drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fhandler_process.cc(format_process_stat): fix /proc/pid/stat issues 

fix tty_nr maj/min bits, vmmaxrss units, and x86 format mismatch:
ctty maj is 31:16, min is 15:0; tty_nr s/b maj 15:8, min 31:20, 7:0;
vmmaxrss s/b bytes not pages;
times all 64 bit - change formats of first two instances from %lu to %U;
realign sprintf formats and variables/values in more logical groups
This commit is contained in:
Brian Inglis 2022-05-10 08:44:42 -06:00 committed by Corinna Vinschen
parent 92b576dcc1
commit 437d0a8f88
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
winsup/cygwin/fhandler_process.cc
View File

@ -1092,6 +1092,11 @@ format_process_stat (void *data, char *&destbuf)
vmsize = 0UL, vmrss = 0UL, vmmaxrss = 0UL;
uint64_t utime = 0ULL, stime = 0ULL, start_time = 0ULL;
int nice = 0;
/* ctty maj is 31:16, min is 15:0; tty_nr s/b maj 15:8, min 31:20, 7:0;
maj is 31:16 >> 16 & fff << 8; min is 15:0 >> 8 & ff << 20 | & ff */
int tty_nr = (((p->ctty >> 8) & 0xff) << 20)
| (((p->ctty >> 16) & 0xfff) << 8)
| (p->ctty & 0xff);
if (p->process_state & PID_EXITED)
strcpy (cmd, "<defunct>");
@ -1171,23 +1176,25 @@ format_process_stat (void *data, char *&destbuf)
else
start_time = (p->start_time - to_time_t (&stodi.BootTime)) * CLOCKS_PER_SEC;
unsigned page_size = wincap.page_size ();
vmsize = vmc.PagefileUsage;
vmrss = vmc.WorkingSetSize / page_size;
vmmaxrss = ql.MaximumWorkingSetSize / page_size;
vmsize = vmc.PagefileUsage; /* bytes */
vmrss = vmc.WorkingSetSize / page_size; /* pages */
vmmaxrss = ql.MaximumWorkingSetSize; /* bytes */
destbuf = (char *) crealloc_abort (destbuf, strlen (cmd) + 320);
return __small_sprintf (destbuf, "%d (%s) %c "
"%d %d %d %d %d "
"%u %lu %lu %u %u %lu %lu "
"%U %U %d %d %d %d "
"%U %lu "
"%ld %lu\n",
"%d %d %d %d "
"%d %u %lu %lu %u %u "
"%U %U %U %U "
"%d %d %d %d "
"%U "
"%lu %ld %lu\n",
p->pid, cmd, state,
p->ppid, p->pgid, p->sid, p->ctty, -1,
0, fault_count, fault_count, 0, 0, utime, stime,
utime, stime, NZERO + nice, nice, 0, 0,
start_time, vmsize,
vmrss, vmmaxrss
p->ppid, p->pgid, p->sid, tty_nr,
-1, 0, fault_count, fault_count, 0, 0,
utime, stime, utime, stime,
NZERO + nice, nice, 0, 0,
start_time,
vmsize, vmrss, vmmaxrss
);
}