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

Comparing libev/ev.c (file contents):
Revision 1.81 by root, Fri Nov 9 17:07:59 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);
… …
271#endif 331#endif
272 332
273 return ev_time (); 333 return ev_time ();
274} 334}
275 335
336#if EV_MULTIPLICITY
276ev_tstamp 337ev_tstamp
277ev_now (EV_P) 338ev_now (EV_P)
278{ 339{
279 return rt_now; 340 return ev_rt_now;
280} 341}
342#endif
281 343
282#define array_roundsize(type,n) ((n) | 4 & ~3) 344#define array_roundsize(type,n) (((n) | 4) & ~3)
283 345
284#define array_needsize(type,base,cur,cnt,init) \ 346#define array_needsize(type,base,cur,cnt,init) \
285 if (expect_false ((cnt) > cur)) \ 347 if (expect_false ((cnt) > cur)) \
286 { \ 348 { \
287 int newcnt = cur; \ 349 int newcnt = cur; \
… …
302 stem ## max = array_roundsize (stem ## cnt >> 1); \ 364 stem ## max = array_roundsize (stem ## cnt >> 1); \
303 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 365 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
304 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 366 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
305 } 367 }
306 368
307/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
308/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
309#define array_free_microshit(stem) \
310 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
311
312#define array_free(stem, idx) \ 369#define array_free(stem, idx) \
313 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;
314 371
315/*****************************************************************************/ 372/*****************************************************************************/
316 373
… …
330void 387void
331ev_feed_event (EV_P_ void *w, int revents) 388ev_feed_event (EV_P_ void *w, int revents)
332{ 389{
333 W w_ = (W)w; 390 W w_ = (W)w;
334 391
335 if (w_->pending) 392 if (expect_false (w_->pending))
336 { 393 {
337 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 394 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
338 return; 395 return;
339 } 396 }
340 397
341 w_->pending = ++pendingcnt [ABSPRI (w_)]; 398 w_->pending = ++pendingcnt [ABSPRI (w_)];
342 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);
343 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 400 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
344 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 401 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
345} 402}
346 403
347static void 404static void
… …
374 fd_event (EV_A_ fd, revents); 431 fd_event (EV_A_ fd, revents);
375} 432}
376 433
377/*****************************************************************************/ 434/*****************************************************************************/
378 435
379static void 436inline void
380fd_reify (EV_P) 437fd_reify (EV_P)
381{ 438{
382 int i; 439 int i;
383 440
384 for (i = 0; i < fdchangecnt; ++i) 441 for (i = 0; i < fdchangecnt; ++i)
… …
390 int events = 0; 447 int events = 0;
391 448
392 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)
393 events |= w->events; 450 events |= w->events;
394 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
395 anfd->reify = 0; 461 anfd->reify = 0;
396 462
397 method_modify (EV_A_ fd, anfd->events, events); 463 backend_modify (EV_A_ fd, anfd->events, events);
398 anfd->events = events; 464 anfd->events = events;
399 } 465 }
400 466
401 fdchangecnt = 0; 467 fdchangecnt = 0;
402} 468}
403 469
404static void 470static void
405fd_change (EV_P_ int fd) 471fd_change (EV_P_ int fd)
406{ 472{
407 if (anfds [fd].reify) 473 if (expect_false (anfds [fd].reify))
408 return; 474 return;
409 475
410 anfds [fd].reify = 1; 476 anfds [fd].reify = 1;
411 477
412 ++fdchangecnt; 478 ++fdchangecnt;
413 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 479 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
414 fdchanges [fdchangecnt - 1] = fd; 480 fdchanges [fdchangecnt - 1] = fd;
415} 481}
416 482
417static void 483static void
418fd_kill (EV_P_ int fd) 484fd_kill (EV_P_ int fd)
… …
424 ev_io_stop (EV_A_ w); 490 ev_io_stop (EV_A_ w);
425 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);
426 } 492 }
427} 493}
428 494
429static int 495inline int
430fd_valid (int fd) 496fd_valid (int fd)
431{ 497{
432#ifdef WIN32 498#ifdef _WIN32
433 return !!win32_get_osfhandle (fd); 499 return _get_osfhandle (fd) != -1;
434#else 500#else
435 return fcntl (fd, F_GETFD) != -1; 501 return fcntl (fd, F_GETFD) != -1;
436#endif 502#endif
437} 503}
438 504
… …
460 fd_kill (EV_A_ fd); 526 fd_kill (EV_A_ fd);
461 return; 527 return;
462 } 528 }
463} 529}
464 530
465/* 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 */
466static void 532static void
467fd_rearm_all (EV_P) 533fd_rearm_all (EV_P)
468{ 534{
469 int fd; 535 int fd;
470 536
… …
518 584
519 heap [k] = w; 585 heap [k] = w;
520 ((W)heap [k])->active = k + 1; 586 ((W)heap [k])->active = k + 1;
521} 587}
522 588
589inline void
590adjustheap (WT *heap, int N, int k)
591{
592 upheap (heap, k);
593 downheap (heap, N, k);
594}
595
523/*****************************************************************************/ 596/*****************************************************************************/
524 597
525typedef struct 598typedef struct
526{ 599{
527 WL head; 600 WL head;
… …
548} 621}
549 622
550static void 623static void
551sighandler (int signum) 624sighandler (int signum)
552{ 625{
553#if WIN32 626#if _WIN32
554 signal (signum, sighandler); 627 signal (signum, sighandler);
555#endif 628#endif
556 629
557 signals [signum - 1].gotsig = 1; 630 signals [signum - 1].gotsig = 1;
558 631
559 if (!gotsig) 632 if (!gotsig)
560 { 633 {
561 int old_errno = errno; 634 int old_errno = errno;
562 gotsig = 1; 635 gotsig = 1;
563#ifdef WIN32
564 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
565#else
566 write (sigpipe [1], &signum, 1); 636 write (sigpipe [1], &signum, 1);
567#endif
568 errno = old_errno; 637 errno = old_errno;
569 } 638 }
570} 639}
571 640
572void 641void
573ev_feed_signal_event (EV_P_ int signum) 642ev_feed_signal_event (EV_P_ int signum)
574{ 643{
575 WL w; 644 WL w;
576 645
577#if EV_MULTIPLICITY 646#if EV_MULTIPLICITY
578 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));
579#endif 648#endif
580 649
581 --signum; 650 --signum;
582 651
583 if (signum < 0 || signum >= signalmax) 652 if (signum < 0 || signum >= signalmax)
… …
592static void 661static void
593sigcb (EV_P_ struct ev_io *iow, int revents) 662sigcb (EV_P_ struct ev_io *iow, int revents)
594{ 663{
595 int signum; 664 int signum;
596 665
597#ifdef WIN32
598 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
599#else
600 read (sigpipe [0], &revents, 1); 666 read (sigpipe [0], &revents, 1);
601#endif
602 gotsig = 0; 667 gotsig = 0;
603 668
604 for (signum = signalmax; signum--; ) 669 for (signum = signalmax; signum--; )
605 if (signals [signum].gotsig) 670 if (signals [signum].gotsig)
606 ev_feed_signal_event (EV_A_ signum + 1); 671 ev_feed_signal_event (EV_A_ signum + 1);
607} 672}
608 673
609static 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
610siginit (EV_P) 687siginit (EV_P)
611{ 688{
612#ifndef WIN32 689 fd_intern (sigpipe [0]);
613 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 690 fd_intern (sigpipe [1]);
614 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
615
616 /* rather than sort out wether we really need nb, set it */
617 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
618 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
619#endif
620 691
621 ev_io_set (&sigev, sigpipe [0], EV_READ); 692 ev_io_set (&sigev, sigpipe [0], EV_READ);
622 ev_io_start (EV_A_ &sigev); 693 ev_io_start (EV_A_ &sigev);
623 ev_unref (EV_A); /* child watcher should not keep loop alive */ 694 ev_unref (EV_A); /* child watcher should not keep loop alive */
624} 695}
625 696
626/*****************************************************************************/ 697/*****************************************************************************/
627 698
628static struct ev_child *childs [PID_HASHSIZE]; 699static struct ev_child *childs [PID_HASHSIZE];
629 700
630#ifndef WIN32 701#ifndef _WIN32
631 702
632static struct ev_signal childev; 703static struct ev_signal childev;
633 704
634#ifndef WCONTINUED 705#ifndef WCONTINUED
635# define WCONTINUED 0 706# define WCONTINUED 0
… …
656 int pid, status; 727 int pid, status;
657 728
658 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 729 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
659 { 730 {
660 /* 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 */
661 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 733 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
662 734
663 child_reap (EV_A_ sw, pid, pid, status); 735 child_reap (EV_A_ sw, pid, pid, status);
664 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 */
665 } 737 }
666} 738}
667 739
668#endif 740#endif
669 741
670/*****************************************************************************/ 742/*****************************************************************************/
671 743
744#if EV_USE_PORT
745# include "ev_port.c"
746#endif
672#if EV_USE_KQUEUE 747#if EV_USE_KQUEUE
673# include "ev_kqueue.c" 748# include "ev_kqueue.c"
674#endif 749#endif
675#if EV_USE_EPOLL 750#if EV_USE_EPOLL
676# include "ev_epoll.c" 751# include "ev_epoll.c"
… …
696 771
697/* 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 */
698static int 773static int
699enable_secure (void) 774enable_secure (void)
700{ 775{
701#ifdef WIN32 776#ifdef _WIN32
702 return 0; 777 return 0;
703#else 778#else
704 return getuid () != geteuid () 779 return getuid () != geteuid ()
705 || getgid () != getegid (); 780 || getgid () != getegid ();
706#endif 781#endif
707} 782}
708 783
709int 784unsigned int
710ev_method (EV_P) 785ev_supported_backends (void)
711{ 786{
712 return method; 787 unsigned int flags = 0;
713}
714 788
715static void 789 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
716loop_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)
717{ 800{
718 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)
719 { 826 {
720#if EV_USE_MONOTONIC 827#if EV_USE_MONOTONIC
721 { 828 {
722 struct timespec ts; 829 struct timespec ts;
723 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 830 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
724 have_monotonic = 1; 831 have_monotonic = 1;
725 } 832 }
726#endif 833#endif
727 834
728 rt_now = ev_time (); 835 ev_rt_now = ev_time ();
729 mn_now = get_clock (); 836 mn_now = get_clock ();
730 now_floor = mn_now; 837 now_floor = mn_now;
731 rtmn_diff = rt_now - mn_now; 838 rtmn_diff = ev_rt_now - mn_now;
732 839
733 if (methods == EVMETHOD_AUTO) 840 if (!(flags & EVFLAG_NOENV)
734 if (!enable_secure () && getenv ("LIBEV_METHODS")) 841 && !enable_secure ()
842 && getenv ("LIBEV_FLAGS"))
735 methods = atoi (getenv ("LIBEV_METHODS")); 843 flags = atoi (getenv ("LIBEV_FLAGS"));
736 else
737 methods = EVMETHOD_ANY;
738 844
739 method = 0; 845 if (!(flags & 0x0000ffffUL))
740#if EV_USE_WIN32 846 flags |= ev_recommended_backends ();
741 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);
742#endif 851#endif
743#if EV_USE_KQUEUE 852#if EV_USE_KQUEUE
744 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 853 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
745#endif 854#endif
746#if EV_USE_EPOLL 855#if EV_USE_EPOLL
747 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 856 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
748#endif 857#endif
749#if EV_USE_POLL 858#if EV_USE_POLL
750 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 859 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
751#endif 860#endif
752#if EV_USE_SELECT 861#if EV_USE_SELECT
753 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 862 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
754#endif 863#endif
755 864
756 ev_watcher_init (&sigev, sigcb); 865 ev_init (&sigev, sigcb);
757 ev_set_priority (&sigev, EV_MAXPRI); 866 ev_set_priority (&sigev, EV_MAXPRI);
758 } 867 }
759} 868}
760 869
761void 870static void
762loop_destroy (EV_P) 871loop_destroy (EV_P)
763{ 872{
764 int i; 873 int i;
765 874
766#if EV_USE_WIN32 875#if EV_USE_PORT
767 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 876 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
768#endif 877#endif
769#if EV_USE_KQUEUE 878#if EV_USE_KQUEUE
770 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 879 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
771#endif 880#endif
772#if EV_USE_EPOLL 881#if EV_USE_EPOLL
773 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 882 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
774#endif 883#endif
775#if EV_USE_POLL 884#if EV_USE_POLL
776 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 885 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
777#endif 886#endif
778#if EV_USE_SELECT 887#if EV_USE_SELECT
779 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 888 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
780#endif 889#endif
781 890
782 for (i = NUMPRI; i--; ) 891 for (i = NUMPRI; i--; )
783 array_free (pending, [i]); 892 array_free (pending, [i]);
784 893
785 /* have to use the microsoft-never-gets-it-right macro */ 894 /* have to use the microsoft-never-gets-it-right macro */
786 array_free_microshit (fdchange); 895 array_free (fdchange, EMPTY0);
787 array_free_microshit (timer); 896 array_free (timer, EMPTY0);
788 array_free_microshit (periodic); 897#if EV_PERIODICS
789 array_free_microshit (idle); 898 array_free (periodic, EMPTY0);
790 array_free_microshit (prepare); 899#endif
791 array_free_microshit (check); 900 array_free (idle, EMPTY0);
901 array_free (prepare, EMPTY0);
902 array_free (check, EMPTY0);
792 903
793 method = 0; 904 backend = 0;
794} 905}
795 906
796static void 907static void
797loop_fork (EV_P) 908loop_fork (EV_P)
798{ 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
799#if EV_USE_EPOLL 916#if EV_USE_EPOLL
800 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 917 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
801#endif
802#if EV_USE_KQUEUE
803 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
804#endif 918#endif
805 919
806 if (ev_is_active (&sigev)) 920 if (ev_is_active (&sigev))
807 { 921 {
808 /* default loop */ 922 /* default loop */
… …
821 postfork = 0; 935 postfork = 0;
822} 936}
823 937
824#if EV_MULTIPLICITY 938#if EV_MULTIPLICITY
825struct ev_loop * 939struct ev_loop *
826ev_loop_new (int methods) 940ev_loop_new (unsigned int flags)
827{ 941{
828 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));
829 943
830 memset (loop, 0, sizeof (struct ev_loop)); 944 memset (loop, 0, sizeof (struct ev_loop));
831 945
832 loop_init (EV_A_ methods); 946 loop_init (EV_A_ flags);
833 947
834 if (ev_method (EV_A)) 948 if (ev_backend (EV_A))
835 return loop; 949 return loop;
836 950
837 return 0; 951 return 0;
838} 952}
839 953
… …
852 966
853#endif 967#endif
854 968
855#if EV_MULTIPLICITY 969#if EV_MULTIPLICITY
856struct ev_loop * 970struct ev_loop *
971ev_default_loop_init (unsigned int flags)
857#else 972#else
858int 973int
974ev_default_loop (unsigned int flags)
859#endif 975#endif
860ev_default_loop (int methods)
861{ 976{
862 if (sigpipe [0] == sigpipe [1]) 977 if (sigpipe [0] == sigpipe [1])
863 if (pipe (sigpipe)) 978 if (pipe (sigpipe))
864 return 0; 979 return 0;
865 980
866 if (!default_loop) 981 if (!ev_default_loop_ptr)
867 { 982 {
868#if EV_MULTIPLICITY 983#if EV_MULTIPLICITY
869 struct ev_loop *loop = default_loop = &default_loop_struct; 984 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
870#else 985#else
871 default_loop = 1; 986 ev_default_loop_ptr = 1;
872#endif 987#endif
873 988
874 loop_init (EV_A_ methods); 989 loop_init (EV_A_ flags);
875 990
876 if (ev_method (EV_A)) 991 if (ev_backend (EV_A))
877 { 992 {
878 siginit (EV_A); 993 siginit (EV_A);
879 994
880#ifndef WIN32 995#ifndef _WIN32
881 ev_signal_init (&childev, childcb, SIGCHLD); 996 ev_signal_init (&childev, childcb, SIGCHLD);
882 ev_set_priority (&childev, EV_MAXPRI); 997 ev_set_priority (&childev, EV_MAXPRI);
883 ev_signal_start (EV_A_ &childev); 998 ev_signal_start (EV_A_ &childev);
884 ev_unref (EV_A); /* child watcher should not keep loop alive */ 999 ev_unref (EV_A); /* child watcher should not keep loop alive */
885#endif 1000#endif
886 } 1001 }
887 else 1002 else
888 default_loop = 0; 1003 ev_default_loop_ptr = 0;
889 } 1004 }
890 1005
891 return default_loop; 1006 return ev_default_loop_ptr;
892} 1007}
893 1008
894void 1009void
895ev_default_destroy (void) 1010ev_default_destroy (void)
896{ 1011{
897#if EV_MULTIPLICITY 1012#if EV_MULTIPLICITY
898 struct ev_loop *loop = default_loop; 1013 struct ev_loop *loop = ev_default_loop_ptr;
899#endif 1014#endif
900 1015
901#ifndef WIN32 1016#ifndef _WIN32
902 ev_ref (EV_A); /* child watcher */ 1017 ev_ref (EV_A); /* child watcher */
903 ev_signal_stop (EV_A_ &childev); 1018 ev_signal_stop (EV_A_ &childev);
904#endif 1019#endif
905 1020
906 ev_ref (EV_A); /* signal watcher */ 1021 ev_ref (EV_A); /* signal watcher */
… …
914 1029
915void 1030void
916ev_default_fork (void) 1031ev_default_fork (void)
917{ 1032{
918#if EV_MULTIPLICITY 1033#if EV_MULTIPLICITY
919 struct ev_loop *loop = default_loop; 1034 struct ev_loop *loop = ev_default_loop_ptr;
920#endif 1035#endif
921 1036
922 if (method) 1037 if (backend)
923 postfork = 1; 1038 postfork = 1;
924} 1039}
925 1040
926/*****************************************************************************/ 1041/*****************************************************************************/
927 1042
… …
935 return 1; 1050 return 1;
936 1051
937 return 0; 1052 return 0;
938} 1053}
939 1054
940static void 1055inline void
941call_pending (EV_P) 1056call_pending (EV_P)
942{ 1057{
943 int pri; 1058 int pri;
944 1059
945 for (pri = NUMPRI; pri--; ) 1060 for (pri = NUMPRI; pri--; )
946 while (pendingcnt [pri]) 1061 while (pendingcnt [pri])
947 { 1062 {
948 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1063 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
949 1064
950 if (p->w) 1065 if (expect_true (p->w))
951 { 1066 {
952 p->w->pending = 0; 1067 p->w->pending = 0;
953 p->w->cb (EV_A_ p->w, p->events); 1068 EV_CB_INVOKE (p->w, p->events);
954 } 1069 }
955 } 1070 }
956} 1071}
957 1072
958static void 1073inline void
959timers_reify (EV_P) 1074timers_reify (EV_P)
960{ 1075{
961 while (timercnt && ((WT)timers [0])->at <= mn_now) 1076 while (timercnt && ((WT)timers [0])->at <= mn_now)
962 { 1077 {
963 struct ev_timer *w = timers [0]; 1078 struct ev_timer *w = timers [0];
… …
966 1081
967 /* first reschedule or stop timer */ 1082 /* first reschedule or stop timer */
968 if (w->repeat) 1083 if (w->repeat)
969 { 1084 {
970 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
971 ((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
972 downheap ((WT *)timers, timercnt, 0); 1091 downheap ((WT *)timers, timercnt, 0);
973 } 1092 }
974 else 1093 else
975 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1094 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
976 1095
977 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1096 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
978 } 1097 }
979} 1098}
980 1099
981static void 1100#if EV_PERIODICS
1101inline void
982periodics_reify (EV_P) 1102periodics_reify (EV_P)
983{ 1103{
984 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1104 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
985 { 1105 {
986 struct ev_periodic *w = periodics [0]; 1106 struct ev_periodic *w = periodics [0];
987 1107
988 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1108 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
989 1109
990 /* first reschedule or stop timer */ 1110 /* first reschedule or stop timer */
991 if (w->reschedule_cb) 1111 if (w->reschedule_cb)
992 { 1112 {
993 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1113 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
994
995 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1114 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
996 downheap ((WT *)periodics, periodiccnt, 0); 1115 downheap ((WT *)periodics, periodiccnt, 0);
997 } 1116 }
998 else if (w->interval) 1117 else if (w->interval)
999 { 1118 {
1000 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1119 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
1001 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1120 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1002 downheap ((WT *)periodics, periodiccnt, 0); 1121 downheap ((WT *)periodics, periodiccnt, 0);
1003 } 1122 }
1004 else 1123 else
1005 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1124 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1006 1125
… …
1017 for (i = 0; i < periodiccnt; ++i) 1136 for (i = 0; i < periodiccnt; ++i)
1018 { 1137 {
1019 struct ev_periodic *w = periodics [i]; 1138 struct ev_periodic *w = periodics [i];
1020 1139
1021 if (w->reschedule_cb) 1140 if (w->reschedule_cb)
1022 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1141 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1023 else if (w->interval) 1142 else if (w->interval)
1024 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1143 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1025 } 1144 }
1026 1145
1027 /* now rebuild the heap */ 1146 /* now rebuild the heap */
1028 for (i = periodiccnt >> 1; i--; ) 1147 for (i = periodiccnt >> 1; i--; )
1029 downheap ((WT *)periodics, periodiccnt, i); 1148 downheap ((WT *)periodics, periodiccnt, i);
1030} 1149}
1150#endif
1031 1151
1032inline int 1152inline int
1033time_update_monotonic (EV_P) 1153time_update_monotonic (EV_P)
1034{ 1154{
1035 mn_now = get_clock (); 1155 mn_now = get_clock ();
1036 1156
1037 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1157 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1038 { 1158 {
1039 rt_now = rtmn_diff + mn_now; 1159 ev_rt_now = rtmn_diff + mn_now;
1040 return 0; 1160 return 0;
1041 } 1161 }
1042 else 1162 else
1043 { 1163 {
1044 now_floor = mn_now; 1164 now_floor = mn_now;
1045 rt_now = ev_time (); 1165 ev_rt_now = ev_time ();
1046 return 1; 1166 return 1;
1047 } 1167 }
1048} 1168}
1049 1169
1050static void 1170inline void
1051time_update (EV_P) 1171time_update (EV_P)
1052{ 1172{
1053 int i; 1173 int i;
1054 1174
1055#if EV_USE_MONOTONIC 1175#if EV_USE_MONOTONIC
… …
1059 { 1179 {
1060 ev_tstamp odiff = rtmn_diff; 1180 ev_tstamp odiff = rtmn_diff;
1061 1181
1062 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1182 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1063 { 1183 {
1064 rtmn_diff = rt_now - mn_now; 1184 rtmn_diff = ev_rt_now - mn_now;
1065 1185
1066 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1186 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1067 return; /* all is well */ 1187 return; /* all is well */
1068 1188
1069 rt_now = ev_time (); 1189 ev_rt_now = ev_time ();
1070 mn_now = get_clock (); 1190 mn_now = get_clock ();
1071 now_floor = mn_now; 1191 now_floor = mn_now;
1072 } 1192 }
1073 1193
1194# if EV_PERIODICS
1074 periodics_reschedule (EV_A); 1195 periodics_reschedule (EV_A);
1196# endif
1075 /* no timer adjustment, as the monotonic clock doesn't jump */ 1197 /* no timer adjustment, as the monotonic clock doesn't jump */
1076 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1198 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1077 } 1199 }
1078 } 1200 }
1079 else 1201 else
1080#endif 1202#endif
1081 { 1203 {
1082 rt_now = ev_time (); 1204 ev_rt_now = ev_time ();
1083 1205
1084 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1206 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1085 { 1207 {
1208#if EV_PERIODICS
1086 periodics_reschedule (EV_A); 1209 periodics_reschedule (EV_A);
1210#endif
1087 1211
1088 /* 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 */
1089 for (i = 0; i < timercnt; ++i) 1213 for (i = 0; i < timercnt; ++i)
1090 ((WT)timers [i])->at += rt_now - mn_now; 1214 ((WT)timers [i])->at += ev_rt_now - mn_now;
1091 } 1215 }
1092 1216
1093 mn_now = rt_now; 1217 mn_now = ev_rt_now;
1094 } 1218 }
1095} 1219}
1096 1220
1097void 1221void
1098ev_ref (EV_P) 1222ev_ref (EV_P)
… …
1112ev_loop (EV_P_ int flags) 1236ev_loop (EV_P_ int flags)
1113{ 1237{
1114 double block; 1238 double block;
1115 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1239 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1116 1240
1117 do 1241 while (activecnt)
1118 { 1242 {
1119 /* queue check watchers (and execute them) */ 1243 /* queue check watchers (and execute them) */
1120 if (expect_false (preparecnt)) 1244 if (expect_false (preparecnt))
1121 { 1245 {
1122 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1246 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1138 if (expect_true (have_monotonic)) 1262 if (expect_true (have_monotonic))
1139 time_update_monotonic (EV_A); 1263 time_update_monotonic (EV_A);
1140 else 1264 else
1141#endif 1265#endif
1142 { 1266 {
1143 rt_now = ev_time (); 1267 ev_rt_now = ev_time ();
1144 mn_now = rt_now; 1268 mn_now = ev_rt_now;
1145 } 1269 }
1146 1270
1147 if (flags & EVLOOP_NONBLOCK || idlecnt) 1271 if (flags & EVLOOP_NONBLOCK || idlecnt)
1148 block = 0.; 1272 block = 0.;
1149 else 1273 else
1150 { 1274 {
1151 block = MAX_BLOCKTIME; 1275 block = MAX_BLOCKTIME;
1152 1276
1153 if (timercnt) 1277 if (timercnt)
1154 { 1278 {
1155 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1279 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1156 if (block > to) block = to; 1280 if (block > to) block = to;
1157 } 1281 }
1158 1282
1283#if EV_PERIODICS
1159 if (periodiccnt) 1284 if (periodiccnt)
1160 { 1285 {
1161 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1286 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1162 if (block > to) block = to; 1287 if (block > to) block = to;
1163 } 1288 }
1289#endif
1164 1290
1165 if (block < 0.) block = 0.; 1291 if (expect_false (block < 0.)) block = 0.;
1166 } 1292 }
1167 1293
1168 method_poll (EV_A_ block); 1294 backend_poll (EV_A_ block);
1169 1295
1170 /* update rt_now, do magic */ 1296 /* update ev_rt_now, do magic */
1171 time_update (EV_A); 1297 time_update (EV_A);
1172 1298
1173 /* queue pending timers and reschedule them */ 1299 /* queue pending timers and reschedule them */
1174 timers_reify (EV_A); /* relative timers called last */ 1300 timers_reify (EV_A); /* relative timers called last */
1301#if EV_PERIODICS
1175 periodics_reify (EV_A); /* absolute timers called first */ 1302 periodics_reify (EV_A); /* absolute timers called first */
1303#endif
1176 1304
1177 /* queue idle watchers unless io or timers are pending */ 1305 /* queue idle watchers unless io or timers are pending */
1178 if (idlecnt && !any_pending (EV_A)) 1306 if (idlecnt && !any_pending (EV_A))
1179 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1307 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1180 1308
1181 /* queue check watchers, to be executed first */ 1309 /* queue check watchers, to be executed first */
1182 if (checkcnt) 1310 if (expect_false (checkcnt))
1183 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1311 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1184 1312
1185 call_pending (EV_A); 1313 call_pending (EV_A);
1314
1315 if (expect_false (loop_done))
1316 break;
1186 } 1317 }
1187 while (activecnt && !loop_done);
1188 1318
1189 if (loop_done != 2) 1319 if (loop_done != 2)
1190 loop_done = 0; 1320 loop_done = 0;
1191} 1321}
1192 1322
… …
1252void 1382void
1253ev_io_start (EV_P_ struct ev_io *w) 1383ev_io_start (EV_P_ struct ev_io *w)
1254{ 1384{
1255 int fd = w->fd; 1385 int fd = w->fd;
1256 1386
1257 if (ev_is_active (w)) 1387 if (expect_false (ev_is_active (w)))
1258 return; 1388 return;
1259 1389
1260 assert (("ev_io_start called with negative fd", fd >= 0)); 1390 assert (("ev_io_start called with negative fd", fd >= 0));
1261 1391
1262 ev_start (EV_A_ (W)w, 1); 1392 ev_start (EV_A_ (W)w, 1);
… …
1268 1398
1269void 1399void
1270ev_io_stop (EV_P_ struct ev_io *w) 1400ev_io_stop (EV_P_ struct ev_io *w)
1271{ 1401{
1272 ev_clear_pending (EV_A_ (W)w); 1402 ev_clear_pending (EV_A_ (W)w);
1273 if (!ev_is_active (w)) 1403 if (expect_false (!ev_is_active (w)))
1274 return; 1404 return;
1405
1406 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1275 1407
1276 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1408 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1277 ev_stop (EV_A_ (W)w); 1409 ev_stop (EV_A_ (W)w);
1278 1410
1279 fd_change (EV_A_ w->fd); 1411 fd_change (EV_A_ w->fd);
1280} 1412}
1281 1413
1282void 1414void
1283ev_timer_start (EV_P_ struct ev_timer *w) 1415ev_timer_start (EV_P_ struct ev_timer *w)
1284{ 1416{
1285 if (ev_is_active (w)) 1417 if (expect_false (ev_is_active (w)))
1286 return; 1418 return;
1287 1419
1288 ((WT)w)->at += mn_now; 1420 ((WT)w)->at += mn_now;
1289 1421
1290 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.));
1291 1423
1292 ev_start (EV_A_ (W)w, ++timercnt); 1424 ev_start (EV_A_ (W)w, ++timercnt);
1293 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1425 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1294 timers [timercnt - 1] = w; 1426 timers [timercnt - 1] = w;
1295 upheap ((WT *)timers, timercnt - 1); 1427 upheap ((WT *)timers, timercnt - 1);
1296 1428
1297 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1429 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1298} 1430}
1299 1431
1300void 1432void
1301ev_timer_stop (EV_P_ struct ev_timer *w) 1433ev_timer_stop (EV_P_ struct ev_timer *w)
1302{ 1434{
1303 ev_clear_pending (EV_A_ (W)w); 1435 ev_clear_pending (EV_A_ (W)w);
1304 if (!ev_is_active (w)) 1436 if (expect_false (!ev_is_active (w)))
1305 return; 1437 return;
1306 1438
1307 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1439 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1308 1440
1309 if (((W)w)->active < timercnt--) 1441 if (expect_true (((W)w)->active < timercnt--))
1310 { 1442 {
1311 timers [((W)w)->active - 1] = timers [timercnt]; 1443 timers [((W)w)->active - 1] = timers [timercnt];
1312 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1444 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1313 } 1445 }
1314 1446
1315 ((WT)w)->at = w->repeat; 1447 ((WT)w)->at -= mn_now;
1316 1448
1317 ev_stop (EV_A_ (W)w); 1449 ev_stop (EV_A_ (W)w);
1318} 1450}
1319 1451
1320void 1452void
… …
1323 if (ev_is_active (w)) 1455 if (ev_is_active (w))
1324 { 1456 {
1325 if (w->repeat) 1457 if (w->repeat)
1326 { 1458 {
1327 ((WT)w)->at = mn_now + w->repeat; 1459 ((WT)w)->at = mn_now + w->repeat;
1328 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1460 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1329 } 1461 }
1330 else 1462 else
1331 ev_timer_stop (EV_A_ w); 1463 ev_timer_stop (EV_A_ w);
1332 } 1464 }
1333 else if (w->repeat) 1465 else if (w->repeat)
1466 {
1467 w->at = w->repeat;
1334 ev_timer_start (EV_A_ w); 1468 ev_timer_start (EV_A_ w);
1469 }
1335} 1470}
1336 1471
1472#if EV_PERIODICS
1337void 1473void
1338ev_periodic_start (EV_P_ struct ev_periodic *w) 1474ev_periodic_start (EV_P_ struct ev_periodic *w)
1339{ 1475{
1340 if (ev_is_active (w)) 1476 if (expect_false (ev_is_active (w)))
1341 return; 1477 return;
1342 1478
1343 if (w->reschedule_cb) 1479 if (w->reschedule_cb)
1344 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1480 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1345 else if (w->interval) 1481 else if (w->interval)
1346 { 1482 {
1347 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1483 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1348 /* 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 */
1349 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1485 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1350 } 1486 }
1351 1487
1352 ev_start (EV_A_ (W)w, ++periodiccnt); 1488 ev_start (EV_A_ (W)w, ++periodiccnt);
1353 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1489 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1354 periodics [periodiccnt - 1] = w; 1490 periodics [periodiccnt - 1] = w;
1355 upheap ((WT *)periodics, periodiccnt - 1); 1491 upheap ((WT *)periodics, periodiccnt - 1);
1356 1492
1357 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1493 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1358} 1494}
1359 1495
1360void 1496void
1361ev_periodic_stop (EV_P_ struct ev_periodic *w) 1497ev_periodic_stop (EV_P_ struct ev_periodic *w)
1362{ 1498{
1363 ev_clear_pending (EV_A_ (W)w); 1499 ev_clear_pending (EV_A_ (W)w);
1364 if (!ev_is_active (w)) 1500 if (expect_false (!ev_is_active (w)))
1365 return; 1501 return;
1366 1502
1367 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1503 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1368 1504
1369 if (((W)w)->active < periodiccnt--) 1505 if (expect_true (((W)w)->active < periodiccnt--))
1370 { 1506 {
1371 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1507 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1372 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1508 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1373 } 1509 }
1374 1510
1375 ev_stop (EV_A_ (W)w); 1511 ev_stop (EV_A_ (W)w);
1376} 1512}
1377 1513
1378void 1514void
1379ev_periodic_again (EV_P_ struct ev_periodic *w) 1515ev_periodic_again (EV_P_ struct ev_periodic *w)
1380{ 1516{
1517 /* TODO: use adjustheap and recalculation */
1381 ev_periodic_stop (EV_A_ w); 1518 ev_periodic_stop (EV_A_ w);
1382 ev_periodic_start (EV_A_ w); 1519 ev_periodic_start (EV_A_ w);
1383} 1520}
1521#endif
1384 1522
1385void 1523void
1386ev_idle_start (EV_P_ struct ev_idle *w) 1524ev_idle_start (EV_P_ struct ev_idle *w)
1387{ 1525{
1388 if (ev_is_active (w)) 1526 if (expect_false (ev_is_active (w)))
1389 return; 1527 return;
1390 1528
1391 ev_start (EV_A_ (W)w, ++idlecnt); 1529 ev_start (EV_A_ (W)w, ++idlecnt);
1392 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1530 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1393 idles [idlecnt - 1] = w; 1531 idles [idlecnt - 1] = w;
1394} 1532}
1395 1533
1396void 1534void
1397ev_idle_stop (EV_P_ struct ev_idle *w) 1535ev_idle_stop (EV_P_ struct ev_idle *w)
1398{ 1536{
1399 ev_clear_pending (EV_A_ (W)w); 1537 ev_clear_pending (EV_A_ (W)w);
1400 if (ev_is_active (w)) 1538 if (expect_false (!ev_is_active (w)))
1401 return; 1539 return;
1402 1540
1403 idles [((W)w)->active - 1] = idles [--idlecnt]; 1541 idles [((W)w)->active - 1] = idles [--idlecnt];
1404 ev_stop (EV_A_ (W)w); 1542 ev_stop (EV_A_ (W)w);
1405} 1543}
1406 1544
1407void 1545void
1408ev_prepare_start (EV_P_ struct ev_prepare *w) 1546ev_prepare_start (EV_P_ struct ev_prepare *w)
1409{ 1547{
1410 if (ev_is_active (w)) 1548 if (expect_false (ev_is_active (w)))
1411 return; 1549 return;
1412 1550
1413 ev_start (EV_A_ (W)w, ++preparecnt); 1551 ev_start (EV_A_ (W)w, ++preparecnt);
1414 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1552 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1415 prepares [preparecnt - 1] = w; 1553 prepares [preparecnt - 1] = w;
1416} 1554}
1417 1555
1418void 1556void
1419ev_prepare_stop (EV_P_ struct ev_prepare *w) 1557ev_prepare_stop (EV_P_ struct ev_prepare *w)
1420{ 1558{
1421 ev_clear_pending (EV_A_ (W)w); 1559 ev_clear_pending (EV_A_ (W)w);
1422 if (ev_is_active (w)) 1560 if (expect_false (!ev_is_active (w)))
1423 return; 1561 return;
1424 1562
1425 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1563 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1426 ev_stop (EV_A_ (W)w); 1564 ev_stop (EV_A_ (W)w);
1427} 1565}
1428 1566
1429void 1567void
1430ev_check_start (EV_P_ struct ev_check *w) 1568ev_check_start (EV_P_ struct ev_check *w)
1431{ 1569{
1432 if (ev_is_active (w)) 1570 if (expect_false (ev_is_active (w)))
1433 return; 1571 return;
1434 1572
1435 ev_start (EV_A_ (W)w, ++checkcnt); 1573 ev_start (EV_A_ (W)w, ++checkcnt);
1436 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1574 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1437 checks [checkcnt - 1] = w; 1575 checks [checkcnt - 1] = w;
1438} 1576}
1439 1577
1440void 1578void
1441ev_check_stop (EV_P_ struct ev_check *w) 1579ev_check_stop (EV_P_ struct ev_check *w)
1442{ 1580{
1443 ev_clear_pending (EV_A_ (W)w); 1581 ev_clear_pending (EV_A_ (W)w);
1444 if (ev_is_active (w)) 1582 if (expect_false (!ev_is_active (w)))
1445 return; 1583 return;
1446 1584
1447 checks [((W)w)->active - 1] = checks [--checkcnt]; 1585 checks [((W)w)->active - 1] = checks [--checkcnt];
1448 ev_stop (EV_A_ (W)w); 1586 ev_stop (EV_A_ (W)w);
1449} 1587}
… …
1454 1592
1455void 1593void
1456ev_signal_start (EV_P_ struct ev_signal *w) 1594ev_signal_start (EV_P_ struct ev_signal *w)
1457{ 1595{
1458#if EV_MULTIPLICITY 1596#if EV_MULTIPLICITY
1459 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));
1460#endif 1598#endif
1461 if (ev_is_active (w)) 1599 if (expect_false (ev_is_active (w)))
1462 return; 1600 return;
1463 1601
1464 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));
1465 1603
1466 ev_start (EV_A_ (W)w, 1); 1604 ev_start (EV_A_ (W)w, 1);
1467 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1605 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1468 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1606 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1469 1607
1470 if (!((WL)w)->next) 1608 if (!((WL)w)->next)
1471 { 1609 {
1472#if WIN32 1610#if _WIN32
1473 signal (w->signum, sighandler); 1611 signal (w->signum, sighandler);
1474#else 1612#else
1475 struct sigaction sa; 1613 struct sigaction sa;
1476 sa.sa_handler = sighandler; 1614 sa.sa_handler = sighandler;
1477 sigfillset (&sa.sa_mask); 1615 sigfillset (&sa.sa_mask);
… …
1483 1621
1484void 1622void
1485ev_signal_stop (EV_P_ struct ev_signal *w) 1623ev_signal_stop (EV_P_ struct ev_signal *w)
1486{ 1624{
1487 ev_clear_pending (EV_A_ (W)w); 1625 ev_clear_pending (EV_A_ (W)w);
1488 if (!ev_is_active (w)) 1626 if (expect_false (!ev_is_active (w)))
1489 return; 1627 return;
1490 1628
1491 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1629 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1492 ev_stop (EV_A_ (W)w); 1630 ev_stop (EV_A_ (W)w);
1493 1631
… …
1497 1635
1498void 1636void
1499ev_child_start (EV_P_ struct ev_child *w) 1637ev_child_start (EV_P_ struct ev_child *w)
1500{ 1638{
1501#if EV_MULTIPLICITY 1639#if EV_MULTIPLICITY
1502 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));
1503#endif 1641#endif
1504 if (ev_is_active (w)) 1642 if (expect_false (ev_is_active (w)))
1505 return; 1643 return;
1506 1644
1507 ev_start (EV_A_ (W)w, 1); 1645 ev_start (EV_A_ (W)w, 1);
1508 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1646 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1509} 1647}
1510 1648
1511void 1649void
1512ev_child_stop (EV_P_ struct ev_child *w) 1650ev_child_stop (EV_P_ struct ev_child *w)
1513{ 1651{
1514 ev_clear_pending (EV_A_ (W)w); 1652 ev_clear_pending (EV_A_ (W)w);
1515 if (ev_is_active (w)) 1653 if (expect_false (!ev_is_active (w)))
1516 return; 1654 return;
1517 1655
1518 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1656 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1519 ev_stop (EV_A_ (W)w); 1657 ev_stop (EV_A_ (W)w);
1520} 1658}
… …
1557void 1695void
1558ev_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)
1559{ 1697{
1560 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));
1561 1699
1562 if (!once) 1700 if (expect_false (!once))
1701 {
1563 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1702 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1564 else 1703 return;
1565 { 1704 }
1705
1566 once->cb = cb; 1706 once->cb = cb;
1567 once->arg = arg; 1707 once->arg = arg;
1568 1708
1569 ev_watcher_init (&once->io, once_cb_io); 1709 ev_init (&once->io, once_cb_io);
1570 if (fd >= 0) 1710 if (fd >= 0)
1571 { 1711 {
1572 ev_io_set (&once->io, fd, events); 1712 ev_io_set (&once->io, fd, events);
1573 ev_io_start (EV_A_ &once->io); 1713 ev_io_start (EV_A_ &once->io);
1574 } 1714 }
1575 1715
1576 ev_watcher_init (&once->to, once_cb_to); 1716 ev_init (&once->to, once_cb_to);
1577 if (timeout >= 0.) 1717 if (timeout >= 0.)
1578 { 1718 {
1579 ev_timer_set (&once->to, timeout, 0.); 1719 ev_timer_set (&once->to, timeout, 0.);
1580 ev_timer_start (EV_A_ &once->to); 1720 ev_timer_start (EV_A_ &once->to);
1581 }
1582 } 1721 }
1583} 1722}
1584 1723
1724#ifdef __cplusplus
1725}
1726#endif
1727

Diff Legend

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