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

get and convert boot time once and use as needed

Browse Source
This commit is contained in:
Brian Inglis 2019-03-23 20:22:39 -06:00 committed by Corinna Vinschen
parent ee1ad64234
commit 23bb2f6608
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
winsup/utils/ps.cc
View File

@ -164,6 +164,7 @@ main (int argc, char *argv[])
const char *lfmt = "%c %7d %7d %7d %10u %4s %8u %8s %s\n"; const char *lfmt = "%c %7d %7d %7d %10u %4s %8u %8s %s\n";
char ch; char ch;
void *drive_map = NULL; void *drive_map = NULL;
time_t boot_time = -1;
aflag = lflag = fflag = sflag = 0; aflag = lflag = fflag = sflag = 0;
uid = getuid (); uid = getuid ();
@ -237,9 +238,12 @@ main (int argc, char *argv[])
if (query == CW_GETPINFO_FULL) if (query == CW_GETPINFO_FULL)
{ {
HANDLE tok;
NTSTATUS status;
SYSTEM_TIMEOFDAY_INFORMATION stodi;
/* Enable debug privilege to allow to enumerate all processes, /* Enable debug privilege to allow to enumerate all processes,
not only processes in current session. */ not only processes in current session. */
HANDLE tok;
if (OpenProcessToken (GetCurrentProcess (), if (OpenProcessToken (GetCurrentProcess (),
TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES, TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES,
&tok)) &tok))
@ -256,6 +260,15 @@ main (int argc, char *argv[])
} }
drive_map = (void *) cygwin_internal (CW_ALLOC_DRIVE_MAP); drive_map = (void *) cygwin_internal (CW_ALLOC_DRIVE_MAP);
/* Get system boot time to default process start time */
status = NtQuerySystemInformation (SystemTimeOfDayInformation,
(PVOID) &stodi, sizeof stodi, NULL);
if (!NT_SUCCESS (status))
fprintf (stderr,
"NtQuerySystemInformation(SystemTimeOfDayInformation), "
"status %#010x\n", status);
boot_time = to_time_t ((FILETIME*)&stodi.BootTime);
} }
for (int pid = 0; for (int pid = 0;
@ -337,16 +350,10 @@ main (int argc, char *argv[])
p->start_time = to_time_t (&ct); p->start_time = to_time_t (&ct);
CloseHandle (h); CloseHandle (h);
} }
/* Default to boot time when process start time inaccessible, 0, -1 */
if (!h || 0 == p->start_time || -1 == p->start_time) if (!h || 0 == p->start_time || -1 == p->start_time)
{ {
SYSTEM_TIMEOFDAY_INFORMATION stodi; p->start_time = boot_time;
status = NtQuerySystemInformation (SystemTimeOfDayInformation,
(PVOID) &stodi, sizeof stodi, NULL);
if (!NT_SUCCESS (status))
fprintf (stderr,
"NtQuerySystemInformation(SystemTimeOfDayInformation), "
"status %08x", status);
p->start_time = to_time_t ((FILETIME*)&stodi.BootTime);
} }
} }