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

Temporarily disable listmanager debug checks

Browse Source 
Since the listmanager code isn't used, the debug assertions will always
fail. They should be disabled until the listmanager code can converted to
the per-thread model.
This commit is contained in:
Markus Makela
2016-10-27 15:13:53 +03:00
parent 51842333d7
commit abc0681248
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/maxscale/debug.h
View File

@ -474,7 +474,6 @@ typedef enum skygw_chk_t
ss_info_dassert(d->dcb_chk_top == CHK_NUM_DCB && \ ss_info_dassert(d->dcb_chk_top == CHK_NUM_DCB && \
d->dcb_chk_tail == CHK_NUM_DCB, \ d->dcb_chk_tail == CHK_NUM_DCB, \
"Dcb under- or overflow"); \ "Dcb under- or overflow"); \
CHK_MANAGED_LIST(d) \
} }
#define CHK_PROTOCOL(p) { \ #define CHK_PROTOCOL(p) { \
@ -487,7 +486,6 @@ typedef enum skygw_chk_t
ss_info_dassert(s->ses_chk_top == CHK_NUM_SESSION && \ ss_info_dassert(s->ses_chk_top == CHK_NUM_SESSION && \
s->ses_chk_tail == CHK_NUM_SESSION, \ s->ses_chk_tail == CHK_NUM_SESSION, \
"Session under- or overflow"); \ "Session under- or overflow"); \
CHK_MANAGED_LIST(s) \
} }
#define CHK_SERVER(s) { \ #define CHK_SERVER(s) { \

5
server/core/dcb.c
View File

@ -377,7 +377,8 @@ void
dcb_free_all_memory(DCB *dcb) dcb_free_all_memory(DCB *dcb)
{ {
DCB_CALLBACK *cb_dcb; DCB_CALLBACK *cb_dcb;
ss_dassert(dcb->entry_is_in_use); // TODO: Uncomment once listmanager code is in use
//ss_dassert(dcb->entry_is_in_use);
if (dcb->protocol && (!DCB_IS_CLONE(dcb))) if (dcb->protocol && (!DCB_IS_CLONE(dcb)))
{ {
@ -1842,10 +1843,12 @@ void printAllDCBs()
void void
dprintOneDCB(DCB *pdcb, DCB *dcb) dprintOneDCB(DCB *pdcb, DCB *dcb)
{ {
/* TODO: Uncomment once listmanager code is in use
if (false == dcb->entry_is_in_use) if (false == dcb->entry_is_in_use)
{ {
return; return;
} }
*/
dcb_printf(pdcb, "DCB: %p\n", (void *)dcb); dcb_printf(pdcb, "DCB: %p\n", (void *)dcb);
dcb_printf(pdcb, "\tDCB state: %s\n", dcb_printf(pdcb, "\tDCB state: %s\n",
gw_dcb_state2string(dcb->state)); gw_dcb_state2string(dcb->state));