mirror of
https://github.com/troglobit/libuev.git
synced 2026-10-23 11:24:34 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4255ebb9c6 | ||
|
|
930cce21fa | ||
|
|
addd60db22 | ||
|
|
e3d40ef010 | ||
|
|
618b50ee88 | ||
|
|
f64301194a | ||
|
|
bdbfe809ab | ||
|
|
2742adfe98 | ||
|
|
35d3a0f185 | ||
|
|
441d53e46e | ||
|
|
0b19880f80 | ||
|
|
852bd506e8 | ||
|
|
98c8e9f8b1 | ||
|
|
9fc5227343 | ||
|
|
e613248392 | ||
|
|
ac5f01ea22 | ||
|
|
a0ddb4eae3 | ||
|
|
1e7720735f | ||
|
|
8010d76133 | ||
|
|
73459ca609 | ||
|
|
bd6d519315 | ||
|
|
ece9788f5a | ||
|
|
a9a78e8bf0 | ||
|
|
71697266ed | ||
|
|
d5d6f9d844 | ||
|
|
57a7bbe1b0 | ||
|
|
acb6d82ccf | ||
|
|
7de9dafacc | ||
|
|
2a1561b449 | ||
|
|
7704e46b48 | ||
|
|
8e3225999c | ||
|
|
f856f299e4 | ||
|
|
7012ab4779 | ||
|
|
23a7773f5c | ||
|
|
232e476429 | ||
|
|
33ad2f5e87 | ||
|
|
ae52fbdf2e | ||
|
|
b3541da7cb | ||
|
|
315bd4558a | ||
|
|
a0bed33445 | ||
|
|
bf127b0dab | ||
|
|
7d6d90cdb1 | ||
|
|
78b7d0962a | ||
|
|
1370275e61 | ||
|
|
d01cd60dae | ||
|
|
fb942fcea9 | ||
|
|
f49232cce0 | ||
|
|
6933f7f7c2 | ||
|
|
cd522704c7 | ||
|
|
a0ebd468b6 | ||
|
|
b621062719 | ||
|
|
f3e12a98a0 | ||
|
|
acf6bbcbaf | ||
|
|
a8604938e9 | ||
|
|
cbb7455603 | ||
|
|
cf5e729dd3 | ||
|
|
352baa8270 | ||
|
|
8721566d74 | ||
|
|
a8d8705c34 | ||
|
|
4c03342c77 | ||
|
|
c1fe3be3e7 | ||
|
|
861bf14d71 | ||
|
|
395d2df573 | ||
|
|
2132ab1bd5 | ||
|
|
d62ae8f041 | ||
|
|
1b1397b4ee | ||
|
|
7bf5c8d8d7 | ||
|
|
1374661d4b | ||
|
|
694e2b5ab9 | ||
|
|
c2751af452 | ||
|
|
1ce9fde395 | ||
|
|
7e9f8c4913 | ||
|
|
dd09c7c3a9 | ||
|
|
fe04723353 | ||
|
|
78995951ae | ||
|
|
3adc7a03c0 | ||
|
|
2abeb39fe8 | ||
|
|
1480976724 | ||
|
|
6ffa76c2f8 | ||
|
|
8a4e8c4af6 | ||
|
|
950015715d | ||
|
|
fb6ac1ecac | ||
|
|
0909decabc | ||
|
|
3452fbd381 | ||
|
|
f64561b708 | ||
|
|
b94023faed | ||
|
|
6637804b80 | ||
|
|
361b013da5 | ||
|
|
052b08e0b5 | ||
|
|
ca803bb12f | ||
|
|
6397edc2c4 | ||
|
|
cbd962c5b6 | ||
|
|
1f9558059a | ||
|
|
9e7f6865fc | ||
|
|
3b31079a1c | ||
|
|
63697e9eda | ||
|
|
ce3930f0cf | ||
|
|
bfd046054b | ||
|
|
6a40d51d26 | ||
|
|
f513408316 | ||
|
|
30b5faa318 | ||
|
|
fe8f3f19da | ||
|
|
71208b7e21 | ||
|
|
312b8257fb | ||
|
|
f29f3b7f38 | ||
|
|
cd4daf0d36 | ||
|
|
43acbadc13 |
No files matched your search
+27
-5
@@ -1,7 +1,29 @@
|
||||
*~
|
||||
*.d
|
||||
*.o
|
||||
*.so
|
||||
*.so.*
|
||||
*.a
|
||||
*.la
|
||||
*.lo
|
||||
.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*.tar.*
|
||||
libuev.pc
|
||||
!libuev.pc.in
|
||||
+13
-5
@@ -1,8 +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
|
||||
- clang
|
||||
|
||||
# We don't need to install packages, use dockerized build, quicker
|
||||
sudo: false
|
||||
|
||||
env:
|
||||
global:
|
||||
@@ -16,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
|
||||
-110
@@ -1,110 +0,0 @@
|
||||
Change Log
|
||||
==========
|
||||
|
||||
All notable changes to the project are documented 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.
|
||||
|
||||
|
||||
[v1.0.4]: 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:
|
||||
-->
|
||||
+276
@@ -0,0 +1,276 @@
|
||||
Change Log
|
||||
==========
|
||||
|
||||
All notable changes to the project are documented in this file.
|
||||
|
||||
|
||||
[v1.4.2][] - 2016-06-25
|
||||
-----------------------
|
||||
|
||||
### Changes
|
||||
- Add range checks for `period` and `timeout` to `uev_timer_init()` and
|
||||
`uev_timer_set()`. If either on is `< 0` libuEv now return `ERANGE`.
|
||||
|
||||
|
||||
[v1.4.1][] - 2016-04-22
|
||||
-----------------------
|
||||
|
||||
### Changes
|
||||
- Add some `pkg-config` integration tips for developers using libuEv
|
||||
with GNU autotools in their projects.
|
||||
|
||||
### Fixes
|
||||
- Add missing `SFD_CLOEXEC` and `TFD_CLOEXEC` to signal and timer file
|
||||
descriptors. This prevents these file descriptors from "leaking" into
|
||||
sub-processes of the parent thread. The kernel will atomically close
|
||||
these descriptors for forked-off children calling the exec*() family
|
||||
of syscalls.
|
||||
- Minor coding style fixes and simplification of build scripts.
|
||||
|
||||
|
||||
[v1.4.0][] - 2016-03-22
|
||||
-----------------------
|
||||
|
||||
This release changes the header file namespace, which was silently
|
||||
introduced in [v1.2.1][]. Apologies for any problems this may cause!
|
||||
|
||||
### Changes
|
||||
- Change namespace for header files: `libuev/` to `uev/`, e.g. using
|
||||
`pkg-config` your C program must now `#include <uev/uev.h>`
|
||||
- Support for `EPOLLPRI` events for I/O watchers, thanks to Markus Svilans
|
||||
- Simplified joystick example
|
||||
- Updated `README` slightly
|
||||
|
||||
|
||||
[v1.3.1][] - 2016-02-02
|
||||
-----------------------
|
||||
|
||||
### Fixes
|
||||
- Remove symlinks to Markdown files from GIT
|
||||
- Distribute and install Markdown files: README.md, etc.
|
||||
|
||||
|
||||
[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.4.2...HEAD
|
||||
[v1.4.2]: https://github.com/troglobit/libuev/compare/v1.4.1...v1.4.2
|
||||
[v1.4.1]: https://github.com/troglobit/libuev/compare/v1.4.0...v1.4.1
|
||||
[v1.4.0]: https://github.com/troglobit/libuev/compare/v1.3.1...v1.4.0
|
||||
[v1.3.1]: https://github.com/troglobit/libuev/compare/v1.3.0...v1.3.1
|
||||
[v1.3.0]: https://github.com/troglobit/libuev/compare/v1.2.3...v1.3.0
|
||||
[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:
|
||||
-->
|
||||
@@ -1,5 +1,5 @@
|
||||
Copyright (c) 2012 Flemming Madsen <flemming!madsen()madsensoft!dk>
|
||||
Copyright (c) 2013-2015 Joachim Nilsson <troglobit()gmail!com>
|
||||
Copyright (c) 2013-2016 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
|
||||
|
||||
@@ -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.0.5
|
||||
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 test.c
|
||||
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)
|
||||
+69
@@ -0,0 +1,69 @@
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
lib_LTLIBRARIES = libuev.la
|
||||
pkgincludedir = $(includedir)/uev
|
||||
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:1:0
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = libuev.pc
|
||||
doc_DATA = README.md LICENSE
|
||||
EXTRA_DIST = README.md LICENSE AUTHORS 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
|
||||
@@ -1,21 +1,296 @@
|
||||
libuEv | Simple event loop for Linux
|
||||
====================================
|
||||
[![Travis Status]][Travis] [![Coverity Status]][Coverity Scan]
|
||||
[![Travis Status][]][Travis] [![Coverity Status][]][Coverity Scan]
|
||||
|
||||
|
||||
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)
|
||||
* [Using -luev](#using--luev)
|
||||
* [Joystick Example](#joystick-example)
|
||||
* [Build & Install](#build--install)
|
||||
* [Background](#background)
|
||||
* [Origin & References](#origin--references)
|
||||
|
||||
|
||||
Introduction
|
||||
------------
|
||||
|
||||
[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.
|
||||
|
||||
Experienced developers may appreciate that [libuEv][] is built on top of
|
||||
modern Linux APIs: epoll, timerfd and signalfd. Note however, 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).
|
||||
|
||||
> “Event driven software improves concurrency” -- [Dave Zarzycki, Apple][]
|
||||
|
||||
|
||||
API
|
||||
---
|
||||
|
||||
The C interface to [libuEv][] is listed in `uev.h`. It handles three
|
||||
different types of events: I/O (files, sockets, message queues, etc.),
|
||||
timers, and signals. With a slight caveat on signals detailed below
|
||||
in the [Summary](#summary).
|
||||
|
||||
```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_t *w, void *arg, int events);
|
||||
|
||||
/* 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 */
|
||||
|
||||
/* I/O watcher: fd is non-blocking, events is UEV_READ and/or UEV_WRITE */
|
||||
int uev_io_init (uev_ctx_t *ctx, uev_t *w, uev_cb_t *cb, void *arg, int fd, int events);
|
||||
int uev_io_set (uev_t *w, int fd, int events);
|
||||
int uev_io_start (uev_t *w);
|
||||
int uev_io_stop (uev_t *w);
|
||||
|
||||
/* Timer watcher: timeout and period in milliseconds */
|
||||
int uev_timer_init (uev_ctx_t *ctx, uev_t *w, uev_cb_t *cb, void *arg, int timeout, int period);
|
||||
int uev_timer_set (uev_t *w, int timeout, int period); /* Change timeout or period */
|
||||
int uev_timer_start (uev_t *w); /* Restart a stopped timer */
|
||||
int uev_timer_stop (uev_t *w); /* Stop a timer */
|
||||
|
||||
/* Signal watcher: signo is the signal to wait for, e.g., SIGTERM */
|
||||
int uev_signal_init (uev_ctx_t *ctx, uev_t *w, uev_cb_t *cb, void *arg, int signo);
|
||||
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 */
|
||||
|
||||
```
|
||||
|
||||
|
||||
### Create an Event Context
|
||||
|
||||
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.
|
||||
|
||||
```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.
|
||||
|
||||
**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
|
||||
|
||||
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
|
||||
opened in blocking mode. Be careful out there!
|
||||
|
||||
**Note 2:** When closing a descriptor or socket, make sure to first stop
|
||||
your watcher, if possible. This will help prevent any nasty side
|
||||
effects on your program.
|
||||
|
||||
**Note 3:** As mentioned above, a certain amount of care is needed when
|
||||
dealing with signalfd. If your application use `system()` you replace
|
||||
that with `fork()`, and then in the child, unblock all signals blocked
|
||||
by your parent process, before you run `exec()`. This because Linux
|
||||
does not unblock signals for your children, and neither does most (all?)
|
||||
C-libraries. See the [finit][6] project's implementation of `run()` for
|
||||
an example of this.
|
||||
|
||||
|
||||
Using -luev
|
||||
-----------
|
||||
|
||||
LibuEv is by default installed as a library with a few header files, you
|
||||
should only ever need to include one:
|
||||
|
||||
#include <uev/uev.h>
|
||||
|
||||
The output from the `pkg-config` tool holds no surprises:
|
||||
|
||||
$ pkg-config --libs --static --cflags libuev
|
||||
-I/usr/local/include -L/usr/local/lib -luev
|
||||
|
||||
The prefix path `/usr/local/` shown here is only the default. Use the
|
||||
`configure` script to select a different prefix when installing libuEv.
|
||||
|
||||
For GNU autotools based projects, use the following in `configure.ac`:
|
||||
|
||||
# Check for required libraries
|
||||
PKG_CHECK_MODULES([uev], [libuev >= 1.4.0])
|
||||
|
||||
and in your `Makefile.am`:
|
||||
|
||||
proggy_CFLAGS = $(uev_CFLAGS)
|
||||
proggy_LDADD = $(uev_LIBS)
|
||||
|
||||
|
||||
Joystick Example
|
||||
----------------
|
||||
|
||||
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/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:
|
||||
printf("Button %d %s\n", e.number, e.value ? "pressed" : "released");
|
||||
break;
|
||||
|
||||
case 2:
|
||||
printf("Joystick axis %d moved, value %d!\n", e.number, e.value);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
int main(void)
|
||||
{
|
||||
int fd;
|
||||
uev_t watcher;
|
||||
uev_ctx_t ctx;
|
||||
|
||||
fd = open("/dev/input/js1", O_RDONLY, O_NONBLOCK);
|
||||
if (fd < 0)
|
||||
errx(errno, "Cannot find a joystick attached.");
|
||||
|
||||
uev_init(&ctx);
|
||||
uev_io_init(&ctx, &watcher, joystick_cb, NULL, fd, UEV_READ);
|
||||
|
||||
puts("Starting, press Ctrl-C to exit.");
|
||||
|
||||
return uev_run(&ctx, 0);
|
||||
}
|
||||
|
||||
```
|
||||
|
||||
To build the example, follow installation instructions below, then save
|
||||
the code as `joystick.c` and call GCC
|
||||
|
||||
gcc `pkg-config --libs --static --cflags libuev` -o joystick joystick.c
|
||||
|
||||
Alternatively, call the `Makefile` with <kbd>make joystick</kbd> from
|
||||
the unpacked [libuEv][] distribution.
|
||||
|
||||
More complete and relevant example uses of [libuEv][] is the FTP/TFTP
|
||||
server [uftpd][5], and the Linux `/sbin/init` replacement [finit][6].
|
||||
Both successfully employ [libuEv][].
|
||||
|
||||
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, patches to
|
||||
support *BSD and its [kqueue][] interface are most welcome.
|
||||
|
||||
libuEv use the GNU configure and build system. To try out the bundled
|
||||
examples, use the `--enable-examples` switch to the `configure` script.
|
||||
|
||||
./configure
|
||||
make all
|
||||
make test
|
||||
make install
|
||||
|
||||
The resulting .so file is ~14 kiB (<kbd>make install-strip</kbd>).
|
||||
|
||||
|
||||
Background
|
||||
----------
|
||||
|
||||
> “Why an event loop, why not use threads?”
|
||||
|
||||
With the advent of light-weight processes (threads) programmers these
|
||||
@@ -24,14 +299,14 @@ often swing without consideration. Event loops and non-blocking I/O is
|
||||
often a far easier approach, as well as less error prone.
|
||||
|
||||
The purpose of many applications is, with a little logic sprinkled on
|
||||
top, to act upon: network packets entering an interface, timeouts
|
||||
expiring, mouse clicks, or other types of events. Such applications are
|
||||
often very well suited to use an event loop.
|
||||
top, to act on network packets entering an interface, timeouts expiring,
|
||||
mouse clicks, or other types of events. Such applications are often
|
||||
very well suited to use an event loop.
|
||||
|
||||
Applications that need to churn massively parallel algorithms are more
|
||||
suitable for running multiple (independent) threads on several CPU
|
||||
cores. However, threaded applications must deal with the side effects
|
||||
of concurrency, like: race conditions, deadlocks, live locks, etc.
|
||||
of concurrency, like race conditions, deadlocks, live locks, etc.
|
||||
Writing error free threaded applications is hard, debugging them can be
|
||||
even harder.
|
||||
|
||||
@@ -44,200 +319,17 @@ 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
|
||||
[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.
|
||||
|
||||
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).
|
||||
|
||||
> “Event driven software improves concurrency” -- [Dave Zarzycki, Apple]
|
||||
|
||||
|
||||
API
|
||||
---
|
||||
|
||||
Here is the interface to [libuEv]. It handles three different types of
|
||||
events: I/O (files, sockets, message queues, etc.), timers, and 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);
|
||||
|
||||
/* Event loop functions, notice 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 */
|
||||
|
||||
/* I/O watcher: fd is non-blocking, events is UEV_READ and/or UEV_WRITE */
|
||||
int uev_io_init (uev_ctx_t *ctx, uev_t *w, uev_cb_t *cb, void *arg, int fd, int events);
|
||||
int uev_io_set (uev_t *w, int fd, int events);
|
||||
int uev_io_stop (uev_t *w);
|
||||
|
||||
/* Timer watcher: timeout and period in milliseconds */
|
||||
int uev_timer_init (uev_ctx_t *ctx, uev_t *w, uev_cb_t *cb, void *arg, int timeout, int period);
|
||||
int uev_timer_set (uev_t *w, int timeout, int period); /* Change timeout or period */
|
||||
int uev_timer_stop (uev_t *w); /* Stop a timer */
|
||||
|
||||
/* Signal watcher: signo is the signal to wait for, e.g., SIGTERM */
|
||||
int uev_signal_init(uev_ctx_t *ctx, uev_t *w, uev_cb_t *cb, void *arg, int signo);
|
||||
int uev_signal_set (uev_t *w, int signo); /* Change signal to wait for */
|
||||
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.
|
||||
|
||||
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.
|
||||
|
||||
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
|
||||
served the first event. If `flags` is set to `UEV_ONCE | UEV_NONBLOCK`
|
||||
the event loop returns immediately if no event is available.
|
||||
|
||||
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
|
||||
|
||||
**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
|
||||
opened in blocking mode. Be careful out there!
|
||||
|
||||
**Note 2:** As mentioned above, a certain amount of care is needed when
|
||||
dealing with signalfd. This means that if your application, for
|
||||
instance, uses `system()` you must redesign that to use `fork()`, and
|
||||
then in the child, unblock all signals blocked by your parent process,
|
||||
before you run `exec()`. This because Linux does not unblock signals
|
||||
for your children, and neither does most (all?) C-libraries. An example
|
||||
of this, from [finit][6], implementing `run()` as a better replacement
|
||||
to `system()`, which sucks anyawy :)
|
||||
|
||||
|
||||
Example
|
||||
-------
|
||||
|
||||
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"
|
||||
|
||||
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
|
||||
`gcc -o joystick joystick.c io.c timer.c signal.c main.c` from this
|
||||
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
|
||||
server [uftpd][5], and the Linux `/sbin/init` replacement [finit][6].
|
||||
Both use [libuEv] as a GIT submodule.
|
||||
|
||||
Also, see the `bench.c` program (<kbd>make bench</kbd> from within the
|
||||
library) for [reference benchmarks][7] against libevent and libev.
|
||||
|
||||
|
||||
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.
|
||||
|
||||
* <kbd>make all</kbd>: The library
|
||||
* <kbd>make test</kbd>: Test and showcase
|
||||
* <kbd>make install</kbd>: Honors `$prefix` and `$DESTDIR` environment variables
|
||||
|
||||
Size of [libuEv]:
|
||||
|
||||
$ 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
|
||||
|
||||
|
||||
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
|
||||
@@ -252,11 +344,16 @@ 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
|
||||
[kqueue]: https://github.com/mheily/libkqueue
|
||||
[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:
|
||||
-->
|
||||
@@ -1,5 +1,7 @@
|
||||
LibuEv TODO
|
||||
===========
|
||||
|
||||
* Make port to *BSD kqueue API, http://en.wikipedia.org/wiki/Kqueue
|
||||
* Port to *BSD kqueue API, http://en.wikipedia.org/wiki/Kqueue
|
||||
Also in UNIX Network Progamming, by W. Richard Stevens 3rd ed.
|
||||
* Restore Lua bindings now that libuEv itself has stabilized
|
||||
|
||||
Executable
+3
@@ -0,0 +1,3 @@
|
||||
#!/bin/sh
|
||||
|
||||
autoreconf -W portability -visfm
|
||||
@@ -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++)
|
||||
@@ -228,7 +229,6 @@ int main(int argc, char **argv)
|
||||
|
||||
/**
|
||||
* Local Variables:
|
||||
* version-control: t
|
||||
* indent-tabs-mode: t
|
||||
* c-file-style: "linux"
|
||||
* End:
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
AC_INIT(libuev, 1.4.2, https://github.com/troglobit/libuev/issues)
|
||||
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 libuev.pc 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_OUTPUT
|
||||
@@ -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)
|
||||
@@ -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
|
||||
+23
-27
@@ -1,25 +1,24 @@
|
||||
/* Simple example of how to use libuEv with Linux joystick API
|
||||
*
|
||||
* Copyright (c) 2014-2015 Joachim Nilsson <troglobit()gmail!com>
|
||||
* Copyright (c) 2014-2016 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>
|
||||
@@ -31,8 +30,6 @@
|
||||
|
||||
#include "uev.h"
|
||||
|
||||
#define UNUSED(arg) arg __attribute__ ((unused))
|
||||
|
||||
struct js_event {
|
||||
uint32_t time; /* event timestamp in milliseconds */
|
||||
int16_t value; /* value */
|
||||
@@ -40,15 +37,14 @@ 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 *arg, int events)
|
||||
{
|
||||
if (read (w->fd, &e, sizeof(e)) < 0)
|
||||
if (read(w->fd, &e, sizeof(e)) < 0)
|
||||
errx(errno, "Failed reading joystick event");
|
||||
|
||||
switch (e.type) {
|
||||
case 1:
|
||||
if (e.value) printf("Button %d pressed\n", e.number);
|
||||
else printf("Button %d released\n", e.number);
|
||||
printf("Button %d %s\n", e.number, e.value ? "pressed" : "released");
|
||||
break;
|
||||
|
||||
case 2:
|
||||
@@ -59,10 +55,11 @@ static void joystick_cb(uev_ctx_t *UNUSED(ctx), uev_t *w, void *UNUSED(arg), int
|
||||
|
||||
int main(void)
|
||||
{
|
||||
int fd = open("/dev/input/js1", O_RDONLY, O_NONBLOCK);
|
||||
uev_t js1_watcher;
|
||||
int fd;
|
||||
uev_t js1_watcher;
|
||||
uev_ctx_t ctx;
|
||||
|
||||
fd = open("/dev/input/js1", O_RDONLY, O_NONBLOCK);
|
||||
if (fd < 0)
|
||||
errx(errno, "Cannot find a joystick attached.");
|
||||
|
||||
@@ -76,8 +73,7 @@ int main(void)
|
||||
|
||||
/**
|
||||
* Local Variables:
|
||||
* compile-command: "gcc -o joystick joystick.c io.o timer.o signal.o main.o"
|
||||
* version-control: t
|
||||
* compile-command: "make joystick"
|
||||
* indent-tabs-mode: t
|
||||
* c-file-style: "linux"
|
||||
* End:
|
||||
|
||||
+27
-23
@@ -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,13 +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)
|
||||
@@ -118,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);
|
||||
@@ -129,7 +134,6 @@ int main(void)
|
||||
|
||||
/**
|
||||
* Local Variables:
|
||||
* version-control: t
|
||||
* indent-tabs-mode: t
|
||||
* c-file-style: "linux"
|
||||
* End:
|
||||
|
||||
+23
-25
@@ -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";
|
||||
@@ -147,7 +146,6 @@ int main(void)
|
||||
|
||||
/**
|
||||
* Local Variables:
|
||||
* version-control: t
|
||||
* indent-tabs-mode: t
|
||||
* c-file-style: "linux"
|
||||
* End:
|
||||
|
||||
@@ -1,30 +1,28 @@
|
||||
/* libuEv - Micro event loop library
|
||||
*
|
||||
* Copyright (c) 2012 Flemming Madsen <flemming!madsen()madsensoft!dk>
|
||||
* Copyright (c) 2013-2015 Joachim Nilsson <troglobit()gmail!com>
|
||||
* Copyright (c) 2013-2016 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>
|
||||
|
||||
#include "uev.h"
|
||||
|
||||
|
||||
@@ -35,7 +33,7 @@
|
||||
* @param cb I/O callback
|
||||
* @param arg Optional callback argument
|
||||
* @param fd File descriptor to watch, or -1 to register an empty watcher
|
||||
* @param events Requested events to watch for, a mask of %UEV_READ and %UEV_WRITE
|
||||
* @param events Requested events to watch for, a mask of %UEV_READ, %UEV_WRITE and %UEV_PRI
|
||||
*
|
||||
* @return POSIX OK(0) or non-zero with @param errno set on error.
|
||||
*/
|
||||
@@ -62,11 +60,8 @@ int uev_io_init(uev_ctx_t *ctx, uev_t *w, uev_cb_t *cb, void *arg, int fd, int e
|
||||
*/
|
||||
int uev_io_set(uev_t *w, int fd, int events)
|
||||
{
|
||||
if (uev_io_stop(w))
|
||||
return -1;
|
||||
|
||||
/* Remove from internal list */
|
||||
LIST_REMOVE(w, link);
|
||||
/* Ignore any errors, only to clean up anything lingering ... */
|
||||
uev_io_stop(w);
|
||||
|
||||
return uev_io_init(w->ctx, w, (uev_cb_t *)w->cb, w->arg, fd, events);
|
||||
}
|
||||
@@ -90,14 +85,11 @@ int uev_io_start(uev_t *w)
|
||||
*/
|
||||
int uev_io_stop(uev_t *w)
|
||||
{
|
||||
int status = uev_watcher_stop(w);
|
||||
|
||||
return status;
|
||||
return uev_watcher_stop(w);
|
||||
}
|
||||
|
||||
/**
|
||||
* Local Variables:
|
||||
* version-control: t
|
||||
* indent-tabs-mode: t
|
||||
* c-file-style: "linux"
|
||||
* End:
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
|
||||
Name: @PACKAGE@
|
||||
Description: Simple event loop for Linux
|
||||
Version: @VERSION@
|
||||
Requires:
|
||||
Libs: -L${libdir} -luev
|
||||
Cflags: -I${includedir}
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
*.m4
|
||||
@@ -0,0 +1,88 @@
|
||||
/* 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 | UEV_PRI)
|
||||
|
||||
/* 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:
|
||||
* indent-tabs-mode: t
|
||||
* c-file-style: "linux"
|
||||
* End:
|
||||
*/
|
||||
@@ -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-$(@)))
|
||||
|
||||
@@ -1,26 +1,25 @@
|
||||
/* libuEv - Micro event loop library
|
||||
*
|
||||
* Copyright (c) 2012 Flemming Madsen <flemming!madsen()madsensoft!dk>
|
||||
* Copyright (c) 2013-2015 Joachim Nilsson <troglobit()gmail!com>
|
||||
* Copyright (c) 2013-2016 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>
|
||||
@@ -53,7 +52,7 @@ int uev_signal_init(uev_ctx_t *ctx, uev_t *w, uev_cb_t *cb, void *arg, int signo
|
||||
w->fd = -1;
|
||||
|
||||
sigemptyset(&mask);
|
||||
fd = signalfd(-1, &mask, SFD_NONBLOCK);
|
||||
fd = signalfd(-1, &mask, SFD_NONBLOCK | SFD_CLOEXEC);
|
||||
if (fd < 0)
|
||||
return -1;
|
||||
|
||||
@@ -152,7 +151,6 @@ int uev_signal_stop(uev_t *w)
|
||||
|
||||
/**
|
||||
* Local Variables:
|
||||
* version-control: t
|
||||
* indent-tabs-mode: t
|
||||
* c-file-style: "linux"
|
||||
* End:
|
||||
|
||||
@@ -1,26 +1,25 @@
|
||||
/* libuEv - Micro event loop library
|
||||
*
|
||||
* Copyright (c) 2012 Flemming Madsen <flemming!madsen()madsensoft!dk>
|
||||
* Copyright (c) 2013-2015 Joachim Nilsson <troglobit()gmail!com>
|
||||
* Copyright (c) 2013-2016 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>
|
||||
@@ -68,7 +67,12 @@ int uev_timer_init(uev_ctx_t *ctx, uev_t *w, uev_cb_t *cb, void *arg, int timeou
|
||||
{
|
||||
int fd;
|
||||
|
||||
fd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK);
|
||||
if (timeout < 0 || period < 0) {
|
||||
errno = ERANGE;
|
||||
return -1;
|
||||
}
|
||||
|
||||
fd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK | TFD_CLOEXEC);
|
||||
if (fd < 0)
|
||||
return -1;
|
||||
|
||||
@@ -101,6 +105,11 @@ int uev_timer_set(uev_t *w, int timeout, int period)
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (timeout < 0 || period < 0) {
|
||||
errno = ERANGE;
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Handle stopped timers */
|
||||
if (w->fd < 0) {
|
||||
/* Timer already stopped */
|
||||
@@ -123,11 +132,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 +164,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;
|
||||
@@ -172,7 +179,6 @@ int uev_timer_stop(uev_t *w)
|
||||
|
||||
/**
|
||||
* Local Variables:
|
||||
* version-control: t
|
||||
* indent-tabs-mode: t
|
||||
* c-file-style: "linux"
|
||||
* End:
|
||||
|
||||
@@ -1,29 +1,29 @@
|
||||
/* libuEv - Micro event loop library
|
||||
*
|
||||
* Copyright (c) 2012 Flemming Madsen <flemming!madsen()madsensoft!dk>
|
||||
* Copyright (c) 2013-2015 Joachim Nilsson <troglobit()gmail!com>
|
||||
* Copyright (c) 2013-2016 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>
|
||||
#include <fcntl.h> /* O_CLOEXEC */
|
||||
#include <string.h> /* memset() */
|
||||
#include <sys/epoll.h>
|
||||
#include <sys/signalfd.h> /* struct signalfd_siginfo */
|
||||
@@ -33,6 +33,29 @@
|
||||
|
||||
#define UNUSED(arg) arg __attribute__ ((unused))
|
||||
|
||||
|
||||
static int _init(uev_ctx_t *ctx, int close_old)
|
||||
{
|
||||
int fd;
|
||||
|
||||
fd = epoll_create1(EPOLL_CLOEXEC);
|
||||
if (fd < 0)
|
||||
return -1;
|
||||
|
||||
if (close_old)
|
||||
close(ctx->fd);
|
||||
|
||||
ctx->fd = fd;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Simple check if a descriptor is still valid in the kernel */
|
||||
static int is_valid_fd(int fd)
|
||||
{
|
||||
return fcntl(fd, F_GETFL) != -1 || errno != EBADF;
|
||||
}
|
||||
|
||||
/* Private to libuEv, 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)
|
||||
{
|
||||
@@ -41,16 +64,14 @@ int uev_watcher_init(uev_ctx_t *ctx, uev_t *w, uev_type_t type, uev_cb_t *cb, vo
|
||||
return -1;
|
||||
}
|
||||
|
||||
memset(w, 0, sizeof(*w));
|
||||
w->ctx = ctx;
|
||||
w->fd = fd;
|
||||
w->type = type;
|
||||
w->active = 0;
|
||||
w->fd = fd;
|
||||
w->cb = (void *)cb;
|
||||
w->arg = arg;
|
||||
w->events = events;
|
||||
|
||||
LIST_INSERT_HEAD(&w->ctx->watchers, w, link);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -67,13 +88,16 @@ int uev_watcher_start(uev_t *w)
|
||||
if (w->active)
|
||||
return 0;
|
||||
|
||||
ev.events = w->events;
|
||||
ev.events = w->events | EPOLLRDHUP;
|
||||
ev.data.ptr = w;
|
||||
if (epoll_ctl(w->ctx->fd, EPOLL_CTL_ADD, w->fd, &ev) < 0)
|
||||
return -1;
|
||||
|
||||
w->active = 1;
|
||||
|
||||
/* Add to internal list for bookkeeping */
|
||||
LIST_INSERT_HEAD(&w->ctx->watchers, w, link);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -88,10 +112,15 @@ int uev_watcher_stop(uev_t *w)
|
||||
if (!w->active)
|
||||
return 0;
|
||||
|
||||
/* Remove from kernel */
|
||||
epoll_ctl(w->ctx->fd, EPOLL_CTL_DEL, w->fd, NULL);
|
||||
w->active = 0;
|
||||
|
||||
/* Remove from internal list */
|
||||
LIST_REMOVE(w, link);
|
||||
|
||||
/* Remove from kernel */
|
||||
if (epoll_ctl(w->ctx->fd, EPOLL_CTL_DEL, w->fd, NULL) < 0)
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -103,17 +132,15 @@ int uev_watcher_stop(uev_t *w)
|
||||
*/
|
||||
int uev_init(uev_ctx_t *ctx)
|
||||
{
|
||||
int fd;
|
||||
|
||||
fd = epoll_create(1);
|
||||
if (fd < 0)
|
||||
if (!ctx) {
|
||||
errno = EINVAL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
memset(ctx, 0, sizeof(*ctx));
|
||||
ctx->fd = fd;
|
||||
LIST_INIT(&ctx->watchers);
|
||||
|
||||
return 0;
|
||||
return _init(ctx, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -206,20 +233,54 @@ int uev_run(uev_ctx_t *ctx, int flags)
|
||||
|
||||
if (EINTR == errno)
|
||||
continue; /* Signalled, try again */
|
||||
exit:
|
||||
result = -1;
|
||||
ctx->running = 0;
|
||||
break;
|
||||
|
||||
/* Unrecoverable error, cleanup and exit with error. */
|
||||
uev_exit(ctx);
|
||||
return -1;
|
||||
}
|
||||
|
||||
for (i = 0; ctx->running && i < nfds; i++) {
|
||||
w = (uev_t *)events[i].data.ptr;
|
||||
|
||||
if (events[i].events & (EPOLLHUP | EPOLLERR)) {
|
||||
ctx->errors++;
|
||||
|
||||
if (ctx->errors >= 42) {
|
||||
uev_t *tmp, *retry = w;;
|
||||
|
||||
/* If not valid anymore, try to remove, ignore any errors. */
|
||||
if (!is_valid_fd(w->fd))
|
||||
uev_watcher_stop(w);
|
||||
|
||||
/* Must recreate epoll fd now ... */
|
||||
if (_init(ctx, 1)) {
|
||||
uev_exit(ctx);
|
||||
return -2;
|
||||
}
|
||||
|
||||
/* Restart watchers in new efd */
|
||||
LIST_FOREACH_SAFE(w, &ctx->watchers, link, tmp) {
|
||||
if (w->active) {
|
||||
w->active = 0;
|
||||
LIST_REMOVE(w, link);
|
||||
uev_watcher_start(w);
|
||||
}
|
||||
}
|
||||
uev_watcher_start(retry);
|
||||
|
||||
/* New efd, restart everything! */
|
||||
ctx->errors = 0;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (UEV_TIMER_TYPE == w->type) {
|
||||
uint64_t exp;
|
||||
|
||||
if (read(w->fd, &exp, sizeof(exp)) != sizeof(exp))
|
||||
goto exit;
|
||||
if (read(w->fd, &exp, sizeof(exp)) != sizeof(exp)) {
|
||||
uev_exit(ctx);
|
||||
return -3;
|
||||
}
|
||||
|
||||
if (!w->period)
|
||||
w->timeout = 0;
|
||||
@@ -229,12 +290,14 @@ int uev_run(uev_ctx_t *ctx, int flags)
|
||||
struct signalfd_siginfo fdsi;
|
||||
ssize_t sz = sizeof(fdsi);
|
||||
|
||||
if (read(w->fd, &fdsi, sz) != sz)
|
||||
goto exit;
|
||||
if (read(w->fd, &fdsi, sz) != sz) {
|
||||
uev_exit(ctx);
|
||||
return -4;
|
||||
}
|
||||
}
|
||||
|
||||
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)
|
||||
@@ -249,10 +312,8 @@ int uev_run(uev_ctx_t *ctx, int flags)
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Local Variables:
|
||||
* version-control: t
|
||||
* indent-tabs-mode: t
|
||||
* c-file-style: "linux"
|
||||
* End:
|
||||
|
||||
@@ -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
|
||||
@@ -38,58 +34,24 @@
|
||||
#define UEV_NONE 0
|
||||
#define UEV_READ EPOLLIN
|
||||
#define UEV_WRITE EPOLLOUT
|
||||
#define UEV_PRI EPOLLPRI
|
||||
|
||||
/* Run flags */
|
||||
#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() */
|
||||
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);
|
||||
@@ -115,7 +77,6 @@ int uev_signal_stop (uev_t *w);
|
||||
|
||||
/**
|
||||
* Local Variables:
|
||||
* version-control: t
|
||||
* indent-tabs-mode: t
|
||||
* c-file-style: "linux"
|
||||
* End:
|
||||
|
||||
Reference in new issue
Block a user