emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ps: with -l, show STIME too

Browse Source 
Signed-off-by: Flemming Madsen <busybox@themadsens.dk>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Flemming Madsen 2011-09-27 15:31:25 +02:00 committed by Denys Vlasenko
parent 8d9ac30572
commit b64bd16459
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
procps/ps.c
View File

@ -676,21 +676,23 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
| PSSCAN_VSZ | PSSCAN_RSS; | PSSCAN_VSZ | PSSCAN_RSS;
/* http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ps.html /* http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ps.html
* mandates for -l: * mandates for -l:
* -F Flags associated with the process (?) * -F Flags (?)
* S The state of the process * S State
* UID,PID,PPID * UID,PID,PPID
* -C Processor utilization for scheduling * -C CPU usage
* -PRI The priority of the process; higher numbers mean lower priority * -PRI The priority of the process; higher numbers mean lower priority
* -NI Nice value; used in priority computation * -NI Nice value
* -ADDR The address of the process * -ADDR The address of the process (?)
* SZ The size in blocks of the core image of the process * SZ The size in blocks of the core image
* -WCHAN The event for which the process is waiting or sleeping * -WCHAN The event for which the process is waiting or sleeping
* TTY * TTY
* TIME The cumulative execution time for the process * TIME The cumulative execution time
* CMD * CMD
* We don't show fileds marked with '-'. We show VSZ and RSS instead of SZ * We don't show fields marked with '-'.
* We show VSZ and RSS instead of SZ.
* We also show STIME (standard says that -f shows it, -l doesn't).
*/ */
puts("S UID PID PPID VSZ RSS TTY TIME CMD"); puts("S UID PID PPID VSZ RSS TTY STIME TIME CMD");
now = time(NULL); now = time(NULL);
sysinfo(&info); sysinfo(&info);
} }
@ -719,7 +721,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
buf6[5] = '\0'; buf6[5] = '\0';
#if ENABLE_FEATURE_PS_LONG #if ENABLE_FEATURE_PS_LONG
if (opts & OPT_l) { if (opts & OPT_l) {
char bufr[6], strt[6]; char bufr[6], stime_str[6];
char tty[2 * sizeof(int)*3 + 2]; char tty[2 * sizeof(int)*3 + 2];
char *endp; char *endp;
unsigned sut = (p->stime + p->utime) / 100; unsigned sut = (p->stime + p->utime) / 100;
@ -731,7 +733,10 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
bufr[5] = '\0'; bufr[5] = '\0';
if (p->tty_major == 136) if (p->tty_major == 136)
endp = stpcpy(tty, "pts/"); /* It should be pts/N, not ptsN, but N > 9
* will overflow field width...
*/
endp = stpcpy(tty, "pts");
else else
if (p->tty_major == 4) { if (p->tty_major == 4) {
endp = stpcpy(tty, "tty"); endp = stpcpy(tty, "tty");
@ -744,12 +749,12 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
endp = tty + sprintf(tty, "%d:", p->tty_major); endp = tty + sprintf(tty, "%d:", p->tty_major);
strcpy(endp, utoa(p->tty_minor)); strcpy(endp, utoa(p->tty_minor));
strftime(strt, 6, (elapsed >= (24 * 60 * 60)) ? "%b%d" : "%H:%M", tm); strftime(stime_str, 6, (elapsed >= (24 * 60 * 60)) ? "%b%d" : "%H:%M", tm);
strt[5] = '\0'; stime_str[5] = '\0';
// S UID PID PPID VSZ RSS TTY TIME CMD // S UID PID PPID VSZ RSS TTY STIME TIME CMD
len = printf("%c %5u %5u %5u %5s %5s %-5s %02u:%02u:%02u ", len = printf("%c %5u %5u %5u %5s %5s %-5s %s %02u:%02u:%02u ",
p->state[0], p->uid, p->pid, p->ppid, buf6, bufr, tty, p->state[0], p->uid, p->pid, p->ppid, buf6, bufr, tty,
sut / 3600, (sut % 3600) / 60, sut % 60); stime_str, sut / 3600, (sut % 3600) / 60, sut % 60);
} else } else
#endif #endif
{ {