Port time() and times()

Author: catamorphism

libc-bottom-half/clocks/times.c

@@ -1,7 +1,11 @@
 #define _WASI_EMULATED_PROCESS_CLOCKS
 #include <time.h>
 #include <sys/times.h>
+#ifdef __wasilibc_use_wasip2
+#include <wasi/wasip2.h>
+#else
 #include <wasi/api.h>
+#endif
 #include <common/time.h>
 
 _Static_assert(
@@ -14,6 +18,17 @@ _Static_assert(
 clock_t __clock(void);
 
 clock_t times(struct tms *buffer) {
+#ifdef __wasilibc_use_wasip2
+    clock_t user = __clock();
+    *buffer = (struct tms){
+        .tms_utime = user,
+        // WASI doesn't provide a way to spawn a new process, so always 0.
+        .tms_cutime = 0
+    };
+
+    monotonic_clock_instant_t realtime = monotonic_clock_now();
+#else
+
     __wasi_timestamp_t user = __clock();
     *buffer = (struct tms){
         .tms_utime = user,
@@ -23,5 +38,6 @@ clock_t times(struct tms *buffer) {
 
     __wasi_timestamp_t realtime = 0;
     (void)__wasi_clock_time_get(__WASI_CLOCKID_MONOTONIC, 0, &realtime);
+#endif
     return realtime;
 }

libc-bottom-half/cloudlibc/src/libc/time/time.c

@@ -4,12 +4,22 @@
 
 #include <common/time.h>
 
+#ifdef __wasilibc_use_wasip2
+#include <wasi/wasip2.h>
+#else
 #include <wasi/api.h>
+#endif
 #include <time.h>
 
 time_t time(time_t *tloc) {
+#ifdef __wasilibc_use_wasip2
+  wall_clock_datetime_t res;
+  wall_clock_now(&res);
+  uint64_t ts = (res.seconds * NSEC_PER_SEC) + res.nanoseconds;
+#else
   __wasi_timestamp_t ts = 0;
   (void)__wasi_clock_time_get(__WASI_CLOCKID_REALTIME, NSEC_PER_SEC, &ts);
+#endif
   if (tloc != NULL)
     *tloc = ts / NSEC_PER_SEC;
   return ts / NSEC_PER_SEC;

test/src/misc/time_and_times.c

@@ -0,0 +1,28 @@
+//! add-flags.py(CFLAGS): -D_WASI_EMULATED_PROCESS_CLOCKS
+//! add-flags.py(LDFLAGS): -lwasi-emulated-process-clocks
+#include <stdlib.h>
+#include <stdio.h>
+#include <time.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/times.h>
+#include "test.h"
+
+#define TEST(c, ...) ((c) ? 1 : (t_error(#c" failed: " __VA_ARGS__),0))
+
+int main(void)
+{
+	time_t t;
+        struct tms buffer;
+
+        clock_t result = times(&buffer);
+        TEST(result > 0);
+        TEST(buffer.tms_utime > 0);
+        TEST(buffer.tms_cutime == 0); // always 0 under WASI
+
+        time_t t1 = time(&t);
+        TEST(t==t1);
+        TEST(t > 0);
+
+	return t_status;
+}