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

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

Diff Legend

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