Merge pull request #2 from phpMv/techempower-benchmarks

Add StartupAsync

Author: jcheron

src/Ubiquity/servers/workerman/WorkermanServer.php

@@ -10,13 +10,14 @@
 /**
  * Ubiquity\servers\workerman$WorkermanServer
  * This class is part of Ubiquity
- * @author jcheron <myaddressmail@gmail.com>
- * @version 1.0.0
  *
+ * @author jcheron <myaddressmail@gmail.com>
+ * @version 1.0.2
  */
 class WorkermanServer {
 
 	/**
+	 *
 	 * @var \Workerman\Worker
 	 */
 	private $server;
@@ -28,9 +29,9 @@ class WorkermanServer {
 	private $basedir;
 
 	private $options;
-	
+
 	private $wCount;
-	
+
 	public $onWorkerStart;
 
 	/**
@@ -75,11 +76,11 @@ private function removePidFile(): void {
 	private function configure($http) {
 		$http->set($this->options);
 	}
-	
+
 	public function init($config, $basedir) {
 		$this->config = $config;
 		$this->basedir = $basedir;
-		$this->httpInstance=new WorkermanHttp();
+		$this->httpInstance = new WorkermanHttp();
 		\Ubiquity\controllers\Startup::init($config);
 		\Ubiquity\controllers\Startup::setHttpInstance($this->httpInstance);
 	}
@@ -99,61 +100,61 @@ public function getOption(string $key) {
 	}
 
 	public function setOptions($options = []) {
-		$this->options=$options;
+		$this->options = $options;
 	}
 
 	public function run($host, $port, $options = []) {
 		$this->setOptions($options);
-		$this->server=new Worker("http://$host:$port",$this->options);
-		$this->server->count=$this->wCount??4;
-		if(isset($this->onWorkerStart)){
-			$this->server->onWorkerStart=$this->onWorkerStart;
+		$this->server = new Worker("http://$host:$port", $this->options);
+		$this->server->count = $this->wCount ?? 4;
+		if (isset($this->onWorkerStart)) {
+			$this->server->onWorkerStart = $this->onWorkerStart;
 		}
-		$this->server->onMessage =function($connection,$datas){
-			return $this->handle($connection,$datas);
+		$this->server->onMessage = function ($connection, $datas) {
+			return $this->handle($connection, $datas);
 		};
 		Worker::runAll();
 	}
-	
 
-	protected function handle(ConnectionInterface $connection,$datas) {
-		//$_REQUEST['REQUEST_TIME_FLOAT']=\microtime(true);
-		Http::header('Date: '.\gmdate('D, d M Y H:i:s').' GMT');
+	protected function handle(ConnectionInterface $connection, $datas) {
+		// $_REQUEST['REQUEST_TIME_FLOAT']=\microtime(true);
+		Http::header('Date: ' . \gmdate('D, d M Y H:i:s') . ' GMT');
 		$_GET['c'] = '';
 		$uri = \ltrim(\urldecode(\parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)), '/');
-		if (($uri == null || ! ($fe=\file_exists($this->basedir . '/../' . $uri))) && ($uri!='favicon.ico')) {
+		if (($uri == null || ! ($fe = \file_exists($this->basedir . '/../' . $uri))) && ($uri != 'favicon.ico')) {
 			$_GET['c'] = $uri;
 		} else {
-			if($fe){
-				Http::header('Content-Type: '. HttpCache::$header['Accept'] ?? 'text/html; charset=utf-8',true);
+			if ($fe) {
+				Http::header('Content-Type: ' . HttpCache::$header['Accept'] ?? 'text/html; charset=utf-8', true);
 				return $connection->send(\file_get_contents($this->basedir . '/../' . $uri));
-			}else{
-				Http::header('Content-Type: '. HttpCache::$header['Accept'] ?? 'text/html; charset=utf-8',true,404);
-				return $connection->send($uri.' not found!');
+			} else {
+				Http::header('Content-Type: ' . HttpCache::$header['Accept'] ?? 'text/html; charset=utf-8', true, 404);
+				return $connection->send($uri . ' not found!');
 			}
 			return;
 		}
 
 		$this->httpInstance->setDatas($datas);
 		\ob_start();
-		\Ubiquity\controllers\Startup::forward($_GET['c']);
+		\Ubiquity\controllers\StartupAsync::forward($_GET['c']);
 		return $connection->send(\ob_get_clean());
 	}
+
 	/**
 	 * Sets the worker count
+	 *
 	 * @param int $wCount
 	 */
 	public function setWCount($wCount) {
 		$this->wCount = $wCount;
 	}
-	
-	public function setDefaultCount($multi=1){
-		$this->wCount= ((int) \shell_exec('nproc') ??4)*$multi;
-	}
-	
-	public function daemonize($value=true){
-		Worker::$daemonize=$value;
+
+	public function setDefaultCount($multi = 1) {
+		$this->wCount = ((int) \shell_exec('nproc') ?? 4) * $multi;
 	}
 
+	public function daemonize($value = true) {
+		Worker::$daemonize = $value;
+	}
 }
 

src/Ubiquity/utils/http/foundation/WorkermanHttp.php

@@ -11,22 +11,20 @@
  *
  * @author jcheron <myaddressmail@gmail.com>
  * @version 1.0.0
- *         
  */
 class WorkermanHttp extends AbstractHttp {
 
 	private $headers = [];
 
 	private $responseCode = 200;
-	
-	private $datas;
 
+	private $datas;
 
 	public function getAllHeaders() {
 		return $this->headers;
 	}
-	
-	public function setDatas($datas){
+
+	public function setDatas($datas) {
 		return $this->datas;
 	}
 
@@ -35,7 +33,7 @@ public function header($key, $value, bool $replace = true, int $http_response_co
 		if ($http_response_code != null) {
 			$this->responseCode = $http_response_code;
 		}
-		Http::header($key.':'.$value,$replace,$http_response_code);
+		Http::header($key . ':' . $value, $replace, $http_response_code);
 	}
 
 	/**
@@ -53,7 +51,7 @@ public function getResponseCode() {
 	public function setResponseCode($responseCode) {
 		if ($responseCode != null) {
 			$this->responseCode = $responseCode;
-			if (PHP_SAPI != 'cli') {
+			if (\PHP_SAPI != 'cli') {
 				return \http_response_code($responseCode);
 			}
 			Http::responseCode($responseCode);