diff options
| author | Christopher Faylor <me@cgf.cx> | 2000-10-15 07:43:48 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2000-10-15 07:43:48 +0400 |
| commit | 5460fae73f298cd0e3a9f3881aaa70fa01ff3e2c (patch) | |
| tree | c8707ad59b60d014bf7061223594f0ddf9215b67 | |
| parent | 1dc16fc74bb91136d75b656f3a4aaefa87af9f20 (diff) | |
* ps.cc (main): Accomodate new PID_ constant.
| -rw-r--r-- | winsup/utils/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/utils/ps.cc | 4 | ||||
| -rw-r--r-- | winsup/utils/strace.cc | 9 |
3 files changed, 13 insertions, 4 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 83e45823b..c591efc95 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,7 @@ +Sat Oct 14 23:42:58 2000 Christopher Faylor <cgf@cygnus.com> + + * ps.cc (main): Accomodate new PID_ constant. + Thu Oct 12 02:19:12 2000 Christopher Faylor <cgf@cygnus.com> * strace.cc (proc_child): Handle exceptions correctly. diff --git a/winsup/utils/ps.cc b/winsup/utils/ps.cc index b9c391ffa..b1e94df9c 100644 --- a/winsup/utils/ps.cc +++ b/winsup/utils/ps.cc @@ -246,8 +246,6 @@ main (int argc, char *argv[]) (p = (external_pinfo *) cygwin_internal (query, pid | CW_NEXTPID)); pid = p->pid) { - if (p->process_state == PID_NOT_IN_USE) - continue; if (!aflag && p->uid != uid) continue; char status = ' '; @@ -259,7 +257,7 @@ main (int argc, char *argv[]) status = 'O'; char pname[MAX_PATH]; - if (p->process_state & PID_ZOMBIE) + if (p->process_state & (PID_ZOMBIE | PID_EXITED)) strcpy (pname, "<defunct>"); else if (p->ppid) { diff --git a/winsup/utils/strace.cc b/winsup/utils/strace.cc index 6f901e1a8..28067214b 100644 --- a/winsup/utils/strace.cc +++ b/winsup/utils/strace.cc @@ -536,7 +536,14 @@ proc_child (unsigned mask, FILE *ofile) break; case EXCEPTION_DEBUG_EVENT: if (ev.u.Exception.ExceptionRecord.ExceptionCode != STATUS_BREAKPOINT) - status = DBG_EXCEPTION_NOT_HANDLED; + { + status = DBG_EXCEPTION_NOT_HANDLED; +#if 0 + fprintf (stderr, "exception %p at %p\n", + ev.u.Exception.ExceptionRecord.ExceptionCode, + ev.u.Exception.ExceptionRecord.ExceptionAddress); +#endif + } break; } if (!ContinueDebugEvent (ev.dwProcessId, ev.dwThreadId, status)) |