go/sqlite3
1
0
Fork 0
mirror of https://github.com/ncruces/go-sqlite3.git synced 2026-01-12 05:59:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Locking fixes.

Browse Source
This commit is contained in:
Nuno Cruces
2023-03-16 02:52:22 +00:00
parent 6fc0afcd12
commit c6a2617dfc
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vfs_lock.go
View File

@@ -114,7 +114,7 @@ func vfsLock(ctx context.Context, mod api.Module, pFile uint32, eLock vfsLockSta
panic(assertErr())
}
// A PENDING lock is needed before acquiring an EXCLUSIVE lock.
if cLock == _RESERVED_LOCK {
if cLock < _PENDING_LOCK {
if rc := vfsOS.GetPendingLock(file); rc != _OK {
return uint32(rc)
}
@@ -169,12 +169,6 @@ func vfsUnlock(ctx context.Context, mod api.Module, pFile uint32, eLock vfsLockS
}
func vfsCheckReservedLock(ctx context.Context, mod api.Module, pFile, pResOut uint32) uint32 {
cLock := vfsFile.GetLock(ctx, mod, pFile)
if cLock > _SHARED_LOCK {
panic(assertErr())
}
file := vfsFile.GetOS(ctx, mod, pFile)
locked, rc := vfsOS.CheckReservedLock(file)

17
vfs_windows.go
View File

@@ -136,9 +136,6 @@ func (vfsOSMethods) readLock(file *os.File, start, len uint32) xErrorCode {
}
func (vfsOSMethods) writeLock(file *os.File, start, len uint32) xErrorCode {
// TODO: implement timeouts.
// https://devblogs.microsoft.com/oldnewthing/20140905-00/?p=63
// https://learn.microsoft.com/en-ie/windows/win32/api/winbase/nf-winbase-reopenfile
return vfsOS.lockErrorCode(windows.LockFileEx(windows.Handle(file.Fd()),
windows.LOCKFILE_FAIL_IMMEDIATELY|windows.LOCKFILE_EXCLUSIVE_LOCK,
0, len, 0, &windows.Overlapped{Offset: start}),
@@ -146,12 +143,17 @@ func (vfsOSMethods) writeLock(file *os.File, start, len uint32) xErrorCode {
}
func (vfsOSMethods) checkLock(file *os.File, start, len uint32) (bool, xErrorCode) {
// TODO: report errors.
rc := vfsOS.readLock(file, start, len)
rc := vfsOS.lockErrorCode(windows.LockFileEx(windows.Handle(file.Fd()),
windows.LOCKFILE_FAIL_IMMEDIATELY,
0, len, 0, &windows.Overlapped{Offset: start}),
IOERR_CHECKRESERVEDLOCK)
if rc == xErrorCode(BUSY) {
return true, _OK
}
if rc == _OK {
vfsOS.unlock(file, start, len)
}
return rc != _OK, _OK
return false, rc
}
func (vfsOSMethods) lockErrorCode(err error, def xErrorCode) xErrorCode {
@@ -163,7 +165,8 @@ func (vfsOSMethods) lockErrorCode(err error, def xErrorCode) xErrorCode {
switch errno {
case
windows.ERROR_LOCK_VIOLATION,
windows.ERROR_IO_PENDING:
windows.ERROR_IO_PENDING,
windows.ERROR_OPERATION_ABORTED:
return xErrorCode(BUSY)
}
}