diff mbox

libgo patch committed: Lock goroutine to thread during cgo call

Message ID CAOyqgcUn4OcyuwAQnTkqSU_RJx=KrYuqfsBEfFuV5J3iOhfrfA@mail.gmail.com
State New
Headers show

Commit Message

Ian Lance Taylor Feb. 24, 2016, 3:03 p.m. UTC 
This patch from Xia Bin fixes libgo to lock a goroutine to a thread
during a cgo call.  That is how the master library works, and it
avoids confusion if the C code calls back into the Go code.
Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu.  Committed
to mainline.

Ian
diff mbox

Patch

Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE	(revision 233515)
+++ gcc/go/gofrontend/MERGE	(working copy)
@@ -1,4 +1,4 @@ 
-1c3747d20789c73447ff71cbc739f7423c4bdf67
+156f5f0152797ac2afe5f23803aeb3c7b8f8418e
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
Index: libgo/runtime/go-cgo.c
===================================================================
--- libgo/runtime/go-cgo.c	(revision 232239)
+++ libgo/runtime/go-cgo.c	(working copy)
@@ -41,6 +41,8 @@  syscall_cgocall ()
   if (runtime_needextram && runtime_cas (&runtime_needextram, 1, 0))
     runtime_newextram ();
 
+  runtime_lockOSThread();
+
   m = runtime_m ();
   ++m->ncgocall;
   g = runtime_g ();
@@ -70,6 +72,8 @@  syscall_cgocalldone ()
      _cgo_panic will already have exited syscall mode.  */
   if (g->status == Gsyscall)
     runtime_exitsyscall ();
+
+  runtime_unlockOSThread();
 }
 
 /* Call back from C/C++ code to Go code.  */