database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00
Code Activity

Do not use sqlite3_mutex_xxx() functions in sqlite3recover.c when built with SQLITE_THREADSAFE=0.

Browse Source 
FossilOrigin-Name: cd0aa27d1732abc61c8a8440118ff629f7dca185d2f515ce1f6090c49d8dc890
This commit is contained in:
dan
2022-10-27 10:51:49 +00:00
parent 4f975c3379
commit 21fd7ce098
3 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ext/recover/sqlite3recover.c
View File

@ -280,6 +280,22 @@ static RecoverGlobal recover_g;
*/
#define RECOVER_ROWID_DEFAULT 1
#if defined(SQLITE_THREADSAFE) && SQLITE_THREADSAFE==0
# define recoverEnterMutex()
# define recoverLeaveMutex()
# define recoverAssertMutexHeld()
#else
static void recoverEnterMutex(void){
sqlite3_mutex_enter(sqlite3_mutex_alloc(RECOVER_MUTEX_ID));
}
static void recoverLeaveMutex(void){
sqlite3_mutex_leave(sqlite3_mutex_alloc(RECOVER_MUTEX_ID));
}
static void recoverAssertMutexHeld(void){
assert( sqlite3_mutex_held(sqlite3_mutex_alloc(RECOVER_MUTEX_ID)) );
}
#endif
/*
** Like strlen(). But handles NULL pointer arguments.
@ -2478,7 +2494,7 @@ static int recoverVfsShmUnmap(sqlite3_file *pFd, int deleteFlag){
static void recoverInstallWrapper(sqlite3_recover *p){
sqlite3_file *pFd = 0;
assert( recover_g.pMethods==0 );
assert( sqlite3_mutex_held( sqlite3_mutex_alloc(RECOVER_MUTEX_ID) ) );
recoverAssertMutexHeld();
sqlite3_file_control(p->dbIn, p->zDb, SQLITE_FCNTL_FILE_POINTER, (void*)&pFd);
if( pFd ){
recover_g.pMethods = pFd->pMethods;
@ -2493,7 +2509,7 @@ static void recoverInstallWrapper(sqlite3_recover *p){
** held when this function is called.
*/
static void recoverUninstallWrapper(sqlite3_recover *p){
assert( sqlite3_mutex_held( sqlite3_mutex_alloc(RECOVER_MUTEX_ID) ) );
recoverAssertMutexHeld();
if( recover_g.pMethods ){
sqlite3_file *pFd = 0;
sqlite3_file_control(p->dbIn, p->zDb,SQLITE_FCNTL_FILE_POINTER,(void*)&pFd);
@ -2518,7 +2534,7 @@ static void recoverStep(sqlite3_recover *p){
recoverSqlCallback(p, "BEGIN");
recoverSqlCallback(p, "PRAGMA writable_schema = on");
sqlite3_mutex_enter( sqlite3_mutex_alloc(RECOVER_MUTEX_ID) );
recoverEnterMutex();
recoverInstallWrapper(p);
/* Open the output database. And register required virtual tables and
@ -2535,7 +2551,7 @@ static void recoverStep(sqlite3_recover *p){
recoverCacheSchema(p);
recoverUninstallWrapper(p);
sqlite3_mutex_leave( sqlite3_mutex_alloc(RECOVER_MUTEX_ID) );
recoverLeaveMutex();
recoverExec(p, p->dbOut, "BEGIN");