注释及一些更新

bin/workermand

@@ -7,7 +7,7 @@ date_default_timezone_set('Asia/Shanghai');
 
 if(empty($argv[1]))
 {
-    echo "Usage: serverd {start|stop|restart|reload|kill|status}".PHP_EOL;
+    echo "Usage: workermand {start|stop|restart|reload|kill|status}".PHP_EOL;
     exit;
 }
 
@@ -147,7 +147,7 @@ switch($cmd)
         }
         break;
     default:
-        echo "Usage: serverd {start|stop|restart|reload|kill|status}\n";
+        echo "Usage: workermand {start|stop|restart|reload|kill|status}\n";
         exit;
         
 }
@@ -155,7 +155,7 @@ switch($cmd)
 function force_kill()
 {
     $ret = $match = array();
-    exec("ps aux | grep -E '".Man\Core\Master::NAME.":|serverd' | grep -v grep", $ret);
+    exec("ps aux | grep -E '".Man\Core\Master::NAME.":|workermand' | grep -v grep", $ret);
     $this_pid = posix_getpid();
     $this_ppid = posix_getppid();
     foreach($ret as $line)

man/Core/AbstractWorker.php

@@ -88,11 +88,6 @@ abstract class AbstractWorker
      */
     protected function installSignal()
     {
-        // 如果是由worker脚本启动则不安装信号
-        if(!defined('WORKERMAN_PID_FILE'))
-        {
-            return;
-        }
         // 报告进程状态
         pcntl_signal(SIGINT, array($this, 'signalHandler'));
         pcntl_signal(SIGHUP, array($this, 'signalHandler'));

man/Core/Master.php

@@ -1,16 +1,17 @@
 <?php 
 namespace Man\Core;
-require_once WORKERMAN_ROOT_DIR . 'man/Core/Lib/Checker.php';
-require_once WORKERMAN_ROOT_DIR . 'man/Core/Lib/Config.php';
-require_once WORKERMAN_ROOT_DIR . 'man/Core/Lib/Task.php';
-require_once WORKERMAN_ROOT_DIR . 'man/Core/Lib/Log.php';
-require_once WORKERMAN_ROOT_DIR . 'man/Core/Lib/Mutex.php';
 
 if(!defined('WORKERMAN_ROOT_DIR'))
 {
     define('WORKERMAN_ROOT_DIR', realpath(__DIR__."/../../")."/");
 }
 
+require_once WORKERMAN_ROOT_DIR . 'man/Core/Lib/Checker.php';
+require_once WORKERMAN_ROOT_DIR . 'man/Core/Lib/Config.php';
+require_once WORKERMAN_ROOT_DIR . 'man/Core/Lib/Task.php';
+require_once WORKERMAN_ROOT_DIR . 'man/Core/Lib/Log.php';
+require_once WORKERMAN_ROOT_DIR . 'man/Core/Lib/Mutex.php';
+
 /**
  * 
  * 主进程
@@ -21,7 +22,7 @@ if(!defined('WORKERMAN_ROOT_DIR'))
  * <b>使用示例:</b>
  * <pre>
  * <code>
- * Master::run();
+ * Man\Core\Master::run();
  * <code>
  * </pre>
  * 
@@ -579,20 +580,16 @@ class Master
             }
     
             // 出错
-            if($pid == -1)
+            if($pid < 0)
             {
-                // 没有子进程了,可能是出现Fatal Err 了
-                if(pcntl_get_last_error() == 10)
-                {
-                    self::notice('Server has no workers now');
-                }
-                return -1;
+                self::notice('pcntl_waitpid return '.$pid.' and pcntl_get_last_error = ' . pcntl_get_last_error());
+                return $pid;
             }
     
             // 查找子进程对应的woker_name
             $pid_workname_map = self::getPidWorkerNameMap();
             $worker_name = isset($pid_workname_map[$pid]) ? $pid_workname_map[$pid] : '';
-            // 没找到worker_name说明出错了 哪里来的野孩子？
+            // 没找到worker_name说明出错了
             if(empty($worker_name))
             {
                 self::notice("child exist but not found worker_name pid:$pid");
@@ -602,7 +599,7 @@ class Master
             // 进程退出状态不是0，说明有问题了
             if($status !== 0)
             {
-                self::notice("worker exit status $status pid:$pid worker:$worker_name");
+                self::notice("worker[$pid:$worker_name] exit width status $status");
             }
             // 记录进程退出状态
             self::$serverStatusInfo['worker_exit_code'][$worker_name][$status] = isset(self::$serverStatusInfo['worker_exit_code'][$worker_name][$status]) ? self::$serverStatusInfo['worker_exit_code'][$worker_name][$status] + 1 : 1;
@@ -756,15 +753,15 @@ class Master
         // 获得所有pid
         $all_worker_pid = self::getPidWorkerNameMap();
     
-        // 强行杀死？
+        // 强行杀死
         if($force)
         {
             // 杀死所有子进程
             foreach($all_worker_pid as $pid=>$worker_name)
             {
-                // 发送kill信号
+                // 发送SIGKILL信号
                 self::forceKillWorker($pid);
-                self::notice("Kill workers($worker_name) force!");
+                self::notice("Kill workers[$worker_name] force");
             }
         }
         else
@@ -805,8 +802,7 @@ class Master
         // 尝试设置gid uid
         if(!posix_setgid($user_info['gid']) || !posix_setuid($user_info['uid']))
         {
-            $notice = 'Notice : Can not run woker as '.$worker_user." , You shuld be root\n";
-            self::notice($notice, true);
+            self::notice( 'Notice : Can not run woker as '.$worker_user." , You shuld be login as root\n", true);
         }
     }
     

man/Core/SocketWorker.php

@@ -90,7 +90,7 @@ abstract class SocketWorker extends AbstractWorker
     protected $eventLoopName ="\\Man\\Core\\Events\\Select";
     
     /**
-     * 时间轮询库实例
+     * 事件轮询库实例
      * @var object
      */
     protected $event = null;
@@ -129,20 +129,19 @@ abstract class SocketWorker extends AbstractWorker
     
     
     /**
-     * 用户worker继承此worker类必须实现该方法，根据具体协议和当前收到的数据决定是否继续收包
-     * @param string $recv_str 收到的数据包
-     * @return int/false 返回0表示接收完毕/>0表示还有多少字节没有接收到/false出错
+     * 必须实现该方法，根据具体协议和当前收到的数据决定是否继续收包
+     * @param string $bin 收到的数据包(可能是二进制)
+     * @return int/false 返回0表示接收完毕 ; int>0表示还有int字节没有接收; false数据包出错（例如数据包不合法等）
      */
-    abstract public function dealInput($recv_str);
+    abstract public function dealInput($bin);
     
     
     /**
-     * 用户worker继承此worker类必须实现该方法，根据包中的数据处理逻辑
-     * 逻辑处理
-     * @param string $recv_str 收到的数据包
+     * 必须实现该方法，根据包中的数据处理逻辑
+     * @param string $bin 收到的数据包
      * @return void
      */
-    abstract public function dealProcess($recv_str);
+    abstract public function dealProcess($bin);
     
     
     /**
@@ -159,10 +158,11 @@ abstract class SocketWorker extends AbstractWorker
         
         // 是否开启长连接
         $this->isPersistentConnection = (bool)Lib\Config::get( $this->workerName . '.persistent_connection');
-        // 最大请求数，如果没有配置则使用PHP_INT_MAX
+        // 最大请求数，超过这个数则安全重启，如果没有配置则使用PHP_INT_MAX
         $this->maxRequests = (int)Lib\Config::get( $this->workerName . '.max_requests');
         $this->maxRequests = $this->maxRequests <= 0 ? PHP_INT_MAX : $this->maxRequests;
 
+        // 预读数据长度，长连接需要设置此项
         $preread_length = (int)Lib\Config::get( $this->workerName . '.preread_length');
         if($preread_length > 0)
         {
@@ -186,8 +186,6 @@ abstract class SocketWorker extends AbstractWorker
         $this->addShutdownHook();
         
         // 初始化事件轮询库
-        // $this->event = new Libevent();
-        // $this->event = new Select();
         $this->event = new $this->eventLoopName();
     }
     
@@ -221,16 +219,15 @@ abstract class SocketWorker extends AbstractWorker
         
         // 主体循环,整个子进程会阻塞在这个函数上
         $ret = $this->event->loop();
-        $this->notice('worker loop exit');
+        $this->notice('worker loop exit unexpected');
         exit(0);
     }
     
     /**
      * 停止服务
-     * @param bool $exit 是否退出
      * @return void
      */
-    public function stop($exit = true)
+    public function stop()
     {
         // 触发该worker进程onStop事件
         if($this->onStop())
@@ -250,10 +247,7 @@ abstract class SocketWorker extends AbstractWorker
         // 没有链接要处理了
         if($this->allTaskHasDone())
         {
-            if($exit)
-            {
-                exit(0);
-            }
+            exit(0);
         }
     }
     
@@ -271,7 +265,6 @@ abstract class SocketWorker extends AbstractWorker
         // 获取协议
         $mata_data = stream_get_meta_data($socket);
         $this->protocol = substr($mata_data['stream_type'], 0, 3);
-        
     }
     
     /**
@@ -395,7 +388,7 @@ abstract class SocketWorker extends AbstractWorker
             {
                 $this->notice('CODE:' . $e->getCode() . ' MESSAGE:' . $e->getMessage()."\n".$e->getTraceAsString()."\nCLIENT_IP:".$this->getRemoteIp()."\nBUFFER:[".var_export($this->recvBuffers[$fd]['buf'],true)."]\n");
                 $this->statusInfo['throw_exception'] ++;
-                $this->sendToClient($e->getMessage());
+                $this->sendToClient($e);
             }
             
             // 是否是长连接
@@ -461,15 +454,15 @@ abstract class SocketWorker extends AbstractWorker
     protected function installSignal()
     {
         // 闹钟信号
-        $this->event->add(SIGALRM, Events\BaseEvent::EV_SIGNAL, array($this, 'signalHandler'), SIGALRM);
+        $this->event->add(SIGALRM, Events\BaseEvent::EV_SIGNAL, array($this, 'signalHandler'));
         // 终止进程信号
-        $this->event->add(SIGINT, Events\BaseEvent::EV_SIGNAL, array($this, 'signalHandler'), SIGINT);
+        $this->event->add(SIGINT, Events\BaseEvent::EV_SIGNAL, array($this, 'signalHandler'));
         // 平滑重启信号
-        $this->event->add(SIGHUP, Events\BaseEvent::EV_SIGNAL, array($this, 'signalHandler'), SIGHUP);
+        $this->event->add(SIGHUP, Events\BaseEvent::EV_SIGNAL, array($this, 'signalHandler'));
         // 报告进程状态
-        $this->event->add(SIGUSR1, Events\BaseEvent::EV_SIGNAL, array($this, 'signalHandler'), SIGUSR1);
+        $this->event->add(SIGUSR1, Events\BaseEvent::EV_SIGNAL, array($this, 'signalHandler'));
         // 报告该进程使用的文件
-        $this->event->add(SIGUSR2, Events\BaseEvent::EV_SIGNAL, array($this, 'signalHandler'), SIGUSR2);
+        $this->event->add(SIGUSR2, Events\BaseEvent::EV_SIGNAL, array($this, 'signalHandler'));
         
         // 设置忽略信号
         pcntl_signal(SIGTTIN, SIG_IGN);
@@ -538,14 +531,6 @@ abstract class SocketWorker extends AbstractWorker
                 $this->sendBuffers[$this->currentDealFd] = $str_to_send;
             }
             $this->event->add($this->connections[$this->currentDealFd],  Events\BaseEvent::EV_WRITE, array($this, 'tcpWriteToClient'), array($this->currentDealFd));
-            /*
-            // tcp 如果一次没写完（一般是缓冲区满的情况），则阻塞写
-            if(!$this->blockWrite($this->connections[$this->currentDealFd], $str_to_send, 500))
-            {
-                $this->notice('sendToClient fail ,Data length = ' . strlen($str_to_send));
-                $this->statusInfo['send_fail']++;
-                return false;
-            }*/
             return null;
         }
         // udp 直接发送，要求数据包不能超过65515
@@ -554,7 +539,7 @@ abstract class SocketWorker extends AbstractWorker
     
     /**
      * 向客户端socket写数据
-     * @param resource $fd
+     * @param int $fd
      * @param string $bin_data
      */
     public function tcpWriteToClient($fd)
@@ -583,41 +568,6 @@ abstract class SocketWorker extends AbstractWorker
     }
     
     /**
-     * 向fd写数据，如果socket缓冲区满了，则改用阻塞模式写数据
-     * @param resource $fd
-     * @param string $str_to_write
-     * @param int $time_out 单位毫秒
-     * @return bool
-     */
-    protected function blockWrite($fd, $str_to_write, $timeout_ms = 500)
-    {
-        $send_len = @fwrite($fd, $str_to_write);
-        if($send_len == strlen($str_to_write))
-        {
-            return true;
-        }
-        
-        // 客户端关闭
-        if(feof($fd))
-        {
-            $this->notice("blockWrite client close");
-            return false;
-        }
-        
-        // 设置阻塞
-        stream_set_blocking($fd, 1);
-        // 设置超时
-        $timeout_sec = floor($timeout_ms/1000);
-        $timeout_ms = $timeout_ms%1000;
-        stream_set_timeout($fd, $timeout_sec, $timeout_ms*1000);
-        $send_len += @fwrite($fd, substr($str_to_write, $send_len));
-        // 改回非阻塞
-        stream_set_blocking($fd, 0);
-        
-        return $send_len == strlen($str_to_write);
-    }
-    
-    /**
      * 获取客户端地址
      * @param int $fd 已经链接的socket id
      * @return string ip:port
@@ -798,6 +748,3 @@ abstract class SocketWorker extends AbstractWorker
     }
     
 }
-
-
-