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

Comparing libev/ev.c (file contents):
Revision 1.76 by root, Wed Nov 7 18:47:26 2007 UTC vs.
Revision 1.133 by root, Fri Nov 23 11:32:22 2007 UTC

26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (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
29 * 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.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H
38# include EV_CONFIG_H
39# else
32# include "config.h" 40# include "config.h"
41# endif
33 42
34# if HAVE_CLOCK_GETTIME 43# if HAVE_CLOCK_GETTIME
44# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 45# define EV_USE_MONOTONIC 1
46# endif
47# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 48# define EV_USE_REALTIME 1
49# endif
50# else
51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0
53# endif
54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0
56# endif
37# endif 57# endif
38 58
59# ifndef EV_USE_SELECT
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 60# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1 61# define EV_USE_SELECT 1
62# else
63# define EV_USE_SELECT 0
64# endif
41# endif 65# endif
42 66
67# ifndef EV_USE_POLL
43# if HAVE_POLL && HAVE_POLL_H 68# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1 69# define EV_USE_POLL 1
70# else
71# define EV_USE_POLL 0
72# endif
45# endif 73# endif
46 74
75# ifndef EV_USE_EPOLL
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 76# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1 77# define EV_USE_EPOLL 1
78# else
79# define EV_USE_EPOLL 0
80# endif
49# endif 81# endif
50 82
83# ifndef EV_USE_KQUEUE
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 84# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1 85# define EV_USE_KQUEUE 1
86# else
87# define EV_USE_KQUEUE 0
88# endif
89# endif
90
91# ifndef EV_USE_PORT
92# if HAVE_PORT_H && HAVE_PORT_CREATE
93# define EV_USE_PORT 1
94# else
95# define EV_USE_PORT 0
96# endif
53# endif 97# endif
54 98
55#endif 99#endif
56 100
57#include <math.h> 101#include <math.h>
66#include <sys/types.h> 110#include <sys/types.h>
67#include <time.h> 111#include <time.h>
68 112
69#include <signal.h> 113#include <signal.h>
70 114
71#ifndef WIN32 115#ifndef _WIN32
72# include <unistd.h> 116# include <unistd.h>
73# include <sys/time.h> 117# include <sys/time.h>
74# include <sys/wait.h> 118# include <sys/wait.h>
119#else
120# define WIN32_LEAN_AND_MEAN
121# include <windows.h>
122# ifndef EV_SELECT_IS_WINSOCKET
123# define EV_SELECT_IS_WINSOCKET 1
75#endif 124# endif
125#endif
126
76/**/ 127/**/
77 128
78#ifndef EV_USE_MONOTONIC 129#ifndef EV_USE_MONOTONIC
79# define EV_USE_MONOTONIC 1 130# define EV_USE_MONOTONIC 0
131#endif
132
133#ifndef EV_USE_REALTIME
134# define EV_USE_REALTIME 0
80#endif 135#endif
81 136
82#ifndef EV_USE_SELECT 137#ifndef EV_USE_SELECT
83# define EV_USE_SELECT 1 138# define EV_USE_SELECT 1
84#endif 139#endif
85 140
86#ifndef EV_USE_POLL 141#ifndef EV_USE_POLL
87# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 142# ifdef _WIN32
143# define EV_USE_POLL 0
144# else
145# define EV_USE_POLL 1
146# endif
88#endif 147#endif
89 148
90#ifndef EV_USE_EPOLL 149#ifndef EV_USE_EPOLL
91# define EV_USE_EPOLL 0 150# define EV_USE_EPOLL 0
92#endif 151#endif
93 152
94#ifndef EV_USE_KQUEUE 153#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0 154# define EV_USE_KQUEUE 0
96#endif 155#endif
97 156
98#ifndef EV_USE_WIN32
99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
102# define EV_USE_SELECT 1
103# else
104# define EV_USE_WIN32 0
105# endif
106#endif
107
108#ifndef EV_USE_REALTIME 157#ifndef EV_USE_PORT
109# define EV_USE_REALTIME 1 158# define EV_USE_PORT 0
110#endif 159#endif
111 160
112/**/ 161/**/
113 162
114#ifndef CLOCK_MONOTONIC 163#ifndef CLOCK_MONOTONIC
119#ifndef CLOCK_REALTIME 168#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 169# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 170# define EV_USE_REALTIME 0
122#endif 171#endif
123 172
173#if EV_SELECT_IS_WINSOCKET
174# include <winsock.h>
175#endif
176
124/**/ 177/**/
125 178
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 179#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
127#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 180#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
128#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 181#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
129/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 182/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
130 183
184#ifdef EV_H
185# include EV_H
186#else
131#include "ev.h" 187# include "ev.h"
188#endif
132 189
133#if __GNUC__ >= 3 190#if __GNUC__ >= 3
134# define expect(expr,value) __builtin_expect ((expr),(value)) 191# define expect(expr,value) __builtin_expect ((expr),(value))
135# define inline inline 192# define inline static inline
136#else 193#else
137# define expect(expr,value) (expr) 194# define expect(expr,value) (expr)
138# define inline static 195# define inline static
139#endif 196#endif
140 197
142#define expect_true(expr) expect ((expr) != 0, 1) 199#define expect_true(expr) expect ((expr) != 0, 1)
143 200
144#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 201#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
145#define ABSPRI(w) ((w)->priority - EV_MINPRI) 202#define ABSPRI(w) ((w)->priority - EV_MINPRI)
146 203
204#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
205#define EMPTY2(a,b) /* used to suppress some warnings */
206
147typedef struct ev_watcher *W; 207typedef struct ev_watcher *W;
148typedef struct ev_watcher_list *WL; 208typedef struct ev_watcher_list *WL;
149typedef struct ev_watcher_time *WT; 209typedef struct ev_watcher_time *WT;
150 210
151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 211static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
152 212
213#ifdef _WIN32
153#include "ev_win32.c" 214# include "ev_win32.c"
215#endif
154 216
155/*****************************************************************************/ 217/*****************************************************************************/
156 218
157static void (*syserr_cb)(const char *msg); 219static void (*syserr_cb)(const char *msg);
158 220
205typedef struct 267typedef struct
206{ 268{
207 WL head; 269 WL head;
208 unsigned char events; 270 unsigned char events;
209 unsigned char reify; 271 unsigned char reify;
272#if EV_SELECT_IS_WINSOCKET
273 SOCKET handle;
274#endif
210} ANFD; 275} ANFD;
211 276
212typedef struct 277typedef struct
213{ 278{
214 W w; 279 W w;
215 int events; 280 int events;
216} ANPENDING; 281} ANPENDING;
217 282
218#if EV_MULTIPLICITY 283#if EV_MULTIPLICITY
219 284
220struct ev_loop 285 struct ev_loop
221{ 286 {
287 ev_tstamp ev_rt_now;
288 #define ev_rt_now ((loop)->ev_rt_now)
222# define VAR(name,decl) decl; 289 #define VAR(name,decl) decl;
223# include "ev_vars.h" 290 #include "ev_vars.h"
224};
225# undef VAR 291 #undef VAR
292 };
226# include "ev_wrap.h" 293 #include "ev_wrap.h"
294
295 static struct ev_loop default_loop_struct;
296 struct ev_loop *ev_default_loop_ptr;
227 297
228#else 298#else
229 299
300 ev_tstamp ev_rt_now;
230# define VAR(name,decl) static decl; 301 #define VAR(name,decl) static decl;
231# include "ev_vars.h" 302 #include "ev_vars.h"
232# undef VAR 303 #undef VAR
304
305 static int ev_default_loop_ptr;
233 306
234#endif 307#endif
235 308
236/*****************************************************************************/ 309/*****************************************************************************/
237 310
238inline ev_tstamp 311ev_tstamp
239ev_time (void) 312ev_time (void)
240{ 313{
241#if EV_USE_REALTIME 314#if EV_USE_REALTIME
242 struct timespec ts; 315 struct timespec ts;
243 clock_gettime (CLOCK_REALTIME, &ts); 316 clock_gettime (CLOCK_REALTIME, &ts);
262#endif 335#endif
263 336
264 return ev_time (); 337 return ev_time ();
265} 338}
266 339
340#if EV_MULTIPLICITY
267ev_tstamp 341ev_tstamp
268ev_now (EV_P) 342ev_now (EV_P)
269{ 343{
270 return rt_now; 344 return ev_rt_now;
271} 345}
346#endif
272 347
273#define array_roundsize(type,n) ((n) | 4 & ~3) 348#define array_roundsize(type,n) (((n) | 4) & ~3)
274 349
275#define array_needsize(type,base,cur,cnt,init) \ 350#define array_needsize(type,base,cur,cnt,init) \
276 if (expect_false ((cnt) > cur)) \ 351 if (expect_false ((cnt) > cur)) \
277 { \ 352 { \
278 int newcnt = cur; \ 353 int newcnt = cur; \
293 stem ## max = array_roundsize (stem ## cnt >> 1); \ 368 stem ## max = array_roundsize (stem ## cnt >> 1); \
294 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 369 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
295 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 370 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
296 } 371 }
297 372
298/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
299/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
300#define array_free_microshit(stem) \
301 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
302
303#define array_free(stem, idx) \ 373#define array_free(stem, idx) \
304 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 374 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
305 375
306/*****************************************************************************/ 376/*****************************************************************************/
307 377
316 386
317 ++base; 387 ++base;
318 } 388 }
319} 389}
320 390
321static void 391void
322event (EV_P_ W w, int events) 392ev_feed_event (EV_P_ void *w, int revents)
323{ 393{
324 if (w->pending) 394 W w_ = (W)w;
395
396 if (expect_false (w_->pending))
325 { 397 {
326 pendings [ABSPRI (w)][w->pending - 1].events |= events; 398 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
327 return; 399 return;
328 } 400 }
329 401
330 w->pending = ++pendingcnt [ABSPRI (w)]; 402 w_->pending = ++pendingcnt [ABSPRI (w_)];
331 array_needsize (ANPENDING, pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], (void)); 403 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
332 pendings [ABSPRI (w)][w->pending - 1].w = w; 404 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
333 pendings [ABSPRI (w)][w->pending - 1].events = events; 405 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
334} 406}
335 407
336static void 408static void
337queue_events (EV_P_ W *events, int eventcnt, int type) 409queue_events (EV_P_ W *events, int eventcnt, int type)
338{ 410{
339 int i; 411 int i;
340 412
341 for (i = 0; i < eventcnt; ++i) 413 for (i = 0; i < eventcnt; ++i)
342 event (EV_A_ events [i], type); 414 ev_feed_event (EV_A_ events [i], type);
343} 415}
344 416
345static void 417inline void
346fd_event (EV_P_ int fd, int events) 418fd_event (EV_P_ int fd, int revents)
347{ 419{
348 ANFD *anfd = anfds + fd; 420 ANFD *anfd = anfds + fd;
349 struct ev_io *w; 421 struct ev_io *w;
350 422
351 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 423 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
352 { 424 {
353 int ev = w->events & events; 425 int ev = w->events & revents;
354 426
355 if (ev) 427 if (ev)
356 event (EV_A_ (W)w, ev); 428 ev_feed_event (EV_A_ (W)w, ev);
357 } 429 }
430}
431
432void
433ev_feed_fd_event (EV_P_ int fd, int revents)
434{
435 fd_event (EV_A_ fd, revents);
358} 436}
359 437
360/*****************************************************************************/ 438/*****************************************************************************/
361 439
362static void 440inline void
363fd_reify (EV_P) 441fd_reify (EV_P)
364{ 442{
365 int i; 443 int i;
366 444
367 for (i = 0; i < fdchangecnt; ++i) 445 for (i = 0; i < fdchangecnt; ++i)
373 int events = 0; 451 int events = 0;
374 452
375 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 453 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
376 events |= w->events; 454 events |= w->events;
377 455
456#if EV_SELECT_IS_WINSOCKET
457 if (events)
458 {
459 unsigned long argp;
460 anfd->handle = _get_osfhandle (fd);
461 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
462 }
463#endif
464
378 anfd->reify = 0; 465 anfd->reify = 0;
379 466
380 method_modify (EV_A_ fd, anfd->events, events); 467 backend_modify (EV_A_ fd, anfd->events, events);
381 anfd->events = events; 468 anfd->events = events;
382 } 469 }
383 470
384 fdchangecnt = 0; 471 fdchangecnt = 0;
385} 472}
386 473
387static void 474static void
388fd_change (EV_P_ int fd) 475fd_change (EV_P_ int fd)
389{ 476{
390 if (anfds [fd].reify) 477 if (expect_false (anfds [fd].reify))
391 return; 478 return;
392 479
393 anfds [fd].reify = 1; 480 anfds [fd].reify = 1;
394 481
395 ++fdchangecnt; 482 ++fdchangecnt;
396 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 483 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
397 fdchanges [fdchangecnt - 1] = fd; 484 fdchanges [fdchangecnt - 1] = fd;
398} 485}
399 486
400static void 487static void
401fd_kill (EV_P_ int fd) 488fd_kill (EV_P_ int fd)
403 struct ev_io *w; 490 struct ev_io *w;
404 491
405 while ((w = (struct ev_io *)anfds [fd].head)) 492 while ((w = (struct ev_io *)anfds [fd].head))
406 { 493 {
407 ev_io_stop (EV_A_ w); 494 ev_io_stop (EV_A_ w);
408 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 495 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
409 } 496 }
410} 497}
411 498
412static int 499inline int
413fd_valid (int fd) 500fd_valid (int fd)
414{ 501{
415#ifdef WIN32 502#ifdef _WIN32
416 return !!win32_get_osfhandle (fd); 503 return _get_osfhandle (fd) != -1;
417#else 504#else
418 return fcntl (fd, F_GETFD) != -1; 505 return fcntl (fd, F_GETFD) != -1;
419#endif 506#endif
420} 507}
421 508
443 fd_kill (EV_A_ fd); 530 fd_kill (EV_A_ fd);
444 return; 531 return;
445 } 532 }
446} 533}
447 534
448/* usually called after fork if method needs to re-arm all fds from scratch */ 535/* usually called after fork if backend needs to re-arm all fds from scratch */
449static void 536static void
450fd_rearm_all (EV_P) 537fd_rearm_all (EV_P)
451{ 538{
452 int fd; 539 int fd;
453 540
501 588
502 heap [k] = w; 589 heap [k] = w;
503 ((W)heap [k])->active = k + 1; 590 ((W)heap [k])->active = k + 1;
504} 591}
505 592
593inline void
594adjustheap (WT *heap, int N, int k)
595{
596 upheap (heap, k);
597 downheap (heap, N, k);
598}
599
506/*****************************************************************************/ 600/*****************************************************************************/
507 601
508typedef struct 602typedef struct
509{ 603{
510 WL head; 604 WL head;
531} 625}
532 626
533static void 627static void
534sighandler (int signum) 628sighandler (int signum)
535{ 629{
536#if WIN32 630#if _WIN32
537 signal (signum, sighandler); 631 signal (signum, sighandler);
538#endif 632#endif
539 633
540 signals [signum - 1].gotsig = 1; 634 signals [signum - 1].gotsig = 1;
541 635
542 if (!gotsig) 636 if (!gotsig)
543 { 637 {
544 int old_errno = errno; 638 int old_errno = errno;
545 gotsig = 1; 639 gotsig = 1;
546#ifdef WIN32
547 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
548#else
549 write (sigpipe [1], &signum, 1); 640 write (sigpipe [1], &signum, 1);
550#endif
551 errno = old_errno; 641 errno = old_errno;
552 } 642 }
553} 643}
554 644
645void
646ev_feed_signal_event (EV_P_ int signum)
647{
648 WL w;
649
650#if EV_MULTIPLICITY
651 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
652#endif
653
654 --signum;
655
656 if (signum < 0 || signum >= signalmax)
657 return;
658
659 signals [signum].gotsig = 0;
660
661 for (w = signals [signum].head; w; w = w->next)
662 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
663}
664
555static void 665static void
556sigcb (EV_P_ struct ev_io *iow, int revents) 666sigcb (EV_P_ struct ev_io *iow, int revents)
557{ 667{
558 WL w;
559 int signum; 668 int signum;
560 669
561#ifdef WIN32
562 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
563#else
564 read (sigpipe [0], &revents, 1); 670 read (sigpipe [0], &revents, 1);
565#endif
566 gotsig = 0; 671 gotsig = 0;
567 672
568 for (signum = signalmax; signum--; ) 673 for (signum = signalmax; signum--; )
569 if (signals [signum].gotsig) 674 if (signals [signum].gotsig)
570 { 675 ev_feed_signal_event (EV_A_ signum + 1);
571 signals [signum].gotsig = 0; 676}
572 677
573 for (w = signals [signum].head; w; w = w->next) 678static void
574 event (EV_A_ (W)w, EV_SIGNAL); 679fd_intern (int fd)
575 } 680{
681#ifdef _WIN32
682 int arg = 1;
683 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
684#else
685 fcntl (fd, F_SETFD, FD_CLOEXEC);
686 fcntl (fd, F_SETFL, O_NONBLOCK);
687#endif
576} 688}
577 689
578static void 690static void
579siginit (EV_P) 691siginit (EV_P)
580{ 692{
581#ifndef WIN32 693 fd_intern (sigpipe [0]);
582 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 694 fd_intern (sigpipe [1]);
583 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
584
585 /* rather than sort out wether we really need nb, set it */
586 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
587 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
588#endif
589 695
590 ev_io_set (&sigev, sigpipe [0], EV_READ); 696 ev_io_set (&sigev, sigpipe [0], EV_READ);
591 ev_io_start (EV_A_ &sigev); 697 ev_io_start (EV_A_ &sigev);
592 ev_unref (EV_A); /* child watcher should not keep loop alive */ 698 ev_unref (EV_A); /* child watcher should not keep loop alive */
593} 699}
594 700
595/*****************************************************************************/ 701/*****************************************************************************/
596 702
597static struct ev_child *childs [PID_HASHSIZE]; 703static struct ev_child *childs [PID_HASHSIZE];
598 704
599#ifndef WIN32 705#ifndef _WIN32
600 706
601static struct ev_signal childev; 707static struct ev_signal childev;
602 708
603#ifndef WCONTINUED 709#ifndef WCONTINUED
604# define WCONTINUED 0 710# define WCONTINUED 0
613 if (w->pid == pid || !w->pid) 719 if (w->pid == pid || !w->pid)
614 { 720 {
615 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 721 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
616 w->rpid = pid; 722 w->rpid = pid;
617 w->rstatus = status; 723 w->rstatus = status;
618 event (EV_A_ (W)w, EV_CHILD); 724 ev_feed_event (EV_A_ (W)w, EV_CHILD);
619 } 725 }
620} 726}
621 727
622static void 728static void
623childcb (EV_P_ struct ev_signal *sw, int revents) 729childcb (EV_P_ struct ev_signal *sw, int revents)
625 int pid, status; 731 int pid, status;
626 732
627 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 733 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
628 { 734 {
629 /* make sure we are called again until all childs have been reaped */ 735 /* make sure we are called again until all childs have been reaped */
736 /* we need to do it this way so that the callback gets called before we continue */
630 event (EV_A_ (W)sw, EV_SIGNAL); 737 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
631 738
632 child_reap (EV_A_ sw, pid, pid, status); 739 child_reap (EV_A_ sw, pid, pid, status);
633 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 740 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
634 } 741 }
635} 742}
636 743
637#endif 744#endif
638 745
639/*****************************************************************************/ 746/*****************************************************************************/
640 747
748#if EV_USE_PORT
749# include "ev_port.c"
750#endif
641#if EV_USE_KQUEUE 751#if EV_USE_KQUEUE
642# include "ev_kqueue.c" 752# include "ev_kqueue.c"
643#endif 753#endif
644#if EV_USE_EPOLL 754#if EV_USE_EPOLL
645# include "ev_epoll.c" 755# include "ev_epoll.c"
665 775
666/* return true if we are running with elevated privileges and should ignore env variables */ 776/* return true if we are running with elevated privileges and should ignore env variables */
667static int 777static int
668enable_secure (void) 778enable_secure (void)
669{ 779{
670#ifdef WIN32 780#ifdef _WIN32
671 return 0; 781 return 0;
672#else 782#else
673 return getuid () != geteuid () 783 return getuid () != geteuid ()
674 || getgid () != getegid (); 784 || getgid () != getegid ();
675#endif 785#endif
676} 786}
677 787
678int 788unsigned int
679ev_method (EV_P) 789ev_supported_backends (void)
680{ 790{
681 return method; 791 unsigned int flags = 0;
682}
683 792
684static void 793 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
685loop_init (EV_P_ int methods) 794 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
795 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
796 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
797 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
798
799 return flags;
800}
801
802unsigned int
803ev_recommended_backends (void)
686{ 804{
687 if (!method) 805 unsigned int flags = ev_supported_backends ();
806
807#ifndef __NetBSD__
808 /* kqueue is borked on everything but netbsd apparently */
809 /* it usually doesn't work correctly on anything but sockets and pipes */
810 flags &= ~EVBACKEND_KQUEUE;
811#endif
812#ifdef __APPLE__
813 // flags &= ~EVBACKEND_KQUEUE; for documentation
814 flags &= ~EVBACKEND_POLL;
815#endif
816
817 return flags;
818}
819
820unsigned int
821ev_backend (EV_P)
822{
823 return backend;
824}
825
826static void
827loop_init (EV_P_ unsigned int flags)
828{
829 if (!backend)
688 { 830 {
689#if EV_USE_MONOTONIC 831#if EV_USE_MONOTONIC
690 { 832 {
691 struct timespec ts; 833 struct timespec ts;
692 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 834 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
693 have_monotonic = 1; 835 have_monotonic = 1;
694 } 836 }
695#endif 837#endif
696 838
697 rt_now = ev_time (); 839 ev_rt_now = ev_time ();
698 mn_now = get_clock (); 840 mn_now = get_clock ();
699 now_floor = mn_now; 841 now_floor = mn_now;
700 rtmn_diff = rt_now - mn_now; 842 rtmn_diff = ev_rt_now - mn_now;
701 843
702 if (methods == EVMETHOD_AUTO) 844 if (!(flags & EVFLAG_NOENV)
703 if (!enable_secure () && getenv ("LIBEV_METHODS")) 845 && !enable_secure ()
846 && getenv ("LIBEV_FLAGS"))
704 methods = atoi (getenv ("LIBEV_METHODS")); 847 flags = atoi (getenv ("LIBEV_FLAGS"));
705 else
706 methods = EVMETHOD_ANY;
707 848
708 method = 0; 849 if (!(flags & 0x0000ffffUL))
709#if EV_USE_WIN32 850 flags |= ev_recommended_backends ();
710 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 851
852 backend = 0;
853#if EV_USE_PORT
854 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
711#endif 855#endif
712#if EV_USE_KQUEUE 856#if EV_USE_KQUEUE
713 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 857 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
714#endif 858#endif
715#if EV_USE_EPOLL 859#if EV_USE_EPOLL
716 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 860 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
717#endif 861#endif
718#if EV_USE_POLL 862#if EV_USE_POLL
719 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 863 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
720#endif 864#endif
721#if EV_USE_SELECT 865#if EV_USE_SELECT
722 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 866 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
723#endif 867#endif
724 868
725 ev_watcher_init (&sigev, sigcb); 869 ev_init (&sigev, sigcb);
726 ev_set_priority (&sigev, EV_MAXPRI); 870 ev_set_priority (&sigev, EV_MAXPRI);
727 } 871 }
728} 872}
729 873
730void 874static void
731loop_destroy (EV_P) 875loop_destroy (EV_P)
732{ 876{
733 int i; 877 int i;
734 878
735#if EV_USE_WIN32 879#if EV_USE_PORT
736 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 880 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
737#endif 881#endif
738#if EV_USE_KQUEUE 882#if EV_USE_KQUEUE
739 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 883 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
740#endif 884#endif
741#if EV_USE_EPOLL 885#if EV_USE_EPOLL
742 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 886 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
743#endif 887#endif
744#if EV_USE_POLL 888#if EV_USE_POLL
745 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 889 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
746#endif 890#endif
747#if EV_USE_SELECT 891#if EV_USE_SELECT
748 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 892 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
749#endif 893#endif
750 894
751 for (i = NUMPRI; i--; ) 895 for (i = NUMPRI; i--; )
752 array_free (pending, [i]); 896 array_free (pending, [i]);
753 897
754 /* have to use the microsoft-never-gets-it-right macro */ 898 /* have to use the microsoft-never-gets-it-right macro */
755 array_free_microshit (fdchange); 899 array_free (fdchange, EMPTY0);
756 array_free_microshit (timer); 900 array_free (timer, EMPTY0);
757 array_free_microshit (periodic); 901#if EV_PERIODICS
758 array_free_microshit (idle); 902 array_free (periodic, EMPTY0);
759 array_free_microshit (prepare); 903#endif
760 array_free_microshit (check); 904 array_free (idle, EMPTY0);
905 array_free (prepare, EMPTY0);
906 array_free (check, EMPTY0);
761 907
762 method = 0; 908 backend = 0;
763} 909}
764 910
765static void 911static void
766loop_fork (EV_P) 912loop_fork (EV_P)
767{ 913{
914#if EV_USE_PORT
915 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
916#endif
917#if EV_USE_KQUEUE
918 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
919#endif
768#if EV_USE_EPOLL 920#if EV_USE_EPOLL
769 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 921 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
770#endif
771#if EV_USE_KQUEUE
772 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
773#endif 922#endif
774 923
775 if (ev_is_active (&sigev)) 924 if (ev_is_active (&sigev))
776 { 925 {
777 /* default loop */ 926 /* default loop */
790 postfork = 0; 939 postfork = 0;
791} 940}
792 941
793#if EV_MULTIPLICITY 942#if EV_MULTIPLICITY
794struct ev_loop * 943struct ev_loop *
795ev_loop_new (int methods) 944ev_loop_new (unsigned int flags)
796{ 945{
797 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 946 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
798 947
799 memset (loop, 0, sizeof (struct ev_loop)); 948 memset (loop, 0, sizeof (struct ev_loop));
800 949
801 loop_init (EV_A_ methods); 950 loop_init (EV_A_ flags);
802 951
803 if (ev_method (EV_A)) 952 if (ev_backend (EV_A))
804 return loop; 953 return loop;
805 954
806 return 0; 955 return 0;
807} 956}
808 957
820} 969}
821 970
822#endif 971#endif
823 972
824#if EV_MULTIPLICITY 973#if EV_MULTIPLICITY
825struct ev_loop default_loop_struct;
826static struct ev_loop *default_loop;
827
828struct ev_loop * 974struct ev_loop *
975ev_default_loop_init (unsigned int flags)
829#else 976#else
830static int default_loop;
831
832int 977int
978ev_default_loop (unsigned int flags)
833#endif 979#endif
834ev_default_loop (int methods)
835{ 980{
836 if (sigpipe [0] == sigpipe [1]) 981 if (sigpipe [0] == sigpipe [1])
837 if (pipe (sigpipe)) 982 if (pipe (sigpipe))
838 return 0; 983 return 0;
839 984
840 if (!default_loop) 985 if (!ev_default_loop_ptr)
841 { 986 {
842#if EV_MULTIPLICITY 987#if EV_MULTIPLICITY
843 struct ev_loop *loop = default_loop = &default_loop_struct; 988 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
844#else 989#else
845 default_loop = 1; 990 ev_default_loop_ptr = 1;
846#endif 991#endif
847 992
848 loop_init (EV_A_ methods); 993 loop_init (EV_A_ flags);
849 994
850 if (ev_method (EV_A)) 995 if (ev_backend (EV_A))
851 { 996 {
852 siginit (EV_A); 997 siginit (EV_A);
853 998
854#ifndef WIN32 999#ifndef _WIN32
855 ev_signal_init (&childev, childcb, SIGCHLD); 1000 ev_signal_init (&childev, childcb, SIGCHLD);
856 ev_set_priority (&childev, EV_MAXPRI); 1001 ev_set_priority (&childev, EV_MAXPRI);
857 ev_signal_start (EV_A_ &childev); 1002 ev_signal_start (EV_A_ &childev);
858 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1003 ev_unref (EV_A); /* child watcher should not keep loop alive */
859#endif 1004#endif
860 } 1005 }
861 else 1006 else
862 default_loop = 0; 1007 ev_default_loop_ptr = 0;
863 } 1008 }
864 1009
865 return default_loop; 1010 return ev_default_loop_ptr;
866} 1011}
867 1012
868void 1013void
869ev_default_destroy (void) 1014ev_default_destroy (void)
870{ 1015{
871#if EV_MULTIPLICITY 1016#if EV_MULTIPLICITY
872 struct ev_loop *loop = default_loop; 1017 struct ev_loop *loop = ev_default_loop_ptr;
873#endif 1018#endif
874 1019
875#ifndef WIN32 1020#ifndef _WIN32
876 ev_ref (EV_A); /* child watcher */ 1021 ev_ref (EV_A); /* child watcher */
877 ev_signal_stop (EV_A_ &childev); 1022 ev_signal_stop (EV_A_ &childev);
878#endif 1023#endif
879 1024
880 ev_ref (EV_A); /* signal watcher */ 1025 ev_ref (EV_A); /* signal watcher */
888 1033
889void 1034void
890ev_default_fork (void) 1035ev_default_fork (void)
891{ 1036{
892#if EV_MULTIPLICITY 1037#if EV_MULTIPLICITY
893 struct ev_loop *loop = default_loop; 1038 struct ev_loop *loop = ev_default_loop_ptr;
894#endif 1039#endif
895 1040
896 if (method) 1041 if (backend)
897 postfork = 1; 1042 postfork = 1;
898} 1043}
899 1044
900/*****************************************************************************/ 1045/*****************************************************************************/
901 1046
909 return 1; 1054 return 1;
910 1055
911 return 0; 1056 return 0;
912} 1057}
913 1058
914static void 1059inline void
915call_pending (EV_P) 1060call_pending (EV_P)
916{ 1061{
917 int pri; 1062 int pri;
918 1063
919 for (pri = NUMPRI; pri--; ) 1064 for (pri = NUMPRI; pri--; )
920 while (pendingcnt [pri]) 1065 while (pendingcnt [pri])
921 { 1066 {
922 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1067 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
923 1068
924 if (p->w) 1069 if (expect_true (p->w))
925 { 1070 {
926 p->w->pending = 0; 1071 p->w->pending = 0;
927 p->w->cb (EV_A_ p->w, p->events); 1072 EV_CB_INVOKE (p->w, p->events);
928 } 1073 }
929 } 1074 }
930} 1075}
931 1076
932static void 1077inline void
933timers_reify (EV_P) 1078timers_reify (EV_P)
934{ 1079{
935 while (timercnt && ((WT)timers [0])->at <= mn_now) 1080 while (timercnt && ((WT)timers [0])->at <= mn_now)
936 { 1081 {
937 struct ev_timer *w = timers [0]; 1082 struct ev_timer *w = timers [0];
940 1085
941 /* first reschedule or stop timer */ 1086 /* first reschedule or stop timer */
942 if (w->repeat) 1087 if (w->repeat)
943 { 1088 {
944 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1089 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1090
945 ((WT)w)->at = mn_now + w->repeat; 1091 ((WT)w)->at += w->repeat;
1092 if (((WT)w)->at < mn_now)
1093 ((WT)w)->at = mn_now;
1094
946 downheap ((WT *)timers, timercnt, 0); 1095 downheap ((WT *)timers, timercnt, 0);
947 } 1096 }
948 else 1097 else
949 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1098 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
950 1099
951 event (EV_A_ (W)w, EV_TIMEOUT); 1100 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
952 } 1101 }
953} 1102}
954 1103
955static void 1104#if EV_PERIODICS
1105inline void
956periodics_reify (EV_P) 1106periodics_reify (EV_P)
957{ 1107{
958 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1108 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
959 { 1109 {
960 struct ev_periodic *w = periodics [0]; 1110 struct ev_periodic *w = periodics [0];
961 1111
962 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1112 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
963 1113
964 /* first reschedule or stop timer */ 1114 /* first reschedule or stop timer */
965 if (w->interval) 1115 if (w->reschedule_cb)
966 { 1116 {
1117 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1118 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1119 downheap ((WT *)periodics, periodiccnt, 0);
1120 }
1121 else if (w->interval)
1122 {
967 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1123 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
968 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1124 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
969 downheap ((WT *)periodics, periodiccnt, 0); 1125 downheap ((WT *)periodics, periodiccnt, 0);
970 } 1126 }
971 else 1127 else
972 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1128 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
973 1129
974 event (EV_A_ (W)w, EV_PERIODIC); 1130 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
975 } 1131 }
976} 1132}
977 1133
978static void 1134static void
979periodics_reschedule (EV_P) 1135periodics_reschedule (EV_P)
983 /* adjust periodics after time jump */ 1139 /* adjust periodics after time jump */
984 for (i = 0; i < periodiccnt; ++i) 1140 for (i = 0; i < periodiccnt; ++i)
985 { 1141 {
986 struct ev_periodic *w = periodics [i]; 1142 struct ev_periodic *w = periodics [i];
987 1143
1144 if (w->reschedule_cb)
1145 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
988 if (w->interval) 1146 else if (w->interval)
989 {
990 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1147 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
991
992 if (fabs (diff) >= 1e-4)
993 {
994 ev_periodic_stop (EV_A_ w);
995 ev_periodic_start (EV_A_ w);
996
997 i = 0; /* restart loop, inefficient, but time jumps should be rare */
998 }
999 }
1000 } 1148 }
1149
1150 /* now rebuild the heap */
1151 for (i = periodiccnt >> 1; i--; )
1152 downheap ((WT *)periodics, periodiccnt, i);
1001} 1153}
1154#endif
1002 1155
1003inline int 1156inline int
1004time_update_monotonic (EV_P) 1157time_update_monotonic (EV_P)
1005{ 1158{
1006 mn_now = get_clock (); 1159 mn_now = get_clock ();
1007 1160
1008 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1161 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1009 { 1162 {
1010 rt_now = rtmn_diff + mn_now; 1163 ev_rt_now = rtmn_diff + mn_now;
1011 return 0; 1164 return 0;
1012 } 1165 }
1013 else 1166 else
1014 { 1167 {
1015 now_floor = mn_now; 1168 now_floor = mn_now;
1016 rt_now = ev_time (); 1169 ev_rt_now = ev_time ();
1017 return 1; 1170 return 1;
1018 } 1171 }
1019} 1172}
1020 1173
1021static void 1174inline void
1022time_update (EV_P) 1175time_update (EV_P)
1023{ 1176{
1024 int i; 1177 int i;
1025 1178
1026#if EV_USE_MONOTONIC 1179#if EV_USE_MONOTONIC
1030 { 1183 {
1031 ev_tstamp odiff = rtmn_diff; 1184 ev_tstamp odiff = rtmn_diff;
1032 1185
1033 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1186 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1034 { 1187 {
1035 rtmn_diff = rt_now - mn_now; 1188 rtmn_diff = ev_rt_now - mn_now;
1036 1189
1037 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1190 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1038 return; /* all is well */ 1191 return; /* all is well */
1039 1192
1040 rt_now = ev_time (); 1193 ev_rt_now = ev_time ();
1041 mn_now = get_clock (); 1194 mn_now = get_clock ();
1042 now_floor = mn_now; 1195 now_floor = mn_now;
1043 } 1196 }
1044 1197
1198# if EV_PERIODICS
1045 periodics_reschedule (EV_A); 1199 periodics_reschedule (EV_A);
1200# endif
1046 /* no timer adjustment, as the monotonic clock doesn't jump */ 1201 /* no timer adjustment, as the monotonic clock doesn't jump */
1047 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1202 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1048 } 1203 }
1049 } 1204 }
1050 else 1205 else
1051#endif 1206#endif
1052 { 1207 {
1053 rt_now = ev_time (); 1208 ev_rt_now = ev_time ();
1054 1209
1055 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1210 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1056 { 1211 {
1212#if EV_PERIODICS
1057 periodics_reschedule (EV_A); 1213 periodics_reschedule (EV_A);
1214#endif
1058 1215
1059 /* adjust timers. this is easy, as the offset is the same for all */ 1216 /* adjust timers. this is easy, as the offset is the same for all */
1060 for (i = 0; i < timercnt; ++i) 1217 for (i = 0; i < timercnt; ++i)
1061 ((WT)timers [i])->at += rt_now - mn_now; 1218 ((WT)timers [i])->at += ev_rt_now - mn_now;
1062 } 1219 }
1063 1220
1064 mn_now = rt_now; 1221 mn_now = ev_rt_now;
1065 } 1222 }
1066} 1223}
1067 1224
1068void 1225void
1069ev_ref (EV_P) 1226ev_ref (EV_P)
1083ev_loop (EV_P_ int flags) 1240ev_loop (EV_P_ int flags)
1084{ 1241{
1085 double block; 1242 double block;
1086 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1243 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1087 1244
1088 do 1245 while (activecnt)
1089 { 1246 {
1090 /* queue check watchers (and execute them) */ 1247 /* queue check watchers (and execute them) */
1091 if (expect_false (preparecnt)) 1248 if (expect_false (preparecnt))
1092 { 1249 {
1093 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1250 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1109 if (expect_true (have_monotonic)) 1266 if (expect_true (have_monotonic))
1110 time_update_monotonic (EV_A); 1267 time_update_monotonic (EV_A);
1111 else 1268 else
1112#endif 1269#endif
1113 { 1270 {
1114 rt_now = ev_time (); 1271 ev_rt_now = ev_time ();
1115 mn_now = rt_now; 1272 mn_now = ev_rt_now;
1116 } 1273 }
1117 1274
1118 if (flags & EVLOOP_NONBLOCK || idlecnt) 1275 if (flags & EVLOOP_NONBLOCK || idlecnt)
1119 block = 0.; 1276 block = 0.;
1120 else 1277 else
1121 { 1278 {
1122 block = MAX_BLOCKTIME; 1279 block = MAX_BLOCKTIME;
1123 1280
1124 if (timercnt) 1281 if (timercnt)
1125 { 1282 {
1126 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1283 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1127 if (block > to) block = to; 1284 if (block > to) block = to;
1128 } 1285 }
1129 1286
1287#if EV_PERIODICS
1130 if (periodiccnt) 1288 if (periodiccnt)
1131 { 1289 {
1132 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1290 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1133 if (block > to) block = to; 1291 if (block > to) block = to;
1134 } 1292 }
1293#endif
1135 1294
1136 if (block < 0.) block = 0.; 1295 if (expect_false (block < 0.)) block = 0.;
1137 } 1296 }
1138 1297
1139 method_poll (EV_A_ block); 1298 backend_poll (EV_A_ block);
1140 1299
1141 /* update rt_now, do magic */ 1300 /* update ev_rt_now, do magic */
1142 time_update (EV_A); 1301 time_update (EV_A);
1143 1302
1144 /* queue pending timers and reschedule them */ 1303 /* queue pending timers and reschedule them */
1145 timers_reify (EV_A); /* relative timers called last */ 1304 timers_reify (EV_A); /* relative timers called last */
1305#if EV_PERIODICS
1146 periodics_reify (EV_A); /* absolute timers called first */ 1306 periodics_reify (EV_A); /* absolute timers called first */
1307#endif
1147 1308
1148 /* queue idle watchers unless io or timers are pending */ 1309 /* queue idle watchers unless io or timers are pending */
1149 if (idlecnt && !any_pending (EV_A)) 1310 if (idlecnt && !any_pending (EV_A))
1150 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1311 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1151 1312
1152 /* queue check watchers, to be executed first */ 1313 /* queue check watchers, to be executed first */
1153 if (checkcnt) 1314 if (expect_false (checkcnt))
1154 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1315 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1155 1316
1156 call_pending (EV_A); 1317 call_pending (EV_A);
1318
1319 if (expect_false (loop_done))
1320 break;
1157 } 1321 }
1158 while (activecnt && !loop_done);
1159 1322
1160 if (loop_done != 2) 1323 if (loop_done != 2)
1161 loop_done = 0; 1324 loop_done = 0;
1162} 1325}
1163 1326
1223void 1386void
1224ev_io_start (EV_P_ struct ev_io *w) 1387ev_io_start (EV_P_ struct ev_io *w)
1225{ 1388{
1226 int fd = w->fd; 1389 int fd = w->fd;
1227 1390
1228 if (ev_is_active (w)) 1391 if (expect_false (ev_is_active (w)))
1229 return; 1392 return;
1230 1393
1231 assert (("ev_io_start called with negative fd", fd >= 0)); 1394 assert (("ev_io_start called with negative fd", fd >= 0));
1232 1395
1233 ev_start (EV_A_ (W)w, 1); 1396 ev_start (EV_A_ (W)w, 1);
1239 1402
1240void 1403void
1241ev_io_stop (EV_P_ struct ev_io *w) 1404ev_io_stop (EV_P_ struct ev_io *w)
1242{ 1405{
1243 ev_clear_pending (EV_A_ (W)w); 1406 ev_clear_pending (EV_A_ (W)w);
1244 if (!ev_is_active (w)) 1407 if (expect_false (!ev_is_active (w)))
1245 return; 1408 return;
1409
1410 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1246 1411
1247 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1412 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1248 ev_stop (EV_A_ (W)w); 1413 ev_stop (EV_A_ (W)w);
1249 1414
1250 fd_change (EV_A_ w->fd); 1415 fd_change (EV_A_ w->fd);
1251} 1416}
1252 1417
1253void 1418void
1254ev_timer_start (EV_P_ struct ev_timer *w) 1419ev_timer_start (EV_P_ struct ev_timer *w)
1255{ 1420{
1256 if (ev_is_active (w)) 1421 if (expect_false (ev_is_active (w)))
1257 return; 1422 return;
1258 1423
1259 ((WT)w)->at += mn_now; 1424 ((WT)w)->at += mn_now;
1260 1425
1261 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1426 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1262 1427
1263 ev_start (EV_A_ (W)w, ++timercnt); 1428 ev_start (EV_A_ (W)w, ++timercnt);
1264 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1429 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1265 timers [timercnt - 1] = w; 1430 timers [timercnt - 1] = w;
1266 upheap ((WT *)timers, timercnt - 1); 1431 upheap ((WT *)timers, timercnt - 1);
1267 1432
1268 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1433 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1269} 1434}
1270 1435
1271void 1436void
1272ev_timer_stop (EV_P_ struct ev_timer *w) 1437ev_timer_stop (EV_P_ struct ev_timer *w)
1273{ 1438{
1274 ev_clear_pending (EV_A_ (W)w); 1439 ev_clear_pending (EV_A_ (W)w);
1275 if (!ev_is_active (w)) 1440 if (expect_false (!ev_is_active (w)))
1276 return; 1441 return;
1277 1442
1278 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1443 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1279 1444
1280 if (((W)w)->active < timercnt--) 1445 if (expect_true (((W)w)->active < timercnt--))
1281 { 1446 {
1282 timers [((W)w)->active - 1] = timers [timercnt]; 1447 timers [((W)w)->active - 1] = timers [timercnt];
1283 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1448 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1284 } 1449 }
1285 1450
1286 ((WT)w)->at = w->repeat; 1451 ((WT)w)->at -= mn_now;
1287 1452
1288 ev_stop (EV_A_ (W)w); 1453 ev_stop (EV_A_ (W)w);
1289} 1454}
1290 1455
1291void 1456void
1294 if (ev_is_active (w)) 1459 if (ev_is_active (w))
1295 { 1460 {
1296 if (w->repeat) 1461 if (w->repeat)
1297 { 1462 {
1298 ((WT)w)->at = mn_now + w->repeat; 1463 ((WT)w)->at = mn_now + w->repeat;
1299 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1464 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1300 } 1465 }
1301 else 1466 else
1302 ev_timer_stop (EV_A_ w); 1467 ev_timer_stop (EV_A_ w);
1303 } 1468 }
1304 else if (w->repeat) 1469 else if (w->repeat)
1470 {
1471 w->at = w->repeat;
1305 ev_timer_start (EV_A_ w); 1472 ev_timer_start (EV_A_ w);
1473 }
1306} 1474}
1307 1475
1476#if EV_PERIODICS
1308void 1477void
1309ev_periodic_start (EV_P_ struct ev_periodic *w) 1478ev_periodic_start (EV_P_ struct ev_periodic *w)
1310{ 1479{
1311 if (ev_is_active (w)) 1480 if (expect_false (ev_is_active (w)))
1312 return; 1481 return;
1313 1482
1483 if (w->reschedule_cb)
1484 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1485 else if (w->interval)
1486 {
1314 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1487 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1315
1316 /* this formula differs from the one in periodic_reify because we do not always round up */ 1488 /* this formula differs from the one in periodic_reify because we do not always round up */
1317 if (w->interval)
1318 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1489 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1490 }
1319 1491
1320 ev_start (EV_A_ (W)w, ++periodiccnt); 1492 ev_start (EV_A_ (W)w, ++periodiccnt);
1321 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1493 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1322 periodics [periodiccnt - 1] = w; 1494 periodics [periodiccnt - 1] = w;
1323 upheap ((WT *)periodics, periodiccnt - 1); 1495 upheap ((WT *)periodics, periodiccnt - 1);
1324 1496
1325 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1497 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1326} 1498}
1327 1499
1328void 1500void
1329ev_periodic_stop (EV_P_ struct ev_periodic *w) 1501ev_periodic_stop (EV_P_ struct ev_periodic *w)
1330{ 1502{
1331 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1332 if (!ev_is_active (w)) 1504 if (expect_false (!ev_is_active (w)))
1333 return; 1505 return;
1334 1506
1335 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1507 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1336 1508
1337 if (((W)w)->active < periodiccnt--) 1509 if (expect_true (((W)w)->active < periodiccnt--))
1338 { 1510 {
1339 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1511 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1340 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1512 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1341 } 1513 }
1342 1514
1343 ev_stop (EV_A_ (W)w); 1515 ev_stop (EV_A_ (W)w);
1344} 1516}
1345 1517
1346void 1518void
1519ev_periodic_again (EV_P_ struct ev_periodic *w)
1520{
1521 /* TODO: use adjustheap and recalculation */
1522 ev_periodic_stop (EV_A_ w);
1523 ev_periodic_start (EV_A_ w);
1524}
1525#endif
1526
1527void
1347ev_idle_start (EV_P_ struct ev_idle *w) 1528ev_idle_start (EV_P_ struct ev_idle *w)
1348{ 1529{
1349 if (ev_is_active (w)) 1530 if (expect_false (ev_is_active (w)))
1350 return; 1531 return;
1351 1532
1352 ev_start (EV_A_ (W)w, ++idlecnt); 1533 ev_start (EV_A_ (W)w, ++idlecnt);
1353 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1534 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1354 idles [idlecnt - 1] = w; 1535 idles [idlecnt - 1] = w;
1355} 1536}
1356 1537
1357void 1538void
1358ev_idle_stop (EV_P_ struct ev_idle *w) 1539ev_idle_stop (EV_P_ struct ev_idle *w)
1359{ 1540{
1360 ev_clear_pending (EV_A_ (W)w); 1541 ev_clear_pending (EV_A_ (W)w);
1361 if (ev_is_active (w)) 1542 if (expect_false (!ev_is_active (w)))
1362 return; 1543 return;
1363 1544
1364 idles [((W)w)->active - 1] = idles [--idlecnt]; 1545 idles [((W)w)->active - 1] = idles [--idlecnt];
1365 ev_stop (EV_A_ (W)w); 1546 ev_stop (EV_A_ (W)w);
1366} 1547}
1367 1548
1368void 1549void
1369ev_prepare_start (EV_P_ struct ev_prepare *w) 1550ev_prepare_start (EV_P_ struct ev_prepare *w)
1370{ 1551{
1371 if (ev_is_active (w)) 1552 if (expect_false (ev_is_active (w)))
1372 return; 1553 return;
1373 1554
1374 ev_start (EV_A_ (W)w, ++preparecnt); 1555 ev_start (EV_A_ (W)w, ++preparecnt);
1375 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1556 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1376 prepares [preparecnt - 1] = w; 1557 prepares [preparecnt - 1] = w;
1377} 1558}
1378 1559
1379void 1560void
1380ev_prepare_stop (EV_P_ struct ev_prepare *w) 1561ev_prepare_stop (EV_P_ struct ev_prepare *w)
1381{ 1562{
1382 ev_clear_pending (EV_A_ (W)w); 1563 ev_clear_pending (EV_A_ (W)w);
1383 if (ev_is_active (w)) 1564 if (expect_false (!ev_is_active (w)))
1384 return; 1565 return;
1385 1566
1386 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1567 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1387 ev_stop (EV_A_ (W)w); 1568 ev_stop (EV_A_ (W)w);
1388} 1569}
1389 1570
1390void 1571void
1391ev_check_start (EV_P_ struct ev_check *w) 1572ev_check_start (EV_P_ struct ev_check *w)
1392{ 1573{
1393 if (ev_is_active (w)) 1574 if (expect_false (ev_is_active (w)))
1394 return; 1575 return;
1395 1576
1396 ev_start (EV_A_ (W)w, ++checkcnt); 1577 ev_start (EV_A_ (W)w, ++checkcnt);
1397 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1578 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1398 checks [checkcnt - 1] = w; 1579 checks [checkcnt - 1] = w;
1399} 1580}
1400 1581
1401void 1582void
1402ev_check_stop (EV_P_ struct ev_check *w) 1583ev_check_stop (EV_P_ struct ev_check *w)
1403{ 1584{
1404 ev_clear_pending (EV_A_ (W)w); 1585 ev_clear_pending (EV_A_ (W)w);
1405 if (ev_is_active (w)) 1586 if (expect_false (!ev_is_active (w)))
1406 return; 1587 return;
1407 1588
1408 checks [((W)w)->active - 1] = checks [--checkcnt]; 1589 checks [((W)w)->active - 1] = checks [--checkcnt];
1409 ev_stop (EV_A_ (W)w); 1590 ev_stop (EV_A_ (W)w);
1410} 1591}
1415 1596
1416void 1597void
1417ev_signal_start (EV_P_ struct ev_signal *w) 1598ev_signal_start (EV_P_ struct ev_signal *w)
1418{ 1599{
1419#if EV_MULTIPLICITY 1600#if EV_MULTIPLICITY
1420 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1601 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1421#endif 1602#endif
1422 if (ev_is_active (w)) 1603 if (expect_false (ev_is_active (w)))
1423 return; 1604 return;
1424 1605
1425 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1606 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1426 1607
1427 ev_start (EV_A_ (W)w, 1); 1608 ev_start (EV_A_ (W)w, 1);
1428 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1609 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1429 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1610 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1430 1611
1431 if (!((WL)w)->next) 1612 if (!((WL)w)->next)
1432 { 1613 {
1433#if WIN32 1614#if _WIN32
1434 signal (w->signum, sighandler); 1615 signal (w->signum, sighandler);
1435#else 1616#else
1436 struct sigaction sa; 1617 struct sigaction sa;
1437 sa.sa_handler = sighandler; 1618 sa.sa_handler = sighandler;
1438 sigfillset (&sa.sa_mask); 1619 sigfillset (&sa.sa_mask);
1444 1625
1445void 1626void
1446ev_signal_stop (EV_P_ struct ev_signal *w) 1627ev_signal_stop (EV_P_ struct ev_signal *w)
1447{ 1628{
1448 ev_clear_pending (EV_A_ (W)w); 1629 ev_clear_pending (EV_A_ (W)w);
1449 if (!ev_is_active (w)) 1630 if (expect_false (!ev_is_active (w)))
1450 return; 1631 return;
1451 1632
1452 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1633 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1453 ev_stop (EV_A_ (W)w); 1634 ev_stop (EV_A_ (W)w);
1454 1635
1458 1639
1459void 1640void
1460ev_child_start (EV_P_ struct ev_child *w) 1641ev_child_start (EV_P_ struct ev_child *w)
1461{ 1642{
1462#if EV_MULTIPLICITY 1643#if EV_MULTIPLICITY
1463 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1644 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1464#endif 1645#endif
1465 if (ev_is_active (w)) 1646 if (expect_false (ev_is_active (w)))
1466 return; 1647 return;
1467 1648
1468 ev_start (EV_A_ (W)w, 1); 1649 ev_start (EV_A_ (W)w, 1);
1469 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1650 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1470} 1651}
1471 1652
1472void 1653void
1473ev_child_stop (EV_P_ struct ev_child *w) 1654ev_child_stop (EV_P_ struct ev_child *w)
1474{ 1655{
1475 ev_clear_pending (EV_A_ (W)w); 1656 ev_clear_pending (EV_A_ (W)w);
1476 if (ev_is_active (w)) 1657 if (expect_false (!ev_is_active (w)))
1477 return; 1658 return;
1478 1659
1479 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1660 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1480 ev_stop (EV_A_ (W)w); 1661 ev_stop (EV_A_ (W)w);
1481} 1662}
1518void 1699void
1519ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1700ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1520{ 1701{
1521 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1702 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1522 1703
1523 if (!once) 1704 if (expect_false (!once))
1705 {
1524 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1706 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1525 else 1707 return;
1526 { 1708 }
1709
1527 once->cb = cb; 1710 once->cb = cb;
1528 once->arg = arg; 1711 once->arg = arg;
1529 1712
1530 ev_watcher_init (&once->io, once_cb_io); 1713 ev_init (&once->io, once_cb_io);
1531 if (fd >= 0) 1714 if (fd >= 0)
1532 { 1715 {
1533 ev_io_set (&once->io, fd, events); 1716 ev_io_set (&once->io, fd, events);
1534 ev_io_start (EV_A_ &once->io); 1717 ev_io_start (EV_A_ &once->io);
1535 } 1718 }
1536 1719
1537 ev_watcher_init (&once->to, once_cb_to); 1720 ev_init (&once->to, once_cb_to);
1538 if (timeout >= 0.) 1721 if (timeout >= 0.)
1539 { 1722 {
1540 ev_timer_set (&once->to, timeout, 0.); 1723 ev_timer_set (&once->to, timeout, 0.);
1541 ev_timer_start (EV_A_ &once->to); 1724 ev_timer_start (EV_A_ &once->to);
1542 }
1543 } 1725 }
1544} 1726}
1545 1727
1728#ifdef __cplusplus
1729}
1730#endif
1731

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines