qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-17 18:14:46 -07:00
Code Releases Activity

syscall, cmd/go/internal/lockedfile/internal/filelock: add and use Flock on illumos

Browse Source 
Copy the syscall wrapper from golang.org/x/sys/unix CL 255377 to provide
Flock on illumos and switch cmd/go/internal/lockedfile/internal/filelock
to use it.

Fixes #35618

Change-Id: I876a2b782329a988fa85361fb1ea58eb6f329af1
Reviewed-on: https://go-review.googlesource.com/c/go/+/255258
Trust: Tobias Klauser <tobias.klauser@gmail.com>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
This commit is contained in:
Tobias Klauser 2020-09-16 22:15:13 +02:00 committed by Tobias Klauser
parent f5d59d0e38
commit 7f24142b7b
5 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/go/internal/lockedfile/internal/filelock/filelock_fcntl.go
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
// +build aix solaris // +build aix solaris,!illumos
// This code implements the filelock API using POSIX 'fcntl' locks, which attach // This code implements the filelock API using POSIX 'fcntl' locks, which attach
// to an (inode, process) pair rather than a file descriptor. To avoid unlocking // to an (inode, process) pair rather than a file descriptor. To avoid unlocking

2
src/cmd/go/internal/lockedfile/internal/filelock/filelock_test.go
View File

@ -161,7 +161,7 @@ func TestRLockExcludesOnlyLock(t *testing.T) {
doUnlockTF := false doUnlockTF := false
switch runtime.GOOS { switch runtime.GOOS {
case "aix", "illumos", "solaris": case "aix", "solaris":
// When using POSIX locks (as on Solaris), we can't safely read-lock the // When using POSIX locks (as on Solaris), we can't safely read-lock the
// same inode through two different descriptors at the same time: when the // same inode through two different descriptors at the same time: when the
// first descriptor is closed, the second descriptor would still be open but // first descriptor is closed, the second descriptor would still be open but

2
src/cmd/go/internal/lockedfile/internal/filelock/filelock_unix.go
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
// +build darwin dragonfly freebsd linux netbsd openbsd // +build darwin dragonfly freebsd illumos linux netbsd openbsd
package filelock package filelock

25
src/syscall/syscall_illumos.go Normal file
View File

@ -0,0 +1,25 @@
// Copyright 2020 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
// +build illumos
// Illumos system calls not present on Solaris.
package syscall
import "unsafe"
//go:cgo_import_dynamic libc_flock flock "libc.so"
//go:linkname procFlock libc_flock
var procFlock libcFunc
func Flock(fd int, how int) error {
_, _, errno := sysvicall6(uintptr(unsafe.Pointer(&procFlock)), 2, uintptr(fd), uintptr(how), 0, 0, 0, 0)
if errno != 0 {
return errno
}
return nil
}

17
src/syscall/types_illumos_amd64.go Normal file
View File

@ -0,0 +1,17 @@
// Copyright 2020 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
// +build illumos
// Illumos consts not present on Solaris. These are added manually rather than
// auto-generated by mkerror.sh
package syscall
const (
LOCK_EX = 0x2
LOCK_NB = 0x4
LOCK_SH = 0x1
LOCK_UN = 0x8
)