make mysqlnd's tracing API more reusable

diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c
index d964dc1b14215592724c7f3c9876a88975288fd6..8fe58ab8433d6c01669cbf19c62a3c62271ac70f 100644 (file)
--- 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;
                }

diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h
index f872099d4aa9e6779caf99e6ecbe66babfe3c4ad..2ac2f46679f568606cc7da8140c0293f0fd47771 100644 (file)
--- a/ext/mysqlnd/mysqlnd_debug.h
+++ b/ext/mysqlnd/mysqlnd_debug.h
@@ -36,7 +36,7 @@ struct st_mysqlnd_debug_methods
        enum_func_status (*log_va)(MYSQLND_DEBUG *self, unsigned int line, const char * const file,
                                                           unsigned int level, const char * type, const char *format, ...);
        zend_bool (*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);
        enum_func_status (*func_leave)(MYSQLND_DEBUG *self, unsigned int line, const char * const file);
        enum_func_status (*close)(MYSQLND_DEBUG *self);
        enum_func_status (*free_handle)(MYSQLND_DEBUG *self);
@@ -55,10 +55,12 @@ struct st_mysqlnd_debug
        zend_stack call_stack;
        HashTable not_filtered_functions;
        struct st_mysqlnd_debug_methods *m;
+       const char ** skip_functions;
 };
 
+extern const char * mysqlnd_debug_std_no_trace_funcs[];
 
-PHPAPI MYSQLND_DEBUG *mysqlnd_debug_init(TSRMLS_D);
+PHPAPI MYSQLND_DEBUG * mysqlnd_debug_init(const char * skip_functions[] TSRMLS_DC);
 
 #define MYSQLND_MEM_D  TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC
 
@@ -78,20 +80,29 @@ void        _mysqlnd_free(void *ptr MYSQLND_MEM_D);
 
 char * mysqlnd_get_backtrace(TSRMLS_D);
 
+#define DBG_INF_EX(dbg_obj, msg)               do { if (dbg_skip_trace == FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "info : ", (msg)); } while (0)
+#define DBG_ERR_EX(dbg_obj, msg)               do { if (dbg_skip_trace == FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "error: ", (msg)); } while (0)
+#define DBG_INF_FMT_EX(dbg_obj, ...)   do { if (dbg_skip_trace == FALSE) (dbg_obj)->m->log_va((dbg_obj), __LINE__, __FILE__, -1, "info : ", __VA_ARGS__); } while (0)
+#define DBG_ERR_FMT_EX(dbg_obj, ...)   do { if (dbg_skip_trace == FALSE) (dbg_obj)->m->log_va((dbg_obj), __LINE__, __FILE__, -1, "error: ", __VA_ARGS__); } while (0)
+
+#define DBG_ENTER_EX(dbg_obj, func_name) zend_bool dbg_skip_trace = TRUE; if ((dbg_obj)) dbg_skip_trace = !(dbg_obj)->m->func_enter((dbg_obj), __LINE__, __FILE__, func_name, strlen(func_name));
+#define DBG_RETURN_EX(dbg_obj, value)  do { if ((dbg_obj)) (dbg_obj)->m->func_leave((dbg_obj), __LINE__, __FILE__); return (value); } while (0)
+#define DBG_VOID_RETURN_EX(dbg_obj)            do { if ((dbg_obj)) (dbg_obj)->m->func_leave((dbg_obj), __LINE__, __FILE__); return; } while (0)
+
+
 #if MYSQLND_DBG_ENABLED == 1
 
-#define DBG_INF(msg) do { if (dbg_skip_trace == FALSE) MYSQLND_G(dbg)->m->log(MYSQLND_G(dbg), __LINE__, __FILE__, -1, "info : ", (msg)); } while (0)
-#define DBG_ERR(msg) do { if (dbg_skip_trace == FALSE) MYSQLND_G(dbg)->m->log(MYSQLND_G(dbg), __LINE__, __FILE__, -1, "error: ", (msg)); } while (0)
-#define DBG_INF_FMT(...) do { if (dbg_skip_trace == FALSE) MYSQLND_G(dbg)->m->log_va(MYSQLND_G(dbg), __LINE__, __FILE__, -1, "info : ", __VA_ARGS__); } while (0)
-#define DBG_ERR_FMT(...) do { if (dbg_skip_trace == FALSE) MYSQLND_G(dbg)->m->log_va(MYSQLND_G(dbg), __LINE__, __FILE__, -1, "error: ", __VA_ARGS__); } while (0)
+#define DBG_INF(msg)           DBG_INF_EX(MYSQLND_G(dbg), (msg))
+#define DBG_ERR(msg)           DBG_ERR_EX(MYSQLND_G(dbg), (msg))
+#define DBG_INF_FMT(...)       DBG_INF_FMT_EX(MYSQLND_G(dbg), __VA_ARGS__)
+#define DBG_ERR_FMT(...)       DBG_ERR_FMT_EX(MYSQLND_G(dbg), __VA_ARGS__)
 
-#define DBG_ENTER(func_name) zend_bool dbg_skip_trace = TRUE; if (MYSQLND_G(dbg)) dbg_skip_trace = !MYSQLND_G(dbg)->m->func_enter(MYSQLND_G(dbg), __LINE__, __FILE__, func_name, strlen(func_name));
-#define DBG_RETURN(value)      do { if (MYSQLND_G(dbg)) MYSQLND_G(dbg)->m->func_leave(MYSQLND_G(dbg), __LINE__, __FILE__); return (value); } while (0)
-#define DBG_VOID_RETURN                do { if (MYSQLND_G(dbg)) MYSQLND_G(dbg)->m->func_leave(MYSQLND_G(dbg), __LINE__, __FILE__); return; } while (0)
+#define DBG_ENTER(func_name)   DBG_ENTER_EX(MYSQLND_G(dbg), (func_name))
+#define DBG_RETURN(value)              DBG_RETURN_EX(MYSQLND_G(dbg), (value))
+#define DBG_VOID_RETURN                        DBG_VOID_RETURN_EX(MYSQLND_G(dbg))
 
 #elif MYSQLND_DBG_ENABLED == 0
 
-
 static inline void DBG_INF(const char * const msg) {}
 static inline void DBG_ERR(const char * const msg) {}
 static inline void DBG_INF_FMT(const char * const format, ...) {}
@@ -99,6 +110,7 @@ static inline void DBG_ERR_FMT(const char * const format, ...) {}
 static inline void DBG_ENTER(const char * const func_name) {}
 #define DBG_RETURN(value)      return (value)
 #define DBG_VOID_RETURN                return
+
 #endif
 
 

diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
index 9938d3abac3594acb61281319052f3ca3a48c7f4..c2ceec6bb515934d87ff676cff57eb457cd74447 100644 (file)
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -66,8 +66,8 @@ static const char *unknown_sqlstate= "HY000";
 char * const mysqlnd_empty_string = "";
 
 /* Used in mysqlnd_debug.c */
-char * mysqlnd_read_header_name        = "mysqlnd_read_header";
-char * mysqlnd_read_body_name  = "mysqlnd_read_body";
+const char mysqlnd_read_header_name[]  = "mysqlnd_read_header";
+const char mysqlnd_read_body_name[]            = "mysqlnd_read_body";
 
 
 #define ERROR_MARKER 0xFF

diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h
index c3cd86a48d467121fce92b59c4d1d1a467ef1a4b..0d482517f69d28015c0437d20f146c826310a230 100644 (file)
--- a/ext/mysqlnd/mysqlnd_wireprotocol.h
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.h
@@ -31,8 +31,8 @@
 #define MYSQLND_NULL_LENGTH    (unsigned long) ~0
 
 /* Used in mysqlnd_debug.c */
-extern char * mysqlnd_read_header_name;
-extern char * mysqlnd_read_body_name;
+extern const char mysqlnd_read_header_name[];
+extern const char mysqlnd_read_body_name[];
 
 
 /* Packet handling */

diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c
index 1204486811da344afc5264149bad229cb4e27d70..1ad5b4e25322a2f2285971f8e49b5149c7052c54 100644 (file)
--- a/ext/mysqlnd/php_mysqlnd.c
+++ b/ext/mysqlnd/php_mysqlnd.c
@@ -205,7 +205,7 @@ static PHP_RINIT_FUNCTION(mysqlnd)
 {
 #if defined(PHP_DEBUG)
        if (MYSQLND_G(debug)) {
-               MYSQLND_DEBUG *dbg = mysqlnd_debug_init(TSRMLS_C);
+               MYSQLND_DEBUG *dbg = mysqlnd_debug_init(mysqlnd_debug_std_no_trace_funcs TSRMLS_CC);
                if (!dbg) {
                        return FAILURE;
                }

diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c
index 77a53106d42df5661c55fb68be06eeb9e977a966..cb39b5250c682059c6ba0f4fed284870c99fb66b 100755 (executable)
--- a/ext/pdo_mysql/pdo_mysql.c
+++ b/ext/pdo_mysql/pdo_mysql.c
@@ -126,7 +126,7 @@ static PHP_RINIT_FUNCTION(pdo_mysql)
 {      
 #if PDO_DBG_ENABLED
        if (PDO_MYSQL_G(debug)) {
-               MYSQLND_DEBUG *dbg = mysqlnd_debug_init(TSRMLS_C);
+               MYSQLND_DEBUG *dbg = mysqlnd_debug_init(mysqlnd_debug_std_no_trace_funcs TSRMLS_CC);
                if (!dbg) {
                        return FAILURE;
                }