if (Ctx) {
Ctx->state = CON_IDLE;
Ctx->kill_me = 1;
+ IO->CitContext = NULL;
}
}
if (CloseFD && (IO->SendBuf.fd > 0)) {
close(IO->SendBuf.fd);
- IO->SendBuf.fd = -1;
- IO->RecvBuf.fd = -1;
+ IO->SendBuf.fd = 0;
+ IO->RecvBuf.fd = 0;
}
}
case eSendMore:
assert(IO->SendDone);
IO->NextState = IO->SendDone(IO);
- ev_io_start(event_base, &IO->send_event);
+ switch (IO->NextState)
+ {
+ case eSendFile:
+ case eSendReply:
+ case eSendMore:
+ case eReadMessage:
+ case eReadPayload:
+ case eReadMore:
+ case eReadFile:
+ ev_io_start(event_base, &IO->send_event);
+ break;
+ case eDBQuery:
+ StopClientWatchers(IO, 0);
+ default:
+ break;
+ }
break;
case eReadPayload:
case eReadMore:
if (errno != EAGAIN) {
StopClientWatchers(IO, 1);
EV_syslog(LOG_DEBUG,
- "EVENT: Socket Invalid! [%d] [%s] [%d]\n",
+ "IO_send_callback(): Socket Invalid! [%d] [%s] [%d]\n",
errno, strerror(errno), IO->SendBuf.fd);
StrBufPrintf(IO->ErrMsg,
"Socket Invalid! [%s]",
strerror(errno));
- SetNextTimeout(IO, 0.0);
+ SetNextTimeout(IO, 0.01);
}
}
/* else : must write more. */
if (nbytes > 0) {
HandleInbound(IO);
} else if (nbytes == 0) {
- SetNextTimeout(IO, 0.0);
+ StopClientWatchers(IO, 1);
+ SetNextTimeout(IO, 0.01);
return;
} else if (nbytes == -1) {
if (errno != EAGAIN) {
// FD is gone. kick it.
StopClientWatchers(IO, 1);
EV_syslog(LOG_DEBUG,
- "EVENT: Socket Invalid! [%d] [%s] [%d]\n",
+ "IO_recv_callback(): Socket Invalid! [%d] [%s] [%d]\n",
errno, strerror(errno), IO->SendBuf.fd);
StrBufPrintf(IO->ErrMsg,
"Socket Invalid! [%s]",
strerror(errno));
- SetNextTimeout(IO, 0.0);
+ SetNextTimeout(IO, 0.01);
}
return;
}
fdflags = fcntl(IO->SendBuf.fd, F_GETFL);
if (fdflags < 0) {
EV_syslog(LOG_ERR,
- "EVENT: unable to get socket flags! %s \n",
+ "EVENT: unable to get socket %d flags! %s \n",
+ IO->SendBuf.fd,
strerror(errno));
StrBufPrintf(IO->ErrMsg,
- "Failed to get socket flags: %s",
+ "Failed to get socket %d flags: %s",
+ IO->SendBuf.fd,
strerror(errno));
close(IO->SendBuf.fd);
IO->SendBuf.fd = IO->RecvBuf.fd = 0;
if (fcntl(IO->SendBuf.fd, F_SETFL, fdflags) < 0) {
EV_syslog(
LOG_ERR,
- "EVENT: unable to set socket nonblocking flags! %s \n",
+ "EVENT: unable to set socket %d nonblocking flags! %s \n",
+ IO->SendBuf.fd,
strerror(errno));
StrBufPrintf(IO->ErrMsg,
"Failed to set socket flags: %s",
}
if (rc >= 0){
- EVM_syslog(LOG_DEBUG, "connect() immediate success.\n");
+ EV_syslog(LOG_DEBUG, "connect() = %d immediate success.\n", IO->SendBuf.fd);
set_start_callback(event_base, IO, 0);
return IO->NextState;
}
else if (errno == EINPROGRESS) {
- EVM_syslog(LOG_DEBUG, "connect() have to wait now.\n");
+ EV_syslog(LOG_DEBUG, "connect() = %d have to wait now.\n", IO->SendBuf.fd);
ev_io_init(&IO->conn_event,
IO_connestd_callback,
IO->conn_fail_immediate.data = IO;
ev_idle_start(event_base, &IO->conn_fail_immediate);
- EV_syslog(LOG_ERR, "connect() failed: %s\n", strerror(errno));
+ EV_syslog(LOG_ERR,
+ "connect() = %d failed: %s\n",
+ IO->SendBuf.fd,
+ strerror(errno));
+
StrBufPrintf(IO->ErrMsg,
"Failed to connect: %s",
strerror(errno));
IO->Data = Data;
IO->CitContext = CloneContext(CC);
- ((CitContext *)IO->CitContext)->session_specific_data = (char*) Data;
+ IO->CitContext->session_specific_data = Data;
+ IO->CitContext->IO = IO;
IO->NextState = NextState;
IO->Data = Data;
IO->CitContext = CloneContext(CC);
- ((CitContext *)IO->CitContext)->session_specific_data = (char*) Data;
+ IO->CitContext->session_specific_data = Data;
+ IO->CitContext->IO = IO;
IO->SendDone = SendDone;
IO->Terminate = Terminate;
}
+
+typedef struct KillOtherSessionContext {
+ AsyncIO IO;
+ AsyncIO *OtherOne;
+}KillOtherSessionContext;
+
+eNextState KillTerminate(AsyncIO *IO)
+{
+ long id;
+ KillOtherSessionContext *Ctx = (KillOtherSessionContext*)IO->Data;
+ EV_syslog(LOG_DEBUG, "%s Exit\n", __FUNCTION__);
+ id = IO->ID;
+ FreeAsyncIOContents(IO);
+ memset(Ctx, 0, sizeof(KillOtherSessionContext));
+ IO->ID = id; /* just for the case we want to analyze it in a coredump */
+ free(Ctx);
+ return eAbort;
+
+}
+
+eNextState KillShutdown(AsyncIO *IO)
+{
+ return eTerminateConnection;
+}
+
+eNextState KillOtherContextNow(AsyncIO *IO)
+{
+ KillOtherSessionContext *Ctx = IO->Data;
+
+ if (Ctx->OtherOne->ShutdownAbort != NULL)
+ Ctx->OtherOne->ShutdownAbort(Ctx->OtherOne);
+ return eTerminateConnection;
+}
+
+void KillAsyncIOContext(AsyncIO *IO)
+{
+ KillOtherSessionContext *Ctx;
+
+ Ctx = (KillOtherSessionContext*) malloc(sizeof(KillOtherSessionContext));
+ memset(Ctx, 0, sizeof(KillOtherSessionContext));
+
+ InitIOStruct(&Ctx->IO,
+ Ctx,
+ eReadMessage,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ KillTerminate,
+ NULL,
+ NULL,
+ NULL,
+ KillShutdown);
+
+ Ctx->OtherOne = IO;
+
+ switch(IO->NextState) {
+ case eSendDNSQuery:
+ case eReadDNSReply:
+
+ case eConnect:
+ case eSendReply:
+ case eSendMore:
+ case eSendFile:
+
+ case eReadMessage:
+ case eReadMore:
+ case eReadPayload:
+ case eReadFile:
+ QueueEventContext(&Ctx->IO, KillOtherContextNow);
+ break;
+ case eDBQuery:
+ QueueDBOperation(&Ctx->IO, KillOtherContextNow);
+ break;
+ case eTerminateConnection:
+ case eAbort:
+ /*hm, its already dying, dunno which Queue its in... */
+ free(Ctx);
+ }
+
+}
+
extern int DebugEventLoopBacktrace;
void EV_backtrace(AsyncIO *IO)
{