X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcontext.c;h=be8bae9cbdf7b8385b5ef3abe7f157ea1e4e9089;hp=da36c8ef6b13693cbbdb7931889433f5b8872e0a;hb=a7ac1c0a3c855321f21682c127a4b707de33a303;hpb=47dd00ab6df0a093b13d4f573ba01c79a6bcc72f

diff --git a/src/context.c b/src/context.c
index da36c8e..be8bae9 100644
--- a/src/context.c
+++ b/src/context.c
@@ -58,10 +58,64 @@
 
 #include "php_psi_posix.h"
 
+PHP_MINIT_FUNCTION(psi_context)
+{
+	unsigned flags = 0;
+	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 && SUCCESS != ops->load()) {
+		return FAILURE;
+	}
+
+	if (psi_check_env("PSI_DEBUG")) {
+		flags |= PSI_DEBUG;
+	}
+	if (psi_check_env("PSI_SILENT")) {
+		flags |= PSI_SILENT;
+	}
+
+	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;
+}
+
+PHP_MSHUTDOWN_FUNCTION(psi_context)
+{
+	if (psi_check_env("PSI_DUMP")) {
+		struct psi_dump dump = {{.hn = stdout}, (psi_dump_cb) fprintf};
+
+		psi_context_dump(&dump, PSI_G(context));
+	}
+
+	psi_context_free(&PSI_G(context));
+
+	if (PSI_G(ops)->free) {
+		PSI_G(ops)->free();
+	}
+
+	return SUCCESS;
+}
+
 struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_ops *ops, psi_error_cb error, unsigned flags)
 {
 	if (!C) {
-		C = malloc(sizeof(*C));
+		C = pemalloc(sizeof(*C), 1);
 	}
 	memset(C, 0, sizeof(*C));
 
@@ -92,11 +146,11 @@ static bool psi_context_add(struct psi_context *C, struct psi_parser *P)
 	struct psi_data *D;
 	struct psi_validate_scope scope = {0};
 
-	C->data = realloc(C->data, (C->count + 1) * sizeof(*C->data));
+	C->data = safe_perealloc(C->data, (C->count + 1), sizeof(*C->data), 0, 1);
 	D = psi_data_exchange(&C->data[C->count++], PSI_DATA(P));
 
 	psi_validate_scope_ctor(&scope);
-	scope.defs = &P->preproc->defs;
+	scope.cpp = P->preproc;
 	valid = psi_validate(&scope, PSI_DATA(C), D);
 	psi_validate_scope_dtor(&scope);
 
@@ -182,7 +236,7 @@ zend_function_entry *psi_context_compile(struct psi_context *C)
 
 			zc.name = zend_string_copy(c->name);
 
-			switch (c->type->type) {
+			switch (c->type ? c->type->type : c->val->type) {
 			case PSI_T_BOOL:
 				ZVAL_BOOL(&zc.value, c->val->ival.zend.bval);
 				break;
@@ -196,6 +250,9 @@ zend_function_entry *psi_context_compile(struct psi_context *C)
 			case PSI_T_STRING:
 			case PSI_T_QUOTED_STRING:
 				ZVAL_NEW_STR(&zc.value, zend_string_copy(c->val->ival.zend.str));
+				if (ZSTR_IS_INTERNED(Z_STR(zc.value))) {
+					Z_TYPE_FLAGS(zc.value) = 0;
+				}
 				break;
 			default:
 				assert(0);
@@ -321,15 +378,21 @@ void psi_context_free(struct psi_context **C)
 	}
 }
 
-void psi_context_dump(struct psi_context *C, int fd)
+void psi_context_dump(struct psi_dump *dump, struct psi_context *C)
 {
 	size_t i;
 
-	dprintf(fd, "// psi.engine=%s\n// %lu files\n",
+	PSI_DUMP(dump, "// psi.engine=%s\n// %lu files\n",
 			(char *) C->ops->query(C, PSI_CONTEXT_QUERY_SELF, NULL),
 			C->count);
 
-	for (i = 0; i < C->count; ++i) {
-		psi_data_dump(fd, &C->data[i]);
+	psi_data_dump(dump, PSI_DATA(C));
+
+#if 0
+	if (C->flags & PSI_DEBUG) {
+		for (i = 0; i < C->count; ++i) {
+			psi_data_dump(fd, &C->data[i]);
+		}
 	}
+#endif
 }