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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines