X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fevent_client.h;h=320beb746cb3a6e7d72e53e6a399050261030ef2;hb=b6b7232c3d43b56d6606eecd9ae84a396ba8ff25;hp=66f7f42e1782d0deb42594e8f9687d3db73e7594;hpb=51df62c4732353701b6e7ef05ba586be054fa92d;p=citadel.git

diff --git a/citadel/event_client.h b/citadel/event_client.h
index 66f7f42e1..320beb746 100644
--- a/citadel/event_client.h
+++ b/citadel/event_client.h
@@ -100,12 +100,12 @@ typedef struct _evcurl_request_data
 
 /* DNS Related */
 typedef struct __evcares_data {
+	ev_tstamp Start;
 	ev_io recv_event,
 		send_event;
 	ev_timer timeout;           /* timeout while requesting ips */
-#ifdef DEBUG_CARES
 	short int SourcePort;
-#endif
+
 	struct ares_options Options;
 	ares_channel Channel;
 	DNSQueryParts *Query;
@@ -115,6 +115,9 @@ typedef struct __evcares_data {
 
 struct AsyncIO {
 	long ID;
+	ev_tstamp Now;
+	ev_tstamp StartIO;
+	ev_tstamp StartDB;
 	eNextState NextState;
 
 	/* connection related */
@@ -146,6 +149,7 @@ struct AsyncIO {
 	IO_CallBack ReadDone, /* Theres new data to read... */
 		SendDone,     /* we may send more data */
 		Terminate,    /* shutting down... */
+		DBTerminate,  /* shutting down... */
 		Timeout,      /* Timeout handler;may also be conn. timeout */
 		ConnFail,     /* What to do when one connection failed? */
 		ShutdownAbort,/* we're going down. make your piece. */
@@ -174,56 +178,70 @@ 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__)
+#define EVQ_syslog(LEVEL, FORMAT, ...)					\
+	EDBGLOG (LEVEL) syslog(LEVEL, "IOQ " FORMAT, __VA_ARGS__)
+
+#define EVQM_syslog(LEVEL, FORMAT)			\
+	EDBGLOG (LEVEL) syslog(LEVEL, "IO " FORMAT)
+
+#define EV_syslog(LEVEL, FORMAT, ...)					\
+	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)
+#define EVM_syslog(LEVEL, FORMAT)					\
+	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__)
+#define EVNC_syslog(LEVEL, FORMAT, ...)					\
+	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 CEDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (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 " %s %p FD %d", IO->ID, CCID, __FUNCTION__, &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 " %s %p FD %d", IO->ID, CCID, __FUNCTION__, &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 " %s %p FD %d", IO->ID, CCID, __FUNCTION__, &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 " %s %p", IO->ID, CCID, __FUNCTION__, &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 " %s %p", IO->ID, CCID, __FUNCTION__, &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);}
+
+#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);
 
 eNextState NextDBOperation(AsyncIO *IO, IO_CallBack CB);
 eNextState QueueDBOperation(AsyncIO *IO, IO_CallBack CB);
+void StopDBWatchers(AsyncIO *IO);
 eNextState QueueEventContext(AsyncIO *IO, IO_CallBack CB);
 eNextState QueueCurlContext(AsyncIO *IO);
 
@@ -248,19 +266,17 @@ void QueryCbDone(AsyncIO *IO);
 
 void StopClient(AsyncIO *IO);
 
-void StopClientWatchers(AsyncIO *IO);
+void StopClientWatchers(AsyncIO *IO, int CloseFD);
 
 void SetNextTimeout(AsyncIO *IO, double timeout);
 
-void InitC_ares_dns(AsyncIO *IO);
-
 #include <curl/curl.h>
 
 #define OPT(s, v) \
 	do { \
 		sta = curl_easy_setopt(chnd, (CURLOPT_##s), (v));	\
 		if (sta)  {						\
-			syslog(LOG_ERR,				\
+			EVQ_syslog(LOG_ERR,				\
 			       "error setting option " #s		\
 			       " on curl handle: %s",			\
 			       curl_easy_strerror(sta));		\
@@ -274,6 +290,7 @@ void InitIOStruct(AsyncIO *IO,
 		  IO_CallBack SendDone,
 		  IO_CallBack ReadDone,
 		  IO_CallBack Terminate,
+		  IO_CallBack DBTerminate,
 		  IO_CallBack ConnFail,
 		  IO_CallBack Timeout,
 		  IO_CallBack ShutdownAbort);
@@ -283,12 +300,17 @@ int InitcURLIOStruct(AsyncIO *IO,
 		     const char* Desc,
 		     IO_CallBack SendDone,
 		     IO_CallBack Terminate,
+		     IO_CallBack DBTerminate,
 		     IO_CallBack ShutdownAbort);
 
+void StopCurlWatchers(AsyncIO *IO);
+
+
 eNextState ReAttachIO(AsyncIO *IO,
 		      void *pData,
 		      int ReadFirst);
 
 void EV_backtrace(AsyncIO *IO);
+ev_tstamp ctdl_ev_now (void);
 
 #endif /* __EVENT_CLIENT_H__ */