X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=a70a50a0249f400287a3015d9873ab4c2a38d2d5;hp=b8109b370e434bdba23ad0ac2c93c9eb924871fb;hb=3fa287dfd76814b2ec54991c0208a019845a3dc0;hpb=4a49fe2f8eb21cdeabb06acec7a0395b6708d911 diff --git a/src/module.c b/src/module.c index b8109b3..a70a50a 100644 --- a/src/module.c +++ b/src/module.c @@ -1,79 +1,221 @@ - #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" +#else +# include "php_config.h" #endif -#include - #include "php.h" #include "php_ini.h" #include "ext/standard/info.h" +#include "zend_constants.h" +#include "zend_operators.h" #include "php_psi.h" - +#include "token.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(); -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(void *context, struct psi_token *t, int type, const char *msg, ...) { - char buf[0x1000]; va_list argv; + const char *fn = NULL; + unsigned ln = 0; + + if (context) { + if (PSI_DATA(context)->flags & PSI_PARSER_SILENT) { + return; + } + } + + if (t) { + fn = t->file; + ln = t->line; + } else if (zend_is_executing()) { + fn = zend_get_executed_filename(); + ln = zend_get_executed_lineno(); + } else if (zend_is_compiling()) { + fn = zend_get_compiled_filename()->val; + ln = zend_get_compiled_lineno(); + } va_start(argv, msg); - vslprintf(buf, 0x1000, msg, argv); + psi_verror(type, fn, ln, 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); } -PHP_MINIT_FUNCTION(psi) +void psi_verror(int type, const char *fn, unsigned ln, const char *msg, va_list argv) { - REGISTER_INI_ENTRIES(); + zend_error_cb(type, fn, ln, msg, argv); +} - PSI_ContextInit(&PSI_G(context), PSI_Libjit(), psi_error); - PSI_ContextBuild(&PSI_G(context), PSI_G(directory)); +static void psi_object_free(zend_object *o) +{ + psi_object *obj = PSI_OBJ(NULL, o); - return SUCCESS; + if (obj->data) { + /* FIXME: how about registering a destructor? + // free(obj->data); */ + obj->data = NULL; + } + zend_object_std_dtor(o); } -PHP_MSHUTDOWN_FUNCTION(psi) + +static zend_object *psi_object_init(zend_class_entry *ce) { - jit_context_t ctx = PSI_G(context); - jit_context_destroy(ctx); + psi_object *o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce)); - UNREGISTER_INI_ENTRIES(); + zend_object_std_init(&o->std, ce); + object_properties_init(&o->std, ce); + o->std.handlers = &psi_object_handlers; + return &o->std; +} - return SUCCESS; +ZEND_BEGIN_ARG_INFO_EX(ai_psi_dump, 0, 0, 0) + ZEND_ARG_INFO(0, stream) +ZEND_END_ARG_INFO(); +static PHP_FUNCTION(psi_dump) { + php_stream *s; + zval *r = NULL; + int fd = STDOUT_FILENO; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "|r!", &r)) { + return; + } + if (r) { + php_stream_from_zval(s, r); + + if (SUCCESS != php_stream_cast(s, PHP_STREAM_AS_FD | PHP_STREAM_CAST_INTERNAL, (void **)&fd, 1)) { + RETURN_FALSE; + } + } + psi_context_dump(&PSI_G(context), fd); } -/* Remove if there's nothing to do at request start */ -/* {{{ PHP_RINIT_FUNCTION - */ -PHP_RINIT_FUNCTION(psi) +ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate, 0, 0, 1) + ZEND_ARG_INFO(0, file) +ZEND_END_ARG_INFO(); +static PHP_FUNCTION(psi_validate) { + zend_string *file; + struct psi_parser P; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P", &file)) { + return; + } + + if (!psi_parser_init(&P, file->val, psi_error_wrapper, 0)) { + RETURN_FALSE; + } + + while (0 < psi_parser_scan(&P)) { + psi_parser_parse(&P, psi_token_alloc(&P)); + if (P.num == PSI_T_EOF) { + break; + } + } + psi_parser_parse(&P, NULL); + + if (0 == psi_context_validate_data(NULL, PSI_DATA(&P)) && !P.errors) { + RETVAL_TRUE; + } else { + RETVAL_FALSE; + } + psi_parser_dtor(&P); +} + +static PHP_MINIT_FUNCTION(psi) { -#if defined(COMPILE_DL_PSI) && defined(ZTS) - ZEND_TSRMLS_CACHE_UPDATE(); + struct psi_context_ops *ops = NULL; + zend_class_entry ce = {0}; + unsigned flags = psi_check_env("PSI_DEBUG") ? PSI_PARSER_DEBUG : ( + psi_check_env("PSI_SILENT") ? PSI_PARSER_SILENT : 0); + + REGISTER_INI_ENTRIES(); + + 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; + + 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_ops(); + } else +#endif +#ifdef HAVE_LIBFFI + ops = psi_libffi_ops(); #endif + + if (!ops) { + php_error(E_WARNING, "No PSI engine found"); + return FAILURE; + } + + psi_context_init(&PSI_G(context), ops, psi_error_wrapper, flags); + psi_context_build(&PSI_G(context), PSI_G(directory)); + + if (psi_check_env("PSI_DUMP")) { + psi_context_dump(&PSI_G(context), STDOUT_FILENO); + } + return SUCCESS; } -/* }}} */ -/* Remove if there's nothing to do at request end */ -/* {{{ PHP_RSHUTDOWN_FUNCTION - */ -PHP_RSHUTDOWN_FUNCTION(psi) +static PHP_MSHUTDOWN_FUNCTION(psi) { + psi_context_dtor(&PSI_G(context)); + + UNREGISTER_INI_ENTRIES(); + return SUCCESS; } -/* }}} */ -PHP_MINFO_FUNCTION(psi) +#if defined(COMPILE_DL_PSI) && defined(ZTS) +static PHP_RINIT_FUNCTION(psi) +{ + ZEND_TSRMLS_CACHE_UPDATE(); + return SUCCESS; +} +#endif + +static PHP_MINFO_FUNCTION(psi) { php_info_print_table_start(); php_info_print_table_header(2, "psi support", "enabled"); @@ -81,7 +223,10 @@ PHP_MINFO_FUNCTION(psi) DISPLAY_INI_ENTRIES(); } -const zend_function_entry psi_functions[] = { + +static const zend_function_entry psi_functions[] = { + PHP_FE(psi_dump, ai_psi_dump) + PHP_FE(psi_validate, ai_psi_validate) PHP_FE_END }; @@ -91,8 +236,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