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

Comparing libev/ev.c (file contents):
Revision 1.85 by root, Sat Nov 10 03:13:50 2007 UTC vs.
Revision 1.124 by root, Sat Nov 17 02:26:24 2007 UTC

26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
32# include "config.h" 37# include "config.h"
33 38
34# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif
37# endif 46# endif
38 47
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
40# define EV_USE_SELECT 1 49# define EV_USE_SELECT 1
41# endif 50# endif
42 51
43# if HAVE_POLL && HAVE_POLL_H 52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
44# define EV_USE_POLL 1 53# define EV_USE_POLL 1
45# endif 54# endif
46 55
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
48# define EV_USE_EPOLL 1 57# define EV_USE_EPOLL 1
49# endif 58# endif
50 59
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
52# define EV_USE_KQUEUE 1 61# define EV_USE_KQUEUE 1
62# endif
63
64# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT)
65# define EV_USE_PORT 1
53# endif 66# endif
54 67
55#endif 68#endif
56 69
57#include <math.h> 70#include <math.h>
66#include <sys/types.h> 79#include <sys/types.h>
67#include <time.h> 80#include <time.h>
68 81
69#include <signal.h> 82#include <signal.h>
70 83
71#ifndef WIN32 84#ifndef _WIN32
72# include <unistd.h> 85# include <unistd.h>
73# include <sys/time.h> 86# include <sys/time.h>
74# include <sys/wait.h> 87# include <sys/wait.h>
88#else
89# define WIN32_LEAN_AND_MEAN
90# include <windows.h>
91# ifndef EV_SELECT_IS_WINSOCKET
92# define EV_SELECT_IS_WINSOCKET 1
75#endif 93# endif
94#endif
95
76/**/ 96/**/
77 97
78#ifndef EV_USE_MONOTONIC 98#ifndef EV_USE_MONOTONIC
79# define EV_USE_MONOTONIC 1 99# define EV_USE_MONOTONIC 0
100#endif
101
102#ifndef EV_USE_REALTIME
103# define EV_USE_REALTIME 0
80#endif 104#endif
81 105
82#ifndef EV_USE_SELECT 106#ifndef EV_USE_SELECT
83# define EV_USE_SELECT 1 107# define EV_USE_SELECT 1
84#endif 108#endif
85 109
86#ifndef EV_USE_POLL 110#ifndef EV_USE_POLL
87# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 111# ifdef _WIN32
112# define EV_USE_POLL 0
113# else
114# define EV_USE_POLL 1
115# endif
88#endif 116#endif
89 117
90#ifndef EV_USE_EPOLL 118#ifndef EV_USE_EPOLL
91# define EV_USE_EPOLL 0 119# define EV_USE_EPOLL 0
92#endif 120#endif
93 121
94#ifndef EV_USE_KQUEUE 122#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0 123# define EV_USE_KQUEUE 0
96#endif 124#endif
97 125
98#ifndef EV_USE_WIN32
99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
102# define EV_USE_SELECT 1
103# else
104# define EV_USE_WIN32 0
105# endif
106#endif
107
108#ifndef EV_USE_REALTIME 126#ifndef EV_USE_PORT
109# define EV_USE_REALTIME 1 127# define EV_USE_PORT 0
110#endif 128#endif
111 129
112/**/ 130/**/
131
132/* darwin simply cannot be helped */
133#ifdef __APPLE__
134# undef EV_USE_POLL
135# undef EV_USE_KQUEUE
136#endif
113 137
114#ifndef CLOCK_MONOTONIC 138#ifndef CLOCK_MONOTONIC
115# undef EV_USE_MONOTONIC 139# undef EV_USE_MONOTONIC
116# define EV_USE_MONOTONIC 0 140# define EV_USE_MONOTONIC 0
117#endif 141#endif
119#ifndef CLOCK_REALTIME 143#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 144# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 145# define EV_USE_REALTIME 0
122#endif 146#endif
123 147
148#if EV_SELECT_IS_WINSOCKET
149# include <winsock.h>
150#endif
151
124/**/ 152/**/
125 153
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 154#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
127#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 155#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
128#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 156#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
129/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 157/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
130 158
131#ifdef EV_H 159#ifdef EV_H
132# include EV_H 160# include EV_H
133#else 161#else
134# include "ev.h" 162# include "ev.h"
135#endif 163#endif
136 164
137#if __GNUC__ >= 3 165#if __GNUC__ >= 3
138# define expect(expr,value) __builtin_expect ((expr),(value)) 166# define expect(expr,value) __builtin_expect ((expr),(value))
139# define inline inline 167# define inline static inline
140#else 168#else
141# define expect(expr,value) (expr) 169# define expect(expr,value) (expr)
142# define inline static 170# define inline static
143#endif 171#endif
144 172
146#define expect_true(expr) expect ((expr) != 0, 1) 174#define expect_true(expr) expect ((expr) != 0, 1)
147 175
148#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 176#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
149#define ABSPRI(w) ((w)->priority - EV_MINPRI) 177#define ABSPRI(w) ((w)->priority - EV_MINPRI)
150 178
179#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
180#define EMPTY2(a,b) /* used to suppress some warnings */
181
151typedef struct ev_watcher *W; 182typedef struct ev_watcher *W;
152typedef struct ev_watcher_list *WL; 183typedef struct ev_watcher_list *WL;
153typedef struct ev_watcher_time *WT; 184typedef struct ev_watcher_time *WT;
154 185
155static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 186static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
156 187
188#ifdef _WIN32
157#include "ev_win32.c" 189# include "ev_win32.c"
190#endif
158 191
159/*****************************************************************************/ 192/*****************************************************************************/
160 193
161static void (*syserr_cb)(const char *msg); 194static void (*syserr_cb)(const char *msg);
162 195
209typedef struct 242typedef struct
210{ 243{
211 WL head; 244 WL head;
212 unsigned char events; 245 unsigned char events;
213 unsigned char reify; 246 unsigned char reify;
247#if EV_SELECT_IS_WINSOCKET
248 SOCKET handle;
249#endif
214} ANFD; 250} ANFD;
215 251
216typedef struct 252typedef struct
217{ 253{
218 W w; 254 W w;
221 257
222#if EV_MULTIPLICITY 258#if EV_MULTIPLICITY
223 259
224 struct ev_loop 260 struct ev_loop
225 { 261 {
262 ev_tstamp ev_rt_now;
263 #define ev_rt_now ((loop)->ev_rt_now)
226 #define VAR(name,decl) decl; 264 #define VAR(name,decl) decl;
227 #include "ev_vars.h" 265 #include "ev_vars.h"
228 #undef VAR 266 #undef VAR
229 }; 267 };
230 #include "ev_wrap.h" 268 #include "ev_wrap.h"
231 269
232 struct ev_loop default_loop_struct; 270 static struct ev_loop default_loop_struct;
233 static struct ev_loop *default_loop; 271 struct ev_loop *ev_default_loop_ptr;
234 272
235#else 273#else
236 274
275 ev_tstamp ev_rt_now;
237 #define VAR(name,decl) static decl; 276 #define VAR(name,decl) static decl;
238 #include "ev_vars.h" 277 #include "ev_vars.h"
239 #undef VAR 278 #undef VAR
240 279
241 static int default_loop; 280 static int ev_default_loop_ptr;
242 281
243#endif 282#endif
244 283
245/*****************************************************************************/ 284/*****************************************************************************/
246 285
247inline ev_tstamp 286ev_tstamp
248ev_time (void) 287ev_time (void)
249{ 288{
250#if EV_USE_REALTIME 289#if EV_USE_REALTIME
251 struct timespec ts; 290 struct timespec ts;
252 clock_gettime (CLOCK_REALTIME, &ts); 291 clock_gettime (CLOCK_REALTIME, &ts);
279{ 318{
280 return ev_rt_now; 319 return ev_rt_now;
281} 320}
282#endif 321#endif
283 322
284#define array_roundsize(type,n) ((n) | 4 & ~3) 323#define array_roundsize(type,n) (((n) | 4) & ~3)
285 324
286#define array_needsize(type,base,cur,cnt,init) \ 325#define array_needsize(type,base,cur,cnt,init) \
287 if (expect_false ((cnt) > cur)) \ 326 if (expect_false ((cnt) > cur)) \
288 { \ 327 { \
289 int newcnt = cur; \ 328 int newcnt = cur; \
304 stem ## max = array_roundsize (stem ## cnt >> 1); \ 343 stem ## max = array_roundsize (stem ## cnt >> 1); \
305 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 344 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
306 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 345 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
307 } 346 }
308 347
309/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
310/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
311#define array_free_microshit(stem) \
312 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
313
314#define array_free(stem, idx) \ 348#define array_free(stem, idx) \
315 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 349 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
316 350
317/*****************************************************************************/ 351/*****************************************************************************/
318 352
332void 366void
333ev_feed_event (EV_P_ void *w, int revents) 367ev_feed_event (EV_P_ void *w, int revents)
334{ 368{
335 W w_ = (W)w; 369 W w_ = (W)w;
336 370
337 if (w_->pending) 371 if (expect_false (w_->pending))
338 { 372 {
339 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 373 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
340 return; 374 return;
341 } 375 }
342 376
343 w_->pending = ++pendingcnt [ABSPRI (w_)]; 377 w_->pending = ++pendingcnt [ABSPRI (w_)];
344 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 378 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
345 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 379 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
346 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 380 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
347} 381}
348 382
349static void 383static void
376 fd_event (EV_A_ fd, revents); 410 fd_event (EV_A_ fd, revents);
377} 411}
378 412
379/*****************************************************************************/ 413/*****************************************************************************/
380 414
381static void 415inline void
382fd_reify (EV_P) 416fd_reify (EV_P)
383{ 417{
384 int i; 418 int i;
385 419
386 for (i = 0; i < fdchangecnt; ++i) 420 for (i = 0; i < fdchangecnt; ++i)
392 int events = 0; 426 int events = 0;
393 427
394 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 428 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
395 events |= w->events; 429 events |= w->events;
396 430
431#if EV_SELECT_IS_WINSOCKET
432 if (events)
433 {
434 unsigned long argp;
435 anfd->handle = _get_osfhandle (fd);
436 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
437 }
438#endif
439
397 anfd->reify = 0; 440 anfd->reify = 0;
398 441
399 method_modify (EV_A_ fd, anfd->events, events); 442 method_modify (EV_A_ fd, anfd->events, events);
400 anfd->events = events; 443 anfd->events = events;
401 } 444 }
404} 447}
405 448
406static void 449static void
407fd_change (EV_P_ int fd) 450fd_change (EV_P_ int fd)
408{ 451{
409 if (anfds [fd].reify) 452 if (expect_false (anfds [fd].reify))
410 return; 453 return;
411 454
412 anfds [fd].reify = 1; 455 anfds [fd].reify = 1;
413 456
414 ++fdchangecnt; 457 ++fdchangecnt;
415 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 458 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
416 fdchanges [fdchangecnt - 1] = fd; 459 fdchanges [fdchangecnt - 1] = fd;
417} 460}
418 461
419static void 462static void
420fd_kill (EV_P_ int fd) 463fd_kill (EV_P_ int fd)
426 ev_io_stop (EV_A_ w); 469 ev_io_stop (EV_A_ w);
427 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 470 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
428 } 471 }
429} 472}
430 473
431static int 474inline int
432fd_valid (int fd) 475fd_valid (int fd)
433{ 476{
434#ifdef WIN32 477#ifdef _WIN32
435 return !!win32_get_osfhandle (fd); 478 return _get_osfhandle (fd) != -1;
436#else 479#else
437 return fcntl (fd, F_GETFD) != -1; 480 return fcntl (fd, F_GETFD) != -1;
438#endif 481#endif
439} 482}
440 483
521 heap [k] = w; 564 heap [k] = w;
522 ((W)heap [k])->active = k + 1; 565 ((W)heap [k])->active = k + 1;
523} 566}
524 567
525inline void 568inline void
526adjustheap (WT *heap, int N, int k, ev_tstamp at) 569adjustheap (WT *heap, int N, int k)
527{ 570{
528 ev_tstamp old_at = heap [k]->at; 571 upheap (heap, k);
529 heap [k]->at = at;
530
531 if (old_at < at)
532 downheap (heap, N, k); 572 downheap (heap, N, k);
533 else
534 upheap (heap, k);
535} 573}
536 574
537/*****************************************************************************/ 575/*****************************************************************************/
538 576
539typedef struct 577typedef struct
562} 600}
563 601
564static void 602static void
565sighandler (int signum) 603sighandler (int signum)
566{ 604{
567#if WIN32 605#if _WIN32
568 signal (signum, sighandler); 606 signal (signum, sighandler);
569#endif 607#endif
570 608
571 signals [signum - 1].gotsig = 1; 609 signals [signum - 1].gotsig = 1;
572 610
573 if (!gotsig) 611 if (!gotsig)
574 { 612 {
575 int old_errno = errno; 613 int old_errno = errno;
576 gotsig = 1; 614 gotsig = 1;
577#ifdef WIN32
578 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
579#else
580 write (sigpipe [1], &signum, 1); 615 write (sigpipe [1], &signum, 1);
581#endif
582 errno = old_errno; 616 errno = old_errno;
583 } 617 }
584} 618}
585 619
586void 620void
587ev_feed_signal_event (EV_P_ int signum) 621ev_feed_signal_event (EV_P_ int signum)
588{ 622{
589 WL w; 623 WL w;
590 624
591#if EV_MULTIPLICITY 625#if EV_MULTIPLICITY
592 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 626 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
593#endif 627#endif
594 628
595 --signum; 629 --signum;
596 630
597 if (signum < 0 || signum >= signalmax) 631 if (signum < 0 || signum >= signalmax)
606static void 640static void
607sigcb (EV_P_ struct ev_io *iow, int revents) 641sigcb (EV_P_ struct ev_io *iow, int revents)
608{ 642{
609 int signum; 643 int signum;
610 644
611#ifdef WIN32
612 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
613#else
614 read (sigpipe [0], &revents, 1); 645 read (sigpipe [0], &revents, 1);
615#endif
616 gotsig = 0; 646 gotsig = 0;
617 647
618 for (signum = signalmax; signum--; ) 648 for (signum = signalmax; signum--; )
619 if (signals [signum].gotsig) 649 if (signals [signum].gotsig)
620 ev_feed_signal_event (EV_A_ signum + 1); 650 ev_feed_signal_event (EV_A_ signum + 1);
621} 651}
622 652
623static void 653static void
654fd_intern (int fd)
655{
656#ifdef _WIN32
657 int arg = 1;
658 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
659#else
660 fcntl (fd, F_SETFD, FD_CLOEXEC);
661 fcntl (fd, F_SETFL, O_NONBLOCK);
662#endif
663}
664
665static void
624siginit (EV_P) 666siginit (EV_P)
625{ 667{
626#ifndef WIN32 668 fd_intern (sigpipe [0]);
627 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 669 fd_intern (sigpipe [1]);
628 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
629
630 /* rather than sort out wether we really need nb, set it */
631 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
632 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
633#endif
634 670
635 ev_io_set (&sigev, sigpipe [0], EV_READ); 671 ev_io_set (&sigev, sigpipe [0], EV_READ);
636 ev_io_start (EV_A_ &sigev); 672 ev_io_start (EV_A_ &sigev);
637 ev_unref (EV_A); /* child watcher should not keep loop alive */ 673 ev_unref (EV_A); /* child watcher should not keep loop alive */
638} 674}
639 675
640/*****************************************************************************/ 676/*****************************************************************************/
641 677
642static struct ev_child *childs [PID_HASHSIZE]; 678static struct ev_child *childs [PID_HASHSIZE];
643 679
644#ifndef WIN32 680#ifndef _WIN32
645 681
646static struct ev_signal childev; 682static struct ev_signal childev;
647 683
648#ifndef WCONTINUED 684#ifndef WCONTINUED
649# define WCONTINUED 0 685# define WCONTINUED 0
681 717
682#endif 718#endif
683 719
684/*****************************************************************************/ 720/*****************************************************************************/
685 721
722#if EV_USE_PORT
723# include "ev_port.c"
724#endif
686#if EV_USE_KQUEUE 725#if EV_USE_KQUEUE
687# include "ev_kqueue.c" 726# include "ev_kqueue.c"
688#endif 727#endif
689#if EV_USE_EPOLL 728#if EV_USE_EPOLL
690# include "ev_epoll.c" 729# include "ev_epoll.c"
710 749
711/* return true if we are running with elevated privileges and should ignore env variables */ 750/* return true if we are running with elevated privileges and should ignore env variables */
712static int 751static int
713enable_secure (void) 752enable_secure (void)
714{ 753{
715#ifdef WIN32 754#ifdef _WIN32
716 return 0; 755 return 0;
717#else 756#else
718 return getuid () != geteuid () 757 return getuid () != geteuid ()
719 || getgid () != getegid (); 758 || getgid () != getegid ();
720#endif 759#endif
721} 760}
722 761
723int 762unsigned int
724ev_method (EV_P) 763ev_method (EV_P)
725{ 764{
726 return method; 765 return method;
727} 766}
728 767
729static void 768static void
730loop_init (EV_P_ int methods) 769loop_init (EV_P_ unsigned int flags)
731{ 770{
732 if (!method) 771 if (!method)
733 { 772 {
734#if EV_USE_MONOTONIC 773#if EV_USE_MONOTONIC
735 { 774 {
742 ev_rt_now = ev_time (); 781 ev_rt_now = ev_time ();
743 mn_now = get_clock (); 782 mn_now = get_clock ();
744 now_floor = mn_now; 783 now_floor = mn_now;
745 rtmn_diff = ev_rt_now - mn_now; 784 rtmn_diff = ev_rt_now - mn_now;
746 785
747 if (methods == EVMETHOD_AUTO) 786 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
748 if (!enable_secure () && getenv ("LIBEV_METHODS"))
749 methods = atoi (getenv ("LIBEV_METHODS")); 787 flags = atoi (getenv ("LIBEV_FLAGS"));
750 else 788
751 methods = EVMETHOD_ANY; 789 if (!(flags & 0x0000ffff))
790 flags |= 0x0000ffff;
752 791
753 method = 0; 792 method = 0;
754#if EV_USE_WIN32 793#if EV_USE_PORT
755 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 794 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
756#endif 795#endif
757#if EV_USE_KQUEUE 796#if EV_USE_KQUEUE
758 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 797 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
759#endif 798#endif
760#if EV_USE_EPOLL 799#if EV_USE_EPOLL
761 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 800 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
762#endif 801#endif
763#if EV_USE_POLL 802#if EV_USE_POLL
764 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 803 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
765#endif 804#endif
766#if EV_USE_SELECT 805#if EV_USE_SELECT
767 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 806 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
768#endif 807#endif
769 808
770 ev_init (&sigev, sigcb); 809 ev_init (&sigev, sigcb);
771 ev_set_priority (&sigev, EV_MAXPRI); 810 ev_set_priority (&sigev, EV_MAXPRI);
772 } 811 }
773} 812}
774 813
775void 814static void
776loop_destroy (EV_P) 815loop_destroy (EV_P)
777{ 816{
778 int i; 817 int i;
779 818
780#if EV_USE_WIN32 819#if EV_USE_PORT
781 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 820 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
782#endif 821#endif
783#if EV_USE_KQUEUE 822#if EV_USE_KQUEUE
784 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 823 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
785#endif 824#endif
786#if EV_USE_EPOLL 825#if EV_USE_EPOLL
795 834
796 for (i = NUMPRI; i--; ) 835 for (i = NUMPRI; i--; )
797 array_free (pending, [i]); 836 array_free (pending, [i]);
798 837
799 /* have to use the microsoft-never-gets-it-right macro */ 838 /* have to use the microsoft-never-gets-it-right macro */
800 array_free_microshit (fdchange); 839 array_free (fdchange, EMPTY0);
801 array_free_microshit (timer); 840 array_free (timer, EMPTY0);
802 array_free_microshit (periodic); 841#if EV_PERIODICS
803 array_free_microshit (idle); 842 array_free (periodic, EMPTY0);
804 array_free_microshit (prepare); 843#endif
805 array_free_microshit (check); 844 array_free (idle, EMPTY0);
845 array_free (prepare, EMPTY0);
846 array_free (check, EMPTY0);
806 847
807 method = 0; 848 method = 0;
808} 849}
809 850
810static void 851static void
811loop_fork (EV_P) 852loop_fork (EV_P)
812{ 853{
854#if EV_USE_PORT
855 if (method == EVMETHOD_PORT ) port_fork (EV_A);
856#endif
857#if EV_USE_KQUEUE
858 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
859#endif
813#if EV_USE_EPOLL 860#if EV_USE_EPOLL
814 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 861 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
815#endif
816#if EV_USE_KQUEUE
817 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
818#endif 862#endif
819 863
820 if (ev_is_active (&sigev)) 864 if (ev_is_active (&sigev))
821 { 865 {
822 /* default loop */ 866 /* default loop */
835 postfork = 0; 879 postfork = 0;
836} 880}
837 881
838#if EV_MULTIPLICITY 882#if EV_MULTIPLICITY
839struct ev_loop * 883struct ev_loop *
840ev_loop_new (int methods) 884ev_loop_new (unsigned int flags)
841{ 885{
842 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 886 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
843 887
844 memset (loop, 0, sizeof (struct ev_loop)); 888 memset (loop, 0, sizeof (struct ev_loop));
845 889
846 loop_init (EV_A_ methods); 890 loop_init (EV_A_ flags);
847 891
848 if (ev_method (EV_A)) 892 if (ev_method (EV_A))
849 return loop; 893 return loop;
850 894
851 return 0; 895 return 0;
866 910
867#endif 911#endif
868 912
869#if EV_MULTIPLICITY 913#if EV_MULTIPLICITY
870struct ev_loop * 914struct ev_loop *
915ev_default_loop_ (unsigned int flags)
871#else 916#else
872int 917int
918ev_default_loop (unsigned int flags)
873#endif 919#endif
874ev_default_loop (int methods)
875{ 920{
876 if (sigpipe [0] == sigpipe [1]) 921 if (sigpipe [0] == sigpipe [1])
877 if (pipe (sigpipe)) 922 if (pipe (sigpipe))
878 return 0; 923 return 0;
879 924
880 if (!default_loop) 925 if (!ev_default_loop_ptr)
881 { 926 {
882#if EV_MULTIPLICITY 927#if EV_MULTIPLICITY
883 struct ev_loop *loop = default_loop = &default_loop_struct; 928 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
884#else 929#else
885 default_loop = 1; 930 ev_default_loop_ptr = 1;
886#endif 931#endif
887 932
888 loop_init (EV_A_ methods); 933 loop_init (EV_A_ flags);
889 934
890 if (ev_method (EV_A)) 935 if (ev_method (EV_A))
891 { 936 {
892 siginit (EV_A); 937 siginit (EV_A);
893 938
894#ifndef WIN32 939#ifndef _WIN32
895 ev_signal_init (&childev, childcb, SIGCHLD); 940 ev_signal_init (&childev, childcb, SIGCHLD);
896 ev_set_priority (&childev, EV_MAXPRI); 941 ev_set_priority (&childev, EV_MAXPRI);
897 ev_signal_start (EV_A_ &childev); 942 ev_signal_start (EV_A_ &childev);
898 ev_unref (EV_A); /* child watcher should not keep loop alive */ 943 ev_unref (EV_A); /* child watcher should not keep loop alive */
899#endif 944#endif
900 } 945 }
901 else 946 else
902 default_loop = 0; 947 ev_default_loop_ptr = 0;
903 } 948 }
904 949
905 return default_loop; 950 return ev_default_loop_ptr;
906} 951}
907 952
908void 953void
909ev_default_destroy (void) 954ev_default_destroy (void)
910{ 955{
911#if EV_MULTIPLICITY 956#if EV_MULTIPLICITY
912 struct ev_loop *loop = default_loop; 957 struct ev_loop *loop = ev_default_loop_ptr;
913#endif 958#endif
914 959
915#ifndef WIN32 960#ifndef _WIN32
916 ev_ref (EV_A); /* child watcher */ 961 ev_ref (EV_A); /* child watcher */
917 ev_signal_stop (EV_A_ &childev); 962 ev_signal_stop (EV_A_ &childev);
918#endif 963#endif
919 964
920 ev_ref (EV_A); /* signal watcher */ 965 ev_ref (EV_A); /* signal watcher */
928 973
929void 974void
930ev_default_fork (void) 975ev_default_fork (void)
931{ 976{
932#if EV_MULTIPLICITY 977#if EV_MULTIPLICITY
933 struct ev_loop *loop = default_loop; 978 struct ev_loop *loop = ev_default_loop_ptr;
934#endif 979#endif
935 980
936 if (method) 981 if (method)
937 postfork = 1; 982 postfork = 1;
938} 983}
949 return 1; 994 return 1;
950 995
951 return 0; 996 return 0;
952} 997}
953 998
954static void 999inline void
955call_pending (EV_P) 1000call_pending (EV_P)
956{ 1001{
957 int pri; 1002 int pri;
958 1003
959 for (pri = NUMPRI; pri--; ) 1004 for (pri = NUMPRI; pri--; )
960 while (pendingcnt [pri]) 1005 while (pendingcnt [pri])
961 { 1006 {
962 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1007 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
963 1008
964 if (p->w) 1009 if (expect_true (p->w))
965 { 1010 {
966 p->w->pending = 0; 1011 p->w->pending = 0;
967 EV_CB_INVOKE (p->w, p->events); 1012 EV_CB_INVOKE (p->w, p->events);
968 } 1013 }
969 } 1014 }
970} 1015}
971 1016
972static void 1017inline void
973timers_reify (EV_P) 1018timers_reify (EV_P)
974{ 1019{
975 while (timercnt && ((WT)timers [0])->at <= mn_now) 1020 while (timercnt && ((WT)timers [0])->at <= mn_now)
976 { 1021 {
977 struct ev_timer *w = timers [0]; 1022 struct ev_timer *w = timers [0];
980 1025
981 /* first reschedule or stop timer */ 1026 /* first reschedule or stop timer */
982 if (w->repeat) 1027 if (w->repeat)
983 { 1028 {
984 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1029 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1030
985 ((WT)w)->at = mn_now + w->repeat; 1031 ((WT)w)->at += w->repeat;
1032 if (((WT)w)->at < mn_now)
1033 ((WT)w)->at = mn_now;
1034
986 downheap ((WT *)timers, timercnt, 0); 1035 downheap ((WT *)timers, timercnt, 0);
987 } 1036 }
988 else 1037 else
989 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1038 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
990 1039
991 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1040 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
992 } 1041 }
993} 1042}
994 1043
995static void 1044#if EV_PERIODICS
1045inline void
996periodics_reify (EV_P) 1046periodics_reify (EV_P)
997{ 1047{
998 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1048 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
999 { 1049 {
1000 struct ev_periodic *w = periodics [0]; 1050 struct ev_periodic *w = periodics [0];
1002 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1052 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1003 1053
1004 /* first reschedule or stop timer */ 1054 /* first reschedule or stop timer */
1005 if (w->reschedule_cb) 1055 if (w->reschedule_cb)
1006 { 1056 {
1007 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1057 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1008
1009 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1058 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1010 downheap ((WT *)periodics, periodiccnt, 0); 1059 downheap ((WT *)periodics, periodiccnt, 0);
1011 } 1060 }
1012 else if (w->interval) 1061 else if (w->interval)
1013 { 1062 {
1040 1089
1041 /* now rebuild the heap */ 1090 /* now rebuild the heap */
1042 for (i = periodiccnt >> 1; i--; ) 1091 for (i = periodiccnt >> 1; i--; )
1043 downheap ((WT *)periodics, periodiccnt, i); 1092 downheap ((WT *)periodics, periodiccnt, i);
1044} 1093}
1094#endif
1045 1095
1046inline int 1096inline int
1047time_update_monotonic (EV_P) 1097time_update_monotonic (EV_P)
1048{ 1098{
1049 mn_now = get_clock (); 1099 mn_now = get_clock ();
1059 ev_rt_now = ev_time (); 1109 ev_rt_now = ev_time ();
1060 return 1; 1110 return 1;
1061 } 1111 }
1062} 1112}
1063 1113
1064static void 1114inline void
1065time_update (EV_P) 1115time_update (EV_P)
1066{ 1116{
1067 int i; 1117 int i;
1068 1118
1069#if EV_USE_MONOTONIC 1119#if EV_USE_MONOTONIC
1083 ev_rt_now = ev_time (); 1133 ev_rt_now = ev_time ();
1084 mn_now = get_clock (); 1134 mn_now = get_clock ();
1085 now_floor = mn_now; 1135 now_floor = mn_now;
1086 } 1136 }
1087 1137
1138# if EV_PERIODICS
1088 periodics_reschedule (EV_A); 1139 periodics_reschedule (EV_A);
1140# endif
1089 /* no timer adjustment, as the monotonic clock doesn't jump */ 1141 /* no timer adjustment, as the monotonic clock doesn't jump */
1090 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1142 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1091 } 1143 }
1092 } 1144 }
1093 else 1145 else
1095 { 1147 {
1096 ev_rt_now = ev_time (); 1148 ev_rt_now = ev_time ();
1097 1149
1098 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1150 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1099 { 1151 {
1152#if EV_PERIODICS
1100 periodics_reschedule (EV_A); 1153 periodics_reschedule (EV_A);
1154#endif
1101 1155
1102 /* adjust timers. this is easy, as the offset is the same for all */ 1156 /* adjust timers. this is easy, as the offset is the same for all */
1103 for (i = 0; i < timercnt; ++i) 1157 for (i = 0; i < timercnt; ++i)
1104 ((WT)timers [i])->at += ev_rt_now - mn_now; 1158 ((WT)timers [i])->at += ev_rt_now - mn_now;
1105 } 1159 }
1126ev_loop (EV_P_ int flags) 1180ev_loop (EV_P_ int flags)
1127{ 1181{
1128 double block; 1182 double block;
1129 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1183 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1130 1184
1131 do 1185 while (activecnt)
1132 { 1186 {
1133 /* queue check watchers (and execute them) */ 1187 /* queue check watchers (and execute them) */
1134 if (expect_false (preparecnt)) 1188 if (expect_false (preparecnt))
1135 { 1189 {
1136 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1190 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1168 { 1222 {
1169 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1223 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1170 if (block > to) block = to; 1224 if (block > to) block = to;
1171 } 1225 }
1172 1226
1227#if EV_PERIODICS
1173 if (periodiccnt) 1228 if (periodiccnt)
1174 { 1229 {
1175 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1230 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1176 if (block > to) block = to; 1231 if (block > to) block = to;
1177 } 1232 }
1233#endif
1178 1234
1179 if (block < 0.) block = 0.; 1235 if (expect_false (block < 0.)) block = 0.;
1180 } 1236 }
1181 1237
1182 method_poll (EV_A_ block); 1238 method_poll (EV_A_ block);
1183 1239
1184 /* update ev_rt_now, do magic */ 1240 /* update ev_rt_now, do magic */
1185 time_update (EV_A); 1241 time_update (EV_A);
1186 1242
1187 /* queue pending timers and reschedule them */ 1243 /* queue pending timers and reschedule them */
1188 timers_reify (EV_A); /* relative timers called last */ 1244 timers_reify (EV_A); /* relative timers called last */
1245#if EV_PERIODICS
1189 periodics_reify (EV_A); /* absolute timers called first */ 1246 periodics_reify (EV_A); /* absolute timers called first */
1247#endif
1190 1248
1191 /* queue idle watchers unless io or timers are pending */ 1249 /* queue idle watchers unless io or timers are pending */
1192 if (idlecnt && !any_pending (EV_A)) 1250 if (idlecnt && !any_pending (EV_A))
1193 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1251 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1194 1252
1195 /* queue check watchers, to be executed first */ 1253 /* queue check watchers, to be executed first */
1196 if (checkcnt) 1254 if (expect_false (checkcnt))
1197 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1255 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1198 1256
1199 call_pending (EV_A); 1257 call_pending (EV_A);
1258
1259 if (expect_false (loop_done))
1260 break;
1200 } 1261 }
1201 while (activecnt && !loop_done);
1202 1262
1203 if (loop_done != 2) 1263 if (loop_done != 2)
1204 loop_done = 0; 1264 loop_done = 0;
1205} 1265}
1206 1266
1266void 1326void
1267ev_io_start (EV_P_ struct ev_io *w) 1327ev_io_start (EV_P_ struct ev_io *w)
1268{ 1328{
1269 int fd = w->fd; 1329 int fd = w->fd;
1270 1330
1271 if (ev_is_active (w)) 1331 if (expect_false (ev_is_active (w)))
1272 return; 1332 return;
1273 1333
1274 assert (("ev_io_start called with negative fd", fd >= 0)); 1334 assert (("ev_io_start called with negative fd", fd >= 0));
1275 1335
1276 ev_start (EV_A_ (W)w, 1); 1336 ev_start (EV_A_ (W)w, 1);
1282 1342
1283void 1343void
1284ev_io_stop (EV_P_ struct ev_io *w) 1344ev_io_stop (EV_P_ struct ev_io *w)
1285{ 1345{
1286 ev_clear_pending (EV_A_ (W)w); 1346 ev_clear_pending (EV_A_ (W)w);
1287 if (!ev_is_active (w)) 1347 if (expect_false (!ev_is_active (w)))
1288 return; 1348 return;
1349
1350 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1289 1351
1290 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1352 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1291 ev_stop (EV_A_ (W)w); 1353 ev_stop (EV_A_ (W)w);
1292 1354
1293 fd_change (EV_A_ w->fd); 1355 fd_change (EV_A_ w->fd);
1294} 1356}
1295 1357
1296void 1358void
1297ev_timer_start (EV_P_ struct ev_timer *w) 1359ev_timer_start (EV_P_ struct ev_timer *w)
1298{ 1360{
1299 if (ev_is_active (w)) 1361 if (expect_false (ev_is_active (w)))
1300 return; 1362 return;
1301 1363
1302 ((WT)w)->at += mn_now; 1364 ((WT)w)->at += mn_now;
1303 1365
1304 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1366 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1305 1367
1306 ev_start (EV_A_ (W)w, ++timercnt); 1368 ev_start (EV_A_ (W)w, ++timercnt);
1307 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1369 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1308 timers [timercnt - 1] = w; 1370 timers [timercnt - 1] = w;
1309 upheap ((WT *)timers, timercnt - 1); 1371 upheap ((WT *)timers, timercnt - 1);
1310 1372
1311 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1373 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1312} 1374}
1313 1375
1314void 1376void
1315ev_timer_stop (EV_P_ struct ev_timer *w) 1377ev_timer_stop (EV_P_ struct ev_timer *w)
1316{ 1378{
1317 ev_clear_pending (EV_A_ (W)w); 1379 ev_clear_pending (EV_A_ (W)w);
1318 if (!ev_is_active (w)) 1380 if (expect_false (!ev_is_active (w)))
1319 return; 1381 return;
1320 1382
1321 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1383 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1322 1384
1323 if (((W)w)->active < timercnt--) 1385 if (expect_true (((W)w)->active < timercnt--))
1324 { 1386 {
1325 timers [((W)w)->active - 1] = timers [timercnt]; 1387 timers [((W)w)->active - 1] = timers [timercnt];
1326 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1388 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1327 } 1389 }
1328 1390
1329 ((WT)w)->at = w->repeat; 1391 ((WT)w)->at -= mn_now;
1330 1392
1331 ev_stop (EV_A_ (W)w); 1393 ev_stop (EV_A_ (W)w);
1332} 1394}
1333 1395
1334void 1396void
1335ev_timer_again (EV_P_ struct ev_timer *w) 1397ev_timer_again (EV_P_ struct ev_timer *w)
1336{ 1398{
1337 if (ev_is_active (w)) 1399 if (ev_is_active (w))
1338 { 1400 {
1339 if (w->repeat) 1401 if (w->repeat)
1402 {
1403 ((WT)w)->at = mn_now + w->repeat;
1340 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1404 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1405 }
1341 else 1406 else
1342 ev_timer_stop (EV_A_ w); 1407 ev_timer_stop (EV_A_ w);
1343 } 1408 }
1344 else if (w->repeat) 1409 else if (w->repeat)
1410 {
1411 w->at = w->repeat;
1345 ev_timer_start (EV_A_ w); 1412 ev_timer_start (EV_A_ w);
1413 }
1346} 1414}
1347 1415
1416#if EV_PERIODICS
1348void 1417void
1349ev_periodic_start (EV_P_ struct ev_periodic *w) 1418ev_periodic_start (EV_P_ struct ev_periodic *w)
1350{ 1419{
1351 if (ev_is_active (w)) 1420 if (expect_false (ev_is_active (w)))
1352 return; 1421 return;
1353 1422
1354 if (w->reschedule_cb) 1423 if (w->reschedule_cb)
1355 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1424 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1356 else if (w->interval) 1425 else if (w->interval)
1359 /* this formula differs from the one in periodic_reify because we do not always round up */ 1428 /* this formula differs from the one in periodic_reify because we do not always round up */
1360 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1429 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1361 } 1430 }
1362 1431
1363 ev_start (EV_A_ (W)w, ++periodiccnt); 1432 ev_start (EV_A_ (W)w, ++periodiccnt);
1364 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1433 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1365 periodics [periodiccnt - 1] = w; 1434 periodics [periodiccnt - 1] = w;
1366 upheap ((WT *)periodics, periodiccnt - 1); 1435 upheap ((WT *)periodics, periodiccnt - 1);
1367 1436
1368 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1437 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1369} 1438}
1370 1439
1371void 1440void
1372ev_periodic_stop (EV_P_ struct ev_periodic *w) 1441ev_periodic_stop (EV_P_ struct ev_periodic *w)
1373{ 1442{
1374 ev_clear_pending (EV_A_ (W)w); 1443 ev_clear_pending (EV_A_ (W)w);
1375 if (!ev_is_active (w)) 1444 if (expect_false (!ev_is_active (w)))
1376 return; 1445 return;
1377 1446
1378 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1447 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1379 1448
1380 if (((W)w)->active < periodiccnt--) 1449 if (expect_true (((W)w)->active < periodiccnt--))
1381 { 1450 {
1382 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1451 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1383 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1452 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1384 } 1453 }
1385 1454
1386 ev_stop (EV_A_ (W)w); 1455 ev_stop (EV_A_ (W)w);
1387} 1456}
1388 1457
1391{ 1460{
1392 /* TODO: use adjustheap and recalculation */ 1461 /* TODO: use adjustheap and recalculation */
1393 ev_periodic_stop (EV_A_ w); 1462 ev_periodic_stop (EV_A_ w);
1394 ev_periodic_start (EV_A_ w); 1463 ev_periodic_start (EV_A_ w);
1395} 1464}
1465#endif
1396 1466
1397void 1467void
1398ev_idle_start (EV_P_ struct ev_idle *w) 1468ev_idle_start (EV_P_ struct ev_idle *w)
1399{ 1469{
1400 if (ev_is_active (w)) 1470 if (expect_false (ev_is_active (w)))
1401 return; 1471 return;
1402 1472
1403 ev_start (EV_A_ (W)w, ++idlecnt); 1473 ev_start (EV_A_ (W)w, ++idlecnt);
1404 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1474 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1405 idles [idlecnt - 1] = w; 1475 idles [idlecnt - 1] = w;
1406} 1476}
1407 1477
1408void 1478void
1409ev_idle_stop (EV_P_ struct ev_idle *w) 1479ev_idle_stop (EV_P_ struct ev_idle *w)
1410{ 1480{
1411 ev_clear_pending (EV_A_ (W)w); 1481 ev_clear_pending (EV_A_ (W)w);
1412 if (ev_is_active (w)) 1482 if (expect_false (!ev_is_active (w)))
1413 return; 1483 return;
1414 1484
1415 idles [((W)w)->active - 1] = idles [--idlecnt]; 1485 idles [((W)w)->active - 1] = idles [--idlecnt];
1416 ev_stop (EV_A_ (W)w); 1486 ev_stop (EV_A_ (W)w);
1417} 1487}
1418 1488
1419void 1489void
1420ev_prepare_start (EV_P_ struct ev_prepare *w) 1490ev_prepare_start (EV_P_ struct ev_prepare *w)
1421{ 1491{
1422 if (ev_is_active (w)) 1492 if (expect_false (ev_is_active (w)))
1423 return; 1493 return;
1424 1494
1425 ev_start (EV_A_ (W)w, ++preparecnt); 1495 ev_start (EV_A_ (W)w, ++preparecnt);
1426 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1496 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1427 prepares [preparecnt - 1] = w; 1497 prepares [preparecnt - 1] = w;
1428} 1498}
1429 1499
1430void 1500void
1431ev_prepare_stop (EV_P_ struct ev_prepare *w) 1501ev_prepare_stop (EV_P_ struct ev_prepare *w)
1432{ 1502{
1433 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1434 if (ev_is_active (w)) 1504 if (expect_false (!ev_is_active (w)))
1435 return; 1505 return;
1436 1506
1437 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1507 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1438 ev_stop (EV_A_ (W)w); 1508 ev_stop (EV_A_ (W)w);
1439} 1509}
1440 1510
1441void 1511void
1442ev_check_start (EV_P_ struct ev_check *w) 1512ev_check_start (EV_P_ struct ev_check *w)
1443{ 1513{
1444 if (ev_is_active (w)) 1514 if (expect_false (ev_is_active (w)))
1445 return; 1515 return;
1446 1516
1447 ev_start (EV_A_ (W)w, ++checkcnt); 1517 ev_start (EV_A_ (W)w, ++checkcnt);
1448 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1518 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1449 checks [checkcnt - 1] = w; 1519 checks [checkcnt - 1] = w;
1450} 1520}
1451 1521
1452void 1522void
1453ev_check_stop (EV_P_ struct ev_check *w) 1523ev_check_stop (EV_P_ struct ev_check *w)
1454{ 1524{
1455 ev_clear_pending (EV_A_ (W)w); 1525 ev_clear_pending (EV_A_ (W)w);
1456 if (ev_is_active (w)) 1526 if (expect_false (!ev_is_active (w)))
1457 return; 1527 return;
1458 1528
1459 checks [((W)w)->active - 1] = checks [--checkcnt]; 1529 checks [((W)w)->active - 1] = checks [--checkcnt];
1460 ev_stop (EV_A_ (W)w); 1530 ev_stop (EV_A_ (W)w);
1461} 1531}
1466 1536
1467void 1537void
1468ev_signal_start (EV_P_ struct ev_signal *w) 1538ev_signal_start (EV_P_ struct ev_signal *w)
1469{ 1539{
1470#if EV_MULTIPLICITY 1540#if EV_MULTIPLICITY
1471 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1541 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1472#endif 1542#endif
1473 if (ev_is_active (w)) 1543 if (expect_false (ev_is_active (w)))
1474 return; 1544 return;
1475 1545
1476 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1546 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1477 1547
1478 ev_start (EV_A_ (W)w, 1); 1548 ev_start (EV_A_ (W)w, 1);
1479 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1549 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1480 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1550 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1481 1551
1482 if (!((WL)w)->next) 1552 if (!((WL)w)->next)
1483 { 1553 {
1484#if WIN32 1554#if _WIN32
1485 signal (w->signum, sighandler); 1555 signal (w->signum, sighandler);
1486#else 1556#else
1487 struct sigaction sa; 1557 struct sigaction sa;
1488 sa.sa_handler = sighandler; 1558 sa.sa_handler = sighandler;
1489 sigfillset (&sa.sa_mask); 1559 sigfillset (&sa.sa_mask);
1495 1565
1496void 1566void
1497ev_signal_stop (EV_P_ struct ev_signal *w) 1567ev_signal_stop (EV_P_ struct ev_signal *w)
1498{ 1568{
1499 ev_clear_pending (EV_A_ (W)w); 1569 ev_clear_pending (EV_A_ (W)w);
1500 if (!ev_is_active (w)) 1570 if (expect_false (!ev_is_active (w)))
1501 return; 1571 return;
1502 1572
1503 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1573 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1504 ev_stop (EV_A_ (W)w); 1574 ev_stop (EV_A_ (W)w);
1505 1575
1509 1579
1510void 1580void
1511ev_child_start (EV_P_ struct ev_child *w) 1581ev_child_start (EV_P_ struct ev_child *w)
1512{ 1582{
1513#if EV_MULTIPLICITY 1583#if EV_MULTIPLICITY
1514 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1584 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1515#endif 1585#endif
1516 if (ev_is_active (w)) 1586 if (expect_false (ev_is_active (w)))
1517 return; 1587 return;
1518 1588
1519 ev_start (EV_A_ (W)w, 1); 1589 ev_start (EV_A_ (W)w, 1);
1520 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1590 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1521} 1591}
1522 1592
1523void 1593void
1524ev_child_stop (EV_P_ struct ev_child *w) 1594ev_child_stop (EV_P_ struct ev_child *w)
1525{ 1595{
1526 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1527 if (ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1528 return; 1598 return;
1529 1599
1530 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1600 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1531 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1532} 1602}
1569void 1639void
1570ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1640ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1571{ 1641{
1572 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1642 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1573 1643
1574 if (!once) 1644 if (expect_false (!once))
1645 {
1575 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1646 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1576 else 1647 return;
1577 { 1648 }
1649
1578 once->cb = cb; 1650 once->cb = cb;
1579 once->arg = arg; 1651 once->arg = arg;
1580 1652
1581 ev_init (&once->io, once_cb_io); 1653 ev_init (&once->io, once_cb_io);
1582 if (fd >= 0) 1654 if (fd >= 0)
1583 { 1655 {
1584 ev_io_set (&once->io, fd, events); 1656 ev_io_set (&once->io, fd, events);
1585 ev_io_start (EV_A_ &once->io); 1657 ev_io_start (EV_A_ &once->io);
1586 } 1658 }
1587 1659
1588 ev_init (&once->to, once_cb_to); 1660 ev_init (&once->to, once_cb_to);
1589 if (timeout >= 0.) 1661 if (timeout >= 0.)
1590 { 1662 {
1591 ev_timer_set (&once->to, timeout, 0.); 1663 ev_timer_set (&once->to, timeout, 0.);
1592 ev_timer_start (EV_A_ &once->to); 1664 ev_timer_start (EV_A_ &once->to);
1593 }
1594 } 1665 }
1595} 1666}
1596 1667
1668#ifdef __cplusplus
1669}
1670#endif
1671

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines