From 79cd0613fb0df17401c74f7940ef027d848f5429 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Mon, 27 Oct 2014 21:19:27 +0100 Subject: [PATCH] - don't use logfunctions that access the non-owned IO anymore - move stopping of c-ares from free to stop client watchers --- citadel/event_client.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/citadel/event_client.c b/citadel/event_client.c index b3b52e688..120519e7e 100644 --- a/citadel/event_client.c +++ b/citadel/event_client.c @@ -122,7 +122,7 @@ eNextState QueueDBOperation(AsyncIO *IO, IO_CallBack CB) ev_async_send (event_db, &DBAddJob); pthread_mutex_unlock(&DBEventExitQueueMutex); - EVM_syslog(LOG_DEBUG, "DBEVENT Q Done.\n"); + EVQM_syslog(LOG_DEBUG, "DBEVENT Q Done.\n"); return eDBQuery; } @@ -314,7 +314,6 @@ eNextState CurlQueueDBOperation(AsyncIO *IO, IO_CallBack CB) } -void DestructCAres(AsyncIO *IO); void FreeAsyncIOContents(AsyncIO *IO) { CitContext *Ctx = IO->CitContext; @@ -323,8 +322,6 @@ void FreeAsyncIOContents(AsyncIO *IO) FreeStrBuf(&IO->SendBuf.Buf); FreeStrBuf(&IO->RecvBuf.Buf); - DestructCAres(IO); - FreeURL(&IO->ConnectMe); FreeStrBuf(&IO->HttpReq.ReplyData); @@ -336,10 +333,13 @@ void FreeAsyncIOContents(AsyncIO *IO) } +void DestructCAres(AsyncIO *IO); void StopClientWatchers(AsyncIO *IO, int CloseFD) { EVM_syslog(LOG_DEBUG, "EVENT StopClientWatchers"); + DestructCAres(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); -- 2.30.2