kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

thread.c: clear atfork functions

Browse source 
* 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
This commit is contained in:
nobu 2016-05-09 01:46:37 +00:00
parent e6709f0a62
commit a46df859cc
4 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -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> Mon May 9 07:18:06 2016 NAKAMURA Usaku <usa@ruby-lang.org>
* include/ruby/{defines,ruby}.h: need to define function attributes * include/ruby/{defines,ruby}.h: need to define function attributes

12
thread.c
View file

@ -3917,6 +3917,7 @@ rb_thread_start_timer_thread(void)
rb_thread_create_timer_thread(); rb_thread_create_timer_thread();
} }
#if defined(HAVE_WORKING_FORK)
static int static int
clear_coverage_i(st_data_t key, st_data_t val, st_data_t dummy) 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); 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 { struct thgroup {
int enclosed; int enclosed;

4
thread_sync.c
View file

@ -14,9 +14,11 @@ typedef struct rb_mutex_struct {
int allow_trap; int allow_trap;
} rb_mutex_t; } rb_mutex_t;
#if defined(HAVE_WORKING_FORK)
static void rb_mutex_abandon_all(rb_mutex_t *mutexes); 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_keeping_mutexes(rb_thread_t *th);
static void rb_mutex_abandon_locking_mutex(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); 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; return self;
} }
#if defined(HAVE_WORKING_FORK)
static void static void
rb_mutex_abandon_keeping_mutexes(rb_thread_t *th) 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; mutex->next_mutex = 0;
} }
} }
#endif
static VALUE static VALUE
rb_mutex_sleep_forever(VALUE time) rb_mutex_sleep_forever(VALUE time)

7
thread_win32.c
View file

@ -113,13 +113,6 @@ gvl_yield(rb_vm_t *vm, rb_thread_t *th)
gvl_acquire(vm, th); gvl_acquire(vm, th);
} }
static void
gvl_atfork(rb_vm_t *vm)
{
rb_bug("gvl_atfork() is called on win32");
}
static void static void
gvl_init(rb_vm_t *vm) gvl_init(rb_vm_t *vm)
{ {