Changeset bd41ac52 in mainline for uspace/lib/posix

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/lib/posix

Files:

• include/posix/sys/time.h (modified) (1 diff)
• include/posix/sys/types.h (modified) (2 diffs)
• include/posix/time.h (modified) (3 diffs)
• src/internal/common.h (modified) (1 diff)
• src/time.c (modified) (6 diffs)

uspace/lib/posix/include/posix/sys/time.h

@@ -34 +34 @@
 #define POSIX_SYS_TIME_H_
 
-#include "libc/sys/time.h"
+#include "libc/time.h"
+
+struct timeval {
+        time_t tv_sec;        /* seconds */
+        suseconds_t tv_usec;  /* microseconds */
+};
+
+extern int gettimeofday(struct timeval *, void *);
 
 #endif

uspace/lib/posix/include/posix/sys/types.h

@@ -38 +38 @@
 
 #include "libc/offset.h"
-#include "libc/sys/time.h"
 #include "libc/types/common.h"
 
@@ -56 +55 @@
 
 /* Clock Types */
-typedef long clock_t;
 typedef int clockid_t;
 
+typedef long suseconds_t;
 
 #endif /* POSIX_SYS_TYPES_H_ */

uspace/lib/posix/include/posix/time.h

@@ -41 +41 @@
 #include <_bits/NULL.h>
 
-#ifndef CLOCKS_PER_SEC
-#define CLOCKS_PER_SEC (1000000L)
-#endif
+#include "libc/time.h"
 
 #ifndef __locale_t_defined
@@ -57 +55 @@
 #define CLOCK_REALTIME ((clockid_t) 0)
 
-struct timespec {
-        time_t tv_sec; /* Seconds. */
-        long tv_nsec; /* Nanoseconds. */
-};
+#define ASCTIME_BUF_LEN  26
 
 struct itimerspec {
@@ -104 +99 @@
     const struct timespec *rqtp, struct timespec *rmtp);
 
-/* CPU Time */
-extern clock_t clock(void);
-
-
 #endif  // POSIX_TIME_H_
 

uspace/lib/posix/src/internal/common.h

@@ -38 +38 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <errno.h>
 #include <offset.h>
 #include <vfs/vfs.h>

uspace/lib/posix/src/time.c

@@ -35 +35 @@
 
 #include "internal/common.h"
+#include "posix/sys/types.h"
+#include "posix/sys/time.h"
 #include "posix/time.h"
 
@@ -47 +49 @@
 #include "libc/malloc.h"
 #include "libc/task.h"
-#include "libc/stats.h"
 #include "libc/stddef.h"
-#include "libc/sys/time.h"
+#include "libc/time.h"
 
 // TODO: test everything in this file
@@ -219 +220 @@
         case CLOCK_REALTIME:
                 res->tv_sec = 0;
-                res->tv_nsec = 1000; /* Microsecond resolution. */
+                res->tv_nsec = USEC2NSEC(1); /* Microsecond resolution. */
                 return 0;
         default:
@@ -244 +245 @@
                 gettimeofday(&tv, NULL);
                 tp->tv_sec = tv.tv_sec;
-                tp->tv_nsec = tv.tv_usec * 1000;
+                tp->tv_nsec = USEC2NSEC(tv.tv_usec);
                 return 0;
         default:
@@ -300 +301 @@
                 }
                 if (rqtp->tv_nsec != 0) {
-                        fibril_usleep(rqtp->tv_nsec / 1000);
+                        fibril_usleep(NSEC2USEC(rqtp->tv_nsec));
                 }
                 return 0;
@@ -309 +310 @@
 }
 
-/**
- * Get CPU time used since the process invocation.
- *
- * @return Consumed CPU cycles by this process or -1 if not available.
- */
-clock_t clock(void)
-{
-        clock_t total_cycles = -1;
-        stats_task_t *task_stats = stats_get_task(task_get_id());
-        if (task_stats) {
-                total_cycles = (clock_t) (task_stats->kcycles +
-                    task_stats->ucycles);
-                free(task_stats);
-                task_stats = 0;
-        }
-
-        return total_cycles;
+int gettimeofday(struct timeval *tv, void *tz)
+{
+        struct timespec ts;
+
+        getrealtime(&ts);
+        tv->tv_sec = ts.tv_sec;
+        tv->tv_usec = NSEC2USEC(ts.tv_nsec);
+
+        return 0;
 }