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:38:02 +0200 |
| commit | 13f4fcd5bf09c70942b6c85a2b919ffa1ca0c6a8 (patch) | |
| tree | 717e1ceeef3a60af29e7897c7629d1502b797838 /src/pkg/net/fd_linux.go | |
| parent | 6bf52070ef1028f7fcc98fad1e73795a7efd7ce7 (diff) | |
| download | golang-13f4fcd5bf09c70942b6c85a2b919ffa1ca0c6a8.tar.gz | |
Imported Upstream version 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) { |