框架性能优化

Author: tayueliuxiang

App/Config/config.php

@@ -14,11 +14,13 @@
     'default_module' => 'Home', //1:PATHINFO 2:QUERY
     'default_controller' => 'Index',
     'timeZone'=>'PRC',
+    'test_mark'=>"cc",
     'default_action' => 'index',
     'current_module' => '',
     'current_controller' => '',
     'current_action' => '',
     'basePath' => dirname(__DIR__),
+    'include_files'=>[__DIR__.DIRECTORY_SEPARATOR.'config.php',__DIR__.DIRECTORY_SEPARATOR.'server.php'], //重启工作进程时需要重新载入的配置文件
     'log'=>[
         'log_dir'=>dirname(__DIR__).DIRECTORY_SEPARATOR.'Log',
         'is_display'=>true

App/Modules/Home/Controller/IndexController.php

@@ -70,7 +70,8 @@ public function indexAction(Crypt $crypt,Event $e,SendSmsListener $smlistener,Se
 
 //        print_r($userData1);
 //        print_r($userData2);
-        $this->assign('name', 'Http Server !!!');
+        print_r(ServerManager::getApp());
+        $this->assign('name', 'Http Server  sssss !!!');
         $this->display('index.html');
 
     }

App/Service/User.php

@@ -19,9 +19,11 @@ class User
 
     public $crypt;
 
+    public $name="userService";
     public function __construct(Crypt $crypt)
     {
         $this->crypt=$crypt;
+        $this->name=$this->name."=>".date("Y-m-d H:i:s");
     }
 
     public function findUser()

Framework/SwServer/AbstractServerApplication.php

@@ -40,7 +40,7 @@ public function init()
         (isset(ServerManager::$config['log']) && ServerManager::$config['log']) && Log::getInstance()->setConfig(ServerManager::$config['log']);
         Db::setConfig(ServerManager::$config['components']['db']['config']);
         $this->setApp();
-        ServerManager::configure(ServerManager::$app[$this->coroutine_id], ServerManager::$config);
+        //ServerManager::configure(ServerManager::$app[$this->coroutine_id], ServerManager::$config);
     }
 
     public function setTimeZone($value)
@@ -99,7 +99,11 @@ public function __get($name)
         if ($res) {
             return $res;
         } else {
-            parent::__get($name);
+            if(isset(ServerManager::$config[$name])){
+                return ServerManager::$config[$name];
+            }else{
+                parent::__get($name);
+            }
         }
     }
     use ServerTrait;

Framework/SwServer/BaseServerManager.php

@@ -19,7 +19,7 @@ abstract class BaseServerManager
     public static $pidFile;
     public static $server;
     public $swoole_server;
-    public static $config;
+    public static $config = [];
     public $coroutine_id;
 
     protected static $pack_check_type = 'length';
@@ -152,7 +152,7 @@ public static function getWorkersPid()
 
     /**
      * setWorkerUserGroup 设置worker进程的工作组，默认是root
-     * @param  string $worker_user
+     * @param string $worker_user
      */
     public static function setWorkerUserGroup($worker_user = null)
     {
@@ -167,7 +167,7 @@ public static function setWorkerUserGroup($worker_user = null)
 
     /**
      * getIncludeFiles 获取woker启动前已经加载的文件
-     * @param   string $dir
+     * @param string $dir
      * @return   void
      */
     public static function getIncludeFiles($dir = 'Http')
@@ -192,15 +192,17 @@ public static function getIncludeFiles($dir = 'Http')
 
     /**
      * startInclude 设置需要在workerstart启动时加载的配置文件
-     * @param  array $includes
+     * @param array $includes
      * @return   void
      */
     public static function startInclude()
     {
         $includeFiles = isset(static::$config['include_files']) ? static::$config['include_files'] : [];
+        self::$config = [];
         if ($includeFiles) {
             foreach ($includeFiles as $filePath) {
-                include_once $filePath;
+                $currentIncludeConfigs = include $filePath;
+                self::$config = array_merge(self::$config, $currentIncludeConfigs);
             }
         }
     }

Framework/SwServer/Component/Invoker.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Created by PhpStorm.
+ * 方法回调超时抛异常
  * User: hdeng
  * Date: 2018/12/7
  * Time: 9:05

Framework/SwServer/Pool/DiPool.php

@@ -1,5 +1,7 @@
 <?php
-//容器池
+/**
+ * 容器对象池
+ */
 
 namespace Framework\SwServer\Pool;
 use \Framework\Traits\ComponentTrait;
@@ -52,6 +54,5 @@ public function get($name)
             }
         }
     }
-
     use ComponentTrait, ServiceTrait, ContainerTrait;
 }

Framework/SwServer/Protocol/WebServer.php

@@ -62,6 +62,10 @@ function onWorkerStart($server, $worker_id)
         ServerManager::$serverApp = \serialize($app);
     }
 
+    function onWorkerStop($server, $worker_id){
+
+    }
+
     function onConnect($server, $client_id, $from_id)
     {
         // TODO: Implement onConnect() method.