projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C-ARES: make debug logging completely runtime configurable.
[citadel.git]
/
citadel
/
event_client.h
diff --git
a/citadel/event_client.h
b/citadel/event_client.h
index 7b56f4d286cb2da16e63ce1123e4c36c068e843e..d5c2741e02c027b534463dc9187e62755f182941 100644
(file)
--- a/
citadel/event_client.h
+++ b/
citadel/event_client.h
@@
-104,9
+104,8
@@
typedef struct __evcares_data {
ev_io recv_event,
send_event;
ev_timer timeout; /* timeout while requesting ips */
ev_io recv_event,
send_event;
ev_timer timeout; /* timeout while requesting ips */
-#ifdef DEBUG_CARES
short int SourcePort;
short int SourcePort;
-#endif
+
struct ares_options Options;
ares_channel Channel;
DNSQueryParts *Query;
struct ares_options Options;
ares_channel Channel;
DNSQueryParts *Query;
@@
-188,49
+187,55
@@
extern int DebugCAres;
#define CCID ((CitContext*)IO->CitContext)->cs_pid
#define CCID ((CitContext*)IO->CitContext)->cs_pid
-#define EVQ_syslog(LEVEL, FORMAT, ...) \
+#define EVQ_syslog(LEVEL, FORMAT, ...)
\
EDBGLOG (LEVEL) syslog(LEVEL, "IOQ " FORMAT, __VA_ARGS__)
EDBGLOG (LEVEL) syslog(LEVEL, "IOQ " FORMAT, __VA_ARGS__)
-#define EVQM_syslog(LEVEL, FORMAT) \
+#define EVQM_syslog(LEVEL, FORMAT)
\
EDBGLOG (LEVEL) syslog(LEVEL, "IO " FORMAT)
EDBGLOG (LEVEL) syslog(LEVEL, "IO " FORMAT)
-#define EV_syslog(LEVEL, FORMAT, ...) \
+#define EV_syslog(LEVEL, FORMAT, ...)
\
EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]CC[%d] " FORMAT, IO->ID, CCID, __VA_ARGS__)
EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]CC[%d] " FORMAT, IO->ID, CCID, __VA_ARGS__)
-#define EVM_syslog(LEVEL, FORMAT) \
+#define EVM_syslog(LEVEL, FORMAT)
\
EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]CC[%d] " FORMAT, IO->ID, CCID)
EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]CC[%d] " FORMAT, IO->ID, CCID)
-#define EVNC_syslog(LEVEL, FORMAT, ...) \
+#define EVNC_syslog(LEVEL, FORMAT, ...)
\
EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld] " FORMAT, IO->ID, __VA_ARGS__)
#define EVNCM_syslog(LEVEL, FORMAT) EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]" FORMAT, IO->ID)
#define CDBGLOG() if (DebugCAres != 0)
EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld] " FORMAT, IO->ID, __VA_ARGS__)
#define EVNCM_syslog(LEVEL, FORMAT) EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]" FORMAT, IO->ID)
#define CDBGLOG() if (DebugCAres != 0)
+#define CEDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (DebugCAres != 0))
#define EV_DNS_LOG_START(a) \
#define EV_DNS_LOG_START(a) \
- CDBGLOG () {syslog(LOG_DEBUG, "IO[%ld]CC[%d] + Starting " #a " %
p FD %d", IO->ID, CCID
, &IO->a, IO->a.fd); \
+ CDBGLOG () {syslog(LOG_DEBUG, "IO[%ld]CC[%d] + Starting " #a " %
s %p FD %d", IO->ID, CCID, __FUNCTION__
, &IO->a, IO->a.fd); \
EV_backtrace(IO);}
#define EV_DNS_LOG_STOP(a) \
EV_backtrace(IO);}
#define EV_DNS_LOG_STOP(a) \
- CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] - Stopping " #a " %
p FD %d", IO->ID, CCID
, &IO->a, IO->a.fd); \
+ CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] - Stopping " #a " %
s %p FD %d", IO->ID, CCID, __FUNCTION__
, &IO->a, IO->a.fd); \
EV_backtrace(IO);}
#define EV_DNS_LOG_INIT(a) \
EV_backtrace(IO);}
#define EV_DNS_LOG_INIT(a) \
- CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] * Init " #a " %
p FD %d", IO->ID, CCID
, &IO->a, IO->a.fd); \
+ CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] * Init " #a " %
s %p FD %d", IO->ID, CCID, __FUNCTION__
, &IO->a, IO->a.fd); \
EV_backtrace(IO);}
#define EV_DNS_LOGT_START(a) \
EV_backtrace(IO);}
#define EV_DNS_LOGT_START(a) \
- CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] + Starting " #a " %
p", IO->ID, CCID
, &IO->a); \
+ CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] + Starting " #a " %
s %p", IO->ID, CCID, __FUNCTION__
, &IO->a); \
EV_backtrace(IO);}
#define EV_DNS_LOGT_STOP(a) \
EV_backtrace(IO);}
#define EV_DNS_LOGT_STOP(a) \
- CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] - Stopping " #a " %
p", IO->ID, CCID
, &IO->a); \
+ CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] - Stopping " #a " %
s %p", IO->ID, CCID, __FUNCTION__
, &IO->a); \
EV_backtrace(IO); }
#define EV_DNS_LOGT_INIT(a) \
CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] * Init " #a " %p", IO->ID, CCID, &IO->a); \
EV_backtrace(IO);}
EV_backtrace(IO); }
#define EV_DNS_LOGT_INIT(a) \
CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] * Init " #a " %p", IO->ID, CCID, &IO->a); \
EV_backtrace(IO);}
+#define EV_DNS_syslog(LEVEL, FORMAT, ...) \
+ CEDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]CC[%d] " FORMAT, IO->ID, CCID, __VA_ARGS__)
+
+#define EVM_DNS_syslog(LEVEL, FORMAT) \
+ CEDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]CC[%d] " FORMAT, IO->ID, CCID)
void FreeAsyncIOContents(AsyncIO *IO);
void FreeAsyncIOContents(AsyncIO *IO);