Changeset b412168 in mainline for uspace/lib/c/generic/stats.c

Timestamp:

2014-11-17T03:25:04Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6069061

Parents:

ef3da5a (diff), 5042706 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/lib/c/generic/stats.c (modified) (2 diffs)

uspace/lib/c/generic/stats.c

@@ -291 +291 @@
 }
 
-/** Get system uptime
- *
- * @return System uptime (in seconds).
- *
- */
-sysarg_t stats_get_uptime(void)
-{
-        sysarg_t uptime;
-        if (sysinfo_get_value("system.uptime", &uptime) != EOK)
-                uptime = 0;
-        
-        return uptime;
-}
-
 /** Print load fixed-point value
  *
@@ -316 +302 @@
 void stats_print_load_fragment(load_t upper, unsigned int dec_length)
 {
-        /* Magic value from BSD */
-        load_t lower = 65536;
-        
         /* Print the whole part */
-        printf("%u.", upper / lower);
-        
-        load_t rest = (upper % lower) * 10;
+        printf("%u.", upper / LOAD_UNIT);
+        
+        load_t rest = (upper % LOAD_UNIT) * 10;
         
         unsigned int i;
         for (i = 0; i < dec_length; i++) {
-                printf("%u", rest / lower);
-                rest = (rest % lower) * 10;
+                printf("%u", rest / LOAD_UNIT);
+                rest = (rest % LOAD_UNIT) * 10;
         }
 }