This patch by Tony Reix adds an emulation of the Flock call to libgo's
syscall package on AIX. Committed to mainline.
Ian
Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE (revision 255666)
+++ gcc/go/gofrontend/MERGE (working copy)
@@ -1,4 +1,4 @@
-c02de8ca63f52a2475ce8645edee3203a3c908ac
+d1f90c9b77baca5c33a398ab844fb4440c6a5ee7
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
Index: libgo/go/syscall/libcall_aix.go
===================================================================
--- libgo/go/syscall/libcall_aix.go (revision 255666)
+++ libgo/go/syscall/libcall_aix.go (working copy)
@@ -111,6 +111,28 @@ func Reboot(how int) (err error) {
//sys Fchownat(dirfd int, path string, uid int, gid int, flags int) (err
error)
//fchownat(dirfd _C_int, path *byte, owner Uid_t, group Gid_t, flags _C_int)
_C_int
+// On AIX, there is no flock() system call, we emulate it.
+func Flock(fd int, op int) (err error) {
+ lk := &Flock_t{}
+ if (op & LOCK_UN) != 0 {
+ lk.Type = F_UNLCK
+ } else if (op & LOCK_EX) != 0 {
+ lk.Type = F_WRLCK
+ } else if (op & LOCK_SH) != 0 {
+ lk.Type = F_RDLCK
+ } else {
+ return nil
+ }
+ if (op & LOCK_NB) != 0 {
+ err = FcntlFlock(uintptr(fd), F_SETLK, lk)
+ if err != nil && (err == EAGAIN || err == EACCES) {
+ return EWOULDBLOCK
+ }
+ return err
+ }
+ return FcntlFlock(uintptr(fd), F_SETLKW, lk)
+}
+
//sys Fstatfs(fd int, buf *Statfs_t) (err error)
//fstatfs64(fd _C_int, buf *Statfs_t) _C_int
