redis,mysql协程连接池加入调用次数矫正，防止极端情况下的超调用

bingcool · May 24, 2019 · 5e33d15 · 5e33d15
1 parent d2ce3dd
commit 5e33d15
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/score/Core/ComponentTrait.php b/score/Core/ComponentTrait.php
@@ -288,7 +288,7 @@ public function __get($name) {
 				if(in_array($name, $this->component_pools)) {
 				    $poolHandler = \Swoolefy\Core\Coroutine\CoroutinePools::getInstance()->getPool($name);
 					if(is_object($poolHandler)) {
-                        $this->container[$name] = $poolHandler->getObj();
+                        $this->container[$name] = $poolHandler->fetchObj();
                     }
 					// 如果没有设置进程池处理实例，则降级到创建实例模式
 					if(isset($this->container[$name]) && is_object($this->container[$name])) {

diff --git a/score/Core/Coroutine/CoroutinePools.php b/score/Core/Coroutine/CoroutinePools.php
@@ -64,6 +64,9 @@ public function addPool(string $pool_name, $handler) {
      * @return   mixed
      */
     public function getPool(string $pool_name) {
+        if(!$pool_name) {
+            return null;
+        }
         $pool_name = trim($pool_name);
         if(isset($this->pools[$pool_name])) {
             return $this->pools[$pool_name];

diff --git a/score/Core/Coroutine/PoolsHandler.php b/score/Core/Coroutine/PoolsHandler.php
@@ -25,6 +25,8 @@ abstract class PoolsHandler {
 
 	protected $popTimeout = 1;
 
+	protected $callCount = 0;
+
 	public function setMaxPoolsNum(int $maxPoolsNum = 50) {
 		$this->maxPoolsNum = $maxPoolsNum;
 	}
@@ -88,11 +90,27 @@ public function registerPools(string $pool_name = null) {
 	public function pushObj($obj) {
 		if(is_object($obj)) {
 		    go(function() use($obj) {
-                $this->channel->push($obj, $this->pushTimeout);
+                $result = $this->channel->push($obj, $this->pushTimeout);
+                $length = $this->channel->length();
+                // 矫正
+                if(($this->maxPoolsNum - $length) == $this->callCount - 1) {
+                	$this->callCount--;
+                }else {
+                	$this->callCount = $this->maxPoolsNum - $length;
+                }
             });
 		}
 	}
 
+	public function fetchObj() {
+		try {
+			$this->callCount++;
+			return $this->getObj();
+		}catch(\Exception $e) {
+			throw new \Exception($e->getMessage());
+		}
+	}
+
 	/**
 	 * getObj 开发者自行实现
 	 * @return