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

* process.c (before_fork_ruby): Renamed from before_fork.

Browse source 
(after_fork_ruby): Renamed from after_fork.




git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47374 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2014-09-03 10:23:24 +00:00
parent ed0f2528e8
commit 777d61faf4
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Sep 3 19:10:28 2014 Tanaka Akira <akr@fsij.org>
* process.c (before_fork_ruby): Renamed from before_fork.
(after_fork_ruby): Renamed from after_fork.
Wed Sep 3 18:56:05 2014 Tanaka Akira <akr@fsij.org> Wed Sep 3 18:56:05 2014 Tanaka Akira <akr@fsij.org>
* process.c (forked_child): Removed. * process.c (forked_child): Removed.

14
process.c
View file

@ -1163,8 +1163,8 @@ after_exec(void)
after_exec_non_async_signal_safe(); after_exec_non_async_signal_safe();
} }
#define before_fork() before_exec() #define before_fork_ruby() before_exec()
#define after_fork() (rb_threadptr_pending_interrupt_clear(GET_THREAD()), after_exec()) #define after_fork_ruby() (rb_threadptr_pending_interrupt_clear(GET_THREAD()), after_exec())
#include "dln.h" #include "dln.h"
@ -3355,11 +3355,11 @@ retry_fork_ruby(int *status)
while (1) { while (1) {
prefork(); prefork();
before_fork(); before_fork_ruby();
pid = fork(); pid = fork();
if (pid == 0) /* fork succeed, child process */ if (pid == 0) /* fork succeed, child process */
return pid; return pid;
preserving_errno(after_fork()); preserving_errno(after_fork_ruby());
if (0 < pid) /* fork succeed, parent process */ if (0 < pid) /* fork succeed, parent process */
return pid; return pid;
/* fork failed */ /* fork failed */
@ -3379,7 +3379,7 @@ rb_fork_ruby(int *status)
if (pid < 0) if (pid < 0)
return pid; return pid;
if (!pid) { if (!pid) {
after_fork(); after_fork_ruby();
} }
return pid; return pid;
} }
@ -5717,9 +5717,9 @@ rb_daemon(int nochdir, int noclose)
{ {
int err = 0; int err = 0;
#ifdef HAVE_DAEMON #ifdef HAVE_DAEMON
before_fork(); before_fork_ruby();
err = daemon(nochdir, noclose); err = daemon(nochdir, noclose);
after_fork(); after_fork_ruby();
rb_thread_atfork(); rb_thread_atfork();
#else #else
int n; int n;