Merge pull request #1 from bastionzero/fnctllock

lgmugnier · web-flow · commit 5643143cb607 · 2023-07-06T12:07:35.000-04:00
Use fnctl lock instead of flock on unix
diff --git a/leveldb/storage/file_storage_unix.go b/leveldb/storage/file_storage_unix.go
@@ -49,15 +49,20 @@ func newFileLock(path string, readOnly bool) (fl fileLock, err error) {
 }
 
 func setFileLock(f *os.File, readOnly, lock bool) error {
-	how := syscall.LOCK_UN
+	flock := syscall.Flock_t{
+		Type:   syscall.F_UNLCK,
+		Start:  0,
+		Len:    0,
+		Whence: 1,
+	}
 	if lock {
 		if readOnly {
-			how = syscall.LOCK_SH
+			flock.Type = syscall.F_RDLCK
 		} else {
-			how = syscall.LOCK_EX
+			flock.Type = syscall.F_WRLCK
 		}
 	}
-	return syscall.Flock(int(f.Fd()), how|syscall.LOCK_NB)
+	return syscall.FcntlFlock(f.Fd(), syscall.F_SETLK, &flock)
 }
 
 func rename(oldpath, newpath string) error {

Original file line number	Diff line number	Diff line change
`@@ -49,15 +49,20 @@ func newFileLock(path string, readOnly bool) (fl fileLock, err error) {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`func setFileLock(f *os.File, readOnly, lock bool) error {`
`52`		`- how := syscall.LOCK_UN`
	`52`	`+ flock := syscall.Flock_t{`
	`53`	`+ Type: syscall.F_UNLCK,`
	`54`	`+ Start: 0,`
	`55`	`+ Len: 0,`
	`56`	`+ Whence: 1,`
	`57`	`+ }`
`53`	`58`	`if lock {`
`54`	`59`	`if readOnly {`
`55`		`- how = syscall.LOCK_SH`
	`60`	`+ flock.Type = syscall.F_RDLCK`
`56`	`61`	`} else {`
`57`		`- how = syscall.LOCK_EX`
	`62`	`+ flock.Type = syscall.F_WRLCK`
`58`	`63`	`}`
`59`	`64`	`}`
`60`		`- return syscall.Flock(int(f.Fd()), how\|syscall.LOCK_NB)`
	`65`	`+ return syscall.FcntlFlock(f.Fd(), syscall.F_SETLK, &flock)`
`61`	`66`	`}`
`62`	`67`
`63`	`68`	`func rename(oldpath, newpath string) error {`