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

* ps.cc (main): Change order of reporting slightly so that windows pids are

Browse Source 
more obvious.
* strace.cc (add_child): Just add child's pid directly.
(remove_child): No need to close the child process pid since ContinueDebugEvent
does that automatically.
(proc_child): Ditto for child thread.
This commit is contained in:
Christopher Faylor 2000-10-09 03:31:10 +00:00
parent 164a681ca5
commit aaf0dee260
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/utils/ChangeLog
View File

@ -1,3 +1,12 @@
Sun Oct 8 23:11:17 2000 Christopher Faylor <cgf@cygnus.com>
* ps.cc (main): Change order of reporting slightly so that windows pids
are more obvious.
* strace.cc (add_child): Just add child's pid directly.
(remove_child): No need to close the child process pid since
ContinueDebugEvent does that automatically.
(proc_child): Ditto for child thread.
Fri Sep 29 13:12:00 2000 Corinna Vinschen <corinna@vinschen.de> Fri Sep 29 13:12:00 2000 Corinna Vinschen <corinna@vinschen.de>
* cygcheck.cc (keyeprint): New function. * cygcheck.cc (keyeprint): New function.

2
winsup/utils/kill.cc
View File

@ -74,7 +74,7 @@ sig0:
} }
else else
{ {
if (errno == ESRCH && force && sig != 0) if (force && sig != 0)
forcekill (pid, sig, 0); forcekill (pid, sig, 0);
else else
{ {

6
winsup/utils/ps.cc
View File

@ -175,8 +175,8 @@ main (int argc, char *argv[])
const char *dfmt = "%5d%4d%10s %s\n"; const char *dfmt = "%5d%4d%10s %s\n";
const char *ftitle = " UID PID PPID TTY STIME COMMAND\n"; const char *ftitle = " UID PID PPID TTY STIME COMMAND\n";
const char *ffmt = "%8.8s%6d%6d%4d%10s %s\n"; const char *ffmt = "%8.8s%6d%6d%4d%10s %s\n";
const char *ltitle = " PID PPID PGID WINPID UID TTY STIME COMMAND\n"; const char *ltitle = " PID PPID PGID WINPID TTY UID STIME COMMAND\n";
const char *lfmt = "%c %5d %5d %5d %8u %4d %3d %8s %s\n"; const char *lfmt = "%c %5d %5d %5d %8u %3d %4d %8s %s\n";
char ch; char ch;
aflag = lflag = fflag = sflag = 0; aflag = lflag = fflag = sflag = 0;
@ -305,7 +305,7 @@ main (int argc, char *argv[])
printf (ffmt, uname, p->pid, p->ppid, p->ctty, start_time (p), pname); printf (ffmt, uname, p->pid, p->ppid, p->ctty, start_time (p), pname);
else if (lflag) else if (lflag)
printf (lfmt, status, p->pid, p->ppid, p->pgid, printf (lfmt, status, p->pid, p->ppid, p->pgid,
p->dwProcessId, p->uid, p->ctty, start_time (p), pname); p->dwProcessId, p->ctty, p->uid, start_time (p), pname);
} }
(void) cygwin_internal (CW_UNLOCK_PINFO); (void) cygwin_internal (CW_UNLOCK_PINFO);

10
winsup/utils/strace.cc
View File

@ -93,10 +93,7 @@ add_child (DWORD id, HANDLE hproc)
children.next->next = c; children.next->next = c;
lastid = children.next->id = id; lastid = children.next->id = id;
HANDLE me = GetCurrentProcess (); HANDLE me = GetCurrentProcess ();
if (!DuplicateHandle (me, hproc, me, &children.next->hproc, PROCFLAGS, lasth = children.next->hproc = hproc;
FALSE, DUPLICATE_CLOSE_SOURCE))
error (0, "couldn't duplicate %p,%p", me, hproc);
lasth = children.next->hproc;
} }
static child_list * static child_list *
@ -120,7 +117,6 @@ remove_child (DWORD id)
if (c->next->id == id) if (c->next->id == id)
{ {
child_list *c1 = c->next; child_list *c1 = c->next;
close_handle (c1->hproc, id);
c->next = c1->next; c->next = c1->next;
delete c1; delete c1;
return; return;
@ -516,15 +512,11 @@ proc_child (unsigned mask, FILE *ofile)
case CREATE_PROCESS_DEBUG_EVENT: case CREATE_PROCESS_DEBUG_EVENT:
if (ev.u.CreateProcessInfo.hFile) if (ev.u.CreateProcessInfo.hFile)
CloseHandle (ev.u.CreateProcessInfo.hFile); CloseHandle (ev.u.CreateProcessInfo.hFile);
if (ev.u.CreateProcessInfo.hThread)
CloseHandle (ev.u.CreateProcessInfo.hThread);
add_child (ev.dwProcessId, ev.u.CreateProcessInfo.hProcess); add_child (ev.dwProcessId, ev.u.CreateProcessInfo.hProcess);
processes++; processes++;
break; break;
case CREATE_THREAD_DEBUG_EVENT: case CREATE_THREAD_DEBUG_EVENT:
if (ev.u.CreateThread.hThread)
CloseHandle (ev.u.CreateThread.hThread);
break; break;
case LOAD_DLL_DEBUG_EVENT: case LOAD_DLL_DEBUG_EVENT: