mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-06 02:20:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR go/61303 (gccgo: segfault, regression since 4.8.2)

Browse Source 
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
This commit is contained in:
Ian Lance Taylor 2015-11-26 00:24:21 +00:00
parent 1a5d8ff69c
commit ae026741df
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/go/gofrontend/MERGE
View File

@ -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.

16
libgo/runtime/netpoll_select.c
View File

@ -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;