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

MXS-2020 Replace ss_debug with MXB_AT_DEBUG

Browse Source
This commit is contained in:
Johan Wikman 2018-08-22 09:41:27 +03:00
parent 84876b881b
commit b1e405442f
20 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/maxscale/debug.h
View File

@ -20,6 +20,5 @@ MXS_BEGIN_DECLS
#define ss_dassert mxb_assert
#define ss_info_dassert mxb_assert_message
#define ss_debug MXB_AT_DEBUG
MXS_END_DECLS

6
query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
View File

@ -232,9 +232,9 @@ bool ensure_query_is_parsed(GWBUF* query)
// serialize the parsing. That's ok, since qc_mysqlembedded is only
// used for verifying the behaviour of qc_sqlite.
ss_debug(int rv);
MXB_AT_DEBUG(int rv);
ss_debug(rv = )pthread_mutex_lock(&this_unit.sql_mode_mutex);
MXB_AT_DEBUG(rv = )pthread_mutex_lock(&this_unit.sql_mode_mutex);
ss_dassert(rv == 0);
if (this_thread.sql_mode == QC_SQL_MODE_ORACLE)
@ -248,7 +248,7 @@ bool ensure_query_is_parsed(GWBUF* query)
parsed = parse_query(query);
ss_debug(rv = )pthread_mutex_unlock(&this_unit.sql_mode_mutex);
MXB_AT_DEBUG(rv = )pthread_mutex_unlock(&this_unit.sql_mode_mutex);
ss_dassert(rv == 0);
if (!parsed)

4
server/core/backend.cc
View File

@ -151,7 +151,7 @@ void Backend::clear_state(backend_state state)
{
if ((state & WAITING_RESULT) && (m_state & WAITING_RESULT))
{
ss_debug(int prev2 = )atomic_add(&m_backend->server->stats.n_current_ops, -1);
MXB_AT_DEBUG(int prev2 = )atomic_add(&m_backend->server->stats.n_current_ops, -1);
ss_dassert(prev2 > 0);
}
@ -162,7 +162,7 @@ void Backend::set_state(backend_state state)
{
if ((state & WAITING_RESULT) && (m_state & WAITING_RESULT) == 0)
{
ss_debug(int prev2 = )atomic_add(&m_backend->server->stats.n_current_ops, 1);
MXB_AT_DEBUG(int prev2 = )atomic_add(&m_backend->server->stats.n_current_ops, 1);
ss_dassert(prev2 >= 0);
}

4
server/core/buffer.cc
View File

@ -542,8 +542,8 @@ int gwbuf_compare(const GWBUF* lhs, const GWBUF* rhs)
uint8_t lc = 0;
uint8_t rc = 0;
ss_debug(bool rv1 = ) gwbuf_get_byte(&lhs, &loffset, &lc);
ss_debug(bool rv2 = ) gwbuf_get_byte(&rhs, &roffset, &rc);
MXB_AT_DEBUG(bool rv1 = ) gwbuf_get_byte(&lhs, &loffset, &lc);
MXB_AT_DEBUG(bool rv2 = ) gwbuf_get_byte(&rhs, &roffset, &rc);
ss_dassert(rv1 && rv2);

2
server/core/config.cc
View File

@ -1648,7 +1648,7 @@ uint64_t config_get_size(const MXS_CONFIG_PARAMETER *params, const char *key)
{
const char *value = config_get_value_string(params, key);
uint64_t intval;
ss_debug(bool rval = )get_suffixed_size(value, &intval);
MXB_AT_DEBUG(bool rval = )get_suffixed_size(value, &intval);
ss_dassert(rval);
return intval;
}

12
server/core/dcb.cc
View File

@ -2189,8 +2189,8 @@ int dcb_accept_SSL(DCB* dcb)
return -1;
}
ss_debug(const char *remote = dcb->remote ? dcb->remote : "");
ss_debug(const char *user = dcb->user ? dcb->user : "");
MXB_AT_DEBUG(const char *remote = dcb->remote ? dcb->remote : "");
MXB_AT_DEBUG(const char *user = dcb->user ? dcb->user : "");
int ssl_rval = SSL_accept(dcb->ssl);
@ -3107,8 +3107,8 @@ static uint32_t dcb_process_poll_events(DCB *dcb, uint32_t events)
if ((events & EPOLLHUP) && (dcb->n_close == 0))
{
ss_debug(int eno = gw_getsockerrno(dcb->fd));
ss_debug(char errbuf[MXS_STRERROR_BUFLEN]);
MXB_AT_DEBUG(int eno = gw_getsockerrno(dcb->fd));
MXB_AT_DEBUG(char errbuf[MXS_STRERROR_BUFLEN]);
MXS_DEBUG("%lu [poll_waitevents] "
"EPOLLHUP on dcb %p, fd %d. "
"Errno %d, %s.",
@ -3133,8 +3133,8 @@ static uint32_t dcb_process_poll_events(DCB *dcb, uint32_t events)
#ifdef EPOLLRDHUP
if ((events & EPOLLRDHUP) && (dcb->n_close == 0))
{
ss_debug(int eno = gw_getsockerrno(dcb->fd));
ss_debug(char errbuf[MXS_STRERROR_BUFLEN]);
MXB_AT_DEBUG(int eno = gw_getsockerrno(dcb->fd));
MXB_AT_DEBUG(char errbuf[MXS_STRERROR_BUFLEN]);
MXS_DEBUG("%lu [poll_waitevents] "
"EPOLLRDHUP on dcb %p, fd %d. "
"Errno %d, %s.",

6
server/core/monitor.cc
View File

@ -2105,7 +2105,7 @@ static bool process_data_file(MXS_MONITOR *monitor, MXS_MONITORED_SERVER **maste
const char *crc_ptr)
{
const char *ptr = data;
ss_debug(const char *prevptr = ptr);
MXB_AT_DEBUG(const char *prevptr = ptr);
while (ptr < crc_ptr)
{
@ -2134,7 +2134,7 @@ static bool process_data_file(MXS_MONITOR *monitor, MXS_MONITORED_SERVER **maste
return false;
}
ss_dassert(prevptr != ptr);
ss_debug(prevptr = ptr);
MXB_AT_DEBUG(prevptr = ptr);
}
ss_dassert(ptr == crc_ptr);
@ -2520,7 +2520,7 @@ int64_t MonitorInstance::get_time_ms()
{
timespec t;
ss_debug(int rv = )clock_gettime(CLOCK_MONOTONIC_COARSE, &t);
MXB_AT_DEBUG(int rv = )clock_gettime(CLOCK_MONOTONIC_COARSE, &t);
ss_dassert(rv == 0);
return t.tv_sec * 1000 + (t.tv_nsec / 1000000);

4
server/core/query_classifier.cc
View File

@ -274,7 +274,7 @@ private:
{
freed_space += i->first.size();
ss_debug(bool erased =) erase(i->first);
MXB_AT_DEBUG(bool erased =) erase(i->first);
ss_dassert(erased);
}
@ -1311,7 +1311,7 @@ bool qc_alter_from_json(json_t* pJson)
if (rv)
{
ss_debug(bool set =) qc_set_cache_properties(&cache_properties);
MXB_AT_DEBUG(bool set =) qc_set_cache_properties(&cache_properties);
ss_dassert(set);
}
}

2
server/modules/authenticator/MySQLAuth/mysql_auth.cc
View File

@ -148,7 +148,7 @@ sqlite3* get_handle(MYSQL_AUTH* instance)
if (instance->handles[i] == NULL)
{
ss_debug(bool rval = )open_instance_database(":memory:", &instance->handles[i]);
MXB_AT_DEBUG(bool rval = )open_instance_database(":memory:", &instance->handles[i]);
ss_dassert(rval);
}

4
server/modules/filter/cache/cachefiltersession.cc vendored
View File

@ -151,7 +151,7 @@ bool is_select_statement(GWBUF* pStmt)
char* pSql;
int len;
ss_debug(int rc = ) modutil_extract_SQL(pStmt, &pSql, &len);
MXB_AT_DEBUG(int rc = ) modutil_extract_SQL(pStmt, &pSql, &len);
ss_dassert(rc == 1);
char* pSql_end = pSql + len;
@ -1001,7 +1001,7 @@ CacheFilterSession::cache_action_t CacheFilterSession::get_cache_action(GWBUF* p
*/
CacheFilterSession::routing_action_t CacheFilterSession::route_COM_QUERY(GWBUF* pPacket)
{
ss_debug(uint8_t* pData = static_cast<uint8_t*>(GWBUF_DATA(pPacket)));
MXB_AT_DEBUG(uint8_t* pData = static_cast<uint8_t*>(GWBUF_DATA(pPacket)));
ss_dassert((int)MYSQL_GET_COMMAND(pData) == MXS_COM_QUERY);
routing_action_t routing_action = ROUTING_CONTINUE;

6
server/modules/filter/cache/test/testerlrustorage.cc vendored
View File

@ -241,9 +241,9 @@ int TesterLRUStorage::test_max_count_and_size(size_t n_threads, size_t n_seconds
{
rv = execute_tasks(n_threads, n_seconds, cache_items, *pStorage);
ss_debug(cache_result_t result);
MXB_AT_DEBUG(cache_result_t result);
uint64_t items;
ss_debug(result = ) pStorage->get_items(&items);
MXB_AT_DEBUG(result = ) pStorage->get_items(&items);
ss_dassert(result == CACHE_RESULT_OK);
out() << "Max count: " << max_count << ", count: " << items << "." << endl;
@ -254,7 +254,7 @@ int TesterLRUStorage::test_max_count_and_size(size_t n_threads, size_t n_seconds
}
uint64_t size;
ss_debug(result = ) pStorage->get_size(&size);
MXB_AT_DEBUG(result = ) pStorage->get_size(&size);
ss_dassert(result == CACHE_RESULT_OK);
out() << "Max size: " << max_size << ", size: " << size << "." << endl;

4
server/modules/filter/namedserverfilter/namedserverfilter.cc
View File

@ -931,9 +931,9 @@ static void generate_param_names(int pairs)
const char FORMAT[] = "%s%02d";
for (int counter = 1; counter <= pairs; counter++)
{
ss_debug(int rval = ) snprintf(name_match, namelen_match, FORMAT, MATCH_STR, counter);
MXB_AT_DEBUG(int rval = ) snprintf(name_match, namelen_match, FORMAT, MATCH_STR, counter);
ss_dassert(rval == namelen_match - 1);
ss_debug(rval = ) snprintf(name_server, namelen_server, FORMAT, TARGET_STR, counter);
MXB_AT_DEBUG(rval = ) snprintf(name_server, namelen_server, FORMAT, TARGET_STR, counter);
ss_dassert(rval == namelen_server - 1);
// Have both names, add them to the global vectors

6
server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
View File

@ -655,7 +655,7 @@ static void check_packet(DCB *dcb, GWBUF *buf, int bytes)
static int
gw_read_do_authentication(DCB *dcb, GWBUF *read_buffer, int nbytes_read)
{
ss_debug(check_packet(dcb, read_buffer, nbytes_read));
MXB_AT_DEBUG(check_packet(dcb, read_buffer, nbytes_read));
/** Allocate the shared session structure */
if (dcb->data == NULL && (dcb->data = mysql_session_alloc()) == NULL)
@ -743,7 +743,7 @@ gw_read_do_authentication(DCB *dcb, GWBUF *read_buffer, int nbytes_read)
// For the time being only the sql_mode is stored in MXS_SESSION::client_protocol_data.
session->client_protocol_data = QC_SQL_MODE_DEFAULT;
protocol->protocol_auth_state = MXS_AUTH_STATE_COMPLETE;
ss_debug(bool check = ) mxs_rworker_register_session(session);
MXB_AT_DEBUG(bool check = ) mxs_rworker_register_session(session);
ss_dassert(check);
mxs_mysql_send_ok(dcb, next_sequence, 0, NULL);
@ -1459,7 +1459,7 @@ static int gw_client_close(DCB *dcb)
{
ss_dassert(target->state == SESSION_STATE_ROUTER_READY ||
target->state == SESSION_STATE_STOPPING);
ss_debug(bool removed = ) mxs_rworker_deregister_session(target->ses_id);
MXB_AT_DEBUG(bool removed = ) mxs_rworker_deregister_session(target->ses_id);
ss_dassert(removed);
session_close(target);
}

2
server/modules/protocol/MySQL/mysql_common.cc
View File

@ -1469,7 +1469,7 @@ void mxs_mysql_parse_ok_packet(GWBUF *buff, size_t packet_offset, size_t packet_
if (server_status & SERVER_SESSION_STATE_CHANGED)
{
ss_debug(uint64_t data_size = )mxs_leint_consume(&ptr); // total SERVER_SESSION_STATE_CHANGED length
MXB_AT_DEBUG(uint64_t data_size = )mxs_leint_consume(&ptr); // total SERVER_SESSION_STATE_CHANGED length
ss_dassert(data_size == packet_len - (ptr - local_buf));
while (ptr < (local_buf + packet_len))

2
server/modules/routing/avrorouter/avro_converter.cc
View File

@ -386,7 +386,7 @@ void AvroConverter::column(int i)
void AvroConverter::set_active(int i)
{
ss_debug(int rc =)avro_value_get_by_name(&m_record, m_create->columns[i].name.c_str(),
MXB_AT_DEBUG(int rc =)avro_value_get_by_name(&m_record, m_create->columns[i].name.c_str(),
&m_field, NULL);
ss_dassert(rc == 0);
}

2
server/modules/routing/avrorouter/avro_file.cc
View File

@ -151,7 +151,7 @@ static int conv_state_handler(void* data, const char* section, const char* key,
if (strcmp(key, "gtid") == 0)
{
gtid_pos_t gtid;
ss_debug(bool rval = )gtid.parse(value);
MXB_AT_DEBUG(bool rval = )gtid.parse(value);
ss_dassert(rval);
router->handler.set_gtid(gtid);
}

2
server/modules/routing/binlogrouter/blr.cc
View File

@ -1206,7 +1206,7 @@ static void freeSession(MXS_ROUTER* router_instance,
ROUTER_INSTANCE *router = (ROUTER_INSTANCE *)router_instance;
ROUTER_SLAVE *slave = (ROUTER_SLAVE *)router_client_ses;
ss_debug(int prev_val = ) atomic_add(&router->stats.n_slaves, -1);
MXB_AT_DEBUG(int prev_val = ) atomic_add(&router->stats.n_slaves, -1);
ss_dassert(prev_val > 0);
/*

2
server/modules/routing/readconnroute/readconnroute.cc
View File

@ -458,7 +458,7 @@ static void freeSession(MXS_ROUTER* router_instance, MXS_ROUTER_SESSION* router_
ROUTER_INSTANCE* router = (ROUTER_INSTANCE *) router_instance;
ROUTER_CLIENT_SES* router_cli_ses = (ROUTER_CLIENT_SES *) router_client_ses;
ss_debug(int prev_val = ) atomic_add(&router_cli_ses->backend->connections, -1);
MXB_AT_DEBUG(int prev_val = ) atomic_add(&router_cli_ses->backend->connections, -1);
ss_dassert(prev_val > 0);
MXS_FREE(router_cli_ses);

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

@ -82,7 +82,7 @@ static SRWBackend compare_backends(SRWBackend a, SRWBackend b, select_criteria_t
void RWSplitSession::handle_connection_keepalive(SRWBackend& target)
{
ss_dassert(target);
ss_debug(int nserv = 0);
MXB_AT_DEBUG(int nserv = 0);
/** Each heartbeat is 1/10th of a second */
int keepalive = m_config.connection_keepalive * 10;
@ -92,7 +92,7 @@ void RWSplitSession::handle_connection_keepalive(SRWBackend& target)
if (backend->in_use() && backend != target && !backend->is_waiting_result())
{
ss_debug(nserv++);
MXB_AT_DEBUG(nserv++);
int diff = mxs_clock() - backend->dcb()->last_read;
if (diff > keepalive)

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

@ -87,7 +87,7 @@ void RWSplitSession::process_sescmd_response(SRWBackend& backend, GWBUF** ppPack
if (command == MXS_COM_STMT_PREPARE && cmd != MYSQL_REPLY_ERR)
{
// This should never fail or the backend protocol is broken
ss_debug(bool b = )mxs_mysql_extract_ps_response(*ppPacket, &resp);
MXB_AT_DEBUG(bool b = )mxs_mysql_extract_ps_response(*ppPacket, &resp);
ss_dassert(b);
backend->add_ps_handle(id, resp.id);
}