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

Comparing libev/ev.c (file contents):
Revision 1.98 by root, Sun Nov 11 02:05:20 2007 UTC vs.
Revision 1.126 by root, Sun Nov 18 01:25:23 2007 UTC

41# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif 42# endif
43# ifndef EV_USE_REALTIME 43# ifndef EV_USE_REALTIME
44# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif 45# endif
46# else
47# ifndef EV_USE_MONOTONIC
48# define EV_USE_MONOTONIC 0
49# endif
50# ifndef EV_USE_REALTIME
51# define EV_USE_REALTIME 0
52# endif
46# endif 53# endif
47 54
48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT) 55# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
49# define EV_USE_SELECT 1 56# define EV_USE_SELECT 1
57# else
58# define EV_USE_SELECT 0
50# endif 59# endif
51 60
52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) 61# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
53# define EV_USE_POLL 1 62# define EV_USE_POLL 1
63# else
64# define EV_USE_POLL 0
54# endif 65# endif
55 66
56# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL) 67# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
57# define EV_USE_EPOLL 1 68# define EV_USE_EPOLL 1
69# else
70# define EV_USE_EPOLL 0
58# endif 71# endif
59 72
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 73# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
61# define EV_USE_KQUEUE 1 74# define EV_USE_KQUEUE 1
75# else
76# define EV_USE_KQUEUE 0
77# endif
78
79# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT)
80# define EV_USE_PORT 1
81# else
82# define EV_USE_PORT 0
62# endif 83# endif
63 84
64#endif 85#endif
65 86
66#include <math.h> 87#include <math.h>
75#include <sys/types.h> 96#include <sys/types.h>
76#include <time.h> 97#include <time.h>
77 98
78#include <signal.h> 99#include <signal.h>
79 100
80#ifndef WIN32 101#ifndef _WIN32
81# include <unistd.h> 102# include <unistd.h>
82# include <sys/time.h> 103# include <sys/time.h>
83# include <sys/wait.h> 104# include <sys/wait.h>
105#else
106# define WIN32_LEAN_AND_MEAN
107# include <windows.h>
108# ifndef EV_SELECT_IS_WINSOCKET
109# define EV_SELECT_IS_WINSOCKET 1
84#endif 110# endif
111#endif
112
85/**/ 113/**/
86 114
87#ifndef EV_USE_MONOTONIC 115#ifndef EV_USE_MONOTONIC
88# define EV_USE_MONOTONIC 1 116# define EV_USE_MONOTONIC 0
117#endif
118
119#ifndef EV_USE_REALTIME
120# define EV_USE_REALTIME 0
89#endif 121#endif
90 122
91#ifndef EV_USE_SELECT 123#ifndef EV_USE_SELECT
92# define EV_USE_SELECT 1 124# define EV_USE_SELECT 1
93#endif 125#endif
94 126
95#ifndef EV_USE_POLL 127#ifndef EV_USE_POLL
96# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 128# ifdef _WIN32
129# define EV_USE_POLL 0
130# else
131# define EV_USE_POLL 1
132# endif
97#endif 133#endif
98 134
99#ifndef EV_USE_EPOLL 135#ifndef EV_USE_EPOLL
100# define EV_USE_EPOLL 0 136# define EV_USE_EPOLL 0
101#endif 137#endif
102 138
103#ifndef EV_USE_KQUEUE 139#ifndef EV_USE_KQUEUE
104# define EV_USE_KQUEUE 0 140# define EV_USE_KQUEUE 0
105#endif 141#endif
106 142
107#ifndef EV_USE_WIN32
108# ifdef WIN32
109# define EV_USE_WIN32 0 /* it does not exist, use select */
110# undef EV_USE_SELECT
111# define EV_USE_SELECT 1
112# else
113# define EV_USE_WIN32 0
114# endif
115#endif
116
117#ifndef EV_USE_REALTIME 143#ifndef EV_USE_PORT
118# define EV_USE_REALTIME 1 144# define EV_USE_PORT 0
119#endif 145#endif
120 146
121/**/ 147/**/
148
149/* darwin simply cannot be helped */
150#ifdef __APPLE__
151# undef EV_USE_POLL
152# undef EV_USE_KQUEUE
153#endif
122 154
123#ifndef CLOCK_MONOTONIC 155#ifndef CLOCK_MONOTONIC
124# undef EV_USE_MONOTONIC 156# undef EV_USE_MONOTONIC
125# define EV_USE_MONOTONIC 0 157# define EV_USE_MONOTONIC 0
126#endif 158#endif
128#ifndef CLOCK_REALTIME 160#ifndef CLOCK_REALTIME
129# undef EV_USE_REALTIME 161# undef EV_USE_REALTIME
130# define EV_USE_REALTIME 0 162# define EV_USE_REALTIME 0
131#endif 163#endif
132 164
165#if EV_SELECT_IS_WINSOCKET
166# include <winsock.h>
167#endif
168
133/**/ 169/**/
134 170
135#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 171#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
136#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 172#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
137#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 173#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
138/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 174/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
139 175
140#ifdef EV_H 176#ifdef EV_H
141# include EV_H 177# include EV_H
142#else 178#else
143# include "ev.h" 179# include "ev.h"
144#endif 180#endif
145 181
146#if __GNUC__ >= 3 182#if __GNUC__ >= 3
147# define expect(expr,value) __builtin_expect ((expr),(value)) 183# define expect(expr,value) __builtin_expect ((expr),(value))
148# define inline inline 184# define inline static inline
149#else 185#else
150# define expect(expr,value) (expr) 186# define expect(expr,value) (expr)
151# define inline static 187# define inline static
152#endif 188#endif
153 189
155#define expect_true(expr) expect ((expr) != 0, 1) 191#define expect_true(expr) expect ((expr) != 0, 1)
156 192
157#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 193#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
158#define ABSPRI(w) ((w)->priority - EV_MINPRI) 194#define ABSPRI(w) ((w)->priority - EV_MINPRI)
159 195
196#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
197#define EMPTY2(a,b) /* used to suppress some warnings */
198
160typedef struct ev_watcher *W; 199typedef struct ev_watcher *W;
161typedef struct ev_watcher_list *WL; 200typedef struct ev_watcher_list *WL;
162typedef struct ev_watcher_time *WT; 201typedef struct ev_watcher_time *WT;
163 202
164static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 203static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
165 204
166#ifdef WIN32 205#ifdef _WIN32
167# include "ev_win32.c" 206# include "ev_win32.c"
168#endif 207#endif
169 208
170/*****************************************************************************/ 209/*****************************************************************************/
171 210
220typedef struct 259typedef struct
221{ 260{
222 WL head; 261 WL head;
223 unsigned char events; 262 unsigned char events;
224 unsigned char reify; 263 unsigned char reify;
264#if EV_SELECT_IS_WINSOCKET
265 SOCKET handle;
266#endif
225} ANFD; 267} ANFD;
226 268
227typedef struct 269typedef struct
228{ 270{
229 W w; 271 W w;
233#if EV_MULTIPLICITY 275#if EV_MULTIPLICITY
234 276
235 struct ev_loop 277 struct ev_loop
236 { 278 {
237 ev_tstamp ev_rt_now; 279 ev_tstamp ev_rt_now;
280 #define ev_rt_now ((loop)->ev_rt_now)
238 #define VAR(name,decl) decl; 281 #define VAR(name,decl) decl;
239 #include "ev_vars.h" 282 #include "ev_vars.h"
240 #undef VAR 283 #undef VAR
241 }; 284 };
242 #include "ev_wrap.h" 285 #include "ev_wrap.h"
243 286
244 struct ev_loop default_loop_struct; 287 static struct ev_loop default_loop_struct;
245 static struct ev_loop *default_loop; 288 struct ev_loop *ev_default_loop_ptr;
246 289
247#else 290#else
248 291
249 ev_tstamp ev_rt_now; 292 ev_tstamp ev_rt_now;
250 #define VAR(name,decl) static decl; 293 #define VAR(name,decl) static decl;
251 #include "ev_vars.h" 294 #include "ev_vars.h"
252 #undef VAR 295 #undef VAR
253 296
254 static int default_loop; 297 static int ev_default_loop_ptr;
255 298
256#endif 299#endif
257 300
258/*****************************************************************************/ 301/*****************************************************************************/
259 302
292{ 335{
293 return ev_rt_now; 336 return ev_rt_now;
294} 337}
295#endif 338#endif
296 339
297#define array_roundsize(type,n) ((n) | 4 & ~3) 340#define array_roundsize(type,n) (((n) | 4) & ~3)
298 341
299#define array_needsize(type,base,cur,cnt,init) \ 342#define array_needsize(type,base,cur,cnt,init) \
300 if (expect_false ((cnt) > cur)) \ 343 if (expect_false ((cnt) > cur)) \
301 { \ 344 { \
302 int newcnt = cur; \ 345 int newcnt = cur; \
317 stem ## max = array_roundsize (stem ## cnt >> 1); \ 360 stem ## max = array_roundsize (stem ## cnt >> 1); \
318 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 361 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
319 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 362 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
320 } 363 }
321 364
322/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
323/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
324#define array_free_microshit(stem) \
325 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
326
327#define array_free(stem, idx) \ 365#define array_free(stem, idx) \
328 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 366 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
329 367
330/*****************************************************************************/ 368/*****************************************************************************/
331 369
345void 383void
346ev_feed_event (EV_P_ void *w, int revents) 384ev_feed_event (EV_P_ void *w, int revents)
347{ 385{
348 W w_ = (W)w; 386 W w_ = (W)w;
349 387
350 if (w_->pending) 388 if (expect_false (w_->pending))
351 { 389 {
352 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 390 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
353 return; 391 return;
354 } 392 }
355 393
356 w_->pending = ++pendingcnt [ABSPRI (w_)]; 394 w_->pending = ++pendingcnt [ABSPRI (w_)];
357 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 395 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
358 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 396 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
359 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 397 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
360} 398}
361 399
362static void 400static void
389 fd_event (EV_A_ fd, revents); 427 fd_event (EV_A_ fd, revents);
390} 428}
391 429
392/*****************************************************************************/ 430/*****************************************************************************/
393 431
394static void 432inline void
395fd_reify (EV_P) 433fd_reify (EV_P)
396{ 434{
397 int i; 435 int i;
398 436
399 for (i = 0; i < fdchangecnt; ++i) 437 for (i = 0; i < fdchangecnt; ++i)
405 int events = 0; 443 int events = 0;
406 444
407 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 445 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
408 events |= w->events; 446 events |= w->events;
409 447
448#if EV_SELECT_IS_WINSOCKET
449 if (events)
450 {
451 unsigned long argp;
452 anfd->handle = _get_osfhandle (fd);
453 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
454 }
455#endif
456
410 anfd->reify = 0; 457 anfd->reify = 0;
411 458
412 method_modify (EV_A_ fd, anfd->events, events); 459 method_modify (EV_A_ fd, anfd->events, events);
413 anfd->events = events; 460 anfd->events = events;
414 } 461 }
417} 464}
418 465
419static void 466static void
420fd_change (EV_P_ int fd) 467fd_change (EV_P_ int fd)
421{ 468{
422 if (anfds [fd].reify) 469 if (expect_false (anfds [fd].reify))
423 return; 470 return;
424 471
425 anfds [fd].reify = 1; 472 anfds [fd].reify = 1;
426 473
427 ++fdchangecnt; 474 ++fdchangecnt;
428 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 475 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
429 fdchanges [fdchangecnt - 1] = fd; 476 fdchanges [fdchangecnt - 1] = fd;
430} 477}
431 478
432static void 479static void
433fd_kill (EV_P_ int fd) 480fd_kill (EV_P_ int fd)
439 ev_io_stop (EV_A_ w); 486 ev_io_stop (EV_A_ w);
440 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 487 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
441 } 488 }
442} 489}
443 490
444static int 491inline int
445fd_valid (int fd) 492fd_valid (int fd)
446{ 493{
447#ifdef WIN32 494#ifdef _WIN32
448 return !!win32_get_osfhandle (fd); 495 return _get_osfhandle (fd) != -1;
449#else 496#else
450 return fcntl (fd, F_GETFD) != -1; 497 return fcntl (fd, F_GETFD) != -1;
451#endif 498#endif
452} 499}
453 500
534 heap [k] = w; 581 heap [k] = w;
535 ((W)heap [k])->active = k + 1; 582 ((W)heap [k])->active = k + 1;
536} 583}
537 584
538inline void 585inline void
539adjustheap (WT *heap, int N, int k, ev_tstamp at) 586adjustheap (WT *heap, int N, int k)
540{ 587{
541 ev_tstamp old_at = heap [k]->at; 588 upheap (heap, k);
542 heap [k]->at = at;
543
544 if (old_at < at)
545 downheap (heap, N, k); 589 downheap (heap, N, k);
546 else
547 upheap (heap, k);
548} 590}
549 591
550/*****************************************************************************/ 592/*****************************************************************************/
551 593
552typedef struct 594typedef struct
575} 617}
576 618
577static void 619static void
578sighandler (int signum) 620sighandler (int signum)
579{ 621{
580#if WIN32 622#if _WIN32
581 signal (signum, sighandler); 623 signal (signum, sighandler);
582#endif 624#endif
583 625
584 signals [signum - 1].gotsig = 1; 626 signals [signum - 1].gotsig = 1;
585 627
586 if (!gotsig) 628 if (!gotsig)
587 { 629 {
588 int old_errno = errno; 630 int old_errno = errno;
589 gotsig = 1; 631 gotsig = 1;
590#ifdef WIN32
591 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
592#else
593 write (sigpipe [1], &signum, 1); 632 write (sigpipe [1], &signum, 1);
594#endif
595 errno = old_errno; 633 errno = old_errno;
596 } 634 }
597} 635}
598 636
599void 637void
600ev_feed_signal_event (EV_P_ int signum) 638ev_feed_signal_event (EV_P_ int signum)
601{ 639{
602 WL w; 640 WL w;
603 641
604#if EV_MULTIPLICITY 642#if EV_MULTIPLICITY
605 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 643 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
606#endif 644#endif
607 645
608 --signum; 646 --signum;
609 647
610 if (signum < 0 || signum >= signalmax) 648 if (signum < 0 || signum >= signalmax)
619static void 657static void
620sigcb (EV_P_ struct ev_io *iow, int revents) 658sigcb (EV_P_ struct ev_io *iow, int revents)
621{ 659{
622 int signum; 660 int signum;
623 661
624#ifdef WIN32
625 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
626#else
627 read (sigpipe [0], &revents, 1); 662 read (sigpipe [0], &revents, 1);
628#endif
629 gotsig = 0; 663 gotsig = 0;
630 664
631 for (signum = signalmax; signum--; ) 665 for (signum = signalmax; signum--; )
632 if (signals [signum].gotsig) 666 if (signals [signum].gotsig)
633 ev_feed_signal_event (EV_A_ signum + 1); 667 ev_feed_signal_event (EV_A_ signum + 1);
634} 668}
635 669
636static void 670static void
671fd_intern (int fd)
672{
673#ifdef _WIN32
674 int arg = 1;
675 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
676#else
677 fcntl (fd, F_SETFD, FD_CLOEXEC);
678 fcntl (fd, F_SETFL, O_NONBLOCK);
679#endif
680}
681
682static void
637siginit (EV_P) 683siginit (EV_P)
638{ 684{
639#ifndef WIN32 685 fd_intern (sigpipe [0]);
640 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 686 fd_intern (sigpipe [1]);
641 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
642
643 /* rather than sort out wether we really need nb, set it */
644 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
645 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
646#endif
647 687
648 ev_io_set (&sigev, sigpipe [0], EV_READ); 688 ev_io_set (&sigev, sigpipe [0], EV_READ);
649 ev_io_start (EV_A_ &sigev); 689 ev_io_start (EV_A_ &sigev);
650 ev_unref (EV_A); /* child watcher should not keep loop alive */ 690 ev_unref (EV_A); /* child watcher should not keep loop alive */
651} 691}
652 692
653/*****************************************************************************/ 693/*****************************************************************************/
654 694
655static struct ev_child *childs [PID_HASHSIZE]; 695static struct ev_child *childs [PID_HASHSIZE];
656 696
657#ifndef WIN32 697#ifndef _WIN32
658 698
659static struct ev_signal childev; 699static struct ev_signal childev;
660 700
661#ifndef WCONTINUED 701#ifndef WCONTINUED
662# define WCONTINUED 0 702# define WCONTINUED 0
694 734
695#endif 735#endif
696 736
697/*****************************************************************************/ 737/*****************************************************************************/
698 738
739#if EV_USE_PORT
740# include "ev_port.c"
741#endif
699#if EV_USE_KQUEUE 742#if EV_USE_KQUEUE
700# include "ev_kqueue.c" 743# include "ev_kqueue.c"
701#endif 744#endif
702#if EV_USE_EPOLL 745#if EV_USE_EPOLL
703# include "ev_epoll.c" 746# include "ev_epoll.c"
723 766
724/* return true if we are running with elevated privileges and should ignore env variables */ 767/* return true if we are running with elevated privileges and should ignore env variables */
725static int 768static int
726enable_secure (void) 769enable_secure (void)
727{ 770{
728#ifdef WIN32 771#ifdef _WIN32
729 return 0; 772 return 0;
730#else 773#else
731 return getuid () != geteuid () 774 return getuid () != geteuid ()
732 || getgid () != getegid (); 775 || getgid () != getegid ();
733#endif 776#endif
734} 777}
735 778
736int 779unsigned int
737ev_method (EV_P) 780ev_method (EV_P)
738{ 781{
739 return method; 782 return method;
740} 783}
741 784
742static void 785static void
743loop_init (EV_P_ int methods) 786loop_init (EV_P_ unsigned int flags)
744{ 787{
745 if (!method) 788 if (!method)
746 { 789 {
747#if EV_USE_MONOTONIC 790#if EV_USE_MONOTONIC
748 { 791 {
755 ev_rt_now = ev_time (); 798 ev_rt_now = ev_time ();
756 mn_now = get_clock (); 799 mn_now = get_clock ();
757 now_floor = mn_now; 800 now_floor = mn_now;
758 rtmn_diff = ev_rt_now - mn_now; 801 rtmn_diff = ev_rt_now - mn_now;
759 802
760 if (methods == EVMETHOD_AUTO) 803 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
761 if (!enable_secure () && getenv ("LIBEV_METHODS"))
762 methods = atoi (getenv ("LIBEV_METHODS")); 804 flags = atoi (getenv ("LIBEV_FLAGS"));
763 else 805
764 methods = EVMETHOD_ANY; 806 if (!(flags & 0x0000ffff))
807 flags |= 0x0000ffff;
765 808
766 method = 0; 809 method = 0;
767#if EV_USE_WIN32 810#if EV_USE_PORT
768 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 811 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
769#endif 812#endif
770#if EV_USE_KQUEUE 813#if EV_USE_KQUEUE
771 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 814 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
772#endif 815#endif
773#if EV_USE_EPOLL 816#if EV_USE_EPOLL
774 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 817 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
775#endif 818#endif
776#if EV_USE_POLL 819#if EV_USE_POLL
777 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 820 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
778#endif 821#endif
779#if EV_USE_SELECT 822#if EV_USE_SELECT
780 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 823 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
781#endif 824#endif
782 825
783 ev_init (&sigev, sigcb); 826 ev_init (&sigev, sigcb);
784 ev_set_priority (&sigev, EV_MAXPRI); 827 ev_set_priority (&sigev, EV_MAXPRI);
785 } 828 }
786} 829}
787 830
788void 831static void
789loop_destroy (EV_P) 832loop_destroy (EV_P)
790{ 833{
791 int i; 834 int i;
792 835
793#if EV_USE_WIN32 836#if EV_USE_PORT
794 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 837 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
795#endif 838#endif
796#if EV_USE_KQUEUE 839#if EV_USE_KQUEUE
797 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 840 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
798#endif 841#endif
799#if EV_USE_EPOLL 842#if EV_USE_EPOLL
808 851
809 for (i = NUMPRI; i--; ) 852 for (i = NUMPRI; i--; )
810 array_free (pending, [i]); 853 array_free (pending, [i]);
811 854
812 /* have to use the microsoft-never-gets-it-right macro */ 855 /* have to use the microsoft-never-gets-it-right macro */
813 array_free_microshit (fdchange); 856 array_free (fdchange, EMPTY0);
814 array_free_microshit (timer); 857 array_free (timer, EMPTY0);
815#if EV_PERIODICS 858#if EV_PERIODICS
816 array_free_microshit (periodic); 859 array_free (periodic, EMPTY0);
817#endif 860#endif
818 array_free_microshit (idle); 861 array_free (idle, EMPTY0);
819 array_free_microshit (prepare); 862 array_free (prepare, EMPTY0);
820 array_free_microshit (check); 863 array_free (check, EMPTY0);
821 864
822 method = 0; 865 method = 0;
823} 866}
824 867
825static void 868static void
826loop_fork (EV_P) 869loop_fork (EV_P)
827{ 870{
871#if EV_USE_PORT
872 if (method == EVMETHOD_PORT ) port_fork (EV_A);
873#endif
874#if EV_USE_KQUEUE
875 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
876#endif
828#if EV_USE_EPOLL 877#if EV_USE_EPOLL
829 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 878 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
830#endif
831#if EV_USE_KQUEUE
832 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
833#endif 879#endif
834 880
835 if (ev_is_active (&sigev)) 881 if (ev_is_active (&sigev))
836 { 882 {
837 /* default loop */ 883 /* default loop */
850 postfork = 0; 896 postfork = 0;
851} 897}
852 898
853#if EV_MULTIPLICITY 899#if EV_MULTIPLICITY
854struct ev_loop * 900struct ev_loop *
855ev_loop_new (int methods) 901ev_loop_new (unsigned int flags)
856{ 902{
857 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 903 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
858 904
859 memset (loop, 0, sizeof (struct ev_loop)); 905 memset (loop, 0, sizeof (struct ev_loop));
860 906
861 loop_init (EV_A_ methods); 907 loop_init (EV_A_ flags);
862 908
863 if (ev_method (EV_A)) 909 if (ev_method (EV_A))
864 return loop; 910 return loop;
865 911
866 return 0; 912 return 0;
881 927
882#endif 928#endif
883 929
884#if EV_MULTIPLICITY 930#if EV_MULTIPLICITY
885struct ev_loop * 931struct ev_loop *
932ev_default_loop_init (unsigned int flags)
886#else 933#else
887int 934int
935ev_default_loop (unsigned int flags)
888#endif 936#endif
889ev_default_loop (int methods)
890{ 937{
891 if (sigpipe [0] == sigpipe [1]) 938 if (sigpipe [0] == sigpipe [1])
892 if (pipe (sigpipe)) 939 if (pipe (sigpipe))
893 return 0; 940 return 0;
894 941
895 if (!default_loop) 942 if (!ev_default_loop_ptr)
896 { 943 {
897#if EV_MULTIPLICITY 944#if EV_MULTIPLICITY
898 struct ev_loop *loop = default_loop = &default_loop_struct; 945 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
899#else 946#else
900 default_loop = 1; 947 ev_default_loop_ptr = 1;
901#endif 948#endif
902 949
903 loop_init (EV_A_ methods); 950 loop_init (EV_A_ flags);
904 951
905 if (ev_method (EV_A)) 952 if (ev_method (EV_A))
906 { 953 {
907 siginit (EV_A); 954 siginit (EV_A);
908 955
909#ifndef WIN32 956#ifndef _WIN32
910 ev_signal_init (&childev, childcb, SIGCHLD); 957 ev_signal_init (&childev, childcb, SIGCHLD);
911 ev_set_priority (&childev, EV_MAXPRI); 958 ev_set_priority (&childev, EV_MAXPRI);
912 ev_signal_start (EV_A_ &childev); 959 ev_signal_start (EV_A_ &childev);
913 ev_unref (EV_A); /* child watcher should not keep loop alive */ 960 ev_unref (EV_A); /* child watcher should not keep loop alive */
914#endif 961#endif
915 } 962 }
916 else 963 else
917 default_loop = 0; 964 ev_default_loop_ptr = 0;
918 } 965 }
919 966
920 return default_loop; 967 return ev_default_loop_ptr;
921} 968}
922 969
923void 970void
924ev_default_destroy (void) 971ev_default_destroy (void)
925{ 972{
926#if EV_MULTIPLICITY 973#if EV_MULTIPLICITY
927 struct ev_loop *loop = default_loop; 974 struct ev_loop *loop = ev_default_loop_ptr;
928#endif 975#endif
929 976
930#ifndef WIN32 977#ifndef _WIN32
931 ev_ref (EV_A); /* child watcher */ 978 ev_ref (EV_A); /* child watcher */
932 ev_signal_stop (EV_A_ &childev); 979 ev_signal_stop (EV_A_ &childev);
933#endif 980#endif
934 981
935 ev_ref (EV_A); /* signal watcher */ 982 ev_ref (EV_A); /* signal watcher */
943 990
944void 991void
945ev_default_fork (void) 992ev_default_fork (void)
946{ 993{
947#if EV_MULTIPLICITY 994#if EV_MULTIPLICITY
948 struct ev_loop *loop = default_loop; 995 struct ev_loop *loop = ev_default_loop_ptr;
949#endif 996#endif
950 997
951 if (method) 998 if (method)
952 postfork = 1; 999 postfork = 1;
953} 1000}
964 return 1; 1011 return 1;
965 1012
966 return 0; 1013 return 0;
967} 1014}
968 1015
969static void 1016inline void
970call_pending (EV_P) 1017call_pending (EV_P)
971{ 1018{
972 int pri; 1019 int pri;
973 1020
974 for (pri = NUMPRI; pri--; ) 1021 for (pri = NUMPRI; pri--; )
975 while (pendingcnt [pri]) 1022 while (pendingcnt [pri])
976 { 1023 {
977 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1024 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
978 1025
979 if (p->w) 1026 if (expect_true (p->w))
980 { 1027 {
981 p->w->pending = 0; 1028 p->w->pending = 0;
982 EV_CB_INVOKE (p->w, p->events); 1029 EV_CB_INVOKE (p->w, p->events);
983 } 1030 }
984 } 1031 }
985} 1032}
986 1033
987static void 1034inline void
988timers_reify (EV_P) 1035timers_reify (EV_P)
989{ 1036{
990 while (timercnt && ((WT)timers [0])->at <= mn_now) 1037 while (timercnt && ((WT)timers [0])->at <= mn_now)
991 { 1038 {
992 struct ev_timer *w = timers [0]; 1039 struct ev_timer *w = timers [0];
1010 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1057 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1011 } 1058 }
1012} 1059}
1013 1060
1014#if EV_PERIODICS 1061#if EV_PERIODICS
1015static void 1062inline void
1016periodics_reify (EV_P) 1063periodics_reify (EV_P)
1017{ 1064{
1018 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1065 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1019 { 1066 {
1020 struct ev_periodic *w = periodics [0]; 1067 struct ev_periodic *w = periodics [0];
1022 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1069 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1023 1070
1024 /* first reschedule or stop timer */ 1071 /* first reschedule or stop timer */
1025 if (w->reschedule_cb) 1072 if (w->reschedule_cb)
1026 { 1073 {
1027 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1074 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1028
1029 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1075 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1030 downheap ((WT *)periodics, periodiccnt, 0); 1076 downheap ((WT *)periodics, periodiccnt, 0);
1031 } 1077 }
1032 else if (w->interval) 1078 else if (w->interval)
1033 { 1079 {
1080 ev_rt_now = ev_time (); 1126 ev_rt_now = ev_time ();
1081 return 1; 1127 return 1;
1082 } 1128 }
1083} 1129}
1084 1130
1085static void 1131inline void
1086time_update (EV_P) 1132time_update (EV_P)
1087{ 1133{
1088 int i; 1134 int i;
1089 1135
1090#if EV_USE_MONOTONIC 1136#if EV_USE_MONOTONIC
1151ev_loop (EV_P_ int flags) 1197ev_loop (EV_P_ int flags)
1152{ 1198{
1153 double block; 1199 double block;
1154 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1200 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1155 1201
1156 do 1202 while (activecnt)
1157 { 1203 {
1158 /* queue check watchers (and execute them) */ 1204 /* queue check watchers (and execute them) */
1159 if (expect_false (preparecnt)) 1205 if (expect_false (preparecnt))
1160 { 1206 {
1161 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1207 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1201 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1247 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1202 if (block > to) block = to; 1248 if (block > to) block = to;
1203 } 1249 }
1204#endif 1250#endif
1205 1251
1206 if (block < 0.) block = 0.; 1252 if (expect_false (block < 0.)) block = 0.;
1207 } 1253 }
1208 1254
1209 method_poll (EV_A_ block); 1255 method_poll (EV_A_ block);
1210 1256
1211 /* update ev_rt_now, do magic */ 1257 /* update ev_rt_now, do magic */
1220 /* queue idle watchers unless io or timers are pending */ 1266 /* queue idle watchers unless io or timers are pending */
1221 if (idlecnt && !any_pending (EV_A)) 1267 if (idlecnt && !any_pending (EV_A))
1222 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1268 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1223 1269
1224 /* queue check watchers, to be executed first */ 1270 /* queue check watchers, to be executed first */
1225 if (checkcnt) 1271 if (expect_false (checkcnt))
1226 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1272 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1227 1273
1228 call_pending (EV_A); 1274 call_pending (EV_A);
1275
1276 if (expect_false (loop_done))
1277 break;
1229 } 1278 }
1230 while (activecnt && !loop_done);
1231 1279
1232 if (loop_done != 2) 1280 if (loop_done != 2)
1233 loop_done = 0; 1281 loop_done = 0;
1234} 1282}
1235 1283
1295void 1343void
1296ev_io_start (EV_P_ struct ev_io *w) 1344ev_io_start (EV_P_ struct ev_io *w)
1297{ 1345{
1298 int fd = w->fd; 1346 int fd = w->fd;
1299 1347
1300 if (ev_is_active (w)) 1348 if (expect_false (ev_is_active (w)))
1301 return; 1349 return;
1302 1350
1303 assert (("ev_io_start called with negative fd", fd >= 0)); 1351 assert (("ev_io_start called with negative fd", fd >= 0));
1304 1352
1305 ev_start (EV_A_ (W)w, 1); 1353 ev_start (EV_A_ (W)w, 1);
1311 1359
1312void 1360void
1313ev_io_stop (EV_P_ struct ev_io *w) 1361ev_io_stop (EV_P_ struct ev_io *w)
1314{ 1362{
1315 ev_clear_pending (EV_A_ (W)w); 1363 ev_clear_pending (EV_A_ (W)w);
1316 if (!ev_is_active (w)) 1364 if (expect_false (!ev_is_active (w)))
1317 return; 1365 return;
1318 1366
1319 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1367 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1320 1368
1321 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1369 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1325} 1373}
1326 1374
1327void 1375void
1328ev_timer_start (EV_P_ struct ev_timer *w) 1376ev_timer_start (EV_P_ struct ev_timer *w)
1329{ 1377{
1330 if (ev_is_active (w)) 1378 if (expect_false (ev_is_active (w)))
1331 return; 1379 return;
1332 1380
1333 ((WT)w)->at += mn_now; 1381 ((WT)w)->at += mn_now;
1334 1382
1335 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1383 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1336 1384
1337 ev_start (EV_A_ (W)w, ++timercnt); 1385 ev_start (EV_A_ (W)w, ++timercnt);
1338 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1386 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1339 timers [timercnt - 1] = w; 1387 timers [timercnt - 1] = w;
1340 upheap ((WT *)timers, timercnt - 1); 1388 upheap ((WT *)timers, timercnt - 1);
1341 1389
1342 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1390 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1343} 1391}
1344 1392
1345void 1393void
1346ev_timer_stop (EV_P_ struct ev_timer *w) 1394ev_timer_stop (EV_P_ struct ev_timer *w)
1347{ 1395{
1348 ev_clear_pending (EV_A_ (W)w); 1396 ev_clear_pending (EV_A_ (W)w);
1349 if (!ev_is_active (w)) 1397 if (expect_false (!ev_is_active (w)))
1350 return; 1398 return;
1351 1399
1352 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1400 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1353 1401
1354 if (((W)w)->active < timercnt--) 1402 if (expect_true (((W)w)->active < timercnt--))
1355 { 1403 {
1356 timers [((W)w)->active - 1] = timers [timercnt]; 1404 timers [((W)w)->active - 1] = timers [timercnt];
1357 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1405 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1358 } 1406 }
1359 1407
1360 ((WT)w)->at -= mn_now; 1408 ((WT)w)->at -= mn_now;
1361 1409
1362 ev_stop (EV_A_ (W)w); 1410 ev_stop (EV_A_ (W)w);
1366ev_timer_again (EV_P_ struct ev_timer *w) 1414ev_timer_again (EV_P_ struct ev_timer *w)
1367{ 1415{
1368 if (ev_is_active (w)) 1416 if (ev_is_active (w))
1369 { 1417 {
1370 if (w->repeat) 1418 if (w->repeat)
1419 {
1420 ((WT)w)->at = mn_now + w->repeat;
1371 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1421 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1422 }
1372 else 1423 else
1373 ev_timer_stop (EV_A_ w); 1424 ev_timer_stop (EV_A_ w);
1374 } 1425 }
1375 else if (w->repeat) 1426 else if (w->repeat)
1427 {
1428 w->at = w->repeat;
1376 ev_timer_start (EV_A_ w); 1429 ev_timer_start (EV_A_ w);
1430 }
1377} 1431}
1378 1432
1379#if EV_PERIODICS 1433#if EV_PERIODICS
1380void 1434void
1381ev_periodic_start (EV_P_ struct ev_periodic *w) 1435ev_periodic_start (EV_P_ struct ev_periodic *w)
1382{ 1436{
1383 if (ev_is_active (w)) 1437 if (expect_false (ev_is_active (w)))
1384 return; 1438 return;
1385 1439
1386 if (w->reschedule_cb) 1440 if (w->reschedule_cb)
1387 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1441 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1388 else if (w->interval) 1442 else if (w->interval)
1391 /* this formula differs from the one in periodic_reify because we do not always round up */ 1445 /* this formula differs from the one in periodic_reify because we do not always round up */
1392 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1446 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1393 } 1447 }
1394 1448
1395 ev_start (EV_A_ (W)w, ++periodiccnt); 1449 ev_start (EV_A_ (W)w, ++periodiccnt);
1396 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1450 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1397 periodics [periodiccnt - 1] = w; 1451 periodics [periodiccnt - 1] = w;
1398 upheap ((WT *)periodics, periodiccnt - 1); 1452 upheap ((WT *)periodics, periodiccnt - 1);
1399 1453
1400 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1454 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1401} 1455}
1402 1456
1403void 1457void
1404ev_periodic_stop (EV_P_ struct ev_periodic *w) 1458ev_periodic_stop (EV_P_ struct ev_periodic *w)
1405{ 1459{
1406 ev_clear_pending (EV_A_ (W)w); 1460 ev_clear_pending (EV_A_ (W)w);
1407 if (!ev_is_active (w)) 1461 if (expect_false (!ev_is_active (w)))
1408 return; 1462 return;
1409 1463
1410 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1464 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1411 1465
1412 if (((W)w)->active < periodiccnt--) 1466 if (expect_true (((W)w)->active < periodiccnt--))
1413 { 1467 {
1414 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1468 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1415 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1469 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1416 } 1470 }
1417 1471
1418 ev_stop (EV_A_ (W)w); 1472 ev_stop (EV_A_ (W)w);
1419} 1473}
1420 1474
1428#endif 1482#endif
1429 1483
1430void 1484void
1431ev_idle_start (EV_P_ struct ev_idle *w) 1485ev_idle_start (EV_P_ struct ev_idle *w)
1432{ 1486{
1433 if (ev_is_active (w)) 1487 if (expect_false (ev_is_active (w)))
1434 return; 1488 return;
1435 1489
1436 ev_start (EV_A_ (W)w, ++idlecnt); 1490 ev_start (EV_A_ (W)w, ++idlecnt);
1437 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1491 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1438 idles [idlecnt - 1] = w; 1492 idles [idlecnt - 1] = w;
1439} 1493}
1440 1494
1441void 1495void
1442ev_idle_stop (EV_P_ struct ev_idle *w) 1496ev_idle_stop (EV_P_ struct ev_idle *w)
1443{ 1497{
1444 ev_clear_pending (EV_A_ (W)w); 1498 ev_clear_pending (EV_A_ (W)w);
1445 if (ev_is_active (w)) 1499 if (expect_false (!ev_is_active (w)))
1446 return; 1500 return;
1447 1501
1448 idles [((W)w)->active - 1] = idles [--idlecnt]; 1502 idles [((W)w)->active - 1] = idles [--idlecnt];
1449 ev_stop (EV_A_ (W)w); 1503 ev_stop (EV_A_ (W)w);
1450} 1504}
1451 1505
1452void 1506void
1453ev_prepare_start (EV_P_ struct ev_prepare *w) 1507ev_prepare_start (EV_P_ struct ev_prepare *w)
1454{ 1508{
1455 if (ev_is_active (w)) 1509 if (expect_false (ev_is_active (w)))
1456 return; 1510 return;
1457 1511
1458 ev_start (EV_A_ (W)w, ++preparecnt); 1512 ev_start (EV_A_ (W)w, ++preparecnt);
1459 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1513 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1460 prepares [preparecnt - 1] = w; 1514 prepares [preparecnt - 1] = w;
1461} 1515}
1462 1516
1463void 1517void
1464ev_prepare_stop (EV_P_ struct ev_prepare *w) 1518ev_prepare_stop (EV_P_ struct ev_prepare *w)
1465{ 1519{
1466 ev_clear_pending (EV_A_ (W)w); 1520 ev_clear_pending (EV_A_ (W)w);
1467 if (ev_is_active (w)) 1521 if (expect_false (!ev_is_active (w)))
1468 return; 1522 return;
1469 1523
1470 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1524 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1471 ev_stop (EV_A_ (W)w); 1525 ev_stop (EV_A_ (W)w);
1472} 1526}
1473 1527
1474void 1528void
1475ev_check_start (EV_P_ struct ev_check *w) 1529ev_check_start (EV_P_ struct ev_check *w)
1476{ 1530{
1477 if (ev_is_active (w)) 1531 if (expect_false (ev_is_active (w)))
1478 return; 1532 return;
1479 1533
1480 ev_start (EV_A_ (W)w, ++checkcnt); 1534 ev_start (EV_A_ (W)w, ++checkcnt);
1481 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1535 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1482 checks [checkcnt - 1] = w; 1536 checks [checkcnt - 1] = w;
1483} 1537}
1484 1538
1485void 1539void
1486ev_check_stop (EV_P_ struct ev_check *w) 1540ev_check_stop (EV_P_ struct ev_check *w)
1487{ 1541{
1488 ev_clear_pending (EV_A_ (W)w); 1542 ev_clear_pending (EV_A_ (W)w);
1489 if (!ev_is_active (w)) 1543 if (expect_false (!ev_is_active (w)))
1490 return; 1544 return;
1491 1545
1492 checks [((W)w)->active - 1] = checks [--checkcnt]; 1546 checks [((W)w)->active - 1] = checks [--checkcnt];
1493 ev_stop (EV_A_ (W)w); 1547 ev_stop (EV_A_ (W)w);
1494} 1548}
1499 1553
1500void 1554void
1501ev_signal_start (EV_P_ struct ev_signal *w) 1555ev_signal_start (EV_P_ struct ev_signal *w)
1502{ 1556{
1503#if EV_MULTIPLICITY 1557#if EV_MULTIPLICITY
1504 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1558 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1505#endif 1559#endif
1506 if (ev_is_active (w)) 1560 if (expect_false (ev_is_active (w)))
1507 return; 1561 return;
1508 1562
1509 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1563 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1510 1564
1511 ev_start (EV_A_ (W)w, 1); 1565 ev_start (EV_A_ (W)w, 1);
1512 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1566 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1513 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1567 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1514 1568
1515 if (!((WL)w)->next) 1569 if (!((WL)w)->next)
1516 { 1570 {
1517#if WIN32 1571#if _WIN32
1518 signal (w->signum, sighandler); 1572 signal (w->signum, sighandler);
1519#else 1573#else
1520 struct sigaction sa; 1574 struct sigaction sa;
1521 sa.sa_handler = sighandler; 1575 sa.sa_handler = sighandler;
1522 sigfillset (&sa.sa_mask); 1576 sigfillset (&sa.sa_mask);
1528 1582
1529void 1583void
1530ev_signal_stop (EV_P_ struct ev_signal *w) 1584ev_signal_stop (EV_P_ struct ev_signal *w)
1531{ 1585{
1532 ev_clear_pending (EV_A_ (W)w); 1586 ev_clear_pending (EV_A_ (W)w);
1533 if (!ev_is_active (w)) 1587 if (expect_false (!ev_is_active (w)))
1534 return; 1588 return;
1535 1589
1536 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1590 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1537 ev_stop (EV_A_ (W)w); 1591 ev_stop (EV_A_ (W)w);
1538 1592
1542 1596
1543void 1597void
1544ev_child_start (EV_P_ struct ev_child *w) 1598ev_child_start (EV_P_ struct ev_child *w)
1545{ 1599{
1546#if EV_MULTIPLICITY 1600#if EV_MULTIPLICITY
1547 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1601 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1548#endif 1602#endif
1549 if (ev_is_active (w)) 1603 if (expect_false (ev_is_active (w)))
1550 return; 1604 return;
1551 1605
1552 ev_start (EV_A_ (W)w, 1); 1606 ev_start (EV_A_ (W)w, 1);
1553 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1607 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1554} 1608}
1555 1609
1556void 1610void
1557ev_child_stop (EV_P_ struct ev_child *w) 1611ev_child_stop (EV_P_ struct ev_child *w)
1558{ 1612{
1559 ev_clear_pending (EV_A_ (W)w); 1613 ev_clear_pending (EV_A_ (W)w);
1560 if (!ev_is_active (w)) 1614 if (expect_false (!ev_is_active (w)))
1561 return; 1615 return;
1562 1616
1563 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1617 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1564 ev_stop (EV_A_ (W)w); 1618 ev_stop (EV_A_ (W)w);
1565} 1619}
1602void 1656void
1603ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1657ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1604{ 1658{
1605 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1659 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1606 1660
1607 if (!once) 1661 if (expect_false (!once))
1662 {
1608 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1663 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1609 else 1664 return;
1610 { 1665 }
1666
1611 once->cb = cb; 1667 once->cb = cb;
1612 once->arg = arg; 1668 once->arg = arg;
1613 1669
1614 ev_init (&once->io, once_cb_io); 1670 ev_init (&once->io, once_cb_io);
1615 if (fd >= 0) 1671 if (fd >= 0)
1616 { 1672 {
1617 ev_io_set (&once->io, fd, events); 1673 ev_io_set (&once->io, fd, events);
1618 ev_io_start (EV_A_ &once->io); 1674 ev_io_start (EV_A_ &once->io);
1619 } 1675 }
1620 1676
1621 ev_init (&once->to, once_cb_to); 1677 ev_init (&once->to, once_cb_to);
1622 if (timeout >= 0.) 1678 if (timeout >= 0.)
1623 { 1679 {
1624 ev_timer_set (&once->to, timeout, 0.); 1680 ev_timer_set (&once->to, timeout, 0.);
1625 ev_timer_start (EV_A_ &once->to); 1681 ev_timer_start (EV_A_ &once->to);
1626 }
1627 } 1682 }
1628} 1683}
1629 1684
1630#ifdef __cplusplus 1685#ifdef __cplusplus
1631} 1686}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines