summaryrefslogtreecommitdiffstats
path: root/llgo/third_party/gofrontend/libgo/runtime/netpoll_select.c
diff options
context:
space:
mode:
authorAndrew Wilkins <axwalk@gmail.com>2016-03-15 05:36:43 +0000
committerAndrew Wilkins <axwalk@gmail.com>2016-03-15 05:36:43 +0000
commit6436a4abd7a2f3a60b230453295dba199d8a59c3 (patch)
tree125aef80fc2cf46c5d1758a8ece1fde14e7b13fd /llgo/third_party/gofrontend/libgo/runtime/netpoll_select.c
parent36761bf92427846ce40fdd849615732c852e44dd (diff)
downloadbcm5719-llvm-6436a4abd7a2f3a60b230453295dba199d8a59c3.tar.gz
bcm5719-llvm-6436a4abd7a2f3a60b230453295dba199d8a59c3.zip
[llgo] Roll gofrontend forward
Switch gofrontend to using go.googlesource.com, and update to 81eb6a3f425b2158c67ee32c0cc973a72ce9d6be. There are various changes required to update to the go 1.5 runtime: typemap.go is changed to accommodate the change in representation for equal/hash algorithms, and the removal of the zero value/type. CMakeLists.txt is updated to add the build tree to the package search path, so internal packages, which are not installed, are found. various files changes due to removal of __go_new_nopointers; the same change as in D11863, but with NoUnwindAttribute added to the added runtime functions which are called with "callOnly". minor cleanups in ssa.go while investigating issues with unwinding/panic handling. Differential Revisision: http://reviews.llvm.org/D15188 llvm-svn: 263536
Diffstat (limited to 'llgo/third_party/gofrontend/libgo/runtime/netpoll_select.c')
-rw-r--r--llgo/third_party/gofrontend/libgo/runtime/netpoll_select.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/llgo/third_party/gofrontend/libgo/runtime/netpoll_select.c b/llgo/third_party/gofrontend/libgo/runtime/netpoll_select.c
index b4613359118..033661d17f2 100644
--- a/llgo/third_party/gofrontend/libgo/runtime/netpoll_select.c
+++ b/llgo/third_party/gofrontend/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;
OpenPOWER on IntegriCloud