In the OSTRACE debugging macros in os_unix.c, identify the VFS currently
in use. FossilOrigin-Name: 082b8da005128f47f63e95b6b702bf4517221b2a
This commit is contained in:
drh
parent
acf28fbdd8
commit
476bda7de4
24
manifest
24
manifest
@ -1,5 +1,8 @@
|
||||
C Modify\s[2ad1461f25]\sto\savoid\sleaving\sa\sprepared\sstatement\sin\s"active"\sstate\sfollowing\san\sOOM\serror\sin\sFTS3.
|
||||
D 2009-12-04T14:11:34
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA1
|
||||
|
||||
C In\sthe\sOSTRACE\sdebugging\smacros\sin\sos_unix.c,\sidentify\sthe\sVFS\scurrently\nin\suse.
|
||||
D 2009-12-04T14:25:19
|
||||
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
|
||||
F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
|
||||
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
|
||||
@ -148,7 +151,7 @@ F src/os.c 4500ff276e277730776fe9b6c6c5930383ec4000
|
||||
F src/os.h 534b082c3cb349ad05fa6fa0b06087e022af282c
|
||||
F src/os_common.h 240c88b163b02c21a9f21f87d49678a0aa21ff30
|
||||
F src/os_os2.c 75a8c7b9a00a2cf1a65f9fa4afbc27d46634bb2f
|
||||
F src/os_unix.c bdd6ca0932dcb51c344081aff430bcc71c14db7f
|
||||
F src/os_unix.c fe85acfeded5cc13c2340ab73c9baf841de4e6d9
|
||||
F src/os_win.c 5ffab20249a61e0625f869efe157fa009747039b
|
||||
F src/pager.c a0ed14b86de9d012a962b83389ca01003b6acccb
|
||||
F src/pager.h 1b32faf2e578ac3e7bcf9c9d11217128261c5c54
|
||||
@ -776,7 +779,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
|
||||
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
|
||||
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
|
||||
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
|
||||
P 2ad1461f255c2499367b706a5ec65b44c1fc1618
|
||||
R 434ac8eeb95fc4fd25e48da71a4aeaab
|
||||
U dan
|
||||
Z 61ea5bb3c9293e72eaba32fbcf09b0bf
|
||||
P 69c21ee46aeeb624fd8638b17ff7259a3e5f9a46
|
||||
R 400f092ce88a5a339c0b27b8a8415aa3
|
||||
U drh
|
||||
Z ed4cd334a82b89245ccfc3ad9b838d68
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.6 (GNU/Linux)
|
||||
|
||||
iD8DBQFLGRvSoxKgR168RlERApe7AJ9uIN22ikW++Uqhi70+FZLKfs2R8gCfUGfY
|
||||
GTEEJa/7cpPCyUSqfXB/ROE=
|
||||
=u43h
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -1 +1 @@
|
||||
69c21ee46aeeb624fd8638b17ff7259a3e5f9a46
|
||||
082b8da005128f47f63e95b6b702bf4517221b2a
|
||||
@ -1159,7 +1159,7 @@ static int unixCheckReservedLock(sqlite3_file *id, int *pResOut){
|
||||
#endif
|
||||
|
||||
unixLeaveMutex();
|
||||
OSTRACE4("TEST WR-LOCK %d %d %d\n", pFile->h, rc, reserved);
|
||||
OSTRACE4("TEST WR-LOCK %d %d %d (unix)\n", pFile->h, rc, reserved);
|
||||
|
||||
*pResOut = reserved;
|
||||
return rc;
|
||||
@ -1292,7 +1292,7 @@ static int unixLock(sqlite3_file *id, int locktype){
|
||||
int tErrno;
|
||||
|
||||
assert( pFile );
|
||||
OSTRACE7("LOCK %d %s was %s(%s,%d) pid=%d\n", pFile->h,
|
||||
OSTRACE7("LOCK %d %s was %s(%s,%d) pid=%d (unix)\n", pFile->h,
|
||||
locktypeName(locktype), locktypeName(pFile->locktype),
|
||||
locktypeName(pLock->locktype), pLock->cnt , getpid());
|
||||
|
||||
@ -1301,7 +1301,7 @@ static int unixLock(sqlite3_file *id, int locktype){
|
||||
** unixEnterMutex() hasn't been called yet.
|
||||
*/
|
||||
if( pFile->locktype>=locktype ){
|
||||
OSTRACE3("LOCK %d %s ok (already held)\n", pFile->h,
|
||||
OSTRACE3("LOCK %d %s ok (already held) (unix)\n", pFile->h,
|
||||
locktypeName(locktype));
|
||||
return SQLITE_OK;
|
||||
}
|
||||
@ -1471,7 +1471,7 @@ static int unixLock(sqlite3_file *id, int locktype){
|
||||
|
||||
end_lock:
|
||||
unixLeaveMutex();
|
||||
OSTRACE4("LOCK %d %s %s\n", pFile->h, locktypeName(locktype),
|
||||
OSTRACE4("LOCK %d %s %s (unix)\n", pFile->h, locktypeName(locktype),
|
||||
rc==SQLITE_OK ? "ok" : "failed");
|
||||
return rc;
|
||||
}
|
||||
@ -1535,7 +1535,7 @@ static int unixUnlock(sqlite3_file *id, int locktype){
|
||||
int tErrno; /* Error code from system call errors */
|
||||
|
||||
assert( pFile );
|
||||
OSTRACE7("UNLOCK %d %d was %d(%d,%d) pid=%d\n", pFile->h, locktype,
|
||||
OSTRACE7("UNLOCK %d %d was %d(%d,%d) pid=%d (unix)\n", pFile->h, locktype,
|
||||
pFile->locktype, pFile->pLock->locktype, pFile->pLock->cnt, getpid());
|
||||
|
||||
assert( locktype<=SHARED_LOCK );
|
||||
@ -1816,7 +1816,7 @@ static int dotlockCheckReservedLock(sqlite3_file *id, int *pResOut) {
|
||||
const char *zLockFile = (const char*)pFile->lockingContext;
|
||||
reserved = access(zLockFile, 0)==0;
|
||||
}
|
||||
OSTRACE4("TEST WR-LOCK %d %d %d\n", pFile->h, rc, reserved);
|
||||
OSTRACE4("TEST WR-LOCK %d %d %d (dotlock)\n", pFile->h, rc, reserved);
|
||||
*pResOut = reserved;
|
||||
return rc;
|
||||
}
|
||||
@ -1906,7 +1906,7 @@ static int dotlockUnlock(sqlite3_file *id, int locktype) {
|
||||
char *zLockFile = (char *)pFile->lockingContext;
|
||||
|
||||
assert( pFile );
|
||||
OSTRACE5("UNLOCK %d %d was %d pid=%d\n", pFile->h, locktype,
|
||||
OSTRACE5("UNLOCK %d %d was %d pid=%d (dotlock)\n", pFile->h, locktype,
|
||||
pFile->locktype, getpid());
|
||||
assert( locktype<=SHARED_LOCK );
|
||||
|
||||
@ -2020,7 +2020,7 @@ static int flockCheckReservedLock(sqlite3_file *id, int *pResOut){
|
||||
}
|
||||
}
|
||||
}
|
||||
OSTRACE4("TEST WR-LOCK %d %d %d\n", pFile->h, rc, reserved);
|
||||
OSTRACE4("TEST WR-LOCK %d %d %d (flock)\n", pFile->h, rc, reserved);
|
||||
|
||||
#ifdef SQLITE_IGNORE_FLOCK_LOCK_ERRORS
|
||||
if( (rc & SQLITE_IOERR) == SQLITE_IOERR ){
|
||||
@ -2087,7 +2087,7 @@ static int flockLock(sqlite3_file *id, int locktype) {
|
||||
/* got it, set the type and return ok */
|
||||
pFile->locktype = locktype;
|
||||
}
|
||||
OSTRACE4("LOCK %d %s %s\n", pFile->h, locktypeName(locktype),
|
||||
OSTRACE4("LOCK %d %s %s (flock)\n", pFile->h, locktypeName(locktype),
|
||||
rc==SQLITE_OK ? "ok" : "failed");
|
||||
#ifdef SQLITE_IGNORE_FLOCK_LOCK_ERRORS
|
||||
if( (rc & SQLITE_IOERR) == SQLITE_IOERR ){
|
||||
@ -2109,7 +2109,7 @@ static int flockUnlock(sqlite3_file *id, int locktype) {
|
||||
unixFile *pFile = (unixFile*)id;
|
||||
|
||||
assert( pFile );
|
||||
OSTRACE5("UNLOCK %d %d was %d pid=%d\n", pFile->h, locktype,
|
||||
OSTRACE5("UNLOCK %d %d was %d pid=%d (flock)\n", pFile->h, locktype,
|
||||
pFile->locktype, getpid());
|
||||
assert( locktype<=SHARED_LOCK );
|
||||
|
||||
@ -2211,7 +2211,7 @@ static int semCheckReservedLock(sqlite3_file *id, int *pResOut) {
|
||||
sem_post(pSem);
|
||||
}
|
||||
}
|
||||
OSTRACE4("TEST WR-LOCK %d %d %d\n", pFile->h, rc, reserved);
|
||||
OSTRACE4("TEST WR-LOCK %d %d %d (sem)\n", pFile->h, rc, reserved);
|
||||
|
||||
*pResOut = reserved;
|
||||
return rc;
|
||||
@ -2286,7 +2286,7 @@ static int semUnlock(sqlite3_file *id, int locktype) {
|
||||
|
||||
assert( pFile );
|
||||
assert( pSem );
|
||||
OSTRACE5("UNLOCK %d %d was %d pid=%d\n", pFile->h, locktype,
|
||||
OSTRACE5("UNLOCK %d %d was %d pid=%d (sem)\n", pFile->h, locktype,
|
||||
pFile->locktype, getpid());
|
||||
assert( locktype<=SHARED_LOCK );
|
||||
|
||||
@ -2456,7 +2456,7 @@ static int afpCheckReservedLock(sqlite3_file *id, int *pResOut){
|
||||
}
|
||||
}
|
||||
|
||||
OSTRACE4("TEST WR-LOCK %d %d %d\n", pFile->h, rc, reserved);
|
||||
OSTRACE4("TEST WR-LOCK %d %d %d (afp)\n", pFile->h, rc, reserved);
|
||||
|
||||
*pResOut = reserved;
|
||||
return rc;
|
||||
@ -2492,7 +2492,7 @@ static int afpLock(sqlite3_file *id, int locktype){
|
||||
afpLockingContext *context = (afpLockingContext *) pFile->lockingContext;
|
||||
|
||||
assert( pFile );
|
||||
OSTRACE5("LOCK %d %s was %s pid=%d\n", pFile->h,
|
||||
OSTRACE5("LOCK %d %s was %s pid=%d (afp)\n", pFile->h,
|
||||
locktypeName(locktype), locktypeName(pFile->locktype), getpid());
|
||||
|
||||
/* If there is already a lock of this type or more restrictive on the
|
||||
@ -2500,7 +2500,7 @@ static int afpLock(sqlite3_file *id, int locktype){
|
||||
** unixEnterMutex() hasn't been called yet.
|
||||
*/
|
||||
if( pFile->locktype>=locktype ){
|
||||
OSTRACE3("LOCK %d %s ok (already held)\n", pFile->h,
|
||||
OSTRACE3("LOCK %d %s ok (already held) (afp)\n", pFile->h,
|
||||
locktypeName(locktype));
|
||||
return SQLITE_OK;
|
||||
}
|
||||
@ -2619,7 +2619,7 @@ static int afpLock(sqlite3_file *id, int locktype){
|
||||
|
||||
afp_end_lock:
|
||||
unixLeaveMutex();
|
||||
OSTRACE4("LOCK %d %s %s\n", pFile->h, locktypeName(locktype),
|
||||
OSTRACE4("LOCK %d %s %s (afp)\n", pFile->h, locktypeName(locktype),
|
||||
rc==SQLITE_OK ? "ok" : "failed");
|
||||
return rc;
|
||||
}
|
||||
@ -2637,7 +2637,7 @@ static int afpUnlock(sqlite3_file *id, int locktype) {
|
||||
afpLockingContext *pCtx = (afpLockingContext *) pFile->lockingContext;
|
||||
|
||||
assert( pFile );
|
||||
OSTRACE5("UNLOCK %d %d was %d pid=%d\n", pFile->h, locktype,
|
||||
OSTRACE5("UNLOCK %d %d was %d pid=%d (afp)\n", pFile->h, locktype,
|
||||
pFile->locktype, getpid());
|
||||
|
||||
assert( locktype<=SHARED_LOCK );
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user