database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Run some malloc() tests with exclusive-access mode. (CVS 3717)

Browse Source 
FossilOrigin-Name: 127454903764daff17390941a002f527ee2ffc87
This commit is contained in:
danielk1977
2007-03-26 12:26:27 +00:00
parent ded6f4b2fe
commit c5859718af
5 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
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.296 2007/03/26 10:27:19 danielk1977 Exp $
** @(#) $Id: pager.c,v 1.297 2007/03/26 12:26:27 danielk1977 Exp $
*/
#ifndef SQLITE_OMIT_DISKIO
#include "sqliteInt.h"
@@ -874,6 +874,7 @@ static void pager_unlock(Pager *pPager){
*/
static void pagerUnlockAndRollback(Pager *p){
if( p->errCode ) return;
assert( p->state>=PAGER_RESERVED || p->journalOpen==0 );
if( p->state>=PAGER_RESERVED ){
sqlite3PagerRollback(p);
}
@@ -2722,6 +2723,9 @@ static int pagerSharedLock(Pager *pPager){
if( rc!=SQLITE_OK ){
return pager_error(pPager, rc);
}
assert(pPager->state==PAGER_SHARED ||
(pPager->exclusiveMode && pPager->state>PAGER_SHARED)
);
}
if( pPager->pAll ){
@@ -2747,7 +2751,10 @@ static int pagerSharedLock(Pager *pPager){
}
}
}
pPager->state = PAGER_SHARED;
assert( pPager->exclusiveMode || pPager->state<=PAGER_SHARED );
if( pPager->state==PAGER_UNLOCK ){
pPager->state = PAGER_SHARED;
}
}
return rc;