Update EventLoop.php

VennDev · Aug 15, 2024 · 24ba12a · 24ba12a
1 parent ffd9885
commit 24ba12a
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/src/vennv/vapm/simultaneous/EventLoop.php b/src/vennv/vapm/simultaneous/EventLoop.php
@@ -26,7 +26,6 @@
 use Generator;
 use SplQueue;
 use Throwable;
-use function count;
 use const PHP_INT_MAX;
 
 interface EventLoopInterface
@@ -162,16 +161,10 @@ private static function clearGarbage(): void
      */
     protected static function run(): void
     {
-        if (count(GreenThread::getFibers()) > 0) GreenThread::run();
-
         $i = 0;
-
-        while (self::$queues->isEmpty() === false) {
-            if ($i++ >= self::$limit) break;
+        while (!self::$queues->isEmpty() && $i++ < self::$limit) {
             /** @var Promise $promise */
             $promise = self::$queues->dequeue();
-
-            $id = $promise->getId();
             $fiber = $promise->getFiber();
 
             if ($fiber->isSuspended()) {
@@ -186,14 +179,14 @@ protected static function run(): void
                 } catch (Throwable $e) {
                     echo $e->getMessage();
                 }
-                MicroTask::addTask($id, $promise);
+                MicroTask::addTask($promise);
             } else {
                 self::$queues->enqueue($promise); // Add to queue again
             }
         }
 
-        if (count(MicroTask::getTasks()) > 0) MicroTask::run();
-        if (count(MacroTask::getTasks()) > 0) MacroTask::run();
+        if (!MicroTask::getTasks()->isEmpty()) MicroTask::run();
+        if (!MacroTask::getTasks()->isEmpty()) MacroTask::run();
 
         self::clearGarbage();
     }
@@ -203,8 +196,8 @@ protected static function run(): void
      */
     protected static function runSingle(): void
     {
-        self::$limit = min((int)(self::$queues->count() / 2) + 1, 100); // Limit 100 promises per loop
-        while (self::$queues->isEmpty() === false || count(MicroTask::getTasks()) > 0 || count(MacroTask::getTasks()) > 0 || count(GreenThread::getFibers()) > 0) self::run();
+        self::$limit = min((int)((self::$queues->count() / 2) + 1), 100); // Limit 100 promises per loop
+        while (!self::$queues->isEmpty() || !MicroTask::getTasks()->isEmpty() || !MacroTask::getTasks()->isEmpty()) self::run();
     }
 
 }