change dir

Applications/Game/Event.php

@@ -6,7 +6,7 @@
  * 
  */
 
-require_once WORKERMAN_ROOT_DIR . 'Applications/Game/Store.php';
+require_once WORKERMAN_ROOT_DIR . 'applications/Game/Store.php';
 
 class Event
 {

Applications/Game/GameBuffer.php

@@ -6,9 +6,9 @@
 * 
  */
 require_once WORKERMAN_ROOT_DIR . 'Protocols/Buffer.php';
-require_once WORKERMAN_ROOT_DIR . 'Applications/Game/Event.php';
+require_once WORKERMAN_ROOT_DIR . 'applications/Game/Event.php';
 
-class GameBuffer extends WORKERMAN\Protocols\Buffer
+class GameBuffer extends Man\Protocols\Buffer
 {
     // 系统命令
     const CMD_SYSTEM = 128;

Workers/EchoWorker.php

@@ -4,8 +4,8 @@
  * 压测worker
  * @author walkor <worker-man@qq.com>
  */
-require_once WORKERMAN_ROOT_DIR . 'Core/SocketWorker.php';
-class EchoWorker extends WORKERMAN\Core\SocketWorker
+require_once WORKERMAN_ROOT_DIR . 'man/Core/SocketWorker.php';
+class EchoWorker extends Man\Core\SocketWorker
 {
     public function dealInput($recv_str)
     {

Workers/FileMonitor.php

@@ -1,12 +1,12 @@
 <?php 
-require_once WORKERMAN_ROOT_DIR . 'Core/SocketWorker.php';
+require_once WORKERMAN_ROOT_DIR . 'man/Core/SocketWorker.php';
 /**
  * 
  * 用这个worker监控文件更新
  * 
 * @author walkor <worker-man@qq.com>
  */
-class FileMonitor extends WORKERMAN\Core\AbstractWorker
+class FileMonitor extends Man\Core\AbstractWorker
 {
     
     /**
@@ -27,7 +27,7 @@ class FileMonitor extends WORKERMAN\Core\AbstractWorker
      */
     public function start()
     {
-        if(\WORKERMAN\Core\Lib\Config::get('workerman.debug') != 1)
+        if(\Man\Core\Lib\Config::get('workerman.debug') != 1)
         {
             return;
         }
@@ -39,10 +39,10 @@ class FileMonitor extends WORKERMAN\Core\AbstractWorker
             }
         }
         $msg_type = $message = 0;
-        \WORKERMAN\Core\Lib\Task::init();
-        \WORKERMAN\Core\Lib\Task::add(1, array($this, 'sendSignalAndGetResult'));
-        \WORKERMAN\Core\Lib\Task::add(1, array($this, 'checkFilesModify'));
-        \WORKERMAN\Core\Lib\Task::add(1, array($this, 'checkTty'));
+        \Man\Core\Lib\Task::init();
+        \Man\Core\Lib\Task::add(1, array($this, 'sendSignalAndGetResult'));
+        \Man\Core\Lib\Task::add(1, array($this, 'checkFilesModify'));
+        \Man\Core\Lib\Task::add(1, array($this, 'checkTty'));
         while(1)
         {
             $this->collectFiles(true);
@@ -135,7 +135,7 @@ class FileMonitor extends WORKERMAN\Core\AbstractWorker
                 $this->filesToInotify[$file] = $mtime_now;
                 if(!$has_send_signal)
                 {
-                    \WORKERMAN\Core\Lib\Log::add("$file updated and reload workers");
+                    \Man\Core\Lib\Log::add("$file updated and reload workers");
                     $this->sendSignalToAllWorker(SIGHUP);
                     $has_send_signal = true;
                 }

Workers/GameGateway.php

@@ -8,11 +8,11 @@
  * @author walkor <worker-man@qq.com>
  * 
  */
-require_once WORKERMAN_ROOT_DIR . 'Core/SocketWorker.php';
-require_once WORKERMAN_ROOT_DIR . 'Applications/Game/GameBuffer.php';
-require_once WORKERMAN_ROOT_DIR . 'Applications/Game/Store.php';
+require_once WORKERMAN_ROOT_DIR . 'man/Core/SocketWorker.php';
+require_once WORKERMAN_ROOT_DIR . 'applications/Game/GameBuffer.php';
+require_once WORKERMAN_ROOT_DIR . 'applications/Game/Store.php';
 
-class GameGateway extends WORKERMAN\Core\SocketWorker
+class GameGateway extends Man\Core\SocketWorker
 {
     // 内部通信socket
     protected $innerMainSocket = null;
@@ -37,11 +37,11 @@ class GameGateway extends WORKERMAN\Core\SocketWorker
         $this->installSignal();
         
         // 添加accept事件
-        $ret = $this->event->add($this->mainSocket,  WORKERMAN\Core\Events\BaseEvent::EV_READ, array($this, 'accept'));
+        $ret = $this->event->add($this->mainSocket,  Man\Core\Events\BaseEvent::EV_READ, array($this, 'accept'));
         
         // 创建内部通信套接字
         $this->lanPort = posix_getpid();
-        $this->lanIp = WORKERMAN\Core\Lib\Config::get($this->workerName.'.lan_ip');
+        $this->lanIp = Man\Core\Lib\Config::get($this->workerName.'.lan_ip');
         if(!$this->lanIp)
         {
             $this->notice($this->workerName.'.lan_ip not set');
@@ -64,7 +64,7 @@ class GameGateway extends WORKERMAN\Core\SocketWorker
         $this->registerAddress("udp://".$this->lanIp.':'.$this->lanPort);
         
         // 添加读udp事件
-        $this->event->add($this->innerMainSocket,  WORKERMAN\Core\Events\BaseEvent::EV_READ, array($this, 'recvUdp'));
+        $this->event->add($this->innerMainSocket,  Man\Core\Events\BaseEvent::EV_READ, array($this, 'recvUdp'));
         
         // 初始化到worker的通信地址
         $this->initWorkerAddresses();
@@ -119,7 +119,7 @@ class GameGateway extends WORKERMAN\Core\SocketWorker
     
     protected function initWorkerAddresses()
     {
-        $this->workerAddresses = WORKERMAN\Core\Lib\Config::get($this->workerName.'.game_worker');
+        $this->workerAddresses = Man\Core\Lib\Config::get($this->workerName.'.game_worker');
         if(!$this->workerAddresses)
         {
             $this->notice($this->workerName.'game_worker not set');
@@ -272,8 +272,8 @@ class GameGateway extends WORKERMAN\Core\SocketWorker
     protected function notice($str, $display=true)
     {
         $str = 'Worker['.get_class($this).']:'."$str ip:".$this->getRemoteIp();
-        WORKERMAN\Core\Lib\Log::add($str);
-        if($display && WORKERMAN\Core\Lib\Config::get('workerman.debug') == 1)
+        Man\Core\Lib\Log::add($str);
+        if($display && Man\Core\Lib\Config::get('workerman.debug') == 1)
         {
             echo $str."\n";
         }

Workers/GameWorker.php

@@ -8,11 +8,11 @@
  * @author walkor <worker-man@qq.com>
  * 
  */
-require_once WORKERMAN_ROOT_DIR . 'Core/SocketWorker.php';
-require_once WORKERMAN_ROOT_DIR . 'Applications/Game/GameBuffer.php';
-require_once WORKERMAN_ROOT_DIR . 'Applications/Game/Event.php';
+require_once WORKERMAN_ROOT_DIR . 'man/Core/SocketWorker.php';
+require_once WORKERMAN_ROOT_DIR . 'applications/Game/GameBuffer.php';
+require_once WORKERMAN_ROOT_DIR . 'applications/Game/Event.php';
 
-class GameWorker extends WORKERMAN\Core\SocketWorker
+class GameWorker extends Man\Core\SocketWorker
 {
     protected $data = array();
     public function dealInput($recv_str)

Workers/Monitor.php

@@ -1,5 +1,5 @@
 <?php 
-require_once WORKERMAN_ROOT_DIR . 'Core/SocketWorker.php';
+require_once WORKERMAN_ROOT_DIR . 'man/Core/SocketWorker.php';
 /**
  * 
  * 1、提供telnet接口，查看服务状态
@@ -10,7 +10,7 @@ require_once WORKERMAN_ROOT_DIR . 'Core/SocketWorker.php';
  * 
 * @author walkor <worker-man@qq.com>
  */
-class Monitor extends WORKERMAN\Core\SocketWorker
+class Monitor extends Man\Core\SocketWorker
 {
     /**
      * 一天有多少秒
@@ -115,14 +115,14 @@ class Monitor extends WORKERMAN\Core\SocketWorker
         }
         
         // 初始化任务
-        \WORKERMAN\Core\Lib\Task::init($this->event);
-        \WORKERMAN\Core\Lib\Task::add(self::CLEAR_LOGS_TIME_LONG, array($this, 'clearLogs'), array(WORKERMAN_LOG_DIR));
-        \WORKERMAN\Core\Lib\Task::add(self::CHECK_MASTER_PROCESS_TIME_LONG, array($this, 'checkMasterProcess'));
-        \WORKERMAN\Core\Lib\Task::add(self::CHECK_MASTER_STATUS_TIME_LONG, array($this, 'checkMasterStatus'));
-        \WORKERMAN\Core\Lib\Task::add(self::CHECK_MASTER_STATUS_TIME_LONG, array($this, 'checkMemUsage'));
+        \Man\Core\Lib\Task::init($this->event);
+        \Man\Core\Lib\Task::add(self::CLEAR_LOGS_TIME_LONG, array($this, 'clearLogs'), array(WORKERMAN_LOG_DIR));
+        \Man\Core\Lib\Task::add(self::CHECK_MASTER_PROCESS_TIME_LONG, array($this, 'checkMasterProcess'));
+        \Man\Core\Lib\Task::add(self::CHECK_MASTER_STATUS_TIME_LONG, array($this, 'checkMasterStatus'));
+        \Man\Core\Lib\Task::add(self::CHECK_MASTER_STATUS_TIME_LONG, array($this, 'checkMemUsage'));
         
         // 添加accept事件
-        $this->event->add($this->mainSocket,  \WORKERMAN\Core\Events\BaseEvent::EV_READ, array($this, 'onAccept'));
+        $this->event->add($this->mainSocket,  \Man\Core\Events\BaseEvent::EV_READ, array($this, 'onAccept'));
         
         // 主体循环
         $ret = $this->event->loop();
@@ -175,7 +175,7 @@ class Monitor extends WORKERMAN\Core\SocketWorker
         $ip = $this->getRemoteIp();
         if($ip != '127.0.0.1' && $buffer == 'status')
         {
-            \WORKERMAN\Core\Lib\Log::add("IP:$ip $buffer");
+            \Man\Core\Lib\Log::add("IP:$ip $buffer");
         }
         
         // 判断是否认证过
@@ -236,15 +236,15 @@ class Monitor extends WORKERMAN\Core\SocketWorker
                 }
                 $msg_type = $message = 0;
                 // 将过期的消息读出来，清理掉
-                if(\WORKERMAN\Core\Master::getQueueId())
+                if(\Man\Core\Master::getQueueId())
                 {
-                    while(msg_receive(\WORKERMAN\Core\Master::getQueueId(), self::MSG_TYPE_STATUS, $msg_type, 1000, $message, true, MSG_IPC_NOWAIT))
+                    while(msg_receive(\Man\Core\Master::getQueueId(), self::MSG_TYPE_STATUS, $msg_type, 1000, $message, true, MSG_IPC_NOWAIT))
                     {
                     }
                 }
                 $loadavg = sys_getloadavg();
                 $this->sendToClient("---------------------------------------GLOBAL STATUS--------------------------------------------\n");
-                $this->sendToClient(\WORKERMAN\Core\Master::NAME.' version:' . \WORKERMAN\Core\Master::VERSION . "\n");
+                $this->sendToClient(\Man\Core\Master::NAME.' version:' . \Man\Core\Master::VERSION . "\n");
                 $this->sendToClient('start time:'. date('Y-m-d H:i:s', $status['start_time']).'   run ' . floor((time()-$status['start_time'])/(24*60*60)). ' days ' . floor(((time()-$status['start_time'])%(24*60*60))/(60*60)) . " hours   \n");
                 $this->sendToClient('load average: ' . implode(", ", $loadavg) . "\n");
                 $this->sendToClient(count($this->connections) . ' users          ' . count($worker_pids) . ' workers       ' . count($pid_worker_name_map)." processes\n");
@@ -266,7 +266,7 @@ class Monitor extends WORKERMAN\Core\SocketWorker
                 
                 $this->sendToClient("---------------------------------------PROCESS STATUS-------------------------------------------\n");
                 $this->sendToClient("pid\tmemory  ".str_pad('    listening', 20)." timestamp  ".str_pad('worker_name', $this->maxWorkerNameLength)." ".str_pad('total_request', 13)." ".str_pad('recv_timeout', 12)." ".str_pad('proc_timeout',12)." ".str_pad('packet_err', 10)." ".str_pad('thunder_herd', 12)." ".str_pad('client_close', 12)." ".str_pad('send_fail', 9)." ".str_pad('throw_exception', 15)." suc/total\n");
-                if(!\WORKERMAN\Core\Master::getQueueId())
+                if(!\Man\Core\Master::getQueueId())
                 {
                     return;
                 }
@@ -337,11 +337,11 @@ class Monitor extends WORKERMAN\Core\SocketWorker
      */
     protected function getStatusFromQueue()
     {
-        if(msg_receive(\WORKERMAN\Core\Master::getQueueId(), self::MSG_TYPE_STATUS, $msg_type, 10000, $message, true, MSG_IPC_NOWAIT))
+        if(msg_receive(\Man\Core\Master::getQueueId(), self::MSG_TYPE_STATUS, $msg_type, 10000, $message, true, MSG_IPC_NOWAIT))
         {
             $pid = $message['pid'];
             $worker_name = $message['worker_name'];
-            $address = \WORKERMAN\Core\Lib\Config::get($this->workerName . '.listen');
+            $address = \Man\Core\Lib\Config::get($this->workerName . '.listen');
             if(!$address)
             {
                 $address = '';
@@ -390,7 +390,7 @@ class Monitor extends WORKERMAN\Core\SocketWorker
      */
     public function checkMasterProcess()
     {
-        $master_pid = \WORKERMAN\Core\Master::getMasterPid();
+        $master_pid = \Man\Core\Master::getMasterPid();
         if(!posix_kill($master_pid, 0))
         {
             $this->onMasterDead();
@@ -439,7 +439,7 @@ class Monitor extends WORKERMAN\Core\SocketWorker
             return;
         }
         
-        $max_worker_exit_count = (int)\WORKERMAN\Core\Lib\Config::get($this->workerName.".max_worker_exit_count");
+        $max_worker_exit_count = (int)\Man\Core\Lib\Config::get($this->workerName.".max_worker_exit_count");
         if($max_worker_exit_count <= 0)
         {
             $max_worker_exit_count = 2000;
@@ -479,7 +479,7 @@ class Monitor extends WORKERMAN\Core\SocketWorker
      */
     protected function checkWorkerMemByPid($pid, $worker_name)
     {
-        $mem_limit = \WORKERMAN\Core\Lib\Config::get($this->workerName.'.max_mem_limit');
+        $mem_limit = \Man\Core\Lib\Config::get($this->workerName.'.max_mem_limit');
         if(!$mem_limit)
         {
             $mem_limit = self::DEFAULT_MEM_LIMIT;
@@ -556,7 +556,7 @@ class Monitor extends WORKERMAN\Core\SocketWorker
         {
             if($worker_name)
             {
-                $ip = \WORKERMAN\Core\Lib\Config::get($worker_name . '.ip');
+                $ip = \Man\Core\Lib\Config::get($worker_name . '.ip');
             }
             if(empty($ip) || $ip == '0.0.0.0' || $ip = '127.0.0.1')
             {

Tests/game.php → applications/Tests/game.php

@@ -2,7 +2,7 @@
 ini_set('display_errors', 'on');
 error_reporting(E_ALL);
 define('WORKERMAN_ROOT_DIR', __DIR__.'/../');
-include '../Applications/Game/GameBuffer.php';
+include '../Game/GameBuffer.php';
 
 $sock = stream_socket_client("tcp://127.0.0.1:8282");
 if(!$sock)exit("can not create sock\n");

Tests/testBufferWorker.php → applications/Tests/testBufferWorker.php

@@ -1,7 +1,7 @@
 <?php 
 error_reporting(E_ALL);
 ini_set('display_errors', 'on');
-include '../Protocols/Buffer.php';
+include '../../man/Protocols/Buffer.php';
 
 $sock = stream_socket_client("tcp://127.0.0.1:20305");
 if(!$sock)exit("can not create sock\n");
@@ -9,10 +9,10 @@ if(!$sock)exit("can not create sock\n");
 $code = 0;
 while(1)
 {
-    $buf = new \WORKERMAN\Protocols\Buffer();
+    $buf = new \Man\Protocols\Buffer();
     $buf->body = 'HELLO YAOYAO';
     $buf->header['code'] = $code++;
     fwrite($sock, $buf->getBuffer());
     $ret = fread($sock, 10240);
-    var_export(\WORKERMAN\Protocols\Buffer::decode($ret));
+    var_export(\Man\Protocols\Buffer::decode($ret));
 }

bin/workermand

@@ -16,30 +16,30 @@ $cmd = $argv[1];
 define('WORKERMAN_ROOT_DIR', realpath(__DIR__."/../")."/");
 
 // ==pid-file==
-require_once WORKERMAN_ROOT_DIR . 'Core/Lib/Config.php';
-WORKERMAN\Core\Lib\Config::instance();
-if(!($pid_file = WORKERMAN\Core\Lib\Config::get('workerman.pid_file')))
+require_once WORKERMAN_ROOT_DIR . 'man/Core/Lib/Config.php';
+Man\Core\Lib\Config::instance();
+if(!($pid_file = Man\Core\Lib\Config::get('workerman.pid_file')))
 {
     $pid_file = '/var/run/php-server.pid';
 }
 define('WORKERMAN_PID_FILE', $pid_file);
 
 // ==log-dir==
-if(!($log_dir = WORKERMAN\Core\Lib\Config::get('workerman.log_dir')))
+if(!($log_dir = Man\Core\Lib\Config::get('workerman.log_dir')))
 {
     $log_dir = WORKERMAN_ROOT_DIR . 'logs/';
 }
 define('WORKERMAN_LOG_DIR', $log_dir . '/');
 
 // ==ipc-key==
-if(!($ipc_key = WORKERMAN\Core\Lib\Config::get('workerman.ipc_key')))
+if(!($ipc_key = Man\Core\Lib\Config::get('workerman.ipc_key')))
 {
     $ipc_key = 0x70010a2e;
 }
 define('IPC_KEY', $ipc_key);
 
 // ==shm-size==
-if(!($shm_size = WORKERMAN\Core\Lib\Config::get('workerman.shm_size')))
+if(!($shm_size = Man\Core\Lib\Config::get('workerman.shm_size')))
 {
     $shm_size = 393216;
 }
@@ -81,7 +81,7 @@ switch($cmd)
 {
     case 'start':
         $worker_user = isset($argv[2]) ? $argv[2] : '';
-        WORKERMAN\Core\Master::run($worker_user);
+        Man\Core\Master::run($worker_user);
         break;
     case 'stop':
         $pid = @file_get_contents(WORKERMAN_PID_FILE);
@@ -94,7 +94,7 @@ switch($cmd)
     case 'restart':
         stop_and_wait();
         $worker_user = isset($argv[2]) ? $argv[2] : '';
-        WORKERMAN\Core\Master::run();
+        Man\Core\Master::run();
         break;
     case 'reload':
         $pid = @file_get_contents(WORKERMAN_PID_FILE);
@@ -110,7 +110,7 @@ switch($cmd)
         force_kill();
         break;
     case 'status':
-        $address = WORKERMAN\Core\Lib\Config::get('Monitor.listen');
+        $address = Man\Core\Lib\Config::get('Monitor.listen');
         $sock = @stream_socket_client($address);
         if(!$sock)
         {
@@ -144,7 +144,7 @@ switch($cmd)
 function force_kill()
 {
     $ret = $match = array();
-    exec("ps aux | grep -E '".WORKERMAN\Core\Master::NAME.":|serverd' | grep -v grep", $ret);
+    exec("ps aux | grep -E '".Man\Core\Master::NAME.":|serverd' | grep -v grep", $ret);
     $this_pid = posix_getpid();
     $this_ppid = posix_getppid();
     foreach($ret as $line)

Core/AbstractWorker.php → man/Core/AbstractWorker.php

@@ -1,6 +1,6 @@
 <?php 
-namespace WORKERMAN\Core;
-require_once WORKERMAN_ROOT_DIR . 'Core/Events/Select.php';
+namespace Man\Core;
+require_once WORKERMAN_ROOT_DIR . 'man/Core/Events/Select.php';
 
 /**
  * 抽象Worker类

Core/Events/Libevent.php → man/Core/Events/Libevent.php

@@ -1,6 +1,6 @@
 <?php 
-namespace WORKERMAN\Core\Events;
-require_once WORKERMAN_ROOT_DIR . 'Core/Events/interfaces.php';
+namespace Man\Core\Events;
+require_once WORKERMAN_ROOT_DIR . 'man/Core/Events/interfaces.php';
 /**
  * 
  * libevent事件轮询库的封装
@@ -39,7 +39,7 @@ class Libevent implements BaseEvent
    
     /**
      * 添加事件
-     * @see \WORKERMAN\Core\Events\BaseEvent::add()
+     * @see \Man\Core\Events\BaseEvent::add()
      */
     public function add($fd, $flag, $func, $args = null)
     {
@@ -96,7 +96,7 @@ class Libevent implements BaseEvent
     
     /**
      * 删除fd的某个事件
-     * @see \WORKERMAN\Core\Events\BaseEvent::del()
+     * @see \Man\Core\Events\BaseEvent::del()
      */
     public function del($fd ,$flag)
     {
@@ -104,14 +104,14 @@ class Libevent implements BaseEvent
         switch($flag)
         {
             // 读事件
-            case \WORKERMAN\Core\Events\BaseEvent::EV_READ:
-            case \WORKERMAN\Core\Events\BaseEvent::EV_WRITE:
+            case \Man\Core\Events\BaseEvent::EV_READ:
+            case \Man\Core\Events\BaseEvent::EV_WRITE:
                 if(isset($this->allEvents[$event_key][$flag]))
                 {
                     event_del($this->allEvents[$event_key][$flag]);
                 }
                 unset($this->allEvents[$event_key][$flag]);
-            case  \WORKERMAN\Core\Events\BaseEvent::EV_SIGNAL:
+            case  \Man\Core\Events\BaseEvent::EV_SIGNAL:
                 if(isset($this->eventSignal[$event_key]))
                 {
                     event_del($this->eventSignal[$event_key]);
@@ -123,7 +123,7 @@ class Libevent implements BaseEvent
 
     /**
      * 事件轮训主循环
-     * @see \WORKERMAN\Core\Events\BaseEvent::loop()
+     * @see \Man\Core\Events\BaseEvent::loop()
      */
     public function loop()
     {

Core/Events/Select.php → man/Core/Events/Select.php

@@ -1,6 +1,6 @@
 <?php 
-namespace WORKERMAN\Core\Events;
-require_once WORKERMAN_ROOT_DIR . 'Core/Events/interfaces.php';
+namespace Man\Core\Events;
+require_once WORKERMAN_ROOT_DIR . 'man/Core/Events/interfaces.php';
 /**
  * 
  * select 轮询封装
@@ -83,7 +83,7 @@ class Select implements BaseEvent
    
     /**
      * 添加事件
-     * @see \WORKERMAN\Core\Events\BaseEvent::add()
+     * @see \Man\Core\Events\BaseEvent::add()
      */
     public function add($fd, $flag, $func, $args = null)
     {
@@ -122,7 +122,7 @@ class Select implements BaseEvent
     
     /**
      * 删除某个fd的某个事件
-     * @see \WORKERMAN\Core\Events\BaseEvent::del()
+     * @see \Man\Core\Events\BaseEvent::del()
      */
     public function del($fd ,$flag)
     {
@@ -156,7 +156,7 @@ class Select implements BaseEvent
 
     /**
      * 事件轮训库主循环
-     * @see \WORKERMAN\Core\Events\BaseEvent::loop()
+     * @see \Man\Core\Events\BaseEvent::loop()
      */
     public function loop()
     {

Core/Events/interfaces.php → man/Core/Events/interfaces.php

@@ -1,5 +1,5 @@
 <?php 
-namespace WORKERMAN\Core\Events;
+namespace Man\Core\Events;
 /**
  * 
  * 事件轮询库的通用接口

Core/Lib/Checker.php → man/Core/Lib/Checker.php

@@ -1,5 +1,5 @@
 <?php
-namespace WORKERMAN\Core\Lib;
+namespace Man\Core\Lib;
 /**
  * 环境检查相关
  * 
@@ -47,7 +47,7 @@ class Checker
             $suport = extension_loaded($ext_name);
             if($must_required && !$suport)
             {
-                \WORKERMAN\Core\Master::notice($ext_name. " [NOT SUPORT BUT REQUIRED] \tYou have to compile CLI version of PHP with --enable-{$ext_name} \tServer start fail");
+                \Man\Core\Master::notice($ext_name. " [NOT SUPORT BUT REQUIRED] \tYou have to compile CLI version of PHP with --enable-{$ext_name} \tServer start fail");
                 exit($ext_name. " \033[31;40m [NOT SUPORT BUT REQUIRED] \033[0m\n\n\033[31;40mYou have to compile CLI version of PHP with --enable-{$ext_name} \033[0m\n\n\033[31;40mServer start fail\033[0m\n\n");
             }
     
@@ -90,7 +90,7 @@ class Checker
         {
             if(isset($disable_func_map[$func]))
             {
-                \WORKERMAN\Core\Master::notice("Function $func may be disabled\tPlease check disable_functions in php.ini \t Server start fail");
+                \Man\Core\Master::notice("Function $func may be disabled\tPlease check disable_functions in php.ini \t Server start fail");
                 exit("\n\033[31;40mFunction $func may be disabled\nPlease check disable_functions in php.ini\033[0m\n\n\033[31;40mServer start fail\033[0m\n\n");
             }
         }
@@ -110,7 +110,7 @@ class Checker
         {
             if(empty($config['start_workers']))
             {
-                \WORKERMAN\Core\Master::notice(str_pad($worker_name, $pad_length)." [start_workers not set]\tServer start fail");
+                \Man\Core\Master::notice(str_pad($worker_name, $pad_length)." [start_workers not set]\tServer start fail");
                 exit(str_pad($worker_name, $pad_length)."\033[31;40m [start_workers not set]\033[0m\n\n\033[31;40mServer start fail\033[0m\n");
             }
     
@@ -120,7 +120,7 @@ class Checker
             if(0 != self::checkSyntaxError(WORKERMAN_ROOT_DIR . "Workers/$worker_name.php", $worker_name))
             {
                 unset(Config::instance()->config[$worker_name]);
-                \WORKERMAN\Core\Master::notice("$worker_name has Fatal Err");
+                \Man\Core\Master::notice("$worker_name has Fatal Err");
                 echo str_pad($worker_name, $pad_length),"\033[31;40m [Fatal Err] \033[0m\n";
                 continue;
             }
@@ -131,7 +131,7 @@ class Checker
                 if(!self::checkWorkerUserName($worker_user))
                 {
                     echo str_pad($worker_name, $pad_length),"\033[31;40m [FAIL] \033[0m\n";
-                    \WORKERMAN\Core\Master::notice("Can not run $worker_name processes as user $worker_user , User $worker_user not exists\tServer start fail");
+                    \Man\Core\Master::notice("Can not run $worker_name processes as user $worker_user , User $worker_user not exists\tServer start fail");
                     exit("\n\033[31;40mCan not run $worker_name processes as user $worker_user , User $worker_user not exists\033[0m\n\n\033[31;40mServer start fail\033[0m\n\n");
                 }
             }
@@ -139,10 +139,10 @@ class Checker
             echo str_pad($worker_name, $pad_length),"\033[32;40m [OK] \033[0m\n";
         }
     
-        if($total_worker_count > \WORKERMAN\Core\Master::SERVER_MAX_WORKER_COUNT)
+        if($total_worker_count > \Man\Core\Master::SERVER_MAX_WORKER_COUNT)
         {
-            \WORKERMAN\Core\Master::notice("Number of worker processes can not be more than " . \WORKERMAN\Core\Master::SERVER_MAX_WORKER_COUNT . ".\tPlease check start_workers in " . WORKERMAN_ROOT_DIR . "config/main.php\tServer start fail");
-            exit("\n\033[31;40mNumber of worker processes can not be more than " . \WORKERMAN\Core\Master::SERVER_MAX_WORKER_COUNT . ".\nPlease check start_workers in " . WORKERMAN_ROOT_DIR . "config/main.php\033[0m\n\n\033[31;40mServer start fail\033[0m\n");
+            \Man\Core\Master::notice("Number of worker processes can not be more than " . \Man\Core\Master::SERVER_MAX_WORKER_COUNT . ".\tPlease check start_workers in " . WORKERMAN_ROOT_DIR . "config/main.php\tServer start fail");
+            exit("\n\033[31;40mNumber of worker processes can not be more than " . \Man\Core\Master::SERVER_MAX_WORKER_COUNT . ".\nPlease check start_workers in " . WORKERMAN_ROOT_DIR . "config/main.php\033[0m\n\n\033[31;40mServer start fail\033[0m\n");
         }
     
         echo "-------------------------------------------------\n";
@@ -184,13 +184,13 @@ class Checker
     {
         if($limit_info = posix_getrlimit())
         {
-            if('unlimited' != $limit_info['soft openfiles'] && $limit_info['soft openfiles'] < \WORKERMAN\Core\Master::MIN_SOFT_OPEN_FILES)
+            if('unlimited' != $limit_info['soft openfiles'] && $limit_info['soft openfiles'] < \Man\Core\Master::MIN_SOFT_OPEN_FILES)
             {
-                echo "Notice : Soft open files now is {$limit_info['soft openfiles']},  We recommend greater than " . \WORKERMAN\Core\Master::MIN_SOFT_OPEN_FILES . "\n";
+                echo "Notice : Soft open files now is {$limit_info['soft openfiles']},  We recommend greater than " . \Man\Core\Master::MIN_SOFT_OPEN_FILES . "\n";
             }
-            if('unlimited' != $limit_info['hard filesize'] && $limit_info['hard filesize'] < \WORKERMAN\Core\Master::MIN_SOFT_OPEN_FILES)
+            if('unlimited' != $limit_info['hard filesize'] && $limit_info['hard filesize'] < \Man\Core\Master::MIN_SOFT_OPEN_FILES)
             {
-                echo "Notice : Hard open files now is {$limit_info['hard filesize']},  We recommend greater than " . \WORKERMAN\Core\Master::MIN_HARD_OPEN_FILES . "\n";
+                echo "Notice : Hard open files now is {$limit_info['hard filesize']},  We recommend greater than " . \Man\Core\Master::MIN_HARD_OPEN_FILES . "\n";
             }
         }
     }
@@ -204,7 +204,7 @@ class Checker
         // 已经有进程pid可能server已经启动
         if(@file_get_contents(WORKERMAN_PID_FILE))
         {
-            \WORKERMAN\Core\Master::notice("Server already started", true);
+            \Man\Core\Master::notice("Server already started", true);
             exit;
         }
         

Core/Lib/Config.php → man/Core/Lib/Config.php

@@ -1,5 +1,5 @@
 <?php
-namespace WORKERMAN\Core\Lib;
+namespace Man\Core\Lib;
 class Config
 {
     public static $filename;

Core/Lib/Log.php → man/Core/Lib/Log.php

@@ -1,5 +1,5 @@
 <?php
-namespace WORKERMAN\Core\Lib;
+namespace Man\Core\Lib;
 /**
  * 
  * 日志类
@@ -20,7 +20,7 @@ class Log
      */
     public static function init()
     {
-        set_error_handler(array('\WORKERMAN\Core\Lib\Log', 'errHandle'), E_RECOVERABLE_ERROR | E_USER_ERROR);
+        set_error_handler(array('\Man\Core\Lib\Log', 'errHandle'), E_RECOVERABLE_ERROR | E_USER_ERROR);
         return self::checkWriteable();
     }
     

Core/Lib/Task.php → man/Core/Lib/Task.php

@@ -1,5 +1,5 @@
 <?php
-namespace WORKERMAN\Core\Lib;
+namespace Man\Core\Lib;
 /**
  * 
  * 定时任务
@@ -7,8 +7,8 @@ namespace WORKERMAN\Core\Lib;
  * <b>使用示例:</b>
  * <pre>
  * <code>
- * \WORKERMAN\Core\Lib\Task::init();
- * \WORKERMAN\Core\Lib\Task::add(5, array('class', 'method'), array($arg1, $arg2..));
+ * \Man\Core\Lib\Task::init();
+ * \Man\Core\Lib\Task::add(5, array('class', 'method'), array($arg1, $arg2..));
  * <code>
  * </pre>
 * @author walkor <worker-man@qq.com>
@@ -36,11 +36,11 @@ class Task
         pcntl_alarm(1);
         if($event)
         {
-            $event->add(SIGALRM, \WORKERMAN\Core\Events\BaseEvent::EV_SIGNAL, array('\WORKERMAN\Core\Lib\Task', 'signalHandle'));
+            $event->add(SIGALRM, \Man\Core\Events\BaseEvent::EV_SIGNAL, array('\Man\Core\Lib\Task', 'signalHandle'));
         }
         else 
         {
-            pcntl_signal(SIGALRM, array('\WORKERMAN\Core\Lib\Task', 'signalHandle'), false);
+            pcntl_signal(SIGALRM, array('\Man\Core\Lib\Task', 'signalHandle'), false);
         }
     }
     
@@ -72,7 +72,7 @@ class Task
         }
         if(!is_callable($func) && class_exists('Log'))
         {
-            \WORKERMAN\Core\Lib\Log::add(var_export($func, true). "not callable\n");
+            \Man\Core\Lib\Log::add(var_export($func, true). "not callable\n");
             return false;
         }
         $time_now = time();

Core/Master.php → man/Core/Master.php

@@ -1,9 +1,9 @@
 <?php 
-namespace WORKERMAN\Core;
-require_once WORKERMAN_ROOT_DIR . 'Core/Lib/Checker.php';
-require_once WORKERMAN_ROOT_DIR . 'Core/Lib/Config.php';
-require_once WORKERMAN_ROOT_DIR . 'Core/Lib/Task.php';
-require_once WORKERMAN_ROOT_DIR . 'Core/Lib/Log.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';
 
 /**
  * 
@@ -394,7 +394,7 @@ class Master
             self::setWorkerProcessTitle($worker_name);
     
             // 创建worker实例
-            include_once WORKERMAN_ROOT_DIR . "Workers/$worker_name.php";
+            include_once WORKERMAN_ROOT_DIR . "workers/$worker_name.php";
             $worker = new $worker_name($worker_name);
             // 如果该worker有配置监听端口，则将监听端口的socket传递给子进程
             if(isset(self::$listenedSockets[$worker_name]))
@@ -422,13 +422,13 @@ class Master
     protected static function installSignal()
     {
         // 设置终止信号处理函数
-        pcntl_signal(SIGINT,  array('\WORKERMAN\Core\Master', 'signalHandler'), false);
+        pcntl_signal(SIGINT,  array('\Man\Core\Master', 'signalHandler'), false);
         // 设置SIGUSR1信号处理函数,测试用
-        pcntl_signal(SIGUSR1, array('\WORKERMAN\Core\Master', 'signalHandler'), false);
+        pcntl_signal(SIGUSR1, array('\Man\Core\Master', 'signalHandler'), false);
         // 设置SIGUSR2信号处理函数,平滑重启Server
-        pcntl_signal(SIGHUP, array('\WORKERMAN\Core\Master', 'signalHandler'), false);
+        pcntl_signal(SIGHUP, array('\Man\Core\Master', 'signalHandler'), false);
         // 设置子进程退出信号处理函数
-        pcntl_signal(SIGCHLD, array('\WORKERMAN\Core\Master', 'signalHandler'), false);
+        pcntl_signal(SIGCHLD, array('\Man\Core\Master', 'signalHandler'), false);
     
         // 设置忽略信号
         pcntl_signal(SIGPIPE, SIG_IGN);
@@ -678,7 +678,7 @@ class Master
             {
                 self::$workerToRestart[$pid] = time();
                 posix_kill($pid, SIGHUP);
-                Lib\Task::add(self::KILL_WORKER_TIME_LONG, array('\WORKERMAN\Core\Master', 'forceKillWorker'), array($pid), false);
+                Lib\Task::add(self::KILL_WORKER_TIME_LONG, array('\Man\Core\Master', 'forceKillWorker'), array($pid), false);
                 break;
             }
         }
@@ -714,7 +714,7 @@ class Master
         self::$serverStatus = self::STATUS_SHUTDOWN;
     
         // killWorkerTimeLong 秒后如果还没停止则强制杀死所有进程
-        Lib\Task::add(self::KILL_WORKER_TIME_LONG, array('\WORKERMAN\Core\Master', 'stopAllWorker'), array(true), false);
+        Lib\Task::add(self::KILL_WORKER_TIME_LONG, array('\Man\Core\Master', 'stopAllWorker'), array(true), false);
     
         // 停止所有worker
         self::stopAllWorker();

Core/SocketWorker.php → man/Core/SocketWorker.php

@@ -1,8 +1,8 @@
 <?php
-namespace WORKERMAN\Core;
-require_once WORKERMAN_ROOT_DIR . 'Core/Events/Select.php';
-require_once WORKERMAN_ROOT_DIR . 'Core/AbstractWorker.php';
-require_once WORKERMAN_ROOT_DIR . 'Core/Lib/Config.php';
+namespace Man\Core;
+require_once WORKERMAN_ROOT_DIR . 'man/Core/Events/Select.php';
+require_once WORKERMAN_ROOT_DIR . 'man/Core/AbstractWorker.php';
+require_once WORKERMAN_ROOT_DIR . 'man/Core/Lib/Config.php';
 
 /**
  * SocketWorker 监听某个端口，对外提供网络服务的worker
@@ -295,7 +295,7 @@ abstract class SocketWorker extends AbstractWorker
     public function setEventLoopName($event_loop_name)
     {
         $this->eventLoopName = "\\WORKERMAN\\Core\\Events\\".$event_loop_name;
-        require_once WORKERMAN_ROOT_DIR . 'Core/Events/'.ucfirst(str_replace('WORKERMAN', '', $event_loop_name)).'.php';
+        require_once WORKERMAN_ROOT_DIR . 'man/Core/Events/'.ucfirst(str_replace('WORKERMAN', '', $event_loop_name)).'.php';
     }
     
     /**

Protocols/Buffer.php → man/Protocols/Buffer.php

@@ -1,5 +1,5 @@
 <?php 
-namespace WORKERMAN\Protocols;
+namespace Man\Protocols;
 /**
  * 通用的server协议,二进制协议
  * 

Protocols/SimpleFastCgi.php → man/Protocols/SimpleFastCgi.php

@@ -1,5 +1,5 @@
 <?php 
-namespace WORKERMAN\Protocols;
+namespace Man\Protocols;
 /**
  * fastcgi 协议解析 相关
  * 简单实现，测试时使用，可能会有bug，不要用到生产环境

Protocols/SimpleHttp.php → man/Protocols/SimpleHttp.php

@@ -1,5 +1,5 @@
 <?php 
-namespace WORKERMAN\Protocols;
+namespace Man\Protocols;
 /**
  * http 协议解析 相关
  * 简单的实现 不支持header cookie