diff options
Diffstat (limited to 'ext/mysqlnd/mysqlnd_debug.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_debug.c | 72 |
1 files changed, 46 insertions, 26 deletions
diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c index d964dc1b14..8fe58ab843 100644 --- a/ext/mysqlnd/mysqlnd_debug.c +++ b/ext/mysqlnd/mysqlnd_debug.c @@ -47,18 +47,37 @@ static const char * const mysqlnd_debug_default_trace_file = "/tmp/mysqlnd.trace #define MYSQLND_DEBUG_FLUSH 128 #define MYSQLND_DEBUG_TRACE_MEMORY_CALLS 256 -static char * mysqlnd_emalloc_name = "_mysqlnd_emalloc"; -static char * mysqlnd_pemalloc_name = "_mysqlnd_pemalloc"; -static char * mysqlnd_ecalloc_name = "_mysqlnd_ecalloc"; -static char * mysqlnd_pecalloc_name = "_mysqlnd_pecalloc"; -static char * mysqlnd_erealloc_name = "_mysqlnd_erealloc"; -static char * mysqlnd_perealloc_name= "_mysqlnd_perealloc"; -static char * mysqlnd_efree_name = "_mysqlnd_efree"; -static char * mysqlnd_pefree_name = "_mysqlnd_pefree"; -static char * mysqlnd_malloc_name = "_mysqlnd_malloc"; -static char * mysqlnd_calloc_name = "_mysqlnd_calloc"; -static char * mysqlnd_realloc_name = "_mysqlnd_realloc"; -static char * mysqlnd_free_name = "_mysqlnd_free"; +static const char mysqlnd_emalloc_name[] = "_mysqlnd_emalloc"; +static const char mysqlnd_pemalloc_name[] = "_mysqlnd_pemalloc"; +static const char mysqlnd_ecalloc_name[] = "_mysqlnd_ecalloc"; +static const char mysqlnd_pecalloc_name[] = "_mysqlnd_pecalloc"; +static const char mysqlnd_erealloc_name[] = "_mysqlnd_erealloc"; +static const char mysqlnd_perealloc_name[] = "_mysqlnd_perealloc"; +static const char mysqlnd_efree_name[] = "_mysqlnd_efree"; +static const char mysqlnd_pefree_name[] = "_mysqlnd_pefree"; +static const char mysqlnd_malloc_name[] = "_mysqlnd_malloc"; +static const char mysqlnd_calloc_name[] = "_mysqlnd_calloc"; +static const char mysqlnd_realloc_name[] = "_mysqlnd_realloc"; +static const char mysqlnd_free_name[] = "_mysqlnd_free"; + +const char * mysqlnd_debug_std_no_trace_funcs[] = +{ + mysqlnd_emalloc_name, + mysqlnd_ecalloc_name, + mysqlnd_efree_name, + mysqlnd_erealloc_name, + mysqlnd_pemalloc_name, + mysqlnd_pecalloc_name, + mysqlnd_pefree_name, + mysqlnd_perealloc_name, + mysqlnd_malloc_name, + mysqlnd_calloc_name, + mysqlnd_realloc_name, + mysqlnd_free_name, + mysqlnd_read_header_name, + mysqlnd_read_body_name, + NULL /* must be always last */ +}; /* {{{ mysqlnd_debug::open */ static enum_func_status @@ -288,7 +307,7 @@ MYSQLND_METHOD(mysqlnd_debug, log_va)(MYSQLND_DEBUG *self, static zend_bool MYSQLND_METHOD(mysqlnd_debug, func_enter)(MYSQLND_DEBUG * self, unsigned int line, const char * const file, - char * func_name, unsigned int func_name_len) + const char * const func_name, unsigned int func_name_len) { if ((self->flags & MYSQLND_DEBUG_DUMP_TRACE) == 0 || self->file_name == NULL) { return FALSE; @@ -297,16 +316,15 @@ MYSQLND_METHOD(mysqlnd_debug, func_enter)(MYSQLND_DEBUG * self, return FALSE; } - if ((self->flags & MYSQLND_DEBUG_TRACE_MEMORY_CALLS) == 0 && - (func_name == mysqlnd_emalloc_name || func_name == mysqlnd_pemalloc_name || - func_name == mysqlnd_ecalloc_name || func_name == mysqlnd_pecalloc_name || - func_name == mysqlnd_erealloc_name || func_name == mysqlnd_perealloc_name || - func_name == mysqlnd_efree_name || func_name == mysqlnd_pefree_name || - func_name == mysqlnd_malloc_name || func_name == mysqlnd_calloc_name || - func_name == mysqlnd_realloc_name || func_name == mysqlnd_free_name || - func_name == mysqlnd_read_header_name || func_name == mysqlnd_read_body_name)) { - zend_stack_push(&self->call_stack, "", sizeof("")); - return FALSE; + if ((self->flags & MYSQLND_DEBUG_TRACE_MEMORY_CALLS) == 0 && self->skip_functions) { + char ** p = self->skip_functions; + while (*p) { + if (*p == func_name) { + zend_stack_push(&self->call_stack, "", sizeof("")); + return FALSE; + } + p++; + } } zend_stack_push(&self->call_stack, func_name, func_name_len + 1); @@ -588,7 +606,8 @@ MYSQLND_CLASS_METHODS_END; /* {{{ mysqlnd_debug_init */ -PHPAPI MYSQLND_DEBUG *mysqlnd_debug_init(TSRMLS_D) +PHPAPI MYSQLND_DEBUG * +mysqlnd_debug_init(const char * skip_functions[] TSRMLS_DC) { MYSQLND_DEBUG *ret = ecalloc(1, sizeof(MYSQLND_DEBUG)); #ifdef ZTS @@ -600,6 +619,7 @@ PHPAPI MYSQLND_DEBUG *mysqlnd_debug_init(TSRMLS_D) zend_hash_init(&ret->not_filtered_functions, 0, NULL, NULL, 0); ret->m = & mysqlnd_mysqlnd_debug_methods; + ret->skip_functions = skip_functions; return ret; } @@ -607,12 +627,12 @@ PHPAPI MYSQLND_DEBUG *mysqlnd_debug_init(TSRMLS_D) /* {{{ _mysqlnd_debug */ -PHPAPI void _mysqlnd_debug(const char *mode TSRMLS_DC) +PHPAPI void _mysqlnd_debug(const char * mode TSRMLS_DC) { #ifdef PHP_DEBUG MYSQLND_DEBUG *dbg = MYSQLND_G(dbg); if (!dbg) { - MYSQLND_G(dbg) = dbg = mysqlnd_debug_init(TSRMLS_C); + MYSQLND_G(dbg) = dbg = mysqlnd_debug_init(mysqlnd_debug_std_no_trace_funcs TSRMLS_CC); if (!dbg) { return; } |