diff options
| author | dan <dan@noemail.net> | 2020-06-29 18:22:21 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2020-06-29 18:22:21 +0000 |
| commit | 5289c51050a9cc4860dca4afcbb276710b7ff8d6 (patch) | |
| tree | 86ee2760c9c923c27dbbd3941f176561d2317ca9 /src/os_unix.c | |
| parent | 2bfd35b8d2871012f3061c89aef9cdb6ad7dbd94 (diff) | |
| download | sqlite-5289c51050a9cc4860dca4afcbb276710b7ff8d6.tar.gz sqlite-5289c51050a9cc4860dca4afcbb276710b7ff8d6.zip | |
Change things so that if SQLITE_ENABLE_SETLK_TIMEOUT is defined as 2 instead of 1, all blocking locks are taken for a single millisecond and the default busy-handler invoked as normal.
FossilOrigin-Name: ac381e6eb3c9284e65f7aad66d21bee1bca9ef4123684ccaf069b8a6d157a56d
Diffstat (limited to 'src/os_unix.c')
| -rw-r--r-- | src/os_unix.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 3571f3f2c..01852afd3 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -3997,7 +3997,13 @@ static int unixFileControl(sqlite3_file *id, int op, void *pArg){ #ifdef SQLITE_ENABLE_SETLK_TIMEOUT case SQLITE_FCNTL_LOCK_TIMEOUT: { int iOld = pFile->iBusyTimeout; +#if SQLITE_ENABLE_SETLK_TIMEOUT==1 pFile->iBusyTimeout = *(int*)pArg; +#elif SQLITE_ENABLE_SETLK_TIMEOUT==2 + pFile->iBusyTimeout = !!(*(int*)pArg); +#else +# error "SQLITE_ENABLE_SETLK_TIMEOUT must be set to 1 or 2" +#endif *(int*)pArg = iOld; return SQLITE_OK; } @@ -4325,7 +4331,7 @@ static int unixShmSystemLock( f.l_len = n; res = osSetPosixAdvisoryLock(pShmNode->hShm, &f, pFile); if( res==-1 ){ -#ifdef SQLITE_ENABLE_SETLK_TIMEOUT +#if defined(SQLITE_ENABLE_SETLK_TIMEOUT) && SQLITE_ENABLE_SETLK_TIMEOUT==1 rc = (pFile->iBusyTimeout ? SQLITE_BUSY_TIMEOUT : SQLITE_BUSY); #else rc = SQLITE_BUSY; |