Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

treate EINVAL as per fd error in kqueue; use argument for debug macro…

…s in

poll; version 1.1a; EINVAL fix from Nick Mathewson


svn:r168
  • Loading branch information...
commit 9938aaf5114110c60a8a4f59866be3de5cd88c48 1 parent 81bd0a0
provos provos authored
Showing with 5 additions and 2 deletions.
  1. +1 −1  configure.in
  2. +3 −0  kqueue.c
  3. +1 −1  poll.c
2  configure.in
View
@@ -2,7 +2,7 @@ dnl configure.in for libevent
dnl Dug Song <dugsong@monkey.org>
AC_INIT(event.c)
-AM_INIT_AUTOMAKE(libevent,1.0f)
+AM_INIT_AUTOMAKE(libevent,1.1a)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
3  kqueue.c
View
@@ -239,11 +239,14 @@ kq_dispatch(struct event_base *base, void *arg, struct timeval *tv)
* closed,
* ENOENT when the file discriptor was closed and
* then reopened.
+ * EINVAL for some reasons not understood; EINVAL
+ * should not be returned ever; but FreeBSD does :-\
* An error is also indicated when a callback deletes
* an event we are still processing. In that case
* the data field is set to ENOENT.
*/
if (events[i].data == EBADF ||
+ events[i].data == EINVAL ||
events[i].data == ENOENT)
continue;
errno = events[i].data;
2  poll.c
View
@@ -157,7 +157,7 @@ poll_dispatch(struct event_base *base, void *arg, struct timeval *tv)
if (evsignal_deliver(&pop->evsigmask) == -1)
return (-1);
- poll_check_ok();
+ poll_check_ok(pop);
sec = tv->tv_sec * 1000 + (tv->tv_usec + 999) / 1000;
nfds = pop->nfds;
res = poll(pop->event_set, nfds, sec);
Please sign in to comment.
Something went wrong with that request. Please try again.