Changeset dec16a2 in mainline for uspace/app/top/top.h

Timestamp:

2010-04-18T16:52:47Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5c45ca8

Parents:

e535eeb

Message:

• sysinfo items "system.tasks" and "system.threads" now return complete statistics of all tasks and threads (statistics of individual tasks and threads can be still acquited from "system.tasks.#" and "system.threads.#")
• update user space functions accordingly
• cleanup top — it is fully functional again

File:

• uspace/app/top/top.h (modified) (4 diffs)

uspace/app/top/top.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2008 Stanislav Kozina
+ * Copyright (c) 2010 Stanislav Kozina
+ * Copyright (c) 2010 Martin Decky
  * All rights reserved.
  *
@@ -35 +36 @@
 
 #include <task.h>
-#include <kernel/ps/cpuinfo.h>
-#include <kernel/ps/taskinfo.h>
+#include <stats.h>
+#include <time.h>
 
 #define FRACTION_TO_FLOAT(float, a, b) { \
@@ -43 +44 @@
 }
 
-#define OP_TASKS 1
-#define OP_IPC 2
+#define OP_TASKS  1
+#define OP_IPC    2
+
 extern int operation_type;
 
@@ -50 +52 @@
         uint64_t upper;
         uint64_t lower;
-} ps_float;
+} fixed_float;
 
 typedef struct {
-        ps_float idle;
-        ps_float busy;
-} cpu_perc_t;
+        fixed_float idle;
+        fixed_float busy;
+} perc_cpu_t;
 
 typedef struct {
-        ps_float ucycles;
-        ps_float kcycles;
-        ps_float mem;
-} task_perc_t;
+        fixed_float ucycles;
+        fixed_float kcycles;
+        fixed_float virtmem;
+} perc_task_t;
 
 typedef struct {
-        unsigned int hours;
-        unsigned int minutes;
-        unsigned int seconds;
-
-        unsigned int uptime_d;
-        unsigned int uptime_h;
-        unsigned int uptime_m;
-        unsigned int uptime_s;
-
-        unsigned long load[3];
-
-        size_t task_count;
-        task_info_t *taskinfos;
-        task_perc_t *task_perc;
-
-        size_t thread_count;
-        thread_info_t *thread_infos;
-
-        unsigned int cpu_count;
-        uspace_cpu_info_t *cpus;
-        cpu_perc_t *cpu_perc;
-
-        uspace_mem_info_t mem_info;
+        time_t hours;
+        time_t minutes;
+        time_t seconds;
+        
+        sysarg_t udays;
+        sysarg_t uhours;
+        sysarg_t uminutes;
+        sysarg_t useconds;
+        
+        size_t load_count;
+        load_t *load;
+        
+        size_t cpus_count;
+        stats_cpu_t *cpus;
+        perc_cpu_t *cpus_perc;
+        
+        size_t tasks_count;
+        stats_task_t *tasks;
+        perc_task_t *tasks_perc;
+        
+        size_t threads_count;
+        stats_thread_t *threads;
+        
+        stats_physmem_t *physmem;
 } data_t;