@@ -77,7 +77,7 @@ function connect()
         try
         {
             $this->_redis = new \Redis();
-            if ($this->config['pconnect'])
+            if (!empty($this->config['pconnect']))
             {
                 $this->_redis->pconnect($this->config['host'], $this->config['port'], $this->config['timeout']);
             }
 
@@ -37,7 +37,7 @@ function _createObject()
             {
                 $object = $this->pool->pop();
                 //必须要 Swoole 2.1.1 以上版本
-                if ($object->connected === false)
+                if (property_exists($object, "connected") and $object->connected === false)
                 {
                     continue;
                 }
 
@@ -0,0 +1,77 @@
+<?php
+
+namespace Swoole\Coroutine\Component\Hook;
+
+use Swoole\Coroutine\Component\Base;
+use Swoole\Coroutine\Context;
+use Swoole\Database\MySQLi as CoMysql;
+
+
+class MySQL extends Base
+{
+    protected $type = 'mysql';
+
+    function __construct($config)
+    {
+        parent::__construct($config);
+        \Swoole::getInstance()->beforeAction([$this, '_createObject'], \Swoole::coroModuleDb);
+        \Swoole::getInstance()->afterAction([$this, '_freeObject'],\Swoole::coroModuleDb);
+    }
+
+    function create()
+    {
+        $db = new CoMySQL($this->config);
+        if ($db->connect() === false)
+        {
+            return false;
+        }
+        else
+        {
+            return $db;
+        }
+    }
+
+    function query($sql)
+    {
+        /**
+         * @var $db CoMySQL
+         */
+        $db = $this->_getObject();
+        if (!$db)
+        {
+            return false;
+        }
+
+        $result = false;
+        for ($i = 0; $i < 2; $i++)
+        {
+            $result = $db->query($sql);
+            if ($result === false)
+            {
+                $db->close();
+                Context::delete($this->type);
+                $db = $this->_createObject();
+                continue;
+            }
+            break;
+        }
+
+        return $result;
+    }
+
+    /**
+     * 调用$driver的自带方法
+     * @param $method
+     * @param array $args
+     * @return mixed
+     */
+    function __call($method, $args = array())
+    {
+        $redis = $this->_getObject();
+        if (!$redis)
+        {
+            return false;
+        }
+        return $redis->{$method}(...$args);
+    }
+}
@@ -0,0 +1,40 @@
+<?php
+
+namespace Swoole\Coroutine\Component\Hook;
+
+use Swoole\Coroutine\Component\Base;
+use Swoole\Component\Redis as CoRedis;
+
+class Redis extends Base
+{
+    protected $type = 'redis';
+
+    function __construct($config)
+    {
+        parent::__construct($config);
+        \Swoole::getInstance()->beforeAction([$this, '_createObject'],\Swoole::coroModuleRedis);
+        \Swoole::getInstance()->afterAction([$this, '_freeObject'],\Swoole::coroModuleRedis);
+    }
+
+
+    function create()
+    {
+        return new CoRedis($this->config);
+    }
+
+    /**
+     * 调用$driver的自带方法
+     * @param $method
+     * @param array $args
+     * @return mixed
+     */
+    function __call($method, $args = array())
+    {
+        $redis = $this->_getObject();
+        if (!$redis)
+        {
+            return false;
+        }
+        return $redis->{$method}(...$args);
+    }
+}
@@ -82,6 +82,9 @@ function __construct($db_config)
             case self::TYPE_COMYSQL:
                 $this->_db = new Coroutine\Component\MySQL($db_config);
                 break;
+            case self::TYPE_COHOOKMYSQL:
+                $this->_db = new Coroutine\Component\HOOK\MySQL($db_config);
+                break;
             default:
                 $this->_db = new Database\PdoDB($db_config);
                 break;
 
@@ -109,6 +109,8 @@ class Swoole
      * @var bool
      */
     static $enableCoroutine = false;
+    static $coroutineStreamHook = [];
+    static $coroutineStreamHookSupported = ['redis','mysql'];
     protected static $coroutineInit = false;
     const coroModuleDb = 1;
     const coroModuleRedis = 2;
@@ -317,6 +319,22 @@ static function go($func)
         });
     }
 
+    static function setCoroutineStreamHook($type = null)
+    {
+        if ($type)
+        {
+            if (!in_array($type, self::$coroutineStreamHookSupported))
+            {
+                throw new RuntimeException("stream hook type [$type] not support");
+            }
+            self::$coroutineStreamHook[$type] = $type;
+        }
+        foreach (self::$coroutineStreamHookSupported as $_type)
+        {
+            self::$coroutineStreamHook[$_type] = $_type;
+        }
+    }
+
     /**
      * 执行Hook函数列表
      * @param $type
@@ -490,16 +508,23 @@ protected function loadModule($module, $id = 'master')
             {
                 $object = require $user_factory_file;
             }
-            //Swoole 2.0 协程模式
+            //Swoole协程模式
             elseif (self::$enableCoroutine)
             {
-                $system_factory_2x_file = LIBPATH . '/factory_2x/' . $module . '.php';
+                if (!empty(self::$coroutineStreamHook[$module]))
+                {
+                    $system_factory_file = LIBPATH . '/factory_hook/' . $module . '.php';
+                }
+                else
+                {
+                    $system_factory_file = LIBPATH . '/factory_2x/' . $module . '.php';
+                }
                 //不存在，继续使用 1.x 的工厂
-                if (!is_file($system_factory_2x_file))
+                if (!is_file($system_factory_file))
                 {
                     goto get_factory_file;
                 }
-                $object = require $system_factory_2x_file;
+                $object = require $system_factory_file;
             }
             //系统默认
             else
@@ -763,33 +788,33 @@ function handlerServer(Swoole\Request $request)
     /**
      * 加载所有模块
      */
-    function loadAllModules()
+    function loadAllModules($type = null)
     {
-        //redis
-        $redis_conf = $this->config['redis'];
-        if (!empty($redis_conf))
+        $support = ['db','redis','cache'];
+        if (!empty($type) and in_array($type,$support))
         {
-            foreach ($redis_conf as $k => $v)
+            $conf = $this->config[$type];
+            if (!empty($conf))
             {
-                $this->loadModule('redis', $k);
-            }
-        }
-        //cache
-        $cache_conf = $this->config['cache'];
-        if (!empty($cache_conf))
-        {
-            foreach ($cache_conf as $k => $v)
-            {
-                $this->loadModule('cache', $k);
+                foreach ($conf as $k => $v)
+                {
+                    $this->loadModule($type, $k);
+                }
             }
         }
-        //db
-        $db_conf = $this->config['db'];
-        if (!empty($db_conf))
+        else
         {
-            foreach ($db_conf as $k => $v)
+
+            foreach ($support as $_type)
             {
-                $this->loadModule('db', $k);
+                $conf = $this->config[$_type];
+                if (!empty($conf))
+                {
+                    foreach ($conf as $k => $v)
+                    {
+                        $this->loadModule($_type, $k);
+                    }
+                }
             }
         }
     }
 
@@ -0,0 +1,27 @@
+<?php
+global $php;
+$configs = $php->config['db'];
+if (empty($configs[$php->factory_key]))
+{
+    throw new Swoole\Exception\Factory("db->{$php->factory_key} is not found.");
+}
+$config = $configs[$php->factory_key];
+
+$config['type'] = \Swoole\Database::TYPE_COHOOKMYSQL;
+if (!empty($config['passwd']))
+{
+    $config['password'] = $config['passwd'];
+    unset($config['passwd']);
+}
+if (!empty($config['name']))
+{
+    $config['database'] = $config['name'];
+    unset($config['name']);
+}
+
+//用于隔离多实例
+$config['object_id'] = $php->factory_key;
+
+$db = new Swoole\Database($config);
+
+return $db;
@@ -0,0 +1,24 @@
+<?php
+global $php;
+
+$config = $php->config['redis'][$php->factory_key];
+if (empty($config) or empty($config['host']))
+{
+    throw new Exception("require redis[$php->factory_key] config.");
+}
+
+if (empty($config['port']))
+{
+    $config['port'] = 6379;
+}
+
+if (empty($config['timeout']))
+{
+    $config['timeout'] = 0.5;
+}
+
+//用于隔离多实例
+$config['object_id'] = $php->factory_key;
+
+$redis = new Swoole\Coroutine\Component\Hook\Redis($config);
+return $redis;
Original file line number	Diff line number	Diff line change
@@ -77,7 +77,7 @@ function connect()
77	77	try
78	78	{
79	79	$this->_redis = new \Redis();
80		- if ($this->config['pconnect'])
	80	+ if (!empty($this->config['pconnect']))
81	81	{
82	82	$this->_redis->pconnect($this->config['host'], $this->config['port'], $this->config['timeout']);
83	83	}
Original file line number	Diff line number	Diff line change
@@ -37,7 +37,7 @@ function _createObject()
37	37	{
38	38	$object = $this->pool->pop();
39	39	//必须要 Swoole 2.1.1 以上版本
40		- if ($object->connected === false)
	40	+ if (property_exists($object, "connected") and $object->connected === false)
41	41	{
42	42	continue;
43	43	}