Change OS_UNIX to SQLITE_OS_UNIX in test_thread.c. Modify notify2.test to

print out its timings in addition to reporting success or failure. (CVS 6382)

FossilOrigin-Name: 940d72d2bae95ddd1aea9b63424179735f440296

diff --git a/manifest b/manifest
index e56a87fd20d8cbca152dc3d9880ee7b0bcbe3ad6..89ee1c3ea0b0794d63c632167360834d172d49a5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Get\sthe\sOOM\stester\sin\sasync2.test\sworking\sagain.\s(CVS\s6381)
-D 2009-03-24T17:43:57
+C Change\sOS_UNIX\sto\sSQLITE_OS_UNIX\sin\stest_thread.c.\s\sModify\snotify2.test\sto\nprint\sout\sits\stimings\sin\saddition\sto\sreporting\ssuccess\sor\sfailure.\s(CVS\s6382)
+D 2009-03-24T18:42:16
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -192,7 +192,7 @@ F src/test_pcache.c 29464896d9c67832e4eef916c0682b98d7283d00
 F src/test_schema.c 4b4bf7bb329326458c491b0e6facd4c8c4c5b479
 F src/test_server.c f0a403b5f699c09bd2b1236b6f69830fd6221f6b
 F src/test_tclvar.c 9e42fa59d3d2f064b7ab8628e7ab2dc8a9fe93d4
-F src/test_thread.c 1c7a895dbc469d87d22c1b36f269a6f799fc47a8
+F src/test_thread.c 7b409dc9f8058e20b6697f97a6382ac75b16da5d
 F src/test_wsd.c 3ae5101de6cbfda2720152ab659ea84079719241
 F src/tokenize.c fff72a9bc0af326583e5966daecebeb5ed9b9614
 F src/trigger.c 21f39db410cdc32166a94900ac1b3df98ea560e6
@@ -479,7 +479,7 @@ F test/mutex1.test ebd54720401fafe854799dc86b7bf60b75631935
 F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
 F test/nan.test c627d79b3d36ea892563fd67584b3e8a18f0618a
 F test/notify1.test 9a985a94f34de1b24daf25fd86b6d5033ba532d0
-F test/notify2.test 997b6caed0c4e2f9549a30eb5df240d0df298eba
+F test/notify2.test f189304492fd9596a9465cfdfb7c8664fabb9643
 F test/notnull.test 44d600f916b770def8b095a9962dbe3be5a70d82
 F test/null.test a8b09b8ed87852742343b33441a9240022108993
 F test/openv2.test f5dd6b23e4dce828eb211649b600763c42a668df
@@ -709,7 +709,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 40df926b4606b3abe8c797bf17163f996bd03ad5
-R dc5fd31931ec261a95010f75735b4f20
+P f398a2d1b0a731bbb600d0bb70ab79f1334ceda9
+R e985bb02f394f55006cd15c1b29cea14
 U drh
-Z fd241091e276e0cd221c93f64b4eaff8
+Z cd8d35f0858a96c51f531491feb53bc1

diff --git a/manifest.uuid b/manifest.uuid
index 94d5c4e1745ee8cc9f792dbdd6ccfd4991e53b15..e4ee2c6df5754b505bd0bbbb69248fe4d8fb1ffb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f398a2d1b0a731bbb600d0bb70ab79f1334ceda9
\ No newline at end of file
+940d72d2bae95ddd1aea9b63424179735f440296
\ No newline at end of file

diff --git a/src/test_thread.c b/src/test_thread.c
index ce51a6e05216a6f9720296ae12dc6d3617c52ea4..2507e5f5510350549ad4c816aa8e57c6dc7d1dfb 100644 (file)
--- a/src/test_thread.c
+++ b/src/test_thread.c
@@ -14,7 +14,7 @@
 ** test that sqlite3 database handles may be concurrently accessed by 
 ** multiple threads. Right now this only works on unix.
 **
-** $Id: test_thread.c,v 1.13 2009/03/23 17:11:27 danielk1977 Exp $
+** $Id: test_thread.c,v 1.14 2009/03/24 18:42:16 drh Exp $
 */
 
 #include "sqliteInt.h"
@@ -115,7 +115,7 @@ static Tcl_ThreadCreateType tclScriptThread(ClientData pSqlThread){
   interp = Tcl_CreateInterp();
   Tcl_CreateObjCommand(interp, "clock_seconds", clock_seconds_proc, 0, 0);
   Tcl_CreateObjCommand(interp, "sqlthread", sqlthread_proc, pSqlThread, 0);
-#if defined(OS_UNIX) && defined(SQLITE_ENABLE_UNLOCK_NOTIFY)
+#if defined(SQLITE_OS_UNIX) && defined(SQLITE_ENABLE_UNLOCK_NOTIFY)
   Tcl_CreateObjCommand(interp, "sqlite3_blocking_step", blocking_step_proc,0,0);
   Tcl_CreateObjCommand(interp, 
       "sqlite3_blocking_prepare_v2", blocking_prepare_v2_proc, (void *)1, 0);
@@ -388,7 +388,7 @@ static int clock_seconds_proc(
 ** should be considered if these functions are to be extended (i.e. to 
 ** support windows) in the future.
 */ 
-#if defined(OS_UNIX) && defined(SQLITE_ENABLE_UNLOCK_NOTIFY)
+#if defined(SQLITE_OS_UNIX) && defined(SQLITE_ENABLE_UNLOCK_NOTIFY)
 
 /* BEGIN_SQLITE_BLOCKING_STEP */
 /* This example uses the pthreads API */
@@ -610,7 +610,7 @@ static int blocking_prepare_v2_proc(
 int SqlitetestThread_Init(Tcl_Interp *interp){
   Tcl_CreateObjCommand(interp, "sqlthread", sqlthread_proc, 0, 0);
   Tcl_CreateObjCommand(interp, "clock_seconds", clock_seconds_proc, 0, 0);
-#if defined(OS_UNIX) && defined(SQLITE_ENABLE_UNLOCK_NOTIFY)
+#if defined(SQLITE_OS_UNIX) && defined(SQLITE_ENABLE_UNLOCK_NOTIFY)
   Tcl_CreateObjCommand(interp, "sqlite3_blocking_step", blocking_step_proc,0,0);
   Tcl_CreateObjCommand(interp, 
       "sqlite3_blocking_prepare_v2", blocking_prepare_v2_proc, (void *)1, 0);

diff --git a/test/notify2.test b/test/notify2.test
index a079c36f2d86dce99ac2a8c8ea67c040fdc0f4f4..91c3e83e1b2f5b70b452ca839ba4818e0a2413eb 100644 (file)
--- a/test/notify2.test
+++ b/test/notify2.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: notify2.test,v 1.3 2009/03/23 17:11:27 danielk1977 Exp $
+# $Id: notify2.test,v 1.4 2009/03/24 18:42:16 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -49,7 +49,7 @@ source $testdir/thread_common.tcl
 
 # Number of threads to run simultaneously.
 #
-set nThread 3
+set nThread 6
 set nSecond 5
 
 # The Tcl script executed by each of the $nThread threads used by this test.
@@ -227,10 +227,16 @@ foreach {iTest xStep xPrepare} {
   } {}
 }
 
+# The following tests checks to make sure sqlite3_blocking_step() is
+# faster than sqlite3_step().  blocking_step() is always faster on
+# multi-core and is usually faster on single-core.  But sometimes, by
+# chance, step() will be faster on a single core, in which case the
+# following test will fail.
+#
+puts [array get anWrite]
 do_test notify2-3 {
   expr {$anWrite(sqlite3_blocking_step) > $anWrite(sqlite3_step)}
 } {1}
 
 sqlite3_enable_shared_cache $::enable_shared_cache
 finish_test
-