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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines