* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if EV_USE_CONFIG_H
+# include "config.h"
+#endif
#include <math.h>
#include <stdlib.h>
#include <sys/time.h>
#include <time.h>
-#ifndef HAVE_MONOTONIC
+#ifndef EV_USE_MONOTONIC
# ifdef CLOCK_MONOTONIC
-# define HAVE_MONOTONIC 1
+# define EV_USE_MONOTONIC 1
# endif
#endif
-#ifndef HAVE_SELECT
-# define HAVE_SELECT 1
+#ifndef EV_USE_SELECT
+# define EV_USE_SELECT 1
#endif
-#ifndef HAVE_EPOLL
-# define HAVE_EPOLL 0
+#ifndef EV_USE_EPOLL
+# define EV_USE_EPOLL 0
#endif
-#ifndef HAVE_REALTIME
-# define HAVE_REALTIME 1 /* posix requirement, but might be slower */
+#ifndef CLOCK_REALTIME
+# define EV_USE_REALTIME 0
+#endif
+#ifndef EV_USE_REALTIME
+# define EV_USE_REALTIME 1 /* posix requirement, but might be slower */
#endif
#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
-#define MAX_BLOCKTIME 60.
-#define PID_HASHSIZE 16 /* size of pid hahs table, must be power of two */
+#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detetc time jumps) */
+#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
+#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
#include "ev.h"
ev_tstamp
ev_time (void)
{
-#if HAVE_REALTIME
+#if EV_USE_REALTIME
struct timespec ts;
clock_gettime (CLOCK_REALTIME, &ts);
return ts.tv_sec + ts.tv_nsec * 1e-9;
static ev_tstamp
get_clock (void)
{
-#if HAVE_MONOTONIC
+#if EV_USE_MONOTONIC
if (have_monotonic)
{
struct timespec ts;
return ev_time ();
}
+#define array_roundsize(base,n) ((n) | 4 & ~3)
+
#define array_needsize(base,cur,cnt,init) \
if ((cnt) > cur) \
{ \
int newcnt = cur; \
do \
{ \
- newcnt = (newcnt << 1) | 4 & ~3; \
+ newcnt = array_roundsize (base, newcnt << 1); \
} \
while ((cnt) > newcnt); \
\
typedef struct
{
struct ev_io *head;
- int events;
+ unsigned char events;
+ unsigned char reify;
} ANFD;
static ANFD *anfds;
{
base->head = 0;
base->events = EV_NONE;
+ base->reify = 0;
+
++base;
}
}
static void
event (W w, int events)
{
- if (w->active)
+ if (w->pending)
{
- w->pending = ++pendingcnt;
- array_needsize (pendings, pendingmax, pendingcnt, );
- pendings [pendingcnt - 1].w = w;
- pendings [pendingcnt - 1].events = events;
+ pendings [w->pending - 1].events |= events;
+ return;
}
+
+ w->pending = ++pendingcnt;
+ array_needsize (pendings, pendingmax, pendingcnt, );
+ pendings [pendingcnt - 1].w = w;
+ pendings [pendingcnt - 1].events = events;
}
static void
for (w = anfd->head; w; w = w->next)
events |= w->events;
- anfd->events &= ~EV_REIFY;
+ anfd->reify = 0;
if (anfd->events != events)
{
static void
fd_change (int fd)
{
- if (anfds [fd].events & EV_REIFY)
+ if (anfds [fd].reify || fdchangecnt < 0)
return;
- anfds [fd].events |= EV_REIFY;
+ anfds [fd].reify = 1;
++fdchangecnt;
array_needsize (fdchanges, fdchangemax, fdchangecnt, );
if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
while (anfds [fd].head)
{
- event ((W)anfds [fd].head, EV_ERROR);
ev_io_stop (anfds [fd].head);
+ event ((W)anfds [fd].head, EV_ERROR | EV_READ | EV_WRITE);
}
}
typedef struct
{
struct ev_signal *head;
- sig_atomic_t gotsig;
+ sig_atomic_t volatile gotsig;
} ANSIG;
static ANSIG *signals;
static int signalmax;
static int sigpipe [2];
-static sig_atomic_t gotsig;
+static sig_atomic_t volatile gotsig;
static struct ev_io sigev;
static void
{
base->head = 0;
base->gotsig = 0;
+
++base;
}
}
if (!gotsig)
{
gotsig = 1;
- write (sigpipe [1], &gotsig, 1);
+ write (sigpipe [1], &signum, 1);
}
}
struct ev_signal *w;
int sig;
- gotsig = 0;
read (sigpipe [0], &revents, 1);
+ gotsig = 0;
for (sig = signalmax; sig--; )
if (signals [sig].gotsig)
/*****************************************************************************/
-#if HAVE_EPOLL
+#if EV_USE_EPOLL
# include "ev_epoll.c"
#endif
-#if HAVE_SELECT
+#if EV_USE_SELECT
# include "ev_select.c"
#endif
{
if (!ev_method)
{
-#if HAVE_MONOTONIC
+#if EV_USE_MONOTONIC
{
struct timespec ts;
if (!clock_gettime (CLOCK_MONOTONIC, &ts))
return 0;
ev_method = EVMETHOD_NONE;
-#if HAVE_EPOLL
+#if EV_USE_EPOLL
if (ev_method == EVMETHOD_NONE) epoll_init (flags);
#endif
-#if HAVE_SELECT
+#if EV_USE_SELECT
if (ev_method == EVMETHOD_NONE) select_init (flags);
#endif
void
ev_postfork_child (void)
{
-#if HAVE_EPOLL
+#if EV_USE_EPOLL
if (ev_method == EVMETHOD_EPOLL)
epoll_postfork_child ();
#endif
{
struct ev_timer *w = timers [0];
- event ((W)w, EV_TIMEOUT);
-
/* first reschedule or stop timer */
if (w->repeat)
{
+ assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
w->at = now + w->repeat;
- assert (("timer timeout in the past, negative repeat?", w->at > now));
downheap ((WT *)timers, timercnt, 0);
}
else
ev_timer_stop (w); /* nonrepeating: stop timer */
+
+ event ((W)w, EV_TIMEOUT);
}
}
if (w->interval)
{
w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
- assert (("periodic timeout in the past, negative interval?", w->at > ev_now));
+ assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > ev_now));
downheap ((WT *)periodics, periodiccnt, 0);
}
else
ev_periodic_stop (w); /* nonrepeating: stop timer */
- event ((W)w, EV_TIMEOUT);
+ event ((W)w, EV_PERIODIC);
}
}
}
static void
-ev_clear (W w)
+ev_clear_pending (W w)
{
if (w->pending)
{
int fd = w->fd;
+ assert (("ev_io_start called with negative fd", fd >= 0));
+
ev_start ((W)w, 1);
array_needsize (anfds, anfdmax, fd + 1, anfds_init);
wlist_add ((WL *)&anfds[fd].head, (WL)w);
void
ev_io_stop (struct ev_io *w)
{
- ev_clear ((W)w);
+ ev_clear_pending ((W)w);
if (!ev_is_active (w))
return;
w->at += now;
- assert (("timer repeat value less than zero not allowed", w->repeat >= 0.));
+ assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
ev_start ((W)w, ++timercnt);
array_needsize (timers, timermax, timercnt, );
void
ev_timer_stop (struct ev_timer *w)
{
- ev_clear ((W)w);
+ ev_clear_pending ((W)w);
if (!ev_is_active (w))
return;
if (ev_is_active (w))
return;
- assert (("periodic interval value less than zero not allowed", w->interval >= 0.));
+ assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
/* this formula differs from the one in periodic_reify because we do not always round up */
if (w->interval)
void
ev_periodic_stop (struct ev_periodic *w)
{
- ev_clear ((W)w);
+ ev_clear_pending ((W)w);
if (!ev_is_active (w))
return;
if (ev_is_active (w))
return;
+ assert (("ev_signal_start called with illegal signal number", w->signum > 0));
+
ev_start ((W)w, 1);
array_needsize (signals, signalmax, w->signum, signals_init);
wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
void
ev_signal_stop (struct ev_signal *w)
{
- ev_clear ((W)w);
+ ev_clear_pending ((W)w);
if (!ev_is_active (w))
return;
void
ev_idle_stop (struct ev_idle *w)
{
- ev_clear ((W)w);
+ ev_clear_pending ((W)w);
if (ev_is_active (w))
return;
void
ev_prepare_stop (struct ev_prepare *w)
{
- ev_clear ((W)w);
+ ev_clear_pending ((W)w);
if (ev_is_active (w))
return;
void
ev_check_stop (struct ev_check *w)
{
- ev_clear ((W)w);
+ ev_clear_pending ((W)w);
if (ev_is_active (w))
return;
void
ev_child_stop (struct ev_child *w)
{
- ev_clear ((W)w);
+ ev_clear_pending ((W)w);
if (ev_is_active (w))
return;
struct ev_once *once = malloc (sizeof (struct ev_once));
if (!once)
- cb (EV_ERROR, arg);
+ cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
else
{
once->cb = cb;
once->arg = arg;
ev_watcher_init (&once->io, once_cb_io);
-
if (fd >= 0)
{
ev_io_set (&once->io, fd, events);
}
ev_watcher_init (&once->to, once_cb_to);
-
if (timeout >= 0.)
{
ev_timer_set (&once->to, timeout, 0.);
projects / software / libev.git / blobdiff