libevent in server_child.

git-svn-id: file:///svn/nsd/trunk@3638 a26ef69c-88ff-0310-839f-98b793d9c207

Author: wcawijngaards

doc/ChangeLog

@@ -1,3 +1,6 @@
+27 August 2012: Wouter
+	- libevent in server_child.
+
 21 August 2012: Matthijs
 	- Fix bug#464: Conditionally define MAXHOSTNAMELEN
 

ipc.c

@@ -31,19 +31,17 @@ static void xfrd_send_quit_req(xfrd_state_t* xfrd);
 static void xfrd_handle_ipc_read(struct event* handler, xfrd_state_t* xfrd);
 
 void
-child_handle_parent_command(netio_type *ATTR_UNUSED(netio),
-		      netio_handler_type *handler,
-		      netio_event_types_type event_types)
+child_handle_parent_command(int fd, short event, void* arg)
 {
 	sig_atomic_t mode;
 	int len;
 	struct ipc_handler_conn_data *data =
-		(struct ipc_handler_conn_data *) handler->user_data;
-	if (!(event_types & NETIO_EVENT_READ)) {
+		(struct ipc_handler_conn_data *) arg;
+	if (!(event & EV_READ)) {
 		return;
 	}
 
-	if ((len = read(handler->fd, &mode, sizeof(mode))) == -1) {
+	if ((len = read(fd, &mode, sizeof(mode))) == -1) {
 		log_msg(LOG_ERR, "handle_parent_command: read: %s",
 			strerror(errno));
 		return;
@@ -64,14 +62,14 @@ child_handle_parent_command(netio_type *ATTR_UNUSED(netio),
 #ifdef BIND8_STATS
 		DEBUG(DEBUG_IPC, 2, (LOG_INFO, "quit QUIT_WITH_STATS"));
 		/* reply with ack and stats and then quit */
-		if(!write_socket(handler->fd, &mode, sizeof(mode))) {
+		if(!write_socket(fd, &mode, sizeof(mode))) {
 			log_msg(LOG_ERR, "cannot write quitwst to parent");
 		}
-		if(!write_socket(handler->fd, &data->nsd->st,
+		if(!write_socket(fd, &data->nsd->st,
 			sizeof(data->nsd->st))) {
 			log_msg(LOG_ERR, "cannot write stats to parent");
 		}
-		fsync(handler->fd);
+		fsync(fd);
 #endif /* BIND8_STATS */
 		data->nsd->mode = NSD_QUIT;
 		break;

ipc.h

@@ -75,8 +75,7 @@ void parent_handle_child_command(netio_type *netio,
  * Routine used by server_child.
  * Handle a command received from the parent process.
  */
-void child_handle_parent_command(netio_type *netio,
-	netio_handler_type *handler, netio_event_types_type event_types);
+void child_handle_parent_command(int fd, short event, void* arg);
 
 /*
  * Routine used by xfrd

netio.c

@@ -151,32 +151,7 @@ netio_dispatch(netio_type *netio, const struct timespec *timeout, const sigset_t
 				max_fd = handler->fd;
 			}
 			if (handler->event_types & NETIO_EVENT_READ) {
-				extern int slowaccept;
-				extern struct timespec slowaccept_timeout;
-
-				if ((handler->event_types & NETIO_EVENT_ACCEPT) && slowaccept) {
-					if (timespec_compare(&slowaccept_timeout, netio_current_time(netio)) < 0) {
-						slowaccept = 0;
-					}
-					if (slowaccept) {
-						/** Timeout after slowaccept timeout. */
-						struct timespec relative;
-						relative.tv_sec = slowaccept_timeout.tv_sec;
-						relative.tv_nsec = slowaccept_timeout.tv_nsec;
-						timespec_subtract(&relative, netio_current_time(netio));
-						if (!have_timeout ||
-							timespec_compare(&relative, &minimum_timeout) < 0) {
-							have_timeout = 1;
-							minimum_timeout.tv_sec = relative.tv_sec;
-							minimum_timeout.tv_nsec = relative.tv_nsec;
-						}
-					} else {
-						FD_SET(handler->fd, &readfds);
-					}
-				} else {
-					/* Not accept event or not slow accept */
-					FD_SET(handler->fd, &readfds);
-				}
+				FD_SET(handler->fd, &readfds);
 			}
 			if (handler->event_types & NETIO_EVENT_WRITE) {
 				FD_SET(handler->fd, &writefds);

netio.h

@@ -50,8 +50,6 @@
 
 #include "region-allocator.h"
 
-#define NETIO_SLOW_ACCEPT_TIMEOUT 2 /* in seconds */
-
 /*
  * The type of events a handler is interested in.  These can be OR'ed
  * together to specify multiple event types.
@@ -62,7 +60,6 @@ enum netio_event_types {
 	NETIO_EVENT_WRITE   = 2,
 	NETIO_EVENT_EXCEPT  = 4,
 	NETIO_EVENT_TIMEOUT = 8,
-	NETIO_EVENT_ACCEPT  = 16
 };
 typedef enum netio_event_types netio_event_types_type;
 

nsd.h

@@ -232,8 +232,10 @@ int server_init(struct nsd *nsd);
 int server_prepare(struct nsd *nsd);
 void server_main(struct nsd *nsd);
 void server_child(struct nsd *nsd);
+struct event_base* nsd_child_event_base(void);
 /* extra domain numbers for temporary domains */
 #define EXTRA_DOMAIN_NUMBERS 1024
+#define SLOW_ACCEPT_TIMEOUT 2 /* in seconds */
 /* allocate and init xfrd variables */
 void server_prepare_xfrd(struct nsd *nsd);
 /* start xfrdaemon (again) */

remote.h

@@ -86,7 +86,7 @@ int daemon_remote_open_ports(struct daemon_remote* rc,
  * Setup comm points for accepting remote control connections.
  * @param rc: state
  * @param xfrd: the process that hosts the control connection.
- *	The rc is attached to its netio.
+ *	The rc is attached to its event base.
  */
 void daemon_remote_attach(struct daemon_remote* rc, struct xfrd_state* xfrd);