Add infrastructure for using multiple event loops

This change adds two configuration options:

  --with-eventloop=[glib|internal|auto]
  --with-pollmethod=[epoll|auto]

First allows switching between GLib event loop and internal one.
Second chooses backend to use for internal event loop.
Conditional compilation symbols are changed accordingly.
Additional helper macro MPD_OPTIONAL_FUNC_NODEF is added as well.

1 files changed, 67 insertions, 1 deletions

diff --git a/configure.ac b/configure.ac
index bfd7ed2ff..f7624a0f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,7 +148,6 @@ AC_SEARCH_LIBS([gethostbyname], [nsl])
 AC_CHECK_FUNCS(pipe2 accept4)
 MPD_OPTIONAL_FUNC(eventfd, eventfd, USE_EVENTFD)
 MPD_OPTIONAL_FUNC(signalfd, signalfd, USE_SIGNALFD)
-MPD_OPTIONAL_FUNC(epoll, epoll_create1, USE_EPOLL)
 
 AC_SEARCH_LIBS([exp], [m],,
 	[AC_MSG_ERROR([exp() not found])])
@@ -157,6 +156,63 @@ AC_CHECK_HEADERS(locale.h)
 AC_CHECK_HEADERS(valgrind/memcheck.h)
 
 dnl ---------------------------------------------------------------------------
+dnl Event loop selection
+dnl ---------------------------------------------------------------------------
+
+MPD_OPTIONAL_FUNC_NODEF(epoll, epoll_create1)
+
+AC_ARG_WITH(eventloop,
+	AS_HELP_STRING(
+		[--with-eventloop=@<:@glib|internal|auto@:>@],
+		[specify event loop implementation (default=auto)]),,
+	[with_eventloop=auto])
+
+AC_ARG_WITH(pollmethod,
+	AS_HELP_STRING(
+		[--with-pollmethod=@<:@epoll|auto@:>@],
+		[specify poll method for internal event loop (default=auto)]),,
+	[with_pollmethod=auto])
+
+if test "x$with_eventloop" = xauto; then
+	if test "x$enable_epoll" = xyes; then
+		with_eventloop=internal
+	else
+		with_eventloop=glib
+	fi
+fi
+
+case "$with_eventloop" in
+glib)
+	AC_DEFINE(USE_GLIB_EVENTLOOP, 1,
+		[Define to use GLib event loop])
+	;;
+internal)
+	AC_DEFINE(USE_INTERNAL_EVENTLOOP, 1,
+		[Define to use internal event loop])
+	;;
+*)
+	AC_MSG_ERROR([unknown eventloop option: $with_eventloop])
+	;;
+esac
+
+if test "x$with_eventloop" = xinternal; then
+	if test "x$with_pollmethod" = xauto; then
+		if test "x$enable_epoll" = xyes; then
+			with_pollmethod=epoll
+		else
+			AC_MSG_ERROR([no poll method is available for your platform])
+		fi
+	fi
+	case "$with_pollmethod" in
+	epoll)
+		AC_DEFINE(USE_EPOLL, 1, [Define to poll sockets with epoll])
+		;;
+	*)
+		AC_MSG_ERROR([unknown pollmethod option: $with_pollmethod])
+	esac
+fi
+
+dnl ---------------------------------------------------------------------------
 dnl Allow tools to be specifically built
 dnl ---------------------------------------------------------------------------
 
@@ -1620,6 +1676,16 @@ results(soundcloud,[Soundcloud])
 printf '\n\t'
 results(mms,[MMS])
 
+printf '\nEvent loop:\n\t'
+case $with_eventloop in
+glib)
+	printf 'GLib'
+	;;
+internal)
+	printf 'Internal (%s)' $with_pollmethod
+	;;
+esac
+
 printf '\n\n##########################################\n\n'
 
 echo 'Generating files needed for compilation'