X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmodule.c;h=1fe5bf32bb390cee6e0cd35223917999afc7e923;hb=b4a3c33fc143fd57288fcfe0878e7a22eeaf61bf;hp=69ec53d6b1d1d16bda64fd5fa23da779f62b231a;hpb=9c72f6584bd95dd6e9c7dcb314a6583f7130362f;p=m6w6%2Fext-psi diff --git a/src/module.c b/src/module.c index 69ec53d..1fe5bf3 100644 --- a/src/module.c +++ b/src/module.c @@ -1,149 +1,141 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" #endif -#include -#include -#include - #include "php.h" #include "php_ini.h" #include "ext/standard/info.h" -#include "php_scandir.h" +#include "zend_constants.h" +#include "zend_operators.h" #include "php_psi.h" -#include "parser.h" -#include "validator.h" -#include "compiler.h" +#if HAVE_LIBJIT +# include "libjit.h" +# ifndef HAVE_LIBFFI +# define PSI_ENGINE "jit" +# endif +#endif +#if HAVE_LIBFFI +# include "libffi.h" +# define PSI_ENGINE "ffi" +#endif ZEND_DECLARE_MODULE_GLOBALS(psi); PHP_INI_BEGIN() - STD_PHP_INI_ENTRY("psi.directory", "psis", PHP_INI_ALL, OnUpdateString, directory, zend_psi_globals, psi_globals) + STD_PHP_INI_ENTRY("psi.engine", PSI_ENGINE, PHP_INI_SYSTEM, OnUpdateString, engine, zend_psi_globals, psi_globals) + STD_PHP_INI_ENTRY("psi.directory", "psi.d", PHP_INI_SYSTEM, OnUpdateString, directory, zend_psi_globals, psi_globals) PHP_INI_END(); -static void psi_error(int type, const char *msg, ...) +static zend_object_handlers psi_object_handlers; +static zend_class_entry *psi_class_entry; + +zend_class_entry *psi_object_get_class_entry() +{ + return psi_class_entry; +} + +void psi_error_wrapper(PSI_Token *t, int type, const char *msg, ...) { - char buf[0x1000]; va_list argv; va_start(argv, msg); - vslprintf(buf, 0x1000, msg, argv); + psi_verror(type, t?t->file:"Unknown", t?t->line:0, msg, argv); va_end(argv); +} +void psi_error(int type, const char *fn, unsigned ln, const char *msg, ...) +{ + va_list argv; - php_error(type, buf); + va_start(argv, msg); + psi_verror(type, fn, ln, msg, argv); + va_end(argv); +} +void psi_verror(int type, const char *fn, unsigned ln, const char *msg, va_list argv) +{ + zend_error_cb(type, fn, ln, msg, argv); } -static int psi_select_dirent(const struct dirent *entry) +static void psi_object_free(zend_object *o) { -#ifndef FNM_CASEFOLD -#define FNM_CASEFOLD 0 -#endif - return 0 == fnmatch("*.psi", entry->d_name, FNM_CASEFOLD); + psi_object *obj = PSI_OBJ(NULL, o); + + if (obj->data) { + /* FIXME: how about registering a destructor? + // free(obj->data); */ + obj->data = NULL; + } + zend_object_std_dtor(o); +} + +static zend_object *psi_object_init(zend_class_entry *ce) +{ + psi_object *o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce)); + + zend_object_std_init(&o->std, ce); + object_properties_init(&o->std, ce); + o->std.handlers = &psi_object_handlers; + return &o->std; } PHP_MINIT_FUNCTION(psi) { - jit_context_t ctx; - int i, n; - struct dirent **entries = NULL; + PSI_ContextOps *ops = NULL; + zend_class_entry ce = {0}; REGISTER_INI_ENTRIES(); - jit_init(); + INIT_NS_CLASS_ENTRY(ce, "psi", "object", NULL); + psi_class_entry = zend_register_internal_class_ex(&ce, NULL); + psi_class_entry->create_object = psi_object_init; - if (!(ctx = jit_context_create())) { - zend_error(E_WARNING, "Could not initialize libjit!"); + memcpy(&psi_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + psi_object_handlers.offset = XtOffsetOf(psi_object, std); + 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(); + } else +#endif +#ifdef HAVE_LIBFFI + ops = PSI_Libffi(); +#endif + + if (!ops) { + php_error(E_WARNING, "No PSI engine found"); return FAILURE; } - PSI_G(context) = ctx; - - n = php_scandir(PSI_G(directory), &entries, psi_select_dirent, alphasort); - if (n < 0) { - php_error(E_WARNING, "Failed to scan PSI directory '%s'", PSI_G(directory)); - } else for (i = 0; i < n; ++i) { - char psi[MAXPATHLEN]; - PSI_Parser P; - PSI_Validator V; - - if (MAXPATHLEN <= slprintf(psi, MAXPATHLEN, "%s/%s", PSI_G(directory), entries[i]->d_name)) { - php_error(E_WARNING, "Path to PSI file too long: %s/%s", - PSI_G(directory), entries[i]->d_name); - } - if (!PSI_ParserInit(&P, psi, psi_error, 0)) { - php_error(E_WARNING, "Failed to init PSI parser (%s): %s", - psi, strerror(errno)); - continue; - } - - while (-1 != PSI_ParserScan(&P)) { - PSI_ParserParse(&P, PSI_TokenAlloc(&P)); - }; - PSI_ParserParse(&P, NULL); - - if (!PSI_ValidatorInit(&V, &P)) { - php_error(E_WARNING, "Failed to init PSI validator"); - break; - } - PSI_ParserDtor(&P); - - if (PSI_ValidatorValidate(&V)) { - PSI_Compiler C; - - jit_context_build_start(ctx); - if (PSI_CompilerInit(&C, &V, ctx)) { - zend_function_entry *closures = PSI_CompilerCompile(&C); - - if (closures && SUCCESS != zend_register_functions(NULL, closures, NULL, MODULE_PERSISTENT)) { - psi_error(E_WARNING, "Failed to register functions!"); - } - //PSI_CompilerDtor(&C); - } - jit_context_build_end(ctx); - } - PSI_ValidatorDtor(&V); - } - if (entries) { - for (i = 0; i < n; ++i) { - free(entries[i]); - } - free(entries); + PSI_ContextInit(&PSI_G(context), ops, psi_error_wrapper); + PSI_ContextBuild(&PSI_G(context), PSI_G(directory)); + + if (psi_check_env("PSI_DUMP")) { + PSI_ContextDump(&PSI_G(context), STDOUT_FILENO); } + return SUCCESS; } + PHP_MSHUTDOWN_FUNCTION(psi) { - jit_context_t ctx = PSI_G(context); - jit_context_destroy(ctx); + PSI_ContextDtor(&PSI_G(context)); UNREGISTER_INI_ENTRIES(); return SUCCESS; } -/* Remove if there's nothing to do at request start */ -/* {{{ PHP_RINIT_FUNCTION - */ +#if defined(COMPILE_DL_PSI) && defined(ZTS) PHP_RINIT_FUNCTION(psi) { -#if defined(COMPILE_DL_PSI) && defined(ZTS) ZEND_TSRMLS_CACHE_UPDATE(); -#endif - return SUCCESS; -} -/* }}} */ - -/* Remove if there's nothing to do at request end */ -/* {{{ PHP_RSHUTDOWN_FUNCTION - */ -PHP_RSHUTDOWN_FUNCTION(psi) -{ return SUCCESS; } -/* }}} */ +#endif PHP_MINFO_FUNCTION(psi) { @@ -163,8 +155,12 @@ zend_module_entry psi_module_entry = { psi_functions, PHP_MINIT(psi), PHP_MSHUTDOWN(psi), +#if defined(COMPILE_DL_PSI) && defined(ZTS) PHP_RINIT(psi), /* Replace with NULL if there's nothing to do at request start */ - PHP_RSHUTDOWN(psi), /* Replace with NULL if there's nothing to do at request end */ +#else + NULL, +#endif + NULL, PHP_MINFO(psi), PHP_PSI_VERSION, STANDARD_MODULE_PROPERTIES