Changeset e535eeb in mainline for uspace

Timestamp:

2010-04-18T12:28:19Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

dec16a2

Parents:

e1b6742

Message:

rename order() to order_suffix(), make it a generic libc string function in user space

Location:

uspace

Files:

• app/tasks/Makefile (modified) (1 diff)
• app/tasks/func.c (deleted)
• app/tasks/func.h (deleted)
• app/tasks/tasks.c (modified) (3 diffs)
• app/top/Makefile (modified) (1 diff)
• app/top/func.c (deleted)
• app/top/func.h (deleted)
• lib/c/generic/str.c (modified) (1 diff)
• lib/c/include/str.h (modified) (1 diff)

uspace/app/tasks/Makefile

@@ -32 +32 @@
 
 SOURCES = \
-        tasks.c \
-        func.c
+        tasks.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/tasks/tasks.c

@@ -45 +45 @@
 #include <inttypes.h>
 #include <bool.h>
+#include <str.h>
 #include <arg_parse.h>
-#include "func.h"
 
 #define NAME  "tasks"
@@ -76 +76 @@
                         char vmsuffix, usuffix, ksuffix;
                         
-                        order(stats_task->virtmem, &virtmem, &vmsuffix);
-                        order(stats_task->ucycles, &ucycles, &usuffix);
-                        order(stats_task->kcycles, &kcycles, &ksuffix);
+                        order_suffix(stats_task->virtmem, &virtmem, &vmsuffix);
+                        order_suffix(stats_task->ucycles, &ucycles, &usuffix);
+                        order_suffix(stats_task->kcycles, &kcycles, &ksuffix);
                         
                         printf("%8" PRIu64 "%8u %8" PRIu64"%c %12"
@@ -113 +113 @@
                                 char usuffix, ksuffix;
                                 
-                                order(stats_thread->ucycles, &ucycles, &usuffix);
-                                order(stats_thread->kcycles, &kcycles, &ksuffix);
+                                order_suffix(stats_thread->ucycles, &ucycles, &usuffix);
+                                order_suffix(stats_thread->kcycles, &kcycles, &ksuffix);
                                 
                                 if (stats_thread->on_cpu) {

uspace/app/top/Makefile

@@ -35 +35 @@
         screen.c \
         input.c \
-        func.c \
         ps.c
 

uspace/lib/c/generic/str.c

@@ -1007 +1007 @@
 }
 
+void order_suffix(const uint64_t val, uint64_t *rv, char *suffix)
+{
+        if (val > 10000000000000000000ULL) {
+                *rv = val / 1000000000000000000ULL;
+                *suffix = 'Z';
+        } else if (val > 1000000000000000000ULL) {
+                *rv = val / 1000000000000000ULL;
+                *suffix = 'E';
+        } else if (val > 1000000000000000ULL) {
+                *rv = val / 1000000000000ULL;
+                *suffix = 'T';
+        } else if (val > 1000000000000ULL) {
+                *rv = val / 1000000000ULL;
+                *suffix = 'G';
+        } else if (val > 1000000000ULL) {
+                *rv = val / 1000000ULL;
+                *suffix = 'M';
+        } else if (val > 1000000ULL) {
+                *rv = val / 1000ULL;
+                *suffix = 'k';
+        } else {
+                *rv = val;
+                *suffix = ' ';
+        }
+}
+
 /** @}
  */

uspace/lib/c/include/str.h

@@ -86 +86 @@
 extern char *str_ndup(const char *, size_t max_size);
 
+extern void order_suffix(const uint64_t val, uint64_t *rv, char *suffix);
+
 /*
  * TODO: Get rid of this.