X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fevent_client.c;fp=citadel%2Fevent_client.c;h=fdd66d7ae6c17a1d47d066e5121c87b587c5cee3;hp=90c5e5dd986619f4f9f5426bea3393133a9cb7c1;hb=9563ce7303d1d0d20b963d643f9afc06b53c8e4d;hpb=457dddd9354898c5b9f9937f2ef344504d3fa4b0

diff --git a/citadel/event_client.c b/citadel/event_client.c
index 90c5e5dd9..fdd66d7ae 100644
--- a/citadel/event_client.c
+++ b/citadel/event_client.c
@@ -64,6 +64,48 @@
 #include "event_client.h"
 #include "ctdl_module.h"
 
+
+ConstStr IOStates[] = {
+	{HKEY("DB Queue")},
+	{HKEY("DB Q Next")},
+	{HKEY("DB Attach")},
+	{HKEY("DB Next")},
+	{HKEY("DB Stop")},
+	{HKEY("DB Exit")},
+	{HKEY("DB Terminate")},
+	{HKEY("IO Queue")},
+	{HKEY("IO Attach")},
+	{HKEY("IO Connect Socket")},
+	{HKEY("IO Abort")},
+	{HKEY("IO Timeout")},
+	{HKEY("IO ConnFail")},
+	{HKEY("IO ConnFail Now")},
+	{HKEY("IO Conn Now")},
+	{HKEY("IO Conn Wait")},
+	{HKEY("Curl Q")},
+	{HKEY("Curl Start")},
+	{HKEY("Curl Shotdown")},
+	{HKEY("Curl More IO")},
+	{HKEY("Curl Got IO")},
+	{HKEY("Curl Got Data")},
+	{HKEY("Curl Got Status")},
+	{HKEY("C-Ares Start")},
+	{HKEY("C-Ares IO Done")},
+	{HKEY("C-Ares Finished")},
+	{HKEY("C-Ares exit")},
+	{HKEY("Killing")},
+	{HKEY("Exit")}
+};
+
+void SetEVState(AsyncIO *IO, eIOState State)
+{
+
+	CitContext* CCC = IO->CitContext;
+	memcpy(CCC->lastcmdname, IOStates[State].Key, IOStates[State].len + 1);
+
+}
+
+
 static void IO_Timeout_callback(struct ev_loop *loop, ev_timer *watcher, int revents);
 static void IO_abort_shutdown_callback(struct ev_loop *loop,
 				       ev_cleanup *watcher,
@@ -86,6 +128,7 @@ eNextState QueueDBOperation(AsyncIO *IO, IO_CallBack CB)
 	IOAddHandler *h;
 	int i;
 
+	SetEVState(IO, eDBQ);
 	h = (IOAddHandler*)malloc(sizeof(IOAddHandler));
 	h->IO = IO;
 	h->EvAttch = CB;
@@ -122,6 +165,7 @@ eNextState QueueDBOperation(AsyncIO *IO, IO_CallBack CB)
 
 void StopDBWatchers(AsyncIO *IO)
 {
+	SetEVState(IO, eDBStop);
 	ev_cleanup_stop(event_db, &IO->db_abort_by_shutdown);
 	ev_idle_stop(event_db, &IO->db_unwind_stack);
 }
@@ -131,6 +175,7 @@ void ShutDownDBCLient(AsyncIO *IO)
 	CitContext *Ctx =IO->CitContext;
 	become_session(Ctx);
 
+	SetEVState(IO, eDBTerm);
 	EVM_syslog(LOG_DEBUG, "DBEVENT Terminating.\n");
 	StopDBWatchers(IO);
 
@@ -142,6 +187,8 @@ void
 DB_PerformNext(struct ev_loop *loop, ev_idle *watcher, int revents)
 {
 	AsyncIO *IO = watcher->data;
+
+	SetEVState(IO, eDBNext);
 	IO->Now = ev_now(event_db);
 	EV_syslog(LOG_DEBUG, "%s()", __FUNCTION__);
 	become_session(IO->CitContext);
@@ -175,6 +222,7 @@ DB_PerformNext(struct ev_loop *loop, ev_idle *watcher, int revents)
 
 eNextState NextDBOperation(AsyncIO *IO, IO_CallBack CB)
 {
+	SetEVState(IO, eQDBNext);
 	IO->NextDBOperation = CB;
 	ev_idle_init(&IO->db_unwind_stack,
 		     DB_PerformNext);
@@ -199,6 +247,8 @@ static void IO_abort_shutdown_callback(struct ev_loop *loop,
 				       int revents)
 {
 	AsyncIO *IO = watcher->data;
+
+	SetEVState(IO, eIOAbort);
 	EV_syslog(LOG_DEBUG, "EVENT Q: %s\n", __FUNCTION__);
 	IO->Now = ev_now(event_base);
 	assert(IO->ShutdownAbort);
@@ -211,6 +261,7 @@ eNextState QueueEventContext(AsyncIO *IO, IO_CallBack CB)
 	IOAddHandler *h;
 	int i;
 
+	SetEVState(IO, eIOQ);
 	h = (IOAddHandler*)malloc(sizeof(IOAddHandler));
 	h->IO = IO;
 	h->EvAttch = CB;
@@ -250,6 +301,7 @@ eNextState QueueCurlContext(AsyncIO *IO)
 	IOAddHandler *h;
 	int i;
 
+	SetEVState(IO, eCurlQ);
 	h = (IOAddHandler*)malloc(sizeof(IOAddHandler));
 	h->IO = IO;
 	h->EvAttch = evcurl_handle_start;
@@ -342,6 +394,8 @@ void StopCurlWatchers(AsyncIO *IO)
 void ShutDownCLient(AsyncIO *IO)
 {
 	CitContext *Ctx =IO->CitContext;
+
+	SetEVState(IO, eExit);
 	become_session(Ctx);
 
 	EVM_syslog(LOG_DEBUG, "EVENT Terminating \n");
@@ -642,6 +696,7 @@ IO_Timeout_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
 {
 	AsyncIO *IO = watcher->data;
 
+	SetEVState(IO, eIOTimeout);
 	IO->Now = ev_now(event_base);
 	ev_timer_stop (event_base, &IO->rw_timeout);
 	become_session(IO->CitContext);
@@ -670,6 +725,7 @@ IO_connfail_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
 {
 	AsyncIO *IO = watcher->data;
 
+	SetEVState(IO, eIOConnfail);
 	IO->Now = ev_now(event_base);
 	ev_timer_stop (event_base, &IO->conn_fail);
 
@@ -702,6 +758,7 @@ IO_connfailimmediate_callback(struct ev_loop *loop,
 {
 	AsyncIO *IO = watcher->data;
 
+	SetEVState(IO, eIOConnfailNow);
 	IO->Now = ev_now(event_base);
 	ev_idle_stop (event_base, &IO->conn_fail_immediate);
 
@@ -731,6 +788,7 @@ IO_connestd_callback(struct ev_loop *loop, ev_io *watcher, int revents)
         socklen_t       lon = sizeof(so_err);
         int             err;
 
+	SetEVState(IO, eIOConnNow);
         IO->Now = ev_now(event_base);
         EVM_syslog(LOG_DEBUG, "connect() succeeded.\n");
 
@@ -844,6 +902,8 @@ void
 IO_postdns_callback(struct ev_loop *loop, ev_idle *watcher, int revents)
 {
 	AsyncIO *IO = watcher->data;
+
+	SetEVState(IO, eCaresFinished);
 	IO->Now = ev_now(event_base);
 	EV_syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
 	become_session(IO->CitContext);
@@ -874,6 +934,7 @@ eNextState EvConnectSock(AsyncIO *IO,
 	int fdflags;
 	int rc = -1;
 
+	SetEVState(IO, eIOConnectSock);
 	become_session(IO->CitContext);
 
 	if (ReadFirst) {
@@ -976,11 +1037,13 @@ eNextState EvConnectSock(AsyncIO *IO,
 	}
 
 	if (rc >= 0){
+		SetEVState(IO, eIOConnNow);
 		EV_syslog(LOG_DEBUG, "connect() = %d immediate success.\n", IO->SendBuf.fd);
 		set_start_callback(event_base, IO, 0);
 		return IO->NextState;
 	}
 	else if (errno == EINPROGRESS) {
+		SetEVState(IO, eIOConnWait);
 		EV_syslog(LOG_DEBUG, "connect() = %d have to wait now.\n", IO->SendBuf.fd);
 
 		ev_io_init(&IO->conn_event,
@@ -995,6 +1058,7 @@ eNextState EvConnectSock(AsyncIO *IO,
 		return IO->NextState;
 	}
 	else {
+		SetEVState(IO, eIOConnfail);
 		ev_idle_init(&IO->conn_fail_immediate,
 			     IO_connfailimmediate_callback);
 		IO->conn_fail_immediate.data = IO;
@@ -1024,6 +1088,7 @@ eNextState ReAttachIO(AsyncIO *IO,
 		      void *pData,
 		      int ReadFirst)
 {
+	SetEVState(IO, eIOAttach);
 	IO->Data = pData;
 	become_session(IO->CitContext);
 	ev_cleanup_start(event_base, &IO->abort_by_shutdown);
@@ -1136,6 +1201,8 @@ eNextState KillOtherContextNow(AsyncIO *IO)
 {
 	KillOtherSessionContext *Ctx = IO->Data;
 
+	SetEVState(IO, eKill);
+
 	if (Ctx->OtherOne->ShutdownAbort != NULL)
 		Ctx->OtherOne->ShutdownAbort(Ctx->OtherOne);
 	return eTerminateConnection;