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

* pinfo.cc (winpids::add): Always copy pinfo structure when winpid. Fill out

Browse Source 
dwProcessId explicitly to handle exec from a windows process.
(winpids::enum_processes): Reorganize to iterate over known cygwin pids when
!winpid.  Simplify logic.  Don't do duplicate detection for winpid.
This commit is contained in:
Christopher Faylor
2014-02-15 04:17:27 +00:00
parent 2889130e0b
commit f235534904
2 changed files with 45 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,11 @@
2014-02-14 Christopher Faylor <me.cygwin2014@cgf.cx>
* pinfo.cc (winpids::add): Always copy pinfo structure when winpid.
Fill out dwProcessId explicitly to handle exec from a windows process.
(winpids::enum_processes): Reorganize to iterate over known cygwin pids
when !winpid. Simplify logic. Don't do duplicate detection for
winpid.
2014-02-14 Corinna Vinschen <corinna@vinschen.de> 2014-02-14 Corinna Vinschen <corinna@vinschen.de>
* uinfo.cc (pwdgrp::fetch_account_from_windows): Default to /bin/bash * uinfo.cc (pwdgrp::fetch_account_from_windows): Default to /bin/bash

97
winsup/cygwin/pinfo.cc
View File

@@ -1174,7 +1174,10 @@ winpids::add (DWORD& nelem, bool winpid, DWORD pid)
/* If we're just looking for winpids then don't do any special cygwin "stuff* */ /* If we're just looking for winpids then don't do any special cygwin "stuff* */
if (winpid) if (winpid)
goto out; {
perform_copy = true;
goto out;
}
/* !p means that we couldn't find shared memory for this pid. Probably means /* !p means that we couldn't find shared memory for this pid. Probably means
that it isn't a cygwin process. */ that it isn't a cygwin process. */
@@ -1239,6 +1242,8 @@ out:
p.release (); p.release ();
p.procinfo = pnew; p.procinfo = pnew;
p.destroy = false; p.destroy = false;
if (winpid)
p->dwProcessId = pid;
} }
} }
} }
@@ -1250,70 +1255,51 @@ DWORD
winpids::enum_processes (bool winpid) winpids::enum_processes (bool winpid)
{ {
DWORD nelem = 0; DWORD nelem = 0;
DWORD cygwin_pid_nelem = 0;
NTSTATUS status;
ULONG context;
struct fdbi
{
DIRECTORY_BASIC_INFORMATION dbi;
WCHAR buf[2][NAME_MAX + 1];
} f;
HANDLE dir = get_shared_parent_dir ();
BOOLEAN restart = TRUE;
while (NT_SUCCESS (NtQueryDirectoryObject (dir, &f, sizeof f, TRUE, restart, if (!winpid)
&context, NULL)))
{ {
restart = FALSE; HANDLE dir = get_shared_parent_dir ();
f.dbi.ObjectName.Buffer[f.dbi.ObjectName.Length / sizeof (WCHAR)] = L'\0'; BOOLEAN restart = TRUE;
if (wcsncmp (f.dbi.ObjectName.Buffer, L"cygpid.", 7) == 0) ULONG context;
struct fdbi
{ {
DWORD pid = wcstoul (f.dbi.ObjectName.Buffer + 7, NULL, 10); DIRECTORY_BASIC_INFORMATION dbi;
add (nelem, false, pid); WCHAR buf[2][NAME_MAX + 1];
} f;
while (NT_SUCCESS (NtQueryDirectoryObject (dir, &f, sizeof f, TRUE,
restart, &context, NULL)))
{
restart = FALSE;
f.dbi.ObjectName.Buffer[f.dbi.ObjectName.Length / sizeof (WCHAR)] = L'\0';
if (wcsncmp (f.dbi.ObjectName.Buffer, L"cygpid.", 7) == 0)
{
DWORD pid = wcstoul (f.dbi.ObjectName.Buffer + 7, NULL, 10);
add (nelem, false, pid);
}
} }
} }
cygwin_pid_nelem = nelem; else
if (winpid)
{ {
static DWORD szprocs; static DWORD szprocs;
static PSYSTEM_PROCESS_INFORMATION procs; static PSYSTEM_PROCESS_INFORMATION procs;
if (!szprocs) while (1)
{ {
procs = (PSYSTEM_PROCESS_INFORMATION) PSYSTEM_PROCESS_INFORMATION new_p = (PSYSTEM_PROCESS_INFORMATION)
malloc (sizeof (*procs) + (szprocs = 200 * sizeof (*procs))); realloc (procs, szprocs += 200 * sizeof (*procs));
if (!procs) if (!new_p)
{ {
system_printf ("out of memory reading system process " system_printf ("out of memory reading system process "
"information"); "information");
return 0; return 0;
} }
} procs = new_p;
NTSTATUS status = NtQuerySystemInformation (SystemProcessInformation,
for (;;) procs, szprocs, NULL);
{
status =
NtQuerySystemInformation (SystemProcessInformation,
procs, szprocs, NULL);
if (NT_SUCCESS (status)) if (NT_SUCCESS (status))
break; break;
if (status == STATUS_INFO_LENGTH_MISMATCH) if (status != STATUS_INFO_LENGTH_MISMATCH)
{
PSYSTEM_PROCESS_INFORMATION new_p;
new_p = (PSYSTEM_PROCESS_INFORMATION)
realloc (procs, szprocs += 200 * sizeof (*procs));
if (!new_p)
{
system_printf ("out of memory reading system process "
"information");
return 0;
}
procs = new_p;
}
else
{ {
system_printf ("error %y reading system process information", system_printf ("error %y reading system process information",
status); status);
@@ -1322,23 +1308,14 @@ winpids::enum_processes (bool winpid)
} }
PSYSTEM_PROCESS_INFORMATION px = procs; PSYSTEM_PROCESS_INFORMATION px = procs;
for (;;) char *&pxc = (char *&)px;
while (1)
{ {
if (px->UniqueProcessId) if (px->UniqueProcessId)
{ add (nelem, true, (DWORD) (uintptr_t) px->UniqueProcessId);
bool do_add = true;
for (unsigned i = 0; i < cygwin_pid_nelem; ++i)
if (pidlist[i] == (uintptr_t) px->UniqueProcessId)
{
do_add = false;
break;
}
if (do_add)
add (nelem, true, (DWORD) (uintptr_t) px->UniqueProcessId);
}
if (!px->NextEntryOffset) if (!px->NextEntryOffset)
break; break;
px = (PSYSTEM_PROCESS_INFORMATION) ((char *) px + px->NextEntryOffset); pxc += px->NextEntryOffset;
} }
} }
return nelem; return nelem;