aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/os.c2
-rw-r--r--src/test6.c148
2 files changed, 102 insertions, 48 deletions
diff --git a/src/os.c b/src/os.c
index 90dd4a39a..f71ab56e6 100644
--- a/src/os.c
+++ b/src/os.c
@@ -233,6 +233,7 @@ int sqlite3_vfs_register(sqlite3_vfs *pVfs, int makeDflt){
pVfs->pNext = vfsList->pNext;
pVfs->pNext = pVfs;
}
+ assert(vfsList);
sqlite3_mutex_leave(mutex);
return SQLITE_OK;
}
@@ -244,6 +245,7 @@ int sqlite3_vfs_unregister(sqlite3_vfs *pVfs){
sqlite3_mutex *mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER);
sqlite3_mutex_enter(mutex);
vfsUnlink(pVfs);
+ assert(vfsList);
sqlite3_mutex_leave(mutex);
return SQLITE_OK;
}
diff --git a/src/test6.c b/src/test6.c
index db20725ed..0abf2353a 100644
--- a/src/test6.c
+++ b/src/test6.c
@@ -126,7 +126,10 @@ struct CrashFile {
sqlite3_file *pRealFile; /* Underlying "real" file handle */
char *zName;
- /* Cache of the entire file. */
+ /* Cache of the entire file. This is used to speed up OsRead() and
+ ** OsFileSize() calls. Although both could be done by traversing the
+ ** write-list, in practice this is impractically slow.
+ */
int iSize; /* Size of file in bytes */
int nData; /* Size of buffer allocated at zData */
u8 *zData; /* Buffer containing file contents */
@@ -303,7 +306,7 @@ static int writeListAppend(
static int cfClose(sqlite3_file *pFile){
CrashFile *pCrash = (CrashFile *)pFile;
writeListSync(pCrash, 0);
- sqlite3OsCloseFree(pCrash->pRealFile);
+ sqlite3OsClose(pCrash->pRealFile);
return SQLITE_OK;
}
@@ -454,8 +457,7 @@ static const sqlite3_io_methods CrashFileVtab = {
** Application data for the crash VFS
*/
struct crashAppData {
- int (*xOpen)(void*,const char*,sqlite3_file*,int,int*); /* Original xOpen */
- void *pAppData; /* Original pAppData */
+ sqlite3_vfs *pOrig; /* Wrapped vfs structure */
};
/*
@@ -468,50 +470,78 @@ struct crashAppData {
** sqlite3_malloc(). The assumption here is (pVfs->szOsFile) is
** equal or greater than sizeof(CrashFile).
*/
-static int sqlite3CrashFileOpen(
- sqlite3_vfs *pVfs,
+static int cfOpen(
+ void *pAppData,
const char *zName,
sqlite3_file *pFile,
int flags,
int *pOutFlags
){
+ sqlite3_vfs *pVfs = (sqlite3_vfs *)pAppData;
int rc;
- if( sqlite3CrashTestEnable ){
- CrashFile *pWrapper = (CrashFile *)pFile;
- sqlite3_file *pReal;
- assert(pVfs->szOsFile>=sizeof(CrashFile));
- memset(pWrapper, 0, sizeof(CrashFile));
- sqlite3CrashTestEnable = 0;
- rc = sqlite3OsOpenMalloc(pVfs, zName, &pReal, flags, pOutFlags);
- sqlite3CrashTestEnable = 1;
- if( rc==SQLITE_OK ){
- i64 iSize;
- pWrapper->pMethod = &CrashFileVtab;
- pWrapper->zName = (char *)zName;
- pWrapper->pRealFile = pReal;
- rc = sqlite3OsFileSize(pReal, &iSize);
- pWrapper->iSize = (int)iSize;
- }
- if( rc==SQLITE_OK ){
- pWrapper->nData = (4096 + pWrapper->iSize);
- pWrapper->zData = (char *)sqlite3_malloc(pWrapper->nData);
- if( pWrapper->zData ){
- memset(pWrapper->zData, 0, pWrapper->nData);
- rc = sqlite3OsRead(pReal, pWrapper->zData, pWrapper->iSize, 0);
- }else{
- rc = SQLITE_NOMEM;
- }
- }
- if( rc!=SQLITE_OK && pWrapper->pMethod ){
- sqlite3OsClose(pFile);
+ CrashFile *pWrapper = (CrashFile *)pFile;
+ sqlite3_file *pReal = &pWrapper[1];
+
+ memset(pWrapper, 0, sizeof(CrashFile));
+ rc = sqlite3OsOpen(pVfs, zName, pReal, flags, pOutFlags);
+
+ if( rc==SQLITE_OK ){
+ i64 iSize;
+ pWrapper->pMethod = &CrashFileVtab;
+ pWrapper->zName = (char *)zName;
+ pWrapper->pRealFile = pReal;
+ rc = sqlite3OsFileSize(pReal, &iSize);
+ pWrapper->iSize = (int)iSize;
+ }
+ if( rc==SQLITE_OK ){
+ pWrapper->nData = (4096 + pWrapper->iSize);
+ pWrapper->zData = (char *)sqlite3_malloc(pWrapper->nData);
+ if( pWrapper->zData ){
+ memset(pWrapper->zData, 0, pWrapper->nData);
+ rc = sqlite3OsRead(pReal, pWrapper->zData, pWrapper->iSize, 0);
+ }else{
+ rc = SQLITE_NOMEM;
}
- }else{
- struct crashAppData *pData = (struct crashAppData*)pVfs->pAppData;
- rc = pData->xOpen(pData->pAppData, zName, pFile, flags, pOutFlags);
+ }
+ if( rc!=SQLITE_OK && pWrapper->pMethod ){
+ sqlite3OsClose(pFile);
}
return rc;
}
+static int cfDelete(void *pAppData, const char *zPath, int dirSync){
+ sqlite3_vfs *pVfs = (sqlite3_vfs *)pAppData;
+ return pVfs->xDelete(pVfs->pAppData, zPath, dirSync);
+}
+static int cfAccess(void *pAppData, const char *zPath, int flags){
+ sqlite3_vfs *pVfs = (sqlite3_vfs *)pAppData;
+ return pVfs->xAccess(pVfs->pAppData, zPath, flags);
+}
+static int cfGetTempName(void *pAppData, char *zBufOut){
+ sqlite3_vfs *pVfs = (sqlite3_vfs *)pAppData;
+ return pVfs->xGetTempName(pVfs->pAppData, zBufOut);
+}
+static int cfFullPathname(void *pAppData, const char *zPath, char *zPathOut){
+ sqlite3_vfs *pVfs = (sqlite3_vfs *)pAppData;
+ return pVfs->xFullPathname(pVfs->pAppData, zPath, zPathOut);
+}
+static void *cfDlOpen(void *pAppData, const char *zPath){
+ sqlite3_vfs *pVfs = (sqlite3_vfs *)pAppData;
+ return pVfs->xDlOpen(pVfs->pAppData, zPath);
+}
+static int cfRandomness(void *pAppData, int nByte, char *zBufOut){
+ sqlite3_vfs *pVfs = (sqlite3_vfs *)pAppData;
+ return pVfs->xRandomness(pVfs->pAppData, nByte, zBufOut);
+}
+static int cfSleep(void *pAppData, int nMicro){
+ sqlite3_vfs *pVfs = (sqlite3_vfs *)pAppData;
+ return pVfs->xSleep(pVfs->pAppData, nMicro);
+}
+static int cfCurrentTime(void *pAppData, double *pTimeOut){
+ sqlite3_vfs *pVfs = (sqlite3_vfs *)pAppData;
+ return pVfs->xCurrentTime(pVfs->pAppData, pTimeOut);
+}
+
/*
** tclcmd: sqlite_crashparams ?OPTIONS? DELAY CRASHFILE
**
@@ -540,20 +570,42 @@ static int crashParamsObjCmd(
int iDelay;
const char *zCrashFile;
int nCrashFile;
- static sqlite3_vfs crashVfs, *pOriginalVfs;
static struct crashAppData appData;
- if( pOriginalVfs==0 ){
- pOriginalVfs = sqlite3_vfs_find(0);
- crashVfs = *pOriginalVfs;
- crashVfs.xOpen = sqlite3CrashFileOpen;
- crashVfs.vfsMutex = 0;
- crashVfs.nRef = 0;
- crashVfs.pAppData = &appData;
- appData.xOpen = pOriginalVfs->xOpen;
- appData.pAppData = pOriginalVfs->pAppData;
+ static sqlite3_vfs crashVfs = {
+ 1, /* iVersion */
+ 0, /* szOsFile */
+ 0, /* mxPathname */
+ 0, /* nRef */
+ 0, /* vfsMutex */
+ 0, /* pNext */
+ "crash", /* zName */
+ 0, /* pAppData */
+
+ cfOpen, /* xOpen */
+ cfDelete, /* xDelete */
+ cfAccess, /* xAccess */
+ cfGetTempName, /* xGetTempName */
+ cfFullPathname, /* xFullPathname */
+ cfDlOpen, /* xDlOpen */
+ 0, /* xDlError */
+ 0, /* xDlSym */
+ 0, /* xDlClose */
+ cfRandomness, /* xRandomness */
+ cfSleep, /* xSleep */
+ cfCurrentTime /* xCurrentTime */
+ };
+
+ if( crashVfs.pAppData==0 ){
+ sqlite3_vfs *pOriginalVfs = sqlite3_vfs_find(0);
+ crashVfs.xDlError = pOriginalVfs->xDlError;
+ crashVfs.xDlSym = pOriginalVfs->xDlSym;
+ crashVfs.xDlClose = pOriginalVfs->xDlClose;
+ crashVfs.mxPathname = pOriginalVfs->mxPathname;
+ crashVfs.pAppData = (void *)pOriginalVfs;
+ crashVfs.szOsFile = sizeof(CrashFile) + pOriginalVfs->szOsFile;
sqlite3_vfs_release(pOriginalVfs);
- sqlite3_vfs_unregister(pOriginalVfs);
+ /* sqlite3_vfs_unregister(pOriginalVfs); */
sqlite3_vfs_register(&crashVfs, 1);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-21 22:03:23 +0000