com php-src: Renamed Zend Optimizer+ into Zend OPcache: ext/opcache/Optimizer/zend_optimizer.c ext/opcache/Optimi zer/zend_optimizer.h
ext/opcache/Optimizer/zend_optimiz er_internal.h ext/opcache/README ext/opcache/ZendAccele rator.c ext/opcache/ZendAccelerator.h ext/opcache/confi
g.m4 ext/opcache/config.w32 ext/opcache/shared_ alloc_mmap.c ext/opcache/shared_alloc_posix.c ext /opcache/shared_alloc_shm.c ext/opcache/shared_alloc
_win32.c ext/opcache/tes

Commit: a62ffb72f403d255c744b27f617ee6b6ac62c216 Author: Dmitry Stogov <dmitry@zend.com> Tue, 19 Mar 2013 10:32:24 +0400 Parents: 840c0d6091ccf25780b97178acd51e2627cefc9a Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a62ffb72f403d255c744b27f617ee6b6ac62c216 Log: Renamed Zend Optimizer+ into Zend OPcache Changed paths: M ext/opcache/Optimizer/zend_optimizer.c M ext/opcache/Optimizer/zend_optimizer.h M ext/opcache/Optimizer/zend_optimizer_internal.h M ext/opcache/README M ext/opcache/ZendAccelerator.c M ext/opcache/ZendAccelerator.h M ext/opcache/config.m4 M ext/opcache/config.w32 M ext/opcache/shared_alloc_mmap.c M ext/opcache/shared_alloc_posix.c M ext/opcache/shared_alloc_shm.c M ext/opcache/shared_alloc_win32.c M ext/opcache/tests/bug64353.phpt M ext/opcache/tests/skipif.inc M ext/opcache/zend_accelerator_blacklist.c M ext/opcache/zend_accelerator_blacklist.h M ext/opcache/zend_accelerator_debug.c M ext/opcache/zend_accelerator_debug..h M ext/opcache/zend_accelerator_hash.c M ext/opcache/zend_accelerator_hash.h M ext/opcache/zend_accelerator_module.c M ext/opcache/zend_accelerator_module.h M ext/opcache/zend_accelerator_util_funcs..c M ext/opcache/zend_accelerator_util_funcs.h M ext/opcache/zend_persist.c M ext/opcache/zend_persist.h M ext/opcache/zend_persist_calc.c M ext/opcache/zend_shared_alloc.c M ext/opcache/zend_shared_alloc.h

diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c index e46e5a2..b574ecc 100644 --- a/ext/opcache/Optimizer/zend_optimizer.c +++ b/ext/opcache/Optimizer/zend_optimizer.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/Optimizer/zend_optimizer.h b/ext/opcache/Optimizer/zend_optimizer.h index ff84853..98275a2 100644 --- a/ext/opcache/Optimizer/zend_optimizer.h +++ b/ext/opcache/Optimizer/zend_optimizer.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/Optimizer/zend_optimizer_internal.h b/ext/opcache/Optimizer/zend_optimizer_internal.h index 6f85364..0097496 100644 --- a/ext/opcache/Optimizer/zend_optimizer_internal.h +++ b/ext/opcache/Optimizer/zend_optimizer_internal.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/README b/ext/opcache/README index e7df876..f87e1cc 100644 --- a/ext/opcache/README +++ b/ext/opcache/README @@ -1,7 +1,7 @@ -The Zend Optimizer+ -=================== +The Zend OPcache +================ -The Zend Optimizer+ provides faster PHP execution through opcode caching and +The Zend OPcache provides faster PHP execution through opcode caching and optimization. It improves PHP performance by storing precompiled script bytecode in the shared memory. This eliminates the stages of reading code from the disk and compiling it on future access. In addition, it applies a few @@ -10,7 +10,7 @@ bytecode optimization patterns that make code execution faster. Compatibility ------------- -This version of Zend Optimizer+ is compatible with PHP 5.2.*, 5.3.*, 5.4.* +This version of Zend OPcache is compatible with PHP 5.2.*, 5.3.*, 5.4.* and PHP-5.5 development branch. PHP 5.2 support may be removed in the future. Quick Install @@ -31,9 +31,9 @@ Quick Install zend_extension=/...full path.../opcache.so -NOTE: In case you are going to use Zend Optimizer+ together with Xdebug, -be sure that Xdebug is loaded after Optimizer+. "php -v" must show Xdebug -after Optimizer+. +NOTE: In case you are going to use Zend OPcache together with Xdebug, +be sure that Xdebug is loaded after OPcache. "php -v" must show Xdebug +after OPcache. - Restart PHP @@ -63,17 +63,17 @@ Configuration Directives ------------------------ opcache.enable (default "1") - Optimizer+ On/Off switch. When set to Off, code is not optimized. + OPcache On/Off switch. When set to Off, code is not optimized. opcache.memory_consumption (default "64") - The Optimizer+ shared memory storage size. The amount of memory for storing + The OPcache shared memory storage size. The amount of memory for storing precompiled PHP code in Mbytes. opcache.interned_strings_buffer (default "4") The amount of memory for interned strings in Mbytes. opcache.max_accelerated_files (default "2000") - The maximum number of keys (scripts) in the Optimizer+ hash table. + The maximum number of keys (scripts) in the OPcache 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 @@ -83,13 +83,13 @@ opcache.max_wasted_percentage (default "5") The maximum percentage of "wasted" memory until a restart is scheduled. opcache.use_cwd (default "1") - When this directive is enabled, the Optimizer+ appends the current working + When this directive is enabled, the OPcache 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. opcache.validate_timestamps (default "1") - When disabled, you must reset the Optimizer+ manually or restart the + When disabled, you must reset the OPcache manually or restart the webserver for changes to the filesystem to take effect. The frequency of the check is controlled by the directive "opcache.revalidate_freq". @@ -127,15 +127,15 @@ opcache.enable_file_override (default "0") Allow file existence override (file_exists, etc.) performance feature. opcache.optimization_level (default "0xffffffff") - A bitmask, where each bit enables or disables the appropriate Optimizer+ + A bitmask, where each bit enables or disables the appropriate OPcache passes 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 + The OPcache stores the places where DECLARE_CLASS opcodes use inheritance (These are the only opcodes that can be executed by PHP, but which may not be executed because the parent class is missing due to - optimization). When the file is loaded, Optimizer+ tries to bind the + optimization). When the file is loaded, OPcache tries to bind the inherited classes by using the current environment. The problem with this scenario is that, while the DECLARE_CLASS opcode may not be needed for the current script, if the script requires that the opcode at least be defined, @@ -147,8 +147,8 @@ opcache.dups_fix (default "0") Enable this hack as a workaround for "Cannot redeclare class" errors. opcache.blacklist_filename - The location of the Optimizer+ blacklist file. - The Optimizer+ blacklist file is a text file that holds the names of files + The location of the OPcache blacklist file. + The OPcache 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 to a new line. The filename may be a full path or just a file prefix (i.e., /var/www/x blacklists all the files and directories in /var/www @@ -157,7 +157,7 @@ opcache.blacklist_filename 1) Directories that contain auto generated code, like Smarty or ZFW cache. 2) Code that does not work well when accelerated, due to some delayed compile time evaluation. - 3) Code that triggers an Optimizer+ bug. + 3) Code that triggers an OPcache bug. opcache.max_file_size (default "0") Allows exclusion of large files from being cached. By default all files @@ -172,18 +172,18 @@ opcache.consistency_checks (default "0") 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 + The OPcache uses this directive to identify a situation where there may be a problem with a process. After this time period has passed, the - Optimizer+ assumes that something has happened and starts killing the + OPcache assumes that something has happened and starts killing the processes that still hold the locks that are preventing a restart. If the log level is 3 or above, a "killed locker" error is recorded in the Apache logs when this happens. opcache.error_log - Optimizer+ error_log file name. Empty string assumes "stderr". + OPcache error_log file name. Empty string assumes "stderr". opcache.log_verbosity_level (default "1") - All Optimizer+ errors go to the Web server log. + All OPcache 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). diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 7c5e124..64c5aa8 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h index 45eae71..3f10630 100644 --- a/ext/opcache/ZendAccelerator.h +++ b/ext/opcache/ZendAccelerator.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ @@ -26,7 +26,7 @@ # include <config.h> #endif -#define ACCELERATOR_PRODUCT_NAME "Zend Optimizer+" +#define ACCELERATOR_PRODUCT_NAME "Zend OPcache" #define ACCELERATOR_VERSION "7.0.1-dev" /* 2 - added Profiler support, on 20010712 */ /* 3 - added support for Optimizer's encoded-only-files mode */ @@ -34,7 +34,7 @@ /* 5 - API 4 didn't really work with the license-enabled file format. v5 does. */ /* 6 - Monitor was removed from ZendPlatform.so, to a module of its own */ /* 7 - Optimizer was embedded into Accelerator */ -/* 8 - Standalone Open Source OptimizerPlus */ +/* 8 - Standalone Open Source Zend OPcache */ #define ACCELERATOR_API_NO 8 #if ZEND_WIN32 diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 index a217234..cbf7d5a 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 @@ -2,8 +2,8 @@ dnl dnl $Id$ dnl -PHP_ARG_ENABLE(opcache, whether to enable Zend Optimizer+ support, -[ --enable-opcache Enable Zend Optimizer+ support], yes) +PHP_ARG_ENABLE(opcache, whether to enable Zend OPcache support, +[ --enable-opcache Enable Zend OPcache support], yes) if test "$PHP_OPCACHE" != "no"; then diff --git a/ext/opcache/config.w32 b/ext/opcache/config.w32 index aeca78a..280ce22 100644 --- a/ext/opcache/config.w32 +++ b/ext/opcache/config.w32 @@ -1,4 +1,4 @@ -ARG_ENABLE("opcache", "whether to enable Zend Optimizer+ support", "yes"); +ARG_ENABLE("opcache", "whether to enable Zend OPcache support", "yes"); if (PHP_OPCACHE != "no") { diff --git a/ext/opcache/shared_alloc_mmap.c b/ext/opcache/shared_alloc_mmap.c index 961f4fe..12f0055 100644 --- a/ext/opcache/shared_alloc_mmap.c +++ b/ext/opcache/shared_alloc_mmap.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/shared_alloc_posix.c b/ext/opcache/shared_alloc_posix.c index 46f0257..f3377de 100644 --- a/ext/opcache/shared_alloc_posix.c +++ b/ext/opcache/shared_alloc_posix.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/shared_alloc_shm.c b/ext/opcache/shared_alloc_shm.c index a8b244a..d2b8423 100644 --- a/ext/opcache/shared_alloc_shm.c +++ b/ext/opcache/shared_alloc_shm.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/shared_alloc_win32.c b/ext/opcache/shared_alloc_win32.c index 7eb93af..e323952 100644 --- a/ext/opcache/shared_alloc_win32.c +++ b/ext/opcache/shared_alloc_win32.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ @@ -26,11 +26,11 @@ #include <process.h> #include <LMCONS.H> -#define ACCEL_FILEMAP_NAME "ZendOptimizer+.SharedMemoryArea" -#define ACCEL_MUTEX_NAME "ZendOptimizer+.SharedMemoryMutex" +#define ACCEL_FILEMAP_NAME "ZendOPcache.SharedMemoryArea" +#define ACCEL_MUTEX_NAME "ZendOPcache.SharedMemoryMutex" #define ACCEL_FILEMAP_BASE_DEFAULT 0x01000000 -#define ACCEL_FILEMAP_BASE "ZendOptimizer+.MemoryBase" -#define ACCEL_EVENT_SOURCE "Zend Optimizer+" +#define ACCEL_FILEMAP_BASE "ZendOPcache.MemoryBase" +#define ACCEL_EVENT_SOURCE "Zend OPcache" static HANDLE memfile = NULL, memory_mutex = NULL; static void *mapping_base; diff --git a/ext/opcache/tests/bug64353.phpt b/ext/opcache/tests/bug64353.phpt index 463b6ee..b1f0c6e 100644 --- a/ext/opcache/tests/bug64353.phpt +++ b/ext/opcache/tests/bug64353.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #64353 (Built-in classes can be unavailable with dynamic includes and Optimizer+) +Bug #64353 (Built-in classes can be unavailable with dynamic includes and OPcache) --INI-- allow_url_include=1 opcache.enable=1 diff --git a/ext/opcache/tests/skipif.inc b/ext/opcache/tests/skipif.inc index 8652a94..c5a8181 100644 --- a/ext/opcache/tests/skipif.inc +++ b/ext/opcache/tests/skipif.inc @@ -1,3 +1,3 @@ <?php - if (!extension_loaded('Zend Optimizer+')) die('skip ZendOptimizerPlus extension not available'); + if (!extension_loaded('Zend OPcache')) die('skip Zend OPcache extension not available'); ?> diff --git a/ext/opcache/zend_accelerator_blacklist.c b/ext/opcache/zend_accelerator_blacklist.c index 87dc474..0ccd62e 100644 --- a/ext/opcache/zend_accelerator_blacklist.c +++ b/ext/opcache/zend_accelerator_blacklist.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/zend_accelerator_blacklist.h b/ext/opcache/zend_accelerator_blacklist.h index 5d7730f..626b8d2 100644 --- a/ext/opcache/zend_accelerator_blacklist.h +++ b/ext/opcache/zend_accelerator_blacklist.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/zend_accelerator_debug.c b/ext/opcache/zend_accelerator_debug.c index 1234c0f..93349e3 100644 --- a/ext/opcache/zend_accelerator_debug.c +++ b/ext/opcache/zend_accelerator_debug.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/zend_accelerator_debug.h b/ext/opcache/zend_accelerator_debug.h index 8d0d732..2ff88e2 100644 --- a/ext/opcache/zend_accelerator_debug.h +++ b/ext/opcache/zend_accelerator_debug.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/zend_accelerator_hash.c b/ext/opcache/zend_accelerator_hash.c index dbdc2ef..afd227c 100644 --- a/ext/opcache/zend_accelerator_hash.c +++ b/ext/opcache/zend_accelerator_hash.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/zend_accelerator_hash.h b/ext/opcache/zend_accelerator_hash.h index a1a836c..fdfddb4 100644 --- a/ext/opcache/zend_accelerator_hash.h +++ b/ext/opcache/zend_accelerator_hash.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c index 6f72dd9..290813c 100644 --- a/ext/opcache/zend_accelerator_module.c +++ b/ext/opcache/zend_accelerator_module.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/zend_accelerator_module.h b/ext/opcache/zend_accelerator_module.h index 5ac5716..539b4e8 100644 --- a/ext/opcache/zend_accelerator_module.h +++ b/ext/opcache/zend_accelerator_module.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c index 06299d8..7d5028c 100644 --- a/ext/opcache/zend_accelerator_util_funcs.c +++ b/ext/opcache/zend_accelerator_util_funcs.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/zend_accelerator_util_funcs.h b/ext/opcache/zend_accelerator_util_funcs.h index 804e0f7..a926145 100644 --- a/ext/opcache/zend_accelerator_util_funcs.h +++ b/ext/opcache/zend_accelerator_util_funcs.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c index 6f9678e..0bffae4 100644 --- a/ext/opcache/zend_persist.c +++ b/ext/opcache/zend_persist.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/zend_persist.h b/ext/opcache/zend_persist.h index ffb990a..cf3fb73 100644 --- a/ext/opcache/zend_persist.h +++ b/ext/opcache/zend_persist.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/zend_persist_calc.c b/ext/opcache/zend_persist_calc.c index 00c8784..18af756 100644 --- a/ext/opcache/zend_persist_calc.c +++ b/ext/opcache/zend_persist_calc.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c index 5e37e38..f4465ce 100644 --- a/ext/opcache/zend_shared_alloc.c +++ b/ext/opcache/zend_shared_alloc.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/opcache/zend_shared_alloc.h b/ext/opcache/zend_shared_alloc.h index c8411b5..23af630 100644 --- a/ext/opcache/zend_shared_alloc.h +++ b/ext/opcache/zend_shared_alloc.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | Zend Optimizer+ | + | Zend OPcache | +----------------------------------------------------------------------+ | Copyright (c) 1998-2013 The PHP Group | +----------------------------------------------------------------------+