Changeset 516adce in mainline for uspace

Timestamp:

2010-04-07T10:24:00Z (15 years ago)

Author:

Stanislav Kozina <stanislav.kozina@…>

Branches:

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

Children:

36b5b0f

Parents:

1ba37fa

Message:

top echoes also physical memory overview

Location:

uspace

Files:

• app/top/Makefile (modified) (1 diff)
• app/top/func.c (added)
• app/top/func.h (added)
• app/top/screen.c (modified) (3 diffs)
• app/top/top.c (modified) (2 diffs)
• app/top/top.h (modified) (1 diff)
• lib/c/Makefile (modified) (1 diff)
• lib/c/generic/cpuinfo.c (moved) (moved from uspace/lib/c/generic/cpu.c )
• lib/c/generic/meminfo.c (added)
• lib/c/include/ps.h (modified) (1 diff)

uspace/app/top/Makefile

@@ -35 +35 @@
         screen.c \
         input.c \
+        func.c \
         ps.c
 

uspace/app/top/screen.c

@@ -43 +43 @@
 #include "screen.h"
 #include "top.h"
+#include "func.h"
 
 int rows;
@@ -133 +134 @@
                 ++up_rows;
         }
+}
+
+static inline void print_meminfo(data_t *data)
+{
+        uint64_t newsize;
+        char suffix;
+        order(data->mem_info.total, &newsize, &suffix);
+        printf("Mem: %8llu %c total", newsize, suffix);
+        order(data->mem_info.used, &newsize, &suffix);
+        printf(", %8llu %c used", newsize, suffix);
+        order(data->mem_info.free, &newsize, &suffix);
+        printf(", %8llu %c free", newsize, suffix);
 }
 
@@ -182 +195 @@
         ++up_rows;
         print_cpuinfo(data);
+        print_meminfo(data);
+        puts("\n");
+        ++up_rows;
         puts("\n");
         ++up_rows;

uspace/app/top/top.c

@@ -43 +43 @@
 #include <sys/time.h>
 #include <load.h>
+#include <ps.h>
 #include "screen.h"
 #include "input.h"
@@ -84 +85 @@
         /* Read cpu infos */
         target->cpu_count = get_cpu_infos(&target->cpus);
+
+        /* Read mem info */
+        get_mem_info(&target->mem_info);
 }
 

uspace/app/top/top.h

@@ -68 +68 @@
         uspace_cpu_info_t *cpus;
         cpu_perc_t *cpu_perc;
+
+        uspace_mem_info_t mem_info;
 } data_t;
 

uspace/lib/c/Makefile

@@ -92 +92 @@
         generic/stacktrace.c \
         generic/ps.c \
-        generic/cpu.c \
+        generic/cpuinfo.c \
+        generic/meminfo.c \
         generic/load.c \
         generic/uptime.c

uspace/lib/c/include/ps.h

@@ -39 +39 @@
 #include <kernel/ps/taskinfo.h>
 #include <kernel/ps/cpuinfo.h>
+#include <kernel/ps/meminfo.h>
 
 extern int get_cpu_info(uspace_cpu_info_t *cpus);
+extern int get_mem_info(uspace_mem_info_t *meminfo);
 extern size_t get_task_ids(task_id_t *ids, size_t size);
 extern int get_task_info(task_id_t id, task_info_t *info);