feat: first-class hybrid extensions

Author: morrisonlevi

Zend/zend_extensions.c

@@ -60,7 +60,7 @@ zend_result zend_load_extension(const char *path)
 #endif
 }
 
-zend_result zend_load_extension_handle(DL_HANDLE handle, const char *path)
+zend_result zend_load_extension_handle_ex(DL_HANDLE handle, const char *path, bool unload_on_failure, bool silent)
 {
 #if ZEND_EXTENSIONS_SUPPORT
 	zend_extension *new_extension;
@@ -74,63 +74,83 @@ zend_result zend_load_extension_handle(DL_HANDLE handle, const char *path)
 		new_extension = (zend_extension *) DL_FETCH_SYMBOL(handle, "_zend_extension_entry");
 	}
 	if (!extension_version_info || !new_extension) {
-		fprintf(stderr, "%s doesn't appear to be a valid Zend extension\n", path);
+		if (!silent) {
+			fprintf(stderr, "%s doesn't appear to be a valid Zend extension\n", path);
+		}
 /* See http://support.microsoft.com/kb/190351 */
 #ifdef ZEND_WIN32
 		fflush(stderr);
 #endif
-		DL_UNLOAD(handle);
+		if (unload_on_failure) {
+			DL_UNLOAD(handle);
+		}
 		return FAILURE;
 	}
 
 	/* allow extension to proclaim compatibility with any Zend version */
 	if (extension_version_info->zend_extension_api_no != ZEND_EXTENSION_API_NO &&(!new_extension->api_no_check || new_extension->api_no_check(ZEND_EXTENSION_API_NO) != SUCCESS)) {
 		if (extension_version_info->zend_extension_api_no > ZEND_EXTENSION_API_NO) {
-			fprintf(stderr, "%s requires Zend Engine API version %d.\n"
-					"The Zend Engine API version %d which is installed, is outdated.\n\n",
-					new_extension->name,
-					extension_version_info->zend_extension_api_no,
-					ZEND_EXTENSION_API_NO);
+			if (!silent) {
+				fprintf(stderr, "%s requires Zend Engine API version %d.\n"
+						"The Zend Engine API version %d which is installed, is outdated.\n\n",
+						new_extension->name,
+						extension_version_info->zend_extension_api_no,
+						ZEND_EXTENSION_API_NO);
+			}
 /* See http://support.microsoft.com/kb/190351 */
 #ifdef ZEND_WIN32
 			fflush(stderr);
 #endif
-			DL_UNLOAD(handle);
+			if (unload_on_failure) {
+				DL_UNLOAD(handle);
+			}
 			return FAILURE;
 		} else if (extension_version_info->zend_extension_api_no < ZEND_EXTENSION_API_NO) {
-			fprintf(stderr, "%s requires Zend Engine API version %d.\n"
-					"The Zend Engine API version %d which is installed, is newer.\n"
-					"Contact %s at %s for a later version of %s.\n\n",
-					new_extension->name,
-					extension_version_info->zend_extension_api_no,
-					ZEND_EXTENSION_API_NO,
-					new_extension->author,
-					new_extension->URL,
-					new_extension->name);
+			if (!silent) {
+				fprintf(stderr, "%s requires Zend Engine API version %d.\n"
+						"The Zend Engine API version %d which is installed, is newer.\n"
+						"Contact %s at %s for a later version of %s.\n\n",
+						new_extension->name,
+						extension_version_info->zend_extension_api_no,
+						ZEND_EXTENSION_API_NO,
+						new_extension->author,
+						new_extension->URL,
+						new_extension->name);
+			}
 /* See http://support.microsoft.com/kb/190351 */
 #ifdef ZEND_WIN32
 			fflush(stderr);
 #endif
-			DL_UNLOAD(handle);
+			if (unload_on_failure) {
+				DL_UNLOAD(handle);
+			}
 			return FAILURE;
 		}
 	} else if (strcmp(ZEND_EXTENSION_BUILD_ID, extension_version_info->build_id) &&
 	           (!new_extension->build_id_check || new_extension->build_id_check(ZEND_EXTENSION_BUILD_ID) != SUCCESS)) {
-		fprintf(stderr, "Cannot load %s - it was built with configuration %s, whereas running engine is %s\n",
-					new_extension->name, extension_version_info->build_id, ZEND_EXTENSION_BUILD_ID);
+		if (!silent) {
+			fprintf(stderr, "Cannot load %s - it was built with configuration %s, whereas running engine is %s\n",
+						new_extension->name, extension_version_info->build_id, ZEND_EXTENSION_BUILD_ID);
+		}
 /* See http://support.microsoft.com/kb/190351 */
 #ifdef ZEND_WIN32
 		fflush(stderr);
 #endif
-		DL_UNLOAD(handle);
+		if (unload_on_failure) {
+			DL_UNLOAD(handle);
+		}
 		return FAILURE;
 	} else if (zend_get_extension(new_extension->name)) {
-		fprintf(stderr, "Cannot load %s - it was already loaded\n", new_extension->name);
+		if (!silent) {
+			fprintf(stderr, "Cannot load %s - it was already loaded\n", new_extension->name);
+		}
 /* See http://support.microsoft.com/kb/190351 */
 #ifdef ZEND_WIN32
 		fflush(stderr);
 #endif
-		DL_UNLOAD(handle);
+		if (unload_on_failure) {
+			DL_UNLOAD(handle);
+		}
 		return FAILURE;
 	}
 
@@ -146,6 +166,11 @@ zend_result zend_load_extension_handle(DL_HANDLE handle, const char *path)
 #endif
 }
 
+zend_result zend_load_extension_handle(DL_HANDLE handle, const char *path)
+{
+	return zend_load_extension_handle_ex(handle, path, true, false);
+}
+
 
 void zend_register_extension(zend_extension *new_extension, DL_HANDLE handle)
 {

Zend/zend_extensions.h

@@ -153,6 +153,7 @@ ZEND_API void zend_reset_internal_run_time_cache(void);
 
 BEGIN_EXTERN_C()
 ZEND_API zend_result zend_load_extension(const char *path);
+ZEND_API zend_result zend_load_extension_handle_ex(DL_HANDLE handle, const char *path, bool unload_on_failure, bool silent);
 ZEND_API zend_result zend_load_extension_handle(DL_HANDLE handle, const char *path);
 ZEND_API void zend_register_extension(zend_extension *new_extension, DL_HANDLE handle);
 ZEND_API zend_extension *zend_get_extension(const char *extension_name);

ext/opcache/ZendAccelerator.c

@@ -102,8 +102,6 @@ typedef int gid_t;
 
 #include "zend_simd.h"
 
-static zend_extension opcache_extension_entry;
-
 #ifndef ZTS
 zend_accel_globals accel_globals;
 #else
@@ -2986,6 +2984,16 @@ static void accel_globals_dtor(zend_accel_globals *accel_globals)
 	}
 }
 
+void zend_accel_init_globals(void)
+{
+#ifdef ZTS
+	ts_allocate_fast_id(&accel_globals_id, &accel_globals_offset, sizeof(zend_accel_globals),
+		(ts_allocate_ctor) accel_globals_ctor, (ts_allocate_dtor) accel_globals_dtor);
+#else
+	accel_globals_ctor(&accel_globals);
+#endif
+}
+
 #ifdef HAVE_HUGE_CODE_PAGES
 # ifndef _WIN32
 #  include <sys/mman.h>
@@ -3188,19 +3196,8 @@ 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
-	accel_globals_id = ts_allocate_fast_id(&accel_globals_id, &accel_globals_offset, sizeof(zend_accel_globals), (ts_allocate_ctor) accel_globals_ctor, (ts_allocate_dtor) accel_globals_dtor);
-#else
-	accel_globals_ctor(&accel_globals);
-#endif
-
 #ifdef HAVE_JIT
 	zend_jit_init();
 #endif
@@ -3211,8 +3208,6 @@ static int accel_startup(zend_extension *extension)
 # endif
 #endif
 
-	zend_accel_register_ini_entries();
-
 #ifdef ZEND_WIN32
 	if (UNEXPECTED(accel_gen_uname_id() == FAILURE)) {
 		zps_startup_failure("Unable to get user name", NULL, accelerator_remove_cb);
@@ -5194,3 +5189,8 @@ static zend_extension opcache_extension_entry = {
 	NULL,									/* op_array dtor */
 	STANDARD_ZEND_EXTENSION_PROPERTIES
 };
+
+zend_extension *zend_accel_get_extension_entry(void)
+{
+	return &opcache_extension_entry;
+}

ext/opcache/ZendAccelerator.h

@@ -313,8 +313,8 @@ extern const char *zps_api_failure_reason;
 
 BEGIN_EXTERN_C()
 
-void start_accel_extension(void);
 void accel_shutdown(void);
+void zend_accel_init_globals(void);
 ZEND_RINIT_FUNCTION(zend_accelerator);
 zend_result accel_post_deactivate(void);
 void zend_accel_schedule_restart(zend_accel_restart_reason reason);
@@ -325,6 +325,7 @@ zend_result validate_timestamp_and_record_ex(zend_persistent_script *persistent_
 zend_result zend_accel_invalidate(zend_string *filename, bool force);
 zend_result accelerator_shm_read_lock(void);
 void accelerator_shm_read_unlock(void);
+zend_extension *zend_accel_get_extension_entry(void);
 
 zend_string *accel_make_persistent_key(zend_string *path);
 zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type);

ext/opcache/zend_accelerator_module.c

@@ -445,17 +445,9 @@ static ZEND_NAMED_FUNCTION(accel_is_readable)
 
 static ZEND_MINIT_FUNCTION(zend_accelerator)
 {
-	start_accel_extension();
-
-	return SUCCESS;
-}
-
-void zend_accel_register_ini_entries(void)
-{
-	zend_module_entry *module = zend_hash_str_find_ptr_lc(&module_registry,
-			ACCELERATOR_PRODUCT_NAME, strlen(ACCELERATOR_PRODUCT_NAME));
-
-	zend_register_ini_entries_ex(ini_entries, module->module_number, module->type);
+	(void)type;
+	zend_accel_init_globals();
+	return REGISTER_INI_ENTRIES();
 }
 
 void zend_accel_override_file_functions(void)

ext/opcache/zend_accelerator_module.h

@@ -27,8 +27,6 @@
 #define phpext_opcache_ptr &opcache_module_entry
 extern zend_module_entry opcache_module_entry;
 
-void zend_accel_register_ini_entries(void);
-
 void zend_accel_override_file_functions(void);
 
 #endif /* _ZEND_ACCELERATOR_MODULE_H */