diff options
Diffstat (limited to 'procps/top.c')
-rw-r--r-- | procps/top.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/procps/top.c b/procps/top.c index ec8437442..4f37878de 100644 --- a/procps/top.c +++ b/procps/top.c | |||
@@ -28,7 +28,7 @@ | |||
28 | * Copyright (C) 1994-1996 Charles L. Blake. | 28 | * Copyright (C) 1994-1996 Charles L. Blake. |
29 | * Copyright (C) 1992-1998 Michael K. Johnson | 29 | * Copyright (C) 1992-1998 Michael K. Johnson |
30 | * | 30 | * |
31 | * Licensed under GPLv2, see file LICENSE in this tarball for details. | 31 | * Licensed under GPLv2, see file LICENSE in this source tree. |
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include "libbb.h" | 34 | #include "libbb.h" |
@@ -942,20 +942,20 @@ int top_main(int argc UNUSED_PARAM, char **argv) | |||
942 | } | 942 | } |
943 | #if ENABLE_FEATURE_TOPMEM | 943 | #if ENABLE_FEATURE_TOPMEM |
944 | else { /* TOPMEM */ | 944 | else { /* TOPMEM */ |
945 | if (!(p->mapped_ro | p->mapped_rw)) | 945 | if (!(p->smaps.mapped_ro | p->smaps.mapped_rw)) |
946 | continue; /* kernel threads are ignored */ | 946 | continue; /* kernel threads are ignored */ |
947 | n = ntop; | 947 | n = ntop; |
948 | /* No bug here - top and topmem are the same */ | 948 | /* No bug here - top and topmem are the same */ |
949 | top = xrealloc_vector(topmem, 6, ntop++); | 949 | top = xrealloc_vector(topmem, 6, ntop++); |
950 | strcpy(topmem[n].comm, p->comm); | 950 | strcpy(topmem[n].comm, p->comm); |
951 | topmem[n].pid = p->pid; | 951 | topmem[n].pid = p->pid; |
952 | topmem[n].vsz = p->mapped_rw + p->mapped_ro; | 952 | topmem[n].vsz = p->smaps.mapped_rw + p->smaps.mapped_ro; |
953 | topmem[n].vszrw = p->mapped_rw; | 953 | topmem[n].vszrw = p->smaps.mapped_rw; |
954 | topmem[n].rss_sh = p->shared_clean + p->shared_dirty; | 954 | topmem[n].rss_sh = p->smaps.shared_clean + p->smaps.shared_dirty; |
955 | topmem[n].rss = p->private_clean + p->private_dirty + topmem[n].rss_sh; | 955 | topmem[n].rss = p->smaps.private_clean + p->smaps.private_dirty + topmem[n].rss_sh; |
956 | topmem[n].dirty = p->private_dirty + p->shared_dirty; | 956 | topmem[n].dirty = p->smaps.private_dirty + p->smaps.shared_dirty; |
957 | topmem[n].dirty_sh = p->shared_dirty; | 957 | topmem[n].dirty_sh = p->smaps.shared_dirty; |
958 | topmem[n].stack = p->stack; | 958 | topmem[n].stack = p->smaps.stack; |
959 | } | 959 | } |
960 | #endif | 960 | #endif |
961 | } /* end of "while we read /proc" */ | 961 | } /* end of "while we read /proc" */ |