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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines