aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-06-19 14:43:17 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-06-19 14:43:17 +0000
commit31789a81d5751acaaf373e8ede2932208161f869 (patch)
tree8b3fe7e25ca247fc8d4e44102cef8b23a92f0354 /libbb
parent362c6ec6941c774992abcf008459616dbce0e7af (diff)
downloadbusybox-31789a81d5751acaaf373e8ede2932208161f869.tar.gz
top,ps: 'stringify' tty only when needed. -60 bytes.
Diffstat (limited to 'libbb')
-rw-r--r--libbb/procps.c24
1 files changed, 6 insertions, 18 deletions
diff --git a/libbb/procps.c b/libbb/procps.c
index e04ff34ff..10ddabf94 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -225,30 +225,18 @@ procps_status_t* procps_scan(procps_status_t* sp, int flags)
break;
sp->vsz = vsz >> 10; /* vsize is in bytes and we want kb */
sp->rss = rss >> 10;
-
- sp->tty_str[0] = '?';
- /* sp->tty_str[1] = '\0'; - done by memset */
- if (tty) /* tty field of "0" means "no tty" */
- snprintf(sp->tty_str, sizeof(sp->tty_str), "%u,%u",
- (tty >> 8) & 0xfff, /* major */
- (tty & 0xff) | ((tty >> 12) & 0xfff00));
+ sp->tty_major = (tty >> 8) & 0xfff;
+ sp->tty_minor = (tty & 0xff) | ((tty >> 12) & 0xfff00));
#else
/* This costs ~100 bytes more but makes top faster by 20%
* If you run 10000 processes, this may be important for you */
- cp += 2;
- sp->state[0] = *cp++; cp++;
- sp->ppid = fast_strtoul_10(cp, &cp);
+ sp->state[0] = cp[2];
+ sp->ppid = fast_strtoul_10(cp + 4, &cp);
sp->pgid = fast_strtoul_10(cp, &cp);
sp->sid = fast_strtoul_10(cp, &cp);
- sp->tty_str[0] = '?';
- /* sp->tty_str[1] = '\0'; - done by memset */
tty = fast_strtoul_10(cp, &cp);
- if (tty && (flags & PSSCAN_TTY)) {
- /* tty field of "0" means "no tty" */
- snprintf(sp->tty_str, sizeof(sp->tty_str), "%u,%u",
- (tty >> 8) & 0xfff, /* major */
- (tty & 0xff) | ((tty >> 12) & 0xfff00));
- }
+ sp->tty_major = (tty >> 8) & 0xfff;
+ sp->tty_minor = (tty & 0xff) | ((tty >> 12) & 0xfff00);
cp = skip_fields(cp, 6); /* tpgid, flags, min_flt, cmin_flt, maj_flt, cmaj_flt */
sp->utime = fast_strtoul_10(cp, &cp);
sp->stime = fast_strtoul_10(cp, &cp);