From: dan Date: Mon, 5 Jul 2010 12:54:08 +0000 (+0000) Subject: Call Tcl_ExitThread() from within threads created using Tcl_CreateThread(). Not doing... X-Git-Tag: version-3.7.2~195 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3374f8aee45b81845247e2e5839c2e66a035609d;p=thirdparty%2Fsqlite.git Call Tcl_ExitThread() from within threads created using Tcl_CreateThread(). Not doing so causes notifier related errors on OSX. FossilOrigin-Name: 684eae6623ef1d0336b7a734b17ed307c720b6f4 --- diff --git a/manifest b/manifest index 36538a9fb1..54fee9f72f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sany\sfiles\sspecified\sas\spart\sof\sthe\sQUICKTEST_INCLUDE\senvironment\svariable\sto\sthe\sset\sof\stest\sfiles\srun\sas\spart\sof\s"make\stest".\sRelease\stesting\suses\sthis\strick. -D 2010-07-05T05:54:56 +C Call\sTcl_ExitThread()\sfrom\swithin\sthreads\screated\susing\sTcl_CreateThread().\sNot\sdoing\sso\scauses\snotifier\srelated\serrors\son\sOSX. +D 2010-07-05T12:54:08 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -186,7 +186,7 @@ F src/test6.c e7f71216e4da6fdafbc571c34401d2ef91f58bb7 F src/test7.c 3f2d63e4ccf97f8c2cf1a7fa0a3c8e2e2a354e6e F src/test8.c f959db9a22d882013b64c92753fa793b2ce3bdea F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60 -F src/test_async.c c1656facbaf43cb2e71b62621e5b9eb080e2621c +F src/test_async.c 5193a69d0982096d64e56c9ff8b2ec6d4f446f82 F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2 @@ -208,7 +208,7 @@ F src/test_pcache.c 7bf828972ac0d2403f5cfa4cd14da41f8ebe73d8 F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0 F src/test_server.c bbba05c144b5fc4b52ff650a4328027b3fa5fcc6 F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa -F src/test_thread.c aa9919c885a1fe53eafc73492f0898ee6c0a0726 +F src/test_thread.c 9fe4226a4b6681ed2c58e23ee576106110f8f20f F src/test_vfs.c bea0f0bdee9b033a62d057bf3451c25760b0414d F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/tokenize.c 25ceb0f0a746ea1d0f9553787f3f0a56853cfaeb @@ -830,7 +830,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P b6600ecb4ee8e4d0fe5e8399450ef25b15071a91 -R da8aed891b7f5d67281385c97a3b2615 +P a40a6e7df191ca10bc3aa504d374b9f5bfa33cbc +R a97be07f4de569b32cbbfb8477867ef2 U dan -Z 923dd86af3faa026add005d8c4375f84 +Z 372b7ef74e3ef16e1a500de7d9db277c diff --git a/manifest.uuid b/manifest.uuid index 45036f0df6..ade978a10c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a40a6e7df191ca10bc3aa504d374b9f5bfa33cbc \ No newline at end of file +684eae6623ef1d0336b7a734b17ed307c720b6f4 \ No newline at end of file diff --git a/src/test_async.c b/src/test_async.c index c0c0cd1164..313645dec6 100644 --- a/src/test_async.c +++ b/src/test_async.c @@ -84,6 +84,7 @@ static Tcl_ThreadCreateType tclWriterThread(ClientData pIsStarted){ *((int *)pIsStarted) = 1; sqlite3async_run(); Tcl_MutexUnlock(&testasync_g_writerMutex); + Tcl_ExitThread(0); TCL_THREAD_CREATE_RETURN; } diff --git a/src/test_thread.c b/src/test_thread.c index c4ade68ed9..08494189cd 100644 --- a/src/test_thread.c +++ b/src/test_thread.c @@ -150,6 +150,7 @@ static Tcl_ThreadCreateType tclScriptThread(ClientData pSqlThread){ Tcl_DecrRefCount(pList); Tcl_DecrRefCount(pRes); Tcl_DeleteInterp(interp); + Tcl_ExitThread(0); TCL_THREAD_CREATE_RETURN; }