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

Comparing libev/ev.c (file contents):
Revision 1.85 by root, Sat Nov 10 03:13:50 2007 UTC vs.
Revision 1.132 by root, Fri Nov 23 10:36:30 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/**/
113 158
114#ifndef CLOCK_MONOTONIC 159#ifndef CLOCK_MONOTONIC
119#ifndef CLOCK_REALTIME 164#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 165# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 166# define EV_USE_REALTIME 0
122#endif 167#endif
123 168
169#if EV_SELECT_IS_WINSOCKET
170# include <winsock.h>
171#endif
172
124/**/ 173/**/
125 174
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 175#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) */ 176#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 */ 177#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 */ 178/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
130 179
131#ifdef EV_H 180#ifdef EV_H
132# include EV_H 181# include EV_H
133#else 182#else
134# include "ev.h" 183# include "ev.h"
135#endif 184#endif
136 185
137#if __GNUC__ >= 3 186#if __GNUC__ >= 3
138# define expect(expr,value) __builtin_expect ((expr),(value)) 187# define expect(expr,value) __builtin_expect ((expr),(value))
139# define inline inline 188# define inline static inline
140#else 189#else
141# define expect(expr,value) (expr) 190# define expect(expr,value) (expr)
142# define inline static 191# define inline static
143#endif 192#endif
144 193
146#define expect_true(expr) expect ((expr) != 0, 1) 195#define expect_true(expr) expect ((expr) != 0, 1)
147 196
148#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 197#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
149#define ABSPRI(w) ((w)->priority - EV_MINPRI) 198#define ABSPRI(w) ((w)->priority - EV_MINPRI)
150 199
200#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
201#define EMPTY2(a,b) /* used to suppress some warnings */
202
151typedef struct ev_watcher *W; 203typedef struct ev_watcher *W;
152typedef struct ev_watcher_list *WL; 204typedef struct ev_watcher_list *WL;
153typedef struct ev_watcher_time *WT; 205typedef struct ev_watcher_time *WT;
154 206
155static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 207static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
156 208
209#ifdef _WIN32
157#include "ev_win32.c" 210# include "ev_win32.c"
211#endif
158 212
159/*****************************************************************************/ 213/*****************************************************************************/
160 214
161static void (*syserr_cb)(const char *msg); 215static void (*syserr_cb)(const char *msg);
162 216
209typedef struct 263typedef struct
210{ 264{
211 WL head; 265 WL head;
212 unsigned char events; 266 unsigned char events;
213 unsigned char reify; 267 unsigned char reify;
268#if EV_SELECT_IS_WINSOCKET
269 SOCKET handle;
270#endif
214} ANFD; 271} ANFD;
215 272
216typedef struct 273typedef struct
217{ 274{
218 W w; 275 W w;
221 278
222#if EV_MULTIPLICITY 279#if EV_MULTIPLICITY
223 280
224 struct ev_loop 281 struct ev_loop
225 { 282 {
283 ev_tstamp ev_rt_now;
284 #define ev_rt_now ((loop)->ev_rt_now)
226 #define VAR(name,decl) decl; 285 #define VAR(name,decl) decl;
227 #include "ev_vars.h" 286 #include "ev_vars.h"
228 #undef VAR 287 #undef VAR
229 }; 288 };
230 #include "ev_wrap.h" 289 #include "ev_wrap.h"
231 290
232 struct ev_loop default_loop_struct; 291 static struct ev_loop default_loop_struct;
233 static struct ev_loop *default_loop; 292 struct ev_loop *ev_default_loop_ptr;
234 293
235#else 294#else
236 295
296 ev_tstamp ev_rt_now;
237 #define VAR(name,decl) static decl; 297 #define VAR(name,decl) static decl;
238 #include "ev_vars.h" 298 #include "ev_vars.h"
239 #undef VAR 299 #undef VAR
240 300
241 static int default_loop; 301 static int ev_default_loop_ptr;
242 302
243#endif 303#endif
244 304
245/*****************************************************************************/ 305/*****************************************************************************/
246 306
247inline ev_tstamp 307ev_tstamp
248ev_time (void) 308ev_time (void)
249{ 309{
250#if EV_USE_REALTIME 310#if EV_USE_REALTIME
251 struct timespec ts; 311 struct timespec ts;
252 clock_gettime (CLOCK_REALTIME, &ts); 312 clock_gettime (CLOCK_REALTIME, &ts);
279{ 339{
280 return ev_rt_now; 340 return ev_rt_now;
281} 341}
282#endif 342#endif
283 343
284#define array_roundsize(type,n) ((n) | 4 & ~3) 344#define array_roundsize(type,n) (((n) | 4) & ~3)
285 345
286#define array_needsize(type,base,cur,cnt,init) \ 346#define array_needsize(type,base,cur,cnt,init) \
287 if (expect_false ((cnt) > cur)) \ 347 if (expect_false ((cnt) > cur)) \
288 { \ 348 { \
289 int newcnt = cur; \ 349 int newcnt = cur; \
304 stem ## max = array_roundsize (stem ## cnt >> 1); \ 364 stem ## max = array_roundsize (stem ## cnt >> 1); \
305 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 365 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
306 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 366 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
307 } 367 }
308 368
309/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
310/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
311#define array_free_microshit(stem) \
312 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
313
314#define array_free(stem, idx) \ 369#define array_free(stem, idx) \
315 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 370 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
316 371
317/*****************************************************************************/ 372/*****************************************************************************/
318 373
332void 387void
333ev_feed_event (EV_P_ void *w, int revents) 388ev_feed_event (EV_P_ void *w, int revents)
334{ 389{
335 W w_ = (W)w; 390 W w_ = (W)w;
336 391
337 if (w_->pending) 392 if (expect_false (w_->pending))
338 { 393 {
339 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 394 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
340 return; 395 return;
341 } 396 }
342 397
343 w_->pending = ++pendingcnt [ABSPRI (w_)]; 398 w_->pending = ++pendingcnt [ABSPRI (w_)];
344 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 399 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
345 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 400 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
346 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 401 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
347} 402}
348 403
349static void 404static void
376 fd_event (EV_A_ fd, revents); 431 fd_event (EV_A_ fd, revents);
377} 432}
378 433
379/*****************************************************************************/ 434/*****************************************************************************/
380 435
381static void 436inline void
382fd_reify (EV_P) 437fd_reify (EV_P)
383{ 438{
384 int i; 439 int i;
385 440
386 for (i = 0; i < fdchangecnt; ++i) 441 for (i = 0; i < fdchangecnt; ++i)
392 int events = 0; 447 int events = 0;
393 448
394 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 449 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
395 events |= w->events; 450 events |= w->events;
396 451
452#if EV_SELECT_IS_WINSOCKET
453 if (events)
454 {
455 unsigned long argp;
456 anfd->handle = _get_osfhandle (fd);
457 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
458 }
459#endif
460
397 anfd->reify = 0; 461 anfd->reify = 0;
398 462
399 method_modify (EV_A_ fd, anfd->events, events); 463 backend_modify (EV_A_ fd, anfd->events, events);
400 anfd->events = events; 464 anfd->events = events;
401 } 465 }
402 466
403 fdchangecnt = 0; 467 fdchangecnt = 0;
404} 468}
405 469
406static void 470static void
407fd_change (EV_P_ int fd) 471fd_change (EV_P_ int fd)
408{ 472{
409 if (anfds [fd].reify) 473 if (expect_false (anfds [fd].reify))
410 return; 474 return;
411 475
412 anfds [fd].reify = 1; 476 anfds [fd].reify = 1;
413 477
414 ++fdchangecnt; 478 ++fdchangecnt;
415 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 479 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
416 fdchanges [fdchangecnt - 1] = fd; 480 fdchanges [fdchangecnt - 1] = fd;
417} 481}
418 482
419static void 483static void
420fd_kill (EV_P_ int fd) 484fd_kill (EV_P_ int fd)
426 ev_io_stop (EV_A_ w); 490 ev_io_stop (EV_A_ w);
427 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 491 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
428 } 492 }
429} 493}
430 494
431static int 495inline int
432fd_valid (int fd) 496fd_valid (int fd)
433{ 497{
434#ifdef WIN32 498#ifdef _WIN32
435 return !!win32_get_osfhandle (fd); 499 return _get_osfhandle (fd) != -1;
436#else 500#else
437 return fcntl (fd, F_GETFD) != -1; 501 return fcntl (fd, F_GETFD) != -1;
438#endif 502#endif
439} 503}
440 504
462 fd_kill (EV_A_ fd); 526 fd_kill (EV_A_ fd);
463 return; 527 return;
464 } 528 }
465} 529}
466 530
467/* usually called after fork if method needs to re-arm all fds from scratch */ 531/* usually called after fork if backend needs to re-arm all fds from scratch */
468static void 532static void
469fd_rearm_all (EV_P) 533fd_rearm_all (EV_P)
470{ 534{
471 int fd; 535 int fd;
472 536
521 heap [k] = w; 585 heap [k] = w;
522 ((W)heap [k])->active = k + 1; 586 ((W)heap [k])->active = k + 1;
523} 587}
524 588
525inline void 589inline void
526adjustheap (WT *heap, int N, int k, ev_tstamp at) 590adjustheap (WT *heap, int N, int k)
527{ 591{
528 ev_tstamp old_at = heap [k]->at; 592 upheap (heap, k);
529 heap [k]->at = at;
530
531 if (old_at < at)
532 downheap (heap, N, k); 593 downheap (heap, N, k);
533 else
534 upheap (heap, k);
535} 594}
536 595
537/*****************************************************************************/ 596/*****************************************************************************/
538 597
539typedef struct 598typedef struct
562} 621}
563 622
564static void 623static void
565sighandler (int signum) 624sighandler (int signum)
566{ 625{
567#if WIN32 626#if _WIN32
568 signal (signum, sighandler); 627 signal (signum, sighandler);
569#endif 628#endif
570 629
571 signals [signum - 1].gotsig = 1; 630 signals [signum - 1].gotsig = 1;
572 631
573 if (!gotsig) 632 if (!gotsig)
574 { 633 {
575 int old_errno = errno; 634 int old_errno = errno;
576 gotsig = 1; 635 gotsig = 1;
577#ifdef WIN32
578 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
579#else
580 write (sigpipe [1], &signum, 1); 636 write (sigpipe [1], &signum, 1);
581#endif
582 errno = old_errno; 637 errno = old_errno;
583 } 638 }
584} 639}
585 640
586void 641void
587ev_feed_signal_event (EV_P_ int signum) 642ev_feed_signal_event (EV_P_ int signum)
588{ 643{
589 WL w; 644 WL w;
590 645
591#if EV_MULTIPLICITY 646#if EV_MULTIPLICITY
592 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 647 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
593#endif 648#endif
594 649
595 --signum; 650 --signum;
596 651
597 if (signum < 0 || signum >= signalmax) 652 if (signum < 0 || signum >= signalmax)
606static void 661static void
607sigcb (EV_P_ struct ev_io *iow, int revents) 662sigcb (EV_P_ struct ev_io *iow, int revents)
608{ 663{
609 int signum; 664 int signum;
610 665
611#ifdef WIN32
612 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
613#else
614 read (sigpipe [0], &revents, 1); 666 read (sigpipe [0], &revents, 1);
615#endif
616 gotsig = 0; 667 gotsig = 0;
617 668
618 for (signum = signalmax; signum--; ) 669 for (signum = signalmax; signum--; )
619 if (signals [signum].gotsig) 670 if (signals [signum].gotsig)
620 ev_feed_signal_event (EV_A_ signum + 1); 671 ev_feed_signal_event (EV_A_ signum + 1);
621} 672}
622 673
623static void 674static void
675fd_intern (int fd)
676{
677#ifdef _WIN32
678 int arg = 1;
679 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
680#else
681 fcntl (fd, F_SETFD, FD_CLOEXEC);
682 fcntl (fd, F_SETFL, O_NONBLOCK);
683#endif
684}
685
686static void
624siginit (EV_P) 687siginit (EV_P)
625{ 688{
626#ifndef WIN32 689 fd_intern (sigpipe [0]);
627 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 690 fd_intern (sigpipe [1]);
628 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
629
630 /* rather than sort out wether we really need nb, set it */
631 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
632 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
633#endif
634 691
635 ev_io_set (&sigev, sigpipe [0], EV_READ); 692 ev_io_set (&sigev, sigpipe [0], EV_READ);
636 ev_io_start (EV_A_ &sigev); 693 ev_io_start (EV_A_ &sigev);
637 ev_unref (EV_A); /* child watcher should not keep loop alive */ 694 ev_unref (EV_A); /* child watcher should not keep loop alive */
638} 695}
639 696
640/*****************************************************************************/ 697/*****************************************************************************/
641 698
642static struct ev_child *childs [PID_HASHSIZE]; 699static struct ev_child *childs [PID_HASHSIZE];
643 700
644#ifndef WIN32 701#ifndef _WIN32
645 702
646static struct ev_signal childev; 703static struct ev_signal childev;
647 704
648#ifndef WCONTINUED 705#ifndef WCONTINUED
649# define WCONTINUED 0 706# define WCONTINUED 0
670 int pid, status; 727 int pid, status;
671 728
672 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 729 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
673 { 730 {
674 /* make sure we are called again until all childs have been reaped */ 731 /* make sure we are called again until all childs have been reaped */
732 /* we need to do it this way so that the callback gets called before we continue */
675 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 733 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
676 734
677 child_reap (EV_A_ sw, pid, pid, status); 735 child_reap (EV_A_ sw, pid, pid, status);
678 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 736 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
679 } 737 }
680} 738}
681 739
682#endif 740#endif
683 741
684/*****************************************************************************/ 742/*****************************************************************************/
685 743
744#if EV_USE_PORT
745# include "ev_port.c"
746#endif
686#if EV_USE_KQUEUE 747#if EV_USE_KQUEUE
687# include "ev_kqueue.c" 748# include "ev_kqueue.c"
688#endif 749#endif
689#if EV_USE_EPOLL 750#if EV_USE_EPOLL
690# include "ev_epoll.c" 751# include "ev_epoll.c"
710 771
711/* return true if we are running with elevated privileges and should ignore env variables */ 772/* return true if we are running with elevated privileges and should ignore env variables */
712static int 773static int
713enable_secure (void) 774enable_secure (void)
714{ 775{
715#ifdef WIN32 776#ifdef _WIN32
716 return 0; 777 return 0;
717#else 778#else
718 return getuid () != geteuid () 779 return getuid () != geteuid ()
719 || getgid () != getegid (); 780 || getgid () != getegid ();
720#endif 781#endif
721} 782}
722 783
723int 784unsigned int
724ev_method (EV_P) 785ev_supported_backends (void)
725{ 786{
726 return method; 787 unsigned int flags = 0;
727}
728 788
729static void 789 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
730loop_init (EV_P_ int methods) 790 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
791 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
792 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
793 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
794
795 return flags;
796}
797
798unsigned int
799ev_recommended_backends (void)
731{ 800{
732 if (!method) 801 unsigned int flags = ev_supported_backends ();
802
803#ifndef __NetBSD__
804 /* kqueue is borked on everything but netbsd apparently */
805 /* it usually doesn't work correctly on anything but sockets and pipes */
806 flags &= ~EVBACKEND_KQUEUE;
807#endif
808#ifdef __APPLE__
809 // flags &= ~EVBACKEND_KQUEUE; for documentation
810 flags &= ~EVBACKEND_POLL;
811#endif
812
813 return flags;
814}
815
816unsigned int
817ev_backend (EV_P)
818{
819 return backend;
820}
821
822static void
823loop_init (EV_P_ unsigned int flags)
824{
825 if (!backend)
733 { 826 {
734#if EV_USE_MONOTONIC 827#if EV_USE_MONOTONIC
735 { 828 {
736 struct timespec ts; 829 struct timespec ts;
737 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 830 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
742 ev_rt_now = ev_time (); 835 ev_rt_now = ev_time ();
743 mn_now = get_clock (); 836 mn_now = get_clock ();
744 now_floor = mn_now; 837 now_floor = mn_now;
745 rtmn_diff = ev_rt_now - mn_now; 838 rtmn_diff = ev_rt_now - mn_now;
746 839
747 if (methods == EVMETHOD_AUTO) 840 if (!(flags & EVFLAG_NOENV)
748 if (!enable_secure () && getenv ("LIBEV_METHODS")) 841 && !enable_secure ()
842 && getenv ("LIBEV_FLAGS"))
749 methods = atoi (getenv ("LIBEV_METHODS")); 843 flags = atoi (getenv ("LIBEV_FLAGS"));
750 else
751 methods = EVMETHOD_ANY;
752 844
753 method = 0; 845 if (!(flags & 0x0000ffffUL))
754#if EV_USE_WIN32 846 flags |= ev_recommended_backends ();
755 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 847
848 backend = 0;
849#if EV_USE_PORT
850 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
756#endif 851#endif
757#if EV_USE_KQUEUE 852#if EV_USE_KQUEUE
758 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 853 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
759#endif 854#endif
760#if EV_USE_EPOLL 855#if EV_USE_EPOLL
761 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 856 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
762#endif 857#endif
763#if EV_USE_POLL 858#if EV_USE_POLL
764 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 859 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
765#endif 860#endif
766#if EV_USE_SELECT 861#if EV_USE_SELECT
767 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 862 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
768#endif 863#endif
769 864
770 ev_init (&sigev, sigcb); 865 ev_init (&sigev, sigcb);
771 ev_set_priority (&sigev, EV_MAXPRI); 866 ev_set_priority (&sigev, EV_MAXPRI);
772 } 867 }
773} 868}
774 869
775void 870static void
776loop_destroy (EV_P) 871loop_destroy (EV_P)
777{ 872{
778 int i; 873 int i;
779 874
780#if EV_USE_WIN32 875#if EV_USE_PORT
781 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 876 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
782#endif 877#endif
783#if EV_USE_KQUEUE 878#if EV_USE_KQUEUE
784 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 879 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
785#endif 880#endif
786#if EV_USE_EPOLL 881#if EV_USE_EPOLL
787 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 882 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
788#endif 883#endif
789#if EV_USE_POLL 884#if EV_USE_POLL
790 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 885 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
791#endif 886#endif
792#if EV_USE_SELECT 887#if EV_USE_SELECT
793 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 888 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
794#endif 889#endif
795 890
796 for (i = NUMPRI; i--; ) 891 for (i = NUMPRI; i--; )
797 array_free (pending, [i]); 892 array_free (pending, [i]);
798 893
799 /* have to use the microsoft-never-gets-it-right macro */ 894 /* have to use the microsoft-never-gets-it-right macro */
800 array_free_microshit (fdchange); 895 array_free (fdchange, EMPTY0);
801 array_free_microshit (timer); 896 array_free (timer, EMPTY0);
802 array_free_microshit (periodic); 897#if EV_PERIODICS
803 array_free_microshit (idle); 898 array_free (periodic, EMPTY0);
804 array_free_microshit (prepare); 899#endif
805 array_free_microshit (check); 900 array_free (idle, EMPTY0);
901 array_free (prepare, EMPTY0);
902 array_free (check, EMPTY0);
806 903
807 method = 0; 904 backend = 0;
808} 905}
809 906
810static void 907static void
811loop_fork (EV_P) 908loop_fork (EV_P)
812{ 909{
910#if EV_USE_PORT
911 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
912#endif
913#if EV_USE_KQUEUE
914 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
915#endif
813#if EV_USE_EPOLL 916#if EV_USE_EPOLL
814 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 917 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
815#endif
816#if EV_USE_KQUEUE
817 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
818#endif 918#endif
819 919
820 if (ev_is_active (&sigev)) 920 if (ev_is_active (&sigev))
821 { 921 {
822 /* default loop */ 922 /* default loop */
835 postfork = 0; 935 postfork = 0;
836} 936}
837 937
838#if EV_MULTIPLICITY 938#if EV_MULTIPLICITY
839struct ev_loop * 939struct ev_loop *
840ev_loop_new (int methods) 940ev_loop_new (unsigned int flags)
841{ 941{
842 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 942 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
843 943
844 memset (loop, 0, sizeof (struct ev_loop)); 944 memset (loop, 0, sizeof (struct ev_loop));
845 945
846 loop_init (EV_A_ methods); 946 loop_init (EV_A_ flags);
847 947
848 if (ev_method (EV_A)) 948 if (ev_backend (EV_A))
849 return loop; 949 return loop;
850 950
851 return 0; 951 return 0;
852} 952}
853 953
866 966
867#endif 967#endif
868 968
869#if EV_MULTIPLICITY 969#if EV_MULTIPLICITY
870struct ev_loop * 970struct ev_loop *
971ev_default_loop_init (unsigned int flags)
871#else 972#else
872int 973int
974ev_default_loop (unsigned int flags)
873#endif 975#endif
874ev_default_loop (int methods)
875{ 976{
876 if (sigpipe [0] == sigpipe [1]) 977 if (sigpipe [0] == sigpipe [1])
877 if (pipe (sigpipe)) 978 if (pipe (sigpipe))
878 return 0; 979 return 0;
879 980
880 if (!default_loop) 981 if (!ev_default_loop_ptr)
881 { 982 {
882#if EV_MULTIPLICITY 983#if EV_MULTIPLICITY
883 struct ev_loop *loop = default_loop = &default_loop_struct; 984 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
884#else 985#else
885 default_loop = 1; 986 ev_default_loop_ptr = 1;
886#endif 987#endif
887 988
888 loop_init (EV_A_ methods); 989 loop_init (EV_A_ flags);
889 990
890 if (ev_method (EV_A)) 991 if (ev_backend (EV_A))
891 { 992 {
892 siginit (EV_A); 993 siginit (EV_A);
893 994
894#ifndef WIN32 995#ifndef _WIN32
895 ev_signal_init (&childev, childcb, SIGCHLD); 996 ev_signal_init (&childev, childcb, SIGCHLD);
896 ev_set_priority (&childev, EV_MAXPRI); 997 ev_set_priority (&childev, EV_MAXPRI);
897 ev_signal_start (EV_A_ &childev); 998 ev_signal_start (EV_A_ &childev);
898 ev_unref (EV_A); /* child watcher should not keep loop alive */ 999 ev_unref (EV_A); /* child watcher should not keep loop alive */
899#endif 1000#endif
900 } 1001 }
901 else 1002 else
902 default_loop = 0; 1003 ev_default_loop_ptr = 0;
903 } 1004 }
904 1005
905 return default_loop; 1006 return ev_default_loop_ptr;
906} 1007}
907 1008
908void 1009void
909ev_default_destroy (void) 1010ev_default_destroy (void)
910{ 1011{
911#if EV_MULTIPLICITY 1012#if EV_MULTIPLICITY
912 struct ev_loop *loop = default_loop; 1013 struct ev_loop *loop = ev_default_loop_ptr;
913#endif 1014#endif
914 1015
915#ifndef WIN32 1016#ifndef _WIN32
916 ev_ref (EV_A); /* child watcher */ 1017 ev_ref (EV_A); /* child watcher */
917 ev_signal_stop (EV_A_ &childev); 1018 ev_signal_stop (EV_A_ &childev);
918#endif 1019#endif
919 1020
920 ev_ref (EV_A); /* signal watcher */ 1021 ev_ref (EV_A); /* signal watcher */
928 1029
929void 1030void
930ev_default_fork (void) 1031ev_default_fork (void)
931{ 1032{
932#if EV_MULTIPLICITY 1033#if EV_MULTIPLICITY
933 struct ev_loop *loop = default_loop; 1034 struct ev_loop *loop = ev_default_loop_ptr;
934#endif 1035#endif
935 1036
936 if (method) 1037 if (backend)
937 postfork = 1; 1038 postfork = 1;
938} 1039}
939 1040
940/*****************************************************************************/ 1041/*****************************************************************************/
941 1042
949 return 1; 1050 return 1;
950 1051
951 return 0; 1052 return 0;
952} 1053}
953 1054
954static void 1055inline void
955call_pending (EV_P) 1056call_pending (EV_P)
956{ 1057{
957 int pri; 1058 int pri;
958 1059
959 for (pri = NUMPRI; pri--; ) 1060 for (pri = NUMPRI; pri--; )
960 while (pendingcnt [pri]) 1061 while (pendingcnt [pri])
961 { 1062 {
962 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1063 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
963 1064
964 if (p->w) 1065 if (expect_true (p->w))
965 { 1066 {
966 p->w->pending = 0; 1067 p->w->pending = 0;
967 EV_CB_INVOKE (p->w, p->events); 1068 EV_CB_INVOKE (p->w, p->events);
968 } 1069 }
969 } 1070 }
970} 1071}
971 1072
972static void 1073inline void
973timers_reify (EV_P) 1074timers_reify (EV_P)
974{ 1075{
975 while (timercnt && ((WT)timers [0])->at <= mn_now) 1076 while (timercnt && ((WT)timers [0])->at <= mn_now)
976 { 1077 {
977 struct ev_timer *w = timers [0]; 1078 struct ev_timer *w = timers [0];
980 1081
981 /* first reschedule or stop timer */ 1082 /* first reschedule or stop timer */
982 if (w->repeat) 1083 if (w->repeat)
983 { 1084 {
984 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1085 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1086
985 ((WT)w)->at = mn_now + w->repeat; 1087 ((WT)w)->at += w->repeat;
1088 if (((WT)w)->at < mn_now)
1089 ((WT)w)->at = mn_now;
1090
986 downheap ((WT *)timers, timercnt, 0); 1091 downheap ((WT *)timers, timercnt, 0);
987 } 1092 }
988 else 1093 else
989 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1094 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
990 1095
991 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1096 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
992 } 1097 }
993} 1098}
994 1099
995static void 1100#if EV_PERIODICS
1101inline void
996periodics_reify (EV_P) 1102periodics_reify (EV_P)
997{ 1103{
998 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1104 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
999 { 1105 {
1000 struct ev_periodic *w = periodics [0]; 1106 struct ev_periodic *w = periodics [0];
1002 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1108 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1003 1109
1004 /* first reschedule or stop timer */ 1110 /* first reschedule or stop timer */
1005 if (w->reschedule_cb) 1111 if (w->reschedule_cb)
1006 { 1112 {
1007 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1113 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1008
1009 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1114 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1010 downheap ((WT *)periodics, periodiccnt, 0); 1115 downheap ((WT *)periodics, periodiccnt, 0);
1011 } 1116 }
1012 else if (w->interval) 1117 else if (w->interval)
1013 { 1118 {
1040 1145
1041 /* now rebuild the heap */ 1146 /* now rebuild the heap */
1042 for (i = periodiccnt >> 1; i--; ) 1147 for (i = periodiccnt >> 1; i--; )
1043 downheap ((WT *)periodics, periodiccnt, i); 1148 downheap ((WT *)periodics, periodiccnt, i);
1044} 1149}
1150#endif
1045 1151
1046inline int 1152inline int
1047time_update_monotonic (EV_P) 1153time_update_monotonic (EV_P)
1048{ 1154{
1049 mn_now = get_clock (); 1155 mn_now = get_clock ();
1059 ev_rt_now = ev_time (); 1165 ev_rt_now = ev_time ();
1060 return 1; 1166 return 1;
1061 } 1167 }
1062} 1168}
1063 1169
1064static void 1170inline void
1065time_update (EV_P) 1171time_update (EV_P)
1066{ 1172{
1067 int i; 1173 int i;
1068 1174
1069#if EV_USE_MONOTONIC 1175#if EV_USE_MONOTONIC
1083 ev_rt_now = ev_time (); 1189 ev_rt_now = ev_time ();
1084 mn_now = get_clock (); 1190 mn_now = get_clock ();
1085 now_floor = mn_now; 1191 now_floor = mn_now;
1086 } 1192 }
1087 1193
1194# if EV_PERIODICS
1088 periodics_reschedule (EV_A); 1195 periodics_reschedule (EV_A);
1196# endif
1089 /* no timer adjustment, as the monotonic clock doesn't jump */ 1197 /* no timer adjustment, as the monotonic clock doesn't jump */
1090 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1198 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1091 } 1199 }
1092 } 1200 }
1093 else 1201 else
1095 { 1203 {
1096 ev_rt_now = ev_time (); 1204 ev_rt_now = ev_time ();
1097 1205
1098 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1206 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1099 { 1207 {
1208#if EV_PERIODICS
1100 periodics_reschedule (EV_A); 1209 periodics_reschedule (EV_A);
1210#endif
1101 1211
1102 /* adjust timers. this is easy, as the offset is the same for all */ 1212 /* adjust timers. this is easy, as the offset is the same for all */
1103 for (i = 0; i < timercnt; ++i) 1213 for (i = 0; i < timercnt; ++i)
1104 ((WT)timers [i])->at += ev_rt_now - mn_now; 1214 ((WT)timers [i])->at += ev_rt_now - mn_now;
1105 } 1215 }
1126ev_loop (EV_P_ int flags) 1236ev_loop (EV_P_ int flags)
1127{ 1237{
1128 double block; 1238 double block;
1129 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1239 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1130 1240
1131 do 1241 while (activecnt)
1132 { 1242 {
1133 /* queue check watchers (and execute them) */ 1243 /* queue check watchers (and execute them) */
1134 if (expect_false (preparecnt)) 1244 if (expect_false (preparecnt))
1135 { 1245 {
1136 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1246 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1164 { 1274 {
1165 block = MAX_BLOCKTIME; 1275 block = MAX_BLOCKTIME;
1166 1276
1167 if (timercnt) 1277 if (timercnt)
1168 { 1278 {
1169 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1279 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1170 if (block > to) block = to; 1280 if (block > to) block = to;
1171 } 1281 }
1172 1282
1283#if EV_PERIODICS
1173 if (periodiccnt) 1284 if (periodiccnt)
1174 { 1285 {
1175 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1286 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1176 if (block > to) block = to; 1287 if (block > to) block = to;
1177 } 1288 }
1289#endif
1178 1290
1179 if (block < 0.) block = 0.; 1291 if (expect_false (block < 0.)) block = 0.;
1180 } 1292 }
1181 1293
1182 method_poll (EV_A_ block); 1294 backend_poll (EV_A_ block);
1183 1295
1184 /* update ev_rt_now, do magic */ 1296 /* update ev_rt_now, do magic */
1185 time_update (EV_A); 1297 time_update (EV_A);
1186 1298
1187 /* queue pending timers and reschedule them */ 1299 /* queue pending timers and reschedule them */
1188 timers_reify (EV_A); /* relative timers called last */ 1300 timers_reify (EV_A); /* relative timers called last */
1301#if EV_PERIODICS
1189 periodics_reify (EV_A); /* absolute timers called first */ 1302 periodics_reify (EV_A); /* absolute timers called first */
1303#endif
1190 1304
1191 /* queue idle watchers unless io or timers are pending */ 1305 /* queue idle watchers unless io or timers are pending */
1192 if (idlecnt && !any_pending (EV_A)) 1306 if (idlecnt && !any_pending (EV_A))
1193 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1307 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1194 1308
1195 /* queue check watchers, to be executed first */ 1309 /* queue check watchers, to be executed first */
1196 if (checkcnt) 1310 if (expect_false (checkcnt))
1197 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1311 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1198 1312
1199 call_pending (EV_A); 1313 call_pending (EV_A);
1314
1315 if (expect_false (loop_done))
1316 break;
1200 } 1317 }
1201 while (activecnt && !loop_done);
1202 1318
1203 if (loop_done != 2) 1319 if (loop_done != 2)
1204 loop_done = 0; 1320 loop_done = 0;
1205} 1321}
1206 1322
1266void 1382void
1267ev_io_start (EV_P_ struct ev_io *w) 1383ev_io_start (EV_P_ struct ev_io *w)
1268{ 1384{
1269 int fd = w->fd; 1385 int fd = w->fd;
1270 1386
1271 if (ev_is_active (w)) 1387 if (expect_false (ev_is_active (w)))
1272 return; 1388 return;
1273 1389
1274 assert (("ev_io_start called with negative fd", fd >= 0)); 1390 assert (("ev_io_start called with negative fd", fd >= 0));
1275 1391
1276 ev_start (EV_A_ (W)w, 1); 1392 ev_start (EV_A_ (W)w, 1);
1282 1398
1283void 1399void
1284ev_io_stop (EV_P_ struct ev_io *w) 1400ev_io_stop (EV_P_ struct ev_io *w)
1285{ 1401{
1286 ev_clear_pending (EV_A_ (W)w); 1402 ev_clear_pending (EV_A_ (W)w);
1287 if (!ev_is_active (w)) 1403 if (expect_false (!ev_is_active (w)))
1288 return; 1404 return;
1405
1406 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1289 1407
1290 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1408 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1291 ev_stop (EV_A_ (W)w); 1409 ev_stop (EV_A_ (W)w);
1292 1410
1293 fd_change (EV_A_ w->fd); 1411 fd_change (EV_A_ w->fd);
1294} 1412}
1295 1413
1296void 1414void
1297ev_timer_start (EV_P_ struct ev_timer *w) 1415ev_timer_start (EV_P_ struct ev_timer *w)
1298{ 1416{
1299 if (ev_is_active (w)) 1417 if (expect_false (ev_is_active (w)))
1300 return; 1418 return;
1301 1419
1302 ((WT)w)->at += mn_now; 1420 ((WT)w)->at += mn_now;
1303 1421
1304 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1422 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1305 1423
1306 ev_start (EV_A_ (W)w, ++timercnt); 1424 ev_start (EV_A_ (W)w, ++timercnt);
1307 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1425 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1308 timers [timercnt - 1] = w; 1426 timers [timercnt - 1] = w;
1309 upheap ((WT *)timers, timercnt - 1); 1427 upheap ((WT *)timers, timercnt - 1);
1310 1428
1311 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1429 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1312} 1430}
1313 1431
1314void 1432void
1315ev_timer_stop (EV_P_ struct ev_timer *w) 1433ev_timer_stop (EV_P_ struct ev_timer *w)
1316{ 1434{
1317 ev_clear_pending (EV_A_ (W)w); 1435 ev_clear_pending (EV_A_ (W)w);
1318 if (!ev_is_active (w)) 1436 if (expect_false (!ev_is_active (w)))
1319 return; 1437 return;
1320 1438
1321 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1439 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1322 1440
1323 if (((W)w)->active < timercnt--) 1441 if (expect_true (((W)w)->active < timercnt--))
1324 { 1442 {
1325 timers [((W)w)->active - 1] = timers [timercnt]; 1443 timers [((W)w)->active - 1] = timers [timercnt];
1326 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1444 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1327 } 1445 }
1328 1446
1329 ((WT)w)->at = w->repeat; 1447 ((WT)w)->at -= mn_now;
1330 1448
1331 ev_stop (EV_A_ (W)w); 1449 ev_stop (EV_A_ (W)w);
1332} 1450}
1333 1451
1334void 1452void
1335ev_timer_again (EV_P_ struct ev_timer *w) 1453ev_timer_again (EV_P_ struct ev_timer *w)
1336{ 1454{
1337 if (ev_is_active (w)) 1455 if (ev_is_active (w))
1338 { 1456 {
1339 if (w->repeat) 1457 if (w->repeat)
1458 {
1459 ((WT)w)->at = mn_now + w->repeat;
1340 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1460 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1461 }
1341 else 1462 else
1342 ev_timer_stop (EV_A_ w); 1463 ev_timer_stop (EV_A_ w);
1343 } 1464 }
1344 else if (w->repeat) 1465 else if (w->repeat)
1466 {
1467 w->at = w->repeat;
1345 ev_timer_start (EV_A_ w); 1468 ev_timer_start (EV_A_ w);
1469 }
1346} 1470}
1347 1471
1472#if EV_PERIODICS
1348void 1473void
1349ev_periodic_start (EV_P_ struct ev_periodic *w) 1474ev_periodic_start (EV_P_ struct ev_periodic *w)
1350{ 1475{
1351 if (ev_is_active (w)) 1476 if (expect_false (ev_is_active (w)))
1352 return; 1477 return;
1353 1478
1354 if (w->reschedule_cb) 1479 if (w->reschedule_cb)
1355 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1480 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1356 else if (w->interval) 1481 else if (w->interval)
1359 /* this formula differs from the one in periodic_reify because we do not always round up */ 1484 /* this formula differs from the one in periodic_reify because we do not always round up */
1360 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1485 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1361 } 1486 }
1362 1487
1363 ev_start (EV_A_ (W)w, ++periodiccnt); 1488 ev_start (EV_A_ (W)w, ++periodiccnt);
1364 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1489 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1365 periodics [periodiccnt - 1] = w; 1490 periodics [periodiccnt - 1] = w;
1366 upheap ((WT *)periodics, periodiccnt - 1); 1491 upheap ((WT *)periodics, periodiccnt - 1);
1367 1492
1368 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1493 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1369} 1494}
1370 1495
1371void 1496void
1372ev_periodic_stop (EV_P_ struct ev_periodic *w) 1497ev_periodic_stop (EV_P_ struct ev_periodic *w)
1373{ 1498{
1374 ev_clear_pending (EV_A_ (W)w); 1499 ev_clear_pending (EV_A_ (W)w);
1375 if (!ev_is_active (w)) 1500 if (expect_false (!ev_is_active (w)))
1376 return; 1501 return;
1377 1502
1378 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1503 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1379 1504
1380 if (((W)w)->active < periodiccnt--) 1505 if (expect_true (((W)w)->active < periodiccnt--))
1381 { 1506 {
1382 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1507 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1383 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1508 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1384 } 1509 }
1385 1510
1386 ev_stop (EV_A_ (W)w); 1511 ev_stop (EV_A_ (W)w);
1387} 1512}
1388 1513
1391{ 1516{
1392 /* TODO: use adjustheap and recalculation */ 1517 /* TODO: use adjustheap and recalculation */
1393 ev_periodic_stop (EV_A_ w); 1518 ev_periodic_stop (EV_A_ w);
1394 ev_periodic_start (EV_A_ w); 1519 ev_periodic_start (EV_A_ w);
1395} 1520}
1521#endif
1396 1522
1397void 1523void
1398ev_idle_start (EV_P_ struct ev_idle *w) 1524ev_idle_start (EV_P_ struct ev_idle *w)
1399{ 1525{
1400 if (ev_is_active (w)) 1526 if (expect_false (ev_is_active (w)))
1401 return; 1527 return;
1402 1528
1403 ev_start (EV_A_ (W)w, ++idlecnt); 1529 ev_start (EV_A_ (W)w, ++idlecnt);
1404 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1530 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1405 idles [idlecnt - 1] = w; 1531 idles [idlecnt - 1] = w;
1406} 1532}
1407 1533
1408void 1534void
1409ev_idle_stop (EV_P_ struct ev_idle *w) 1535ev_idle_stop (EV_P_ struct ev_idle *w)
1410{ 1536{
1411 ev_clear_pending (EV_A_ (W)w); 1537 ev_clear_pending (EV_A_ (W)w);
1412 if (ev_is_active (w)) 1538 if (expect_false (!ev_is_active (w)))
1413 return; 1539 return;
1414 1540
1415 idles [((W)w)->active - 1] = idles [--idlecnt]; 1541 idles [((W)w)->active - 1] = idles [--idlecnt];
1416 ev_stop (EV_A_ (W)w); 1542 ev_stop (EV_A_ (W)w);
1417} 1543}
1418 1544
1419void 1545void
1420ev_prepare_start (EV_P_ struct ev_prepare *w) 1546ev_prepare_start (EV_P_ struct ev_prepare *w)
1421{ 1547{
1422 if (ev_is_active (w)) 1548 if (expect_false (ev_is_active (w)))
1423 return; 1549 return;
1424 1550
1425 ev_start (EV_A_ (W)w, ++preparecnt); 1551 ev_start (EV_A_ (W)w, ++preparecnt);
1426 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1552 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1427 prepares [preparecnt - 1] = w; 1553 prepares [preparecnt - 1] = w;
1428} 1554}
1429 1555
1430void 1556void
1431ev_prepare_stop (EV_P_ struct ev_prepare *w) 1557ev_prepare_stop (EV_P_ struct ev_prepare *w)
1432{ 1558{
1433 ev_clear_pending (EV_A_ (W)w); 1559 ev_clear_pending (EV_A_ (W)w);
1434 if (ev_is_active (w)) 1560 if (expect_false (!ev_is_active (w)))
1435 return; 1561 return;
1436 1562
1437 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1563 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1438 ev_stop (EV_A_ (W)w); 1564 ev_stop (EV_A_ (W)w);
1439} 1565}
1440 1566
1441void 1567void
1442ev_check_start (EV_P_ struct ev_check *w) 1568ev_check_start (EV_P_ struct ev_check *w)
1443{ 1569{
1444 if (ev_is_active (w)) 1570 if (expect_false (ev_is_active (w)))
1445 return; 1571 return;
1446 1572
1447 ev_start (EV_A_ (W)w, ++checkcnt); 1573 ev_start (EV_A_ (W)w, ++checkcnt);
1448 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1574 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1449 checks [checkcnt - 1] = w; 1575 checks [checkcnt - 1] = w;
1450} 1576}
1451 1577
1452void 1578void
1453ev_check_stop (EV_P_ struct ev_check *w) 1579ev_check_stop (EV_P_ struct ev_check *w)
1454{ 1580{
1455 ev_clear_pending (EV_A_ (W)w); 1581 ev_clear_pending (EV_A_ (W)w);
1456 if (ev_is_active (w)) 1582 if (expect_false (!ev_is_active (w)))
1457 return; 1583 return;
1458 1584
1459 checks [((W)w)->active - 1] = checks [--checkcnt]; 1585 checks [((W)w)->active - 1] = checks [--checkcnt];
1460 ev_stop (EV_A_ (W)w); 1586 ev_stop (EV_A_ (W)w);
1461} 1587}
1466 1592
1467void 1593void
1468ev_signal_start (EV_P_ struct ev_signal *w) 1594ev_signal_start (EV_P_ struct ev_signal *w)
1469{ 1595{
1470#if EV_MULTIPLICITY 1596#if EV_MULTIPLICITY
1471 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1597 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1472#endif 1598#endif
1473 if (ev_is_active (w)) 1599 if (expect_false (ev_is_active (w)))
1474 return; 1600 return;
1475 1601
1476 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1602 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1477 1603
1478 ev_start (EV_A_ (W)w, 1); 1604 ev_start (EV_A_ (W)w, 1);
1479 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1605 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1480 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1606 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1481 1607
1482 if (!((WL)w)->next) 1608 if (!((WL)w)->next)
1483 { 1609 {
1484#if WIN32 1610#if _WIN32
1485 signal (w->signum, sighandler); 1611 signal (w->signum, sighandler);
1486#else 1612#else
1487 struct sigaction sa; 1613 struct sigaction sa;
1488 sa.sa_handler = sighandler; 1614 sa.sa_handler = sighandler;
1489 sigfillset (&sa.sa_mask); 1615 sigfillset (&sa.sa_mask);
1495 1621
1496void 1622void
1497ev_signal_stop (EV_P_ struct ev_signal *w) 1623ev_signal_stop (EV_P_ struct ev_signal *w)
1498{ 1624{
1499 ev_clear_pending (EV_A_ (W)w); 1625 ev_clear_pending (EV_A_ (W)w);
1500 if (!ev_is_active (w)) 1626 if (expect_false (!ev_is_active (w)))
1501 return; 1627 return;
1502 1628
1503 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1629 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1504 ev_stop (EV_A_ (W)w); 1630 ev_stop (EV_A_ (W)w);
1505 1631
1509 1635
1510void 1636void
1511ev_child_start (EV_P_ struct ev_child *w) 1637ev_child_start (EV_P_ struct ev_child *w)
1512{ 1638{
1513#if EV_MULTIPLICITY 1639#if EV_MULTIPLICITY
1514 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1640 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1515#endif 1641#endif
1516 if (ev_is_active (w)) 1642 if (expect_false (ev_is_active (w)))
1517 return; 1643 return;
1518 1644
1519 ev_start (EV_A_ (W)w, 1); 1645 ev_start (EV_A_ (W)w, 1);
1520 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1646 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1521} 1647}
1522 1648
1523void 1649void
1524ev_child_stop (EV_P_ struct ev_child *w) 1650ev_child_stop (EV_P_ struct ev_child *w)
1525{ 1651{
1526 ev_clear_pending (EV_A_ (W)w); 1652 ev_clear_pending (EV_A_ (W)w);
1527 if (ev_is_active (w)) 1653 if (expect_false (!ev_is_active (w)))
1528 return; 1654 return;
1529 1655
1530 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1656 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1531 ev_stop (EV_A_ (W)w); 1657 ev_stop (EV_A_ (W)w);
1532} 1658}
1569void 1695void
1570ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1696ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1571{ 1697{
1572 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1698 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1573 1699
1574 if (!once) 1700 if (expect_false (!once))
1701 {
1575 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1702 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1576 else 1703 return;
1577 { 1704 }
1705
1578 once->cb = cb; 1706 once->cb = cb;
1579 once->arg = arg; 1707 once->arg = arg;
1580 1708
1581 ev_init (&once->io, once_cb_io); 1709 ev_init (&once->io, once_cb_io);
1582 if (fd >= 0) 1710 if (fd >= 0)
1583 { 1711 {
1584 ev_io_set (&once->io, fd, events); 1712 ev_io_set (&once->io, fd, events);
1585 ev_io_start (EV_A_ &once->io); 1713 ev_io_start (EV_A_ &once->io);
1586 } 1714 }
1587 1715
1588 ev_init (&once->to, once_cb_to); 1716 ev_init (&once->to, once_cb_to);
1589 if (timeout >= 0.) 1717 if (timeout >= 0.)
1590 { 1718 {
1591 ev_timer_set (&once->to, timeout, 0.); 1719 ev_timer_set (&once->to, timeout, 0.);
1592 ev_timer_start (EV_A_ &once->to); 1720 ev_timer_start (EV_A_ &once->to);
1593 }
1594 } 1721 }
1595} 1722}
1596 1723
1724#ifdef __cplusplus
1725}
1726#endif
1727

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines