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

LOGIF_MAYBE macros cleaned away.

Browse Source 
Used in few places and only obscured what was going on.
This commit is contained in:
Johan Wikman
2015-11-13 14:26:43 +02:00
parent 8d0bd8150a
commit 86dcd1cc0f
3 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
log_manager/log_manager.h
View File

@ -83,14 +83,6 @@ typedef struct log_info
#define LOG_MAY_BE_ENABLED(id) (((lm_enabled_logfiles_bitmask & id) || \ #define LOG_MAY_BE_ENABLED(id) (((lm_enabled_logfiles_bitmask & id) || \
log_ses_count[id] > 0) ? true : false) 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 * Execute the given command if specified log is enabled in general or
@ -101,13 +93,6 @@ typedef struct log_info
cmd; \ 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. * UNINIT means zeroed memory buffer allocated for the struct.
* INIT means that struct members may have values, and memory may * INIT means that struct members may have values, and memory may

11
server/core/dcb.c
View File

@ -628,10 +628,13 @@ dcb_process_victim_queue(DCB *listofdcb)
#endif /* FAKE_CODE */ #endif /* FAKE_CODE */
} }
} }
LOGIF_MAYBE(LT, (dcb_get_ses_log_info(
dcb, if (LOG_MAY_BE_ENABLED(LOGFILE_TRACE))
&tls_log_info.li_sesid, {
&tls_log_info.li_enabled_logs))); dcb_get_ses_log_info(dcb,
&tls_log_info.li_sesid,
&tls_log_info.li_enabled_logs);
}
dcb->state = DCB_STATE_DISCONNECTED; dcb->state = DCB_STATE_DISCONNECTED;
nextdcb = dcb->memdata.next; nextdcb = dcb->memdata.next;

64
server/core/poll.c
View File

@ -880,10 +880,13 @@ unsigned long qtime;
if (eno == 0) { if (eno == 0) {
atomic_add(&pollStats.n_write, 1); atomic_add(&pollStats.n_write, 1);
/** Read session id to thread's local storage */ /** Read session id to thread's local storage */
LOGIF_MAYBE(LT, (dcb_get_ses_log_info( if (LOG_MAY_BE_ENABLED(LOGFILE_TRACE))
dcb, {
&tls_log_info.li_sesid, dcb_get_ses_log_info(dcb,
&tls_log_info.li_enabled_logs))); &tls_log_info.li_sesid,
&tls_log_info.li_enabled_logs);
}
if (poll_dcb_session_check(dcb, "write_ready")) if (poll_dcb_session_check(dcb, "write_ready"))
{ {
dcb->func.write_ready(dcb); dcb->func.write_ready(dcb);
@ -914,10 +917,14 @@ unsigned long qtime;
dcb->fd))); dcb->fd)));
atomic_add( atomic_add(
&pollStats.n_accept, 1); &pollStats.n_accept, 1);
LOGIF_MAYBE(LT, (dcb_get_ses_log_info(
dcb, if (LOG_MAY_BE_ENABLED(LOGFILE_TRACE))
&tls_log_info.li_sesid, {
&tls_log_info.li_enabled_logs))); dcb_get_ses_log_info(dcb,
&tls_log_info.li_sesid,
&tls_log_info.li_enabled_logs);
}
if (poll_dcb_session_check(dcb, "accept")) if (poll_dcb_session_check(dcb, "accept"))
{ {
dcb->func.accept(dcb); dcb->func.accept(dcb);
@ -934,10 +941,13 @@ unsigned long qtime;
dcb->fd))); dcb->fd)));
atomic_add(&pollStats.n_read, 1); atomic_add(&pollStats.n_read, 1);
/** Read session id to thread's local storage */ /** Read session id to thread's local storage */
LOGIF_MAYBE(LT, (dcb_get_ses_log_info( if (LOG_MAY_BE_ENABLED(LOGFILE_TRACE))
dcb, {
&tls_log_info.li_sesid, dcb_get_ses_log_info(dcb,
&tls_log_info.li_enabled_logs))); &tls_log_info.li_sesid,
&tls_log_info.li_enabled_logs);
}
if (poll_dcb_session_check(dcb, "read")) if (poll_dcb_session_check(dcb, "read"))
{ {
dcb->func.read(dcb); dcb->func.read(dcb);
@ -974,10 +984,12 @@ unsigned long qtime;
} }
atomic_add(&pollStats.n_error, 1); atomic_add(&pollStats.n_error, 1);
/** Read session id to thread's local storage */ /** Read session id to thread's local storage */
LOGIF_MAYBE(LT, (dcb_get_ses_log_info( if (LOG_MAY_BE_ENABLED(LOGFILE_TRACE))
dcb, {
&tls_log_info.li_sesid, dcb_get_ses_log_info(dcb,
&tls_log_info.li_enabled_logs))); &tls_log_info.li_sesid,
&tls_log_info.li_enabled_logs);
}
if (poll_dcb_session_check(dcb, "error")) if (poll_dcb_session_check(dcb, "error"))
{ {
dcb->func.error(dcb); dcb->func.error(dcb);
@ -1006,10 +1018,12 @@ unsigned long qtime;
dcb->flags |= DCBF_HUNG; dcb->flags |= DCBF_HUNG;
spinlock_release(&dcb->dcb_initlock); spinlock_release(&dcb->dcb_initlock);
/** Read session id to thread's local storage */ /** Read session id to thread's local storage */
LOGIF_MAYBE(LT, (dcb_get_ses_log_info( if (LOG_MAY_BE_ENABLED(LOGFILE_TRACE))
dcb, {
&tls_log_info.li_sesid, dcb_get_ses_log_info(dcb,
&tls_log_info.li_enabled_logs))); &tls_log_info.li_sesid,
&tls_log_info.li_enabled_logs);
}
if (poll_dcb_session_check(dcb, "hangup EPOLLHUP")) if (poll_dcb_session_check(dcb, "hangup EPOLLHUP"))
{ {
dcb->func.hangup(dcb); dcb->func.hangup(dcb);
@ -1042,10 +1056,12 @@ unsigned long qtime;
dcb->flags |= DCBF_HUNG; dcb->flags |= DCBF_HUNG;
spinlock_release(&dcb->dcb_initlock); spinlock_release(&dcb->dcb_initlock);
/** Read session id to thread's local storage */ /** Read session id to thread's local storage */
LOGIF_MAYBE(LT, (dcb_get_ses_log_info( if (LOG_MAY_BE_ENABLED(LOGFILE_TRACE))
dcb, {
&tls_log_info.li_sesid, dcb_get_ses_log_info(dcb,
&tls_log_info.li_enabled_logs))); &tls_log_info.li_sesid,
&tls_log_info.li_enabled_logs);
}
if (poll_dcb_session_check(dcb, "hangup EPOLLRDHUP")) if (poll_dcb_session_check(dcb, "hangup EPOLLRDHUP"))
{ {
dcb->func.hangup(dcb); dcb->func.hangup(dcb);