diff options
Diffstat (limited to 'procps/ps.c')
-rw-r--r-- | procps/ps.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/procps/ps.c b/procps/ps.c index f3d11b72c..a9da807a5 100644 --- a/procps/ps.c +++ b/procps/ps.c | |||
@@ -47,10 +47,10 @@ static void func_pgid(char *buf, int size, const procps_status_t *ps) | |||
47 | snprintf(buf, size+1, "%*u", size, ps->pgid); | 47 | snprintf(buf, size+1, "%*u", size, ps->pgid); |
48 | } | 48 | } |
49 | 49 | ||
50 | static void func_rss(char *buf, int size, const procps_status_t *ps) | 50 | static void func_vsz(char *buf, int size, const procps_status_t *ps) |
51 | { | 51 | { |
52 | char buf5[5]; | 52 | char buf5[5]; |
53 | smart_ulltoa5( ((unsigned long long)ps->rss) << 10, buf5); | 53 | smart_ulltoa5( ((unsigned long long)ps->vsz) << 10, buf5); |
54 | snprintf(buf, size+1, "%.*s", size, buf5); | 54 | snprintf(buf, size+1, "%.*s", size, buf5); |
55 | } | 55 | } |
56 | 56 | ||
@@ -103,9 +103,9 @@ static const ps_out_t out_spec[] = { | |||
103 | // { "ruser" ,"RUSER" ,func_ruser ,PSSCAN_UIDGID,sizeof("RUSER" )-1 }, | 103 | // { "ruser" ,"RUSER" ,func_ruser ,PSSCAN_UIDGID,sizeof("RUSER" )-1 }, |
104 | // { "time" ,"TIME" ,func_time ,PSSCAN_ ,sizeof("TIME" )-1 }, | 104 | // { "time" ,"TIME" ,func_time ,PSSCAN_ ,sizeof("TIME" )-1 }, |
105 | // { "tty" ,"TT" ,func_tty ,PSSCAN_ ,sizeof("TT" )-1 }, | 105 | // { "tty" ,"TT" ,func_tty ,PSSCAN_ ,sizeof("TT" )-1 }, |
106 | // { "vsz" ,"VSZ" ,func_vsz ,PSSCAN_VSZ ,4 }, | 106 | { "vsz" ,"VSZ" ,func_vsz ,PSSCAN_VSZ ,4 }, |
107 | // Not mandated by POSIX: | 107 | // Not mandated by POSIX: |
108 | { "rss" ,"RSS" ,func_rss ,PSSCAN_RSS ,4 }, | 108 | // { "rss" ,"RSS" ,func_rss ,PSSCAN_RSS ,4 }, |
109 | }; | 109 | }; |
110 | 110 | ||
111 | #define VEC_SIZE(v) ( sizeof(v) / sizeof((v)[0]) ) | 111 | #define VEC_SIZE(v) ( sizeof(v) / sizeof((v)[0]) ) |
@@ -321,13 +321,13 @@ int ps_main(int argc, char **argv) | |||
321 | if (use_selinux) | 321 | if (use_selinux) |
322 | puts(" PID Context Stat Command"); | 322 | puts(" PID Context Stat Command"); |
323 | else | 323 | else |
324 | puts(" PID Uid VmSize Stat Command"); | 324 | puts(" PID Uid VSZ Stat Command"); |
325 | 325 | ||
326 | while ((p = procps_scan(p, 0 | 326 | while ((p = procps_scan(p, 0 |
327 | | PSSCAN_PID | 327 | | PSSCAN_PID |
328 | | PSSCAN_UIDGID | 328 | | PSSCAN_UIDGID |
329 | | PSSCAN_STATE | 329 | | PSSCAN_STATE |
330 | | PSSCAN_RSS | 330 | | PSSCAN_VSZ |
331 | | PSSCAN_CMD | 331 | | PSSCAN_CMD |
332 | ))) { | 332 | ))) { |
333 | char *namecmd = p->cmd; | 333 | char *namecmd = p->cmd; |
@@ -355,12 +355,12 @@ int ps_main(int argc, char **argv) | |||
355 | #endif | 355 | #endif |
356 | { | 356 | { |
357 | const char *user = get_cached_username(p->uid); | 357 | const char *user = get_cached_username(p->uid); |
358 | if (p->rss == 0) | 358 | if (p->vsz == 0) |
359 | len = printf("%5u %-8s %s ", | 359 | len = printf("%5u %-8s %s ", |
360 | p->pid, user, p->state); | 360 | p->pid, user, p->state); |
361 | else | 361 | else |
362 | len = printf("%5u %-8s %6ld %s ", | 362 | len = printf("%5u %-8s %6ld %s ", |
363 | p->pid, user, p->rss, p->state); | 363 | p->pid, user, p->vsz, p->state); |
364 | } | 364 | } |
365 | 365 | ||
366 | i = terminal_width-len; | 366 | i = terminal_width-len; |