Add timeout facility for event contexts

[citadel.git] / citadel / modules / eventclient / serv_eventclient.c

diff --git a/citadel/modules/eventclient/serv_eventclient.c b/citadel/modules/eventclient/serv_eventclient.c
index d0951eea8949352f83938672c83802694ed2a776..2260446a29671af6db5cb85f81065629f7817a0f 100644 (file)
--- a/citadel/modules/eventclient/serv_eventclient.c
+++ b/citadel/modules/eventclient/serv_eventclient.c
@@ -63,6 +63,7 @@ ev_loop *event_base;
 int DebugEventLoop = 0;
 int DebugEventLoopBacktrace = 0;
 int DebugCurl = 0;
+pthread_key_t evConKey;
 
 long EvIDSource = 1;
 /*****************************************************************************
@@ -71,12 +72,12 @@ long EvIDSource = 1;
 #define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (DebugCurl != 0))
 
 #define EVCURL_syslog(LEVEL, FORMAT, ...)                              \
-       DBGLOG (LEVEL) syslog(LEVEL, "EVCURL:IO[%ld]CC[%d] " FORMAT,    \
-                             IO->ID, CCID, __VA_ARGS__)
+       DBGLOG (LEVEL) syslog(LEVEL, "EVCURL:%s[%ld]CC[%d] " FORMAT,    \
+                             IOSTR, IO->ID, CCID, __VA_ARGS__)
 
 #define EVCURLM_syslog(LEVEL, FORMAT)                                  \
-       DBGLOG (LEVEL) syslog(LEVEL, "EVCURL:IO[%ld]CC[%d] " FORMAT,    \
-                             IO->ID, CCID)
+       DBGLOG (LEVEL) syslog(LEVEL, "EVCURL:%s[%ld]CC[%d] " FORMAT,    \
+                             IOSTR, IO->ID, CCID)
 
 #define CURL_syslog(LEVEL, FORMAT, ...)                                        \
        DBGLOG (LEVEL) syslog(LEVEL, "CURL: " FORMAT, __VA_ARGS__)
@@ -106,6 +107,8 @@ typedef struct _evcurl_global_data {
 ev_async WakeupCurl;
 evcurl_global_data global;
 
+eNextState QueueAnDBOperation(AsyncIO *IO);
+
 static void
 gotstatus(int nnrun)
 {
@@ -123,7 +126,7 @@ gotstatus(int nnrun)
 
                if (CURLMSG_DONE == msg->msg) {
                        CURL *chnd;
-                       char *chandle = NULL;
+                       void *chandle = NULL;
                        CURLcode sta;
                        CURLMcode msta;
                        AsyncIO*IO;
@@ -151,7 +154,7 @@ gotstatus(int nnrun)
 
                        EVCURLM_syslog(LOG_DEBUG, "request complete\n");
 
-                       IO->Now = ev_now(event_base);
+                       IO->CitContext->lastcmd = IO->Now = ev_now(event_base);
 
                        ev_io_stop(event_base, &IO->recv_event);
                        ev_io_stop(event_base, &IO->send_event);
@@ -161,9 +164,10 @@ gotstatus(int nnrun)
                                EVCURL_syslog(LOG_ERR,
                                              "error description: %s\n",
                                              IO->HttpReq.errdesc);
+                               IO->HttpReq.CurlError = curl_easy_strerror(sta);
                                EVCURL_syslog(LOG_ERR,
                                              "error performing request: %s\n",
-                                             curl_easy_strerror(sta));
+                                             IO->HttpReq.CurlError);
                                if (sta == CURLE_OPERATION_TIMEDOUT)
                                {
                                        IO->SendBuf.fd = 0;
@@ -184,6 +188,7 @@ gotstatus(int nnrun)
 
 
                        curl_slist_free_all(IO->HttpReq.headers);
+                       IO->HttpReq.headers = NULL;
                        msta = curl_multi_remove_handle(global.mhnd, chnd);
                        if (msta)
                                EVCURL_syslog(LOG_ERR,
@@ -198,6 +203,9 @@ gotstatus(int nnrun)
                        switch(IO->SendDone(IO))
                        {
                        case eDBQuery:
+                               FreeURL(&IO->ConnectMe);
+                               QueueAnDBOperation(IO);
+                               break;
                        case eSendDNSQuery:
                        case eReadDNSReply:
                        case eConnect:
@@ -282,7 +290,7 @@ gotdata(void *data, size_t size, size_t nmemb, void *cglobal)
        {
                IO->HttpReq.ReplyData = NewStrBufPlain(NULL, SIZ);
        }
-       IO->Now = ev_now(event_base);
+       IO->CitContext->lastcmd = IO->Now = ev_now(event_base);
        return CurlFillStrBuf_callback(data,
                                       size,
                                       nmemb,
@@ -311,7 +319,7 @@ gotwatchsock(CURL *easy,
 {
        evcurl_global_data *global = cglobal;
        CURLM *mhnd = global->mhnd;
-       char *f;
+       void *f;
        AsyncIO *IO = (AsyncIO*) vIO;
        CURLcode sta;
        const char *Action;
@@ -343,7 +351,7 @@ gotwatchsock(CURL *easy,
        }
 
        SetEVState(IO, eCurlGotIO);
-       IO->Now = ev_now(event_base);
+       IO->CitContext->lastcmd = IO->Now = ev_now(event_base);
 
        Action = "";
        switch (action)
@@ -502,10 +510,11 @@ static void IOcurl_abort_shutdown_callback(struct ev_loop *loop,
                return;
 
        SetEVState(IO, eCurlShutdown);
-       IO->Now = ev_now(event_base);
+       IO->CitContext->lastcmd = IO->Now = ev_now(event_base);
        EVCURL_syslog(LOG_DEBUG, "EVENT Curl: %s\n", __FUNCTION__);
 
        curl_slist_free_all(IO->HttpReq.headers);
+       IO->HttpReq.headers = NULL;
        msta = curl_multi_remove_handle(global.mhnd, IO->HttpReq.chnd);
        if (msta)
        {
@@ -523,6 +532,7 @@ static void IOcurl_abort_shutdown_callback(struct ev_loop *loop,
        assert(IO->ShutdownAbort);
        IO->ShutdownAbort(IO);
 }
+
 eNextState
 evcurl_handle_start(AsyncIO *IO)
 {
@@ -609,6 +619,8 @@ ev_async ExitEventLoop;
 static void QueueEventAddCallback(EV_P_ ev_async *w, int revents)
 {
        CitContext *Ctx;
+       long IOID = -1;
+       long count = 0;
        ev_tstamp Now;
        HashList *q;
        void *v;
@@ -633,9 +645,11 @@ static void QueueEventAddCallback(EV_P_ ev_async *w, int revents)
        while (GetNextHashPos(q, It, &len, &Key, &v))
        {
                IOAddHandler *h = v;
+               count ++;
                if (h->IO->ID == 0) {
                        h->IO->ID = EvIDSource++;
                }
+               IOID = h->IO->ID;
                if (h->IO->StartIO == 0.0)
                        h->IO->StartIO = Now;
 
@@ -644,7 +658,7 @@ static void QueueEventAddCallback(EV_P_ ev_async *w, int revents)
                Ctx = h->IO->CitContext;
                become_session(Ctx);
 
-               h->IO->Now = Now;
+               h->IO->CitContext->lastcmd = h->IO->Now = Now;
                switch (h->EvAttch(h->IO))
                {
                case eReadMore:
@@ -667,7 +681,7 @@ static void QueueEventAddCallback(EV_P_ ev_async *w, int revents)
        }
        DeleteHashPos(&It);
        DeleteHashContent(&q);
-       EVQM_syslog(LOG_DEBUG, "EVENT Q Add done.\n");
+       EVQ_syslog(LOG_DEBUG, "%s CC[%ld] EVENT Q Add %ld  done.", IOSTR, IOID, count);
 }
 
 
@@ -693,6 +707,7 @@ void InitEventQueue(void)
 extern void CtdlDestroyEVCleanupHooks(void);
 
 extern int EVQShutDown;
+const char *IOLog = "IO";
 /*
  * this thread operates the select() etc. via libev.
  */
@@ -701,7 +716,9 @@ void *client_event_thread(void *arg)
        struct CitContext libev_client_CC;
 
        CtdlFillSystemContext(&libev_client_CC, "LibEv Thread");
-//     citthread_setspecific(MyConKey, (void *)&smtp_queue_CC);
+
+       pthread_setspecific(evConKey, IOLog);
+
        EVQM_syslog(LOG_DEBUG, "client_event_thread() initializing\n");
 
        event_base = ev_default_loop (EVFLAG_AUTO);
@@ -757,6 +774,8 @@ extern void ShutDownDBCLient(AsyncIO *IO);
 static void DBQueueEventAddCallback(EV_P_ ev_async *w, int revents)
 {
        CitContext *Ctx;
+       long IOID = -1;
+       long count = 0;;
        ev_tstamp Now;
        HashList *q;
        void *v;
@@ -783,11 +802,13 @@ static void DBQueueEventAddCallback(EV_P_ ev_async *w, int revents)
        {
                IOAddHandler *h = v;
                eNextState rc;
+               count ++;
                if (h->IO->ID == 0)
                        h->IO->ID = EvIDSource++;
+               IOID = h->IO->ID;
                if (h->IO->StartDB == 0.0)
                        h->IO->StartDB = Now;
-               h->IO->Now = Now;
+               h->IO->CitContext->lastcmd = h->IO->Now = Now;
 
                SetEVState(h->IO, eDBAttach);
                Ctx = h->IO->CitContext;
@@ -804,7 +825,7 @@ static void DBQueueEventAddCallback(EV_P_ ev_async *w, int revents)
        }
        DeleteHashPos(&It);
        DeleteHashContent(&q);
-       EVQM_syslog(LOG_DEBUG, "DBEVENT Q Add done.\n");
+       EVQ_syslog(LOG_DEBUG, "%s CC[%ld] DBEVENT Q Add %ld done.", IOSTR, IOID, count);
 }
 
 
@@ -827,6 +848,8 @@ void DBInitEventQueue(void)
        DBInboundEventQueue = DBInboundEventQueues[0];
 }
 
+const char *DBLog = "BD";
+
 /*
  * this thread operates writing to the message database via libev.
  */
@@ -835,6 +858,8 @@ void *db_event_thread(void *arg)
        ev_loop *tmp;
        struct CitContext libev_msg_CC;
 
+       pthread_setspecific(evConKey, DBLog);
+
        CtdlFillSystemContext(&libev_msg_CC, "LibEv DB IO Thread");
 
        EVQM_syslog(LOG_DEBUG, "dbevent_thread() initializing\n");
@@ -892,10 +917,16 @@ void DebugCurlEnable(const int n)
        DebugCurl = n;
 }
 
+const char *WLog = "WX";
 CTDL_MODULE_INIT(event_client)
 {
        if (!threading)
        {
+               if (pthread_key_create(&evConKey, NULL) != 0) {
+                       syslog(LOG_CRIT, "Can't create TSD key: %s", strerror(errno));
+               }
+               pthread_setspecific(evConKey, WLog);
+
                CtdlRegisterDebugFlagHook(HKEY("eventloop"), DebugEventloopEnable, &DebugEventLoop);
                CtdlRegisterDebugFlagHook(HKEY("eventloopbacktrace"), DebugEventloopBacktraceEnable, &DebugEventLoopBacktrace);
                CtdlRegisterDebugFlagHook(HKEY("curl"), DebugCurlEnable, &DebugCurl);