database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-15 11:41:13 +03:00
Code Activity

Modify the sqlite3OsInMutex os-layer interface to take a single parameter

Browse Source 
to distinguish between mutexes held by the current thread and mutexes held
by any thread.  Part of the fix for ticket #1630. (CVS 2973)

FossilOrigin-Name: e1ad9df1cf46287f2a7789275e98d28e05880e17
This commit is contained in:
drh
2006-01-18 17:25:45 +00:00
parent 9e12800dec
commit 757b04ed36
7 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/os_win.c
View File

@@ -1068,17 +1068,20 @@ int sqlite3WinSleep(int ms){
*/
static int inMutex = 0;
#ifdef SQLITE_W32_THREADS
static HANDLE mutexOwner;
static DWORD mutexOwner;
static CRITICAL_SECTION cs;
#endif
/*
** The following pair of routine implement mutual exclusion for
** The following pair of routines implement mutual exclusion for
** multi-threaded processes. Only a single thread is allowed to
** executed code that is surrounded by EnterMutex() and LeaveMutex().
**
** SQLite uses only a single Mutex. There is not much critical
** code and what little there is executes quickly and without blocking.
**
** Version 3.3.1 and earlier used a simple mutex. Beginning with
** version 3.3.2, a recursive mutex is required.
*/
void sqlite3WinEnterMutex(){
#ifdef SQLITE_W32_THREADS
@@ -1093,7 +1096,7 @@ void sqlite3WinEnterMutex(){
}
}
EnterCriticalSection(&cs);
mutexOwner = GetCurrentThread();
mutexOwner = GetCurrentThreadId();
#endif
inMutex++;
}
@@ -1101,18 +1104,23 @@ void sqlite3WinLeaveMutex(){
assert( inMutex );
inMutex--;
#ifdef SQLITE_W32_THREADS
assert( mutexOwner==GetCurrentThreadId() );
LeaveCriticalSection(&cs);
#endif
}
/*
** Return TRUE if we are currently within the mutex and FALSE if not.
** Return TRUE if the mutex is currently held.
**
** If the thisThreadOnly parameter is true, return true if and only if the
** calling thread holds the mutex. If the parameter is false, return
** true if any thread holds the mutex.
*/
int sqlite3WinInMutex(){
int sqlite3WinInMutex(int thisThreadOnly){
#ifdef SQLITE_W32_THREADS
return inMutex && mutexOwner==GetCurrentThread();
return inMutex>0 && (thisThreadOnly==0 || mutexOwner==GetCurrentThreadId());
#else
return inMutex;
return inMutex>0;
#endif
}