X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=c31ce8d4d948c6f1edd5c00751bebcc7cb6ac2fe;hp=e7948d8a0e9abec32534e7665797fa6109e65fdf;hb=3b44aae43e81d56d0686d2dee8b1ded3c277f2fd;hpb=ba906e039ffe9e57842ce5135aa43efa00b8a4c6

diff --git a/src/module.c b/src/module.c
index e7948d8..c31ce8d 100644
--- a/src/module.c
+++ b/src/module.c
@@ -35,6 +35,9 @@
 #include "token.h"
 #include "parser.h"
 
+#define PSI_CPP_SEARCH
+#include "php_psi_cpp.h"
+
 #if HAVE_LIBJIT
 # include "libjit.h"
 # ifndef HAVE_LIBFFI
@@ -195,9 +198,32 @@ static PHP_FUNCTION(psi_validate_string)
 	free(I);
 }
 
-static PHP_MINIT_FUNCTION(psi)
+static ZEND_RESULT_CODE psi_ops_load()
 {
 	struct psi_context_ops *ops = NULL;
+#ifdef HAVE_LIBJIT
+	if (!strcasecmp(PSI_G(engine), "jit")) {
+		ops = psi_libjit_ops();
+	} else
+#endif
+#ifdef HAVE_LIBFFI
+		ops = psi_libffi_ops();
+#endif
+
+	if (!ops) {
+		php_error(E_WARNING, "No PSI engine found");
+		return FAILURE;
+	}
+
+	PSI_G(ops) = ops;
+	if (ops->load) {
+		return ops->load();
+	}
+	return SUCCESS;
+}
+
+static PHP_MINIT_FUNCTION(psi)
+{
 	zend_class_entry ce = {0};
 	unsigned flags = 0;
 
@@ -215,17 +241,7 @@ static PHP_MINIT_FUNCTION(psi)
 	psi_object_handlers.free_obj = psi_object_free;
 	psi_object_handlers.clone_obj = NULL;
 
-#ifdef HAVE_LIBJIT
-	if (!strcasecmp(PSI_G(engine), "jit")) {
-		ops = psi_libjit_ops();
-	} else
-#endif
-#ifdef HAVE_LIBFFI
-		ops = psi_libffi_ops();
-#endif
-
-	if (!ops) {
-		php_error(E_WARNING, "No PSI engine found");
+	if (SUCCESS != psi_ops_load()) {
 		return FAILURE;
 	}
 
@@ -236,7 +252,10 @@ static PHP_MINIT_FUNCTION(psi)
 		flags |= PSI_SILENT;
 	}
 
-	PSI_G(context) = psi_context_init(NULL, ops, psi_error_wrapper, flags);
+	PSI_G(search_path) = pemalloc(strlen(PSI_G(directory)) + strlen(psi_cpp_search) + 1 + 1, 1);
+	sprintf(PSI_G(search_path), "%s:%s", PSI_G(directory), psi_cpp_search);
+
+	PSI_G(context) = psi_context_init(NULL, PSI_G(ops), psi_error_wrapper, flags);
 	psi_context_build(PSI_G(context), PSI_G(directory));
 
 	return SUCCESS;
@@ -250,6 +269,10 @@ static PHP_MSHUTDOWN_FUNCTION(psi)
 
 	psi_context_free(&PSI_G(context));
 
+	if (PSI_G(ops)->free) {
+		PSI_G(ops)->free();
+	}
+
 	UNREGISTER_INI_ENTRIES();
 
 	return SUCCESS;
@@ -268,7 +291,9 @@ static PHP_MINFO_FUNCTION(psi)
 	php_info_print_table_start();
 	php_info_print_table_header(2, "PSI Support", "enabled");
 	php_info_print_table_row(2, "Extension Version", PHP_PSI_VERSION);
+	php_info_print_table_row(2, "Search Path", PSI_G(search_path));
 	php_info_print_table_end();
+
 	php_info_print_table_start();
 	php_info_print_table_header(3, "Used Library", "Compiled", "Linked");
 	php_info_print_table_row(3, "libffi",
@@ -292,6 +317,48 @@ static PHP_MINFO_FUNCTION(psi)
 	DISPLAY_INI_ENTRIES();
 }
 
+static void ptr_free(void *ptr)
+{
+	free(*(void **) ptr);
+}
+
+static PHP_GINIT_FUNCTION(psi)
+{
+	char *tmp;
+	struct psi_plist **bl_decls = &psi_globals->blacklist.decls;
+
+	*bl_decls = psi_plist_init(ptr_free);
+
+#define BL_DECL_ADD(d) \
+	tmp = strdup(d); \
+	*bl_decls = psi_plist_add(*bl_decls, &tmp)
+
+	BL_DECL_ADD("dlsym");
+	BL_DECL_ADD("alloca");
+	BL_DECL_ADD("atexit");
+	BL_DECL_ADD("at_quick_exit");
+
+	/* missing */
+	BL_DECL_ADD("_IO_cookie_init");
+	BL_DECL_ADD("bindresvport6");
+
+	/* va_list as arg */
+	BL_DECL_ADD("*v*printf");
+	BL_DECL_ADD("*v*scanf");
+	BL_DECL_ADD("vsyslog");
+
+	/* LFS/LFO for 32bit */
+	BL_DECL_ADD("*stat*64");
+	BL_DECL_ADD("*glob*64");
+	/* Hurd only */
+	BL_DECL_ADD("getumask");
+}
+
+static PHP_GSHUTDOWN_FUNCTION(psi)
+{
+	psi_plist_free(psi_globals->blacklist.decls);
+}
+
 static const zend_function_entry psi_functions[] = {
 	PHP_FE(psi_dump, ai_psi_dump)
 	PHP_FE(psi_validate, ai_psi_validate)
@@ -313,7 +380,11 @@ zend_module_entry psi_module_entry = {
 	NULL,
 	PHP_MINFO(psi),
 	PHP_PSI_VERSION,
-	STANDARD_MODULE_PROPERTIES
+	ZEND_MODULE_GLOBALS(psi),
+	PHP_GINIT(psi),
+	PHP_GSHUTDOWN(psi),
+	NULL, /* post-deactivate */
+	STANDARD_MODULE_PROPERTIES_EX
 };
 
 #ifdef COMPILE_DL_PSI