don't call curl_multi_add_handle() from outside of the event queue

[citadel.git] / citadel / event_client.h

diff --git a/citadel/event_client.h b/citadel/event_client.h
index 8647fdde43720722de033bd6356932eaac566dc8..828ee0cb5a236b3fe073444dd7234232846e81c3 100644 (file)
--- a/citadel/event_client.h
+++ b/citadel/event_client.h
@@ -1,3 +1,6 @@
+#ifndef __EVENT_CLIENT_H__
+#define __EVENT_CLIENT_H__
+#define EV_COMPAT3 0
 #include <ev.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -11,10 +14,19 @@ typedef struct AsyncIO AsyncIO;
 typedef enum _eNextState {
        eSendDNSQuery,
        eReadDNSReply,
+
+       eDBQuery,
+
        eConnect,
        eSendReply, 
        eSendMore,
+       eSendFile,
+
        eReadMessage, 
+       eReadMore,
+       eReadPayload,
+       eReadFile,
+
        eTerminateConnection,
        eAbort
 }eNextState;
@@ -24,6 +36,21 @@ typedef eReadState (*IO_LineReaderCallback)(AsyncIO *IO);
 typedef void (*ParseDNSAnswerCb)(AsyncIO*, unsigned char*, int);
 typedef void (*FreeDNSReply)(void *DNSData);
 
+
+typedef struct __ReadAsyncMsg {
+       StrBuf *MsgBuf;
+       size_t maxlen;          /* maximum message length */
+
+       const char *terminator; /* token signalling EOT */
+       long tlen;
+       int dodot;
+
+       int flushing;           /* if we read maxlen, read until nothing more arives and ignore this. */
+
+       int crlf;               /* CRLF newlines instead of LF */
+} ReadAsyncMsg;
+
+
 typedef struct _DNSQueryParts {
        ParseDNSAnswerCb DNS_CB;
        IO_CallBack PostDNS;
@@ -36,15 +63,18 @@ typedef struct _DNSQueryParts {
 
 typedef struct _evcurl_request_data 
 {
-       CURL *chnd;
-       char errdesc[CURL_ERROR_SIZE];
-       int attached;
-       char* PlainPostData;
-       long PlainPostDataLen;
-       StrBuf *PostData;
-       StrBuf *ReplyData;
-///    ParsedURL *URL; /// take from AsyncIO->ConnectMe
-       struct curl_slist * headers;
+       CURL              *chnd;
+       struct curl_slist *headers;
+       char               errdesc[CURL_ERROR_SIZE];
+
+       int                attached;
+
+       char              *PlainPostData;
+       long               PlainPostDataLen;
+       StrBuf            *PostData;
+
+       StrBuf            *ReplyData;
+       long               httpcode;
 } evcurl_request_data;
 
 struct AsyncIO {
@@ -58,11 +88,16 @@ struct AsyncIO {
        IOBuffer SendBuf, 
                RecvBuf;
 
+       FDIOBuffer IOB; /* when sending from / reading into files, this is used. */
+
        /* our events... */
-       ev_cleanup abort_by_shutdown; /* server wants to go down... */
+       ev_cleanup abort_by_shutdown, /* server wants to go down... */
+               db_abort_by_shutdown; /* server wants to go down... */
        ev_timer conn_fail,           /* connection establishing timed out */
                rw_timeout;           /* timeout while sending data */
-       ev_idle unwind_stack;         /* get c-ares out of the stack */
+       ev_idle unwind_stack,         /* get c-ares out of the stack */
+               db_unwind_stack,      /* wait for next db operation... */
+               conn_fail_immediate;  /* unwind stack, but fail immediately. */
        ev_io recv_event,             /* receive data from the client */
                send_event,           /* send more data to the client */
                conn_event;           /* Connection successfully established */
@@ -75,7 +110,9 @@ struct AsyncIO {
                Terminate,    /* shutting down... */
                Timeout,      /* Timeout handler; may also be connection timeout */
                ConnFail,     /* What to do when one connection failed? */
-               ShutdownAbort;/* we're going down. make your piece. */ 
+               DNSFail,      /* the dns lookup didn't work out. */
+               ShutdownAbort,/* we're going down. make your piece. */ 
+               NextDBOperation; /* Perform Database IO */
 
        IO_LineReaderCallback LineReader; /* if we have linereaders, maybe we want to read more lines before the real application logic is called? */
 
@@ -88,6 +125,10 @@ struct AsyncIO {
        
        evcurl_request_data HttpReq;
 
+       /* Saving / loading a message async from / to disk */
+       ReadAsyncMsg *ReadMsg;
+       struct CtdlMessage *AsyncMsg;
+       struct recptypes *AsyncRcp;
        /* Custom data; its expected to contain  AsyncIO so we can save malloc()s... */
        void *Data;        /* application specific data */
        void *CitContext;  /* Citadel Session context... */
@@ -100,7 +141,10 @@ typedef struct _IOAddHandler {
 
 void FreeAsyncIOContents(AsyncIO *IO);
 
-int QueueEventContext(AsyncIO *IO, IO_CallBack CB);
+eNextState NextDBOperation(AsyncIO *IO, IO_CallBack CB);
+eNextState QueueDBOperation(AsyncIO *IO, IO_CallBack CB);
+eNextState QueueEventContext(AsyncIO *IO, IO_CallBack CB);
+eNextState QueueCurlContext(AsyncIO *IO);
 int ShutDownEventQueue(void);
 
 eNextState InitEventIO(AsyncIO *IO, 
@@ -129,13 +173,18 @@ void InitC_ares_dns(AsyncIO *IO);
        do { \
                sta = curl_easy_setopt(chnd, (CURLOPT_##s), (v)); \
                if (sta)  {                                             \
-                       CtdlLogPrintf(CTDL_ERR, "error setting option " #s " on curl handle: %s", curl_easy_strerror(sta)); \
+                       syslog(LOG_ERR, "error setting option " #s " on curl handle: %s", curl_easy_strerror(sta)); \
        } } while (0)
 
 
 int evcurl_init(AsyncIO *IO, 
                void *CustomData, 
                const char* Desc,
-               int CallBack);
+               IO_CallBack CallBack, 
+               IO_CallBack Terminate);
+
+eNextState ReAttachIO(AsyncIO *IO, 
+                     void *pData, 
+                     int ReadFirst);
 
-void evcurl_handle_start(AsyncIO *IO);
+#endif /* __EVENT_CLIENT_H__ */