/*
- *
* Copyright (c) 1998-2012 by the citadel.org team
*
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 3.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*/
#include "sysdep.h"
*----------------------------------------------------------------------------*/
extern int evdb_count;
extern pthread_mutex_t DBEventQueueMutex;
+extern pthread_mutex_t DBEventExitQueueMutex;
extern HashList *DBInboundEventQueue;
extern struct ev_loop *event_db;
extern ev_async DBAddJob;
ev_cleanup_init(&IO->db_abort_by_shutdown,
IO_abort_shutdown_callback);
IO->db_abort_by_shutdown.data = IO;
- ev_cleanup_start(event_db, &IO->db_abort_by_shutdown);
pthread_mutex_lock(&DBEventQueueMutex);
+ if (DBInboundEventQueue == NULL)
+ {
+ /* shutting down... */
+ free(h);
+ EVM_syslog(LOG_DEBUG, "DBEVENT Q exiting.\n");
+ pthread_mutex_unlock(&DBEventQueueMutex);
+ return eAbort;
+ }
EVM_syslog(LOG_DEBUG, "DBEVENT Q\n");
i = ++evdb_count ;
Put(DBInboundEventQueue, IKEY(i), h, NULL);
pthread_mutex_unlock(&DBEventQueueMutex);
+ pthread_mutex_lock(&DBEventExitQueueMutex);
+ if (event_db == NULL)
+ {
+ pthread_mutex_unlock(&DBEventExitQueueMutex);
+ return eAbort;
+ }
ev_async_send (event_db, &DBAddJob);
+ pthread_mutex_unlock(&DBEventExitQueueMutex);
+
EVM_syslog(LOG_DEBUG, "DBEVENT Q Done.\n");
return eDBQuery;
}
+void StopDBWatchers(AsyncIO *IO)
+{
+ ev_cleanup_stop(event_db, &IO->db_abort_by_shutdown);
+ ev_idle_stop(event_db, &IO->db_unwind_stack);
+}
+
void ShutDownDBCLient(AsyncIO *IO)
{
CitContext *Ctx =IO->CitContext;
become_session(Ctx);
EVM_syslog(LOG_DEBUG, "DBEVENT Terminating.\n");
- ev_cleanup_stop(event_db, &IO->db_abort_by_shutdown);
+ StopDBWatchers(IO);
assert(IO->DBTerminate);
IO->DBTerminate(IO);
*----------------------------------------------------------------------------*/
extern int evbase_count;
extern pthread_mutex_t EventQueueMutex;
+extern pthread_mutex_t EventExitQueueMutex;
extern HashList *InboundEventQueue;
extern struct ev_loop *event_base;
extern ev_async AddJob;
ev_cleanup_init(&IO->abort_by_shutdown,
IO_abort_shutdown_callback);
IO->abort_by_shutdown.data = IO;
- ev_cleanup_start(event_base, &IO->abort_by_shutdown);
pthread_mutex_lock(&EventQueueMutex);
+ if (InboundEventQueue == NULL)
+ {
+ free(h);
+ /* shutting down... */
+ EVM_syslog(LOG_DEBUG, "EVENT Q exiting.\n");
+ pthread_mutex_unlock(&EventQueueMutex);
+ return eAbort;
+ }
EVM_syslog(LOG_DEBUG, "EVENT Q\n");
i = ++evbase_count;
Put(InboundEventQueue, IKEY(i), h, NULL);
pthread_mutex_unlock(&EventQueueMutex);
+ pthread_mutex_lock(&EventExitQueueMutex);
+ if (event_base == NULL) {
+ pthread_mutex_unlock(&EventExitQueueMutex);
+ return eAbort;
+ }
ev_async_send (event_base, &AddJob);
+ pthread_mutex_unlock(&EventExitQueueMutex);
EVM_syslog(LOG_DEBUG, "EVENT Q Done.\n");
return eSendReply;
}
h->EvAttch = evcurl_handle_start;
pthread_mutex_lock(&EventQueueMutex);
+ if (InboundEventQueue == NULL)
+ {
+ /* shutting down... */
+ free(h);
+ EVM_syslog(LOG_DEBUG, "EVENT Q exiting.\n");
+ pthread_mutex_unlock(&EventQueueMutex);
+ return eAbort;
+ }
+
EVM_syslog(LOG_DEBUG, "EVENT Q\n");
i = ++evbase_count;
Put(InboundEventQueue, IKEY(i), h, NULL);
pthread_mutex_unlock(&EventQueueMutex);
+ pthread_mutex_lock(&EventExitQueueMutex);
+ if (event_base == NULL) {
+ pthread_mutex_unlock(&EventExitQueueMutex);
+ return eAbort;
+ }
ev_async_send (event_base, &AddJob);
+ pthread_mutex_unlock(&EventExitQueueMutex);
+
EVM_syslog(LOG_DEBUG, "EVENT Q Done.\n");
return eSendReply;
}
if (Ctx) {
Ctx->state = CON_IDLE;
Ctx->kill_me = 1;
+ IO->CitContext = NULL;
}
}
-void StopClientWatchers(AsyncIO *IO)
+void StopClientWatchers(AsyncIO *IO, int CloseFD)
{
ev_timer_stop (event_base, &IO->rw_timeout);
ev_timer_stop(event_base, &IO->conn_fail);
ev_idle_stop(event_base, &IO->unwind_stack);
+ ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
+
+ ev_io_stop(event_base, &IO->conn_event);
+ ev_io_stop(event_base, &IO->send_event);
+ ev_io_stop(event_base, &IO->recv_event);
+
+ if (CloseFD && (IO->SendBuf.fd > 0)) {
+ close(IO->SendBuf.fd);
+ IO->SendBuf.fd = 0;
+ IO->RecvBuf.fd = 0;
+ }
+}
+
+void StopCurlWatchers(AsyncIO *IO)
+{
+ ev_timer_stop (event_base, &IO->rw_timeout);
+ ev_timer_stop(event_base, &IO->conn_fail);
+ ev_idle_stop(event_base, &IO->unwind_stack);
+ ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
ev_io_stop(event_base, &IO->conn_event);
ev_io_stop(event_base, &IO->send_event);
EVM_syslog(LOG_DEBUG, "EVENT Terminating \n");
- ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
- StopClientWatchers(IO);
+ StopClientWatchers(IO, 1);
if (IO->DNS.Channel != NULL) {
ares_destroy(IO->DNS.Channel);
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:
StrBufPlain(IO->ErrMsg, errmsg, -1);
break;
default:
- rc = StrBuf_write_one_chunk_callback(watcher->fd,
- 0/*TODO*/,
+ rc = StrBuf_write_one_chunk_callback(IO->SendBuf.fd,
+ 0,
&IO->SendBuf);
}
}
}
else if (rc < 0) {
- IO_Timeout_callback(loop, &IO->rw_timeout, revents);
+ if (errno != EAGAIN) {
+ StopClientWatchers(IO, 1);
+ EV_syslog(LOG_DEBUG,
+ "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.01);
+ }
}
/* else : must write more. */
}
static void
set_start_callback(struct ev_loop *loop, AsyncIO *IO, int revents)
{
+ ev_timer_stop(event_base, &IO->conn_fail);
+ ev_timer_start(event_base, &IO->rw_timeout);
+
switch(IO->NextState) {
case eReadMore:
case eReadMessage:
case eReadFile:
+ StrBufAppendBufPlain(IO->ErrMsg, HKEY("[while waiting for greeting]"), 0);
ev_io_start(event_base, &IO->recv_event);
break;
case eSendReply:
static void
IO_connestd_callback(struct ev_loop *loop, ev_io *watcher, int revents)
{
- AsyncIO *IO = watcher->data;
-
- IO->Now = ev_now(event_base);
- ev_io_stop(loop, &IO->conn_event);
- ev_timer_stop (event_base, &IO->conn_fail);
- set_start_callback(loop, IO, revents);
+ AsyncIO *IO = watcher->data;
+ int so_err = 0;
+ socklen_t lon = sizeof(so_err);
+ int err;
+
+ IO->Now = ev_now(event_base);
+ EVM_syslog(LOG_DEBUG, "connect() succeeded.\n");
+
+ ev_io_stop(loop, &IO->conn_event);
+ ev_timer_stop(event_base, &IO->conn_fail);
+
+ err = getsockopt(IO->SendBuf.fd,
+ SOL_SOCKET,
+ SO_ERROR,
+ (void*)&so_err,
+ &lon);
+
+ if ((err == 0) && (so_err != 0))
+ {
+ EV_syslog(LOG_DEBUG, "connect() failed [%d][%s]\n",
+ so_err,
+ strerror(so_err));
+ IO_connfail_callback(loop, &IO->conn_fail, revents);
+
+ }
+ else
+ {
+ EVM_syslog(LOG_DEBUG, "connect() succeeded\n");
+ set_start_callback(loop, IO, revents);
+ }
}
+
static void
IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
{
}
break;
default:
- nbytes = StrBuf_read_one_chunk_callback(watcher->fd,
- 0 /*TODO */,
+ nbytes = StrBuf_read_one_chunk_callback(IO->RecvBuf.fd,
+ 0,
&IO->RecvBuf);
break;
}
if (nbytes > 0) {
HandleInbound(IO);
} else if (nbytes == 0) {
- IO_Timeout_callback(loop, &IO->rw_timeout, revents);
+ StopClientWatchers(IO, 1);
+ SetNextTimeout(IO, 0.01);
return;
} else if (nbytes == -1) {
- // FD is gone. kick it.
- StopClientWatchers(IO);
- EV_syslog(LOG_DEBUG,
- "EVENT: Socket Invalid! %s \n",
- strerror(errno));
- ShutDownCLient(IO);
+ if (errno != EAGAIN) {
+ // FD is gone. kick it.
+ StopClientWatchers(IO, 1);
+ EV_syslog(LOG_DEBUG,
+ "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.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);
- ev_timer_start(event_base, &IO->rw_timeout);
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)
{
projects / citadel.git / blobdiff