Change the profile timer units back to nanoseconds and update the

sqlite3_profile() documentation.
Ticket [c43940c49b74c70a69]

FossilOrigin-Name: 7783b98a938b77d6b8e4e85b32b05452c47fbe4b

diff --git a/manifest b/manifest
index 5745efe23e1b0b5798f77519eef98f5a9fbf24a8..805f29dba1fefdda04134fdfec4bf4e5dc895075 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Correct\shandling\sof\scompound\sforeign\skey\sconstraints\sthat\sinclude\sthe\s\ninteger\sprimary\skey\sas\sone\sof\sthe\scolumns.\s\s\nTicket\s[ce7c133ea6cc9ccdc1]
-D 2010-07-29T01:50:39
+C Change\sthe\sprofile\stimer\sunits\sback\sto\snanoseconds\sand\supdate\sthe\nsqlite3_profile()\sdocumentation.\nTicket\s[c43940c49b74c70a69]
+D 2010-07-29T10:07:21
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -173,7 +173,7 @@ F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c 74fef1334bec27e606ef0b19e5c41cd0a639e69c
 F src/shell.c 8517fc1f9c59ae4007e6cc8b9af91ab231ea2056
-F src/sqlite.h.in 373dedd8489ecd9dfb33d6d4378ee9f34a3c2386
+F src/sqlite.h.in ae47c9a641c0ce766719aa4657e26b319d253c8c
 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
 F src/sqliteInt.h a9be6badc6cd6a3c1ae54475a98661cf351ecad5
 F src/sqliteLimit.h 196e2f83c3b444c4548fc1874f52f84fdbda40f3
@@ -224,7 +224,7 @@ F src/vacuum.c 241a8386727c1497eba4955933356dfba6ff8c9f
 F src/vdbe.c cefff41564b68a412e65e6a1013ec1b1c1ece6c4
 F src/vdbe.h 4de0efb4b0fdaaa900cf419b35c458933ef1c6d2
 F src/vdbeInt.h ffd68c4d4229227a5089bec53a1c635146177abc
-F src/vdbeapi.c dc3138f10afbc95ed3c21dd25abb154504b1db9d
+F src/vdbeapi.c d0f4407e465f261780ad725c1caece7d66a6aa35
 F src/vdbeaux.c 77442ab4233858cf603910429033fbbd997ecdef
 F src/vdbeblob.c 258a6010ba7a82b72b327fb24c55790655689256
 F src/vdbemem.c 5e579abf6532001dfbee0e640dc34eae897a9807
@@ -842,14 +842,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 33b1e862ffa7109480cf4a77ceae8aebe98d3eee
-R 1a747cd66c3cb3531b2d422eed64646d
+P 53902f7d4a46aa70ecc5bf180a01ff888d52686a
+R 5c7f3d7af62d969d6bf07f63f9a6dc16
 U drh
-Z f3390b0f32a832cb0283a0a97736cdae
+Z 278ae6e643818185a89142571af06620
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMUN5zoxKgR168RlERAuaoAJsGqWIctdVM52Ga01Y24rzgl5SLEgCeK9O0
-mB2frcny0J2mHg1qnqy1X4A=
-=UB37
+iD8DBQFMUVLcoxKgR168RlERAoZMAJ49AHrWc/0+siMt64/zrJKLt1+nUACeMpNG
+x2umDnXBmB1KEwdKFIiDQOs=
+=yNbn
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 11a286a12243179704f20a7566430f54c5f665fa..2a79f9f55c1a523a2a6c92fd2122bd201e411afc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-53902f7d4a46aa70ecc5bf180a01ff888d52686a
\ No newline at end of file
+7783b98a938b77d6b8e4e85b32b05452c47fbe4b
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 286ff5990f7f8c563530c09805eaa5f7e009981e..57910ee3248021ec96d24efd3e0a9a7f79ea3108 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -2171,7 +2171,13 @@ int sqlite3_set_authorizer(
 ** ^The callback function registered by sqlite3_profile() is invoked
 ** as each SQL statement finishes.  ^The profile callback contains
 ** the original statement text and an estimate of wall-clock time
-** of how long that statement took to run.
+** of how long that statement took to run.  ^The profile callback
+** time is in units of nanoseconds, however the current implementation
+** is only capable of millisecond resolution so the six least significant
+** digits in the time are meaningless.  Future versions of SQLite
+** might provide greater resolution on the profiler callback.  The
+** sqlite3_profile() function is considered experimental and is
+** subject to change in future versions of SQLite.
 */
 void *sqlite3_trace(sqlite3*, void(*xTrace)(void*,const char*), void*);
 SQLITE_EXPERIMENTAL void *sqlite3_profile(sqlite3*,

diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 2f5aaa36d1437ed852c2329ff3e9c14bc83ca103..afb4a1b6e68e98ece59953afb7b835b40c103687 100644 (file)
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -398,7 +398,7 @@ static int sqlite3Step(Vdbe *p){
   if( rc!=SQLITE_ROW && db->xProfile && !db->init.busy && p->zSql ){
     sqlite3_int64 iNow;
     sqlite3OsCurrentTimeInt64(db->pVfs, &iNow);
-    db->xProfile(db->pProfileArg, p->zSql, iNow - p->startTime);
+    db->xProfile(db->pProfileArg, p->zSql, (iNow - p->startTime)*1000000);
   }
 #endif