Changeset e43cdac in mainline

Timestamp:

2010-04-13T12:57:05Z (14 years ago)

Author:

Stanislav Kozina <stanislav.kozina@…>

Branches:

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

Children:

a307beb

Parents:

638927a

Message:

Removed all floating point computation from top utility.
Now all percentages are computed using fixed point.
FPU was emmiting exception 16 when storing float from FP register into the
memory and I really cannot figure out why:-(

Files:

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

kernel/generic/include/ps/taskinfo.h

@@ -77 +77 @@
         state_t state;
         int priority;
-        uint64_t cycles;
         uint64_t ucycles;
         uint64_t kcycles;

uspace/app/top/screen.c

@@ -52 +52 @@
 #define BLACK 0x000000
 
-static void print_float(float f, int precision)
-{
-        printf("%2u.", (unsigned int) f);
+static void print_float(ps_float f, int precision)
+{
+        printf("%2u.", f.upper / f.lower);
         int i;
-        float rest = (f - (int)f) * 10;
+        unsigned int rest = (f.upper % f.lower) * 10;
         for (i = 0; i < precision; ++i) {
-                printf("%d", (unsigned int)rest);
-                rest = (rest - (int)rest) * 10;
+                printf("%d", rest / f.lower);
+                rest = (rest % f.lower) * 10;
         }
 }
@@ -208 +208 @@
         fflush(stdout);
         console_set_rgb_color(fphone(stdout), WHITE, BLACK);
-        printf("      ID  Threads      Mem      %%Mem %%uCycles %%kCycles Name");
+        printf("      ID  Threads      Mem      %%Mem %%uCycles %%kCycles  Name");
         int i;
-        for (i = 60; i < colls; ++i)
+        for (i = 61; i < colls; ++i)
                 puts(" ");
         fflush(stdout);

uspace/app/top/top.c

@@ -110 +110 @@
                 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;
+                FRACTION_TO_FLOAT(new_data->cpu_perc[i].idle, idle * 100, sum);
+                FRACTION_TO_FLOAT(new_data->cpu_perc[i].busy, busy * 100, sum);
         }
 
@@ -143 +143 @@
         new_data->task_perc = malloc(new_data->task_count * sizeof(task_perc_t));
         for (i = 0; i < new_data->task_count; ++i) {
-                new_data->task_perc[i].mem = (float)(new_data->taskinfos[i].virt_mem * 100) / mem_total;
-                new_data->task_perc[i].ucycles = (float)(ucycles_diff[i] * 100) / ucycles_total;
-                new_data->task_perc[i].kcycles = (float)(kcycles_diff[i] * 100) / kcycles_total;
+                FRACTION_TO_FLOAT(new_data->task_perc[i].mem, new_data->taskinfos[i].virt_mem * 100, mem_total);
+                FRACTION_TO_FLOAT(new_data->task_perc[i].ucycles, ucycles_diff[i] * 100, ucycles_total);
+                FRACTION_TO_FLOAT(new_data->task_perc[i].kcycles, kcycles_diff[i] * 100, kcycles_total);
         }
 

uspace/app/top/top.h

@@ -38 +38 @@
 #include <kernel/ps/taskinfo.h>
 
+#define FRACTION_TO_FLOAT(float, a, b) { \
+        (float).upper = (a); \
+        (float).lower = (b); \
+}
+
 typedef struct {
-        float idle;
-        float busy;
+        uint64_t upper;
+        uint64_t lower;
+} ps_float;
+
+typedef struct {
+        ps_float idle;
+        ps_float busy;
 } cpu_perc_t;
 
 typedef struct {
-        float ucycles;
-        float kcycles;
-        float mem;
+        ps_float ucycles;
+        ps_float kcycles;
+        ps_float mem;
 } task_perc_t;