Merge branch 'main' into tty-test

Author: hoodmane

src/deterministic.js

@@ -17,10 +17,11 @@ function deterministicNow() {
 
 Date.now = deterministicNow;
 
-// Setting performance.now to deterministicNow doesn't work so we instead
-// use a helper function in parseTools (getPerformanceNow()) to call it
-// directly.
-// if (globalThis.performance) performance.now = Date.now;
+// Note: this approach does not work on certain versions of Node.js
+// Specifically it seems like its not possible to override performance.now on
+// node v16 through v18.
+// See getPerformanceNow in parseTools.mjs for how we deal with this.
+if (globalThis.performance) performance.now = deterministicNow;
 
 Module['thisProgram'] = 'thisProgram'; // for consistency between different builds than between runs of the same build
 

src/jsifier.mjs

@@ -713,6 +713,9 @@ function(${args}) {
       } else if (typeof snippet == 'object') {
         snippet = stringifyWithFunctions(snippet);
         addImplicitDeps(snippet, deps);
+      } else if (typeof snippet == 'string' && (snippet.match(/^\s*\([^}]*\)\s*=>/) || snippet.match(/^function\b/))) {
+        // Support functions that are already "stringified"
+        isFunction = true;
       }
 
       if (isFunction) {

src/lib/libcore.js

@@ -2593,7 +2593,7 @@ function wrapSyscallFunction(x, library, isWasi) {
     t = modifyJSFunction(t, (args, body, async_) => `${async_}function (${args}) {\n${pre}${body}${post}}\n`);
   }
 
-  library[x] = eval(`(${t})`);
+  library[x] = t;
   // Automatically add dependency on `$SYSCALLS`
   if (!WASMFS && t.includes('SYSCALLS')) {
     library[x + '__deps'].push('$SYSCALLS');

src/lib/libsyscall.js

@@ -1028,8 +1028,8 @@ var SyscallsLibrary = {
   },
 };
 
-for (var x in SyscallsLibrary) {
-  wrapSyscallFunction(x, SyscallsLibrary, false);
+for (const name of Object.keys(SyscallsLibrary)) {
+  wrapSyscallFunction(name, SyscallsLibrary, false);
 }
 
 addToLibrary(SyscallsLibrary);

src/lib/libwasi.js

@@ -620,8 +620,8 @@ var WasiLibrary = {
   random_get: (buffer, size) => randomFill(HEAPU8.subarray(buffer, buffer + size)),
 };
 
-for (var x in WasiLibrary) {
-  wrapSyscallFunction(x, WasiLibrary, true);
+for (const name of Object.keys(WasiLibrary)) {
+  wrapSyscallFunction(name, WasiLibrary, true);
 }
 
 addToLibrary(WasiLibrary);

src/parseTools.mjs

@@ -1106,7 +1106,10 @@ function formattedMinNodeVersion() {
 }
 
 function getPerformanceNow() {
-  if (DETERMINISTIC) {
+  // This is needed to support Node.js v16 - v18 where `performance.now`
+  // cannot be overridden in the normal way.
+  // TODO(sbc): remove this once we drop support for these versions.
+  if (DETERMINISTIC && ENVIRONMENT_MAY_BE_NODE) {
     return 'deterministicNow';
   } else {
     return 'performance.now';

system/lib/pthread/emscripten_futex_wait.c

@@ -172,15 +172,15 @@ int emscripten_futex_wait(volatile void *addr, uint32_t val, double max_wait_ms)
     wakeup_interval = 100 * 1000000;
   }
 
-  // When wakeup_interval is set, we use remainder_ns to track how many ns
-  // remain of the intiial max_wait_ns.
-  int64_t remainder_ns = 0;
+  // When wakeup_interval is set, we use end_time to track the absolute
+  // time when the wait should end.
+  double end_time = 0;
   if (wakeup_interval) {
-    remainder_ns = max_wait_ns;
-    if (remainder_ns < 0) {
+    if (max_wait_ms == INFINITY) {
       max_wait_ns = wakeup_interval;
     } else {
-      max_wait_ns = MIN(remainder_ns, wakeup_interval);
+      end_time = emscripten_get_now() + max_wait_ms;
+      max_wait_ns = MIN(max_wait_ns, wakeup_interval);
     }
   }
 
@@ -222,14 +222,12 @@ int emscripten_futex_wait(volatile void *addr, uint32_t val, double max_wait_ms)
       emscripten_conditional_set_current_thread_status(EM_THREAD_STATUS_WAITFUTEX, EM_THREAD_STATUS_RUNNING);
       return -ECANCELED;
     }
-    // If remainder_ns is negative it means we want wait forever, and we don't
-    // need to decrement remainder_ns in that case.
-    if (wakeup_interval && remainder_ns >= 0) {
-      remainder_ns -= wakeup_interval;
-      if (remainder_ns <= 0) {
+    if (wakeup_interval && max_wait_ms != INFINITY) {
+      double remainder_ms = end_time - emscripten_get_now();
+      if (remainder_ms <= 0) {
         break;
       }
-      max_wait_ns = MIN(remainder_ns, wakeup_interval);
+      max_wait_ns = MIN((int64_t)(remainder_ms * 1e6), wakeup_interval);
     }
   } while (wakeup_interval && ret == ATOMICS_WAIT_TIMED_OUT);
 #endif

system/lib/pthread/library_pthread.c

@@ -65,54 +65,32 @@ int sched_get_priority_min(int policy) {
     return 0;
 }
 
-int pthread_mutexattr_getprioceiling(const pthread_mutexattr_t *restrict attr, int *restrict prioceiling)
-{
+int pthread_mutexattr_getprioceiling(const pthread_mutexattr_t *restrict attr, int *restrict prioceiling) {
   // Not supported either in Emscripten or musl, return a faked value.
   if (prioceiling) *prioceiling = 99;
   return 0;
 }
 
-int pthread_mutexattr_setprioceiling(pthread_mutexattr_t *attr, int prioceiling)
-{
+int pthread_mutexattr_setprioceiling(pthread_mutexattr_t *attr, int prioceiling) {
   // Not supported either in Emscripten or musl, return an error.
   return EPERM;
 }
 
-static uint32_t dummyZeroAddress = 0;
-
 void emscripten_thread_sleep(double msecs) {
-  double now = emscripten_get_now();
-  double target = now + msecs;
-
-  // If we have less than this many msecs left to wait, busy spin that instead.
-  double min_ms_slice_to_sleep = 0.1;
-
-  // Break up sleeping so that we process proxied work at regular intervals.
-  // TODO(sbc): This should be removed and/or moved down into
-  // `emscripten_futex_wait`.
-  double max_ms_slice_to_sleep = 100;
-
-  emscripten_conditional_set_current_thread_status(
-    EM_THREAD_STATUS_RUNNING, EM_THREAD_STATUS_SLEEPING);
-
-  do {
-    // Keep processing the main loop of the calling thread.
-    __pthread_testcancel(); // pthreads spec: sleep is a cancellation point, so must test if this
-                            // thread is cancelled during the sleep.
-    emscripten_current_thread_process_queued_calls();
-
-    now = emscripten_get_now();
-    double ms_to_sleep = target - now;
-    if (ms_to_sleep < min_ms_slice_to_sleep)
-      continue;
-    if (ms_to_sleep > max_ms_slice_to_sleep)
-      ms_to_sleep = max_ms_slice_to_sleep;
-    emscripten_futex_wait(&dummyZeroAddress, 0, ms_to_sleep);
-    now = emscripten_get_now();
-  } while (now < target);
-
-  emscripten_conditional_set_current_thread_status(
-    EM_THREAD_STATUS_SLEEPING, EM_THREAD_STATUS_RUNNING);
+  // We include emscripten_current_thread_process_queued_calls before and
+  // after sleeping since that is how we recieve "async" signals.
+  // We include __pthread_testcancel here becuase clock_nanosleep is
+  // a pthread cancelation point.
+  emscripten_current_thread_process_queued_calls();
+  __pthread_testcancel();
+  emscripten_conditional_set_current_thread_status(EM_THREAD_STATUS_RUNNING,
+                                                   EM_THREAD_STATUS_SLEEPING);
+  uint32_t dummyZeroAddress = 0;
+  emscripten_futex_wait(&dummyZeroAddress, 0, msecs);
+  emscripten_conditional_set_current_thread_status(EM_THREAD_STATUS_SLEEPING,
+                                                   EM_THREAD_STATUS_RUNNING);
+  emscripten_current_thread_process_queued_calls();
+  __pthread_testcancel();
 }
 
 static struct pthread __main_pthread;

system/lib/pthread/library_pthread_stub.c

@@ -231,7 +231,9 @@ int pthread_cancel(pthread_t thread) {
   return 0;
 }
 
-void pthread_testcancel() {}
+void __pthread_testcancel() {}
+
+weak_alias(__pthread_testcancel, pthread_testcancel);
 
 _Noreturn void __pthread_exit(void* status) {
    exit(0);

test/codesize/test_codesize_cxx_mangle.json

@@ -2,9 +2,9 @@
   "a.out.js": 23224,
   "a.out.js.gz": 8983,
   "a.out.nodebug.wasm": 238957,
-  "a.out.nodebug.wasm.gz": 79847,
+  "a.out.nodebug.wasm.gz": 79842,
   "total": 262181,
-  "total_gz": 88830,
+  "total_gz": 88825,
   "sent": [
     "__cxa_begin_catch",
     "__cxa_end_catch",