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

Comparing libev/ev.c (file contents):
Revision 1.274 by root, Thu Nov 20 00:35:10 2008 UTC vs.
Revision 1.311 by root, Wed Jul 29 09:36:05 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 *
… …
57# endif 57# endif
58# ifndef EV_USE_MONOTONIC 58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 59# define EV_USE_MONOTONIC 1
60# endif 60# endif
61# endif 61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
62# endif 64# endif
63 65
64# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
67# endif 69# endif
68# ifndef EV_USE_REALTIME 70# ifndef EV_USE_REALTIME
69# define EV_USE_REALTIME 1 71# define EV_USE_REALTIME 0
70# endif 72# endif
71# else 73# else
72# ifndef EV_USE_MONOTONIC 74# ifndef EV_USE_MONOTONIC
73# define EV_USE_MONOTONIC 0 75# define EV_USE_MONOTONIC 0
74# endif 76# endif
… …
131# else 133# else
132# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
133# endif 135# endif
134# endif 136# endif
135 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
136# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
137# if HAVE_EVENTFD 147# if HAVE_EVENTFD
138# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
139# else 149# else
140# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
… …
176# endif 186# endif
177#endif 187#endif
178 188
179/* 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 */
180 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
181#ifndef EV_USE_CLOCK_SYSCALL 218#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
184# else 221# else
185# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
… …
193# define EV_USE_MONOTONIC 0 230# define EV_USE_MONOTONIC 0
194# endif 231# endif
195#endif 232#endif
196 233
197#ifndef EV_USE_REALTIME 234#ifndef EV_USE_REALTIME
198# define EV_USE_REALTIME 0 235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
199#endif 236#endif
200 237
201#ifndef EV_USE_NANOSLEEP 238#ifndef EV_USE_NANOSLEEP
202# if _POSIX_C_SOURCE >= 199309L 239# if _POSIX_C_SOURCE >= 199309L
203# define EV_USE_NANOSLEEP 1 240# define EV_USE_NANOSLEEP 1
… …
264# else 301# else
265# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
266# endif 303# endif
267#endif 304#endif
268 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
269#if 0 /* debugging */ 314#if 0 /* debugging */
270# define EV_VERIFY 3 315# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 316# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 317# define EV_HEAP_CACHE_AT 1
273#endif 318#endif
… …
280# define EV_USE_4HEAP !EV_MINIMAL 325# define EV_USE_4HEAP !EV_MINIMAL
281#endif 326#endif
282 327
283#ifndef EV_HEAP_CACHE_AT 328#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 329# define EV_HEAP_CACHE_AT !EV_MINIMAL
330#endif
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
285#endif 344#endif
286 345
287/* 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 */
288 347
289#ifndef CLOCK_MONOTONIC 348#ifndef CLOCK_MONOTONIC
… …
320 379
321#if EV_SELECT_IS_WINSOCKET 380#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 381# include <winsock.h>
323#endif 382#endif
324 383
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
335/* 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 */
336# 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
337# ifdef __cplusplus 397# ifdef __cplusplus
338extern "C" { 398extern "C" {
339# endif 399# endif
340int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
341# ifdef __cplusplus 401# ifdef __cplusplus
342} 402}
343# endif 403# endif
404#endif
405
406#if EV_USE_SIGNALFD
407# include <sys/signalfd.h>
344#endif 408#endif
345 409
346/**/ 410/**/
347 411
348#if EV_VERIFY >= 3 412#if EV_VERIFY >= 3
… …
384# define inline_speed static noinline 448# define inline_speed static noinline
385#else 449#else
386# define inline_speed static inline 450# define inline_speed static inline
387#endif 451#endif
388 452
389#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
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 458# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
459#endif
391 460
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 461#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 462#define EMPTY2(a,b) /* used to suppress some warnings */
394 463
395typedef ev_watcher *W; 464typedef ev_watcher *W;
… …
397typedef ev_watcher_time *WT; 466typedef ev_watcher_time *WT;
398 467
399#define ev_active(w) ((W)(w))->active 468#define ev_active(w) ((W)(w))->active
400#define ev_at(w) ((WT)(w))->at 469#define ev_at(w) ((WT)(w))->at
401 470
402#if EV_USE_MONOTONIC 471#if EV_USE_REALTIME
403/* 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 */
404/* 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
405static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 478static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
406#endif 479#endif
407 480
408#ifdef _WIN32 481#ifdef _WIN32
409# include "ev_win32.c" 482# include "ev_win32.c"
… …
474#define ev_malloc(size) ev_realloc (0, (size)) 547#define ev_malloc(size) ev_realloc (0, (size))
475#define ev_free(ptr) ev_realloc ((ptr), 0) 548#define ev_free(ptr) ev_realloc ((ptr), 0)
476 549
477/*****************************************************************************/ 550/*****************************************************************************/
478 551
552/* set in reify when reification needed */
553#define EV_ANFD_REIFY 1
554
555/* file descriptor info structure */
479typedef struct 556typedef struct
480{ 557{
481 WL head; 558 WL head;
482 unsigned char events; 559 unsigned char events; /* the events watched for */
483 unsigned char reify; 560 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
484 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 561 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
485 unsigned char unused; 562 unsigned char unused;
486#if EV_USE_EPOLL 563#if EV_USE_EPOLL
487 unsigned int egen; /* generation counter to counter epoll bugs */ 564 unsigned int egen; /* generation counter to counter epoll bugs */
488#endif 565#endif
489#if EV_SELECT_IS_WINSOCKET 566#if EV_SELECT_IS_WINSOCKET
490 SOCKET handle; 567 SOCKET handle;
491#endif 568#endif
492} ANFD; 569} ANFD;
493 570
571/* stores the pending event set for a given watcher */
494typedef struct 572typedef struct
495{ 573{
496 W w; 574 W w;
497 int events; 575 int events; /* the pending event set for the given watcher */
498} ANPENDING; 576} ANPENDING;
499 577
500#if EV_USE_INOTIFY 578#if EV_USE_INOTIFY
501/* hash table entry per inotify-id */ 579/* hash table entry per inotify-id */
502typedef struct 580typedef struct
… …
505} ANFS; 583} ANFS;
506#endif 584#endif
507 585
508/* Heap Entry */ 586/* Heap Entry */
509#if EV_HEAP_CACHE_AT 587#if EV_HEAP_CACHE_AT
588 /* a heap element */
510 typedef struct { 589 typedef struct {
511 ev_tstamp at; 590 ev_tstamp at;
512 WT w; 591 WT w;
513 } ANHE; 592 } ANHE;
514 593
515 #define ANHE_w(he) (he).w /* access watcher, read-write */ 594 #define ANHE_w(he) (he).w /* access watcher, read-write */
516 #define ANHE_at(he) (he).at /* access cached at, read-only */ 595 #define ANHE_at(he) (he).at /* access cached at, read-only */
517 #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 */
518#else 597#else
598 /* a heap element */
519 typedef WT ANHE; 599 typedef WT ANHE;
520 600
521 #define ANHE_w(he) (he) 601 #define ANHE_w(he) (he)
522 #define ANHE_at(he) (he)->at 602 #define ANHE_at(he) (he)->at
523 #define ANHE_at_cache(he) 603 #define ANHE_at_cache(he)
… …
547 627
548 static int ev_default_loop_ptr; 628 static int ev_default_loop_ptr;
549 629
550#endif 630#endif
551 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
552/*****************************************************************************/ 644/*****************************************************************************/
553 645
646#ifndef EV_HAVE_EV_TIME
554ev_tstamp 647ev_tstamp
555ev_time (void) 648ev_time (void)
556{ 649{
557#if EV_USE_REALTIME 650#if EV_USE_REALTIME
651 if (expect_true (have_realtime))
652 {
558 struct timespec ts; 653 struct timespec ts;
559 clock_gettime (CLOCK_REALTIME, &ts); 654 clock_gettime (CLOCK_REALTIME, &ts);
560 return ts.tv_sec + ts.tv_nsec * 1e-9; 655 return ts.tv_sec + ts.tv_nsec * 1e-9;
561#else 656 }
657#endif
658
562 struct timeval tv; 659 struct timeval tv;
563 gettimeofday (&tv, 0); 660 gettimeofday (&tv, 0);
564 return tv.tv_sec + tv.tv_usec * 1e-6; 661 return tv.tv_sec + tv.tv_usec * 1e-6;
565#endif
566} 662}
663#endif
567 664
568ev_tstamp inline_size 665inline_size ev_tstamp
569get_clock (void) 666get_clock (void)
570{ 667{
571#if EV_USE_MONOTONIC 668#if EV_USE_MONOTONIC
572 if (expect_true (have_monotonic)) 669 if (expect_true (have_monotonic))
573 { 670 {
… …
607 704
608 tv.tv_sec = (time_t)delay; 705 tv.tv_sec = (time_t)delay;
609 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 706 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
610 707
611 /* 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 */
612 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 709 /* something not guaranteed by newer posix versions, but guaranteed */
613 /* by older ones */ 710 /* by older ones */
614 select (0, 0, 0, 0, &tv); 711 select (0, 0, 0, 0, &tv);
615#endif 712#endif
616 } 713 }
617} 714}
618 715
619/*****************************************************************************/ 716/*****************************************************************************/
620 717
621#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 */
622 719
623int 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
624array_nextsize (int elem, int cur, int cnt) 723array_nextsize (int elem, int cur, int cnt)
625{ 724{
626 int ncur = cur + 1; 725 int ncur = cur + 1;
627 726
628 do 727 do
… …
669 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 768 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
670 } 769 }
671#endif 770#endif
672 771
673#define array_free(stem, idx) \ 772#define array_free(stem, idx) \
674 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
675 774
676/*****************************************************************************/ 775/*****************************************************************************/
776
777/* dummy callback for pending events */
778static void noinline
779pendingcb (EV_P_ ev_prepare *w, int revents)
780{
781}
677 782
678void noinline 783void noinline
679ev_feed_event (EV_P_ void *w, int revents) 784ev_feed_event (EV_P_ void *w, int revents)
680{ 785{
681 W w_ = (W)w; 786 W w_ = (W)w;
… …
690 pendings [pri][w_->pending - 1].w = w_; 795 pendings [pri][w_->pending - 1].w = w_;
691 pendings [pri][w_->pending - 1].events = revents; 796 pendings [pri][w_->pending - 1].events = revents;
692 } 797 }
693} 798}
694 799
695void 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
696queue_events (EV_P_ W *events, int eventcnt, int type) 816queue_events (EV_P_ W *events, int eventcnt, int type)
697{ 817{
698 int i; 818 int i;
699 819
700 for (i = 0; i < eventcnt; ++i) 820 for (i = 0; i < eventcnt; ++i)
701 ev_feed_event (EV_A_ events [i], type); 821 ev_feed_event (EV_A_ events [i], type);
702} 822}
703 823
704/*****************************************************************************/ 824/*****************************************************************************/
705 825
706void inline_speed 826inline_speed void
707fd_event (EV_P_ int fd, int revents) 827fd_event_nc (EV_P_ int fd, int revents)
708{ 828{
709 ANFD *anfd = anfds + fd; 829 ANFD *anfd = anfds + fd;
710 ev_io *w; 830 ev_io *w;
711 831
712 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)
… …
716 if (ev) 836 if (ev)
717 ev_feed_event (EV_A_ (W)w, ev); 837 ev_feed_event (EV_A_ (W)w, ev);
718 } 838 }
719} 839}
720 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
721void 852void
722ev_feed_fd_event (EV_P_ int fd, int revents) 853ev_feed_fd_event (EV_P_ int fd, int revents)
723{ 854{
724 if (fd >= 0 && fd < anfdmax) 855 if (fd >= 0 && fd < anfdmax)
725 fd_event (EV_A_ fd, revents); 856 fd_event_nc (EV_A_ fd, revents);
726} 857}
727 858
728void inline_size 859/* make sure the external fd watch events are in-sync */
860/* with the kernel/libev internal state */
861inline_size void
729fd_reify (EV_P) 862fd_reify (EV_P)
730{ 863{
731 int i; 864 int i;
732 865
733 for (i = 0; i < fdchangecnt; ++i) 866 for (i = 0; i < fdchangecnt; ++i)
… …
748 #ifdef EV_FD_TO_WIN32_HANDLE 881 #ifdef EV_FD_TO_WIN32_HANDLE
749 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 882 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
750 #else 883 #else
751 anfd->handle = _get_osfhandle (fd); 884 anfd->handle = _get_osfhandle (fd);
752 #endif 885 #endif
753 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));
754 } 887 }
755#endif 888#endif
756 889
757 { 890 {
758 unsigned char o_events = anfd->events; 891 unsigned char o_events = anfd->events;
759 unsigned char o_reify = anfd->reify; 892 unsigned char o_reify = anfd->reify;
760 893
761 anfd->reify = 0; 894 anfd->reify = 0;
762 anfd->events = events; 895 anfd->events = events;
763 896
764 if (o_events != events || o_reify & EV_IOFDSET) 897 if (o_events != events || o_reify & EV__IOFDSET)
765 backend_modify (EV_A_ fd, o_events, events); 898 backend_modify (EV_A_ fd, o_events, events);
766 } 899 }
767 } 900 }
768 901
769 fdchangecnt = 0; 902 fdchangecnt = 0;
770} 903}
771 904
772void inline_size 905/* something about the given fd changed */
906inline_size void
773fd_change (EV_P_ int fd, int flags) 907fd_change (EV_P_ int fd, int flags)
774{ 908{
775 unsigned char reify = anfds [fd].reify; 909 unsigned char reify = anfds [fd].reify;
776 anfds [fd].reify |= flags; 910 anfds [fd].reify |= flags;
777 911
… …
781 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 915 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
782 fdchanges [fdchangecnt - 1] = fd; 916 fdchanges [fdchangecnt - 1] = fd;
783 } 917 }
784} 918}
785 919
786void inline_speed 920/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
921inline_speed void
787fd_kill (EV_P_ int fd) 922fd_kill (EV_P_ int fd)
788{ 923{
789 ev_io *w; 924 ev_io *w;
790 925
791 while ((w = (ev_io *)anfds [fd].head)) 926 while ((w = (ev_io *)anfds [fd].head))
… …
793 ev_io_stop (EV_A_ w); 928 ev_io_stop (EV_A_ w);
794 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);
795 } 930 }
796} 931}
797 932
798int inline_size 933/* check whether the given fd is atcually valid, for error recovery */
934inline_size int
799fd_valid (int fd) 935fd_valid (int fd)
800{ 936{
801#ifdef _WIN32 937#ifdef _WIN32
802 return _get_osfhandle (fd) != -1; 938 return _get_osfhandle (fd) != -1;
803#else 939#else
… …
825 961
826 for (fd = anfdmax; fd--; ) 962 for (fd = anfdmax; fd--; )
827 if (anfds [fd].events) 963 if (anfds [fd].events)
828 { 964 {
829 fd_kill (EV_A_ fd); 965 fd_kill (EV_A_ fd);
830 return; 966 break;
831 } 967 }
832} 968}
833 969
834/* 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 */
835static void noinline 971static void noinline
… …
840 for (fd = 0; fd < anfdmax; ++fd) 976 for (fd = 0; fd < anfdmax; ++fd)
841 if (anfds [fd].events) 977 if (anfds [fd].events)
842 { 978 {
843 anfds [fd].events = 0; 979 anfds [fd].events = 0;
844 anfds [fd].emask = 0; 980 anfds [fd].emask = 0;
845 fd_change (EV_A_ fd, EV_IOFDSET | 1); 981 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
846 } 982 }
847} 983}
848 984
849/*****************************************************************************/ 985/*****************************************************************************/
850 986
… …
866#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1002#define HEAP0 (DHEAP - 1) /* index of first element in heap */
867#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1003#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
868#define UPHEAP_DONE(p,k) ((p) == (k)) 1004#define UPHEAP_DONE(p,k) ((p) == (k))
869 1005
870/* away from the root */ 1006/* away from the root */
871void inline_speed 1007inline_speed void
872downheap (ANHE *heap, int N, int k) 1008downheap (ANHE *heap, int N, int k)
873{ 1009{
874 ANHE he = heap [k]; 1010 ANHE he = heap [k];
875 ANHE *E = heap + N + HEAP0; 1011 ANHE *E = heap + N + HEAP0;
876 1012
… …
916#define HEAP0 1 1052#define HEAP0 1
917#define HPARENT(k) ((k) >> 1) 1053#define HPARENT(k) ((k) >> 1)
918#define UPHEAP_DONE(p,k) (!(p)) 1054#define UPHEAP_DONE(p,k) (!(p))
919 1055
920/* away from the root */ 1056/* away from the root */
921void inline_speed 1057inline_speed void
922downheap (ANHE *heap, int N, int k) 1058downheap (ANHE *heap, int N, int k)
923{ 1059{
924 ANHE he = heap [k]; 1060 ANHE he = heap [k];
925 1061
926 for (;;) 1062 for (;;)
927 { 1063 {
928 int c = k << 1; 1064 int c = k << 1;
929 1065
930 if (c > N + HEAP0 - 1) 1066 if (c >= N + HEAP0)
931 break; 1067 break;
932 1068
933 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])
934 ? 1 : 0; 1070 ? 1 : 0;
935 1071
… …
946 ev_active (ANHE_w (he)) = k; 1082 ev_active (ANHE_w (he)) = k;
947} 1083}
948#endif 1084#endif
949 1085
950/* towards the root */ 1086/* towards the root */
951void inline_speed 1087inline_speed void
952upheap (ANHE *heap, int k) 1088upheap (ANHE *heap, int k)
953{ 1089{
954 ANHE he = heap [k]; 1090 ANHE he = heap [k];
955 1091
956 for (;;) 1092 for (;;)
… …
967 1103
968 heap [k] = he; 1104 heap [k] = he;
969 ev_active (ANHE_w (he)) = k; 1105 ev_active (ANHE_w (he)) = k;
970} 1106}
971 1107
972void inline_size 1108/* move an element suitably so it is in a correct place */
1109inline_size void
973adjustheap (ANHE *heap, int N, int k) 1110adjustheap (ANHE *heap, int N, int k)
974{ 1111{
975 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)]))
976 upheap (heap, k); 1113 upheap (heap, k);
977 else 1114 else
978 downheap (heap, N, k); 1115 downheap (heap, N, k);
979} 1116}
980 1117
981/* 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 */
982void inline_size 1119inline_size void
983reheap (ANHE *heap, int N) 1120reheap (ANHE *heap, int N)
984{ 1121{
985 int i; 1122 int i;
986 1123
987 /* 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 */
… …
990 upheap (heap, i + HEAP0); 1127 upheap (heap, i + HEAP0);
991} 1128}
992 1129
993/*****************************************************************************/ 1130/*****************************************************************************/
994 1131
1132/* associate signal watchers to a signal signal */
995typedef struct 1133typedef struct
996{ 1134{
1135 EV_ATOMIC_T pending;
1136#if EV_MULTIPLICITY
1137 EV_P;
1138#endif
997 WL head; 1139 WL head;
998 EV_ATOMIC_T gotsig;
999} ANSIG; 1140} ANSIG;
1000 1141
1001static ANSIG *signals; 1142static ANSIG signals [EV_NSIG - 1];
1002static int signalmax;
1003
1004static EV_ATOMIC_T gotsig;
1005 1143
1006/*****************************************************************************/ 1144/*****************************************************************************/
1007 1145
1008void inline_speed 1146/* used to prepare libev internal fd's */
1147/* this is not fork-safe */
1148inline_speed void
1009fd_intern (int fd) 1149fd_intern (int fd)
1010{ 1150{
1011#ifdef _WIN32 1151#ifdef _WIN32
1012 unsigned long arg = 1; 1152 unsigned long arg = 1;
1013 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1153 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
1018} 1158}
1019 1159
1020static void noinline 1160static void noinline
1021evpipe_init (EV_P) 1161evpipe_init (EV_P)
1022{ 1162{
1023 if (!ev_is_active (&pipeev)) 1163 if (!ev_is_active (&pipe_w))
1024 { 1164 {
1025#if EV_USE_EVENTFD 1165#if EV_USE_EVENTFD
1166 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1167 if (evfd < 0 && errno == EINVAL)
1026 if ((evfd = eventfd (0, 0)) >= 0) 1168 evfd = eventfd (0, 0);
1169
1170 if (evfd >= 0)
1027 { 1171 {
1028 evpipe [0] = -1; 1172 evpipe [0] = -1;
1029 fd_intern (evfd); 1173 fd_intern (evfd); /* doing it twice doesn't hurt */
1030 ev_io_set (&pipeev, evfd, EV_READ); 1174 ev_io_set (&pipe_w, evfd, EV_READ);
1031 } 1175 }
1032 else 1176 else
1033#endif 1177#endif
1034 { 1178 {
1035 while (pipe (evpipe)) 1179 while (pipe (evpipe))
1036 ev_syserr ("(libev) error creating signal/async pipe"); 1180 ev_syserr ("(libev) error creating signal/async pipe");
1037 1181
1038 fd_intern (evpipe [0]); 1182 fd_intern (evpipe [0]);
1039 fd_intern (evpipe [1]); 1183 fd_intern (evpipe [1]);
1040 ev_io_set (&pipeev, evpipe [0], EV_READ); 1184 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1041 } 1185 }
1042 1186
1043 ev_io_start (EV_A_ &pipeev); 1187 ev_io_start (EV_A_ &pipe_w);
1044 ev_unref (EV_A); /* watcher should not keep loop alive */ 1188 ev_unref (EV_A); /* watcher should not keep loop alive */
1045 } 1189 }
1046} 1190}
1047 1191
1048void inline_size 1192inline_size void
1049evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1193evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1050{ 1194{
1051 if (!*flag) 1195 if (!*flag)
1052 { 1196 {
1053 int old_errno = errno; /* save errno because write might clobber it */ 1197 int old_errno = errno; /* save errno because write might clobber it */
… …
1066 1210
1067 errno = old_errno; 1211 errno = old_errno;
1068 } 1212 }
1069} 1213}
1070 1214
1215/* called whenever the libev signal pipe */
1216/* got some events (signal, async) */
1071static void 1217static void
1072pipecb (EV_P_ ev_io *iow, int revents) 1218pipecb (EV_P_ ev_io *iow, int revents)
1073{ 1219{
1220 int i;
1221
1074#if EV_USE_EVENTFD 1222#if EV_USE_EVENTFD
1075 if (evfd >= 0) 1223 if (evfd >= 0)
1076 { 1224 {
1077 uint64_t counter; 1225 uint64_t counter;
1078 read (evfd, &counter, sizeof (uint64_t)); 1226 read (evfd, &counter, sizeof (uint64_t));
… …
1082 { 1230 {
1083 char dummy; 1231 char dummy;
1084 read (evpipe [0], &dummy, 1); 1232 read (evpipe [0], &dummy, 1);
1085 } 1233 }
1086 1234
1087 if (gotsig && ev_is_default_loop (EV_A)) 1235 if (sig_pending)
1088 { 1236 {
1089 int signum; 1237 sig_pending = 0;
1090 gotsig = 0;
1091 1238
1092 for (signum = signalmax; signum--; ) 1239 for (i = EV_NSIG - 1; i--; )
1093 if (signals [signum].gotsig) 1240 if (expect_false (signals [i].pending))
1094 ev_feed_signal_event (EV_A_ signum + 1); 1241 ev_feed_signal_event (EV_A_ i + 1);
1095 } 1242 }
1096 1243
1097#if EV_ASYNC_ENABLE 1244#if EV_ASYNC_ENABLE
1098 if (gotasync) 1245 if (async_pending)
1099 { 1246 {
1100 int i; 1247 async_pending = 0;
1101 gotasync = 0;
1102 1248
1103 for (i = asynccnt; i--; ) 1249 for (i = asynccnt; i--; )
1104 if (asyncs [i]->sent) 1250 if (asyncs [i]->sent)
1105 { 1251 {
1106 asyncs [i]->sent = 0; 1252 asyncs [i]->sent = 0;
… …
1114 1260
1115static void 1261static void
1116ev_sighandler (int signum) 1262ev_sighandler (int signum)
1117{ 1263{
1118#if EV_MULTIPLICITY 1264#if EV_MULTIPLICITY
1119 struct ev_loop *loop = &default_loop_struct; 1265 EV_P = signals [signum - 1].loop;
1120#endif 1266#endif
1121 1267
1122#if _WIN32 1268#if _WIN32
1123 signal (signum, ev_sighandler); 1269 signal (signum, ev_sighandler);
1124#endif 1270#endif
1125 1271
1126 signals [signum - 1].gotsig = 1; 1272 signals [signum - 1].pending = 1;
1127 evpipe_write (EV_A_ &gotsig); 1273 evpipe_write (EV_A_ &sig_pending);
1128} 1274}
1129 1275
1130void noinline 1276void noinline
1131ev_feed_signal_event (EV_P_ int signum) 1277ev_feed_signal_event (EV_P_ int signum)
1132{ 1278{
1133 WL w; 1279 WL w;
1134 1280
1281 if (expect_false (signum <= 0 || signum > EV_NSIG))
1282 return;
1283
1284 --signum;
1285
1135#if EV_MULTIPLICITY 1286#if EV_MULTIPLICITY
1136 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 */
1137#endif 1288 /* or, likely more useful, feeding a signal nobody is waiting for */
1138 1289
1139 --signum; 1290 if (expect_false (signals [signum].loop != EV_A))
1140
1141 if (signum < 0 || signum >= signalmax)
1142 return; 1291 return;
1292#endif
1143 1293
1144 signals [signum].gotsig = 0; 1294 signals [signum].pending = 0;
1145 1295
1146 for (w = signals [signum].head; w; w = w->next) 1296 for (w = signals [signum].head; w; w = w->next)
1147 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1297 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1148} 1298}
1149 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
1150/*****************************************************************************/ 1320/*****************************************************************************/
1151 1321
1152static WL childs [EV_PID_HASHSIZE]; 1322static WL childs [EV_PID_HASHSIZE];
1153 1323
1154#ifndef _WIN32 1324#ifndef _WIN32
… …
1157 1327
1158#ifndef WIFCONTINUED 1328#ifndef WIFCONTINUED
1159# define WIFCONTINUED(status) 0 1329# define WIFCONTINUED(status) 0
1160#endif 1330#endif
1161 1331
1162void inline_speed 1332/* handle a single child status event */
1333inline_speed void
1163child_reap (EV_P_ int chain, int pid, int status) 1334child_reap (EV_P_ int chain, int pid, int status)
1164{ 1335{
1165 ev_child *w; 1336 ev_child *w;
1166 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1337 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1167 1338
… …
1180 1351
1181#ifndef WCONTINUED 1352#ifndef WCONTINUED
1182# define WCONTINUED 0 1353# define WCONTINUED 0
1183#endif 1354#endif
1184 1355
1356/* called on sigchld etc., calls waitpid */
1185static void 1357static void
1186childcb (EV_P_ ev_signal *sw, int revents) 1358childcb (EV_P_ ev_signal *sw, int revents)
1187{ 1359{
1188 int pid, status; 1360 int pid, status;
1189 1361
… …
1270 /* kqueue is borked on everything but netbsd apparently */ 1442 /* kqueue is borked on everything but netbsd apparently */
1271 /* 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 */
1272 flags &= ~EVBACKEND_KQUEUE; 1444 flags &= ~EVBACKEND_KQUEUE;
1273#endif 1445#endif
1274#ifdef __APPLE__ 1446#ifdef __APPLE__
1275 // flags &= ~EVBACKEND_KQUEUE; for documentation 1447 /* only select works correctly on that "unix-certified" platform */
1276 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 */
1277#endif 1450#endif
1278 1451
1279 return flags; 1452 return flags;
1280} 1453}
1281 1454
… …
1295ev_backend (EV_P) 1468ev_backend (EV_P)
1296{ 1469{
1297 return backend; 1470 return backend;
1298} 1471}
1299 1472
1473#if EV_MINIMAL < 2
1300unsigned int 1474unsigned int
1301ev_loop_count (EV_P) 1475ev_loop_count (EV_P)
1302{ 1476{
1303 return loop_count; 1477 return loop_count;
1304} 1478}
1305 1479
1480unsigned int
1481ev_loop_depth (EV_P)
1482{
1483 return loop_depth;
1484}
1485
1306void 1486void
1307ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1487ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1308{ 1488{
1309 io_blocktime = interval; 1489 io_blocktime = interval;
1310} 1490}
… …
1313ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1493ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1314{ 1494{
1315 timeout_blocktime = interval; 1495 timeout_blocktime = interval;
1316} 1496}
1317 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 */
1318static void noinline 1523static void noinline
1319loop_init (EV_P_ unsigned int flags) 1524loop_init (EV_P_ unsigned int flags)
1320{ 1525{
1321 if (!backend) 1526 if (!backend)
1322 { 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
1323#if EV_USE_MONOTONIC 1538#if EV_USE_MONOTONIC
1539 if (!have_monotonic)
1324 { 1540 {
1325 struct timespec ts; 1541 struct timespec ts;
1542
1326 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1543 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1327 have_monotonic = 1; 1544 have_monotonic = 1;
1328 } 1545 }
1329#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"));
1330 1558
1331 ev_rt_now = ev_time (); 1559 ev_rt_now = ev_time ();
1332 mn_now = get_clock (); 1560 mn_now = get_clock ();
1333 now_floor = mn_now; 1561 now_floor = mn_now;
1334 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
1335 1566
1336 io_blocktime = 0.; 1567 io_blocktime = 0.;
1337 timeout_blocktime = 0.; 1568 timeout_blocktime = 0.;
1338 backend = 0; 1569 backend = 0;
1339 backend_fd = -1; 1570 backend_fd = -1;
1340 gotasync = 0; 1571 sig_pending = 0;
1572#if EV_ASYNC_ENABLE
1573 async_pending = 0;
1574#endif
1341#if EV_USE_INOTIFY 1575#if EV_USE_INOTIFY
1342 fs_fd = -2; 1576 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1343#endif 1577#endif
1344 1578#if EV_USE_SIGNALFD
1345 /* pid check not overridable via env */ 1579 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1346#ifndef _WIN32
1347 if (flags & EVFLAG_FORKCHECK)
1348 curpid = getpid ();
1349#endif 1580#endif
1350
1351 if (!(flags & EVFLAG_NOENV)
1352 && !enable_secure ()
1353 && getenv ("LIBEV_FLAGS"))
1354 flags = atoi (getenv ("LIBEV_FLAGS"));
1355 1581
1356 if (!(flags & 0x0000ffffU)) 1582 if (!(flags & 0x0000ffffU))
1357 flags |= ev_recommended_backends (); 1583 flags |= ev_recommended_backends ();
1358 1584
1359#if EV_USE_PORT 1585#if EV_USE_PORT
… …
1370#endif 1596#endif
1371#if EV_USE_SELECT 1597#if EV_USE_SELECT
1372 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1598 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1373#endif 1599#endif
1374 1600
1601 ev_prepare_init (&pending_w, pendingcb);
1602
1375 ev_init (&pipeev, pipecb); 1603 ev_init (&pipe_w, pipecb);
1376 ev_set_priority (&pipeev, EV_MAXPRI); 1604 ev_set_priority (&pipe_w, EV_MAXPRI);
1377 } 1605 }
1378} 1606}
1379 1607
1608/* free up a loop structure */
1380static void noinline 1609static void noinline
1381loop_destroy (EV_P) 1610loop_destroy (EV_P)
1382{ 1611{
1383 int i; 1612 int i;
1384 1613
1385 if (ev_is_active (&pipeev)) 1614 if (ev_is_active (&pipe_w))
1386 { 1615 {
1387 ev_ref (EV_A); /* signal watcher */ 1616 /*ev_ref (EV_A);*/
1388 ev_io_stop (EV_A_ &pipeev); 1617 /*ev_io_stop (EV_A_ &pipe_w);*/
1389 1618
1390#if EV_USE_EVENTFD 1619#if EV_USE_EVENTFD
1391 if (evfd >= 0) 1620 if (evfd >= 0)
1392 close (evfd); 1621 close (evfd);
1393#endif 1622#endif
… …
1397 close (evpipe [0]); 1626 close (evpipe [0]);
1398 close (evpipe [1]); 1627 close (evpipe [1]);
1399 } 1628 }
1400 } 1629 }
1401 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
1402#if EV_USE_INOTIFY 1641#if EV_USE_INOTIFY
1403 if (fs_fd >= 0) 1642 if (fs_fd >= 0)
1404 close (fs_fd); 1643 close (fs_fd);
1405#endif 1644#endif
1406 1645
… …
1429#if EV_IDLE_ENABLE 1668#if EV_IDLE_ENABLE
1430 array_free (idle, [i]); 1669 array_free (idle, [i]);
1431#endif 1670#endif
1432 } 1671 }
1433 1672
1434 ev_free (anfds); anfdmax = 0; 1673 ev_free (anfds); anfds = 0; anfdmax = 0;
1435 1674
1436 /* 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);
1437 array_free (fdchange, EMPTY); 1677 array_free (fdchange, EMPTY);
1438 array_free (timer, EMPTY); 1678 array_free (timer, EMPTY);
1439#if EV_PERIODIC_ENABLE 1679#if EV_PERIODIC_ENABLE
1440 array_free (periodic, EMPTY); 1680 array_free (periodic, EMPTY);
1441#endif 1681#endif
… …
1450 1690
1451 backend = 0; 1691 backend = 0;
1452} 1692}
1453 1693
1454#if EV_USE_INOTIFY 1694#if EV_USE_INOTIFY
1455void inline_size infy_fork (EV_P); 1695inline_size void infy_fork (EV_P);
1456#endif 1696#endif
1457 1697
1458void inline_size 1698inline_size void
1459loop_fork (EV_P) 1699loop_fork (EV_P)
1460{ 1700{
1461#if EV_USE_PORT 1701#if EV_USE_PORT
1462 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1702 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1463#endif 1703#endif
… …
1469#endif 1709#endif
1470#if EV_USE_INOTIFY 1710#if EV_USE_INOTIFY
1471 infy_fork (EV_A); 1711 infy_fork (EV_A);
1472#endif 1712#endif
1473 1713
1474 if (ev_is_active (&pipeev)) 1714 if (ev_is_active (&pipe_w))
1475 { 1715 {
1476 /* this "locks" the handlers against writing to the pipe */ 1716 /* this "locks" the handlers against writing to the pipe */
1477 /* while we modify the fd vars */ 1717 /* while we modify the fd vars */
1478 gotsig = 1; 1718 sig_pending = 1;
1479#if EV_ASYNC_ENABLE 1719#if EV_ASYNC_ENABLE
1480 gotasync = 1; 1720 async_pending = 1;
1481#endif 1721#endif
1482 1722
1483 ev_ref (EV_A); 1723 ev_ref (EV_A);
1484 ev_io_stop (EV_A_ &pipeev); 1724 ev_io_stop (EV_A_ &pipe_w);
1485 1725
1486#if EV_USE_EVENTFD 1726#if EV_USE_EVENTFD
1487 if (evfd >= 0) 1727 if (evfd >= 0)
1488 close (evfd); 1728 close (evfd);
1489#endif 1729#endif
… …
1494 close (evpipe [1]); 1734 close (evpipe [1]);
1495 } 1735 }
1496 1736
1497 evpipe_init (EV_A); 1737 evpipe_init (EV_A);
1498 /* now iterate over everything, in case we missed something */ 1738 /* now iterate over everything, in case we missed something */
1499 pipecb (EV_A_ &pipeev, EV_READ); 1739 pipecb (EV_A_ &pipe_w, EV_READ);
1500 } 1740 }
1501 1741
1502 postfork = 0; 1742 postfork = 0;
1503} 1743}
1504 1744
1505#if EV_MULTIPLICITY 1745#if EV_MULTIPLICITY
1506 1746
1507struct ev_loop * 1747struct ev_loop *
1508ev_loop_new (unsigned int flags) 1748ev_loop_new (unsigned int flags)
1509{ 1749{
1510 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));
1511 1751
1512 memset (loop, 0, sizeof (struct ev_loop)); 1752 memset (EV_A, 0, sizeof (struct ev_loop));
1513
1514 loop_init (EV_A_ flags); 1753 loop_init (EV_A_ flags);
1515 1754
1516 if (ev_backend (EV_A)) 1755 if (ev_backend (EV_A))
1517 return loop; 1756 return EV_A;
1518 1757
1519 return 0; 1758 return 0;
1520} 1759}
1521 1760
1522void 1761void
… …
1529void 1768void
1530ev_loop_fork (EV_P) 1769ev_loop_fork (EV_P)
1531{ 1770{
1532 postfork = 1; /* must be in line with ev_default_fork */ 1771 postfork = 1; /* must be in line with ev_default_fork */
1533} 1772}
1773#endif /* multiplicity */
1534 1774
1535#if EV_VERIFY 1775#if EV_VERIFY
1536static void noinline 1776static void noinline
1537verify_watcher (EV_P_ W w) 1777verify_watcher (EV_P_ W w)
1538{ 1778{
1539 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1779 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1540 1780
1541 if (w->pending) 1781 if (w->pending)
1542 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));
1543} 1783}
1544 1784
1545static void noinline 1785static void noinline
1546verify_heap (EV_P_ ANHE *heap, int N) 1786verify_heap (EV_P_ ANHE *heap, int N)
1547{ 1787{
1548 int i; 1788 int i;
1549 1789
1550 for (i = HEAP0; i < N + HEAP0; ++i) 1790 for (i = HEAP0; i < N + HEAP0; ++i)
1551 { 1791 {
1552 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));
1553 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])));
1554 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]))));
1555 1795
1556 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1796 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1557 } 1797 }
1558} 1798}
1559 1799
1560static void noinline 1800static void noinline
1561array_verify (EV_P_ W *ws, int cnt) 1801array_verify (EV_P_ W *ws, int cnt)
1562{ 1802{
1563 while (cnt--) 1803 while (cnt--)
1564 { 1804 {
1565 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1805 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1566 verify_watcher (EV_A_ ws [cnt]); 1806 verify_watcher (EV_A_ ws [cnt]);
1567 } 1807 }
1568} 1808}
1569#endif 1809#endif
1570 1810
1811#if EV_MINIMAL < 2
1571void 1812void
1572ev_loop_verify (EV_P) 1813ev_loop_verify (EV_P)
1573{ 1814{
1574#if EV_VERIFY 1815#if EV_VERIFY
1575 int i; 1816 int i;
… …
1577 1818
1578 assert (activecnt >= -1); 1819 assert (activecnt >= -1);
1579 1820
1580 assert (fdchangemax >= fdchangecnt); 1821 assert (fdchangemax >= fdchangecnt);
1581 for (i = 0; i < fdchangecnt; ++i) 1822 for (i = 0; i < fdchangecnt; ++i)
1582 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1823 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1583 1824
1584 assert (anfdmax >= 0); 1825 assert (anfdmax >= 0);
1585 for (i = 0; i < anfdmax; ++i) 1826 for (i = 0; i < anfdmax; ++i)
1586 for (w = anfds [i].head; w; w = w->next) 1827 for (w = anfds [i].head; w; w = w->next)
1587 { 1828 {
1588 verify_watcher (EV_A_ (W)w); 1829 verify_watcher (EV_A_ (W)w);
1589 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1830 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1590 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));
1591 } 1832 }
1592 1833
1593 assert (timermax >= timercnt); 1834 assert (timermax >= timercnt);
1594 verify_heap (EV_A_ timers, timercnt); 1835 verify_heap (EV_A_ timers, timercnt);
1595 1836
… …
1624 assert (checkmax >= checkcnt); 1865 assert (checkmax >= checkcnt);
1625 array_verify (EV_A_ (W *)checks, checkcnt); 1866 array_verify (EV_A_ (W *)checks, checkcnt);
1626 1867
1627# if 0 1868# if 0
1628 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)
1629 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1870 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1630# endif 1871# endif
1631#endif 1872#endif
1632} 1873}
1633 1874#endif
1634#endif /* multiplicity */
1635 1875
1636#if EV_MULTIPLICITY 1876#if EV_MULTIPLICITY
1637struct ev_loop * 1877struct ev_loop *
1638ev_default_loop_init (unsigned int flags) 1878ev_default_loop_init (unsigned int flags)
1639#else 1879#else
… …
1642#endif 1882#endif
1643{ 1883{
1644 if (!ev_default_loop_ptr) 1884 if (!ev_default_loop_ptr)
1645 { 1885 {
1646#if EV_MULTIPLICITY 1886#if EV_MULTIPLICITY
1647 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1887 EV_P = ev_default_loop_ptr = &default_loop_struct;
1648#else 1888#else
1649 ev_default_loop_ptr = 1; 1889 ev_default_loop_ptr = 1;
1650#endif 1890#endif
1651 1891
1652 loop_init (EV_A_ flags); 1892 loop_init (EV_A_ flags);
… …
1669 1909
1670void 1910void
1671ev_default_destroy (void) 1911ev_default_destroy (void)
1672{ 1912{
1673#if EV_MULTIPLICITY 1913#if EV_MULTIPLICITY
1674 struct ev_loop *loop = ev_default_loop_ptr; 1914 EV_P = ev_default_loop_ptr;
1675#endif 1915#endif
1676 1916
1677 ev_default_loop_ptr = 0; 1917 ev_default_loop_ptr = 0;
1678 1918
1679#ifndef _WIN32 1919#ifndef _WIN32
… …
1686 1926
1687void 1927void
1688ev_default_fork (void) 1928ev_default_fork (void)
1689{ 1929{
1690#if EV_MULTIPLICITY 1930#if EV_MULTIPLICITY
1691 struct ev_loop *loop = ev_default_loop_ptr; 1931 EV_P = ev_default_loop_ptr;
1692#endif 1932#endif
1693 1933
1694 postfork = 1; /* must be in line with ev_loop_fork */ 1934 postfork = 1; /* must be in line with ev_loop_fork */
1695} 1935}
1696 1936
… …
1700ev_invoke (EV_P_ void *w, int revents) 1940ev_invoke (EV_P_ void *w, int revents)
1701{ 1941{
1702 EV_CB_INVOKE ((W)w, revents); 1942 EV_CB_INVOKE ((W)w, revents);
1703} 1943}
1704 1944
1705void inline_speed 1945unsigned int
1706call_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)
1707{ 1959{
1708 int pri; 1960 int pri;
1709 1961
1710 for (pri = NUMPRI; pri--; ) 1962 for (pri = NUMPRI; pri--; )
1711 while (pendingcnt [pri]) 1963 while (pendingcnt [pri])
1712 { 1964 {
1713 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1965 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1714 1966
1715 if (expect_true (p->w))
1716 {
1717 /*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 */
1718 1969
1719 p->w->pending = 0; 1970 p->w->pending = 0;
1720 EV_CB_INVOKE (p->w, p->events); 1971 EV_CB_INVOKE (p->w, p->events);
1721 EV_FREQUENT_CHECK; 1972 EV_FREQUENT_CHECK;
1722 }
1723 } 1973 }
1724} 1974}
1725 1975
1726#if EV_IDLE_ENABLE 1976#if EV_IDLE_ENABLE
1727void inline_size 1977/* make idle watchers pending. this handles the "call-idle */
1978/* only when higher priorities are idle" logic */
1979inline_size void
1728idle_reify (EV_P) 1980idle_reify (EV_P)
1729{ 1981{
1730 if (expect_false (idleall)) 1982 if (expect_false (idleall))
1731 { 1983 {
1732 int pri; 1984 int pri;
… …
1744 } 1996 }
1745 } 1997 }
1746} 1998}
1747#endif 1999#endif
1748 2000
1749void inline_size 2001/* make timers pending */
2002inline_size void
1750timers_reify (EV_P) 2003timers_reify (EV_P)
1751{ 2004{
1752 EV_FREQUENT_CHECK; 2005 EV_FREQUENT_CHECK;
1753 2006
1754 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2007 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1755 { 2008 {
1756 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2009 do
1757
1758 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1759
1760 /* first reschedule or stop timer */
1761 if (w->repeat)
1762 { 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 {
1763 ev_at (w) += w->repeat; 2018 ev_at (w) += w->repeat;
1764 if (ev_at (w) < mn_now) 2019 if (ev_at (w) < mn_now)
1765 ev_at (w) = mn_now; 2020 ev_at (w) = mn_now;
1766 2021
1767 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.));
1768 2023
1769 ANHE_at_cache (timers [HEAP0]); 2024 ANHE_at_cache (timers [HEAP0]);
1770 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);
1771 } 2032 }
1772 else 2033 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1773 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1774 2034
1775 EV_FREQUENT_CHECK;
1776 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2035 feed_reverse_done (EV_A_ EV_TIMEOUT);
1777 } 2036 }
1778} 2037}
1779 2038
1780#if EV_PERIODIC_ENABLE 2039#if EV_PERIODIC_ENABLE
1781void inline_size 2040/* make periodics pending */
2041inline_size void
1782periodics_reify (EV_P) 2042periodics_reify (EV_P)
1783{ 2043{
1784 EV_FREQUENT_CHECK; 2044 EV_FREQUENT_CHECK;
1785 2045
1786 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2046 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1787 { 2047 {
1788 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2048 int feed_count = 0;
1789 2049
1790 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2050 do
1791
1792 /* first reschedule or stop timer */
1793 if (w->reschedule_cb)
1794 { 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 {
1795 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2059 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1796 2060
1797 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));
1798 2062
1799 ANHE_at_cache (periodics [HEAP0]); 2063 ANHE_at_cache (periodics [HEAP0]);
1800 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);
1801 } 2090 }
1802 else if (w->interval) 2091 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1803 {
1804 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1805 /* if next trigger time is not sufficiently in the future, put it there */
1806 /* this might happen because of floating point inexactness */
1807 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1808 {
1809 ev_at (w) += w->interval;
1810 2092
1811 /* if interval is unreasonably low we might still have a time in the past */
1812 /* so correct this. this will make the periodic very inexact, but the user */
1813 /* has effectively asked to get triggered more often than possible */
1814 if (ev_at (w) < ev_rt_now)
1815 ev_at (w) = ev_rt_now;
1816 }
1817
1818 ANHE_at_cache (periodics [HEAP0]);
1819 downheap (periodics, periodiccnt, HEAP0);
1820 }
1821 else
1822 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1823
1824 EV_FREQUENT_CHECK;
1825 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2093 feed_reverse_done (EV_A_ EV_PERIODIC);
1826 } 2094 }
1827} 2095}
1828 2096
2097/* simply recalculate all periodics */
2098/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1829static void noinline 2099static void noinline
1830periodics_reschedule (EV_P) 2100periodics_reschedule (EV_P)
1831{ 2101{
1832 int i; 2102 int i;
1833 2103
… …
1846 2116
1847 reheap (periodics, periodiccnt); 2117 reheap (periodics, periodiccnt);
1848} 2118}
1849#endif 2119#endif
1850 2120
1851void 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
1852time_update (EV_P_ ev_tstamp max_block) 2138time_update (EV_P_ ev_tstamp max_block)
1853{ 2139{
1854 int i;
1855
1856#if EV_USE_MONOTONIC 2140#if EV_USE_MONOTONIC
1857 if (expect_true (have_monotonic)) 2141 if (expect_true (have_monotonic))
1858 { 2142 {
2143 int i;
1859 ev_tstamp odiff = rtmn_diff; 2144 ev_tstamp odiff = rtmn_diff;
1860 2145
1861 mn_now = get_clock (); 2146 mn_now = get_clock ();
1862 2147
1863 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2148 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1889 ev_rt_now = ev_time (); 2174 ev_rt_now = ev_time ();
1890 mn_now = get_clock (); 2175 mn_now = get_clock ();
1891 now_floor = mn_now; 2176 now_floor = mn_now;
1892 } 2177 }
1893 2178
2179 /* no timer adjustment, as the monotonic clock doesn't jump */
2180 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1894# if EV_PERIODIC_ENABLE 2181# if EV_PERIODIC_ENABLE
1895 periodics_reschedule (EV_A); 2182 periodics_reschedule (EV_A);
1896# endif 2183# endif
1897 /* no timer adjustment, as the monotonic clock doesn't jump */
1898 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1899 } 2184 }
1900 else 2185 else
1901#endif 2186#endif
1902 { 2187 {
1903 ev_rt_now = ev_time (); 2188 ev_rt_now = ev_time ();
1904 2189
1905 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))
1906 { 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);
1907#if EV_PERIODIC_ENABLE 2194#if EV_PERIODIC_ENABLE
1908 periodics_reschedule (EV_A); 2195 periodics_reschedule (EV_A);
1909#endif 2196#endif
1910 /* adjust timers. this is easy, as the offset is the same for all of them */
1911 for (i = 0; i < timercnt; ++i)
1912 {
1913 ANHE *he = timers + i + HEAP0;
1914 ANHE_w (*he)->at += ev_rt_now - mn_now;
1915 ANHE_at_cache (*he);
1916 }
1917 } 2197 }
1918 2198
1919 mn_now = ev_rt_now; 2199 mn_now = ev_rt_now;
1920 } 2200 }
1921} 2201}
1922 2202
1923void 2203void
1924ev_ref (EV_P)
1925{
1926 ++activecnt;
1927}
1928
1929void
1930ev_unref (EV_P)
1931{
1932 --activecnt;
1933}
1934
1935void
1936ev_now_update (EV_P)
1937{
1938 time_update (EV_A_ 1e100);
1939}
1940
1941static int loop_done;
1942
1943void
1944ev_loop (EV_P_ int flags) 2204ev_loop (EV_P_ int flags)
1945{ 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
1946 loop_done = EVUNLOOP_CANCEL; 2212 loop_done = EVUNLOOP_CANCEL;
1947 2213
1948 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 */
1949 2215
1950 do 2216 do
1951 { 2217 {
1952#if EV_VERIFY >= 2 2218#if EV_VERIFY >= 2
1953 ev_loop_verify (EV_A); 2219 ev_loop_verify (EV_A);
… …
1966 /* we might have forked, so queue fork handlers */ 2232 /* we might have forked, so queue fork handlers */
1967 if (expect_false (postfork)) 2233 if (expect_false (postfork))
1968 if (forkcnt) 2234 if (forkcnt)
1969 { 2235 {
1970 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2236 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1971 call_pending (EV_A); 2237 EV_INVOKE_PENDING;
1972 } 2238 }
1973#endif 2239#endif
1974 2240
1975 /* queue prepare watchers (and execute them) */ 2241 /* queue prepare watchers (and execute them) */
1976 if (expect_false (preparecnt)) 2242 if (expect_false (preparecnt))
1977 { 2243 {
1978 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2244 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1979 call_pending (EV_A); 2245 EV_INVOKE_PENDING;
1980 } 2246 }
1981 2247
1982 if (expect_false (!activecnt)) 2248 if (expect_false (loop_done))
1983 break; 2249 break;
1984 2250
1985 /* we might have forked, so reify kernel state if necessary */ 2251 /* we might have forked, so reify kernel state if necessary */
1986 if (expect_false (postfork)) 2252 if (expect_false (postfork))
1987 loop_fork (EV_A); 2253 loop_fork (EV_A);
… …
1994 ev_tstamp waittime = 0.; 2260 ev_tstamp waittime = 0.;
1995 ev_tstamp sleeptime = 0.; 2261 ev_tstamp sleeptime = 0.;
1996 2262
1997 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2263 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1998 { 2264 {
2265 /* remember old timestamp for io_blocktime calculation */
2266 ev_tstamp prev_mn_now = mn_now;
2267
1999 /* update time to cancel out callback processing overhead */ 2268 /* update time to cancel out callback processing overhead */
2000 time_update (EV_A_ 1e100); 2269 time_update (EV_A_ 1e100);
2001 2270
2002 waittime = MAX_BLOCKTIME; 2271 waittime = MAX_BLOCKTIME;
2003 2272
… …
2013 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;
2014 if (waittime > to) waittime = to; 2283 if (waittime > to) waittime = to;
2015 } 2284 }
2016#endif 2285#endif
2017 2286
2287 /* don't let timeouts decrease the waittime below timeout_blocktime */
2018 if (expect_false (waittime < timeout_blocktime)) 2288 if (expect_false (waittime < timeout_blocktime))
2019 waittime = timeout_blocktime; 2289 waittime = timeout_blocktime;
2020 2290
2021 sleeptime = waittime - backend_fudge; 2291 /* extra check because io_blocktime is commonly 0 */
2022
2023 if (expect_true (sleeptime > io_blocktime)) 2292 if (expect_false (io_blocktime))
2024 sleeptime = io_blocktime;
2025
2026 if (sleeptime)
2027 { 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 {
2028 ev_sleep (sleeptime); 2301 ev_sleep (sleeptime);
2029 waittime -= sleeptime; 2302 waittime -= sleeptime;
2303 }
2030 } 2304 }
2031 } 2305 }
2032 2306
2307#if EV_MINIMAL < 2
2033 ++loop_count; 2308 ++loop_count;
2309#endif
2310 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2034 backend_poll (EV_A_ waittime); 2311 backend_poll (EV_A_ waittime);
2312 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2035 2313
2036 /* update ev_rt_now, do magic */ 2314 /* update ev_rt_now, do magic */
2037 time_update (EV_A_ waittime + sleeptime); 2315 time_update (EV_A_ waittime + sleeptime);
2038 } 2316 }
2039 2317
… …
2050 2328
2051 /* queue check watchers, to be executed first */ 2329 /* queue check watchers, to be executed first */
2052 if (expect_false (checkcnt)) 2330 if (expect_false (checkcnt))
2053 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2331 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2054 2332
2055 call_pending (EV_A); 2333 EV_INVOKE_PENDING;
2056 } 2334 }
2057 while (expect_true ( 2335 while (expect_true (
2058 activecnt 2336 activecnt
2059 && !loop_done 2337 && !loop_done
2060 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2338 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2061 )); 2339 ));
2062 2340
2063 if (loop_done == EVUNLOOP_ONE) 2341 if (loop_done == EVUNLOOP_ONE)
2064 loop_done = EVUNLOOP_CANCEL; 2342 loop_done = EVUNLOOP_CANCEL;
2343
2344#if EV_MINIMAL < 2
2345 --loop_depth;
2346#endif
2065} 2347}
2066 2348
2067void 2349void
2068ev_unloop (EV_P_ int how) 2350ev_unloop (EV_P_ int how)
2069{ 2351{
2070 loop_done = how; 2352 loop_done = how;
2071} 2353}
2072 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
2073/*****************************************************************************/ 2392/*****************************************************************************/
2393/* singly-linked list management, used when the expected list length is short */
2074 2394
2075void inline_size 2395inline_size void
2076wlist_add (WL *head, WL elem) 2396wlist_add (WL *head, WL elem)
2077{ 2397{
2078 elem->next = *head; 2398 elem->next = *head;
2079 *head = elem; 2399 *head = elem;
2080} 2400}
2081 2401
2082void inline_size 2402inline_size void
2083wlist_del (WL *head, WL elem) 2403wlist_del (WL *head, WL elem)
2084{ 2404{
2085 while (*head) 2405 while (*head)
2086 { 2406 {
2087 if (*head == elem) 2407 if (expect_true (*head == elem))
2088 { 2408 {
2089 *head = elem->next; 2409 *head = elem->next;
2090 return; 2410 break;
2091 } 2411 }
2092 2412
2093 head = &(*head)->next; 2413 head = &(*head)->next;
2094 } 2414 }
2095} 2415}
2096 2416
2097void inline_speed 2417/* internal, faster, version of ev_clear_pending */
2418inline_speed void
2098clear_pending (EV_P_ W w) 2419clear_pending (EV_P_ W w)
2099{ 2420{
2100 if (w->pending) 2421 if (w->pending)
2101 { 2422 {
2102 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2423 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2103 w->pending = 0; 2424 w->pending = 0;
2104 } 2425 }
2105} 2426}
2106 2427
2107int 2428int
… …
2111 int pending = w_->pending; 2432 int pending = w_->pending;
2112 2433
2113 if (expect_true (pending)) 2434 if (expect_true (pending))
2114 { 2435 {
2115 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2436 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2437 p->w = (W)&pending_w;
2116 w_->pending = 0; 2438 w_->pending = 0;
2117 p->w = 0;
2118 return p->events; 2439 return p->events;
2119 } 2440 }
2120 else 2441 else
2121 return 0; 2442 return 0;
2122} 2443}
2123 2444
2124void inline_size 2445inline_size void
2125pri_adjust (EV_P_ W w) 2446pri_adjust (EV_P_ W w)
2126{ 2447{
2127 int pri = w->priority; 2448 int pri = ev_priority (w);
2128 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2449 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2129 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2450 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2130 w->priority = pri; 2451 ev_set_priority (w, pri);
2131} 2452}
2132 2453
2133void inline_speed 2454inline_speed void
2134ev_start (EV_P_ W w, int active) 2455ev_start (EV_P_ W w, int active)
2135{ 2456{
2136 pri_adjust (EV_A_ w); 2457 pri_adjust (EV_A_ w);
2137 w->active = active; 2458 w->active = active;
2138 ev_ref (EV_A); 2459 ev_ref (EV_A);
2139} 2460}
2140 2461
2141void inline_size 2462inline_size void
2142ev_stop (EV_P_ W w) 2463ev_stop (EV_P_ W w)
2143{ 2464{
2144 ev_unref (EV_A); 2465 ev_unref (EV_A);
2145 w->active = 0; 2466 w->active = 0;
2146} 2467}
… …
2153 int fd = w->fd; 2474 int fd = w->fd;
2154 2475
2155 if (expect_false (ev_is_active (w))) 2476 if (expect_false (ev_is_active (w)))
2156 return; 2477 return;
2157 2478
2158 assert (("ev_io_start called with negative fd", fd >= 0)); 2479 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2159 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE)))); 2480 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2160 2481
2161 EV_FREQUENT_CHECK; 2482 EV_FREQUENT_CHECK;
2162 2483
2163 ev_start (EV_A_ (W)w, 1); 2484 ev_start (EV_A_ (W)w, 1);
2164 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2485 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2165 wlist_add (&anfds[fd].head, (WL)w); 2486 wlist_add (&anfds[fd].head, (WL)w);
2166 2487
2167 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2488 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2168 w->events &= ~EV_IOFDSET; 2489 w->events &= ~EV__IOFDSET;
2169 2490
2170 EV_FREQUENT_CHECK; 2491 EV_FREQUENT_CHECK;
2171} 2492}
2172 2493
2173void noinline 2494void noinline
… …
2175{ 2496{
2176 clear_pending (EV_A_ (W)w); 2497 clear_pending (EV_A_ (W)w);
2177 if (expect_false (!ev_is_active (w))) 2498 if (expect_false (!ev_is_active (w)))
2178 return; 2499 return;
2179 2500
2180 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));
2181 2502
2182 EV_FREQUENT_CHECK; 2503 EV_FREQUENT_CHECK;
2183 2504
2184 wlist_del (&anfds[w->fd].head, (WL)w); 2505 wlist_del (&anfds[w->fd].head, (WL)w);
2185 ev_stop (EV_A_ (W)w); 2506 ev_stop (EV_A_ (W)w);
… …
2195 if (expect_false (ev_is_active (w))) 2516 if (expect_false (ev_is_active (w)))
2196 return; 2517 return;
2197 2518
2198 ev_at (w) += mn_now; 2519 ev_at (w) += mn_now;
2199 2520
2200 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.));
2201 2522
2202 EV_FREQUENT_CHECK; 2523 EV_FREQUENT_CHECK;
2203 2524
2204 ++timercnt; 2525 ++timercnt;
2205 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2526 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2208 ANHE_at_cache (timers [ev_active (w)]); 2529 ANHE_at_cache (timers [ev_active (w)]);
2209 upheap (timers, ev_active (w)); 2530 upheap (timers, ev_active (w));
2210 2531
2211 EV_FREQUENT_CHECK; 2532 EV_FREQUENT_CHECK;
2212 2533
2213 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2534 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2214} 2535}
2215 2536
2216void noinline 2537void noinline
2217ev_timer_stop (EV_P_ ev_timer *w) 2538ev_timer_stop (EV_P_ ev_timer *w)
2218{ 2539{
… …
2223 EV_FREQUENT_CHECK; 2544 EV_FREQUENT_CHECK;
2224 2545
2225 { 2546 {
2226 int active = ev_active (w); 2547 int active = ev_active (w);
2227 2548
2228 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2549 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2229 2550
2230 --timercnt; 2551 --timercnt;
2231 2552
2232 if (expect_true (active < timercnt + HEAP0)) 2553 if (expect_true (active < timercnt + HEAP0))
2233 { 2554 {
… …
2266 } 2587 }
2267 2588
2268 EV_FREQUENT_CHECK; 2589 EV_FREQUENT_CHECK;
2269} 2590}
2270 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
2271#if EV_PERIODIC_ENABLE 2598#if EV_PERIODIC_ENABLE
2272void noinline 2599void noinline
2273ev_periodic_start (EV_P_ ev_periodic *w) 2600ev_periodic_start (EV_P_ ev_periodic *w)
2274{ 2601{
2275 if (expect_false (ev_is_active (w))) 2602 if (expect_false (ev_is_active (w)))
… …
2277 2604
2278 if (w->reschedule_cb) 2605 if (w->reschedule_cb)
2279 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2606 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2280 else if (w->interval) 2607 else if (w->interval)
2281 { 2608 {
2282 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.));
2283 /* 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 */
2284 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;
2285 } 2612 }
2286 else 2613 else
2287 ev_at (w) = w->offset; 2614 ev_at (w) = w->offset;
… …
2295 ANHE_at_cache (periodics [ev_active (w)]); 2622 ANHE_at_cache (periodics [ev_active (w)]);
2296 upheap (periodics, ev_active (w)); 2623 upheap (periodics, ev_active (w));
2297 2624
2298 EV_FREQUENT_CHECK; 2625 EV_FREQUENT_CHECK;
2299 2626
2300 /*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));*/
2301} 2628}
2302 2629
2303void noinline 2630void noinline
2304ev_periodic_stop (EV_P_ ev_periodic *w) 2631ev_periodic_stop (EV_P_ ev_periodic *w)
2305{ 2632{
… …
2310 EV_FREQUENT_CHECK; 2637 EV_FREQUENT_CHECK;
2311 2638
2312 { 2639 {
2313 int active = ev_active (w); 2640 int active = ev_active (w);
2314 2641
2315 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2642 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2316 2643
2317 --periodiccnt; 2644 --periodiccnt;
2318 2645
2319 if (expect_true (active < periodiccnt + HEAP0)) 2646 if (expect_true (active < periodiccnt + HEAP0))
2320 { 2647 {
… …
2342#endif 2669#endif
2343 2670
2344void noinline 2671void noinline
2345ev_signal_start (EV_P_ ev_signal *w) 2672ev_signal_start (EV_P_ ev_signal *w)
2346{ 2673{
2347#if EV_MULTIPLICITY
2348 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2349#endif
2350 if (expect_false (ev_is_active (w))) 2674 if (expect_false (ev_is_active (w)))
2351 return; 2675 return;
2352 2676
2353 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));
2354 2678
2355 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));
2356 2682
2357 EV_FREQUENT_CHECK; 2683 signals [w->signum - 1].loop = EV_A;
2684#endif
2358 2685
2686 EV_FREQUENT_CHECK;
2687
2688#if EV_USE_SIGNALFD
2689 if (sigfd == -2)
2359 { 2690 {
2360#ifndef _WIN32 2691 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2361 sigset_t full, prev; 2692 if (sigfd < 0 && errno == EINVAL)
2362 sigfillset (&full); 2693 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2363 sigprocmask (SIG_SETMASK, &full, &prev);
2364#endif
2365 2694
2366 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2695 if (sigfd >= 0)
2696 {
2697 fd_intern (sigfd); /* doing it twice will not hurt */
2367 2698
2368#ifndef _WIN32 2699 sigemptyset (&sigfd_set);
2369 sigprocmask (SIG_SETMASK, &prev, 0); 2700
2370#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 }
2371 } 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
2372 2717
2373 ev_start (EV_A_ (W)w, 1); 2718 ev_start (EV_A_ (W)w, 1);
2374 wlist_add (&signals [w->signum - 1].head, (WL)w); 2719 wlist_add (&signals [w->signum - 1].head, (WL)w);
2375 2720
2376 if (!((WL)w)->next) 2721 if (!((WL)w)->next)
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0) /*TODO*/
2724# endif
2377 { 2725 {
2378#if _WIN32 2726# if _WIN32
2379 signal (w->signum, ev_sighandler); 2727 signal (w->signum, ev_sighandler);
2380#else 2728# else
2381 struct sigaction sa; 2729 struct sigaction sa;
2730
2731 evpipe_init (EV_A);
2732
2382 sa.sa_handler = ev_sighandler; 2733 sa.sa_handler = ev_sighandler;
2383 sigfillset (&sa.sa_mask); 2734 sigfillset (&sa.sa_mask);
2384 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 */
2385 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);
2386#endif 2741#endif
2387 } 2742 }
2388 2743
2389 EV_FREQUENT_CHECK; 2744 EV_FREQUENT_CHECK;
2390} 2745}
2391 2746
2392void noinline 2747void noinline
… …
2400 2755
2401 wlist_del (&signals [w->signum - 1].head, (WL)w); 2756 wlist_del (&signals [w->signum - 1].head, (WL)w);
2402 ev_stop (EV_A_ (W)w); 2757 ev_stop (EV_A_ (W)w);
2403 2758
2404 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
2405 signal (w->signum, SIG_DFL); 2775 signal (w->signum, SIG_DFL);
2776 }
2406 2777
2407 EV_FREQUENT_CHECK; 2778 EV_FREQUENT_CHECK;
2408} 2779}
2409 2780
2410void 2781void
2411ev_child_start (EV_P_ ev_child *w) 2782ev_child_start (EV_P_ ev_child *w)
2412{ 2783{
2413#if EV_MULTIPLICITY 2784#if EV_MULTIPLICITY
2414 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));
2415#endif 2786#endif
2416 if (expect_false (ev_is_active (w))) 2787 if (expect_false (ev_is_active (w)))
2417 return; 2788 return;
2418 2789
2419 EV_FREQUENT_CHECK; 2790 EV_FREQUENT_CHECK;
… …
2478 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2849 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2479 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2850 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2480 2851
2481 char *pend = strrchr (path, '/'); 2852 char *pend = strrchr (path, '/');
2482 2853
2483 if (!pend) 2854 if (!pend || pend == path)
2484 break; /* whoops, no '/', complain to your admin */ 2855 break;
2485 2856
2486 *pend = 0; 2857 *pend = 0;
2487 w->wd = inotify_add_watch (fs_fd, path, mask); 2858 w->wd = inotify_add_watch (fs_fd, path, mask);
2488 } 2859 }
2489 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2860 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2490 } 2861 }
2491 } 2862 }
2492 else 2863
2864 if (w->wd >= 0)
2493 { 2865 {
2494 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2866 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2495 2867
2496 /* now local changes will be tracked by inotify, but remote changes won't */ 2868 /* now local changes will be tracked by inotify, but remote changes won't */
2497 /* unless the filesystem it known to be local, we therefore still poll */ 2869 /* unless the filesystem it known to be local, we therefore still poll */
… …
2547 2919
2548 if (w->wd == wd || wd == -1) 2920 if (w->wd == wd || wd == -1)
2549 { 2921 {
2550 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2922 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2551 { 2923 {
2924 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2552 w->wd = -1; 2925 w->wd = -1;
2553 infy_add (EV_A_ w); /* re-add, no matter what */ 2926 infy_add (EV_A_ w); /* re-add, no matter what */
2554 } 2927 }
2555 2928
2556 stat_timer_cb (EV_A_ &w->timer, 0); 2929 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2569 2942
2570 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2943 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2571 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2944 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2572} 2945}
2573 2946
2574void inline_size 2947inline_size void
2575check_2625 (EV_P) 2948check_2625 (EV_P)
2576{ 2949{
2577 /* kernels < 2.6.25 are borked 2950 /* kernels < 2.6.25 are borked
2578 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2951 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2579 */ 2952 */
… …
2592 return; 2965 return;
2593 2966
2594 fs_2625 = 1; 2967 fs_2625 = 1;
2595} 2968}
2596 2969
2597void inline_size 2970inline_size void
2598infy_init (EV_P) 2971infy_init (EV_P)
2599{ 2972{
2600 if (fs_fd != -2) 2973 if (fs_fd != -2)
2601 return; 2974 return;
2602 2975
… …
2612 ev_set_priority (&fs_w, EV_MAXPRI); 2985 ev_set_priority (&fs_w, EV_MAXPRI);
2613 ev_io_start (EV_A_ &fs_w); 2986 ev_io_start (EV_A_ &fs_w);
2614 } 2987 }
2615} 2988}
2616 2989
2617void inline_size 2990inline_size void
2618infy_fork (EV_P) 2991infy_fork (EV_P)
2619{ 2992{
2620 int slot; 2993 int slot;
2621 2994
2622 if (fs_fd < 0) 2995 if (fs_fd < 0)
… …
2888embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3261embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2889{ 3262{
2890 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3263 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2891 3264
2892 { 3265 {
2893 struct ev_loop *loop = w->other; 3266 EV_P = w->other;
2894 3267
2895 while (fdchangecnt) 3268 while (fdchangecnt)
2896 { 3269 {
2897 fd_reify (EV_A); 3270 fd_reify (EV_A);
2898 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3271 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2903static void 3276static void
2904embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3277embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2905{ 3278{
2906 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3279 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2907 3280
3281 ev_embed_stop (EV_A_ w);
3282
2908 { 3283 {
2909 struct ev_loop *loop = w->other; 3284 EV_P = w->other;
2910 3285
2911 ev_loop_fork (EV_A); 3286 ev_loop_fork (EV_A);
3287 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2912 } 3288 }
3289
3290 ev_embed_start (EV_A_ w);
2913} 3291}
2914 3292
2915#if 0 3293#if 0
2916static void 3294static void
2917embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3295embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2925{ 3303{
2926 if (expect_false (ev_is_active (w))) 3304 if (expect_false (ev_is_active (w)))
2927 return; 3305 return;
2928 3306
2929 { 3307 {
2930 struct ev_loop *loop = w->other; 3308 EV_P = w->other;
2931 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3309 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2932 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3310 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2933 } 3311 }
2934 3312
2935 EV_FREQUENT_CHECK; 3313 EV_FREQUENT_CHECK;
2936 3314
… …
3047 3425
3048void 3426void
3049ev_async_send (EV_P_ ev_async *w) 3427ev_async_send (EV_P_ ev_async *w)
3050{ 3428{
3051 w->sent = 1; 3429 w->sent = 1;
3052 evpipe_write (EV_A_ &gotasync); 3430 evpipe_write (EV_A_ &async_pending);
3053} 3431}
3054#endif 3432#endif
3055 3433
3056/*****************************************************************************/ 3434/*****************************************************************************/
3057 3435
… …
3119 ev_timer_set (&once->to, timeout, 0.); 3497 ev_timer_set (&once->to, timeout, 0.);
3120 ev_timer_start (EV_A_ &once->to); 3498 ev_timer_start (EV_A_ &once->to);
3121 } 3499 }
3122} 3500}
3123 3501
3502/*****************************************************************************/
3503
3504#if EV_WALK_ENABLE
3505void
3506ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3507{
3508 int i, j;
3509 ev_watcher_list *wl, *wn;
3510
3511 if (types & (EV_IO | EV_EMBED))
3512 for (i = 0; i < anfdmax; ++i)
3513 for (wl = anfds [i].head; wl; )
3514 {
3515 wn = wl->next;
3516
3517#if EV_EMBED_ENABLE
3518 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3519 {
3520 if (types & EV_EMBED)
3521 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3522 }
3523 else
3524#endif
3525#if EV_USE_INOTIFY
3526 if (ev_cb ((ev_io *)wl) == infy_cb)
3527 ;
3528 else
3529#endif
3530 if ((ev_io *)wl != &pipe_w)
3531 if (types & EV_IO)
3532 cb (EV_A_ EV_IO, wl);
3533
3534 wl = wn;
3535 }
3536
3537 if (types & (EV_TIMER | EV_STAT))
3538 for (i = timercnt + HEAP0; i-- > HEAP0; )
3539#if EV_STAT_ENABLE
3540 /*TODO: timer is not always active*/
3541 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3542 {
3543 if (types & EV_STAT)
3544 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3545 }
3546 else
3547#endif
3548 if (types & EV_TIMER)
3549 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3550
3551#if EV_PERIODIC_ENABLE
3552 if (types & EV_PERIODIC)
3553 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3554 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3555#endif
3556
3557#if EV_IDLE_ENABLE
3558 if (types & EV_IDLE)
3559 for (j = NUMPRI; i--; )
3560 for (i = idlecnt [j]; i--; )
3561 cb (EV_A_ EV_IDLE, idles [j][i]);
3562#endif
3563
3564#if EV_FORK_ENABLE
3565 if (types & EV_FORK)
3566 for (i = forkcnt; i--; )
3567 if (ev_cb (forks [i]) != embed_fork_cb)
3568 cb (EV_A_ EV_FORK, forks [i]);
3569#endif
3570
3571#if EV_ASYNC_ENABLE
3572 if (types & EV_ASYNC)
3573 for (i = asynccnt; i--; )
3574 cb (EV_A_ EV_ASYNC, asyncs [i]);
3575#endif
3576
3577 if (types & EV_PREPARE)
3578 for (i = preparecnt; i--; )
3579#if EV_EMBED_ENABLE
3580 if (ev_cb (prepares [i]) != embed_prepare_cb)
3581#endif
3582 cb (EV_A_ EV_PREPARE, prepares [i]);
3583
3584 if (types & EV_CHECK)
3585 for (i = checkcnt; i--; )
3586 cb (EV_A_ EV_CHECK, checks [i]);
3587
3588 if (types & EV_SIGNAL)
3589 for (i = 0; i < EV_NSIG - 1; ++i)
3590 for (wl = signals [i].head; wl; )
3591 {
3592 wn = wl->next;
3593 cb (EV_A_ EV_SIGNAL, wl);
3594 wl = wn;
3595 }
3596
3597 if (types & EV_CHILD)
3598 for (i = EV_PID_HASHSIZE; i--; )
3599 for (wl = childs [i]; wl; )
3600 {
3601 wn = wl->next;
3602 cb (EV_A_ EV_CHILD, wl);
3603 wl = wn;
3604 }
3605/* EV_STAT 0x00001000 /* stat data changed */
3606/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3607}
3608#endif
3609
3124#if EV_MULTIPLICITY 3610#if EV_MULTIPLICITY
3125 #include "ev_wrap.h" 3611 #include "ev_wrap.h"
3126#endif 3612#endif
3127 3613
3128#ifdef __cplusplus 3614#ifdef __cplusplus

Diff Legend

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