static void IO_abort_shutdown_callback(struct ev_loop *loop, ev_cleanup *watcher, int revents)
{
- CtdlLogPrintf(CTDL_DEBUG, "EVENT Q: %s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "EVENT Q: %s\n", __FUNCTION__);
AsyncIO *IO = watcher->data;
assert(IO->ShutdownAbort);
extern ev_async DBAddJob;
extern ev_async DBExitEventLoop;
-int QueueDBOperation(AsyncIO *IO, IO_CallBack CB)
+eNextState 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,
+ ev_cleanup_init(&IO->db_abort_by_shutdown,
IO_abort_shutdown_callback);
- IO->abort_by_shutdown.data = IO;
- ev_cleanup_start(event_db, &IO->abort_by_shutdown);
+ IO->db_abort_by_shutdown.data = IO;
+ ev_cleanup_start(event_db, &IO->db_abort_by_shutdown);
citthread_mutex_lock(&DBEventQueueMutex);
- CtdlLogPrintf(CTDL_DEBUG, "DBEVENT Q\n");
+ syslog(LOG_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;
+ syslog(LOG_DEBUG, "DBEVENT Q Done.\n");
+ return eDBQuery;
}
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);
+ syslog(LOG_DEBUG, "DBEVENT\n");
+ ev_cleanup_stop(event_db, &IO->db_abort_by_shutdown);
assert(IO->Terminate);
IO->Terminate(IO);
DB_PerformNext(struct ev_loop *loop, ev_idle *watcher, int revents)
{
AsyncIO *IO = watcher->data;
- CtdlLogPrintf(CTDL_DEBUG, "event: %s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
become_session(IO->CitContext);
- ev_idle_stop(event_db, &IO->unwind_stack);
+ ev_idle_stop(event_db, &IO->db_unwind_stack);
- assert(IO->ReadDone);
- switch (IO->ReadDone(IO))
+ assert(IO->NextDBOperation);
+ switch (IO->NextDBOperation(IO))
{
+ case eDBQuery:
+ break;
+ case eSendDNSQuery:
+ case eReadDNSReply:
+ case eConnect:
+ case eSendReply:
+ case eSendMore:
+ case eReadMessage:
+ case eReadMore:
+ case eReadPayload:
+ ev_cleanup_stop(loop, &IO->db_abort_by_shutdown);
+ break;
+ case eTerminateConnection:
case eAbort:
ShutDownDBCLient(IO);
- default:
- break;
}
}
-void NextDBOperation(AsyncIO *IO, IO_CallBack CB)
+eNextState NextDBOperation(AsyncIO *IO, IO_CallBack CB)
{
- IO->ReadDone = CB;
- ev_idle_init(&IO->unwind_stack,
+ IO->NextDBOperation = CB;
+ ev_idle_init(&IO->db_unwind_stack,
DB_PerformNext);
- IO->unwind_stack.data = IO;
- ev_idle_start(event_db, &IO->unwind_stack);
+ IO->db_unwind_stack.data = IO;
+ ev_idle_start(event_db, &IO->db_unwind_stack);
+ return eDBQuery;
}
/*--------------------------------------------------------------------------------
extern ev_async ExitEventLoop;
-int QueueEventContext(AsyncIO *IO, IO_CallBack CB)
+eNextState QueueEventContext(AsyncIO *IO, IO_CallBack CB)
{
IOAddHandler *h;
int i;
ev_cleanup_start(event_base, &IO->abort_by_shutdown);
citthread_mutex_lock(&EventQueueMutex);
- CtdlLogPrintf(CTDL_DEBUG, "EVENT Q\n");
+ syslog(LOG_DEBUG, "EVENT Q\n");
i = ++evbase_count;
Put(InboundEventQueue, IKEY(i), h, NULL);
citthread_mutex_unlock(&EventQueueMutex);
ev_async_send (event_base, &AddJob);
- CtdlLogPrintf(CTDL_DEBUG, "EVENT Q Done.\n");
- return 0;
+ syslog(LOG_DEBUG, "EVENT Q Done.\n");
+ return eSendReply;
}
int ShutDownEventQueue(void)
ev_io_stop(event_base, &IO->conn_event);
ev_idle_stop(event_base, &IO->unwind_stack);
- 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 = 0;
- IO->RecvBuf.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 = 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);
+ syslog(LOG_DEBUG, "EVENT x %d\n", IO->SendBuf.fd);
ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
StopClientWatchers(IO);
become_session(IO->CitContext);
- while ((Finished == eBufferNotEmpty) && (IO->NextState == eReadMessage)){
+ while ((Finished == eBufferNotEmpty) &&
+ ((IO->NextState == eReadMessage)||
+ (IO->NextState == eReadMore)||
+ (IO->NextState == eReadPayload)))
+ {
if (IO->RecvBuf.nBlobBytesWanted != 0) {
}
switch (Finished) {
case eMustReadMore: /// read new from socket...
- return Finished;
break;
case eBufferNotEmpty: /* shouldn't happen... */
case eReadSuccess: /// done for now...
}
}
-
- if ((IO->NextState == eSendReply) ||
- (IO->NextState == eSendMore))
- {
+ switch (IO->NextState) {
+ case eSendReply:
+ case eSendMore:
assert(IO->SendDone);
IO->NextState = IO->SendDone(IO);
ev_io_start(event_base, &IO->send_event);
- }
- else if ((IO->NextState == eTerminateConnection) ||
- (IO->NextState == eAbort) )
+ break;
+ case eReadPayload:
+ case eReadMore:
+ ev_io_start(event_base, &IO->recv_event);
+ break;
+ case eTerminateConnection:
+ case eAbort:
ShutDownCLient(IO);
+ break;
+ case eSendDNSQuery:
+ case eReadDNSReply:
+ case eDBQuery:
+ case eConnect:
+ case eReadMessage:
+ break;
+ }
return Finished;
}
AsyncIO *IO = watcher->data;
become_session(IO->CitContext);
- rc = StrBuf_write_one_chunk_callback(watcher->fd, 0/*TODO*/, &IO->SendBuf);
-
- if (rc == 0)
- {
#ifdef BIGBAD_IODBG
- {
- int rv = 0;
- char fn [SIZ];
- FILE *fd;
- const char *pch = ChrPtr(IO->SendBuf.Buf);
- const char *pchh = IO->SendBuf.ReadWritePointer;
- long nbytes;
-
- if (pchh == NULL)
- pchh = pch;
-
- nbytes = StrLength(IO->SendBuf.Buf) - (pchh - pch);
- snprintf(fn, SIZ, "/tmp/foolog_ev_%s.%d", "smtpev", IO->SendBuf.fd);
+ {
+ int rv = 0;
+ char fn [SIZ];
+ FILE *fd;
+ const char *pch = ChrPtr(IO->SendBuf.Buf);
+ const char *pchh = IO->SendBuf.ReadWritePointer;
+ long nbytes;
- fd = fopen(fn, "a+");
- fprintf(fd, "Read: BufSize: %ld BufContent: [",
- nbytes);
- rv = fwrite(pchh, nbytes, 1, fd);
- if (!rv) printf("failed to write debug!");
- fprintf(fd, "]\n");
+ if (pchh == NULL)
+ pchh = pch;
-
- fclose(fd);
- }
+ nbytes = StrLength(IO->SendBuf.Buf) - (pchh - pch);
+ snprintf(fn, SIZ, "/tmp/foolog_ev_%s.%d",
+ ((CitContext*)(IO->CitContext))->ServiceName,
+ IO->SendBuf.fd);
+
+ fd = fopen(fn, "a+");
+ fprintf(fd, "Send: BufSize: %ld BufContent: [",
+ nbytes);
+ rv = fwrite(pchh, nbytes, 1, fd);
+ if (!rv) printf("failed to write debug to %s!\n", fn);
+ fprintf(fd, "]\n");
#endif
+ rc = StrBuf_write_one_chunk_callback(watcher->fd, 0/*TODO*/, &IO->SendBuf);
+
+#ifdef BIGBAD_IODBG
+ fprintf(fd, "Sent: BufSize: %d bytes.\n", rc);
+ fclose(fd);
+ }
+#endif
+ if (rc == 0)
+ {
ev_io_stop(event_base, &IO->send_event);
switch (IO->NextState) {
- case eSendReply:
- break;
case eSendMore:
assert(IO->SendDone);
IO->NextState = IO->SendDone(IO);
ev_io_start(event_base, &IO->send_event);
}
break;
+ case eSendReply:
+ if (StrBufCheckBuffer(&IO->SendBuf) != eReadSuccess)
+ break;
+ IO->NextState = eReadMore;
+ case eReadMore:
case eReadMessage:
+ case eReadPayload:
if (StrBufCheckBuffer(&IO->RecvBuf) == eBufferNotEmpty) {
HandleInbound(IO);
}
ev_io_start(event_base, &IO->recv_event);
}
+ break;
+ case eDBQuery:
+ /* we now live in another queue, so we have to unregister. */
+ ev_cleanup_stop(loop, &IO->abort_by_shutdown);
break;
case eSendDNSQuery:
case eReadDNSReply:
{
switch(IO->NextState) {
+ case eReadMore:
case eReadMessage:
ev_io_start(event_base, &IO->recv_event);
break;
case eSendReply:
case eSendMore:
+ case eReadPayload:
become_session(IO->CitContext);
IO_send_callback(loop, &IO->send_event, revents);
break;
+ case eDBQuery:
case eSendDNSQuery:
case eReadDNSReply:
case eConnect:
AsyncIO *IO = watcher->data;
nbytes = StrBuf_read_one_chunk_callback(watcher->fd, 0 /*TODO */, &IO->RecvBuf);
+#ifdef BIGBAD_IODBG
+ {
+ int rv = 0;
+ char fn [SIZ];
+ FILE *fd;
+ const char *pch = ChrPtr(IO->RecvBuf.Buf);
+ const char *pchh = IO->RecvBuf.ReadWritePointer;
+ long nbytes;
+
+ if (pchh == NULL)
+ pchh = pch;
+
+ nbytes = StrLength(IO->RecvBuf.Buf) - (pchh - pch);
+ snprintf(fn, SIZ, "/tmp/foolog_ev_%s.%d",
+ ((CitContext*)(IO->CitContext))->ServiceName,
+ IO->SendBuf.fd);
+
+ fd = fopen(fn, "a+");
+ fprintf(fd, "Read: BufSize: %ld BufContent: [",
+ nbytes);
+ rv = fwrite(pchh, nbytes, 1, fd);
+ if (!rv) printf("failed to write debug to %s!\n", fn);
+ fprintf(fd, "]\n");
+
+
+ fclose(fd);
+ }
+#endif
if (nbytes > 0) {
HandleInbound(IO);
} else if (nbytes == 0) {
return;
} else if (nbytes == -1) {
/// TODO: FD is gone. kick it. sock_buff_invoke_free(sb, errno);
+ syslog(LOG_DEBUG,
+ "EVENT: Socket Invalid! %s \n",
+ strerror(errno));
return;
}
}
IO_postdns_callback(struct ev_loop *loop, ev_idle *watcher, int revents)
{
AsyncIO *IO = watcher->data;
- CtdlLogPrintf(CTDL_DEBUG, "event: %s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
become_session(IO->CitContext);
switch (IO->DNSQuery->PostDNS(IO))
IPPROTO_TCP);
if (IO->SendBuf.fd < 0) {
- CtdlLogPrintf(CTDL_ERR, "EVENT: socket() failed: %s\n", strerror(errno));
+ syslog(LOG_ERR, "EVENT: socket() failed: %s\n", strerror(errno));
StrBufPrintf(IO->ErrMsg, "Failed to create socket: %s", strerror(errno));
return eAbort;
}
fdflags = fcntl(IO->SendBuf.fd, F_GETFL);
if (fdflags < 0) {
- CtdlLogPrintf(CTDL_DEBUG,
- "EVENT: unable to get socket flags! %s \n",
- strerror(errno));
+ syslog(LOG_DEBUG,
+ "EVENT: unable to get socket flags! %s \n",
+ strerror(errno));
StrBufPrintf(IO->ErrMsg, "Failed to get socket flags: %s", strerror(errno));
return eAbort;
}
fdflags = fdflags | O_NONBLOCK;
if (fcntl(IO->SendBuf.fd, F_SETFL, fdflags) < 0) {
- CtdlLogPrintf(CTDL_DEBUG,
- "EVENT: unable to set socket nonblocking flags! %s \n",
- strerror(errno));
+ syslog(LOG_DEBUG,
+ "EVENT: unable to set socket nonblocking flags! %s \n",
+ strerror(errno));
StrBufPrintf(IO->ErrMsg, "Failed to set socket flags: %s", strerror(errno));
close(IO->SendBuf.fd);
IO->SendBuf.fd = IO->RecvBuf.fd = -1;
ev_timer_init(&IO->rw_timeout, IO_Timeout_callback, first_rw_timeout, 0);
IO->rw_timeout.data = IO;
+
+ /* Bypass it like this: IO->Addr.sin_addr.s_addr = inet_addr("127.0.0.1"); */
+/// ((struct sockaddr_in)IO->ConnectMe->Addr).sin_addr.s_addr = inet_addr("127.0.0.1");
if (IO->ConnectMe->IPv6)
rc = connect(IO->SendBuf.fd, &IO->ConnectMe->Addr, sizeof(struct sockaddr_in6));
else
rc = connect(IO->SendBuf.fd, (struct sockaddr_in *)&IO->ConnectMe->Addr, sizeof(struct sockaddr_in));
if (rc >= 0){
- CtdlLogPrintf(CTDL_DEBUG, "connect() immediate success.\n");
+ syslog(LOG_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");
+ syslog(LOG_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;
IO->conn_fail_immediate.data = IO;
ev_idle_start(event_base, &IO->conn_fail_immediate);
- CtdlLogPrintf(CTDL_ERR, "connect() failed: %s\n", strerror(errno));
+ syslog(LOG_ERR, "connect() failed: %s\n", strerror(errno));
StrBufPrintf(IO->ErrMsg, "Failed to connect: %s", strerror(errno));
return IO->NextState;
}
}
return event_connect_socket(IO, conn_timeout, first_rw_timeout);
}
+
+eNextState ReAttachIO(AsyncIO *IO,
+ void *pData,
+ int ReadFirst)
+{
+ IO->Data = pData;
+ become_session(IO->CitContext);
+ ev_cleanup_start(event_base, &IO->abort_by_shutdown);
+ if (ReadFirst) {
+ IO->NextState = eReadMessage;
+ }
+ else {
+ IO->NextState = eSendReply;
+ }
+ set_start_callback(event_base, IO, 0);
+
+ return IO->NextState;
+}
projects / citadel.git / blobdiff