From: dan <dan@noemail.net>
Date: Mon, 26 Jun 2017 08:24:35 +0000 (+0000)
Subject: Fix another problem with multi-threaded mode in the LSM test code.
X-Git-Tag: version-3.20.0~165^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a31c67aaeaf7b123c2100732477ccc32a4c6509;p=thirdparty%2Fsqlite.git

Fix another problem with multi-threaded mode in the LSM test code.

FossilOrigin-Name: 461ced77d93e84f09bfb4291999cd0245506fa9a8369049fd68968bbcf18d41b
---

diff --git a/ext/lsm1/lsm-test/lsmtest_tdb3.c b/ext/lsm1/lsm-test/lsmtest_tdb3.c
index 3cd843ad80..048fd71ef6 100644
--- a/ext/lsm1/lsm-test/lsmtest_tdb3.c
+++ b/ext/lsm1/lsm-test/lsmtest_tdb3.c
@@ -521,7 +521,9 @@ static int waitOnCheckpointer(LsmDb *pDb, lsm_db *db){
     rc = lsm_info(db, LSM_INFO_CHECKPOINT_SIZE, &nKB);
     if( rc!=LSM_OK || nKB<pDb->nMtMaxCkpt ) break;
 #ifdef LSM_MUTEX_PTHREADS
-    mt_signal_worker(pDb, 1);
+    mt_signal_worker(pDb, 
+        (pDb->eMode==LSMTEST_MODE_BACKGROUND_CKPT ? 0 : 1)
+    );
 #endif
     usleep(5000);
     nSleep += 5;
diff --git a/manifest b/manifest
index 43b2376acf..a564f7571c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sa\stest\scase\sto\sreflect\sthe\sfact\sthat\sthe\slsm\sblocksize\sis\sconfigured\sin\nKiB.\sAnd\sdefaults\sto\s1024,\snot\s2048.
-D 2017-06-26T07:31:28.709
+C Fix\sanother\sproblem\swith\smulti-threaded\smode\sin\sthe\sLSM\stest\scode.
+D 2017-06-26T08:24:35.524
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
@@ -229,7 +229,7 @@ F ext/lsm1/lsm-test/lsmtest_mem.c 996b1e76cc876e8d765182a2f14159b1acbf56cbf86d28
 F ext/lsm1/lsm-test/lsmtest_tdb.c 59a58b2513e0dbb581008c0a32c6e2b630dafafe8972f800cc13faac5fe63b1a
 F ext/lsm1/lsm-test/lsmtest_tdb.h de1ee8c71a7ef61d964e40e057cffea387d7b58a51d95905ab909937d24e4a91
 F ext/lsm1/lsm-test/lsmtest_tdb2.cc 99ea7f2dd9c7536c8fb9bdd329e4cfeb76899f3ddf6f48bdd3926e016922b715
-F ext/lsm1/lsm-test/lsmtest_tdb3.c 4030ad346f4cb46716f12832f66b0a26292b4ec0e2d16a55db28a795921ad0f5
+F ext/lsm1/lsm-test/lsmtest_tdb3.c 6de609f6233026227d721e9265e62bf1834aed07d8795610c7ef8e30ce6be559
 F ext/lsm1/lsm-test/lsmtest_tdb4.c 47e8bb5eba266472d690fb8264f1855ebdba0ae5a0e541e35fcda61ebf1d277f
 F ext/lsm1/lsm-test/lsmtest_util.c 0c2b7c1d109fbd6b7b9a2780f1315e2438a973d18afea5c4eccf94e8827c8260
 F ext/lsm1/lsm.h 0f6f64ff071471cb87bf98beb8386566f30ea001
@@ -1622,7 +1622,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 23f16382ed47a90bf5e6c1684d54d28484dca46fea20ca0f131bd477cf222bfb
-R 42cfaba8180225a4be675b52b68e350a
+P d7015475f121db1f56060716cd8adb73e9b52016890ec9018b620ef9d7d4fbff
+R b9a98a6b215e7bedda7016d56ba98fbd
 U dan
-Z 66b9f7dba4db0fdf711ca0bea95a98fa
+Z d1e7007f4ef8398b65bd06f90d76fe20
diff --git a/manifest.uuid b/manifest.uuid
index a7c3a25c60..040f78a32a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d7015475f121db1f56060716cd8adb73e9b52016890ec9018b620ef9d7d4fbff
\ No newline at end of file
+461ced77d93e84f09bfb4291999cd0245506fa9a8369049fd68968bbcf18d41b
\ No newline at end of file