Integrate file cache into the cache scenario

Author: weltling

lib/php/libsdk/SDK/Build/PGO/Abstracts/PHP.php

@@ -11,6 +11,8 @@ abstract class PHP
 {
 	protected $php_root;
 	protected $php_ext_root;
+	protected $opcache_file_cache;
+	protected $id;
 
 	protected function setupPaths()
 	{
@@ -23,6 +25,9 @@ protected function setupPaths()
 		} else {
 			$this->php_ext_root = $this->php_root;
 		}
+		if ("cache" == $this->scenario) {
+			$this->opcache_file_cache = SDKConfig::getTmpDir() . DIRECTORY_SEPARATOR . $this->id;
+		}
 	}
 
 	/* TODO Might be improved. */
@@ -147,6 +152,11 @@ public function getIniFilename()
 			}
 		}
 
+		/* Special handling, otherwise it'll need functionality to extrapolate ini values. */
+		if ("cache" == $this->scenario) {
+			$tpl_vars[$this->conf->buildTplVarName("php", "opcache", "file_cache")] = $this->opcache_file_cache;
+		}
+
 		$this->conf->processTplFile(
 			$this->getIniTplFilename(),
 			$ret,
@@ -214,5 +224,13 @@ public function exec(string $php_cmd, string $args = NULL, array $extra_env = ar
 
 		return proc_close($p);
 	}
+
+	public function getIdString(): string
+	{
+		return $this->getVersion() . "-"
+			. SDKConfig::getCurrentCrtName() . "-"
+			. ($this->isThreadSafe() ? "ts" : "nts") . "-"
+			. ($this->is64bit() ? "x64" : "x86");
+	}
 }
 

lib/php/libsdk/SDK/Build/PGO/PHP/CLI.php

@@ -16,6 +16,10 @@ public function __construct(PGOConfig $conf)
 	{
 		$this->conf = $conf;
 		$this->scenario = $conf->getScenario();
+		// Don't do that, it'll be a recursive dependency. 
+		// Once we need to train CLI, we'll need to split
+		// a new class, this one is a utility class.
+		//$this->id = $this->getIdString();
 
 		$this->setupPaths();
 	}

lib/php/libsdk/SDK/Build/PGO/PHP/FCGI.php

@@ -10,6 +10,8 @@
 
 class FCGI extends Abstracts\PHP implements Interfaces\PHP
 {
+	use FileOps;
+
 	protected $conf;
 	protected $is_tcp;
 
@@ -22,6 +24,7 @@ public function __construct(PGOConfig $conf, bool $is_tcp)
 		$this->conf = $conf;
 		$this->is_tcp = $is_tcp;
 		$this->scenario = $conf->getScenario();
+		$this->id = $this->getIdString();
 
 		$this->setupPaths();
 	}
@@ -64,6 +67,13 @@ public function up() : void
 	{
 		echo "Starting PHP FCGI.\n";
 
+		if ("cache" == $this->scenario) {
+			if (file_exists($this->opcache_file_cache)) {
+				$this->rm($this->opcache_file_cache);
+			}
+			mkdir($this->opcache_file_cache);
+		}
+
 		$exe  = $this->getExeFilename();
 		$ini  = $this->getIniFilename();
 		$host = $this->conf->getSectionItem("php", "fcgi", "host");
@@ -82,6 +92,10 @@ public function up() : void
 		/* Give some time, it might be slow on PGI enabled proc. */
 		sleep(3);
 
+		/*while(false !== ($s = fread($pipes[2], 1024))) {
+			echo "$s";
+		}*/
+
 		$c = proc_close($p);
 
 		if ($c) {
@@ -99,6 +113,11 @@ public function down(bool $force = false) : void
 
 		exec("taskkill /f /im php-cgi.exe >nul 2>&1");
 
+		/* XXX Add cleanup interface. */
+		if ("cache" == $this->scenario) {
+			$this->rm($this->opcache_file_cache);
+		}
+
 		echo "PHP FCGI stopped.\n";
 	}
 }

pgo/tpl/php/php-7.3-pgo-nts-cache.ini

@@ -993,6 +993,8 @@ opcache.enable=1
 ;opcache.enable_cli=1
 opcache.error_log = PHP_SDK_PGO_PHP_ERROR_LOG
 opcache.log_verbosity_level = 2
+opcache.file_cache=PHP_SDK_PGO_PHP_OPCACHE_FILE_CACHE
+opcache.file_cache_fallback=1
 
 ;;;;;;;;;;;;;;;;;;;
 ; Module Settings ;

pgo/tpl/php/php-7.3-pgo-ts-cache.ini

@@ -993,6 +993,8 @@ opcache.enable=1
 ;opcache.enable_cli=1
 opcache.error_log = PHP_SDK_PGO_PHP_ERROR_LOG
 opcache.log_verbosity_level = 2
+opcache.file_cache=PHP_SDK_PGO_PHP_OPCACHE_FILE_CACHE
+opcache.file_cache_fallback=1
 
 ;;;;;;;;;;;;;;;;;;;
 ; Module Settings ;