Changeset cf2af94 in mainline for uspace/app/top/top.c

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• uspace/app/top/top.c (modified) (3 diffs)

uspace/app/top/top.c ¶

@@ -195 +195 @@
         
         uint64_t virtmem_total = 0;
+        uint64_t resmem_total = 0;
         uint64_t ucycles_total = 0;
         uint64_t kcycles_total = 0;
@@ -223 +224 @@
                 
                 virtmem_total += new_data->tasks[i].virtmem;
+                resmem_total += new_data->tasks[i].resmem;
                 ucycles_total += new_data->ucycles_diff[i];
                 kcycles_total += new_data->kcycles_diff[i];
@@ -232 +234 @@
                 FRACTION_TO_FLOAT(new_data->tasks_perc[i].virtmem,
                     new_data->tasks[i].virtmem * 100, virtmem_total);
+                FRACTION_TO_FLOAT(new_data->tasks_perc[i].resmem,
+                    new_data->tasks[i].resmem * 100, resmem_total);
                 FRACTION_TO_FLOAT(new_data->tasks_perc[i].ucycles,
                     new_data->ucycles_diff[i] * 100, ucycles_total);