add TcpConnection::$id and add Gateway::$router

Author: walkor

GatewayWorker/Gateway.php

@@ -54,6 +54,12 @@ class Gateway extends Worker
      */
     public $pingData = '';
 
+    /**
+     * 路由函数
+     * @var callback
+     */
+    public $router = null;
+    
     /**
      * 保存客户端的所有connection对象
      * @var array
@@ -123,6 +129,8 @@ public function __construct($socket_name, $context_option = array())
     {
         parent::__construct($socket_name, $context_option);
 
+        $this->router = array("\\GatewayWorker\\Gateway", 'routerRand');
+        
         $backrace = debug_backtrace();
         $this->_appInitPath = dirname($backrace[0]['file']);
     }
@@ -219,11 +227,11 @@ protected function sendToWorker($cmd, $connection, $body = '')
         $gateway_data['cmd'] = $cmd;
         $gateway_data['body'] = $body;
         $gateway_data['ext_data'] = $connection->session;
-        // 随机选择一个worker处理
-        $key = array_rand($this->_workerConnections);
-        if($key)
+        if($this->_workerConnections)
         {
-            if(false === $this->_workerConnections[$key]->send($gateway_data))
+            // 调用路由函数，选择一个worker把请求转发给它
+            $worker_connection = call_user_func($this->router, $this->_workerConnections, $connection, $cmd, $body);
+            if(false === $worker_connection->send($gateway_data))
             {
                 $msg = "SendBufferToWorker fail. May be the send buffer are overflow";
                 $this->log($msg);
@@ -246,6 +254,19 @@ protected function sendToWorker($cmd, $connection, $body = '')
         return true;
     }
 
+    /**
+     * 随机路由，返回worker connection对象
+     * @param array $worker_connections
+     * @param TcpConnection $client_connection
+     * @param int $cmd
+     * @param mixed $buffer
+     * @return TcpConnection
+     */
+    public static function routerRand($worker_connections, $client_connection, $cmd, $buffer)
+    {
+        return $worker_connections[array_rand($worker_connections)];
+    }
+    
     /**
      * 保存客户端连接的gateway通讯地址
      * @param int $global_client_id

Workerman/Connection/AsyncTcpConnection.php

@@ -49,6 +49,7 @@ public function __construct($remote_address)
             }
         }
         $this->_remoteAddress = substr($address, 2);
+        $this->id = self::$_idRecorder++;
     }
 
     public function connect()

Workerman/Connection/TcpConnection.php

@@ -87,6 +87,12 @@ class TcpConnection extends ConnectionInterface
      */
     public $worker = null;
 
+    /**
+     * 连接的id，一个自增整数
+     * @var int
+     */
+    public $id = 0;
+    
     /**
      * 发送缓冲区大小，当发送缓冲区满时，会尝试触发onBufferFull回调（如果有设置的话）
      * 如果没设置onBufferFull回调，由于发送缓冲区满，则后续发送的数据将被丢弃，
@@ -105,6 +111,12 @@ class TcpConnection extends ConnectionInterface
      */
     public static $maxPackageSize = 10485760;
 
+    /**
+     * id 记录器
+     * @var int
+     */
+    protected static $_idRecorder = 1;
+    
     /**
      * 实际的socket资源
      * @var resource
@@ -167,6 +179,7 @@ class TcpConnection extends ConnectionInterface
      */
     public function __construct($socket)
     {
+        $this->id = self::$_idRecorder++;
         $this->_socket = $socket;
         stream_set_blocking($this->_socket, 0);
         Worker::$globalEvent->add($this->_socket, EventInterface::EV_READ, array($this, 'baseRead'));