fix: scheduler::resume/throw behavior adds a pre check before execution.

Author: cclilshy

src/Runtime/FiberCoroutine.php

@@ -34,9 +34,9 @@ final class FiberCoroutine extends Coroutine
      */
     public function __get(string $name): mixed
     {
-        return match($name) {
+        return match ($name) {
             'result' => $this->result,
-            default =>  new UnexpectedValueException("Property {$name} does not exist or is not accessible")
+            default => new UnexpectedValueException("Property {$name} does not exist or is not accessible")
         };
     }
 
@@ -74,7 +74,6 @@ public function start(): mixed
         try {
             $result = $this->fiber->start(...$this->args);
         } catch (Throwable $exception) {
-            $this->result = $exception;
             $this->setState(Coroutine::STATE_DEAD);
             throw $exception;
         }
@@ -103,15 +102,9 @@ public function suspend(mixed $value = null): mixed
         }
 
         $this->setState(Coroutine::STATE_WAITING);
-
-        try {
-            $result = $this->fiber->suspend($value);
-        } catch (Throwable $exception) {
-            $this->setState(Coroutine::STATE_DEAD);
-            throw $exception;
-        }
-
+        $result = $this->fiber->suspend($value);
         $this->setState(Coroutine::STATE_RUNNING);
+
         return $result;
     }
 
@@ -123,6 +116,10 @@ public function suspend(mixed $value = null): mixed
      */
     public function resume(mixed $value = null): mixed
     {
+        if ($this->state !== Coroutine::STATE_WAITING) {
+            throw new CoroutineStateException('Coroutine::resume() called with coroutine not in running state');
+        }
+
         $this->setState(Coroutine::STATE_RUNNING);
 
         try {
@@ -151,6 +148,10 @@ public function resume(mixed $value = null): mixed
      */
     public function throw(Throwable $exception): mixed
     {
+        if ($this->state !== Coroutine::STATE_WAITING) {
+            throw new CoroutineStateException('Coroutine::throw() called with coroutine not in running state');
+        }
+
         $this->setState(Coroutine::STATE_RUNNING);
 
         try {
@@ -182,7 +183,7 @@ public function recycle(?Closure $callback = null): void
             new CoroutineStateException("Unable to recycle a coroutine in use");
         }
 
-        $this->fiber = new Fiber($callback);
+        $this->callback = $callback;
         $this->recycleReset();
     }
 

src/Runtime/Scheduler.php

@@ -29,8 +29,6 @@
 
 use function array_shift;
 use function str_repeat;
-use function array_slice;
-use function debug_backtrace;
 
 Runtime::init();
 
@@ -140,7 +138,7 @@ public static function enqueue(Coroutine $coroutine, bool $immediate = false): v
                 $coroutine->state(),
                 Coroutine::STATE_RUNNABLE,
                 $coroutine,
-                "self::enqueue() called with non-runnable coroutine"
+                "Scheduler::enqueue() called with non-runnable coroutine"
             );
         }
 
@@ -281,8 +279,6 @@ public static function runnableQueue(): SplQueue
      */
     public static function start(Coroutine $coroutine): void
     {
-        Runtime::$DEBUG &&
-        $coroutine->addTrace($coroutine->state(), 'start', array_slice(debug_backtrace(), 0, 1));
         $coroutine->runnable();
 
         self::$coroutineMap[$coroutine->key()] = WeakReference::create($coroutine);
@@ -307,9 +303,6 @@ public static function start(Coroutine $coroutine): void
      */
     public static function resume(Coroutine $coroutine, mixed $value = null): ControlResult
     {
-        Runtime::$DEBUG &&
-        $coroutine->addTrace($coroutine->state(), 'resume', array_slice(debug_backtrace(), 0, 1));
-
         try {
             return new ControlResult('resume', $coroutine->resume($value), $coroutine);
         } catch (Throwable $exception) {
@@ -330,9 +323,6 @@ public static function resume(Coroutine $coroutine, mixed $value = null): Contro
      */
     public static function throw(Coroutine $coroutine, Throwable $exception): ControlResult
     {
-        Runtime::$DEBUG &&
-        $coroutine->addTrace($coroutine->state(), 'throw', array_slice(debug_backtrace(), 0, 1));
-
         try {
             return new ControlResult('throw', $coroutine->throw($exception), $coroutine);
         } catch (Throwable $exception) {

src/Runtime/Trait/StateMachine.php

@@ -14,6 +14,7 @@
 
 use Closure;
 use Ripple\Coroutine;
+use Ripple\Runtime\Exception\CoroutineException;
 
 use function array_pop;
 use function array_reverse;
@@ -64,6 +65,12 @@ public function setState(string $state): void
             return;
         }
 
+        if ($state === Coroutine::STATE_DEAD && isset($this->fiber)) {
+            if (!$this->fiber->isTerminated()) {
+                throw new CoroutineException('状态不同步');
+            }
+        }
+
         $this->state = $state;
 
         // 内部分发

tests/Net/HttpFileTransferTest.php

@@ -168,14 +168,6 @@ public function testFileDownload(): void
 
             $serverMd5 = $response->getHeaderLine('Content-MD5');
             $localMd5  = md5_file($downloadedFile);
-            $serverContentLength = $response->getHeaderLine('Content-Length');
-            $localFileSize = filesize($downloadedFile);
-
-            echo "serverMd5: $serverMd5\n";
-            echo "localMd5: $localMd5\n";
-            echo "serverContentLength: $serverContentLength\n";
-            echo "localFileSize: $localFileSize\n";
-
             $this->assertNotEmpty($serverMd5, '服务器未返回Content-MD5头');
             $this->assertEquals($serverMd5, $localMd5, '下载文件MD5校验失败');
 

tests/Sync/MutexTest.php

@@ -90,7 +90,7 @@ public function testMultipleCoroutinesCompeting(): void
             go(function () use ($mutex, &$sharedData, &$results, $i) {
                 $mutex->lock();
 
-                Time::sleep(1);
+                Time::sleep(0.1);
                 $oldValue = $sharedData;
                 $sharedData = $oldValue + 1;
                 $results[] = "Coroutine $i: $oldValue -> $sharedData";
@@ -152,12 +152,12 @@ public function testUnlockByNonOwner(): void
         go(function () use ($mutex, &$results) {
             $mutex->lock();
             $results[] = "Coroutine 1 got lock";
-            Time::sleep(1);
+            Time::sleep(0.1);
         });
 
         // 协程2尝试解锁协程1的锁
         go(function () use ($mutex, &$results) {
-            Time::sleep(1);
+            Time::sleep(0.1);
             try {
                 $mutex->unlock();
                 $results[] = "Coroutine 2 unlocked (should not happen)";
@@ -262,7 +262,7 @@ public function testConcurrentLockSafety(): void
             $coroutines[] = go(function () use ($mutex, &$counter, &$results, $i) {
                 for ($j = 0; $j < 10; $j++) {
                     $mutex->lock();
-                    Time::sleep(1); // 模拟一些工作
+                    Time::sleep(0.1); // 模拟一些工作
                     $counter++;
                     $mutex->unlock();
                 }