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

* win32/win32.c (waitpid): fix bug of checking child slot.

Browse Source 
* win32/win32.c (FindChildSlotByHandle): new.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20517 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2008-12-04 14:31:37 +00:00
parent bca9bf7fef
commit 8068f49727
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Dec 4 23:29:34 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (waitpid): fix bug of checking child slot.
* win32/win32.c (FindChildSlotByHandle): new.
Thu Dec 4 23:24:05 2008 Tanaka Akira <akr@fsij.org> Thu Dec 4 23:24:05 2008 Tanaka Akira <akr@fsij.org>
* lib/open3.rb (Open3.poutput3): new method. * lib/open3.rb (Open3.poutput3): new method.

14
win32/win32.c
View File

@ -533,6 +533,18 @@ FindChildSlot(rb_pid_t pid)
return NULL; return NULL;
} }
static struct ChildRecord *
FindChildSlotByHandle(HANDLE h)
{
FOREACH_CHILD(child) {
if (child->hProcess == h) {
return child;
}
} END_FOREACH_CHILD;
return NULL;
}
static void static void
CloseChildHandle(struct ChildRecord *child) CloseChildHandle(struct ChildRecord *child)
{ {
@ -3062,7 +3074,7 @@ waitpid(rb_pid_t pid, int *stat_loc, int options)
return -1; return -1;
} }
return poll_child_status(ChildRecord + ret, stat_loc); return poll_child_status(FindChildSlotByHandle(events[ret]), stat_loc);
} }
else { else {
struct ChildRecord* child = FindChildSlot(pid); struct ChildRecord* child = FindChildSlot(pid);