]> granicus.if.org Git - php/commitdiff
Renamed Zend Optimizer+ into Zend OPcache
authorDmitry Stogov <dmitry@zend.com>
Tue, 19 Mar 2013 06:32:24 +0000 (10:32 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 19 Mar 2013 06:32:24 +0000 (10:32 +0400)
29 files changed:
ext/opcache/Optimizer/zend_optimizer.c
ext/opcache/Optimizer/zend_optimizer.h
ext/opcache/Optimizer/zend_optimizer_internal.h
ext/opcache/README
ext/opcache/ZendAccelerator.c
ext/opcache/ZendAccelerator.h
ext/opcache/config.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/tests/bug64353.phpt
ext/opcache/tests/skipif.inc
ext/opcache/zend_accelerator_blacklist.c
ext/opcache/zend_accelerator_blacklist.h
ext/opcache/zend_accelerator_debug.c
ext/opcache/zend_accelerator_debug.h
ext/opcache/zend_accelerator_hash.c
ext/opcache/zend_accelerator_hash.h
ext/opcache/zend_accelerator_module.c
ext/opcache/zend_accelerator_module.h
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_accelerator_util_funcs.h
ext/opcache/zend_persist.c
ext/opcache/zend_persist.h
ext/opcache/zend_persist_calc.c
ext/opcache/zend_shared_alloc.c
ext/opcache/zend_shared_alloc.h

index e46e5a2ececb6a8358835a3533c5f787aba91ddc..b574ecc81f2da564781d891101a2d8abbddcfbcf 100644 (file)
@@ -1,6 +1,6 @@
 /*\r
    +----------------------------------------------------------------------+\r
-   | Zend Optimizer+                                                      |\r
+   | Zend OPcache                                                         |\r
    +----------------------------------------------------------------------+\r
    | Copyright (c) 1998-2013 The PHP Group                                |\r
    +----------------------------------------------------------------------+\r
index ff848535d30af797f53ea8b71487d09a16417c51..98275a20aae0e992a6d10aacd77f02ae7acda865 100644 (file)
@@ -1,6 +1,6 @@
 /*\r
    +----------------------------------------------------------------------+\r
-   | Zend Optimizer+                                                      |\r
+   | Zend OPcache                                                         |\r
    +----------------------------------------------------------------------+\r
    | Copyright (c) 1998-2013 The PHP Group                                |\r
    +----------------------------------------------------------------------+\r
index 6f853641fac30fd1c02846f98b64ab1f326d1112..0097496df9a7968f9a3b66cd6ffbe478c6f3d090 100644 (file)
@@ -1,6 +1,6 @@
 /*\r
    +----------------------------------------------------------------------+\r
-   | Zend Optimizer+                                                      |\r
+   | Zend OPcache                                                         |\r
    +----------------------------------------------------------------------+\r
    | Copyright (c) 1998-2013 The PHP Group                                |\r
    +----------------------------------------------------------------------+\r
index e7df8769b674c2c2ff6931226b894ce76fa9bccf..f87e1ccbfc6151db51c00e3e996f69d962752988 100644 (file)
@@ -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).
index 7c5e124729764584327003add2f4f8512f21842b..64c5aa8f14b826ba968d1cefe49de5741702e477 100644 (file)
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | Zend Optimizer+                                                      |
+   | Zend OPcache                                                         |
    +----------------------------------------------------------------------+
    | Copyright (c) 1998-2013 The PHP Group                                |
    +----------------------------------------------------------------------+
index 45eae71dd74e8a5a3e607097834a01cd9c279104..3f10630ac83e117a83e2bdd74b11bece63871023 100644 (file)
@@ -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
index a217234854d8d30f1ef8d29fc0b80e53952c9341..cbf7d5a19c08c388b402a2690f48c99318e63002 100644 (file)
@@ -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
 
index aeca78a77bb9d6918aecedb34fdd7a9d41b6c0b9..280ce228c641dbe275ac45690866cdaba84d69b0 100644 (file)
@@ -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") {
 
index 961f4fea9afd6a3d93df123dbf1d9ef27f6b0b5a..12f00554a14956cc687cb933b89489b355fee057 100644 (file)
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | Zend Optimizer+                                                      |
+   | Zend OPcache                                                         |
    +----------------------------------------------------------------------+
    | Copyright (c) 1998-2013 The PHP Group                                |
    +----------------------------------------------------------------------+
index 46f0257bb3aa851d424d811d1731b64b4ef2584b..f3377dec60754fe46b37a168635f462feb308a26 100644 (file)
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | Zend Optimizer+                                                      |
+   | Zend OPcache                                                         |
    +----------------------------------------------------------------------+
    | Copyright (c) 1998-2013 The PHP Group                                |
    +----------------------------------------------------------------------+
index a8b244aac15196dd575988590d456fa6d796c2c0..d2b842304b545df7fe150b7762e82dfa3bd2ce10 100644 (file)
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | Zend Optimizer+                                                      |
+   | Zend OPcache                                                         |
    +----------------------------------------------------------------------+
    | Copyright (c) 1998-2013 The PHP Group                                |
    +----------------------------------------------------------------------+
index 7eb93af62f2292299fdeb5fa5c6f468771b37c29..e323952845d0cee46d8dc4c34676ce58021bcf18 100644 (file)
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | Zend Optimizer+                                                      |
+   | Zend OPcache                                                         |
    +----------------------------------------------------------------------+
    | Copyright (c) 1998-2013 The PHP Group                                |
    +----------------------------------------------------------------------+
 #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;
index 463b6ee2281f3b0fe940f85026a9d31ead8bdb51..b1f0c6e713507b1f2a12e23e3d68da789a9044d8 100644 (file)
@@ -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
index 8652a94de74b42e882b89810120fc76ed230f257..c5a81810391b798ac56895bd574d1bb8dea52e2d 100644 (file)
@@ -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');
 ?>
index 87dc4744574f11e8a7ac41f906f4d3f4c3c101a9..0ccd62e3441ca042bf72699bf0304dd265d07f0d 100644 (file)
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | Zend Optimizer+                                                      |
+   | Zend OPcache                                                         |
    +----------------------------------------------------------------------+
    | Copyright (c) 1998-2013 The PHP Group                                |
    +----------------------------------------------------------------------+
index 5d7730f470132618056eeee6e050ea407e6dc321..626b8d2c4762971c0c7eec25eae52a2d9aeda69f 100644 (file)
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | Zend Optimizer+                                                      |
+   | Zend OPcache                                                         |
    +----------------------------------------------------------------------+
    | Copyright (c) 1998-2013 The PHP Group                                |
    +----------------------------------------------------------------------+
index 1234c0fc93ca4ca1f2c5e9740ea4452d942c9c99..93349e3d172e74d1da157dd51ebdd78a641973a5 100644 (file)
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | Zend Optimizer+                                                      |
+   | Zend OPcache                                                         |
    +----------------------------------------------------------------------+
    | Copyright (c) 1998-2013 The PHP Group                                |
    +----------------------------------------------------------------------+
index 8d0d7320bf55dbb8d674dd28e6eafade0a8a0f55..2ff88e21d3f6dfa6ab894763bbb0f53c108caa53 100644 (file)
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | Zend Optimizer+                                                      |
+   | Zend OPcache                                                         |
    +----------------------------------------------------------------------+
    | Copyright (c) 1998-2013 The PHP Group                                |
    +----------------------------------------------------------------------+
index dbdc2ef1405568c6fcb973a0c88e5ae7ea0bbcef..afd227c5d54371a68c367110fb2f328fee75c4fe 100644 (file)
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | Zend Optimizer+                                                      |
+   | Zend OPcache                                                         |
    +----------------------------------------------------------------------+
    | Copyright (c) 1998-2013 The PHP Group                                |
    +----------------------------------------------------------------------+
index a1a836c03c3f5e117d6db3309807793d479be44c..fdfddb406440363962fa84605ac5516eba40ad0a 100644 (file)
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | Zend Optimizer+                                                      |
+   | Zend OPcache                                                         |
    +----------------------------------------------------------------------+
    | Copyright (c) 1998-2013 The PHP Group                                |
    +----------------------------------------------------------------------+
index 6f72dd9ebc0dedc3f1651ad8608cd31fabd11c1b..290813c06bd2e9169cb515e9474e181d763a1e44 100644 (file)
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | Zend Optimizer+                                                      |
+   | Zend OPcache                                                         |
    +----------------------------------------------------------------------+
    | Copyright (c) 1998-2013 The PHP Group                                |
    +----------------------------------------------------------------------+
index 5ac5716ca7ce2e43a1076511ed8cc82ba0f77f02..539b4e85af9c33406076b214e62f9c779e150b5b 100644 (file)
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | Zend Optimizer+                                                      |
+   | Zend OPcache                                                         |
    +----------------------------------------------------------------------+
    | Copyright (c) 1998-2013 The PHP Group                                |
    +----------------------------------------------------------------------+
index 06299d8a0bf607173ff54fe99b6765b3aaa5f559..7d5028c4c140b031351d19004d7335af0235600a 100644 (file)
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | Zend Optimizer+                                                      |
+   | Zend OPcache                                                         |
    +----------------------------------------------------------------------+
    | Copyright (c) 1998-2013 The PHP Group                                |
    +----------------------------------------------------------------------+
index 804e0f786b359c0663466bcc60f4bfe46ba215c2..a926145c98659baeb851675cf4c535ccec6907c3 100644 (file)
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | Zend Optimizer+                                                      |
+   | Zend OPcache                                                         |
    +----------------------------------------------------------------------+
    | Copyright (c) 1998-2013 The PHP Group                                |
    +----------------------------------------------------------------------+
index 6f9678e2850f44af430084f43267b844f5a6e3b5..0bffae4d0e2fdb40f610d2f9dff8492baab8eab8 100644 (file)
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | Zend Optimizer+                                                      |
+   | Zend OPcache                                                         |
    +----------------------------------------------------------------------+
    | Copyright (c) 1998-2013 The PHP Group                                |
    +----------------------------------------------------------------------+
index ffb990ae751b96282cde9e60d21f104a92eaf6e3..cf3fb73cddda7c98cee6ebc88608c1df00552b00 100644 (file)
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | Zend Optimizer+                                                      |
+   | Zend OPcache                                                         |
    +----------------------------------------------------------------------+
    | Copyright (c) 1998-2013 The PHP Group                                |
    +----------------------------------------------------------------------+
index 00c8784a84b74a6ef50dbb7f19c40fd859a9cfc9..18af756f6e8c9f1e939fc907f1d90f226a3836b7 100644 (file)
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | Zend Optimizer+                                                      |
+   | Zend OPcache                                                         |
    +----------------------------------------------------------------------+
    | Copyright (c) 1998-2013 The PHP Group                                |
    +----------------------------------------------------------------------+
index 5e37e38586351d5905b58b8e81fd824c6ab191ba..f4465ce78f28aca048f6c5ced5cf143ebae0566c 100644 (file)
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | Zend Optimizer+                                                      |
+   | Zend OPcache                                                         |
    +----------------------------------------------------------------------+
    | Copyright (c) 1998-2013 The PHP Group                                |
    +----------------------------------------------------------------------+
index c8411b5624c6ef52e3b67f6ff5b8e1a85d929840..23af630f80de7b2499e1f8604864cf98fd2b5ed1 100644 (file)
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | Zend Optimizer+                                                      |
+   | Zend OPcache                                                         |
    +----------------------------------------------------------------------+
    | Copyright (c) 1998-2013 The PHP Group                                |
    +----------------------------------------------------------------------+