diff options
| author | drh <drh@noemail.net> | 2007-08-29 04:00:57 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2007-08-29 04:00:57 +0000 |
| commit | 1fee73e74acab48412a3c596d4cd68deecadeef6 (patch) | |
| tree | 10aec18d0d28cd9a1a55c6db8d1d128a8afb0716 /src/btree.h | |
| parent | b1ab8ea7f36073eff200639169fdf73cba1bef8c (diff) | |
| download | sqlite-1fee73e74acab48412a3c596d4cd68deecadeef6.tar.gz sqlite-1fee73e74acab48412a3c596d4cd68deecadeef6.zip | |
Better asserts(). But now some of the tests are busted again. (CVS 4320)
FossilOrigin-Name: e8060f85e7871572e2a38dc96f03e6e1f34cc8fd
Diffstat (limited to 'src/btree.h')
| -rw-r--r-- | src/btree.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/btree.h b/src/btree.h index a7f71fe35..6733daa50 100644 --- a/src/btree.h +++ b/src/btree.h @@ -13,7 +13,7 @@ ** subsystem. See comments in the source code for a detailed description ** of what each interface routine does. ** -** @(#) $Id: btree.h,v 1.89 2007/08/29 00:33:07 drh Exp $ +** @(#) $Id: btree.h,v 1.90 2007/08/29 04:00:58 drh Exp $ */ #ifndef _BTREE_H_ #define _BTREE_H_ @@ -175,23 +175,24 @@ int sqlite3BtreePageDump(Btree*, int, int recursive); #if !defined(SQLITE_OMIT_SHARED_CACHE) && SQLITE_THREADSAFE void sqlite3BtreeEnter(Btree*); void sqlite3BtreeLeave(Btree*); -# define sqlite3BtreeMutexHeld(X) sqlite3_mutex_held(X) + int sqlite3BtreeHoldsMutex(Btree*); void sqlite3BtreeEnterAll(sqlite3*); void sqlite3BtreeLeaveAll(sqlite3*); + int sqlite3BtreeHoldsAllMutexes(sqlite3*); void sqlite3BtreeMutexArrayEnter(BtreeMutexArray*); void sqlite3BtreeMutexArrayLeave(BtreeMutexArray*); void sqlite3BtreeMutexArrayInsert(BtreeMutexArray*, Btree*); #else # define sqlite3BtreeEnter(X) # define sqlite3BtreeLeave(X) -# define sqlite3BtreeMutexHeld(X) 1 +# define sqlite3BtreeHoldsMutex(X) 1 # define sqlite3BtreeEnterAll(X) # define sqlite3BtreeLeaveAll(X) +# define sqlite3BtreeHoldsAllMutexes(X) 1 # define sqlite3BtreeMutexArrayEnter(X) # define sqlite3BtreeMutexArrayLeave(X) # define sqlite3BtreeMutexArrayInsert(X,Y) #endif - #endif /* _BTREE_H_ */ |