改名

System/Pool/Helper/QueueInterface.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Kiri\Pool\Helper;
+
+interface QueueInterface
+{
+
+
+	public function isEmpty(): bool;
+
+	public function push(mixed $data, float $timeout = -1): bool;
+
+
+	public function pop(float $timeout = -1): mixed;
+
+
+	public function stats(): array;
+
+
+	public function close(): bool;
+
+
+	public function length(): int;
+
+
+	public function isFull(): bool;
+
+}

System/Pool/Helper/SplQueue.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace Kiri\Pool\Helper;
+
+
+use JetBrains\PhpStorm\Pure;
+
+/**
+ *
+ */
+class SplQueue implements QueueInterface
+{
+
+	private \SplQueue $channel;
+
+
+	public int $errCode = 0;
+
+
+	/**
+	 * @param int $max
+	 */
+	#[Pure] public function __construct(public int $max)
+	{
+		$this->channel = new \SplQueue();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isEmpty(): bool
+	{
+		// TODO: Implement isEmpty() method.
+		return $this->channel->count() < 1;
+	}
+
+
+	/**
+	 * @param mixed $data
+	 * @param float $timeout
+	 * @return bool
+	 */
+	public function push(mixed $data, float $timeout = -1): bool
+	{
+		// TODO: Implement push() method.
+		$this->channel->enqueue($data);
+		return true;
+	}
+
+
+	/**
+	 * @param float $timeout
+	 * @return mixed
+	 */
+	public function pop(float $timeout = -1): mixed
+	{
+		// TODO: Implement pop() method.
+		return $this->channel->dequeue();
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function stats(): array
+	{
+		// TODO: Implement stats() method.
+		return [];
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function close(): bool
+	{
+		// TODO: Implement close() method.
+		return false;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function length(): int
+	{
+		// TODO: Implement length() method.
+		return $this->channel->count();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isFull(): bool
+	{
+		// TODO: Implement isFull() method.
+		return $this->channel->count() >= $this->max;
+	}
+}

System/Pool/Pool.php

@@ -5,14 +5,12 @@ namespace Kiri\Pool;
 
 
 use Exception;
-use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri\Pool\Helper\SplQueue;
 use Swoole\Coroutine;
 use Swoole\Coroutine\Channel;
-use Swoole\Timer;
 
 
 /**
@@ -48,9 +46,6 @@ class Pool extends Component
 	 */
 	protected function pop(Channel $channel, $retain_number): void
 	{
-        if (Coroutine::getCid() === -1) {
-            return;
-        }
 		while ($channel->length() > $retain_number) {
 			$connection = $channel->pop();
 			if ($connection instanceof StopHeartbeatCheck) {
@@ -64,17 +59,19 @@ class Pool extends Component
 	 * @param $name
 	 * @param false $isMaster
 	 * @param int $max
+	 * @throws ConfigException
 	 */
 	public function initConnections($name, bool $isMaster = false, int $max = 60)
 	{
 		$name = $this->name($name, $isMaster);
-        if (isset(static::$_connections[$name]) && static::$_connections[$name] instanceof Channel) {
+		if (isset(static::$_connections[$name])) {
 			return;
 		}
-        if (Coroutine::getCid() === -1) {
+		$value = static::$_connections[$name];
+		if ($value instanceof Channel || $value instanceof SplQueue) {
 			return;
 		}
-        static::$_connections[$name] = new Channel($max);
+		$this->newChannel($name, $max);
 		$this->max = $max;
 	}
 
@@ -88,7 +85,7 @@ class Pool extends Component
 	private function getChannel($name): Channel
 	{
 		if (!isset(static::$_connections[$name])) {
-            static::$_connections[$name] = new Channel(Config::get('databases.pool.max', 10));
+			$this->newChannel($name);
 		}
 		if (static::$_connections[$name]->errCode == SWOOLE_CHANNEL_CLOSED) {
 			throw new Exception('Channel is Close.');
@@ -97,6 +94,22 @@ class Pool extends Component
 	}
 
 
+	/**
+	 * @throws ConfigException
+	 */
+	private function newChannel($name, $max = null)
+	{
+		if ($max !== null) {
+			$max = Config::get('databases.pool.max', 10);
+		}
+		if (Coroutine::getCid() === -1) {
+			static::$_connections[$name] = new SplQueue($max);
+		} else {
+			static::$_connections[$name] = new Channel($max);
+		}
+	}
+
+
 	/**
 	 * @param $name
 	 * @param $callback
@@ -105,9 +118,6 @@ class Pool extends Component
 	 */
 	public function get($name, $callback): mixed
 	{
-        if (Coroutine::getCid() === -1) {
-            return $callback();
-        }
 		$channel = $this->getChannel($name);
 		if (!$channel->isEmpty()) {
 			$connection = $channel->pop();
@@ -161,9 +171,6 @@ class Pool extends Component
 	 */
 	public function size(string $name): mixed
 	{
-        if (Coroutine::getCid() === -1) {
-            return 0;
-        }
 		if (!isset(static::$_connections[$name])) {
 			return 0;
 		}
@@ -178,9 +185,6 @@ class Pool extends Component
 	 */
 	public function push(string $name, mixed $client)
 	{
-        if (Coroutine::getCid() === -1) {
-            return;
-        }
 		$channel = $this->getChannel($name);
 		if (!$channel->isFull()) {
 			$channel->push($client);
@@ -195,7 +199,7 @@ class Pool extends Component
 	 */
 	public function clean(string $name)
 	{
-        if (Coroutine::getCid() === -1 || !isset(static::$_connections[$name])) {
+		if (!isset(static::$_connections[$name])) {
 			return;
 		}
 		$channel = static::$_connections[$name];