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.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;
240 #include "ev_vars.h" 282 #include "ev_vars.h"
241 #undef VAR 283 #undef VAR
242 }; 284 };
243 #include "ev_wrap.h" 285 #include "ev_wrap.h"
244 286
245 struct ev_loop default_loop_struct; 287 static struct ev_loop default_loop_struct;
246 static struct ev_loop *default_loop; 288 struct ev_loop *ev_default_loop_ptr;
247 289
248#else 290#else
249 291
250 ev_tstamp ev_rt_now; 292 ev_tstamp ev_rt_now;
251 #define VAR(name,decl) static decl; 293 #define VAR(name,decl) static decl;
252 #include "ev_vars.h" 294 #include "ev_vars.h"
253 #undef VAR 295 #undef VAR
254 296
255 static int default_loop; 297 static int ev_default_loop_ptr;
256 298
257#endif 299#endif
258 300
259/*****************************************************************************/ 301/*****************************************************************************/
260 302
293{ 335{
294 return ev_rt_now; 336 return ev_rt_now;
295} 337}
296#endif 338#endif
297 339
298#define array_roundsize(type,n) ((n) | 4 & ~3) 340#define array_roundsize(type,n) (((n) | 4) & ~3)
299 341
300#define array_needsize(type,base,cur,cnt,init) \ 342#define array_needsize(type,base,cur,cnt,init) \
301 if (expect_false ((cnt) > cur)) \ 343 if (expect_false ((cnt) > cur)) \
302 { \ 344 { \
303 int newcnt = cur; \ 345 int newcnt = cur; \
318 stem ## max = array_roundsize (stem ## cnt >> 1); \ 360 stem ## max = array_roundsize (stem ## cnt >> 1); \
319 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 361 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
320 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 362 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
321 } 363 }
322 364
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) \ 365#define array_free(stem, idx) \
329 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;
330 367
331/*****************************************************************************/ 368/*****************************************************************************/
332 369
346void 383void
347ev_feed_event (EV_P_ void *w, int revents) 384ev_feed_event (EV_P_ void *w, int revents)
348{ 385{
349 W w_ = (W)w; 386 W w_ = (W)w;
350 387
351 if (w_->pending) 388 if (expect_false (w_->pending))
352 { 389 {
353 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 390 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
354 return; 391 return;
355 } 392 }
356 393
357 w_->pending = ++pendingcnt [ABSPRI (w_)]; 394 w_->pending = ++pendingcnt [ABSPRI (w_)];
358 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);
359 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 396 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
360 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 397 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
361} 398}
362 399
363static void 400static void
390 fd_event (EV_A_ fd, revents); 427 fd_event (EV_A_ fd, revents);
391} 428}
392 429
393/*****************************************************************************/ 430/*****************************************************************************/
394 431
395static void 432inline void
396fd_reify (EV_P) 433fd_reify (EV_P)
397{ 434{
398 int i; 435 int i;
399 436
400 for (i = 0; i < fdchangecnt; ++i) 437 for (i = 0; i < fdchangecnt; ++i)
406 int events = 0; 443 int events = 0;
407 444
408 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)
409 events |= w->events; 446 events |= w->events;
410 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
411 anfd->reify = 0; 457 anfd->reify = 0;
412 458
413 method_modify (EV_A_ fd, anfd->events, events); 459 method_modify (EV_A_ fd, anfd->events, events);
414 anfd->events = events; 460 anfd->events = events;
415 } 461 }
418} 464}
419 465
420static void 466static void
421fd_change (EV_P_ int fd) 467fd_change (EV_P_ int fd)
422{ 468{
423 if (anfds [fd].reify) 469 if (expect_false (anfds [fd].reify))
424 return; 470 return;
425 471
426 anfds [fd].reify = 1; 472 anfds [fd].reify = 1;
427 473
428 ++fdchangecnt; 474 ++fdchangecnt;
429 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 475 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
430 fdchanges [fdchangecnt - 1] = fd; 476 fdchanges [fdchangecnt - 1] = fd;
431} 477}
432 478
433static void 479static void
434fd_kill (EV_P_ int fd) 480fd_kill (EV_P_ int fd)
440 ev_io_stop (EV_A_ w); 486 ev_io_stop (EV_A_ w);
441 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);
442 } 488 }
443} 489}
444 490
445static int 491inline int
446fd_valid (int fd) 492fd_valid (int fd)
447{ 493{
448#ifdef WIN32 494#ifdef _WIN32
449 return !!win32_get_osfhandle (fd); 495 return _get_osfhandle (fd) != -1;
450#else 496#else
451 return fcntl (fd, F_GETFD) != -1; 497 return fcntl (fd, F_GETFD) != -1;
452#endif 498#endif
453} 499}
454 500
571} 617}
572 618
573static void 619static void
574sighandler (int signum) 620sighandler (int signum)
575{ 621{
576#if WIN32 622#if _WIN32
577 signal (signum, sighandler); 623 signal (signum, sighandler);
578#endif 624#endif
579 625
580 signals [signum - 1].gotsig = 1; 626 signals [signum - 1].gotsig = 1;
581 627
582 if (!gotsig) 628 if (!gotsig)
583 { 629 {
584 int old_errno = errno; 630 int old_errno = errno;
585 gotsig = 1; 631 gotsig = 1;
586#ifdef WIN32
587 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
588#else
589 write (sigpipe [1], &signum, 1); 632 write (sigpipe [1], &signum, 1);
590#endif
591 errno = old_errno; 633 errno = old_errno;
592 } 634 }
593} 635}
594 636
595void 637void
596ev_feed_signal_event (EV_P_ int signum) 638ev_feed_signal_event (EV_P_ int signum)
597{ 639{
598 WL w; 640 WL w;
599 641
600#if EV_MULTIPLICITY 642#if EV_MULTIPLICITY
601 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));
602#endif 644#endif
603 645
604 --signum; 646 --signum;
605 647
606 if (signum < 0 || signum >= signalmax) 648 if (signum < 0 || signum >= signalmax)
615static void 657static void
616sigcb (EV_P_ struct ev_io *iow, int revents) 658sigcb (EV_P_ struct ev_io *iow, int revents)
617{ 659{
618 int signum; 660 int signum;
619 661
620#ifdef WIN32
621 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
622#else
623 read (sigpipe [0], &revents, 1); 662 read (sigpipe [0], &revents, 1);
624#endif
625 gotsig = 0; 663 gotsig = 0;
626 664
627 for (signum = signalmax; signum--; ) 665 for (signum = signalmax; signum--; )
628 if (signals [signum].gotsig) 666 if (signals [signum].gotsig)
629 ev_feed_signal_event (EV_A_ signum + 1); 667 ev_feed_signal_event (EV_A_ signum + 1);
630} 668}
631 669
632static 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
633siginit (EV_P) 683siginit (EV_P)
634{ 684{
635#ifndef WIN32 685 fd_intern (sigpipe [0]);
636 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 686 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 687
644 ev_io_set (&sigev, sigpipe [0], EV_READ); 688 ev_io_set (&sigev, sigpipe [0], EV_READ);
645 ev_io_start (EV_A_ &sigev); 689 ev_io_start (EV_A_ &sigev);
646 ev_unref (EV_A); /* child watcher should not keep loop alive */ 690 ev_unref (EV_A); /* child watcher should not keep loop alive */
647} 691}
648 692
649/*****************************************************************************/ 693/*****************************************************************************/
650 694
651static struct ev_child *childs [PID_HASHSIZE]; 695static struct ev_child *childs [PID_HASHSIZE];
652 696
653#ifndef WIN32 697#ifndef _WIN32
654 698
655static struct ev_signal childev; 699static struct ev_signal childev;
656 700
657#ifndef WCONTINUED 701#ifndef WCONTINUED
658# define WCONTINUED 0 702# define WCONTINUED 0
690 734
691#endif 735#endif
692 736
693/*****************************************************************************/ 737/*****************************************************************************/
694 738
739#if EV_USE_PORT
740# include "ev_port.c"
741#endif
695#if EV_USE_KQUEUE 742#if EV_USE_KQUEUE
696# include "ev_kqueue.c" 743# include "ev_kqueue.c"
697#endif 744#endif
698#if EV_USE_EPOLL 745#if EV_USE_EPOLL
699# include "ev_epoll.c" 746# include "ev_epoll.c"
719 766
720/* 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 */
721static int 768static int
722enable_secure (void) 769enable_secure (void)
723{ 770{
724#ifdef WIN32 771#ifdef _WIN32
725 return 0; 772 return 0;
726#else 773#else
727 return getuid () != geteuid () 774 return getuid () != geteuid ()
728 || getgid () != getegid (); 775 || getgid () != getegid ();
729#endif 776#endif
730} 777}
731 778
732int 779unsigned int
733ev_method (EV_P) 780ev_method (EV_P)
734{ 781{
735 return method; 782 return method;
736} 783}
737 784
738static void 785static void
739loop_init (EV_P_ int methods) 786loop_init (EV_P_ unsigned int flags)
740{ 787{
741 if (!method) 788 if (!method)
742 { 789 {
743#if EV_USE_MONOTONIC 790#if EV_USE_MONOTONIC
744 { 791 {
751 ev_rt_now = ev_time (); 798 ev_rt_now = ev_time ();
752 mn_now = get_clock (); 799 mn_now = get_clock ();
753 now_floor = mn_now; 800 now_floor = mn_now;
754 rtmn_diff = ev_rt_now - mn_now; 801 rtmn_diff = ev_rt_now - mn_now;
755 802
756 if (methods == EVMETHOD_AUTO) 803 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
757 if (!enable_secure () && getenv ("LIBEV_METHODS"))
758 methods = atoi (getenv ("LIBEV_METHODS")); 804 flags = atoi (getenv ("LIBEV_FLAGS"));
759 else 805
760 methods = EVMETHOD_ANY; 806 if (!(flags & 0x0000ffff))
807 flags |= 0x0000ffff;
761 808
762 method = 0; 809 method = 0;
763#if EV_USE_WIN32 810#if EV_USE_PORT
764 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 811 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
765#endif 812#endif
766#if EV_USE_KQUEUE 813#if EV_USE_KQUEUE
767 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 814 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
768#endif 815#endif
769#if EV_USE_EPOLL 816#if EV_USE_EPOLL
770 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 817 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
771#endif 818#endif
772#if EV_USE_POLL 819#if EV_USE_POLL
773 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 820 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
774#endif 821#endif
775#if EV_USE_SELECT 822#if EV_USE_SELECT
776 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 823 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
777#endif 824#endif
778 825
779 ev_init (&sigev, sigcb); 826 ev_init (&sigev, sigcb);
780 ev_set_priority (&sigev, EV_MAXPRI); 827 ev_set_priority (&sigev, EV_MAXPRI);
781 } 828 }
782} 829}
783 830
784void 831static void
785loop_destroy (EV_P) 832loop_destroy (EV_P)
786{ 833{
787 int i; 834 int i;
788 835
789#if EV_USE_WIN32 836#if EV_USE_PORT
790 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 837 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
791#endif 838#endif
792#if EV_USE_KQUEUE 839#if EV_USE_KQUEUE
793 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 840 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
794#endif 841#endif
795#if EV_USE_EPOLL 842#if EV_USE_EPOLL
804 851
805 for (i = NUMPRI; i--; ) 852 for (i = NUMPRI; i--; )
806 array_free (pending, [i]); 853 array_free (pending, [i]);
807 854
808 /* have to use the microsoft-never-gets-it-right macro */ 855 /* have to use the microsoft-never-gets-it-right macro */
809 array_free_microshit (fdchange); 856 array_free (fdchange, EMPTY0);
810 array_free_microshit (timer); 857 array_free (timer, EMPTY0);
811#if EV_PERIODICS 858#if EV_PERIODICS
812 array_free_microshit (periodic); 859 array_free (periodic, EMPTY0);
813#endif 860#endif
814 array_free_microshit (idle); 861 array_free (idle, EMPTY0);
815 array_free_microshit (prepare); 862 array_free (prepare, EMPTY0);
816 array_free_microshit (check); 863 array_free (check, EMPTY0);
817 864
818 method = 0; 865 method = 0;
819} 866}
820 867
821static void 868static void
822loop_fork (EV_P) 869loop_fork (EV_P)
823{ 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
824#if EV_USE_EPOLL 877#if EV_USE_EPOLL
825 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 878 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 879#endif
830 880
831 if (ev_is_active (&sigev)) 881 if (ev_is_active (&sigev))
832 { 882 {
833 /* default loop */ 883 /* default loop */
846 postfork = 0; 896 postfork = 0;
847} 897}
848 898
849#if EV_MULTIPLICITY 899#if EV_MULTIPLICITY
850struct ev_loop * 900struct ev_loop *
851ev_loop_new (int methods) 901ev_loop_new (unsigned int flags)
852{ 902{
853 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));
854 904
855 memset (loop, 0, sizeof (struct ev_loop)); 905 memset (loop, 0, sizeof (struct ev_loop));
856 906
857 loop_init (EV_A_ methods); 907 loop_init (EV_A_ flags);
858 908
859 if (ev_method (EV_A)) 909 if (ev_method (EV_A))
860 return loop; 910 return loop;
861 911
862 return 0; 912 return 0;
877 927
878#endif 928#endif
879 929
880#if EV_MULTIPLICITY 930#if EV_MULTIPLICITY
881struct ev_loop * 931struct ev_loop *
932ev_default_loop_init (unsigned int flags)
882#else 933#else
883int 934int
935ev_default_loop (unsigned int flags)
884#endif 936#endif
885ev_default_loop (int methods)
886{ 937{
887 if (sigpipe [0] == sigpipe [1]) 938 if (sigpipe [0] == sigpipe [1])
888 if (pipe (sigpipe)) 939 if (pipe (sigpipe))
889 return 0; 940 return 0;
890 941
891 if (!default_loop) 942 if (!ev_default_loop_ptr)
892 { 943 {
893#if EV_MULTIPLICITY 944#if EV_MULTIPLICITY
894 struct ev_loop *loop = default_loop = &default_loop_struct; 945 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
895#else 946#else
896 default_loop = 1; 947 ev_default_loop_ptr = 1;
897#endif 948#endif
898 949
899 loop_init (EV_A_ methods); 950 loop_init (EV_A_ flags);
900 951
901 if (ev_method (EV_A)) 952 if (ev_method (EV_A))
902 { 953 {
903 siginit (EV_A); 954 siginit (EV_A);
904 955
905#ifndef WIN32 956#ifndef _WIN32
906 ev_signal_init (&childev, childcb, SIGCHLD); 957 ev_signal_init (&childev, childcb, SIGCHLD);
907 ev_set_priority (&childev, EV_MAXPRI); 958 ev_set_priority (&childev, EV_MAXPRI);
908 ev_signal_start (EV_A_ &childev); 959 ev_signal_start (EV_A_ &childev);
909 ev_unref (EV_A); /* child watcher should not keep loop alive */ 960 ev_unref (EV_A); /* child watcher should not keep loop alive */
910#endif 961#endif
911 } 962 }
912 else 963 else
913 default_loop = 0; 964 ev_default_loop_ptr = 0;
914 } 965 }
915 966
916 return default_loop; 967 return ev_default_loop_ptr;
917} 968}
918 969
919void 970void
920ev_default_destroy (void) 971ev_default_destroy (void)
921{ 972{
922#if EV_MULTIPLICITY 973#if EV_MULTIPLICITY
923 struct ev_loop *loop = default_loop; 974 struct ev_loop *loop = ev_default_loop_ptr;
924#endif 975#endif
925 976
926#ifndef WIN32 977#ifndef _WIN32
927 ev_ref (EV_A); /* child watcher */ 978 ev_ref (EV_A); /* child watcher */
928 ev_signal_stop (EV_A_ &childev); 979 ev_signal_stop (EV_A_ &childev);
929#endif 980#endif
930 981
931 ev_ref (EV_A); /* signal watcher */ 982 ev_ref (EV_A); /* signal watcher */
939 990
940void 991void
941ev_default_fork (void) 992ev_default_fork (void)
942{ 993{
943#if EV_MULTIPLICITY 994#if EV_MULTIPLICITY
944 struct ev_loop *loop = default_loop; 995 struct ev_loop *loop = ev_default_loop_ptr;
945#endif 996#endif
946 997
947 if (method) 998 if (method)
948 postfork = 1; 999 postfork = 1;
949} 1000}
960 return 1; 1011 return 1;
961 1012
962 return 0; 1013 return 0;
963} 1014}
964 1015
965static void 1016inline void
966call_pending (EV_P) 1017call_pending (EV_P)
967{ 1018{
968 int pri; 1019 int pri;
969 1020
970 for (pri = NUMPRI; pri--; ) 1021 for (pri = NUMPRI; pri--; )
971 while (pendingcnt [pri]) 1022 while (pendingcnt [pri])
972 { 1023 {
973 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1024 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
974 1025
975 if (p->w) 1026 if (expect_true (p->w))
976 { 1027 {
977 p->w->pending = 0; 1028 p->w->pending = 0;
978 EV_CB_INVOKE (p->w, p->events); 1029 EV_CB_INVOKE (p->w, p->events);
979 } 1030 }
980 } 1031 }
981} 1032}
982 1033
983static void 1034inline void
984timers_reify (EV_P) 1035timers_reify (EV_P)
985{ 1036{
986 while (timercnt && ((WT)timers [0])->at <= mn_now) 1037 while (timercnt && ((WT)timers [0])->at <= mn_now)
987 { 1038 {
988 struct ev_timer *w = timers [0]; 1039 struct ev_timer *w = timers [0];
1006 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1057 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1007 } 1058 }
1008} 1059}
1009 1060
1010#if EV_PERIODICS 1061#if EV_PERIODICS
1011static void 1062inline void
1012periodics_reify (EV_P) 1063periodics_reify (EV_P)
1013{ 1064{
1014 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1065 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1015 { 1066 {
1016 struct ev_periodic *w = periodics [0]; 1067 struct ev_periodic *w = periodics [0];
1018 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1069 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1019 1070
1020 /* first reschedule or stop timer */ 1071 /* first reschedule or stop timer */
1021 if (w->reschedule_cb) 1072 if (w->reschedule_cb)
1022 { 1073 {
1023 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);
1024
1025 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));
1026 downheap ((WT *)periodics, periodiccnt, 0); 1076 downheap ((WT *)periodics, periodiccnt, 0);
1027 } 1077 }
1028 else if (w->interval) 1078 else if (w->interval)
1029 { 1079 {
1076 ev_rt_now = ev_time (); 1126 ev_rt_now = ev_time ();
1077 return 1; 1127 return 1;
1078 } 1128 }
1079} 1129}
1080 1130
1081static void 1131inline void
1082time_update (EV_P) 1132time_update (EV_P)
1083{ 1133{
1084 int i; 1134 int i;
1085 1135
1086#if EV_USE_MONOTONIC 1136#if EV_USE_MONOTONIC
1147ev_loop (EV_P_ int flags) 1197ev_loop (EV_P_ int flags)
1148{ 1198{
1149 double block; 1199 double block;
1150 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1200 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1151 1201
1152 do 1202 while (activecnt)
1153 { 1203 {
1154 /* queue check watchers (and execute them) */ 1204 /* queue check watchers (and execute them) */
1155 if (expect_false (preparecnt)) 1205 if (expect_false (preparecnt))
1156 { 1206 {
1157 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1207 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1197 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;
1198 if (block > to) block = to; 1248 if (block > to) block = to;
1199 } 1249 }
1200#endif 1250#endif
1201 1251
1202 if (block < 0.) block = 0.; 1252 if (expect_false (block < 0.)) block = 0.;
1203 } 1253 }
1204 1254
1205 method_poll (EV_A_ block); 1255 method_poll (EV_A_ block);
1206 1256
1207 /* update ev_rt_now, do magic */ 1257 /* update ev_rt_now, do magic */
1216 /* queue idle watchers unless io or timers are pending */ 1266 /* queue idle watchers unless io or timers are pending */
1217 if (idlecnt && !any_pending (EV_A)) 1267 if (idlecnt && !any_pending (EV_A))
1218 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1268 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1219 1269
1220 /* queue check watchers, to be executed first */ 1270 /* queue check watchers, to be executed first */
1221 if (checkcnt) 1271 if (expect_false (checkcnt))
1222 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1272 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1223 1273
1224 call_pending (EV_A); 1274 call_pending (EV_A);
1275
1276 if (expect_false (loop_done))
1277 break;
1225 } 1278 }
1226 while (activecnt && !loop_done);
1227 1279
1228 if (loop_done != 2) 1280 if (loop_done != 2)
1229 loop_done = 0; 1281 loop_done = 0;
1230} 1282}
1231 1283
1291void 1343void
1292ev_io_start (EV_P_ struct ev_io *w) 1344ev_io_start (EV_P_ struct ev_io *w)
1293{ 1345{
1294 int fd = w->fd; 1346 int fd = w->fd;
1295 1347
1296 if (ev_is_active (w)) 1348 if (expect_false (ev_is_active (w)))
1297 return; 1349 return;
1298 1350
1299 assert (("ev_io_start called with negative fd", fd >= 0)); 1351 assert (("ev_io_start called with negative fd", fd >= 0));
1300 1352
1301 ev_start (EV_A_ (W)w, 1); 1353 ev_start (EV_A_ (W)w, 1);
1307 1359
1308void 1360void
1309ev_io_stop (EV_P_ struct ev_io *w) 1361ev_io_stop (EV_P_ struct ev_io *w)
1310{ 1362{
1311 ev_clear_pending (EV_A_ (W)w); 1363 ev_clear_pending (EV_A_ (W)w);
1312 if (!ev_is_active (w)) 1364 if (expect_false (!ev_is_active (w)))
1313 return; 1365 return;
1314 1366
1315 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));
1316 1368
1317 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1369 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1321} 1373}
1322 1374
1323void 1375void
1324ev_timer_start (EV_P_ struct ev_timer *w) 1376ev_timer_start (EV_P_ struct ev_timer *w)
1325{ 1377{
1326 if (ev_is_active (w)) 1378 if (expect_false (ev_is_active (w)))
1327 return; 1379 return;
1328 1380
1329 ((WT)w)->at += mn_now; 1381 ((WT)w)->at += mn_now;
1330 1382
1331 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.));
1332 1384
1333 ev_start (EV_A_ (W)w, ++timercnt); 1385 ev_start (EV_A_ (W)w, ++timercnt);
1334 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1386 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1335 timers [timercnt - 1] = w; 1387 timers [timercnt - 1] = w;
1336 upheap ((WT *)timers, timercnt - 1); 1388 upheap ((WT *)timers, timercnt - 1);
1337 1389
1338 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1390 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1339} 1391}
1340 1392
1341void 1393void
1342ev_timer_stop (EV_P_ struct ev_timer *w) 1394ev_timer_stop (EV_P_ struct ev_timer *w)
1343{ 1395{
1344 ev_clear_pending (EV_A_ (W)w); 1396 ev_clear_pending (EV_A_ (W)w);
1345 if (!ev_is_active (w)) 1397 if (expect_false (!ev_is_active (w)))
1346 return; 1398 return;
1347 1399
1348 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1400 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1349 1401
1350 if (((W)w)->active < timercnt--) 1402 if (expect_true (((W)w)->active < timercnt--))
1351 { 1403 {
1352 timers [((W)w)->active - 1] = timers [timercnt]; 1404 timers [((W)w)->active - 1] = timers [timercnt];
1353 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1405 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1354 } 1406 }
1355 1407
1370 } 1422 }
1371 else 1423 else
1372 ev_timer_stop (EV_A_ w); 1424 ev_timer_stop (EV_A_ w);
1373 } 1425 }
1374 else if (w->repeat) 1426 else if (w->repeat)
1427 {
1428 w->at = w->repeat;
1375 ev_timer_start (EV_A_ w); 1429 ev_timer_start (EV_A_ w);
1430 }
1376} 1431}
1377 1432
1378#if EV_PERIODICS 1433#if EV_PERIODICS
1379void 1434void
1380ev_periodic_start (EV_P_ struct ev_periodic *w) 1435ev_periodic_start (EV_P_ struct ev_periodic *w)
1381{ 1436{
1382 if (ev_is_active (w)) 1437 if (expect_false (ev_is_active (w)))
1383 return; 1438 return;
1384 1439
1385 if (w->reschedule_cb) 1440 if (w->reschedule_cb)
1386 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1441 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1387 else if (w->interval) 1442 else if (w->interval)
1390 /* 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 */
1391 ((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;
1392 } 1447 }
1393 1448
1394 ev_start (EV_A_ (W)w, ++periodiccnt); 1449 ev_start (EV_A_ (W)w, ++periodiccnt);
1395 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1450 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1396 periodics [periodiccnt - 1] = w; 1451 periodics [periodiccnt - 1] = w;
1397 upheap ((WT *)periodics, periodiccnt - 1); 1452 upheap ((WT *)periodics, periodiccnt - 1);
1398 1453
1399 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1454 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1400} 1455}
1401 1456
1402void 1457void
1403ev_periodic_stop (EV_P_ struct ev_periodic *w) 1458ev_periodic_stop (EV_P_ struct ev_periodic *w)
1404{ 1459{
1405 ev_clear_pending (EV_A_ (W)w); 1460 ev_clear_pending (EV_A_ (W)w);
1406 if (!ev_is_active (w)) 1461 if (expect_false (!ev_is_active (w)))
1407 return; 1462 return;
1408 1463
1409 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1464 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1410 1465
1411 if (((W)w)->active < periodiccnt--) 1466 if (expect_true (((W)w)->active < periodiccnt--))
1412 { 1467 {
1413 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1468 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1414 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1469 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1415 } 1470 }
1416 1471
1427#endif 1482#endif
1428 1483
1429void 1484void
1430ev_idle_start (EV_P_ struct ev_idle *w) 1485ev_idle_start (EV_P_ struct ev_idle *w)
1431{ 1486{
1432 if (ev_is_active (w)) 1487 if (expect_false (ev_is_active (w)))
1433 return; 1488 return;
1434 1489
1435 ev_start (EV_A_ (W)w, ++idlecnt); 1490 ev_start (EV_A_ (W)w, ++idlecnt);
1436 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1491 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1437 idles [idlecnt - 1] = w; 1492 idles [idlecnt - 1] = w;
1438} 1493}
1439 1494
1440void 1495void
1441ev_idle_stop (EV_P_ struct ev_idle *w) 1496ev_idle_stop (EV_P_ struct ev_idle *w)
1442{ 1497{
1443 ev_clear_pending (EV_A_ (W)w); 1498 ev_clear_pending (EV_A_ (W)w);
1444 if (ev_is_active (w)) 1499 if (expect_false (!ev_is_active (w)))
1445 return; 1500 return;
1446 1501
1447 idles [((W)w)->active - 1] = idles [--idlecnt]; 1502 idles [((W)w)->active - 1] = idles [--idlecnt];
1448 ev_stop (EV_A_ (W)w); 1503 ev_stop (EV_A_ (W)w);
1449} 1504}
1450 1505
1451void 1506void
1452ev_prepare_start (EV_P_ struct ev_prepare *w) 1507ev_prepare_start (EV_P_ struct ev_prepare *w)
1453{ 1508{
1454 if (ev_is_active (w)) 1509 if (expect_false (ev_is_active (w)))
1455 return; 1510 return;
1456 1511
1457 ev_start (EV_A_ (W)w, ++preparecnt); 1512 ev_start (EV_A_ (W)w, ++preparecnt);
1458 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1513 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1459 prepares [preparecnt - 1] = w; 1514 prepares [preparecnt - 1] = w;
1460} 1515}
1461 1516
1462void 1517void
1463ev_prepare_stop (EV_P_ struct ev_prepare *w) 1518ev_prepare_stop (EV_P_ struct ev_prepare *w)
1464{ 1519{
1465 ev_clear_pending (EV_A_ (W)w); 1520 ev_clear_pending (EV_A_ (W)w);
1466 if (ev_is_active (w)) 1521 if (expect_false (!ev_is_active (w)))
1467 return; 1522 return;
1468 1523
1469 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1524 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1470 ev_stop (EV_A_ (W)w); 1525 ev_stop (EV_A_ (W)w);
1471} 1526}
1472 1527
1473void 1528void
1474ev_check_start (EV_P_ struct ev_check *w) 1529ev_check_start (EV_P_ struct ev_check *w)
1475{ 1530{
1476 if (ev_is_active (w)) 1531 if (expect_false (ev_is_active (w)))
1477 return; 1532 return;
1478 1533
1479 ev_start (EV_A_ (W)w, ++checkcnt); 1534 ev_start (EV_A_ (W)w, ++checkcnt);
1480 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1535 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1481 checks [checkcnt - 1] = w; 1536 checks [checkcnt - 1] = w;
1482} 1537}
1483 1538
1484void 1539void
1485ev_check_stop (EV_P_ struct ev_check *w) 1540ev_check_stop (EV_P_ struct ev_check *w)
1486{ 1541{
1487 ev_clear_pending (EV_A_ (W)w); 1542 ev_clear_pending (EV_A_ (W)w);
1488 if (!ev_is_active (w)) 1543 if (expect_false (!ev_is_active (w)))
1489 return; 1544 return;
1490 1545
1491 checks [((W)w)->active - 1] = checks [--checkcnt]; 1546 checks [((W)w)->active - 1] = checks [--checkcnt];
1492 ev_stop (EV_A_ (W)w); 1547 ev_stop (EV_A_ (W)w);
1493} 1548}
1498 1553
1499void 1554void
1500ev_signal_start (EV_P_ struct ev_signal *w) 1555ev_signal_start (EV_P_ struct ev_signal *w)
1501{ 1556{
1502#if EV_MULTIPLICITY 1557#if EV_MULTIPLICITY
1503 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));
1504#endif 1559#endif
1505 if (ev_is_active (w)) 1560 if (expect_false (ev_is_active (w)))
1506 return; 1561 return;
1507 1562
1508 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));
1509 1564
1510 ev_start (EV_A_ (W)w, 1); 1565 ev_start (EV_A_ (W)w, 1);
1511 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1566 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1512 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1567 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1513 1568
1514 if (!((WL)w)->next) 1569 if (!((WL)w)->next)
1515 { 1570 {
1516#if WIN32 1571#if _WIN32
1517 signal (w->signum, sighandler); 1572 signal (w->signum, sighandler);
1518#else 1573#else
1519 struct sigaction sa; 1574 struct sigaction sa;
1520 sa.sa_handler = sighandler; 1575 sa.sa_handler = sighandler;
1521 sigfillset (&sa.sa_mask); 1576 sigfillset (&sa.sa_mask);
1527 1582
1528void 1583void
1529ev_signal_stop (EV_P_ struct ev_signal *w) 1584ev_signal_stop (EV_P_ struct ev_signal *w)
1530{ 1585{
1531 ev_clear_pending (EV_A_ (W)w); 1586 ev_clear_pending (EV_A_ (W)w);
1532 if (!ev_is_active (w)) 1587 if (expect_false (!ev_is_active (w)))
1533 return; 1588 return;
1534 1589
1535 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1590 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1536 ev_stop (EV_A_ (W)w); 1591 ev_stop (EV_A_ (W)w);
1537 1592
1541 1596
1542void 1597void
1543ev_child_start (EV_P_ struct ev_child *w) 1598ev_child_start (EV_P_ struct ev_child *w)
1544{ 1599{
1545#if EV_MULTIPLICITY 1600#if EV_MULTIPLICITY
1546 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));
1547#endif 1602#endif
1548 if (ev_is_active (w)) 1603 if (expect_false (ev_is_active (w)))
1549 return; 1604 return;
1550 1605
1551 ev_start (EV_A_ (W)w, 1); 1606 ev_start (EV_A_ (W)w, 1);
1552 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1607 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1553} 1608}
1554 1609
1555void 1610void
1556ev_child_stop (EV_P_ struct ev_child *w) 1611ev_child_stop (EV_P_ struct ev_child *w)
1557{ 1612{
1558 ev_clear_pending (EV_A_ (W)w); 1613 ev_clear_pending (EV_A_ (W)w);
1559 if (!ev_is_active (w)) 1614 if (expect_false (!ev_is_active (w)))
1560 return; 1615 return;
1561 1616
1562 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1617 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1563 ev_stop (EV_A_ (W)w); 1618 ev_stop (EV_A_ (W)w);
1564} 1619}
1601void 1656void
1602ev_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)
1603{ 1658{
1604 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));
1605 1660
1606 if (!once) 1661 if (expect_false (!once))
1662 {
1607 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1663 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1608 else 1664 return;
1609 { 1665 }
1666
1610 once->cb = cb; 1667 once->cb = cb;
1611 once->arg = arg; 1668 once->arg = arg;
1612 1669
1613 ev_init (&once->io, once_cb_io); 1670 ev_init (&once->io, once_cb_io);
1614 if (fd >= 0) 1671 if (fd >= 0)
1615 { 1672 {
1616 ev_io_set (&once->io, fd, events); 1673 ev_io_set (&once->io, fd, events);
1617 ev_io_start (EV_A_ &once->io); 1674 ev_io_start (EV_A_ &once->io);
1618 } 1675 }
1619 1676
1620 ev_init (&once->to, once_cb_to); 1677 ev_init (&once->to, once_cb_to);
1621 if (timeout >= 0.) 1678 if (timeout >= 0.)
1622 { 1679 {
1623 ev_timer_set (&once->to, timeout, 0.); 1680 ev_timer_set (&once->to, timeout, 0.);
1624 ev_timer_start (EV_A_ &once->to); 1681 ev_timer_start (EV_A_ &once->to);
1625 }
1626 } 1682 }
1627} 1683}
1628 1684
1629#ifdef __cplusplus 1685#ifdef __cplusplus
1630} 1686}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines