* Server DB IO
*/
extern int evdb_count;
-extern citthread_mutex_t DBEventQueueMutex;
+extern pthread_mutex_t DBEventQueueMutex;
extern HashList *DBInboundEventQueue;
extern struct ev_loop *event_db;
extern ev_async DBAddJob;
IO->db_abort_by_shutdown.data = IO;
ev_cleanup_start(event_db, &IO->db_abort_by_shutdown);
- citthread_mutex_lock(&DBEventQueueMutex);
+ pthread_mutex_lock(&DBEventQueueMutex);
syslog(LOG_DEBUG, "DBEVENT Q\n");
i = ++evdb_count ;
Put(DBInboundEventQueue, IKEY(i), h, NULL);
- citthread_mutex_unlock(&DBEventQueueMutex);
+ pthread_mutex_unlock(&DBEventQueueMutex);
ev_async_send (event_db, &DBAddJob);
syslog(LOG_DEBUG, "DBEVENT Q Done.\n");
case eConnect:
case eSendReply:
case eSendMore:
+ case eSendFile:
case eReadMessage:
case eReadMore:
case eReadPayload:
+ case eReadFile:
ev_cleanup_stop(loop, &IO->db_abort_by_shutdown);
break;
case eTerminateConnection:
* Client IO
*/
extern int evbase_count;
-extern citthread_mutex_t EventQueueMutex;
+extern pthread_mutex_t EventQueueMutex;
extern HashList *InboundEventQueue;
extern struct ev_loop *event_base;
extern ev_async AddJob;
IO->abort_by_shutdown.data = IO;
ev_cleanup_start(event_base, &IO->abort_by_shutdown);
- citthread_mutex_lock(&EventQueueMutex);
+ pthread_mutex_lock(&EventQueueMutex);
syslog(LOG_DEBUG, "EVENT Q\n");
i = ++evbase_count;
Put(InboundEventQueue, IKEY(i), h, NULL);
- citthread_mutex_unlock(&EventQueueMutex);
+ pthread_mutex_unlock(&EventQueueMutex);
ev_async_send (event_base, &AddJob);
syslog(LOG_DEBUG, "EVENT Q Done.\n");
int ShutDownEventQueue(void)
{
- citthread_mutex_lock(&DBEventQueueMutex);
+ pthread_mutex_lock(&DBEventQueueMutex);
ev_async_send (event_db, &DBExitEventLoop);
- citthread_mutex_unlock(&DBEventQueueMutex);
+ pthread_mutex_unlock(&DBEventQueueMutex);
- citthread_mutex_lock(&EventQueueMutex);
+ pthread_mutex_lock(&EventQueueMutex);
ev_async_send (EV_DEFAULT_ &ExitEventLoop);
- citthread_mutex_unlock(&EventQueueMutex);
+ pthread_mutex_unlock(&EventQueueMutex);
return 0;
}
eReadState HandleInbound(AsyncIO *IO)
{
+ const char *Err = NULL;
eReadState Finished = eBufferNotEmpty;
become_session(IO->CitContext);
while ((Finished == eBufferNotEmpty) &&
((IO->NextState == eReadMessage)||
(IO->NextState == eReadMore)||
+ (IO->NextState == eReadFile)||
(IO->NextState == eReadPayload)))
{
if (IO->RecvBuf.nBlobBytesWanted != 0) {
}
else { /* Reading lines... */
//// lex line reply in callback, or do it ourselves. as nnn-blabla means continue reading in SMTP
- if (IO->LineReader)
+ if ((IO->NextState == eReadFile) &&
+ (Finished == eBufferNotEmpty))
+ {
+ Finished = WriteIOBAlreadyRead(&IO->IOB, &Err);
+ if (Finished == eReadSuccess)
+ {
+ IO->NextState = eSendReply;
+ }
+ }
+ else if (IO->LineReader)
Finished = IO->LineReader(IO);
else
Finished = StrBufChunkSipLine(IO->IOBuf, &IO->RecvBuf);
}
switch (IO->NextState) {
+ case eSendFile:
+ ev_io_start(event_base, &IO->send_event);
+ break;
case eSendReply:
case eSendMore:
assert(IO->SendDone);
break;
case eReadPayload:
case eReadMore:
+ case eReadFile:
ev_io_start(event_base, &IO->recv_event);
break;
case eTerminateConnection:
+//////TODOxxxx
+ break;
case eAbort:
ShutDownCLient(IO);
break;
{
int rc;
AsyncIO *IO = watcher->data;
+ const char *errmsg = NULL;
become_session(IO->CitContext);
#ifdef BIGBAD_IODBG
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);
+ switch (IO->NextState) {
+ case eSendFile:
+ rc = FileSendChunked(&IO->IOB, &errmsg);
+ if (rc < 0)
+ StrBufPlain(IO->ErrMsg, errmsg, -1);
+ break;
+ default:
+ rc = StrBuf_write_one_chunk_callback(watcher->fd, 0/*TODO*/, &IO->SendBuf);
+ }
#ifdef BIGBAD_IODBG
fprintf(fd, "Sent: BufSize: %d bytes.\n", rc);
ev_io_start(event_base, &IO->send_event);
}
break;
+ case eSendFile:
+ if (IO->IOB.ChunkSendRemain > 0) {
+ ev_io_start(event_base, &IO->recv_event);
+ } else {
+ assert(IO->ReadDone);
+ IO->NextState = IO->ReadDone(IO);
+ switch(IO->NextState) {
+ case eSendDNSQuery:
+ case eReadDNSReply:
+ case eDBQuery:
+ case eConnect:
+ break;
+ case eSendReply:
+ case eSendMore:
+ case eSendFile:
+ ev_io_start(event_base, &IO->send_event);
+ break;
+ case eReadMessage:
+ case eReadMore:
+ case eReadPayload:
+ case eReadFile:
+ break;
+ case eTerminateConnection:
+ case eAbort:
+ break;
+ }
+ }
+ break;
case eSendReply:
if (StrBufCheckBuffer(&IO->SendBuf) != eReadSuccess)
break;
case eReadMore:
case eReadMessage:
case eReadPayload:
+ case eReadFile:
if (StrBufCheckBuffer(&IO->RecvBuf) == eBufferNotEmpty) {
HandleInbound(IO);
}
switch(IO->NextState) {
case eReadMore:
case eReadMessage:
+ case eReadFile:
ev_io_start(event_base, &IO->recv_event);
break;
case eSendReply:
case eSendMore:
case eReadPayload:
+ case eSendFile:
become_session(IO->CitContext);
IO_send_callback(loop, &IO->send_event, revents);
break;
static void
IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
{
+ const char *errmsg;
ssize_t nbytes;
AsyncIO *IO = watcher->data;
- nbytes = StrBuf_read_one_chunk_callback(watcher->fd, 0 /*TODO */, &IO->RecvBuf);
+ switch (IO->NextState) {
+ case eReadFile:
+ nbytes = FileRecvChunked(&IO->IOB, &errmsg);
+ if (nbytes < 0)
+ StrBufPlain(IO->ErrMsg, errmsg, -1);
+ else
+ {
+ if (IO->IOB.ChunkSendRemain == 0)
+ {
+ IO->NextState = eSendReply;
+ }
+ else
+ return;
+ }
+ break;
+ default:
+ nbytes = StrBuf_read_one_chunk_callback(watcher->fd, 0 /*TODO */, &IO->RecvBuf);
+ break;
+ }
+
#ifdef BIGBAD_IODBG
{
int rv = 0;
syslog(LOG_DEBUG,
"EVENT: Socket Invalid! %s \n",
strerror(errno));
+ ShutDownCLient(IO);
return;
}
}
AsyncIO *IO = watcher->data;
syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
become_session(IO->CitContext);
-
+ assert(IO->DNSFail);
+ assert(IO->DNSQuery->PostDNS);
switch (IO->DNSQuery->PostDNS(IO))
{
case eAbort:
- ShutDownCLient(IO);
+ IO->DNSFail(IO);
default:
break;
}