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

Comparing libev/ev.c (file contents):
Revision 1.80 by root, Fri Nov 9 15:30:59 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;
… …
217 282
218#if EV_MULTIPLICITY 283#if EV_MULTIPLICITY
219 284
220 struct 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 #undef VAR 291 #undef VAR
225 }; 292 };
226 #include "ev_wrap.h" 293 #include "ev_wrap.h"
227 294
228 struct ev_loop default_loop_struct; 295 static struct ev_loop default_loop_struct;
229 static struct ev_loop *default_loop; 296 struct ev_loop *ev_default_loop_ptr;
230 297
231#else 298#else
232 299
300 ev_tstamp ev_rt_now;
233 #define VAR(name,decl) static decl; 301 #define VAR(name,decl) static decl;
234 #include "ev_vars.h" 302 #include "ev_vars.h"
235 #undef VAR 303 #undef VAR
236 304
237 static int default_loop; 305 static int ev_default_loop_ptr;
238 306
239#endif 307#endif
240 308
241/*****************************************************************************/ 309/*****************************************************************************/
242 310
243inline ev_tstamp 311ev_tstamp
244ev_time (void) 312ev_time (void)
245{ 313{
246#if EV_USE_REALTIME 314#if EV_USE_REALTIME
247 struct timespec ts; 315 struct timespec ts;
248 clock_gettime (CLOCK_REALTIME, &ts); 316 clock_gettime (CLOCK_REALTIME, &ts);
… …
267#endif 335#endif
268 336
269 return ev_time (); 337 return ev_time ();
270} 338}
271 339
340#if EV_MULTIPLICITY
272ev_tstamp 341ev_tstamp
273ev_now (EV_P) 342ev_now (EV_P)
274{ 343{
275 return rt_now; 344 return ev_rt_now;
276} 345}
346#endif
277 347
278#define array_roundsize(type,n) ((n) | 4 & ~3) 348#define array_roundsize(type,n) (((n) | 4) & ~3)
279 349
280#define array_needsize(type,base,cur,cnt,init) \ 350#define array_needsize(type,base,cur,cnt,init) \
281 if (expect_false ((cnt) > cur)) \ 351 if (expect_false ((cnt) > cur)) \
282 { \ 352 { \
283 int newcnt = cur; \ 353 int newcnt = cur; \
… …
298 stem ## max = array_roundsize (stem ## cnt >> 1); \ 368 stem ## max = array_roundsize (stem ## cnt >> 1); \
299 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 369 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
300 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 370 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
301 } 371 }
302 372
303/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
304/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
305#define array_free_microshit(stem) \
306 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
307
308#define array_free(stem, idx) \ 373#define array_free(stem, idx) \
309 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;
310 375
311/*****************************************************************************/ 376/*****************************************************************************/
312 377
… …
326void 391void
327ev_feed_event (EV_P_ void *w, int revents) 392ev_feed_event (EV_P_ void *w, int revents)
328{ 393{
329 W w_ = (W)w; 394 W w_ = (W)w;
330 395
331 if (w_->pending) 396 if (expect_false (w_->pending))
332 { 397 {
333 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 398 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
334 return; 399 return;
335 } 400 }
336 401
337 w_->pending = ++pendingcnt [ABSPRI (w_)]; 402 w_->pending = ++pendingcnt [ABSPRI (w_)];
338 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);
339 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 404 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
340 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 405 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
341} 406}
342 407
343static void 408static void
… …
370 fd_event (EV_A_ fd, revents); 435 fd_event (EV_A_ fd, revents);
371} 436}
372 437
373/*****************************************************************************/ 438/*****************************************************************************/
374 439
375static void 440inline void
376fd_reify (EV_P) 441fd_reify (EV_P)
377{ 442{
378 int i; 443 int i;
379 444
380 for (i = 0; i < fdchangecnt; ++i) 445 for (i = 0; i < fdchangecnt; ++i)
… …
386 int events = 0; 451 int events = 0;
387 452
388 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)
389 events |= w->events; 454 events |= w->events;
390 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
391 anfd->reify = 0; 465 anfd->reify = 0;
392 466
393 method_modify (EV_A_ fd, anfd->events, events); 467 backend_modify (EV_A_ fd, anfd->events, events);
394 anfd->events = events; 468 anfd->events = events;
395 } 469 }
396 470
397 fdchangecnt = 0; 471 fdchangecnt = 0;
398} 472}
399 473
400static void 474static void
401fd_change (EV_P_ int fd) 475fd_change (EV_P_ int fd)
402{ 476{
403 if (anfds [fd].reify) 477 if (expect_false (anfds [fd].reify))
404 return; 478 return;
405 479
406 anfds [fd].reify = 1; 480 anfds [fd].reify = 1;
407 481
408 ++fdchangecnt; 482 ++fdchangecnt;
409 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 483 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
410 fdchanges [fdchangecnt - 1] = fd; 484 fdchanges [fdchangecnt - 1] = fd;
411} 485}
412 486
413static void 487static void
414fd_kill (EV_P_ int fd) 488fd_kill (EV_P_ int fd)
… …
420 ev_io_stop (EV_A_ w); 494 ev_io_stop (EV_A_ w);
421 ev_feed_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);
422 } 496 }
423} 497}
424 498
425static int 499inline int
426fd_valid (int fd) 500fd_valid (int fd)
427{ 501{
428#ifdef WIN32 502#ifdef _WIN32
429 return !!win32_get_osfhandle (fd); 503 return _get_osfhandle (fd) != -1;
430#else 504#else
431 return fcntl (fd, F_GETFD) != -1; 505 return fcntl (fd, F_GETFD) != -1;
432#endif 506#endif
433} 507}
434 508
… …
456 fd_kill (EV_A_ fd); 530 fd_kill (EV_A_ fd);
457 return; 531 return;
458 } 532 }
459} 533}
460 534
461/* 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 */
462static void 536static void
463fd_rearm_all (EV_P) 537fd_rearm_all (EV_P)
464{ 538{
465 int fd; 539 int fd;
466 540
… …
514 588
515 heap [k] = w; 589 heap [k] = w;
516 ((W)heap [k])->active = k + 1; 590 ((W)heap [k])->active = k + 1;
517} 591}
518 592
593inline void
594adjustheap (WT *heap, int N, int k)
595{
596 upheap (heap, k);
597 downheap (heap, N, k);
598}
599
519/*****************************************************************************/ 600/*****************************************************************************/
520 601
521typedef struct 602typedef struct
522{ 603{
523 WL head; 604 WL head;
… …
544} 625}
545 626
546static void 627static void
547sighandler (int signum) 628sighandler (int signum)
548{ 629{
549#if WIN32 630#if _WIN32
550 signal (signum, sighandler); 631 signal (signum, sighandler);
551#endif 632#endif
552 633
553 signals [signum - 1].gotsig = 1; 634 signals [signum - 1].gotsig = 1;
554 635
555 if (!gotsig) 636 if (!gotsig)
556 { 637 {
557 int old_errno = errno; 638 int old_errno = errno;
558 gotsig = 1; 639 gotsig = 1;
559#ifdef WIN32
560 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
561#else
562 write (sigpipe [1], &signum, 1); 640 write (sigpipe [1], &signum, 1);
563#endif
564 errno = old_errno; 641 errno = old_errno;
565 } 642 }
566} 643}
567 644
568void 645void
569ev_feed_signal_event (EV_P_ int signum) 646ev_feed_signal_event (EV_P_ int signum)
570{ 647{
571 WL w; 648 WL w;
572 649
573#if EV_MULTIPLICITY 650#if EV_MULTIPLICITY
574 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 651 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
575#endif 652#endif
576 653
577 --signum; 654 --signum;
578 655
579 if (signum < 0 || signum >= signalmax) 656 if (signum < 0 || signum >= signalmax)
… …
588static void 665static void
589sigcb (EV_P_ struct ev_io *iow, int revents) 666sigcb (EV_P_ struct ev_io *iow, int revents)
590{ 667{
591 int signum; 668 int signum;
592 669
593#ifdef WIN32
594 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
595#else
596 read (sigpipe [0], &revents, 1); 670 read (sigpipe [0], &revents, 1);
597#endif
598 gotsig = 0; 671 gotsig = 0;
599 672
600 for (signum = signalmax; signum--; ) 673 for (signum = signalmax; signum--; )
601 if (signals [signum].gotsig) 674 if (signals [signum].gotsig)
602 ev_feed_signal_event (EV_A_ signum + 1); 675 ev_feed_signal_event (EV_A_ signum + 1);
603} 676}
604 677
605static void 678static void
679fd_intern (int fd)
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
688}
689
690static void
606siginit (EV_P) 691siginit (EV_P)
607{ 692{
608#ifndef WIN32 693 fd_intern (sigpipe [0]);
609 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 694 fd_intern (sigpipe [1]);
610 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
611
612 /* rather than sort out wether we really need nb, set it */
613 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
614 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
615#endif
616 695
617 ev_io_set (&sigev, sigpipe [0], EV_READ); 696 ev_io_set (&sigev, sigpipe [0], EV_READ);
618 ev_io_start (EV_A_ &sigev); 697 ev_io_start (EV_A_ &sigev);
619 ev_unref (EV_A); /* child watcher should not keep loop alive */ 698 ev_unref (EV_A); /* child watcher should not keep loop alive */
620} 699}
621 700
622/*****************************************************************************/ 701/*****************************************************************************/
623 702
624static struct ev_child *childs [PID_HASHSIZE]; 703static struct ev_child *childs [PID_HASHSIZE];
625 704
626#ifndef WIN32 705#ifndef _WIN32
627 706
628static struct ev_signal childev; 707static struct ev_signal childev;
629 708
630#ifndef WCONTINUED 709#ifndef WCONTINUED
631# define WCONTINUED 0 710# define WCONTINUED 0
… …
652 int pid, status; 731 int pid, status;
653 732
654 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 733 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
655 { 734 {
656 /* 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 */
657 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 737 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
658 738
659 child_reap (EV_A_ sw, pid, pid, status); 739 child_reap (EV_A_ sw, pid, pid, status);
660 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 */
661 } 741 }
662} 742}
663 743
664#endif 744#endif
665 745
666/*****************************************************************************/ 746/*****************************************************************************/
667 747
748#if EV_USE_PORT
749# include "ev_port.c"
750#endif
668#if EV_USE_KQUEUE 751#if EV_USE_KQUEUE
669# include "ev_kqueue.c" 752# include "ev_kqueue.c"
670#endif 753#endif
671#if EV_USE_EPOLL 754#if EV_USE_EPOLL
672# include "ev_epoll.c" 755# include "ev_epoll.c"
… …
692 775
693/* 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 */
694static int 777static int
695enable_secure (void) 778enable_secure (void)
696{ 779{
697#ifdef WIN32 780#ifdef _WIN32
698 return 0; 781 return 0;
699#else 782#else
700 return getuid () != geteuid () 783 return getuid () != geteuid ()
701 || getgid () != getegid (); 784 || getgid () != getegid ();
702#endif 785#endif
703} 786}
704 787
705int 788unsigned int
706ev_method (EV_P) 789ev_supported_backends (void)
707{ 790{
708 return method; 791 unsigned int flags = 0;
709}
710 792
711static void 793 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
712loop_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)
713{ 804{
714 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)
715 { 830 {
716#if EV_USE_MONOTONIC 831#if EV_USE_MONOTONIC
717 { 832 {
718 struct timespec ts; 833 struct timespec ts;
719 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 834 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
720 have_monotonic = 1; 835 have_monotonic = 1;
721 } 836 }
722#endif 837#endif
723 838
724 rt_now = ev_time (); 839 ev_rt_now = ev_time ();
725 mn_now = get_clock (); 840 mn_now = get_clock ();
726 now_floor = mn_now; 841 now_floor = mn_now;
727 rtmn_diff = rt_now - mn_now; 842 rtmn_diff = ev_rt_now - mn_now;
728 843
729 if (methods == EVMETHOD_AUTO) 844 if (!(flags & EVFLAG_NOENV)
730 if (!enable_secure () && getenv ("LIBEV_METHODS")) 845 && !enable_secure ()
846 && getenv ("LIBEV_FLAGS"))
731 methods = atoi (getenv ("LIBEV_METHODS")); 847 flags = atoi (getenv ("LIBEV_FLAGS"));
732 else
733 methods = EVMETHOD_ANY;
734 848
735 method = 0; 849 if (!(flags & 0x0000ffffUL))
736#if EV_USE_WIN32 850 flags |= ev_recommended_backends ();
737 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);
738#endif 855#endif
739#if EV_USE_KQUEUE 856#if EV_USE_KQUEUE
740 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 857 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
741#endif 858#endif
742#if EV_USE_EPOLL 859#if EV_USE_EPOLL
743 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 860 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
744#endif 861#endif
745#if EV_USE_POLL 862#if EV_USE_POLL
746 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 863 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
747#endif 864#endif
748#if EV_USE_SELECT 865#if EV_USE_SELECT
749 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 866 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
750#endif 867#endif
751 868
752 ev_watcher_init (&sigev, sigcb); 869 ev_init (&sigev, sigcb);
753 ev_set_priority (&sigev, EV_MAXPRI); 870 ev_set_priority (&sigev, EV_MAXPRI);
754 } 871 }
755} 872}
756 873
757void 874static void
758loop_destroy (EV_P) 875loop_destroy (EV_P)
759{ 876{
760 int i; 877 int i;
761 878
762#if EV_USE_WIN32 879#if EV_USE_PORT
763 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 880 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
764#endif 881#endif
765#if EV_USE_KQUEUE 882#if EV_USE_KQUEUE
766 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 883 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
767#endif 884#endif
768#if EV_USE_EPOLL 885#if EV_USE_EPOLL
769 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 886 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
770#endif 887#endif
771#if EV_USE_POLL 888#if EV_USE_POLL
772 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 889 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
773#endif 890#endif
774#if EV_USE_SELECT 891#if EV_USE_SELECT
775 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 892 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
776#endif 893#endif
777 894
778 for (i = NUMPRI; i--; ) 895 for (i = NUMPRI; i--; )
779 array_free (pending, [i]); 896 array_free (pending, [i]);
780 897
781 /* have to use the microsoft-never-gets-it-right macro */ 898 /* have to use the microsoft-never-gets-it-right macro */
782 array_free_microshit (fdchange); 899 array_free (fdchange, EMPTY0);
783 array_free_microshit (timer); 900 array_free (timer, EMPTY0);
784 array_free_microshit (periodic); 901#if EV_PERIODICS
785 array_free_microshit (idle); 902 array_free (periodic, EMPTY0);
786 array_free_microshit (prepare); 903#endif
787 array_free_microshit (check); 904 array_free (idle, EMPTY0);
905 array_free (prepare, EMPTY0);
906 array_free (check, EMPTY0);
788 907
789 method = 0; 908 backend = 0;
790} 909}
791 910
792static void 911static void
793loop_fork (EV_P) 912loop_fork (EV_P)
794{ 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
795#if EV_USE_EPOLL 920#if EV_USE_EPOLL
796 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 921 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
797#endif
798#if EV_USE_KQUEUE
799 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
800#endif 922#endif
801 923
802 if (ev_is_active (&sigev)) 924 if (ev_is_active (&sigev))
803 { 925 {
804 /* default loop */ 926 /* default loop */
… …
817 postfork = 0; 939 postfork = 0;
818} 940}
819 941
820#if EV_MULTIPLICITY 942#if EV_MULTIPLICITY
821struct ev_loop * 943struct ev_loop *
822ev_loop_new (int methods) 944ev_loop_new (unsigned int flags)
823{ 945{
824 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));
825 947
826 memset (loop, 0, sizeof (struct ev_loop)); 948 memset (loop, 0, sizeof (struct ev_loop));
827 949
828 loop_init (EV_A_ methods); 950 loop_init (EV_A_ flags);
829 951
830 if (ev_method (EV_A)) 952 if (ev_backend (EV_A))
831 return loop; 953 return loop;
832 954
833 return 0; 955 return 0;
834} 956}
835 957
… …
848 970
849#endif 971#endif
850 972
851#if EV_MULTIPLICITY 973#if EV_MULTIPLICITY
852struct ev_loop * 974struct ev_loop *
975ev_default_loop_init (unsigned int flags)
853#else 976#else
854int 977int
978ev_default_loop (unsigned int flags)
855#endif 979#endif
856ev_default_loop (int methods)
857{ 980{
858 if (sigpipe [0] == sigpipe [1]) 981 if (sigpipe [0] == sigpipe [1])
859 if (pipe (sigpipe)) 982 if (pipe (sigpipe))
860 return 0; 983 return 0;
861 984
862 if (!default_loop) 985 if (!ev_default_loop_ptr)
863 { 986 {
864#if EV_MULTIPLICITY 987#if EV_MULTIPLICITY
865 struct ev_loop *loop = default_loop = &default_loop_struct; 988 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
866#else 989#else
867 default_loop = 1; 990 ev_default_loop_ptr = 1;
868#endif 991#endif
869 992
870 loop_init (EV_A_ methods); 993 loop_init (EV_A_ flags);
871 994
872 if (ev_method (EV_A)) 995 if (ev_backend (EV_A))
873 { 996 {
874 siginit (EV_A); 997 siginit (EV_A);
875 998
876#ifndef WIN32 999#ifndef _WIN32
877 ev_signal_init (&childev, childcb, SIGCHLD); 1000 ev_signal_init (&childev, childcb, SIGCHLD);
878 ev_set_priority (&childev, EV_MAXPRI); 1001 ev_set_priority (&childev, EV_MAXPRI);
879 ev_signal_start (EV_A_ &childev); 1002 ev_signal_start (EV_A_ &childev);
880 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1003 ev_unref (EV_A); /* child watcher should not keep loop alive */
881#endif 1004#endif
882 } 1005 }
883 else 1006 else
884 default_loop = 0; 1007 ev_default_loop_ptr = 0;
885 } 1008 }
886 1009
887 return default_loop; 1010 return ev_default_loop_ptr;
888} 1011}
889 1012
890void 1013void
891ev_default_destroy (void) 1014ev_default_destroy (void)
892{ 1015{
893#if EV_MULTIPLICITY 1016#if EV_MULTIPLICITY
894 struct ev_loop *loop = default_loop; 1017 struct ev_loop *loop = ev_default_loop_ptr;
895#endif 1018#endif
896 1019
897#ifndef WIN32 1020#ifndef _WIN32
898 ev_ref (EV_A); /* child watcher */ 1021 ev_ref (EV_A); /* child watcher */
899 ev_signal_stop (EV_A_ &childev); 1022 ev_signal_stop (EV_A_ &childev);
900#endif 1023#endif
901 1024
902 ev_ref (EV_A); /* signal watcher */ 1025 ev_ref (EV_A); /* signal watcher */
… …
910 1033
911void 1034void
912ev_default_fork (void) 1035ev_default_fork (void)
913{ 1036{
914#if EV_MULTIPLICITY 1037#if EV_MULTIPLICITY
915 struct ev_loop *loop = default_loop; 1038 struct ev_loop *loop = ev_default_loop_ptr;
916#endif 1039#endif
917 1040
918 if (method) 1041 if (backend)
919 postfork = 1; 1042 postfork = 1;
920} 1043}
921 1044
922/*****************************************************************************/ 1045/*****************************************************************************/
923 1046
… …
931 return 1; 1054 return 1;
932 1055
933 return 0; 1056 return 0;
934} 1057}
935 1058
936static void 1059inline void
937call_pending (EV_P) 1060call_pending (EV_P)
938{ 1061{
939 int pri; 1062 int pri;
940 1063
941 for (pri = NUMPRI; pri--; ) 1064 for (pri = NUMPRI; pri--; )
942 while (pendingcnt [pri]) 1065 while (pendingcnt [pri])
943 { 1066 {
944 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1067 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
945 1068
946 if (p->w) 1069 if (expect_true (p->w))
947 { 1070 {
948 p->w->pending = 0; 1071 p->w->pending = 0;
949 p->w->cb (EV_A_ p->w, p->events); 1072 EV_CB_INVOKE (p->w, p->events);
950 } 1073 }
951 } 1074 }
952} 1075}
953 1076
954static void 1077inline void
955timers_reify (EV_P) 1078timers_reify (EV_P)
956{ 1079{
957 while (timercnt && ((WT)timers [0])->at <= mn_now) 1080 while (timercnt && ((WT)timers [0])->at <= mn_now)
958 { 1081 {
959 struct ev_timer *w = timers [0]; 1082 struct ev_timer *w = timers [0];
… …
962 1085
963 /* first reschedule or stop timer */ 1086 /* first reschedule or stop timer */
964 if (w->repeat) 1087 if (w->repeat)
965 { 1088 {
966 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
967 ((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
968 downheap ((WT *)timers, timercnt, 0); 1095 downheap ((WT *)timers, timercnt, 0);
969 } 1096 }
970 else 1097 else
971 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1098 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
972 1099
973 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1100 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
974 } 1101 }
975} 1102}
976 1103
977static void 1104#if EV_PERIODICS
1105inline void
978periodics_reify (EV_P) 1106periodics_reify (EV_P)
979{ 1107{
980 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1108 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
981 { 1109 {
982 struct ev_periodic *w = periodics [0]; 1110 struct ev_periodic *w = periodics [0];
983 1111
984 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1112 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
985 1113
986 /* first reschedule or stop timer */ 1114 /* first reschedule or stop timer */
987 if (w->reschedule_cb) 1115 if (w->reschedule_cb)
988 { 1116 {
989 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1117 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
990
991 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1118 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
992 downheap ((WT *)periodics, periodiccnt, 0); 1119 downheap ((WT *)periodics, periodiccnt, 0);
993 } 1120 }
994 else if (w->interval) 1121 else if (w->interval)
995 { 1122 {
996 ((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;
997 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));
998 downheap ((WT *)periodics, periodiccnt, 0); 1125 downheap ((WT *)periodics, periodiccnt, 0);
999 } 1126 }
1000 else 1127 else
1001 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1128 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1002 1129
… …
1013 for (i = 0; i < periodiccnt; ++i) 1140 for (i = 0; i < periodiccnt; ++i)
1014 { 1141 {
1015 struct ev_periodic *w = periodics [i]; 1142 struct ev_periodic *w = periodics [i];
1016 1143
1017 if (w->reschedule_cb) 1144 if (w->reschedule_cb)
1018 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1145 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1019 else if (w->interval) 1146 else if (w->interval)
1020 ((WT)w)->at += 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;
1021 } 1148 }
1022 1149
1023 /* now rebuild the heap */ 1150 /* now rebuild the heap */
1024 for (i = periodiccnt >> 1; i--; ) 1151 for (i = periodiccnt >> 1; i--; )
1025 downheap ((WT *)periodics, periodiccnt, i); 1152 downheap ((WT *)periodics, periodiccnt, i);
1026} 1153}
1154#endif
1027 1155
1028inline int 1156inline int
1029time_update_monotonic (EV_P) 1157time_update_monotonic (EV_P)
1030{ 1158{
1031 mn_now = get_clock (); 1159 mn_now = get_clock ();
1032 1160
1033 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1161 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1034 { 1162 {
1035 rt_now = rtmn_diff + mn_now; 1163 ev_rt_now = rtmn_diff + mn_now;
1036 return 0; 1164 return 0;
1037 } 1165 }
1038 else 1166 else
1039 { 1167 {
1040 now_floor = mn_now; 1168 now_floor = mn_now;
1041 rt_now = ev_time (); 1169 ev_rt_now = ev_time ();
1042 return 1; 1170 return 1;
1043 } 1171 }
1044} 1172}
1045 1173
1046static void 1174inline void
1047time_update (EV_P) 1175time_update (EV_P)
1048{ 1176{
1049 int i; 1177 int i;
1050 1178
1051#if EV_USE_MONOTONIC 1179#if EV_USE_MONOTONIC
… …
1055 { 1183 {
1056 ev_tstamp odiff = rtmn_diff; 1184 ev_tstamp odiff = rtmn_diff;
1057 1185
1058 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 */
1059 { 1187 {
1060 rtmn_diff = rt_now - mn_now; 1188 rtmn_diff = ev_rt_now - mn_now;
1061 1189
1062 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1190 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1063 return; /* all is well */ 1191 return; /* all is well */
1064 1192
1065 rt_now = ev_time (); 1193 ev_rt_now = ev_time ();
1066 mn_now = get_clock (); 1194 mn_now = get_clock ();
1067 now_floor = mn_now; 1195 now_floor = mn_now;
1068 } 1196 }
1069 1197
1198# if EV_PERIODICS
1070 periodics_reschedule (EV_A); 1199 periodics_reschedule (EV_A);
1200# endif
1071 /* no timer adjustment, as the monotonic clock doesn't jump */ 1201 /* no timer adjustment, as the monotonic clock doesn't jump */
1072 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1202 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1073 } 1203 }
1074 } 1204 }
1075 else 1205 else
1076#endif 1206#endif
1077 { 1207 {
1078 rt_now = ev_time (); 1208 ev_rt_now = ev_time ();
1079 1209
1080 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))
1081 { 1211 {
1212#if EV_PERIODICS
1082 periodics_reschedule (EV_A); 1213 periodics_reschedule (EV_A);
1214#endif
1083 1215
1084 /* 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 */
1085 for (i = 0; i < timercnt; ++i) 1217 for (i = 0; i < timercnt; ++i)
1086 ((WT)timers [i])->at += rt_now - mn_now; 1218 ((WT)timers [i])->at += ev_rt_now - mn_now;
1087 } 1219 }
1088 1220
1089 mn_now = rt_now; 1221 mn_now = ev_rt_now;
1090 } 1222 }
1091} 1223}
1092 1224
1093void 1225void
1094ev_ref (EV_P) 1226ev_ref (EV_P)
… …
1108ev_loop (EV_P_ int flags) 1240ev_loop (EV_P_ int flags)
1109{ 1241{
1110 double block; 1242 double block;
1111 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1243 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1112 1244
1113 do 1245 while (activecnt)
1114 { 1246 {
1115 /* queue check watchers (and execute them) */ 1247 /* queue check watchers (and execute them) */
1116 if (expect_false (preparecnt)) 1248 if (expect_false (preparecnt))
1117 { 1249 {
1118 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1250 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1134 if (expect_true (have_monotonic)) 1266 if (expect_true (have_monotonic))
1135 time_update_monotonic (EV_A); 1267 time_update_monotonic (EV_A);
1136 else 1268 else
1137#endif 1269#endif
1138 { 1270 {
1139 rt_now = ev_time (); 1271 ev_rt_now = ev_time ();
1140 mn_now = rt_now; 1272 mn_now = ev_rt_now;
1141 } 1273 }
1142 1274
1143 if (flags & EVLOOP_NONBLOCK || idlecnt) 1275 if (flags & EVLOOP_NONBLOCK || idlecnt)
1144 block = 0.; 1276 block = 0.;
1145 else 1277 else
1146 { 1278 {
1147 block = MAX_BLOCKTIME; 1279 block = MAX_BLOCKTIME;
1148 1280
1149 if (timercnt) 1281 if (timercnt)
1150 { 1282 {
1151 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1283 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1152 if (block > to) block = to; 1284 if (block > to) block = to;
1153 } 1285 }
1154 1286
1287#if EV_PERIODICS
1155 if (periodiccnt) 1288 if (periodiccnt)
1156 { 1289 {
1157 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1290 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1158 if (block > to) block = to; 1291 if (block > to) block = to;
1159 } 1292 }
1293#endif
1160 1294
1161 if (block < 0.) block = 0.; 1295 if (expect_false (block < 0.)) block = 0.;
1162 } 1296 }
1163 1297
1164 method_poll (EV_A_ block); 1298 backend_poll (EV_A_ block);
1165 1299
1166 /* update rt_now, do magic */ 1300 /* update ev_rt_now, do magic */
1167 time_update (EV_A); 1301 time_update (EV_A);
1168 1302
1169 /* queue pending timers and reschedule them */ 1303 /* queue pending timers and reschedule them */
1170 timers_reify (EV_A); /* relative timers called last */ 1304 timers_reify (EV_A); /* relative timers called last */
1305#if EV_PERIODICS
1171 periodics_reify (EV_A); /* absolute timers called first */ 1306 periodics_reify (EV_A); /* absolute timers called first */
1307#endif
1172 1308
1173 /* queue idle watchers unless io or timers are pending */ 1309 /* queue idle watchers unless io or timers are pending */
1174 if (idlecnt && !any_pending (EV_A)) 1310 if (idlecnt && !any_pending (EV_A))
1175 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1311 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1176 1312
1177 /* queue check watchers, to be executed first */ 1313 /* queue check watchers, to be executed first */
1178 if (checkcnt) 1314 if (expect_false (checkcnt))
1179 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1315 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1180 1316
1181 call_pending (EV_A); 1317 call_pending (EV_A);
1318
1319 if (expect_false (loop_done))
1320 break;
1182 } 1321 }
1183 while (activecnt && !loop_done);
1184 1322
1185 if (loop_done != 2) 1323 if (loop_done != 2)
1186 loop_done = 0; 1324 loop_done = 0;
1187} 1325}
1188 1326
… …
1248void 1386void
1249ev_io_start (EV_P_ struct ev_io *w) 1387ev_io_start (EV_P_ struct ev_io *w)
1250{ 1388{
1251 int fd = w->fd; 1389 int fd = w->fd;
1252 1390
1253 if (ev_is_active (w)) 1391 if (expect_false (ev_is_active (w)))
1254 return; 1392 return;
1255 1393
1256 assert (("ev_io_start called with negative fd", fd >= 0)); 1394 assert (("ev_io_start called with negative fd", fd >= 0));
1257 1395
1258 ev_start (EV_A_ (W)w, 1); 1396 ev_start (EV_A_ (W)w, 1);
… …
1264 1402
1265void 1403void
1266ev_io_stop (EV_P_ struct ev_io *w) 1404ev_io_stop (EV_P_ struct ev_io *w)
1267{ 1405{
1268 ev_clear_pending (EV_A_ (W)w); 1406 ev_clear_pending (EV_A_ (W)w);
1269 if (!ev_is_active (w)) 1407 if (expect_false (!ev_is_active (w)))
1270 return; 1408 return;
1409
1410 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1271 1411
1272 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1412 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1273 ev_stop (EV_A_ (W)w); 1413 ev_stop (EV_A_ (W)w);
1274 1414
1275 fd_change (EV_A_ w->fd); 1415 fd_change (EV_A_ w->fd);
1276} 1416}
1277 1417
1278void 1418void
1279ev_timer_start (EV_P_ struct ev_timer *w) 1419ev_timer_start (EV_P_ struct ev_timer *w)
1280{ 1420{
1281 if (ev_is_active (w)) 1421 if (expect_false (ev_is_active (w)))
1282 return; 1422 return;
1283 1423
1284 ((WT)w)->at += mn_now; 1424 ((WT)w)->at += mn_now;
1285 1425
1286 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.));
1287 1427
1288 ev_start (EV_A_ (W)w, ++timercnt); 1428 ev_start (EV_A_ (W)w, ++timercnt);
1289 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1429 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1290 timers [timercnt - 1] = w; 1430 timers [timercnt - 1] = w;
1291 upheap ((WT *)timers, timercnt - 1); 1431 upheap ((WT *)timers, timercnt - 1);
1292 1432
1293 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1433 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1294} 1434}
1295 1435
1296void 1436void
1297ev_timer_stop (EV_P_ struct ev_timer *w) 1437ev_timer_stop (EV_P_ struct ev_timer *w)
1298{ 1438{
1299 ev_clear_pending (EV_A_ (W)w); 1439 ev_clear_pending (EV_A_ (W)w);
1300 if (!ev_is_active (w)) 1440 if (expect_false (!ev_is_active (w)))
1301 return; 1441 return;
1302 1442
1303 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1443 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1304 1444
1305 if (((W)w)->active < timercnt--) 1445 if (expect_true (((W)w)->active < timercnt--))
1306 { 1446 {
1307 timers [((W)w)->active - 1] = timers [timercnt]; 1447 timers [((W)w)->active - 1] = timers [timercnt];
1308 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1448 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1309 } 1449 }
1310 1450
1311 ((WT)w)->at = w->repeat; 1451 ((WT)w)->at -= mn_now;
1312 1452
1313 ev_stop (EV_A_ (W)w); 1453 ev_stop (EV_A_ (W)w);
1314} 1454}
1315 1455
1316void 1456void
… …
1319 if (ev_is_active (w)) 1459 if (ev_is_active (w))
1320 { 1460 {
1321 if (w->repeat) 1461 if (w->repeat)
1322 { 1462 {
1323 ((WT)w)->at = mn_now + w->repeat; 1463 ((WT)w)->at = mn_now + w->repeat;
1324 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1464 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1325 } 1465 }
1326 else 1466 else
1327 ev_timer_stop (EV_A_ w); 1467 ev_timer_stop (EV_A_ w);
1328 } 1468 }
1329 else if (w->repeat) 1469 else if (w->repeat)
1470 {
1471 w->at = w->repeat;
1330 ev_timer_start (EV_A_ w); 1472 ev_timer_start (EV_A_ w);
1473 }
1331} 1474}
1332 1475
1476#if EV_PERIODICS
1333void 1477void
1334ev_periodic_start (EV_P_ struct ev_periodic *w) 1478ev_periodic_start (EV_P_ struct ev_periodic *w)
1335{ 1479{
1336 if (ev_is_active (w)) 1480 if (expect_false (ev_is_active (w)))
1337 return; 1481 return;
1338 1482
1339 if (w->reschedule_cb) 1483 if (w->reschedule_cb)
1340 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1484 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1341 else if (w->interval) 1485 else if (w->interval)
1342 { 1486 {
1343 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.));
1344 /* 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 */
1345 ((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;
1346 } 1490 }
1347 1491
1348 ev_start (EV_A_ (W)w, ++periodiccnt); 1492 ev_start (EV_A_ (W)w, ++periodiccnt);
1349 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1493 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1350 periodics [periodiccnt - 1] = w; 1494 periodics [periodiccnt - 1] = w;
1351 upheap ((WT *)periodics, periodiccnt - 1); 1495 upheap ((WT *)periodics, periodiccnt - 1);
1352 1496
1353 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1497 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1354} 1498}
1355 1499
1356void 1500void
1357ev_periodic_stop (EV_P_ struct ev_periodic *w) 1501ev_periodic_stop (EV_P_ struct ev_periodic *w)
1358{ 1502{
1359 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1360 if (!ev_is_active (w)) 1504 if (expect_false (!ev_is_active (w)))
1361 return; 1505 return;
1362 1506
1363 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1507 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1364 1508
1365 if (((W)w)->active < periodiccnt--) 1509 if (expect_true (((W)w)->active < periodiccnt--))
1366 { 1510 {
1367 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1511 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1368 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1512 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1369 } 1513 }
1370 1514
1371 ev_stop (EV_A_ (W)w); 1515 ev_stop (EV_A_ (W)w);
1372} 1516}
1373 1517
1374void 1518void
1375ev_periodic_again (EV_P_ struct ev_periodic *w) 1519ev_periodic_again (EV_P_ struct ev_periodic *w)
1376{ 1520{
1521 /* TODO: use adjustheap and recalculation */
1377 ev_periodic_stop (EV_A_ w); 1522 ev_periodic_stop (EV_A_ w);
1378 ev_periodic_start (EV_A_ w); 1523 ev_periodic_start (EV_A_ w);
1379} 1524}
1525#endif
1380 1526
1381void 1527void
1382ev_idle_start (EV_P_ struct ev_idle *w) 1528ev_idle_start (EV_P_ struct ev_idle *w)
1383{ 1529{
1384 if (ev_is_active (w)) 1530 if (expect_false (ev_is_active (w)))
1385 return; 1531 return;
1386 1532
1387 ev_start (EV_A_ (W)w, ++idlecnt); 1533 ev_start (EV_A_ (W)w, ++idlecnt);
1388 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1534 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1389 idles [idlecnt - 1] = w; 1535 idles [idlecnt - 1] = w;
1390} 1536}
1391 1537
1392void 1538void
1393ev_idle_stop (EV_P_ struct ev_idle *w) 1539ev_idle_stop (EV_P_ struct ev_idle *w)
1394{ 1540{
1395 ev_clear_pending (EV_A_ (W)w); 1541 ev_clear_pending (EV_A_ (W)w);
1396 if (ev_is_active (w)) 1542 if (expect_false (!ev_is_active (w)))
1397 return; 1543 return;
1398 1544
1399 idles [((W)w)->active - 1] = idles [--idlecnt]; 1545 idles [((W)w)->active - 1] = idles [--idlecnt];
1400 ev_stop (EV_A_ (W)w); 1546 ev_stop (EV_A_ (W)w);
1401} 1547}
1402 1548
1403void 1549void
1404ev_prepare_start (EV_P_ struct ev_prepare *w) 1550ev_prepare_start (EV_P_ struct ev_prepare *w)
1405{ 1551{
1406 if (ev_is_active (w)) 1552 if (expect_false (ev_is_active (w)))
1407 return; 1553 return;
1408 1554
1409 ev_start (EV_A_ (W)w, ++preparecnt); 1555 ev_start (EV_A_ (W)w, ++preparecnt);
1410 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1556 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1411 prepares [preparecnt - 1] = w; 1557 prepares [preparecnt - 1] = w;
1412} 1558}
1413 1559
1414void 1560void
1415ev_prepare_stop (EV_P_ struct ev_prepare *w) 1561ev_prepare_stop (EV_P_ struct ev_prepare *w)
1416{ 1562{
1417 ev_clear_pending (EV_A_ (W)w); 1563 ev_clear_pending (EV_A_ (W)w);
1418 if (ev_is_active (w)) 1564 if (expect_false (!ev_is_active (w)))
1419 return; 1565 return;
1420 1566
1421 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1567 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1422 ev_stop (EV_A_ (W)w); 1568 ev_stop (EV_A_ (W)w);
1423} 1569}
1424 1570
1425void 1571void
1426ev_check_start (EV_P_ struct ev_check *w) 1572ev_check_start (EV_P_ struct ev_check *w)
1427{ 1573{
1428 if (ev_is_active (w)) 1574 if (expect_false (ev_is_active (w)))
1429 return; 1575 return;
1430 1576
1431 ev_start (EV_A_ (W)w, ++checkcnt); 1577 ev_start (EV_A_ (W)w, ++checkcnt);
1432 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1578 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1433 checks [checkcnt - 1] = w; 1579 checks [checkcnt - 1] = w;
1434} 1580}
1435 1581
1436void 1582void
1437ev_check_stop (EV_P_ struct ev_check *w) 1583ev_check_stop (EV_P_ struct ev_check *w)
1438{ 1584{
1439 ev_clear_pending (EV_A_ (W)w); 1585 ev_clear_pending (EV_A_ (W)w);
1440 if (ev_is_active (w)) 1586 if (expect_false (!ev_is_active (w)))
1441 return; 1587 return;
1442 1588
1443 checks [((W)w)->active - 1] = checks [--checkcnt]; 1589 checks [((W)w)->active - 1] = checks [--checkcnt];
1444 ev_stop (EV_A_ (W)w); 1590 ev_stop (EV_A_ (W)w);
1445} 1591}
… …
1450 1596
1451void 1597void
1452ev_signal_start (EV_P_ struct ev_signal *w) 1598ev_signal_start (EV_P_ struct ev_signal *w)
1453{ 1599{
1454#if EV_MULTIPLICITY 1600#if EV_MULTIPLICITY
1455 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));
1456#endif 1602#endif
1457 if (ev_is_active (w)) 1603 if (expect_false (ev_is_active (w)))
1458 return; 1604 return;
1459 1605
1460 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));
1461 1607
1462 ev_start (EV_A_ (W)w, 1); 1608 ev_start (EV_A_ (W)w, 1);
1463 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1609 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1464 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1610 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1465 1611
1466 if (!((WL)w)->next) 1612 if (!((WL)w)->next)
1467 { 1613 {
1468#if WIN32 1614#if _WIN32
1469 signal (w->signum, sighandler); 1615 signal (w->signum, sighandler);
1470#else 1616#else
1471 struct sigaction sa; 1617 struct sigaction sa;
1472 sa.sa_handler = sighandler; 1618 sa.sa_handler = sighandler;
1473 sigfillset (&sa.sa_mask); 1619 sigfillset (&sa.sa_mask);
… …
1479 1625
1480void 1626void
1481ev_signal_stop (EV_P_ struct ev_signal *w) 1627ev_signal_stop (EV_P_ struct ev_signal *w)
1482{ 1628{
1483 ev_clear_pending (EV_A_ (W)w); 1629 ev_clear_pending (EV_A_ (W)w);
1484 if (!ev_is_active (w)) 1630 if (expect_false (!ev_is_active (w)))
1485 return; 1631 return;
1486 1632
1487 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1633 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1488 ev_stop (EV_A_ (W)w); 1634 ev_stop (EV_A_ (W)w);
1489 1635
… …
1493 1639
1494void 1640void
1495ev_child_start (EV_P_ struct ev_child *w) 1641ev_child_start (EV_P_ struct ev_child *w)
1496{ 1642{
1497#if EV_MULTIPLICITY 1643#if EV_MULTIPLICITY
1498 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));
1499#endif 1645#endif
1500 if (ev_is_active (w)) 1646 if (expect_false (ev_is_active (w)))
1501 return; 1647 return;
1502 1648
1503 ev_start (EV_A_ (W)w, 1); 1649 ev_start (EV_A_ (W)w, 1);
1504 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1650 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1505} 1651}
1506 1652
1507void 1653void
1508ev_child_stop (EV_P_ struct ev_child *w) 1654ev_child_stop (EV_P_ struct ev_child *w)
1509{ 1655{
1510 ev_clear_pending (EV_A_ (W)w); 1656 ev_clear_pending (EV_A_ (W)w);
1511 if (ev_is_active (w)) 1657 if (expect_false (!ev_is_active (w)))
1512 return; 1658 return;
1513 1659
1514 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1660 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1515 ev_stop (EV_A_ (W)w); 1661 ev_stop (EV_A_ (W)w);
1516} 1662}
… …
1553void 1699void
1554ev_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)
1555{ 1701{
1556 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));
1557 1703
1558 if (!once) 1704 if (expect_false (!once))
1705 {
1559 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1706 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1560 else 1707 return;
1561 { 1708 }
1709
1562 once->cb = cb; 1710 once->cb = cb;
1563 once->arg = arg; 1711 once->arg = arg;
1564 1712
1565 ev_watcher_init (&once->io, once_cb_io); 1713 ev_init (&once->io, once_cb_io);
1566 if (fd >= 0) 1714 if (fd >= 0)
1567 { 1715 {
1568 ev_io_set (&once->io, fd, events); 1716 ev_io_set (&once->io, fd, events);
1569 ev_io_start (EV_A_ &once->io); 1717 ev_io_start (EV_A_ &once->io);
1570 } 1718 }
1571 1719
1572 ev_watcher_init (&once->to, once_cb_to); 1720 ev_init (&once->to, once_cb_to);
1573 if (timeout >= 0.) 1721 if (timeout >= 0.)
1574 { 1722 {
1575 ev_timer_set (&once->to, timeout, 0.); 1723 ev_timer_set (&once->to, timeout, 0.);
1576 ev_timer_start (EV_A_ &once->to); 1724 ev_timer_start (EV_A_ &once->to);
1577 }
1578 } 1725 }
1579} 1726}
1580 1727
1728#ifdef __cplusplus
1729}
1730#endif
1731

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines