Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(fcntl): use syscall instead of x/sys/unix #86

Closed
wants to merge 1 commit into from
Closed

refactor(fcntl): use syscall instead of x/sys/unix #86

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions flock_unix_fcntl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ import (
"sync"
"syscall"
"time"

"golang.org/x/sys/unix"
)

// https://github.com/golang/go/blob/09aeb6e33ab426eff4676a3baf694d5a3019e9fc/src/cmd/go/internal/lockedfile/internal/filelock/filelock_fcntl.go#L28
Expand All @@ -50,8 +48,8 @@ func (lt lockType) String() string {

// https://github.com/golang/go/blob/09aeb6e33ab426eff4676a3baf694d5a3019e9fc/src/cmd/go/internal/lockedfile/internal/filelock/filelock_fcntl.go#L30-L33
const (
readLock lockType = unix.F_RDLCK
writeLock lockType = unix.F_WRLCK
readLock lockType = syscall.F_RDLCK
writeLock lockType = syscall.F_WRLCK
)

// https://github.com/golang/go/blob/09aeb6e33ab426eff4676a3baf694d5a3019e9fc/src/cmd/go/internal/lockedfile/internal/filelock/filelock_fcntl.go#L35
Expand All @@ -66,8 +64,8 @@ type inodeLock struct {
type cmdType int

const (
tryLock cmdType = unix.F_SETLK
waitLock cmdType = unix.F_SETLKW
tryLock cmdType = syscall.F_SETLK
waitLock cmdType = syscall.F_SETLKW
)

var (
Expand Down Expand Up @@ -251,7 +249,7 @@ func (f *Flock) doLock(cmd cmdType, lt lockType, blocking bool) (bool, error) {
if err != nil {
f.doUnlock()

if cmd == tryLock && errors.Is(err, unix.EACCES) {
if cmd == tryLock && errors.Is(err, syscall.EACCES) {
return false, nil
}

Expand Down Expand Up @@ -298,7 +296,7 @@ func (f *Flock) doUnlock() (err error) {
mu.Unlock()

if owner == f {
err = setlkw(f.fh.Fd(), waitLock, unix.F_UNLCK)
err = setlkw(f.fh.Fd(), waitLock, syscall.F_UNLCK)
}

mu.Lock()
Expand Down Expand Up @@ -379,13 +377,13 @@ func (f *Flock) try(locked *bool, flag lockType) (bool, error) {
// https://github.com/golang/go/blob/09aeb6e33ab426eff4676a3baf694d5a3019e9fc/src/cmd/go/internal/lockedfile/internal/filelock/filelock_fcntl.go#L198
func setlkw(fd uintptr, cmd cmdType, lt lockType) error {
for {
err := unix.FcntlFlock(fd, int(cmd), &unix.Flock_t{
err := syscall.FcntlFlock(fd, int(cmd), &syscall.Flock_t{
Type: int16(lt),
Whence: io.SeekStart,
Start: 0,
Len: 0, // All bytes.
})
if !errors.Is(err, unix.EINTR) {
if !errors.Is(err, syscall.EINTR) {
return err
}
}
Expand Down