Changeset 8eec3c8 in mainline for uspace/app/top

Timestamp:

2010-06-10T14:24:50Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c0f13d2

Parents:

1113c9e

Message:

merge basic exception accounting (this is the last piece missing from the original "measure" branch by Stanislav Kozina)

Location:

uspace/app/top

Files:

• screen.c (modified) (2 diffs)
• top.c (modified) (3 diffs)
• top.h (modified) (2 diffs)

uspace/app/top/screen.c

@@ -325 +325 @@
 }
 
+static inline void print_exc_head(void)
+{
+        screen_style_inverted();
+        printf("  ID                     Desc    Count   Cycles");
+        screen_newline();
+        screen_style_normal();
+}
+
+static inline void print_exc(data_t *data)
+{
+        ipcarg_t cols;
+        ipcarg_t rows;
+        screen_get_size(&cols, &rows);
+        
+        ipcarg_t col;
+        ipcarg_t row;
+        screen_get_pos(&col, &row);
+        
+        size_t i;
+        for (i = 0; (i < data->exceptions_count) && (row < rows); i++, row++) {
+                uint64_t cycles;
+                char suffix;
+                
+                order_suffix(data->exceptions[i].cycles, &cycles, &suffix);
+                printf("%8u %20s %8" PRIu64 " %8" PRIu64 "%c",
+                     data->exceptions[i].id, data->exceptions[i].desc,
+                     data->exceptions[i].count, cycles, suffix);
+                
+                screen_newline();
+        }
+        
+        while (row < rows) {
+                screen_newline();
+                row++;
+        }
+}
+
 void print_data(data_t *data)
 {
@@ -338 +375 @@
         screen_newline();
         
-        if (operation_type == OP_IPC) {
+        switch (operation_type) {
+        case OP_TASKS:
+                print_task_head();
+                print_tasks(data);
+                break;
+        case OP_IPC:
                 print_ipc_head();
                 print_ipc(data);
-        } else {
-                print_task_head();
-                print_tasks(data);
+                break;
+        case OP_EXC:
+                print_exc_head();
+                print_exc(data);
+                break;
         }
         

uspace/app/top/top.c

@@ -115 +115 @@
                 return "Cannot get threads";
         
+        target->exceptions = stats_get_exceptions(&(target->exceptions_count));
+        if (target->exceptions == NULL)
+                return "Cannot get exceptions";
+        
         /* Get physical memory */
         target->physmem = stats_get_physmem();
@@ -231 +235 @@
         if (target->threads != NULL)
                 free(target->threads);
+        
+        if (target->exceptions != NULL)
+                free(target->exceptions);
         
         if (target->physmem != NULL)
@@ -285 +292 @@
                                 operation_type = OP_TASKS;
                                 break;
+                        case 'e':
+                                print_warning("Showing exception statistics");
+                                operation_type = OP_EXC;
+                                break;
                         default:
                                 print_warning("Unknown command: %c", c);

uspace/app/top/top.h

@@ -46 +46 @@
 #define OP_TASKS  1
 #define OP_IPC    2
+#define OP_EXC    3
 
 extern int operation_type;
@@ -89 +90 @@
         stats_thread_t *threads;
         
+        size_t exceptions_count;
+        stats_exc_t *exceptions;
+        
         stats_physmem_t *physmem;
 } data_t;