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

Comparing libev/ev.c (file contents):
Revision 1.87 by root, Sat Nov 10 03:36:15 2007 UTC vs.
Revision 1.133 by root, Fri Nov 23 11:32:22 2007 UTC

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

Diff Legend

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