Fix the speedtest1.c test program to set the worker thread count using

the threads pragma.

FossilOrigin-Name: 2ab4b5adc60b52bf2d2b79968d226b8dd7d2ab3b

diff --git a/manifest b/manifest
index 6f1298ff91cf5cc4470b0952b675ec53146a1fbe..31a0c63cb4c79661f61ec19a0bf1dc22cbbb9412 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sSQLITE_LIMIT_WORKER_THREADS\sfor\scontrolling\sthe\smaximum\snumber\sof\nworker\sthreads.
-D 2014-08-29T16:20:47.382
+C Fix\sthe\sspeedtest1.c\stest\sprogram\sto\sset\sthe\sworker\sthread\scount\susing\nthe\sthreads\spragma.
+D 2014-08-29T18:06:33.187
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -851,7 +851,7 @@ F test/speed3.test d32043614c08c53eafdc80f33191d5bd9b920523
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
-F test/speedtest1.c f452891e50571627f7060c0e1262359127055717
+F test/speedtest1.c 83f6b3318f7ee60e52b978b5a5e5dd7e83dfb7ee
 F test/spellfix.test 24f676831acddd2f4056a598fd731a72c6311f49
 F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298
 F test/stat.test 76fd746b85459e812a0193410fb599f0531f22de
@@ -1193,7 +1193,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 35c44a3c73e2e8b14ff194c41986f4bdb9dfe737
-R 2f78b359e3468cdedd78b18f8317c2eb
+P 1b598c68f32db635d1cea1373bedc434aa60cf08
+R 0f5325539e5516baa4a3f930643f73d7
 U drh
-Z bfedd71a211c8cc0f7a49234bc820538
+Z 8e5082b548f72bf30dfd81cfdd246c1c

diff --git a/manifest.uuid b/manifest.uuid
index cd1149dbb050efbdd7c6df5ca62f9f9d831d2ad0..8313e4677933fde979e8ae1b110abad3a4291798 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1b598c68f32db635d1cea1373bedc434aa60cf08
\ No newline at end of file
+2ab4b5adc60b52bf2d2b79968d226b8dd7d2ab3b
\ No newline at end of file

diff --git a/test/speedtest1.c b/test/speedtest1.c
index 5fb9917f9b02172115f8b177f1666fa6d9d79ba3..8589b163339e5de0095e0b923d0b48fb7a8c318c 100644 (file)
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -1278,11 +1278,6 @@ int main(int argc, char **argv){
     rc = sqlite3_config(SQLITE_CONFIG_SCRATCH, pScratch, szScratch, nScratch);
     if( rc ) fatal_error("scratch configuration failed: %d\n", rc);
   }
-#ifdef SQLITE_CONFIG_WORKER_THREADS
-  if( nThread>0 ){
-    sqlite3_config(SQLITE_CONFIG_WORKER_THREADS, nThread);
-  }
-#endif
   if( nLook>0 ){
     sqlite3_config(SQLITE_CONFIG_LOOKASIDE, 0, 0);
   }
@@ -1300,6 +1295,7 @@ int main(int argc, char **argv){
   /* Set database connection options */
   sqlite3_create_function(g.db, "random", 0, SQLITE_UTF8, 0, randomFunc, 0, 0);
   if( doTrace ) sqlite3_trace(g.db, traceCallback, 0);
+  speedtest1_exec("PRAGMA threads=%d", nThread);
   if( zKey ){
     speedtest1_exec("PRAGMA key('%s')", zKey);
   }