Allow building opcache statically

Opcache is both a Zend extension and a PHP module. When Opcache is built
statically, the engine will attempt to initialize it as a PHP module, but will
not initialize the Zend extension.

Here I make Opcache a two-way hybrid extension [1] so that initializing it as a
PHP module also initializes the Zend extension.

[1] https://www.phpinternalsbook.com/php7/extensions_design/zend_extensions.html#hybrid-extensions

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"
@@ -100,7 +101,13 @@ typedef int gid_t;
 
 #include "zend_simd.h"
 
+#ifdef COMPILE_DL_OPCACHE
 ZEND_EXTENSION();
+ZEND_EXT_API zend_extension zend_extension_entry;
+#define opcache_extension_entry zend_extension_entry
+#else
+zend_extension opcache_extension_entry;
+#endif
 
 #ifndef ZTS
 zend_accel_globals accel_globals;
@@ -118,6 +125,7 @@ zend_accel_shared_globals *accel_shared_globals = NULL;
 #ifdef ZEND_WIN32
 char accel_uname_id[32];
 #endif
+bool accel_starting = false;
 bool accel_startup_ok = false;
 static const char *zps_failure_reason = NULL;
 const char *zps_api_failure_reason = NULL;
@@ -3154,8 +3162,21 @@ 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)
+{
+	if (accel_starting) {
+		return;
+	}
+
+	accel_starting = true;
+
+	zend_register_extension(&opcache_extension_entry, NULL);
+}
+
 static int accel_startup(zend_extension *extension)
 {
+	accel_starting = true;
+
 #ifdef ZTS
 	accel_globals_id = ts_allocate_id(&accel_globals_id, sizeof(zend_accel_globals), (ts_allocate_ctor) accel_globals_ctor, (ts_allocate_dtor) accel_globals_dtor);
 #else
@@ -3172,12 +3193,15 @@ static int accel_startup(zend_extension *extension)
 # endif
 #endif
 
-	if (start_accel_module() == FAILURE) {
+	zend_module_entry *module = start_accel_module();
+	if (module == NULL) {
 		accel_startup_ok = false;
 		zend_error(E_WARNING, ACCELERATOR_PRODUCT_NAME ": module registration failed!");
 		return FAILURE;
 	}
 
+	accel_register_ini_entries(module);
+
 #ifdef ZEND_WIN32
 	if (UNEXPECTED(accel_gen_uname_id() == FAILURE)) {
 		zps_startup_failure("Unable to get user name", NULL, accelerator_remove_cb);
@@ -5037,7 +5061,11 @@ static void accel_activate(void) {
 	}
 }
 
+#ifdef COMPILE_DL_OPCACHE
 ZEND_EXT_API zend_extension zend_extension_entry = {
+#else
+zend_extension opcache_extension_entry = {
+#endif
 	ACCELERATOR_PRODUCT_NAME,               /* name */
 	PHP_VERSION,							/* version */
 	"Zend Technologies",					/* author */

ext/opcache/ZendAccelerator.h

@@ -314,6 +314,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);
@@ -336,6 +337,10 @@ zend_string* ZEND_FASTCALL accel_new_interned_string(zend_string *str);
 
 uint32_t zend_accel_get_class_name_map_ptr(zend_string *type_name);
 
+#ifndef COMPILE_DL_OPCACHE
+extern zend_extension opcache_extension_entry;
+#endif
+
 END_EXTERN_C()
 
 /* memory write protection */

ext/opcache/config.m4

@@ -26,9 +26,6 @@ PHP_ARG_WITH([capstone],
   [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.])])

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');

ext/opcache/zend_accelerator_module.c

@@ -25,6 +25,8 @@
 #include "ZendAccelerator.h"
 #include "zend_API.h"
 #include "zend_closures.h"
+#include "zend_extensions.h"
+#include "zend_modules.h"
 #include "zend_shared_alloc.h"
 #include "zend_accelerator_blacklist.h"
 #include "php_ini.h"
@@ -55,6 +57,9 @@
 ))
 #define TOKENTOSTR(X) #X
 
+static zend_module_entry *accel_module_loaded = NULL;
+zend_module_entry opcache_module_entry;
+
 static zif_handler orig_file_exists = NULL;
 static zif_handler orig_is_file = NULL;
 static zif_handler orig_is_readable = NULL;
@@ -405,13 +410,19 @@ static ZEND_NAMED_FUNCTION(accel_is_readable)
 
 static ZEND_MINIT_FUNCTION(zend_accelerator)
 {
-	(void)type; /* keep the compiler happy */
+	accel_module_loaded = zend_hash_str_find_ptr_lc(&module_registry,
+			opcache_module_entry.name, strlen(opcache_module_entry.name));
 
-	REGISTER_INI_ENTRIES();
+	start_accel_extension();
 
 	return SUCCESS;
 }
 
+void accel_register_ini_entries(zend_module_entry *module)
+{
+	zend_register_ini_entries_ex(ini_entries, module->module_number, module->type);
+}
+
 void zend_accel_override_file_functions(void)
 {
 	zend_function *old_function;
@@ -554,7 +565,7 @@ void zend_accel_info(ZEND_MODULE_INFO_FUNC_ARGS)
 	DISPLAY_INI_ENTRIES();
 }
 
-static zend_module_entry accel_module_entry = {
+zend_module_entry opcache_module_entry = {
 	STANDARD_MODULE_HEADER,
 	ACCELERATOR_PRODUCT_NAME,
 	ext_functions,
@@ -569,9 +580,22 @@ static zend_module_entry accel_module_entry = {
 	STANDARD_MODULE_PROPERTIES_EX
 };
 
-int start_accel_module(void)
+zend_module_entry *start_accel_module(void)
 {
-	return zend_startup_module(&accel_module_entry);
+	if (accel_module_loaded) {
+		return accel_module_loaded;
+	}
+
+	accel_module_loaded = zend_register_internal_module(&opcache_module_entry);
+	if (!accel_module_loaded) {
+		return NULL;
+	}
+
+	if (zend_startup_module_ex(accel_module_loaded) == FAILURE) {
+		return NULL;
+	}
+
+	return accel_module_loaded;
 }
 
 /* {{{ Get the scripts which are accelerated by ZendAccelerator */

ext/opcache/zend_accelerator_module.h

@@ -22,7 +22,14 @@
 #ifndef ZEND_ACCELERATOR_MODULE_H
 #define ZEND_ACCELERATOR_MODULE_H
 
-int start_accel_module(void);
+#include "Zend/zend_modules.h"
+
+#define phpext_opcache_ptr &opcache_module_entry
+extern zend_module_entry opcache_module_entry;
+
+zend_module_entry *start_accel_module(void);
+
+void accel_register_ini_entries(zend_module_entry *module);
 
 void zend_accel_override_file_functions(void);