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

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

Diff Legend

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