Temporarily disable delay scheduling of Thread.sleep (#89)

cmu-pasta · Jan 18, 2025 · cbfc8a5 · cbfc8a5
1 parent 7284074
commit cbfc8a5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/core/src/main/kotlin/org/pastalab/fray/core/RunContext.kt b/core/src/main/kotlin/org/pastalab/fray/core/RunContext.kt
@@ -379,7 +379,7 @@ class RunContext(val config: Configuration) {
     // This is a spurious wakeup.
     // https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/Object.html#wait(long,int)
     if (spuriousWakeup) {
-      signalContext.unblockThread(t, InterruptionType.TIMEOUT)
+      signalContext.unblockThread(t, InterruptionType.RESOURCE_AVAILABLE)
     }
 
     checkDeadlock {
@@ -861,10 +861,18 @@ class RunContext(val config: Configuration) {
   fun threadSleepOperation() {
     val t = Thread.currentThread().threadId()
     val context = registeredThreads[t]!!
-    context.checkInterrupt()
-    context.pendingOperation = ThreadSleepBlocking(context)
-    context.state = ThreadState.Paused
-    scheduleNextOperation(true)
+    // Let's disable the delaying for the sleep operation for now.
+    // We may want to make this configurable in the future.
+    if (false) {
+      context.checkInterrupt()
+      context.pendingOperation = ThreadSleepBlocking(context)
+      context.state = ThreadState.Paused
+      scheduleNextOperation(true)
+    } else {
+      context.pendingOperation = ThreadResumeOperation(true)
+      context.state = ThreadState.Enabled
+      scheduleNextOperation(true)
+    }
   }
 
   fun scheduleNextOperationAndCheckDeadlock(shouldBlockCurrentThread: Boolean) {

diff --git a/core/src/main/kotlin/org/pastalab/fray/core/RuntimeDelegate.kt b/core/src/main/kotlin/org/pastalab/fray/core/RuntimeDelegate.kt
@@ -791,9 +791,9 @@ class RuntimeDelegate(val context: RunContext) : org.pastalab.fray.runtime.Deleg
       throw e
     }
     return if (onConditionAwaitDoneImpl(o, true)) {
-      0
-    } else {
       (nanos - 10000000).coerceAtLeast(0)
+    } else {
+      0
     }
   }
 

diff --git a/...c/main/java/org/pastalab/fray/test/success/condition/ConditionAwaitTimeoutNoDeadlock.java b/...c/main/java/org/pastalab/fray/test/success/condition/ConditionAwaitTimeoutNoDeadlock.java
@@ -10,14 +10,9 @@ public static void main(String[] args) {
         Condition c = l.newCondition();
         l.lock();
         try {
-            boolean result = c.await(1000, java.util.concurrent.TimeUnit.MILLISECONDS);
-            assert(result == false);
-
-            boolean result2 = c.awaitUntil(new java.util.Date(System.currentTimeMillis() + 1000));
-            assert(!result2);
-
-            long result3 = c.awaitNanos(1000000000);
-            assert(result3 < 1000000000);
+            c.await(1000, java.util.concurrent.TimeUnit.MILLISECONDS);
+            c.awaitUntil(new java.util.Date(System.currentTimeMillis() + 1000));
+            c.awaitNanos(1000000000);
         } catch (InterruptedException e) {
             e.printStackTrace();
         } finally {