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

Enabled debug assertions for DEBUG=Y builds. Fixed one debug assertion in log manager.

Browse Source
This commit is contained in:
vraatikka
2013-08-05 17:47:21 +03:00
parent bc6fe8f6ef
commit b852079631
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
log_manager/log_manager.cc
View File

@ -774,7 +774,7 @@ static char* blockbuf_get_writepos(
ss_dassert(pos == NULL); ss_dassert(pos == NULL);
ss_dassert(!(bb->bb_isfull || bb->bb_buf_left < str_len)); ss_dassert(!(bb->bb_isfull || bb->bb_buf_left < str_len));
ss_dassert(bb_list->mlist_nodecount <= nodecount_max); ss_dassert(bb_list->mlist_nodecount <= bb_list->mlist_nodecount_max);
/** /**
* Registration to blockbuf adds reference for the write operation. * Registration to blockbuf adds reference for the write operation.
@ -816,7 +816,7 @@ static char* blockbuf_get_writepos(
/** Unlock buffer */ /** Unlock buffer */
simple_mutex_unlock(&bb->bb_mutex); simple_mutex_unlock(&bb->bb_mutex);
ss_dassert(bb_list->mlist_mutex->sm_lock_thr != pthread_self()); ss_dassert(bb_list->mlist_mutex.sm_lock_thr != pthread_self());
return pos; return pos;
} }

10
utils/skygw_debug.h
View File

@ -47,15 +47,13 @@
# define ss_prof(exp) # define ss_prof(exp)
#endif /* SS_DEBUG || SS_PROF */ #endif /* SS_DEBUG || SS_PROF */
#if defined(EI_SS_DEBUG) #if defined(SS_DEBUG)
# define ss_debug(exp) exp # define ss_debug(exp) exp
# define ss_dfprintf fprintf # define ss_dfprintf fprintf
# define ss_dfflush fflush # define ss_dfflush fflush
# define ss_dfwrite fwrite # define ss_dfwrite fwrite
# undef ss_dassert
# undef ss_info_dassert
#if !defined(ss_dassert)
# define ss_dassert(exp) \ # define ss_dassert(exp) \
{ \ { \
if (!(exp)) { \ if (!(exp)) { \
@ -67,9 +65,8 @@
assert(exp); \ assert(exp); \
} \ } \
} }
#endif /* !defined(ss_dassert) */
#if !defined(ss_info_dassert)
# define ss_info_dassert(exp, info) \ # define ss_info_dassert(exp, info) \
{ \ { \
if (!(exp)) { \ if (!(exp)) { \
@ -81,7 +78,6 @@
assert((exp)); \ assert((exp)); \
} \ } \
} }
#endif /* !defined(ss_info_dassert) */
#else /* SS_DEBUG */ #else /* SS_DEBUG */