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

RDoc states that Process::Status.wait returns nil if cannot wait

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2020-12-11 19:54:14 +09:00
parent 1728eba48a
commit ed343c76fb
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
2 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
process.c
View File

@ -572,7 +572,6 @@ static VALUE rb_cProcessStatus;
struct rb_process_status { struct rb_process_status {
rb_pid_t pid; rb_pid_t pid;
int status; int status;
int error;
}; };
static const rb_data_type_t rb_process_status_type = { static const rb_data_type_t rb_process_status_type = {
@ -620,29 +619,22 @@ proc_s_last_status(VALUE mod)
} }
VALUE VALUE
rb_process_status_new(rb_pid_t pid, int status, int error) rb_process_status_new(rb_pid_t pid, int status)
{ {
VALUE last_status = rb_process_status_allocate(rb_cProcessStatus); VALUE last_status = rb_process_status_allocate(rb_cProcessStatus);
struct rb_process_status *data = RTYPEDDATA_DATA(last_status); struct rb_process_status *data = RTYPEDDATA_DATA(last_status);
data->pid = pid; data->pid = pid;
data->status = status; data->status = status;
data->error = error;
rb_obj_freeze(last_status); rb_obj_freeze(last_status);
return last_status; return last_status;
} }
static void
process_status_set(rb_pid_t pid, int status, int error)
{
GET_THREAD()->last_status = rb_process_status_new(pid, status, error);
}
void void
rb_last_status_set(int status, rb_pid_t pid) rb_last_status_set(int status, rb_pid_t pid)
{ {
process_status_set(pid, status, 0); GET_THREAD()->last_status = rb_process_status_new(pid, status);
} }
void void
@ -1334,14 +1326,16 @@ rb_process_status_wait(rb_pid_t pid, int flags)
waitpid_no_SIGCHLD(w); waitpid_no_SIGCHLD(w);
} }
if (w->ret > 0) { VALUE status = Qnil;
if (ruby_nocldwait) { if (w->ret == -1) {
w->ret = -1; errno = w->errnum;
w->errnum = ECHILD;
} }
else if (w->ret > 0 && ruby_nocldwait) {
errno = ECHILD;
}
else {
status = rb_process_status_new(w->ret, w->status);
} }
VALUE status = rb_process_status_new(w->ret, w->status, w->errnum);
COROUTINE_STACK_FREE(w); COROUTINE_STACK_FREE(w);
@ -1415,19 +1409,16 @@ rb_pid_t
rb_waitpid(rb_pid_t pid, int *st, int flags) rb_waitpid(rb_pid_t pid, int *st, int flags)
{ {
VALUE status = rb_process_status_wait(pid, flags); VALUE status = rb_process_status_wait(pid, flags);
if (NIL_P(status)) return -1;
struct rb_process_status *data = RTYPEDDATA_DATA(status); struct rb_process_status *data = RTYPEDDATA_DATA(status);
pid = data->pid;
if (st) *st = data->status; if (st) *st = data->status;
if (data->pid == -1) {
errno = data->error;
}
else {
GET_THREAD()->last_status = status; GET_THREAD()->last_status = status;
}
RB_GC_GUARD(status); return pid;
return data->pid;
} }
static VALUE static VALUE

4
test/ruby/test_process.rb
View File

@ -1459,6 +1459,10 @@ class TestProcess < Test::Unit::TestCase
end end
end end
def test_status_fail
assert_nil(Process::Status.wait($$))
end
def test_wait_without_arg def test_wait_without_arg
with_tmpchdir do with_tmpchdir do
write_file("foo", "sleep 0.1") write_file("foo", "sleep 0.1")