JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* signal.cc (_pinfo::kill): Return success on kill(0) only if pid exists or is

Browse Source 
in PID_EXITED state.  Report pid 0 when pid does not exist rather than pid -1.
Make debug output reflect actual function call.
* sigproc.cc (stopped_or_terminated): Set process state to reaped when we've
finished waiting for it.
* include/sys/cygwin.h (PID_REAPED): New enum.
This commit is contained in:
Christopher Faylor
2011-05-05 00:31:22 +00:00
parent 942945956c
commit 5069a2b0d9
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,12 @@
2011-05-04 Christopher Faylor <me.cygwin2011@cgf.cx>
* signal.cc (_pinfo::kill): Return success on kill(0) only if pid
exists or is in PID_EXITED state. Report pid 0 when pid does not exist
rather than pid -1. Make debug output reflect actual function call.
* sigproc.cc (stopped_or_terminated): Set process state to reaped when
we've finished waiting for it.
* include/sys/cygwin.h (PID_REAPED): New enum.
2011-05-04 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> 2011-05-04 Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
* cygwin.din (psiginfo): Export. * cygwin.din (psiginfo): Export.

3
winsup/cygwin/include/sys/cygwin.h
View File

@@ -168,7 +168,8 @@ enum
PID_ALLPIDS = 0x02000, /* used by pinfo scanner */ PID_ALLPIDS = 0x02000, /* used by pinfo scanner */
PID_EXECED = 0x04000, /* redirect to original pid info block */ PID_EXECED = 0x04000, /* redirect to original pid info block */
PID_NOREDIR = 0x08000, /* don't redirect if execed */ PID_NOREDIR = 0x08000, /* don't redirect if execed */
PID_EXITED = 0x80000000 /* Free entry. */ PID_EXITED = 0x40000000, /* Free entry. */
PID_REAPED = 0x80000000 /* Reaped */
}; };
#ifdef WINVER #ifdef WINVER

8
winsup/cygwin/signal.cc
View File

@@ -250,7 +250,7 @@ _pinfo::kill (siginfo_t& si)
} }
this_pid = pid; this_pid = pid;
} }
else if (si.si_signo == 0 && this) else if (si.si_signo == 0 && this && process_state == PID_EXITED)
{ {
this_process_state = process_state; this_process_state = process_state;
this_pid = pid; this_pid = pid;
@@ -260,12 +260,12 @@ _pinfo::kill (siginfo_t& si)
{ {
set_errno (ESRCH); set_errno (ESRCH);
this_process_state = 0; this_process_state = 0;
this_pid = -1; this_pid = 0;
res = -1; res = -1;
} }
syscall_printf ("%d = _pinfo::kill (%d, %d), process_state %p", res, this_pid, syscall_printf ("%d = _pinfo::kill (%d), pid %d, process_state %p", res,
si.si_signo, this_process_state); si.si_signo, this_pid, this_process_state);
return res; return res;
} }

1
winsup/cygwin/sigproc.cc
View File

@@ -1041,6 +1041,7 @@ stopped_or_terminated (waitq *parent_w, _pinfo *child)
} }
else else
{ {
child->process_state = PID_REAPED;
w->status = (__uint16_t) child->exitcode; w->status = (__uint16_t) child->exitcode;
add_rusage (&myself->rusage_children, &child->rusage_children); add_rusage (&myself->rusage_children, &child->rusage_children);