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

Comparing libev/ev.c (file contents):
Revision 1.98 by root, Sun Nov 11 02:05:20 2007 UTC vs.
Revision 1.128 by root, Thu Nov 22 12:28:27 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;
… …
233#if EV_MULTIPLICITY 285#if EV_MULTIPLICITY
234 286
235 struct ev_loop 287 struct ev_loop
236 { 288 {
237 ev_tstamp ev_rt_now; 289 ev_tstamp ev_rt_now;
290 #define ev_rt_now ((loop)->ev_rt_now)
238 #define VAR(name,decl) decl; 291 #define VAR(name,decl) decl;
239 #include "ev_vars.h" 292 #include "ev_vars.h"
240 #undef VAR 293 #undef VAR
241 }; 294 };
242 #include "ev_wrap.h" 295 #include "ev_wrap.h"
243 296
244 struct ev_loop default_loop_struct; 297 static struct ev_loop default_loop_struct;
245 static struct ev_loop *default_loop; 298 struct ev_loop *ev_default_loop_ptr;
246 299
247#else 300#else
248 301
249 ev_tstamp ev_rt_now; 302 ev_tstamp ev_rt_now;
250 #define VAR(name,decl) static decl; 303 #define VAR(name,decl) static decl;
251 #include "ev_vars.h" 304 #include "ev_vars.h"
252 #undef VAR 305 #undef VAR
253 306
254 static int default_loop; 307 static int ev_default_loop_ptr;
255 308
256#endif 309#endif
257 310
258/*****************************************************************************/ 311/*****************************************************************************/
259 312
… …
292{ 345{
293 return ev_rt_now; 346 return ev_rt_now;
294} 347}
295#endif 348#endif
296 349
297#define array_roundsize(type,n) ((n) | 4 & ~3) 350#define array_roundsize(type,n) (((n) | 4) & ~3)
298 351
299#define array_needsize(type,base,cur,cnt,init) \ 352#define array_needsize(type,base,cur,cnt,init) \
300 if (expect_false ((cnt) > cur)) \ 353 if (expect_false ((cnt) > cur)) \
301 { \ 354 { \
302 int newcnt = cur; \ 355 int newcnt = cur; \
… …
317 stem ## max = array_roundsize (stem ## cnt >> 1); \ 370 stem ## max = array_roundsize (stem ## cnt >> 1); \
318 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 371 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
319 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 372 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
320 } 373 }
321 374
322/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
323/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
324#define array_free_microshit(stem) \
325 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
326
327#define array_free(stem, idx) \ 375#define array_free(stem, idx) \
328 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;
329 377
330/*****************************************************************************/ 378/*****************************************************************************/
331 379
… …
345void 393void
346ev_feed_event (EV_P_ void *w, int revents) 394ev_feed_event (EV_P_ void *w, int revents)
347{ 395{
348 W w_ = (W)w; 396 W w_ = (W)w;
349 397
350 if (w_->pending) 398 if (expect_false (w_->pending))
351 { 399 {
352 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 400 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
353 return; 401 return;
354 } 402 }
355 403
356 w_->pending = ++pendingcnt [ABSPRI (w_)]; 404 w_->pending = ++pendingcnt [ABSPRI (w_)];
357 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);
358 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 406 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
359 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 407 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
360} 408}
361 409
362static void 410static void
… …
389 fd_event (EV_A_ fd, revents); 437 fd_event (EV_A_ fd, revents);
390} 438}
391 439
392/*****************************************************************************/ 440/*****************************************************************************/
393 441
394static void 442inline void
395fd_reify (EV_P) 443fd_reify (EV_P)
396{ 444{
397 int i; 445 int i;
398 446
399 for (i = 0; i < fdchangecnt; ++i) 447 for (i = 0; i < fdchangecnt; ++i)
… …
405 int events = 0; 453 int events = 0;
406 454
407 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)
408 events |= w->events; 456 events |= w->events;
409 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
410 anfd->reify = 0; 467 anfd->reify = 0;
411 468
412 method_modify (EV_A_ fd, anfd->events, events); 469 method_modify (EV_A_ fd, anfd->events, events);
413 anfd->events = events; 470 anfd->events = events;
414 } 471 }
… …
417} 474}
418 475
419static void 476static void
420fd_change (EV_P_ int fd) 477fd_change (EV_P_ int fd)
421{ 478{
422 if (anfds [fd].reify) 479 if (expect_false (anfds [fd].reify))
423 return; 480 return;
424 481
425 anfds [fd].reify = 1; 482 anfds [fd].reify = 1;
426 483
427 ++fdchangecnt; 484 ++fdchangecnt;
428 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 485 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
429 fdchanges [fdchangecnt - 1] = fd; 486 fdchanges [fdchangecnt - 1] = fd;
430} 487}
431 488
432static void 489static void
433fd_kill (EV_P_ int fd) 490fd_kill (EV_P_ int fd)
… …
439 ev_io_stop (EV_A_ w); 496 ev_io_stop (EV_A_ w);
440 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);
441 } 498 }
442} 499}
443 500
444static int 501inline int
445fd_valid (int fd) 502fd_valid (int fd)
446{ 503{
447#ifdef WIN32 504#ifdef _WIN32
448 return !!win32_get_osfhandle (fd); 505 return _get_osfhandle (fd) != -1;
449#else 506#else
450 return fcntl (fd, F_GETFD) != -1; 507 return fcntl (fd, F_GETFD) != -1;
451#endif 508#endif
452} 509}
453 510
… …
534 heap [k] = w; 591 heap [k] = w;
535 ((W)heap [k])->active = k + 1; 592 ((W)heap [k])->active = k + 1;
536} 593}
537 594
538inline void 595inline void
539adjustheap (WT *heap, int N, int k, ev_tstamp at) 596adjustheap (WT *heap, int N, int k)
540{ 597{
541 ev_tstamp old_at = heap [k]->at; 598 upheap (heap, k);
542 heap [k]->at = at;
543
544 if (old_at < at)
545 downheap (heap, N, k); 599 downheap (heap, N, k);
546 else
547 upheap (heap, k);
548} 600}
549 601
550/*****************************************************************************/ 602/*****************************************************************************/
551 603
552typedef struct 604typedef struct
… …
575} 627}
576 628
577static void 629static void
578sighandler (int signum) 630sighandler (int signum)
579{ 631{
580#if WIN32 632#if _WIN32
581 signal (signum, sighandler); 633 signal (signum, sighandler);
582#endif 634#endif
583 635
584 signals [signum - 1].gotsig = 1; 636 signals [signum - 1].gotsig = 1;
585 637
586 if (!gotsig) 638 if (!gotsig)
587 { 639 {
588 int old_errno = errno; 640 int old_errno = errno;
589 gotsig = 1; 641 gotsig = 1;
590#ifdef WIN32
591 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
592#else
593 write (sigpipe [1], &signum, 1); 642 write (sigpipe [1], &signum, 1);
594#endif
595 errno = old_errno; 643 errno = old_errno;
596 } 644 }
597} 645}
598 646
599void 647void
600ev_feed_signal_event (EV_P_ int signum) 648ev_feed_signal_event (EV_P_ int signum)
601{ 649{
602 WL w; 650 WL w;
603 651
604#if EV_MULTIPLICITY 652#if EV_MULTIPLICITY
605 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));
606#endif 654#endif
607 655
608 --signum; 656 --signum;
609 657
610 if (signum < 0 || signum >= signalmax) 658 if (signum < 0 || signum >= signalmax)
… …
619static void 667static void
620sigcb (EV_P_ struct ev_io *iow, int revents) 668sigcb (EV_P_ struct ev_io *iow, int revents)
621{ 669{
622 int signum; 670 int signum;
623 671
624#ifdef WIN32
625 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
626#else
627 read (sigpipe [0], &revents, 1); 672 read (sigpipe [0], &revents, 1);
628#endif
629 gotsig = 0; 673 gotsig = 0;
630 674
631 for (signum = signalmax; signum--; ) 675 for (signum = signalmax; signum--; )
632 if (signals [signum].gotsig) 676 if (signals [signum].gotsig)
633 ev_feed_signal_event (EV_A_ signum + 1); 677 ev_feed_signal_event (EV_A_ signum + 1);
634} 678}
635 679
636static 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
637siginit (EV_P) 693siginit (EV_P)
638{ 694{
639#ifndef WIN32 695 fd_intern (sigpipe [0]);
640 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 696 fd_intern (sigpipe [1]);
641 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
642
643 /* rather than sort out wether we really need nb, set it */
644 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
645 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
646#endif
647 697
648 ev_io_set (&sigev, sigpipe [0], EV_READ); 698 ev_io_set (&sigev, sigpipe [0], EV_READ);
649 ev_io_start (EV_A_ &sigev); 699 ev_io_start (EV_A_ &sigev);
650 ev_unref (EV_A); /* child watcher should not keep loop alive */ 700 ev_unref (EV_A); /* child watcher should not keep loop alive */
651} 701}
652 702
653/*****************************************************************************/ 703/*****************************************************************************/
654 704
655static struct ev_child *childs [PID_HASHSIZE]; 705static struct ev_child *childs [PID_HASHSIZE];
656 706
657#ifndef WIN32 707#ifndef _WIN32
658 708
659static struct ev_signal childev; 709static struct ev_signal childev;
660 710
661#ifndef WCONTINUED 711#ifndef WCONTINUED
662# define WCONTINUED 0 712# define WCONTINUED 0
… …
694 744
695#endif 745#endif
696 746
697/*****************************************************************************/ 747/*****************************************************************************/
698 748
749#if EV_USE_PORT
750# include "ev_port.c"
751#endif
699#if EV_USE_KQUEUE 752#if EV_USE_KQUEUE
700# include "ev_kqueue.c" 753# include "ev_kqueue.c"
701#endif 754#endif
702#if EV_USE_EPOLL 755#if EV_USE_EPOLL
703# include "ev_epoll.c" 756# include "ev_epoll.c"
… …
723 776
724/* 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 */
725static int 778static int
726enable_secure (void) 779enable_secure (void)
727{ 780{
728#ifdef WIN32 781#ifdef _WIN32
729 return 0; 782 return 0;
730#else 783#else
731 return getuid () != geteuid () 784 return getuid () != geteuid ()
732 || getgid () != getegid (); 785 || getgid () != getegid ();
733#endif 786#endif
734} 787}
735 788
736int 789unsigned int
737ev_method (EV_P) 790ev_method (EV_P)
738{ 791{
739 return method; 792 return method;
740} 793}
741 794
742static void 795static void
743loop_init (EV_P_ int methods) 796loop_init (EV_P_ unsigned int flags)
744{ 797{
745 if (!method) 798 if (!method)
746 { 799 {
747#if EV_USE_MONOTONIC 800#if EV_USE_MONOTONIC
748 { 801 {
… …
755 ev_rt_now = ev_time (); 808 ev_rt_now = ev_time ();
756 mn_now = get_clock (); 809 mn_now = get_clock ();
757 now_floor = mn_now; 810 now_floor = mn_now;
758 rtmn_diff = ev_rt_now - mn_now; 811 rtmn_diff = ev_rt_now - mn_now;
759 812
760 if (methods == EVMETHOD_AUTO) 813 if (!(flags & EVFLAG_NOENV)
761 if (!enable_secure () && getenv ("LIBEV_METHODS")) 814 && !enable_secure ()
815 && getenv ("LIBEV_FLAGS"))
762 methods = atoi (getenv ("LIBEV_METHODS")); 816 flags = atoi (getenv ("LIBEV_FLAGS"));
817
818 if (!(flags & EVMETHOD_ALL))
763 else 819 {
764 methods = EVMETHOD_ANY; 820 flags |= EVMETHOD_ALL;
821#if EV_USE_KQUEUE && !defined (__NetBSD__)
822 /* kqueue is borked on everything but netbsd apparently */
823 /* it usually doesn't work correctly on anything but sockets and pipes */
824 flags &= ~EVMETHOD_KQUEUE;
825#endif
826 }
765 827
766 method = 0; 828 method = 0;
767#if EV_USE_WIN32 829#if EV_USE_PORT
768 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 830 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
769#endif 831#endif
770#if EV_USE_KQUEUE 832#if EV_USE_KQUEUE
771 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 833 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
772#endif 834#endif
773#if EV_USE_EPOLL 835#if EV_USE_EPOLL
774 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 836 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
775#endif 837#endif
776#if EV_USE_POLL 838#if EV_USE_POLL
777 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 839 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
778#endif 840#endif
779#if EV_USE_SELECT 841#if EV_USE_SELECT
780 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 842 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
781#endif 843#endif
782 844
783 ev_init (&sigev, sigcb); 845 ev_init (&sigev, sigcb);
784 ev_set_priority (&sigev, EV_MAXPRI); 846 ev_set_priority (&sigev, EV_MAXPRI);
785 } 847 }
786} 848}
787 849
788void 850static void
789loop_destroy (EV_P) 851loop_destroy (EV_P)
790{ 852{
791 int i; 853 int i;
792 854
793#if EV_USE_WIN32 855#if EV_USE_PORT
794 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 856 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
795#endif 857#endif
796#if EV_USE_KQUEUE 858#if EV_USE_KQUEUE
797 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 859 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
798#endif 860#endif
799#if EV_USE_EPOLL 861#if EV_USE_EPOLL
… …
808 870
809 for (i = NUMPRI; i--; ) 871 for (i = NUMPRI; i--; )
810 array_free (pending, [i]); 872 array_free (pending, [i]);
811 873
812 /* have to use the microsoft-never-gets-it-right macro */ 874 /* have to use the microsoft-never-gets-it-right macro */
813 array_free_microshit (fdchange); 875 array_free (fdchange, EMPTY0);
814 array_free_microshit (timer); 876 array_free (timer, EMPTY0);
815#if EV_PERIODICS 877#if EV_PERIODICS
816 array_free_microshit (periodic); 878 array_free (periodic, EMPTY0);
817#endif 879#endif
818 array_free_microshit (idle); 880 array_free (idle, EMPTY0);
819 array_free_microshit (prepare); 881 array_free (prepare, EMPTY0);
820 array_free_microshit (check); 882 array_free (check, EMPTY0);
821 883
822 method = 0; 884 method = 0;
823} 885}
824 886
825static void 887static void
826loop_fork (EV_P) 888loop_fork (EV_P)
827{ 889{
890#if EV_USE_PORT
891 if (method == EVMETHOD_PORT ) port_fork (EV_A);
892#endif
893#if EV_USE_KQUEUE
894 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
895#endif
828#if EV_USE_EPOLL 896#if EV_USE_EPOLL
829 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 897 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
830#endif
831#if EV_USE_KQUEUE
832 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
833#endif 898#endif
834 899
835 if (ev_is_active (&sigev)) 900 if (ev_is_active (&sigev))
836 { 901 {
837 /* default loop */ 902 /* default loop */
… …
850 postfork = 0; 915 postfork = 0;
851} 916}
852 917
853#if EV_MULTIPLICITY 918#if EV_MULTIPLICITY
854struct ev_loop * 919struct ev_loop *
855ev_loop_new (int methods) 920ev_loop_new (unsigned int flags)
856{ 921{
857 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 922 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
858 923
859 memset (loop, 0, sizeof (struct ev_loop)); 924 memset (loop, 0, sizeof (struct ev_loop));
860 925
861 loop_init (EV_A_ methods); 926 loop_init (EV_A_ flags);
862 927
863 if (ev_method (EV_A)) 928 if (ev_method (EV_A))
864 return loop; 929 return loop;
865 930
866 return 0; 931 return 0;
… …
881 946
882#endif 947#endif
883 948
884#if EV_MULTIPLICITY 949#if EV_MULTIPLICITY
885struct ev_loop * 950struct ev_loop *
951ev_default_loop_init (unsigned int flags)
886#else 952#else
887int 953int
954ev_default_loop (unsigned int flags)
888#endif 955#endif
889ev_default_loop (int methods)
890{ 956{
891 if (sigpipe [0] == sigpipe [1]) 957 if (sigpipe [0] == sigpipe [1])
892 if (pipe (sigpipe)) 958 if (pipe (sigpipe))
893 return 0; 959 return 0;
894 960
895 if (!default_loop) 961 if (!ev_default_loop_ptr)
896 { 962 {
897#if EV_MULTIPLICITY 963#if EV_MULTIPLICITY
898 struct ev_loop *loop = default_loop = &default_loop_struct; 964 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
899#else 965#else
900 default_loop = 1; 966 ev_default_loop_ptr = 1;
901#endif 967#endif
902 968
903 loop_init (EV_A_ methods); 969 loop_init (EV_A_ flags);
904 970
905 if (ev_method (EV_A)) 971 if (ev_method (EV_A))
906 { 972 {
907 siginit (EV_A); 973 siginit (EV_A);
908 974
909#ifndef WIN32 975#ifndef _WIN32
910 ev_signal_init (&childev, childcb, SIGCHLD); 976 ev_signal_init (&childev, childcb, SIGCHLD);
911 ev_set_priority (&childev, EV_MAXPRI); 977 ev_set_priority (&childev, EV_MAXPRI);
912 ev_signal_start (EV_A_ &childev); 978 ev_signal_start (EV_A_ &childev);
913 ev_unref (EV_A); /* child watcher should not keep loop alive */ 979 ev_unref (EV_A); /* child watcher should not keep loop alive */
914#endif 980#endif
915 } 981 }
916 else 982 else
917 default_loop = 0; 983 ev_default_loop_ptr = 0;
918 } 984 }
919 985
920 return default_loop; 986 return ev_default_loop_ptr;
921} 987}
922 988
923void 989void
924ev_default_destroy (void) 990ev_default_destroy (void)
925{ 991{
926#if EV_MULTIPLICITY 992#if EV_MULTIPLICITY
927 struct ev_loop *loop = default_loop; 993 struct ev_loop *loop = ev_default_loop_ptr;
928#endif 994#endif
929 995
930#ifndef WIN32 996#ifndef _WIN32
931 ev_ref (EV_A); /* child watcher */ 997 ev_ref (EV_A); /* child watcher */
932 ev_signal_stop (EV_A_ &childev); 998 ev_signal_stop (EV_A_ &childev);
933#endif 999#endif
934 1000
935 ev_ref (EV_A); /* signal watcher */ 1001 ev_ref (EV_A); /* signal watcher */
… …
943 1009
944void 1010void
945ev_default_fork (void) 1011ev_default_fork (void)
946{ 1012{
947#if EV_MULTIPLICITY 1013#if EV_MULTIPLICITY
948 struct ev_loop *loop = default_loop; 1014 struct ev_loop *loop = ev_default_loop_ptr;
949#endif 1015#endif
950 1016
951 if (method) 1017 if (method)
952 postfork = 1; 1018 postfork = 1;
953} 1019}
… …
964 return 1; 1030 return 1;
965 1031
966 return 0; 1032 return 0;
967} 1033}
968 1034
969static void 1035inline void
970call_pending (EV_P) 1036call_pending (EV_P)
971{ 1037{
972 int pri; 1038 int pri;
973 1039
974 for (pri = NUMPRI; pri--; ) 1040 for (pri = NUMPRI; pri--; )
975 while (pendingcnt [pri]) 1041 while (pendingcnt [pri])
976 { 1042 {
977 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1043 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
978 1044
979 if (p->w) 1045 if (expect_true (p->w))
980 { 1046 {
981 p->w->pending = 0; 1047 p->w->pending = 0;
982 EV_CB_INVOKE (p->w, p->events); 1048 EV_CB_INVOKE (p->w, p->events);
983 } 1049 }
984 } 1050 }
985} 1051}
986 1052
987static void 1053inline void
988timers_reify (EV_P) 1054timers_reify (EV_P)
989{ 1055{
990 while (timercnt && ((WT)timers [0])->at <= mn_now) 1056 while (timercnt && ((WT)timers [0])->at <= mn_now)
991 { 1057 {
992 struct ev_timer *w = timers [0]; 1058 struct ev_timer *w = timers [0];
… …
1010 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1076 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1011 } 1077 }
1012} 1078}
1013 1079
1014#if EV_PERIODICS 1080#if EV_PERIODICS
1015static void 1081inline void
1016periodics_reify (EV_P) 1082periodics_reify (EV_P)
1017{ 1083{
1018 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1084 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1019 { 1085 {
1020 struct ev_periodic *w = periodics [0]; 1086 struct ev_periodic *w = periodics [0];
… …
1022 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1088 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1023 1089
1024 /* first reschedule or stop timer */ 1090 /* first reschedule or stop timer */
1025 if (w->reschedule_cb) 1091 if (w->reschedule_cb)
1026 { 1092 {
1027 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1093 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1028
1029 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1094 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1030 downheap ((WT *)periodics, periodiccnt, 0); 1095 downheap ((WT *)periodics, periodiccnt, 0);
1031 } 1096 }
1032 else if (w->interval) 1097 else if (w->interval)
1033 { 1098 {
… …
1080 ev_rt_now = ev_time (); 1145 ev_rt_now = ev_time ();
1081 return 1; 1146 return 1;
1082 } 1147 }
1083} 1148}
1084 1149
1085static void 1150inline void
1086time_update (EV_P) 1151time_update (EV_P)
1087{ 1152{
1088 int i; 1153 int i;
1089 1154
1090#if EV_USE_MONOTONIC 1155#if EV_USE_MONOTONIC
… …
1151ev_loop (EV_P_ int flags) 1216ev_loop (EV_P_ int flags)
1152{ 1217{
1153 double block; 1218 double block;
1154 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1219 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1155 1220
1156 do 1221 while (activecnt)
1157 { 1222 {
1158 /* queue check watchers (and execute them) */ 1223 /* queue check watchers (and execute them) */
1159 if (expect_false (preparecnt)) 1224 if (expect_false (preparecnt))
1160 { 1225 {
1161 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1226 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1201 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1266 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1202 if (block > to) block = to; 1267 if (block > to) block = to;
1203 } 1268 }
1204#endif 1269#endif
1205 1270
1206 if (block < 0.) block = 0.; 1271 if (expect_false (block < 0.)) block = 0.;
1207 } 1272 }
1208 1273
1209 method_poll (EV_A_ block); 1274 method_poll (EV_A_ block);
1210 1275
1211 /* update ev_rt_now, do magic */ 1276 /* update ev_rt_now, do magic */
… …
1220 /* queue idle watchers unless io or timers are pending */ 1285 /* queue idle watchers unless io or timers are pending */
1221 if (idlecnt && !any_pending (EV_A)) 1286 if (idlecnt && !any_pending (EV_A))
1222 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1287 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1223 1288
1224 /* queue check watchers, to be executed first */ 1289 /* queue check watchers, to be executed first */
1225 if (checkcnt) 1290 if (expect_false (checkcnt))
1226 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1291 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1227 1292
1228 call_pending (EV_A); 1293 call_pending (EV_A);
1294
1295 if (expect_false (loop_done))
1296 break;
1229 } 1297 }
1230 while (activecnt && !loop_done);
1231 1298
1232 if (loop_done != 2) 1299 if (loop_done != 2)
1233 loop_done = 0; 1300 loop_done = 0;
1234} 1301}
1235 1302
… …
1295void 1362void
1296ev_io_start (EV_P_ struct ev_io *w) 1363ev_io_start (EV_P_ struct ev_io *w)
1297{ 1364{
1298 int fd = w->fd; 1365 int fd = w->fd;
1299 1366
1300 if (ev_is_active (w)) 1367 if (expect_false (ev_is_active (w)))
1301 return; 1368 return;
1302 1369
1303 assert (("ev_io_start called with negative fd", fd >= 0)); 1370 assert (("ev_io_start called with negative fd", fd >= 0));
1304 1371
1305 ev_start (EV_A_ (W)w, 1); 1372 ev_start (EV_A_ (W)w, 1);
… …
1311 1378
1312void 1379void
1313ev_io_stop (EV_P_ struct ev_io *w) 1380ev_io_stop (EV_P_ struct ev_io *w)
1314{ 1381{
1315 ev_clear_pending (EV_A_ (W)w); 1382 ev_clear_pending (EV_A_ (W)w);
1316 if (!ev_is_active (w)) 1383 if (expect_false (!ev_is_active (w)))
1317 return; 1384 return;
1318 1385
1319 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1386 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1320 1387
1321 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1388 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1325} 1392}
1326 1393
1327void 1394void
1328ev_timer_start (EV_P_ struct ev_timer *w) 1395ev_timer_start (EV_P_ struct ev_timer *w)
1329{ 1396{
1330 if (ev_is_active (w)) 1397 if (expect_false (ev_is_active (w)))
1331 return; 1398 return;
1332 1399
1333 ((WT)w)->at += mn_now; 1400 ((WT)w)->at += mn_now;
1334 1401
1335 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1402 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1336 1403
1337 ev_start (EV_A_ (W)w, ++timercnt); 1404 ev_start (EV_A_ (W)w, ++timercnt);
1338 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1405 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1339 timers [timercnt - 1] = w; 1406 timers [timercnt - 1] = w;
1340 upheap ((WT *)timers, timercnt - 1); 1407 upheap ((WT *)timers, timercnt - 1);
1341 1408
1342 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1409 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1343} 1410}
1344 1411
1345void 1412void
1346ev_timer_stop (EV_P_ struct ev_timer *w) 1413ev_timer_stop (EV_P_ struct ev_timer *w)
1347{ 1414{
1348 ev_clear_pending (EV_A_ (W)w); 1415 ev_clear_pending (EV_A_ (W)w);
1349 if (!ev_is_active (w)) 1416 if (expect_false (!ev_is_active (w)))
1350 return; 1417 return;
1351 1418
1352 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1419 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1353 1420
1354 if (((W)w)->active < timercnt--) 1421 if (expect_true (((W)w)->active < timercnt--))
1355 { 1422 {
1356 timers [((W)w)->active - 1] = timers [timercnt]; 1423 timers [((W)w)->active - 1] = timers [timercnt];
1357 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1424 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1358 } 1425 }
1359 1426
1360 ((WT)w)->at -= mn_now; 1427 ((WT)w)->at -= mn_now;
1361 1428
1362 ev_stop (EV_A_ (W)w); 1429 ev_stop (EV_A_ (W)w);
… …
1366ev_timer_again (EV_P_ struct ev_timer *w) 1433ev_timer_again (EV_P_ struct ev_timer *w)
1367{ 1434{
1368 if (ev_is_active (w)) 1435 if (ev_is_active (w))
1369 { 1436 {
1370 if (w->repeat) 1437 if (w->repeat)
1438 {
1439 ((WT)w)->at = mn_now + w->repeat;
1371 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1440 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1441 }
1372 else 1442 else
1373 ev_timer_stop (EV_A_ w); 1443 ev_timer_stop (EV_A_ w);
1374 } 1444 }
1375 else if (w->repeat) 1445 else if (w->repeat)
1446 {
1447 w->at = w->repeat;
1376 ev_timer_start (EV_A_ w); 1448 ev_timer_start (EV_A_ w);
1449 }
1377} 1450}
1378 1451
1379#if EV_PERIODICS 1452#if EV_PERIODICS
1380void 1453void
1381ev_periodic_start (EV_P_ struct ev_periodic *w) 1454ev_periodic_start (EV_P_ struct ev_periodic *w)
1382{ 1455{
1383 if (ev_is_active (w)) 1456 if (expect_false (ev_is_active (w)))
1384 return; 1457 return;
1385 1458
1386 if (w->reschedule_cb) 1459 if (w->reschedule_cb)
1387 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1460 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1388 else if (w->interval) 1461 else if (w->interval)
… …
1391 /* this formula differs from the one in periodic_reify because we do not always round up */ 1464 /* this formula differs from the one in periodic_reify because we do not always round up */
1392 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1465 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1393 } 1466 }
1394 1467
1395 ev_start (EV_A_ (W)w, ++periodiccnt); 1468 ev_start (EV_A_ (W)w, ++periodiccnt);
1396 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1469 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1397 periodics [periodiccnt - 1] = w; 1470 periodics [periodiccnt - 1] = w;
1398 upheap ((WT *)periodics, periodiccnt - 1); 1471 upheap ((WT *)periodics, periodiccnt - 1);
1399 1472
1400 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1473 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1401} 1474}
1402 1475
1403void 1476void
1404ev_periodic_stop (EV_P_ struct ev_periodic *w) 1477ev_periodic_stop (EV_P_ struct ev_periodic *w)
1405{ 1478{
1406 ev_clear_pending (EV_A_ (W)w); 1479 ev_clear_pending (EV_A_ (W)w);
1407 if (!ev_is_active (w)) 1480 if (expect_false (!ev_is_active (w)))
1408 return; 1481 return;
1409 1482
1410 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1483 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1411 1484
1412 if (((W)w)->active < periodiccnt--) 1485 if (expect_true (((W)w)->active < periodiccnt--))
1413 { 1486 {
1414 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1487 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1415 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1488 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1416 } 1489 }
1417 1490
1418 ev_stop (EV_A_ (W)w); 1491 ev_stop (EV_A_ (W)w);
1419} 1492}
1420 1493
… …
1428#endif 1501#endif
1429 1502
1430void 1503void
1431ev_idle_start (EV_P_ struct ev_idle *w) 1504ev_idle_start (EV_P_ struct ev_idle *w)
1432{ 1505{
1433 if (ev_is_active (w)) 1506 if (expect_false (ev_is_active (w)))
1434 return; 1507 return;
1435 1508
1436 ev_start (EV_A_ (W)w, ++idlecnt); 1509 ev_start (EV_A_ (W)w, ++idlecnt);
1437 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1510 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1438 idles [idlecnt - 1] = w; 1511 idles [idlecnt - 1] = w;
1439} 1512}
1440 1513
1441void 1514void
1442ev_idle_stop (EV_P_ struct ev_idle *w) 1515ev_idle_stop (EV_P_ struct ev_idle *w)
1443{ 1516{
1444 ev_clear_pending (EV_A_ (W)w); 1517 ev_clear_pending (EV_A_ (W)w);
1445 if (ev_is_active (w)) 1518 if (expect_false (!ev_is_active (w)))
1446 return; 1519 return;
1447 1520
1448 idles [((W)w)->active - 1] = idles [--idlecnt]; 1521 idles [((W)w)->active - 1] = idles [--idlecnt];
1449 ev_stop (EV_A_ (W)w); 1522 ev_stop (EV_A_ (W)w);
1450} 1523}
1451 1524
1452void 1525void
1453ev_prepare_start (EV_P_ struct ev_prepare *w) 1526ev_prepare_start (EV_P_ struct ev_prepare *w)
1454{ 1527{
1455 if (ev_is_active (w)) 1528 if (expect_false (ev_is_active (w)))
1456 return; 1529 return;
1457 1530
1458 ev_start (EV_A_ (W)w, ++preparecnt); 1531 ev_start (EV_A_ (W)w, ++preparecnt);
1459 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1532 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1460 prepares [preparecnt - 1] = w; 1533 prepares [preparecnt - 1] = w;
1461} 1534}
1462 1535
1463void 1536void
1464ev_prepare_stop (EV_P_ struct ev_prepare *w) 1537ev_prepare_stop (EV_P_ struct ev_prepare *w)
1465{ 1538{
1466 ev_clear_pending (EV_A_ (W)w); 1539 ev_clear_pending (EV_A_ (W)w);
1467 if (ev_is_active (w)) 1540 if (expect_false (!ev_is_active (w)))
1468 return; 1541 return;
1469 1542
1470 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1543 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1471 ev_stop (EV_A_ (W)w); 1544 ev_stop (EV_A_ (W)w);
1472} 1545}
1473 1546
1474void 1547void
1475ev_check_start (EV_P_ struct ev_check *w) 1548ev_check_start (EV_P_ struct ev_check *w)
1476{ 1549{
1477 if (ev_is_active (w)) 1550 if (expect_false (ev_is_active (w)))
1478 return; 1551 return;
1479 1552
1480 ev_start (EV_A_ (W)w, ++checkcnt); 1553 ev_start (EV_A_ (W)w, ++checkcnt);
1481 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1554 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1482 checks [checkcnt - 1] = w; 1555 checks [checkcnt - 1] = w;
1483} 1556}
1484 1557
1485void 1558void
1486ev_check_stop (EV_P_ struct ev_check *w) 1559ev_check_stop (EV_P_ struct ev_check *w)
1487{ 1560{
1488 ev_clear_pending (EV_A_ (W)w); 1561 ev_clear_pending (EV_A_ (W)w);
1489 if (!ev_is_active (w)) 1562 if (expect_false (!ev_is_active (w)))
1490 return; 1563 return;
1491 1564
1492 checks [((W)w)->active - 1] = checks [--checkcnt]; 1565 checks [((W)w)->active - 1] = checks [--checkcnt];
1493 ev_stop (EV_A_ (W)w); 1566 ev_stop (EV_A_ (W)w);
1494} 1567}
… …
1499 1572
1500void 1573void
1501ev_signal_start (EV_P_ struct ev_signal *w) 1574ev_signal_start (EV_P_ struct ev_signal *w)
1502{ 1575{
1503#if EV_MULTIPLICITY 1576#if EV_MULTIPLICITY
1504 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1577 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1505#endif 1578#endif
1506 if (ev_is_active (w)) 1579 if (expect_false (ev_is_active (w)))
1507 return; 1580 return;
1508 1581
1509 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1582 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1510 1583
1511 ev_start (EV_A_ (W)w, 1); 1584 ev_start (EV_A_ (W)w, 1);
1512 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1585 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1513 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1586 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1514 1587
1515 if (!((WL)w)->next) 1588 if (!((WL)w)->next)
1516 { 1589 {
1517#if WIN32 1590#if _WIN32
1518 signal (w->signum, sighandler); 1591 signal (w->signum, sighandler);
1519#else 1592#else
1520 struct sigaction sa; 1593 struct sigaction sa;
1521 sa.sa_handler = sighandler; 1594 sa.sa_handler = sighandler;
1522 sigfillset (&sa.sa_mask); 1595 sigfillset (&sa.sa_mask);
… …
1528 1601
1529void 1602void
1530ev_signal_stop (EV_P_ struct ev_signal *w) 1603ev_signal_stop (EV_P_ struct ev_signal *w)
1531{ 1604{
1532 ev_clear_pending (EV_A_ (W)w); 1605 ev_clear_pending (EV_A_ (W)w);
1533 if (!ev_is_active (w)) 1606 if (expect_false (!ev_is_active (w)))
1534 return; 1607 return;
1535 1608
1536 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1609 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1537 ev_stop (EV_A_ (W)w); 1610 ev_stop (EV_A_ (W)w);
1538 1611
… …
1542 1615
1543void 1616void
1544ev_child_start (EV_P_ struct ev_child *w) 1617ev_child_start (EV_P_ struct ev_child *w)
1545{ 1618{
1546#if EV_MULTIPLICITY 1619#if EV_MULTIPLICITY
1547 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1620 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1548#endif 1621#endif
1549 if (ev_is_active (w)) 1622 if (expect_false (ev_is_active (w)))
1550 return; 1623 return;
1551 1624
1552 ev_start (EV_A_ (W)w, 1); 1625 ev_start (EV_A_ (W)w, 1);
1553 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1626 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1554} 1627}
1555 1628
1556void 1629void
1557ev_child_stop (EV_P_ struct ev_child *w) 1630ev_child_stop (EV_P_ struct ev_child *w)
1558{ 1631{
1559 ev_clear_pending (EV_A_ (W)w); 1632 ev_clear_pending (EV_A_ (W)w);
1560 if (!ev_is_active (w)) 1633 if (expect_false (!ev_is_active (w)))
1561 return; 1634 return;
1562 1635
1563 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1636 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1564 ev_stop (EV_A_ (W)w); 1637 ev_stop (EV_A_ (W)w);
1565} 1638}
… …
1602void 1675void
1603ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1676ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1604{ 1677{
1605 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1678 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1606 1679
1607 if (!once) 1680 if (expect_false (!once))
1681 {
1608 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1682 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1609 else 1683 return;
1610 { 1684 }
1685
1611 once->cb = cb; 1686 once->cb = cb;
1612 once->arg = arg; 1687 once->arg = arg;
1613 1688
1614 ev_init (&once->io, once_cb_io); 1689 ev_init (&once->io, once_cb_io);
1615 if (fd >= 0) 1690 if (fd >= 0)
1616 { 1691 {
1617 ev_io_set (&once->io, fd, events); 1692 ev_io_set (&once->io, fd, events);
1618 ev_io_start (EV_A_ &once->io); 1693 ev_io_start (EV_A_ &once->io);
1619 } 1694 }
1620 1695
1621 ev_init (&once->to, once_cb_to); 1696 ev_init (&once->to, once_cb_to);
1622 if (timeout >= 0.) 1697 if (timeout >= 0.)
1623 { 1698 {
1624 ev_timer_set (&once->to, timeout, 0.); 1699 ev_timer_set (&once->to, timeout, 0.);
1625 ev_timer_start (EV_A_ &once->to); 1700 ev_timer_start (EV_A_ &once->to);
1626 }
1627 } 1701 }
1628} 1702}
1629 1703
1630#ifdef __cplusplus 1704#ifdef __cplusplus
1631} 1705}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines