diff options
| author | dan <dan@noemail.net> | 2015-03-24 18:21:41 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2015-03-24 18:21:41 +0000 |
| commit | 6da7a0a93da31b48081f50e92d4e7b5ffe19522d (patch) | |
| tree | 3e9128ad52de6f69aa11508109f8eb28d1bb2309 /src/test_vfs.c | |
| parent | f37120a416aee4703f5305e68c7535927678cc87 (diff) | |
| parent | 126e9e6347216e47b538e4e8f24cfc2d752d89b3 (diff) | |
| download | sqlite-6da7a0a93da31b48081f50e92d4e7b5ffe19522d.tar.gz sqlite-6da7a0a93da31b48081f50e92d4e7b5ffe19522d.zip | |
Merge the latest trunk changes into this branch.
FossilOrigin-Name: 9d9b6c883b4f7d69c615cedfb59a2385aac47b74
Diffstat (limited to 'src/test_vfs.c')
| -rw-r--r-- | src/test_vfs.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/test_vfs.c b/src/test_vfs.c index 561addfcc..2277cf7eb 100644 --- a/src/test_vfs.c +++ b/src/test_vfs.c @@ -967,16 +967,15 @@ static void tvfsShmBarrier(sqlite3_file *pFile){ TestvfsFd *pFd = tvfsGetFd(pFile); Testvfs *p = (Testvfs *)(pFd->pVfs->pAppData); + if( p->pScript && p->mask&TESTVFS_SHMBARRIER_MASK ){ + const char *z = pFd->pShm ? pFd->pShm->zFile : ""; + tvfsExecTcl(p, "xShmBarrier", Tcl_NewStringObj(z, -1), pFd->pShmId, 0, 0); + } + if( p->isFullshm ){ sqlite3OsShmBarrier(pFd->pReal); return; } - - if( p->pScript && p->mask&TESTVFS_SHMBARRIER_MASK ){ - tvfsExecTcl(p, "xShmBarrier", - Tcl_NewStringObj(pFd->pShm->zFile, -1), pFd->pShmId, 0, 0 - ); - } } static int tvfsShmUnmap( @@ -1532,7 +1531,7 @@ static int testvfs_cmd( return TCL_OK; bad_args: - Tcl_WrongNumArgs(interp, 1, objv, "VFSNAME ?-noshm BOOL? ?-default BOOL? ?-mxpathname INT? ?-szosfile INT? ?-iversion INT?"); + Tcl_WrongNumArgs(interp, 1, objv, "VFSNAME ?-noshm BOOL? ?-fullshm BOOL? ?-default BOOL? ?-mxpathname INT? ?-szosfile INT? ?-iversion INT?"); return TCL_ERROR; } |