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

process.c: attempt to reap spawnvp (win32) result from mjit

Browse Source 
Basically in win32, mjit.c seems to work directly on spawnvp
result while normal Ruby code wraps process handles to look
like *nix PIDs.  I'm only guessing, here...

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63797 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2018-06-30 06:11:33 +00:00
parent e4600b87b5
commit 9eb6861502
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
process.c
View File

@ -923,15 +923,27 @@ waitpid_notify(struct waitpid_state *w, rb_pid_t ret)
rb_native_cond_signal(w->cond); rb_native_cond_signal(w->cond);
} }
/* called by both timer thread and main thread */ #ifdef _WIN32 /* for spawnvp result from mjit.c */
# define waitpid_sys(pid,status,options) \
(WaitForSingleObject((HANDLE)(pid), 0),\
GetExitCodeProcess((HANDLE)(pid), (LPDWORD)(status)))
#else
# define waitpid_sys(pid,status,options) do_waitpid((pid),(status),(options))
#endif
/* called by timer thread */
static void static void
waitpid_each(struct list_head *head) waitpid_each(struct list_head *head)
{ {
struct waitpid_state *w = 0, *next; struct waitpid_state *w = 0, *next;
list_for_each_safe(head, w, next, wnode) { list_for_each_safe(head, w, next, wnode) {
rb_pid_t ret = do_waitpid(w->pid, &w->status, w->options | WNOHANG); rb_pid_t ret;
if (w->ec)
ret = do_waitpid(w->pid, &w->status, w->options | WNOHANG);
else
ret = waitpid_sys(w->pid, &w->status, w->options | WNOHANG);
if (!ret) continue; if (!ret) continue;
if (ret == -1) w->errnum = errno; if (ret == -1) w->errnum = errno;