parent
dcf25f5973
commit
753e7b85bd
|
@ -350,7 +350,7 @@ func (fd *netFD) Read(p []byte) (n int, err os.Error) {
|
||||||
for {
|
for {
|
||||||
var errno int
|
var errno int
|
||||||
n, errno = syscall.Read(fd.sysfile.Fd(), p)
|
n, errno = syscall.Read(fd.sysfile.Fd(), p)
|
||||||
if errno == syscall.EAGAIN && fd.rdeadline >= 0 {
|
if (errno == syscall.EAGAIN || errno == syscall.EINTR) && fd.rdeadline >= 0 {
|
||||||
pollserver.WaitRead(fd)
|
pollserver.WaitRead(fd)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
@ -385,7 +385,7 @@ func (fd *netFD) ReadFrom(p []byte) (n int, sa syscall.Sockaddr, err os.Error) {
|
||||||
for {
|
for {
|
||||||
var errno int
|
var errno int
|
||||||
n, sa, errno = syscall.Recvfrom(fd.sysfd, p, 0)
|
n, sa, errno = syscall.Recvfrom(fd.sysfd, p, 0)
|
||||||
if errno == syscall.EAGAIN && fd.rdeadline >= 0 {
|
if (errno == syscall.EAGAIN || errno == syscall.EINTR) && fd.rdeadline >= 0 {
|
||||||
pollserver.WaitRead(fd)
|
pollserver.WaitRead(fd)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
@ -418,7 +418,7 @@ func (fd *netFD) ReadMsg(p []byte, oob []byte) (n, oobn, flags int, sa syscall.S
|
||||||
for {
|
for {
|
||||||
var errno int
|
var errno int
|
||||||
n, oobn, flags, sa, errno = syscall.Recvmsg(fd.sysfd, p, oob, 0)
|
n, oobn, flags, sa, errno = syscall.Recvmsg(fd.sysfd, p, oob, 0)
|
||||||
if errno == syscall.EAGAIN && fd.rdeadline >= 0 {
|
if (errno == syscall.EAGAIN || errno == syscall.EINTR) && fd.rdeadline >= 0 {
|
||||||
pollserver.WaitRead(fd)
|
pollserver.WaitRead(fd)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
@ -464,7 +464,7 @@ func (fd *netFD) Write(p []byte) (n int, err os.Error) {
|
||||||
if nn == len(p) {
|
if nn == len(p) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
if errno == syscall.EAGAIN && fd.wdeadline >= 0 {
|
if (errno == syscall.EAGAIN || errno == syscall.EINTR) && fd.wdeadline >= 0 {
|
||||||
pollserver.WaitWrite(fd)
|
pollserver.WaitWrite(fd)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
@ -500,7 +500,7 @@ func (fd *netFD) WriteTo(p []byte, sa syscall.Sockaddr) (n int, err os.Error) {
|
||||||
var oserr os.Error
|
var oserr os.Error
|
||||||
for {
|
for {
|
||||||
errno := syscall.Sendto(fd.sysfd, p, 0, sa)
|
errno := syscall.Sendto(fd.sysfd, p, 0, sa)
|
||||||
if errno == syscall.EAGAIN && fd.wdeadline >= 0 {
|
if (errno == syscall.EAGAIN || errno == syscall.EINTR) && fd.wdeadline >= 0 {
|
||||||
pollserver.WaitWrite(fd)
|
pollserver.WaitWrite(fd)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
@ -534,7 +534,7 @@ func (fd *netFD) WriteMsg(p []byte, oob []byte, sa syscall.Sockaddr) (n int, oob
|
||||||
for {
|
for {
|
||||||
var errno int
|
var errno int
|
||||||
errno = syscall.Sendmsg(fd.sysfd, p, oob, sa, 0)
|
errno = syscall.Sendmsg(fd.sysfd, p, oob, sa, 0)
|
||||||
if errno == syscall.EAGAIN && fd.wdeadline >= 0 {
|
if (errno == syscall.EAGAIN || errno == syscall.EINTR) && fd.wdeadline >= 0 {
|
||||||
pollserver.WaitWrite(fd)
|
pollserver.WaitWrite(fd)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
@ -572,7 +572,7 @@ func (fd *netFD) accept(toAddr func(syscall.Sockaddr) Addr) (nfd *netFD, err os.
|
||||||
return nil, os.EINVAL
|
return nil, os.EINVAL
|
||||||
}
|
}
|
||||||
s, sa, e = syscall.Accept(fd.sysfd)
|
s, sa, e = syscall.Accept(fd.sysfd)
|
||||||
if e != syscall.EAGAIN {
|
if e != syscall.EAGAIN && e != syscall.EINTR {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
syscall.ForkLock.RUnlock()
|
syscall.ForkLock.RUnlock()
|
||||||
|
|
Loading…
Reference in New Issue