Make OPcache non-optional

Author: arnaud-lb

ext/opcache/ZendAccelerator.c

@@ -25,6 +25,7 @@
 #include "zend_extensions.h"
 #include "zend_compile.h"
 #include "ZendAccelerator.h"
+#include "zend_modules.h"
 #include "zend_persist.h"
 #include "zend_shared_alloc.h"
 #include "zend_accelerator_module.h"
@@ -102,15 +103,12 @@ typedef int gid_t;
 
 #include "zend_simd.h"
 
-ZEND_EXTENSION();
+static zend_extension opcache_extension_entry;
 
 #ifndef ZTS
 zend_accel_globals accel_globals;
 #else
 int accel_globals_id;
-#if defined(COMPILE_DL_OPCACHE)
-ZEND_TSRMLS_CACHE_DEFINE()
-#endif
 #endif
 
 /* Points to the structure shared across all PHP processes */
@@ -2969,9 +2967,6 @@ static zend_result zend_accel_init_shm(void)
 
 static void accel_globals_ctor(zend_accel_globals *accel_globals)
 {
-#if defined(COMPILE_DL_OPCACHE) && defined(ZTS)
-	ZEND_TSRMLS_CACHE_UPDATE();
-#endif
 	memset(accel_globals, 0, sizeof(zend_accel_globals));
 	accel_globals->key = zend_string_alloc(ZCG_KEY_LEN, true);
 	GC_MAKE_PERSISTENT_LOCAL(accel_globals->key);
@@ -3156,6 +3151,11 @@ static void accel_move_code_to_huge_pages(void)
 # endif /* defined(MAP_HUGETLB) || defined(MADV_HUGEPAGE) */
 #endif /* HAVE_HUGE_CODE_PAGES */
 
+void start_accel_extension(void)
+{
+	zend_register_extension(&opcache_extension_entry, NULL);
+}
+
 static int accel_startup(zend_extension *extension)
 {
 #ifdef ZTS
@@ -3174,11 +3174,7 @@ static int accel_startup(zend_extension *extension)
 # endif
 #endif
 
-	if (start_accel_module() == FAILURE) {
-		accel_startup_ok = false;
-		zend_error(E_WARNING, ACCELERATOR_PRODUCT_NAME ": module registration failed!");
-		return FAILURE;
-	}
+	zend_accel_register_ini_entries();
 
 #ifdef ZEND_WIN32
 	if (UNEXPECTED(accel_gen_uname_id() == FAILURE)) {
@@ -5084,7 +5080,7 @@ static void accel_activate(void) {
 	}
 }
 
-ZEND_EXT_API zend_extension zend_extension_entry = {
+static zend_extension opcache_extension_entry = {
 	ACCELERATOR_PRODUCT_NAME,               /* name */
 	PHP_VERSION,							/* version */
 	"Zend Technologies",					/* author */

ext/opcache/ZendAccelerator.h

@@ -302,9 +302,6 @@ extern zend_accel_shared_globals *accel_shared_globals;
 #ifdef ZTS
 # define ZCG(v)	ZEND_TSRMG(accel_globals_id, zend_accel_globals *, v)
 extern int accel_globals_id;
-# ifdef COMPILE_DL_OPCACHE
-ZEND_TSRMLS_CACHE_EXTERN()
-# endif
 #else
 # define ZCG(v) (accel_globals.v)
 extern zend_accel_globals accel_globals;
@@ -314,6 +311,7 @@ extern const char *zps_api_failure_reason;
 
 BEGIN_EXTERN_C()
 
+void start_accel_extension(void);
 void accel_shutdown(void);
 ZEND_RINIT_FUNCTION(zend_accelerator);
 zend_result accel_post_deactivate(void);

ext/opcache/config.m4

@@ -1,9 +1,3 @@
-PHP_ARG_ENABLE([opcache],
-  [whether to enable Zend OPcache support],
-  [AS_HELP_STRING([--disable-opcache],
-    [Disable Zend OPcache support])],
-  [yes])
-
 PHP_ARG_ENABLE([huge-code-pages],
   [whether to enable copying PHP CODE pages into HUGE PAGES],
   [AS_HELP_STRING([--disable-huge-code-pages],
@@ -25,89 +19,85 @@ PHP_ARG_WITH([capstone],
   [no],
   [no])
 
-if test "$PHP_OPCACHE" != "no"; then
-  dnl Always build as shared extension.
-  ext_shared=yes
+AS_VAR_IF([PHP_HUGE_CODE_PAGES], [yes],
+  [AC_DEFINE([HAVE_HUGE_CODE_PAGES], [1],
+    [Define to 1 to enable copying PHP CODE pages into HUGE PAGES.])])
 
-  AS_VAR_IF([PHP_HUGE_CODE_PAGES], [yes],
-    [AC_DEFINE([HAVE_HUGE_CODE_PAGES], [1],
-      [Define to 1 to enable copying PHP CODE pages into HUGE PAGES.])])
+AS_VAR_IF([PHP_OPCACHE_JIT], [yes], [
+  AS_CASE([$host_cpu],
+    [[i[34567]86*|x86*|aarch64|amd64]], [],
+    [
+      AC_MSG_WARN([JIT not supported by host architecture])
+      PHP_OPCACHE_JIT=no
+    ])
 
-  AS_VAR_IF([PHP_OPCACHE_JIT], [yes], [
-    AS_CASE([$host_cpu],
-      [[i[34567]86*|x86*|aarch64|amd64]], [],
-      [
-        AC_MSG_WARN([JIT not supported by host architecture])
-        PHP_OPCACHE_JIT=no
-      ])
+  if test "$host_vendor" = "apple" && test "$host_cpu" = "aarch64" && test "$PHP_THREAD_SAFETY" = "yes"; then
+    AC_MSG_WARN([JIT not supported on Apple Silicon with ZTS])
+    PHP_OPCACHE_JIT=no
+  fi
+])
+
+AS_VAR_IF([PHP_OPCACHE_JIT], [yes], [
+  AC_DEFINE([HAVE_JIT], [1], [Define to 1 to enable JIT.])
+  ZEND_JIT_SRC=m4_normalize(["
+    jit/ir/ir_cfg.c
+    jit/ir/ir_check.c
+    jit/ir/ir_dump.c
+    jit/ir/ir_emit.c
+    jit/ir/ir_gcm.c
+    jit/ir/ir_gdb.c
+    jit/ir/ir_patch.c
+    jit/ir/ir_perf.c
+    jit/ir/ir_ra.c
+    jit/ir/ir_save.c
+    jit/ir/ir_sccp.c
+    jit/ir/ir_strtab.c
+    jit/ir/ir.c
+    jit/zend_jit_vm_helpers.c
+    jit/zend_jit.c
+  "])
+
+  dnl Find out which ABI we are using.
+  AS_CASE([$host_alias],
+    [x86_64-*-darwin*], [
+      IR_TARGET=IR_TARGET_X64
+      DASM_FLAGS="-D X64APPLE=1 -D X64=1"
+      DASM_ARCH="x86"
+    ],
+    [*x86_64*|amd64-*-freebsd*], [
+      IR_TARGET=IR_TARGET_X64
+      DASM_FLAGS="-D X64=1"
+      DASM_ARCH="x86"
+    ],
+    [[i[34567]86*|x86*]], [
+      IR_TARGET=IR_TARGET_X86
+      DASM_ARCH="x86"
+    ],
+    [aarch64*], [
+      IR_TARGET=IR_TARGET_AARCH64
+      DASM_ARCH="aarch64"
+    ])
 
-    if test "$host_vendor" = "apple" && test "$host_cpu" = "aarch64" && test "$PHP_THREAD_SAFETY" = "yes"; then
-      AC_MSG_WARN([JIT not supported on Apple Silicon with ZTS])
-      PHP_OPCACHE_JIT=no
-    fi
-  ])
+  AS_VAR_IF([PHP_CAPSTONE], [yes],
+    [PKG_CHECK_MODULES([CAPSTONE], [capstone >= 3.0.0], [
+      AC_DEFINE([HAVE_CAPSTONE], [1], [Define to 1 if Capstone is available.])
+      PHP_EVAL_LIBLINE([$CAPSTONE_LIBS], [OPCACHE_SHARED_LIBADD])
+      PHP_EVAL_INCLINE([$CAPSTONE_CFLAGS])
+      ZEND_JIT_SRC="$ZEND_JIT_SRC jit/ir/ir_disasm.c"
+    ])])
 
-  AS_VAR_IF([PHP_OPCACHE_JIT], [yes], [
-    AC_DEFINE([HAVE_JIT], [1], [Define to 1 to enable JIT.])
-    ZEND_JIT_SRC=m4_normalize(["
-      jit/ir/ir_cfg.c
-      jit/ir/ir_check.c
-      jit/ir/ir_dump.c
-      jit/ir/ir_emit.c
-      jit/ir/ir_gcm.c
-      jit/ir/ir_gdb.c
-      jit/ir/ir_patch.c
-      jit/ir/ir_perf.c
-      jit/ir/ir_ra.c
-      jit/ir/ir_save.c
-      jit/ir/ir_sccp.c
-      jit/ir/ir_strtab.c
-      jit/ir/ir.c
-      jit/zend_jit_vm_helpers.c
-      jit/zend_jit.c
-    "])
-
-    dnl Find out which ABI we are using.
-    AS_CASE([$host_alias],
-      [x86_64-*-darwin*], [
-        IR_TARGET=IR_TARGET_X64
-        DASM_FLAGS="-D X64APPLE=1 -D X64=1"
-        DASM_ARCH="x86"
-      ],
-      [*x86_64*|amd64-*-freebsd*], [
-        IR_TARGET=IR_TARGET_X64
-        DASM_FLAGS="-D X64=1"
-        DASM_ARCH="x86"
-      ],
-      [[i[34567]86*|x86*]], [
-        IR_TARGET=IR_TARGET_X86
-        DASM_ARCH="x86"
-      ],
-      [aarch64*], [
-        IR_TARGET=IR_TARGET_AARCH64
-        DASM_ARCH="aarch64"
-      ])
-
-    AS_VAR_IF([PHP_CAPSTONE], [yes],
-      [PKG_CHECK_MODULES([CAPSTONE], [capstone >= 3.0.0], [
-        AC_DEFINE([HAVE_CAPSTONE], [1], [Define to 1 if Capstone is available.])
-        PHP_EVAL_LIBLINE([$CAPSTONE_LIBS], [OPCACHE_SHARED_LIBADD])
-        PHP_EVAL_INCLINE([$CAPSTONE_CFLAGS])
-        ZEND_JIT_SRC="$ZEND_JIT_SRC jit/ir/ir_disasm.c"
-      ])])
-
-    PHP_SUBST([IR_TARGET])
-    PHP_SUBST([DASM_FLAGS])
-    PHP_SUBST([DASM_ARCH])
-
-    JIT_CFLAGS="-I@ext_builddir@/jit/ir -D$IR_TARGET -DIR_PHP"
-    AS_VAR_IF([ZEND_DEBUG], [yes], [JIT_CFLAGS="$JIT_CFLAGS -DIR_DEBUG"])
-  ])
+  PHP_SUBST([IR_TARGET])
+  PHP_SUBST([DASM_FLAGS])
+  PHP_SUBST([DASM_ARCH])
 
-  AC_CHECK_FUNCS([mprotect shm_create_largepage])
+  JIT_CFLAGS="-I@ext_builddir@/jit/ir -D$IR_TARGET -DIR_PHP"
+  AS_VAR_IF([ZEND_DEBUG], [yes], [JIT_CFLAGS="$JIT_CFLAGS -DIR_DEBUG"])
+])
 
-  AC_CACHE_CHECK([for sysvipc shared memory support], [php_cv_shm_ipc],
-    [AC_RUN_IFELSE([AC_LANG_SOURCE([
+AC_CHECK_FUNCS([mprotect shm_create_largepage])
+
+AC_CACHE_CHECK([for sysvipc shared memory support], [php_cv_shm_ipc],
+  [AC_RUN_IFELSE([AC_LANG_SOURCE([
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/ipc.h>
@@ -309,56 +299,55 @@ int main(void) {
   }
   return 0;
 }]])],
-      [php_cv_shm_mmap_posix=yes],
-      [php_cv_shm_mmap_posix=no],
-      [php_cv_shm_mmap_posix=no])
-    ])
+    [php_cv_shm_mmap_posix=yes],
+    [php_cv_shm_mmap_posix=no],
+    [php_cv_shm_mmap_posix=no])
   ])
-  LIBS=$LIBS_save
+])
+LIBS=$LIBS_save
+
+AS_VAR_IF([php_cv_shm_mmap_posix], [yes], [
+  AC_DEFINE([HAVE_SHM_MMAP_POSIX], [1],
+    [Define to 1 if you have the POSIX mmap() SHM support.])
+  AS_CASE([$ac_cv_search_shm_open], ["none required"|no], [],
+    [PHP_EVAL_LIBLINE([$ac_cv_search_shm_open], [OPCACHE_SHARED_LIBADD])])
+])
+
+PHP_NEW_EXTENSION([opcache], m4_normalize([
+    shared_alloc_mmap.c
+    shared_alloc_posix.c
+    shared_alloc_shm.c
+    zend_accelerator_blacklist.c
+    zend_accelerator_debug.c
+    zend_accelerator_hash.c
+    zend_accelerator_module.c
+    zend_accelerator_util_funcs.c
+    zend_file_cache.c
+    zend_persist_calc.c
+    zend_persist.c
+    zend_shared_alloc.c
+    ZendAccelerator.c
+    $ZEND_JIT_SRC
+  ]),
+  [$ext_shared],,
+  [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 $JIT_CFLAGS],,
+  [yes])
 
-  AS_VAR_IF([php_cv_shm_mmap_posix], [yes], [
-    AC_DEFINE([HAVE_SHM_MMAP_POSIX], [1],
-      [Define to 1 if you have the POSIX mmap() SHM support.])
-    AS_CASE([$ac_cv_search_shm_open], ["none required"|no], [],
-      [PHP_EVAL_LIBLINE([$ac_cv_search_shm_open], [OPCACHE_SHARED_LIBADD])])
-  ])
+PHP_ADD_EXTENSION_DEP(opcache, date)
+PHP_ADD_EXTENSION_DEP(opcache, pcre)
 
-  PHP_NEW_EXTENSION([opcache], m4_normalize([
-      shared_alloc_mmap.c
-      shared_alloc_posix.c
-      shared_alloc_shm.c
-      zend_accelerator_blacklist.c
-      zend_accelerator_debug.c
-      zend_accelerator_hash.c
-      zend_accelerator_module.c
-      zend_accelerator_util_funcs.c
-      zend_file_cache.c
-      zend_persist_calc.c
-      zend_persist.c
-      zend_shared_alloc.c
-      ZendAccelerator.c
-      $ZEND_JIT_SRC
-    ]),
-    [$ext_shared],,
-    [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 $JIT_CFLAGS],,
-    [yes])
-
-  PHP_ADD_EXTENSION_DEP(opcache, date)
-  PHP_ADD_EXTENSION_DEP(opcache, pcre)
-
-  if test "$php_cv_shm_ipc" != "yes" && test "$php_cv_shm_mmap_posix" != "yes" && test "$php_cv_shm_mmap_anon" != "yes"; then
-    AC_MSG_FAILURE(m4_text_wrap([
-      No supported shared memory caching support was found when configuring
-      opcache.
-    ]))
-  fi
+if test "$php_cv_shm_ipc" != "yes" && test "$php_cv_shm_mmap_posix" != "yes" && test "$php_cv_shm_mmap_anon" != "yes"; then
+  AC_MSG_FAILURE(m4_text_wrap([
+    No supported shared memory caching support was found when configuring
+    opcache.
+  ]))
+fi
 
-  AS_VAR_IF([PHP_OPCACHE_JIT], [yes], [
-    PHP_ADD_BUILD_DIR([
-      $ext_builddir/jit
-      $ext_builddir/jit/ir
-    ])
-    PHP_ADD_MAKEFILE_FRAGMENT([$ext_srcdir/jit/Makefile.frag])
+AS_VAR_IF([PHP_OPCACHE_JIT], [yes], [
+  PHP_ADD_BUILD_DIR([
+    $ext_builddir/jit
+    $ext_builddir/jit/ir
   ])
-  PHP_SUBST([OPCACHE_SHARED_LIBADD])
-fi
+  PHP_ADD_MAKEFILE_FRAGMENT([$ext_srcdir/jit/Makefile.frag])
+])
+PHP_SUBST([OPCACHE_SHARED_LIBADD])

ext/opcache/config.w32

@@ -15,7 +15,7 @@ if (PHP_OPCACHE != "no") {
 		zend_persist_calc.c \
 		zend_file_cache.c \
 		zend_shared_alloc.c \
-		shared_alloc_win32.c", true, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
+		shared_alloc_win32.c", PHP_OPCACHE_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
 
 	ADD_EXTENSION_DEP('opcache', 'date');
 	ADD_EXTENSION_DEP('opcache', 'hash');