Changeset 9d491a7 in mainline

Timestamp:

2010-04-01T09:15:38Z (14 years ago)

Author:

Stanislav Kozina <stanislav.kozina@…>

Branches:

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

Children:

83a957a

Parents:

c0379fc

Message:

ps and uptime improvements

Location:

uspace/app

Files:

• ps/ps.c (modified) (2 diffs)
• uptime/uptime.c (modified) (1 diff)

uspace/app/ps/ps.c

@@ -48 +48 @@
 #define TASK_COUNT 10
 #define THREAD_COUNT 50
+
+#define ECHOLOAD1(x) ((x) >> 11)
+#define ECHOLOAD2(x) (((x) & 0x7ff) / 2)
 
 /** Thread states */
@@ -124 +127 @@
 {
         size_t load[3];
-        load[0] = 0;
-        load[1] = 0;
-        load[2] = 0;
         get_load(load);
-        printf("Current load: %d.%03d %d.%03d %d.%03d\n", load[0] >> 11, (load[0] & 0x7ff) / 2, load[1] >> 11, (load[1] & 0x7ff) / 2, load[2] >> 11, (load[2] & 0x7ff) / 2);
+        printf("System load: %d.%03d %d.%03d %d.%03d\n", ECHOLOAD1(load[0]), ECHOLOAD2(load[0]), ECHOLOAD1(load[1]), ECHOLOAD2(load[1]), ECHOLOAD1(load[2]), ECHOLOAD2(load[2]));
 }
 

uspace/app/uptime/uptime.c

@@ -37 +37 @@
 #include <stdio.h>
 #include <uptime.h>
+#include <sys/time.h>
+#include <load.h>
+
+#define DAY 86400
+#define HOUR 3600
+#define MINUTE 60
+
+#define ECHOLOAD1(x) ((x) >> 11)
+#define ECHOLOAD2(x) (((x) & 0x7ff) / 2)
 
 int main(int argc, char *argv[])
 {
+        struct timeval time;
+        uint64_t sec;
+        if (gettimeofday(&time, NULL) != 0) {
+                printf("Cannot get time of day!\n");
+                return 1;
+        }
+        sec = time.tv_sec;
+        printf("%02llu:%02llu:%02llu", (sec % DAY) / HOUR,
+                        (sec % HOUR) / MINUTE, sec % MINUTE);
+
         uint64_t uptime;
+        get_uptime(&uptime);
+        printf("\tUp %4llu days, %02llu:%02llu:%02llu",
+                uptime / DAY, (uptime % DAY) / HOUR, (uptime % HOUR) / MINUTE, uptime % MINUTE);
 
-        get_uptime(&uptime);
-        printf("Up %llu days, %llu hours, %llu minutes, %llu seconds\n",
-                uptime / 86400, (uptime % 86400) / 3600, (uptime % 3600) / 60, uptime % 60);
+        size_t load[3];
+        get_load(load);
+        printf("\t load: %d.%03d %d.%03d %d.%03d ", ECHOLOAD1(load[0]), ECHOLOAD2(load[0]), ECHOLOAD1(load[1]), ECHOLOAD2(load[1]), ECHOLOAD1(load[2]), ECHOLOAD2(load[2]));
+
+        printf("\n");
         return 0;
 }