Changeset 205f1add in mainline for uspace/lib/posix

Timestamp:

2018-08-23T21:14:56Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Children:

f33c989e

Parents:

e2625b1a

git-author:

Jakub Jermar <jakub@…> (2018-08-21 21:58:52)

git-committer:

Jakub Jermar <jakub@…> (2018-08-23 21:14:56)

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 C99-like or HelenOS-specific
interfaces to libc.

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

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) (2 diffs)

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

@@ -34 +34 @@
 #define POSIX_SYS_TIME_H_
 
-#include "libc/sys/time.h"
-
 #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;
-
 
 #endif /* POSIX_SYS_TYPES_H_ */

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

@@ -41 +41 @@
 #include <_bits/NULL.h>
 
+#include "libc/time.h"
+
 #ifndef CLOCKS_PER_SEC
 #define CLOCKS_PER_SEC (1000000L)
@@ -57 +59 @@
 #define CLOCK_REALTIME ((clockid_t) 0)
 
-struct timespec {
-        time_t tv_sec; /* Seconds. */
-        long tv_nsec; /* Nanoseconds. */
+#define DST_NONE  0
+
+#define ASCTIME_BUF_LEN  26
+
+typedef long suseconds_t;
+
+struct timeval {
+        time_t tv_sec;        /* seconds */
+        suseconds_t tv_usec;  /* microseconds */
+};
+
+struct timezone {
+        int tz_minuteswest;  /* minutes W of Greenwich */
+        int tz_dsttime;      /* type of dst correction */
 };
 
@@ -107 +120 @@
 extern clock_t clock(void);
 
+extern int gettimeofday(struct timeval *, struct timezone *);
 
 #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

@@ -49 +49 @@
 #include "libc/stats.h"
 #include "libc/stddef.h"
-#include "libc/sys/time.h"
+#include "libc/time.h"
 
 // TODO: test everything in this file
@@ -328 +328 @@
 }
 
+int gettimeofday(struct timeval *tv, struct timezone *tz)
+{
+        struct timespec ts;
+
+        getrealtime(&ts);
+        tv->tv_sec = ts.tv_sec;
+        tv->tv_usec = NSEC2USEC(ts.tv_nsec);
+
+        return 0;
+}
+
 /** @}
  */