X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fevent_client.h;h=66976a8aded74ce1fc8aa1a120976007579c26ca;hb=4c274aa94a53d8850ed363e64c5863970fe629a4;hp=4be26614c215837d904f70d508aafd5a82e1f1e2;hpb=4b49575b46e9726cc7f629c935bf4e110361d01c;p=citadel.git diff --git a/citadel/event_client.h b/citadel/event_client.h index 4be26614c..66976a8ad 100644 --- a/citadel/event_client.h +++ b/citadel/event_client.h @@ -23,8 +23,48 @@ #include #include +#ifndef __ASYNCIO__ +#define __ASYNCIO__ typedef struct AsyncIO AsyncIO; +#endif +#ifndef __CIT_CONTEXT__ +#define __CIT_CONTEXT__ typedef struct CitContext CitContext; +#endif + +extern pthread_key_t evConKey; + +typedef enum __eIOState { + eDBQ, + eQDBNext, + eDBAttach, + eDBNext, + eDBStop, + eDBX, + eDBTerm, + eIOQ, + eIOAttach, + eIOConnectSock, + eIOAbort, + eIOTimeout, + eIOConnfail, + eIOConnfailNow, + eIOConnNow, + eIOConnWait, + eCurlQ, + eCurlStart, + eCurlShutdown, + eCurlNewIO, + eCurlGotIO, + eCurlGotData, + eCurlGotStatus, + eCaresStart, + eCaresDoneIO, + eCaresFinished, + eCaresX, + eKill, + eExit +}eIOState; typedef enum _eNextState { eSendDNSQuery, @@ -46,6 +86,8 @@ typedef enum _eNextState { eAbort }eNextState; +void SetEVState(AsyncIO *IO, eIOState State); + typedef eNextState (*IO_CallBack)(AsyncIO *IO); typedef eReadState (*IO_LineReaderCallback)(AsyncIO *IO); typedef void (*ParseDNSAnswerCb)(AsyncIO*, unsigned char*, int); @@ -84,6 +126,7 @@ typedef struct _evcurl_request_data CURL *chnd; struct curl_slist *headers; char errdesc[CURL_ERROR_SIZE]; + const char *CurlError; int attached; @@ -110,6 +153,7 @@ typedef struct __evcares_data { IO_CallBack Fail; /* the dns lookup didn't work out. */ } evcares_data; + struct AsyncIO { long ID; ev_tstamp Now; @@ -150,7 +194,8 @@ struct AsyncIO { Timeout, /* Timeout handler;may also be conn. timeout */ ConnFail, /* What to do when one connection failed? */ ShutdownAbort,/* we're going down. make your piece. */ - NextDBOperation; /* Perform Database IO */ + NextDBOperation, /* Perform Database IO */ + ReAttachCB; /* on the hop from one Q to the other, this is the next CB */ /* if we have linereaders, maybe we want to read more lines before * the real application logic is called? */ @@ -163,7 +208,7 @@ struct AsyncIO { /* Saving / loading a message async from / to disk */ ReadAsyncMsg *ReadMsg; struct CtdlMessage *AsyncMsg; - struct recptypes *AsyncRcp; + recptypes *AsyncRcp; /* Context specific data; Hint: put AsyncIO in there */ void *Data; /* application specific data */ @@ -176,71 +221,75 @@ typedef struct _IOAddHandler { } IOAddHandler; +inline static time_t EvGetNow(AsyncIO *IO) { return (time_t) IO->Now;} extern int DebugEventLoop; extern int DebugCAres; +#define IOSTR (const char *) pthread_getspecific(evConKey) + #define EDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (DebugEventLoop != 0)) -#define CCID ((CitContext*)IO->CitContext)->cs_pid +#define CCID ((CitContext*)IO->CitContext)?((CitContext*)IO->CitContext)->cs_pid:-1 #define EVQ_syslog(LEVEL, FORMAT, ...) \ - EDBGLOG (LEVEL) syslog(LEVEL, "IOQ " FORMAT, __VA_ARGS__) + EDBGLOG (LEVEL) syslog(LEVEL, "%sQ " FORMAT, IOSTR, __VA_ARGS__) #define EVQM_syslog(LEVEL, FORMAT) \ - EDBGLOG (LEVEL) syslog(LEVEL, "IO " FORMAT) + EDBGLOG (LEVEL) syslog(LEVEL, "%s " FORMAT, IOSTR) #define EV_syslog(LEVEL, FORMAT, ...) \ - EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]CC[%d] " FORMAT, IO->ID, CCID, __VA_ARGS__) + EDBGLOG (LEVEL) syslog(LEVEL, "%s[%ld]CC[%d] " FORMAT, IOSTR, IO->ID, CCID, __VA_ARGS__) #define EVM_syslog(LEVEL, FORMAT) \ - EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]CC[%d] " FORMAT, IO->ID, CCID) + EDBGLOG (LEVEL) syslog(LEVEL, "%s[%ld]CC[%d] " FORMAT, IOSTR, IO->ID, CCID) #define EVNC_syslog(LEVEL, FORMAT, ...) \ - EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld] " FORMAT, IO->ID, __VA_ARGS__) + EDBGLOG (LEVEL) syslog(LEVEL, "%s[%ld] " FORMAT, IOSTR, IO->ID, __VA_ARGS__) -#define EVNCM_syslog(LEVEL, FORMAT) EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]" FORMAT, IO->ID) +#define EVNCM_syslog(LEVEL, FORMAT) EDBGLOG (LEVEL) syslog(LEVEL, "%s[%ld]" FORMAT, IOSTR, IO->ID) #define CDBGLOG() if (DebugCAres != 0) #define CEDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (DebugCAres != 0)) #define EV_DNS_LOG_START(a) \ - CDBGLOG () {syslog(LOG_DEBUG, "IO[%ld]CC[%d] + Starting " #a " %s %p FD %d", IO->ID, CCID, __FUNCTION__, &IO->a, IO->a.fd); \ + CDBGLOG () {syslog(LOG_DEBUG, "%s[%ld]CC[%d] + Starting " #a " %s %p FD %d", IOSTR, IO->ID, CCID, __FUNCTION__, &IO->a, IO->a.fd); \ EV_backtrace(IO);} #define EV_DNS_LOG_STOP(a) \ - CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] - Stopping " #a " %s %p FD %d", IO->ID, CCID, __FUNCTION__, &IO->a, IO->a.fd); \ + CDBGLOG () { syslog(LOG_DEBUG, "%s[%ld]CC[%d] - Stopping " #a " %s %p FD %d", IOSTR, IO->ID, CCID, __FUNCTION__, &IO->a, IO->a.fd); \ EV_backtrace(IO);} #define EV_DNS_LOG_INIT(a) \ - CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] * Init " #a " %s %p FD %d", IO->ID, CCID, __FUNCTION__, &IO->a, IO->a.fd); \ + CDBGLOG () { syslog(LOG_DEBUG, "%s[%ld]CC[%d] * Init " #a " %s %p FD %d", IOSTR, IO->ID, CCID, __FUNCTION__, &IO->a, IO->a.fd); \ EV_backtrace(IO);} #define EV_DNS_LOGT_START(a) \ - CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] + Starting " #a " %s %p", IO->ID, CCID, __FUNCTION__, &IO->a); \ + CDBGLOG () { syslog(LOG_DEBUG, "%s[%ld]CC[%d] + Starting " #a " %s %p", IOSTR, IO->ID, CCID, __FUNCTION__, &IO->a); \ EV_backtrace(IO);} #define EV_DNS_LOGT_STOP(a) \ - CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] - Stopping " #a " %s %p", IO->ID, CCID, __FUNCTION__, &IO->a); \ + CDBGLOG () { syslog(LOG_DEBUG, "%s[%ld]CC[%d] - Stopping " #a " %s %p", IOSTR, IO->ID, CCID, __FUNCTION__, &IO->a); \ EV_backtrace(IO); } #define EV_DNS_LOGT_INIT(a) \ - CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] * Init " #a " %p", IO->ID, CCID, &IO->a); \ + CDBGLOG () { syslog(LOG_DEBUG, "%s[%ld]CC[%d] * Init " #a " %p", IOSTR, 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__) + CEDBGLOG (LEVEL) syslog(LEVEL, "%s[%ld]CC[%d] " FORMAT, IOSTR, IO->ID, CCID, __VA_ARGS__) #define EVM_DNS_syslog(LEVEL, FORMAT) \ - CEDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]CC[%d] " FORMAT, IO->ID, CCID) + CEDBGLOG (LEVEL) syslog(LEVEL, "%s[%ld]CC[%d] " FORMAT, IOSTR, IO->ID, CCID) void FreeAsyncIOContents(AsyncIO *IO); eNextState NextDBOperation(AsyncIO *IO, IO_CallBack CB); -eNextState QueueDBOperation(AsyncIO *IO, IO_CallBack CB); +eNextState EventQueueDBOperation(AsyncIO *IO, IO_CallBack CB, int CloseFDs); void StopDBWatchers(AsyncIO *IO); eNextState QueueEventContext(AsyncIO *IO, IO_CallBack CB); eNextState QueueCurlContext(AsyncIO *IO); +eNextState DBQueueEventContext(AsyncIO *IO, IO_CallBack CB); eNextState EvConnectSock(AsyncIO *IO, double conn_timeout, @@ -279,6 +328,10 @@ void SetNextTimeout(AsyncIO *IO, double timeout); curl_easy_strerror(sta)); \ } } while (0) +#define SET_EV_TIME(IO, BASE) \ + IO->Now = ev_now(BASE); \ + if (IO->CitContext != NULL) IO->CitContext->lastcmd = IO->Now; + void InitIOStruct(AsyncIO *IO, void *Data, eNextState NextState, @@ -302,6 +355,7 @@ int InitcURLIOStruct(AsyncIO *IO, void KillAsyncIOContext(AsyncIO *IO); void StopCurlWatchers(AsyncIO *IO); +eNextState CurlQueueDBOperation(AsyncIO *IO, IO_CallBack CB); eNextState ReAttachIO(AsyncIO *IO, void *pData,