Changeset bd41ac52 in mainline for uspace/lib/posix/include

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

Files:

• sys/time.h (modified) (1 diff)
• sys/types.h (modified) (2 diffs)
• time.h (modified) (3 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_