Commit 1fc9a17c authored by Mikio Hara's avatar Mikio Hara

runtime/cgo: darwin signal masking

Fixes #3101 (again).

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5825043
parent ace7d264
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <string.h> /* for strerror */ #include <string.h> /* for strerror */
#include <pthread.h> #include <pthread.h>
#include <signal.h>
#include "libcgo.h" #include "libcgo.h"
static void* threadentry(void*); static void* threadentry(void*);
...@@ -120,14 +121,21 @@ void ...@@ -120,14 +121,21 @@ void
libcgo_sys_thread_start(ThreadStart *ts) libcgo_sys_thread_start(ThreadStart *ts)
{ {
pthread_attr_t attr; pthread_attr_t attr;
sigset_t ign, oset;
pthread_t p; pthread_t p;
size_t size; size_t size;
int err; int err;
sigfillset(&ign);
sigprocmask(SIG_SETMASK, &ign, &oset);
pthread_attr_init(&attr); pthread_attr_init(&attr);
pthread_attr_getstacksize(&attr, &size); pthread_attr_getstacksize(&attr, &size);
ts->g->stackguard = size; ts->g->stackguard = size;
err = pthread_create(&p, &attr, threadentry, ts); err = pthread_create(&p, &attr, threadentry, ts);
sigprocmask(SIG_SETMASK, &oset, nil);
if (err != 0) { if (err != 0) {
fprintf(stderr, "runtime/cgo: pthread_create failed: %s\n", strerror(err)); fprintf(stderr, "runtime/cgo: pthread_create failed: %s\n", strerror(err));
abort(); abort();
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <string.h> /* for strerror */ #include <string.h> /* for strerror */
#include <pthread.h> #include <pthread.h>
#include <signal.h>
#include "libcgo.h" #include "libcgo.h"
static void* threadentry(void*); static void* threadentry(void*);
...@@ -90,14 +91,21 @@ void ...@@ -90,14 +91,21 @@ void
libcgo_sys_thread_start(ThreadStart *ts) libcgo_sys_thread_start(ThreadStart *ts)
{ {
pthread_attr_t attr; pthread_attr_t attr;
sigset_t ign, oset;
pthread_t p; pthread_t p;
size_t size; size_t size;
int err; int err;
sigfillset(&ign);
sigprocmask(SIG_SETMASK, &ign, &oset);
pthread_attr_init(&attr); pthread_attr_init(&attr);
pthread_attr_getstacksize(&attr, &size); pthread_attr_getstacksize(&attr, &size);
ts->g->stackguard = size; ts->g->stackguard = size;
err = pthread_create(&p, &attr, threadentry, ts); err = pthread_create(&p, &attr, threadentry, ts);
sigprocmask(SIG_SETMASK, &oset, nil);
if (err != 0) { if (err != 0) {
fprintf(stderr, "runtime/cgo: pthread_create failed: %s\n", strerror(err)); fprintf(stderr, "runtime/cgo: pthread_create failed: %s\n", strerror(err));
abort(); abort();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment