Changeset bd41ac52 in mainline for uspace/app/top

Timestamp:

2018-08-25T22:21:25Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

cca80a2

Parents:

e2625b1a

Message:

Get rid of sys/time.h

This commit moves the POSIX-like time functionality from libc's
sys/time.h to libposix and introduces C11-like or HelenOS-specific
interfaces to libc.

Specifically, use of sys/time.h, struct timeval, suseconds_t and
gettimeofday is replaced by time.h (C11), struct timespec (C11), usec_t
(HelenOS) and getuptime / getrealtime (HelenOS).

Also attempt to fix the implementation of clock() to return microseconds
(clocks) rather than processor cycles and move it to libc.

Location:

uspace/app/top

Files:

• screen.c (modified) (6 diffs)
• screen.h (modified) (1 diff)
• top.c (modified) (3 diffs)

uspace/app/top/screen.c

@@ -49 +49 @@
 #include "top.h"
 
-#define USEC_COUNT  1000000
-
-static suseconds_t timeleft = 0;
+static usec_t timeleft = 0;
 
 console_ctrl_t *console;
@@ -57 +55 @@
 static sysarg_t warning_col = 0;
 static sysarg_t warning_row = 0;
-static suseconds_t warning_timeleft = 0;
+static usec_t warning_timeleft = 0;
 static char *warning_text = NULL;
 
@@ -179 +177 @@
 static inline void print_global_head(data_t *data)
 {
-        printf("top - %02lu:%02lu:%02lu up "
+        printf("top - %02lld:%02lld:%02lld up "
             "%" PRIun " days, %02" PRIun ":%02" PRIun ":%02" PRIun ", "
             "load average:",
@@ -527 +525 @@
         va_end(args);
 
-        warning_timeleft = 2 * USEC_COUNT;
+        warning_timeleft = SEC2USEC(2);
 
         screen_moveto(warning_col, warning_row);
@@ -537 +535 @@
  *
  */
-int tgetchar(unsigned int sec)
+int tgetchar(sec_t sec)
 {
         /*
@@ -544 +542 @@
 
         if (timeleft <= 0)
-                timeleft = sec * USEC_COUNT;
+                timeleft = SEC2USEC(sec);
 
         /*

uspace/app/top/screen.h

@@ -47 +47 @@
     _HELENOS_PRINTF_ATTRIBUTE(1, 2);
 
-extern int tgetchar(unsigned int);
+extern int tgetchar(sec_t);
 
 #endif

uspace/app/top/top.c

@@ -39 +39 @@
 #include <stdlib.h>
 #include <task.h>
-#include <sys/time.h>
+#include <time.h>
 #include <errno.h>
 #include <gsort.h>
@@ -154 +154 @@
 
         /* Get current time */
-        struct timeval time;
-        gettimeofday(&time, NULL);
+        struct timespec time;
+        getrealtime(&time);
 
         target->hours = (time.tv_sec % DAY) / HOUR;
@@ -162 +162 @@
 
         /* Get uptime */
-        struct timeval uptime;
+        struct timespec uptime;
         getuptime(&uptime);