X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Feventclient%2Fserv_eventclient.c;h=97e217de9dd43c6ca3b9e171a47970b36dacaa5a;hb=72a4e9f304cff9f487b334f0d70f09142fee4183;hp=dd3c4d403bb1fc1c8f66d7b4199d2323e38fcd31;hpb=cdc34fa661ed54fdcebf86521496220cc28f4943;p=citadel.git

diff --git a/citadel/modules/eventclient/serv_eventclient.c b/citadel/modules/eventclient/serv_eventclient.c
index dd3c4d403..97e217de9 100644
--- a/citadel/modules/eventclient/serv_eventclient.c
+++ b/citadel/modules/eventclient/serv_eventclient.c
@@ -60,6 +60,8 @@
 #include "serv_curl.h"
 
 ev_loop *event_base;
+int DebugEventLoop = 0;
+int DebugCurl = 0;
 
 long EvIDSource = 1;
 /*****************************************************************************
@@ -121,6 +123,8 @@ gotstatus(int nnrun)
 				       curl_easy_strerror(sta));
 			IO = (AsyncIO *)chandle;
 
+			IO->Now = ev_now(event_base);
+
 			ev_io_stop(event_base, &IO->recv_event);
 			ev_io_stop(event_base, &IO->send_event);
 
@@ -248,6 +252,7 @@ gotdata(void *data, size_t size, size_t nmemb, void *cglobal) {
 	{
 		IO->HttpReq.ReplyData = NewStrBufPlain(NULL, SIZ);
 	}
+	IO->Now = ev_now(event_base);
 	return CurlFillStrBuf_callback(data,
 				       size,
 				       nmemb,
@@ -306,6 +311,8 @@ gotwatchsock(CURL *easy,
 		curl_multi_assign(mhnd, fd, IO);
 	}
 
+	IO->Now = ev_now(event_base);
+
 	Action = "";
 	switch (action)
 	{
@@ -458,6 +465,7 @@ static void IOcurl_abort_shutdown_callback(struct ev_loop *loop,
 {
 	CURLMcode msta;
 	AsyncIO *IO = watcher->data;
+	IO->Now = ev_now(event_base);
 	EV_syslog(LOG_DEBUG, "EVENT Curl: %s\n", __FUNCTION__);
 
 	curl_slist_free_all(IO->HttpReq.headers);
@@ -559,6 +567,7 @@ ev_async ExitEventLoop;
 
 static void QueueEventAddCallback(EV_P_ ev_async *w, int revents)
 {
+	ev_tstamp Now;
 	HashList *q;
 	void *v;
 	HashPos*It;
@@ -577,13 +586,17 @@ static void QueueEventAddCallback(EV_P_ ev_async *w, int revents)
 		q = InboundEventQueues[1];
 	}
 	pthread_mutex_unlock(&EventQueueMutex);
-
+	Now = ev_now (event_base);
 	It = GetNewHashPos(q, 0);
 	while (GetNextHashPos(q, It, &len, &Key, &v))
 	{
 		IOAddHandler *h = v;
-		if (h->IO->ID == 0)
+		if (h->IO->ID == 0) {
 			h->IO->ID = EvIDSource++;
+		}
+		if (h->IO->StartIO == 0.0)
+			h->IO->StartIO = Now;
+		h->IO->Now = Now;
 		h->EvAttch(h->IO);
 	}
 	DeleteHashPos(&It);
@@ -687,6 +700,7 @@ extern void ShutDownDBCLient(AsyncIO *IO);
 
 static void DBQueueEventAddCallback(EV_P_ ev_async *w, int revents)
 {
+	ev_tstamp Now;
 	HashList *q;
 	void *v;
 	HashPos *It;
@@ -706,6 +720,7 @@ static void DBQueueEventAddCallback(EV_P_ ev_async *w, int revents)
 	}
 	pthread_mutex_unlock(&DBEventQueueMutex);
 
+	Now = ev_now (event_db);
 	It = GetNewHashPos(q, 0);
 	while (GetNextHashPos(q, It, &len, &Key, &v))
 	{
@@ -713,6 +728,9 @@ static void DBQueueEventAddCallback(EV_P_ ev_async *w, int revents)
 		eNextState rc;
 		if (h->IO->ID == 0)
 			h->IO->ID = EvIDSource++;
+		if (h->IO->StartDB == 0.0)
+			h->IO->StartDB = Now;
+		h->IO->Now = Now;
 		rc = h->EvAttch(h->IO);
 		switch (rc)
 		{
@@ -806,10 +824,22 @@ void ShutDownEventQueues(void)
 	pthread_mutex_unlock(&EventQueueMutex);
 }
 
+void DebugEventloopEnable(void)
+{
+	DebugEventLoop = 1;
+}
+
+void DebugCurlEnable(void)
+{
+	DebugCurl = 1;
+}
+
 CTDL_MODULE_INIT(event_client)
 {
 	if (!threading)
 	{
+		CtdlRegisterDebugFlagHook(HKEY("eventloop"), DebugEventloopEnable);
+		CtdlRegisterDebugFlagHook(HKEY("curl"), DebugCurlEnable);
 		InitEventQueue();
 		DBInitEventQueue();
 		CtdlThreadCreate(client_event_thread);