diff options
Diffstat (limited to 'src/lib/net')
| -rw-r--r-- | src/lib/net/fd.go | 9 | ||||
| -rw-r--r-- | src/lib/net/net.go | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/lib/net/fd.go b/src/lib/net/fd.go index 1ec0d8af9..0c7770c77 100644 --- a/src/lib/net/fd.go +++ b/src/lib/net/fd.go @@ -280,17 +280,26 @@ func (fd *netFD) Accept(sa *syscall.Sockaddr) (nfd *netFD, err *os.Error) { return nil, os.EINVAL } + // See ../syscall/exec.go for description of ForkLock. + // It is okay to hold the lock across syscall.Accept + // because we have put fd.fd into non-blocking mode. + syscall.ForkLock.RLock(); var s, e int64; for { s, e = syscall.Accept(fd.fd, sa); if e != syscall.EAGAIN { break; } + syscall.ForkLock.RUnlock(); pollserver.WaitRead(fd); + syscall.ForkLock.RLock(); } if e != 0 { + syscall.ForkLock.RUnlock(); return nil, os.ErrnoToError(e) } + syscall.CloseOnExec(s); + syscall.ForkLock.RUnlock(); raddr, err1 := sockaddrToHostPort(sa); if err1 != nil { diff --git a/src/lib/net/net.go b/src/lib/net/net.go index b81e99268..db708191b 100644 --- a/src/lib/net/net.go +++ b/src/lib/net/net.go @@ -143,10 +143,15 @@ func boolint(b bool) int { func socket(net, laddr, raddr string, f, p, t int64, la, ra *syscall.Sockaddr) (fd *netFD, err *os.Error) { + // See ../syscall/exec.go for description of ForkLock. + syscall.ForkLock.RLock(); s, e := syscall.Socket(f, p, t); if e != 0 { + syscall.ForkLock.RUnlock(); return nil, os.ErrnoToError(e) } + syscall.CloseOnExec(s); + syscall.ForkLock.RUnlock(); // Allow reuse of recently-used addresses. syscall.Setsockopt_int(s, syscall.SOL_SOCKET, syscall.SO_REUSEADDR, 1); |