database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +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

14
src/btmutex.c
View File

@@ -10,7 +10,7 @@
**
*************************************************************************
**
** $Id: btmutex.c,v 1.2 2007/08/28 16:44:20 drh Exp $
** $Id: btmutex.c,v 1.3 2007/08/28 23:28:08 drh Exp $
**
** This file contains code used to implement mutexes on Btree objects.
** This code really belongs in btree.c. But btree.c is getting too
@@ -110,7 +110,7 @@ void sqlite3BtreeLeave(Btree *p){
}
/*
** Potentially dd a new Btree pointer to a BtreeMutexSet.
** Potentially dd a new Btree pointer to a BtreeMutexArray.
** Really only add the Btree if it can possibly be shared with
** another database connection.
**
@@ -122,7 +122,7 @@ void sqlite3BtreeLeave(Btree *p){
** The number of shared btrees will always be small (usually 0 or 1)
** so an insertion sort is an adequate algorithm here.
*/
void sqlite3BtreeMutexSetInsert(BtreeMutexSet *pSet, Btree *pBtree){
void sqlite3BtreeMutexArrayInsert(BtreeMutexArray *pSet, Btree *pBtree){
int i, j;
BtShared *pBt;
if( !pBtree->sharable ) return;
@@ -150,11 +150,11 @@ void sqlite3BtreeMutexSetInsert(BtreeMutexSet *pSet, Btree *pBtree){
}
/*
** Enter the mutex of every btree in the set. This routine is
** Enter the mutex of every btree in the array. This routine is
** called at the beginning of sqlite3VdbeExec(). The mutexes are
** exited at the end of the same function.
*/
void sqlite3BtreeMutexSetEnter(BtreeMutexSet *pSet){
void sqlite3BtreeMutexArrayEnter(BtreeMutexArray *pSet){
int i;
for(i=0; i<pSet->nMutex; i++){
Btree *p = pSet->aBtree[i];
@@ -175,9 +175,9 @@ void sqlite3BtreeMutexSetEnter(BtreeMutexSet *pSet){
}
/*
** Leave the mutex of every btree in the set.
** Leave the mutex of every btree in the group.
*/
void sqlite3BtreeMutexSetLeave(BtreeMutexSet *pSet){
void sqlite3BtreeMutexArrayLeave(BtreeMutexArray *pSet){
int i;
for(i=0; i<pSet->nMutex; i++){
Btree *p = pSet->aBtree[i];