Changeset 8f56d93 in mainline

Timestamp:

2010-04-02T13:35:19Z (15 years ago)

Author:

Stanislav Kozina <stanislav.kozina@…>

Branches:

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

Children:

8b2aba5

Parents:

175ad5c6

Message:

top echoes also task list

Files:

• kernel/generic/include/ps/taskinfo.h (modified) (1 diff)
• kernel/generic/src/ps/ps.c (modified) (1 diff)
• uspace/app/top/screen.c (modified) (3 diffs)
• uspace/app/top/screen.h (modified) (1 diff)

kernel/generic/include/ps/taskinfo.h

@@ -46 +46 @@
 
 typedef struct {
+        task_id_t taskid;
         char name[TASK_NAME_BUFLEN];
         size_t pages;

kernel/generic/src/ps/ps.c

@@ -130 +130 @@
         spinlock_unlock(&tasks_lock);
 
+        copy_to_uspace(&uspace_info->taskid, &t->taskid, sizeof(task_id_t));
         copy_to_uspace(uspace_info->name, t->name, sizeof(t->name));
 

uspace/app/top/screen.c

@@ -39 +39 @@
 #include <vfs/vfs.h>
 #include <load.h>
+#include <kernel/ps/taskinfo.h>
+#include <ps.h>
 #include "screen.h"
 #include "top.h"
+
+int rows;
+int colls;
+
+#define WHITE 0xf0f0f0
+#define BLACK 0x000000
 
 static void resume_normal(void)
 {
         fflush(stdout);
-        console_set_rgb_color(fphone(stdout), 0, 0xf0f0f0);
+        console_set_rgb_color(fphone(stdout), 0, WHITE);
 }
 
 void screen_init(void)
 {
+        console_get_size(fphone(stdout), &colls, &rows);
         console_cursor_visibility(fphone(stdout), 0);
         resume_normal();
@@ -94 +103 @@
 }
 
+static inline void print_tasks(data_t *data, int row)
+{
+        int i;
+        for (i = 0; i < (int)data->task_count; ++i) {
+                if (row + i > rows)
+                        return;
+                task_info_t taskinfo;
+                get_task_info(data->tasks[i], &taskinfo);
+                printf("%8llu %8u %8u %12llu %12llu %s\n", taskinfo.taskid,
+                        taskinfo.thread_count, taskinfo.pages, taskinfo.ucycles / 1000 / 1000,
+                        taskinfo.kcycles / 1000 / 1000, taskinfo.name);
+        }
+}
+
+
+static inline void print_head(void)
+{
+        fflush(stdout);
+        console_set_rgb_color(fphone(stdout), WHITE, BLACK);
+        printf("      ID  Threads    Pages      uCycles      kCycles Name");
+        int i;
+        for (i = 60; i < colls; ++i)
+                puts(" ");
+        fflush(stdout);
+        console_set_rgb_color(fphone(stdout), BLACK, WHITE);
+}
+
 void print_data(data_t *data)
 {
@@ -104 +140 @@
         puts("\n");
         print_taskstat(data);
+        puts("\n\n");
+        print_head();
         puts("\n");
+        print_tasks(data, 4);
         fflush(stdout);
 }

uspace/app/top/screen.h

@@ -36 +36 @@
 #include "top.h"
 
+extern int rows;
+extern int colls;
+
 extern void screen_init(void);
 extern void clear_screen(void);