@wasm-oj/server 0.2.3 → 0.2.5

package/crates/runtime-core/src/deterministic.rs

@@ -6,6 +6,7 @@ use crate::{
     },
     types::DeterminismConfig,
 };
+use std::cell::Cell;
 use std::sync::{Arc, Mutex};
 use wasmer::{
     AsStoreMut, Extern, Function, FunctionEnv, FunctionEnvMut, Imports, Memory, Memory32, Memory64,
@@ -239,6 +240,23 @@ struct PollEnv {
     clock: VirtualClock,
 }
 
+thread_local! {
+    static STDIN_READINESS_DEFERRALS: Cell<u64> = const { Cell::new(0) };
+}
+
+/// Whether an empty stdin readiness check may return `Pending` instead of
+/// blocking. A clock probe never blocks. A poll without a clock grants one
+/// deferral per read subscription, so WASIX reports any other ready
+/// subscription first and blocks on stdin only when it would wait anyway.
+#[cfg(target_arch = "wasm32")]
+pub(crate) fn defer_stdin_readiness() -> bool {
+    STDIN_READINESS_DEFERRALS.with(|deferrals| {
+        let remaining = deferrals.get();
+        deferrals.set(remaining.saturating_sub(1));
+        remaining > 0
+    })
+}
+
 #[derive(Clone, Copy)]
 struct ClockSubscription {
     subscription: Subscription,
@@ -251,6 +269,7 @@ fn call_original_poll<M: MemorySize>(
     events: WasmPtr<Event, M>,
     subscription_count: M::Offset,
     event_count: WasmPtr<M::Offset, M>,
+    stdin_deferrals: u64,
 ) -> Result<i32, RuntimeError> {
     let Some(original) = env.data().original.clone() else {
         return Ok(Errno::Notsup as i32);
@@ -262,6 +281,7 @@ fn call_original_poll<M: MemorySize>(
             Value::I32(offset as i32)
         }
     };
+    STDIN_READINESS_DEFERRALS.with(|deferrals| deferrals.set(stdin_deferrals));
     let results = original.call(
         env,
         &[
@@ -270,7 +290,9 @@ fn call_original_poll<M: MemorySize>(
             pointer(subscription_count.into()),
             pointer(event_count.offset().into()),
         ],
-    )?;
+    );
+    STDIN_READINESS_DEFERRALS.with(|deferrals| deferrals.set(0));
+    let results = results?;
     match results.as_ref() {
         [Value::I32(errno)] => Ok(*errno),
         _ => Err(RuntimeError::new(
@@ -302,6 +324,7 @@ fn deterministic_poll_oneoff<M: MemorySize>(
     let mut originals = Vec::with_capacity(input.len() as usize);
     let mut clock_subscriptions = Vec::new();
     let mut has_non_clock = false;
+    let mut read_subscriptions = 0;
     for index in 0..input.len() {
         let subscription = input
             .index(index)
@@ -320,6 +343,7 @@ fn deterministic_poll_oneoff<M: MemorySize>(
             });
         } else {
             has_non_clock = true;
+            read_subscriptions += u64::from(subscription.type_ == Eventtype::FdRead);
         }
     }
 
@@ -330,6 +354,7 @@ fn deterministic_poll_oneoff<M: MemorySize>(
             events,
             subscription_count,
             event_count,
+            read_subscriptions,
         );
     }
 
@@ -355,6 +380,7 @@ fn deterministic_poll_oneoff<M: MemorySize>(
             events,
             subscription_count,
             event_count,
+            u64::MAX,
         );
         let restore_view = memory.view(&env);
         let restore_input = subscriptions