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.127 by root, Sun Nov 18 02:17:57 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) && !enable_secure () && getenv ("LIBEV_FLAGS"))
730 if (!enable_secure () && getenv ("LIBEV_METHODS"))
731 methods = atoi (getenv ("LIBEV_METHODS")); 814 flags = atoi (getenv ("LIBEV_FLAGS"));
732 else 815
733 methods = EVMETHOD_ANY; 816 if (!(flags & 0x0000ffff))
817 flags |= 0x0000ffff;
734 818
735 method = 0; 819 method = 0;
736#if EV_USE_WIN32 820#if EV_USE_PORT
737 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 821 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
738#endif 822#endif
739#if EV_USE_KQUEUE 823#if EV_USE_KQUEUE
740 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 824 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
741#endif 825#endif
742#if EV_USE_EPOLL 826#if EV_USE_EPOLL
743 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 827 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
744#endif 828#endif
745#if EV_USE_POLL 829#if EV_USE_POLL
746 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 830 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
747#endif 831#endif
748#if EV_USE_SELECT 832#if EV_USE_SELECT
749 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 833 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
750#endif 834#endif
751 835
752 ev_watcher_init (&sigev, sigcb); 836 ev_init (&sigev, sigcb);
753 ev_set_priority (&sigev, EV_MAXPRI); 837 ev_set_priority (&sigev, EV_MAXPRI);
754 } 838 }
755} 839}
756 840
757void 841static void
758loop_destroy (EV_P) 842loop_destroy (EV_P)
759{ 843{
760 int i; 844 int i;
761 845
762#if EV_USE_WIN32 846#if EV_USE_PORT
763 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 847 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
764#endif 848#endif
765#if EV_USE_KQUEUE 849#if EV_USE_KQUEUE
766 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 850 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
767#endif 851#endif
768#if EV_USE_EPOLL 852#if EV_USE_EPOLL
777 861
778 for (i = NUMPRI; i--; ) 862 for (i = NUMPRI; i--; )
779 array_free (pending, [i]); 863 array_free (pending, [i]);
780 864
781 /* have to use the microsoft-never-gets-it-right macro */ 865 /* have to use the microsoft-never-gets-it-right macro */
782 array_free_microshit (fdchange); 866 array_free (fdchange, EMPTY0);
783 array_free_microshit (timer); 867 array_free (timer, EMPTY0);
784 array_free_microshit (periodic); 868#if EV_PERIODICS
785 array_free_microshit (idle); 869 array_free (periodic, EMPTY0);
786 array_free_microshit (prepare); 870#endif
787 array_free_microshit (check); 871 array_free (idle, EMPTY0);
872 array_free (prepare, EMPTY0);
873 array_free (check, EMPTY0);
788 874
789 method = 0; 875 method = 0;
790} 876}
791 877
792static void 878static void
793loop_fork (EV_P) 879loop_fork (EV_P)
794{ 880{
881#if EV_USE_PORT
882 if (method == EVMETHOD_PORT ) port_fork (EV_A);
883#endif
884#if EV_USE_KQUEUE
885 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
886#endif
795#if EV_USE_EPOLL 887#if EV_USE_EPOLL
796 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 888 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 889#endif
801 890
802 if (ev_is_active (&sigev)) 891 if (ev_is_active (&sigev))
803 { 892 {
804 /* default loop */ 893 /* default loop */
817 postfork = 0; 906 postfork = 0;
818} 907}
819 908
820#if EV_MULTIPLICITY 909#if EV_MULTIPLICITY
821struct ev_loop * 910struct ev_loop *
822ev_loop_new (int methods) 911ev_loop_new (unsigned int flags)
823{ 912{
824 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 913 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
825 914
826 memset (loop, 0, sizeof (struct ev_loop)); 915 memset (loop, 0, sizeof (struct ev_loop));
827 916
828 loop_init (EV_A_ methods); 917 loop_init (EV_A_ flags);
829 918
830 if (ev_method (EV_A)) 919 if (ev_method (EV_A))
831 return loop; 920 return loop;
832 921
833 return 0; 922 return 0;
848 937
849#endif 938#endif
850 939
851#if EV_MULTIPLICITY 940#if EV_MULTIPLICITY
852struct ev_loop * 941struct ev_loop *
942ev_default_loop_init (unsigned int flags)
853#else 943#else
854int 944int
945ev_default_loop (unsigned int flags)
855#endif 946#endif
856ev_default_loop (int methods)
857{ 947{
858 if (sigpipe [0] == sigpipe [1]) 948 if (sigpipe [0] == sigpipe [1])
859 if (pipe (sigpipe)) 949 if (pipe (sigpipe))
860 return 0; 950 return 0;
861 951
862 if (!default_loop) 952 if (!ev_default_loop_ptr)
863 { 953 {
864#if EV_MULTIPLICITY 954#if EV_MULTIPLICITY
865 struct ev_loop *loop = default_loop = &default_loop_struct; 955 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
866#else 956#else
867 default_loop = 1; 957 ev_default_loop_ptr = 1;
868#endif 958#endif
869 959
870 loop_init (EV_A_ methods); 960 loop_init (EV_A_ flags);
871 961
872 if (ev_method (EV_A)) 962 if (ev_method (EV_A))
873 { 963 {
874 siginit (EV_A); 964 siginit (EV_A);
875 965
876#ifndef WIN32 966#ifndef _WIN32
877 ev_signal_init (&childev, childcb, SIGCHLD); 967 ev_signal_init (&childev, childcb, SIGCHLD);
878 ev_set_priority (&childev, EV_MAXPRI); 968 ev_set_priority (&childev, EV_MAXPRI);
879 ev_signal_start (EV_A_ &childev); 969 ev_signal_start (EV_A_ &childev);
880 ev_unref (EV_A); /* child watcher should not keep loop alive */ 970 ev_unref (EV_A); /* child watcher should not keep loop alive */
881#endif 971#endif
882 } 972 }
883 else 973 else
884 default_loop = 0; 974 ev_default_loop_ptr = 0;
885 } 975 }
886 976
887 return default_loop; 977 return ev_default_loop_ptr;
888} 978}
889 979
890void 980void
891ev_default_destroy (void) 981ev_default_destroy (void)
892{ 982{
893#if EV_MULTIPLICITY 983#if EV_MULTIPLICITY
894 struct ev_loop *loop = default_loop; 984 struct ev_loop *loop = ev_default_loop_ptr;
895#endif 985#endif
896 986
897#ifndef WIN32 987#ifndef _WIN32
898 ev_ref (EV_A); /* child watcher */ 988 ev_ref (EV_A); /* child watcher */
899 ev_signal_stop (EV_A_ &childev); 989 ev_signal_stop (EV_A_ &childev);
900#endif 990#endif
901 991
902 ev_ref (EV_A); /* signal watcher */ 992 ev_ref (EV_A); /* signal watcher */
910 1000
911void 1001void
912ev_default_fork (void) 1002ev_default_fork (void)
913{ 1003{
914#if EV_MULTIPLICITY 1004#if EV_MULTIPLICITY
915 struct ev_loop *loop = default_loop; 1005 struct ev_loop *loop = ev_default_loop_ptr;
916#endif 1006#endif
917 1007
918 if (method) 1008 if (method)
919 postfork = 1; 1009 postfork = 1;
920} 1010}
931 return 1; 1021 return 1;
932 1022
933 return 0; 1023 return 0;
934} 1024}
935 1025
936static void 1026inline void
937call_pending (EV_P) 1027call_pending (EV_P)
938{ 1028{
939 int pri; 1029 int pri;
940 1030
941 for (pri = NUMPRI; pri--; ) 1031 for (pri = NUMPRI; pri--; )
942 while (pendingcnt [pri]) 1032 while (pendingcnt [pri])
943 { 1033 {
944 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1034 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
945 1035
946 if (p->w) 1036 if (expect_true (p->w))
947 { 1037 {
948 p->w->pending = 0; 1038 p->w->pending = 0;
949 p->w->cb (EV_A_ p->w, p->events); 1039 EV_CB_INVOKE (p->w, p->events);
950 } 1040 }
951 } 1041 }
952} 1042}
953 1043
954static void 1044inline void
955timers_reify (EV_P) 1045timers_reify (EV_P)
956{ 1046{
957 while (timercnt && ((WT)timers [0])->at <= mn_now) 1047 while (timercnt && ((WT)timers [0])->at <= mn_now)
958 { 1048 {
959 struct ev_timer *w = timers [0]; 1049 struct ev_timer *w = timers [0];
962 1052
963 /* first reschedule or stop timer */ 1053 /* first reschedule or stop timer */
964 if (w->repeat) 1054 if (w->repeat)
965 { 1055 {
966 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1056 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1057
967 ((WT)w)->at = mn_now + w->repeat; 1058 ((WT)w)->at += w->repeat;
1059 if (((WT)w)->at < mn_now)
1060 ((WT)w)->at = mn_now;
1061
968 downheap ((WT *)timers, timercnt, 0); 1062 downheap ((WT *)timers, timercnt, 0);
969 } 1063 }
970 else 1064 else
971 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1065 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
972 1066
973 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1067 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
974 } 1068 }
975} 1069}
976 1070
977static void 1071#if EV_PERIODICS
1072inline void
978periodics_reify (EV_P) 1073periodics_reify (EV_P)
979{ 1074{
980 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1075 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
981 { 1076 {
982 struct ev_periodic *w = periodics [0]; 1077 struct ev_periodic *w = periodics [0];
983 1078
984 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1079 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
985 1080
986 /* first reschedule or stop timer */ 1081 /* first reschedule or stop timer */
987 if (w->reschedule_cb) 1082 if (w->reschedule_cb)
988 { 1083 {
989 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1084 ((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)); 1085 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
992 downheap ((WT *)periodics, periodiccnt, 0); 1086 downheap ((WT *)periodics, periodiccnt, 0);
993 } 1087 }
994 else if (w->interval) 1088 else if (w->interval)
995 { 1089 {
996 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1090 ((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)); 1091 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); 1092 downheap ((WT *)periodics, periodiccnt, 0);
999 } 1093 }
1000 else 1094 else
1001 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1095 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1002 1096
1013 for (i = 0; i < periodiccnt; ++i) 1107 for (i = 0; i < periodiccnt; ++i)
1014 { 1108 {
1015 struct ev_periodic *w = periodics [i]; 1109 struct ev_periodic *w = periodics [i];
1016 1110
1017 if (w->reschedule_cb) 1111 if (w->reschedule_cb)
1018 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1112 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1019 else if (w->interval) 1113 else if (w->interval)
1020 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1114 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1021 } 1115 }
1022 1116
1023 /* now rebuild the heap */ 1117 /* now rebuild the heap */
1024 for (i = periodiccnt >> 1; i--; ) 1118 for (i = periodiccnt >> 1; i--; )
1025 downheap ((WT *)periodics, periodiccnt, i); 1119 downheap ((WT *)periodics, periodiccnt, i);
1026} 1120}
1121#endif
1027 1122
1028inline int 1123inline int
1029time_update_monotonic (EV_P) 1124time_update_monotonic (EV_P)
1030{ 1125{
1031 mn_now = get_clock (); 1126 mn_now = get_clock ();
1032 1127
1033 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1128 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1034 { 1129 {
1035 rt_now = rtmn_diff + mn_now; 1130 ev_rt_now = rtmn_diff + mn_now;
1036 return 0; 1131 return 0;
1037 } 1132 }
1038 else 1133 else
1039 { 1134 {
1040 now_floor = mn_now; 1135 now_floor = mn_now;
1041 rt_now = ev_time (); 1136 ev_rt_now = ev_time ();
1042 return 1; 1137 return 1;
1043 } 1138 }
1044} 1139}
1045 1140
1046static void 1141inline void
1047time_update (EV_P) 1142time_update (EV_P)
1048{ 1143{
1049 int i; 1144 int i;
1050 1145
1051#if EV_USE_MONOTONIC 1146#if EV_USE_MONOTONIC
1055 { 1150 {
1056 ev_tstamp odiff = rtmn_diff; 1151 ev_tstamp odiff = rtmn_diff;
1057 1152
1058 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1153 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1059 { 1154 {
1060 rtmn_diff = rt_now - mn_now; 1155 rtmn_diff = ev_rt_now - mn_now;
1061 1156
1062 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1157 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1063 return; /* all is well */ 1158 return; /* all is well */
1064 1159
1065 rt_now = ev_time (); 1160 ev_rt_now = ev_time ();
1066 mn_now = get_clock (); 1161 mn_now = get_clock ();
1067 now_floor = mn_now; 1162 now_floor = mn_now;
1068 } 1163 }
1069 1164
1165# if EV_PERIODICS
1070 periodics_reschedule (EV_A); 1166 periodics_reschedule (EV_A);
1167# endif
1071 /* no timer adjustment, as the monotonic clock doesn't jump */ 1168 /* no timer adjustment, as the monotonic clock doesn't jump */
1072 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1169 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1073 } 1170 }
1074 } 1171 }
1075 else 1172 else
1076#endif 1173#endif
1077 { 1174 {
1078 rt_now = ev_time (); 1175 ev_rt_now = ev_time ();
1079 1176
1080 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1177 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1081 { 1178 {
1179#if EV_PERIODICS
1082 periodics_reschedule (EV_A); 1180 periodics_reschedule (EV_A);
1181#endif
1083 1182
1084 /* adjust timers. this is easy, as the offset is the same for all */ 1183 /* adjust timers. this is easy, as the offset is the same for all */
1085 for (i = 0; i < timercnt; ++i) 1184 for (i = 0; i < timercnt; ++i)
1086 ((WT)timers [i])->at += rt_now - mn_now; 1185 ((WT)timers [i])->at += ev_rt_now - mn_now;
1087 } 1186 }
1088 1187
1089 mn_now = rt_now; 1188 mn_now = ev_rt_now;
1090 } 1189 }
1091} 1190}
1092 1191
1093void 1192void
1094ev_ref (EV_P) 1193ev_ref (EV_P)
1108ev_loop (EV_P_ int flags) 1207ev_loop (EV_P_ int flags)
1109{ 1208{
1110 double block; 1209 double block;
1111 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1210 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1112 1211
1113 do 1212 while (activecnt)
1114 { 1213 {
1115 /* queue check watchers (and execute them) */ 1214 /* queue check watchers (and execute them) */
1116 if (expect_false (preparecnt)) 1215 if (expect_false (preparecnt))
1117 { 1216 {
1118 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1217 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1134 if (expect_true (have_monotonic)) 1233 if (expect_true (have_monotonic))
1135 time_update_monotonic (EV_A); 1234 time_update_monotonic (EV_A);
1136 else 1235 else
1137#endif 1236#endif
1138 { 1237 {
1139 rt_now = ev_time (); 1238 ev_rt_now = ev_time ();
1140 mn_now = rt_now; 1239 mn_now = ev_rt_now;
1141 } 1240 }
1142 1241
1143 if (flags & EVLOOP_NONBLOCK || idlecnt) 1242 if (flags & EVLOOP_NONBLOCK || idlecnt)
1144 block = 0.; 1243 block = 0.;
1145 else 1244 else
1150 { 1249 {
1151 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1250 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1152 if (block > to) block = to; 1251 if (block > to) block = to;
1153 } 1252 }
1154 1253
1254#if EV_PERIODICS
1155 if (periodiccnt) 1255 if (periodiccnt)
1156 { 1256 {
1157 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1257 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1158 if (block > to) block = to; 1258 if (block > to) block = to;
1159 } 1259 }
1260#endif
1160 1261
1161 if (block < 0.) block = 0.; 1262 if (expect_false (block < 0.)) block = 0.;
1162 } 1263 }
1163 1264
1164 method_poll (EV_A_ block); 1265 method_poll (EV_A_ block);
1165 1266
1166 /* update rt_now, do magic */ 1267 /* update ev_rt_now, do magic */
1167 time_update (EV_A); 1268 time_update (EV_A);
1168 1269
1169 /* queue pending timers and reschedule them */ 1270 /* queue pending timers and reschedule them */
1170 timers_reify (EV_A); /* relative timers called last */ 1271 timers_reify (EV_A); /* relative timers called last */
1272#if EV_PERIODICS
1171 periodics_reify (EV_A); /* absolute timers called first */ 1273 periodics_reify (EV_A); /* absolute timers called first */
1274#endif
1172 1275
1173 /* queue idle watchers unless io or timers are pending */ 1276 /* queue idle watchers unless io or timers are pending */
1174 if (idlecnt && !any_pending (EV_A)) 1277 if (idlecnt && !any_pending (EV_A))
1175 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1278 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1176 1279
1177 /* queue check watchers, to be executed first */ 1280 /* queue check watchers, to be executed first */
1178 if (checkcnt) 1281 if (expect_false (checkcnt))
1179 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1282 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1180 1283
1181 call_pending (EV_A); 1284 call_pending (EV_A);
1285
1286 if (expect_false (loop_done))
1287 break;
1182 } 1288 }
1183 while (activecnt && !loop_done);
1184 1289
1185 if (loop_done != 2) 1290 if (loop_done != 2)
1186 loop_done = 0; 1291 loop_done = 0;
1187} 1292}
1188 1293
1248void 1353void
1249ev_io_start (EV_P_ struct ev_io *w) 1354ev_io_start (EV_P_ struct ev_io *w)
1250{ 1355{
1251 int fd = w->fd; 1356 int fd = w->fd;
1252 1357
1253 if (ev_is_active (w)) 1358 if (expect_false (ev_is_active (w)))
1254 return; 1359 return;
1255 1360
1256 assert (("ev_io_start called with negative fd", fd >= 0)); 1361 assert (("ev_io_start called with negative fd", fd >= 0));
1257 1362
1258 ev_start (EV_A_ (W)w, 1); 1363 ev_start (EV_A_ (W)w, 1);
1264 1369
1265void 1370void
1266ev_io_stop (EV_P_ struct ev_io *w) 1371ev_io_stop (EV_P_ struct ev_io *w)
1267{ 1372{
1268 ev_clear_pending (EV_A_ (W)w); 1373 ev_clear_pending (EV_A_ (W)w);
1269 if (!ev_is_active (w)) 1374 if (expect_false (!ev_is_active (w)))
1270 return; 1375 return;
1376
1377 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1271 1378
1272 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1379 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1273 ev_stop (EV_A_ (W)w); 1380 ev_stop (EV_A_ (W)w);
1274 1381
1275 fd_change (EV_A_ w->fd); 1382 fd_change (EV_A_ w->fd);
1276} 1383}
1277 1384
1278void 1385void
1279ev_timer_start (EV_P_ struct ev_timer *w) 1386ev_timer_start (EV_P_ struct ev_timer *w)
1280{ 1387{
1281 if (ev_is_active (w)) 1388 if (expect_false (ev_is_active (w)))
1282 return; 1389 return;
1283 1390
1284 ((WT)w)->at += mn_now; 1391 ((WT)w)->at += mn_now;
1285 1392
1286 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1393 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1287 1394
1288 ev_start (EV_A_ (W)w, ++timercnt); 1395 ev_start (EV_A_ (W)w, ++timercnt);
1289 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1396 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1290 timers [timercnt - 1] = w; 1397 timers [timercnt - 1] = w;
1291 upheap ((WT *)timers, timercnt - 1); 1398 upheap ((WT *)timers, timercnt - 1);
1292 1399
1293 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1400 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1294} 1401}
1295 1402
1296void 1403void
1297ev_timer_stop (EV_P_ struct ev_timer *w) 1404ev_timer_stop (EV_P_ struct ev_timer *w)
1298{ 1405{
1299 ev_clear_pending (EV_A_ (W)w); 1406 ev_clear_pending (EV_A_ (W)w);
1300 if (!ev_is_active (w)) 1407 if (expect_false (!ev_is_active (w)))
1301 return; 1408 return;
1302 1409
1303 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1410 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1304 1411
1305 if (((W)w)->active < timercnt--) 1412 if (expect_true (((W)w)->active < timercnt--))
1306 { 1413 {
1307 timers [((W)w)->active - 1] = timers [timercnt]; 1414 timers [((W)w)->active - 1] = timers [timercnt];
1308 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1415 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1309 } 1416 }
1310 1417
1311 ((WT)w)->at = w->repeat; 1418 ((WT)w)->at -= mn_now;
1312 1419
1313 ev_stop (EV_A_ (W)w); 1420 ev_stop (EV_A_ (W)w);
1314} 1421}
1315 1422
1316void 1423void
1319 if (ev_is_active (w)) 1426 if (ev_is_active (w))
1320 { 1427 {
1321 if (w->repeat) 1428 if (w->repeat)
1322 { 1429 {
1323 ((WT)w)->at = mn_now + w->repeat; 1430 ((WT)w)->at = mn_now + w->repeat;
1324 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1431 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1325 } 1432 }
1326 else 1433 else
1327 ev_timer_stop (EV_A_ w); 1434 ev_timer_stop (EV_A_ w);
1328 } 1435 }
1329 else if (w->repeat) 1436 else if (w->repeat)
1437 {
1438 w->at = w->repeat;
1330 ev_timer_start (EV_A_ w); 1439 ev_timer_start (EV_A_ w);
1440 }
1331} 1441}
1332 1442
1443#if EV_PERIODICS
1333void 1444void
1334ev_periodic_start (EV_P_ struct ev_periodic *w) 1445ev_periodic_start (EV_P_ struct ev_periodic *w)
1335{ 1446{
1336 if (ev_is_active (w)) 1447 if (expect_false (ev_is_active (w)))
1337 return; 1448 return;
1338 1449
1339 if (w->reschedule_cb) 1450 if (w->reschedule_cb)
1340 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1451 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1341 else if (w->interval) 1452 else if (w->interval)
1342 { 1453 {
1343 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1454 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 */ 1455 /* 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; 1456 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1346 } 1457 }
1347 1458
1348 ev_start (EV_A_ (W)w, ++periodiccnt); 1459 ev_start (EV_A_ (W)w, ++periodiccnt);
1349 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1460 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1350 periodics [periodiccnt - 1] = w; 1461 periodics [periodiccnt - 1] = w;
1351 upheap ((WT *)periodics, periodiccnt - 1); 1462 upheap ((WT *)periodics, periodiccnt - 1);
1352 1463
1353 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1464 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1354} 1465}
1355 1466
1356void 1467void
1357ev_periodic_stop (EV_P_ struct ev_periodic *w) 1468ev_periodic_stop (EV_P_ struct ev_periodic *w)
1358{ 1469{
1359 ev_clear_pending (EV_A_ (W)w); 1470 ev_clear_pending (EV_A_ (W)w);
1360 if (!ev_is_active (w)) 1471 if (expect_false (!ev_is_active (w)))
1361 return; 1472 return;
1362 1473
1363 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1474 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1364 1475
1365 if (((W)w)->active < periodiccnt--) 1476 if (expect_true (((W)w)->active < periodiccnt--))
1366 { 1477 {
1367 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1478 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1368 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1479 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1369 } 1480 }
1370 1481
1371 ev_stop (EV_A_ (W)w); 1482 ev_stop (EV_A_ (W)w);
1372} 1483}
1373 1484
1374void 1485void
1375ev_periodic_again (EV_P_ struct ev_periodic *w) 1486ev_periodic_again (EV_P_ struct ev_periodic *w)
1376{ 1487{
1488 /* TODO: use adjustheap and recalculation */
1377 ev_periodic_stop (EV_A_ w); 1489 ev_periodic_stop (EV_A_ w);
1378 ev_periodic_start (EV_A_ w); 1490 ev_periodic_start (EV_A_ w);
1379} 1491}
1492#endif
1380 1493
1381void 1494void
1382ev_idle_start (EV_P_ struct ev_idle *w) 1495ev_idle_start (EV_P_ struct ev_idle *w)
1383{ 1496{
1384 if (ev_is_active (w)) 1497 if (expect_false (ev_is_active (w)))
1385 return; 1498 return;
1386 1499
1387 ev_start (EV_A_ (W)w, ++idlecnt); 1500 ev_start (EV_A_ (W)w, ++idlecnt);
1388 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1501 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1389 idles [idlecnt - 1] = w; 1502 idles [idlecnt - 1] = w;
1390} 1503}
1391 1504
1392void 1505void
1393ev_idle_stop (EV_P_ struct ev_idle *w) 1506ev_idle_stop (EV_P_ struct ev_idle *w)
1394{ 1507{
1395 ev_clear_pending (EV_A_ (W)w); 1508 ev_clear_pending (EV_A_ (W)w);
1396 if (ev_is_active (w)) 1509 if (expect_false (!ev_is_active (w)))
1397 return; 1510 return;
1398 1511
1399 idles [((W)w)->active - 1] = idles [--idlecnt]; 1512 idles [((W)w)->active - 1] = idles [--idlecnt];
1400 ev_stop (EV_A_ (W)w); 1513 ev_stop (EV_A_ (W)w);
1401} 1514}
1402 1515
1403void 1516void
1404ev_prepare_start (EV_P_ struct ev_prepare *w) 1517ev_prepare_start (EV_P_ struct ev_prepare *w)
1405{ 1518{
1406 if (ev_is_active (w)) 1519 if (expect_false (ev_is_active (w)))
1407 return; 1520 return;
1408 1521
1409 ev_start (EV_A_ (W)w, ++preparecnt); 1522 ev_start (EV_A_ (W)w, ++preparecnt);
1410 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1523 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1411 prepares [preparecnt - 1] = w; 1524 prepares [preparecnt - 1] = w;
1412} 1525}
1413 1526
1414void 1527void
1415ev_prepare_stop (EV_P_ struct ev_prepare *w) 1528ev_prepare_stop (EV_P_ struct ev_prepare *w)
1416{ 1529{
1417 ev_clear_pending (EV_A_ (W)w); 1530 ev_clear_pending (EV_A_ (W)w);
1418 if (ev_is_active (w)) 1531 if (expect_false (!ev_is_active (w)))
1419 return; 1532 return;
1420 1533
1421 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1534 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1422 ev_stop (EV_A_ (W)w); 1535 ev_stop (EV_A_ (W)w);
1423} 1536}
1424 1537
1425void 1538void
1426ev_check_start (EV_P_ struct ev_check *w) 1539ev_check_start (EV_P_ struct ev_check *w)
1427{ 1540{
1428 if (ev_is_active (w)) 1541 if (expect_false (ev_is_active (w)))
1429 return; 1542 return;
1430 1543
1431 ev_start (EV_A_ (W)w, ++checkcnt); 1544 ev_start (EV_A_ (W)w, ++checkcnt);
1432 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1545 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1433 checks [checkcnt - 1] = w; 1546 checks [checkcnt - 1] = w;
1434} 1547}
1435 1548
1436void 1549void
1437ev_check_stop (EV_P_ struct ev_check *w) 1550ev_check_stop (EV_P_ struct ev_check *w)
1438{ 1551{
1439 ev_clear_pending (EV_A_ (W)w); 1552 ev_clear_pending (EV_A_ (W)w);
1440 if (ev_is_active (w)) 1553 if (expect_false (!ev_is_active (w)))
1441 return; 1554 return;
1442 1555
1443 checks [((W)w)->active - 1] = checks [--checkcnt]; 1556 checks [((W)w)->active - 1] = checks [--checkcnt];
1444 ev_stop (EV_A_ (W)w); 1557 ev_stop (EV_A_ (W)w);
1445} 1558}
1450 1563
1451void 1564void
1452ev_signal_start (EV_P_ struct ev_signal *w) 1565ev_signal_start (EV_P_ struct ev_signal *w)
1453{ 1566{
1454#if EV_MULTIPLICITY 1567#if EV_MULTIPLICITY
1455 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1568 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1456#endif 1569#endif
1457 if (ev_is_active (w)) 1570 if (expect_false (ev_is_active (w)))
1458 return; 1571 return;
1459 1572
1460 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1573 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1461 1574
1462 ev_start (EV_A_ (W)w, 1); 1575 ev_start (EV_A_ (W)w, 1);
1463 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1576 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1464 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1577 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1465 1578
1466 if (!((WL)w)->next) 1579 if (!((WL)w)->next)
1467 { 1580 {
1468#if WIN32 1581#if _WIN32
1469 signal (w->signum, sighandler); 1582 signal (w->signum, sighandler);
1470#else 1583#else
1471 struct sigaction sa; 1584 struct sigaction sa;
1472 sa.sa_handler = sighandler; 1585 sa.sa_handler = sighandler;
1473 sigfillset (&sa.sa_mask); 1586 sigfillset (&sa.sa_mask);
1479 1592
1480void 1593void
1481ev_signal_stop (EV_P_ struct ev_signal *w) 1594ev_signal_stop (EV_P_ struct ev_signal *w)
1482{ 1595{
1483 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1484 if (!ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1485 return; 1598 return;
1486 1599
1487 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1600 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1488 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1489 1602
1493 1606
1494void 1607void
1495ev_child_start (EV_P_ struct ev_child *w) 1608ev_child_start (EV_P_ struct ev_child *w)
1496{ 1609{
1497#if EV_MULTIPLICITY 1610#if EV_MULTIPLICITY
1498 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1611 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1499#endif 1612#endif
1500 if (ev_is_active (w)) 1613 if (expect_false (ev_is_active (w)))
1501 return; 1614 return;
1502 1615
1503 ev_start (EV_A_ (W)w, 1); 1616 ev_start (EV_A_ (W)w, 1);
1504 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1617 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1505} 1618}
1506 1619
1507void 1620void
1508ev_child_stop (EV_P_ struct ev_child *w) 1621ev_child_stop (EV_P_ struct ev_child *w)
1509{ 1622{
1510 ev_clear_pending (EV_A_ (W)w); 1623 ev_clear_pending (EV_A_ (W)w);
1511 if (ev_is_active (w)) 1624 if (expect_false (!ev_is_active (w)))
1512 return; 1625 return;
1513 1626
1514 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1627 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1515 ev_stop (EV_A_ (W)w); 1628 ev_stop (EV_A_ (W)w);
1516} 1629}
1553void 1666void
1554ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1667ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1555{ 1668{
1556 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1669 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1557 1670
1558 if (!once) 1671 if (expect_false (!once))
1672 {
1559 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1673 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1560 else 1674 return;
1561 { 1675 }
1676
1562 once->cb = cb; 1677 once->cb = cb;
1563 once->arg = arg; 1678 once->arg = arg;
1564 1679
1565 ev_watcher_init (&once->io, once_cb_io); 1680 ev_init (&once->io, once_cb_io);
1566 if (fd >= 0) 1681 if (fd >= 0)
1567 { 1682 {
1568 ev_io_set (&once->io, fd, events); 1683 ev_io_set (&once->io, fd, events);
1569 ev_io_start (EV_A_ &once->io); 1684 ev_io_start (EV_A_ &once->io);
1570 } 1685 }
1571 1686
1572 ev_watcher_init (&once->to, once_cb_to); 1687 ev_init (&once->to, once_cb_to);
1573 if (timeout >= 0.) 1688 if (timeout >= 0.)
1574 { 1689 {
1575 ev_timer_set (&once->to, timeout, 0.); 1690 ev_timer_set (&once->to, timeout, 0.);
1576 ev_timer_start (EV_A_ &once->to); 1691 ev_timer_start (EV_A_ &once->to);
1577 }
1578 } 1692 }
1579} 1693}
1580 1694
1695#ifdef __cplusplus
1696}
1697#endif
1698

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines