Removed default evqueue, as it's not used anyway.

src/common/evqueue.c

@@ -22,9 +22,6 @@
 #include "common/evqueue.h"
 #include "common/fdset.h"
 
-/*! \brief Singleton application-wide event queue. */
-evqueue_t *s_evqueue = 0;
-
 evqueue_t *evqueue_new()
 {
 	evqueue_t* q = malloc(sizeof(evqueue_t));

src/common/evqueue.h

@@ -178,23 +178,6 @@ int evqueue_get(evqueue_t *q, event_t *ev);
  */
 int evqueue_add(evqueue_t *q, const event_t *ev);
 
-/* Singleton event queue pointer. */
-extern evqueue_t *s_evqueue;
-
-/*!
- * \brief Event queue singleton.
- */
-static inline evqueue_t *evqueue() {
-	return s_evqueue;
-}
-
-/*!
- * \brief Set event queue singleton.
- */
-static inline void evqueue_set(evqueue_t *q) {
-	s_evqueue = q;
-}
-
 #endif /* _KNOTD_COMMON_EVQUEUE_H_ */
 
 /*! @} */

src/knot/ctl/remote.c

@@ -402,14 +402,15 @@ int remote_unbind(int r)
 
 int remote_poll(int r)
 {
-	if (r < 0) {
-		return -1;
-	}
-
 	/* Wait for events. */
 	fd_set rfds;
 	FD_ZERO(&rfds);
-	FD_SET(r, &rfds);
+	if (r > -1) {
+		FD_SET(r, &rfds);
+	} else {
+		r = -1; /* Make sure n == r + 1 == 0 */
+	}
+
 	return fdset_pselect(r + 1, &rfds, NULL, NULL, NULL, NULL);
 }
 

src/knot/main.c

@@ -151,9 +151,6 @@ int main(int argc, char **argv)
 	sigaction(SIGPIPE, &emptyset, NULL); // Mask
 	rcu_register_thread();
 
-	// Setup event queue
-	evqueue_set(evqueue_new());
-
 	// Initialize log
 	log_init();
 
@@ -315,9 +312,6 @@ int main(int argc, char **argv)
 					ctl_if->address, (char*)buf);
 			remote = remote_bind(ctl_if);
 		}
-		if (remote < 0)
-			remote = evqueue()->fds[EVQUEUE_READFD];
-
 
 		/* Run event loop. */
 		for(;;) {
@@ -422,8 +416,5 @@ static int do_cleanup(server_t *server, char *configf, char *pidf)
 	/* Unhook from RCU */
 	rcu_unregister_thread();
 
-	/* Free event loop. */
-	evqueue_t *q = evqueue();
-	evqueue_free(&q);
 	return 1;
 }

src/tests/xfr_tests.c

@@ -280,9 +280,10 @@ int main(int argc, char **argv)
 		pthread_sigmask(SIG_BLOCK, &sa.sa_mask, NULL);
 
 		/* Run event loop. */
+		evqueue_t *evq = evqueue_new();
 		for(;;) {
 			pthread_sigmask(SIG_UNBLOCK, &sa.sa_mask, NULL);
-			int ret = evqueue_poll(evqueue(), 0, 0);
+			int ret = evqueue_poll(evq, 0, 0);
 			pthread_sigmask(SIG_BLOCK, &sa.sa_mask, NULL);
 
 			/* Interrupts. */
@@ -354,6 +355,7 @@ int main(int argc, char **argv)
 		log_server_fatal("An error occured while "
 				 "starting the server.\n");
 	}
+	evqueue_free(&evq);
 
 	// Stop server and close log
 	server_destroy(&server);
@@ -367,10 +369,6 @@ int main(int argc, char **argv)
 	log_close();
 	free(pidfile);
 
-	// Destroy event loop
-	evqueue_t *q = evqueue();
-	evqueue_free(&q);
-
 	// Free default config filename if exists
 	free(zone);
 	free(config_fn);