]> code.citadel.org Git - citadel.git/blobdiff - citadel/event_client.c
first working RSS collection with async DB-Saves
[citadel.git] / citadel / event_client.c
index 08a9fc24bd964202b56424091ed74dfdc05d4595..dbabc743a35cc51bb13a1af22f641f04b6e883cd 100644 (file)
 
 #include "event_client.h"
 
-extern citthread_mutex_t EventQueueMutex;
-extern HashList *InboundEventQueue;
-extern struct ev_loop *event_base;
-extern ev_async AddJob;   
-extern ev_async ExitEventLoop;
-
-static void
-IO_abort_shutdown_callback(struct ev_loop *loop, ev_cleanup *watcher, int revents)
+static void IO_abort_shutdown_callback(struct ev_loop *loop, ev_cleanup *watcher, int revents)
 {
        CtdlLogPrintf(CTDL_DEBUG, "EVENT Q: %s\n", __FUNCTION__);
 
        AsyncIO *IO = watcher->data;
+       assert(IO->ShutdownAbort);
        IO->ShutdownAbort(IO);
 }
+
+
+/*--------------------------------------------------------------------------------
+ * Server DB IO 
+ */
+extern int evdb_count;
+extern citthread_mutex_t DBEventQueueMutex;
+extern HashList *DBInboundEventQueue;
+extern struct ev_loop *event_db;
+extern ev_async DBAddJob;   
+extern ev_async DBExitEventLoop;
+
+int QueueDBOperation(AsyncIO *IO, IO_CallBack CB)
+{
+       IOAddHandler *h;
+       int i;
+
+       h = (IOAddHandler*)malloc(sizeof(IOAddHandler));
+       h->IO = IO;
+       h->EvAttch = CB;
+       ev_cleanup_init(&IO->abort_by_shutdown, 
+                       IO_abort_shutdown_callback);
+       IO->abort_by_shutdown.data = IO;
+       ev_cleanup_start(event_db, &IO->abort_by_shutdown);
+
+       citthread_mutex_lock(&DBEventQueueMutex);
+       CtdlLogPrintf(CTDL_DEBUG, "DBEVENT Q\n");
+       i = ++evdb_count ;
+       Put(DBInboundEventQueue, IKEY(i), h, NULL);
+       citthread_mutex_unlock(&DBEventQueueMutex);
+
+       ev_async_send (event_db, &DBAddJob);
+       CtdlLogPrintf(CTDL_DEBUG, "DBEVENT Q Done.\n");
+       return 0;
+}
+
+void ShutDownDBCLient(AsyncIO *IO)
+{
+       CitContext *Ctx =IO->CitContext;
+       become_session(Ctx);
+
+       CtdlLogPrintf(CTDL_DEBUG, "DBEVENT\n");
+       ev_cleanup_stop(event_db, &IO->abort_by_shutdown);
+
+       assert(IO->Terminate);
+       IO->Terminate(IO);      
+
+       Ctx->state = CON_IDLE;
+       Ctx->kill_me = 1;
+}
+
+void
+DB_PerformNext(struct ev_loop *loop, ev_idle *watcher, int revents)
+{
+       AsyncIO *IO = watcher->data;
+       CtdlLogPrintf(CTDL_DEBUG, "event: %s\n", __FUNCTION__);
+       become_session(IO->CitContext);
        
+       ev_idle_stop(event_db, &IO->unwind_stack);
+
+       assert(IO->ReadDone);
+       switch (IO->ReadDone(IO))
+       {
+       case eAbort:
+           ShutDownDBCLient(IO);
+       default:
+           break;
+       }
+}
+
+void NextDBOperation(AsyncIO *IO, IO_CallBack CB)
+{
+       IO->ReadDone = CB;
+       ev_idle_init(&IO->unwind_stack,
+                    DB_PerformNext);
+       IO->unwind_stack.data = IO;
+       ev_idle_start(event_db, &IO->unwind_stack);
+}
+
+/*--------------------------------------------------------------------------------
+ * Client IO 
+ */
+extern int evbase_count;
+extern citthread_mutex_t EventQueueMutex;
+extern HashList *InboundEventQueue;
+extern struct ev_loop *event_base;
+extern ev_async AddJob;   
+extern ev_async ExitEventLoop;
+
+
 int QueueEventContext(AsyncIO *IO, IO_CallBack CB)
 {
        IOAddHandler *h;
@@ -97,7 +180,7 @@ int QueueEventContext(AsyncIO *IO, IO_CallBack CB)
 
        citthread_mutex_lock(&EventQueueMutex);
        CtdlLogPrintf(CTDL_DEBUG, "EVENT Q\n");
-       i = GetCount(InboundEventQueue);
+       i = ++evbase_count;
        Put(InboundEventQueue, IKEY(i), h, NULL);
        citthread_mutex_unlock(&EventQueueMutex);
 
@@ -106,9 +189,12 @@ int QueueEventContext(AsyncIO *IO, IO_CallBack CB)
        return 0;
 }
 
-
 int ShutDownEventQueue(void)
 {
+       citthread_mutex_lock(&DBEventQueueMutex);
+       ev_async_send (event_db, &DBExitEventLoop);
+       citthread_mutex_unlock(&DBEventQueueMutex);
+
        citthread_mutex_lock(&EventQueueMutex);
        ev_async_send (EV_DEFAULT_ &ExitEventLoop);
        citthread_mutex_unlock(&EventQueueMutex);
@@ -123,11 +209,11 @@ void FreeAsyncIOContents(AsyncIO *IO)
 }
 
 
-void ShutDownCLient(AsyncIO *IO)
+void StopClientWatchers(AsyncIO *IO)
 {
-       CtdlLogPrintf(CTDL_DEBUG, "EVENT x %d\n", IO->SendBuf.fd);
-
-       ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
+       ev_timer_stop(event_base, &IO->conn_fail);
+       ev_io_stop(event_base, &IO->conn_event);
+       ev_idle_stop(event_base, &IO->unwind_stack);
 
        if (IO->SendBuf.fd != 0)
        {
@@ -138,6 +224,18 @@ void ShutDownCLient(AsyncIO *IO)
                IO->SendBuf.fd = 0;
                IO->RecvBuf.fd = 0;
        }
+}
+
+void ShutDownCLient(AsyncIO *IO)
+{
+       CitContext *Ctx =IO->CitContext;
+       become_session(Ctx);
+
+       CtdlLogPrintf(CTDL_DEBUG, "EVENT x %d\n", IO->SendBuf.fd);
+
+       ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
+       StopClientWatchers(IO);
+
        if (IO->DNSChannel != NULL) {
                ares_destroy(IO->DNSChannel);
                ev_io_stop(event_base, &IO->dns_recv_event);
@@ -145,9 +243,9 @@ void ShutDownCLient(AsyncIO *IO)
                IO->DNSChannel = NULL;
        }
        assert(IO->Terminate);
-       become_session(IO->CitContext);
        IO->Terminate(IO);
-       
+       Ctx->state = CON_IDLE;
+       Ctx->kill_me = 1;
 }
 
 
@@ -235,6 +333,7 @@ IO_send_callback(struct ev_loop *loop, ev_io *watcher, int revents)
                        fprintf(fd, "Read: BufSize: %ld BufContent: [",
                                nbytes);
                        rv = fwrite(pchh, nbytes, 1, fd);
+                       if (!rv) printf("failed to write debug!");
                        fprintf(fd, "]\n");
                
                        
@@ -265,6 +364,9 @@ IO_send_callback(struct ev_loop *loop, ev_io *watcher, int revents)
                        }
 
                        break;
+               case eSendDNSQuery:
+               case eReadDNSReply:
+               case eConnect:
                case eTerminateConnection:
                case eAbort:
                        break;
@@ -289,6 +391,9 @@ set_start_callback(struct ev_loop *loop, AsyncIO *IO, int revents)
                become_session(IO->CitContext);
                IO_send_callback(loop, &IO->send_event, revents);
                break;
+       case eSendDNSQuery:
+       case eReadDNSReply:
+       case eConnect:
        case eTerminateConnection:
        case eAbort:
                /// TODO: WHUT?
@@ -297,28 +402,86 @@ set_start_callback(struct ev_loop *loop, AsyncIO *IO, int revents)
 }
 
 static void
-IO_Timout_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
+IO_Timeout_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
 {
        AsyncIO *IO = watcher->data;
 
        ev_timer_stop (event_base, &IO->rw_timeout);
        become_session(IO->CitContext);
 
+       if (IO->SendBuf.fd != 0)
+       {
+               ev_io_stop(event_base, &IO->send_event);
+               ev_io_stop(event_base, &IO->recv_event);
+               ev_timer_stop (event_base, &IO->rw_timeout);
+               close(IO->SendBuf.fd);
+               IO->SendBuf.fd = IO->RecvBuf.fd = 0;
+       }
+
        assert(IO->Timeout);
-       IO->Timeout(IO);
+        switch (IO->Timeout(IO))
+       {
+       case eAbort:
+               ShutDownCLient(IO);
+       default:
+               break;
+       }
 }
+
 static void
 IO_connfail_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
 {
        AsyncIO *IO = watcher->data;
 
        ev_timer_stop (event_base, &IO->conn_fail);
-       ev_io_stop(loop, &IO->conn_event);
+
+       if (IO->SendBuf.fd != 0)
+       {
+               ev_io_stop(loop, &IO->conn_event);
+               ev_io_stop(event_base, &IO->send_event);
+               ev_io_stop(event_base, &IO->recv_event);
+               ev_timer_stop (event_base, &IO->rw_timeout);
+               close(IO->SendBuf.fd);
+               IO->SendBuf.fd = IO->RecvBuf.fd = 0;
+       }
+       become_session(IO->CitContext);
+
+       assert(IO->ConnFail);
+        switch (IO->ConnFail(IO))
+       {
+       case eAbort:
+               ShutDownCLient(IO);
+       default:
+               break;
+
+       }
+}
+
+static void
+IO_connfailimmediate_callback(struct ev_loop *loop, ev_idle *watcher, int revents)
+{
+       AsyncIO *IO = watcher->data;
+
+       ev_idle_stop (event_base, &IO->conn_fail_immediate);
+
+       if (IO->SendBuf.fd != 0)
+       {
+               close(IO->SendBuf.fd);
+               IO->SendBuf.fd = IO->RecvBuf.fd = 0;
+       }
        become_session(IO->CitContext);
 
        assert(IO->ConnFail);
-       IO->ConnFail(IO);
+        switch (IO->ConnFail(IO))
+       {
+       case eAbort:
+               ShutDownCLient(IO);
+       default:
+               break;
+
+       }
 }
+
 static void
 IO_connestd_callback(struct ev_loop *loop, ev_io *watcher, int revents)
 {
@@ -339,7 +502,14 @@ IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
                HandleInbound(IO);
        } else if (nbytes == 0) {
                assert(IO->Timeout);
-               IO->Timeout(IO); /* this is a timeout... */
+
+               switch (IO->Timeout(IO))
+               {
+               case eAbort:
+                       ShutDownCLient(IO);
+               default:
+                       break;
+               }
                return;
        } else if (nbytes == -1) {
 /// TODO: FD is gone. kick it.        sock_buff_invoke_free(sb, errno);
@@ -354,7 +524,13 @@ IO_postdns_callback(struct ev_loop *loop, ev_idle *watcher, int revents)
        CtdlLogPrintf(CTDL_DEBUG, "event: %s\n", __FUNCTION__);
        become_session(IO->CitContext);
 
-       IO->DNSQuery->PostDNS(IO);
+       switch (IO->DNSQuery->PostDNS(IO))
+       {
+       case eAbort:
+           ShutDownCLient(IO);
+       default:
+           break;
+       }
 }
 
 eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_rw_timeout)
@@ -371,7 +547,6 @@ eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_r
        if (IO->SendBuf.fd < 0) {
                CtdlLogPrintf(CTDL_ERR, "EVENT: socket() failed: %s\n", strerror(errno));
                StrBufPrintf(IO->ErrMsg, "Failed to create socket: %s", strerror(errno));
-//             freeaddrinfo(res);
                return eAbort;
        }
        fdflags = fcntl(IO->SendBuf.fd, F_GETFL);
@@ -402,7 +577,7 @@ eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_r
 
        ev_timer_init(&IO->conn_fail, IO_connfail_callback, conn_timeout, 0);
        IO->conn_fail.data = IO;
-       ev_timer_init(&IO->rw_timeout, IO_Timout_callback, first_rw_timeout, 0);
+       ev_timer_init(&IO->rw_timeout, IO_Timeout_callback, first_rw_timeout, 0);
        IO->rw_timeout.data = IO;
 
        if (IO->ConnectMe->IPv6)
@@ -411,12 +586,13 @@ eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_r
                rc = connect(IO->SendBuf.fd, (struct sockaddr_in *)&IO->ConnectMe->Addr, sizeof(struct sockaddr_in));
 
        if (rc >= 0){
-////           freeaddrinfo(res);
+               CtdlLogPrintf(CTDL_DEBUG, "connect() immediate success.\n");
                set_start_callback(event_base, IO, 0);
                ev_timer_start(event_base, &IO->rw_timeout);
                return IO->NextState;
        }
        else if (errno == EINPROGRESS) {
+               CtdlLogPrintf(CTDL_DEBUG, "connect() have to wait now.\n");
 
                ev_io_init(&IO->conn_event, IO_connestd_callback, IO->SendBuf.fd, EV_READ|EV_WRITE);
                IO->conn_event.data = IO;
@@ -426,11 +602,14 @@ eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_r
                return IO->NextState;
        }
        else {
+               ev_idle_init(&IO->conn_fail_immediate,
+                            IO_connfailimmediate_callback);
+               IO->conn_fail_immediate.data = IO;
+               ev_idle_start(event_base, &IO->conn_fail_immediate);
+               
                CtdlLogPrintf(CTDL_ERR, "connect() failed: %s\n", strerror(errno));
                StrBufPrintf(IO->ErrMsg, "Failed to connect: %s", strerror(errno));
-               assert(IO->ConnFail);
-               IO->ConnFail(IO);
-               return eAbort;
+               return IO->NextState;
        }
        return IO->NextState;
 }