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

Comparing libev/ev.c (file contents):
Revision 1.80 by root, Fri Nov 9 15:30:59 2007 UTC vs.
Revision 1.125 by root, Sat Nov 17 02:28:43 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
159#ifdef EV_H
160# include EV_H
161#else
131#include "ev.h" 162# include "ev.h"
163#endif
132 164
133#if __GNUC__ >= 3 165#if __GNUC__ >= 3
134# define expect(expr,value) __builtin_expect ((expr),(value)) 166# define expect(expr,value) __builtin_expect ((expr),(value))
135# define inline inline 167# define inline static inline
136#else 168#else
137# define expect(expr,value) (expr) 169# define expect(expr,value) (expr)
138# define inline static 170# define inline static
139#endif 171#endif
140 172
142#define expect_true(expr) expect ((expr) != 0, 1) 174#define expect_true(expr) expect ((expr) != 0, 1)
143 175
144#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 176#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
145#define ABSPRI(w) ((w)->priority - EV_MINPRI) 177#define ABSPRI(w) ((w)->priority - EV_MINPRI)
146 178
179#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
180#define EMPTY2(a,b) /* used to suppress some warnings */
181
147typedef struct ev_watcher *W; 182typedef struct ev_watcher *W;
148typedef struct ev_watcher_list *WL; 183typedef struct ev_watcher_list *WL;
149typedef struct ev_watcher_time *WT; 184typedef struct ev_watcher_time *WT;
150 185
151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 186static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
152 187
188#ifdef _WIN32
153#include "ev_win32.c" 189# include "ev_win32.c"
190#endif
154 191
155/*****************************************************************************/ 192/*****************************************************************************/
156 193
157static void (*syserr_cb)(const char *msg); 194static void (*syserr_cb)(const char *msg);
158 195
205typedef struct 242typedef struct
206{ 243{
207 WL head; 244 WL head;
208 unsigned char events; 245 unsigned char events;
209 unsigned char reify; 246 unsigned char reify;
247#if EV_SELECT_IS_WINSOCKET
248 SOCKET handle;
249#endif
210} ANFD; 250} ANFD;
211 251
212typedef struct 252typedef struct
213{ 253{
214 W w; 254 W w;
217 257
218#if EV_MULTIPLICITY 258#if EV_MULTIPLICITY
219 259
220 struct ev_loop 260 struct ev_loop
221 { 261 {
262 ev_tstamp ev_rt_now;
263 #define ev_rt_now ((loop)->ev_rt_now)
222 #define VAR(name,decl) decl; 264 #define VAR(name,decl) decl;
223 #include "ev_vars.h" 265 #include "ev_vars.h"
224 #undef VAR 266 #undef VAR
225 }; 267 };
226 #include "ev_wrap.h" 268 #include "ev_wrap.h"
227 269
228 struct ev_loop default_loop_struct; 270 static struct ev_loop default_loop_struct;
229 static struct ev_loop *default_loop; 271 struct ev_loop *ev_default_loop_ptr;
230 272
231#else 273#else
232 274
275 ev_tstamp ev_rt_now;
233 #define VAR(name,decl) static decl; 276 #define VAR(name,decl) static decl;
234 #include "ev_vars.h" 277 #include "ev_vars.h"
235 #undef VAR 278 #undef VAR
236 279
237 static int default_loop; 280 static int ev_default_loop_ptr;
238 281
239#endif 282#endif
240 283
241/*****************************************************************************/ 284/*****************************************************************************/
242 285
243inline ev_tstamp 286ev_tstamp
244ev_time (void) 287ev_time (void)
245{ 288{
246#if EV_USE_REALTIME 289#if EV_USE_REALTIME
247 struct timespec ts; 290 struct timespec ts;
248 clock_gettime (CLOCK_REALTIME, &ts); 291 clock_gettime (CLOCK_REALTIME, &ts);
267#endif 310#endif
268 311
269 return ev_time (); 312 return ev_time ();
270} 313}
271 314
315#if EV_MULTIPLICITY
272ev_tstamp 316ev_tstamp
273ev_now (EV_P) 317ev_now (EV_P)
274{ 318{
275 return rt_now; 319 return ev_rt_now;
276} 320}
321#endif
277 322
278#define array_roundsize(type,n) ((n) | 4 & ~3) 323#define array_roundsize(type,n) (((n) | 4) & ~3)
279 324
280#define array_needsize(type,base,cur,cnt,init) \ 325#define array_needsize(type,base,cur,cnt,init) \
281 if (expect_false ((cnt) > cur)) \ 326 if (expect_false ((cnt) > cur)) \
282 { \ 327 { \
283 int newcnt = cur; \ 328 int newcnt = cur; \
298 stem ## max = array_roundsize (stem ## cnt >> 1); \ 343 stem ## max = array_roundsize (stem ## cnt >> 1); \
299 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 344 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
300 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 345 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
301 } 346 }
302 347
303/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
304/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
305#define array_free_microshit(stem) \
306 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
307
308#define array_free(stem, idx) \ 348#define array_free(stem, idx) \
309 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;
310 350
311/*****************************************************************************/ 351/*****************************************************************************/
312 352
326void 366void
327ev_feed_event (EV_P_ void *w, int revents) 367ev_feed_event (EV_P_ void *w, int revents)
328{ 368{
329 W w_ = (W)w; 369 W w_ = (W)w;
330 370
331 if (w_->pending) 371 if (expect_false (w_->pending))
332 { 372 {
333 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 373 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
334 return; 374 return;
335 } 375 }
336 376
337 w_->pending = ++pendingcnt [ABSPRI (w_)]; 377 w_->pending = ++pendingcnt [ABSPRI (w_)];
338 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);
339 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 379 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
340 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 380 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
341} 381}
342 382
343static void 383static void
370 fd_event (EV_A_ fd, revents); 410 fd_event (EV_A_ fd, revents);
371} 411}
372 412
373/*****************************************************************************/ 413/*****************************************************************************/
374 414
375static void 415inline void
376fd_reify (EV_P) 416fd_reify (EV_P)
377{ 417{
378 int i; 418 int i;
379 419
380 for (i = 0; i < fdchangecnt; ++i) 420 for (i = 0; i < fdchangecnt; ++i)
386 int events = 0; 426 int events = 0;
387 427
388 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)
389 events |= w->events; 429 events |= w->events;
390 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
391 anfd->reify = 0; 440 anfd->reify = 0;
392 441
393 method_modify (EV_A_ fd, anfd->events, events); 442 method_modify (EV_A_ fd, anfd->events, events);
394 anfd->events = events; 443 anfd->events = events;
395 } 444 }
398} 447}
399 448
400static void 449static void
401fd_change (EV_P_ int fd) 450fd_change (EV_P_ int fd)
402{ 451{
403 if (anfds [fd].reify) 452 if (expect_false (anfds [fd].reify))
404 return; 453 return;
405 454
406 anfds [fd].reify = 1; 455 anfds [fd].reify = 1;
407 456
408 ++fdchangecnt; 457 ++fdchangecnt;
409 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 458 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
410 fdchanges [fdchangecnt - 1] = fd; 459 fdchanges [fdchangecnt - 1] = fd;
411} 460}
412 461
413static void 462static void
414fd_kill (EV_P_ int fd) 463fd_kill (EV_P_ int fd)
420 ev_io_stop (EV_A_ w); 469 ev_io_stop (EV_A_ w);
421 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);
422 } 471 }
423} 472}
424 473
425static int 474inline int
426fd_valid (int fd) 475fd_valid (int fd)
427{ 476{
428#ifdef WIN32 477#ifdef _WIN32
429 return !!win32_get_osfhandle (fd); 478 return _get_osfhandle (fd) != -1;
430#else 479#else
431 return fcntl (fd, F_GETFD) != -1; 480 return fcntl (fd, F_GETFD) != -1;
432#endif 481#endif
433} 482}
434 483
514 563
515 heap [k] = w; 564 heap [k] = w;
516 ((W)heap [k])->active = k + 1; 565 ((W)heap [k])->active = k + 1;
517} 566}
518 567
568inline void
569adjustheap (WT *heap, int N, int k)
570{
571 upheap (heap, k);
572 downheap (heap, N, k);
573}
574
519/*****************************************************************************/ 575/*****************************************************************************/
520 576
521typedef struct 577typedef struct
522{ 578{
523 WL head; 579 WL head;
544} 600}
545 601
546static void 602static void
547sighandler (int signum) 603sighandler (int signum)
548{ 604{
549#if WIN32 605#if _WIN32
550 signal (signum, sighandler); 606 signal (signum, sighandler);
551#endif 607#endif
552 608
553 signals [signum - 1].gotsig = 1; 609 signals [signum - 1].gotsig = 1;
554 610
555 if (!gotsig) 611 if (!gotsig)
556 { 612 {
557 int old_errno = errno; 613 int old_errno = errno;
558 gotsig = 1; 614 gotsig = 1;
559#ifdef WIN32
560 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
561#else
562 write (sigpipe [1], &signum, 1); 615 write (sigpipe [1], &signum, 1);
563#endif
564 errno = old_errno; 616 errno = old_errno;
565 } 617 }
566} 618}
567 619
568void 620void
569ev_feed_signal_event (EV_P_ int signum) 621ev_feed_signal_event (EV_P_ int signum)
570{ 622{
571 WL w; 623 WL w;
572 624
573#if EV_MULTIPLICITY 625#if EV_MULTIPLICITY
574 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));
575#endif 627#endif
576 628
577 --signum; 629 --signum;
578 630
579 if (signum < 0 || signum >= signalmax) 631 if (signum < 0 || signum >= signalmax)
588static void 640static void
589sigcb (EV_P_ struct ev_io *iow, int revents) 641sigcb (EV_P_ struct ev_io *iow, int revents)
590{ 642{
591 int signum; 643 int signum;
592 644
593#ifdef WIN32
594 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
595#else
596 read (sigpipe [0], &revents, 1); 645 read (sigpipe [0], &revents, 1);
597#endif
598 gotsig = 0; 646 gotsig = 0;
599 647
600 for (signum = signalmax; signum--; ) 648 for (signum = signalmax; signum--; )
601 if (signals [signum].gotsig) 649 if (signals [signum].gotsig)
602 ev_feed_signal_event (EV_A_ signum + 1); 650 ev_feed_signal_event (EV_A_ signum + 1);
603} 651}
604 652
605static 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
606siginit (EV_P) 666siginit (EV_P)
607{ 667{
608#ifndef WIN32 668 fd_intern (sigpipe [0]);
609 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 669 fd_intern (sigpipe [1]);
610 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
611
612 /* rather than sort out wether we really need nb, set it */
613 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
614 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
615#endif
616 670
617 ev_io_set (&sigev, sigpipe [0], EV_READ); 671 ev_io_set (&sigev, sigpipe [0], EV_READ);
618 ev_io_start (EV_A_ &sigev); 672 ev_io_start (EV_A_ &sigev);
619 ev_unref (EV_A); /* child watcher should not keep loop alive */ 673 ev_unref (EV_A); /* child watcher should not keep loop alive */
620} 674}
621 675
622/*****************************************************************************/ 676/*****************************************************************************/
623 677
624static struct ev_child *childs [PID_HASHSIZE]; 678static struct ev_child *childs [PID_HASHSIZE];
625 679
626#ifndef WIN32 680#ifndef _WIN32
627 681
628static struct ev_signal childev; 682static struct ev_signal childev;
629 683
630#ifndef WCONTINUED 684#ifndef WCONTINUED
631# define WCONTINUED 0 685# define WCONTINUED 0
663 717
664#endif 718#endif
665 719
666/*****************************************************************************/ 720/*****************************************************************************/
667 721
722#if EV_USE_PORT
723# include "ev_port.c"
724#endif
668#if EV_USE_KQUEUE 725#if EV_USE_KQUEUE
669# include "ev_kqueue.c" 726# include "ev_kqueue.c"
670#endif 727#endif
671#if EV_USE_EPOLL 728#if EV_USE_EPOLL
672# include "ev_epoll.c" 729# include "ev_epoll.c"
692 749
693/* 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 */
694static int 751static int
695enable_secure (void) 752enable_secure (void)
696{ 753{
697#ifdef WIN32 754#ifdef _WIN32
698 return 0; 755 return 0;
699#else 756#else
700 return getuid () != geteuid () 757 return getuid () != geteuid ()
701 || getgid () != getegid (); 758 || getgid () != getegid ();
702#endif 759#endif
703} 760}
704 761
705int 762unsigned int
706ev_method (EV_P) 763ev_method (EV_P)
707{ 764{
708 return method; 765 return method;
709} 766}
710 767
711static void 768static void
712loop_init (EV_P_ int methods) 769loop_init (EV_P_ unsigned int flags)
713{ 770{
714 if (!method) 771 if (!method)
715 { 772 {
716#if EV_USE_MONOTONIC 773#if EV_USE_MONOTONIC
717 { 774 {
719 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 776 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
720 have_monotonic = 1; 777 have_monotonic = 1;
721 } 778 }
722#endif 779#endif
723 780
724 rt_now = ev_time (); 781 ev_rt_now = ev_time ();
725 mn_now = get_clock (); 782 mn_now = get_clock ();
726 now_floor = mn_now; 783 now_floor = mn_now;
727 rtmn_diff = rt_now - mn_now; 784 rtmn_diff = ev_rt_now - mn_now;
728 785
729 if (methods == EVMETHOD_AUTO) 786 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
730 if (!enable_secure () && getenv ("LIBEV_METHODS"))
731 methods = atoi (getenv ("LIBEV_METHODS")); 787 flags = atoi (getenv ("LIBEV_FLAGS"));
732 else 788
733 methods = EVMETHOD_ANY; 789 if (!(flags & 0x0000ffff))
790 flags |= 0x0000ffff;
734 791
735 method = 0; 792 method = 0;
736#if EV_USE_WIN32 793#if EV_USE_PORT
737 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 794 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
738#endif 795#endif
739#if EV_USE_KQUEUE 796#if EV_USE_KQUEUE
740 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 797 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
741#endif 798#endif
742#if EV_USE_EPOLL 799#if EV_USE_EPOLL
743 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 800 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
744#endif 801#endif
745#if EV_USE_POLL 802#if EV_USE_POLL
746 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 803 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
747#endif 804#endif
748#if EV_USE_SELECT 805#if EV_USE_SELECT
749 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 806 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
750#endif 807#endif
751 808
752 ev_watcher_init (&sigev, sigcb); 809 ev_init (&sigev, sigcb);
753 ev_set_priority (&sigev, EV_MAXPRI); 810 ev_set_priority (&sigev, EV_MAXPRI);
754 } 811 }
755} 812}
756 813
757void 814static void
758loop_destroy (EV_P) 815loop_destroy (EV_P)
759{ 816{
760 int i; 817 int i;
761 818
762#if EV_USE_WIN32 819#if EV_USE_PORT
763 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 820 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
764#endif 821#endif
765#if EV_USE_KQUEUE 822#if EV_USE_KQUEUE
766 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 823 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
767#endif 824#endif
768#if EV_USE_EPOLL 825#if EV_USE_EPOLL
777 834
778 for (i = NUMPRI; i--; ) 835 for (i = NUMPRI; i--; )
779 array_free (pending, [i]); 836 array_free (pending, [i]);
780 837
781 /* have to use the microsoft-never-gets-it-right macro */ 838 /* have to use the microsoft-never-gets-it-right macro */
782 array_free_microshit (fdchange); 839 array_free (fdchange, EMPTY0);
783 array_free_microshit (timer); 840 array_free (timer, EMPTY0);
784 array_free_microshit (periodic); 841#if EV_PERIODICS
785 array_free_microshit (idle); 842 array_free (periodic, EMPTY0);
786 array_free_microshit (prepare); 843#endif
787 array_free_microshit (check); 844 array_free (idle, EMPTY0);
845 array_free (prepare, EMPTY0);
846 array_free (check, EMPTY0);
788 847
789 method = 0; 848 method = 0;
790} 849}
791 850
792static void 851static void
793loop_fork (EV_P) 852loop_fork (EV_P)
794{ 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
795#if EV_USE_EPOLL 860#if EV_USE_EPOLL
796 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 861 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
797#endif
798#if EV_USE_KQUEUE
799 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
800#endif 862#endif
801 863
802 if (ev_is_active (&sigev)) 864 if (ev_is_active (&sigev))
803 { 865 {
804 /* default loop */ 866 /* default loop */
817 postfork = 0; 879 postfork = 0;
818} 880}
819 881
820#if EV_MULTIPLICITY 882#if EV_MULTIPLICITY
821struct ev_loop * 883struct ev_loop *
822ev_loop_new (int methods) 884ev_loop_new (unsigned int flags)
823{ 885{
824 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));
825 887
826 memset (loop, 0, sizeof (struct ev_loop)); 888 memset (loop, 0, sizeof (struct ev_loop));
827 889
828 loop_init (EV_A_ methods); 890 loop_init (EV_A_ flags);
829 891
830 if (ev_method (EV_A)) 892 if (ev_method (EV_A))
831 return loop; 893 return loop;
832 894
833 return 0; 895 return 0;
848 910
849#endif 911#endif
850 912
851#if EV_MULTIPLICITY 913#if EV_MULTIPLICITY
852struct ev_loop * 914struct ev_loop *
915ev_default_loop_init (unsigned int flags)
853#else 916#else
854int 917int
918ev_default_loop (unsigned int flags)
855#endif 919#endif
856ev_default_loop (int methods)
857{ 920{
858 if (sigpipe [0] == sigpipe [1]) 921 if (sigpipe [0] == sigpipe [1])
859 if (pipe (sigpipe)) 922 if (pipe (sigpipe))
860 return 0; 923 return 0;
861 924
862 if (!default_loop) 925 if (!ev_default_loop_ptr)
863 { 926 {
864#if EV_MULTIPLICITY 927#if EV_MULTIPLICITY
865 struct ev_loop *loop = default_loop = &default_loop_struct; 928 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
866#else 929#else
867 default_loop = 1; 930 ev_default_loop_ptr = 1;
868#endif 931#endif
869 932
870 loop_init (EV_A_ methods); 933 loop_init (EV_A_ flags);
871 934
872 if (ev_method (EV_A)) 935 if (ev_method (EV_A))
873 { 936 {
874 siginit (EV_A); 937 siginit (EV_A);
875 938
876#ifndef WIN32 939#ifndef _WIN32
877 ev_signal_init (&childev, childcb, SIGCHLD); 940 ev_signal_init (&childev, childcb, SIGCHLD);
878 ev_set_priority (&childev, EV_MAXPRI); 941 ev_set_priority (&childev, EV_MAXPRI);
879 ev_signal_start (EV_A_ &childev); 942 ev_signal_start (EV_A_ &childev);
880 ev_unref (EV_A); /* child watcher should not keep loop alive */ 943 ev_unref (EV_A); /* child watcher should not keep loop alive */
881#endif 944#endif
882 } 945 }
883 else 946 else
884 default_loop = 0; 947 ev_default_loop_ptr = 0;
885 } 948 }
886 949
887 return default_loop; 950 return ev_default_loop_ptr;
888} 951}
889 952
890void 953void
891ev_default_destroy (void) 954ev_default_destroy (void)
892{ 955{
893#if EV_MULTIPLICITY 956#if EV_MULTIPLICITY
894 struct ev_loop *loop = default_loop; 957 struct ev_loop *loop = ev_default_loop_ptr;
895#endif 958#endif
896 959
897#ifndef WIN32 960#ifndef _WIN32
898 ev_ref (EV_A); /* child watcher */ 961 ev_ref (EV_A); /* child watcher */
899 ev_signal_stop (EV_A_ &childev); 962 ev_signal_stop (EV_A_ &childev);
900#endif 963#endif
901 964
902 ev_ref (EV_A); /* signal watcher */ 965 ev_ref (EV_A); /* signal watcher */
910 973
911void 974void
912ev_default_fork (void) 975ev_default_fork (void)
913{ 976{
914#if EV_MULTIPLICITY 977#if EV_MULTIPLICITY
915 struct ev_loop *loop = default_loop; 978 struct ev_loop *loop = ev_default_loop_ptr;
916#endif 979#endif
917 980
918 if (method) 981 if (method)
919 postfork = 1; 982 postfork = 1;
920} 983}
931 return 1; 994 return 1;
932 995
933 return 0; 996 return 0;
934} 997}
935 998
936static void 999inline void
937call_pending (EV_P) 1000call_pending (EV_P)
938{ 1001{
939 int pri; 1002 int pri;
940 1003
941 for (pri = NUMPRI; pri--; ) 1004 for (pri = NUMPRI; pri--; )
942 while (pendingcnt [pri]) 1005 while (pendingcnt [pri])
943 { 1006 {
944 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1007 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
945 1008
946 if (p->w) 1009 if (expect_true (p->w))
947 { 1010 {
948 p->w->pending = 0; 1011 p->w->pending = 0;
949 p->w->cb (EV_A_ p->w, p->events); 1012 EV_CB_INVOKE (p->w, p->events);
950 } 1013 }
951 } 1014 }
952} 1015}
953 1016
954static void 1017inline void
955timers_reify (EV_P) 1018timers_reify (EV_P)
956{ 1019{
957 while (timercnt && ((WT)timers [0])->at <= mn_now) 1020 while (timercnt && ((WT)timers [0])->at <= mn_now)
958 { 1021 {
959 struct ev_timer *w = timers [0]; 1022 struct ev_timer *w = timers [0];
962 1025
963 /* first reschedule or stop timer */ 1026 /* first reschedule or stop timer */
964 if (w->repeat) 1027 if (w->repeat)
965 { 1028 {
966 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
967 ((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
968 downheap ((WT *)timers, timercnt, 0); 1035 downheap ((WT *)timers, timercnt, 0);
969 } 1036 }
970 else 1037 else
971 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1038 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
972 1039
973 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1040 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
974 } 1041 }
975} 1042}
976 1043
977static void 1044#if EV_PERIODICS
1045inline void
978periodics_reify (EV_P) 1046periodics_reify (EV_P)
979{ 1047{
980 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1048 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
981 { 1049 {
982 struct ev_periodic *w = periodics [0]; 1050 struct ev_periodic *w = periodics [0];
983 1051
984 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1052 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
985 1053
986 /* first reschedule or stop timer */ 1054 /* first reschedule or stop timer */
987 if (w->reschedule_cb) 1055 if (w->reschedule_cb)
988 { 1056 {
989 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1057 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
990
991 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1058 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
992 downheap ((WT *)periodics, periodiccnt, 0); 1059 downheap ((WT *)periodics, periodiccnt, 0);
993 } 1060 }
994 else if (w->interval) 1061 else if (w->interval)
995 { 1062 {
996 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1063 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
997 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1064 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
998 downheap ((WT *)periodics, periodiccnt, 0); 1065 downheap ((WT *)periodics, periodiccnt, 0);
999 } 1066 }
1000 else 1067 else
1001 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1068 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1002 1069
1013 for (i = 0; i < periodiccnt; ++i) 1080 for (i = 0; i < periodiccnt; ++i)
1014 { 1081 {
1015 struct ev_periodic *w = periodics [i]; 1082 struct ev_periodic *w = periodics [i];
1016 1083
1017 if (w->reschedule_cb) 1084 if (w->reschedule_cb)
1018 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1085 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1019 else if (w->interval) 1086 else if (w->interval)
1020 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1087 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1021 } 1088 }
1022 1089
1023 /* now rebuild the heap */ 1090 /* now rebuild the heap */
1024 for (i = periodiccnt >> 1; i--; ) 1091 for (i = periodiccnt >> 1; i--; )
1025 downheap ((WT *)periodics, periodiccnt, i); 1092 downheap ((WT *)periodics, periodiccnt, i);
1026} 1093}
1094#endif
1027 1095
1028inline int 1096inline int
1029time_update_monotonic (EV_P) 1097time_update_monotonic (EV_P)
1030{ 1098{
1031 mn_now = get_clock (); 1099 mn_now = get_clock ();
1032 1100
1033 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1101 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1034 { 1102 {
1035 rt_now = rtmn_diff + mn_now; 1103 ev_rt_now = rtmn_diff + mn_now;
1036 return 0; 1104 return 0;
1037 } 1105 }
1038 else 1106 else
1039 { 1107 {
1040 now_floor = mn_now; 1108 now_floor = mn_now;
1041 rt_now = ev_time (); 1109 ev_rt_now = ev_time ();
1042 return 1; 1110 return 1;
1043 } 1111 }
1044} 1112}
1045 1113
1046static void 1114inline void
1047time_update (EV_P) 1115time_update (EV_P)
1048{ 1116{
1049 int i; 1117 int i;
1050 1118
1051#if EV_USE_MONOTONIC 1119#if EV_USE_MONOTONIC
1055 { 1123 {
1056 ev_tstamp odiff = rtmn_diff; 1124 ev_tstamp odiff = rtmn_diff;
1057 1125
1058 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1126 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1059 { 1127 {
1060 rtmn_diff = rt_now - mn_now; 1128 rtmn_diff = ev_rt_now - mn_now;
1061 1129
1062 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1130 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1063 return; /* all is well */ 1131 return; /* all is well */
1064 1132
1065 rt_now = ev_time (); 1133 ev_rt_now = ev_time ();
1066 mn_now = get_clock (); 1134 mn_now = get_clock ();
1067 now_floor = mn_now; 1135 now_floor = mn_now;
1068 } 1136 }
1069 1137
1138# if EV_PERIODICS
1070 periodics_reschedule (EV_A); 1139 periodics_reschedule (EV_A);
1140# endif
1071 /* no timer adjustment, as the monotonic clock doesn't jump */ 1141 /* no timer adjustment, as the monotonic clock doesn't jump */
1072 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1142 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1073 } 1143 }
1074 } 1144 }
1075 else 1145 else
1076#endif 1146#endif
1077 { 1147 {
1078 rt_now = ev_time (); 1148 ev_rt_now = ev_time ();
1079 1149
1080 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1150 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1081 { 1151 {
1152#if EV_PERIODICS
1082 periodics_reschedule (EV_A); 1153 periodics_reschedule (EV_A);
1154#endif
1083 1155
1084 /* 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 */
1085 for (i = 0; i < timercnt; ++i) 1157 for (i = 0; i < timercnt; ++i)
1086 ((WT)timers [i])->at += rt_now - mn_now; 1158 ((WT)timers [i])->at += ev_rt_now - mn_now;
1087 } 1159 }
1088 1160
1089 mn_now = rt_now; 1161 mn_now = ev_rt_now;
1090 } 1162 }
1091} 1163}
1092 1164
1093void 1165void
1094ev_ref (EV_P) 1166ev_ref (EV_P)
1108ev_loop (EV_P_ int flags) 1180ev_loop (EV_P_ int flags)
1109{ 1181{
1110 double block; 1182 double block;
1111 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1183 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1112 1184
1113 do 1185 while (activecnt)
1114 { 1186 {
1115 /* queue check watchers (and execute them) */ 1187 /* queue check watchers (and execute them) */
1116 if (expect_false (preparecnt)) 1188 if (expect_false (preparecnt))
1117 { 1189 {
1118 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1190 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1134 if (expect_true (have_monotonic)) 1206 if (expect_true (have_monotonic))
1135 time_update_monotonic (EV_A); 1207 time_update_monotonic (EV_A);
1136 else 1208 else
1137#endif 1209#endif
1138 { 1210 {
1139 rt_now = ev_time (); 1211 ev_rt_now = ev_time ();
1140 mn_now = rt_now; 1212 mn_now = ev_rt_now;
1141 } 1213 }
1142 1214
1143 if (flags & EVLOOP_NONBLOCK || idlecnt) 1215 if (flags & EVLOOP_NONBLOCK || idlecnt)
1144 block = 0.; 1216 block = 0.;
1145 else 1217 else
1150 { 1222 {
1151 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1223 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1152 if (block > to) block = to; 1224 if (block > to) block = to;
1153 } 1225 }
1154 1226
1227#if EV_PERIODICS
1155 if (periodiccnt) 1228 if (periodiccnt)
1156 { 1229 {
1157 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1230 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1158 if (block > to) block = to; 1231 if (block > to) block = to;
1159 } 1232 }
1233#endif
1160 1234
1161 if (block < 0.) block = 0.; 1235 if (expect_false (block < 0.)) block = 0.;
1162 } 1236 }
1163 1237
1164 method_poll (EV_A_ block); 1238 method_poll (EV_A_ block);
1165 1239
1166 /* update rt_now, do magic */ 1240 /* update ev_rt_now, do magic */
1167 time_update (EV_A); 1241 time_update (EV_A);
1168 1242
1169 /* queue pending timers and reschedule them */ 1243 /* queue pending timers and reschedule them */
1170 timers_reify (EV_A); /* relative timers called last */ 1244 timers_reify (EV_A); /* relative timers called last */
1245#if EV_PERIODICS
1171 periodics_reify (EV_A); /* absolute timers called first */ 1246 periodics_reify (EV_A); /* absolute timers called first */
1247#endif
1172 1248
1173 /* queue idle watchers unless io or timers are pending */ 1249 /* queue idle watchers unless io or timers are pending */
1174 if (idlecnt && !any_pending (EV_A)) 1250 if (idlecnt && !any_pending (EV_A))
1175 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1251 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1176 1252
1177 /* queue check watchers, to be executed first */ 1253 /* queue check watchers, to be executed first */
1178 if (checkcnt) 1254 if (expect_false (checkcnt))
1179 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1255 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1180 1256
1181 call_pending (EV_A); 1257 call_pending (EV_A);
1258
1259 if (expect_false (loop_done))
1260 break;
1182 } 1261 }
1183 while (activecnt && !loop_done);
1184 1262
1185 if (loop_done != 2) 1263 if (loop_done != 2)
1186 loop_done = 0; 1264 loop_done = 0;
1187} 1265}
1188 1266
1248void 1326void
1249ev_io_start (EV_P_ struct ev_io *w) 1327ev_io_start (EV_P_ struct ev_io *w)
1250{ 1328{
1251 int fd = w->fd; 1329 int fd = w->fd;
1252 1330
1253 if (ev_is_active (w)) 1331 if (expect_false (ev_is_active (w)))
1254 return; 1332 return;
1255 1333
1256 assert (("ev_io_start called with negative fd", fd >= 0)); 1334 assert (("ev_io_start called with negative fd", fd >= 0));
1257 1335
1258 ev_start (EV_A_ (W)w, 1); 1336 ev_start (EV_A_ (W)w, 1);
1264 1342
1265void 1343void
1266ev_io_stop (EV_P_ struct ev_io *w) 1344ev_io_stop (EV_P_ struct ev_io *w)
1267{ 1345{
1268 ev_clear_pending (EV_A_ (W)w); 1346 ev_clear_pending (EV_A_ (W)w);
1269 if (!ev_is_active (w)) 1347 if (expect_false (!ev_is_active (w)))
1270 return; 1348 return;
1349
1350 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1271 1351
1272 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1352 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1273 ev_stop (EV_A_ (W)w); 1353 ev_stop (EV_A_ (W)w);
1274 1354
1275 fd_change (EV_A_ w->fd); 1355 fd_change (EV_A_ w->fd);
1276} 1356}
1277 1357
1278void 1358void
1279ev_timer_start (EV_P_ struct ev_timer *w) 1359ev_timer_start (EV_P_ struct ev_timer *w)
1280{ 1360{
1281 if (ev_is_active (w)) 1361 if (expect_false (ev_is_active (w)))
1282 return; 1362 return;
1283 1363
1284 ((WT)w)->at += mn_now; 1364 ((WT)w)->at += mn_now;
1285 1365
1286 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.));
1287 1367
1288 ev_start (EV_A_ (W)w, ++timercnt); 1368 ev_start (EV_A_ (W)w, ++timercnt);
1289 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1369 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1290 timers [timercnt - 1] = w; 1370 timers [timercnt - 1] = w;
1291 upheap ((WT *)timers, timercnt - 1); 1371 upheap ((WT *)timers, timercnt - 1);
1292 1372
1293 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1373 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1294} 1374}
1295 1375
1296void 1376void
1297ev_timer_stop (EV_P_ struct ev_timer *w) 1377ev_timer_stop (EV_P_ struct ev_timer *w)
1298{ 1378{
1299 ev_clear_pending (EV_A_ (W)w); 1379 ev_clear_pending (EV_A_ (W)w);
1300 if (!ev_is_active (w)) 1380 if (expect_false (!ev_is_active (w)))
1301 return; 1381 return;
1302 1382
1303 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1383 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1304 1384
1305 if (((W)w)->active < timercnt--) 1385 if (expect_true (((W)w)->active < timercnt--))
1306 { 1386 {
1307 timers [((W)w)->active - 1] = timers [timercnt]; 1387 timers [((W)w)->active - 1] = timers [timercnt];
1308 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1388 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1309 } 1389 }
1310 1390
1311 ((WT)w)->at = w->repeat; 1391 ((WT)w)->at -= mn_now;
1312 1392
1313 ev_stop (EV_A_ (W)w); 1393 ev_stop (EV_A_ (W)w);
1314} 1394}
1315 1395
1316void 1396void
1319 if (ev_is_active (w)) 1399 if (ev_is_active (w))
1320 { 1400 {
1321 if (w->repeat) 1401 if (w->repeat)
1322 { 1402 {
1323 ((WT)w)->at = mn_now + w->repeat; 1403 ((WT)w)->at = mn_now + w->repeat;
1324 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1404 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1325 } 1405 }
1326 else 1406 else
1327 ev_timer_stop (EV_A_ w); 1407 ev_timer_stop (EV_A_ w);
1328 } 1408 }
1329 else if (w->repeat) 1409 else if (w->repeat)
1410 {
1411 w->at = w->repeat;
1330 ev_timer_start (EV_A_ w); 1412 ev_timer_start (EV_A_ w);
1413 }
1331} 1414}
1332 1415
1416#if EV_PERIODICS
1333void 1417void
1334ev_periodic_start (EV_P_ struct ev_periodic *w) 1418ev_periodic_start (EV_P_ struct ev_periodic *w)
1335{ 1419{
1336 if (ev_is_active (w)) 1420 if (expect_false (ev_is_active (w)))
1337 return; 1421 return;
1338 1422
1339 if (w->reschedule_cb) 1423 if (w->reschedule_cb)
1340 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1424 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1341 else if (w->interval) 1425 else if (w->interval)
1342 { 1426 {
1343 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1427 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1344 /* 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 */
1345 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1429 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1346 } 1430 }
1347 1431
1348 ev_start (EV_A_ (W)w, ++periodiccnt); 1432 ev_start (EV_A_ (W)w, ++periodiccnt);
1349 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1433 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1350 periodics [periodiccnt - 1] = w; 1434 periodics [periodiccnt - 1] = w;
1351 upheap ((WT *)periodics, periodiccnt - 1); 1435 upheap ((WT *)periodics, periodiccnt - 1);
1352 1436
1353 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1437 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1354} 1438}
1355 1439
1356void 1440void
1357ev_periodic_stop (EV_P_ struct ev_periodic *w) 1441ev_periodic_stop (EV_P_ struct ev_periodic *w)
1358{ 1442{
1359 ev_clear_pending (EV_A_ (W)w); 1443 ev_clear_pending (EV_A_ (W)w);
1360 if (!ev_is_active (w)) 1444 if (expect_false (!ev_is_active (w)))
1361 return; 1445 return;
1362 1446
1363 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1447 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1364 1448
1365 if (((W)w)->active < periodiccnt--) 1449 if (expect_true (((W)w)->active < periodiccnt--))
1366 { 1450 {
1367 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1451 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1368 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1452 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1369 } 1453 }
1370 1454
1371 ev_stop (EV_A_ (W)w); 1455 ev_stop (EV_A_ (W)w);
1372} 1456}
1373 1457
1374void 1458void
1375ev_periodic_again (EV_P_ struct ev_periodic *w) 1459ev_periodic_again (EV_P_ struct ev_periodic *w)
1376{ 1460{
1461 /* TODO: use adjustheap and recalculation */
1377 ev_periodic_stop (EV_A_ w); 1462 ev_periodic_stop (EV_A_ w);
1378 ev_periodic_start (EV_A_ w); 1463 ev_periodic_start (EV_A_ w);
1379} 1464}
1465#endif
1380 1466
1381void 1467void
1382ev_idle_start (EV_P_ struct ev_idle *w) 1468ev_idle_start (EV_P_ struct ev_idle *w)
1383{ 1469{
1384 if (ev_is_active (w)) 1470 if (expect_false (ev_is_active (w)))
1385 return; 1471 return;
1386 1472
1387 ev_start (EV_A_ (W)w, ++idlecnt); 1473 ev_start (EV_A_ (W)w, ++idlecnt);
1388 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1474 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1389 idles [idlecnt - 1] = w; 1475 idles [idlecnt - 1] = w;
1390} 1476}
1391 1477
1392void 1478void
1393ev_idle_stop (EV_P_ struct ev_idle *w) 1479ev_idle_stop (EV_P_ struct ev_idle *w)
1394{ 1480{
1395 ev_clear_pending (EV_A_ (W)w); 1481 ev_clear_pending (EV_A_ (W)w);
1396 if (ev_is_active (w)) 1482 if (expect_false (!ev_is_active (w)))
1397 return; 1483 return;
1398 1484
1399 idles [((W)w)->active - 1] = idles [--idlecnt]; 1485 idles [((W)w)->active - 1] = idles [--idlecnt];
1400 ev_stop (EV_A_ (W)w); 1486 ev_stop (EV_A_ (W)w);
1401} 1487}
1402 1488
1403void 1489void
1404ev_prepare_start (EV_P_ struct ev_prepare *w) 1490ev_prepare_start (EV_P_ struct ev_prepare *w)
1405{ 1491{
1406 if (ev_is_active (w)) 1492 if (expect_false (ev_is_active (w)))
1407 return; 1493 return;
1408 1494
1409 ev_start (EV_A_ (W)w, ++preparecnt); 1495 ev_start (EV_A_ (W)w, ++preparecnt);
1410 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1496 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1411 prepares [preparecnt - 1] = w; 1497 prepares [preparecnt - 1] = w;
1412} 1498}
1413 1499
1414void 1500void
1415ev_prepare_stop (EV_P_ struct ev_prepare *w) 1501ev_prepare_stop (EV_P_ struct ev_prepare *w)
1416{ 1502{
1417 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1418 if (ev_is_active (w)) 1504 if (expect_false (!ev_is_active (w)))
1419 return; 1505 return;
1420 1506
1421 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1507 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1422 ev_stop (EV_A_ (W)w); 1508 ev_stop (EV_A_ (W)w);
1423} 1509}
1424 1510
1425void 1511void
1426ev_check_start (EV_P_ struct ev_check *w) 1512ev_check_start (EV_P_ struct ev_check *w)
1427{ 1513{
1428 if (ev_is_active (w)) 1514 if (expect_false (ev_is_active (w)))
1429 return; 1515 return;
1430 1516
1431 ev_start (EV_A_ (W)w, ++checkcnt); 1517 ev_start (EV_A_ (W)w, ++checkcnt);
1432 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1518 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1433 checks [checkcnt - 1] = w; 1519 checks [checkcnt - 1] = w;
1434} 1520}
1435 1521
1436void 1522void
1437ev_check_stop (EV_P_ struct ev_check *w) 1523ev_check_stop (EV_P_ struct ev_check *w)
1438{ 1524{
1439 ev_clear_pending (EV_A_ (W)w); 1525 ev_clear_pending (EV_A_ (W)w);
1440 if (ev_is_active (w)) 1526 if (expect_false (!ev_is_active (w)))
1441 return; 1527 return;
1442 1528
1443 checks [((W)w)->active - 1] = checks [--checkcnt]; 1529 checks [((W)w)->active - 1] = checks [--checkcnt];
1444 ev_stop (EV_A_ (W)w); 1530 ev_stop (EV_A_ (W)w);
1445} 1531}
1450 1536
1451void 1537void
1452ev_signal_start (EV_P_ struct ev_signal *w) 1538ev_signal_start (EV_P_ struct ev_signal *w)
1453{ 1539{
1454#if EV_MULTIPLICITY 1540#if EV_MULTIPLICITY
1455 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));
1456#endif 1542#endif
1457 if (ev_is_active (w)) 1543 if (expect_false (ev_is_active (w)))
1458 return; 1544 return;
1459 1545
1460 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));
1461 1547
1462 ev_start (EV_A_ (W)w, 1); 1548 ev_start (EV_A_ (W)w, 1);
1463 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1549 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1464 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1550 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1465 1551
1466 if (!((WL)w)->next) 1552 if (!((WL)w)->next)
1467 { 1553 {
1468#if WIN32 1554#if _WIN32
1469 signal (w->signum, sighandler); 1555 signal (w->signum, sighandler);
1470#else 1556#else
1471 struct sigaction sa; 1557 struct sigaction sa;
1472 sa.sa_handler = sighandler; 1558 sa.sa_handler = sighandler;
1473 sigfillset (&sa.sa_mask); 1559 sigfillset (&sa.sa_mask);
1479 1565
1480void 1566void
1481ev_signal_stop (EV_P_ struct ev_signal *w) 1567ev_signal_stop (EV_P_ struct ev_signal *w)
1482{ 1568{
1483 ev_clear_pending (EV_A_ (W)w); 1569 ev_clear_pending (EV_A_ (W)w);
1484 if (!ev_is_active (w)) 1570 if (expect_false (!ev_is_active (w)))
1485 return; 1571 return;
1486 1572
1487 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1573 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1488 ev_stop (EV_A_ (W)w); 1574 ev_stop (EV_A_ (W)w);
1489 1575
1493 1579
1494void 1580void
1495ev_child_start (EV_P_ struct ev_child *w) 1581ev_child_start (EV_P_ struct ev_child *w)
1496{ 1582{
1497#if EV_MULTIPLICITY 1583#if EV_MULTIPLICITY
1498 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));
1499#endif 1585#endif
1500 if (ev_is_active (w)) 1586 if (expect_false (ev_is_active (w)))
1501 return; 1587 return;
1502 1588
1503 ev_start (EV_A_ (W)w, 1); 1589 ev_start (EV_A_ (W)w, 1);
1504 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1590 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1505} 1591}
1506 1592
1507void 1593void
1508ev_child_stop (EV_P_ struct ev_child *w) 1594ev_child_stop (EV_P_ struct ev_child *w)
1509{ 1595{
1510 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1511 if (ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1512 return; 1598 return;
1513 1599
1514 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1600 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1515 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1516} 1602}
1553void 1639void
1554ev_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)
1555{ 1641{
1556 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));
1557 1643
1558 if (!once) 1644 if (expect_false (!once))
1645 {
1559 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1646 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1560 else 1647 return;
1561 { 1648 }
1649
1562 once->cb = cb; 1650 once->cb = cb;
1563 once->arg = arg; 1651 once->arg = arg;
1564 1652
1565 ev_watcher_init (&once->io, once_cb_io); 1653 ev_init (&once->io, once_cb_io);
1566 if (fd >= 0) 1654 if (fd >= 0)
1567 { 1655 {
1568 ev_io_set (&once->io, fd, events); 1656 ev_io_set (&once->io, fd, events);
1569 ev_io_start (EV_A_ &once->io); 1657 ev_io_start (EV_A_ &once->io);
1570 } 1658 }
1571 1659
1572 ev_watcher_init (&once->to, once_cb_to); 1660 ev_init (&once->to, once_cb_to);
1573 if (timeout >= 0.) 1661 if (timeout >= 0.)
1574 { 1662 {
1575 ev_timer_set (&once->to, timeout, 0.); 1663 ev_timer_set (&once->to, timeout, 0.);
1576 ev_timer_start (EV_A_ &once->to); 1664 ev_timer_start (EV_A_ &once->to);
1577 }
1578 } 1665 }
1579} 1666}
1580 1667
1668#ifdef __cplusplus
1669}
1670#endif
1671

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines