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

Rework order of operations to better handle last_status.

Browse source
This commit is contained in:
Samuel Williams 2021-09-22 00:02:14 +12:00
parent 7db021f83b
commit bf3e314852
Notes: git 2021-09-22 15:50:46 +09:00 
Merged: https://github.com/ruby/ruby/pull/4595
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
process.c
View file

@ -4203,7 +4203,7 @@ retry_fork_async_signal_safe(struct rb_process_status *status, int *ep,
_exit(127);
#endif
}
err = errno;
err = errno;
waitpid_lock = waitpid_lock_init;
if (waitpid_lock) {
if (pid > 0 && w != WAITPID_LOCK_ONLY) {
@ -4768,14 +4768,15 @@ rb_f_system(int argc, VALUE *argv, VALUE _)
VALUE execarg_obj = rb_execarg_new(argc, argv, TRUE, TRUE);
struct rb_execarg *eargp = rb_execarg_get(execarg_obj);
struct rb_process_status status;
struct rb_process_status status = {0};
eargp->status = &status;
/* may be different from waitpid_state.pid on exec failure */
rb_pid_t pid = rb_execarg_spawn(execarg_obj, 0, 0);
rb_last_status_clear();
// This function can set the thread's last status.
// May be different from waitpid_state.pid on exec failure.
rb_pid_t pid = rb_execarg_spawn(execarg_obj, 0, 0);
if (pid > 0) {
VALUE status = rb_process_status_wait(pid, 0);
struct rb_process_status *data = RTYPEDDATA_DATA(status);
@ -4813,10 +4814,6 @@ rb_f_system(int argc, VALUE *argv, VALUE _)
RB_GC_GUARD(status);
}
if (status.pid > 0) {
GET_THREAD()->last_status = rb_process_status_new(status.pid, status.status, status.error);
}
if (eargp->exception) {
VALUE command = eargp->invoke.sh.shell_script;
RB_GC_GUARD(execarg_obj);