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

Be more aggressive about using the busy handler. Ticket #1159. (CVS 2385)

Browse Source 
FossilOrigin-Name: 644c6398e52481e5dda87671e1c196b26b1e4990
This commit is contained in:
drh
2005-03-14 02:01:49 +00:00
parent 556927f944
commit b8ef32c3e8
6 changed files with 107 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pager.c
View File

@@ -18,7 +18,7 @@
** file simultaneously, or one process from reading the database while
** another is writing.
**
** @(#) $Id: pager.c,v 1.192 2005/03/10 14:11:13 drh Exp $
** @(#) $Id: pager.c,v 1.193 2005/03/14 02:01:50 drh Exp $
*/
#include "sqliteInt.h"
#include "os.h"
@@ -1824,12 +1824,12 @@ static int pager_wait_on_lock(Pager *pPager, int locktype){
rc = SQLITE_OK;
}else{
int busy = 1;
BusyHandler *pH;
do {
rc = sqlite3OsLock(&pPager->fd, locktype);
}while( rc==SQLITE_BUSY &&
pPager->pBusyHandler &&
pPager->pBusyHandler->xFunc &&
pPager->pBusyHandler->xFunc(pPager->pBusyHandler->pArg, busy++)
(pH = pPager->pBusyHandler)!=0 &&
pH->xFunc && pH->xFunc(pH->pArg, busy++)
);
if( rc==SQLITE_OK ){
pPager->state = locktype;
@@ -2633,11 +2633,7 @@ int sqlite3pager_begin(void *pData, int exFlag){
pPager->state = PAGER_EXCLUSIVE;
pPager->origDbSize = pPager->dbSize;
}else{
if( SQLITE_BUSY_RESERVED_LOCK || exFlag ){
rc = pager_wait_on_lock(pPager, RESERVED_LOCK);
}else{
rc = sqlite3OsLock(&pPager->fd, RESERVED_LOCK);
}
rc = sqlite3OsLock(&pPager->fd, RESERVED_LOCK);
if( rc==SQLITE_OK ){
pPager->state = PAGER_RESERVED;
if( exFlag ){