Patchwork libgo patch committed: Ignore EINTR in runtime_lock_full

login
register
mail settings
Submitter Ian Taylor
Date March 9, 2011, 6:31 a.m.
Message ID <mcrpqq0pzxt.fsf@google.com>
Download mbox | patch
Permalink /patch/86062/
State New
Headers show

Comments

Ian Taylor - March 9, 2011, 6:31 a.m.
This patch to libgo ignores EINTR when calling sem_wait in
runtime_lock_full.  This is based on a patch from Rainer in PR 48019.
Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu.
Committed to mainline.

Ian

Patch

diff -r bdcef618b22e libgo/runtime/thread.c
--- a/libgo/runtime/thread.c	Tue Mar 08 21:56:24 2011 -0800
+++ b/libgo/runtime/thread.c	Tue Mar 08 22:29:23 2011 -0800
@@ -2,6 +2,7 @@ 
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include <errno.h>
 #include "runtime.h"
 #include "go-assert.h"
 
@@ -32,8 +33,12 @@ 
 static void
 runtime_lock_full(Lock *l)
 {
-	if(sem_wait(&l->sem) != 0)
-		runtime_throw("sem_wait failed");
+	for(;;){
+		if(sem_wait(&l->sem) == 0)
+			return;
+		if(errno != EINTR)
+			runtime_throw("sem_wait failed");
+	}
 }
 
 void