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.128 by root, Thu Nov 22 12:28:27 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
46# else
47# ifndef EV_USE_MONOTONIC
48# define EV_USE_MONOTONIC 0
49# endif
50# ifndef EV_USE_REALTIME
51# define EV_USE_REALTIME 0
52# endif
37# endif 53# endif
38 54
55# ifndef EV_USE_SELECT
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 56# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1 57# define EV_USE_SELECT 1
58# else
59# define EV_USE_SELECT 0
60# endif
41# endif 61# endif
42 62
63# ifndef EV_USE_POLL
43# if HAVE_POLL && HAVE_POLL_H 64# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1 65# define EV_USE_POLL 1
66# else
67# define EV_USE_POLL 0
68# endif
45# endif 69# endif
46 70
71# ifndef EV_USE_EPOLL
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 72# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1 73# define EV_USE_EPOLL 1
74# else
75# define EV_USE_EPOLL 0
76# endif
49# endif 77# endif
50 78
79# ifndef EV_USE_KQUEUE
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 80# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1 81# define EV_USE_KQUEUE 1
82# else
83# define EV_USE_KQUEUE 0
84# endif
85# endif
86
87# ifndef EV_USE_PORT
88# if HAVE_PORT_H && HAVE_PORT_CREATE
89# define EV_USE_PORT 1
90# else
91# define EV_USE_PORT 0
92# endif
53# endif 93# endif
54 94
55#endif 95#endif
56 96
57#include <math.h> 97#include <math.h>
… …
66#include <sys/types.h> 106#include <sys/types.h>
67#include <time.h> 107#include <time.h>
68 108
69#include <signal.h> 109#include <signal.h>
70 110
71#ifndef WIN32 111#ifndef _WIN32
72# include <unistd.h> 112# include <unistd.h>
73# include <sys/time.h> 113# include <sys/time.h>
74# include <sys/wait.h> 114# include <sys/wait.h>
115#else
116# define WIN32_LEAN_AND_MEAN
117# include <windows.h>
118# ifndef EV_SELECT_IS_WINSOCKET
119# define EV_SELECT_IS_WINSOCKET 1
75#endif 120# endif
121#endif
122
76/**/ 123/**/
77 124
78#ifndef EV_USE_MONOTONIC 125#ifndef EV_USE_MONOTONIC
79# define EV_USE_MONOTONIC 1 126# define EV_USE_MONOTONIC 0
127#endif
128
129#ifndef EV_USE_REALTIME
130# define EV_USE_REALTIME 0
80#endif 131#endif
81 132
82#ifndef EV_USE_SELECT 133#ifndef EV_USE_SELECT
83# define EV_USE_SELECT 1 134# define EV_USE_SELECT 1
84#endif 135#endif
85 136
86#ifndef EV_USE_POLL 137#ifndef EV_USE_POLL
87# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 138# ifdef _WIN32
139# define EV_USE_POLL 0
140# else
141# define EV_USE_POLL 1
142# endif
88#endif 143#endif
89 144
90#ifndef EV_USE_EPOLL 145#ifndef EV_USE_EPOLL
91# define EV_USE_EPOLL 0 146# define EV_USE_EPOLL 0
92#endif 147#endif
93 148
94#ifndef EV_USE_KQUEUE 149#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0 150# define EV_USE_KQUEUE 0
96#endif 151#endif
97 152
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 153#ifndef EV_USE_PORT
109# define EV_USE_REALTIME 1 154# define EV_USE_PORT 0
110#endif 155#endif
111 156
112/**/ 157/**/
158
159/* darwin simply cannot be helped */
160#ifdef __APPLE__
161# undef EV_USE_POLL
162# undef EV_USE_KQUEUE
163#endif
113 164
114#ifndef CLOCK_MONOTONIC 165#ifndef CLOCK_MONOTONIC
115# undef EV_USE_MONOTONIC 166# undef EV_USE_MONOTONIC
116# define EV_USE_MONOTONIC 0 167# define EV_USE_MONOTONIC 0
117#endif 168#endif
… …
119#ifndef CLOCK_REALTIME 170#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 171# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 172# define EV_USE_REALTIME 0
122#endif 173#endif
123 174
175#if EV_SELECT_IS_WINSOCKET
176# include <winsock.h>
177#endif
178
124/**/ 179/**/
125 180
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 181#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
127#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 182#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
128#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 183#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
129/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 184/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
130 185
186#ifdef EV_H
187# include EV_H
188#else
131#include "ev.h" 189# include "ev.h"
190#endif
132 191
133#if __GNUC__ >= 3 192#if __GNUC__ >= 3
134# define expect(expr,value) __builtin_expect ((expr),(value)) 193# define expect(expr,value) __builtin_expect ((expr),(value))
135# define inline inline 194# define inline static inline
136#else 195#else
137# define expect(expr,value) (expr) 196# define expect(expr,value) (expr)
138# define inline static 197# define inline static
139#endif 198#endif
140 199
… …
142#define expect_true(expr) expect ((expr) != 0, 1) 201#define expect_true(expr) expect ((expr) != 0, 1)
143 202
144#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 203#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
145#define ABSPRI(w) ((w)->priority - EV_MINPRI) 204#define ABSPRI(w) ((w)->priority - EV_MINPRI)
146 205
206#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
207#define EMPTY2(a,b) /* used to suppress some warnings */
208
147typedef struct ev_watcher *W; 209typedef struct ev_watcher *W;
148typedef struct ev_watcher_list *WL; 210typedef struct ev_watcher_list *WL;
149typedef struct ev_watcher_time *WT; 211typedef struct ev_watcher_time *WT;
150 212
151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 213static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
152 214
215#ifdef _WIN32
153#include "ev_win32.c" 216# include "ev_win32.c"
217#endif
154 218
155/*****************************************************************************/ 219/*****************************************************************************/
156 220
157static void (*syserr_cb)(const char *msg); 221static void (*syserr_cb)(const char *msg);
158 222
… …
205typedef struct 269typedef struct
206{ 270{
207 WL head; 271 WL head;
208 unsigned char events; 272 unsigned char events;
209 unsigned char reify; 273 unsigned char reify;
274#if EV_SELECT_IS_WINSOCKET
275 SOCKET handle;
276#endif
210} ANFD; 277} ANFD;
211 278
212typedef struct 279typedef struct
213{ 280{
214 W w; 281 W w;
… …
217 284
218#if EV_MULTIPLICITY 285#if EV_MULTIPLICITY
219 286
220 struct ev_loop 287 struct ev_loop
221 { 288 {
289 ev_tstamp ev_rt_now;
290 #define ev_rt_now ((loop)->ev_rt_now)
222 #define VAR(name,decl) decl; 291 #define VAR(name,decl) decl;
223 #include "ev_vars.h" 292 #include "ev_vars.h"
224 #undef VAR 293 #undef VAR
225 }; 294 };
226 #include "ev_wrap.h" 295 #include "ev_wrap.h"
227 296
228 struct ev_loop default_loop_struct; 297 static struct ev_loop default_loop_struct;
229 static struct ev_loop *default_loop; 298 struct ev_loop *ev_default_loop_ptr;
230 299
231#else 300#else
232 301
302 ev_tstamp ev_rt_now;
233 #define VAR(name,decl) static decl; 303 #define VAR(name,decl) static decl;
234 #include "ev_vars.h" 304 #include "ev_vars.h"
235 #undef VAR 305 #undef VAR
236 306
237 static int default_loop; 307 static int ev_default_loop_ptr;
238 308
239#endif 309#endif
240 310
241/*****************************************************************************/ 311/*****************************************************************************/
242 312
243inline ev_tstamp 313ev_tstamp
244ev_time (void) 314ev_time (void)
245{ 315{
246#if EV_USE_REALTIME 316#if EV_USE_REALTIME
247 struct timespec ts; 317 struct timespec ts;
248 clock_gettime (CLOCK_REALTIME, &ts); 318 clock_gettime (CLOCK_REALTIME, &ts);
… …
267#endif 337#endif
268 338
269 return ev_time (); 339 return ev_time ();
270} 340}
271 341
342#if EV_MULTIPLICITY
272ev_tstamp 343ev_tstamp
273ev_now (EV_P) 344ev_now (EV_P)
274{ 345{
275 return rt_now; 346 return ev_rt_now;
276} 347}
348#endif
277 349
278#define array_roundsize(type,n) ((n) | 4 & ~3) 350#define array_roundsize(type,n) (((n) | 4) & ~3)
279 351
280#define array_needsize(type,base,cur,cnt,init) \ 352#define array_needsize(type,base,cur,cnt,init) \
281 if (expect_false ((cnt) > cur)) \ 353 if (expect_false ((cnt) > cur)) \
282 { \ 354 { \
283 int newcnt = cur; \ 355 int newcnt = cur; \
… …
298 stem ## max = array_roundsize (stem ## cnt >> 1); \ 370 stem ## max = array_roundsize (stem ## cnt >> 1); \
299 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 371 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
300 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 372 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
301 } 373 }
302 374
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) \ 375#define array_free(stem, idx) \
309 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 376 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
310 377
311/*****************************************************************************/ 378/*****************************************************************************/
312 379
… …
326void 393void
327ev_feed_event (EV_P_ void *w, int revents) 394ev_feed_event (EV_P_ void *w, int revents)
328{ 395{
329 W w_ = (W)w; 396 W w_ = (W)w;
330 397
331 if (w_->pending) 398 if (expect_false (w_->pending))
332 { 399 {
333 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 400 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
334 return; 401 return;
335 } 402 }
336 403
337 w_->pending = ++pendingcnt [ABSPRI (w_)]; 404 w_->pending = ++pendingcnt [ABSPRI (w_)];
338 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 405 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
339 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 406 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
340 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 407 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
341} 408}
342 409
343static void 410static void
… …
370 fd_event (EV_A_ fd, revents); 437 fd_event (EV_A_ fd, revents);
371} 438}
372 439
373/*****************************************************************************/ 440/*****************************************************************************/
374 441
375static void 442inline void
376fd_reify (EV_P) 443fd_reify (EV_P)
377{ 444{
378 int i; 445 int i;
379 446
380 for (i = 0; i < fdchangecnt; ++i) 447 for (i = 0; i < fdchangecnt; ++i)
… …
386 int events = 0; 453 int events = 0;
387 454
388 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 455 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
389 events |= w->events; 456 events |= w->events;
390 457
458#if EV_SELECT_IS_WINSOCKET
459 if (events)
460 {
461 unsigned long argp;
462 anfd->handle = _get_osfhandle (fd);
463 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
464 }
465#endif
466
391 anfd->reify = 0; 467 anfd->reify = 0;
392 468
393 method_modify (EV_A_ fd, anfd->events, events); 469 method_modify (EV_A_ fd, anfd->events, events);
394 anfd->events = events; 470 anfd->events = events;
395 } 471 }
… …
398} 474}
399 475
400static void 476static void
401fd_change (EV_P_ int fd) 477fd_change (EV_P_ int fd)
402{ 478{
403 if (anfds [fd].reify) 479 if (expect_false (anfds [fd].reify))
404 return; 480 return;
405 481
406 anfds [fd].reify = 1; 482 anfds [fd].reify = 1;
407 483
408 ++fdchangecnt; 484 ++fdchangecnt;
409 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 485 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
410 fdchanges [fdchangecnt - 1] = fd; 486 fdchanges [fdchangecnt - 1] = fd;
411} 487}
412 488
413static void 489static void
414fd_kill (EV_P_ int fd) 490fd_kill (EV_P_ int fd)
… …
420 ev_io_stop (EV_A_ w); 496 ev_io_stop (EV_A_ w);
421 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 497 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
422 } 498 }
423} 499}
424 500
425static int 501inline int
426fd_valid (int fd) 502fd_valid (int fd)
427{ 503{
428#ifdef WIN32 504#ifdef _WIN32
429 return !!win32_get_osfhandle (fd); 505 return _get_osfhandle (fd) != -1;
430#else 506#else
431 return fcntl (fd, F_GETFD) != -1; 507 return fcntl (fd, F_GETFD) != -1;
432#endif 508#endif
433} 509}
434 510
… …
514 590
515 heap [k] = w; 591 heap [k] = w;
516 ((W)heap [k])->active = k + 1; 592 ((W)heap [k])->active = k + 1;
517} 593}
518 594
595inline void
596adjustheap (WT *heap, int N, int k)
597{
598 upheap (heap, k);
599 downheap (heap, N, k);
600}
601
519/*****************************************************************************/ 602/*****************************************************************************/
520 603
521typedef struct 604typedef struct
522{ 605{
523 WL head; 606 WL head;
… …
544} 627}
545 628
546static void 629static void
547sighandler (int signum) 630sighandler (int signum)
548{ 631{
549#if WIN32 632#if _WIN32
550 signal (signum, sighandler); 633 signal (signum, sighandler);
551#endif 634#endif
552 635
553 signals [signum - 1].gotsig = 1; 636 signals [signum - 1].gotsig = 1;
554 637
555 if (!gotsig) 638 if (!gotsig)
556 { 639 {
557 int old_errno = errno; 640 int old_errno = errno;
558 gotsig = 1; 641 gotsig = 1;
559#ifdef WIN32
560 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
561#else
562 write (sigpipe [1], &signum, 1); 642 write (sigpipe [1], &signum, 1);
563#endif
564 errno = old_errno; 643 errno = old_errno;
565 } 644 }
566} 645}
567 646
568void 647void
569ev_feed_signal_event (EV_P_ int signum) 648ev_feed_signal_event (EV_P_ int signum)
570{ 649{
571 WL w; 650 WL w;
572 651
573#if EV_MULTIPLICITY 652#if EV_MULTIPLICITY
574 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 653 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
575#endif 654#endif
576 655
577 --signum; 656 --signum;
578 657
579 if (signum < 0 || signum >= signalmax) 658 if (signum < 0 || signum >= signalmax)
… …
588static void 667static void
589sigcb (EV_P_ struct ev_io *iow, int revents) 668sigcb (EV_P_ struct ev_io *iow, int revents)
590{ 669{
591 int signum; 670 int signum;
592 671
593#ifdef WIN32
594 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
595#else
596 read (sigpipe [0], &revents, 1); 672 read (sigpipe [0], &revents, 1);
597#endif
598 gotsig = 0; 673 gotsig = 0;
599 674
600 for (signum = signalmax; signum--; ) 675 for (signum = signalmax; signum--; )
601 if (signals [signum].gotsig) 676 if (signals [signum].gotsig)
602 ev_feed_signal_event (EV_A_ signum + 1); 677 ev_feed_signal_event (EV_A_ signum + 1);
603} 678}
604 679
605static void 680static void
681fd_intern (int fd)
682{
683#ifdef _WIN32
684 int arg = 1;
685 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
686#else
687 fcntl (fd, F_SETFD, FD_CLOEXEC);
688 fcntl (fd, F_SETFL, O_NONBLOCK);
689#endif
690}
691
692static void
606siginit (EV_P) 693siginit (EV_P)
607{ 694{
608#ifndef WIN32 695 fd_intern (sigpipe [0]);
609 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 696 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 697
617 ev_io_set (&sigev, sigpipe [0], EV_READ); 698 ev_io_set (&sigev, sigpipe [0], EV_READ);
618 ev_io_start (EV_A_ &sigev); 699 ev_io_start (EV_A_ &sigev);
619 ev_unref (EV_A); /* child watcher should not keep loop alive */ 700 ev_unref (EV_A); /* child watcher should not keep loop alive */
620} 701}
621 702
622/*****************************************************************************/ 703/*****************************************************************************/
623 704
624static struct ev_child *childs [PID_HASHSIZE]; 705static struct ev_child *childs [PID_HASHSIZE];
625 706
626#ifndef WIN32 707#ifndef _WIN32
627 708
628static struct ev_signal childev; 709static struct ev_signal childev;
629 710
630#ifndef WCONTINUED 711#ifndef WCONTINUED
631# define WCONTINUED 0 712# define WCONTINUED 0
… …
663 744
664#endif 745#endif
665 746
666/*****************************************************************************/ 747/*****************************************************************************/
667 748
749#if EV_USE_PORT
750# include "ev_port.c"
751#endif
668#if EV_USE_KQUEUE 752#if EV_USE_KQUEUE
669# include "ev_kqueue.c" 753# include "ev_kqueue.c"
670#endif 754#endif
671#if EV_USE_EPOLL 755#if EV_USE_EPOLL
672# include "ev_epoll.c" 756# include "ev_epoll.c"
… …
692 776
693/* return true if we are running with elevated privileges and should ignore env variables */ 777/* return true if we are running with elevated privileges and should ignore env variables */
694static int 778static int
695enable_secure (void) 779enable_secure (void)
696{ 780{
697#ifdef WIN32 781#ifdef _WIN32
698 return 0; 782 return 0;
699#else 783#else
700 return getuid () != geteuid () 784 return getuid () != geteuid ()
701 || getgid () != getegid (); 785 || getgid () != getegid ();
702#endif 786#endif
703} 787}
704 788
705int 789unsigned int
706ev_method (EV_P) 790ev_method (EV_P)
707{ 791{
708 return method; 792 return method;
709} 793}
710 794
711static void 795static void
712loop_init (EV_P_ int methods) 796loop_init (EV_P_ unsigned int flags)
713{ 797{
714 if (!method) 798 if (!method)
715 { 799 {
716#if EV_USE_MONOTONIC 800#if EV_USE_MONOTONIC
717 { 801 {
… …
719 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 803 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
720 have_monotonic = 1; 804 have_monotonic = 1;
721 } 805 }
722#endif 806#endif
723 807
724 rt_now = ev_time (); 808 ev_rt_now = ev_time ();
725 mn_now = get_clock (); 809 mn_now = get_clock ();
726 now_floor = mn_now; 810 now_floor = mn_now;
727 rtmn_diff = rt_now - mn_now; 811 rtmn_diff = ev_rt_now - mn_now;
728 812
729 if (methods == EVMETHOD_AUTO) 813 if (!(flags & EVFLAG_NOENV)
730 if (!enable_secure () && getenv ("LIBEV_METHODS")) 814 && !enable_secure ()
815 && getenv ("LIBEV_FLAGS"))
731 methods = atoi (getenv ("LIBEV_METHODS")); 816 flags = atoi (getenv ("LIBEV_FLAGS"));
817
818 if (!(flags & EVMETHOD_ALL))
732 else 819 {
733 methods = EVMETHOD_ANY; 820 flags |= EVMETHOD_ALL;
821#if EV_USE_KQUEUE && !defined (__NetBSD__)
822 /* kqueue is borked on everything but netbsd apparently */
823 /* it usually doesn't work correctly on anything but sockets and pipes */
824 flags &= ~EVMETHOD_KQUEUE;
825#endif
826 }
734 827
735 method = 0; 828 method = 0;
736#if EV_USE_WIN32 829#if EV_USE_PORT
737 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 830 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
738#endif 831#endif
739#if EV_USE_KQUEUE 832#if EV_USE_KQUEUE
740 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 833 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
741#endif 834#endif
742#if EV_USE_EPOLL 835#if EV_USE_EPOLL
743 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 836 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
744#endif 837#endif
745#if EV_USE_POLL 838#if EV_USE_POLL
746 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 839 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
747#endif 840#endif
748#if EV_USE_SELECT 841#if EV_USE_SELECT
749 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 842 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
750#endif 843#endif
751 844
752 ev_watcher_init (&sigev, sigcb); 845 ev_init (&sigev, sigcb);
753 ev_set_priority (&sigev, EV_MAXPRI); 846 ev_set_priority (&sigev, EV_MAXPRI);
754 } 847 }
755} 848}
756 849
757void 850static void
758loop_destroy (EV_P) 851loop_destroy (EV_P)
759{ 852{
760 int i; 853 int i;
761 854
762#if EV_USE_WIN32 855#if EV_USE_PORT
763 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 856 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
764#endif 857#endif
765#if EV_USE_KQUEUE 858#if EV_USE_KQUEUE
766 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 859 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
767#endif 860#endif
768#if EV_USE_EPOLL 861#if EV_USE_EPOLL
… …
777 870
778 for (i = NUMPRI; i--; ) 871 for (i = NUMPRI; i--; )
779 array_free (pending, [i]); 872 array_free (pending, [i]);
780 873
781 /* have to use the microsoft-never-gets-it-right macro */ 874 /* have to use the microsoft-never-gets-it-right macro */
782 array_free_microshit (fdchange); 875 array_free (fdchange, EMPTY0);
783 array_free_microshit (timer); 876 array_free (timer, EMPTY0);
784 array_free_microshit (periodic); 877#if EV_PERIODICS
785 array_free_microshit (idle); 878 array_free (periodic, EMPTY0);
786 array_free_microshit (prepare); 879#endif
787 array_free_microshit (check); 880 array_free (idle, EMPTY0);
881 array_free (prepare, EMPTY0);
882 array_free (check, EMPTY0);
788 883
789 method = 0; 884 method = 0;
790} 885}
791 886
792static void 887static void
793loop_fork (EV_P) 888loop_fork (EV_P)
794{ 889{
890#if EV_USE_PORT
891 if (method == EVMETHOD_PORT ) port_fork (EV_A);
892#endif
893#if EV_USE_KQUEUE
894 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
895#endif
795#if EV_USE_EPOLL 896#if EV_USE_EPOLL
796 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 897 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 898#endif
801 899
802 if (ev_is_active (&sigev)) 900 if (ev_is_active (&sigev))
803 { 901 {
804 /* default loop */ 902 /* default loop */
… …
817 postfork = 0; 915 postfork = 0;
818} 916}
819 917
820#if EV_MULTIPLICITY 918#if EV_MULTIPLICITY
821struct ev_loop * 919struct ev_loop *
822ev_loop_new (int methods) 920ev_loop_new (unsigned int flags)
823{ 921{
824 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 922 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
825 923
826 memset (loop, 0, sizeof (struct ev_loop)); 924 memset (loop, 0, sizeof (struct ev_loop));
827 925
828 loop_init (EV_A_ methods); 926 loop_init (EV_A_ flags);
829 927
830 if (ev_method (EV_A)) 928 if (ev_method (EV_A))
831 return loop; 929 return loop;
832 930
833 return 0; 931 return 0;
… …
848 946
849#endif 947#endif
850 948
851#if EV_MULTIPLICITY 949#if EV_MULTIPLICITY
852struct ev_loop * 950struct ev_loop *
951ev_default_loop_init (unsigned int flags)
853#else 952#else
854int 953int
954ev_default_loop (unsigned int flags)
855#endif 955#endif
856ev_default_loop (int methods)
857{ 956{
858 if (sigpipe [0] == sigpipe [1]) 957 if (sigpipe [0] == sigpipe [1])
859 if (pipe (sigpipe)) 958 if (pipe (sigpipe))
860 return 0; 959 return 0;
861 960
862 if (!default_loop) 961 if (!ev_default_loop_ptr)
863 { 962 {
864#if EV_MULTIPLICITY 963#if EV_MULTIPLICITY
865 struct ev_loop *loop = default_loop = &default_loop_struct; 964 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
866#else 965#else
867 default_loop = 1; 966 ev_default_loop_ptr = 1;
868#endif 967#endif
869 968
870 loop_init (EV_A_ methods); 969 loop_init (EV_A_ flags);
871 970
872 if (ev_method (EV_A)) 971 if (ev_method (EV_A))
873 { 972 {
874 siginit (EV_A); 973 siginit (EV_A);
875 974
876#ifndef WIN32 975#ifndef _WIN32
877 ev_signal_init (&childev, childcb, SIGCHLD); 976 ev_signal_init (&childev, childcb, SIGCHLD);
878 ev_set_priority (&childev, EV_MAXPRI); 977 ev_set_priority (&childev, EV_MAXPRI);
879 ev_signal_start (EV_A_ &childev); 978 ev_signal_start (EV_A_ &childev);
880 ev_unref (EV_A); /* child watcher should not keep loop alive */ 979 ev_unref (EV_A); /* child watcher should not keep loop alive */
881#endif 980#endif
882 } 981 }
883 else 982 else
884 default_loop = 0; 983 ev_default_loop_ptr = 0;
885 } 984 }
886 985
887 return default_loop; 986 return ev_default_loop_ptr;
888} 987}
889 988
890void 989void
891ev_default_destroy (void) 990ev_default_destroy (void)
892{ 991{
893#if EV_MULTIPLICITY 992#if EV_MULTIPLICITY
894 struct ev_loop *loop = default_loop; 993 struct ev_loop *loop = ev_default_loop_ptr;
895#endif 994#endif
896 995
897#ifndef WIN32 996#ifndef _WIN32
898 ev_ref (EV_A); /* child watcher */ 997 ev_ref (EV_A); /* child watcher */
899 ev_signal_stop (EV_A_ &childev); 998 ev_signal_stop (EV_A_ &childev);
900#endif 999#endif
901 1000
902 ev_ref (EV_A); /* signal watcher */ 1001 ev_ref (EV_A); /* signal watcher */
… …
910 1009
911void 1010void
912ev_default_fork (void) 1011ev_default_fork (void)
913{ 1012{
914#if EV_MULTIPLICITY 1013#if EV_MULTIPLICITY
915 struct ev_loop *loop = default_loop; 1014 struct ev_loop *loop = ev_default_loop_ptr;
916#endif 1015#endif
917 1016
918 if (method) 1017 if (method)
919 postfork = 1; 1018 postfork = 1;
920} 1019}
… …
931 return 1; 1030 return 1;
932 1031
933 return 0; 1032 return 0;
934} 1033}
935 1034
936static void 1035inline void
937call_pending (EV_P) 1036call_pending (EV_P)
938{ 1037{
939 int pri; 1038 int pri;
940 1039
941 for (pri = NUMPRI; pri--; ) 1040 for (pri = NUMPRI; pri--; )
942 while (pendingcnt [pri]) 1041 while (pendingcnt [pri])
943 { 1042 {
944 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1043 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
945 1044
946 if (p->w) 1045 if (expect_true (p->w))
947 { 1046 {
948 p->w->pending = 0; 1047 p->w->pending = 0;
949 p->w->cb (EV_A_ p->w, p->events); 1048 EV_CB_INVOKE (p->w, p->events);
950 } 1049 }
951 } 1050 }
952} 1051}
953 1052
954static void 1053inline void
955timers_reify (EV_P) 1054timers_reify (EV_P)
956{ 1055{
957 while (timercnt && ((WT)timers [0])->at <= mn_now) 1056 while (timercnt && ((WT)timers [0])->at <= mn_now)
958 { 1057 {
959 struct ev_timer *w = timers [0]; 1058 struct ev_timer *w = timers [0];
… …
962 1061
963 /* first reschedule or stop timer */ 1062 /* first reschedule or stop timer */
964 if (w->repeat) 1063 if (w->repeat)
965 { 1064 {
966 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1065 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1066
967 ((WT)w)->at = mn_now + w->repeat; 1067 ((WT)w)->at += w->repeat;
1068 if (((WT)w)->at < mn_now)
1069 ((WT)w)->at = mn_now;
1070
968 downheap ((WT *)timers, timercnt, 0); 1071 downheap ((WT *)timers, timercnt, 0);
969 } 1072 }
970 else 1073 else
971 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1074 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
972 1075
973 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1076 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
974 } 1077 }
975} 1078}
976 1079
977static void 1080#if EV_PERIODICS
1081inline void
978periodics_reify (EV_P) 1082periodics_reify (EV_P)
979{ 1083{
980 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1084 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
981 { 1085 {
982 struct ev_periodic *w = periodics [0]; 1086 struct ev_periodic *w = periodics [0];
983 1087
984 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1088 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
985 1089
986 /* first reschedule or stop timer */ 1090 /* first reschedule or stop timer */
987 if (w->reschedule_cb) 1091 if (w->reschedule_cb)
988 { 1092 {
989 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1093 ((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)); 1094 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
992 downheap ((WT *)periodics, periodiccnt, 0); 1095 downheap ((WT *)periodics, periodiccnt, 0);
993 } 1096 }
994 else if (w->interval) 1097 else if (w->interval)
995 { 1098 {
996 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1099 ((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)); 1100 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); 1101 downheap ((WT *)periodics, periodiccnt, 0);
999 } 1102 }
1000 else 1103 else
1001 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1104 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1002 1105
… …
1013 for (i = 0; i < periodiccnt; ++i) 1116 for (i = 0; i < periodiccnt; ++i)
1014 { 1117 {
1015 struct ev_periodic *w = periodics [i]; 1118 struct ev_periodic *w = periodics [i];
1016 1119
1017 if (w->reschedule_cb) 1120 if (w->reschedule_cb)
1018 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1121 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1019 else if (w->interval) 1122 else if (w->interval)
1020 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1123 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1021 } 1124 }
1022 1125
1023 /* now rebuild the heap */ 1126 /* now rebuild the heap */
1024 for (i = periodiccnt >> 1; i--; ) 1127 for (i = periodiccnt >> 1; i--; )
1025 downheap ((WT *)periodics, periodiccnt, i); 1128 downheap ((WT *)periodics, periodiccnt, i);
1026} 1129}
1130#endif
1027 1131
1028inline int 1132inline int
1029time_update_monotonic (EV_P) 1133time_update_monotonic (EV_P)
1030{ 1134{
1031 mn_now = get_clock (); 1135 mn_now = get_clock ();
1032 1136
1033 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1137 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1034 { 1138 {
1035 rt_now = rtmn_diff + mn_now; 1139 ev_rt_now = rtmn_diff + mn_now;
1036 return 0; 1140 return 0;
1037 } 1141 }
1038 else 1142 else
1039 { 1143 {
1040 now_floor = mn_now; 1144 now_floor = mn_now;
1041 rt_now = ev_time (); 1145 ev_rt_now = ev_time ();
1042 return 1; 1146 return 1;
1043 } 1147 }
1044} 1148}
1045 1149
1046static void 1150inline void
1047time_update (EV_P) 1151time_update (EV_P)
1048{ 1152{
1049 int i; 1153 int i;
1050 1154
1051#if EV_USE_MONOTONIC 1155#if EV_USE_MONOTONIC
… …
1055 { 1159 {
1056 ev_tstamp odiff = rtmn_diff; 1160 ev_tstamp odiff = rtmn_diff;
1057 1161
1058 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1162 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1059 { 1163 {
1060 rtmn_diff = rt_now - mn_now; 1164 rtmn_diff = ev_rt_now - mn_now;
1061 1165
1062 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1166 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1063 return; /* all is well */ 1167 return; /* all is well */
1064 1168
1065 rt_now = ev_time (); 1169 ev_rt_now = ev_time ();
1066 mn_now = get_clock (); 1170 mn_now = get_clock ();
1067 now_floor = mn_now; 1171 now_floor = mn_now;
1068 } 1172 }
1069 1173
1174# if EV_PERIODICS
1070 periodics_reschedule (EV_A); 1175 periodics_reschedule (EV_A);
1176# endif
1071 /* no timer adjustment, as the monotonic clock doesn't jump */ 1177 /* no timer adjustment, as the monotonic clock doesn't jump */
1072 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1178 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1073 } 1179 }
1074 } 1180 }
1075 else 1181 else
1076#endif 1182#endif
1077 { 1183 {
1078 rt_now = ev_time (); 1184 ev_rt_now = ev_time ();
1079 1185
1080 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1186 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1081 { 1187 {
1188#if EV_PERIODICS
1082 periodics_reschedule (EV_A); 1189 periodics_reschedule (EV_A);
1190#endif
1083 1191
1084 /* adjust timers. this is easy, as the offset is the same for all */ 1192 /* adjust timers. this is easy, as the offset is the same for all */
1085 for (i = 0; i < timercnt; ++i) 1193 for (i = 0; i < timercnt; ++i)
1086 ((WT)timers [i])->at += rt_now - mn_now; 1194 ((WT)timers [i])->at += ev_rt_now - mn_now;
1087 } 1195 }
1088 1196
1089 mn_now = rt_now; 1197 mn_now = ev_rt_now;
1090 } 1198 }
1091} 1199}
1092 1200
1093void 1201void
1094ev_ref (EV_P) 1202ev_ref (EV_P)
… …
1108ev_loop (EV_P_ int flags) 1216ev_loop (EV_P_ int flags)
1109{ 1217{
1110 double block; 1218 double block;
1111 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1219 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1112 1220
1113 do 1221 while (activecnt)
1114 { 1222 {
1115 /* queue check watchers (and execute them) */ 1223 /* queue check watchers (and execute them) */
1116 if (expect_false (preparecnt)) 1224 if (expect_false (preparecnt))
1117 { 1225 {
1118 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1226 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1134 if (expect_true (have_monotonic)) 1242 if (expect_true (have_monotonic))
1135 time_update_monotonic (EV_A); 1243 time_update_monotonic (EV_A);
1136 else 1244 else
1137#endif 1245#endif
1138 { 1246 {
1139 rt_now = ev_time (); 1247 ev_rt_now = ev_time ();
1140 mn_now = rt_now; 1248 mn_now = ev_rt_now;
1141 } 1249 }
1142 1250
1143 if (flags & EVLOOP_NONBLOCK || idlecnt) 1251 if (flags & EVLOOP_NONBLOCK || idlecnt)
1144 block = 0.; 1252 block = 0.;
1145 else 1253 else
… …
1150 { 1258 {
1151 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1259 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1152 if (block > to) block = to; 1260 if (block > to) block = to;
1153 } 1261 }
1154 1262
1263#if EV_PERIODICS
1155 if (periodiccnt) 1264 if (periodiccnt)
1156 { 1265 {
1157 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1266 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1158 if (block > to) block = to; 1267 if (block > to) block = to;
1159 } 1268 }
1269#endif
1160 1270
1161 if (block < 0.) block = 0.; 1271 if (expect_false (block < 0.)) block = 0.;
1162 } 1272 }
1163 1273
1164 method_poll (EV_A_ block); 1274 method_poll (EV_A_ block);
1165 1275
1166 /* update rt_now, do magic */ 1276 /* update ev_rt_now, do magic */
1167 time_update (EV_A); 1277 time_update (EV_A);
1168 1278
1169 /* queue pending timers and reschedule them */ 1279 /* queue pending timers and reschedule them */
1170 timers_reify (EV_A); /* relative timers called last */ 1280 timers_reify (EV_A); /* relative timers called last */
1281#if EV_PERIODICS
1171 periodics_reify (EV_A); /* absolute timers called first */ 1282 periodics_reify (EV_A); /* absolute timers called first */
1283#endif
1172 1284
1173 /* queue idle watchers unless io or timers are pending */ 1285 /* queue idle watchers unless io or timers are pending */
1174 if (idlecnt && !any_pending (EV_A)) 1286 if (idlecnt && !any_pending (EV_A))
1175 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1287 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1176 1288
1177 /* queue check watchers, to be executed first */ 1289 /* queue check watchers, to be executed first */
1178 if (checkcnt) 1290 if (expect_false (checkcnt))
1179 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1291 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1180 1292
1181 call_pending (EV_A); 1293 call_pending (EV_A);
1294
1295 if (expect_false (loop_done))
1296 break;
1182 } 1297 }
1183 while (activecnt && !loop_done);
1184 1298
1185 if (loop_done != 2) 1299 if (loop_done != 2)
1186 loop_done = 0; 1300 loop_done = 0;
1187} 1301}
1188 1302
… …
1248void 1362void
1249ev_io_start (EV_P_ struct ev_io *w) 1363ev_io_start (EV_P_ struct ev_io *w)
1250{ 1364{
1251 int fd = w->fd; 1365 int fd = w->fd;
1252 1366
1253 if (ev_is_active (w)) 1367 if (expect_false (ev_is_active (w)))
1254 return; 1368 return;
1255 1369
1256 assert (("ev_io_start called with negative fd", fd >= 0)); 1370 assert (("ev_io_start called with negative fd", fd >= 0));
1257 1371
1258 ev_start (EV_A_ (W)w, 1); 1372 ev_start (EV_A_ (W)w, 1);
… …
1264 1378
1265void 1379void
1266ev_io_stop (EV_P_ struct ev_io *w) 1380ev_io_stop (EV_P_ struct ev_io *w)
1267{ 1381{
1268 ev_clear_pending (EV_A_ (W)w); 1382 ev_clear_pending (EV_A_ (W)w);
1269 if (!ev_is_active (w)) 1383 if (expect_false (!ev_is_active (w)))
1270 return; 1384 return;
1385
1386 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1271 1387
1272 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1388 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1273 ev_stop (EV_A_ (W)w); 1389 ev_stop (EV_A_ (W)w);
1274 1390
1275 fd_change (EV_A_ w->fd); 1391 fd_change (EV_A_ w->fd);
1276} 1392}
1277 1393
1278void 1394void
1279ev_timer_start (EV_P_ struct ev_timer *w) 1395ev_timer_start (EV_P_ struct ev_timer *w)
1280{ 1396{
1281 if (ev_is_active (w)) 1397 if (expect_false (ev_is_active (w)))
1282 return; 1398 return;
1283 1399
1284 ((WT)w)->at += mn_now; 1400 ((WT)w)->at += mn_now;
1285 1401
1286 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1402 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1287 1403
1288 ev_start (EV_A_ (W)w, ++timercnt); 1404 ev_start (EV_A_ (W)w, ++timercnt);
1289 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1405 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1290 timers [timercnt - 1] = w; 1406 timers [timercnt - 1] = w;
1291 upheap ((WT *)timers, timercnt - 1); 1407 upheap ((WT *)timers, timercnt - 1);
1292 1408
1293 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1409 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1294} 1410}
1295 1411
1296void 1412void
1297ev_timer_stop (EV_P_ struct ev_timer *w) 1413ev_timer_stop (EV_P_ struct ev_timer *w)
1298{ 1414{
1299 ev_clear_pending (EV_A_ (W)w); 1415 ev_clear_pending (EV_A_ (W)w);
1300 if (!ev_is_active (w)) 1416 if (expect_false (!ev_is_active (w)))
1301 return; 1417 return;
1302 1418
1303 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1419 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1304 1420
1305 if (((W)w)->active < timercnt--) 1421 if (expect_true (((W)w)->active < timercnt--))
1306 { 1422 {
1307 timers [((W)w)->active - 1] = timers [timercnt]; 1423 timers [((W)w)->active - 1] = timers [timercnt];
1308 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1424 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1309 } 1425 }
1310 1426
1311 ((WT)w)->at = w->repeat; 1427 ((WT)w)->at -= mn_now;
1312 1428
1313 ev_stop (EV_A_ (W)w); 1429 ev_stop (EV_A_ (W)w);
1314} 1430}
1315 1431
1316void 1432void
… …
1319 if (ev_is_active (w)) 1435 if (ev_is_active (w))
1320 { 1436 {
1321 if (w->repeat) 1437 if (w->repeat)
1322 { 1438 {
1323 ((WT)w)->at = mn_now + w->repeat; 1439 ((WT)w)->at = mn_now + w->repeat;
1324 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1440 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1325 } 1441 }
1326 else 1442 else
1327 ev_timer_stop (EV_A_ w); 1443 ev_timer_stop (EV_A_ w);
1328 } 1444 }
1329 else if (w->repeat) 1445 else if (w->repeat)
1446 {
1447 w->at = w->repeat;
1330 ev_timer_start (EV_A_ w); 1448 ev_timer_start (EV_A_ w);
1449 }
1331} 1450}
1332 1451
1452#if EV_PERIODICS
1333void 1453void
1334ev_periodic_start (EV_P_ struct ev_periodic *w) 1454ev_periodic_start (EV_P_ struct ev_periodic *w)
1335{ 1455{
1336 if (ev_is_active (w)) 1456 if (expect_false (ev_is_active (w)))
1337 return; 1457 return;
1338 1458
1339 if (w->reschedule_cb) 1459 if (w->reschedule_cb)
1340 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1460 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1341 else if (w->interval) 1461 else if (w->interval)
1342 { 1462 {
1343 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1463 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 */ 1464 /* 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; 1465 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1346 } 1466 }
1347 1467
1348 ev_start (EV_A_ (W)w, ++periodiccnt); 1468 ev_start (EV_A_ (W)w, ++periodiccnt);
1349 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1469 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1350 periodics [periodiccnt - 1] = w; 1470 periodics [periodiccnt - 1] = w;
1351 upheap ((WT *)periodics, periodiccnt - 1); 1471 upheap ((WT *)periodics, periodiccnt - 1);
1352 1472
1353 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1473 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1354} 1474}
1355 1475
1356void 1476void
1357ev_periodic_stop (EV_P_ struct ev_periodic *w) 1477ev_periodic_stop (EV_P_ struct ev_periodic *w)
1358{ 1478{
1359 ev_clear_pending (EV_A_ (W)w); 1479 ev_clear_pending (EV_A_ (W)w);
1360 if (!ev_is_active (w)) 1480 if (expect_false (!ev_is_active (w)))
1361 return; 1481 return;
1362 1482
1363 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1483 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1364 1484
1365 if (((W)w)->active < periodiccnt--) 1485 if (expect_true (((W)w)->active < periodiccnt--))
1366 { 1486 {
1367 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1487 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1368 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1488 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1369 } 1489 }
1370 1490
1371 ev_stop (EV_A_ (W)w); 1491 ev_stop (EV_A_ (W)w);
1372} 1492}
1373 1493
1374void 1494void
1375ev_periodic_again (EV_P_ struct ev_periodic *w) 1495ev_periodic_again (EV_P_ struct ev_periodic *w)
1376{ 1496{
1497 /* TODO: use adjustheap and recalculation */
1377 ev_periodic_stop (EV_A_ w); 1498 ev_periodic_stop (EV_A_ w);
1378 ev_periodic_start (EV_A_ w); 1499 ev_periodic_start (EV_A_ w);
1379} 1500}
1501#endif
1380 1502
1381void 1503void
1382ev_idle_start (EV_P_ struct ev_idle *w) 1504ev_idle_start (EV_P_ struct ev_idle *w)
1383{ 1505{
1384 if (ev_is_active (w)) 1506 if (expect_false (ev_is_active (w)))
1385 return; 1507 return;
1386 1508
1387 ev_start (EV_A_ (W)w, ++idlecnt); 1509 ev_start (EV_A_ (W)w, ++idlecnt);
1388 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1510 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1389 idles [idlecnt - 1] = w; 1511 idles [idlecnt - 1] = w;
1390} 1512}
1391 1513
1392void 1514void
1393ev_idle_stop (EV_P_ struct ev_idle *w) 1515ev_idle_stop (EV_P_ struct ev_idle *w)
1394{ 1516{
1395 ev_clear_pending (EV_A_ (W)w); 1517 ev_clear_pending (EV_A_ (W)w);
1396 if (ev_is_active (w)) 1518 if (expect_false (!ev_is_active (w)))
1397 return; 1519 return;
1398 1520
1399 idles [((W)w)->active - 1] = idles [--idlecnt]; 1521 idles [((W)w)->active - 1] = idles [--idlecnt];
1400 ev_stop (EV_A_ (W)w); 1522 ev_stop (EV_A_ (W)w);
1401} 1523}
1402 1524
1403void 1525void
1404ev_prepare_start (EV_P_ struct ev_prepare *w) 1526ev_prepare_start (EV_P_ struct ev_prepare *w)
1405{ 1527{
1406 if (ev_is_active (w)) 1528 if (expect_false (ev_is_active (w)))
1407 return; 1529 return;
1408 1530
1409 ev_start (EV_A_ (W)w, ++preparecnt); 1531 ev_start (EV_A_ (W)w, ++preparecnt);
1410 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1532 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1411 prepares [preparecnt - 1] = w; 1533 prepares [preparecnt - 1] = w;
1412} 1534}
1413 1535
1414void 1536void
1415ev_prepare_stop (EV_P_ struct ev_prepare *w) 1537ev_prepare_stop (EV_P_ struct ev_prepare *w)
1416{ 1538{
1417 ev_clear_pending (EV_A_ (W)w); 1539 ev_clear_pending (EV_A_ (W)w);
1418 if (ev_is_active (w)) 1540 if (expect_false (!ev_is_active (w)))
1419 return; 1541 return;
1420 1542
1421 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1543 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1422 ev_stop (EV_A_ (W)w); 1544 ev_stop (EV_A_ (W)w);
1423} 1545}
1424 1546
1425void 1547void
1426ev_check_start (EV_P_ struct ev_check *w) 1548ev_check_start (EV_P_ struct ev_check *w)
1427{ 1549{
1428 if (ev_is_active (w)) 1550 if (expect_false (ev_is_active (w)))
1429 return; 1551 return;
1430 1552
1431 ev_start (EV_A_ (W)w, ++checkcnt); 1553 ev_start (EV_A_ (W)w, ++checkcnt);
1432 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1554 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1433 checks [checkcnt - 1] = w; 1555 checks [checkcnt - 1] = w;
1434} 1556}
1435 1557
1436void 1558void
1437ev_check_stop (EV_P_ struct ev_check *w) 1559ev_check_stop (EV_P_ struct ev_check *w)
1438{ 1560{
1439 ev_clear_pending (EV_A_ (W)w); 1561 ev_clear_pending (EV_A_ (W)w);
1440 if (ev_is_active (w)) 1562 if (expect_false (!ev_is_active (w)))
1441 return; 1563 return;
1442 1564
1443 checks [((W)w)->active - 1] = checks [--checkcnt]; 1565 checks [((W)w)->active - 1] = checks [--checkcnt];
1444 ev_stop (EV_A_ (W)w); 1566 ev_stop (EV_A_ (W)w);
1445} 1567}
… …
1450 1572
1451void 1573void
1452ev_signal_start (EV_P_ struct ev_signal *w) 1574ev_signal_start (EV_P_ struct ev_signal *w)
1453{ 1575{
1454#if EV_MULTIPLICITY 1576#if EV_MULTIPLICITY
1455 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1577 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1456#endif 1578#endif
1457 if (ev_is_active (w)) 1579 if (expect_false (ev_is_active (w)))
1458 return; 1580 return;
1459 1581
1460 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1582 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1461 1583
1462 ev_start (EV_A_ (W)w, 1); 1584 ev_start (EV_A_ (W)w, 1);
1463 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1585 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1464 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1586 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1465 1587
1466 if (!((WL)w)->next) 1588 if (!((WL)w)->next)
1467 { 1589 {
1468#if WIN32 1590#if _WIN32
1469 signal (w->signum, sighandler); 1591 signal (w->signum, sighandler);
1470#else 1592#else
1471 struct sigaction sa; 1593 struct sigaction sa;
1472 sa.sa_handler = sighandler; 1594 sa.sa_handler = sighandler;
1473 sigfillset (&sa.sa_mask); 1595 sigfillset (&sa.sa_mask);
… …
1479 1601
1480void 1602void
1481ev_signal_stop (EV_P_ struct ev_signal *w) 1603ev_signal_stop (EV_P_ struct ev_signal *w)
1482{ 1604{
1483 ev_clear_pending (EV_A_ (W)w); 1605 ev_clear_pending (EV_A_ (W)w);
1484 if (!ev_is_active (w)) 1606 if (expect_false (!ev_is_active (w)))
1485 return; 1607 return;
1486 1608
1487 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1609 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1488 ev_stop (EV_A_ (W)w); 1610 ev_stop (EV_A_ (W)w);
1489 1611
… …
1493 1615
1494void 1616void
1495ev_child_start (EV_P_ struct ev_child *w) 1617ev_child_start (EV_P_ struct ev_child *w)
1496{ 1618{
1497#if EV_MULTIPLICITY 1619#if EV_MULTIPLICITY
1498 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1620 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1499#endif 1621#endif
1500 if (ev_is_active (w)) 1622 if (expect_false (ev_is_active (w)))
1501 return; 1623 return;
1502 1624
1503 ev_start (EV_A_ (W)w, 1); 1625 ev_start (EV_A_ (W)w, 1);
1504 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1626 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1505} 1627}
1506 1628
1507void 1629void
1508ev_child_stop (EV_P_ struct ev_child *w) 1630ev_child_stop (EV_P_ struct ev_child *w)
1509{ 1631{
1510 ev_clear_pending (EV_A_ (W)w); 1632 ev_clear_pending (EV_A_ (W)w);
1511 if (ev_is_active (w)) 1633 if (expect_false (!ev_is_active (w)))
1512 return; 1634 return;
1513 1635
1514 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1636 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1515 ev_stop (EV_A_ (W)w); 1637 ev_stop (EV_A_ (W)w);
1516} 1638}
… …
1553void 1675void
1554ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1676ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1555{ 1677{
1556 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1678 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1557 1679
1558 if (!once) 1680 if (expect_false (!once))
1681 {
1559 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1682 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1560 else 1683 return;
1561 { 1684 }
1685
1562 once->cb = cb; 1686 once->cb = cb;
1563 once->arg = arg; 1687 once->arg = arg;
1564 1688
1565 ev_watcher_init (&once->io, once_cb_io); 1689 ev_init (&once->io, once_cb_io);
1566 if (fd >= 0) 1690 if (fd >= 0)
1567 { 1691 {
1568 ev_io_set (&once->io, fd, events); 1692 ev_io_set (&once->io, fd, events);
1569 ev_io_start (EV_A_ &once->io); 1693 ev_io_start (EV_A_ &once->io);
1570 } 1694 }
1571 1695
1572 ev_watcher_init (&once->to, once_cb_to); 1696 ev_init (&once->to, once_cb_to);
1573 if (timeout >= 0.) 1697 if (timeout >= 0.)
1574 { 1698 {
1575 ev_timer_set (&once->to, timeout, 0.); 1699 ev_timer_set (&once->to, timeout, 0.);
1576 ev_timer_start (EV_A_ &once->to); 1700 ev_timer_start (EV_A_ &once->to);
1577 }
1578 } 1701 }
1579} 1702}
1580 1703
1704#ifdef __cplusplus
1705}
1706#endif
1707

Diff Legend

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