diff options
| author | Andrey Hristov <andrey@php.net> | 2011-05-04 19:05:19 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2011-05-04 19:05:19 +0000 |
| commit | 84a309f87b5c1c1d4514644c9091f346488a09ae (patch) | |
| tree | 07184e20ba2b0e6c50352e036aedbc25c2d21a9c | |
| parent | 2d5e51db05a1ee9e4447920580a0188ed7e0e5f9 (diff) | |
| download | php-git-84a309f87b5c1c1d4514644c9091f346488a09ae.tar.gz | |
reorganize the DBG_ macros, add DBG_BLOCK_XXX
| -rw-r--r-- | ext/mysqlnd/mysqlnd_debug.h | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h index ff96d1e7c0..98558b0eac 100644 --- a/ext/mysqlnd/mysqlnd_debug.h +++ b/ext/mysqlnd/mysqlnd_debug.h @@ -101,6 +101,15 @@ PHPAPI char * mysqlnd_get_backtrace(uint max_levels, size_t * length TSRMLS_DC); #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_BLOCK_ENTER_EX(dbg_obj, block_name) \ + { \ + DBG_ENTER_EX(dbg_obj, (block_name)); + +#define DBG_BLOCK_LEAVE_EX(dbg_obj) \ + DBG_LEAVE_EX((dbg_obj), ;) \ + } \ + + #define DBG_ENTER_EX(dbg_obj, func_name) \ struct timeval __dbg_prof_tp = {0}; \ uint64_t __dbg_prof_start = 0; /* initialization is needed */ \ @@ -114,18 +123,7 @@ PHPAPI char * mysqlnd_get_backtrace(uint max_levels, size_t * length TSRMLS_DC); } \ } while (0); -#define DBG_RETURN_EX(dbg_obj, value) \ - do {\ - if ((dbg_obj)) { \ - uint64_t this_call_duration = 0; \ - if ((dbg_obj)->flags & MYSQLND_DEBUG_PROFILE_CALLS) { \ - DBG_PROFILE_END_TIME(this_call_duration); \ - } \ - (dbg_obj)->m->func_leave((dbg_obj), __LINE__, __FILE__, this_call_duration); \ - } \ - return (value);\ - } while (0) -#define DBG_VOID_RETURN_EX(dbg_obj) \ +#define DBG_LEAVE_EX(dbg_obj, leave) \ do {\ if ((dbg_obj)) { \ uint64_t this_call_duration = 0; \ @@ -134,8 +132,14 @@ PHPAPI char * mysqlnd_get_backtrace(uint max_levels, size_t * length TSRMLS_DC); } \ (dbg_obj)->m->func_leave((dbg_obj), __LINE__, __FILE__, this_call_duration); \ } \ - return;\ - } while (0) + leave \ + } while (0); + +#define DBG_RETURN_EX(dbg_obj, value) DBG_LEAVE_EX(dbg_obj, return (value);) + +#define DBG_VOID_RETURN_EX(dbg_obj) DBG_LEAVE_EX(dbg_obj, return;) + + #else static inline void DBG_INF_EX(MYSQLND_DEBUG * dbg_obj, const char * const msg) {} @@ -145,6 +149,7 @@ static inline void DBG_ERR_FMT_EX(MYSQLND_DEBUG * dbg_obj, ...) {} static inline void DBG_ENTER_EX(MYSQLND_DEBUG * dbg_obj, const char * const func_name) {} #define DBG_RETURN_EX(dbg_obj, value) return (value) #define DBG_VOID_RETURN_EX(dbg_obj) return +#define DBG_BLOCK_LEAVE_EX(dbg_obj) ; #endif @@ -156,8 +161,10 @@ static inline void DBG_ENTER_EX(MYSQLND_DEBUG * dbg_obj, const char * const func #define DBG_ERR_FMT(...) DBG_ERR_FMT_EX(MYSQLND_G(dbg), __VA_ARGS__) #define DBG_ENTER(func_name) DBG_ENTER_EX(MYSQLND_G(dbg), (func_name)) +#define DBG_BLOCK_ENTER(bname) DBG_BLOCK_ENTER_EX(MYSQLND_G(dbg), (bname)) #define DBG_RETURN(value) DBG_RETURN_EX(MYSQLND_G(dbg), (value)) #define DBG_VOID_RETURN DBG_VOID_RETURN_EX(MYSQLND_G(dbg)) +#define DBG_BLOCK_LEAVE DBG_BLOCK_LEAVE_EX(MYSQLND_G(dbg)) #elif MYSQLND_DBG_ENABLED == 0 @@ -166,8 +173,10 @@ static inline void DBG_ERR(const char * const msg) {} static inline void DBG_INF_FMT(const char * const format, ...) {} 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 +#define DBG_BLOCK_ENTER(bname) { +#define DBG_RETURN(value) return (value) +#define DBG_VOID_RETURN return +#define DBG_BLOCK_LEAVE } #endif |