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

Comparing libev/ev.c (file contents):
Revision 1.273 by root, Mon Nov 3 14:27:06 2008 UTC vs.
Revision 1.309 by root, Sun Jul 26 04:24: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
… …
260# define EV_USE_4HEAP !EV_MINIMAL 325# define EV_USE_4HEAP !EV_MINIMAL
261#endif 326#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
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
265#endif 344#endif
266 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
… …
303#endif 382#endif
304 383
305#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
306/* 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 */
307# include <stdint.h> 386# include <stdint.h>
387# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK
389# endif
390# ifndef EFD_CLOEXEC
391# define EFD_CLOEXEC O_CLOEXEC
392# endif
308# ifdef __cplusplus 393# ifdef __cplusplus
309extern "C" { 394extern "C" {
310# endif 395# endif
311int eventfd (unsigned int initval, int flags); 396int eventfd (unsigned int initval, int flags);
312# ifdef __cplusplus 397# ifdef __cplusplus
313} 398}
314# endif 399# endif
400#endif
401
402#if EV_USE_SIGNALFD
403# include <sys/signalfd.h>
315#endif 404#endif
316 405
317/**/ 406/**/
318 407
319#if EV_VERIFY >= 3 408#if EV_VERIFY >= 3
… …
355# define inline_speed static noinline 444# define inline_speed static noinline
356#else 445#else
357# define inline_speed static inline 446# define inline_speed static inline
358#endif 447#endif
359 448
360#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 449#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
450
451#if EV_MINPRI == EV_MAXPRI
452# define ABSPRI(w) (((W)w), 0)
453#else
361#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 454# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
455#endif
362 456
363#define EMPTY /* required for microsofts broken pseudo-c compiler */ 457#define EMPTY /* required for microsofts broken pseudo-c compiler */
364#define EMPTY2(a,b) /* used to suppress some warnings */ 458#define EMPTY2(a,b) /* used to suppress some warnings */
365 459
366typedef ev_watcher *W; 460typedef ev_watcher *W;
… …
368typedef ev_watcher_time *WT; 462typedef ev_watcher_time *WT;
369 463
370#define ev_active(w) ((W)(w))->active 464#define ev_active(w) ((W)(w))->active
371#define ev_at(w) ((WT)(w))->at 465#define ev_at(w) ((WT)(w))->at
372 466
373#if EV_USE_MONOTONIC 467#if EV_USE_REALTIME
374/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 468/* sig_atomic_t is used to avoid per-thread variables or locking but still */
375/* giving it a reasonably high chance of working on typical architetcures */ 469/* giving it a reasonably high chance of working on typical architetcures */
470static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
471#endif
472
473#if EV_USE_MONOTONIC
376static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 474static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
377#endif 475#endif
378 476
379#ifdef _WIN32 477#ifdef _WIN32
380# include "ev_win32.c" 478# include "ev_win32.c"
… …
445#define ev_malloc(size) ev_realloc (0, (size)) 543#define ev_malloc(size) ev_realloc (0, (size))
446#define ev_free(ptr) ev_realloc ((ptr), 0) 544#define ev_free(ptr) ev_realloc ((ptr), 0)
447 545
448/*****************************************************************************/ 546/*****************************************************************************/
449 547
548/* set in reify when reification needed */
549#define EV_ANFD_REIFY 1
550
551/* file descriptor info structure */
450typedef struct 552typedef struct
451{ 553{
452 WL head; 554 WL head;
453 unsigned char events; 555 unsigned char events; /* the events watched for */
454 unsigned char reify; 556 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
455 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 557 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
456 unsigned char unused; 558 unsigned char unused;
457#if EV_USE_EPOLL 559#if EV_USE_EPOLL
458 unsigned int egen; /* generation counter to counter epoll bugs */ 560 unsigned int egen; /* generation counter to counter epoll bugs */
459#endif 561#endif
460#if EV_SELECT_IS_WINSOCKET 562#if EV_SELECT_IS_WINSOCKET
461 SOCKET handle; 563 SOCKET handle;
462#endif 564#endif
463} ANFD; 565} ANFD;
464 566
567/* stores the pending event set for a given watcher */
465typedef struct 568typedef struct
466{ 569{
467 W w; 570 W w;
468 int events; 571 int events; /* the pending event set for the given watcher */
469} ANPENDING; 572} ANPENDING;
470 573
471#if EV_USE_INOTIFY 574#if EV_USE_INOTIFY
472/* hash table entry per inotify-id */ 575/* hash table entry per inotify-id */
473typedef struct 576typedef struct
… …
476} ANFS; 579} ANFS;
477#endif 580#endif
478 581
479/* Heap Entry */ 582/* Heap Entry */
480#if EV_HEAP_CACHE_AT 583#if EV_HEAP_CACHE_AT
584 /* a heap element */
481 typedef struct { 585 typedef struct {
482 ev_tstamp at; 586 ev_tstamp at;
483 WT w; 587 WT w;
484 } ANHE; 588 } ANHE;
485 589
486 #define ANHE_w(he) (he).w /* access watcher, read-write */ 590 #define ANHE_w(he) (he).w /* access watcher, read-write */
487 #define ANHE_at(he) (he).at /* access cached at, read-only */ 591 #define ANHE_at(he) (he).at /* access cached at, read-only */
488 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 592 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
489#else 593#else
594 /* a heap element */
490 typedef WT ANHE; 595 typedef WT ANHE;
491 596
492 #define ANHE_w(he) (he) 597 #define ANHE_w(he) (he)
493 #define ANHE_at(he) (he)->at 598 #define ANHE_at(he) (he)->at
494 #define ANHE_at_cache(he) 599 #define ANHE_at_cache(he)
… …
518 623
519 static int ev_default_loop_ptr; 624 static int ev_default_loop_ptr;
520 625
521#endif 626#endif
522 627
628#if EV_MINIMAL < 2
629# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
630# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
631# define EV_INVOKE_PENDING invoke_cb (EV_A)
632#else
633# define EV_RELEASE_CB (void)0
634# define EV_ACQUIRE_CB (void)0
635# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
636#endif
637
638#define EVUNLOOP_RECURSE 0x80
639
523/*****************************************************************************/ 640/*****************************************************************************/
524 641
642#ifndef EV_HAVE_EV_TIME
525ev_tstamp 643ev_tstamp
526ev_time (void) 644ev_time (void)
527{ 645{
528#if EV_USE_REALTIME 646#if EV_USE_REALTIME
647 if (expect_true (have_realtime))
648 {
529 struct timespec ts; 649 struct timespec ts;
530 clock_gettime (CLOCK_REALTIME, &ts); 650 clock_gettime (CLOCK_REALTIME, &ts);
531 return ts.tv_sec + ts.tv_nsec * 1e-9; 651 return ts.tv_sec + ts.tv_nsec * 1e-9;
532#else 652 }
653#endif
654
533 struct timeval tv; 655 struct timeval tv;
534 gettimeofday (&tv, 0); 656 gettimeofday (&tv, 0);
535 return tv.tv_sec + tv.tv_usec * 1e-6; 657 return tv.tv_sec + tv.tv_usec * 1e-6;
536#endif
537} 658}
659#endif
538 660
539ev_tstamp inline_size 661inline_size ev_tstamp
540get_clock (void) 662get_clock (void)
541{ 663{
542#if EV_USE_MONOTONIC 664#if EV_USE_MONOTONIC
543 if (expect_true (have_monotonic)) 665 if (expect_true (have_monotonic))
544 { 666 {
… …
578 700
579 tv.tv_sec = (time_t)delay; 701 tv.tv_sec = (time_t)delay;
580 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 702 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
581 703
582 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 704 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
583 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 705 /* something not guaranteed by newer posix versions, but guaranteed */
584 /* by older ones */ 706 /* by older ones */
585 select (0, 0, 0, 0, &tv); 707 select (0, 0, 0, 0, &tv);
586#endif 708#endif
587 } 709 }
588} 710}
589 711
590/*****************************************************************************/ 712/*****************************************************************************/
591 713
592#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 714#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
593 715
594int inline_size 716/* find a suitable new size for the given array, */
717/* hopefully by rounding to a ncie-to-malloc size */
718inline_size int
595array_nextsize (int elem, int cur, int cnt) 719array_nextsize (int elem, int cur, int cnt)
596{ 720{
597 int ncur = cur + 1; 721 int ncur = cur + 1;
598 722
599 do 723 do
… …
640 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 764 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
641 } 765 }
642#endif 766#endif
643 767
644#define array_free(stem, idx) \ 768#define array_free(stem, idx) \
645 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 769 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
646 770
647/*****************************************************************************/ 771/*****************************************************************************/
772
773/* dummy callback for pending events */
774static void noinline
775pendingcb (EV_P_ ev_prepare *w, int revents)
776{
777}
648 778
649void noinline 779void noinline
650ev_feed_event (EV_P_ void *w, int revents) 780ev_feed_event (EV_P_ void *w, int revents)
651{ 781{
652 W w_ = (W)w; 782 W w_ = (W)w;
… …
661 pendings [pri][w_->pending - 1].w = w_; 791 pendings [pri][w_->pending - 1].w = w_;
662 pendings [pri][w_->pending - 1].events = revents; 792 pendings [pri][w_->pending - 1].events = revents;
663 } 793 }
664} 794}
665 795
666void inline_speed 796inline_speed void
797feed_reverse (EV_P_ W w)
798{
799 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
800 rfeeds [rfeedcnt++] = w;
801}
802
803inline_size void
804feed_reverse_done (EV_P_ int revents)
805{
806 do
807 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
808 while (rfeedcnt);
809}
810
811inline_speed void
667queue_events (EV_P_ W *events, int eventcnt, int type) 812queue_events (EV_P_ W *events, int eventcnt, int type)
668{ 813{
669 int i; 814 int i;
670 815
671 for (i = 0; i < eventcnt; ++i) 816 for (i = 0; i < eventcnt; ++i)
672 ev_feed_event (EV_A_ events [i], type); 817 ev_feed_event (EV_A_ events [i], type);
673} 818}
674 819
675/*****************************************************************************/ 820/*****************************************************************************/
676 821
677void inline_speed 822inline_speed void
678fd_event (EV_P_ int fd, int revents) 823fd_event_nc (EV_P_ int fd, int revents)
679{ 824{
680 ANFD *anfd = anfds + fd; 825 ANFD *anfd = anfds + fd;
681 ev_io *w; 826 ev_io *w;
682 827
683 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 828 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
687 if (ev) 832 if (ev)
688 ev_feed_event (EV_A_ (W)w, ev); 833 ev_feed_event (EV_A_ (W)w, ev);
689 } 834 }
690} 835}
691 836
837/* do not submit kernel events for fds that have reify set */
838/* because that means they changed while we were polling for new events */
839inline_speed void
840fd_event (EV_P_ int fd, int revents)
841{
842 ANFD *anfd = anfds + fd;
843
844 if (expect_true (!anfd->reify))
845 fd_event_nc (EV_A_ fd, revents);
846}
847
692void 848void
693ev_feed_fd_event (EV_P_ int fd, int revents) 849ev_feed_fd_event (EV_P_ int fd, int revents)
694{ 850{
695 if (fd >= 0 && fd < anfdmax) 851 if (fd >= 0 && fd < anfdmax)
696 fd_event (EV_A_ fd, revents); 852 fd_event_nc (EV_A_ fd, revents);
697} 853}
698 854
699void inline_size 855/* make sure the external fd watch events are in-sync */
856/* with the kernel/libev internal state */
857inline_size void
700fd_reify (EV_P) 858fd_reify (EV_P)
701{ 859{
702 int i; 860 int i;
703 861
704 for (i = 0; i < fdchangecnt; ++i) 862 for (i = 0; i < fdchangecnt; ++i)
… …
719 #ifdef EV_FD_TO_WIN32_HANDLE 877 #ifdef EV_FD_TO_WIN32_HANDLE
720 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 878 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
721 #else 879 #else
722 anfd->handle = _get_osfhandle (fd); 880 anfd->handle = _get_osfhandle (fd);
723 #endif 881 #endif
724 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 882 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
725 } 883 }
726#endif 884#endif
727 885
728 { 886 {
729 unsigned char o_events = anfd->events; 887 unsigned char o_events = anfd->events;
730 unsigned char o_reify = anfd->reify; 888 unsigned char o_reify = anfd->reify;
731 889
732 anfd->reify = 0; 890 anfd->reify = 0;
733 anfd->events = events; 891 anfd->events = events;
734 892
735 if (o_events != events || o_reify & EV_IOFDSET) 893 if (o_events != events || o_reify & EV__IOFDSET)
736 backend_modify (EV_A_ fd, o_events, events); 894 backend_modify (EV_A_ fd, o_events, events);
737 } 895 }
738 } 896 }
739 897
740 fdchangecnt = 0; 898 fdchangecnt = 0;
741} 899}
742 900
743void inline_size 901/* something about the given fd changed */
902inline_size void
744fd_change (EV_P_ int fd, int flags) 903fd_change (EV_P_ int fd, int flags)
745{ 904{
746 unsigned char reify = anfds [fd].reify; 905 unsigned char reify = anfds [fd].reify;
747 anfds [fd].reify |= flags; 906 anfds [fd].reify |= flags;
748 907
… …
752 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 911 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
753 fdchanges [fdchangecnt - 1] = fd; 912 fdchanges [fdchangecnt - 1] = fd;
754 } 913 }
755} 914}
756 915
757void inline_speed 916/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
917inline_speed void
758fd_kill (EV_P_ int fd) 918fd_kill (EV_P_ int fd)
759{ 919{
760 ev_io *w; 920 ev_io *w;
761 921
762 while ((w = (ev_io *)anfds [fd].head)) 922 while ((w = (ev_io *)anfds [fd].head))
… …
764 ev_io_stop (EV_A_ w); 924 ev_io_stop (EV_A_ w);
765 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 925 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
766 } 926 }
767} 927}
768 928
769int inline_size 929/* check whether the given fd is atcually valid, for error recovery */
930inline_size int
770fd_valid (int fd) 931fd_valid (int fd)
771{ 932{
772#ifdef _WIN32 933#ifdef _WIN32
773 return _get_osfhandle (fd) != -1; 934 return _get_osfhandle (fd) != -1;
774#else 935#else
… …
796 957
797 for (fd = anfdmax; fd--; ) 958 for (fd = anfdmax; fd--; )
798 if (anfds [fd].events) 959 if (anfds [fd].events)
799 { 960 {
800 fd_kill (EV_A_ fd); 961 fd_kill (EV_A_ fd);
801 return; 962 break;
802 } 963 }
803} 964}
804 965
805/* usually called after fork if backend needs to re-arm all fds from scratch */ 966/* usually called after fork if backend needs to re-arm all fds from scratch */
806static void noinline 967static void noinline
… …
811 for (fd = 0; fd < anfdmax; ++fd) 972 for (fd = 0; fd < anfdmax; ++fd)
812 if (anfds [fd].events) 973 if (anfds [fd].events)
813 { 974 {
814 anfds [fd].events = 0; 975 anfds [fd].events = 0;
815 anfds [fd].emask = 0; 976 anfds [fd].emask = 0;
816 fd_change (EV_A_ fd, EV_IOFDSET | 1); 977 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
817 } 978 }
818} 979}
819 980
820/*****************************************************************************/ 981/*****************************************************************************/
821 982
… …
837#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 998#define HEAP0 (DHEAP - 1) /* index of first element in heap */
838#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 999#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
839#define UPHEAP_DONE(p,k) ((p) == (k)) 1000#define UPHEAP_DONE(p,k) ((p) == (k))
840 1001
841/* away from the root */ 1002/* away from the root */
842void inline_speed 1003inline_speed void
843downheap (ANHE *heap, int N, int k) 1004downheap (ANHE *heap, int N, int k)
844{ 1005{
845 ANHE he = heap [k]; 1006 ANHE he = heap [k];
846 ANHE *E = heap + N + HEAP0; 1007 ANHE *E = heap + N + HEAP0;
847 1008
… …
887#define HEAP0 1 1048#define HEAP0 1
888#define HPARENT(k) ((k) >> 1) 1049#define HPARENT(k) ((k) >> 1)
889#define UPHEAP_DONE(p,k) (!(p)) 1050#define UPHEAP_DONE(p,k) (!(p))
890 1051
891/* away from the root */ 1052/* away from the root */
892void inline_speed 1053inline_speed void
893downheap (ANHE *heap, int N, int k) 1054downheap (ANHE *heap, int N, int k)
894{ 1055{
895 ANHE he = heap [k]; 1056 ANHE he = heap [k];
896 1057
897 for (;;) 1058 for (;;)
898 { 1059 {
899 int c = k << 1; 1060 int c = k << 1;
900 1061
901 if (c > N + HEAP0 - 1) 1062 if (c >= N + HEAP0)
902 break; 1063 break;
903 1064
904 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1065 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
905 ? 1 : 0; 1066 ? 1 : 0;
906 1067
… …
917 ev_active (ANHE_w (he)) = k; 1078 ev_active (ANHE_w (he)) = k;
918} 1079}
919#endif 1080#endif
920 1081
921/* towards the root */ 1082/* towards the root */
922void inline_speed 1083inline_speed void
923upheap (ANHE *heap, int k) 1084upheap (ANHE *heap, int k)
924{ 1085{
925 ANHE he = heap [k]; 1086 ANHE he = heap [k];
926 1087
927 for (;;) 1088 for (;;)
… …
938 1099
939 heap [k] = he; 1100 heap [k] = he;
940 ev_active (ANHE_w (he)) = k; 1101 ev_active (ANHE_w (he)) = k;
941} 1102}
942 1103
943void inline_size 1104/* move an element suitably so it is in a correct place */
1105inline_size void
944adjustheap (ANHE *heap, int N, int k) 1106adjustheap (ANHE *heap, int N, int k)
945{ 1107{
946 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1108 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
947 upheap (heap, k); 1109 upheap (heap, k);
948 else 1110 else
949 downheap (heap, N, k); 1111 downheap (heap, N, k);
950} 1112}
951 1113
952/* rebuild the heap: this function is used only once and executed rarely */ 1114/* rebuild the heap: this function is used only once and executed rarely */
953void inline_size 1115inline_size void
954reheap (ANHE *heap, int N) 1116reheap (ANHE *heap, int N)
955{ 1117{
956 int i; 1118 int i;
957 1119
958 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1120 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
961 upheap (heap, i + HEAP0); 1123 upheap (heap, i + HEAP0);
962} 1124}
963 1125
964/*****************************************************************************/ 1126/*****************************************************************************/
965 1127
1128/* associate signal watchers to a signal signal */
966typedef struct 1129typedef struct
967{ 1130{
1131 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY
1133 EV_P;
1134#endif
968 WL head; 1135 WL head;
969 EV_ATOMIC_T gotsig;
970} ANSIG; 1136} ANSIG;
971 1137
972static ANSIG *signals; 1138static ANSIG signals [EV_NSIG - 1];
973static int signalmax;
974
975static EV_ATOMIC_T gotsig;
976 1139
977/*****************************************************************************/ 1140/*****************************************************************************/
978 1141
979void inline_speed 1142/* used to prepare libev internal fd's */
1143/* this is not fork-safe */
1144inline_speed void
980fd_intern (int fd) 1145fd_intern (int fd)
981{ 1146{
982#ifdef _WIN32 1147#ifdef _WIN32
983 unsigned long arg = 1; 1148 unsigned long arg = 1;
984 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1149 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
989} 1154}
990 1155
991static void noinline 1156static void noinline
992evpipe_init (EV_P) 1157evpipe_init (EV_P)
993{ 1158{
994 if (!ev_is_active (&pipeev)) 1159 if (!ev_is_active (&pipe_w))
995 { 1160 {
996#if EV_USE_EVENTFD 1161#if EV_USE_EVENTFD
1162 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1163 if (evfd < 0 && errno == EINVAL)
997 if ((evfd = eventfd (0, 0)) >= 0) 1164 evfd = eventfd (0, 0);
1165
1166 if (evfd >= 0)
998 { 1167 {
999 evpipe [0] = -1; 1168 evpipe [0] = -1;
1000 fd_intern (evfd); 1169 fd_intern (evfd); /* doing it twice doesn't hurt */
1001 ev_io_set (&pipeev, evfd, EV_READ); 1170 ev_io_set (&pipe_w, evfd, EV_READ);
1002 } 1171 }
1003 else 1172 else
1004#endif 1173#endif
1005 { 1174 {
1006 while (pipe (evpipe)) 1175 while (pipe (evpipe))
1007 ev_syserr ("(libev) error creating signal/async pipe"); 1176 ev_syserr ("(libev) error creating signal/async pipe");
1008 1177
1009 fd_intern (evpipe [0]); 1178 fd_intern (evpipe [0]);
1010 fd_intern (evpipe [1]); 1179 fd_intern (evpipe [1]);
1011 ev_io_set (&pipeev, evpipe [0], EV_READ); 1180 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1012 } 1181 }
1013 1182
1014 ev_io_start (EV_A_ &pipeev); 1183 ev_io_start (EV_A_ &pipe_w);
1015 ev_unref (EV_A); /* watcher should not keep loop alive */ 1184 ev_unref (EV_A); /* watcher should not keep loop alive */
1016 } 1185 }
1017} 1186}
1018 1187
1019void inline_size 1188inline_size void
1020evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1189evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1021{ 1190{
1022 if (!*flag) 1191 if (!*flag)
1023 { 1192 {
1024 int old_errno = errno; /* save errno because write might clobber it */ 1193 int old_errno = errno; /* save errno because write might clobber it */
… …
1037 1206
1038 errno = old_errno; 1207 errno = old_errno;
1039 } 1208 }
1040} 1209}
1041 1210
1211/* called whenever the libev signal pipe */
1212/* got some events (signal, async) */
1042static void 1213static void
1043pipecb (EV_P_ ev_io *iow, int revents) 1214pipecb (EV_P_ ev_io *iow, int revents)
1044{ 1215{
1216 int i;
1217
1045#if EV_USE_EVENTFD 1218#if EV_USE_EVENTFD
1046 if (evfd >= 0) 1219 if (evfd >= 0)
1047 { 1220 {
1048 uint64_t counter; 1221 uint64_t counter;
1049 read (evfd, &counter, sizeof (uint64_t)); 1222 read (evfd, &counter, sizeof (uint64_t));
… …
1053 { 1226 {
1054 char dummy; 1227 char dummy;
1055 read (evpipe [0], &dummy, 1); 1228 read (evpipe [0], &dummy, 1);
1056 } 1229 }
1057 1230
1058 if (gotsig && ev_is_default_loop (EV_A)) 1231 if (sig_pending)
1059 { 1232 {
1060 int signum; 1233 sig_pending = 0;
1061 gotsig = 0;
1062 1234
1063 for (signum = signalmax; signum--; ) 1235 for (i = EV_NSIG - 1; i--; )
1064 if (signals [signum].gotsig) 1236 if (expect_false (signals [i].pending))
1065 ev_feed_signal_event (EV_A_ signum + 1); 1237 ev_feed_signal_event (EV_A_ i + 1);
1066 } 1238 }
1067 1239
1068#if EV_ASYNC_ENABLE 1240#if EV_ASYNC_ENABLE
1069 if (gotasync) 1241 if (async_pending)
1070 { 1242 {
1071 int i; 1243 async_pending = 0;
1072 gotasync = 0;
1073 1244
1074 for (i = asynccnt; i--; ) 1245 for (i = asynccnt; i--; )
1075 if (asyncs [i]->sent) 1246 if (asyncs [i]->sent)
1076 { 1247 {
1077 asyncs [i]->sent = 0; 1248 asyncs [i]->sent = 0;
… …
1085 1256
1086static void 1257static void
1087ev_sighandler (int signum) 1258ev_sighandler (int signum)
1088{ 1259{
1089#if EV_MULTIPLICITY 1260#if EV_MULTIPLICITY
1090 struct ev_loop *loop = &default_loop_struct; 1261 EV_P = signals [signum - 1].loop;
1091#endif 1262#endif
1092 1263
1093#if _WIN32 1264#if _WIN32
1094 signal (signum, ev_sighandler); 1265 signal (signum, ev_sighandler);
1095#endif 1266#endif
1096 1267
1097 signals [signum - 1].gotsig = 1; 1268 signals [signum - 1].pending = 1;
1098 evpipe_write (EV_A_ &gotsig); 1269 evpipe_write (EV_A_ &sig_pending);
1099} 1270}
1100 1271
1101void noinline 1272void noinline
1102ev_feed_signal_event (EV_P_ int signum) 1273ev_feed_signal_event (EV_P_ int signum)
1103{ 1274{
1104 WL w; 1275 WL w;
1105 1276
1277 if (expect_false (signum <= 0 || signum > EV_NSIG))
1278 return;
1279
1280 --signum;
1281
1106#if EV_MULTIPLICITY 1282#if EV_MULTIPLICITY
1107 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1283 /* it is permissible to try to feed a signal to the wrong loop */
1108#endif 1284 /* or, likely more useful, feeding a signal nobody is waiting for */
1109 1285
1110 --signum; 1286 if (expect_false (signals [signum].loop != EV_A))
1111
1112 if (signum < 0 || signum >= signalmax)
1113 return; 1287 return;
1288#endif
1114 1289
1115 signals [signum].gotsig = 0; 1290 signals [signum].pending = 0;
1116 1291
1117 for (w = signals [signum].head; w; w = w->next) 1292 for (w = signals [signum].head; w; w = w->next)
1118 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1293 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1119} 1294}
1120 1295
1296#if EV_USE_SIGNALFD
1297static void
1298sigfdcb (EV_P_ ev_io *iow, int revents)
1299{
1300 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1301
1302 for (;;)
1303 {
1304 ssize_t res = read (sigfd, si, sizeof (si));
1305
1306 /* not ISO-C, as res might be -1, but works with SuS */
1307 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1308 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1309
1310 if (res < (ssize_t)sizeof (si))
1311 break;
1312 }
1313}
1314#endif
1315
1121/*****************************************************************************/ 1316/*****************************************************************************/
1122 1317
1123static WL childs [EV_PID_HASHSIZE]; 1318static WL childs [EV_PID_HASHSIZE];
1124 1319
1125#ifndef _WIN32 1320#ifndef _WIN32
… …
1128 1323
1129#ifndef WIFCONTINUED 1324#ifndef WIFCONTINUED
1130# define WIFCONTINUED(status) 0 1325# define WIFCONTINUED(status) 0
1131#endif 1326#endif
1132 1327
1133void inline_speed 1328/* handle a single child status event */
1329inline_speed void
1134child_reap (EV_P_ int chain, int pid, int status) 1330child_reap (EV_P_ int chain, int pid, int status)
1135{ 1331{
1136 ev_child *w; 1332 ev_child *w;
1137 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1333 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1138 1334
… …
1151 1347
1152#ifndef WCONTINUED 1348#ifndef WCONTINUED
1153# define WCONTINUED 0 1349# define WCONTINUED 0
1154#endif 1350#endif
1155 1351
1352/* called on sigchld etc., calls waitpid */
1156static void 1353static void
1157childcb (EV_P_ ev_signal *sw, int revents) 1354childcb (EV_P_ ev_signal *sw, int revents)
1158{ 1355{
1159 int pid, status; 1356 int pid, status;
1160 1357
… …
1241 /* kqueue is borked on everything but netbsd apparently */ 1438 /* kqueue is borked on everything but netbsd apparently */
1242 /* it usually doesn't work correctly on anything but sockets and pipes */ 1439 /* it usually doesn't work correctly on anything but sockets and pipes */
1243 flags &= ~EVBACKEND_KQUEUE; 1440 flags &= ~EVBACKEND_KQUEUE;
1244#endif 1441#endif
1245#ifdef __APPLE__ 1442#ifdef __APPLE__
1246 // flags &= ~EVBACKEND_KQUEUE; for documentation 1443 /* only select works correctly on that "unix-certified" platform */
1247 flags &= ~EVBACKEND_POLL; 1444 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1445 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1248#endif 1446#endif
1249 1447
1250 return flags; 1448 return flags;
1251} 1449}
1252 1450
… …
1266ev_backend (EV_P) 1464ev_backend (EV_P)
1267{ 1465{
1268 return backend; 1466 return backend;
1269} 1467}
1270 1468
1469#if EV_MINIMAL < 2
1271unsigned int 1470unsigned int
1272ev_loop_count (EV_P) 1471ev_loop_count (EV_P)
1273{ 1472{
1274 return loop_count; 1473 return loop_count;
1275} 1474}
1276 1475
1476unsigned int
1477ev_loop_depth (EV_P)
1478{
1479 return loop_depth;
1480}
1481
1277void 1482void
1278ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1483ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1279{ 1484{
1280 io_blocktime = interval; 1485 io_blocktime = interval;
1281} 1486}
… …
1284ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1489ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1285{ 1490{
1286 timeout_blocktime = interval; 1491 timeout_blocktime = interval;
1287} 1492}
1288 1493
1494void
1495ev_set_userdata (EV_P_ void *data)
1496{
1497 userdata = data;
1498}
1499
1500void *
1501ev_userdata (EV_P)
1502{
1503 return userdata;
1504}
1505
1506void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1507{
1508 invoke_cb = invoke_pending_cb;
1509}
1510
1511void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1512{
1513 release_cb = release;
1514 acquire_cb = acquire;
1515}
1516#endif
1517
1518/* initialise a loop structure, must be zero-initialised */
1289static void noinline 1519static void noinline
1290loop_init (EV_P_ unsigned int flags) 1520loop_init (EV_P_ unsigned int flags)
1291{ 1521{
1292 if (!backend) 1522 if (!backend)
1293 { 1523 {
1524#if EV_USE_REALTIME
1525 if (!have_realtime)
1526 {
1527 struct timespec ts;
1528
1529 if (!clock_gettime (CLOCK_REALTIME, &ts))
1530 have_realtime = 1;
1531 }
1532#endif
1533
1294#if EV_USE_MONOTONIC 1534#if EV_USE_MONOTONIC
1535 if (!have_monotonic)
1295 { 1536 {
1296 struct timespec ts; 1537 struct timespec ts;
1538
1297 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1539 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1298 have_monotonic = 1; 1540 have_monotonic = 1;
1299 } 1541 }
1300#endif 1542#endif
1543
1544 /* pid check not overridable via env */
1545#ifndef _WIN32
1546 if (flags & EVFLAG_FORKCHECK)
1547 curpid = getpid ();
1548#endif
1549
1550 if (!(flags & EVFLAG_NOENV)
1551 && !enable_secure ()
1552 && getenv ("LIBEV_FLAGS"))
1553 flags = atoi (getenv ("LIBEV_FLAGS"));
1301 1554
1302 ev_rt_now = ev_time (); 1555 ev_rt_now = ev_time ();
1303 mn_now = get_clock (); 1556 mn_now = get_clock ();
1304 now_floor = mn_now; 1557 now_floor = mn_now;
1305 rtmn_diff = ev_rt_now - mn_now; 1558 rtmn_diff = ev_rt_now - mn_now;
1559#if EV_MINIMAL < 2
1560 invoke_cb = ev_invoke_pending;
1561#endif
1306 1562
1307 io_blocktime = 0.; 1563 io_blocktime = 0.;
1308 timeout_blocktime = 0.; 1564 timeout_blocktime = 0.;
1309 backend = 0; 1565 backend = 0;
1310 backend_fd = -1; 1566 backend_fd = -1;
1311 gotasync = 0; 1567 sig_pending = 0;
1568#if EV_ASYNC_ENABLE
1569 async_pending = 0;
1570#endif
1312#if EV_USE_INOTIFY 1571#if EV_USE_INOTIFY
1313 fs_fd = -2; 1572 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1314#endif 1573#endif
1315 1574#if EV_USE_SIGNALFD
1316 /* pid check not overridable via env */ 1575 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1317#ifndef _WIN32
1318 if (flags & EVFLAG_FORKCHECK)
1319 curpid = getpid ();
1320#endif 1576#endif
1321
1322 if (!(flags & EVFLAG_NOENV)
1323 && !enable_secure ()
1324 && getenv ("LIBEV_FLAGS"))
1325 flags = atoi (getenv ("LIBEV_FLAGS"));
1326 1577
1327 if (!(flags & 0x0000ffffU)) 1578 if (!(flags & 0x0000ffffU))
1328 flags |= ev_recommended_backends (); 1579 flags |= ev_recommended_backends ();
1329 1580
1330#if EV_USE_PORT 1581#if EV_USE_PORT
… …
1341#endif 1592#endif
1342#if EV_USE_SELECT 1593#if EV_USE_SELECT
1343 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1594 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1344#endif 1595#endif
1345 1596
1597 ev_prepare_init (&pending_w, pendingcb);
1598
1346 ev_init (&pipeev, pipecb); 1599 ev_init (&pipe_w, pipecb);
1347 ev_set_priority (&pipeev, EV_MAXPRI); 1600 ev_set_priority (&pipe_w, EV_MAXPRI);
1348 } 1601 }
1349} 1602}
1350 1603
1604/* free up a loop structure */
1351static void noinline 1605static void noinline
1352loop_destroy (EV_P) 1606loop_destroy (EV_P)
1353{ 1607{
1354 int i; 1608 int i;
1355 1609
1356 if (ev_is_active (&pipeev)) 1610 if (ev_is_active (&pipe_w))
1357 { 1611 {
1358 ev_ref (EV_A); /* signal watcher */ 1612 /*ev_ref (EV_A);*/
1359 ev_io_stop (EV_A_ &pipeev); 1613 /*ev_io_stop (EV_A_ &pipe_w);*/
1360 1614
1361#if EV_USE_EVENTFD 1615#if EV_USE_EVENTFD
1362 if (evfd >= 0) 1616 if (evfd >= 0)
1363 close (evfd); 1617 close (evfd);
1364#endif 1618#endif
… …
1368 close (evpipe [0]); 1622 close (evpipe [0]);
1369 close (evpipe [1]); 1623 close (evpipe [1]);
1370 } 1624 }
1371 } 1625 }
1372 1626
1627#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd);
1634 }
1635#endif
1636
1373#if EV_USE_INOTIFY 1637#if EV_USE_INOTIFY
1374 if (fs_fd >= 0) 1638 if (fs_fd >= 0)
1375 close (fs_fd); 1639 close (fs_fd);
1376#endif 1640#endif
1377 1641
… …
1400#if EV_IDLE_ENABLE 1664#if EV_IDLE_ENABLE
1401 array_free (idle, [i]); 1665 array_free (idle, [i]);
1402#endif 1666#endif
1403 } 1667 }
1404 1668
1405 ev_free (anfds); anfdmax = 0; 1669 ev_free (anfds); anfds = 0; anfdmax = 0;
1406 1670
1407 /* have to use the microsoft-never-gets-it-right macro */ 1671 /* have to use the microsoft-never-gets-it-right macro */
1672 array_free (rfeed, EMPTY);
1408 array_free (fdchange, EMPTY); 1673 array_free (fdchange, EMPTY);
1409 array_free (timer, EMPTY); 1674 array_free (timer, EMPTY);
1410#if EV_PERIODIC_ENABLE 1675#if EV_PERIODIC_ENABLE
1411 array_free (periodic, EMPTY); 1676 array_free (periodic, EMPTY);
1412#endif 1677#endif
… …
1421 1686
1422 backend = 0; 1687 backend = 0;
1423} 1688}
1424 1689
1425#if EV_USE_INOTIFY 1690#if EV_USE_INOTIFY
1426void inline_size infy_fork (EV_P); 1691inline_size void infy_fork (EV_P);
1427#endif 1692#endif
1428 1693
1429void inline_size 1694inline_size void
1430loop_fork (EV_P) 1695loop_fork (EV_P)
1431{ 1696{
1432#if EV_USE_PORT 1697#if EV_USE_PORT
1433 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1698 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1434#endif 1699#endif
… …
1440#endif 1705#endif
1441#if EV_USE_INOTIFY 1706#if EV_USE_INOTIFY
1442 infy_fork (EV_A); 1707 infy_fork (EV_A);
1443#endif 1708#endif
1444 1709
1445 if (ev_is_active (&pipeev)) 1710 if (ev_is_active (&pipe_w))
1446 { 1711 {
1447 /* this "locks" the handlers against writing to the pipe */ 1712 /* this "locks" the handlers against writing to the pipe */
1448 /* while we modify the fd vars */ 1713 /* while we modify the fd vars */
1449 gotsig = 1; 1714 sig_pending = 1;
1450#if EV_ASYNC_ENABLE 1715#if EV_ASYNC_ENABLE
1451 gotasync = 1; 1716 async_pending = 1;
1452#endif 1717#endif
1453 1718
1454 ev_ref (EV_A); 1719 ev_ref (EV_A);
1455 ev_io_stop (EV_A_ &pipeev); 1720 ev_io_stop (EV_A_ &pipe_w);
1456 1721
1457#if EV_USE_EVENTFD 1722#if EV_USE_EVENTFD
1458 if (evfd >= 0) 1723 if (evfd >= 0)
1459 close (evfd); 1724 close (evfd);
1460#endif 1725#endif
… …
1465 close (evpipe [1]); 1730 close (evpipe [1]);
1466 } 1731 }
1467 1732
1468 evpipe_init (EV_A); 1733 evpipe_init (EV_A);
1469 /* now iterate over everything, in case we missed something */ 1734 /* now iterate over everything, in case we missed something */
1470 pipecb (EV_A_ &pipeev, EV_READ); 1735 pipecb (EV_A_ &pipe_w, EV_READ);
1471 } 1736 }
1472 1737
1473 postfork = 0; 1738 postfork = 0;
1474} 1739}
1475 1740
1476#if EV_MULTIPLICITY 1741#if EV_MULTIPLICITY
1477 1742
1478struct ev_loop * 1743struct ev_loop *
1479ev_loop_new (unsigned int flags) 1744ev_loop_new (unsigned int flags)
1480{ 1745{
1481 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1746 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1482 1747
1483 memset (loop, 0, sizeof (struct ev_loop)); 1748 memset (EV_A, 0, sizeof (struct ev_loop));
1484
1485 loop_init (EV_A_ flags); 1749 loop_init (EV_A_ flags);
1486 1750
1487 if (ev_backend (EV_A)) 1751 if (ev_backend (EV_A))
1488 return loop; 1752 return EV_A;
1489 1753
1490 return 0; 1754 return 0;
1491} 1755}
1492 1756
1493void 1757void
… …
1500void 1764void
1501ev_loop_fork (EV_P) 1765ev_loop_fork (EV_P)
1502{ 1766{
1503 postfork = 1; /* must be in line with ev_default_fork */ 1767 postfork = 1; /* must be in line with ev_default_fork */
1504} 1768}
1769#endif /* multiplicity */
1505 1770
1506#if EV_VERIFY 1771#if EV_VERIFY
1507static void noinline 1772static void noinline
1508verify_watcher (EV_P_ W w) 1773verify_watcher (EV_P_ W w)
1509{ 1774{
1510 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1775 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1511 1776
1512 if (w->pending) 1777 if (w->pending)
1513 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1778 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1514} 1779}
1515 1780
1516static void noinline 1781static void noinline
1517verify_heap (EV_P_ ANHE *heap, int N) 1782verify_heap (EV_P_ ANHE *heap, int N)
1518{ 1783{
1519 int i; 1784 int i;
1520 1785
1521 for (i = HEAP0; i < N + HEAP0; ++i) 1786 for (i = HEAP0; i < N + HEAP0; ++i)
1522 { 1787 {
1523 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1788 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1524 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1789 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1525 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1790 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1526 1791
1527 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1792 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1528 } 1793 }
1529} 1794}
1530 1795
1531static void noinline 1796static void noinline
1532array_verify (EV_P_ W *ws, int cnt) 1797array_verify (EV_P_ W *ws, int cnt)
1533{ 1798{
1534 while (cnt--) 1799 while (cnt--)
1535 { 1800 {
1536 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1801 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1537 verify_watcher (EV_A_ ws [cnt]); 1802 verify_watcher (EV_A_ ws [cnt]);
1538 } 1803 }
1539} 1804}
1540#endif 1805#endif
1541 1806
1807#if EV_MINIMAL < 2
1542void 1808void
1543ev_loop_verify (EV_P) 1809ev_loop_verify (EV_P)
1544{ 1810{
1545#if EV_VERIFY 1811#if EV_VERIFY
1546 int i; 1812 int i;
… …
1548 1814
1549 assert (activecnt >= -1); 1815 assert (activecnt >= -1);
1550 1816
1551 assert (fdchangemax >= fdchangecnt); 1817 assert (fdchangemax >= fdchangecnt);
1552 for (i = 0; i < fdchangecnt; ++i) 1818 for (i = 0; i < fdchangecnt; ++i)
1553 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1819 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1554 1820
1555 assert (anfdmax >= 0); 1821 assert (anfdmax >= 0);
1556 for (i = 0; i < anfdmax; ++i) 1822 for (i = 0; i < anfdmax; ++i)
1557 for (w = anfds [i].head; w; w = w->next) 1823 for (w = anfds [i].head; w; w = w->next)
1558 { 1824 {
1559 verify_watcher (EV_A_ (W)w); 1825 verify_watcher (EV_A_ (W)w);
1560 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1826 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1561 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1827 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1562 } 1828 }
1563 1829
1564 assert (timermax >= timercnt); 1830 assert (timermax >= timercnt);
1565 verify_heap (EV_A_ timers, timercnt); 1831 verify_heap (EV_A_ timers, timercnt);
1566 1832
… …
1595 assert (checkmax >= checkcnt); 1861 assert (checkmax >= checkcnt);
1596 array_verify (EV_A_ (W *)checks, checkcnt); 1862 array_verify (EV_A_ (W *)checks, checkcnt);
1597 1863
1598# if 0 1864# if 0
1599 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1600 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1866 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1601# endif 1867# endif
1602#endif 1868#endif
1603} 1869}
1604 1870#endif
1605#endif /* multiplicity */
1606 1871
1607#if EV_MULTIPLICITY 1872#if EV_MULTIPLICITY
1608struct ev_loop * 1873struct ev_loop *
1609ev_default_loop_init (unsigned int flags) 1874ev_default_loop_init (unsigned int flags)
1610#else 1875#else
… …
1613#endif 1878#endif
1614{ 1879{
1615 if (!ev_default_loop_ptr) 1880 if (!ev_default_loop_ptr)
1616 { 1881 {
1617#if EV_MULTIPLICITY 1882#if EV_MULTIPLICITY
1618 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1883 EV_P = ev_default_loop_ptr = &default_loop_struct;
1619#else 1884#else
1620 ev_default_loop_ptr = 1; 1885 ev_default_loop_ptr = 1;
1621#endif 1886#endif
1622 1887
1623 loop_init (EV_A_ flags); 1888 loop_init (EV_A_ flags);
… …
1640 1905
1641void 1906void
1642ev_default_destroy (void) 1907ev_default_destroy (void)
1643{ 1908{
1644#if EV_MULTIPLICITY 1909#if EV_MULTIPLICITY
1645 struct ev_loop *loop = ev_default_loop_ptr; 1910 EV_P = ev_default_loop_ptr;
1646#endif 1911#endif
1647 1912
1648 ev_default_loop_ptr = 0; 1913 ev_default_loop_ptr = 0;
1649 1914
1650#ifndef _WIN32 1915#ifndef _WIN32
… …
1657 1922
1658void 1923void
1659ev_default_fork (void) 1924ev_default_fork (void)
1660{ 1925{
1661#if EV_MULTIPLICITY 1926#if EV_MULTIPLICITY
1662 struct ev_loop *loop = ev_default_loop_ptr; 1927 EV_P = ev_default_loop_ptr;
1663#endif 1928#endif
1664 1929
1665 postfork = 1; /* must be in line with ev_loop_fork */ 1930 postfork = 1; /* must be in line with ev_loop_fork */
1666} 1931}
1667 1932
… …
1671ev_invoke (EV_P_ void *w, int revents) 1936ev_invoke (EV_P_ void *w, int revents)
1672{ 1937{
1673 EV_CB_INVOKE ((W)w, revents); 1938 EV_CB_INVOKE ((W)w, revents);
1674} 1939}
1675 1940
1676void inline_speed 1941unsigned int
1677call_pending (EV_P) 1942ev_pending_count (EV_P)
1943{
1944 int pri;
1945 unsigned int count = 0;
1946
1947 for (pri = NUMPRI; pri--; )
1948 count += pendingcnt [pri];
1949
1950 return count;
1951}
1952
1953void noinline
1954ev_invoke_pending (EV_P)
1678{ 1955{
1679 int pri; 1956 int pri;
1680 1957
1681 for (pri = NUMPRI; pri--; ) 1958 for (pri = NUMPRI; pri--; )
1682 while (pendingcnt [pri]) 1959 while (pendingcnt [pri])
1683 { 1960 {
1684 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1961 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1685 1962
1686 if (expect_true (p->w))
1687 {
1688 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1963 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1964 /* ^ this is no longer true, as pending_w could be here */
1689 1965
1690 p->w->pending = 0; 1966 p->w->pending = 0;
1691 EV_CB_INVOKE (p->w, p->events); 1967 EV_CB_INVOKE (p->w, p->events);
1692 EV_FREQUENT_CHECK; 1968 EV_FREQUENT_CHECK;
1693 }
1694 } 1969 }
1695} 1970}
1696 1971
1697#if EV_IDLE_ENABLE 1972#if EV_IDLE_ENABLE
1698void inline_size 1973/* make idle watchers pending. this handles the "call-idle */
1974/* only when higher priorities are idle" logic */
1975inline_size void
1699idle_reify (EV_P) 1976idle_reify (EV_P)
1700{ 1977{
1701 if (expect_false (idleall)) 1978 if (expect_false (idleall))
1702 { 1979 {
1703 int pri; 1980 int pri;
… …
1715 } 1992 }
1716 } 1993 }
1717} 1994}
1718#endif 1995#endif
1719 1996
1720void inline_size 1997/* make timers pending */
1998inline_size void
1721timers_reify (EV_P) 1999timers_reify (EV_P)
1722{ 2000{
1723 EV_FREQUENT_CHECK; 2001 EV_FREQUENT_CHECK;
1724 2002
1725 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2003 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1726 { 2004 {
1727 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2005 do
1728
1729 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1730
1731 /* first reschedule or stop timer */
1732 if (w->repeat)
1733 { 2006 {
2007 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2008
2009 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2010
2011 /* first reschedule or stop timer */
2012 if (w->repeat)
2013 {
1734 ev_at (w) += w->repeat; 2014 ev_at (w) += w->repeat;
1735 if (ev_at (w) < mn_now) 2015 if (ev_at (w) < mn_now)
1736 ev_at (w) = mn_now; 2016 ev_at (w) = mn_now;
1737 2017
1738 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2018 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1739 2019
1740 ANHE_at_cache (timers [HEAP0]); 2020 ANHE_at_cache (timers [HEAP0]);
1741 downheap (timers, timercnt, HEAP0); 2021 downheap (timers, timercnt, HEAP0);
2022 }
2023 else
2024 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2025
2026 EV_FREQUENT_CHECK;
2027 feed_reverse (EV_A_ (W)w);
1742 } 2028 }
1743 else 2029 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1744 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1745 2030
1746 EV_FREQUENT_CHECK;
1747 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2031 feed_reverse_done (EV_A_ EV_TIMEOUT);
1748 } 2032 }
1749} 2033}
1750 2034
1751#if EV_PERIODIC_ENABLE 2035#if EV_PERIODIC_ENABLE
1752void inline_size 2036/* make periodics pending */
2037inline_size void
1753periodics_reify (EV_P) 2038periodics_reify (EV_P)
1754{ 2039{
1755 EV_FREQUENT_CHECK; 2040 EV_FREQUENT_CHECK;
1756 2041
1757 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2042 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1758 { 2043 {
1759 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2044 int feed_count = 0;
1760 2045
1761 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2046 do
1762
1763 /* first reschedule or stop timer */
1764 if (w->reschedule_cb)
1765 { 2047 {
2048 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2049
2050 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2051
2052 /* first reschedule or stop timer */
2053 if (w->reschedule_cb)
2054 {
1766 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2055 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1767 2056
1768 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2057 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1769 2058
1770 ANHE_at_cache (periodics [HEAP0]); 2059 ANHE_at_cache (periodics [HEAP0]);
1771 downheap (periodics, periodiccnt, HEAP0); 2060 downheap (periodics, periodiccnt, HEAP0);
2061 }
2062 else if (w->interval)
2063 {
2064 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2065 /* if next trigger time is not sufficiently in the future, put it there */
2066 /* this might happen because of floating point inexactness */
2067 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2068 {
2069 ev_at (w) += w->interval;
2070
2071 /* if interval is unreasonably low we might still have a time in the past */
2072 /* so correct this. this will make the periodic very inexact, but the user */
2073 /* has effectively asked to get triggered more often than possible */
2074 if (ev_at (w) < ev_rt_now)
2075 ev_at (w) = ev_rt_now;
2076 }
2077
2078 ANHE_at_cache (periodics [HEAP0]);
2079 downheap (periodics, periodiccnt, HEAP0);
2080 }
2081 else
2082 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2083
2084 EV_FREQUENT_CHECK;
2085 feed_reverse (EV_A_ (W)w);
1772 } 2086 }
1773 else if (w->interval) 2087 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1774 {
1775 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1776 /* if next trigger time is not sufficiently in the future, put it there */
1777 /* this might happen because of floating point inexactness */
1778 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1779 {
1780 ev_at (w) += w->interval;
1781 2088
1782 /* if interval is unreasonably low we might still have a time in the past */
1783 /* so correct this. this will make the periodic very inexact, but the user */
1784 /* has effectively asked to get triggered more often than possible */
1785 if (ev_at (w) < ev_rt_now)
1786 ev_at (w) = ev_rt_now;
1787 }
1788
1789 ANHE_at_cache (periodics [HEAP0]);
1790 downheap (periodics, periodiccnt, HEAP0);
1791 }
1792 else
1793 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1794
1795 EV_FREQUENT_CHECK;
1796 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2089 feed_reverse_done (EV_A_ EV_PERIODIC);
1797 } 2090 }
1798} 2091}
1799 2092
2093/* simply recalculate all periodics */
2094/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1800static void noinline 2095static void noinline
1801periodics_reschedule (EV_P) 2096periodics_reschedule (EV_P)
1802{ 2097{
1803 int i; 2098 int i;
1804 2099
… …
1817 2112
1818 reheap (periodics, periodiccnt); 2113 reheap (periodics, periodiccnt);
1819} 2114}
1820#endif 2115#endif
1821 2116
1822void inline_speed 2117/* adjust all timers by a given offset */
2118static void noinline
2119timers_reschedule (EV_P_ ev_tstamp adjust)
2120{
2121 int i;
2122
2123 for (i = 0; i < timercnt; ++i)
2124 {
2125 ANHE *he = timers + i + HEAP0;
2126 ANHE_w (*he)->at += adjust;
2127 ANHE_at_cache (*he);
2128 }
2129}
2130
2131/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */
2133inline_speed void
1823time_update (EV_P_ ev_tstamp max_block) 2134time_update (EV_P_ ev_tstamp max_block)
1824{ 2135{
1825 int i;
1826
1827#if EV_USE_MONOTONIC 2136#if EV_USE_MONOTONIC
1828 if (expect_true (have_monotonic)) 2137 if (expect_true (have_monotonic))
1829 { 2138 {
2139 int i;
1830 ev_tstamp odiff = rtmn_diff; 2140 ev_tstamp odiff = rtmn_diff;
1831 2141
1832 mn_now = get_clock (); 2142 mn_now = get_clock ();
1833 2143
1834 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2144 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1860 ev_rt_now = ev_time (); 2170 ev_rt_now = ev_time ();
1861 mn_now = get_clock (); 2171 mn_now = get_clock ();
1862 now_floor = mn_now; 2172 now_floor = mn_now;
1863 } 2173 }
1864 2174
2175 /* no timer adjustment, as the monotonic clock doesn't jump */
2176 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1865# if EV_PERIODIC_ENABLE 2177# if EV_PERIODIC_ENABLE
1866 periodics_reschedule (EV_A); 2178 periodics_reschedule (EV_A);
1867# endif 2179# endif
1868 /* no timer adjustment, as the monotonic clock doesn't jump */
1869 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1870 } 2180 }
1871 else 2181 else
1872#endif 2182#endif
1873 { 2183 {
1874 ev_rt_now = ev_time (); 2184 ev_rt_now = ev_time ();
1875 2185
1876 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2186 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1877 { 2187 {
2188 /* adjust timers. this is easy, as the offset is the same for all of them */
2189 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1878#if EV_PERIODIC_ENABLE 2190#if EV_PERIODIC_ENABLE
1879 periodics_reschedule (EV_A); 2191 periodics_reschedule (EV_A);
1880#endif 2192#endif
1881 /* adjust timers. this is easy, as the offset is the same for all of them */
1882 for (i = 0; i < timercnt; ++i)
1883 {
1884 ANHE *he = timers + i + HEAP0;
1885 ANHE_w (*he)->at += ev_rt_now - mn_now;
1886 ANHE_at_cache (*he);
1887 }
1888 } 2193 }
1889 2194
1890 mn_now = ev_rt_now; 2195 mn_now = ev_rt_now;
1891 } 2196 }
1892} 2197}
1893 2198
1894void 2199void
1895ev_ref (EV_P)
1896{
1897 ++activecnt;
1898}
1899
1900void
1901ev_unref (EV_P)
1902{
1903 --activecnt;
1904}
1905
1906void
1907ev_now_update (EV_P)
1908{
1909 time_update (EV_A_ 1e100);
1910}
1911
1912static int loop_done;
1913
1914void
1915ev_loop (EV_P_ int flags) 2200ev_loop (EV_P_ int flags)
1916{ 2201{
2202#if EV_MINIMAL < 2
2203 ++loop_depth;
2204#endif
2205
2206 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2207
1917 loop_done = EVUNLOOP_CANCEL; 2208 loop_done = EVUNLOOP_CANCEL;
1918 2209
1919 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2210 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1920 2211
1921 do 2212 do
1922 { 2213 {
1923#if EV_VERIFY >= 2 2214#if EV_VERIFY >= 2
1924 ev_loop_verify (EV_A); 2215 ev_loop_verify (EV_A);
… …
1937 /* we might have forked, so queue fork handlers */ 2228 /* we might have forked, so queue fork handlers */
1938 if (expect_false (postfork)) 2229 if (expect_false (postfork))
1939 if (forkcnt) 2230 if (forkcnt)
1940 { 2231 {
1941 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1942 call_pending (EV_A); 2233 EV_INVOKE_PENDING;
1943 } 2234 }
1944#endif 2235#endif
1945 2236
1946 /* queue prepare watchers (and execute them) */ 2237 /* queue prepare watchers (and execute them) */
1947 if (expect_false (preparecnt)) 2238 if (expect_false (preparecnt))
1948 { 2239 {
1949 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1950 call_pending (EV_A); 2241 EV_INVOKE_PENDING;
1951 } 2242 }
1952 2243
1953 if (expect_false (!activecnt)) 2244 if (expect_false (loop_done))
1954 break; 2245 break;
1955 2246
1956 /* we might have forked, so reify kernel state if necessary */ 2247 /* we might have forked, so reify kernel state if necessary */
1957 if (expect_false (postfork)) 2248 if (expect_false (postfork))
1958 loop_fork (EV_A); 2249 loop_fork (EV_A);
… …
1965 ev_tstamp waittime = 0.; 2256 ev_tstamp waittime = 0.;
1966 ev_tstamp sleeptime = 0.; 2257 ev_tstamp sleeptime = 0.;
1967 2258
1968 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2259 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1969 { 2260 {
2261 /* remember old timestamp for io_blocktime calculation */
2262 ev_tstamp prev_mn_now = mn_now;
2263
1970 /* update time to cancel out callback processing overhead */ 2264 /* update time to cancel out callback processing overhead */
1971 time_update (EV_A_ 1e100); 2265 time_update (EV_A_ 1e100);
1972 2266
1973 waittime = MAX_BLOCKTIME; 2267 waittime = MAX_BLOCKTIME;
1974 2268
… …
1984 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2278 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1985 if (waittime > to) waittime = to; 2279 if (waittime > to) waittime = to;
1986 } 2280 }
1987#endif 2281#endif
1988 2282
2283 /* don't let timeouts decrease the waittime below timeout_blocktime */
1989 if (expect_false (waittime < timeout_blocktime)) 2284 if (expect_false (waittime < timeout_blocktime))
1990 waittime = timeout_blocktime; 2285 waittime = timeout_blocktime;
1991 2286
1992 sleeptime = waittime - backend_fudge; 2287 /* extra check because io_blocktime is commonly 0 */
1993
1994 if (expect_true (sleeptime > io_blocktime)) 2288 if (expect_false (io_blocktime))
1995 sleeptime = io_blocktime;
1996
1997 if (sleeptime)
1998 { 2289 {
2290 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2291
2292 if (sleeptime > waittime - backend_fudge)
2293 sleeptime = waittime - backend_fudge;
2294
2295 if (expect_true (sleeptime > 0.))
2296 {
1999 ev_sleep (sleeptime); 2297 ev_sleep (sleeptime);
2000 waittime -= sleeptime; 2298 waittime -= sleeptime;
2299 }
2001 } 2300 }
2002 } 2301 }
2003 2302
2303#if EV_MINIMAL < 2
2004 ++loop_count; 2304 ++loop_count;
2305#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2005 backend_poll (EV_A_ waittime); 2307 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2006 2309
2007 /* update ev_rt_now, do magic */ 2310 /* update ev_rt_now, do magic */
2008 time_update (EV_A_ waittime + sleeptime); 2311 time_update (EV_A_ waittime + sleeptime);
2009 } 2312 }
2010 2313
… …
2021 2324
2022 /* queue check watchers, to be executed first */ 2325 /* queue check watchers, to be executed first */
2023 if (expect_false (checkcnt)) 2326 if (expect_false (checkcnt))
2024 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2025 2328
2026 call_pending (EV_A); 2329 EV_INVOKE_PENDING;
2027 } 2330 }
2028 while (expect_true ( 2331 while (expect_true (
2029 activecnt 2332 activecnt
2030 && !loop_done 2333 && !loop_done
2031 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2334 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2032 )); 2335 ));
2033 2336
2034 if (loop_done == EVUNLOOP_ONE) 2337 if (loop_done == EVUNLOOP_ONE)
2035 loop_done = EVUNLOOP_CANCEL; 2338 loop_done = EVUNLOOP_CANCEL;
2339
2340#if EV_MINIMAL < 2
2341 --loop_depth;
2342#endif
2036} 2343}
2037 2344
2038void 2345void
2039ev_unloop (EV_P_ int how) 2346ev_unloop (EV_P_ int how)
2040{ 2347{
2041 loop_done = how; 2348 loop_done = how;
2042} 2349}
2043 2350
2351void
2352ev_ref (EV_P)
2353{
2354 ++activecnt;
2355}
2356
2357void
2358ev_unref (EV_P)
2359{
2360 --activecnt;
2361}
2362
2363void
2364ev_now_update (EV_P)
2365{
2366 time_update (EV_A_ 1e100);
2367}
2368
2369void
2370ev_suspend (EV_P)
2371{
2372 ev_now_update (EV_A);
2373}
2374
2375void
2376ev_resume (EV_P)
2377{
2378 ev_tstamp mn_prev = mn_now;
2379
2380 ev_now_update (EV_A);
2381 timers_reschedule (EV_A_ mn_now - mn_prev);
2382#if EV_PERIODIC_ENABLE
2383 /* TODO: really do this? */
2384 periodics_reschedule (EV_A);
2385#endif
2386}
2387
2044/*****************************************************************************/ 2388/*****************************************************************************/
2389/* singly-linked list management, used when the expected list length is short */
2045 2390
2046void inline_size 2391inline_size void
2047wlist_add (WL *head, WL elem) 2392wlist_add (WL *head, WL elem)
2048{ 2393{
2049 elem->next = *head; 2394 elem->next = *head;
2050 *head = elem; 2395 *head = elem;
2051} 2396}
2052 2397
2053void inline_size 2398inline_size void
2054wlist_del (WL *head, WL elem) 2399wlist_del (WL *head, WL elem)
2055{ 2400{
2056 while (*head) 2401 while (*head)
2057 { 2402 {
2058 if (*head == elem) 2403 if (expect_true (*head == elem))
2059 { 2404 {
2060 *head = elem->next; 2405 *head = elem->next;
2061 return; 2406 break;
2062 } 2407 }
2063 2408
2064 head = &(*head)->next; 2409 head = &(*head)->next;
2065 } 2410 }
2066} 2411}
2067 2412
2068void inline_speed 2413/* internal, faster, version of ev_clear_pending */
2414inline_speed void
2069clear_pending (EV_P_ W w) 2415clear_pending (EV_P_ W w)
2070{ 2416{
2071 if (w->pending) 2417 if (w->pending)
2072 { 2418 {
2073 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2419 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2074 w->pending = 0; 2420 w->pending = 0;
2075 } 2421 }
2076} 2422}
2077 2423
2078int 2424int
… …
2082 int pending = w_->pending; 2428 int pending = w_->pending;
2083 2429
2084 if (expect_true (pending)) 2430 if (expect_true (pending))
2085 { 2431 {
2086 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2432 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2433 p->w = (W)&pending_w;
2087 w_->pending = 0; 2434 w_->pending = 0;
2088 p->w = 0;
2089 return p->events; 2435 return p->events;
2090 } 2436 }
2091 else 2437 else
2092 return 0; 2438 return 0;
2093} 2439}
2094 2440
2095void inline_size 2441inline_size void
2096pri_adjust (EV_P_ W w) 2442pri_adjust (EV_P_ W w)
2097{ 2443{
2098 int pri = w->priority; 2444 int pri = ev_priority (w);
2099 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2445 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2100 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2446 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2101 w->priority = pri; 2447 ev_set_priority (w, pri);
2102} 2448}
2103 2449
2104void inline_speed 2450inline_speed void
2105ev_start (EV_P_ W w, int active) 2451ev_start (EV_P_ W w, int active)
2106{ 2452{
2107 pri_adjust (EV_A_ w); 2453 pri_adjust (EV_A_ w);
2108 w->active = active; 2454 w->active = active;
2109 ev_ref (EV_A); 2455 ev_ref (EV_A);
2110} 2456}
2111 2457
2112void inline_size 2458inline_size void
2113ev_stop (EV_P_ W w) 2459ev_stop (EV_P_ W w)
2114{ 2460{
2115 ev_unref (EV_A); 2461 ev_unref (EV_A);
2116 w->active = 0; 2462 w->active = 0;
2117} 2463}
… …
2124 int fd = w->fd; 2470 int fd = w->fd;
2125 2471
2126 if (expect_false (ev_is_active (w))) 2472 if (expect_false (ev_is_active (w)))
2127 return; 2473 return;
2128 2474
2129 assert (("ev_io_start called with negative fd", fd >= 0)); 2475 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2130 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE)))); 2476 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2131 2477
2132 EV_FREQUENT_CHECK; 2478 EV_FREQUENT_CHECK;
2133 2479
2134 ev_start (EV_A_ (W)w, 1); 2480 ev_start (EV_A_ (W)w, 1);
2135 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2136 wlist_add (&anfds[fd].head, (WL)w); 2482 wlist_add (&anfds[fd].head, (WL)w);
2137 2483
2138 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2484 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2139 w->events &= ~EV_IOFDSET; 2485 w->events &= ~EV__IOFDSET;
2140 2486
2141 EV_FREQUENT_CHECK; 2487 EV_FREQUENT_CHECK;
2142} 2488}
2143 2489
2144void noinline 2490void noinline
… …
2146{ 2492{
2147 clear_pending (EV_A_ (W)w); 2493 clear_pending (EV_A_ (W)w);
2148 if (expect_false (!ev_is_active (w))) 2494 if (expect_false (!ev_is_active (w)))
2149 return; 2495 return;
2150 2496
2151 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2497 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2152 2498
2153 EV_FREQUENT_CHECK; 2499 EV_FREQUENT_CHECK;
2154 2500
2155 wlist_del (&anfds[w->fd].head, (WL)w); 2501 wlist_del (&anfds[w->fd].head, (WL)w);
2156 ev_stop (EV_A_ (W)w); 2502 ev_stop (EV_A_ (W)w);
… …
2166 if (expect_false (ev_is_active (w))) 2512 if (expect_false (ev_is_active (w)))
2167 return; 2513 return;
2168 2514
2169 ev_at (w) += mn_now; 2515 ev_at (w) += mn_now;
2170 2516
2171 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2517 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2172 2518
2173 EV_FREQUENT_CHECK; 2519 EV_FREQUENT_CHECK;
2174 2520
2175 ++timercnt; 2521 ++timercnt;
2176 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2522 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2179 ANHE_at_cache (timers [ev_active (w)]); 2525 ANHE_at_cache (timers [ev_active (w)]);
2180 upheap (timers, ev_active (w)); 2526 upheap (timers, ev_active (w));
2181 2527
2182 EV_FREQUENT_CHECK; 2528 EV_FREQUENT_CHECK;
2183 2529
2184 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2530 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2185} 2531}
2186 2532
2187void noinline 2533void noinline
2188ev_timer_stop (EV_P_ ev_timer *w) 2534ev_timer_stop (EV_P_ ev_timer *w)
2189{ 2535{
… …
2194 EV_FREQUENT_CHECK; 2540 EV_FREQUENT_CHECK;
2195 2541
2196 { 2542 {
2197 int active = ev_active (w); 2543 int active = ev_active (w);
2198 2544
2199 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2545 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2200 2546
2201 --timercnt; 2547 --timercnt;
2202 2548
2203 if (expect_true (active < timercnt + HEAP0)) 2549 if (expect_true (active < timercnt + HEAP0))
2204 { 2550 {
… …
2237 } 2583 }
2238 2584
2239 EV_FREQUENT_CHECK; 2585 EV_FREQUENT_CHECK;
2240} 2586}
2241 2587
2588ev_tstamp
2589ev_timer_remaining (EV_P_ ev_timer *w)
2590{
2591 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2592}
2593
2242#if EV_PERIODIC_ENABLE 2594#if EV_PERIODIC_ENABLE
2243void noinline 2595void noinline
2244ev_periodic_start (EV_P_ ev_periodic *w) 2596ev_periodic_start (EV_P_ ev_periodic *w)
2245{ 2597{
2246 if (expect_false (ev_is_active (w))) 2598 if (expect_false (ev_is_active (w)))
… …
2248 2600
2249 if (w->reschedule_cb) 2601 if (w->reschedule_cb)
2250 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2602 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2251 else if (w->interval) 2603 else if (w->interval)
2252 { 2604 {
2253 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2605 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2254 /* this formula differs from the one in periodic_reify because we do not always round up */ 2606 /* this formula differs from the one in periodic_reify because we do not always round up */
2255 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2607 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2256 } 2608 }
2257 else 2609 else
2258 ev_at (w) = w->offset; 2610 ev_at (w) = w->offset;
… …
2266 ANHE_at_cache (periodics [ev_active (w)]); 2618 ANHE_at_cache (periodics [ev_active (w)]);
2267 upheap (periodics, ev_active (w)); 2619 upheap (periodics, ev_active (w));
2268 2620
2269 EV_FREQUENT_CHECK; 2621 EV_FREQUENT_CHECK;
2270 2622
2271 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2623 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2272} 2624}
2273 2625
2274void noinline 2626void noinline
2275ev_periodic_stop (EV_P_ ev_periodic *w) 2627ev_periodic_stop (EV_P_ ev_periodic *w)
2276{ 2628{
… …
2281 EV_FREQUENT_CHECK; 2633 EV_FREQUENT_CHECK;
2282 2634
2283 { 2635 {
2284 int active = ev_active (w); 2636 int active = ev_active (w);
2285 2637
2286 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2638 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2287 2639
2288 --periodiccnt; 2640 --periodiccnt;
2289 2641
2290 if (expect_true (active < periodiccnt + HEAP0)) 2642 if (expect_true (active < periodiccnt + HEAP0))
2291 { 2643 {
… …
2313#endif 2665#endif
2314 2666
2315void noinline 2667void noinline
2316ev_signal_start (EV_P_ ev_signal *w) 2668ev_signal_start (EV_P_ ev_signal *w)
2317{ 2669{
2318#if EV_MULTIPLICITY
2319 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2320#endif
2321 if (expect_false (ev_is_active (w))) 2670 if (expect_false (ev_is_active (w)))
2322 return; 2671 return;
2323 2672
2324 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2673 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2325 2674
2326 evpipe_init (EV_A); 2675#if EV_MULTIPLICITY
2676 assert (("libev: a signal must not be attached to two different loops",
2677 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2327 2678
2328 EV_FREQUENT_CHECK; 2679 signals [w->signum - 1].loop = EV_A;
2680#endif
2329 2681
2682 EV_FREQUENT_CHECK;
2683
2684#if EV_USE_SIGNALFD
2685 if (sigfd == -2)
2330 { 2686 {
2331#ifndef _WIN32 2687 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2332 sigset_t full, prev; 2688 if (sigfd < 0 && errno == EINVAL)
2333 sigfillset (&full); 2689 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2334 sigprocmask (SIG_SETMASK, &full, &prev);
2335#endif
2336 2690
2337 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2691 if (sigfd >= 0)
2692 {
2693 fd_intern (sigfd); /* doing it twice will not hurt */
2338 2694
2339#ifndef _WIN32 2695 sigemptyset (&sigfd_set);
2340 sigprocmask (SIG_SETMASK, &prev, 0); 2696
2341#endif 2697 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2698 ev_set_priority (&sigfd_w, EV_MAXPRI);
2699 ev_io_start (EV_A_ &sigfd_w);
2700 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2701 }
2342 } 2702 }
2703
2704 if (sigfd >= 0)
2705 {
2706 /* TODO: check .head */
2707 sigaddset (&sigfd_set, w->signum);
2708 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2709
2710 signalfd (sigfd, &sigfd_set, 0);
2711 }
2712#endif
2343 2713
2344 ev_start (EV_A_ (W)w, 1); 2714 ev_start (EV_A_ (W)w, 1);
2345 wlist_add (&signals [w->signum - 1].head, (WL)w); 2715 wlist_add (&signals [w->signum - 1].head, (WL)w);
2346 2716
2347 if (!((WL)w)->next) 2717 if (!((WL)w)->next)
2718# if EV_USE_SIGNALFD
2719 if (sigfd < 0) /*TODO*/
2720# endif
2348 { 2721 {
2349#if _WIN32 2722# if _WIN32
2350 signal (w->signum, ev_sighandler); 2723 signal (w->signum, ev_sighandler);
2351#else 2724# else
2352 struct sigaction sa; 2725 struct sigaction sa;
2726
2727 evpipe_init (EV_A);
2728
2353 sa.sa_handler = ev_sighandler; 2729 sa.sa_handler = ev_sighandler;
2354 sigfillset (&sa.sa_mask); 2730 sigfillset (&sa.sa_mask);
2355 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2731 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2356 sigaction (w->signum, &sa, 0); 2732 sigaction (w->signum, &sa, 0);
2733
2734 sigemptyset (&sa.sa_mask);
2735 sigaddset (&sa.sa_mask, w->signum);
2736 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2357#endif 2737#endif
2358 } 2738 }
2359 2739
2360 EV_FREQUENT_CHECK; 2740 EV_FREQUENT_CHECK;
2361} 2741}
2362 2742
2363void noinline 2743void noinline
… …
2371 2751
2372 wlist_del (&signals [w->signum - 1].head, (WL)w); 2752 wlist_del (&signals [w->signum - 1].head, (WL)w);
2373 ev_stop (EV_A_ (W)w); 2753 ev_stop (EV_A_ (W)w);
2374 2754
2375 if (!signals [w->signum - 1].head) 2755 if (!signals [w->signum - 1].head)
2756 {
2757#if EV_MULTIPLICITY
2758 signals [w->signum - 1].loop = 0; /* unattach from signal */
2759#endif
2760#if EV_USE_SIGNALFD
2761 if (sigfd >= 0)
2762 {
2763 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2764 sigdelset (&sigfd_set, w->signum);
2765 signalfd (sigfd, &sigfd_set, 0);
2766 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2767 /*TODO: maybe unblock signal? */
2768 }
2769 else
2770#endif
2376 signal (w->signum, SIG_DFL); 2771 signal (w->signum, SIG_DFL);
2772 }
2377 2773
2378 EV_FREQUENT_CHECK; 2774 EV_FREQUENT_CHECK;
2379} 2775}
2380 2776
2381void 2777void
2382ev_child_start (EV_P_ ev_child *w) 2778ev_child_start (EV_P_ ev_child *w)
2383{ 2779{
2384#if EV_MULTIPLICITY 2780#if EV_MULTIPLICITY
2385 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2781 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2386#endif 2782#endif
2387 if (expect_false (ev_is_active (w))) 2783 if (expect_false (ev_is_active (w)))
2388 return; 2784 return;
2389 2785
2390 EV_FREQUENT_CHECK; 2786 EV_FREQUENT_CHECK;
… …
2449 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2845 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2450 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2846 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2451 2847
2452 char *pend = strrchr (path, '/'); 2848 char *pend = strrchr (path, '/');
2453 2849
2454 if (!pend) 2850 if (!pend || pend == path)
2455 break; /* whoops, no '/', complain to your admin */ 2851 break;
2456 2852
2457 *pend = 0; 2853 *pend = 0;
2458 w->wd = inotify_add_watch (fs_fd, path, mask); 2854 w->wd = inotify_add_watch (fs_fd, path, mask);
2459 } 2855 }
2460 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2856 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2461 } 2857 }
2462 } 2858 }
2463 else 2859
2860 if (w->wd >= 0)
2464 { 2861 {
2465 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2862 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2466 2863
2467 /* now local changes will be tracked by inotify, but remote changes won't */ 2864 /* now local changes will be tracked by inotify, but remote changes won't */
2468 /* unless the filesystem it known to be local, we therefore still poll */ 2865 /* unless the filesystem it known to be local, we therefore still poll */
… …
2518 2915
2519 if (w->wd == wd || wd == -1) 2916 if (w->wd == wd || wd == -1)
2520 { 2917 {
2521 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2918 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2522 { 2919 {
2920 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2523 w->wd = -1; 2921 w->wd = -1;
2524 infy_add (EV_A_ w); /* re-add, no matter what */ 2922 infy_add (EV_A_ w); /* re-add, no matter what */
2525 } 2923 }
2526 2924
2527 stat_timer_cb (EV_A_ &w->timer, 0); 2925 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2540 2938
2541 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2939 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2542 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2940 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2543} 2941}
2544 2942
2545void inline_size 2943inline_size void
2546check_2625 (EV_P) 2944check_2625 (EV_P)
2547{ 2945{
2548 /* kernels < 2.6.25 are borked 2946 /* kernels < 2.6.25 are borked
2549 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2947 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2550 */ 2948 */
… …
2563 return; 2961 return;
2564 2962
2565 fs_2625 = 1; 2963 fs_2625 = 1;
2566} 2964}
2567 2965
2568void inline_size 2966inline_size void
2569infy_init (EV_P) 2967infy_init (EV_P)
2570{ 2968{
2571 if (fs_fd != -2) 2969 if (fs_fd != -2)
2572 return; 2970 return;
2573 2971
… …
2583 ev_set_priority (&fs_w, EV_MAXPRI); 2981 ev_set_priority (&fs_w, EV_MAXPRI);
2584 ev_io_start (EV_A_ &fs_w); 2982 ev_io_start (EV_A_ &fs_w);
2585 } 2983 }
2586} 2984}
2587 2985
2588void inline_size 2986inline_size void
2589infy_fork (EV_P) 2987infy_fork (EV_P)
2590{ 2988{
2591 int slot; 2989 int slot;
2592 2990
2593 if (fs_fd < 0) 2991 if (fs_fd < 0)
… …
2859embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3257embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2860{ 3258{
2861 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3259 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2862 3260
2863 { 3261 {
2864 struct ev_loop *loop = w->other; 3262 EV_P = w->other;
2865 3263
2866 while (fdchangecnt) 3264 while (fdchangecnt)
2867 { 3265 {
2868 fd_reify (EV_A); 3266 fd_reify (EV_A);
2869 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3267 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2874static void 3272static void
2875embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3273embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2876{ 3274{
2877 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3275 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2878 3276
3277 ev_embed_stop (EV_A_ w);
3278
2879 { 3279 {
2880 struct ev_loop *loop = w->other; 3280 EV_P = w->other;
2881 3281
2882 ev_loop_fork (EV_A); 3282 ev_loop_fork (EV_A);
3283 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2883 } 3284 }
3285
3286 ev_embed_start (EV_A_ w);
2884} 3287}
2885 3288
2886#if 0 3289#if 0
2887static void 3290static void
2888embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3291embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2896{ 3299{
2897 if (expect_false (ev_is_active (w))) 3300 if (expect_false (ev_is_active (w)))
2898 return; 3301 return;
2899 3302
2900 { 3303 {
2901 struct ev_loop *loop = w->other; 3304 EV_P = w->other;
2902 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3305 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2903 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3306 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2904 } 3307 }
2905 3308
2906 EV_FREQUENT_CHECK; 3309 EV_FREQUENT_CHECK;
2907 3310
… …
3018 3421
3019void 3422void
3020ev_async_send (EV_P_ ev_async *w) 3423ev_async_send (EV_P_ ev_async *w)
3021{ 3424{
3022 w->sent = 1; 3425 w->sent = 1;
3023 evpipe_write (EV_A_ &gotasync); 3426 evpipe_write (EV_A_ &async_pending);
3024} 3427}
3025#endif 3428#endif
3026 3429
3027/*****************************************************************************/ 3430/*****************************************************************************/
3028 3431
… …
3090 ev_timer_set (&once->to, timeout, 0.); 3493 ev_timer_set (&once->to, timeout, 0.);
3091 ev_timer_start (EV_A_ &once->to); 3494 ev_timer_start (EV_A_ &once->to);
3092 } 3495 }
3093} 3496}
3094 3497
3498/*****************************************************************************/
3499
3500#if EV_WALK_ENABLE
3501void
3502ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3503{
3504 int i, j;
3505 ev_watcher_list *wl, *wn;
3506
3507 if (types & (EV_IO | EV_EMBED))
3508 for (i = 0; i < anfdmax; ++i)
3509 for (wl = anfds [i].head; wl; )
3510 {
3511 wn = wl->next;
3512
3513#if EV_EMBED_ENABLE
3514 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3515 {
3516 if (types & EV_EMBED)
3517 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3518 }
3519 else
3520#endif
3521#if EV_USE_INOTIFY
3522 if (ev_cb ((ev_io *)wl) == infy_cb)
3523 ;
3524 else
3525#endif
3526 if ((ev_io *)wl != &pipe_w)
3527 if (types & EV_IO)
3528 cb (EV_A_ EV_IO, wl);
3529
3530 wl = wn;
3531 }
3532
3533 if (types & (EV_TIMER | EV_STAT))
3534 for (i = timercnt + HEAP0; i-- > HEAP0; )
3535#if EV_STAT_ENABLE
3536 /*TODO: timer is not always active*/
3537 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3538 {
3539 if (types & EV_STAT)
3540 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3541 }
3542 else
3543#endif
3544 if (types & EV_TIMER)
3545 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3546
3547#if EV_PERIODIC_ENABLE
3548 if (types & EV_PERIODIC)
3549 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3550 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3551#endif
3552
3553#if EV_IDLE_ENABLE
3554 if (types & EV_IDLE)
3555 for (j = NUMPRI; i--; )
3556 for (i = idlecnt [j]; i--; )
3557 cb (EV_A_ EV_IDLE, idles [j][i]);
3558#endif
3559
3560#if EV_FORK_ENABLE
3561 if (types & EV_FORK)
3562 for (i = forkcnt; i--; )
3563 if (ev_cb (forks [i]) != embed_fork_cb)
3564 cb (EV_A_ EV_FORK, forks [i]);
3565#endif
3566
3567#if EV_ASYNC_ENABLE
3568 if (types & EV_ASYNC)
3569 for (i = asynccnt; i--; )
3570 cb (EV_A_ EV_ASYNC, asyncs [i]);
3571#endif
3572
3573 if (types & EV_PREPARE)
3574 for (i = preparecnt; i--; )
3575#if EV_EMBED_ENABLE
3576 if (ev_cb (prepares [i]) != embed_prepare_cb)
3577#endif
3578 cb (EV_A_ EV_PREPARE, prepares [i]);
3579
3580 if (types & EV_CHECK)
3581 for (i = checkcnt; i--; )
3582 cb (EV_A_ EV_CHECK, checks [i]);
3583
3584 if (types & EV_SIGNAL)
3585 for (i = 0; i < EV_NSIG - 1; ++i)
3586 for (wl = signals [i].head; wl; )
3587 {
3588 wn = wl->next;
3589 cb (EV_A_ EV_SIGNAL, wl);
3590 wl = wn;
3591 }
3592
3593 if (types & EV_CHILD)
3594 for (i = EV_PID_HASHSIZE; i--; )
3595 for (wl = childs [i]; wl; )
3596 {
3597 wn = wl->next;
3598 cb (EV_A_ EV_CHILD, wl);
3599 wl = wn;
3600 }
3601/* EV_STAT 0x00001000 /* stat data changed */
3602/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3603}
3604#endif
3605
3095#if EV_MULTIPLICITY 3606#if EV_MULTIPLICITY
3096 #include "ev_wrap.h" 3607 #include "ev_wrap.h"
3097#endif 3608#endif
3098 3609
3099#ifdef __cplusplus 3610#ifdef __cplusplus

Diff Legend

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