mirror of
https://github.com/cuberite/libevent.git
synced 2025-09-08 03:44:22 -04:00
treate EINVAL as per fd error in kqueue; use argument for debug macros in
poll; version 1.1a; EINVAL fix from Nick Mathewson svn:r168
This commit is contained in:
parent
81bd0a0687
commit
9938aaf511
@ -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
3
kqueue.c
@ -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
2
poll.c
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user