extern ev_async AddJob;
extern ev_async ExitEventLoop;
+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;
+ IO->ShutdownAbort(IO);
+}
int QueueEventContext(AsyncIO *IO, IO_CallBack CB)
{
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_base, &IO->abort_by_shutdown);
citthread_mutex_lock(&EventQueueMutex);
CtdlLogPrintf(CTDL_DEBUG, "EVENT Q\n");
{
CtdlLogPrintf(CTDL_DEBUG, "EVENT x %d\n", IO->sock);
+ ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
+
if (IO->sock != 0)
{
ev_io_stop(event_base, &IO->send_event);
}
void
-IO_postdns_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
+IO_postdns_callback(struct ev_loop *loop, ev_idle *watcher, int revents)
{
AsyncIO *IO = watcher->data;
CtdlLogPrintf(CTDL_DEBUG, "event: %s\n", __FUNCTION__);
- IO->PostDNS(IO);
+ IO->DNSQuery->PostDNS(IO);
}
eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_rw_timeout)
IO->rw_timeout.data = IO;
if (IO->IP6)
- rc = connect(IO->sock, &IO->Addr, sizeof(struct sockaddr_in6));
+ rc = connect(IO->sock, IO->Addr, sizeof(struct sockaddr_in6));
else
- rc = connect(IO->sock, (struct sockaddr_in *)&IO->Addr, sizeof(struct sockaddr_in));
+ rc = connect(IO->sock, (struct sockaddr_in *)IO->Addr, sizeof(struct sockaddr_in));
if (rc >= 0){
//// freeaddrinfo(res);