diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-06-03 11:31:24 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-06-03 11:31:24 +0200 |
| commit | 56135c623a865c501ab31cc940c0e22ece2673f4 (patch) | |
| tree | f69e04e82bbf75bdab0f624430ef265425e62b35 /src/pkg/net/fd_linux.go | |
| parent | 63d29fefab5290dc96e0a03ff70603aefa995887 (diff) | |
| download | golang-56135c623a865c501ab31cc940c0e22ece2673f4.tar.gz | |
Imported Upstream version 2011.06.02upstream-weekly/2011.06.02
Diffstat (limited to 'src/pkg/net/fd_linux.go')
| -rw-r--r-- | src/pkg/net/fd_linux.go | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/pkg/net/fd_linux.go b/src/pkg/net/fd_linux.go index dcf65c014..70fc344b2 100644 --- a/src/pkg/net/fd_linux.go +++ b/src/pkg/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) { |