X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fevent_client.c;h=0b40edcf4c9ea29ac619c0e4741792fab01f8a8b;hb=57b110370156d70f589924e130fd9c5a56296000;hp=e2b3ba69a84d2f7597aa05f3f80fc329aff5e5bb;hpb=7503f872f1d5fba349e0c6af6a017881fe97316b;p=citadel.git

diff --git a/citadel/event_client.c b/citadel/event_client.c
index e2b3ba69a..0b40edcf4 100644
--- a/citadel/event_client.c
+++ b/citadel/event_client.c
@@ -72,17 +72,9 @@
 #include "ctdl_module.h"
 
 static void IO_Timeout_callback(struct ev_loop *loop, ev_timer *watcher, int revents);
-
 static void IO_abort_shutdown_callback(struct ev_loop *loop,
 				       ev_cleanup *watcher,
-				       int revents)
-{
-	AsyncIO *IO = watcher->data;
-	EV_syslog(LOG_DEBUG, "EVENT Q: %s\n", __FUNCTION__);
-
-	assert(IO->ShutdownAbort);
-	IO->ShutdownAbort(IO);
-}
+				       int revents);
 
 
 /*------------------------------------------------------------------------------
@@ -135,7 +127,8 @@ void
 DB_PerformNext(struct ev_loop *loop, ev_idle *watcher, int revents)
 {
 	AsyncIO *IO = watcher->data;
-	EV_syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
+	IO->Now = ev_now(event_db);
+	EV_syslog(LOG_DEBUG, "%s()", __FUNCTION__);
 	become_session(IO->CitContext);
 
 	ev_idle_stop(event_db, &IO->db_unwind_stack);
@@ -185,6 +178,17 @@ extern struct ev_loop *event_base;
 extern ev_async AddJob;
 extern ev_async ExitEventLoop;
 
+static void IO_abort_shutdown_callback(struct ev_loop *loop,
+				       ev_cleanup *watcher,
+				       int revents)
+{
+	AsyncIO *IO = watcher->data;
+	EV_syslog(LOG_DEBUG, "EVENT Q: %s\n", __FUNCTION__);
+	IO->Now = ev_now(event_base);
+	assert(IO->ShutdownAbort);
+	IO->ShutdownAbort(IO);
+}
+
 
 eNextState QueueEventContext(AsyncIO *IO, IO_CallBack CB)
 {
@@ -388,6 +392,7 @@ IO_send_callback(struct ev_loop *loop, ev_io *watcher, int revents)
 	AsyncIO *IO = watcher->data;
 	const char *errmsg = NULL;
 
+	IO->Now = ev_now(event_base);
 	become_session(IO->CitContext);
 #ifdef BIGBAD_IODBG
 	{
@@ -545,6 +550,7 @@ IO_Timeout_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
 {
 	AsyncIO *IO = watcher->data;
 
+	IO->Now = ev_now(event_base);
 	ev_timer_stop (event_base, &IO->rw_timeout);
 	become_session(IO->CitContext);
 
@@ -572,6 +578,7 @@ IO_connfail_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
 {
 	AsyncIO *IO = watcher->data;
 
+	IO->Now = ev_now(event_base);
 	ev_timer_stop (event_base, &IO->conn_fail);
 
 	if (IO->SendBuf.fd != 0)
@@ -603,6 +610,7 @@ IO_connfailimmediate_callback(struct ev_loop *loop,
 {
 	AsyncIO *IO = watcher->data;
 
+	IO->Now = ev_now(event_base);
 	ev_idle_stop (event_base, &IO->conn_fail_immediate);
 
 	if (IO->SendBuf.fd != 0)
@@ -628,6 +636,9 @@ IO_connestd_callback(struct ev_loop *loop, ev_io *watcher, int revents)
 {
 	AsyncIO *IO = watcher->data;
 
+	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);
 	set_start_callback(loop, IO, revents);
@@ -639,6 +650,7 @@ IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
 	ssize_t nbytes;
 	AsyncIO *IO = watcher->data;
 
+	IO->Now = ev_now(event_base);
 	switch (IO->NextState) {
 	case eReadFile:
 		nbytes = FileRecvChunked(&IO->IOB, &errmsg);
@@ -711,6 +723,7 @@ void
 IO_postdns_callback(struct ev_loop *loop, ev_idle *watcher, int revents)
 {
 	AsyncIO *IO = watcher->data;
+	IO->Now = ev_now(event_base);
 	EV_syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
 	become_session(IO->CitContext);
 	assert(IO->DNS.Query->PostDNS);
@@ -768,7 +781,7 @@ eNextState EvConnectSock(AsyncIO *IO,
 	}
 	fdflags = fcntl(IO->SendBuf.fd, F_GETFL);
 	if (fdflags < 0) {
-		EV_syslog(LOG_DEBUG,
+		EV_syslog(LOG_ERR,
 			  "EVENT: unable to get socket flags! %s \n",
 			  strerror(errno));
 		StrBufPrintf(IO->ErrMsg,
@@ -781,7 +794,7 @@ eNextState EvConnectSock(AsyncIO *IO,
 	fdflags = fdflags | O_NONBLOCK;
 	if (fcntl(IO->SendBuf.fd, F_SETFL, fdflags) < 0) {
 		EV_syslog(
-			LOG_DEBUG,
+			LOG_ERR,
 			"EVENT: unable to set socket nonblocking flags! %s \n",
 			strerror(errno));
 		StrBufPrintf(IO->ErrMsg,
@@ -965,6 +978,7 @@ int InitcURLIOStruct(AsyncIO *IO,
 
 }
 
+extern int DebugEventLoopBacktrace;
 void EV_backtrace(AsyncIO *IO)
 {
 #ifdef HAVE_BACKTRACE
@@ -972,14 +986,17 @@ void EV_backtrace(AsyncIO *IO)
 	size_t size, i;
 	char **strings;
 
-
+	if ((IO == NULL) || (DebugEventLoopBacktrace == 0))
+		return;
 	size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*));
 	strings = backtrace_symbols(stack_frames, size);
 	for (i = 0; i < size; i++) {
-		if (strings != NULL)
+		if (strings != NULL) {
 			EV_syslog(LOG_ALERT, " BT %s\n", strings[i]);
-		else
+		}
+		else {
 			EV_syslog(LOG_ALERT, " BT %p\n", stack_frames[i]);
+		}
 	}
 	free(strings);
 #endif