From 86dcd1cc0f55addebcc92406fac754e593d3e61c Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Fri, 13 Nov 2015 14:26:43 +0200 Subject: [PATCH] LOGIF_MAYBE macros cleaned away. Used in few places and only obscured what was going on. --- log_manager/log_manager.h | 15 --------- server/core/dcb.c | 11 ++++--- server/core/poll.c | 64 ++++++++++++++++++++++++--------------- 3 files changed, 47 insertions(+), 43 deletions(-) diff --git a/log_manager/log_manager.h b/log_manager/log_manager.h index fa4c79903..51f7b2f14 100644 --- a/log_manager/log_manager.h +++ b/log_manager/log_manager.h @@ -83,14 +83,6 @@ typedef struct log_info #define LOG_MAY_BE_ENABLED(id) (((lm_enabled_logfiles_bitmask & id) || \ log_ses_count[id] > 0) ? true : false) -/** - * Execute the given command if specified log is enabled in general or - * if there is at least one session for whom the log is enabled. - */ -#define LOGIF_MAYBE(id,cmd) if (LOG_MAY_BE_ENABLED(id)) \ - { \ - cmd; \ - } /** * Execute the given command if specified log is enabled in general or @@ -101,13 +93,6 @@ typedef struct log_info cmd; \ } -#if !defined(LOGIF) -#define LOGIF(id,cmd) if (lm_enabled_logfiles_bitmask & id) \ - { \ - cmd; \ - } -#endif - /** * UNINIT means zeroed memory buffer allocated for the struct. * INIT means that struct members may have values, and memory may diff --git a/server/core/dcb.c b/server/core/dcb.c index 7dafccfd9..22d1b7b87 100644 --- a/server/core/dcb.c +++ b/server/core/dcb.c @@ -628,10 +628,13 @@ dcb_process_victim_queue(DCB *listofdcb) #endif /* FAKE_CODE */ } } - LOGIF_MAYBE(LT, (dcb_get_ses_log_info( - dcb, - &tls_log_info.li_sesid, - &tls_log_info.li_enabled_logs))); + + if (LOG_MAY_BE_ENABLED(LOGFILE_TRACE)) + { + dcb_get_ses_log_info(dcb, + &tls_log_info.li_sesid, + &tls_log_info.li_enabled_logs); + } dcb->state = DCB_STATE_DISCONNECTED; nextdcb = dcb->memdata.next; diff --git a/server/core/poll.c b/server/core/poll.c index a88405029..0869b63f8 100644 --- a/server/core/poll.c +++ b/server/core/poll.c @@ -880,10 +880,13 @@ unsigned long qtime; if (eno == 0) { atomic_add(&pollStats.n_write, 1); /** Read session id to thread's local storage */ - LOGIF_MAYBE(LT, (dcb_get_ses_log_info( - dcb, - &tls_log_info.li_sesid, - &tls_log_info.li_enabled_logs))); + if (LOG_MAY_BE_ENABLED(LOGFILE_TRACE)) + { + dcb_get_ses_log_info(dcb, + &tls_log_info.li_sesid, + &tls_log_info.li_enabled_logs); + } + if (poll_dcb_session_check(dcb, "write_ready")) { dcb->func.write_ready(dcb); @@ -914,10 +917,14 @@ unsigned long qtime; dcb->fd))); atomic_add( &pollStats.n_accept, 1); - LOGIF_MAYBE(LT, (dcb_get_ses_log_info( - dcb, - &tls_log_info.li_sesid, - &tls_log_info.li_enabled_logs))); + + if (LOG_MAY_BE_ENABLED(LOGFILE_TRACE)) + { + dcb_get_ses_log_info(dcb, + &tls_log_info.li_sesid, + &tls_log_info.li_enabled_logs); + } + if (poll_dcb_session_check(dcb, "accept")) { dcb->func.accept(dcb); @@ -934,10 +941,13 @@ unsigned long qtime; dcb->fd))); atomic_add(&pollStats.n_read, 1); /** Read session id to thread's local storage */ - LOGIF_MAYBE(LT, (dcb_get_ses_log_info( - dcb, - &tls_log_info.li_sesid, - &tls_log_info.li_enabled_logs))); + if (LOG_MAY_BE_ENABLED(LOGFILE_TRACE)) + { + dcb_get_ses_log_info(dcb, + &tls_log_info.li_sesid, + &tls_log_info.li_enabled_logs); + } + if (poll_dcb_session_check(dcb, "read")) { dcb->func.read(dcb); @@ -974,10 +984,12 @@ unsigned long qtime; } atomic_add(&pollStats.n_error, 1); /** Read session id to thread's local storage */ - LOGIF_MAYBE(LT, (dcb_get_ses_log_info( - dcb, - &tls_log_info.li_sesid, - &tls_log_info.li_enabled_logs))); + if (LOG_MAY_BE_ENABLED(LOGFILE_TRACE)) + { + dcb_get_ses_log_info(dcb, + &tls_log_info.li_sesid, + &tls_log_info.li_enabled_logs); + } if (poll_dcb_session_check(dcb, "error")) { dcb->func.error(dcb); @@ -1006,10 +1018,12 @@ unsigned long qtime; dcb->flags |= DCBF_HUNG; spinlock_release(&dcb->dcb_initlock); /** Read session id to thread's local storage */ - LOGIF_MAYBE(LT, (dcb_get_ses_log_info( - dcb, - &tls_log_info.li_sesid, - &tls_log_info.li_enabled_logs))); + if (LOG_MAY_BE_ENABLED(LOGFILE_TRACE)) + { + dcb_get_ses_log_info(dcb, + &tls_log_info.li_sesid, + &tls_log_info.li_enabled_logs); + } if (poll_dcb_session_check(dcb, "hangup EPOLLHUP")) { dcb->func.hangup(dcb); @@ -1042,10 +1056,12 @@ unsigned long qtime; dcb->flags |= DCBF_HUNG; spinlock_release(&dcb->dcb_initlock); /** Read session id to thread's local storage */ - LOGIF_MAYBE(LT, (dcb_get_ses_log_info( - dcb, - &tls_log_info.li_sesid, - &tls_log_info.li_enabled_logs))); + if (LOG_MAY_BE_ENABLED(LOGFILE_TRACE)) + { + dcb_get_ses_log_info(dcb, + &tls_log_info.li_sesid, + &tls_log_info.li_enabled_logs); + } if (poll_dcb_session_check(dcb, "hangup EPOLLRDHUP")) { dcb->func.hangup(dcb);