Merge pull request #103 from turbolent/wasi-libc-clocks

turbolent · Oct 13, 2024 · 3b18f55 · 3b18f55
2 parents 042b592 + 87ae131
commit 3b18f55
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/wasi/wasi.c b/wasi/wasi.c
@@ -1764,13 +1764,21 @@ wasiClockTimeGet(
                 break;
             }
 #endif
-#ifdef _POSIX_CPUTIME
+/* Don't check for _POSIX_CPUTIME, because e.g. WASI libc defines it,
+ * but it does not have CLOCK_PROCESS_CPUTIME_ID.
+ * See https://github.com/WebAssembly/wasi-libc/issues/513
+ */
+#ifdef CLOCK_PROCESS_CPUTIME_ID
             case WASI_CLOCK_PROCESS_CPUTIME_ID: {
                 nativeClockID = CLOCK_PROCESS_CPUTIME_ID;
                 break;
             }
 #endif
-#ifdef _POSIX_THREAD_CPUTIME
+/* Don't check for _POSIX_THREAD_CPUTIME, because e.g. WASI libc defines it,
+ * but it does not have CLOCK_THREAD_CPUTIME_ID.
+ * See https://github.com/WebAssembly/wasi-libc/issues/513
+ */
+#ifdef CLOCK_THREAD_CPUTIME_ID
             case WASI_CLOCK_THREAD_CPUTIME_ID: {
                 nativeClockID = CLOCK_THREAD_CPUTIME_ID;
                 break;
@@ -2038,13 +2046,21 @@ wasiClockResGet(
                 break;
             }
 #endif
-#ifdef _POSIX_CPUTIME
+/* Don't check for _POSIX_CPUTIME, because e.g. WASI libc defines it,
+ * but it does not have CLOCK_PROCESS_CPUTIME_ID.
+ * See https://github.com/WebAssembly/wasi-libc/issues/513
+ */
+#ifdef CLOCK_PROCESS_CPUTIME_ID
             case WASI_CLOCK_PROCESS_CPUTIME_ID: {
                 nativeClockID = CLOCK_PROCESS_CPUTIME_ID;
                 break;
             }
 #endif
-#ifdef _POSIX_THREAD_CPUTIME
+/* Don't check for _POSIX_THREAD_CPUTIME, because e.g. WASI libc defines it,
+ * but it does not have CLOCK_THREAD_CPUTIME_ID.
+ * See https://github.com/WebAssembly/wasi-libc/issues/513
+ */
+#ifdef CLOCK_THREAD_CPUTIME_ID
             case WASI_CLOCK_THREAD_CPUTIME_ID: {
                 nativeClockID = CLOCK_THREAD_CPUTIME_ID;
                 break;