diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-08 09:02:21 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-08 09:02:21 +0000 |
commit | c0144a2fbb5f5b7b90c8ab29a79653ce0a4319af (patch) | |
tree | 96628ff46365edf03cb878f8f26d1a4c42faf00c | |
parent | 1ab8a925beec7cdce7669bcb7ee6fb16342b33fd (diff) |
merge revision(s) 27983:
* io.c, eval.c, process.c: remove all condition of r26371.
now, all platform use the same way. [Bug #3278][ruby-core:30167]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28222 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | eval.c | 3 | ||||
-rw-r--r-- | io.c | 8 | ||||
-rw-r--r-- | process.c | 9 | ||||
-rw-r--r-- | version.h | 2 |
5 files changed, 7 insertions, 20 deletions
@@ -1,3 +1,8 @@ +Tue Jun 8 17:49:18 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * io.c, eval.c, process.c: remove all condition of r26371. + now, all platform use the same way. [Bug #3278][ruby-core:30167] + Tue Jun 8 17:45:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/iconv/iconv.c (rb_iconv_sys_fail): fix number of arguments. @@ -12352,9 +12352,6 @@ rb_thread_start_timer() safe_mutex_lock(&time_thread.lock); if (pthread_create(&time_thread.thread, 0, thread_timer, args) == 0) { thread_init = 1; -#if !defined(__NetBSD__) && !defined(__APPLE__) && !defined(linux) - pthread_atfork(0, 0, rb_thread_stop_timer); -#endif pthread_cond_wait(&start, &time_thread.lock); } pthread_cleanup_pop(1); @@ -3251,9 +3251,7 @@ retry: } retry: -#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux) rb_thread_stop_timer(); -#endif switch ((pid = fork())) { case 0: /* child */ if (modef & FMODE_READABLE) { @@ -3281,17 +3279,13 @@ retry: ruby_sourcefile, ruby_sourceline, pname); _exit(127); } -#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux) rb_thread_start_timer(); -#endif rb_io_synchronized(RFILE(orig_stdout)->fptr); rb_io_synchronized(RFILE(orig_stderr)->fptr); return Qnil; case -1: /* fork failed */ -#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux) rb_thread_start_timer(); -#endif if (errno == EAGAIN) { rb_thread_sleep(1); goto retry; @@ -3312,9 +3306,7 @@ retry: break; default: /* parent */ -#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux) rb_thread_start_timer(); -#endif if (pid < 0) rb_sys_fail(pname); else { VALUE port = io_alloc(rb_cIO); @@ -1330,13 +1330,10 @@ rb_f_fork(obj) fflush(stderr); #endif -#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux) before_exec(); -#endif pid = fork(); -#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux) after_exec(); -#endif + switch (pid) { case 0: #ifdef linux @@ -1577,9 +1574,7 @@ rb_f_system(argc, argv) chfunc = signal(SIGCHLD, SIG_DFL); retry: -#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux) before_exec(); -#endif pid = fork(); if (pid == 0) { /* child process */ @@ -1587,9 +1582,7 @@ rb_f_system(argc, argv) rb_protect(proc_exec_args, (VALUE)&earg, NULL); _exit(127); } -#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux) after_exec(); -#endif if (pid < 0) { if (errno == EAGAIN) { rb_thread_sleep(1); @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2010-06-08" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20100608 -#define RUBY_PATCHLEVEL 286 +#define RUBY_PATCHLEVEL 287 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |