Replace env.sleep/now_ms shims with the time stdlib module.

Author: malbarbo

engine/src/lib.rs

@@ -682,22 +682,6 @@ pub fn repl_new(source: &str, level: Level) -> Box<ReplState> {
 fn register_ffi_module(vm: &vm::VirtualMachine) {
     use rustpython::vm::PyObjectRef;
 
-    let sleep_fn = vm.new_function(
-        "sleep",
-        |ms: i64, vm: &vm::VirtualMachine| -> vm::PyResult {
-            wasm_ffi::sleep_ms(ms);
-            Ok(vm.ctx.none())
-        },
-    );
-
-    let now_ms_fn = vm.new_function("now_ms", |vm: &vm::VirtualMachine| -> PyObjectRef {
-        let ms = std::time::SystemTime::now()
-            .duration_since(std::time::UNIX_EPOCH)
-            .map(|d| d.as_millis() as i64)
-            .unwrap_or(0);
-        vm.ctx.new_int(ms).into()
-    });
-
     let show_svg_fn = vm.new_function(
         "show_svg",
         |svg: String, vm: &vm::VirtualMachine| -> vm::PyResult {
@@ -777,8 +761,6 @@ fn register_ffi_module(vm: &vm::VirtualMachine) {
     );
 
     let dict = vm.ctx.new_dict();
-    dict.set_item("sleep", sleep_fn.into(), vm).unwrap();
-    dict.set_item("now_ms", now_ms_fn.into(), vm).unwrap();
     dict.set_item("show_svg", show_svg_fn.into(), vm).unwrap();
     dict.set_item("get_key_event", get_key_event_fn.into(), vm)
         .unwrap();

engine/src/wasm_ffi.rs

@@ -6,7 +6,6 @@
 #[cfg(target_arch = "wasm32")]
 #[link(wasm_import_module = "env")]
 unsafe extern "C" {
-    fn sleep(ms: i64);
     fn draw_svg(ptr: *const u8, len: usize);
     fn get_key_event(key_ptr: *mut u8, key_len: usize, mods_ptr: *mut u8) -> i32;
     fn text_width(
@@ -35,22 +34,6 @@ unsafe extern "C" {
     ) -> f64;
 }
 
-/// Block for `ms` milliseconds. On WASM, calls the host's env.sleep (which yields
-/// to the JS event loop and wakes early on Stop). On native, uses std::thread::sleep.
-pub fn sleep_ms(ms: i64) {
-    if ms <= 0 {
-        return;
-    }
-    #[cfg(target_arch = "wasm32")]
-    unsafe {
-        sleep(ms);
-    }
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        std::thread::sleep(std::time::Duration::from_millis(ms as u64));
-    }
-}
-
 /// Show an SVG image. On WASM, calls the env import; on native, prints to stdout.
 pub fn show_svg(svg: &str) {
     #[cfg(target_arch = "wasm32")]

lib/spython/system.py

@@ -1,10 +1,18 @@
 import sys
 import builtins
+import time as _time
+
+
+def sleep(ms: int) -> None:
+    _time.sleep(ms / 1000.0)
+
+
+def now_ms() -> int:
+    return int(_time.time() * 1000)
+
 
 try:
     from _spython_ffi import (
-        sleep,
-        now_ms,
         show_svg,
         get_key_event,
         text_width,
@@ -14,13 +22,6 @@
         load_bitmap,
     )  # type: ignore[import-not-found]
 except ImportError:
-    import time as _time
-
-    def sleep(ms: int) -> None:
-        _time.sleep(ms / 1000.0)
-
-    def now_ms() -> int:
-        return int(_time.time() * 1000)
 
     def show_svg(svg: str) -> None:
         print(svg)

typeshed_allowlist.txt

@@ -23,6 +23,7 @@ os
 os.path
 re
 sys
+time
 types
 typing
 typing_extensions

wasm/tests/wasi.ts

@@ -249,7 +249,34 @@ export function makeWasi(options: WasiOptions) {
     path_filestat_get: (): number => WASI_ENOSYS,
     fd_prestat_get: (): number => WASI_EBADF,
     fd_prestat_dir_name: (): number => WASI_ENOSYS,
-    poll_oneoff: (): number => WASI_ENOSYS,
+    poll_oneoff: (
+      inPtr: number,
+      outPtr: number,
+      nsubscriptions: number,
+      neventsPtr: number,
+    ): number => {
+      // Test polyfill: emit a clock event for the first clock subscription
+      // (so std::thread::sleep / time.sleep don't panic), but skip the
+      // actual block to keep tests fast.
+      try {
+        const dv = new DataView(buf());
+        for (let i = 0; i < nsubscriptions; i++) {
+          const o = inPtr + i * 48;
+          const userdata = dv.getBigUint64(o, true);
+          const tag = dv.getUint8(o + 8);
+          if (tag !== 0) continue;
+          const u8 = new Uint8Array(buf());
+          u8.fill(0, outPtr, outPtr + 32);
+          dv.setBigUint64(outPtr, userdata, true);
+          dv.setInt32(neventsPtr, 1, true);
+          return WASI_ESUCCESS;
+        }
+        dv.setInt32(neventsPtr, 0, true);
+        return WASI_ESUCCESS;
+      } catch {
+        return WASI_ENOSYS;
+      }
+    },
     sched_yield: (): number => WASI_ESUCCESS,
   };
 }

wasm/tests/wasm_test.ts

@@ -66,8 +66,6 @@ function makeEnv(
     check_interrupt: (): number => {
       return interrupted ? 1 : 0;
     },
-    sleep: (_ms: bigint): void => {},
-    now_ms: (): bigint => BigInt(Date.now()),
     draw_svg: (ptr: number, len: number): void => {
       const b = new Uint8Array(getBuffer() as ArrayBuffer);
       svgs.push(decoder.decode(b.slice(ptr, ptr + len)));