database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-14 00:22:38 +03:00
Code Activity

The shared_err test runs with no errors. But a potential deadlock has been

Browse Source 
discovered and is still unfixed. (CVS 4317)

FossilOrigin-Name: f84550be0a0c9e5859b852863b9a8f8ed3fd6919
This commit is contained in:
drh
2007-08-28 23:28:07 +00:00
parent d0679edc7a
commit 4cf7c7f7e7
9 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vdbeaux.c
View File

@@ -667,7 +667,7 @@ void sqlite3VdbeUsesBtree(Vdbe *p, int i, Btree *pBtree){
assert( i<sizeof(p->btreeMask)*8 );
assert( p->db->aDb[i].pBt==pBtree );
p->btreeMask |= 1<<i;
sqlite3BtreeMutexSetInsert(&p->mtxSet, pBtree);
sqlite3BtreeMutexArrayInsert(&p->aMutex, pBtree);
}
@@ -1331,7 +1331,7 @@ void sqlite3AbortOtherActiveVdbes(sqlite3 *db, Vdbe *pExcept){
** lock contention, return SQLITE_BUSY. If SQLITE_BUSY is returned, it
** means the close did not happen and needs to be repeated.
*/
int sqlite3VdbeHalt(Vdbe *p){
static int sqlite3VdbeHaltLocked(Vdbe *p){
sqlite3 *db = p->db;
int i;
int (*xFunc)(Btree *pBt) = 0; /* Function to call on each btree backend */
@@ -1533,6 +1533,14 @@ int sqlite3VdbeHalt(Vdbe *p){
return SQLITE_OK;
}
int sqlite3VdbeHalt(Vdbe *p){
int rc;
sqlite3BtreeMutexArrayEnter(&p->aMutex);
rc = sqlite3VdbeHaltLocked(p);
sqlite3BtreeMutexArrayLeave(&p->aMutex);
return rc;
}
/*
** Each VDBE holds the result of the most recent sqlite3_step() call