aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-09 01:46:37 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-09 01:46:37 +0000
commita46df859ccc62fd7847d112b898b3dd5b694f2f7 (patch)
treee8c70f2ce1505277bd20d132b3f3b7d2e5aa626c
parente6709f0a62215ca4e9dd0d29a546a77cda4a8cb6 (diff)
downloadruby-a46df859ccc62fd7847d112b898b3dd5b694f2f7.tar.gz
thread.c: clear atfork functions
* thread.c (rb_thread_atfork, rb_thread_atfork_before_exec): do nothing unless working fork is available. * thread_sync.c (rb_mutex_abandon_all): define only if working fork is available. * thread_sync.c (rb_mutex_abandon_keeping_mutexes): ditto. * thread_sync.c (rb_mutex_abandon_locking_mutex): ditto. * thread_win32.c (gvl_init): never used. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54960 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog14
-rw-r--r--thread.c12
-rw-r--r--thread_sync.c4
-rw-r--r--thread_win32.c7
4 files changed, 30 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 55aad4be39..cfc3b5c6df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Mon May 9 10:46:36 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * thread.c (rb_thread_atfork, rb_thread_atfork_before_exec): do
+ nothing unless working fork is available.
+
+ * thread_sync.c (rb_mutex_abandon_all): define only if working
+ fork is available.
+
+ * thread_sync.c (rb_mutex_abandon_keeping_mutexes): ditto.
+
+ * thread_sync.c (rb_mutex_abandon_locking_mutex): ditto.
+
+ * thread_win32.c (gvl_init): never used.
+
Mon May 9 07:18:06 2016 NAKAMURA Usaku <usa@ruby-lang.org>
* include/ruby/{defines,ruby}.h: need to define function attributes
diff --git a/thread.c b/thread.c
index 536783f15d..fac0bec8d2 100644
--- a/thread.c
+++ b/thread.c
@@ -3917,6 +3917,7 @@ rb_thread_start_timer_thread(void)
rb_thread_create_timer_thread();
}
+#if defined(HAVE_WORKING_FORK)
static int
clear_coverage_i(st_data_t key, st_data_t val, st_data_t dummy)
{
@@ -3992,6 +3993,17 @@ rb_thread_atfork_before_exec(void)
{
rb_thread_atfork_internal(terminate_atfork_before_exec_i);
}
+#else
+void
+rb_thread_atfork(void)
+{
+}
+
+void
+rb_thread_atfork_before_exec(void)
+{
+}
+#endif
struct thgroup {
int enclosed;
diff --git a/thread_sync.c b/thread_sync.c
index ed0daa95d3..ed81a31d76 100644
--- a/thread_sync.c
+++ b/thread_sync.c
@@ -14,9 +14,11 @@ typedef struct rb_mutex_struct {
int allow_trap;
} rb_mutex_t;
+#if defined(HAVE_WORKING_FORK)
static void rb_mutex_abandon_all(rb_mutex_t *mutexes);
static void rb_mutex_abandon_keeping_mutexes(rb_thread_t *th);
static void rb_mutex_abandon_locking_mutex(rb_thread_t *th);
+#endif
static const char* rb_mutex_unlock_th(rb_mutex_t *mutex, rb_thread_t volatile *th);
/*
@@ -378,6 +380,7 @@ rb_mutex_unlock(VALUE self)
return self;
}
+#if defined(HAVE_WORKING_FORK)
static void
rb_mutex_abandon_keeping_mutexes(rb_thread_t *th)
{
@@ -412,6 +415,7 @@ rb_mutex_abandon_all(rb_mutex_t *mutexes)
mutex->next_mutex = 0;
}
}
+#endif
static VALUE
rb_mutex_sleep_forever(VALUE time)
diff --git a/thread_win32.c b/thread_win32.c
index d9a9bd1fd6..5d0c493276 100644
--- a/thread_win32.c
+++ b/thread_win32.c
@@ -113,13 +113,6 @@ gvl_yield(rb_vm_t *vm, rb_thread_t *th)
gvl_acquire(vm, th);
}
-
-static void
-gvl_atfork(rb_vm_t *vm)
-{
- rb_bug("gvl_atfork() is called on win32");
-}
-
static void
gvl_init(rb_vm_t *vm)
{