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

Comparing libev/ev.c (file contents):
Revision 1.262 by root, Wed Oct 1 04:25:25 2008 UTC vs.
Revision 1.312 by root, Wed Aug 12 18:48:17 2009 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
64# endif
65
52# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
55# endif 69# endif
56# ifndef EV_USE_REALTIME 70# ifndef EV_USE_REALTIME
57# define EV_USE_REALTIME 1 71# define EV_USE_REALTIME 0
58# endif 72# endif
59# else 73# else
60# ifndef EV_USE_MONOTONIC 74# ifndef EV_USE_MONOTONIC
61# define EV_USE_MONOTONIC 0 75# define EV_USE_MONOTONIC 0
62# endif 76# endif
… …
119# else 133# else
120# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
121# endif 135# endif
122# endif 136# endif
123 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
124# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD 147# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
127# else 149# else
128# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
… …
164# endif 186# endif
165#endif 187#endif
166 188
167/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
168 190
191/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG)
193/* use what's provided */
194#elif defined (NSIG)
195# define EV_NSIG (NSIG)
196#elif defined(_NSIG)
197# define EV_NSIG (_NSIG)
198#elif defined (SIGMAX)
199# define EV_NSIG (SIGMAX+1)
200#elif defined (SIG_MAX)
201# define EV_NSIG (SIG_MAX+1)
202#elif defined (_SIG_MAX)
203# define EV_NSIG (_SIG_MAX+1)
204#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else
213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 65
216#endif
217
218#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2
220# define EV_USE_CLOCK_SYSCALL 1
221# else
222# define EV_USE_CLOCK_SYSCALL 0
223# endif
224#endif
225
169#ifndef EV_USE_MONOTONIC 226#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 227# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 228# define EV_USE_MONOTONIC 1
172# else 229# else
173# define EV_USE_MONOTONIC 0 230# define EV_USE_MONOTONIC 0
174# endif 231# endif
175#endif 232#endif
176 233
177#ifndef EV_USE_REALTIME 234#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 236#endif
180 237
181#ifndef EV_USE_NANOSLEEP 238#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 239# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 240# define EV_USE_NANOSLEEP 1
… …
244# else 301# else
245# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
246# endif 303# endif
247#endif 304#endif
248 305
306#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))
308# define EV_USE_SIGNALFD 1
309# else
310# define EV_USE_SIGNALFD 0
311# endif
312#endif
313
249#if 0 /* debugging */ 314#if 0 /* debugging */
250# define EV_VERIFY 3 315# define EV_VERIFY 3
251# define EV_USE_4HEAP 1 316# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1 317# define EV_HEAP_CACHE_AT 1
253#endif 318#endif
… …
262 327
263#ifndef EV_HEAP_CACHE_AT 328#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL 329# define EV_HEAP_CACHE_AT !EV_MINIMAL
265#endif 330#endif
266 331
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
333/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL
335# include <syscall.h>
336# ifdef SYS_clock_gettime
337# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
338# undef EV_USE_MONOTONIC
339# define EV_USE_MONOTONIC 1
340# else
341# undef EV_USE_CLOCK_SYSCALL
342# define EV_USE_CLOCK_SYSCALL 0
343# endif
344#endif
345
267/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 346/* this block fixes any misconfiguration where we know we run into trouble otherwise */
268 347
269#ifndef CLOCK_MONOTONIC 348#ifndef CLOCK_MONOTONIC
270# undef EV_USE_MONOTONIC 349# undef EV_USE_MONOTONIC
271# define EV_USE_MONOTONIC 0 350# define EV_USE_MONOTONIC 0
… …
286# include <sys/select.h> 365# include <sys/select.h>
287# endif 366# endif
288#endif 367#endif
289 368
290#if EV_USE_INOTIFY 369#if EV_USE_INOTIFY
370# include <sys/utsname.h>
371# include <sys/statfs.h>
291# include <sys/inotify.h> 372# include <sys/inotify.h>
373/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
374# ifndef IN_DONT_FOLLOW
375# undef EV_USE_INOTIFY
376# define EV_USE_INOTIFY 0
377# endif
292#endif 378#endif
293 379
294#if EV_SELECT_IS_WINSOCKET 380#if EV_SELECT_IS_WINSOCKET
295# include <winsock.h> 381# include <winsock.h>
296#endif 382#endif
297 383
298#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
299/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 385/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
300# include <stdint.h> 386# include <stdint.h>
387# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK
389# endif
390# ifndef EFD_CLOEXEC
391# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC
393# else
394# define EFD_CLOEXEC 02000000
395# endif
396# endif
301# ifdef __cplusplus 397# ifdef __cplusplus
302extern "C" { 398extern "C" {
303# endif 399# endif
304int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
305# ifdef __cplusplus 401# ifdef __cplusplus
306} 402}
307# endif 403# endif
404#endif
405
406#if EV_USE_SIGNALFD
407# include <sys/signalfd.h>
308#endif 408#endif
309 409
310/**/ 410/**/
311 411
312#if EV_VERIFY >= 3 412#if EV_VERIFY >= 3
… …
348# define inline_speed static noinline 448# define inline_speed static noinline
349#else 449#else
350# define inline_speed static inline 450# define inline_speed static inline
351#endif 451#endif
352 452
353#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 453#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
454
455#if EV_MINPRI == EV_MAXPRI
456# define ABSPRI(w) (((W)w), 0)
457#else
354#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 458# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
459#endif
355 460
356#define EMPTY /* required for microsofts broken pseudo-c compiler */ 461#define EMPTY /* required for microsofts broken pseudo-c compiler */
357#define EMPTY2(a,b) /* used to suppress some warnings */ 462#define EMPTY2(a,b) /* used to suppress some warnings */
358 463
359typedef ev_watcher *W; 464typedef ev_watcher *W;
… …
361typedef ev_watcher_time *WT; 466typedef ev_watcher_time *WT;
362 467
363#define ev_active(w) ((W)(w))->active 468#define ev_active(w) ((W)(w))->active
364#define ev_at(w) ((WT)(w))->at 469#define ev_at(w) ((WT)(w))->at
365 470
366#if EV_USE_MONOTONIC 471#if EV_USE_REALTIME
367/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 472/* sig_atomic_t is used to avoid per-thread variables or locking but still */
368/* giving it a reasonably high chance of working on typical architetcures */ 473/* giving it a reasonably high chance of working on typical architetcures */
474static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
475#endif
476
477#if EV_USE_MONOTONIC
369static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 478static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
370#endif 479#endif
371 480
372#ifdef _WIN32 481#ifdef _WIN32
373# include "ev_win32.c" 482# include "ev_win32.c"
… …
382{ 491{
383 syserr_cb = cb; 492 syserr_cb = cb;
384} 493}
385 494
386static void noinline 495static void noinline
387syserr (const char *msg) 496ev_syserr (const char *msg)
388{ 497{
389 if (!msg) 498 if (!msg)
390 msg = "(libev) system error"; 499 msg = "(libev) system error";
391 500
392 if (syserr_cb) 501 if (syserr_cb)
… …
438#define ev_malloc(size) ev_realloc (0, (size)) 547#define ev_malloc(size) ev_realloc (0, (size))
439#define ev_free(ptr) ev_realloc ((ptr), 0) 548#define ev_free(ptr) ev_realloc ((ptr), 0)
440 549
441/*****************************************************************************/ 550/*****************************************************************************/
442 551
552/* set in reify when reification needed */
553#define EV_ANFD_REIFY 1
554
555/* file descriptor info structure */
443typedef struct 556typedef struct
444{ 557{
445 WL head; 558 WL head;
446 unsigned char events; 559 unsigned char events; /* the events watched for */
560 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
561 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
447 unsigned char reify; 562 unsigned char unused;
563#if EV_USE_EPOLL
564 unsigned int egen; /* generation counter to counter epoll bugs */
565#endif
448#if EV_SELECT_IS_WINSOCKET 566#if EV_SELECT_IS_WINSOCKET
449 SOCKET handle; 567 SOCKET handle;
450#endif 568#endif
451} ANFD; 569} ANFD;
452 570
571/* stores the pending event set for a given watcher */
453typedef struct 572typedef struct
454{ 573{
455 W w; 574 W w;
456 int events; 575 int events; /* the pending event set for the given watcher */
457} ANPENDING; 576} ANPENDING;
458 577
459#if EV_USE_INOTIFY 578#if EV_USE_INOTIFY
460/* hash table entry per inotify-id */ 579/* hash table entry per inotify-id */
461typedef struct 580typedef struct
… …
464} ANFS; 583} ANFS;
465#endif 584#endif
466 585
467/* Heap Entry */ 586/* Heap Entry */
468#if EV_HEAP_CACHE_AT 587#if EV_HEAP_CACHE_AT
588 /* a heap element */
469 typedef struct { 589 typedef struct {
470 ev_tstamp at; 590 ev_tstamp at;
471 WT w; 591 WT w;
472 } ANHE; 592 } ANHE;
473 593
474 #define ANHE_w(he) (he).w /* access watcher, read-write */ 594 #define ANHE_w(he) (he).w /* access watcher, read-write */
475 #define ANHE_at(he) (he).at /* access cached at, read-only */ 595 #define ANHE_at(he) (he).at /* access cached at, read-only */
476 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 596 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
477#else 597#else
598 /* a heap element */
478 typedef WT ANHE; 599 typedef WT ANHE;
479 600
480 #define ANHE_w(he) (he) 601 #define ANHE_w(he) (he)
481 #define ANHE_at(he) (he)->at 602 #define ANHE_at(he) (he)->at
482 #define ANHE_at_cache(he) 603 #define ANHE_at_cache(he)
… …
506 627
507 static int ev_default_loop_ptr; 628 static int ev_default_loop_ptr;
508 629
509#endif 630#endif
510 631
632#if EV_MINIMAL < 2
633# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
634# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
635# define EV_INVOKE_PENDING invoke_cb (EV_A)
636#else
637# define EV_RELEASE_CB (void)0
638# define EV_ACQUIRE_CB (void)0
639# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
640#endif
641
642#define EVUNLOOP_RECURSE 0x80
643
511/*****************************************************************************/ 644/*****************************************************************************/
512 645
646#ifndef EV_HAVE_EV_TIME
513ev_tstamp 647ev_tstamp
514ev_time (void) 648ev_time (void)
515{ 649{
516#if EV_USE_REALTIME 650#if EV_USE_REALTIME
651 if (expect_true (have_realtime))
652 {
517 struct timespec ts; 653 struct timespec ts;
518 clock_gettime (CLOCK_REALTIME, &ts); 654 clock_gettime (CLOCK_REALTIME, &ts);
519 return ts.tv_sec + ts.tv_nsec * 1e-9; 655 return ts.tv_sec + ts.tv_nsec * 1e-9;
520#else 656 }
657#endif
658
521 struct timeval tv; 659 struct timeval tv;
522 gettimeofday (&tv, 0); 660 gettimeofday (&tv, 0);
523 return tv.tv_sec + tv.tv_usec * 1e-6; 661 return tv.tv_sec + tv.tv_usec * 1e-6;
524#endif
525} 662}
663#endif
526 664
527ev_tstamp inline_size 665inline_size ev_tstamp
528get_clock (void) 666get_clock (void)
529{ 667{
530#if EV_USE_MONOTONIC 668#if EV_USE_MONOTONIC
531 if (expect_true (have_monotonic)) 669 if (expect_true (have_monotonic))
532 { 670 {
… …
566 704
567 tv.tv_sec = (time_t)delay; 705 tv.tv_sec = (time_t)delay;
568 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 706 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
569 707
570 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 708 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
571 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 709 /* something not guaranteed by newer posix versions, but guaranteed */
572 /* by older ones */ 710 /* by older ones */
573 select (0, 0, 0, 0, &tv); 711 select (0, 0, 0, 0, &tv);
574#endif 712#endif
575 } 713 }
576} 714}
577 715
578/*****************************************************************************/ 716/*****************************************************************************/
579 717
580#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 718#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
581 719
582int inline_size 720/* find a suitable new size for the given array, */
721/* hopefully by rounding to a ncie-to-malloc size */
722inline_size int
583array_nextsize (int elem, int cur, int cnt) 723array_nextsize (int elem, int cur, int cnt)
584{ 724{
585 int ncur = cur + 1; 725 int ncur = cur + 1;
586 726
587 do 727 do
… …
604array_realloc (int elem, void *base, int *cur, int cnt) 744array_realloc (int elem, void *base, int *cur, int cnt)
605{ 745{
606 *cur = array_nextsize (elem, *cur, cnt); 746 *cur = array_nextsize (elem, *cur, cnt);
607 return ev_realloc (base, elem * *cur); 747 return ev_realloc (base, elem * *cur);
608} 748}
749
750#define array_init_zero(base,count) \
751 memset ((void *)(base), 0, sizeof (*(base)) * (count))
609 752
610#define array_needsize(type,base,cur,cnt,init) \ 753#define array_needsize(type,base,cur,cnt,init) \
611 if (expect_false ((cnt) > (cur))) \ 754 if (expect_false ((cnt) > (cur))) \
612 { \ 755 { \
613 int ocur_ = (cur); \ 756 int ocur_ = (cur); \
… …
625 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 768 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
626 } 769 }
627#endif 770#endif
628 771
629#define array_free(stem, idx) \ 772#define array_free(stem, idx) \
630 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 773 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
631 774
632/*****************************************************************************/ 775/*****************************************************************************/
776
777/* dummy callback for pending events */
778static void noinline
779pendingcb (EV_P_ ev_prepare *w, int revents)
780{
781}
633 782
634void noinline 783void noinline
635ev_feed_event (EV_P_ void *w, int revents) 784ev_feed_event (EV_P_ void *w, int revents)
636{ 785{
637 W w_ = (W)w; 786 W w_ = (W)w;
… …
646 pendings [pri][w_->pending - 1].w = w_; 795 pendings [pri][w_->pending - 1].w = w_;
647 pendings [pri][w_->pending - 1].events = revents; 796 pendings [pri][w_->pending - 1].events = revents;
648 } 797 }
649} 798}
650 799
651void inline_speed 800inline_speed void
801feed_reverse (EV_P_ W w)
802{
803 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
804 rfeeds [rfeedcnt++] = w;
805}
806
807inline_size void
808feed_reverse_done (EV_P_ int revents)
809{
810 do
811 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
812 while (rfeedcnt);
813}
814
815inline_speed void
652queue_events (EV_P_ W *events, int eventcnt, int type) 816queue_events (EV_P_ W *events, int eventcnt, int type)
653{ 817{
654 int i; 818 int i;
655 819
656 for (i = 0; i < eventcnt; ++i) 820 for (i = 0; i < eventcnt; ++i)
657 ev_feed_event (EV_A_ events [i], type); 821 ev_feed_event (EV_A_ events [i], type);
658} 822}
659 823
660/*****************************************************************************/ 824/*****************************************************************************/
661 825
662void inline_size 826inline_speed void
663anfds_init (ANFD *base, int count)
664{
665 while (count--)
666 {
667 base->head = 0;
668 base->events = EV_NONE;
669 base->reify = 0;
670
671 ++base;
672 }
673}
674
675void inline_speed
676fd_event (EV_P_ int fd, int revents) 827fd_event_nc (EV_P_ int fd, int revents)
677{ 828{
678 ANFD *anfd = anfds + fd; 829 ANFD *anfd = anfds + fd;
679 ev_io *w; 830 ev_io *w;
680 831
681 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 832 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
685 if (ev) 836 if (ev)
686 ev_feed_event (EV_A_ (W)w, ev); 837 ev_feed_event (EV_A_ (W)w, ev);
687 } 838 }
688} 839}
689 840
841/* do not submit kernel events for fds that have reify set */
842/* because that means they changed while we were polling for new events */
843inline_speed void
844fd_event (EV_P_ int fd, int revents)
845{
846 ANFD *anfd = anfds + fd;
847
848 if (expect_true (!anfd->reify))
849 fd_event_nc (EV_A_ fd, revents);
850}
851
690void 852void
691ev_feed_fd_event (EV_P_ int fd, int revents) 853ev_feed_fd_event (EV_P_ int fd, int revents)
692{ 854{
693 if (fd >= 0 && fd < anfdmax) 855 if (fd >= 0 && fd < anfdmax)
694 fd_event (EV_A_ fd, revents); 856 fd_event_nc (EV_A_ fd, revents);
695} 857}
696 858
697void inline_size 859/* make sure the external fd watch events are in-sync */
860/* with the kernel/libev internal state */
861inline_size void
698fd_reify (EV_P) 862fd_reify (EV_P)
699{ 863{
700 int i; 864 int i;
701 865
702 for (i = 0; i < fdchangecnt; ++i) 866 for (i = 0; i < fdchangecnt; ++i)
… …
717 #ifdef EV_FD_TO_WIN32_HANDLE 881 #ifdef EV_FD_TO_WIN32_HANDLE
718 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 882 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
719 #else 883 #else
720 anfd->handle = _get_osfhandle (fd); 884 anfd->handle = _get_osfhandle (fd);
721 #endif 885 #endif
722 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 886 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
723 } 887 }
724#endif 888#endif
725 889
726 { 890 {
727 unsigned char o_events = anfd->events; 891 unsigned char o_events = anfd->events;
728 unsigned char o_reify = anfd->reify; 892 unsigned char o_reify = anfd->reify;
729 893
730 anfd->reify = 0; 894 anfd->reify = 0;
731 anfd->events = events; 895 anfd->events = events;
732 896
733 if (o_events != events || o_reify & EV_IOFDSET) 897 if (o_events != events || o_reify & EV__IOFDSET)
734 backend_modify (EV_A_ fd, o_events, events); 898 backend_modify (EV_A_ fd, o_events, events);
735 } 899 }
736 } 900 }
737 901
738 fdchangecnt = 0; 902 fdchangecnt = 0;
739} 903}
740 904
741void inline_size 905/* something about the given fd changed */
906inline_size void
742fd_change (EV_P_ int fd, int flags) 907fd_change (EV_P_ int fd, int flags)
743{ 908{
744 unsigned char reify = anfds [fd].reify; 909 unsigned char reify = anfds [fd].reify;
745 anfds [fd].reify |= flags; 910 anfds [fd].reify |= flags;
746 911
… …
750 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 915 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
751 fdchanges [fdchangecnt - 1] = fd; 916 fdchanges [fdchangecnt - 1] = fd;
752 } 917 }
753} 918}
754 919
755void inline_speed 920/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
921inline_speed void
756fd_kill (EV_P_ int fd) 922fd_kill (EV_P_ int fd)
757{ 923{
758 ev_io *w; 924 ev_io *w;
759 925
760 while ((w = (ev_io *)anfds [fd].head)) 926 while ((w = (ev_io *)anfds [fd].head))
… …
762 ev_io_stop (EV_A_ w); 928 ev_io_stop (EV_A_ w);
763 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 929 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
764 } 930 }
765} 931}
766 932
767int inline_size 933/* check whether the given fd is atcually valid, for error recovery */
934inline_size int
768fd_valid (int fd) 935fd_valid (int fd)
769{ 936{
770#ifdef _WIN32 937#ifdef _WIN32
771 return _get_osfhandle (fd) != -1; 938 return _get_osfhandle (fd) != -1;
772#else 939#else
… …
794 961
795 for (fd = anfdmax; fd--; ) 962 for (fd = anfdmax; fd--; )
796 if (anfds [fd].events) 963 if (anfds [fd].events)
797 { 964 {
798 fd_kill (EV_A_ fd); 965 fd_kill (EV_A_ fd);
799 return; 966 break;
800 } 967 }
801} 968}
802 969
803/* usually called after fork if backend needs to re-arm all fds from scratch */ 970/* usually called after fork if backend needs to re-arm all fds from scratch */
804static void noinline 971static void noinline
… …
808 975
809 for (fd = 0; fd < anfdmax; ++fd) 976 for (fd = 0; fd < anfdmax; ++fd)
810 if (anfds [fd].events) 977 if (anfds [fd].events)
811 { 978 {
812 anfds [fd].events = 0; 979 anfds [fd].events = 0;
980 anfds [fd].emask = 0;
813 fd_change (EV_A_ fd, EV_IOFDSET | 1); 981 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
814 } 982 }
815} 983}
816 984
817/*****************************************************************************/ 985/*****************************************************************************/
818 986
… …
834#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1002#define HEAP0 (DHEAP - 1) /* index of first element in heap */
835#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1003#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
836#define UPHEAP_DONE(p,k) ((p) == (k)) 1004#define UPHEAP_DONE(p,k) ((p) == (k))
837 1005
838/* away from the root */ 1006/* away from the root */
839void inline_speed 1007inline_speed void
840downheap (ANHE *heap, int N, int k) 1008downheap (ANHE *heap, int N, int k)
841{ 1009{
842 ANHE he = heap [k]; 1010 ANHE he = heap [k];
843 ANHE *E = heap + N + HEAP0; 1011 ANHE *E = heap + N + HEAP0;
844 1012
… …
884#define HEAP0 1 1052#define HEAP0 1
885#define HPARENT(k) ((k) >> 1) 1053#define HPARENT(k) ((k) >> 1)
886#define UPHEAP_DONE(p,k) (!(p)) 1054#define UPHEAP_DONE(p,k) (!(p))
887 1055
888/* away from the root */ 1056/* away from the root */
889void inline_speed 1057inline_speed void
890downheap (ANHE *heap, int N, int k) 1058downheap (ANHE *heap, int N, int k)
891{ 1059{
892 ANHE he = heap [k]; 1060 ANHE he = heap [k];
893 1061
894 for (;;) 1062 for (;;)
895 { 1063 {
896 int c = k << 1; 1064 int c = k << 1;
897 1065
898 if (c > N + HEAP0 - 1) 1066 if (c >= N + HEAP0)
899 break; 1067 break;
900 1068
901 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1069 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
902 ? 1 : 0; 1070 ? 1 : 0;
903 1071
… …
914 ev_active (ANHE_w (he)) = k; 1082 ev_active (ANHE_w (he)) = k;
915} 1083}
916#endif 1084#endif
917 1085
918/* towards the root */ 1086/* towards the root */
919void inline_speed 1087inline_speed void
920upheap (ANHE *heap, int k) 1088upheap (ANHE *heap, int k)
921{ 1089{
922 ANHE he = heap [k]; 1090 ANHE he = heap [k];
923 1091
924 for (;;) 1092 for (;;)
… …
935 1103
936 heap [k] = he; 1104 heap [k] = he;
937 ev_active (ANHE_w (he)) = k; 1105 ev_active (ANHE_w (he)) = k;
938} 1106}
939 1107
940void inline_size 1108/* move an element suitably so it is in a correct place */
1109inline_size void
941adjustheap (ANHE *heap, int N, int k) 1110adjustheap (ANHE *heap, int N, int k)
942{ 1111{
943 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1112 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
944 upheap (heap, k); 1113 upheap (heap, k);
945 else 1114 else
946 downheap (heap, N, k); 1115 downheap (heap, N, k);
947} 1116}
948 1117
949/* rebuild the heap: this function is used only once and executed rarely */ 1118/* rebuild the heap: this function is used only once and executed rarely */
950void inline_size 1119inline_size void
951reheap (ANHE *heap, int N) 1120reheap (ANHE *heap, int N)
952{ 1121{
953 int i; 1122 int i;
954 1123
955 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1124 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
958 upheap (heap, i + HEAP0); 1127 upheap (heap, i + HEAP0);
959} 1128}
960 1129
961/*****************************************************************************/ 1130/*****************************************************************************/
962 1131
1132/* associate signal watchers to a signal signal */
963typedef struct 1133typedef struct
964{ 1134{
1135 EV_ATOMIC_T pending;
1136#if EV_MULTIPLICITY
1137 EV_P;
1138#endif
965 WL head; 1139 WL head;
966 EV_ATOMIC_T gotsig;
967} ANSIG; 1140} ANSIG;
968 1141
969static ANSIG *signals; 1142static ANSIG signals [EV_NSIG - 1];
970static int signalmax;
971
972static EV_ATOMIC_T gotsig;
973
974void inline_size
975signals_init (ANSIG *base, int count)
976{
977 while (count--)
978 {
979 base->head = 0;
980 base->gotsig = 0;
981
982 ++base;
983 }
984}
985 1143
986/*****************************************************************************/ 1144/*****************************************************************************/
987 1145
988void inline_speed 1146/* used to prepare libev internal fd's */
1147/* this is not fork-safe */
1148inline_speed void
989fd_intern (int fd) 1149fd_intern (int fd)
990{ 1150{
991#ifdef _WIN32 1151#ifdef _WIN32
992 unsigned long arg = 1; 1152 unsigned long arg = 1;
993 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1153 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
998} 1158}
999 1159
1000static void noinline 1160static void noinline
1001evpipe_init (EV_P) 1161evpipe_init (EV_P)
1002{ 1162{
1003 if (!ev_is_active (&pipeev)) 1163 if (!ev_is_active (&pipe_w))
1004 { 1164 {
1005#if EV_USE_EVENTFD 1165#if EV_USE_EVENTFD
1166 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1167 if (evfd < 0 && errno == EINVAL)
1006 if ((evfd = eventfd (0, 0)) >= 0) 1168 evfd = eventfd (0, 0);
1169
1170 if (evfd >= 0)
1007 { 1171 {
1008 evpipe [0] = -1; 1172 evpipe [0] = -1;
1009 fd_intern (evfd); 1173 fd_intern (evfd); /* doing it twice doesn't hurt */
1010 ev_io_set (&pipeev, evfd, EV_READ); 1174 ev_io_set (&pipe_w, evfd, EV_READ);
1011 } 1175 }
1012 else 1176 else
1013#endif 1177#endif
1014 { 1178 {
1015 while (pipe (evpipe)) 1179 while (pipe (evpipe))
1016 syserr ("(libev) error creating signal/async pipe"); 1180 ev_syserr ("(libev) error creating signal/async pipe");
1017 1181
1018 fd_intern (evpipe [0]); 1182 fd_intern (evpipe [0]);
1019 fd_intern (evpipe [1]); 1183 fd_intern (evpipe [1]);
1020 ev_io_set (&pipeev, evpipe [0], EV_READ); 1184 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1021 } 1185 }
1022 1186
1023 ev_io_start (EV_A_ &pipeev); 1187 ev_io_start (EV_A_ &pipe_w);
1024 ev_unref (EV_A); /* watcher should not keep loop alive */ 1188 ev_unref (EV_A); /* watcher should not keep loop alive */
1025 } 1189 }
1026} 1190}
1027 1191
1028void inline_size 1192inline_size void
1029evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1193evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1030{ 1194{
1031 if (!*flag) 1195 if (!*flag)
1032 { 1196 {
1033 int old_errno = errno; /* save errno because write might clobber it */ 1197 int old_errno = errno; /* save errno because write might clobber it */
… …
1046 1210
1047 errno = old_errno; 1211 errno = old_errno;
1048 } 1212 }
1049} 1213}
1050 1214
1215/* called whenever the libev signal pipe */
1216/* got some events (signal, async) */
1051static void 1217static void
1052pipecb (EV_P_ ev_io *iow, int revents) 1218pipecb (EV_P_ ev_io *iow, int revents)
1053{ 1219{
1220 int i;
1221
1054#if EV_USE_EVENTFD 1222#if EV_USE_EVENTFD
1055 if (evfd >= 0) 1223 if (evfd >= 0)
1056 { 1224 {
1057 uint64_t counter; 1225 uint64_t counter;
1058 read (evfd, &counter, sizeof (uint64_t)); 1226 read (evfd, &counter, sizeof (uint64_t));
… …
1062 { 1230 {
1063 char dummy; 1231 char dummy;
1064 read (evpipe [0], &dummy, 1); 1232 read (evpipe [0], &dummy, 1);
1065 } 1233 }
1066 1234
1067 if (gotsig && ev_is_default_loop (EV_A)) 1235 if (sig_pending)
1068 { 1236 {
1069 int signum; 1237 sig_pending = 0;
1070 gotsig = 0;
1071 1238
1072 for (signum = signalmax; signum--; ) 1239 for (i = EV_NSIG - 1; i--; )
1073 if (signals [signum].gotsig) 1240 if (expect_false (signals [i].pending))
1074 ev_feed_signal_event (EV_A_ signum + 1); 1241 ev_feed_signal_event (EV_A_ i + 1);
1075 } 1242 }
1076 1243
1077#if EV_ASYNC_ENABLE 1244#if EV_ASYNC_ENABLE
1078 if (gotasync) 1245 if (async_pending)
1079 { 1246 {
1080 int i; 1247 async_pending = 0;
1081 gotasync = 0;
1082 1248
1083 for (i = asynccnt; i--; ) 1249 for (i = asynccnt; i--; )
1084 if (asyncs [i]->sent) 1250 if (asyncs [i]->sent)
1085 { 1251 {
1086 asyncs [i]->sent = 0; 1252 asyncs [i]->sent = 0;
… …
1094 1260
1095static void 1261static void
1096ev_sighandler (int signum) 1262ev_sighandler (int signum)
1097{ 1263{
1098#if EV_MULTIPLICITY 1264#if EV_MULTIPLICITY
1099 struct ev_loop *loop = &default_loop_struct; 1265 EV_P = signals [signum - 1].loop;
1100#endif 1266#endif
1101 1267
1102#if _WIN32 1268#if _WIN32
1103 signal (signum, ev_sighandler); 1269 signal (signum, ev_sighandler);
1104#endif 1270#endif
1105 1271
1106 signals [signum - 1].gotsig = 1; 1272 signals [signum - 1].pending = 1;
1107 evpipe_write (EV_A_ &gotsig); 1273 evpipe_write (EV_A_ &sig_pending);
1108} 1274}
1109 1275
1110void noinline 1276void noinline
1111ev_feed_signal_event (EV_P_ int signum) 1277ev_feed_signal_event (EV_P_ int signum)
1112{ 1278{
1113 WL w; 1279 WL w;
1114 1280
1281 if (expect_false (signum <= 0 || signum > EV_NSIG))
1282 return;
1283
1284 --signum;
1285
1115#if EV_MULTIPLICITY 1286#if EV_MULTIPLICITY
1116 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1287 /* it is permissible to try to feed a signal to the wrong loop */
1117#endif 1288 /* or, likely more useful, feeding a signal nobody is waiting for */
1118 1289
1119 --signum; 1290 if (expect_false (signals [signum].loop != EV_A))
1120
1121 if (signum < 0 || signum >= signalmax)
1122 return; 1291 return;
1292#endif
1123 1293
1124 signals [signum].gotsig = 0; 1294 signals [signum].pending = 0;
1125 1295
1126 for (w = signals [signum].head; w; w = w->next) 1296 for (w = signals [signum].head; w; w = w->next)
1127 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1297 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1128} 1298}
1129 1299
1300#if EV_USE_SIGNALFD
1301static void
1302sigfdcb (EV_P_ ev_io *iow, int revents)
1303{
1304 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1305
1306 for (;;)
1307 {
1308 ssize_t res = read (sigfd, si, sizeof (si));
1309
1310 /* not ISO-C, as res might be -1, but works with SuS */
1311 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1312 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1313
1314 if (res < (ssize_t)sizeof (si))
1315 break;
1316 }
1317}
1318#endif
1319
1130/*****************************************************************************/ 1320/*****************************************************************************/
1131 1321
1132static WL childs [EV_PID_HASHSIZE]; 1322static WL childs [EV_PID_HASHSIZE];
1133 1323
1134#ifndef _WIN32 1324#ifndef _WIN32
… …
1137 1327
1138#ifndef WIFCONTINUED 1328#ifndef WIFCONTINUED
1139# define WIFCONTINUED(status) 0 1329# define WIFCONTINUED(status) 0
1140#endif 1330#endif
1141 1331
1142void inline_speed 1332/* handle a single child status event */
1333inline_speed void
1143child_reap (EV_P_ int chain, int pid, int status) 1334child_reap (EV_P_ int chain, int pid, int status)
1144{ 1335{
1145 ev_child *w; 1336 ev_child *w;
1146 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1337 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1147 1338
… …
1160 1351
1161#ifndef WCONTINUED 1352#ifndef WCONTINUED
1162# define WCONTINUED 0 1353# define WCONTINUED 0
1163#endif 1354#endif
1164 1355
1356/* called on sigchld etc., calls waitpid */
1165static void 1357static void
1166childcb (EV_P_ ev_signal *sw, int revents) 1358childcb (EV_P_ ev_signal *sw, int revents)
1167{ 1359{
1168 int pid, status; 1360 int pid, status;
1169 1361
… …
1250 /* kqueue is borked on everything but netbsd apparently */ 1442 /* kqueue is borked on everything but netbsd apparently */
1251 /* it usually doesn't work correctly on anything but sockets and pipes */ 1443 /* it usually doesn't work correctly on anything but sockets and pipes */
1252 flags &= ~EVBACKEND_KQUEUE; 1444 flags &= ~EVBACKEND_KQUEUE;
1253#endif 1445#endif
1254#ifdef __APPLE__ 1446#ifdef __APPLE__
1255 // flags &= ~EVBACKEND_KQUEUE; for documentation 1447 /* only select works correctly on that "unix-certified" platform */
1256 flags &= ~EVBACKEND_POLL; 1448 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1449 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1257#endif 1450#endif
1258 1451
1259 return flags; 1452 return flags;
1260} 1453}
1261 1454
… …
1275ev_backend (EV_P) 1468ev_backend (EV_P)
1276{ 1469{
1277 return backend; 1470 return backend;
1278} 1471}
1279 1472
1473#if EV_MINIMAL < 2
1280unsigned int 1474unsigned int
1281ev_loop_count (EV_P) 1475ev_loop_count (EV_P)
1282{ 1476{
1283 return loop_count; 1477 return loop_count;
1284} 1478}
1285 1479
1480unsigned int
1481ev_loop_depth (EV_P)
1482{
1483 return loop_depth;
1484}
1485
1286void 1486void
1287ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1487ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1288{ 1488{
1289 io_blocktime = interval; 1489 io_blocktime = interval;
1290} 1490}
… …
1293ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1493ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1294{ 1494{
1295 timeout_blocktime = interval; 1495 timeout_blocktime = interval;
1296} 1496}
1297 1497
1498void
1499ev_set_userdata (EV_P_ void *data)
1500{
1501 userdata = data;
1502}
1503
1504void *
1505ev_userdata (EV_P)
1506{
1507 return userdata;
1508}
1509
1510void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1511{
1512 invoke_cb = invoke_pending_cb;
1513}
1514
1515void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1516{
1517 release_cb = release;
1518 acquire_cb = acquire;
1519}
1520#endif
1521
1522/* initialise a loop structure, must be zero-initialised */
1298static void noinline 1523static void noinline
1299loop_init (EV_P_ unsigned int flags) 1524loop_init (EV_P_ unsigned int flags)
1300{ 1525{
1301 if (!backend) 1526 if (!backend)
1302 { 1527 {
1528#if EV_USE_REALTIME
1529 if (!have_realtime)
1530 {
1531 struct timespec ts;
1532
1533 if (!clock_gettime (CLOCK_REALTIME, &ts))
1534 have_realtime = 1;
1535 }
1536#endif
1537
1303#if EV_USE_MONOTONIC 1538#if EV_USE_MONOTONIC
1539 if (!have_monotonic)
1304 { 1540 {
1305 struct timespec ts; 1541 struct timespec ts;
1542
1306 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1543 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1307 have_monotonic = 1; 1544 have_monotonic = 1;
1308 } 1545 }
1309#endif 1546#endif
1547
1548 /* pid check not overridable via env */
1549#ifndef _WIN32
1550 if (flags & EVFLAG_FORKCHECK)
1551 curpid = getpid ();
1552#endif
1553
1554 if (!(flags & EVFLAG_NOENV)
1555 && !enable_secure ()
1556 && getenv ("LIBEV_FLAGS"))
1557 flags = atoi (getenv ("LIBEV_FLAGS"));
1310 1558
1311 ev_rt_now = ev_time (); 1559 ev_rt_now = ev_time ();
1312 mn_now = get_clock (); 1560 mn_now = get_clock ();
1313 now_floor = mn_now; 1561 now_floor = mn_now;
1314 rtmn_diff = ev_rt_now - mn_now; 1562 rtmn_diff = ev_rt_now - mn_now;
1563#if EV_MINIMAL < 2
1564 invoke_cb = ev_invoke_pending;
1565#endif
1315 1566
1316 io_blocktime = 0.; 1567 io_blocktime = 0.;
1317 timeout_blocktime = 0.; 1568 timeout_blocktime = 0.;
1318 backend = 0; 1569 backend = 0;
1319 backend_fd = -1; 1570 backend_fd = -1;
1320 gotasync = 0; 1571 sig_pending = 0;
1572#if EV_ASYNC_ENABLE
1573 async_pending = 0;
1574#endif
1321#if EV_USE_INOTIFY 1575#if EV_USE_INOTIFY
1322 fs_fd = -2; 1576 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1323#endif 1577#endif
1324 1578#if EV_USE_SIGNALFD
1325 /* pid check not overridable via env */ 1579 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1326#ifndef _WIN32
1327 if (flags & EVFLAG_FORKCHECK)
1328 curpid = getpid ();
1329#endif 1580#endif
1330
1331 if (!(flags & EVFLAG_NOENV)
1332 && !enable_secure ()
1333 && getenv ("LIBEV_FLAGS"))
1334 flags = atoi (getenv ("LIBEV_FLAGS"));
1335 1581
1336 if (!(flags & 0x0000ffffU)) 1582 if (!(flags & 0x0000ffffU))
1337 flags |= ev_recommended_backends (); 1583 flags |= ev_recommended_backends ();
1338 1584
1339#if EV_USE_PORT 1585#if EV_USE_PORT
… …
1350#endif 1596#endif
1351#if EV_USE_SELECT 1597#if EV_USE_SELECT
1352 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1598 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1353#endif 1599#endif
1354 1600
1601 ev_prepare_init (&pending_w, pendingcb);
1602
1355 ev_init (&pipeev, pipecb); 1603 ev_init (&pipe_w, pipecb);
1356 ev_set_priority (&pipeev, EV_MAXPRI); 1604 ev_set_priority (&pipe_w, EV_MAXPRI);
1357 } 1605 }
1358} 1606}
1359 1607
1608/* free up a loop structure */
1360static void noinline 1609static void noinline
1361loop_destroy (EV_P) 1610loop_destroy (EV_P)
1362{ 1611{
1363 int i; 1612 int i;
1364 1613
1365 if (ev_is_active (&pipeev)) 1614 if (ev_is_active (&pipe_w))
1366 { 1615 {
1367 ev_ref (EV_A); /* signal watcher */ 1616 /*ev_ref (EV_A);*/
1368 ev_io_stop (EV_A_ &pipeev); 1617 /*ev_io_stop (EV_A_ &pipe_w);*/
1369 1618
1370#if EV_USE_EVENTFD 1619#if EV_USE_EVENTFD
1371 if (evfd >= 0) 1620 if (evfd >= 0)
1372 close (evfd); 1621 close (evfd);
1373#endif 1622#endif
… …
1377 close (evpipe [0]); 1626 close (evpipe [0]);
1378 close (evpipe [1]); 1627 close (evpipe [1]);
1379 } 1628 }
1380 } 1629 }
1381 1630
1631#if EV_USE_SIGNALFD
1632 if (ev_is_active (&sigfd_w))
1633 {
1634 /*ev_ref (EV_A);*/
1635 /*ev_io_stop (EV_A_ &sigfd_w);*/
1636
1637 close (sigfd);
1638 }
1639#endif
1640
1382#if EV_USE_INOTIFY 1641#if EV_USE_INOTIFY
1383 if (fs_fd >= 0) 1642 if (fs_fd >= 0)
1384 close (fs_fd); 1643 close (fs_fd);
1385#endif 1644#endif
1386 1645
… …
1409#if EV_IDLE_ENABLE 1668#if EV_IDLE_ENABLE
1410 array_free (idle, [i]); 1669 array_free (idle, [i]);
1411#endif 1670#endif
1412 } 1671 }
1413 1672
1414 ev_free (anfds); anfdmax = 0; 1673 ev_free (anfds); anfds = 0; anfdmax = 0;
1415 1674
1416 /* have to use the microsoft-never-gets-it-right macro */ 1675 /* have to use the microsoft-never-gets-it-right macro */
1676 array_free (rfeed, EMPTY);
1417 array_free (fdchange, EMPTY); 1677 array_free (fdchange, EMPTY);
1418 array_free (timer, EMPTY); 1678 array_free (timer, EMPTY);
1419#if EV_PERIODIC_ENABLE 1679#if EV_PERIODIC_ENABLE
1420 array_free (periodic, EMPTY); 1680 array_free (periodic, EMPTY);
1421#endif 1681#endif
… …
1430 1690
1431 backend = 0; 1691 backend = 0;
1432} 1692}
1433 1693
1434#if EV_USE_INOTIFY 1694#if EV_USE_INOTIFY
1435void inline_size infy_fork (EV_P); 1695inline_size void infy_fork (EV_P);
1436#endif 1696#endif
1437 1697
1438void inline_size 1698inline_size void
1439loop_fork (EV_P) 1699loop_fork (EV_P)
1440{ 1700{
1441#if EV_USE_PORT 1701#if EV_USE_PORT
1442 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1702 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1443#endif 1703#endif
… …
1449#endif 1709#endif
1450#if EV_USE_INOTIFY 1710#if EV_USE_INOTIFY
1451 infy_fork (EV_A); 1711 infy_fork (EV_A);
1452#endif 1712#endif
1453 1713
1454 if (ev_is_active (&pipeev)) 1714 if (ev_is_active (&pipe_w))
1455 { 1715 {
1456 /* this "locks" the handlers against writing to the pipe */ 1716 /* this "locks" the handlers against writing to the pipe */
1457 /* while we modify the fd vars */ 1717 /* while we modify the fd vars */
1458 gotsig = 1; 1718 sig_pending = 1;
1459#if EV_ASYNC_ENABLE 1719#if EV_ASYNC_ENABLE
1460 gotasync = 1; 1720 async_pending = 1;
1461#endif 1721#endif
1462 1722
1463 ev_ref (EV_A); 1723 ev_ref (EV_A);
1464 ev_io_stop (EV_A_ &pipeev); 1724 ev_io_stop (EV_A_ &pipe_w);
1465 1725
1466#if EV_USE_EVENTFD 1726#if EV_USE_EVENTFD
1467 if (evfd >= 0) 1727 if (evfd >= 0)
1468 close (evfd); 1728 close (evfd);
1469#endif 1729#endif
… …
1474 close (evpipe [1]); 1734 close (evpipe [1]);
1475 } 1735 }
1476 1736
1477 evpipe_init (EV_A); 1737 evpipe_init (EV_A);
1478 /* now iterate over everything, in case we missed something */ 1738 /* now iterate over everything, in case we missed something */
1479 pipecb (EV_A_ &pipeev, EV_READ); 1739 pipecb (EV_A_ &pipe_w, EV_READ);
1480 } 1740 }
1481 1741
1482 postfork = 0; 1742 postfork = 0;
1483} 1743}
1484 1744
1485#if EV_MULTIPLICITY 1745#if EV_MULTIPLICITY
1486 1746
1487struct ev_loop * 1747struct ev_loop *
1488ev_loop_new (unsigned int flags) 1748ev_loop_new (unsigned int flags)
1489{ 1749{
1490 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1750 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1491 1751
1492 memset (loop, 0, sizeof (struct ev_loop)); 1752 memset (EV_A, 0, sizeof (struct ev_loop));
1493
1494 loop_init (EV_A_ flags); 1753 loop_init (EV_A_ flags);
1495 1754
1496 if (ev_backend (EV_A)) 1755 if (ev_backend (EV_A))
1497 return loop; 1756 return EV_A;
1498 1757
1499 return 0; 1758 return 0;
1500} 1759}
1501 1760
1502void 1761void
… …
1509void 1768void
1510ev_loop_fork (EV_P) 1769ev_loop_fork (EV_P)
1511{ 1770{
1512 postfork = 1; /* must be in line with ev_default_fork */ 1771 postfork = 1; /* must be in line with ev_default_fork */
1513} 1772}
1773#endif /* multiplicity */
1514 1774
1515#if EV_VERIFY 1775#if EV_VERIFY
1516static void noinline 1776static void noinline
1517verify_watcher (EV_P_ W w) 1777verify_watcher (EV_P_ W w)
1518{ 1778{
1519 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1779 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1520 1780
1521 if (w->pending) 1781 if (w->pending)
1522 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1782 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1523} 1783}
1524 1784
1525static void noinline 1785static void noinline
1526verify_heap (EV_P_ ANHE *heap, int N) 1786verify_heap (EV_P_ ANHE *heap, int N)
1527{ 1787{
1528 int i; 1788 int i;
1529 1789
1530 for (i = HEAP0; i < N + HEAP0; ++i) 1790 for (i = HEAP0; i < N + HEAP0; ++i)
1531 { 1791 {
1532 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1792 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1533 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1793 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1534 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1794 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1535 1795
1536 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1796 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1537 } 1797 }
1538} 1798}
1539 1799
1540static void noinline 1800static void noinline
1541array_verify (EV_P_ W *ws, int cnt) 1801array_verify (EV_P_ W *ws, int cnt)
1542{ 1802{
1543 while (cnt--) 1803 while (cnt--)
1544 { 1804 {
1545 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1805 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1546 verify_watcher (EV_A_ ws [cnt]); 1806 verify_watcher (EV_A_ ws [cnt]);
1547 } 1807 }
1548} 1808}
1549#endif 1809#endif
1550 1810
1811#if EV_MINIMAL < 2
1551void 1812void
1552ev_loop_verify (EV_P) 1813ev_loop_verify (EV_P)
1553{ 1814{
1554#if EV_VERIFY 1815#if EV_VERIFY
1555 int i; 1816 int i;
… …
1557 1818
1558 assert (activecnt >= -1); 1819 assert (activecnt >= -1);
1559 1820
1560 assert (fdchangemax >= fdchangecnt); 1821 assert (fdchangemax >= fdchangecnt);
1561 for (i = 0; i < fdchangecnt; ++i) 1822 for (i = 0; i < fdchangecnt; ++i)
1562 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1823 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1563 1824
1564 assert (anfdmax >= 0); 1825 assert (anfdmax >= 0);
1565 for (i = 0; i < anfdmax; ++i) 1826 for (i = 0; i < anfdmax; ++i)
1566 for (w = anfds [i].head; w; w = w->next) 1827 for (w = anfds [i].head; w; w = w->next)
1567 { 1828 {
1568 verify_watcher (EV_A_ (W)w); 1829 verify_watcher (EV_A_ (W)w);
1569 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1830 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1570 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1831 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1571 } 1832 }
1572 1833
1573 assert (timermax >= timercnt); 1834 assert (timermax >= timercnt);
1574 verify_heap (EV_A_ timers, timercnt); 1835 verify_heap (EV_A_ timers, timercnt);
1575 1836
… …
1604 assert (checkmax >= checkcnt); 1865 assert (checkmax >= checkcnt);
1605 array_verify (EV_A_ (W *)checks, checkcnt); 1866 array_verify (EV_A_ (W *)checks, checkcnt);
1606 1867
1607# if 0 1868# if 0
1608 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1869 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1609 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1870 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1610# endif 1871# endif
1611#endif 1872#endif
1612} 1873}
1613 1874#endif
1614#endif /* multiplicity */
1615 1875
1616#if EV_MULTIPLICITY 1876#if EV_MULTIPLICITY
1617struct ev_loop * 1877struct ev_loop *
1618ev_default_loop_init (unsigned int flags) 1878ev_default_loop_init (unsigned int flags)
1619#else 1879#else
… …
1622#endif 1882#endif
1623{ 1883{
1624 if (!ev_default_loop_ptr) 1884 if (!ev_default_loop_ptr)
1625 { 1885 {
1626#if EV_MULTIPLICITY 1886#if EV_MULTIPLICITY
1627 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1887 EV_P = ev_default_loop_ptr = &default_loop_struct;
1628#else 1888#else
1629 ev_default_loop_ptr = 1; 1889 ev_default_loop_ptr = 1;
1630#endif 1890#endif
1631 1891
1632 loop_init (EV_A_ flags); 1892 loop_init (EV_A_ flags);
… …
1649 1909
1650void 1910void
1651ev_default_destroy (void) 1911ev_default_destroy (void)
1652{ 1912{
1653#if EV_MULTIPLICITY 1913#if EV_MULTIPLICITY
1654 struct ev_loop *loop = ev_default_loop_ptr; 1914 EV_P = ev_default_loop_ptr;
1655#endif 1915#endif
1916
1917 ev_default_loop_ptr = 0;
1656 1918
1657#ifndef _WIN32 1919#ifndef _WIN32
1658 ev_ref (EV_A); /* child watcher */ 1920 ev_ref (EV_A); /* child watcher */
1659 ev_signal_stop (EV_A_ &childev); 1921 ev_signal_stop (EV_A_ &childev);
1660#endif 1922#endif
… …
1664 1926
1665void 1927void
1666ev_default_fork (void) 1928ev_default_fork (void)
1667{ 1929{
1668#if EV_MULTIPLICITY 1930#if EV_MULTIPLICITY
1669 struct ev_loop *loop = ev_default_loop_ptr; 1931 EV_P = ev_default_loop_ptr;
1670#endif 1932#endif
1671 1933
1672 if (backend)
1673 postfork = 1; /* must be in line with ev_loop_fork */ 1934 postfork = 1; /* must be in line with ev_loop_fork */
1674} 1935}
1675 1936
1676/*****************************************************************************/ 1937/*****************************************************************************/
1677 1938
1678void 1939void
1679ev_invoke (EV_P_ void *w, int revents) 1940ev_invoke (EV_P_ void *w, int revents)
1680{ 1941{
1681 EV_CB_INVOKE ((W)w, revents); 1942 EV_CB_INVOKE ((W)w, revents);
1682} 1943}
1683 1944
1684void inline_speed 1945unsigned int
1685call_pending (EV_P) 1946ev_pending_count (EV_P)
1947{
1948 int pri;
1949 unsigned int count = 0;
1950
1951 for (pri = NUMPRI; pri--; )
1952 count += pendingcnt [pri];
1953
1954 return count;
1955}
1956
1957void noinline
1958ev_invoke_pending (EV_P)
1686{ 1959{
1687 int pri; 1960 int pri;
1688 1961
1689 for (pri = NUMPRI; pri--; ) 1962 for (pri = NUMPRI; pri--; )
1690 while (pendingcnt [pri]) 1963 while (pendingcnt [pri])
1691 { 1964 {
1692 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1965 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1693 1966
1694 if (expect_true (p->w))
1695 {
1696 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1967 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1968 /* ^ this is no longer true, as pending_w could be here */
1697 1969
1698 p->w->pending = 0; 1970 p->w->pending = 0;
1699 EV_CB_INVOKE (p->w, p->events); 1971 EV_CB_INVOKE (p->w, p->events);
1700 EV_FREQUENT_CHECK; 1972 EV_FREQUENT_CHECK;
1701 }
1702 } 1973 }
1703} 1974}
1704 1975
1705#if EV_IDLE_ENABLE 1976#if EV_IDLE_ENABLE
1706void inline_size 1977/* make idle watchers pending. this handles the "call-idle */
1978/* only when higher priorities are idle" logic */
1979inline_size void
1707idle_reify (EV_P) 1980idle_reify (EV_P)
1708{ 1981{
1709 if (expect_false (idleall)) 1982 if (expect_false (idleall))
1710 { 1983 {
1711 int pri; 1984 int pri;
… …
1723 } 1996 }
1724 } 1997 }
1725} 1998}
1726#endif 1999#endif
1727 2000
1728void inline_size 2001/* make timers pending */
2002inline_size void
1729timers_reify (EV_P) 2003timers_reify (EV_P)
1730{ 2004{
1731 EV_FREQUENT_CHECK; 2005 EV_FREQUENT_CHECK;
1732 2006
1733 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2007 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1734 { 2008 {
1735 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2009 do
1736
1737 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1738
1739 /* first reschedule or stop timer */
1740 if (w->repeat)
1741 { 2010 {
2011 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2012
2013 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2014
2015 /* first reschedule or stop timer */
2016 if (w->repeat)
2017 {
1742 ev_at (w) += w->repeat; 2018 ev_at (w) += w->repeat;
1743 if (ev_at (w) < mn_now) 2019 if (ev_at (w) < mn_now)
1744 ev_at (w) = mn_now; 2020 ev_at (w) = mn_now;
1745 2021
1746 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2022 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1747 2023
1748 ANHE_at_cache (timers [HEAP0]); 2024 ANHE_at_cache (timers [HEAP0]);
1749 downheap (timers, timercnt, HEAP0); 2025 downheap (timers, timercnt, HEAP0);
2026 }
2027 else
2028 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2029
2030 EV_FREQUENT_CHECK;
2031 feed_reverse (EV_A_ (W)w);
1750 } 2032 }
1751 else 2033 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1752 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1753 2034
1754 EV_FREQUENT_CHECK;
1755 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2035 feed_reverse_done (EV_A_ EV_TIMEOUT);
1756 } 2036 }
1757} 2037}
1758 2038
1759#if EV_PERIODIC_ENABLE 2039#if EV_PERIODIC_ENABLE
1760void inline_size 2040/* make periodics pending */
2041inline_size void
1761periodics_reify (EV_P) 2042periodics_reify (EV_P)
1762{ 2043{
1763 EV_FREQUENT_CHECK; 2044 EV_FREQUENT_CHECK;
1764 2045
1765 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2046 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1766 { 2047 {
1767 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2048 int feed_count = 0;
1768 2049
1769 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2050 do
1770
1771 /* first reschedule or stop timer */
1772 if (w->reschedule_cb)
1773 { 2051 {
2052 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2053
2054 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2055
2056 /* first reschedule or stop timer */
2057 if (w->reschedule_cb)
2058 {
1774 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2059 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1775 2060
1776 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2061 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1777 2062
1778 ANHE_at_cache (periodics [HEAP0]); 2063 ANHE_at_cache (periodics [HEAP0]);
1779 downheap (periodics, periodiccnt, HEAP0); 2064 downheap (periodics, periodiccnt, HEAP0);
2065 }
2066 else if (w->interval)
2067 {
2068 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2069 /* if next trigger time is not sufficiently in the future, put it there */
2070 /* this might happen because of floating point inexactness */
2071 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2072 {
2073 ev_at (w) += w->interval;
2074
2075 /* if interval is unreasonably low we might still have a time in the past */
2076 /* so correct this. this will make the periodic very inexact, but the user */
2077 /* has effectively asked to get triggered more often than possible */
2078 if (ev_at (w) < ev_rt_now)
2079 ev_at (w) = ev_rt_now;
2080 }
2081
2082 ANHE_at_cache (periodics [HEAP0]);
2083 downheap (periodics, periodiccnt, HEAP0);
2084 }
2085 else
2086 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2087
2088 EV_FREQUENT_CHECK;
2089 feed_reverse (EV_A_ (W)w);
1780 } 2090 }
1781 else if (w->interval) 2091 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1782 {
1783 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1784 /* if next trigger time is not sufficiently in the future, put it there */
1785 /* this might happen because of floating point inexactness */
1786 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1787 {
1788 ev_at (w) += w->interval;
1789 2092
1790 /* if interval is unreasonably low we might still have a time in the past */
1791 /* so correct this. this will make the periodic very inexact, but the user */
1792 /* has effectively asked to get triggered more often than possible */
1793 if (ev_at (w) < ev_rt_now)
1794 ev_at (w) = ev_rt_now;
1795 }
1796
1797 ANHE_at_cache (periodics [HEAP0]);
1798 downheap (periodics, periodiccnt, HEAP0);
1799 }
1800 else
1801 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1802
1803 EV_FREQUENT_CHECK;
1804 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2093 feed_reverse_done (EV_A_ EV_PERIODIC);
1805 } 2094 }
1806} 2095}
1807 2096
2097/* simply recalculate all periodics */
2098/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1808static void noinline 2099static void noinline
1809periodics_reschedule (EV_P) 2100periodics_reschedule (EV_P)
1810{ 2101{
1811 int i; 2102 int i;
1812 2103
… …
1825 2116
1826 reheap (periodics, periodiccnt); 2117 reheap (periodics, periodiccnt);
1827} 2118}
1828#endif 2119#endif
1829 2120
1830void inline_speed 2121/* adjust all timers by a given offset */
2122static void noinline
2123timers_reschedule (EV_P_ ev_tstamp adjust)
2124{
2125 int i;
2126
2127 for (i = 0; i < timercnt; ++i)
2128 {
2129 ANHE *he = timers + i + HEAP0;
2130 ANHE_w (*he)->at += adjust;
2131 ANHE_at_cache (*he);
2132 }
2133}
2134
2135/* fetch new monotonic and realtime times from the kernel */
2136/* also detetc if there was a timejump, and act accordingly */
2137inline_speed void
1831time_update (EV_P_ ev_tstamp max_block) 2138time_update (EV_P_ ev_tstamp max_block)
1832{ 2139{
1833 int i;
1834
1835#if EV_USE_MONOTONIC 2140#if EV_USE_MONOTONIC
1836 if (expect_true (have_monotonic)) 2141 if (expect_true (have_monotonic))
1837 { 2142 {
2143 int i;
1838 ev_tstamp odiff = rtmn_diff; 2144 ev_tstamp odiff = rtmn_diff;
1839 2145
1840 mn_now = get_clock (); 2146 mn_now = get_clock ();
1841 2147
1842 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2148 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1868 ev_rt_now = ev_time (); 2174 ev_rt_now = ev_time ();
1869 mn_now = get_clock (); 2175 mn_now = get_clock ();
1870 now_floor = mn_now; 2176 now_floor = mn_now;
1871 } 2177 }
1872 2178
2179 /* no timer adjustment, as the monotonic clock doesn't jump */
2180 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1873# if EV_PERIODIC_ENABLE 2181# if EV_PERIODIC_ENABLE
1874 periodics_reschedule (EV_A); 2182 periodics_reschedule (EV_A);
1875# endif 2183# endif
1876 /* no timer adjustment, as the monotonic clock doesn't jump */
1877 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1878 } 2184 }
1879 else 2185 else
1880#endif 2186#endif
1881 { 2187 {
1882 ev_rt_now = ev_time (); 2188 ev_rt_now = ev_time ();
1883 2189
1884 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2190 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1885 { 2191 {
2192 /* adjust timers. this is easy, as the offset is the same for all of them */
2193 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1886#if EV_PERIODIC_ENABLE 2194#if EV_PERIODIC_ENABLE
1887 periodics_reschedule (EV_A); 2195 periodics_reschedule (EV_A);
1888#endif 2196#endif
1889 /* adjust timers. this is easy, as the offset is the same for all of them */
1890 for (i = 0; i < timercnt; ++i)
1891 {
1892 ANHE *he = timers + i + HEAP0;
1893 ANHE_w (*he)->at += ev_rt_now - mn_now;
1894 ANHE_at_cache (*he);
1895 }
1896 } 2197 }
1897 2198
1898 mn_now = ev_rt_now; 2199 mn_now = ev_rt_now;
1899 } 2200 }
1900} 2201}
1901 2202
1902void 2203void
1903ev_ref (EV_P)
1904{
1905 ++activecnt;
1906}
1907
1908void
1909ev_unref (EV_P)
1910{
1911 --activecnt;
1912}
1913
1914void
1915ev_now_update (EV_P)
1916{
1917 time_update (EV_A_ 1e100);
1918}
1919
1920static int loop_done;
1921
1922void
1923ev_loop (EV_P_ int flags) 2204ev_loop (EV_P_ int flags)
1924{ 2205{
2206#if EV_MINIMAL < 2
2207 ++loop_depth;
2208#endif
2209
2210 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2211
1925 loop_done = EVUNLOOP_CANCEL; 2212 loop_done = EVUNLOOP_CANCEL;
1926 2213
1927 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2214 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1928 2215
1929 do 2216 do
1930 { 2217 {
1931#if EV_VERIFY >= 2 2218#if EV_VERIFY >= 2
1932 ev_loop_verify (EV_A); 2219 ev_loop_verify (EV_A);
… …
1945 /* we might have forked, so queue fork handlers */ 2232 /* we might have forked, so queue fork handlers */
1946 if (expect_false (postfork)) 2233 if (expect_false (postfork))
1947 if (forkcnt) 2234 if (forkcnt)
1948 { 2235 {
1949 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2236 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1950 call_pending (EV_A); 2237 EV_INVOKE_PENDING;
1951 } 2238 }
1952#endif 2239#endif
1953 2240
1954 /* queue prepare watchers (and execute them) */ 2241 /* queue prepare watchers (and execute them) */
1955 if (expect_false (preparecnt)) 2242 if (expect_false (preparecnt))
1956 { 2243 {
1957 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2244 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1958 call_pending (EV_A); 2245 EV_INVOKE_PENDING;
1959 } 2246 }
1960 2247
1961 if (expect_false (!activecnt)) 2248 if (expect_false (loop_done))
1962 break; 2249 break;
1963 2250
1964 /* we might have forked, so reify kernel state if necessary */ 2251 /* we might have forked, so reify kernel state if necessary */
1965 if (expect_false (postfork)) 2252 if (expect_false (postfork))
1966 loop_fork (EV_A); 2253 loop_fork (EV_A);
… …
1973 ev_tstamp waittime = 0.; 2260 ev_tstamp waittime = 0.;
1974 ev_tstamp sleeptime = 0.; 2261 ev_tstamp sleeptime = 0.;
1975 2262
1976 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2263 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1977 { 2264 {
2265 /* remember old timestamp for io_blocktime calculation */
2266 ev_tstamp prev_mn_now = mn_now;
2267
1978 /* update time to cancel out callback processing overhead */ 2268 /* update time to cancel out callback processing overhead */
1979 time_update (EV_A_ 1e100); 2269 time_update (EV_A_ 1e100);
1980 2270
1981 waittime = MAX_BLOCKTIME; 2271 waittime = MAX_BLOCKTIME;
1982 2272
… …
1992 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2282 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1993 if (waittime > to) waittime = to; 2283 if (waittime > to) waittime = to;
1994 } 2284 }
1995#endif 2285#endif
1996 2286
2287 /* don't let timeouts decrease the waittime below timeout_blocktime */
1997 if (expect_false (waittime < timeout_blocktime)) 2288 if (expect_false (waittime < timeout_blocktime))
1998 waittime = timeout_blocktime; 2289 waittime = timeout_blocktime;
1999 2290
2000 sleeptime = waittime - backend_fudge; 2291 /* extra check because io_blocktime is commonly 0 */
2001
2002 if (expect_true (sleeptime > io_blocktime)) 2292 if (expect_false (io_blocktime))
2003 sleeptime = io_blocktime;
2004
2005 if (sleeptime)
2006 { 2293 {
2294 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2295
2296 if (sleeptime > waittime - backend_fudge)
2297 sleeptime = waittime - backend_fudge;
2298
2299 if (expect_true (sleeptime > 0.))
2300 {
2007 ev_sleep (sleeptime); 2301 ev_sleep (sleeptime);
2008 waittime -= sleeptime; 2302 waittime -= sleeptime;
2303 }
2009 } 2304 }
2010 } 2305 }
2011 2306
2307#if EV_MINIMAL < 2
2012 ++loop_count; 2308 ++loop_count;
2309#endif
2310 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2013 backend_poll (EV_A_ waittime); 2311 backend_poll (EV_A_ waittime);
2312 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2014 2313
2015 /* update ev_rt_now, do magic */ 2314 /* update ev_rt_now, do magic */
2016 time_update (EV_A_ waittime + sleeptime); 2315 time_update (EV_A_ waittime + sleeptime);
2017 } 2316 }
2018 2317
… …
2029 2328
2030 /* queue check watchers, to be executed first */ 2329 /* queue check watchers, to be executed first */
2031 if (expect_false (checkcnt)) 2330 if (expect_false (checkcnt))
2032 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2331 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2033 2332
2034 call_pending (EV_A); 2333 EV_INVOKE_PENDING;
2035 } 2334 }
2036 while (expect_true ( 2335 while (expect_true (
2037 activecnt 2336 activecnt
2038 && !loop_done 2337 && !loop_done
2039 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2338 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2040 )); 2339 ));
2041 2340
2042 if (loop_done == EVUNLOOP_ONE) 2341 if (loop_done == EVUNLOOP_ONE)
2043 loop_done = EVUNLOOP_CANCEL; 2342 loop_done = EVUNLOOP_CANCEL;
2343
2344#if EV_MINIMAL < 2
2345 --loop_depth;
2346#endif
2044} 2347}
2045 2348
2046void 2349void
2047ev_unloop (EV_P_ int how) 2350ev_unloop (EV_P_ int how)
2048{ 2351{
2049 loop_done = how; 2352 loop_done = how;
2050} 2353}
2051 2354
2355void
2356ev_ref (EV_P)
2357{
2358 ++activecnt;
2359}
2360
2361void
2362ev_unref (EV_P)
2363{
2364 --activecnt;
2365}
2366
2367void
2368ev_now_update (EV_P)
2369{
2370 time_update (EV_A_ 1e100);
2371}
2372
2373void
2374ev_suspend (EV_P)
2375{
2376 ev_now_update (EV_A);
2377}
2378
2379void
2380ev_resume (EV_P)
2381{
2382 ev_tstamp mn_prev = mn_now;
2383
2384 ev_now_update (EV_A);
2385 timers_reschedule (EV_A_ mn_now - mn_prev);
2386#if EV_PERIODIC_ENABLE
2387 /* TODO: really do this? */
2388 periodics_reschedule (EV_A);
2389#endif
2390}
2391
2052/*****************************************************************************/ 2392/*****************************************************************************/
2393/* singly-linked list management, used when the expected list length is short */
2053 2394
2054void inline_size 2395inline_size void
2055wlist_add (WL *head, WL elem) 2396wlist_add (WL *head, WL elem)
2056{ 2397{
2057 elem->next = *head; 2398 elem->next = *head;
2058 *head = elem; 2399 *head = elem;
2059} 2400}
2060 2401
2061void inline_size 2402inline_size void
2062wlist_del (WL *head, WL elem) 2403wlist_del (WL *head, WL elem)
2063{ 2404{
2064 while (*head) 2405 while (*head)
2065 { 2406 {
2066 if (*head == elem) 2407 if (expect_true (*head == elem))
2067 { 2408 {
2068 *head = elem->next; 2409 *head = elem->next;
2069 return; 2410 break;
2070 } 2411 }
2071 2412
2072 head = &(*head)->next; 2413 head = &(*head)->next;
2073 } 2414 }
2074} 2415}
2075 2416
2076void inline_speed 2417/* internal, faster, version of ev_clear_pending */
2418inline_speed void
2077clear_pending (EV_P_ W w) 2419clear_pending (EV_P_ W w)
2078{ 2420{
2079 if (w->pending) 2421 if (w->pending)
2080 { 2422 {
2081 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2423 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2082 w->pending = 0; 2424 w->pending = 0;
2083 } 2425 }
2084} 2426}
2085 2427
2086int 2428int
… …
2090 int pending = w_->pending; 2432 int pending = w_->pending;
2091 2433
2092 if (expect_true (pending)) 2434 if (expect_true (pending))
2093 { 2435 {
2094 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2436 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2437 p->w = (W)&pending_w;
2095 w_->pending = 0; 2438 w_->pending = 0;
2096 p->w = 0;
2097 return p->events; 2439 return p->events;
2098 } 2440 }
2099 else 2441 else
2100 return 0; 2442 return 0;
2101} 2443}
2102 2444
2103void inline_size 2445inline_size void
2104pri_adjust (EV_P_ W w) 2446pri_adjust (EV_P_ W w)
2105{ 2447{
2106 int pri = w->priority; 2448 int pri = ev_priority (w);
2107 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2449 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2108 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2450 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2109 w->priority = pri; 2451 ev_set_priority (w, pri);
2110} 2452}
2111 2453
2112void inline_speed 2454inline_speed void
2113ev_start (EV_P_ W w, int active) 2455ev_start (EV_P_ W w, int active)
2114{ 2456{
2115 pri_adjust (EV_A_ w); 2457 pri_adjust (EV_A_ w);
2116 w->active = active; 2458 w->active = active;
2117 ev_ref (EV_A); 2459 ev_ref (EV_A);
2118} 2460}
2119 2461
2120void inline_size 2462inline_size void
2121ev_stop (EV_P_ W w) 2463ev_stop (EV_P_ W w)
2122{ 2464{
2123 ev_unref (EV_A); 2465 ev_unref (EV_A);
2124 w->active = 0; 2466 w->active = 0;
2125} 2467}
… …
2132 int fd = w->fd; 2474 int fd = w->fd;
2133 2475
2134 if (expect_false (ev_is_active (w))) 2476 if (expect_false (ev_is_active (w)))
2135 return; 2477 return;
2136 2478
2137 assert (("ev_io_start called with negative fd", fd >= 0)); 2479 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2480 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2138 2481
2139 EV_FREQUENT_CHECK; 2482 EV_FREQUENT_CHECK;
2140 2483
2141 ev_start (EV_A_ (W)w, 1); 2484 ev_start (EV_A_ (W)w, 1);
2142 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2485 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2143 wlist_add (&anfds[fd].head, (WL)w); 2486 wlist_add (&anfds[fd].head, (WL)w);
2144 2487
2145 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2488 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2146 w->events &= ~EV_IOFDSET; 2489 w->events &= ~EV__IOFDSET;
2147 2490
2148 EV_FREQUENT_CHECK; 2491 EV_FREQUENT_CHECK;
2149} 2492}
2150 2493
2151void noinline 2494void noinline
… …
2153{ 2496{
2154 clear_pending (EV_A_ (W)w); 2497 clear_pending (EV_A_ (W)w);
2155 if (expect_false (!ev_is_active (w))) 2498 if (expect_false (!ev_is_active (w)))
2156 return; 2499 return;
2157 2500
2158 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2501 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2159 2502
2160 EV_FREQUENT_CHECK; 2503 EV_FREQUENT_CHECK;
2161 2504
2162 wlist_del (&anfds[w->fd].head, (WL)w); 2505 wlist_del (&anfds[w->fd].head, (WL)w);
2163 ev_stop (EV_A_ (W)w); 2506 ev_stop (EV_A_ (W)w);
… …
2173 if (expect_false (ev_is_active (w))) 2516 if (expect_false (ev_is_active (w)))
2174 return; 2517 return;
2175 2518
2176 ev_at (w) += mn_now; 2519 ev_at (w) += mn_now;
2177 2520
2178 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2521 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2179 2522
2180 EV_FREQUENT_CHECK; 2523 EV_FREQUENT_CHECK;
2181 2524
2182 ++timercnt; 2525 ++timercnt;
2183 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2526 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2186 ANHE_at_cache (timers [ev_active (w)]); 2529 ANHE_at_cache (timers [ev_active (w)]);
2187 upheap (timers, ev_active (w)); 2530 upheap (timers, ev_active (w));
2188 2531
2189 EV_FREQUENT_CHECK; 2532 EV_FREQUENT_CHECK;
2190 2533
2191 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2534 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2192} 2535}
2193 2536
2194void noinline 2537void noinline
2195ev_timer_stop (EV_P_ ev_timer *w) 2538ev_timer_stop (EV_P_ ev_timer *w)
2196{ 2539{
… …
2201 EV_FREQUENT_CHECK; 2544 EV_FREQUENT_CHECK;
2202 2545
2203 { 2546 {
2204 int active = ev_active (w); 2547 int active = ev_active (w);
2205 2548
2206 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2549 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2207 2550
2208 --timercnt; 2551 --timercnt;
2209 2552
2210 if (expect_true (active < timercnt + HEAP0)) 2553 if (expect_true (active < timercnt + HEAP0))
2211 { 2554 {
… …
2244 } 2587 }
2245 2588
2246 EV_FREQUENT_CHECK; 2589 EV_FREQUENT_CHECK;
2247} 2590}
2248 2591
2592ev_tstamp
2593ev_timer_remaining (EV_P_ ev_timer *w)
2594{
2595 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2596}
2597
2249#if EV_PERIODIC_ENABLE 2598#if EV_PERIODIC_ENABLE
2250void noinline 2599void noinline
2251ev_periodic_start (EV_P_ ev_periodic *w) 2600ev_periodic_start (EV_P_ ev_periodic *w)
2252{ 2601{
2253 if (expect_false (ev_is_active (w))) 2602 if (expect_false (ev_is_active (w)))
… …
2255 2604
2256 if (w->reschedule_cb) 2605 if (w->reschedule_cb)
2257 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2606 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2258 else if (w->interval) 2607 else if (w->interval)
2259 { 2608 {
2260 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2609 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2261 /* this formula differs from the one in periodic_reify because we do not always round up */ 2610 /* this formula differs from the one in periodic_reify because we do not always round up */
2262 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2611 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2263 } 2612 }
2264 else 2613 else
2265 ev_at (w) = w->offset; 2614 ev_at (w) = w->offset;
… …
2273 ANHE_at_cache (periodics [ev_active (w)]); 2622 ANHE_at_cache (periodics [ev_active (w)]);
2274 upheap (periodics, ev_active (w)); 2623 upheap (periodics, ev_active (w));
2275 2624
2276 EV_FREQUENT_CHECK; 2625 EV_FREQUENT_CHECK;
2277 2626
2278 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2627 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2279} 2628}
2280 2629
2281void noinline 2630void noinline
2282ev_periodic_stop (EV_P_ ev_periodic *w) 2631ev_periodic_stop (EV_P_ ev_periodic *w)
2283{ 2632{
… …
2288 EV_FREQUENT_CHECK; 2637 EV_FREQUENT_CHECK;
2289 2638
2290 { 2639 {
2291 int active = ev_active (w); 2640 int active = ev_active (w);
2292 2641
2293 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2642 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2294 2643
2295 --periodiccnt; 2644 --periodiccnt;
2296 2645
2297 if (expect_true (active < periodiccnt + HEAP0)) 2646 if (expect_true (active < periodiccnt + HEAP0))
2298 { 2647 {
… …
2320#endif 2669#endif
2321 2670
2322void noinline 2671void noinline
2323ev_signal_start (EV_P_ ev_signal *w) 2672ev_signal_start (EV_P_ ev_signal *w)
2324{ 2673{
2325#if EV_MULTIPLICITY
2326 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2327#endif
2328 if (expect_false (ev_is_active (w))) 2674 if (expect_false (ev_is_active (w)))
2329 return; 2675 return;
2330 2676
2331 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2677 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2332 2678
2333 evpipe_init (EV_A); 2679#if EV_MULTIPLICITY
2680 assert (("libev: a signal must not be attached to two different loops",
2681 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2334 2682
2335 EV_FREQUENT_CHECK; 2683 signals [w->signum - 1].loop = EV_A;
2684#endif
2336 2685
2686 EV_FREQUENT_CHECK;
2687
2688#if EV_USE_SIGNALFD
2689 if (sigfd == -2)
2337 { 2690 {
2338#ifndef _WIN32 2691 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2339 sigset_t full, prev; 2692 if (sigfd < 0 && errno == EINVAL)
2340 sigfillset (&full); 2693 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2341 sigprocmask (SIG_SETMASK, &full, &prev);
2342#endif
2343 2694
2344 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2695 if (sigfd >= 0)
2696 {
2697 fd_intern (sigfd); /* doing it twice will not hurt */
2345 2698
2346#ifndef _WIN32 2699 sigemptyset (&sigfd_set);
2347 sigprocmask (SIG_SETMASK, &prev, 0); 2700
2348#endif 2701 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2702 ev_set_priority (&sigfd_w, EV_MAXPRI);
2703 ev_io_start (EV_A_ &sigfd_w);
2704 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2705 }
2349 } 2706 }
2707
2708 if (sigfd >= 0)
2709 {
2710 /* TODO: check .head */
2711 sigaddset (&sigfd_set, w->signum);
2712 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2713
2714 signalfd (sigfd, &sigfd_set, 0);
2715 }
2716#endif
2350 2717
2351 ev_start (EV_A_ (W)w, 1); 2718 ev_start (EV_A_ (W)w, 1);
2352 wlist_add (&signals [w->signum - 1].head, (WL)w); 2719 wlist_add (&signals [w->signum - 1].head, (WL)w);
2353 2720
2354 if (!((WL)w)->next) 2721 if (!((WL)w)->next)
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0) /*TODO*/
2724# endif
2355 { 2725 {
2356#if _WIN32 2726# if _WIN32
2357 signal (w->signum, ev_sighandler); 2727 signal (w->signum, ev_sighandler);
2358#else 2728# else
2359 struct sigaction sa; 2729 struct sigaction sa;
2730
2731 evpipe_init (EV_A);
2732
2360 sa.sa_handler = ev_sighandler; 2733 sa.sa_handler = ev_sighandler;
2361 sigfillset (&sa.sa_mask); 2734 sigfillset (&sa.sa_mask);
2362 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2735 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2363 sigaction (w->signum, &sa, 0); 2736 sigaction (w->signum, &sa, 0);
2737
2738 sigemptyset (&sa.sa_mask);
2739 sigaddset (&sa.sa_mask, w->signum);
2740 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2364#endif 2741#endif
2365 } 2742 }
2366 2743
2367 EV_FREQUENT_CHECK; 2744 EV_FREQUENT_CHECK;
2368} 2745}
2369 2746
2370void noinline 2747void noinline
… …
2378 2755
2379 wlist_del (&signals [w->signum - 1].head, (WL)w); 2756 wlist_del (&signals [w->signum - 1].head, (WL)w);
2380 ev_stop (EV_A_ (W)w); 2757 ev_stop (EV_A_ (W)w);
2381 2758
2382 if (!signals [w->signum - 1].head) 2759 if (!signals [w->signum - 1].head)
2760 {
2761#if EV_MULTIPLICITY
2762 signals [w->signum - 1].loop = 0; /* unattach from signal */
2763#endif
2764#if EV_USE_SIGNALFD
2765 if (sigfd >= 0)
2766 {
2767 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2768 sigdelset (&sigfd_set, w->signum);
2769 signalfd (sigfd, &sigfd_set, 0);
2770 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2771 /*TODO: maybe unblock signal? */
2772 }
2773 else
2774#endif
2383 signal (w->signum, SIG_DFL); 2775 signal (w->signum, SIG_DFL);
2776 }
2384 2777
2385 EV_FREQUENT_CHECK; 2778 EV_FREQUENT_CHECK;
2386} 2779}
2387 2780
2388void 2781void
2389ev_child_start (EV_P_ ev_child *w) 2782ev_child_start (EV_P_ ev_child *w)
2390{ 2783{
2391#if EV_MULTIPLICITY 2784#if EV_MULTIPLICITY
2392 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2785 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2393#endif 2786#endif
2394 if (expect_false (ev_is_active (w))) 2787 if (expect_false (ev_is_active (w)))
2395 return; 2788 return;
2396 2789
2397 EV_FREQUENT_CHECK; 2790 EV_FREQUENT_CHECK;
… …
2422# ifdef _WIN32 2815# ifdef _WIN32
2423# undef lstat 2816# undef lstat
2424# define lstat(a,b) _stati64 (a,b) 2817# define lstat(a,b) _stati64 (a,b)
2425# endif 2818# endif
2426 2819
2427#define DEF_STAT_INTERVAL 5.0074891 2820#define DEF_STAT_INTERVAL 5.0074891
2821#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2428#define MIN_STAT_INTERVAL 0.1074891 2822#define MIN_STAT_INTERVAL 0.1074891
2429 2823
2430static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2824static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2431 2825
2432#if EV_USE_INOTIFY 2826#if EV_USE_INOTIFY
2433# define EV_INOTIFY_BUFSIZE 8192 2827# define EV_INOTIFY_BUFSIZE 8192
… …
2437{ 2831{
2438 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2832 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2439 2833
2440 if (w->wd < 0) 2834 if (w->wd < 0)
2441 { 2835 {
2836 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2442 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2837 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2443 2838
2444 /* monitor some parent directory for speedup hints */ 2839 /* monitor some parent directory for speedup hints */
2445 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2840 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2446 /* but an efficiency issue only */ 2841 /* but an efficiency issue only */
2447 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2842 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2448 { 2843 {
2449 char path [4096]; 2844 char path [4096];
2450 strcpy (path, w->path); 2845 strcpy (path, w->path);
… …
2454 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2849 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2455 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2850 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2456 2851
2457 char *pend = strrchr (path, '/'); 2852 char *pend = strrchr (path, '/');
2458 2853
2459 if (!pend) 2854 if (!pend || pend == path)
2460 break; /* whoops, no '/', complain to your admin */ 2855 break;
2461 2856
2462 *pend = 0; 2857 *pend = 0;
2463 w->wd = inotify_add_watch (fs_fd, path, mask); 2858 w->wd = inotify_add_watch (fs_fd, path, mask);
2464 } 2859 }
2465 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2860 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2466 } 2861 }
2467 } 2862 }
2468 else
2469 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2470 2863
2471 if (w->wd >= 0) 2864 if (w->wd >= 0)
2865 {
2866 struct statfs sfs;
2867
2472 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2868 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2869
2870 /* now local changes will be tracked by inotify, but remote changes won't */
2871 /* unless the filesystem it known to be local, we therefore still poll */
2872 /* also do poll on <2.6.25, but with normal frequency */
2873
2874 if (fs_2625 && !statfs (w->path, &sfs))
2875 if (sfs.f_type == 0x1373 /* devfs */
2876 || sfs.f_type == 0xEF53 /* ext2/3 */
2877 || sfs.f_type == 0x3153464a /* jfs */
2878 || sfs.f_type == 0x52654973 /* reiser3 */
2879 || sfs.f_type == 0x01021994 /* tempfs */
2880 || sfs.f_type == 0x58465342 /* xfs */)
2881 return;
2882
2883 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2884 ev_timer_again (EV_A_ &w->timer);
2885 }
2473} 2886}
2474 2887
2475static void noinline 2888static void noinline
2476infy_del (EV_P_ ev_stat *w) 2889infy_del (EV_P_ ev_stat *w)
2477{ 2890{
… …
2491 2904
2492static void noinline 2905static void noinline
2493infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2906infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2494{ 2907{
2495 if (slot < 0) 2908 if (slot < 0)
2496 /* overflow, need to check for all hahs slots */ 2909 /* overflow, need to check for all hash slots */
2497 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2910 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2498 infy_wd (EV_A_ slot, wd, ev); 2911 infy_wd (EV_A_ slot, wd, ev);
2499 else 2912 else
2500 { 2913 {
2501 WL w_; 2914 WL w_;
… …
2507 2920
2508 if (w->wd == wd || wd == -1) 2921 if (w->wd == wd || wd == -1)
2509 { 2922 {
2510 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2923 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2511 { 2924 {
2925 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2512 w->wd = -1; 2926 w->wd = -1;
2513 infy_add (EV_A_ w); /* re-add, no matter what */ 2927 infy_add (EV_A_ w); /* re-add, no matter what */
2514 } 2928 }
2515 2929
2516 stat_timer_cb (EV_A_ &w->timer, 0); 2930 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2529 2943
2530 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2944 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2531 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2945 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2532} 2946}
2533 2947
2534void inline_size 2948inline_size void
2949check_2625 (EV_P)
2950{
2951 /* kernels < 2.6.25 are borked
2952 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2953 */
2954 struct utsname buf;
2955 int major, minor, micro;
2956
2957 if (uname (&buf))
2958 return;
2959
2960 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2961 return;
2962
2963 if (major < 2
2964 || (major == 2 && minor < 6)
2965 || (major == 2 && minor == 6 && micro < 25))
2966 return;
2967
2968 fs_2625 = 1;
2969}
2970
2971inline_size void
2535infy_init (EV_P) 2972infy_init (EV_P)
2536{ 2973{
2537 if (fs_fd != -2) 2974 if (fs_fd != -2)
2538 return; 2975 return;
2976
2977 fs_fd = -1;
2978
2979 check_2625 (EV_A);
2539 2980
2540 fs_fd = inotify_init (); 2981 fs_fd = inotify_init ();
2541 2982
2542 if (fs_fd >= 0) 2983 if (fs_fd >= 0)
2543 { 2984 {
… …
2545 ev_set_priority (&fs_w, EV_MAXPRI); 2986 ev_set_priority (&fs_w, EV_MAXPRI);
2546 ev_io_start (EV_A_ &fs_w); 2987 ev_io_start (EV_A_ &fs_w);
2547 } 2988 }
2548} 2989}
2549 2990
2550void inline_size 2991inline_size void
2551infy_fork (EV_P) 2992infy_fork (EV_P)
2552{ 2993{
2553 int slot; 2994 int slot;
2554 2995
2555 if (fs_fd < 0) 2996 if (fs_fd < 0)
… …
2571 w->wd = -1; 3012 w->wd = -1;
2572 3013
2573 if (fs_fd >= 0) 3014 if (fs_fd >= 0)
2574 infy_add (EV_A_ w); /* re-add, no matter what */ 3015 infy_add (EV_A_ w); /* re-add, no matter what */
2575 else 3016 else
2576 ev_timer_start (EV_A_ &w->timer); 3017 ev_timer_again (EV_A_ &w->timer);
2577 } 3018 }
2578
2579 } 3019 }
2580} 3020}
2581 3021
2582#endif 3022#endif
2583 3023
… …
2619 || w->prev.st_atime != w->attr.st_atime 3059 || w->prev.st_atime != w->attr.st_atime
2620 || w->prev.st_mtime != w->attr.st_mtime 3060 || w->prev.st_mtime != w->attr.st_mtime
2621 || w->prev.st_ctime != w->attr.st_ctime 3061 || w->prev.st_ctime != w->attr.st_ctime
2622 ) { 3062 ) {
2623 #if EV_USE_INOTIFY 3063 #if EV_USE_INOTIFY
3064 if (fs_fd >= 0)
3065 {
2624 infy_del (EV_A_ w); 3066 infy_del (EV_A_ w);
2625 infy_add (EV_A_ w); 3067 infy_add (EV_A_ w);
2626 ev_stat_stat (EV_A_ w); /* avoid race... */ 3068 ev_stat_stat (EV_A_ w); /* avoid race... */
3069 }
2627 #endif 3070 #endif
2628 3071
2629 ev_feed_event (EV_A_ w, EV_STAT); 3072 ev_feed_event (EV_A_ w, EV_STAT);
2630 } 3073 }
2631} 3074}
… …
2634ev_stat_start (EV_P_ ev_stat *w) 3077ev_stat_start (EV_P_ ev_stat *w)
2635{ 3078{
2636 if (expect_false (ev_is_active (w))) 3079 if (expect_false (ev_is_active (w)))
2637 return; 3080 return;
2638 3081
2639 /* since we use memcmp, we need to clear any padding data etc. */
2640 memset (&w->prev, 0, sizeof (ev_statdata));
2641 memset (&w->attr, 0, sizeof (ev_statdata));
2642
2643 ev_stat_stat (EV_A_ w); 3082 ev_stat_stat (EV_A_ w);
2644 3083
3084 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2645 if (w->interval < MIN_STAT_INTERVAL) 3085 w->interval = MIN_STAT_INTERVAL;
2646 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2647 3086
2648 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3087 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2649 ev_set_priority (&w->timer, ev_priority (w)); 3088 ev_set_priority (&w->timer, ev_priority (w));
2650 3089
2651#if EV_USE_INOTIFY 3090#if EV_USE_INOTIFY
2652 infy_init (EV_A); 3091 infy_init (EV_A);
2653 3092
2654 if (fs_fd >= 0) 3093 if (fs_fd >= 0)
2655 infy_add (EV_A_ w); 3094 infy_add (EV_A_ w);
2656 else 3095 else
2657#endif 3096#endif
2658 ev_timer_start (EV_A_ &w->timer); 3097 ev_timer_again (EV_A_ &w->timer);
2659 3098
2660 ev_start (EV_A_ (W)w, 1); 3099 ev_start (EV_A_ (W)w, 1);
2661 3100
2662 EV_FREQUENT_CHECK; 3101 EV_FREQUENT_CHECK;
2663} 3102}
… …
2823embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3262embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2824{ 3263{
2825 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3264 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2826 3265
2827 { 3266 {
2828 struct ev_loop *loop = w->other; 3267 EV_P = w->other;
2829 3268
2830 while (fdchangecnt) 3269 while (fdchangecnt)
2831 { 3270 {
2832 fd_reify (EV_A); 3271 fd_reify (EV_A);
2833 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3272 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2838static void 3277static void
2839embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3278embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2840{ 3279{
2841 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3280 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2842 3281
3282 ev_embed_stop (EV_A_ w);
3283
2843 { 3284 {
2844 struct ev_loop *loop = w->other; 3285 EV_P = w->other;
2845 3286
2846 ev_loop_fork (EV_A); 3287 ev_loop_fork (EV_A);
3288 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2847 } 3289 }
3290
3291 ev_embed_start (EV_A_ w);
2848} 3292}
2849 3293
2850#if 0 3294#if 0
2851static void 3295static void
2852embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3296embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2860{ 3304{
2861 if (expect_false (ev_is_active (w))) 3305 if (expect_false (ev_is_active (w)))
2862 return; 3306 return;
2863 3307
2864 { 3308 {
2865 struct ev_loop *loop = w->other; 3309 EV_P = w->other;
2866 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3310 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2867 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3311 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2868 } 3312 }
2869 3313
2870 EV_FREQUENT_CHECK; 3314 EV_FREQUENT_CHECK;
2871 3315
… …
2982 3426
2983void 3427void
2984ev_async_send (EV_P_ ev_async *w) 3428ev_async_send (EV_P_ ev_async *w)
2985{ 3429{
2986 w->sent = 1; 3430 w->sent = 1;
2987 evpipe_write (EV_A_ &gotasync); 3431 evpipe_write (EV_A_ &async_pending);
2988} 3432}
2989#endif 3433#endif
2990 3434
2991/*****************************************************************************/ 3435/*****************************************************************************/
2992 3436
… …
3054 ev_timer_set (&once->to, timeout, 0.); 3498 ev_timer_set (&once->to, timeout, 0.);
3055 ev_timer_start (EV_A_ &once->to); 3499 ev_timer_start (EV_A_ &once->to);
3056 } 3500 }
3057} 3501}
3058 3502
3503/*****************************************************************************/
3504
3505#if EV_WALK_ENABLE
3506void
3507ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3508{
3509 int i, j;
3510 ev_watcher_list *wl, *wn;
3511
3512 if (types & (EV_IO | EV_EMBED))
3513 for (i = 0; i < anfdmax; ++i)
3514 for (wl = anfds [i].head; wl; )
3515 {
3516 wn = wl->next;
3517
3518#if EV_EMBED_ENABLE
3519 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3520 {
3521 if (types & EV_EMBED)
3522 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3523 }
3524 else
3525#endif
3526#if EV_USE_INOTIFY
3527 if (ev_cb ((ev_io *)wl) == infy_cb)
3528 ;
3529 else
3530#endif
3531 if ((ev_io *)wl != &pipe_w)
3532 if (types & EV_IO)
3533 cb (EV_A_ EV_IO, wl);
3534
3535 wl = wn;
3536 }
3537
3538 if (types & (EV_TIMER | EV_STAT))
3539 for (i = timercnt + HEAP0; i-- > HEAP0; )
3540#if EV_STAT_ENABLE
3541 /*TODO: timer is not always active*/
3542 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3543 {
3544 if (types & EV_STAT)
3545 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3546 }
3547 else
3548#endif
3549 if (types & EV_TIMER)
3550 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3551
3552#if EV_PERIODIC_ENABLE
3553 if (types & EV_PERIODIC)
3554 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3555 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3556#endif
3557
3558#if EV_IDLE_ENABLE
3559 if (types & EV_IDLE)
3560 for (j = NUMPRI; i--; )
3561 for (i = idlecnt [j]; i--; )
3562 cb (EV_A_ EV_IDLE, idles [j][i]);
3563#endif
3564
3565#if EV_FORK_ENABLE
3566 if (types & EV_FORK)
3567 for (i = forkcnt; i--; )
3568 if (ev_cb (forks [i]) != embed_fork_cb)
3569 cb (EV_A_ EV_FORK, forks [i]);
3570#endif
3571
3572#if EV_ASYNC_ENABLE
3573 if (types & EV_ASYNC)
3574 for (i = asynccnt; i--; )
3575 cb (EV_A_ EV_ASYNC, asyncs [i]);
3576#endif
3577
3578 if (types & EV_PREPARE)
3579 for (i = preparecnt; i--; )
3580#if EV_EMBED_ENABLE
3581 if (ev_cb (prepares [i]) != embed_prepare_cb)
3582#endif
3583 cb (EV_A_ EV_PREPARE, prepares [i]);
3584
3585 if (types & EV_CHECK)
3586 for (i = checkcnt; i--; )
3587 cb (EV_A_ EV_CHECK, checks [i]);
3588
3589 if (types & EV_SIGNAL)
3590 for (i = 0; i < EV_NSIG - 1; ++i)
3591 for (wl = signals [i].head; wl; )
3592 {
3593 wn = wl->next;
3594 cb (EV_A_ EV_SIGNAL, wl);
3595 wl = wn;
3596 }
3597
3598 if (types & EV_CHILD)
3599 for (i = EV_PID_HASHSIZE; i--; )
3600 for (wl = childs [i]; wl; )
3601 {
3602 wn = wl->next;
3603 cb (EV_A_ EV_CHILD, wl);
3604 wl = wn;
3605 }
3606/* EV_STAT 0x00001000 /* stat data changed */
3607/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3608}
3609#endif
3610
3059#if EV_MULTIPLICITY 3611#if EV_MULTIPLICITY
3060 #include "ev_wrap.h" 3612 #include "ev_wrap.h"
3061#endif 3613#endif
3062 3614
3063#ifdef __cplusplus 3615#ifdef __cplusplus

Diff Legend

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