diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2015-11-26 00:24:21 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2015-11-26 00:24:21 +0000 |
| commit | ae026741df1a3f1dfe86ffde544010027a4c08b1 (patch) | |
| tree | c853bd52fd73b08be9644ba4fccfd3de7381eaca | |
| parent | 1a5d8ff69ceb839da0920199b0d5b8915e48cd43 (diff) | |
| download | gcc-ae026741df1a3f1dfe86ffde544010027a4c08b1.zip gcc-ae026741df1a3f1dfe86ffde544010027a4c08b1.tar.gz gcc-ae026741df1a3f1dfe86ffde544010027a4c08b1.tar.bz2 | |
re PR go/61303 (gccgo: segfault, regression since 4.8.2)
PR go/61303
runtime: don't overallocate in select code
If we've already allocated an fd_set, don't allocate another one.
Also, don't bother to read from rdwake if it wasn't returned in select.
Fixes https://gcc.gnu.org/PR61303.
Reviewed-on: https://go-review.googlesource.com/17243
From-SVN: r230922
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/runtime/netpoll_select.c | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 9fe9d5e..80136ab 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -0d979f0b860cfd879754150e0ae5e1018b94d7c4 +81eb6a3f425b2158c67ee32c0cc973a72ce9d6be The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/runtime/netpoll_select.c b/libgo/runtime/netpoll_select.c index b461335..033661d 100644 --- a/libgo/runtime/netpoll_select.c +++ b/libgo/runtime/netpoll_select.c @@ -135,6 +135,8 @@ runtime_netpoll(bool block) byte b; struct stat st; + allocatedfds = false; + retry: runtime_lock(&selectlock); @@ -146,11 +148,13 @@ runtime_netpoll(bool block) } if(inuse) { - prfds = runtime_SysAlloc(4 * sizeof fds, &mstats.other_sys); - pwfds = prfds + 1; - pefds = pwfds + 1; - ptfds = pefds + 1; - allocatedfds = true; + if(!allocatedfds) { + prfds = runtime_SysAlloc(4 * sizeof fds, &mstats.other_sys); + pwfds = prfds + 1; + pefds = pwfds + 1; + ptfds = pefds + 1; + allocatedfds = true; + } } else { prfds = &grfds; pwfds = &gwfds; @@ -216,7 +220,7 @@ runtime_netpoll(bool block) mode = 'r' + 'w'; --c; } - if(i == rdwake) { + if(i == rdwake && mode != 0) { while(read(rdwake, &b, sizeof b) > 0) ; continue; |