Merge pull request #53 from aconchillo/multiple-backends

add support for multiple backend (epoll, libevent...)

Author: aconchillo

.github/workflows/guile2.2.yml

@@ -8,9 +8,7 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-22.04
-
     steps:
       - name: Install dependencies
         run: |
@@ -24,9 +22,24 @@ jobs:
         run: ./autogen.sh
       - name: Configure
         run: ./configure
-      - name: Make
-        run: make
-      - name: Run tests
-        run: make check
       - name: Make distribution
         run: make distcheck
+
+  build-libevent:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Install dependencies
+        run: |
+          sudo apt update
+          sudo apt install automake autoconf libtool pkg-config make gcc
+          sudo apt install guile-2.2 guile-2.2-libs guile-2.2-dev
+          sudo apt install gettext texinfo texlive
+          sudo apt install libevent-dev
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Autogen
+        run: ./autogen.sh
+      - name: Configure
+        run: ./configure --disable-epoll
+      - name: Make distribution
+        run: make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-epoll

.github/workflows/guile3.0.yml

@@ -8,9 +8,7 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-22.04
-
     steps:
       - name: Install dependencies
         run: |
@@ -24,9 +22,24 @@ jobs:
         run: ./autogen.sh
       - name: Configure
         run: ./configure
-      - name: Make
-        run: make
-      - name: Run tests
-        run: make check
       - name: Make distribution
         run: make distcheck
+
+  build-libevent:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Install dependencies
+        run: |
+          sudo apt update
+          sudo apt install automake autoconf libtool pkg-config make gcc
+          sudo apt install guile-3.0 guile-3.0-libs guile-3.0-dev
+          sudo apt install gettext texinfo texlive
+          sudo apt install libevent-dev
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Autogen
+        run: ./autogen.sh
+      - name: Configure
+        run: ./configure --disable-epoll
+      - name: Make distribution
+        run: make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-epoll

.gitignore

@@ -1,3 +1,7 @@
+.deps
+.libs
+.dirstamp
+build/
 /INSTALL
 /Makefile
 /Makefile.in
@@ -15,6 +19,8 @@
 /config.log
 /config.status
 /configure
+/configure~
+/configure.ac~
 /env
 /libtool
 /m4/libtool.m4
@@ -23,12 +29,15 @@
 /m4/ltversion.m4
 /m4/lt~obsolete.m4
 /stamp-h1
-/.deps
-/.libs
+/build-aux/ar-lib
 /build-aux/depcomp
-/epoll.la
-/epoll_la-epoll.lo
-*.go
-/fibers.info
 /build-aux/texinfo.tex
+/fibers.info
+/fibers/affinity.scm
 /fibers/config.scm
+/fibers/posix-clocks.scm
+/fibers/events-impl.scm
+*.la
+*.lo
+*.go
+*.o

Makefile.am

@@ -1,5 +1,7 @@
 # fibers
-# Copyright (C) 2016  Andy Wingo <wingo@pobox.com>
+# Copyright (C) 2016 Andy Wingo <wingo@pobox.com>
+# Copyright (C) 2020 Abdulrahman Semrie <hsamireh@gmail.com>
+# Copyright (C) 2020-2022 Aleix Conchillo Flaqué <aconchillo@gmail.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as
@@ -26,42 +28,85 @@ info_TEXINFOS=fibers.texi
 
 SOURCES = \
 	fibers.scm \
+	fibers/affinity.scm \
 	fibers/channels.scm \
 	fibers/conditions.scm \
 	fibers/config.scm \
 	fibers/counter.scm \
+	fibers/events-impl.scm \
 	fibers/deque.scm \
-	fibers/epoll.scm \
 	fibers/interrupts.scm \
 	fibers/io-wakeup.scm \
 	fibers/nameset.scm \
 	fibers/operations.scm \
 	fibers/posix-clocks.scm \
 	fibers/psq.scm \
+	fibers/repl.scm \
 	fibers/scheduler.scm \
 	fibers/stack.scm \
-	fibers/repl.scm \
 	fibers/timers.scm \
 	fibers/web/server.scm \
 	web/server/fibers.scm
 
-BUILT_SOURCES = fibers/config.scm
+BUILT_SOURCES = \
+	fibers/affinity.scm \
+	fibers/config.scm \
+	fibers/events-impl.scm \
+	fibers/posix-clocks.scm
 
 extlibdir = $(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions
-extlib_LTLIBRARIES = epoll.la
 AM_CFLAGS = -I$(srcdir) $(WARN_CFLAGS) $(DEBUG_CFLAGS)
-epoll_la_SOURCES = epoll.c
-epoll_la_CFLAGS = $(AM_CFLAGS) $(GUILE_CFLAGS)
-epoll_la_LIBADD = $(GUILE_LIBS)
-epoll_la_LDFLAGS = -export-dynamic -module
-$(GOBJECTS): epoll.la
+
+extlib_LTLIBRARIES =
+
+if HAVE_LIBEVENT
+extlib_LTLIBRARIES += fibers-libevent.la
+fibers_libevent_la_SOURCES = extensions/libevent.c
+fibers_libevent_la_CFLAGS = $(AM_CFLAGS) $(GUILE_CFLAGS) $(LIBEVENT_CFLAGS) -I$(top_srcdir)/extensions
+fibers_libevent_la_LDFLAGS = -module -no-undefined $(LIBEVENT_LIBS) $(GUILE_LDFLAGS)
+$(GOBJECTS): fibers-libevent.la
+
+fibers/events-impl.scm: Makefile fibers/libevent.scm
+	cp -f $(abs_top_srcdir)/fibers/libevent.scm $(abs_top_builddir)/fibers/events-impl.scm
+else
+if HAVE_EPOLL_WAIT
+extlib_LTLIBRARIES += fibers-epoll.la
+fibers_epoll_la_SOURCES = extensions/epoll.c
+fibers_epoll_la_CFLAGS = $(AM_CFLAGS) $(GUILE_CFLAGS) -I$(top_srcdir)/extensions
+fibers_epoll_la_LIBADD = $(GUILE_LIBS)
+fibers_epoll_la_LDFLAGS = -export-dynamic -module
+$(GOBJECTS): fibers-epoll.la
+
+fibers/events-impl.scm: Makefile fibers/epoll.scm
+	cp -f $(abs_top_srcdir)/fibers/epoll.scm $(abs_top_builddir)/fibers/events-impl.scm
+endif
+endif
+
+if ! HAVE_CLOCK_NANOSLEEP
+extlib_LTLIBRARIES += fibers-clocks.la
+fibers_clocks_la_SOURCES = extensions/$(PLATFORM)/clock-nanosleep.c
+fibers_clocks_la_CFLAGS = $(AM_CFLAGS) $(GUILE_CFLAGS) -I$(top_srcdir)/extensions
+fibers_clocks_la_LDFLAGS = -module -no-undefined $(GUILE_LDFLAGS)
+endif
 
 fibers/config.scm: Makefile fibers/config.scm.in
 	mkdir -p fibers
 	sed -e "s|@extlibdir\@|$(extlibdir)|" \
 	    $(srcdir)/fibers/config.scm.in > fibers/config.scm
 
-CLEANFILES += fibers/config.scm
+fibers/affinity.scm: Makefile fibers/affinity-$(PLATFORM).scm
+	mkdir -p $(abs_top_builddir)/fibers
+	cp -f $(abs_top_srcdir)/fibers/affinity-$(PLATFORM).scm $(abs_top_builddir)/fibers/affinity.scm
+
+fibers/posix-clocks.scm: Makefile fibers/posix-clocks-$(PLATFORM).scm
+	mkdir -p $(abs_top_builddir)/fibers
+	cp -f $(abs_top_srcdir)/fibers/posix-clocks-$(PLATFORM).scm $(abs_top_builddir)/fibers/posix-clocks.scm
+
+CLEANFILES += \
+	fibers/affinity.scm \
+	fibers/config.scm \
+	fibers/events-impl.scm \
+	fibers/posix-clocks.scm
 
 TESTS = \
 	tests/basic.scm \
@@ -70,19 +115,40 @@ TESTS = \
 	tests/foreign.scm \
 	tests/io-wakeup.scm \
 	tests/parameters.scm \
-        tests/ports.scm \
 	tests/preemption.scm \
-	tests/speedup.scm \
+	tests/speedup.scm
+
+# The following tests require SOCK_NONBLOCK and SOCK_CLOEXEC. For now we just
+# run them on a platform that supports epoll (probably Linux).
+if HAVE_EPOLL_WAIT
+TESTS += \
+        tests/ports.scm \
 	tests/concurrent-web-server.scm
+endif
+
 TESTS_ENVIRONMENT=top_srcdir="$(abs_top_srcdir)" ./env $(GUILE) -s
 
 EXTRA_DIST += \
+	$(bin_SCRIPTS) \
+	$(TESTS) \
 	env.in \
-	fibers/config.scm.in \
 	HACKING \
         COPYING.LESSER \
 	README.md \
 	TODO.md \
-	$(bin_SCRIPTS) \
-	$(TESTS) \
+	fibers/config.scm.in \
+	fibers/epoll.scm \
+	fibers/libevent.scm \
+	fibers/affinity-darwin.scm \
+	fibers/affinity-generic.scm \
+	fibers/posix-clocks-darwin.scm \
+	fibers/posix-clocks-generic.scm \
 	examples
+
+# List all extension files here.
+EXTRA_DIST += \
+	extensions/epoll.c \
+	extensions/libevent.c \
+	extensions/clock-nanosleep.h \
+	extensions/darwin/clock-nanosleep.c \
+	extensions/generic/clock-nanosleep.c

build-aux/guile.am

@@ -22,6 +22,6 @@ EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES)
 GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat
 SUFFIXES = .scm .go
 .scm.go:
-	$(AM_V_GEN)$(CROSS_COMPILING_VARIABLE)$(top_builddir)/env	\
+	$(AM_V_GEN)$(CROSS_COMPILING_VARIABLE) $(top_builddir)/env	\
 	  $(GUILE_TOOLS) compile $(GUILE_TARGET) -L "$(abs_top_srcdir)"	\
 	  $(GUILE_WARNINGS) -o "$@" "$<"

configure.ac

@@ -1,6 +1,8 @@
 define(FIBERS_CONFIGURE_COPYRIGHT,[[
 
-Copyright (C) 2016-2022 Andy Wingo <wingo@pobox.com>
+Copyright (C) 2016 Andy Wingo <wingo@pobox.com>
+Copyright (C) 2020 Abdulrahman Semrie <hsamireh@gmail.com>
+Copyright (C) 2020-2022 Aleix Conchillo Flaqué <aconchillo@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as
@@ -18,39 +20,65 @@ License along with this program.  If not, see
 
 ]])
 
-AC_PREREQ(2.52)
-AC_INIT([fibers], [1.1.1])
+AC_PREREQ([2.71])
+AC_INIT([fibers],[1.1.1])
 AC_CONFIG_SRCDIR([env.in])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIRS([m4])
-AM_INIT_AUTOMAKE([serial-tests])
+AM_INIT_AUTOMAKE([subdir-objects serial-tests -Werror foreign])
 AC_COPYRIGHT(FIBERS_CONFIGURE_COPYRIGHT)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 
-AC_DISABLE_STATIC
-
-AC_ISC_POSIX
 AC_PROG_CC
-AC_STDC_HEADERS
-AC_PROG_LIBTOOL
 
-AC_CHECK_HEADERS([sys/epoll.h])
-AC_CHECK_FUNCS([epoll_create epoll_create1])
+LT_INIT([disable-static])
 
 AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = "xyes"])
 
-if test "$cross_compiling" = "no"; then
+if test "x$cross_compiling" = "xno"; then
    GUILE_TARGET=""
 else
    GUILE_TARGET="--target=$host_alias"
 fi
 AC_SUBST([GUILE_TARGET])
 
 WARN_CFLAGS=-Wall
-AC_ARG_ENABLE([Werror], AC_HELP_STRING([--disable-Werror],[Don't stop the build on errors]),
-        [], WARN_CFLAGS="-Wall -Werror")
+AC_ARG_ENABLE([Werror], AS_HELP_STRING([--disable-Werror],[Don't stop the build on errors]),
+    [], WARN_CFLAGS="-Wall -Werror")
 AC_SUBST(WARN_CFLAGS)
 
+AC_ARG_ENABLE([epoll], AS_HELP_STRING([--disable-epoll],[Disable epoll support]),
+    [disable_epoll=yes], [disable_epoll=no])
+
+AC_CHECK_FUNCS(epoll_wait)
+AM_CONDITIONAL([HAVE_EPOLL_WAIT], [test "x$ac_cv_func_epoll_wait" = "xyes"])
+
+AC_CHECK_FUNCS(clock_nanosleep)
+AM_CONDITIONAL([HAVE_CLOCK_NANOSLEEP], [test "x$ac_cv_func_clock_nanosleep" = "xyes"])
+
+# We should update `native_support` variable to yes if any native system
+# (e.g. epoll, kqueue) was found and not disabled.
+AS_IF([test "x$ac_cv_func_epoll_wait" = "xyes"],
+    [AS_IF([test "x$disable_epoll" = "xyes"], [native_support=no],[native_support=yes])],[native_support=no])
+
+# If there's no native support or it was disabled, try libevent.
+AS_IF([test "x$native_support" = "xno"],
+    [PKG_CHECK_MODULES([LIBEVENT], [libevent >= 2.1.0],[have_libevent=yes],
+        [AC_MSG_ERROR([Not found or disabled native support, and libevent was not found either])])])
+
+AM_CONDITIONAL([HAVE_LIBEVENT], [test "x$have_libevent" = "xyes"])
+
+# Detect the target system
+case "$host_os" in
+    *darwin*)
+        PLATFORM=darwin
+        ;;
+    *)
+        PLATFORM=generic
+        ;;
+esac
+AC_SUBST(PLATFORM)
+
 #
 # Check for Guile
 #

env.in

@@ -33,6 +33,12 @@ else
   GUILE_LOAD_COMPILED_PATH=@abs_top_builddir@:$GUILE_LOAD_COMPILED_PATH
 fi
 
+if test "$GUILE_EXTENSIONS_PATH" = ""; then
+  GUILE_EXTENSIONS_PATH=@abs_top_builddir@/.libs
+else
+  GUILE_EXTENSIONS_PATH=@abs_top_builddir@/.libs:$GUILE_EXTENSIONS_PATH
+fi
+
 if test "$LTDL_LIBRARY_PATH" = ""; then
   LTDL_LIBRARY_PATH=@abs_top_builddir@/.libs
 else
@@ -49,6 +55,7 @@ FIBERS_BUILD_DIR=@abs_top_builddir@
 
 export GUILE_LOAD_PATH
 export GUILE_LOAD_COMPILED_PATH
+export GUILE_EXTENSIONS_PATH
 export LTDL_LIBRARY_PATH
 export PATH
 export FIBERS_BUILD_DIR

examples/memcached-client.scm

@@ -12,10 +12,8 @@
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;; Lesser General Public License for more details.
 ;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-;; 02110-1301 USA
+;; You should have received a copy of the GNU Lesser General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 (use-modules (rnrs bytevectors)
              (fibers)