Changeset 97c7682 in mainline for uspace/app/top/top.h

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

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

uspace/app/top/top.h

@@ -51 +51 @@
 
 typedef enum {
-        OP_TASKS,
-        OP_IPC,
-        OP_EXCS,
-        OP_HELP
-} op_mode_t;
+        SCREEN_TABLE,
+        SCREEN_SORT,
+        SCREEN_HELP,
+} screen_mode_t;
 
-typedef enum {
-        SORT_TASK_CYCLES
-} sort_mode_t;
-
-extern op_mode_t op_mode;
-extern sort_mode_t sort_mode;
-extern bool excs_all;
+extern screen_mode_t screen_mode;
 
 typedef struct {
@@ -87 +80 @@
 } perc_exc_t;
 
+typedef enum {
+        FIELD_EMPTY, FIELD_UINT, FIELD_UINT_SUFFIX_BIN, FIELD_UINT_SUFFIX_DEC,
+        FIELD_PERCENT, FIELD_STRING
+} field_type_t;
+
+typedef struct {
+        field_type_t type;
+        union {
+                fixed_float fixed;
+                uint64_t uint;
+                const char *string;
+        };
+} field_t;
+
+typedef struct {
+        const char *name;
+        char key;
+        int width;
+} column_t;
+
+typedef struct {
+        const char *name;
+        size_t num_columns;
+        const column_t *columns;
+        size_t num_fields;
+        field_t *fields;
+} table_t;
+
 typedef struct {
         time_t hours;
@@ -107 +128 @@
         stats_task_t *tasks;
         perc_task_t *tasks_perc;
-        size_t *tasks_map;
         
         size_t threads_count;
@@ -122 +142 @@
         uint64_t *ecycles_diff;
         uint64_t *ecount_diff;
+
+        table_t table;
 } data_t;