Changes in uspace/app/top/top.c [172aad6:b3b7e14a] in mainline

File:

• uspace/app/top/top.c (modified) (14 diffs)

uspace/app/top/top.c

@@ -44 +44 @@
 #include <arch/barrier.h>
 #include <errno.h>
-#include <sort.h>
 #include "screen.h"
 #include "input.h"
@@ -58 +57 @@
 
 op_mode_t op_mode = OP_TASKS;
-sort_mode_t sort_mode = SORT_TASK_CYCLES;
 bool excs_all = false;
 
@@ -69 +67 @@
         target->tasks = NULL;
         target->tasks_perc = NULL;
-        target->tasks_map = NULL;
         target->threads = NULL;
         target->exceptions = NULL;
         target->exceptions_perc = NULL;
         target->physmem = NULL;
-        target->ucycles_diff = NULL;
-        target->kcycles_diff = NULL;
-        target->ecycles_diff = NULL;
-        target->ecount_diff = NULL;
         
         /* Get current time */
@@ -120 +113 @@
                 return "Not enough memory for task utilization";
         
-        target->tasks_map =
-            (size_t *) calloc(target->tasks_count, sizeof(size_t));
-        if (target->tasks_map == NULL)
-                return "Not enough memory for task map";
-        
         /* Get threads */
         target->threads = stats_get_threads(&(target->threads_count));
@@ -144 +132 @@
         if (target->physmem == NULL)
                 return "Cannot get physical memory";
-        
-        target->ucycles_diff = calloc(target->tasks_count,
-            sizeof(uint64_t));
-        if (target->ucycles_diff == NULL)
-                return "Not enough memory for user utilization";
-        
-        /* Allocate memory for computed values */
-        target->kcycles_diff = calloc(target->tasks_count,
-            sizeof(uint64_t));
-        if (target->kcycles_diff == NULL)
-                return "Not enough memory for kernel utilization";
-        
-        target->ecycles_diff = calloc(target->exceptions_count,
-            sizeof(uint64_t));
-        if (target->ecycles_diff == NULL)
-                return "Not enough memory for exception cycles utilization";
-        
-        target->ecount_diff = calloc(target->exceptions_count,
-            sizeof(uint64_t));
-        if (target->ecount_diff == NULL)
-                return "Not enough memory for exception count utilization";
         
         return NULL;
@@ -175 +142 @@
  *
  */
-static void compute_percentages(data_t *old_data, data_t *new_data)
+static const char *compute_percentages(data_t *old_data, data_t *new_data)
 {
-        /* For each CPU: Compute total cycles and divide it between
+        /* Allocate memory */
+        
+        uint64_t *ucycles_diff = calloc(new_data->tasks_count,
+            sizeof(uint64_t));
+        if (ucycles_diff == NULL)
+                return "Not enough memory for user utilization";
+        
+        uint64_t *kcycles_diff = calloc(new_data->tasks_count,
+            sizeof(uint64_t));
+        if (kcycles_diff == NULL) {
+                free(ucycles_diff);
+                return "Not enough memory for kernel utilization";
+        }
+        
+        uint64_t *ecycles_diff = calloc(new_data->exceptions_count,
+            sizeof(uint64_t));
+        if (ecycles_diff == NULL) {
+                free(ucycles_diff);
+                free(kcycles_diff);
+                return "Not enough memory for exception cycles utilization";
+        }
+        
+        uint64_t *ecount_diff = calloc(new_data->exceptions_count,
+            sizeof(uint64_t));
+        if (ecount_diff == NULL) {
+                free(ucycles_diff);
+                free(kcycles_diff);
+                free(ecycles_diff);
+                return "Not enough memory for exception count utilization";
+        }
+        
+        /* For each CPU: Compute total ticks and divide it between
            user and kernel */
         
@@ -183 +181 @@
         for (i = 0; i < new_data->cpus_count; i++) {
                 uint64_t idle =
-                    new_data->cpus[i].idle_cycles - old_data->cpus[i].idle_cycles;
+                    new_data->cpus[i].idle_ticks - old_data->cpus[i].idle_ticks;
                 uint64_t busy =
-                    new_data->cpus[i].busy_cycles - old_data->cpus[i].busy_cycles;
+                    new_data->cpus[i].busy_ticks - old_data->cpus[i].busy_ticks;
                 uint64_t sum = idle + busy;
                 
@@ -212 +210 @@
                 if (!found) {
                         /* This is newly borned task, ignore it */
-                        new_data->ucycles_diff[i] = 0;
-                        new_data->kcycles_diff[i] = 0;
+                        ucycles_diff[i] = 0;
+                        kcycles_diff[i] = 0;
                         continue;
                 }
                 
-                new_data->ucycles_diff[i] =
+                ucycles_diff[i] =
                     new_data->tasks[i].ucycles - old_data->tasks[j].ucycles;
-                new_data->kcycles_diff[i] =
+                kcycles_diff[i] =
                     new_data->tasks[i].kcycles - old_data->tasks[j].kcycles;
                 
                 virtmem_total += new_data->tasks[i].virtmem;
-                ucycles_total += new_data->ucycles_diff[i];
-                kcycles_total += new_data->kcycles_diff[i];
+                ucycles_total += ucycles_diff[i];
+                kcycles_total += kcycles_diff[i];
         }
         
@@ -233 +231 @@
                     new_data->tasks[i].virtmem * 100, virtmem_total);
                 FRACTION_TO_FLOAT(new_data->tasks_perc[i].ucycles,
-                    new_data->ucycles_diff[i] * 100, ucycles_total);
+                    ucycles_diff[i] * 100, ucycles_total);
                 FRACTION_TO_FLOAT(new_data->tasks_perc[i].kcycles,
-                    new_data->kcycles_diff[i] * 100, kcycles_total);
+                    kcycles_diff[i] * 100, kcycles_total);
         }
         
@@ -261 +259 @@
                 if (!found) {
                         /* This is a new exception, ignore it */
-                        new_data->ecycles_diff[i] = 0;
-                        new_data->ecount_diff[i] = 0;
+                        ecycles_diff[i] = 0;
+                        ecount_diff[i] = 0;
                         continue;
                 }
                 
-                new_data->ecycles_diff[i] =
+                ecycles_diff[i] =
                     new_data->exceptions[i].cycles - old_data->exceptions[j].cycles;
-                new_data->ecount_diff[i] =
+                ecount_diff[i] =
                     new_data->exceptions[i].count - old_data->exceptions[i].count;
                 
-                ecycles_total += new_data->ecycles_diff[i];
-                ecount_total += new_data->ecount_diff[i];
+                ecycles_total += ecycles_diff[i];
+                ecount_total += ecount_diff[i];
         }
         
@@ -279 +277 @@
         for (i = 0; i < new_data->exceptions_count; i++) {
                 FRACTION_TO_FLOAT(new_data->exceptions_perc[i].cycles,
-                    new_data->ecycles_diff[i] * 100, ecycles_total);
+                    ecycles_diff[i] * 100, ecycles_total);
                 FRACTION_TO_FLOAT(new_data->exceptions_perc[i].count,
-                    new_data->ecount_diff[i] * 100, ecount_total);
-        }
-}
-
-static int cmp_data(void *a, void *b, void *arg)
-{
-        size_t ia = *((size_t *) a);
-        size_t ib = *((size_t *) b);
-        data_t *data = (data_t *) arg;
-        
-        uint64_t acycles = data->ucycles_diff[ia] + data->kcycles_diff[ia];
-        uint64_t bcycles = data->ucycles_diff[ib] + data->kcycles_diff[ib];
-        
-        if (acycles > bcycles)
-                return -1;
-        
-        if (acycles < bcycles)
-                return 1;
-        
-        return 0;
-}
-
-static void sort_data(data_t *data)
-{
-        size_t i;
-        
-        for (i = 0; i < data->tasks_count; i++)
-                data->tasks_map[i] = i;
-        
-        qsort((void *) data->tasks_map, data->tasks_count,
-            sizeof(size_t), cmp_data, (void *) data);
+                    ecount_diff[i] * 100, ecount_total);
+        }
+        
+        /* Cleanup */
+        
+        free(ucycles_diff);
+        free(kcycles_diff);
+        free(ecycles_diff);
+        free(ecount_diff);
+        
+        return NULL;
 }
 
@@ -342 +320 @@
         if (target->physmem != NULL)
                 free(target->physmem);
-        
-        if (target->ucycles_diff != NULL)
-                free(target->ucycles_diff);
-        
-        if (target->kcycles_diff != NULL)
-                free(target->kcycles_diff);
-        
-        if (target->ecycles_diff != NULL)
-                free(target->ecycles_diff);
-        
-        if (target->ecount_diff != NULL)
-                free(target->ecount_diff);
 }
 
@@ -369 +335 @@
         
         /* Compute some rubbish to have initialised values */
-        compute_percentages(&data_prev, &data_prev);
+        if ((ret = compute_percentages(&data_prev, &data_prev)) != NULL)
+                goto out;
         
         /* And paint screen until death */
@@ -380 +347 @@
                         }
                         
-                        compute_percentages(&data_prev, &data);
-                        sort_data(&data);
+                        if ((ret = compute_percentages(&data_prev, &data)) != NULL) {
+                                free_data(&data);
+                                goto out;
+                        }
+                        
                         print_data(&data);
                         free_data(&data_prev);