"ZendOptimizerPlus" is renamed to "opcache" to de merged into PHP-5.5 under ext/opcache (the product name is still "Zend Optimizer+")

Author: dstogov

README

@@ -42,64 +42,64 @@ Speed Tuning
 
 We recommend the following configuration options for best performance.
 
-zend_optimizerplus.memory_consumption=128
-zend_optimizerplus.interned_strings_buffer=8
-zend_optimizerplus.max_accelerated_files=4000
-zend_optimizerplus.revalidate_freq=60
-zend_optimizerplus.fast_shutdown=1
-zend_optimizerplus.enable_cli=1
+opcache.memory_consumption=128
+opcache.interned_strings_buffer=8
+opcache.max_accelerated_files=4000
+opcache.revalidate_freq=60
+opcache.fast_shutdown=1
+opcache.enable_cli=1
 
 You also may add the following, but it may break some applications and
 frameworks. Please, read description of these directives and add them on your
 own risk.
 
-zend_optimizerplus.save_comments=0
-zend_optimizerplus.enable_file_override=1
+opcache.save_comments=0
+opcache.enable_file_override=1
 
 In some cases you may like to prefer enabling/disabling some features
 to avoid incompatibilities at the cost of some performance degradation.
 
 Configuration Directives
 ------------------------
 
-zend_optimizerplus.enable (default "1")
+opcache.enable (default "1")
 	Optimizer+ On/Off switch. When set to Off, code is not optimized.
 
-zend_optimizerplus.memory_consumption (default "64")
+opcache.memory_consumption (default "64")
 	The Optimizer+ shared memory storage size. The amount of memory for storing
 	precompiled PHP code in Mbytes.
 
-zend_optimizerplus.interned_strings_buffer (default "4")
+opcache.interned_strings_buffer (default "4")
 	The amount of memory for interned strings in Mbytes.
 
-zend_optimizerplus.max_accelerated_files (default "2000")
+opcache.max_accelerated_files (default "2000")
 	The maximum number of keys (scripts) in the Optimizer+ hash table.
 	The number is actually the first one in the following set of prime
 	numbers that is bigger than the one supplied: { 223, 463, 983, 1979, 3907,
 	7963, 16229, 32531, 65407, 130987 }. Only numbers between 200 and 100000
 	are allowed.
 
-zend_optimizerplus.max_wasted_percentage (default "5")
+opcache.max_wasted_percentage (default "5")
 	The maximum percentage of "wasted" memory until a restart is scheduled.
 
-zend_optimizerplus.use_cwd (default "1")
+opcache.use_cwd (default "1")
 	When this directive is enabled, the Optimizer+ appends the current working
 	directory to the script key, thus eliminating possible collisions between
 	files with the same name (basename). Disabling the directive improves
 	performance, but may break existing applications.
 
-zend_optimizerplus.validate_timestamps (default "1")
+opcache.validate_timestamps (default "1")
 	When disabled, you must reset the Optimizer+ manually or restart the
 	webserver for changes to the filesystem to take effect.
 	The frequency of the check is controlled by the directive
-	"zend_optimizerplus.revalidate_freq".
+	"opcache.revalidate_freq".
 
-zend_optimizerplus.revalidate_freq (default "2")
+opcache.revalidate_freq (default "2")
 	How often (in seconds) to check file timestamps for changes to the shared
 	memory storage allocation. ("1" means validate once per second, but only
 	once per request. "0" means always validate)
 
-zend_optimizerplus.revalidate_path (default "0")
+opcache.revalidate_path (default "0")
 	Enables or disables file search in include_path optimization
 	If the file search is disabled and a cached file is found that uses
 	the same include_path, the file is not searched again. Thus, if a file
@@ -108,29 +108,29 @@ zend_optimizerplus.revalidate_path (default "0")
 	your applications. The default for this directive is disabled, which means
 	that optimization is active.
 
-zend_optimizerplus.save_comments (default "1")
+opcache.save_comments (default "1")
 	If disabled, all PHPDoc comments are dropped from the code to reduce the
 	size of the optimized code. Disabling "Doc Comments" may break some
 	existing applications and frameworks (e.g. Doctrine, ZF2, PHPUnit)
 
-zend_optimizerplus.load_comments (default "1")
+opcache.load_comments (default "1")
 	If disabled, PHPDoc comments are not loaded from SHM, so "Doc Comments"
 	may be always stored (save_comments=1), but not loaded by applications
 	that don't need them anyway.
 
-zend_optimizerplus.fast_shutdown (default "0")
+opcache.fast_shutdown (default "0")
 	If enabled, a fast shutdown sequence is used for the accelerated code
 	The fast shutdown sequence doesn't free each allocated block, but lets
 	the Zend Engine Memory Manager do the work.
 
-zend_optimizerplus.enable_file_override (default "0")
+opcache.enable_file_override (default "0")
 	Allow file existence override (file_exists, etc.) performance feature.
 
-zend_optimizerplus.optimization_level (default "0xffffffff")
+opcache.optimization_level (default "0xffffffff")
 	A bitmask, where each bit enables or disables the appropriate Optimizer+
 	passes
 
-zend_optimizerplus.inherited_hack (default "1")
+opcache.inherited_hack (default "1")
 	Enable this hack as a workaround for "can't redeclare class" errors.
 	The Optimizer+ stores the places where DECLARE_CLASS opcodes use
 	inheritance (These are the only opcodes that can be executed by PHP,
@@ -143,10 +143,10 @@ zend_optimizerplus.inherited_hack (default "1")
 	that optimization is active. In php-5.3 and above this hack is not needed
 	anymore and this setting has no effect.
 
-zend_optimizerplus.dups_fix (default "0")
+opcache.dups_fix (default "0")
 	Enable this hack as a workaround for "Cannot redeclare class" errors.
 
-zend_optimizerplus.blacklist_filename
+opcache.blacklist_filename
 	The location of the Optimizer+ blacklist file.
 	The Optimizer+ blacklist file is a text file that holds the names of files
 	that should not be accelerated. The file format is to add each filename
@@ -159,17 +159,17 @@ zend_optimizerplus.blacklist_filename
 	   compile time evaluation.
 	3) Code that triggers an Optimizer+ bug.
 
-zend_optimizerplus.max_file_size (default "0")
+opcache.max_file_size (default "0")
 	Allows exclusion of large files from being cached. By default all files
 	are cached.
 
-zend_optimizerplus.consistency_checks (default "0")
+opcache.consistency_checks (default "0")
 	Check the cache checksum each N requests.
 	The default value of "0" means that the checks are disabled.
 	Because calculating the checksum impairs performance, this directive should
 	be enabled only as part of a debugging process.
 
-zend_optimizerplus.force_restart_timeout (default "180")
+opcache.force_restart_timeout (default "180")
 	How long to wait (in seconds) for a scheduled restart to begin if the cache
 	is not being accessed.
 	The Optimizer+ uses this directive to identify a situation where there may
@@ -179,23 +179,23 @@ zend_optimizerplus.force_restart_timeout (default "180")
 	If the log level is 3 or above, a "killed locker" error is recorded
 	in the Apache logs when this happens.
 
-zend_optimizerplus.error_log
+opcache.error_log
 	Optimizer+ error_log file name. Empty string assumes "stderr".
 
-zend_optimizerplus.log_verbosity_level (default "1")
+opcache.log_verbosity_level (default "1")
 	All Optimizer+ errors go to the Web server log.
 	By default, only fatal errors (level 0) or errors (level 1) are logged.
 	You can also enable warnings (level 2), info messages (level 3) or
 	debug messages (level 4).
 
-zend_optimizerplus.preferred_memory_model
+opcache.preferred_memory_model
 	Preferred Shared Memory back-end. Leave empty and let the system decide.
 
-zend_optimizerplus.protect_memory (default "0")
+opcache.protect_memory (default "0")
 	Protect the shared memory from unexpected writing during script execution.
 	Useful for internal debugging only.
 
-zend_optimizerplus.mmap_base
+opcache.mmap_base
 	Mapping base of shared memory segments (for Windows only). All the PHP
 	processes have to map shared memory into the same address space. This
 	directive allows to manually fix the "Unable to reattach to base address"

ZendAccelerator.c

@@ -913,7 +913,7 @@ char *accel_make_persistent_key_ex(zend_file_handle *file_handle, int path_lengt
 
         if ((cwd = accel_getcwd(&cwd_len TSRMLS_CC)) == NULL) {
             /* we don't handle this well for now. */
-            zend_accel_error(ACCEL_LOG_INFO, "getcwd() failed for '%s' (%d), please try to set zend_optimizerplus.use_cwd to 0 in ini file", file_handle->filename, errno);
+            zend_accel_error(ACCEL_LOG_INFO, "getcwd() failed for '%s' (%d), please try to set opcache.use_cwd to 0 in ini file", file_handle->filename, errno);
             if (file_handle->opened_path) {
                 cwd = file_handle->opened_path;
 		        cwd_len = strlen(cwd);

config.m4

@@ -2,11 +2,10 @@ dnl
 dnl $Id$
 dnl
 
-PHP_ARG_ENABLE(optimizer-plus, whether to enable Zend OptimizerPlus support,
-[  --enable-optimizer-plus Enable Zend OptimizerPlus support])
+PHP_ARG_ENABLE(opcache, whether to enable Zend Optimizer+ support,
+[  --enable-opcache Enable Zend Optimizer+ support])
 
-if test "$PHP_OPTIMIZER_PLUS" != "no"; then
-  AC_DEFINE(HAVE_OPTIMIZER_PLUS, 1, [ ])
+if test "$PHP_OPCACHE" != "no"; then
 
   AC_CHECK_FUNC(mprotect,[
     AC_DEFINE(HAVE_MPROTECT, 1, [Define if you have mprotect() function])
@@ -327,7 +326,7 @@ int main() {
     msg=yes,msg=no,msg=no)
   AC_MSG_RESULT([$msg])
 
-  PHP_NEW_EXTENSION(ZendOptimizerPlus,
+  PHP_NEW_EXTENSION(opcache,
 	ZendAccelerator.c \
 	zend_accelerator_blacklist.c \
 	zend_accelerator_debug.c \

config.w32

@@ -1,11 +1,11 @@
-ARG_ENABLE("optimizer-plus", "whether to enable Zend OptimizerPlus support", "yes");
+ARG_ENABLE("opcache", "whether to enable Zend Optimizer+ support", "yes");
 
-if (PHP_OPTIMIZER_PLUS != "no") {
+if (PHP_OPCACHE != "no") {
 
 	PHP_PGI = "no"; // workaround
 	PHP_PGO = "no"; // workaround
 
-	EXTENSION('ZendOptimizerPlus', "\
+	EXTENSION('opcache', "\
 		ZendAccelerator.c \
 		zend_accelerator_blacklist.c \
 		zend_accelerator_debug.c \
@@ -17,12 +17,11 @@ if (PHP_OPTIMIZER_PLUS != "no") {
 		zend_shared_alloc.c \
 		shared_alloc_win32.c", true);
 
-	ADD_SOURCES(configure_module_dirname + "/Optimizer", "zend_optimizer.c", "ZendOptimizerPlus", "OptimizerObj");
+	ADD_SOURCES(configure_module_dirname + "/Optimizer", "zend_optimizer.c", "opcache", "OptimizerObj");
 
 
-	ADD_FLAG('CFLAGS_ZENDOPTIMIZERPLUS', "/I " + configure_module_dirname);
-	ADD_FLAG('CFLAGS_ZENDOPTIMIZERPLUS', "/D HAVE_OPTIMIZER_PLUS=1");
+	ADD_FLAG('CFLAGS_OPCACHE', "/I " + configure_module_dirname);
 
-	ADD_FLAG('CFLAGS_ZENDOPTIMIZERPLUS', "/Dregexec=php_regexec /Dregerror=php_regerror /Dregfree=php_regfree /Dregcomp=php_regcomp /Iext/ereg/regex");
+	ADD_FLAG('CFLAGS_OPCACHE', "/Dregexec=php_regexec /Dregerror=php_regerror /Dregfree=php_regfree /Dregcomp=php_regcomp /Iext/ereg/regex");
 
 }

shared_alloc_win32.c

@@ -275,7 +275,7 @@ static int create_segments(size_t requested_size, zend_shared_segment ***shared_
 		}
 		if (sscanf(s, "%p", &default_mapping_base_set[0]) != 1) {
 			zend_shared_alloc_unlock_win32();
-			zend_win_error_message(ACCEL_LOG_FATAL, "Bad mapping address specified in zend_optimizerplus.mmap_base", err);
+			zend_win_error_message(ACCEL_LOG_FATAL, "Bad mapping address specified in opcache.mmap_base", err);
 			return ALLOC_FAILURE;
 		}
 	}