Changeset b412168 in mainline for uspace/app/top/top.c

Timestamp:

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

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update

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/app/top/top.c (modified) (2 diffs)

uspace/app/top/top.c

@@ -156 +156 @@
         /* Get current time */
         struct timeval time;
-        if (gettimeofday(&time, NULL) != EOK)
-                return "Cannot get time of day";
+        gettimeofday(&time, NULL);
         
         target->hours = (time.tv_sec % DAY) / HOUR;
@@ -164 +163 @@
         
         /* Get uptime */
-        sysarg_t uptime = stats_get_uptime();
-        target->udays = uptime / DAY;
-        target->uhours = (uptime % DAY) / HOUR;
-        target->uminutes = (uptime % HOUR) / MINUTE;
-        target->useconds = uptime % MINUTE;
+        struct timeval uptime;
+        getuptime(&uptime);
+        
+        target->udays = uptime.tv_sec / DAY;
+        target->uhours = (uptime.tv_sec % DAY) / HOUR;
+        target->uminutes = (uptime.tv_sec % HOUR) / MINUTE;
+        target->useconds = uptime.tv_sec % MINUTE;
         
         /* Get load */