hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add the expression to debug assertion log message

Browse Source 
The actual expression that failed should help figure out what went wrong
from the logs alone.
This commit is contained in:
Markus Mäkelä
2017-01-23 09:59:47 +02:00
parent 4f03aa674c
commit 5cd347ff18
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/maxscale/debug.h
View File

@ -35,10 +35,12 @@ MXS_BEGIN_DECLS
#if defined(SS_DEBUG) && defined(LOG_ASSERT) #if defined(SS_DEBUG) && defined(LOG_ASSERT)
#include <maxscale/log_manager.h> #include <maxscale/log_manager.h>
# define ss_dassert(exp) do { if(!(exp)){\ # define ss_dassert(exp) do { if(!(exp)){\
MXS_ERROR("debug assert %s:%d\n", (char*)__FILE__, __LINE__);\ const char *debug_expr = #exp; /** The MXS_ERROR marco doesn't seem to like stringification */ \
MXS_ERROR("debug assert at %s:%d failed: %s\n", (char*)__FILE__, __LINE__, debug_expr);\
mxs_log_flush_sync(); assert(exp);} } while (false) mxs_log_flush_sync(); assert(exp);} } while (false)
#define ss_info_dassert(exp,info) do { if(!(exp)){\ #define ss_info_dassert(exp,info) do { if(!(exp)){\
MXS_ERROR("debug assert %s:%d %s\n", (char*)__FILE__, __LINE__, info);\ const char *debug_expr = #exp; \
MXS_ERROR("debug assert at %s:%d failed: %s (%s)\n", (char*)__FILE__, __LINE__, info, debug_expr);\
mxs_log_flush_sync();assert(exp);} } while (false) mxs_log_flush_sync();assert(exp);} } while (false)
# define ss_debug(exp) exp # define ss_debug(exp) exp
# define ss_dfprintf fprintf # define ss_dfprintf fprintf