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

Enhance mutex testing to include APP and VFS static mutexes.

Browse Source 
FossilOrigin-Name: 1025873fdfd9e7e53094c48af1a79c60ae50ae97
This commit is contained in:
mistachkin
2015-07-03 23:11:36 +00:00
parent 93de653844
commit 28ae577a3d
4 changed files with 120 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/test_mutex.c
View File

@@ -19,9 +19,18 @@
#include <assert.h>
#include <string.h>
#define MAX_MUTEXES (SQLITE_MUTEX_STATIC_VFS3+1)
/* defined in main.c */
extern const char *sqlite3ErrName(int);
static const char *aName[MAX_MUTEXES+1] = {
"fast", "recursive", "static_master", "static_mem",
"static_open", "static_prng", "static_lru", "static_pmem",
"static_app1", "static_app2", "static_app3", "static_vfs1",
"static_vfs2", "static_vfs3", 0
};
/* A countable mutex */
struct sqlite3_mutex {
sqlite3_mutex *pReal;
@@ -30,13 +39,13 @@ struct sqlite3_mutex {
/* State variables */
static struct test_mutex_globals {
int isInstalled; /* True if installed */
int disableInit; /* True to cause sqlite3_initalize() to fail */
int disableTry; /* True to force sqlite3_mutex_try() to fail */
int isInit; /* True if initialized */
sqlite3_mutex_methods m; /* Interface to "real" mutex system */
int aCounter[8]; /* Number of grabs of each type of mutex */
sqlite3_mutex aStatic[6]; /* The six static mutexes */
int isInstalled; /* True if installed */
int disableInit; /* True to cause sqlite3_initalize() to fail */
int disableTry; /* True to force sqlite3_mutex_try() to fail */
int isInit; /* True if initialized */
sqlite3_mutex_methods m; /* Interface to "real" mutex system */
int aCounter[MAX_MUTEXES]; /* Number of grabs of each type of mutex */
sqlite3_mutex aStatic[MAX_MUTEXES]; /* The static mutexes */
} g = {0};
/* Return true if the countable mutex is currently held */
@@ -78,7 +87,8 @@ static sqlite3_mutex *counterMutexAlloc(int eType){
sqlite3_mutex *pRet = 0;
assert( g.isInit );
assert(eType<8 && eType>=0);
assert( eType>=SQLITE_MUTEX_FAST );
assert( eType<=SQLITE_MUTEX_STATIC_VFS3 );
pReal = g.m.xMutexAlloc(eType);
if( !pReal ) return 0;
@@ -86,7 +96,10 @@ static sqlite3_mutex *counterMutexAlloc(int eType){
if( eType==SQLITE_MUTEX_FAST || eType==SQLITE_MUTEX_RECURSIVE ){
pRet = (sqlite3_mutex *)malloc(sizeof(sqlite3_mutex));
}else{
pRet = &g.aStatic[eType-2];
int eStaticType = eType - (SQLITE_MUTEX_RECURSIVE + 1);
assert( eStaticType>=0 );
assert( eStaticType<MAX_MUTEXES );
pRet = &g.aStatic[eStaticType];
}
pRet->eType = eType;
@@ -110,6 +123,8 @@ static void counterMutexFree(sqlite3_mutex *p){
*/
static void counterMutexEnter(sqlite3_mutex *p){
assert( g.isInit );
assert( p->eType>=0 );
assert( p->eType<MAX_MUTEXES );
g.aCounter[p->eType]++;
g.m.xMutexEnter(p->pReal);
}
@@ -119,6 +134,8 @@ static void counterMutexEnter(sqlite3_mutex *p){
*/
static int counterMutexTry(sqlite3_mutex *p){
assert( g.isInit );
assert( p->eType>=0 );
assert( p->eType<MAX_MUTEXES );
g.aCounter[p->eType]++;
if( g.disableTry ) return SQLITE_BUSY;
return g.m.xMutexTry(p->pReal);
@@ -245,10 +262,6 @@ static int test_read_mutex_counters(
){
Tcl_Obj *pRet;
int ii;
char *aName[8] = {
"fast", "recursive", "static_master", "static_mem",
"static_open", "static_prng", "static_lru", "static_pmem"
};
if( objc!=1 ){
Tcl_WrongNumArgs(interp, 1, objv, "");
@@ -257,7 +270,7 @@ static int test_read_mutex_counters(
pRet = Tcl_NewObj();
Tcl_IncrRefCount(pRet);
for(ii=0; ii<8; ii++){
for(ii=0; ii<MAX_MUTEXES; ii++){
Tcl_ListObjAppendElement(interp, pRet, Tcl_NewStringObj(aName[ii], -1));
Tcl_ListObjAppendElement(interp, pRet, Tcl_NewIntObj(g.aCounter[ii]));
}
@@ -283,7 +296,7 @@ static int test_clear_mutex_counters(
return TCL_ERROR;
}
for(ii=0; ii<8; ii++){
for(ii=0; ii<MAX_MUTEXES; ii++){
g.aCounter[ii] = 0;
}
return TCL_OK;
@@ -371,6 +384,56 @@ static sqlite3 *getDbPointer(Tcl_Interp *pInterp, Tcl_Obj *pObj){
return db;
}
static sqlite3_mutex *getStaticMutexPointer(
Tcl_Interp *pInterp,
Tcl_Obj *pObj
){
int iMutex;
if( Tcl_GetIndexFromObj(pInterp, pObj, aName, "mutex name", 0, &iMutex) ){
return 0;
}
assert( iMutex!=SQLITE_MUTEX_FAST && iMutex!=SQLITE_MUTEX_RECURSIVE );
return counterMutexAlloc(iMutex);
}
static int test_enter_static_mutex(
void * clientData,
Tcl_Interp *interp,
int objc,
Tcl_Obj *CONST objv[]
){
sqlite3_mutex *pMutex;
if( objc!=2 ){
Tcl_WrongNumArgs(interp, 1, objv, "NAME");
return TCL_ERROR;
}
pMutex = getStaticMutexPointer(interp, objv[1]);
if( !pMutex ){
return TCL_ERROR;
}
sqlite3_mutex_enter(pMutex);
return TCL_OK;
}
static int test_leave_static_mutex(
void * clientData,
Tcl_Interp *interp,
int objc,
Tcl_Obj *CONST objv[]
){
sqlite3_mutex *pMutex;
if( objc!=2 ){
Tcl_WrongNumArgs(interp, 1, objv, "NAME");
return TCL_ERROR;
}
pMutex = getStaticMutexPointer(interp, objv[1]);
if( !pMutex ){
return TCL_ERROR;
}
sqlite3_mutex_leave(pMutex);
return TCL_OK;
}
static int test_enter_db_mutex(
void * clientData,
Tcl_Interp *interp,
@@ -418,6 +481,9 @@ int Sqlitetest_mutex_Init(Tcl_Interp *interp){
{ "sqlite3_initialize", (Tcl_ObjCmdProc*)test_initialize },
{ "sqlite3_config", (Tcl_ObjCmdProc*)test_config },
{ "enter_static_mutex", (Tcl_ObjCmdProc*)test_enter_static_mutex },
{ "leave_static_mutex", (Tcl_ObjCmdProc*)test_leave_static_mutex },
{ "enter_db_mutex", (Tcl_ObjCmdProc*)test_enter_db_mutex },
{ "leave_db_mutex", (Tcl_ObjCmdProc*)test_leave_db_mutex },