1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "thread_pthread.c: fix memory leak from fork loop leapfrog"

Browse Source 
Oops, CI failures...

This reverts r66288 / commit 2b1dcc1dd1eb260fd20ff1e6e0dfb0e5624a3cc6.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66289 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2018-12-08 20:36:32 +00:00
parent 2b1dcc1dd1
commit 1a17766e6a
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
thread_pthread.c
View File

@ -1726,12 +1726,16 @@ rb_thread_create_timer_thread(void)
if (setup_communication_pipe_internal(signal_self_pipe.normal) < 0) return; if (setup_communication_pipe_internal(signal_self_pipe.normal) < 0) return;
if (setup_communication_pipe_internal(signal_self_pipe.ub_main) < 0) return; if (setup_communication_pipe_internal(signal_self_pipe.ub_main) < 0) return;
ubf_timer_create(current);
if (owner != current) { if (owner != current) {
/* validate pipe on this process */ /* validate pipe on this process */
ubf_timer_create(current);
sigwait_th = THREAD_INVALID; sigwait_th = THREAD_INVALID;
signal_self_pipe.owner_process = current; signal_self_pipe.owner_process = current;
} }
else if (UBF_TIMER == UBF_TIMER_PTHREAD) {
/* UBF_TIMER_PTHREAD needs to recreate after fork */
ubf_timer_pthread_create(current);
}
} }
static void static void
@ -1759,13 +1763,7 @@ ubf_timer_disarm(void)
static void static void
ubf_timer_destroy(void) ubf_timer_destroy(void)
{ {
#if UBF_TIMER == UBF_TIMER_POSIX #if UBF_TIMER == UBF_TIMER_PTHREAD
if (timer_posix.owner == getpid()) {
if (timer_delete(timer_posix.timerid) < 0)
rb_sys_fail("timer_delete");
memset(&timer_posix, 0, sizeof(timer_posix));
}
#elif UBF_TIMER == UBF_TIMER_PTHREAD
int err; int err;
timer_pthread.owner = 0; timer_pthread.owner = 0;
@ -1776,6 +1774,7 @@ ubf_timer_destroy(void)
rb_raise(rb_eThreadError, "native_thread_join() failed (%d)", err); rb_raise(rb_eThreadError, "native_thread_join() failed (%d)", err);
} }
#endif #endif
/* no need to destroy real POSIX timers */
} }
static int static int