From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 2DBC63857402; Wed, 11 May 2022 08:00:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2DBC63857402 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] fhandler_process.cc(format_process_stat): fix /proc/pid/stat issues X-Act-Checkin: newlib-cygwin X-Git-Author: Brian Inglis X-Git-Refname: refs/heads/master X-Git-Oldrev: 92b576dcc1577e2484c9ce484baa54de3bb60a55 X-Git-Newrev: 437d0a8f885036f77a6ae606bbe1ccf90fe79729 Message-Id: <20220511080021.2DBC63857402@sourceware.org> Date: Wed, 11 May 2022 08:00:21 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 May 2022 08:00:21 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D437d0a8f885= 036f77a6ae606bbe1ccf90fe79729 commit 437d0a8f885036f77a6ae606bbe1ccf90fe79729 Author: Brian Inglis Date: Tue May 10 08:44:42 2022 -0600 fhandler_process.cc(format_process_stat): fix /proc/pid/stat issues =20 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 Diff: --- winsup/cygwin/fhandler_process.cc | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/winsup/cygwin/fhandler_process.cc b/winsup/cygwin/fhandler_pro= cess.cc index 4c42bc015..718945b9a 100644 --- a/winsup/cygwin/fhandler_process.cc +++ b/winsup/cygwin/fhandler_process.cc @@ -1092,6 +1092,11 @@ format_process_stat (void *data, char *&destbuf) vmsize =3D 0UL, vmrss =3D 0UL, vmmaxrss =3D 0UL; uint64_t utime =3D 0ULL, stime =3D 0ULL, start_time =3D 0ULL; int nice =3D 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 =3D (((p->ctty >> 8) & 0xff) << 20) + | (((p->ctty >> 16) & 0xfff) << 8) + | (p->ctty & 0xff); =20 if (p->process_state & PID_EXITED) strcpy (cmd, ""); @@ -1171,23 +1176,25 @@ format_process_stat (void *data, char *&destbuf) else start_time =3D (p->start_time - to_time_t (&stodi.BootTime)) * CLOCKS_= PER_SEC; unsigned page_size =3D wincap.page_size (); - vmsize =3D vmc.PagefileUsage; - vmrss =3D vmc.WorkingSetSize / page_size; - vmmaxrss =3D ql.MaximumWorkingSetSize / page_size; + vmsize =3D vmc.PagefileUsage; /* bytes */ + vmrss =3D vmc.WorkingSetSize / page_size; /* pages */ + vmmaxrss =3D ql.MaximumWorkingSetSize; /* bytes */ =20 destbuf =3D (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 ); }