Update ChangeLog and bump version for v1.3.0 release

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>

.gitignore

@@ -1,7 +1,25 @@
+*~
+*.d
+*.o
+*.so
+*.so.*
+*.a
+.deps
+.libs
+compile
+config.*
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
+Makefile
+Makefile.in
+aclocal.m4
+ar-lib
+autom4te.cache
 bench
 test
-.*.d
-*.o
-*~
-libuev.a
-libuev.so.1
+libuev*

.travis.yml

@@ -1,7 +1,9 @@
 # Travis CI integration -- https://travis-ci.org/troglobit/libuev
+# Defaults to GNU GCC and autotools: ./configure && make && make test
 language: c
-compiler:
-  - gcc
+
+# We don't need to install packages, use dockerized build, quicker
+sudo: false
 
 env:
   global:
@@ -15,7 +17,14 @@ addons:
       name: "troglobit/libuev"
       description: "libuEv | Simple event loop for Linux"
     notification_email: troglobit@gmail.com
-    build_command: "make"
+    build_command_prepend: "./autogen && ./configure --enable-examples"
+    build_command: "make clean all"
     branch_pattern: dev
 
-script: make
+# We don't use configure, so we must define our own build script.
+script:
+  - ./autogen.sh
+  - ./configure --disable-silent-rules --enable-examples
+  - make clean
+  - make -j5
+  - make test

CHANGELOG

@@ -1 +0,0 @@
-CHANGELOG.md

CHANGELOG.md

@@ -1,133 +0,0 @@
-Change Log
-==========
-
-All notable changes to the project are documented in this file.
-
-
-[v1.1.0]
---------
-
-Massively improved error handling.
-
-### Changes
-- Handle case when user closes a descriptor *before* stopping a watcher.
-- Handle `EPOLLHUP` and `EPOLLERR`.  Restart `epoll(7)` descriptor and
-  all watchers when an error count reaches a MAX value -- handles stale
-  descriptors or cases when kernel does not notice updated descriptors.
-- Return error when stopping a watcher fails.
-- Update [README.md] with new `uev_*_start()` functions.
-- Bump dev version to 1.1 due to the number of significant changes.
-
-### Fixes
-- Remove `test.c` from `DISTFILES` in `Makefile`.  You need the
-  comeplete sources to build the examples now.  Thanks to @karasz for
-  the heads up on this and the musl libc issue with missing `queue.h`!
-- Fix broken link to [v1.0.5] in this file.
-
-
-[v1.0.5]
---------
-
-### Changes
-- Add `uev_*_start()` functions.
-- Add slightly odd `examples/signal.c` example that utilises `fork()`
-  and causes segfault in child.
-- Renamed `main.c` to `uev.c`
-- Move examples to `examples/` subdirectory
-- Simplify automatic dependency calculation
-- Add [TODO.md] for wishlist items
-- Add [CHANGELOG.md], attempt to align with http://keepachangelog.com
-- Further updates to [README.md]
-
-
-[v1.0.4] - 2015-01-24
----------------------
-
-Minor documentation and build fixes.
-
-Release mainly targeted for [Finit development](https://github.com/troglobit/finit/).
-
-### Changes
-* `test.c` has been simplified/clarified
-* Further updates to [README.md]
-* Minor update to Makefile, change how build progress is echoed
-
-
-[v1.0.3] - 2015-01-24
----------------------
-
-This is a very minor release, with a strong focus on documentation. 
-
-### Changes
-- [README.md], massively updated
-- API documentation, updated
-- Travis CI integration added, https://travis-ci.org/troglobit/libuev
-- Coverity Scan integration, https://scan.coverity.com/projects/3846
-- Clang scan-build support added
-
-
-[v1.0.2] - 2015-01-07
----------------------
-
-### Fixes
-- Fix broken `make dist` target in [v1.0.1].
-
-
-[v1.0.1] - 2015-01-07
----------------------
-
-### Changes
-- Cleanup and rewrite of [README.md] after first audit by @vonj
-- Added API and example section to [README.md]
-- New [joystick.c] example added
-- `main.c:uev_run()`: Document mysterious flags parameter
-
-
-[v1.0.0] - 2013-08-06
----------------------
-
-First release in the new guise and API.
-
-### Changes
-- Add support for timers, using `timerfd_*()` and `epoll()` API's
-- Add support for signals using `signalfd()` API
-- Convert to use BSD `sys/queue.h` API in GLIBC instead of homebrew
-  linked list implementation
-- Massive changes to code structure, API naming
-- Reindent to use Linux KNF
-- Change library name to libuev
-- Lua support removed
-- Make sure to state the [MIT license] correctly in all files
-- Import [Niels Provos]' `bench.c`, the [libev version]
-
-
-v0.0.1 - 2012-03-17
--------------------
-
-[Initial announcement] of [libuevent] by [Flemming Madsen] to the Lua
-users mailing list.
-
-[UNRELEASED]: https://github.com/troglobit/libuev/compare/v1.1,0...HEAD
-[v1.1.0]: https://github.com/troglobit/libuev/compare/v1.0.5...v1.1.0
-[v1.0.5]: https://github.com/troglobit/libuev/compare/v1.0.4...v1.0.5
-[v1.0.4]: https://github.com/troglobit/libuev/compare/v1.0.3...v1.0.4
-[v1.0.3]: https://github.com/troglobit/libuev/compare/v1.0.2...v1.0.3
-[v1.0.2]: https://github.com/troglobit/libuev/compare/v1.0.1...v1.0.2
-[v1.0.1]: https://github.com/troglobit/libuev/compare/v1.0.0...v1.0.1
-[v1.0.0]: https://github.com/troglobit/libuev/compare/v0.0.1...v1.0.0
-[TODO.md]: https://github.com/troglobit/libuev/blob/master/TODO.md
-[README.md]: https://github.com/troglobit/libuev/blob/master/README.md
-[CHANGLOG.md]: https://github.com/troglobit/libuev/blob/master/CHANGELOG.md
-[joystick.c]: https://github.com/troglobit/libuev/blob/master/joystick.c
-[Niels Provos]: http://en.wikipedia.org/wiki/Niels_Provos
-[MIT license]: http://en.wikipedia.org/wiki/MIT_License
-[libev version]: http://libev.schmorp.de/bench.c
-[libuevent]: https://code.google.com/p/libuevent/
-[Flemming Madsen]: http://www.madsensoft.dk
-[Initial announcement]: http://lua-users.org/lists/lua-l/2012-03/msg00510.html
-
-<!--
-  -- Local Variables:
-  --  mode: markdown
-  -- End:
-  -->

ChangeLog

@@ -0,0 +1 @@
+ChangeLog.md

ChangeLog.md

@@ -0,0 +1,225 @@
+Change Log
+==========
+
+All notable changes to the project are documented in this file.
+
+
+[v1.3.0][] - 2016-01-22
+-----------------------
+
+### Changes
+- Change to GNU configure and build system
+- Default optimization is now -O2, not -Os, which can be a bit
+  unpredictable with some cross compiler toolchains.  -O2 is
+  the tried and tested path, and default in autotools
+- Added `-Wextra` to the previous `-W -Wall`, drop `-Werror`
+  which is supposed to be used by maintainer(s) only.
+
+
+[v1.2.4][] - 2015-11-23
+-----------------------
+
+### Fixes
+
+- Do not allow `VERSION` to be overloaded by build system.
+- Make sure we don't inherit `LDFLAGS` from environment.
+
+
+[v1.2.3][] - 2015-09-17
+-----------------------
+
+Very minor release.
+
+### Changes
+- [README.md][] updates, mostly cleanup and readability improvements
+- `make test` now runs the test case, on behalf of Travis-CI
+- Renamed CHANGELOG.md to [ChangeLog.md][]
+- Dropped [TODO.md][] from distribution archives, only for devs
+
+### Fixes
+- Lots of Markdown syntax fixes in both README and ChangeLog
+- Silence annoying warning from newer GNU ar in Ubuntu 15.10
+
+
+[v1.2.2][] - 2015-08-30
+-----------------------
+
+Minor bugfix release.
+
+### Changes
+- The `ifdef STATIC` in the Makefile has been removed.  Now both the
+  .a and .so libraries are built.  The user may then select what to
+  install.  This is a change for convenience when using libuEv from
+  a GNU Configure & Build based project.
+
+### Fixes
+- Fix odd data ordering issue on Debian Jessie in new `uev_private_t`
+- Fix issue #6: Segfault when stopping timer before calling `uev_exit()`
+
+
+[v1.2.1][] - 2015-07-02
+-----------------------
+
+### Changes
+- Private data members in `uev.h` have now been moved to a new file
+  called `private.h`.  This will hopefully make it easier to understand
+  what a user of libuEv is allowed to play around with.  Thanks to @vonj
+  for the discussions around this!
+- All builds of libuEv now default to use -fPIC, this bloats the code
+  slightly, but ensures that linking works for all use cases, withouth
+  introducing unnecessary complexity.
+
+### Fixes
+- Fix install/uninstall Makefile recipes so they work for both static
+  and dynamic builds.  Also, make sure to install all required headers.
+- Jakob Eriksson noticed that `O_CLOEXEC` does not exist in the Debian 6
+  EGLIBC, but `EPOLL_CLOEXEC` does, and is also what `epoll_create1()`
+  should use.  Thank you @vonj!
+
+
+[v1.2.0][] - 2015-06-09
+-----------------------
+
+API change in event callbacks and fix timers that never start.
+
+### Changes
+- Remove first `uev_ctx_t *` argument in callbacks, incompatible API
+  change!  Please update all your callbacks if you upgrade.
+
+### Fixes
+- Fix timers that accidentally broke in [v1.1.0][].
+- Fixes to `bench.c`, it now actually listens to the pipe/socket.
+
+
+[v1.1.0][] - 2015-03-04
+-----------------------
+
+Massively improved error handling.
+
+### Changes
+- Handle case when user closes a descriptor *before* stopping a watcher.
+- Handle `EPOLLHUP` and `EPOLLERR`.  Restart `epoll(7)` descriptor and
+  all watchers when an error count reaches a MAX value -- handles stale
+  descriptors or cases when kernel does not notice updated descriptors.
+- Return error when stopping a watcher fails.
+- Update [README.md][] with new `uev_*_start()` functions.
+- Bump dev version to 1.1 due to the number of significant changes.
+
+### Fixes
+- Remove `test.c` from `DISTFILES` in `Makefile`.  You need the
+  comeplete sources to build the examples now.  Thanks to @karasz for
+  the heads up on this and the musl libc issue with missing `queue.h`!
+- Fix broken link to [v1.0.5][] in this file.
+
+
+[v1.0.5][] - 2015-02-15
+-----------------------
+
+### Changes
+- Add `uev_*_start()` functions.
+- Add slightly odd `examples/signal.c` example that utilises `fork()`
+  and causes segfault in child.
+- Renamed `main.c` to `uev.c`
+- Move examples to `examples/` subdirectory
+- Simplify automatic dependency calculation
+- Add [TODO.md][] for wishlist items
+- Add [CHANGELOG.md][ChangeLog.md], to align with http://keepachangelog.com
+- Further updates to [README.md][]
+
+
+[v1.0.4][] - 2015-01-24
+-----------------------
+
+Minor documentation and build fixes.
+
+Release mainly targeted for [Finit development](https://github.com/troglobit/finit/).
+
+### Changes
+* `test.c` has been simplified/clarified
+* Further updates to [README.md][]
+* Minor update to Makefile, change how build progress is echoed
+
+
+[v1.0.3][] - 2015-01-24
+-----------------------
+
+This is a very minor release, with a strong focus on documentation. 
+
+### Changes
+- [README.md][], massively updated
+- API documentation, updated
+- Travis CI integration added, https://travis-ci.org/troglobit/libuev
+- Coverity Scan integration, https://scan.coverity.com/projects/3846
+- Clang scan-build support added
+
+
+[v1.0.2][] - 2015-01-07
+-----------------------
+
+### Fixes
+- Fix broken `make dist` target in [v1.0.1][].
+
+
+[v1.0.1][] - 2015-01-07
+-----------------------
+
+### Changes
+- Cleanup and rewrite of [README.md][] after first audit by @vonj
+- Added API and example section to [README.md][]
+- New [joystick.c][] example added
+- `main.c:uev_run()`: Document mysterious flags parameter
+
+
+[v1.0.0][] - 2013-08-06
+-----------------------
+
+First release in the new guise and API.
+
+### Changes
+- Add support for timers, using `timerfd_*()` and `epoll()` API's
+- Add support for signals using `signalfd()` API
+- Convert to use BSD `sys/queue.h` API in GLIBC instead of homebrew
+  linked list implementation
+- Massive changes to code structure, API naming
+- Reindent to use Linux KNF
+- Change library name to libuev
+- Lua support removed
+- Make sure to state the [MIT license][] correctly in all files
+- Import [Niels Provos][]' `bench.c`, the [libev version][]
+
+
+v0.0.1 - 2012-03-17
+-------------------
+
+[Initial announcement][] of [libuevent][] by [Flemming Madsen][] to the
+Lua users mailing list.
+
+
+[UNRELEASED]: https://github.com/troglobit/libuev/compare/v1.2.3...HEAD
+[v1.2.3]: https://github.com/troglobit/libuev/compare/v1.2.2...v1.2.3
+[v1.2.2]: https://github.com/troglobit/libuev/compare/v1.2.1...v1.2.2
+[v1.2.1]: https://github.com/troglobit/libuev/compare/v1.2.0...v1.2.1
+[v1.2.0]: https://github.com/troglobit/libuev/compare/v1.1.0...v1.2.0
+[v1.1.0]: https://github.com/troglobit/libuev/compare/v1.0.5...v1.1.0
+[v1.0.5]: https://github.com/troglobit/libuev/compare/v1.0.4...v1.0.5
+[v1.0.4]: https://github.com/troglobit/libuev/compare/v1.0.3...v1.0.4
+[v1.0.3]: https://github.com/troglobit/libuev/compare/v1.0.2...v1.0.3
+[v1.0.2]: https://github.com/troglobit/libuev/compare/v1.0.1...v1.0.2
+[v1.0.1]: https://github.com/troglobit/libuev/compare/v1.0.0...v1.0.1
+[v1.0.0]: https://github.com/troglobit/libuev/compare/v0.0.1...v1.0.0
+[TODO.md]: https://github.com/troglobit/libuev/blob/master/TODO.md
+[README.md]: https://github.com/troglobit/libuev/blob/master/README.md
+[ChangeLog.md]: https://github.com/troglobit/libuev/blob/master/ChangeLog.md
+[joystick.c]: https://github.com/troglobit/libuev/blob/master/joystick.c
+[Niels Provos]: http://en.wikipedia.org/wiki/Niels_Provos
+[MIT license]: http://en.wikipedia.org/wiki/MIT_License
+[libev version]: http://libev.schmorp.de/bench.c
+[libuevent]: https://code.google.com/p/libuevent/
+[Flemming Madsen]: http://www.madsensoft.dk
+[Initial announcement]: http://lua-users.org/lists/lua-l/2012-03/msg00510.html
+
+<!--
+  -- Local Variables:
+  --  mode: markdown
+  -- End:
+  -->

Makefile

@@ -1,128 +0,0 @@
-# libuEv main build file
-#
-# Copyright (c) 2012       Flemming Madsen <flemming!madsen()madsensoft!dk>
-# Copyright (c) 2013-2015  Joachim Nilsson <troglobit()gmail!com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-.PHONY: all test clean joystick test examples
-
-#VERSION    = $(shell git tag -l | tail -1)
-VERSION    ?= 1.1.0
-NAME        = libuev
-PKG         = $(NAME)-$(VERSION)
-ARCHIVE     = $(PKG).tar.xz
-
-CC         ?= $(CROSS)gcc
-AR         ?= $(CROSS)ar
-STRIP      ?= $(CROSS)strip
-CFLAGS     += -fPIC -Os
-CPPFLAGS   += -W -Wall -Werror
-ARFLAGS     = crus
-JUNK        = *~ *.bak *.map .*.d DEADJOE *.gdb *.elf core core.* *.html
-
-MAKEFLAGS   = --no-print-directory
-
-ROOTDIR    ?= $(shell pwd)
-LIBNAME     = $(NAME)
-prefix     ?= /usr/local
-libdir     ?= $(prefix)/lib
-datadir    ?= $(prefix)/share/doc/$(LIBNAME)
-incdir     ?= $(prefix)/include
-DISTFILES   = README CHANGELOG TODO LICENSE
-HEADER      = uev.h
-
-OBJS       := uev.o io.o timer.o signal.o
-SRCS       := $(OBJS:.o=.c)
-DEPS       := $(SRCS:.c=.d)
-VER         = 1
-SOLIB       = $(LIBNAME).so.$(VER)
-SYMLIB      = $(LIBNAME).so
-STATICLIB   = $(LIBNAME).a
-TARGET      = $(STATICLIB) $(SOLIB)
-
-export STATICLIB JUNK ROOTDIR CFLAGS CPPFLAGS
-
-# This magic trick looks like a comment, but works on BSD PMake
-#include <rules.mk>
-include rules.mk
-
-# Build rules
-all: $(TARGET)
-
-$(SOLIB): Makefile $(OBJS)
-	@printf "  LINK    $@\n"
-	@$(CC) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS)
-
-$(STATICLIB): Makefile $(OBJS)
-	@printf "  ARCHIVE $@\n"
-	@$(AR) $(ARFLAGS) $@ $(OBJS)
-
-install: strip
-	@install -d $(DESTDIR)$(libdir)
-	@install $(SOLIB) $(DESTDIR)$(prefix)/lib/$(SOLIB)
-	@install $(STATICLIB) $(DESTDIR)$(prefix)/lib/$(STATICLIB)
-	@ln -sf $(SOLIB) $(DESTDIR)$(prefix)/lib/$(SYMLIB)
-	@install -d $(DESTDIR)$(incdir)
-	@install -m 0644 $(HEADER) $(DESTDIR)$(incdir)/$(HEADER)
-	@install -d $(DESTDIR)$(datadir)
-	@for file in $(DISTFILES); do \
-		install -m 0644 $$file $(DESTDIR)$(datadir)/$$file; \
-	done
-
-uninstall:
-	-@$(RM) -r $(DESTDIR)$(datadir)
-	-@$(RM) -r $(DESTDIR)$(incdir)
-	-@$(RM) $(DESTDIR)$(prefix)/lib/$(LIBNAME)*
-
-strip: $(TARGET)
-	@printf "  STRIP   %s\n" $(TARGET)
-	@$(STRIP) --strip-unneeded $(TARGET)
-	@size $(TARGET)
-
-bench: Makefile bench.o $(STATICLIB)
-	@printf "  BENCH   %s\n" $(STATICLIB)
-	@$(CC) $(CPPFLAGS) -g -o bench bench.c $(STATICLIB) && ./bench
-
-examples: all
-	@$(MAKE) -C examples
-
-test joystick:
-	@$(MAKE) -C examples $@
-
-# Runs Clang scan-build on the whole tree
-check: clean
-	@scan-build $(MAKE) all
-
-clean:
-	-@$(MAKE) -C examples $@
-	-@$(RM) $(TARGET) *.o test joystick bench
-
-distclean: clean
-	-@$(MAKE) -C examples $@
-	-@$(RM) $(DEPS) $(JUNK)
-
-dist:
-	@echo "Building .xz tarball of $(PKG) in parent dir..."
-	git archive --format=tar --prefix=$(PKG)/ v$(VERSION) | xz >../$(ARCHIVE)
-	@(cd ..; md5sum $(ARCHIVE) | tee $(ARCHIVE).md5)
-
-# Include automatically generated rules
--include $(DEPS)

Makefile.am

@@ -0,0 +1,66 @@
+ACLOCAL_AMFLAGS     = -I m4
+
+lib_LTLIBRARIES     = libuev.la
+pkginclude_HEADERS  = uev.h private.h queue.h
+libuev_la_SOURCES   = uev.c io.c timer.c signal.c
+
+check_PROGRAMS      = bench
+bench_CPPFLAGS      = -D_GNU_SOURCE
+bench_LDADD         = $(top_srcdir)/libuev.la
+
+libuev_la_CPPFLAGS  = -D_GNU_SOURCE
+libuev_la_CFLAGS    = -W -Wall -Wextra
+libuev_la_LDFLAGS   = $(AM_LDFLAGS) -version-info 1:0:0
+
+doc_DATA            = README LICENSE
+#EXTRA_DIST          = README.md AUTHORS LICENSE ChangeLog.md
+
+DIST_SUBDIRS        = examples
+SUBDIRS             = .
+if ENABLE_EXAMPLES
+  SUBDIRS          += examples
+endif
+
+test joystick: all-recursive
+	./examples/$@
+
+check-local:
+	@echo "  BENCH    $(PACKAGE)"
+	@./bench
+if ENABLE_EXAMPLES
+	@echo "  TEST     $(PACKAGE)"
+	@./examples/test
+endif
+
+## Generate MD5 checksum file
+MD5 = md5sum
+md5-dist:
+	@for file in $(DIST_ARCHIVES); do	\
+		$(MD5) $$file > $$file.md5;	\
+	done
+
+## Check if tagged in git
+release-hook:
+	if [ ! `git tag | grep $(PACKAGE_VERSION)` ]; then				\
+		echo;									\
+		printf "\e[1m\e[41mCannot find release tag $(PACKAGE_VERSION)\e[0m\n";	\
+		printf "\e[1m\e[5mDo release anyway?\e[0m "; read yorn;			\
+		if [ "$$yorn" != "y" -a "$$yorn" != "Y" ]; then				\
+			printf "OK, aborting release.\n";				\
+			exit 1;								\
+		fi;									\
+		echo;									\
+	else										\
+		echo;									\
+		printf "\e[1m\e[42mFound GIT release tag $(PACKAGE_VERSION)\e[0m\n";	\
+		printf "\e[1m\e[44m>>Remember to push tags!\e[0m\n";			\
+		echo;									\
+	fi
+
+## Target to run when building a release
+release: dist release-hook md5-dist
+	@for file in $(DIST_ARCHIVES); do						\
+		printf "$$file    \tDistribution tarball\n";				\
+		printf "$$file.md5\t"; cat $$file.md5 | cut -f1 -d' ';			\
+		mv $$file* ../;								\
+	done

README.md

@@ -1,6 +1,6 @@
 libuEv | Simple event loop for Linux
 ====================================
-[![Travis Status]][Travis] [![Coverity Status]][Coverity Scan]
+[![Travis Status][]][Travis] [![Coverity Status][]][Coverity Scan]
 
 
 Table of Contents
@@ -8,7 +8,11 @@ Table of Contents
 
 * [Introduction](#introduction)
 * [API](#api)
-* [Example](#example)
+  * [Create an Event Context](#create-an-event-context)
+  * [Register an Event Watcher](#register-an-event-watcher)
+  * [Start Event Loop](#start-event-loop)
+  * [Summary](#summary)
+* [Joystick Example](#joystick-example)
 * [Build & Install](#build--install)
 * [Origin & References](#origin--references)
 
@@ -44,13 +48,13 @@ core, even though they run Linux, with multiple threads a program may
 actually run slower!  Always profile your program, and if possible, test
 it on different architectures.
 
-[libuEv] is a simple event loop in the style of the more established
+[libuEv][] is a simple event loop in the style of the more established
 [libevent][1], [libev][2] and the venerable [Xt(3)][3] event loop.  The
 *u* (micro) in the name refers to both the small feature set and the
 small size overhead impact of the library.  The primary target of
-[libuEv] is a modern Linux system.
+[libuEv][] is a modern Linux system.
 
-Experienced developers may appreciate that [libuEv] is built on top of
+Experienced developers may appreciate that [libuEv][] is built on top of
 modern Linux APIs: epoll, timerfd and signalfd.  Note, a certain amount
 of care is needed when dealing with APIs that employ signalfd.  For
 details, see [this article][4] at [lwn.net](http://lwn.net).
@@ -61,17 +65,19 @@ details, see [this article][4] at [lwn.net](http://lwn.net).
 API
 ---
 
-Here is the interface to [libuEv].  It handles three different types of
-events: I/O (files, sockets, message queues, etc.), timers, and signals.
+The C interface to [libuEv][] is very simple.  It handles three different
+types of events: I/O (files, sockets, message queues, etc.), timers, and
+signals.  With a slight caveat on signals
 
 ```C
+
     /* Callback example, arg is passed from watcher's *_init()
      * w->fd holds the file descriptor, events is set by libuEv
      * to indicate if any of UEV_READ and/or UEV_WRITE is ready.
      */
-    void callback       (uev_ctx_t *ctx, uev_t *w, void *arg, int events);
+    void callback       (uev_t *w, void *arg, int events);
 
-    /* Event loop functions, notice use of flags! */
+    /* Event loop:      Notice the use of flags! */
     int uev_init        (uev_ctx_t *ctx);
     int uev_exit        (uev_ctx_t *ctx);
     int uev_run         (uev_ctx_t *ctx, int flags);         /* UEV_NONE, UEV_ONCE, and/or UEV_NONBLOCK */
@@ -93,35 +99,85 @@ events: I/O (files, sockets, message queues, etc.), timers, and signals.
     int uev_signal_set  (uev_t *w, int signo);               /* Change signal to wait for */
     int uev_signal_start(uev_t *w);                          /* Restart a stopped signal watcher */
     int uev_signal_stop (uev_t *w);                          /* Stop signal watcher */
+
 ```
 
-To be able to set up callbacks to events the developer first need to
-create an *event context*, achieved by calling `uev_init()` with a
-pointer to a local `uev_ctx_t` variable.
+### Create an Event Context
 
-Events are monitored by watchers in [libuEv].  A watcher is nothing more
-than a mechnism that polls a file descriptor.  Register a watcher with a
-callback to the event context by passing the `uev_ctx_t` variable, along
-with an `uev_t` variable to each event's `_init()` function.
+To monitor events the developer first creates an *event context*, this
+is achieved by calling `uev_init()` with a pointer to a (thread) local
+`uev_ctx_t` variable.
 
-When all watchers are registered call the event loop with `uev_run()`
-and the argument to the event context.  The `flags` parameter is slightly
-mysterious, but can be used to integrate [libuEv] into another event loop.
-With `flags` set to `UEV_ONCE` the event loop returns after having
+```C
+
+    uev_ctx_t ctx;
+    
+    uev_init(&ctx);
+
+```
+
+
+### Register an Event Watcher
+
+For each event to monitor, be it a signal, timer or file descriptor, a
+*watcher* must be registered with the event context.  The watcher, an
+`uev_t`, is registered by calling the event type's `_init()` function
+with the `uev_ctx_t` context, the callback, and an optional argument.
+
+Here is a signal example:
+
+```C
+
+    void cleanup_exit(uev_t *w, void *arg, int events)
+    {
+        /* Graceful exit, with optional cleanup ... */
+        uev_exit(w->ctx);
+    }
+    
+    int main(void)
+	{
+	    uev_t sigterm_watcher;
+        .
+		.
+		.
+        uev_signal_init(&ctx, &sigterm_watcher, cleanup_exit, NULL, SIGTERM);
+		.
+		.
+		.
+	}
+
+```
+
+
+### Start Event Loop
+
+When all watchers are registered, call the *event loop* with `uev_run()`
+and the argument to the event context.  The `flags` parameter can be
+used to integrate [libuEv][] into another event loop.
+
+In this example we set `flags` to none:
+
+```C
+
+    uev_run(&ctx, UEV_NONE);
+
+```
+
+With `flags` set to `UEV_ONCE` the event loop returns as soon as it has
 served the first event.  If `flags` is set to `UEV_ONCE | UEV_NONBLOCK`
 the event loop returns immediately if no event is available.
 
-In the case of errors, stream close, or peer shutdown libuEv handles
-much internally, but also lets the callback run.  This is useful for
-stateful connections to be able to detect EOF.
+**Note:** libuEv handles many types of errors, stream close, or peer
+shutdowns internally, but also lets the callback run.  This is useful
+for stateful connections to be able to detect EOF.
 
-Summary:
+### Summary
 
-1. Prepare an event context with `uev_init()`
-2. Register event callbacks with `uev_io_init()`, `uev_signal_init()`
-   or `uev_timer_init()`
-3. Enter the event loop with `uev_run()`
-4. Leave the event loop with `uev_exit()`, possibly from a callback
+1. Set up an event context with `uev_init()`
+2. Register event callbacks with the event context using
+   `uev_io_init()`, `uev_signal_init()` or `uev_timer_init()`
+3. Start the event loop with `uev_run()`
+4. Exit the event loop with `uev_exit()`, possibly from a callback
 
 **Note 1:** Make sure to use non-blocking stream I/O!  Most hard to find
 bugs in event driven applications are due to sockets and files being
@@ -141,61 +197,63 @@ of this, from [finit][6], implementing `run()` as a better replacement
 to `system()`, which sucks anyawy :)
 
 
-Example
--------
+Joystick Example
+----------------
 
-Here follows a very brief example to illustrate how one can use [libuEv]
-to act upon joystick input.
+Here follows a very brief example to illustrate how one can use
+[libuEv][] to act upon joystick input.
 
 ```C
-#include <err.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <fcntl.h>
-#include <unistd.h>
 
-#include "uev.h"
+    #include <err.h>
+    #include <errno.h>
+    #include <stdio.h>
+    #include <stdint.h>
+    #include <fcntl.h>
+    #include <unistd.h>
+    
+    #include "uev.h"
+    
+    struct js_event {
+    	uint32_t time;		/* event timestamp in milliseconds */
+    	int16_t  value;		/* value */
+    	uint8_t  type;		/* event type */
+    	uint8_t  number;	/* axis/button number */
+    } e;
+    
+    static void joystick_cb(uev_t *w, void *arg, int events)
+    {
+    	read (w->fd, &e, sizeof(e));
+    
+    	switch (e.type) {
+    	case 1:
+    		if (e.value) printf("Button %d pressed\n", e.number);
+    		else 	     printf("Button %d released\n", e.number);
+    		break;
+    
+    	case 2:
+    		printf("Joystick axis %d moved, value %d!\n", e.number, e.value);
+    		break;
+    	}
+    }
+    
+    int main(void)
+    {
+    	int       fd = open("/dev/input/js1", O_RDONLY, O_NONBLOCK);
+    	uev_t     js1_watcher;
+    	uev_ctx_t ctx;
+    
+    	if (fd < 0)
+    		errx(errno, "Cannot find a joystick attached.");
+    
+    	uev_init(&ctx);
+    	uev_io_init(&ctx, &js1_watcher, joystick_cb, NULL, fd, UEV_READ);
+    
+    	puts("Starting, press Ctrl-C to exit.");
+    
+    	return uev_run(&ctx, 0);
+    }
 
-struct js_event {
-	uint32_t time;		/* event timestamp in milliseconds */
-	int16_t  value;		/* value */
-	uint8_t  type;		/* event type */
-	uint8_t  number;	/* axis/button number */
-} e;
-
-static void joystick_cb(uev_ctx_t *ctx, uev_t *w, void *arg, int events)
-{
-	read (w->fd, &e, sizeof(e));
-
-	switch (e.type) {
-	case 1:
-		if (e.value) printf("Button %d pressed\n", e.number);
-		else 	     printf("Button %d released\n", e.number);
-		break;
-
-	case 2:
-		printf("Joystick axis %d moved, value %d!\n", e.number, e.value);
-		break;
-	}
-}
-
-int main(void)
-{
-	int       fd = open("/dev/input/js1", O_RDONLY, O_NONBLOCK);
-	uev_t     js1_watcher;
-	uev_ctx_t ctx;
-
-	if (fd < 0)
-		errx(errno, "Cannot find a joystick attached.");
-
-	uev_init(&ctx);
-	uev_io_init(&ctx, &js1_watcher, joystick_cb, NULL, fd, UEV_READ);
-
-	puts("Starting, press Ctrl-C to exit.");
-
-	return uev_run(&ctx, 0);
-}
 ```
 
 To compile the program, save the code as `joystick.c` and call GCC with
@@ -203,52 +261,42 @@ To compile the program, save the code as `joystick.c` and call GCC with
 directory, skips using a Makefile altogether.  Alternatively, call the
 `Makefile` with <kbd>make joystick</kbd> from this directory.
 
-More complete and relevant example uses of [libuEv] is the TFTP/FTP
+More complete and relevant example uses of [libuEv][] is the FTP/TFTP
 server [uftpd][5], and the Linux `/sbin/init` replacement [finit][6].
-Both use [libuEv] as a GIT submodule.
+Both successfully employ [libuEv][].
 
-Also, see the `bench.c` program (<kbd>make bench</kbd> from within the
-library) for [reference benchmarks][7] against libevent and libev.
+Also see the `bench.c` program (<kbd>make bench</kbd> from within the
+library) for [reference benchmarks][7] against [libevent][1] and
+[libev][2].
 
 
 Build & Install
 ---------------
 
-The library is built for and developed on GNU/Linux systems, so it may
-use GCC and GNU Make specific extensions here and there.  This is not on
-purpose and patches to correct this are most welcome.  Particularly
-patches to support *BSD and its kqueue interface.
+The library is built for and developed on GNU/Linux systems, patches to
+support *BSD and its kqueue interface are most welcome.
 
-* <kbd>make all</kbd>: The library
-* <kbd>make test</kbd>: Test and showcase
-* <kbd>make install</kbd>: Honors `$prefix` and `$DESTDIR` environment variables
+libuEv use the GNU configure and build system.  To try out the bundled
+examples, use the `--enable-examples` switch to the `configure` script.
 
-Size of [libuEv]:
+    ./configure
+    make all
+    make test
+    make install
 
-    $ make strip
-    CC      main.o
-    CC      io.o
-    CC      timer.o
-    CC      signal.o
-    ARCHIVE libuev.a
-    LINK    libuev.so.1
-    STRIP   libuev.a
-    STRIP   libuev.so.1
-    text	   data	    bss	    dec	    hex	filename
-    1177	      0	      0	   1177	    499	main.o     (ex libuev.a)
-     308	      0	      0	    308	    134	io.o       (ex libuev.a)
-     682	      0	      0	    682	    2aa	timer.o    (ex libuev.a)
-     563	      0	      0	    563	    233	signal.o   (ex libuev.a)
-    6306	    768	      8	   7082	   1baa	libuev.so.1
+The resulting .so file is ~14 kiB when stripped (`make install-strip`).
 
 
 Origin & References
---------------------
+-------------------
 
-[libuEv] was originally based on [LibUEvent][8] by [Flemming Madsen] but
-has been completely rewritten with a much clearer API.  Now more similar
-to the famous [libev][2] by [Mark Lehmann].  Another small event library
-used for inspiration is the very small [Picoev][9] by [Oku Kazuho].
+[libuEv][] was originally based on [LibUEvent][8] by [Flemming Madsen][]
+but has been completely rewritten with a much clearer API.  Now more
+similar to the famous [libev][2] by [Mark Lehmann][].  Another small
+event library used for inspiration is the very small [Picoev][9] by
+[Oku Kazuho][].
+
+[libuEv][] is developed and maintained by [Joachim Nilsson][].
 
 [1]: http://libevent.org
 [2]: http://software.schmorp.de/pkg/libev.html
@@ -263,11 +311,15 @@ used for inspiration is the very small [Picoev][9] by [Oku Kazuho].
 [Travis Status]:   https://travis-ci.org/troglobit/libuev.png?branch=master
 [Coverity Scan]:   https://scan.coverity.com/projects/3846
 [Coverity Status]: https://scan.coverity.com/projects/3846/badge.svg
-[LibuEV]:          https://github.com/troglobit/libuev
+[LibuEv]:          https://github.com/troglobit/libuev
 [Oku Kazuho]:      https://github.com/kazuho
 [Mark Lehmann]:    http://software.schmorp.de
 [Joachim Nilsson]: http://troglobit.com
 [Flemming Madsen]: http://www.madsensoft.dk
 [Dave Zarzycki, Apple]: http://www.youtube.com/watch?v=cD_s6Fjdri8
 
-[libuEv] is developed and maintained by [Joachim Nilsson]
+<!--
+  -- Local Variables:
+  --  mode: markdown
+  -- End:
+  -->

autogen.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+autoreconf -W portability -visfm

bench.c

@@ -70,7 +70,7 @@ static int *pipes;
 static uev_t *evio;
 static uev_t *evto;
 
-static void read_cb(uev_ctx_t *UNUSED(ctx), uev_t *w, void *arg, int UNUSED(events))
+static void read_cb(uev_t *w, void *arg, int UNUSED(events))
 {
 	int idx, widx;
 	u_char ch;
@@ -96,7 +96,7 @@ static void read_cb(uev_ctx_t *UNUSED(ctx), uev_t *w, void *arg, int UNUSED(even
 	}
 }
 
-static void timer_cb(uev_ctx_t UNUSED(*ctx), uev_t UNUSED(*w), void UNUSED(*arg), int UNUSED(events))
+static void timer_cb(uev_t UNUSED(*w), void UNUSED(*arg), int UNUSED(events))
 {
 	/* nop */
 }
@@ -208,16 +208,17 @@ int main(int argc, char **argv)
 		if (timers)
 			uev_timer_init(&ctx, &evto[i], timer_cb, NULL, 0, 0);
 		args[i].index = i;
-		uev_io_init(&ctx, &evio[i], read_cb, &args[i], -1, UEV_READ);
 
 #ifdef USE_PIPES
-		if (pipe(cp) == -1) {
+		if (pipe2(cp, O_NONBLOCK) == -1) {
 #else
-		if (socketpair(AF_UNIX, SOCK_STREAM, 0, cp) == -1) {
+		if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0, cp) == -1) {
 #endif
 			perror("pipe");
 			exit(1);
 		}
+
+		uev_io_init(&ctx, &evio[i], read_cb, &args[i], cp[0], UEV_READ);
 	}
 
 	for (i = 0; i < 2; i++)

configure.ac

@@ -0,0 +1,24 @@
+# Use v2.61 for backwards compat with Ubuntu 12.04 LTS
+AC_PREREQ([2.61])
+AC_INIT(libuEv, 1.3.0, https://github.com/troglobit/libuev/issues, libuev)
+AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
+AM_SILENT_RULES([yes])
+
+AC_CONFIG_SRCDIR(uev.c)
+AM_CONFIG_HEADER(config.h)
+AC_CONFIG_FILES([Makefile examples/Makefile])
+AC_CONFIG_MACRO_DIR([m4])
+
+AC_PROG_CC
+AM_PROG_AR
+LT_INIT
+
+AC_ARG_ENABLE([examples],
+	[AS_HELP_STRING([--enable-examples], [build examples])],
+	[enable_examples=yes], [])
+AM_CONDITIONAL([ENABLE_EXAMPLES], [test "$enable_examples" = yes])
+
+AC_HEADER_STDC
+AC_C_CONST
+
+AC_OUTPUT

examples/Makefile

@@ -1,54 +0,0 @@
-# libuEv examples
-#
-# Copyright (c) 2012       Flemming Madsen <flemming!madsen()madsensoft!dk>
-# Copyright (c) 2013-2015  Joachim Nilsson <troglobit()gmail!com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-.PHONY: all clean
-
-TARGET      = signal test joystick
-OBJS       := $(addsuffix .o, $(TARGET))
-SRCS       := $(OBJS:.o=.c)
-DEPS       := $(SRCS:.c=.d)
-CPPFLAGS   += -I../
-LDFLAGS    := -L../
-LDLIBS     := ../$(STATICLIB)
-
-# This magic trick looks like a comment, but works on BSD PMake
-#include <../rules.mk>
-include ../rules.mk
-
-all: $(TARGET)
-
-signal: signal.o
-
-test: test.o
-
-joystick: joystick.o
-
-clean:
-	-@$(RM) $(TARGET) *.o
-
-distclean: clean
-	-@$(RM) $(DEPS) $(JUNK)
-
-# Include automatically generated rules
--include $(DEPS)

examples/Makefile.am

@@ -0,0 +1,5 @@
+noinst_PROGRAMS = signal test joystick
+AM_CPPFLAGS     = -I$(top_srcdir)
+AM_LDFLAGS      = -L$(top_srcdir)
+LIBS            = $(LTLIBINTL)
+LDADD           = $(top_srcdir)/libuev.la

examples/joystick.c

@@ -2,24 +2,23 @@
  *
  * Copyright (c) 2014-2015  Joachim Nilsson <troglobit()gmail!com>
  *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 #include <err.h>
@@ -40,7 +39,7 @@ struct js_event {
 	uint8_t  number;	/* axis/button number */
 } e;
 
-static void joystick_cb(uev_ctx_t *UNUSED(ctx), uev_t *w, void *UNUSED(arg), int UNUSED(events))
+static void joystick_cb(uev_t *w, void *UNUSED(arg), int UNUSED(events))
 {
 	if (read (w->fd, &e, sizeof(e)) < 0)
 		errx(errno, "Failed reading joystick event");

examples/signal.c

@@ -2,24 +2,23 @@
  *
  * Copyright (c) 2015  Joachim Nilsson <troglobit@gmail.com>
  *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 #define _GNU_SOURCE
@@ -69,13 +68,13 @@ static int callback(arg_t *arg, int event, void *foo)
         return 42;
 }
 
-static void sigsegv_cb(uev_ctx_t *UNUSED(ctx), uev_t *UNUSED(w), void *UNUSED(arg), int UNUSED(events))
+static void sigsegv_cb(uev_t *UNUSED(w), void *UNUSED(arg), int UNUSED(events))
 {
 	warnx("PID %d caused segfault.", getpid());
 	exit(-1);
 }
 
-static void sigchld_cb(uev_ctx_t *UNUSED(ctx), uev_t *UNUSED(w), void *UNUSED(arg), int UNUSED(events))
+static void sigchld_cb(uev_t *UNUSED(w), void *UNUSED(arg), int UNUSED(events))
 {
         pid_t pid = waitpid(-1, NULL, WNOHANG);
 
@@ -83,7 +82,7 @@ static void sigchld_cb(uev_ctx_t *UNUSED(ctx), uev_t *UNUSED(w), void *UNUSED(ar
                 warnx("PID %d exited, bye.", pid);
 }
 
-static void work_cb(uev_ctx_t *UNUSED(ctx), uev_t *UNUSED(w), void *arg, int UNUSED(events))
+static void work_cb(uev_t *UNUSED(w), void *arg, int UNUSED(events))
 {
 	int    status = 0;
         pid_t  pid;
@@ -102,15 +101,17 @@ static void work_cb(uev_ctx_t *UNUSED(ctx), uev_t *UNUSED(w), void *arg, int UNU
 	if (WIFEXITED(status))
 		printf("Child exited normally => %d\n", WEXITSTATUS(status));
 	else if (WCOREDUMP(status))
-		printf("Child crashed!\n");
+		printf("Child crashed! %s\n", DO_SEGFAULT
+		       ? "As expected, everything is OK."
+		       : "This should not happen!");
 	else
 		printf("Child did not exit normally!\n");
 }
 
-static void exit_cb(uev_ctx_t *ctx, uev_t *UNUSED(w), void *UNUSED(arg), int UNUSED(events))
+static void exit_cb(uev_t *w, void *UNUSED(arg), int UNUSED(events))
 {
         printf("Process deadline reached, exiting!\n");
-	uev_exit(ctx);
+	uev_exit(w->ctx);
 }
 
 int main(void)
@@ -120,6 +121,8 @@ int main(void)
 
 	/* Initialize libuEv */
 	uev_init(&ctx);
+
+	/* Setup callbacks */
 	uev_signal_init(&ctx, &sigsegv_watcher, sigsegv_cb, NULL, SIGSEGV);
 	uev_signal_init(&ctx, &sigchld_watcher, sigchld_cb, NULL, SIGCHLD);
 	uev_timer_init(&ctx, &timeout_watcher, work_cb, &arg, 400, 0);

examples/test.c

@@ -3,24 +3,23 @@
  * Copyright (c) 2012       Flemming Madsen <flemming!madsen()madsensoft!dk>
  * Copyright (c) 2013-2015  Joachim Nilsson <troglobit()gmail!com>
  *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 #include <signal.h>
@@ -40,33 +39,33 @@ static int in, out;
 static int period = 0;
 static uev_t *watchdog;
 
-static void lifetime_cb(uev_ctx_t *ctx, uev_t UNUSED(*w), void *arg, int UNUSED(events))
+static void lifetime_cb(uev_t *w, void *arg, int UNUSED(events))
 {
 	fprintf(stderr, "\nLifetime exceeded, program completed successfully! (arg:%p)\n", arg);
-	uev_exit(ctx);
+	uev_exit(w->ctx);
 }
 
 /* The pipe watchdog, if it triggers we haven't received data in time. */
-static void timeout_cb(uev_ctx_t *ctx, uev_t *UNUSED(w), void *arg, int UNUSED(events))
+static void timeout_cb(uev_t *w, void *arg, int UNUSED(events))
 {
 	watchdog = NULL;
 	fprintf(stderr, "\nTimeout exceeded %p\n", arg);
 
 	// uev_timer_stop(w); <-- No need to stop timers with period=0 :)
-	uev_exit(ctx);
+	uev_exit(w->ctx);
 }
 
-static void periodic_task(uev_ctx_t UNUSED(*ctx), uev_t UNUSED(*w), void UNUSED(*arg), int UNUSED(events))
+static void periodic_task(uev_t UNUSED(*w), void UNUSED(*arg), int UNUSED(events))
 {
 	fprintf(stderr, "|");
 }
 
-static void signal_cb(uev_ctx_t *UNUSED(ctx), uev_t *w, void *UNUSED(arg), int UNUSED(events))
+static void signal_cb(uev_t *w, void *UNUSED(arg), int UNUSED(events))
 {
 	fprintf(stderr, w->signo == SIGINT ? "^Cv" : "^\v");
 }
 
-static void pipe_read_cb(uev_ctx_t *UNUSED(ctx), uev_t UNUSED(*w), void UNUSED(*arg), int UNUSED(events))
+static void pipe_read_cb(uev_t UNUSED(*w), void UNUSED(*arg), int UNUSED(events))
 {
 	int cnt;
 	char msg[50];
@@ -80,7 +79,7 @@ static void pipe_read_cb(uev_ctx_t *UNUSED(ctx), uev_t UNUSED(*w), void UNUSED(*
 	fprintf(stderr, "%.*s.%d ", cnt, msg, cnt);
 }
 
-static void pipe_write_cb(uev_ctx_t UNUSED(*ctx), uev_t *w, void *arg, int UNUSED(events))
+static void pipe_write_cb(uev_t *w, void *arg, int UNUSED(events))
 {
 	my_t *my  = arg;
 	char *msg = "TESTING";

io.c

@@ -3,24 +3,23 @@
  * Copyright (c) 2012       Flemming Madsen <flemming!madsen()madsensoft!dk>
  * Copyright (c) 2013-2015  Joachim Nilsson <troglobit()gmail!com>
  *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 #include <errno.h>

m4/.gitignore

@@ -0,0 +1 @@
+*.m4

private.h

@@ -0,0 +1,89 @@
+/* libuEv - Private methods and data types, do not use directly!
+ *
+ * Copyright (c) 2012       Flemming Madsen <flemming!madsen()madsensoft!dk>
+ * Copyright (c) 2013-2015  Joachim Nilsson <troglobit()gmail!com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef LIBUEV_PRIVATE_H_
+#define LIBUEV_PRIVATE_H_
+
+#include <stdio.h>
+#include <sys/epoll.h>
+#include "queue.h"	       /* OpenBSD queue.h > old GLIBC version */
+
+/* I/O, timer, or signal watcher */
+typedef enum {
+	UEV_IO_TYPE = 1,
+	UEV_TIMER_TYPE,
+	UEV_SIGNAL_TYPE,
+} uev_type_t;
+
+/* Event mask, used internally only. */
+#define UEV_EVENT_MASK  (UEV_READ | UEV_WRITE)
+
+/* Main libuEv context type */
+typedef struct {
+	int             running;
+	int             fd;     /* For epoll() */
+	uint32_t        errors;
+	LIST_HEAD(,uev) watchers;
+} uev_ctx_t;
+
+/* Forward declare due to dependencys, don't try this at home kids. */
+struct uev;
+
+/* This is used to hide all private data members in uev_t */
+#define uev_private_t                                           \
+	LIST_ENTRY(uev) link;   /* For queue.h linked list */   \
+								\
+	int             active;                                 \
+	int             events;                                 \
+								\
+	/* Watcher callback with optional argument */           \
+	void          (*cb)(struct uev *, void *, int);         \
+	void           *arg;                                    \
+								\
+	/* Timer watchers, time in milliseconds */		\
+	int             timeout;                                \
+	int             period;                                 \
+								\
+	/* Signal watchers */                                   \
+	int             signo;                                  \
+								\
+	/* Watcher type */					\
+	uev_type_t
+
+/* Internal API for dealing with generic watchers */
+int uev_watcher_init (uev_ctx_t *ctx, struct uev *w, uev_type_t type,
+		      void (*cb)(struct uev *, void *, int), void *arg,
+		      int fd, int events);
+int uev_watcher_start(struct uev *w);
+int uev_watcher_stop (struct uev *w);
+
+#endif /* LIBUEV_PRIVATE_H_ */
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

rules.mk

@@ -1,9 +0,0 @@
-# Pretty printing and GCC -M for auto dep files
-%.o: %.c
-	@printf "  CC      $(subst $(ROOTDIR)/,,$(shell pwd)/)$@\n"
-	@$(CC) $(CFLAGS) $(CPPFLAGS) -c -MMD -MP -o $@ $<
-
-%: %.o
-	@printf "  LINK    $(subst $(ROOTDIR)/,,$(shell pwd)/)$@\n"
-	@$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-Map,$@.map -o $@ $^ $(LDLIBS$(LDLIBS-$(@)))
-

signal.c

@@ -3,24 +3,23 @@
  * Copyright (c) 2012       Flemming Madsen <flemming!madsen()madsensoft!dk>
  * Copyright (c) 2013-2015  Joachim Nilsson <troglobit()gmail!com>
  *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 #include <errno.h>

timer.c

@@ -3,24 +3,23 @@
  * Copyright (c) 2012       Flemming Madsen <flemming!madsen()madsensoft!dk>
  * Copyright (c) 2013-2015  Joachim Nilsson <troglobit()gmail!com>
  *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 #include <errno.h>
@@ -123,11 +122,9 @@ int uev_timer_set(uev_t *w, int timeout, int period)
 		msec2tspec(timeout, &time.it_value);
 		msec2tspec(period, &time.it_interval);
 		timerfd_settime(w->fd, 0, &time, NULL);
-
-		return uev_watcher_start(w);
 	}
 
-	return 0;
+	return uev_watcher_start(w);
 }
 
 /**
@@ -157,12 +154,12 @@ int uev_timer_start(uev_t *w)
  */
 int uev_timer_stop(uev_t *w)
 {
-	if (uev_watcher_stop(w))
-		return -1;
-
 	/* Stop kernel timer */
 	uev_timer_set(w, 0, 0);
 
+	if (uev_watcher_stop(w))
+		return -1;
+
 	/* Close timerfd, will have to be reopened again on reset */
 	close(w->fd);
 	w->fd = -1;

uev.c

@@ -3,24 +3,23 @@
  * Copyright (c) 2012       Flemming Madsen <flemming!madsen()madsensoft!dk>
  * Copyright (c) 2013-2015  Joachim Nilsson <troglobit()gmail!com>
  *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 #include <errno.h>
@@ -37,7 +36,7 @@
 
 static int _init(uev_ctx_t *ctx, int close_old)
 {
-	int fd = epoll_create1(O_CLOEXEC);
+	int fd = epoll_create1(EPOLL_CLOEXEC);
 
 	if (fd < 0)
 		return -1;
@@ -297,7 +296,7 @@ int uev_run(uev_ctx_t *ctx, int flags)
 			}
 
 			if (w->cb)
-				w->cb((struct uev *)ctx, w, w->arg);
+				w->cb(w, w->arg, events[i].events & UEV_EVENT_MASK);
 
 			if (UEV_TIMER_TYPE == w->type) {
 				if (!w->timeout)

uev.h

@@ -3,33 +3,29 @@
  * Copyright (c) 2012       Flemming Madsen <flemming!madsen()madsensoft!dk>
  * Copyright (c) 2013-2015  Joachim Nilsson <troglobit()gmail!com>
  *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 #ifndef LIBUEV_UEV_H_
 #define LIBUEV_UEV_H_
 
-#include <stdio.h>
-#include <sys/epoll.h>
-
-#include "queue.h"	       /* OpenBSD queue.h > old GLIBC version */
+#include "private.h"
 
 /* Max. number of simulateneous events */
 #define UEV_MAX_EVENTS  10
@@ -43,54 +39,18 @@
 #define UEV_ONCE        1
 #define UEV_NONBLOCK    2
 
-/* I/O, timer, or signal watcher */
-typedef enum {
-	UEV_IO_TYPE = 1,
-	UEV_TIMER_TYPE,
-	UEV_SIGNAL_TYPE,
-} uev_type_t;
-
-/* Forward declare due to dependencys, don't try this at home kids. */
-struct uev;
-
-/* Main libuEv context type */
-typedef struct {
-	int             running;
-	int             fd;	/* For epoll() */
-	uint32_t        errors;
-	LIST_HEAD(,uev) watchers;
-} uev_ctx_t;
-
-/* I/O event watcher */
+/* Event watcher */
 typedef struct uev {
-	LIST_ENTRY(uev) link;	/* For queue.h linked list */
+	/* Private data for libuEv internal engine */
+	uev_private_t   type;
 
-	/* Common to all watchers */
-	uev_ctx_t      *ctx;
-	uev_type_t      type;
-	int             active;
+	/* Public data for users to reference  */
 	int             fd;
-	int             events;
-
-	/* Watcher callback with optional argument */
-	void          (*cb)(struct uev *, struct uev *, void *);
-	void           *arg;
-
-	/* Timer watchers, time in milliseconds */
-	int             timeout;
-	int             period;
-
-	/* Signal watchers */
-	int             signo;
+	uev_ctx_t      *ctx;
 } uev_t;
 
 /* Generic callback for watchers */
-typedef void (uev_cb_t)(uev_ctx_t *ctx, uev_t *w, void *arg, int events);
-
-/* Private methods, do not use directly! */
-int uev_watcher_init   (uev_ctx_t *ctx, uev_t *w, uev_type_t type, uev_cb_t *cb, void *arg, int fd, int events);
-int uev_watcher_start  (uev_t *w);
-int uev_watcher_stop   (uev_t *w);
+typedef void (uev_cb_t)(uev_t *w, void *arg, int events);
 
 /* Public interface */
 int uev_init           (uev_ctx_t *ctx);