Changeset dd6c71c in mainline

Timestamp:

2010-04-02T08:27:13Z (14 years ago)

Author:

Stanislav Kozina <stanislav.kozina@…>

Branches:

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

Children:

175ad5c6

Parents:

62550dce

Message:

top echoes counts of tasks

Location:

uspace/app

Files:

• top/Makefile (modified) (1 diff)
• top/ps.c (added)
• top/ps.h (added)
• top/screen.c (modified) (3 diffs)
• top/top.c (modified) (3 diffs)
• top/top.h (modified) (2 diffs)
• uptime/uptime.c (modified) (1 diff)

uspace/app/top/Makefile

@@ -34 +34 @@
         top.c \
         screen.c \
-        input.c
+        input.c \
+        ps.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/top/screen.c

@@ -38 +38 @@
 #include <io/console.h>
 #include <vfs/vfs.h>
+#include <load.h>
 #include "screen.h"
 #include "top.h"
@@ -73 +74 @@
 static inline void print_uptime(data_t *data)
 {
-        printf("up %4d days, %02d:%02d:%02d ", data->uptime_d, data->uptime_h,
+        printf("up %4d days, %02d:%02d:%02d, ", data->uptime_d, data->uptime_h,
                 data->uptime_m, data->uptime_s);
 }
 
-static int i = 0;
+static inline void print_load(data_t *data)
+{
+        puts("load avarage: ");
+        print_load_fragment(data->load[0], 2);
+        puts(" ");
+        print_load_fragment(data->load[1], 2);
+        puts(" ");
+        print_load_fragment(data->load[2], 2);
+}
+
+static inline void print_taskstat(data_t *data)
+{
+        puts("Tasks: ");
+        printf("%4u total", data->task_count);
+}
+
 void print_data(data_t *data)
 {
@@ -85 +101 @@
         print_time(data);
         print_uptime(data);
-        puts(" ... \n");
-        printf("A dalsi radek topu - jiz po %dte", ++i);
+        print_load(data);
+        puts("\n");
+        print_taskstat(data);
+        puts("\n");
         fflush(stdout);
 }

uspace/app/top/top.c

@@ -47 +47 @@
 #include "input.h"
 #include "top.h"
+#include "ps.h"
 
 #define UPDATE_INTERVAL 1
@@ -76 +77 @@
         /* Read load */
         get_load(target->load);
+
+        /* Read task ids */
+        target->task_count = get_tasks(&target->tasks);
 }
 
@@ -111 +115 @@
         }
 
+        free(new_data.tasks);
         puts("\n\n");
         fflush(stdout);

uspace/app/top/top.h

@@ -34 +34 @@
 #define TOP_TOP_H_
 
+#include <task.h>
+
 typedef struct {
         unsigned int hours;
@@ -45 +47 @@
 
         unsigned long load[3];
+
+        task_id_t *tasks;
+        unsigned int task_count;
 } data_t;
 

uspace/app/uptime/uptime.c

@@ -44 +44 @@
 #define MINUTE 60
 
-#define ECHOLOAD1(x) ((x) >> 11)
-#define ECHOLOAD2(x) (((x) & 0x7ff) / 2)
-
 int main(int argc, char *argv[])
 {