libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cygwin: /proc/[PID]/stat to pull process priority correctly 

Fix to prior commit 5fa9a0e7 to address https://cygwin.com/ml/cygwin/2019-08/msg00082.html
This commit is contained in:
Anton Lavrentiev via cygwin-patches 2019-11-30 22:58:14 -05:00 committed by Corinna Vinschen
parent c63c29e76e
commit 8574f8a1e4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/fhandler_process.cc
View File

@ -1076,6 +1076,7 @@ format_process_stat (void *data, char *&destbuf)
unsigned long fault_count = 0UL, unsigned long fault_count = 0UL,
vmsize = 0UL, vmrss = 0UL, vmmaxrss = 0UL; vmsize = 0UL, vmrss = 0UL, vmmaxrss = 0UL;
uint64_t utime = 0ULL, stime = 0ULL, start_time = 0ULL; uint64_t utime = 0ULL, stime = 0ULL, start_time = 0ULL;
int nice = 0;
if (p->process_state & PID_EXITED) if (p->process_state & PID_EXITED)
strcpy (cmd, "<defunct>"); strcpy (cmd, "<defunct>");
@ -1138,6 +1139,7 @@ format_process_stat (void *data, char *&destbuf)
if (!NT_SUCCESS (status)) if (!NT_SUCCESS (status))
debug_printf ("NtQueryInformationProcess(ProcessQuotaLimits): " debug_printf ("NtQueryInformationProcess(ProcessQuotaLimits): "
"status %y", status); "status %y", status);
nice = winprio_to_nice (GetPriorityClass (hProcess));
CloseHandle (hProcess); CloseHandle (hProcess);
} }
status = NtQuerySystemInformation (SystemTimeOfDayInformation, status = NtQuerySystemInformation (SystemTimeOfDayInformation,
@ -1157,7 +1159,6 @@ format_process_stat (void *data, char *&destbuf)
vmsize = vmc.PagefileUsage; vmsize = vmc.PagefileUsage;
vmrss = vmc.WorkingSetSize / page_size; vmrss = vmc.WorkingSetSize / page_size;
vmmaxrss = ql.MaximumWorkingSetSize / page_size; vmmaxrss = ql.MaximumWorkingSetSize / page_size;
int nice = winprio_to_nice(GetPriorityClass(hProcess));
destbuf = (char *) crealloc_abort (destbuf, strlen (cmd) + 320); destbuf = (char *) crealloc_abort (destbuf, strlen (cmd) + 320);
return __small_sprintf (destbuf, "%d (%s) %c " return __small_sprintf (destbuf, "%d (%s) %c "
@ -1169,7 +1170,7 @@ format_process_stat (void *data, char *&destbuf)
p->pid, cmd, state, p->pid, cmd, state,
p->ppid, p->pgid, p->sid, p->ctty, -1, p->ppid, p->pgid, p->sid, p->ctty, -1,
0, fault_count, fault_count, 0, 0, utime, stime, 0, fault_count, fault_count, 0, 0, utime, stime,
utime, stime, NZERO + nice, nice, 0, 0, utime, stime, NZERO + nice, nice, 0, 0,
start_time, vmsize, start_time, vmsize,
vmrss, vmmaxrss vmrss, vmmaxrss
); );