diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-09-16 15:47:21 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-09-16 15:47:21 +0000 |
| commit | adb0401dac41c81571722312d4586b2693f95aa6 (patch) | |
| tree | ea2b52e3c258d6b6d9356977c683c7f72a4a5fd5 /libgo/go/net/fd_linux.go | |
| parent | 5548ca3540bccbc908a45942896d635ea5f1c23f (diff) | |
| download | gcc-adb0401dac41c81571722312d4586b2693f95aa6.zip gcc-adb0401dac41c81571722312d4586b2693f95aa6.tar.gz gcc-adb0401dac41c81571722312d4586b2693f95aa6.tar.bz2 | |
Update Go library to r60.
From-SVN: r178910
Diffstat (limited to 'libgo/go/net/fd_linux.go')
| -rw-r--r-- | libgo/go/net/fd_linux.go | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libgo/go/net/fd_linux.go b/libgo/go/net/fd_linux.go index dcf65c0..70fc344b 100644 --- a/libgo/go/net/fd_linux.go +++ b/libgo/go/net/fd_linux.go @@ -117,6 +117,17 @@ func (p *pollster) DelFD(fd int, mode int) { } else { p.StopWaiting(fd, writeFlags) } + + // Discard any queued up events. + i := 0 + for i < len(p.waitEvents) { + if fd == int(p.waitEvents[i].Fd) { + copy(p.waitEvents[i:], p.waitEvents[i+1:]) + p.waitEvents = p.waitEvents[:len(p.waitEvents)-1] + } else { + i++ + } + } } func (p *pollster) WaitFD(s *pollServer, nsec int64) (fd int, mode int, err os.Error) { |