diff options
| author | dan <Dan Kennedy> | 2025-02-10 20:46:14 +0000 |
|---|---|---|
| committer | dan <Dan Kennedy> | 2025-02-10 20:46:14 +0000 |
| commit | 2d878947004909b22c2057eb124b9d00fabe8d82 (patch) | |
| tree | 93891151e07bcf3176d15cdaa1465423576c0ab2 /src/os_unix.c | |
| parent | df54ecb1bfaf1d6e514b534a9c647ffc72571684 (diff) | |
| download | sqlite-2d878947004909b22c2057eb124b9d00fabe8d82.tar.gz sqlite-2d878947004909b22c2057eb124b9d00fabe8d82.zip | |
Experimental change to allow clients to block when taking a SHARED lock to connect to a wal mode database.
FossilOrigin-Name: d2d6a000fb9bf8097e0ce9979685408d183be3ab785ceeb11ec1f97a81a83e41
Diffstat (limited to 'src/os_unix.c')
| -rw-r--r-- | src/os_unix.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 58e495210..7f92c5234 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -284,6 +284,7 @@ struct unixFile { #endif #ifdef SQLITE_ENABLE_SETLK_TIMEOUT unsigned iBusyTimeout; /* Wait this many millisec on locks */ + int bBlockOnConnect; /* True to block for SHARED locks */ #endif #if OS_VXWORKS struct vxworksFileId *pId; /* Unique file ID */ @@ -1677,6 +1678,13 @@ static int unixFileLock(unixFile *pFile, struct flock *pLock){ rc = 0; } }else{ +#ifdef SQLITE_ENABLE_SETLK_TIMEOUT + if( pFile->bBlockOnConnect && pLock->l_type==F_RDLCK + && pLock->l_start==SHARED_FIRST && pLock->l_len==SHARED_SIZE + ){ + rc = osFcntl(pFile->h, F_SETLKW, pLock); + }else +#endif rc = osSetPosixAdvisoryLock(pFile->h, pLock, pFile); } return rc; @@ -4049,7 +4057,12 @@ static int unixFileControl(sqlite3_file *id, int op, void *pArg){ *(int*)pArg = iOld; return SQLITE_OK; } -#endif + case SQLITE_FCNTL_BLOCK_ON_CONNECT: { + int iNew = *(int*)pArg; + pFile->bBlockOnConnect = iNew; + return SQLITE_OK; + } +#endif /* SQLITE_ENABLE_SETLK_TIMEOUT */ #if SQLITE_MAX_MMAP_SIZE>0 case SQLITE_FCNTL_MMAP_SIZE: { i64 newLimit = *(i64*)pArg; |