archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* io.c, eval.c, process.c: remove all condition of r26371.

Browse source 
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@27983 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2010-05-23 20:00:48 +00:00
parent 02e3cc3420
commit 968bac58e6
4 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon May 24 04:58:39 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]
Fri May 21 08:33:52 2010 Yutaka Kanemoto <kanemoto@ruby-lang.org>
* common.mk (EXPORTOBJS): merged r24482 from trunk. [Bug #3326]

3
eval.c
View file

@ -12524,9 +12524,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);

8
io.c
View file

@ -3271,9 +3271,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) {
@ -3301,17 +3299,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;
@ -3332,9 +3326,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);

9
process.c
View file

@ -1331,13 +1331,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
@ -1578,9 +1575,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 */
@ -1588,9 +1583,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);