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

Always include debug members in objects

Browse Source 
Having the structures be of the same size with and without debug mode is
beneficial when debugging release binaries.
This commit is contained in:
Markus Mäkelä
2017-06-13 12:40:10 +03:00
parent bd7a26d830
commit dfc1d0a413
3 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/modules/routing/readwritesplit/readwritesplit.cc
View File

@ -213,12 +213,9 @@ rses_property_t *rses_property_init(rses_property_type_t prop_type)
prop->rses_prop_type = prop_type; prop->rses_prop_type = prop_type;
prop->rses_prop_next = NULL; prop->rses_prop_next = NULL;
prop->rses_prop_refcount = 1; prop->rses_prop_refcount = 1;
#if defined(SS_DEBUG)
prop->rses_prop_chk_top = CHK_NUM_ROUTER_PROPERTY; prop->rses_prop_chk_top = CHK_NUM_ROUTER_PROPERTY;
prop->rses_prop_chk_tail = CHK_NUM_ROUTER_PROPERTY; prop->rses_prop_chk_tail = CHK_NUM_ROUTER_PROPERTY;
#endif
CHK_RSES_PROP(prop);
return prop; return prop;
} }
@ -770,12 +767,10 @@ static bool create_backends(ROUTER_CLIENT_SES *rses, backend_ref_t** dest, int*
{ {
if (sref->active) if (sref->active)
{ {
#if defined(SS_DEBUG)
backend_ref[i].bref_chk_top = CHK_NUM_BACKEND_REF; backend_ref[i].bref_chk_top = CHK_NUM_BACKEND_REF;
backend_ref[i].bref_chk_tail = CHK_NUM_BACKEND_REF; backend_ref[i].bref_chk_tail = CHK_NUM_BACKEND_REF;
backend_ref[i].bref_sescmd_cur.scmd_cur_chk_top = CHK_NUM_SESCMD_CUR; backend_ref[i].bref_sescmd_cur.scmd_cur_chk_top = CHK_NUM_SESCMD_CUR;
backend_ref[i].bref_sescmd_cur.scmd_cur_chk_tail = CHK_NUM_SESCMD_CUR; backend_ref[i].bref_sescmd_cur.scmd_cur_chk_tail = CHK_NUM_SESCMD_CUR;
#endif
backend_ref[i].closed_at = 0; backend_ref[i].closed_at = 0;
backend_ref[i].bref_state = 0; backend_ref[i].bref_state = 0;
backend_ref[i].ref = sref; backend_ref[i].ref = sref;
@ -1034,10 +1029,8 @@ static MXS_ROUTER_SESSION *newSession(MXS_ROUTER *router_inst, MXS_SESSION *sess
} }
prop->rses_prop_rsession = client_rses; prop->rses_prop_rsession = client_rses;
#if defined(SS_DEBUG)
client_rses->rses_chk_top = CHK_NUM_ROUTER_SES; client_rses->rses_chk_top = CHK_NUM_ROUTER_SES;
client_rses->rses_chk_tail = CHK_NUM_ROUTER_SES; client_rses->rses_chk_tail = CHK_NUM_ROUTER_SES;
#endif
client_rses->rses_closed = false; client_rses->rses_closed = false;
client_rses->rses_properties[RSES_PROP_TYPE_SESCMD] = NULL; client_rses->rses_properties[RSES_PROP_TYPE_SESCMD] = NULL;
client_rses->rses_properties[RSES_PROP_TYPE_TMPTABLES] = prop; client_rses->rses_properties[RSES_PROP_TYPE_TMPTABLES] = prop;

4
server/modules/routing/readwritesplit/rwsplit_mysql.cc
View File

@ -29,10 +29,6 @@
#include <maxscale/protocol/mysql.h> #include <maxscale/protocol/mysql.h>
#include <maxscale/alloc.h> #include <maxscale/alloc.h>
#if defined(SS_DEBUG)
#include <maxscale/protocol/mysql.h>
#endif
#define RWSPLIT_TRACE_MSG_LEN 1000 #define RWSPLIT_TRACE_MSG_LEN 1000
/** /**

2
server/modules/routing/readwritesplit/rwsplit_session_cmd.cc
View File

@ -75,10 +75,8 @@ mysql_sescmd_t *mysql_sescmd_init(rses_property_t *rses_prop,
/** Can't call rses_property_get_sescmd with uninitialized sescmd */ /** Can't call rses_property_get_sescmd with uninitialized sescmd */
sescmd = &rses_prop->rses_prop_data.sescmd; sescmd = &rses_prop->rses_prop_data.sescmd;
sescmd->my_sescmd_prop = rses_prop; /*< reference to owning property */ sescmd->my_sescmd_prop = rses_prop; /*< reference to owning property */
#if defined(SS_DEBUG)
sescmd->my_sescmd_chk_top = CHK_NUM_MY_SESCMD; sescmd->my_sescmd_chk_top = CHK_NUM_MY_SESCMD;
sescmd->my_sescmd_chk_tail = CHK_NUM_MY_SESCMD; sescmd->my_sescmd_chk_tail = CHK_NUM_MY_SESCMD;
#endif
/** Set session command buffer */ /** Set session command buffer */
sescmd->my_sescmd_buf = sescmd_buf; sescmd->my_sescmd_buf = sescmd_buf;
sescmd->my_sescmd_packet_type = packet_type; sescmd->my_sescmd_packet_type = packet_type;