Changeset ee35ba0b in mainline

Timestamp:

2010-04-03T15:26:34Z (14 years ago)

Author:

Stanislav Kozina <stanislav.kozina@…>

Branches:

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

Children:

452268a

Parents:

8b2aba5

Message:

top echoes also percentage usage of cpu

Location:

uspace/app/top

Files:

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

uspace/app/top/ps.c

@@ -70 +70 @@
         }
 
+/*
         int i;
         for (i = 0; i < result; ++i) {
@@ -75 +76 @@
                 get_task_info(tasks[i], &taskinfo);
         }
+        */
 
         *out_tasks = tasks;

uspace/app/top/screen.c

@@ -50 +50 @@
 #define WHITE 0xf0f0f0
 #define BLACK 0x000000
+
+static void print_float(float f, int precision)
+{
+        printf("%u.", (unsigned int) f);
+        int i;
+        float rest = (f - (int)f) * 10;
+        for (i = 0; i < precision; ++i) {
+                printf("%d", (unsigned int)rest);
+                rest = (rest - (int)rest) * 10;
+        }
+}
 
 static void resume_normal(void)
@@ -112 +123 @@
         uspace_cpu_info_t *cpus = data->cpus;
         for (i = 0; i < data->cpu_count; ++i) {
-                printf("Cpu%u (%4u Mhz): Busy ticks: %6llu, Idle Ticks: %6llu\n",
+                printf("Cpu%u (%4u Mhz): Busy ticks: %6llu, Idle Ticks: %6llu",
                         i, (unsigned int)cpus[i].frequency_mhz, cpus[i].busy_ticks,
                         cpus[i].idle_ticks);
+                printf(", idle: ");
+                print_float(data->cpu_perc[i].idle, 2);
+                puts("%, busy: ");
+                print_float(data->cpu_perc[i].busy, 2);
+                puts("%\n");
                 ++up_rows;
         }
@@ -163 +179 @@
         print_head();
         puts("\n");
-        print_tasks(data, 4);
+        print_tasks(data, up_rows);
         fflush(stdout);
 }

uspace/app/top/top.c

@@ -54 +54 @@
 #define MINUTE 60
 
+int number = 0;
+int number2 = 0;
 static void read_data(data_t *target)
 {
@@ -84 +86 @@
 }
 
+/** Computes percentage differencies from old_data to new_data
+ *
+ * @param old_data      Pointer to old data strucutre.
+ * @param new_data      Pointer to actual data where percetages are stored.
+ *
+ */
+static void compute_percentages(data_t *old_data, data_t *new_data)
+{
+        /* Foreach cpu, compute total ticks and divide it between user and
+         * system */
+        unsigned int i;
+        new_data->cpu_perc = malloc(new_data->cpu_count * sizeof(cpu_perc_t));
+        for (i = 0; i < new_data->cpu_count; ++i) {
+                uint64_t idle = new_data->cpus[i].idle_ticks - old_data->cpus[i].idle_ticks;
+                uint64_t busy = new_data->cpus[i].busy_ticks - old_data->cpus[i].busy_ticks;
+                uint64_t sum = idle + busy;
+                new_data->cpu_perc[i].idle = ((float)(idle * 100) / sum);
+                new_data->cpu_perc[i].busy = ((float)(busy * 100) / sum);
+        }
+}
+
 static void free_data(data_t *target)
 {
         free(target->tasks);
+        free(target->cpus);
+        free(target->cpu_perc);
 }
 
-static inline void swap(data_t *first, data_t *second)
+static inline void swap(data_t **first, data_t **second)
 {
         data_t *temp;
-        temp = first;
-        first = second;
-        second = temp;
+        temp = *first;
+        *first = *second;
+        *second = temp;
 }
 
@@ -103 +128 @@
         data_t *data1 = &data[0];
         data_t *data2 = &data[1];
+        screen_init();
 
         /* Read initial stats */
         printf("Reading initial data...\n");
         read_data(data1);
-        sleep(UPDATE_INTERVAL);
-        read_data(data2);
-
-        screen_init();
-        print_data(data2);
+        /* Compute some rubbish to have initialised values */
+        compute_percentages(data1, data1);
 
         /* And paint screen until death... */
@@ -117 +140 @@
                 char c = tgetchar(UPDATE_INTERVAL);
                 if (c < 0) {
+                        read_data(data2);
+                        compute_percentages(data1, data2);
                         free_data(data1);
-                        swap(data1, data2);
-                        read_data(data2);
                         print_data(data2);
+                        swap(&data1, &data2);
                         continue;
                 }

uspace/app/top/top.h

@@ -38 +38 @@
 
 typedef struct {
+        float idle;
+        float busy;
+} cpu_perc_t;
+
+typedef struct {
+        float user;
+        float system;
+        float memory;
+} task_perc_t;
+
+typedef struct {
         unsigned int hours;
         unsigned int minutes;
@@ -49 +60 @@
         unsigned long load[3];
 
+        unsigned int task_count;
         task_id_t *tasks;
-        unsigned int task_count;
 
+        unsigned int cpu_count;
         uspace_cpu_info_t *cpus;
-        unsigned int cpu_count;
+        cpu_perc_t *cpu_perc;
 } data_t;