diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-03-16 23:05:44 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-03-16 23:05:44 +0000 |
| commit | 5133f00ef8baab894d92de1e8b8baae59815a8b6 (patch) | |
| tree | 44176975832a3faf1626836e70c97d5edd674122 /libgo/go/net/fd.go | |
| parent | f617201f55938fc89b532f2240bdf77bea946471 (diff) | |
| download | gcc-5133f00ef8baab894d92de1e8b8baae59815a8b6.zip gcc-5133f00ef8baab894d92de1e8b8baae59815a8b6.tar.gz gcc-5133f00ef8baab894d92de1e8b8baae59815a8b6.tar.bz2 | |
Update to current version of Go library (revision 94d654be2064).
From-SVN: r171076
Diffstat (limited to 'libgo/go/net/fd.go')
| -rw-r--r-- | libgo/go/net/fd.go | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libgo/go/net/fd.go b/libgo/go/net/fd.go index 26d17d4..d48aefe 100644 --- a/libgo/go/net/fd.go +++ b/libgo/go/net/fd.go @@ -220,11 +220,16 @@ func (s *pollServer) Run() { nn, _ = s.pr.Read(scratch[0:]) } // Read from channels - for fd, ok := <-s.cr; ok; fd, ok = <-s.cr { - s.AddFD(fd, 'r') - } - for fd, ok := <-s.cw; ok; fd, ok = <-s.cw { - s.AddFD(fd, 'w') + Update: + for { + select { + case fd := <-s.cr: + s.AddFD(fd, 'r') + case fd := <-s.cw: + s.AddFD(fd, 'w') + default: + break Update + } } } else { netfd := s.LookupFD(fd, mode) |