diff --git a/vendor/go4.org/lock/lock.go b/vendor/go4.org/lock/lock.go index a9fb802de..3e2536282 100644 --- a/vendor/go4.org/lock/lock.go +++ b/vendor/go4.org/lock/lock.go @@ -15,7 +15,7 @@ limitations under the License. */ // Package lock is a file locking library. -package lock +package lock // import "go4.org/lock" import ( "encoding/json" diff --git a/vendor/go4.org/lock/lock_darwin_amd64.go b/vendor/go4.org/lock/lock_darwin_amd64.go deleted file mode 100644 index 35f5787ba..000000000 --- a/vendor/go4.org/lock/lock_darwin_amd64.go +++ /dev/null @@ -1,67 +0,0 @@ -// +build darwin,amd64 -// +build !appengine - -/* -Copyright 2013 The Go Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package lock - -import ( - "fmt" - "io" - "os" - "syscall" - "unsafe" -) - -func init() { - lockFn = lockFcntl -} - -func lockFcntl(name string) (io.Closer, error) { - fi, err := os.Stat(name) - if err == nil && fi.Size() > 0 { - return nil, fmt.Errorf("can't Lock file %q: has non-zero size", name) - } - - f, err := os.Create(name) - if err != nil { - return nil, fmt.Errorf("Lock Create of %s failed: %v", name, err) - } - - // This type matches C's "struct flock" defined in /usr/include/sys/fcntl.h. - // TODO: move this into the standard syscall package. - k := struct { - Start uint64 // sizeof(off_t): 8 - Len uint64 // sizeof(off_t): 8 - Pid uint32 // sizeof(pid_t): 4 - Type uint16 // sizeof(short): 2 - Whence uint16 // sizeof(short): 2 - }{ - Type: syscall.F_WRLCK, - Whence: uint16(os.SEEK_SET), - Start: 0, - Len: 0, // 0 means to lock the entire file. - Pid: uint32(os.Getpid()), - } - - _, _, errno := syscall.Syscall(syscall.SYS_FCNTL, f.Fd(), uintptr(syscall.F_SETLK), uintptr(unsafe.Pointer(&k))) - if errno != 0 { - f.Close() - return nil, errno - } - return &unlocker{f: f, abs: name}, nil -} diff --git a/vendor/go4.org/lock/lock_freebsd.go b/vendor/go4.org/lock/lock_freebsd.go deleted file mode 100644 index ee2767a0a..000000000 --- a/vendor/go4.org/lock/lock_freebsd.go +++ /dev/null @@ -1,66 +0,0 @@ -/* -Copyright 2013 The Go Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package lock - -import ( - "fmt" - "io" - "os" - "syscall" - "unsafe" -) - -func init() { - lockFn = lockFcntl -} - -func lockFcntl(name string) (io.Closer, error) { - fi, err := os.Stat(name) - if err == nil && fi.Size() > 0 { - return nil, fmt.Errorf("can't Lock file %q: has non-zero size", name) - } - - f, err := os.Create(name) - if err != nil { - return nil, err - } - - // This type matches C's "struct flock" defined in /usr/include/fcntl.h. - // TODO: move this into the standard syscall package. - k := struct { - Start int64 /* off_t starting offset */ - Len int64 /* off_t len = 0 means until end of file */ - Pid int32 /* pid_t lock owner */ - Type int16 /* short lock type: read/write, etc. */ - Whence int16 /* short type of l_start */ - Sysid int32 /* int remote system id or zero for local */ - }{ - Start: 0, - Len: 0, // 0 means to lock the entire file. - Pid: int32(os.Getpid()), - Type: syscall.F_WRLCK, - Whence: int16(os.SEEK_SET), - Sysid: 0, - } - - _, _, errno := syscall.Syscall(syscall.SYS_FCNTL, f.Fd(), uintptr(syscall.F_SETLK), uintptr(unsafe.Pointer(&k))) - if errno != 0 { - f.Close() - return nil, errno - } - return &unlocker{f: f, abs: name}, nil -} diff --git a/vendor/go4.org/lock/lock_linux_arm.go b/vendor/go4.org/lock/lock_linux_arm.go deleted file mode 100644 index ebf87bd3e..000000000 --- a/vendor/go4.org/lock/lock_linux_arm.go +++ /dev/null @@ -1,68 +0,0 @@ -// +build linux,arm -// +build !appengine - -/* -Copyright 2013 The Go Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package lock - -import ( - "fmt" - "io" - "os" - "syscall" - "unsafe" -) - -func init() { - lockFn = lockFcntl -} - -func lockFcntl(name string) (io.Closer, error) { - fi, err := os.Stat(name) - if err == nil && fi.Size() > 0 { - return nil, fmt.Errorf("can't Lock file %q: has non-zero size", name) - } - - f, err := os.Create(name) - if err != nil { - return nil, err - } - - // This type matches C's "struct flock" defined in /usr/include/bits/fcntl.h. - // TODO: move this into the standard syscall package. - k := struct { - Type uint16 - Whence uint16 - Start uint32 - Len uint32 - Pid uint32 - }{ - Type: syscall.F_WRLCK, - Whence: uint16(os.SEEK_SET), - Start: 0, - Len: 0, // 0 means to lock the entire file. - Pid: uint32(os.Getpid()), - } - - const F_SETLK = 6 // actual value. syscall package is wrong: golang.org/issue/7059 - _, _, errno := syscall.Syscall(syscall.SYS_FCNTL, f.Fd(), uintptr(F_SETLK), uintptr(unsafe.Pointer(&k))) - if errno != 0 { - f.Close() - return nil, errno - } - return &unlocker{f: f, abs: name}, nil -} diff --git a/vendor/go4.org/lock/lock_linux_amd64.go b/vendor/go4.org/lock/lock_unix.go similarity index 65% rename from vendor/go4.org/lock/lock_linux_amd64.go rename to vendor/go4.org/lock/lock_unix.go index 08b3aae92..580d1fdd1 100644 --- a/vendor/go4.org/lock/lock_linux_amd64.go +++ b/vendor/go4.org/lock/lock_unix.go @@ -1,4 +1,4 @@ -// +build linux,amd64 +// +build linux darwin freebsd openbsd netbsd dragonfly // +build !appengine /* @@ -23,8 +23,8 @@ import ( "fmt" "io" "os" - "syscall" - "unsafe" + + "golang.org/x/sys/unix" ) func init() { @@ -39,29 +39,20 @@ func lockFcntl(name string) (io.Closer, error) { f, err := os.Create(name) if err != nil { - return nil, err + return nil, fmt.Errorf("Lock Create of %s failed: %v", name, err) } - // This type matches C's "struct flock" defined in /usr/include/bits/fcntl.h. - // TODO: move this into the standard syscall package. - k := struct { - Type uint32 - Whence uint32 - Start uint64 - Len uint64 - Pid uint32 - }{ - Type: syscall.F_WRLCK, - Whence: uint32(os.SEEK_SET), + err = unix.FcntlFlock(f.Fd(), unix.F_SETLK, &unix.Flock_t{ + Type: unix.F_WRLCK, + Whence: int16(os.SEEK_SET), Start: 0, Len: 0, // 0 means to lock the entire file. - Pid: uint32(os.Getpid()), - } + Pid: 0, // only used by F_GETLK + }) - _, _, errno := syscall.Syscall(syscall.SYS_FCNTL, f.Fd(), uintptr(syscall.F_SETLK), uintptr(unsafe.Pointer(&k))) - if errno != 0 { + if err != nil { f.Close() - return nil, errno + return nil, fmt.Errorf("Lock FcntlFlock of %s failed: %v", name, err) } return &unlocker{f: f, abs: name}, nil }