X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Feventclient%2Fserv_eventclient.c;h=e08a39f284b08917421e1d424f466f8551829187;hb=9563ce7303d1d0d20b963d643f9afc06b53c8e4d;hp=d54d72947ee99fd26fef456cad530c537e351aa7;hpb=6a61899af576a26fc4dc52e883b8e5184c9c5213;p=citadel.git

diff --git a/citadel/modules/eventclient/serv_eventclient.c b/citadel/modules/eventclient/serv_eventclient.c
index d54d72947..e08a39f28 100644
--- a/citadel/modules/eventclient/serv_eventclient.c
+++ b/citadel/modules/eventclient/serv_eventclient.c
@@ -147,6 +147,7 @@ gotstatus(int nnrun)
 					      IO);
 				continue;
 			}
+			SetEVState(IO, eCurlGotStatus);
 
 			EVCURLM_syslog(LOG_DEBUG, "request complete\n");
 
@@ -186,7 +187,7 @@ gotstatus(int nnrun)
 					      "%s\n",
 					      curl_multi_strerror(msta));
 
-		       ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
+			ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
 
 			IO->HttpReq.attached = 0;
 			switch(IO->SendDone(IO))
@@ -272,9 +273,11 @@ got_out(struct ev_loop *loop, ev_io *ioev, int events)
 }
 
 static size_t
-gotdata(void *data, size_t size, size_t nmemb, void *cglobal) {
+gotdata(void *data, size_t size, size_t nmemb, void *cglobal)
+{
 	AsyncIO *IO = (AsyncIO*) cglobal;
 
+	SetEVState(IO, eCurlGotData);
 	if (IO->HttpReq.ReplyData == NULL)
 	{
 		IO->HttpReq.ReplyData = NewStrBufPlain(NULL, SIZ);
@@ -323,6 +326,7 @@ gotwatchsock(CURL *easy,
 			return -1;
 		}
 		IO = (AsyncIO *) f;
+		SetEVState(IO, eCurlNewIO);
 		EVCURL_syslog(LOG_DEBUG,
 			      "EVCURL: got socket for URL: %s\n",
 			      IO->ConnectMe->PlainUrl);
@@ -338,6 +342,7 @@ gotwatchsock(CURL *easy,
 		curl_multi_assign(mhnd, fd, IO);
 	}
 
+	SetEVState(IO, eCurlGotIO);
 	IO->Now = ev_now(event_base);
 
 	Action = "";
@@ -495,6 +500,8 @@ static void IOcurl_abort_shutdown_callback(struct ev_loop *loop,
 
 	if (IO == NULL)
 		return;
+
+	SetEVState(IO, eCurlShutdown);
 	IO->Now = ev_now(event_base);
 	EVCURL_syslog(LOG_DEBUG, "EVENT Curl: %s\n", __FUNCTION__);
 
@@ -523,6 +530,7 @@ evcurl_handle_start(AsyncIO *IO)
 	CURLcode sta;
 	CURL *chnd;
 
+	SetEVState(IO, eCurlStart);
 	chnd = IO->HttpReq.chnd;
 	EVCURL_syslog(LOG_DEBUG,
 		  "EVCURL: Loading URL: %s\n", IO->ConnectMe->PlainUrl);
@@ -593,6 +601,7 @@ pthread_mutex_t EventExitQueueMutex; /* locks the access to the event queue poin
 HashList *QueueEvents = NULL;
 HashList *InboundEventQueue = NULL;
 HashList *InboundEventQueues[2] = { NULL, NULL };
+extern void ShutDownCLient(AsyncIO *IO);
 
 ev_async AddJob;
 ev_async ExitEventLoop;
@@ -630,11 +639,31 @@ static void QueueEventAddCallback(EV_P_ ev_async *w, int revents)
 		if (h->IO->StartIO == 0.0)
 			h->IO->StartIO = Now;
 
+		SetEVState(h->IO, eIOAttach);
+
 		Ctx = h->IO->CitContext;
 		become_session(Ctx);
 
 		h->IO->Now = Now;
-		h->EvAttch(h->IO);
+		switch (h->EvAttch(h->IO))
+		{
+		case eReadMore:
+		case eReadMessage:
+		case eReadFile:
+		case eSendReply:
+		case eSendMore:
+		case eReadPayload:
+		case eSendFile:
+		case eDBQuery:
+		case eSendDNSQuery:
+		case eReadDNSReply:
+		case eConnect:
+			break;
+		case eTerminateConnection:
+		case eAbort:
+			ShutDownCLient(h->IO);
+		break;
+		}
 	}
 	DeleteHashPos(&It);
 	DeleteHashContent(&q);
@@ -760,6 +789,7 @@ static void DBQueueEventAddCallback(EV_P_ ev_async *w, int revents)
 			h->IO->StartDB = Now;
 		h->IO->Now = Now;
 
+		SetEVState(h->IO, eDBAttach);
 		Ctx = h->IO->CitContext;
 		become_session(Ctx);
 		ev_cleanup_start(event_db, &h->IO->db_abort_by_shutdown);