X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fevent_client.c;h=4a2f481a9cafc2412cc7c8fd2ed3b6d8e2a7e2aa;hb=cf7cb2463d47a4a9ed36c8d1c13f188418389437;hp=57a6440102f12ca86d58b83aba96c0f1d1ad76f7;hpb=192056a6112602350c1f8a73eae2e134a31c7ba2;p=citadel.git

diff --git a/citadel/event_client.c b/citadel/event_client.c
index 57a644010..4a2f481a9 100644
--- a/citadel/event_client.c
+++ b/citadel/event_client.c
@@ -2,7 +2,7 @@
  *
  * Copyright (c) 1998-2009 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  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.
@@ -69,9 +69,9 @@
 
 static void IO_abort_shutdown_callback(struct ev_loop *loop, ev_cleanup *watcher, int revents)
 {
-	syslog(LOG_DEBUG, "EVENT Q: %s\n", __FUNCTION__);
-
 	AsyncIO *IO = watcher->data;
+	EV_syslog(LOG_DEBUG, "EVENT Q: %s\n", __FUNCTION__);
+
 	assert(IO->ShutdownAbort);
 	IO->ShutdownAbort(IO);
 }
@@ -101,13 +101,13 @@ eNextState QueueDBOperation(AsyncIO *IO, IO_CallBack CB)
 	ev_cleanup_start(event_db, &IO->db_abort_by_shutdown);
 
 	pthread_mutex_lock(&DBEventQueueMutex);
-	syslog(LOG_DEBUG, "DBEVENT Q\n");
+	EVM_syslog(LOG_DEBUG, "DBEVENT Q\n");
 	i = ++evdb_count ;
 	Put(DBInboundEventQueue, IKEY(i), h, NULL);
 	pthread_mutex_unlock(&DBEventQueueMutex);
 
 	ev_async_send (event_db, &DBAddJob);
-	syslog(LOG_DEBUG, "DBEVENT Q Done.\n");
+	EVM_syslog(LOG_DEBUG, "DBEVENT Q Done.\n");
 	return eDBQuery;
 }
 
@@ -116,7 +116,7 @@ void ShutDownDBCLient(AsyncIO *IO)
 	CitContext *Ctx =IO->CitContext;
 	become_session(Ctx);
 
-	syslog(LOG_DEBUG, "DBEVENT\n");
+	EVM_syslog(LOG_DEBUG, "DBEVENT Terminating.\n");
 	ev_cleanup_stop(event_db, &IO->db_abort_by_shutdown);
 
 	assert(IO->Terminate);
@@ -130,7 +130,7 @@ void
 DB_PerformNext(struct ev_loop *loop, ev_idle *watcher, int revents)
 {
 	AsyncIO *IO = watcher->data;
-	syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
+	EV_syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
 	become_session(IO->CitContext);
 	
 	ev_idle_stop(event_db, &IO->db_unwind_stack);
@@ -154,7 +154,9 @@ DB_PerformNext(struct ev_loop *loop, ev_idle *watcher, int revents)
 		break;
 	case eTerminateConnection:
 	case eAbort:
-	    ShutDownDBCLient(IO);
+		ev_idle_stop(event_db, &IO->db_unwind_stack);
+		ev_cleanup_stop(loop, &IO->db_abort_by_shutdown);
+		ShutDownDBCLient(IO);
 	}
 }
 
@@ -193,13 +195,13 @@ eNextState QueueEventContext(AsyncIO *IO, IO_CallBack CB)
 	ev_cleanup_start(event_base, &IO->abort_by_shutdown);
 
 	pthread_mutex_lock(&EventQueueMutex);
-	syslog(LOG_DEBUG, "EVENT Q\n");
+	EVM_syslog(LOG_DEBUG, "EVENT Q\n");
 	i = ++evbase_count;
 	Put(InboundEventQueue, IKEY(i), h, NULL);
 	pthread_mutex_unlock(&EventQueueMutex);
 
 	ev_async_send (event_base, &AddJob);
-	syslog(LOG_DEBUG, "EVENT Q Done.\n");
+	EVM_syslog(LOG_DEBUG, "EVENT Q Done.\n");
 	return eSendReply;
 }
 
@@ -215,28 +217,16 @@ eNextState QueueCurlContext(AsyncIO *IO)
 	h->EvAttch = evcurl_handle_start;
 
 	pthread_mutex_lock(&EventQueueMutex);
-	syslog(LOG_DEBUG, "EVENT Q\n");
+	EVM_syslog(LOG_DEBUG, "EVENT Q\n");
 	i = ++evbase_count;
 	Put(InboundEventQueue, IKEY(i), h, NULL);
 	pthread_mutex_unlock(&EventQueueMutex);
 
 	ev_async_send (event_base, &AddJob);
-	syslog(LOG_DEBUG, "EVENT Q Done.\n");
+	EVM_syslog(LOG_DEBUG, "EVENT Q Done.\n");
 	return eSendReply;
 }
 
-int ShutDownEventQueue(void)
-{
-	pthread_mutex_lock(&DBEventQueueMutex);
-	ev_async_send (event_db, &DBExitEventLoop);
-	pthread_mutex_unlock(&DBEventQueueMutex);
-
-	pthread_mutex_lock(&EventQueueMutex);
-	ev_async_send (EV_DEFAULT_ &ExitEventLoop);
-	pthread_mutex_unlock(&EventQueueMutex);
-	return 0;
-}
-
 void FreeAsyncIOContents(AsyncIO *IO)
 {
 	FreeStrBuf(&IO->IOBuf);
@@ -264,16 +254,16 @@ void ShutDownCLient(AsyncIO *IO)
 	CitContext *Ctx =IO->CitContext;
 	become_session(Ctx);
 
-	syslog(LOG_DEBUG, "EVENT x %d\n", IO->SendBuf.fd);
+	EVM_syslog(LOG_DEBUG, "EVENT Terminating \n");
 
 	ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
 	StopClientWatchers(IO);
 
-	if (IO->DNSChannel != NULL) {
-		ares_destroy(IO->DNSChannel);
-		ev_io_stop(event_base, &IO->dns_recv_event);
-		ev_io_stop(event_base, &IO->dns_send_event);
-		IO->DNSChannel = NULL;
+	if (IO->DNS.Channel != NULL) {
+		ares_destroy(IO->DNS.Channel);
+		ev_io_stop(event_base, &IO->DNS.recv_event);
+		ev_io_stop(event_base, &IO->DNS.send_event);
+		IO->DNS.Channel = NULL;
 	}
 	assert(IO->Terminate);
 	IO->Terminate(IO);
@@ -679,9 +669,9 @@ IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
 		return;
 	} else if (nbytes == -1) {
 /// TODO: FD is gone. kick it.        sock_buff_invoke_free(sb, errno);
-		syslog(LOG_DEBUG, 
-		       "EVENT: Socket Invalid! %s \n",
-		       strerror(errno));
+		EV_syslog(LOG_DEBUG, 
+			  "EVENT: Socket Invalid! %s \n",
+			  strerror(errno));
 		ShutDownCLient(IO);
 		return;
 	}
@@ -691,24 +681,45 @@ void
 IO_postdns_callback(struct ev_loop *loop, ev_idle *watcher, int revents)
 {
 	AsyncIO *IO = watcher->data;
-	syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
+	EV_syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
 	become_session(IO->CitContext);
-	assert(IO->DNSFail);
-	assert(IO->DNSQuery->PostDNS);
-	switch (IO->DNSQuery->PostDNS(IO))
+	assert(IO->DNS.Fail);
+	assert(IO->DNS.Query->PostDNS);
+	switch (IO->DNS.Query->PostDNS(IO))
 	{
 	case eAbort:
-		IO->DNSFail(IO);
+		switch (IO->DNS.Fail(IO)) {
+		case eAbort:
+			ShutDownCLient(IO);
+		default:
+			break;
+			
+		}
 	default:
-	    break;
+		break;
 	}
 }
 
-eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_rw_timeout)
+
+eNextState EvConnectSock(AsyncIO *IO, 
+			 void *pData, 
+			 double conn_timeout, 
+			 double first_rw_timeout,
+			 int ReadFirst)
 {
 	int fdflags; 
 	int rc = -1;
 
+	IO->Data = pData;
+	become_session(IO->CitContext);
+	
+	if (ReadFirst) {
+		IO->NextState = eReadMessage;
+	}
+	else {
+		IO->NextState = eSendReply;
+	}
+
 	IO->SendBuf.fd = IO->RecvBuf.fd = 
 		socket(
 			(IO->ConnectMe->IPv6)?PF_INET6:PF_INET, 
@@ -716,23 +727,23 @@ eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_r
 			IPPROTO_TCP);
 
 	if (IO->SendBuf.fd < 0) {
-		syslog(LOG_ERR, "EVENT: socket() failed: %s\n", strerror(errno));
+		EV_syslog(LOG_ERR, "EVENT: socket() failed: %s\n", strerror(errno));
 		StrBufPrintf(IO->ErrMsg, "Failed to create socket: %s", strerror(errno));
 		return eAbort;
 	}
 	fdflags = fcntl(IO->SendBuf.fd, F_GETFL);
 	if (fdflags < 0) {
-		syslog(LOG_DEBUG, 
-		       "EVENT: unable to get socket flags! %s \n",
-		       strerror(errno));
+		EV_syslog(LOG_DEBUG, 
+			  "EVENT: unable to get socket flags! %s \n",
+			  strerror(errno));
 		StrBufPrintf(IO->ErrMsg, "Failed to get socket flags: %s", strerror(errno));
 		return eAbort;
 	}
 	fdflags = fdflags | O_NONBLOCK;
 	if (fcntl(IO->SendBuf.fd, F_SETFL, fdflags) < 0) {
-		syslog(LOG_DEBUG, 
-		       "EVENT: unable to set socket nonblocking flags! %s \n",
-		       strerror(errno));
+		EV_syslog(LOG_DEBUG, 
+			  "EVENT: unable to set socket nonblocking flags! %s \n",
+			  strerror(errno));
 		StrBufPrintf(IO->ErrMsg, "Failed to set socket flags: %s", strerror(errno));
 		close(IO->SendBuf.fd);
 		IO->SendBuf.fd = IO->RecvBuf.fd = -1;
@@ -760,13 +771,13 @@ eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_r
 		rc = connect(IO->SendBuf.fd, (struct sockaddr_in *)&IO->ConnectMe->Addr, sizeof(struct sockaddr_in));
 
 	if (rc >= 0){
-		syslog(LOG_DEBUG, "connect() immediate success.\n");
+		EVM_syslog(LOG_DEBUG, "connect() immediate success.\n");
 		set_start_callback(event_base, IO, 0);
 		ev_timer_start(event_base, &IO->rw_timeout);
 		return IO->NextState;
 	}
 	else if (errno == EINPROGRESS) {
-		syslog(LOG_DEBUG, "connect() have to wait now.\n");
+		EVM_syslog(LOG_DEBUG, "connect() have to wait now.\n");
 
 		ev_io_init(&IO->conn_event, IO_connestd_callback, IO->SendBuf.fd, EV_READ|EV_WRITE);
 		IO->conn_event.data = IO;
@@ -781,7 +792,7 @@ eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_r
 		IO->conn_fail_immediate.data = IO;
 		ev_idle_start(event_base, &IO->conn_fail_immediate);
 		
-		syslog(LOG_ERR, "connect() failed: %s\n", strerror(errno));
+		EV_syslog(LOG_ERR, "connect() failed: %s\n", strerror(errno));
 		StrBufPrintf(IO->ErrMsg, "Failed to connect: %s", strerror(errno));
 		return IO->NextState;
 	}
@@ -794,23 +805,6 @@ void SetNextTimeout(AsyncIO *IO, double timeout)
 	ev_timer_again (event_base,  &IO->rw_timeout);
 }
 
-eNextState InitEventIO(AsyncIO *IO, 
-		       void *pData, 
-		       double conn_timeout, 
-		       double first_rw_timeout,
-		       int ReadFirst)
-{
-	IO->Data = pData;
-	become_session(IO->CitContext);
-	
-	if (ReadFirst) {
-		IO->NextState = eReadMessage;
-	}
-	else {
-		IO->NextState = eSendReply;
-	}
-	return event_connect_socket(IO, conn_timeout, first_rw_timeout);
-}
 
 eNextState ReAttachIO(AsyncIO *IO, 
 		      void *pData,