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

Comparing libev/ev.c (file contents):
Revision 1.96 by root, Sun Nov 11 01:50:36 2007 UTC vs.
Revision 1.123 by root, Sat Nov 17 02:23:54 2007 UTC

35 35
36#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# include "config.h" 37# include "config.h"
38 38
39# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC
40# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
41# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif
42# endif 46# endif
43 47
44# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT) 48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
45# define EV_USE_SELECT 1 49# define EV_USE_SELECT 1
46# endif 50# endif
47 51
48# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) 52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
49# define EV_USE_POLL 1 53# define EV_USE_POLL 1
50# endif 54# endif
51 55
52# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL) 56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
53# define EV_USE_EPOLL 1 57# define EV_USE_EPOLL 1
54# endif 58# endif
55 59
56# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
57# define EV_USE_KQUEUE 1 61# define EV_USE_KQUEUE 1
62# endif
63
64# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT)
65# define EV_USE_PORT 1
58# endif 66# endif
59 67
60#endif 68#endif
61 69
62#include <math.h> 70#include <math.h>
71#include <sys/types.h> 79#include <sys/types.h>
72#include <time.h> 80#include <time.h>
73 81
74#include <signal.h> 82#include <signal.h>
75 83
76#ifndef WIN32 84#ifndef _WIN32
77# include <unistd.h> 85# include <unistd.h>
78# include <sys/time.h> 86# include <sys/time.h>
79# include <sys/wait.h> 87# include <sys/wait.h>
88#else
89# define WIN32_LEAN_AND_MEAN
90# include <windows.h>
91# ifndef EV_SELECT_IS_WINSOCKET
92# define EV_SELECT_IS_WINSOCKET 1
80#endif 93# endif
94#endif
95
81/**/ 96/**/
82 97
83#ifndef EV_USE_MONOTONIC 98#ifndef EV_USE_MONOTONIC
84# define EV_USE_MONOTONIC 1 99# define EV_USE_MONOTONIC 0
100#endif
101
102#ifndef EV_USE_REALTIME
103# define EV_USE_REALTIME 0
85#endif 104#endif
86 105
87#ifndef EV_USE_SELECT 106#ifndef EV_USE_SELECT
88# define EV_USE_SELECT 1 107# define EV_USE_SELECT 1
89#endif 108#endif
90 109
91#ifndef EV_USE_POLL 110#ifndef EV_USE_POLL
92# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 111# ifdef _WIN32
112# define EV_USE_POLL 0
113# else
114# define EV_USE_POLL 1
115# endif
93#endif 116#endif
94 117
95#ifndef EV_USE_EPOLL 118#ifndef EV_USE_EPOLL
96# define EV_USE_EPOLL 0 119# define EV_USE_EPOLL 0
97#endif 120#endif
98 121
99#ifndef EV_USE_KQUEUE 122#ifndef EV_USE_KQUEUE
100# define EV_USE_KQUEUE 0 123# define EV_USE_KQUEUE 0
101#endif 124#endif
102 125
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 126#ifndef EV_USE_PORT
114# define EV_USE_REALTIME 1 127# define EV_USE_PORT 0
115#endif 128#endif
116 129
117/**/ 130/**/
131
132/* darwin simply cannot be helped */
133#ifdef __APPLE__
134# undef EV_USE_POLL
135# undef EV_USE_KQUEUE
136#endif
118 137
119#ifndef CLOCK_MONOTONIC 138#ifndef CLOCK_MONOTONIC
120# undef EV_USE_MONOTONIC 139# undef EV_USE_MONOTONIC
121# define EV_USE_MONOTONIC 0 140# define EV_USE_MONOTONIC 0
122#endif 141#endif
124#ifndef CLOCK_REALTIME 143#ifndef CLOCK_REALTIME
125# undef EV_USE_REALTIME 144# undef EV_USE_REALTIME
126# define EV_USE_REALTIME 0 145# define EV_USE_REALTIME 0
127#endif 146#endif
128 147
148#if EV_SELECT_IS_WINSOCKET
149# include <winsock.h>
150#endif
151
129/**/ 152/**/
130 153
131#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 154#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) */ 155#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 */ 156#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 */ 157/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
135 158
136#ifdef EV_H 159#ifdef EV_H
137# include EV_H 160# include EV_H
138#else 161#else
139# include "ev.h" 162# include "ev.h"
140#endif 163#endif
141 164
142#if __GNUC__ >= 3 165#if __GNUC__ >= 3
143# define expect(expr,value) __builtin_expect ((expr),(value)) 166# define expect(expr,value) __builtin_expect ((expr),(value))
144# define inline inline 167# define inline static inline
145#else 168#else
146# define expect(expr,value) (expr) 169# define expect(expr,value) (expr)
147# define inline static 170# define inline static
148#endif 171#endif
149 172
151#define expect_true(expr) expect ((expr) != 0, 1) 174#define expect_true(expr) expect ((expr) != 0, 1)
152 175
153#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 176#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
154#define ABSPRI(w) ((w)->priority - EV_MINPRI) 177#define ABSPRI(w) ((w)->priority - EV_MINPRI)
155 178
179#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
180#define EMPTY2(a,b) /* used to suppress some warnings */
181
156typedef struct ev_watcher *W; 182typedef struct ev_watcher *W;
157typedef struct ev_watcher_list *WL; 183typedef struct ev_watcher_list *WL;
158typedef struct ev_watcher_time *WT; 184typedef struct ev_watcher_time *WT;
159 185
160static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 186static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
161 187
188#ifdef _WIN32
162#include "ev_win32.c" 189# include "ev_win32.c"
190#endif
163 191
164/*****************************************************************************/ 192/*****************************************************************************/
165 193
166static void (*syserr_cb)(const char *msg); 194static void (*syserr_cb)(const char *msg);
167 195
214typedef struct 242typedef struct
215{ 243{
216 WL head; 244 WL head;
217 unsigned char events; 245 unsigned char events;
218 unsigned char reify; 246 unsigned char reify;
247#if EV_SELECT_IS_WINSOCKET
248 SOCKET handle;
249#endif
219} ANFD; 250} ANFD;
220 251
221typedef struct 252typedef struct
222{ 253{
223 W w; 254 W w;
227#if EV_MULTIPLICITY 258#if EV_MULTIPLICITY
228 259
229 struct ev_loop 260 struct ev_loop
230 { 261 {
231 ev_tstamp ev_rt_now; 262 ev_tstamp ev_rt_now;
263 #define ev_rt_now ((loop)->ev_rt_now)
232 #define VAR(name,decl) decl; 264 #define VAR(name,decl) decl;
233 #include "ev_vars.h" 265 #include "ev_vars.h"
234 #undef VAR 266 #undef VAR
235 }; 267 };
236 #include "ev_wrap.h" 268 #include "ev_wrap.h"
237 269
238 struct ev_loop default_loop_struct; 270 static struct ev_loop default_loop_struct;
239 static struct ev_loop *default_loop; 271 struct ev_loop *ev_default_loop_ptr;
240 272
241#else 273#else
242 274
243 ev_tstamp ev_rt_now; 275 ev_tstamp ev_rt_now;
244 #define VAR(name,decl) static decl; 276 #define VAR(name,decl) static decl;
245 #include "ev_vars.h" 277 #include "ev_vars.h"
246 #undef VAR 278 #undef VAR
247 279
248 static int default_loop; 280 static int ev_default_loop_ptr;
249 281
250#endif 282#endif
251 283
252/*****************************************************************************/ 284/*****************************************************************************/
253 285
286{ 318{
287 return ev_rt_now; 319 return ev_rt_now;
288} 320}
289#endif 321#endif
290 322
291#define array_roundsize(type,n) ((n) | 4 & ~3) 323#define array_roundsize(type,n) (((n) | 4) & ~3)
292 324
293#define array_needsize(type,base,cur,cnt,init) \ 325#define array_needsize(type,base,cur,cnt,init) \
294 if (expect_false ((cnt) > cur)) \ 326 if (expect_false ((cnt) > cur)) \
295 { \ 327 { \
296 int newcnt = cur; \ 328 int newcnt = cur; \
311 stem ## max = array_roundsize (stem ## cnt >> 1); \ 343 stem ## max = array_roundsize (stem ## cnt >> 1); \
312 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 344 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
313 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 345 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
314 } 346 }
315 347
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) \ 348#define array_free(stem, idx) \
322 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 349 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
323 350
324/*****************************************************************************/ 351/*****************************************************************************/
325 352
339void 366void
340ev_feed_event (EV_P_ void *w, int revents) 367ev_feed_event (EV_P_ void *w, int revents)
341{ 368{
342 W w_ = (W)w; 369 W w_ = (W)w;
343 370
344 if (w_->pending) 371 if (expect_false (w_->pending))
345 { 372 {
346 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 373 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
347 return; 374 return;
348 } 375 }
349 376
350 w_->pending = ++pendingcnt [ABSPRI (w_)]; 377 w_->pending = ++pendingcnt [ABSPRI (w_)];
351 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 378 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
352 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 379 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
353 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 380 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
354} 381}
355 382
356static void 383static void
383 fd_event (EV_A_ fd, revents); 410 fd_event (EV_A_ fd, revents);
384} 411}
385 412
386/*****************************************************************************/ 413/*****************************************************************************/
387 414
388static void 415inline void
389fd_reify (EV_P) 416fd_reify (EV_P)
390{ 417{
391 int i; 418 int i;
392 419
393 for (i = 0; i < fdchangecnt; ++i) 420 for (i = 0; i < fdchangecnt; ++i)
399 int events = 0; 426 int events = 0;
400 427
401 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 428 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
402 events |= w->events; 429 events |= w->events;
403 430
431#if EV_SELECT_IS_WINSOCKET
432 if (events)
433 {
434 unsigned long argp;
435 anfd->handle = _get_osfhandle (fd);
436 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
437 }
438#endif
439
404 anfd->reify = 0; 440 anfd->reify = 0;
405 441
406 method_modify (EV_A_ fd, anfd->events, events); 442 method_modify (EV_A_ fd, anfd->events, events);
407 anfd->events = events; 443 anfd->events = events;
408 } 444 }
411} 447}
412 448
413static void 449static void
414fd_change (EV_P_ int fd) 450fd_change (EV_P_ int fd)
415{ 451{
416 if (anfds [fd].reify) 452 if (expect_false (anfds [fd].reify))
417 return; 453 return;
418 454
419 anfds [fd].reify = 1; 455 anfds [fd].reify = 1;
420 456
421 ++fdchangecnt; 457 ++fdchangecnt;
422 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 458 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
423 fdchanges [fdchangecnt - 1] = fd; 459 fdchanges [fdchangecnt - 1] = fd;
424} 460}
425 461
426static void 462static void
427fd_kill (EV_P_ int fd) 463fd_kill (EV_P_ int fd)
433 ev_io_stop (EV_A_ w); 469 ev_io_stop (EV_A_ w);
434 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 470 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
435 } 471 }
436} 472}
437 473
438static int 474inline int
439fd_valid (int fd) 475fd_valid (int fd)
440{ 476{
441#ifdef WIN32 477#ifdef _WIN32
442 return !!win32_get_osfhandle (fd); 478 return _get_osfhandle (fd) != -1;
443#else 479#else
444 return fcntl (fd, F_GETFD) != -1; 480 return fcntl (fd, F_GETFD) != -1;
445#endif 481#endif
446} 482}
447 483
528 heap [k] = w; 564 heap [k] = w;
529 ((W)heap [k])->active = k + 1; 565 ((W)heap [k])->active = k + 1;
530} 566}
531 567
532inline void 568inline void
533adjustheap (WT *heap, int N, int k, ev_tstamp at) 569adjustheap (WT *heap, int N, int k)
534{ 570{
535 ev_tstamp old_at = heap [k]->at; 571 upheap (heap, k);
536 heap [k]->at = at;
537
538 if (old_at < at)
539 downheap (heap, N, k); 572 downheap (heap, N, k);
540 else
541 upheap (heap, k);
542} 573}
543 574
544/*****************************************************************************/ 575/*****************************************************************************/
545 576
546typedef struct 577typedef struct
569} 600}
570 601
571static void 602static void
572sighandler (int signum) 603sighandler (int signum)
573{ 604{
574#if WIN32 605#if _WIN32
575 signal (signum, sighandler); 606 signal (signum, sighandler);
576#endif 607#endif
577 608
578 signals [signum - 1].gotsig = 1; 609 signals [signum - 1].gotsig = 1;
579 610
580 if (!gotsig) 611 if (!gotsig)
581 { 612 {
582 int old_errno = errno; 613 int old_errno = errno;
583 gotsig = 1; 614 gotsig = 1;
584#ifdef WIN32
585 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
586#else
587 write (sigpipe [1], &signum, 1); 615 write (sigpipe [1], &signum, 1);
588#endif
589 errno = old_errno; 616 errno = old_errno;
590 } 617 }
591} 618}
592 619
593void 620void
594ev_feed_signal_event (EV_P_ int signum) 621ev_feed_signal_event (EV_P_ int signum)
595{ 622{
596 WL w; 623 WL w;
597 624
598#if EV_MULTIPLICITY 625#if EV_MULTIPLICITY
599 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 626 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
600#endif 627#endif
601 628
602 --signum; 629 --signum;
603 630
604 if (signum < 0 || signum >= signalmax) 631 if (signum < 0 || signum >= signalmax)
613static void 640static void
614sigcb (EV_P_ struct ev_io *iow, int revents) 641sigcb (EV_P_ struct ev_io *iow, int revents)
615{ 642{
616 int signum; 643 int signum;
617 644
618#ifdef WIN32
619 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
620#else
621 read (sigpipe [0], &revents, 1); 645 read (sigpipe [0], &revents, 1);
622#endif
623 gotsig = 0; 646 gotsig = 0;
624 647
625 for (signum = signalmax; signum--; ) 648 for (signum = signalmax; signum--; )
626 if (signals [signum].gotsig) 649 if (signals [signum].gotsig)
627 ev_feed_signal_event (EV_A_ signum + 1); 650 ev_feed_signal_event (EV_A_ signum + 1);
628} 651}
629 652
630static void 653static void
654fd_intern (int fd)
655{
656#ifdef _WIN32
657 int arg = 1;
658 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
659#else
660 fcntl (fd, F_SETFD, FD_CLOEXEC);
661 fcntl (fd, F_SETFL, O_NONBLOCK);
662#endif
663}
664
665static void
631siginit (EV_P) 666siginit (EV_P)
632{ 667{
633#ifndef WIN32 668 fd_intern (sigpipe [0]);
634 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 669 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 670
642 ev_io_set (&sigev, sigpipe [0], EV_READ); 671 ev_io_set (&sigev, sigpipe [0], EV_READ);
643 ev_io_start (EV_A_ &sigev); 672 ev_io_start (EV_A_ &sigev);
644 ev_unref (EV_A); /* child watcher should not keep loop alive */ 673 ev_unref (EV_A); /* child watcher should not keep loop alive */
645} 674}
646 675
647/*****************************************************************************/ 676/*****************************************************************************/
648 677
649static struct ev_child *childs [PID_HASHSIZE]; 678static struct ev_child *childs [PID_HASHSIZE];
650 679
651#ifndef WIN32 680#ifndef _WIN32
652 681
653static struct ev_signal childev; 682static struct ev_signal childev;
654 683
655#ifndef WCONTINUED 684#ifndef WCONTINUED
656# define WCONTINUED 0 685# define WCONTINUED 0
688 717
689#endif 718#endif
690 719
691/*****************************************************************************/ 720/*****************************************************************************/
692 721
722#if EV_USE_PORT
723# include "ev_port.c"
724#endif
693#if EV_USE_KQUEUE 725#if EV_USE_KQUEUE
694# include "ev_kqueue.c" 726# include "ev_kqueue.c"
695#endif 727#endif
696#if EV_USE_EPOLL 728#if EV_USE_EPOLL
697# include "ev_epoll.c" 729# include "ev_epoll.c"
717 749
718/* return true if we are running with elevated privileges and should ignore env variables */ 750/* return true if we are running with elevated privileges and should ignore env variables */
719static int 751static int
720enable_secure (void) 752enable_secure (void)
721{ 753{
722#ifdef WIN32 754#ifdef _WIN32
723 return 0; 755 return 0;
724#else 756#else
725 return getuid () != geteuid () 757 return getuid () != geteuid ()
726 || getgid () != getegid (); 758 || getgid () != getegid ();
727#endif 759#endif
728} 760}
729 761
730int 762unsigned int
731ev_method (EV_P) 763ev_method (EV_P)
732{ 764{
733 return method; 765 return method;
734} 766}
735 767
736static void 768static void
737loop_init (EV_P_ int methods) 769loop_init (EV_P_ unsigned int flags)
738{ 770{
739 if (!method) 771 if (!method)
740 { 772 {
741#if EV_USE_MONOTONIC 773#if EV_USE_MONOTONIC
742 { 774 {
749 ev_rt_now = ev_time (); 781 ev_rt_now = ev_time ();
750 mn_now = get_clock (); 782 mn_now = get_clock ();
751 now_floor = mn_now; 783 now_floor = mn_now;
752 rtmn_diff = ev_rt_now - mn_now; 784 rtmn_diff = ev_rt_now - mn_now;
753 785
754 if (methods == EVMETHOD_AUTO) 786 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
755 if (!enable_secure () && getenv ("LIBEV_METHODS"))
756 methods = atoi (getenv ("LIBEV_METHODS")); 787 flags = atoi (getenv ("LIBEV_FLAGS"));
757 else 788
758 methods = EVMETHOD_ANY; 789 if (!(flags & 0x0000ffff))
790 flags |= 0x0000ffff;
759 791
760 method = 0; 792 method = 0;
761#if EV_USE_WIN32 793#if EV_USE_PORT
762 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 794 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
763#endif 795#endif
764#if EV_USE_KQUEUE 796#if EV_USE_KQUEUE
765 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 797 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
766#endif 798#endif
767#if EV_USE_EPOLL 799#if EV_USE_EPOLL
768 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 800 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
769#endif 801#endif
770#if EV_USE_POLL 802#if EV_USE_POLL
771 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 803 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
772#endif 804#endif
773#if EV_USE_SELECT 805#if EV_USE_SELECT
774 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 806 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
775#endif 807#endif
776 808
777 ev_init (&sigev, sigcb); 809 ev_init (&sigev, sigcb);
778 ev_set_priority (&sigev, EV_MAXPRI); 810 ev_set_priority (&sigev, EV_MAXPRI);
779 } 811 }
782void 814void
783loop_destroy (EV_P) 815loop_destroy (EV_P)
784{ 816{
785 int i; 817 int i;
786 818
787#if EV_USE_WIN32 819#if EV_USE_PORT
788 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 820 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
789#endif 821#endif
790#if EV_USE_KQUEUE 822#if EV_USE_KQUEUE
791 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 823 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
792#endif 824#endif
793#if EV_USE_EPOLL 825#if EV_USE_EPOLL
802 834
803 for (i = NUMPRI; i--; ) 835 for (i = NUMPRI; i--; )
804 array_free (pending, [i]); 836 array_free (pending, [i]);
805 837
806 /* have to use the microsoft-never-gets-it-right macro */ 838 /* have to use the microsoft-never-gets-it-right macro */
807 array_free_microshit (fdchange); 839 array_free (fdchange, EMPTY0);
808 array_free_microshit (timer); 840 array_free (timer, EMPTY0);
809#if EV_PERIODICS 841#if EV_PERIODICS
810 array_free_microshit (periodic); 842 array_free (periodic, EMPTY0);
811#endif 843#endif
812 array_free_microshit (idle); 844 array_free (idle, EMPTY0);
813 array_free_microshit (prepare); 845 array_free (prepare, EMPTY0);
814 array_free_microshit (check); 846 array_free (check, EMPTY0);
815 847
816 method = 0; 848 method = 0;
817} 849}
818 850
819static void 851static void
820loop_fork (EV_P) 852loop_fork (EV_P)
821{ 853{
854#if EV_USE_PORT
855 if (method == EVMETHOD_PORT ) port_fork (EV_A);
856#endif
857#if EV_USE_KQUEUE
858 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
859#endif
822#if EV_USE_EPOLL 860#if EV_USE_EPOLL
823 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 861 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
824#endif
825#if EV_USE_KQUEUE
826 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
827#endif 862#endif
828 863
829 if (ev_is_active (&sigev)) 864 if (ev_is_active (&sigev))
830 { 865 {
831 /* default loop */ 866 /* default loop */
844 postfork = 0; 879 postfork = 0;
845} 880}
846 881
847#if EV_MULTIPLICITY 882#if EV_MULTIPLICITY
848struct ev_loop * 883struct ev_loop *
849ev_loop_new (int methods) 884ev_loop_new (unsigned int flags)
850{ 885{
851 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 886 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
852 887
853 memset (loop, 0, sizeof (struct ev_loop)); 888 memset (loop, 0, sizeof (struct ev_loop));
854 889
855 loop_init (EV_A_ methods); 890 loop_init (EV_A_ flags);
856 891
857 if (ev_method (EV_A)) 892 if (ev_method (EV_A))
858 return loop; 893 return loop;
859 894
860 return 0; 895 return 0;
875 910
876#endif 911#endif
877 912
878#if EV_MULTIPLICITY 913#if EV_MULTIPLICITY
879struct ev_loop * 914struct ev_loop *
915ev_default_loop_ (unsigned int flags)
880#else 916#else
881int 917int
918ev_default_loop (unsigned int flags)
882#endif 919#endif
883ev_default_loop (int methods)
884{ 920{
885 if (sigpipe [0] == sigpipe [1]) 921 if (sigpipe [0] == sigpipe [1])
886 if (pipe (sigpipe)) 922 if (pipe (sigpipe))
887 return 0; 923 return 0;
888 924
889 if (!default_loop) 925 if (!ev_default_loop_ptr)
890 { 926 {
891#if EV_MULTIPLICITY 927#if EV_MULTIPLICITY
892 struct ev_loop *loop = default_loop = &default_loop_struct; 928 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
893#else 929#else
894 default_loop = 1; 930 ev_default_loop_ptr = 1;
895#endif 931#endif
896 932
897 loop_init (EV_A_ methods); 933 loop_init (EV_A_ flags);
898 934
899 if (ev_method (EV_A)) 935 if (ev_method (EV_A))
900 { 936 {
901 siginit (EV_A); 937 siginit (EV_A);
902 938
903#ifndef WIN32 939#ifndef _WIN32
904 ev_signal_init (&childev, childcb, SIGCHLD); 940 ev_signal_init (&childev, childcb, SIGCHLD);
905 ev_set_priority (&childev, EV_MAXPRI); 941 ev_set_priority (&childev, EV_MAXPRI);
906 ev_signal_start (EV_A_ &childev); 942 ev_signal_start (EV_A_ &childev);
907 ev_unref (EV_A); /* child watcher should not keep loop alive */ 943 ev_unref (EV_A); /* child watcher should not keep loop alive */
908#endif 944#endif
909 } 945 }
910 else 946 else
911 default_loop = 0; 947 ev_default_loop_ptr = 0;
912 } 948 }
913 949
914 return default_loop; 950 return ev_default_loop_ptr;
915} 951}
916 952
917void 953void
918ev_default_destroy (void) 954ev_default_destroy (void)
919{ 955{
920#if EV_MULTIPLICITY 956#if EV_MULTIPLICITY
921 struct ev_loop *loop = default_loop; 957 struct ev_loop *loop = ev_default_loop_ptr;
922#endif 958#endif
923 959
924#ifndef WIN32 960#ifndef _WIN32
925 ev_ref (EV_A); /* child watcher */ 961 ev_ref (EV_A); /* child watcher */
926 ev_signal_stop (EV_A_ &childev); 962 ev_signal_stop (EV_A_ &childev);
927#endif 963#endif
928 964
929 ev_ref (EV_A); /* signal watcher */ 965 ev_ref (EV_A); /* signal watcher */
937 973
938void 974void
939ev_default_fork (void) 975ev_default_fork (void)
940{ 976{
941#if EV_MULTIPLICITY 977#if EV_MULTIPLICITY
942 struct ev_loop *loop = default_loop; 978 struct ev_loop *loop = ev_default_loop_ptr;
943#endif 979#endif
944 980
945 if (method) 981 if (method)
946 postfork = 1; 982 postfork = 1;
947} 983}
958 return 1; 994 return 1;
959 995
960 return 0; 996 return 0;
961} 997}
962 998
963static void 999inline void
964call_pending (EV_P) 1000call_pending (EV_P)
965{ 1001{
966 int pri; 1002 int pri;
967 1003
968 for (pri = NUMPRI; pri--; ) 1004 for (pri = NUMPRI; pri--; )
969 while (pendingcnt [pri]) 1005 while (pendingcnt [pri])
970 { 1006 {
971 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1007 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
972 1008
973 if (p->w) 1009 if (expect_true (p->w))
974 { 1010 {
975 p->w->pending = 0; 1011 p->w->pending = 0;
976 EV_CB_INVOKE (p->w, p->events); 1012 EV_CB_INVOKE (p->w, p->events);
977 } 1013 }
978 } 1014 }
979} 1015}
980 1016
981static void 1017inline void
982timers_reify (EV_P) 1018timers_reify (EV_P)
983{ 1019{
984 while (timercnt && ((WT)timers [0])->at <= mn_now) 1020 while (timercnt && ((WT)timers [0])->at <= mn_now)
985 { 1021 {
986 struct ev_timer *w = timers [0]; 1022 struct ev_timer *w = timers [0];
1004 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1040 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1005 } 1041 }
1006} 1042}
1007 1043
1008#if EV_PERIODICS 1044#if EV_PERIODICS
1009static void 1045inline void
1010periodics_reify (EV_P) 1046periodics_reify (EV_P)
1011{ 1047{
1012 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1048 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1013 { 1049 {
1014 struct ev_periodic *w = periodics [0]; 1050 struct ev_periodic *w = periodics [0];
1016 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1052 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1017 1053
1018 /* first reschedule or stop timer */ 1054 /* first reschedule or stop timer */
1019 if (w->reschedule_cb) 1055 if (w->reschedule_cb)
1020 { 1056 {
1021 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1057 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1022
1023 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1058 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1024 downheap ((WT *)periodics, periodiccnt, 0); 1059 downheap ((WT *)periodics, periodiccnt, 0);
1025 } 1060 }
1026 else if (w->interval) 1061 else if (w->interval)
1027 { 1062 {
1074 ev_rt_now = ev_time (); 1109 ev_rt_now = ev_time ();
1075 return 1; 1110 return 1;
1076 } 1111 }
1077} 1112}
1078 1113
1079static void 1114inline void
1080time_update (EV_P) 1115time_update (EV_P)
1081{ 1116{
1082 int i; 1117 int i;
1083 1118
1084#if EV_USE_MONOTONIC 1119#if EV_USE_MONOTONIC
1145ev_loop (EV_P_ int flags) 1180ev_loop (EV_P_ int flags)
1146{ 1181{
1147 double block; 1182 double block;
1148 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1183 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1149 1184
1150 do 1185 while (activecnt)
1151 { 1186 {
1152 /* queue check watchers (and execute them) */ 1187 /* queue check watchers (and execute them) */
1153 if (expect_false (preparecnt)) 1188 if (expect_false (preparecnt))
1154 { 1189 {
1155 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1190 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1195 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1230 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1196 if (block > to) block = to; 1231 if (block > to) block = to;
1197 } 1232 }
1198#endif 1233#endif
1199 1234
1200 if (block < 0.) block = 0.; 1235 if (expect_false (block < 0.)) block = 0.;
1201 } 1236 }
1202 1237
1203 method_poll (EV_A_ block); 1238 method_poll (EV_A_ block);
1204 1239
1205 /* update ev_rt_now, do magic */ 1240 /* update ev_rt_now, do magic */
1214 /* queue idle watchers unless io or timers are pending */ 1249 /* queue idle watchers unless io or timers are pending */
1215 if (idlecnt && !any_pending (EV_A)) 1250 if (idlecnt && !any_pending (EV_A))
1216 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1251 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1217 1252
1218 /* queue check watchers, to be executed first */ 1253 /* queue check watchers, to be executed first */
1219 if (checkcnt) 1254 if (expect_false (checkcnt))
1220 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1255 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1221 1256
1222 call_pending (EV_A); 1257 call_pending (EV_A);
1258
1259 if (expect_false (loop_done))
1260 break;
1223 } 1261 }
1224 while (activecnt && !loop_done);
1225 1262
1226 if (loop_done != 2) 1263 if (loop_done != 2)
1227 loop_done = 0; 1264 loop_done = 0;
1228} 1265}
1229 1266
1289void 1326void
1290ev_io_start (EV_P_ struct ev_io *w) 1327ev_io_start (EV_P_ struct ev_io *w)
1291{ 1328{
1292 int fd = w->fd; 1329 int fd = w->fd;
1293 1330
1294 if (ev_is_active (w)) 1331 if (expect_false (ev_is_active (w)))
1295 return; 1332 return;
1296 1333
1297 assert (("ev_io_start called with negative fd", fd >= 0)); 1334 assert (("ev_io_start called with negative fd", fd >= 0));
1298 1335
1299 ev_start (EV_A_ (W)w, 1); 1336 ev_start (EV_A_ (W)w, 1);
1305 1342
1306void 1343void
1307ev_io_stop (EV_P_ struct ev_io *w) 1344ev_io_stop (EV_P_ struct ev_io *w)
1308{ 1345{
1309 ev_clear_pending (EV_A_ (W)w); 1346 ev_clear_pending (EV_A_ (W)w);
1310 if (!ev_is_active (w)) 1347 if (expect_false (!ev_is_active (w)))
1311 return; 1348 return;
1312 1349
1313 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1350 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1314 1351
1315 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1352 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1319} 1356}
1320 1357
1321void 1358void
1322ev_timer_start (EV_P_ struct ev_timer *w) 1359ev_timer_start (EV_P_ struct ev_timer *w)
1323{ 1360{
1324 if (ev_is_active (w)) 1361 if (expect_false (ev_is_active (w)))
1325 return; 1362 return;
1326 1363
1327 ((WT)w)->at += mn_now; 1364 ((WT)w)->at += mn_now;
1328 1365
1329 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1366 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1330 1367
1331 ev_start (EV_A_ (W)w, ++timercnt); 1368 ev_start (EV_A_ (W)w, ++timercnt);
1332 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1369 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1333 timers [timercnt - 1] = w; 1370 timers [timercnt - 1] = w;
1334 upheap ((WT *)timers, timercnt - 1); 1371 upheap ((WT *)timers, timercnt - 1);
1335 1372
1336 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1373 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1337} 1374}
1338 1375
1339void 1376void
1340ev_timer_stop (EV_P_ struct ev_timer *w) 1377ev_timer_stop (EV_P_ struct ev_timer *w)
1341{ 1378{
1342 ev_clear_pending (EV_A_ (W)w); 1379 ev_clear_pending (EV_A_ (W)w);
1343 if (!ev_is_active (w)) 1380 if (expect_false (!ev_is_active (w)))
1344 return; 1381 return;
1345 1382
1346 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1383 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1347 1384
1348 if (((W)w)->active < timercnt--) 1385 if (expect_true (((W)w)->active < timercnt--))
1349 { 1386 {
1350 timers [((W)w)->active - 1] = timers [timercnt]; 1387 timers [((W)w)->active - 1] = timers [timercnt];
1351 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1388 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1352 } 1389 }
1353 1390
1354 ((WT)w)->at -= mn_now; 1391 ((WT)w)->at -= mn_now;
1355 1392
1356 ev_stop (EV_A_ (W)w); 1393 ev_stop (EV_A_ (W)w);
1360ev_timer_again (EV_P_ struct ev_timer *w) 1397ev_timer_again (EV_P_ struct ev_timer *w)
1361{ 1398{
1362 if (ev_is_active (w)) 1399 if (ev_is_active (w))
1363 { 1400 {
1364 if (w->repeat) 1401 if (w->repeat)
1402 {
1403 ((WT)w)->at = mn_now + w->repeat;
1365 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1404 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1405 }
1366 else 1406 else
1367 ev_timer_stop (EV_A_ w); 1407 ev_timer_stop (EV_A_ w);
1368 } 1408 }
1369 else if (w->repeat) 1409 else if (w->repeat)
1410 {
1411 w->at = w->repeat;
1370 ev_timer_start (EV_A_ w); 1412 ev_timer_start (EV_A_ w);
1413 }
1371} 1414}
1372 1415
1373#if EV_PERIODICS 1416#if EV_PERIODICS
1374void 1417void
1375ev_periodic_start (EV_P_ struct ev_periodic *w) 1418ev_periodic_start (EV_P_ struct ev_periodic *w)
1376{ 1419{
1377 if (ev_is_active (w)) 1420 if (expect_false (ev_is_active (w)))
1378 return; 1421 return;
1379 1422
1380 if (w->reschedule_cb) 1423 if (w->reschedule_cb)
1381 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1424 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1382 else if (w->interval) 1425 else if (w->interval)
1385 /* this formula differs from the one in periodic_reify because we do not always round up */ 1428 /* this formula differs from the one in periodic_reify because we do not always round up */
1386 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1429 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1387 } 1430 }
1388 1431
1389 ev_start (EV_A_ (W)w, ++periodiccnt); 1432 ev_start (EV_A_ (W)w, ++periodiccnt);
1390 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1433 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1391 periodics [periodiccnt - 1] = w; 1434 periodics [periodiccnt - 1] = w;
1392 upheap ((WT *)periodics, periodiccnt - 1); 1435 upheap ((WT *)periodics, periodiccnt - 1);
1393 1436
1394 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1437 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1395} 1438}
1396 1439
1397void 1440void
1398ev_periodic_stop (EV_P_ struct ev_periodic *w) 1441ev_periodic_stop (EV_P_ struct ev_periodic *w)
1399{ 1442{
1400 ev_clear_pending (EV_A_ (W)w); 1443 ev_clear_pending (EV_A_ (W)w);
1401 if (!ev_is_active (w)) 1444 if (expect_false (!ev_is_active (w)))
1402 return; 1445 return;
1403 1446
1404 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1447 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1405 1448
1406 if (((W)w)->active < periodiccnt--) 1449 if (expect_true (((W)w)->active < periodiccnt--))
1407 { 1450 {
1408 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1451 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1409 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1452 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1410 } 1453 }
1411 1454
1412 ev_stop (EV_A_ (W)w); 1455 ev_stop (EV_A_ (W)w);
1413} 1456}
1414 1457
1422#endif 1465#endif
1423 1466
1424void 1467void
1425ev_idle_start (EV_P_ struct ev_idle *w) 1468ev_idle_start (EV_P_ struct ev_idle *w)
1426{ 1469{
1427 if (ev_is_active (w)) 1470 if (expect_false (ev_is_active (w)))
1428 return; 1471 return;
1429 1472
1430 ev_start (EV_A_ (W)w, ++idlecnt); 1473 ev_start (EV_A_ (W)w, ++idlecnt);
1431 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1474 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1432 idles [idlecnt - 1] = w; 1475 idles [idlecnt - 1] = w;
1433} 1476}
1434 1477
1435void 1478void
1436ev_idle_stop (EV_P_ struct ev_idle *w) 1479ev_idle_stop (EV_P_ struct ev_idle *w)
1437{ 1480{
1438 ev_clear_pending (EV_A_ (W)w); 1481 ev_clear_pending (EV_A_ (W)w);
1439 if (ev_is_active (w)) 1482 if (expect_false (!ev_is_active (w)))
1440 return; 1483 return;
1441 1484
1442 idles [((W)w)->active - 1] = idles [--idlecnt]; 1485 idles [((W)w)->active - 1] = idles [--idlecnt];
1443 ev_stop (EV_A_ (W)w); 1486 ev_stop (EV_A_ (W)w);
1444} 1487}
1445 1488
1446void 1489void
1447ev_prepare_start (EV_P_ struct ev_prepare *w) 1490ev_prepare_start (EV_P_ struct ev_prepare *w)
1448{ 1491{
1449 if (ev_is_active (w)) 1492 if (expect_false (ev_is_active (w)))
1450 return; 1493 return;
1451 1494
1452 ev_start (EV_A_ (W)w, ++preparecnt); 1495 ev_start (EV_A_ (W)w, ++preparecnt);
1453 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1496 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1454 prepares [preparecnt - 1] = w; 1497 prepares [preparecnt - 1] = w;
1455} 1498}
1456 1499
1457void 1500void
1458ev_prepare_stop (EV_P_ struct ev_prepare *w) 1501ev_prepare_stop (EV_P_ struct ev_prepare *w)
1459{ 1502{
1460 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1461 if (ev_is_active (w)) 1504 if (expect_false (!ev_is_active (w)))
1462 return; 1505 return;
1463 1506
1464 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1507 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1465 ev_stop (EV_A_ (W)w); 1508 ev_stop (EV_A_ (W)w);
1466} 1509}
1467 1510
1468void 1511void
1469ev_check_start (EV_P_ struct ev_check *w) 1512ev_check_start (EV_P_ struct ev_check *w)
1470{ 1513{
1471 if (ev_is_active (w)) 1514 if (expect_false (ev_is_active (w)))
1472 return; 1515 return;
1473 1516
1474 ev_start (EV_A_ (W)w, ++checkcnt); 1517 ev_start (EV_A_ (W)w, ++checkcnt);
1475 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1518 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1476 checks [checkcnt - 1] = w; 1519 checks [checkcnt - 1] = w;
1477} 1520}
1478 1521
1479void 1522void
1480ev_check_stop (EV_P_ struct ev_check *w) 1523ev_check_stop (EV_P_ struct ev_check *w)
1481{ 1524{
1482 ev_clear_pending (EV_A_ (W)w); 1525 ev_clear_pending (EV_A_ (W)w);
1483 if (!ev_is_active (w)) 1526 if (expect_false (!ev_is_active (w)))
1484 return; 1527 return;
1485 1528
1486 checks [((W)w)->active - 1] = checks [--checkcnt]; 1529 checks [((W)w)->active - 1] = checks [--checkcnt];
1487 ev_stop (EV_A_ (W)w); 1530 ev_stop (EV_A_ (W)w);
1488} 1531}
1493 1536
1494void 1537void
1495ev_signal_start (EV_P_ struct ev_signal *w) 1538ev_signal_start (EV_P_ struct ev_signal *w)
1496{ 1539{
1497#if EV_MULTIPLICITY 1540#if EV_MULTIPLICITY
1498 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1541 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1499#endif 1542#endif
1500 if (ev_is_active (w)) 1543 if (expect_false (ev_is_active (w)))
1501 return; 1544 return;
1502 1545
1503 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1546 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1504 1547
1505 ev_start (EV_A_ (W)w, 1); 1548 ev_start (EV_A_ (W)w, 1);
1506 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1549 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1507 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1550 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1508 1551
1509 if (!((WL)w)->next) 1552 if (!((WL)w)->next)
1510 { 1553 {
1511#if WIN32 1554#if _WIN32
1512 signal (w->signum, sighandler); 1555 signal (w->signum, sighandler);
1513#else 1556#else
1514 struct sigaction sa; 1557 struct sigaction sa;
1515 sa.sa_handler = sighandler; 1558 sa.sa_handler = sighandler;
1516 sigfillset (&sa.sa_mask); 1559 sigfillset (&sa.sa_mask);
1522 1565
1523void 1566void
1524ev_signal_stop (EV_P_ struct ev_signal *w) 1567ev_signal_stop (EV_P_ struct ev_signal *w)
1525{ 1568{
1526 ev_clear_pending (EV_A_ (W)w); 1569 ev_clear_pending (EV_A_ (W)w);
1527 if (!ev_is_active (w)) 1570 if (expect_false (!ev_is_active (w)))
1528 return; 1571 return;
1529 1572
1530 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1573 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1531 ev_stop (EV_A_ (W)w); 1574 ev_stop (EV_A_ (W)w);
1532 1575
1536 1579
1537void 1580void
1538ev_child_start (EV_P_ struct ev_child *w) 1581ev_child_start (EV_P_ struct ev_child *w)
1539{ 1582{
1540#if EV_MULTIPLICITY 1583#if EV_MULTIPLICITY
1541 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1584 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1542#endif 1585#endif
1543 if (ev_is_active (w)) 1586 if (expect_false (ev_is_active (w)))
1544 return; 1587 return;
1545 1588
1546 ev_start (EV_A_ (W)w, 1); 1589 ev_start (EV_A_ (W)w, 1);
1547 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1590 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1548} 1591}
1549 1592
1550void 1593void
1551ev_child_stop (EV_P_ struct ev_child *w) 1594ev_child_stop (EV_P_ struct ev_child *w)
1552{ 1595{
1553 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1554 if (!ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1555 return; 1598 return;
1556 1599
1557 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1600 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1558 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1559} 1602}
1596void 1639void
1597ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1640ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1598{ 1641{
1599 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1642 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1600 1643
1601 if (!once) 1644 if (expect_false (!once))
1645 {
1602 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1646 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1603 else 1647 return;
1604 { 1648 }
1649
1605 once->cb = cb; 1650 once->cb = cb;
1606 once->arg = arg; 1651 once->arg = arg;
1607 1652
1608 ev_init (&once->io, once_cb_io); 1653 ev_init (&once->io, once_cb_io);
1609 if (fd >= 0) 1654 if (fd >= 0)
1610 { 1655 {
1611 ev_io_set (&once->io, fd, events); 1656 ev_io_set (&once->io, fd, events);
1612 ev_io_start (EV_A_ &once->io); 1657 ev_io_start (EV_A_ &once->io);
1613 } 1658 }
1614 1659
1615 ev_init (&once->to, once_cb_to); 1660 ev_init (&once->to, once_cb_to);
1616 if (timeout >= 0.) 1661 if (timeout >= 0.)
1617 { 1662 {
1618 ev_timer_set (&once->to, timeout, 0.); 1663 ev_timer_set (&once->to, timeout, 0.);
1619 ev_timer_start (EV_A_ &once->to); 1664 ev_timer_start (EV_A_ &once->to);
1620 }
1621 } 1665 }
1622} 1666}
1623 1667
1624#ifdef __cplusplus 1668#ifdef __cplusplus
1625} 1669}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines