update Swoole Library for v6.0.0-rc1

Signed-off-by: Demin Yin <[email protected]>
swoole · Nov 29, 2024 · a8a6c7e · a8a6c7e
1 parent 5e54938
commit a8a6c7e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/src/swoole_library/src/core/Constant.php b/src/swoole_library/src/core/Constant.php
@@ -127,6 +127,10 @@ class Constant
 
     public const OPTION_IOURING_ENTRIES = 'iouring_entries';
 
+    public const OPTION_IOURING_WORKERS = 'iouring_workers';
+
+    public const OPTION_IOURING_FLAG = 'iouring_flag';
+
     public const OPTION_ENABLE_SIGNALFD = 'enable_signalfd';
 
     public const OPTION_WAIT_SIGNAL = 'wait_signal';

diff --git a/src/swoole_library/src/core/Curl/Handler.php b/src/swoole_library/src/core/Curl/Handler.php
@@ -13,9 +13,9 @@
 
 namespace Swoole\Curl;
 
-use Swoole;
 use Swoole\Constant;
 use Swoole\Coroutine\Http\Client;
+use Swoole\Coroutine\System;
 use Swoole\Curl\Exception as CurlException;
 use Swoole\Http\Status;
 
@@ -717,7 +717,7 @@ private function execute()
                 }
 
                 if (!filter_var($proxy, FILTER_VALIDATE_IP)) {
-                    $ip = Swoole\Coroutine::gethostbyname($proxy, AF_INET, $this->clientOptions['connect_timeout'] ?? -1);
+                    $ip = System::gethostbyname($proxy, AF_INET, $this->clientOptions['connect_timeout'] ?? -1);
                     if (!$ip) {
                         $this->setError(CURLE_COULDNT_RESOLVE_PROXY, 'Could not resolve proxy: ' . $proxy);
                         return false;

diff --git a/src/swoole_library/src/core/Thread/Pool.php b/src/swoole_library/src/core/Thread/Pool.php
@@ -34,6 +34,7 @@ class Pool
     private object $running;
 
     private object $queue;
+
     private array $indexes = [];
 
     public function __construct(string $runnableClass, int $threadNum)
@@ -45,7 +46,7 @@ public function __construct(string $runnableClass, int $threadNum)
         $this->threadNum     = $threadNum;
     }
 
-    public function withArguments(array $arguments): static
+    public function withArguments(...$arguments): static
     {
         $this->arguments = $arguments;
         return $this;
@@ -66,7 +67,7 @@ public function withClassDefinitionFile(string $classDefinitionFile): static
     /**
      * @throws \ReflectionException
      */
-    public function start(array $arguments = []): void
+    public function start(): void
     {
         if (empty($this->classDefinitionFile) and class_exists($this->runnableClass, false)) {
             $file = (new \ReflectionClass($this->runnableClass))->getFileName();
@@ -131,11 +132,11 @@ public function start(array $arguments = []): void
 
         while ($this->running->get()) {
             $threadId = $this->queue->pop(-1);
-            $thread = $this->threads[$threadId];
-            $index = $this->indexes[$threadId];
+            $thread   = $this->threads[$threadId];
+            $index    = $this->indexes[$threadId];
             $thread->join();
-            unset($this->threads[$threadId]);
-            unset($this->indexes[$threadId]);
+            unset($this->threads[$threadId], $this->indexes[$threadId]);
+
             $this->createThread($index);
         }
 

diff --git a/src/swoole_library/src/core/Thread/Runnable.php b/src/swoole_library/src/core/Thread/Runnable.php
@@ -14,12 +14,13 @@
 abstract class Runnable
 {
     protected Atomic $running;
+
     protected int $id;
 
     public function __construct($running, $index)
     {
         $this->running = $running;
-        $this->id = $index;
+        $this->id      = $index;
     }
 
     abstract public function run(array $args): void;