ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev.c
(Generate patch)

Comparing libev/ev.c (file contents):
Revision 1.23 by root, Wed Oct 31 20:10:17 2007 UTC vs.
Revision 1.51 by root, Sat Nov 3 21:58:51 2007 UTC

1/* 1/*
2 * libev event processing core, watcher management
3 *
2 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
3 * All rights reserved. 5 * All rights reserved.
4 * 6 *
5 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 8 * modification, are permitted provided that the following conditions are
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 30 */
31#ifndef EV_STANDALONE
32# include "config.h"
33#endif
29 34
30#include <math.h> 35#include <math.h>
31#include <stdlib.h> 36#include <stdlib.h>
32#include <unistd.h> 37#include <unistd.h>
33#include <fcntl.h> 38#include <fcntl.h>
37#include <stdio.h> 42#include <stdio.h>
38 43
39#include <assert.h> 44#include <assert.h>
40#include <errno.h> 45#include <errno.h>
41#include <sys/types.h> 46#include <sys/types.h>
47#ifndef WIN32
42#include <sys/wait.h> 48# include <sys/wait.h>
49#endif
43#include <sys/time.h> 50#include <sys/time.h>
44#include <time.h> 51#include <time.h>
45 52
53/**/
54
46#ifndef HAVE_MONOTONIC 55#ifndef EV_USE_MONOTONIC
56# define EV_USE_MONOTONIC 1
57#endif
58
59#ifndef EV_USE_SELECT
60# define EV_USE_SELECT 1
61#endif
62
63#ifndef EV_USEV_POLL
64# define EV_USEV_POLL 0 /* poll is usually slower than select, and not as well tested */
65#endif
66
67#ifndef EV_USE_EPOLL
68# define EV_USE_EPOLL 0
69#endif
70
71#ifndef EV_USE_KQUEUE
72# define EV_USE_KQUEUE 0
73#endif
74
75#ifndef EV_USE_REALTIME
76# define EV_USE_REALTIME 1
77#endif
78
79/**/
80
47# ifdef CLOCK_MONOTONIC 81#ifndef CLOCK_MONOTONIC
82# undef EV_USE_MONOTONIC
48# define HAVE_MONOTONIC 1 83# define EV_USE_MONOTONIC 0
49# endif 84#endif
50#endif
51 85
52#ifndef HAVE_SELECT
53# define HAVE_SELECT 1
54#endif
55
56#ifndef HAVE_EPOLL
57# define HAVE_EPOLL 0
58#endif
59
60#ifndef HAVE_REALTIME 86#ifndef CLOCK_REALTIME
61# define HAVE_REALTIME 1 /* posix requirement, but might be slower */ 87# undef EV_USE_REALTIME
88# define EV_USE_REALTIME 0
62#endif 89#endif
90
91/**/
63 92
64#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 93#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
65#define MAX_BLOCKTIME 60. 94#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
66#define PID_HASHSIZE 16 /* size of pid hahs table, must be power of two */ 95#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
96/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
67 97
68#include "ev.h" 98#include "ev.h"
99
100#if __GNUC__ >= 3
101# define expect(expr,value) __builtin_expect ((expr),(value))
102# define inline inline
103#else
104# define expect(expr,value) (expr)
105# define inline static
106#endif
107
108#define expect_false(expr) expect ((expr) != 0, 0)
109#define expect_true(expr) expect ((expr) != 0, 1)
110
111#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
112#define ABSPRI(w) ((w)->priority - EV_MINPRI)
69 113
70typedef struct ev_watcher *W; 114typedef struct ev_watcher *W;
71typedef struct ev_watcher_list *WL; 115typedef struct ev_watcher_list *WL;
72typedef struct ev_watcher_time *WT; 116typedef struct ev_watcher_time *WT;
73 117
74static ev_tstamp now, diff; /* monotonic clock */ 118static ev_tstamp now_floor, mn_now, diff; /* monotonic clock */
75ev_tstamp ev_now; 119static ev_tstamp rt_now;
76int ev_method; 120static int method;
77 121
78static int have_monotonic; /* runtime */ 122static int have_monotonic; /* runtime */
79 123
80static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */ 124static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */
81static void (*method_modify)(int fd, int oev, int nev); 125static void (*method_modify)(EV_P_ int fd, int oev, int nev);
82static void (*method_poll)(ev_tstamp timeout); 126static void (*method_poll)(EV_P_ ev_tstamp timeout);
127
128static int activecnt; /* number of active events */
129
130#if EV_USE_SELECT
131static unsigned char *vec_ri, *vec_ro, *vec_wi, *vec_wo;
132static int vec_max;
133#endif
134
135#if EV_USEV_POLL
136static struct pollfd *polls;
137static int pollmax, pollcnt;
138static int *pollidxs; /* maps fds into structure indices */
139static int pollidxmax;
140#endif
141
142#if EV_USE_EPOLL
143static int epoll_fd = -1;
144
145static struct epoll_event *events;
146static int eventmax;
147#endif
148
149#if EV_USE_KQUEUE
150static int kqueue_fd;
151static struct kevent *kqueue_changes;
152static int kqueue_changemax, kqueue_changecnt;
153static struct kevent *kqueue_events;
154static int kqueue_eventmax;
155#endif
83 156
84/*****************************************************************************/ 157/*****************************************************************************/
85 158
86ev_tstamp 159inline ev_tstamp
87ev_time (void) 160ev_time (void)
88{ 161{
89#if HAVE_REALTIME 162#if EV_USE_REALTIME
90 struct timespec ts; 163 struct timespec ts;
91 clock_gettime (CLOCK_REALTIME, &ts); 164 clock_gettime (CLOCK_REALTIME, &ts);
92 return ts.tv_sec + ts.tv_nsec * 1e-9; 165 return ts.tv_sec + ts.tv_nsec * 1e-9;
93#else 166#else
94 struct timeval tv; 167 struct timeval tv;
95 gettimeofday (&tv, 0); 168 gettimeofday (&tv, 0);
96 return tv.tv_sec + tv.tv_usec * 1e-6; 169 return tv.tv_sec + tv.tv_usec * 1e-6;
97#endif 170#endif
98} 171}
99 172
100static ev_tstamp 173inline ev_tstamp
101get_clock (void) 174get_clock (void)
102{ 175{
103#if HAVE_MONOTONIC 176#if EV_USE_MONOTONIC
104 if (have_monotonic) 177 if (expect_true (have_monotonic))
105 { 178 {
106 struct timespec ts; 179 struct timespec ts;
107 clock_gettime (CLOCK_MONOTONIC, &ts); 180 clock_gettime (CLOCK_MONOTONIC, &ts);
108 return ts.tv_sec + ts.tv_nsec * 1e-9; 181 return ts.tv_sec + ts.tv_nsec * 1e-9;
109 } 182 }
110#endif 183#endif
111 184
112 return ev_time (); 185 return ev_time ();
113} 186}
114 187
188ev_tstamp
189ev_now (EV_P)
190{
191 return rt_now;
192}
193
194#define array_roundsize(base,n) ((n) | 4 & ~3)
195
115#define array_needsize(base,cur,cnt,init) \ 196#define array_needsize(base,cur,cnt,init) \
116 if ((cnt) > cur) \ 197 if (expect_false ((cnt) > cur)) \
117 { \ 198 { \
118 int newcnt = cur; \ 199 int newcnt = cur; \
119 do \ 200 do \
120 { \ 201 { \
121 newcnt = (newcnt << 1) | 4 & ~3; \ 202 newcnt = array_roundsize (base, newcnt << 1); \
122 } \ 203 } \
123 while ((cnt) > newcnt); \ 204 while ((cnt) > newcnt); \
124 \ 205 \
125 base = realloc (base, sizeof (*base) * (newcnt)); \ 206 base = realloc (base, sizeof (*base) * (newcnt)); \
126 init (base + cur, newcnt - cur); \ 207 init (base + cur, newcnt - cur); \
129 210
130/*****************************************************************************/ 211/*****************************************************************************/
131 212
132typedef struct 213typedef struct
133{ 214{
134 struct ev_io *head; 215 struct ev_watcher_list *head;
135 unsigned char wev, rev; /* want, received event set */ 216 unsigned char events;
217 unsigned char reify;
136} ANFD; 218} ANFD;
137 219
138static ANFD *anfds; 220static ANFD *anfds;
139static int anfdmax; 221static int anfdmax;
140 222
141static int *fdchanges;
142static int fdchangemax, fdchangecnt;
143
144static void 223static void
145anfds_init (ANFD *base, int count) 224anfds_init (ANFD *base, int count)
146{ 225{
147 while (count--) 226 while (count--)
148 { 227 {
149 base->head = 0; 228 base->head = 0;
150 base->wev = base->rev = EV_NONE; 229 base->events = EV_NONE;
230 base->reify = 0;
231
151 ++base; 232 ++base;
152 } 233 }
153} 234}
154 235
155typedef struct 236typedef struct
156{ 237{
157 W w; 238 W w;
158 int events; 239 int events;
159} ANPENDING; 240} ANPENDING;
160 241
161static ANPENDING *pendings; 242static ANPENDING *pendings [NUMPRI];
162static int pendingmax, pendingcnt; 243static int pendingmax [NUMPRI], pendingcnt [NUMPRI];
163 244
164static void 245static void
165event (W w, int events) 246event (EV_P_ W w, int events)
166{ 247{
167 if (w->active) 248 if (w->pending)
168 { 249 {
169 w->pending = ++pendingcnt;
170 array_needsize (pendings, pendingmax, pendingcnt, );
171 pendings [pendingcnt - 1].w = w;
172 pendings [pendingcnt - 1].events = events; 250 pendings [ABSPRI (w)][w->pending - 1].events |= events;
251 return;
173 } 252 }
174}
175 253
254 w->pending = ++pendingcnt [ABSPRI (w)];
255 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
256 pendings [ABSPRI (w)][w->pending - 1].w = w;
257 pendings [ABSPRI (w)][w->pending - 1].events = events;
258}
259
176static void 260static void
261queue_events (EV_P_ W *events, int eventcnt, int type)
262{
263 int i;
264
265 for (i = 0; i < eventcnt; ++i)
266 event (EV_A_ events [i], type);
267}
268
269static void
177fd_event (int fd, int events) 270fd_event (EV_P_ int fd, int events)
178{ 271{
179 ANFD *anfd = anfds + fd; 272 ANFD *anfd = anfds + fd;
180 struct ev_io *w; 273 struct ev_io *w;
181 274
182 for (w = anfd->head; w; w = w->next) 275 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
183 { 276 {
184 int ev = w->events & events; 277 int ev = w->events & events;
185 278
186 if (ev) 279 if (ev)
187 event ((W)w, ev); 280 event (EV_A_ (W)w, ev);
188 } 281 }
189} 282}
190 283
284/*****************************************************************************/
285
286static int *fdchanges;
287static int fdchangemax, fdchangecnt;
288
191static void 289static void
192queue_events (W *events, int eventcnt, int type) 290fd_reify (EV_P)
193{ 291{
194 int i; 292 int i;
195 293
196 for (i = 0; i < eventcnt; ++i) 294 for (i = 0; i < fdchangecnt; ++i)
197 event (events [i], type); 295 {
296 int fd = fdchanges [i];
297 ANFD *anfd = anfds + fd;
298 struct ev_io *w;
299
300 int events = 0;
301
302 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
303 events |= w->events;
304
305 anfd->reify = 0;
306
307 if (anfd->events != events)
308 {
309 method_modify (EV_A_ fd, anfd->events, events);
310 anfd->events = events;
311 }
312 }
313
314 fdchangecnt = 0;
315}
316
317static void
318fd_change (EV_P_ int fd)
319{
320 if (anfds [fd].reify || fdchangecnt < 0)
321 return;
322
323 anfds [fd].reify = 1;
324
325 ++fdchangecnt;
326 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
327 fdchanges [fdchangecnt - 1] = fd;
328}
329
330static void
331fd_kill (EV_P_ int fd)
332{
333 struct ev_io *w;
334
335 while ((w = (struct ev_io *)anfds [fd].head))
336 {
337 ev_io_stop (EV_A_ w);
338 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
339 }
198} 340}
199 341
200/* called on EBADF to verify fds */ 342/* called on EBADF to verify fds */
201static void 343static void
202fd_recheck () 344fd_ebadf (EV_P)
203{ 345{
204 int fd; 346 int fd;
205 347
206 for (fd = 0; fd < anfdmax; ++fd) 348 for (fd = 0; fd < anfdmax; ++fd)
207 if (anfds [fd].wev) 349 if (anfds [fd].events)
208 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 350 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
209 while (anfds [fd].head) 351 fd_kill (EV_A_ fd);
210 evio_stop (anfds [fd].head); 352}
353
354/* called on ENOMEM in select/poll to kill some fds and retry */
355static void
356fd_enomem (EV_P)
357{
358 int fd = anfdmax;
359
360 while (fd--)
361 if (anfds [fd].events)
362 {
363 close (fd);
364 fd_kill (EV_A_ fd);
365 return;
366 }
211} 367}
212 368
213/*****************************************************************************/ 369/*****************************************************************************/
214 370
215static struct ev_timer **timers; 371static struct ev_timer **timers;
261 417
262/*****************************************************************************/ 418/*****************************************************************************/
263 419
264typedef struct 420typedef struct
265{ 421{
266 struct ev_signal *head; 422 struct ev_watcher_list *head;
267 sig_atomic_t gotsig; 423 sig_atomic_t volatile gotsig;
268} ANSIG; 424} ANSIG;
269 425
270static ANSIG *signals; 426static ANSIG *signals;
271static int signalmax; 427static int signalmax;
272 428
273static int sigpipe [2]; 429static int sigpipe [2];
274static sig_atomic_t gotsig; 430static sig_atomic_t volatile gotsig;
275static struct ev_io sigev; 431static struct ev_io sigev;
276 432
277static void 433static void
278signals_init (ANSIG *base, int count) 434signals_init (ANSIG *base, int count)
279{ 435{
280 while (count--) 436 while (count--)
281 { 437 {
282 base->head = 0; 438 base->head = 0;
283 base->gotsig = 0; 439 base->gotsig = 0;
440
284 ++base; 441 ++base;
285 } 442 }
286} 443}
287 444
288static void 445static void
290{ 447{
291 signals [signum - 1].gotsig = 1; 448 signals [signum - 1].gotsig = 1;
292 449
293 if (!gotsig) 450 if (!gotsig)
294 { 451 {
452 int old_errno = errno;
295 gotsig = 1; 453 gotsig = 1;
296 write (sigpipe [1], &gotsig, 1); 454 write (sigpipe [1], &signum, 1);
455 errno = old_errno;
297 } 456 }
298} 457}
299 458
300static void 459static void
301sigcb (struct ev_io *iow, int revents) 460sigcb (EV_P_ struct ev_io *iow, int revents)
302{ 461{
303 struct ev_signal *w; 462 struct ev_watcher_list *w;
304 int sig; 463 int signum;
305 464
465 read (sigpipe [0], &revents, 1);
306 gotsig = 0; 466 gotsig = 0;
307 read (sigpipe [0], &revents, 1);
308 467
309 for (sig = signalmax; sig--; ) 468 for (signum = signalmax; signum--; )
310 if (signals [sig].gotsig) 469 if (signals [signum].gotsig)
311 { 470 {
312 signals [sig].gotsig = 0; 471 signals [signum].gotsig = 0;
313 472
314 for (w = signals [sig].head; w; w = w->next) 473 for (w = signals [signum].head; w; w = w->next)
315 event ((W)w, EV_SIGNAL); 474 event (EV_A_ (W)w, EV_SIGNAL);
316 } 475 }
317} 476}
318 477
319static void 478static void
320siginit (void) 479siginit (EV_P)
321{ 480{
481#ifndef WIN32
322 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 482 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
323 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC); 483 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
324 484
325 /* rather than sort out wether we really need nb, set it */ 485 /* rather than sort out wether we really need nb, set it */
326 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 486 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
327 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 487 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
488#endif
328 489
329 evio_set (&sigev, sigpipe [0], EV_READ); 490 ev_io_set (&sigev, sigpipe [0], EV_READ);
330 evio_start (&sigev); 491 ev_io_start (&sigev);
331} 492}
332 493
333/*****************************************************************************/ 494/*****************************************************************************/
334 495
335static struct ev_idle **idles; 496static struct ev_idle **idles;
344/*****************************************************************************/ 505/*****************************************************************************/
345 506
346static struct ev_child *childs [PID_HASHSIZE]; 507static struct ev_child *childs [PID_HASHSIZE];
347static struct ev_signal childev; 508static struct ev_signal childev;
348 509
510#ifndef WIN32
511
349#ifndef WCONTINUED 512#ifndef WCONTINUED
350# define WCONTINUED 0 513# define WCONTINUED 0
351#endif 514#endif
352 515
353static void 516static void
354childcb (struct ev_signal *sw, int revents) 517child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status)
355{ 518{
356 struct ev_child *w; 519 struct ev_child *w;
520
521 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
522 if (w->pid == pid || !w->pid)
523 {
524 w->priority = sw->priority; /* need to do it *now* */
525 w->rpid = pid;
526 w->rstatus = status;
527 event (EV_A_ (W)w, EV_CHILD);
528 }
529}
530
531static void
532childcb (EV_P_ struct ev_signal *sw, int revents)
533{
357 int pid, status; 534 int pid, status;
358 535
359 while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1) 536 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
360 for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next) 537 {
361 if (w->pid == pid || w->pid == -1) 538 /* make sure we are called again until all childs have been reaped */
362 { 539 event (EV_A_ (W)sw, EV_SIGNAL);
363 w->status = status; 540
364 event ((W)w, EV_CHILD); 541 child_reap (EV_A_ sw, pid, pid, status);
365 } 542 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
543 }
366} 544}
545
546#endif
367 547
368/*****************************************************************************/ 548/*****************************************************************************/
369 549
550#if EV_USE_KQUEUE
551# include "ev_kqueue.c"
552#endif
370#if HAVE_EPOLL 553#if EV_USE_EPOLL
371# include "ev_epoll.c" 554# include "ev_epoll.c"
372#endif 555#endif
556#if EV_USEV_POLL
557# include "ev_poll.c"
558#endif
373#if HAVE_SELECT 559#if EV_USE_SELECT
374# include "ev_select.c" 560# include "ev_select.c"
375#endif 561#endif
376 562
377int ev_init (int flags) 563int
564ev_version_major (void)
378{ 565{
566 return EV_VERSION_MAJOR;
567}
568
569int
570ev_version_minor (void)
571{
572 return EV_VERSION_MINOR;
573}
574
575/* return true if we are running with elevated privileges and should ignore env variables */
576static int
577enable_secure (void)
578{
579#ifdef WIN32
580 return 0;
581#else
582 return getuid () != geteuid ()
583 || getgid () != getegid ();
584#endif
585}
586
587int
588ev_method (EV_P)
589{
590 return method;
591}
592
593int
594ev_init (EV_P_ int methods)
595{
379 if (!ev_method) 596 if (!method)
380 { 597 {
381#if HAVE_MONOTONIC 598#if EV_USE_MONOTONIC
382 { 599 {
383 struct timespec ts; 600 struct timespec ts;
384 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 601 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
385 have_monotonic = 1; 602 have_monotonic = 1;
386 } 603 }
387#endif 604#endif
388 605
389 ev_now = ev_time (); 606 rt_now = ev_time ();
390 now = get_clock (); 607 mn_now = get_clock ();
608 now_floor = mn_now;
391 diff = ev_now - now; 609 diff = rt_now - mn_now;
392 610
393 if (pipe (sigpipe)) 611 if (pipe (sigpipe))
394 return 0; 612 return 0;
395 613
614 if (methods == EVMETHOD_AUTO)
615 if (!enable_secure () && getenv ("LIBmethodS"))
616 methods = atoi (getenv ("LIBmethodS"));
617 else
396 ev_method = EVMETHOD_NONE; 618 methods = EVMETHOD_ANY;
619
620 method = 0;
621#if EV_USE_KQUEUE
622 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
623#endif
397#if HAVE_EPOLL 624#if EV_USE_EPOLL
398 if (ev_method == EVMETHOD_NONE) epoll_init (flags); 625 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
399#endif 626#endif
627#if EV_USEV_POLL
628 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
629#endif
400#if HAVE_SELECT 630#if EV_USE_SELECT
401 if (ev_method == EVMETHOD_NONE) select_init (flags); 631 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
402#endif 632#endif
403 633
404 if (ev_method) 634 if (method)
405 { 635 {
406 evw_init (&sigev, sigcb); 636 ev_watcher_init (&sigev, sigcb);
637 ev_set_priority (&sigev, EV_MAXPRI);
407 siginit (); 638 siginit (EV_A);
408 639
640#ifndef WIN32
409 evsignal_init (&childev, childcb, SIGCHLD); 641 ev_signal_init (&childev, childcb, SIGCHLD);
642 ev_set_priority (&childev, EV_MAXPRI);
410 evsignal_start (&childev); 643 ev_signal_start (EV_A_ &childev);
644#endif
411 } 645 }
412 } 646 }
413 647
414 return ev_method; 648 return method;
415} 649}
416 650
417/*****************************************************************************/ 651/*****************************************************************************/
418 652
419void ev_prefork (void) 653void
654ev_fork_prepare (void)
420{ 655{
421 /* nop */ 656 /* nop */
422} 657}
423 658
659void
424void ev_postfork_parent (void) 660ev_fork_parent (void)
425{ 661{
426 /* nop */ 662 /* nop */
427} 663}
428 664
665void
429void ev_postfork_child (void) 666ev_fork_child (void)
430{ 667{
431#if HAVE_EPOLL 668#if EV_USE_EPOLL
432 if (ev_method == EVMETHOD_EPOLL) 669 if (method == EVMETHOD_EPOLL)
433 epoll_postfork_child (); 670 epoll_postfork_child ();
434#endif 671#endif
435 672
436 evio_stop (&sigev); 673 ev_io_stop (&sigev);
437 close (sigpipe [0]); 674 close (sigpipe [0]);
438 close (sigpipe [1]); 675 close (sigpipe [1]);
439 pipe (sigpipe); 676 pipe (sigpipe);
440 siginit (); 677 siginit ();
441} 678}
442 679
443/*****************************************************************************/ 680/*****************************************************************************/
444 681
445static void 682static void
446fd_reify (void) 683call_pending (EV_P)
447{ 684{
448 int i; 685 int pri;
449 686
450 for (i = 0; i < fdchangecnt; ++i) 687 for (pri = NUMPRI; pri--; )
451 { 688 while (pendingcnt [pri])
452 int fd = fdchanges [i];
453 ANFD *anfd = anfds + fd;
454 struct ev_io *w;
455
456 int wev = 0;
457
458 for (w = anfd->head; w; w = w->next)
459 wev |= w->events;
460
461 if (anfd->wev != wev)
462 { 689 {
463 method_modify (fd, anfd->wev, wev);
464 anfd->wev = wev;
465 }
466 }
467
468 fdchangecnt = 0;
469}
470
471static void
472call_pending ()
473{
474 while (pendingcnt)
475 {
476 ANPENDING *p = pendings + --pendingcnt; 690 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
477 691
478 if (p->w) 692 if (p->w)
479 { 693 {
480 p->w->pending = 0; 694 p->w->pending = 0;
481 p->w->cb (p->w, p->events); 695 p->w->cb (EV_A_ p->w, p->events);
482 } 696 }
483 } 697 }
484} 698}
485 699
486static void 700static void
487timers_reify () 701timers_reify (EV_P)
488{ 702{
489 while (timercnt && timers [0]->at <= now) 703 while (timercnt && timers [0]->at <= mn_now)
490 { 704 {
491 struct ev_timer *w = timers [0]; 705 struct ev_timer *w = timers [0];
492
493 event ((W)w, EV_TIMEOUT);
494 706
495 /* first reschedule or stop timer */ 707 /* first reschedule or stop timer */
496 if (w->repeat) 708 if (w->repeat)
497 { 709 {
710 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
498 w->at = now + w->repeat; 711 w->at = mn_now + w->repeat;
499 assert (("timer timeout in the past, negative repeat?", w->at > now));
500 downheap ((WT *)timers, timercnt, 0); 712 downheap ((WT *)timers, timercnt, 0);
501 } 713 }
502 else 714 else
503 evtimer_stop (w); /* nonrepeating: stop timer */ 715 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
504 }
505}
506 716
717 event ((W)w, EV_TIMEOUT);
718 }
719}
720
507static void 721static void
508periodics_reify () 722periodics_reify (EV_P)
509{ 723{
510 while (periodiccnt && periodics [0]->at <= ev_now) 724 while (periodiccnt && periodics [0]->at <= rt_now)
511 { 725 {
512 struct ev_periodic *w = periodics [0]; 726 struct ev_periodic *w = periodics [0];
513 727
514 /* first reschedule or stop timer */ 728 /* first reschedule or stop timer */
515 if (w->interval) 729 if (w->interval)
516 { 730 {
517 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval; 731 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval;
518 assert (("periodic timeout in the past, negative interval?", w->at > ev_now)); 732 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now));
519 downheap ((WT *)periodics, periodiccnt, 0); 733 downheap ((WT *)periodics, periodiccnt, 0);
520 } 734 }
521 else 735 else
522 evperiodic_stop (w); /* nonrepeating: stop timer */ 736 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
523 737
524 event ((W)w, EV_TIMEOUT); 738 event (EV_A_ (W)w, EV_PERIODIC);
525 } 739 }
526} 740}
527 741
528static void 742static void
529periodics_reschedule (ev_tstamp diff) 743periodics_reschedule (EV_P_ ev_tstamp diff)
530{ 744{
531 int i; 745 int i;
532 746
533 /* adjust periodics after time jump */ 747 /* adjust periodics after time jump */
534 for (i = 0; i < periodiccnt; ++i) 748 for (i = 0; i < periodiccnt; ++i)
535 { 749 {
536 struct ev_periodic *w = periodics [i]; 750 struct ev_periodic *w = periodics [i];
537 751
538 if (w->interval) 752 if (w->interval)
539 { 753 {
540 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval; 754 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval;
541 755
542 if (fabs (diff) >= 1e-4) 756 if (fabs (diff) >= 1e-4)
543 { 757 {
544 evperiodic_stop (w); 758 ev_periodic_stop (EV_A_ w);
545 evperiodic_start (w); 759 ev_periodic_start (EV_A_ w);
546 760
547 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 761 i = 0; /* restart loop, inefficient, but time jumps should be rare */
548 } 762 }
549 } 763 }
550 } 764 }
551} 765}
552 766
767inline int
768time_update_monotonic (EV_P)
769{
770 mn_now = get_clock ();
771
772 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
773 {
774 rt_now = mn_now + diff;
775 return 0;
776 }
777 else
778 {
779 now_floor = mn_now;
780 rt_now = ev_time ();
781 return 1;
782 }
783}
784
553static void 785static void
554time_update () 786time_update (EV_P)
555{ 787{
556 int i; 788 int i;
557 789
558 ev_now = ev_time (); 790#if EV_USE_MONOTONIC
559
560 if (have_monotonic) 791 if (expect_true (have_monotonic))
561 { 792 {
562 ev_tstamp odiff = diff; 793 if (time_update_monotonic (EV_A))
563
564 for (i = 4; --i; ) /* loop a few times, before making important decisions */
565 { 794 {
566 now = get_clock (); 795 ev_tstamp odiff = diff;
796
797 for (i = 4; --i; ) /* loop a few times, before making important decisions */
798 {
567 diff = ev_now - now; 799 diff = rt_now - mn_now;
568 800
569 if (fabs (odiff - diff) < MIN_TIMEJUMP) 801 if (fabs (odiff - diff) < MIN_TIMEJUMP)
570 return; /* all is well */ 802 return; /* all is well */
571 803
572 ev_now = ev_time (); 804 rt_now = ev_time ();
805 mn_now = get_clock ();
806 now_floor = mn_now;
807 }
808
809 periodics_reschedule (EV_A_ diff - odiff);
810 /* no timer adjustment, as the monotonic clock doesn't jump */
573 } 811 }
574
575 periodics_reschedule (diff - odiff);
576 /* no timer adjustment, as the monotonic clock doesn't jump */
577 } 812 }
578 else 813 else
814#endif
579 { 815 {
580 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) 816 rt_now = ev_time ();
817
818 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
581 { 819 {
582 periodics_reschedule (ev_now - now); 820 periodics_reschedule (EV_A_ rt_now - mn_now);
583 821
584 /* adjust timers. this is easy, as the offset is the same for all */ 822 /* adjust timers. this is easy, as the offset is the same for all */
585 for (i = 0; i < timercnt; ++i) 823 for (i = 0; i < timercnt; ++i)
586 timers [i]->at += diff; 824 timers [i]->at += diff;
587 } 825 }
588 826
589 now = ev_now; 827 mn_now = rt_now;
590 } 828 }
591} 829}
592 830
593int ev_loop_done; 831void
832ev_ref (EV_P)
833{
834 ++activecnt;
835}
594 836
837void
838ev_unref (EV_P)
839{
840 --activecnt;
841}
842
843static int loop_done;
844
845void
595void ev_loop (int flags) 846ev_loop (EV_P_ int flags)
596{ 847{
597 double block; 848 double block;
598 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0; 849 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
599 850
600 do 851 do
601 { 852 {
602 /* queue check watchers (and execute them) */ 853 /* queue check watchers (and execute them) */
603 if (preparecnt) 854 if (expect_false (preparecnt))
604 { 855 {
605 queue_events ((W *)prepares, preparecnt, EV_PREPARE); 856 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
606 call_pending (); 857 call_pending (EV_A);
607 } 858 }
608 859
609 /* update fd-related kernel structures */ 860 /* update fd-related kernel structures */
610 fd_reify (); 861 fd_reify (EV_A);
611 862
612 /* calculate blocking time */ 863 /* calculate blocking time */
613 864
614 /* we only need this for !monotonic clockor timers, but as we basically 865 /* we only need this for !monotonic clockor timers, but as we basically
615 always have timers, we just calculate it always */ 866 always have timers, we just calculate it always */
867#if EV_USE_MONOTONIC
868 if (expect_true (have_monotonic))
869 time_update_monotonic (EV_A);
870 else
871#endif
872 {
616 ev_now = ev_time (); 873 rt_now = ev_time ();
874 mn_now = rt_now;
875 }
617 876
618 if (flags & EVLOOP_NONBLOCK || idlecnt) 877 if (flags & EVLOOP_NONBLOCK || idlecnt)
619 block = 0.; 878 block = 0.;
620 else 879 else
621 { 880 {
622 block = MAX_BLOCKTIME; 881 block = MAX_BLOCKTIME;
623 882
624 if (timercnt) 883 if (timercnt)
625 { 884 {
626 ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge; 885 ev_tstamp to = timers [0]->at - mn_now + method_fudge;
627 if (block > to) block = to; 886 if (block > to) block = to;
628 } 887 }
629 888
630 if (periodiccnt) 889 if (periodiccnt)
631 { 890 {
632 ev_tstamp to = periodics [0]->at - ev_now + method_fudge; 891 ev_tstamp to = periodics [0]->at - rt_now + method_fudge;
633 if (block > to) block = to; 892 if (block > to) block = to;
634 } 893 }
635 894
636 if (block < 0.) block = 0.; 895 if (block < 0.) block = 0.;
637 } 896 }
638 897
639 method_poll (block); 898 method_poll (EV_A_ block);
640 899
641 /* update ev_now, do magic */ 900 /* update rt_now, do magic */
642 time_update (); 901 time_update (EV_A);
643 902
644 /* queue pending timers and reschedule them */ 903 /* queue pending timers and reschedule them */
645 timers_reify (); /* relative timers called last */ 904 timers_reify (EV_A); /* relative timers called last */
646 periodics_reify (); /* absolute timers called first */ 905 periodics_reify (EV_A); /* absolute timers called first */
647 906
648 /* queue idle watchers unless io or timers are pending */ 907 /* queue idle watchers unless io or timers are pending */
649 if (!pendingcnt) 908 if (!pendingcnt)
650 queue_events ((W *)idles, idlecnt, EV_IDLE); 909 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
651 910
652 /* queue check watchers, to be executed first */ 911 /* queue check watchers, to be executed first */
653 if (checkcnt) 912 if (checkcnt)
654 queue_events ((W *)checks, checkcnt, EV_CHECK); 913 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
655 914
656 call_pending (); 915 call_pending (EV_A);
916 printf ("activecnt %d\n", activecnt);//D
657 } 917 }
658 while (!ev_loop_done); 918 while (activecnt && !loop_done);
659 919
660 if (ev_loop_done != 2) 920 if (loop_done != 2)
661 ev_loop_done = 0; 921 loop_done = 0;
922}
923
924void
925ev_unloop (EV_P_ int how)
926{
927 loop_done = how;
662} 928}
663 929
664/*****************************************************************************/ 930/*****************************************************************************/
665 931
666static void 932inline void
667wlist_add (WL *head, WL elem) 933wlist_add (WL *head, WL elem)
668{ 934{
669 elem->next = *head; 935 elem->next = *head;
670 *head = elem; 936 *head = elem;
671} 937}
672 938
673static void 939inline void
674wlist_del (WL *head, WL elem) 940wlist_del (WL *head, WL elem)
675{ 941{
676 while (*head) 942 while (*head)
677 { 943 {
678 if (*head == elem) 944 if (*head == elem)
683 949
684 head = &(*head)->next; 950 head = &(*head)->next;
685 } 951 }
686} 952}
687 953
688static void 954inline void
689ev_clear (W w) 955ev_clear_pending (EV_P_ W w)
690{ 956{
691 if (w->pending) 957 if (w->pending)
692 { 958 {
693 pendings [w->pending - 1].w = 0; 959 pendings [ABSPRI (w)][w->pending - 1].w = 0;
694 w->pending = 0; 960 w->pending = 0;
695 } 961 }
696} 962}
697 963
698static void 964inline void
699ev_start (W w, int active) 965ev_start (EV_P_ W w, int active)
700{ 966{
967 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
968 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
969
701 w->active = active; 970 w->active = active;
971 ev_ref (EV_A);
702} 972}
703 973
704static void 974inline void
705ev_stop (W w) 975ev_stop (EV_P_ W w)
706{ 976{
977 ev_unref (EV_A);
707 w->active = 0; 978 w->active = 0;
708} 979}
709 980
710/*****************************************************************************/ 981/*****************************************************************************/
711 982
712void 983void
713evio_start (struct ev_io *w) 984ev_io_start (EV_P_ struct ev_io *w)
714{ 985{
986 int fd = w->fd;
987
715 if (ev_is_active (w)) 988 if (ev_is_active (w))
716 return; 989 return;
717 990
718 int fd = w->fd; 991 assert (("ev_io_start called with negative fd", fd >= 0));
719 992
720 ev_start ((W)w, 1); 993 ev_start (EV_A_ (W)w, 1);
721 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 994 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
722 wlist_add ((WL *)&anfds[fd].head, (WL)w); 995 wlist_add ((WL *)&anfds[fd].head, (WL)w);
723 996
724 ++fdchangecnt; 997 fd_change (EV_A_ fd);
725 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
726 fdchanges [fdchangecnt - 1] = fd;
727} 998}
728 999
729void 1000void
730evio_stop (struct ev_io *w) 1001ev_io_stop (EV_P_ struct ev_io *w)
731{ 1002{
732 ev_clear ((W)w); 1003 ev_clear_pending (EV_A_ (W)w);
733 if (!ev_is_active (w)) 1004 if (!ev_is_active (w))
734 return; 1005 return;
735 1006
736 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1007 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
737 ev_stop ((W)w); 1008 ev_stop (EV_A_ (W)w);
738 1009
739 ++fdchangecnt; 1010 fd_change (EV_A_ w->fd);
740 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
741 fdchanges [fdchangecnt - 1] = w->fd;
742} 1011}
743 1012
744void 1013void
745evtimer_start (struct ev_timer *w) 1014ev_timer_start (EV_P_ struct ev_timer *w)
746{ 1015{
747 if (ev_is_active (w)) 1016 if (ev_is_active (w))
748 return; 1017 return;
749 1018
750 w->at += now; 1019 w->at += mn_now;
751 1020
752 assert (("timer repeat value less than zero not allowed", w->repeat >= 0.)); 1021 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
753 1022
754 ev_start ((W)w, ++timercnt); 1023 ev_start (EV_A_ (W)w, ++timercnt);
755 array_needsize (timers, timermax, timercnt, ); 1024 array_needsize (timers, timermax, timercnt, );
756 timers [timercnt - 1] = w; 1025 timers [timercnt - 1] = w;
757 upheap ((WT *)timers, timercnt - 1); 1026 upheap ((WT *)timers, timercnt - 1);
758} 1027}
759 1028
760void 1029void
761evtimer_stop (struct ev_timer *w) 1030ev_timer_stop (EV_P_ struct ev_timer *w)
762{ 1031{
763 ev_clear ((W)w); 1032 ev_clear_pending (EV_A_ (W)w);
764 if (!ev_is_active (w)) 1033 if (!ev_is_active (w))
765 return; 1034 return;
766 1035
767 if (w->active < timercnt--) 1036 if (w->active < timercnt--)
768 { 1037 {
770 downheap ((WT *)timers, timercnt, w->active - 1); 1039 downheap ((WT *)timers, timercnt, w->active - 1);
771 } 1040 }
772 1041
773 w->at = w->repeat; 1042 w->at = w->repeat;
774 1043
775 ev_stop ((W)w); 1044 ev_stop (EV_A_ (W)w);
776} 1045}
777 1046
778void 1047void
779evtimer_again (struct ev_timer *w) 1048ev_timer_again (EV_P_ struct ev_timer *w)
780{ 1049{
781 if (ev_is_active (w)) 1050 if (ev_is_active (w))
782 { 1051 {
783 if (w->repeat) 1052 if (w->repeat)
784 { 1053 {
785 w->at = now + w->repeat; 1054 w->at = mn_now + w->repeat;
786 downheap ((WT *)timers, timercnt, w->active - 1); 1055 downheap ((WT *)timers, timercnt, w->active - 1);
787 } 1056 }
788 else 1057 else
789 evtimer_stop (w); 1058 ev_timer_stop (EV_A_ w);
790 } 1059 }
791 else if (w->repeat) 1060 else if (w->repeat)
792 evtimer_start (w); 1061 ev_timer_start (EV_A_ w);
793} 1062}
794 1063
795void 1064void
796evperiodic_start (struct ev_periodic *w) 1065ev_periodic_start (EV_P_ struct ev_periodic *w)
797{ 1066{
798 if (ev_is_active (w)) 1067 if (ev_is_active (w))
799 return; 1068 return;
800 1069
801 assert (("periodic interval value less than zero not allowed", w->interval >= 0.)); 1070 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
802 1071
803 /* this formula differs from the one in periodic_reify because we do not always round up */ 1072 /* this formula differs from the one in periodic_reify because we do not always round up */
804 if (w->interval) 1073 if (w->interval)
805 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; 1074 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval;
806 1075
807 ev_start ((W)w, ++periodiccnt); 1076 ev_start (EV_A_ (W)w, ++periodiccnt);
808 array_needsize (periodics, periodicmax, periodiccnt, ); 1077 array_needsize (periodics, periodicmax, periodiccnt, );
809 periodics [periodiccnt - 1] = w; 1078 periodics [periodiccnt - 1] = w;
810 upheap ((WT *)periodics, periodiccnt - 1); 1079 upheap ((WT *)periodics, periodiccnt - 1);
811} 1080}
812 1081
813void 1082void
814evperiodic_stop (struct ev_periodic *w) 1083ev_periodic_stop (EV_P_ struct ev_periodic *w)
815{ 1084{
816 ev_clear ((W)w); 1085 ev_clear_pending (EV_A_ (W)w);
817 if (!ev_is_active (w)) 1086 if (!ev_is_active (w))
818 return; 1087 return;
819 1088
820 if (w->active < periodiccnt--) 1089 if (w->active < periodiccnt--)
821 { 1090 {
822 periodics [w->active - 1] = periodics [periodiccnt]; 1091 periodics [w->active - 1] = periodics [periodiccnt];
823 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1092 downheap ((WT *)periodics, periodiccnt, w->active - 1);
824 } 1093 }
825 1094
826 ev_stop ((W)w); 1095 ev_stop (EV_A_ (W)w);
827} 1096}
828 1097
1098#ifndef SA_RESTART
1099# define SA_RESTART 0
1100#endif
1101
829void 1102void
830evsignal_start (struct ev_signal *w) 1103ev_signal_start (EV_P_ struct ev_signal *w)
831{ 1104{
832 if (ev_is_active (w)) 1105 if (ev_is_active (w))
833 return; 1106 return;
834 1107
1108 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1109
835 ev_start ((W)w, 1); 1110 ev_start (EV_A_ (W)w, 1);
836 array_needsize (signals, signalmax, w->signum, signals_init); 1111 array_needsize (signals, signalmax, w->signum, signals_init);
837 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1112 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
838 1113
839 if (!w->next) 1114 if (!w->next)
840 { 1115 {
841 struct sigaction sa; 1116 struct sigaction sa;
842 sa.sa_handler = sighandler; 1117 sa.sa_handler = sighandler;
843 sigfillset (&sa.sa_mask); 1118 sigfillset (&sa.sa_mask);
844 sa.sa_flags = 0; 1119 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
845 sigaction (w->signum, &sa, 0); 1120 sigaction (w->signum, &sa, 0);
846 } 1121 }
847} 1122}
848 1123
849void 1124void
850evsignal_stop (struct ev_signal *w) 1125ev_signal_stop (EV_P_ struct ev_signal *w)
851{ 1126{
852 ev_clear ((W)w); 1127 ev_clear_pending (EV_A_ (W)w);
853 if (!ev_is_active (w)) 1128 if (!ev_is_active (w))
854 return; 1129 return;
855 1130
856 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1131 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
857 ev_stop ((W)w); 1132 ev_stop (EV_A_ (W)w);
858 1133
859 if (!signals [w->signum - 1].head) 1134 if (!signals [w->signum - 1].head)
860 signal (w->signum, SIG_DFL); 1135 signal (w->signum, SIG_DFL);
861} 1136}
862 1137
1138void
863void evidle_start (struct ev_idle *w) 1139ev_idle_start (EV_P_ struct ev_idle *w)
864{ 1140{
865 if (ev_is_active (w)) 1141 if (ev_is_active (w))
866 return; 1142 return;
867 1143
868 ev_start ((W)w, ++idlecnt); 1144 ev_start (EV_A_ (W)w, ++idlecnt);
869 array_needsize (idles, idlemax, idlecnt, ); 1145 array_needsize (idles, idlemax, idlecnt, );
870 idles [idlecnt - 1] = w; 1146 idles [idlecnt - 1] = w;
871} 1147}
872 1148
1149void
873void evidle_stop (struct ev_idle *w) 1150ev_idle_stop (EV_P_ struct ev_idle *w)
874{ 1151{
875 ev_clear ((W)w); 1152 ev_clear_pending (EV_A_ (W)w);
876 if (ev_is_active (w)) 1153 if (ev_is_active (w))
877 return; 1154 return;
878 1155
879 idles [w->active - 1] = idles [--idlecnt]; 1156 idles [w->active - 1] = idles [--idlecnt];
880 ev_stop ((W)w); 1157 ev_stop (EV_A_ (W)w);
881} 1158}
882 1159
1160void
883void evprepare_start (struct ev_prepare *w) 1161ev_prepare_start (EV_P_ struct ev_prepare *w)
884{ 1162{
885 if (ev_is_active (w)) 1163 if (ev_is_active (w))
886 return; 1164 return;
887 1165
888 ev_start ((W)w, ++preparecnt); 1166 ev_start (EV_A_ (W)w, ++preparecnt);
889 array_needsize (prepares, preparemax, preparecnt, ); 1167 array_needsize (prepares, preparemax, preparecnt, );
890 prepares [preparecnt - 1] = w; 1168 prepares [preparecnt - 1] = w;
891} 1169}
892 1170
1171void
893void evprepare_stop (struct ev_prepare *w) 1172ev_prepare_stop (EV_P_ struct ev_prepare *w)
894{ 1173{
895 ev_clear ((W)w); 1174 ev_clear_pending (EV_A_ (W)w);
896 if (ev_is_active (w)) 1175 if (ev_is_active (w))
897 return; 1176 return;
898 1177
899 prepares [w->active - 1] = prepares [--preparecnt]; 1178 prepares [w->active - 1] = prepares [--preparecnt];
900 ev_stop ((W)w); 1179 ev_stop (EV_A_ (W)w);
901} 1180}
902 1181
1182void
903void evcheck_start (struct ev_check *w) 1183ev_check_start (EV_P_ struct ev_check *w)
904{ 1184{
905 if (ev_is_active (w)) 1185 if (ev_is_active (w))
906 return; 1186 return;
907 1187
908 ev_start ((W)w, ++checkcnt); 1188 ev_start (EV_A_ (W)w, ++checkcnt);
909 array_needsize (checks, checkmax, checkcnt, ); 1189 array_needsize (checks, checkmax, checkcnt, );
910 checks [checkcnt - 1] = w; 1190 checks [checkcnt - 1] = w;
911} 1191}
912 1192
1193void
913void evcheck_stop (struct ev_check *w) 1194ev_check_stop (EV_P_ struct ev_check *w)
914{ 1195{
915 ev_clear ((W)w); 1196 ev_clear_pending (EV_A_ (W)w);
916 if (ev_is_active (w)) 1197 if (ev_is_active (w))
917 return; 1198 return;
918 1199
919 checks [w->active - 1] = checks [--checkcnt]; 1200 checks [w->active - 1] = checks [--checkcnt];
920 ev_stop ((W)w); 1201 ev_stop (EV_A_ (W)w);
921} 1202}
922 1203
1204void
923void evchild_start (struct ev_child *w) 1205ev_child_start (EV_P_ struct ev_child *w)
924{ 1206{
925 if (ev_is_active (w)) 1207 if (ev_is_active (w))
926 return; 1208 return;
927 1209
928 ev_start ((W)w, 1); 1210 ev_start (EV_A_ (W)w, 1);
929 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1211 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
930} 1212}
931 1213
1214void
932void evchild_stop (struct ev_child *w) 1215ev_child_stop (EV_P_ struct ev_child *w)
933{ 1216{
934 ev_clear ((W)w); 1217 ev_clear_pending (EV_A_ (W)w);
935 if (ev_is_active (w)) 1218 if (ev_is_active (w))
936 return; 1219 return;
937 1220
938 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1221 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
939 ev_stop ((W)w); 1222 ev_stop (EV_A_ (W)w);
940} 1223}
941 1224
942/*****************************************************************************/ 1225/*****************************************************************************/
943 1226
944struct ev_once 1227struct ev_once
948 void (*cb)(int revents, void *arg); 1231 void (*cb)(int revents, void *arg);
949 void *arg; 1232 void *arg;
950}; 1233};
951 1234
952static void 1235static void
953once_cb (struct ev_once *once, int revents) 1236once_cb (EV_P_ struct ev_once *once, int revents)
954{ 1237{
955 void (*cb)(int revents, void *arg) = once->cb; 1238 void (*cb)(int revents, void *arg) = once->cb;
956 void *arg = once->arg; 1239 void *arg = once->arg;
957 1240
958 evio_stop (&once->io); 1241 ev_io_stop (EV_A_ &once->io);
959 evtimer_stop (&once->to); 1242 ev_timer_stop (EV_A_ &once->to);
960 free (once); 1243 free (once);
961 1244
962 cb (revents, arg); 1245 cb (revents, arg);
963} 1246}
964 1247
965static void 1248static void
966once_cb_io (struct ev_io *w, int revents) 1249once_cb_io (EV_P_ struct ev_io *w, int revents)
967{ 1250{
968 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 1251 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
969} 1252}
970 1253
971static void 1254static void
972once_cb_to (struct ev_timer *w, int revents) 1255once_cb_to (EV_P_ struct ev_timer *w, int revents)
973{ 1256{
974 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 1257 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
975} 1258}
976 1259
977void 1260void
978ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1261ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
979{ 1262{
980 struct ev_once *once = malloc (sizeof (struct ev_once)); 1263 struct ev_once *once = malloc (sizeof (struct ev_once));
981 1264
982 if (!once) 1265 if (!once)
983 cb (EV_ERROR, arg); 1266 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
984 else 1267 else
985 { 1268 {
986 once->cb = cb; 1269 once->cb = cb;
987 once->arg = arg; 1270 once->arg = arg;
988 1271
989 evw_init (&once->io, once_cb_io); 1272 ev_watcher_init (&once->io, once_cb_io);
990
991 if (fd >= 0) 1273 if (fd >= 0)
992 { 1274 {
993 evio_set (&once->io, fd, events); 1275 ev_io_set (&once->io, fd, events);
994 evio_start (&once->io); 1276 ev_io_start (EV_A_ &once->io);
995 } 1277 }
996 1278
997 evw_init (&once->to, once_cb_to); 1279 ev_watcher_init (&once->to, once_cb_to);
998
999 if (timeout >= 0.) 1280 if (timeout >= 0.)
1000 { 1281 {
1001 evtimer_set (&once->to, timeout, 0.); 1282 ev_timer_set (&once->to, timeout, 0.);
1002 evtimer_start (&once->to); 1283 ev_timer_start (EV_A_ &once->to);
1003 } 1284 }
1004 } 1285 }
1005} 1286}
1006 1287
1007/*****************************************************************************/ 1288/*****************************************************************************/
1018 1299
1019static void 1300static void
1020ocb (struct ev_timer *w, int revents) 1301ocb (struct ev_timer *w, int revents)
1021{ 1302{
1022 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data); 1303 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);
1023 evtimer_stop (w); 1304 ev_timer_stop (w);
1024 evtimer_start (w); 1305 ev_timer_start (w);
1025} 1306}
1026 1307
1027static void 1308static void
1028scb (struct ev_signal *w, int revents) 1309scb (struct ev_signal *w, int revents)
1029{ 1310{
1030 fprintf (stderr, "signal %x,%d\n", revents, w->signum); 1311 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
1031 evio_stop (&wio); 1312 ev_io_stop (&wio);
1032 evio_start (&wio); 1313 ev_io_start (&wio);
1033} 1314}
1034 1315
1035static void 1316static void
1036gcb (struct ev_signal *w, int revents) 1317gcb (struct ev_signal *w, int revents)
1037{ 1318{
1041 1322
1042int main (void) 1323int main (void)
1043{ 1324{
1044 ev_init (0); 1325 ev_init (0);
1045 1326
1046 evio_init (&wio, sin_cb, 0, EV_READ); 1327 ev_io_init (&wio, sin_cb, 0, EV_READ);
1047 evio_start (&wio); 1328 ev_io_start (&wio);
1048 1329
1049 struct ev_timer t[10000]; 1330 struct ev_timer t[10000];
1050 1331
1051#if 0 1332#if 0
1052 int i; 1333 int i;
1053 for (i = 0; i < 10000; ++i) 1334 for (i = 0; i < 10000; ++i)
1054 { 1335 {
1055 struct ev_timer *w = t + i; 1336 struct ev_timer *w = t + i;
1056 evw_init (w, ocb, i); 1337 ev_watcher_init (w, ocb, i);
1057 evtimer_init_abs (w, ocb, drand48 (), 0.99775533); 1338 ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
1058 evtimer_start (w); 1339 ev_timer_start (w);
1059 if (drand48 () < 0.5) 1340 if (drand48 () < 0.5)
1060 evtimer_stop (w); 1341 ev_timer_stop (w);
1061 } 1342 }
1062#endif 1343#endif
1063 1344
1064 struct ev_timer t1; 1345 struct ev_timer t1;
1065 evtimer_init (&t1, ocb, 5, 10); 1346 ev_timer_init (&t1, ocb, 5, 10);
1066 evtimer_start (&t1); 1347 ev_timer_start (&t1);
1067 1348
1068 struct ev_signal sig; 1349 struct ev_signal sig;
1069 evsignal_init (&sig, scb, SIGQUIT); 1350 ev_signal_init (&sig, scb, SIGQUIT);
1070 evsignal_start (&sig); 1351 ev_signal_start (&sig);
1071 1352
1072 struct ev_check cw; 1353 struct ev_check cw;
1073 evcheck_init (&cw, gcb); 1354 ev_check_init (&cw, gcb);
1074 evcheck_start (&cw); 1355 ev_check_start (&cw);
1075 1356
1076 struct ev_idle iw; 1357 struct ev_idle iw;
1077 evidle_init (&iw, gcb); 1358 ev_idle_init (&iw, gcb);
1078 evidle_start (&iw); 1359 ev_idle_start (&iw);
1079 1360
1080 ev_loop (0); 1361 ev_loop (0);
1081 1362
1082 return 0; 1363 return 0;
1083} 1364}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines