X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fevent_client.h;h=9ed142eeb874f37b5bcf2eb0a43a8803933523d9;hb=ef347e598ab670b87e178af7fc6b00795494303a;hp=2d5ab986161d1a7a85de628b766d2dec5f2fec29;hpb=b1493ab199a2cf39b919cb8d0536263ae1d280aa;p=citadel.git

diff --git a/citadel/event_client.h b/citadel/event_client.h
index 2d5ab9861..9ed142eeb 100644
--- a/citadel/event_client.h
+++ b/citadel/event_client.h
@@ -179,51 +179,52 @@ typedef struct _IOAddHandler {
 	IO_CallBack EvAttch;
 } IOAddHandler;
 
+
+
+extern int DebugEventLoop;
+extern int DebugCAres;
+
+#define EDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (DebugEventLoop != 0))
+
 #define CCID ((CitContext*)IO->CitContext)->cs_pid
 
 #define EV_syslog(LEVEL, FORMAT, ...) \
-	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) \
-	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, ...) \
-	syslog(LEVEL, "IO[%ld]" FORMAT, IO->ID, __VA_ARGS__)
+	EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]" FORMAT, IO->ID, __VA_ARGS__)
 
-#define EVNCM_syslog(LEVEL, FORMAT) syslog(LEVEL, "IO[%ld]" FORMAT, IO->ID)
+#define EVNCM_syslog(LEVEL, FORMAT) EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]" FORMAT, IO->ID)
 
-#ifdef DEBUG_CARES
+
+#define CDBGLOG() if (DebugCAres != 0)
 #define EV_DNS_LOG_START(a)							\
-	syslog(LOG_DEBUG, "IO[%ld]CC[%d] + Starting " #a " %p FD %d", IO->ID, CCID, &IO->a, IO->a.fd); \
-	EV_backtrace(IO);
+	CDBGLOG () {syslog(LOG_DEBUG, "IO[%ld]CC[%d] + Starting " #a " %p FD %d", IO->ID, CCID, &IO->a, IO->a.fd); \
+		    EV_backtrace(IO);}
 
 #define EV_DNS_LOG_STOP(a)							\
-	syslog(LOG_DEBUG, "IO[%ld]CC[%d] - Stopping " #a " %p FD %d", IO->ID, CCID, &IO->a, IO->a.fd); \
-	EV_backtrace(IO);
+	CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] - Stopping " #a " %p FD %d", IO->ID, CCID, &IO->a, IO->a.fd); \
+		     EV_backtrace(IO);}
 
 #define EV_DNS_LOG_INIT(a)							\
-	syslog(LOG_DEBUG, "IO[%ld]CC[%d] * Init " #a " %p FD %d", IO->ID, CCID, &IO->a, IO->a.fd); \
-	EV_backtrace(IO);
+	CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] * Init " #a " %p FD %d", IO->ID, CCID, &IO->a, IO->a.fd); \
+		     EV_backtrace(IO);}
 
 #define EV_DNS_LOGT_START(a)							\
-	syslog(LOG_DEBUG, "IO[%ld]CC[%d] + Starting " #a " %p", IO->ID, CCID, &IO->a); \
-	EV_backtrace(IO);
+	CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] + Starting " #a " %p", IO->ID, CCID, &IO->a); \
+		     EV_backtrace(IO);}
 
 #define EV_DNS_LOGT_STOP(a)							\
-	syslog(LOG_DEBUG, "IO[%ld]CC[%d] - Stopping " #a " %p", IO->ID, CCID, &IO->a); \
-	EV_backtrace(IO);
+	CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] - Stopping " #a " %p", IO->ID, CCID, &IO->a); \
+		     EV_backtrace(IO); }
 
 #define EV_DNS_LOGT_INIT(a)							\
-	syslog(LOG_DEBUG, "IO[%ld]CC[%d] * Init " #a " %p", IO->ID, CCID, &IO->a); \
-	EV_backtrace(IO);
-#else
-#define EV_DNS_LOG_START(a)
-#define EV_DNS_LOG_STOP(a)
-#define EV_DNS_LOG_INIT(a)
-#define EV_DNS_LOGT_START(a)
-#define EV_DNS_LOGT_STOP(a)
-#define EV_DNS_LOGT_INIT(a)
-#endif
+	CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] * Init " #a " %p", IO->ID, CCID, &IO->a); \
+		     EV_backtrace(IO);}
+
 
 void FreeAsyncIOContents(AsyncIO *IO);