diff options
| author | drh <drh@noemail.net> | 2010-09-02 17:15:19 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2010-09-02 17:15:19 +0000 |
| commit | 1ff6e3ab899ed014860e69c2dca5a9ea3ade6d2c (patch) | |
| tree | cc985c51df965f20bf83ce7197fe1800e1c5e9d6 | |
| parent | aac1bf94979d822c1a1c0ad09e0e665eff0c340a (diff) | |
| download | sqlite-1ff6e3ab899ed014860e69c2dca5a9ea3ade6d2c.tar.gz sqlite-1ff6e3ab899ed014860e69c2dca5a9ea3ade6d2c.zip | |
Use sqlite3_mutex_notheld() instead of !sqlite3_mutex_held() inside
of assert() statements since the former works when mutexing is disabled
while the latter does not.
FossilOrigin-Name: 2211486b69cf53f5efb1334aff8b403b26596102
| -rw-r--r-- | manifest | 24 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/malloc.c | 2 |
3 files changed, 19 insertions, 9 deletions
@@ -1,5 +1,8 @@ -C Add\stest\scase\sto\sverify\sthe\sprevious\schange\sis\scorrect. -D 2010-09-02T14:35:36 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +C Use\ssqlite3_mutex_notheld()\sinstead\sof\s!sqlite3_mutex_held()\sinside\nof\sassert()\sstatements\ssince\sthe\sformer\sworks\swhen\smutexing\sis\sdisabled\nwhile\sthe\slatter\sdoes\snot. +D 2010-09-02T17:15:19 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -139,7 +142,7 @@ F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e F src/loadext.c 6d422ea91cf3d2d00408c5a8f2391cd458da85f8 F src/main.c b92c6c9a302999975897730b2808708fbf531a56 -F src/malloc.c 8b67cb6ba7853ad166fd6909ca5f702bf063c053 +F src/malloc.c 2231edbd06f23dd6966f30eda26cb7b365741673 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206 F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf @@ -853,7 +856,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 36397f62f2e3a62b4d5730b29c197449c6850cac -R 2ed03f8f0cf86a56ef69bc75fbb086f3 -U dan -Z 8c092445351db0593b5b806712e1a032 +P 2a5eed35b410fb6bd69242841c00700906f48d5f +R 0c22e9c2aca445476ab0951fae018b3f +U drh +Z a9898d4883843bb1e58123dd33c0c45f +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFMf9uqoxKgR168RlERAgkIAJ4//z+UaADrF2cV99XQ6qH5bKAT7QCggncs +C2rjXXoF03atWsdT31EAiGY= +=MDOk +-----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index be4b87114..a54158736 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2a5eed35b410fb6bd69242841c00700906f48d5f
\ No newline at end of file +2211486b69cf53f5efb1334aff8b403b26596102
\ No newline at end of file diff --git a/src/malloc.c b/src/malloc.c index f6f75565f..b8d47ad85 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -365,7 +365,7 @@ void *sqlite3ScratchMalloc(int n){ } sqlite3MemdebugSetType(p, MEMTYPE_SCRATCH); } - assert( !sqlite3_mutex_held(mem0.mutex) ); + assert( sqlite3_mutex_notheld(mem0.mutex) ); #if SQLITE_THREADSAFE==0 && !defined(NDEBUG) |