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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines