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

Comparing libev/ev.c (file contents):
Revision 1.285 by root, Wed Apr 15 19:35:53 2009 UTC vs.
Revision 1.327 by root, Sun Feb 14 19:09:04 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 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
108# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
109# endif 111# endif
110# endif 112# endif
111 113
112# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
113# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
115# else 117# else
116# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
117# endif 119# endif
118# endif 120# 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
143 153
144#endif 154#endif
145 155
146#include <math.h> 156#include <math.h>
147#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
148#include <fcntl.h> 159#include <fcntl.h>
149#include <stddef.h> 160#include <stddef.h>
150 161
151#include <stdio.h> 162#include <stdio.h>
152 163
153#include <assert.h> 164#include <assert.h>
154#include <errno.h> 165#include <errno.h>
155#include <sys/types.h> 166#include <sys/types.h>
156#include <time.h> 167#include <time.h>
168#include <limits.h>
157 169
158#include <signal.h> 170#include <signal.h>
159 171
160#ifdef EV_H 172#ifdef EV_H
161# include EV_H 173# include EV_H
176# endif 188# endif
177#endif 189#endif
178 190
179/* this block tries to deduce configuration from header-defined symbols and defaults */ 191/* this block tries to deduce configuration from header-defined symbols and defaults */
180 192
193/* try to deduce the maximum number of signals on this platform */
194#if defined (EV_NSIG)
195/* use what's provided */
196#elif defined (NSIG)
197# define EV_NSIG (NSIG)
198#elif defined(_NSIG)
199# define EV_NSIG (_NSIG)
200#elif defined (SIGMAX)
201# define EV_NSIG (SIGMAX+1)
202#elif defined (SIG_MAX)
203# define EV_NSIG (SIG_MAX+1)
204#elif defined (_SIG_MAX)
205# define EV_NSIG (_SIG_MAX+1)
206#elif defined (MAXSIG)
207# define EV_NSIG (MAXSIG+1)
208#elif defined (MAX_SIG)
209# define EV_NSIG (MAX_SIG+1)
210#elif defined (SIGARRAYSIZE)
211# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
212#elif defined (_sys_nsig)
213# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
214#else
215# error "unable to find value for NSIG, please report"
216/* to make it compile regardless, just remove the above line */
217# define EV_NSIG 65
218#endif
219
181#ifndef EV_USE_CLOCK_SYSCALL 220#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 221# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 222# define EV_USE_CLOCK_SYSCALL 1
184# else 223# else
185# define EV_USE_CLOCK_SYSCALL 0 224# define EV_USE_CLOCK_SYSCALL 0
264# else 303# else
265# define EV_USE_EVENTFD 0 304# define EV_USE_EVENTFD 0
266# endif 305# endif
267#endif 306#endif
268 307
308#ifndef EV_USE_SIGNALFD
309# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
310# define EV_USE_SIGNALFD 1
311# else
312# define EV_USE_SIGNALFD 0
313# endif
314#endif
315
269#if 0 /* debugging */ 316#if 0 /* debugging */
270# define EV_VERIFY 3 317# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 318# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 319# define EV_HEAP_CACHE_AT 1
273#endif 320#endif
282 329
283#ifndef EV_HEAP_CACHE_AT 330#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 331# define EV_HEAP_CACHE_AT !EV_MINIMAL
285#endif 332#endif
286 333
334/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
335/* which makes programs even slower. might work on other unices, too. */
336#if EV_USE_CLOCK_SYSCALL
337# include <syscall.h>
338# ifdef SYS_clock_gettime
339# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
340# undef EV_USE_MONOTONIC
341# define EV_USE_MONOTONIC 1
342# else
343# undef EV_USE_CLOCK_SYSCALL
344# define EV_USE_CLOCK_SYSCALL 0
345# endif
346#endif
347
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 348/* this block fixes any misconfiguration where we know we run into trouble otherwise */
349
350#ifdef _AIX
351/* AIX has a completely broken poll.h header */
352# undef EV_USE_POLL
353# define EV_USE_POLL 0
354#endif
288 355
289#ifndef CLOCK_MONOTONIC 356#ifndef CLOCK_MONOTONIC
290# undef EV_USE_MONOTONIC 357# undef EV_USE_MONOTONIC
291# define EV_USE_MONOTONIC 0 358# define EV_USE_MONOTONIC 0
292#endif 359#endif
320 387
321#if EV_SELECT_IS_WINSOCKET 388#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 389# include <winsock.h>
323#endif 390#endif
324 391
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 392#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 393/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 394# include <stdint.h>
395# ifndef EFD_NONBLOCK
396# define EFD_NONBLOCK O_NONBLOCK
397# endif
398# ifndef EFD_CLOEXEC
399# ifdef O_CLOEXEC
400# define EFD_CLOEXEC O_CLOEXEC
401# else
402# define EFD_CLOEXEC 02000000
403# endif
404# endif
337# ifdef __cplusplus 405# ifdef __cplusplus
338extern "C" { 406extern "C" {
339# endif 407# endif
340int eventfd (unsigned int initval, int flags); 408int eventfd (unsigned int initval, int flags);
341# ifdef __cplusplus 409# ifdef __cplusplus
342} 410}
343# endif 411# endif
344#endif 412#endif
413
414#if EV_USE_SIGNALFD
415/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
416# include <stdint.h>
417# ifndef SFD_NONBLOCK
418# define SFD_NONBLOCK O_NONBLOCK
419# endif
420# ifndef SFD_CLOEXEC
421# ifdef O_CLOEXEC
422# define SFD_CLOEXEC O_CLOEXEC
423# else
424# define SFD_CLOEXEC 02000000
425# endif
426# endif
427# ifdef __cplusplus
428extern "C" {
429# endif
430int signalfd (int fd, const sigset_t *mask, int flags);
431
432struct signalfd_siginfo
433{
434 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)];
436};
437# ifdef __cplusplus
438}
439# endif
440#endif
441
345 442
346/**/ 443/**/
347 444
348#if EV_VERIFY >= 3 445#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 446# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
361 */ 458 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 459#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 460
364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 461#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
365#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 462#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
366/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
367 463
368#if __GNUC__ >= 4 464#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 465# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 466# define noinline __attribute__ ((noinline))
371#else 467#else
384# define inline_speed static noinline 480# define inline_speed static noinline
385#else 481#else
386# define inline_speed static inline 482# define inline_speed static inline
387#endif 483#endif
388 484
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 485#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
486
487#if EV_MINPRI == EV_MAXPRI
488# define ABSPRI(w) (((W)w), 0)
489#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 490# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
491#endif
391 492
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 493#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 494#define EMPTY2(a,b) /* used to suppress some warnings */
394 495
395typedef ev_watcher *W; 496typedef ev_watcher *W;
407 508
408#if EV_USE_MONOTONIC 509#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 510static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 511#endif
411 512
513#ifndef EV_FD_TO_WIN32_HANDLE
514# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
515#endif
516#ifndef EV_WIN32_HANDLE_TO_FD
517# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
518#endif
519#ifndef EV_WIN32_CLOSE_FD
520# define EV_WIN32_CLOSE_FD(fd) close (fd)
521#endif
522
412#ifdef _WIN32 523#ifdef _WIN32
413# include "ev_win32.c" 524# include "ev_win32.c"
414#endif 525#endif
415 526
416/*****************************************************************************/ 527/*****************************************************************************/
478#define ev_malloc(size) ev_realloc (0, (size)) 589#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 590#define ev_free(ptr) ev_realloc ((ptr), 0)
480 591
481/*****************************************************************************/ 592/*****************************************************************************/
482 593
594/* set in reify when reification needed */
595#define EV_ANFD_REIFY 1
596
597/* file descriptor info structure */
483typedef struct 598typedef struct
484{ 599{
485 WL head; 600 WL head;
486 unsigned char events; 601 unsigned char events; /* the events watched for */
487 unsigned char reify; 602 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
488 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 603 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 604 unsigned char unused;
490#if EV_USE_EPOLL 605#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 606 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 607#endif
493#if EV_SELECT_IS_WINSOCKET 608#if EV_SELECT_IS_WINSOCKET
494 SOCKET handle; 609 SOCKET handle;
495#endif 610#endif
496} ANFD; 611} ANFD;
497 612
613/* stores the pending event set for a given watcher */
498typedef struct 614typedef struct
499{ 615{
500 W w; 616 W w;
501 int events; 617 int events; /* the pending event set for the given watcher */
502} ANPENDING; 618} ANPENDING;
503 619
504#if EV_USE_INOTIFY 620#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 621/* hash table entry per inotify-id */
506typedef struct 622typedef struct
509} ANFS; 625} ANFS;
510#endif 626#endif
511 627
512/* Heap Entry */ 628/* Heap Entry */
513#if EV_HEAP_CACHE_AT 629#if EV_HEAP_CACHE_AT
630 /* a heap element */
514 typedef struct { 631 typedef struct {
515 ev_tstamp at; 632 ev_tstamp at;
516 WT w; 633 WT w;
517 } ANHE; 634 } ANHE;
518 635
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 636 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 637 #define ANHE_at(he) (he).at /* access cached at, read-only */
521 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 638 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 639#else
640 /* a heap element */
523 typedef WT ANHE; 641 typedef WT ANHE;
524 642
525 #define ANHE_w(he) (he) 643 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 644 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 645 #define ANHE_at_cache(he)
551 669
552 static int ev_default_loop_ptr; 670 static int ev_default_loop_ptr;
553 671
554#endif 672#endif
555 673
674#if EV_MINIMAL < 2
675# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
676# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
677# define EV_INVOKE_PENDING invoke_cb (EV_A)
678#else
679# define EV_RELEASE_CB (void)0
680# define EV_ACQUIRE_CB (void)0
681# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
682#endif
683
684#define EVUNLOOP_RECURSE 0x80
685
556/*****************************************************************************/ 686/*****************************************************************************/
557 687
688#ifndef EV_HAVE_EV_TIME
558ev_tstamp 689ev_tstamp
559ev_time (void) 690ev_time (void)
560{ 691{
561#if EV_USE_REALTIME 692#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 693 if (expect_true (have_realtime))
569 700
570 struct timeval tv; 701 struct timeval tv;
571 gettimeofday (&tv, 0); 702 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 703 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 704}
705#endif
574 706
575inline_size ev_tstamp 707inline_size ev_tstamp
576get_clock (void) 708get_clock (void)
577{ 709{
578#if EV_USE_MONOTONIC 710#if EV_USE_MONOTONIC
614 746
615 tv.tv_sec = (time_t)delay; 747 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 748 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617 749
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 750 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 751 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 752 /* by older ones */
621 select (0, 0, 0, 0, &tv); 753 select (0, 0, 0, 0, &tv);
622#endif 754#endif
623 } 755 }
624} 756}
625 757
626/*****************************************************************************/ 758/*****************************************************************************/
627 759
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 760#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 761
762/* find a suitable new size for the given array, */
763/* hopefully by rounding to a ncie-to-malloc size */
630inline_size int 764inline_size int
631array_nextsize (int elem, int cur, int cnt) 765array_nextsize (int elem, int cur, int cnt)
632{ 766{
633 int ncur = cur + 1; 767 int ncur = cur + 1;
634 768
680#define array_free(stem, idx) \ 814#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 815 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 816
683/*****************************************************************************/ 817/*****************************************************************************/
684 818
819/* dummy callback for pending events */
820static void noinline
821pendingcb (EV_P_ ev_prepare *w, int revents)
822{
823}
824
685void noinline 825void noinline
686ev_feed_event (EV_P_ void *w, int revents) 826ev_feed_event (EV_P_ void *w, int revents)
687{ 827{
688 W w_ = (W)w; 828 W w_ = (W)w;
689 int pri = ABSPRI (w_); 829 int pri = ABSPRI (w_);
724} 864}
725 865
726/*****************************************************************************/ 866/*****************************************************************************/
727 867
728inline_speed void 868inline_speed void
729fd_event (EV_P_ int fd, int revents) 869fd_event_nc (EV_P_ int fd, int revents)
730{ 870{
731 ANFD *anfd = anfds + fd; 871 ANFD *anfd = anfds + fd;
732 ev_io *w; 872 ev_io *w;
733 873
734 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 874 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
738 if (ev) 878 if (ev)
739 ev_feed_event (EV_A_ (W)w, ev); 879 ev_feed_event (EV_A_ (W)w, ev);
740 } 880 }
741} 881}
742 882
883/* do not submit kernel events for fds that have reify set */
884/* because that means they changed while we were polling for new events */
885inline_speed void
886fd_event (EV_P_ int fd, int revents)
887{
888 ANFD *anfd = anfds + fd;
889
890 if (expect_true (!anfd->reify))
891 fd_event_nc (EV_A_ fd, revents);
892}
893
743void 894void
744ev_feed_fd_event (EV_P_ int fd, int revents) 895ev_feed_fd_event (EV_P_ int fd, int revents)
745{ 896{
746 if (fd >= 0 && fd < anfdmax) 897 if (fd >= 0 && fd < anfdmax)
747 fd_event (EV_A_ fd, revents); 898 fd_event_nc (EV_A_ fd, revents);
748} 899}
749 900
901/* make sure the external fd watch events are in-sync */
902/* with the kernel/libev internal state */
750inline_size void 903inline_size void
751fd_reify (EV_P) 904fd_reify (EV_P)
752{ 905{
753 int i; 906 int i;
754 907
765 918
766#if EV_SELECT_IS_WINSOCKET 919#if EV_SELECT_IS_WINSOCKET
767 if (events) 920 if (events)
768 { 921 {
769 unsigned long arg; 922 unsigned long arg;
770 #ifdef EV_FD_TO_WIN32_HANDLE
771 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 923 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
772 #else
773 anfd->handle = _get_osfhandle (fd);
774 #endif
775 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 924 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
776 } 925 }
777#endif 926#endif
778 927
779 { 928 {
789 } 938 }
790 939
791 fdchangecnt = 0; 940 fdchangecnt = 0;
792} 941}
793 942
943/* something about the given fd changed */
794inline_size void 944inline_size void
795fd_change (EV_P_ int fd, int flags) 945fd_change (EV_P_ int fd, int flags)
796{ 946{
797 unsigned char reify = anfds [fd].reify; 947 unsigned char reify = anfds [fd].reify;
798 anfds [fd].reify |= flags; 948 anfds [fd].reify |= flags;
803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 953 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
804 fdchanges [fdchangecnt - 1] = fd; 954 fdchanges [fdchangecnt - 1] = fd;
805 } 955 }
806} 956}
807 957
958/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
808inline_speed void 959inline_speed void
809fd_kill (EV_P_ int fd) 960fd_kill (EV_P_ int fd)
810{ 961{
811 ev_io *w; 962 ev_io *w;
812 963
815 ev_io_stop (EV_A_ w); 966 ev_io_stop (EV_A_ w);
816 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 967 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
817 } 968 }
818} 969}
819 970
971/* check whether the given fd is atcually valid, for error recovery */
820inline_size int 972inline_size int
821fd_valid (int fd) 973fd_valid (int fd)
822{ 974{
823#ifdef _WIN32 975#ifdef _WIN32
824 return _get_osfhandle (fd) != -1; 976 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
825#else 977#else
826 return fcntl (fd, F_GETFD) != -1; 978 return fcntl (fd, F_GETFD) != -1;
827#endif 979#endif
828} 980}
829 981
847 999
848 for (fd = anfdmax; fd--; ) 1000 for (fd = anfdmax; fd--; )
849 if (anfds [fd].events) 1001 if (anfds [fd].events)
850 { 1002 {
851 fd_kill (EV_A_ fd); 1003 fd_kill (EV_A_ fd);
852 return; 1004 break;
853 } 1005 }
854} 1006}
855 1007
856/* usually called after fork if backend needs to re-arm all fds from scratch */ 1008/* usually called after fork if backend needs to re-arm all fds from scratch */
857static void noinline 1009static void noinline
862 for (fd = 0; fd < anfdmax; ++fd) 1014 for (fd = 0; fd < anfdmax; ++fd)
863 if (anfds [fd].events) 1015 if (anfds [fd].events)
864 { 1016 {
865 anfds [fd].events = 0; 1017 anfds [fd].events = 0;
866 anfds [fd].emask = 0; 1018 anfds [fd].emask = 0;
867 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1019 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
868 } 1020 }
869} 1021}
870 1022
871/*****************************************************************************/ 1023/*****************************************************************************/
872 1024
947 1099
948 for (;;) 1100 for (;;)
949 { 1101 {
950 int c = k << 1; 1102 int c = k << 1;
951 1103
952 if (c > N + HEAP0 - 1) 1104 if (c >= N + HEAP0)
953 break; 1105 break;
954 1106
955 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1107 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
956 ? 1 : 0; 1108 ? 1 : 0;
957 1109
989 1141
990 heap [k] = he; 1142 heap [k] = he;
991 ev_active (ANHE_w (he)) = k; 1143 ev_active (ANHE_w (he)) = k;
992} 1144}
993 1145
1146/* move an element suitably so it is in a correct place */
994inline_size void 1147inline_size void
995adjustheap (ANHE *heap, int N, int k) 1148adjustheap (ANHE *heap, int N, int k)
996{ 1149{
997 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1150 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
998 upheap (heap, k); 1151 upheap (heap, k);
999 else 1152 else
1000 downheap (heap, N, k); 1153 downheap (heap, N, k);
1001} 1154}
1002 1155
1012 upheap (heap, i + HEAP0); 1165 upheap (heap, i + HEAP0);
1013} 1166}
1014 1167
1015/*****************************************************************************/ 1168/*****************************************************************************/
1016 1169
1170/* associate signal watchers to a signal signal */
1017typedef struct 1171typedef struct
1018{ 1172{
1173 EV_ATOMIC_T pending;
1174#if EV_MULTIPLICITY
1175 EV_P;
1176#endif
1019 WL head; 1177 WL head;
1020 EV_ATOMIC_T gotsig;
1021} ANSIG; 1178} ANSIG;
1022 1179
1023static ANSIG *signals; 1180static ANSIG signals [EV_NSIG - 1];
1024static int signalmax;
1025
1026static EV_ATOMIC_T gotsig;
1027 1181
1028/*****************************************************************************/ 1182/*****************************************************************************/
1029 1183
1184/* used to prepare libev internal fd's */
1185/* this is not fork-safe */
1030inline_speed void 1186inline_speed void
1031fd_intern (int fd) 1187fd_intern (int fd)
1032{ 1188{
1033#ifdef _WIN32 1189#ifdef _WIN32
1034 unsigned long arg = 1; 1190 unsigned long arg = 1;
1035 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1191 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1036#else 1192#else
1037 fcntl (fd, F_SETFD, FD_CLOEXEC); 1193 fcntl (fd, F_SETFD, FD_CLOEXEC);
1038 fcntl (fd, F_SETFL, O_NONBLOCK); 1194 fcntl (fd, F_SETFL, O_NONBLOCK);
1039#endif 1195#endif
1040} 1196}
1041 1197
1042static void noinline 1198static void noinline
1043evpipe_init (EV_P) 1199evpipe_init (EV_P)
1044{ 1200{
1045 if (!ev_is_active (&pipeev)) 1201 if (!ev_is_active (&pipe_w))
1046 { 1202 {
1047#if EV_USE_EVENTFD 1203#if EV_USE_EVENTFD
1204 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1205 if (evfd < 0 && errno == EINVAL)
1048 if ((evfd = eventfd (0, 0)) >= 0) 1206 evfd = eventfd (0, 0);
1207
1208 if (evfd >= 0)
1049 { 1209 {
1050 evpipe [0] = -1; 1210 evpipe [0] = -1;
1051 fd_intern (evfd); 1211 fd_intern (evfd); /* doing it twice doesn't hurt */
1052 ev_io_set (&pipeev, evfd, EV_READ); 1212 ev_io_set (&pipe_w, evfd, EV_READ);
1053 } 1213 }
1054 else 1214 else
1055#endif 1215#endif
1056 { 1216 {
1057 while (pipe (evpipe)) 1217 while (pipe (evpipe))
1058 ev_syserr ("(libev) error creating signal/async pipe"); 1218 ev_syserr ("(libev) error creating signal/async pipe");
1059 1219
1060 fd_intern (evpipe [0]); 1220 fd_intern (evpipe [0]);
1061 fd_intern (evpipe [1]); 1221 fd_intern (evpipe [1]);
1062 ev_io_set (&pipeev, evpipe [0], EV_READ); 1222 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1063 } 1223 }
1064 1224
1065 ev_io_start (EV_A_ &pipeev); 1225 ev_io_start (EV_A_ &pipe_w);
1066 ev_unref (EV_A); /* watcher should not keep loop alive */ 1226 ev_unref (EV_A); /* watcher should not keep loop alive */
1067 } 1227 }
1068} 1228}
1069 1229
1070inline_size void 1230inline_size void
1088 1248
1089 errno = old_errno; 1249 errno = old_errno;
1090 } 1250 }
1091} 1251}
1092 1252
1253/* called whenever the libev signal pipe */
1254/* got some events (signal, async) */
1093static void 1255static void
1094pipecb (EV_P_ ev_io *iow, int revents) 1256pipecb (EV_P_ ev_io *iow, int revents)
1095{ 1257{
1258 int i;
1259
1096#if EV_USE_EVENTFD 1260#if EV_USE_EVENTFD
1097 if (evfd >= 0) 1261 if (evfd >= 0)
1098 { 1262 {
1099 uint64_t counter; 1263 uint64_t counter;
1100 read (evfd, &counter, sizeof (uint64_t)); 1264 read (evfd, &counter, sizeof (uint64_t));
1104 { 1268 {
1105 char dummy; 1269 char dummy;
1106 read (evpipe [0], &dummy, 1); 1270 read (evpipe [0], &dummy, 1);
1107 } 1271 }
1108 1272
1109 if (gotsig && ev_is_default_loop (EV_A)) 1273 if (sig_pending)
1110 { 1274 {
1111 int signum; 1275 sig_pending = 0;
1112 gotsig = 0;
1113 1276
1114 for (signum = signalmax; signum--; ) 1277 for (i = EV_NSIG - 1; i--; )
1115 if (signals [signum].gotsig) 1278 if (expect_false (signals [i].pending))
1116 ev_feed_signal_event (EV_A_ signum + 1); 1279 ev_feed_signal_event (EV_A_ i + 1);
1117 } 1280 }
1118 1281
1119#if EV_ASYNC_ENABLE 1282#if EV_ASYNC_ENABLE
1120 if (gotasync) 1283 if (async_pending)
1121 { 1284 {
1122 int i; 1285 async_pending = 0;
1123 gotasync = 0;
1124 1286
1125 for (i = asynccnt; i--; ) 1287 for (i = asynccnt; i--; )
1126 if (asyncs [i]->sent) 1288 if (asyncs [i]->sent)
1127 { 1289 {
1128 asyncs [i]->sent = 0; 1290 asyncs [i]->sent = 0;
1136 1298
1137static void 1299static void
1138ev_sighandler (int signum) 1300ev_sighandler (int signum)
1139{ 1301{
1140#if EV_MULTIPLICITY 1302#if EV_MULTIPLICITY
1141 struct ev_loop *loop = &default_loop_struct; 1303 EV_P = signals [signum - 1].loop;
1142#endif 1304#endif
1143 1305
1144#if _WIN32 1306#ifdef _WIN32
1145 signal (signum, ev_sighandler); 1307 signal (signum, ev_sighandler);
1146#endif 1308#endif
1147 1309
1148 signals [signum - 1].gotsig = 1; 1310 signals [signum - 1].pending = 1;
1149 evpipe_write (EV_A_ &gotsig); 1311 evpipe_write (EV_A_ &sig_pending);
1150} 1312}
1151 1313
1152void noinline 1314void noinline
1153ev_feed_signal_event (EV_P_ int signum) 1315ev_feed_signal_event (EV_P_ int signum)
1154{ 1316{
1155 WL w; 1317 WL w;
1156 1318
1319 if (expect_false (signum <= 0 || signum > EV_NSIG))
1320 return;
1321
1322 --signum;
1323
1157#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1158 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1325 /* it is permissible to try to feed a signal to the wrong loop */
1159#endif 1326 /* or, likely more useful, feeding a signal nobody is waiting for */
1160 1327
1161 --signum; 1328 if (expect_false (signals [signum].loop != EV_A))
1162
1163 if (signum < 0 || signum >= signalmax)
1164 return; 1329 return;
1330#endif
1165 1331
1166 signals [signum].gotsig = 0; 1332 signals [signum].pending = 0;
1167 1333
1168 for (w = signals [signum].head; w; w = w->next) 1334 for (w = signals [signum].head; w; w = w->next)
1169 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1335 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1170} 1336}
1171 1337
1338#if EV_USE_SIGNALFD
1339static void
1340sigfdcb (EV_P_ ev_io *iow, int revents)
1341{
1342 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1343
1344 for (;;)
1345 {
1346 ssize_t res = read (sigfd, si, sizeof (si));
1347
1348 /* not ISO-C, as res might be -1, but works with SuS */
1349 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1350 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1351
1352 if (res < (ssize_t)sizeof (si))
1353 break;
1354 }
1355}
1356#endif
1357
1172/*****************************************************************************/ 1358/*****************************************************************************/
1173 1359
1174static WL childs [EV_PID_HASHSIZE]; 1360static WL childs [EV_PID_HASHSIZE];
1175 1361
1176#ifndef _WIN32 1362#ifndef _WIN32
1179 1365
1180#ifndef WIFCONTINUED 1366#ifndef WIFCONTINUED
1181# define WIFCONTINUED(status) 0 1367# define WIFCONTINUED(status) 0
1182#endif 1368#endif
1183 1369
1370/* handle a single child status event */
1184inline_speed void 1371inline_speed void
1185child_reap (EV_P_ int chain, int pid, int status) 1372child_reap (EV_P_ int chain, int pid, int status)
1186{ 1373{
1187 ev_child *w; 1374 ev_child *w;
1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1375 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1202 1389
1203#ifndef WCONTINUED 1390#ifndef WCONTINUED
1204# define WCONTINUED 0 1391# define WCONTINUED 0
1205#endif 1392#endif
1206 1393
1394/* called on sigchld etc., calls waitpid */
1207static void 1395static void
1208childcb (EV_P_ ev_signal *sw, int revents) 1396childcb (EV_P_ ev_signal *sw, int revents)
1209{ 1397{
1210 int pid, status; 1398 int pid, status;
1211 1399
1318ev_backend (EV_P) 1506ev_backend (EV_P)
1319{ 1507{
1320 return backend; 1508 return backend;
1321} 1509}
1322 1510
1511#if EV_MINIMAL < 2
1323unsigned int 1512unsigned int
1324ev_loop_count (EV_P) 1513ev_loop_count (EV_P)
1325{ 1514{
1326 return loop_count; 1515 return loop_count;
1327} 1516}
1328 1517
1518unsigned int
1519ev_loop_depth (EV_P)
1520{
1521 return loop_depth;
1522}
1523
1329void 1524void
1330ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1525ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1331{ 1526{
1332 io_blocktime = interval; 1527 io_blocktime = interval;
1333} 1528}
1336ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1531ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1337{ 1532{
1338 timeout_blocktime = interval; 1533 timeout_blocktime = interval;
1339} 1534}
1340 1535
1536void
1537ev_set_userdata (EV_P_ void *data)
1538{
1539 userdata = data;
1540}
1541
1542void *
1543ev_userdata (EV_P)
1544{
1545 return userdata;
1546}
1547
1548void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1549{
1550 invoke_cb = invoke_pending_cb;
1551}
1552
1553void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1554{
1555 release_cb = release;
1556 acquire_cb = acquire;
1557}
1558#endif
1559
1560/* initialise a loop structure, must be zero-initialised */
1341static void noinline 1561static void noinline
1342loop_init (EV_P_ unsigned int flags) 1562loop_init (EV_P_ unsigned int flags)
1343{ 1563{
1344 if (!backend) 1564 if (!backend)
1345 { 1565 {
1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1581 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1362 have_monotonic = 1; 1582 have_monotonic = 1;
1363 } 1583 }
1364#endif 1584#endif
1365 1585
1586 /* pid check not overridable via env */
1587#ifndef _WIN32
1588 if (flags & EVFLAG_FORKCHECK)
1589 curpid = getpid ();
1590#endif
1591
1592 if (!(flags & EVFLAG_NOENV)
1593 && !enable_secure ()
1594 && getenv ("LIBEV_FLAGS"))
1595 flags = atoi (getenv ("LIBEV_FLAGS"));
1596
1366 ev_rt_now = ev_time (); 1597 ev_rt_now = ev_time ();
1367 mn_now = get_clock (); 1598 mn_now = get_clock ();
1368 now_floor = mn_now; 1599 now_floor = mn_now;
1369 rtmn_diff = ev_rt_now - mn_now; 1600 rtmn_diff = ev_rt_now - mn_now;
1601#if EV_MINIMAL < 2
1602 invoke_cb = ev_invoke_pending;
1603#endif
1370 1604
1371 io_blocktime = 0.; 1605 io_blocktime = 0.;
1372 timeout_blocktime = 0.; 1606 timeout_blocktime = 0.;
1373 backend = 0; 1607 backend = 0;
1374 backend_fd = -1; 1608 backend_fd = -1;
1375 gotasync = 0; 1609 sig_pending = 0;
1610#if EV_ASYNC_ENABLE
1611 async_pending = 0;
1612#endif
1376#if EV_USE_INOTIFY 1613#if EV_USE_INOTIFY
1377 fs_fd = -2; 1614 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1378#endif 1615#endif
1379 1616#if EV_USE_SIGNALFD
1380 /* pid check not overridable via env */ 1617 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1381#ifndef _WIN32
1382 if (flags & EVFLAG_FORKCHECK)
1383 curpid = getpid ();
1384#endif 1618#endif
1385
1386 if (!(flags & EVFLAG_NOENV)
1387 && !enable_secure ()
1388 && getenv ("LIBEV_FLAGS"))
1389 flags = atoi (getenv ("LIBEV_FLAGS"));
1390 1619
1391 if (!(flags & 0x0000ffffU)) 1620 if (!(flags & 0x0000ffffU))
1392 flags |= ev_recommended_backends (); 1621 flags |= ev_recommended_backends ();
1393 1622
1394#if EV_USE_PORT 1623#if EV_USE_PORT
1405#endif 1634#endif
1406#if EV_USE_SELECT 1635#if EV_USE_SELECT
1407 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1636 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1408#endif 1637#endif
1409 1638
1639 ev_prepare_init (&pending_w, pendingcb);
1640
1410 ev_init (&pipeev, pipecb); 1641 ev_init (&pipe_w, pipecb);
1411 ev_set_priority (&pipeev, EV_MAXPRI); 1642 ev_set_priority (&pipe_w, EV_MAXPRI);
1412 } 1643 }
1413} 1644}
1414 1645
1646/* free up a loop structure */
1415static void noinline 1647static void noinline
1416loop_destroy (EV_P) 1648loop_destroy (EV_P)
1417{ 1649{
1418 int i; 1650 int i;
1419 1651
1420 if (ev_is_active (&pipeev)) 1652 if (ev_is_active (&pipe_w))
1421 { 1653 {
1422 ev_ref (EV_A); /* signal watcher */ 1654 /*ev_ref (EV_A);*/
1423 ev_io_stop (EV_A_ &pipeev); 1655 /*ev_io_stop (EV_A_ &pipe_w);*/
1424 1656
1425#if EV_USE_EVENTFD 1657#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1658 if (evfd >= 0)
1427 close (evfd); 1659 close (evfd);
1428#endif 1660#endif
1429 1661
1430 if (evpipe [0] >= 0) 1662 if (evpipe [0] >= 0)
1431 { 1663 {
1432 close (evpipe [0]); 1664 EV_WIN32_CLOSE_FD (evpipe [0]);
1433 close (evpipe [1]); 1665 EV_WIN32_CLOSE_FD (evpipe [1]);
1434 } 1666 }
1435 } 1667 }
1668
1669#if EV_USE_SIGNALFD
1670 if (ev_is_active (&sigfd_w))
1671 close (sigfd);
1672#endif
1436 1673
1437#if EV_USE_INOTIFY 1674#if EV_USE_INOTIFY
1438 if (fs_fd >= 0) 1675 if (fs_fd >= 0)
1439 close (fs_fd); 1676 close (fs_fd);
1440#endif 1677#endif
1464#if EV_IDLE_ENABLE 1701#if EV_IDLE_ENABLE
1465 array_free (idle, [i]); 1702 array_free (idle, [i]);
1466#endif 1703#endif
1467 } 1704 }
1468 1705
1469 ev_free (anfds); anfdmax = 0; 1706 ev_free (anfds); anfds = 0; anfdmax = 0;
1470 1707
1471 /* have to use the microsoft-never-gets-it-right macro */ 1708 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY); 1709 array_free (rfeed, EMPTY);
1473 array_free (fdchange, EMPTY); 1710 array_free (fdchange, EMPTY);
1474 array_free (timer, EMPTY); 1711 array_free (timer, EMPTY);
1505#endif 1742#endif
1506#if EV_USE_INOTIFY 1743#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1744 infy_fork (EV_A);
1508#endif 1745#endif
1509 1746
1510 if (ev_is_active (&pipeev)) 1747 if (ev_is_active (&pipe_w))
1511 { 1748 {
1512 /* this "locks" the handlers against writing to the pipe */ 1749 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1750 /* while we modify the fd vars */
1514 gotsig = 1; 1751 sig_pending = 1;
1515#if EV_ASYNC_ENABLE 1752#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1753 async_pending = 1;
1517#endif 1754#endif
1518 1755
1519 ev_ref (EV_A); 1756 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1757 ev_io_stop (EV_A_ &pipe_w);
1521 1758
1522#if EV_USE_EVENTFD 1759#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1760 if (evfd >= 0)
1524 close (evfd); 1761 close (evfd);
1525#endif 1762#endif
1526 1763
1527 if (evpipe [0] >= 0) 1764 if (evpipe [0] >= 0)
1528 { 1765 {
1529 close (evpipe [0]); 1766 EV_WIN32_CLOSE_FD (evpipe [0]);
1530 close (evpipe [1]); 1767 EV_WIN32_CLOSE_FD (evpipe [1]);
1531 } 1768 }
1532 1769
1533 evpipe_init (EV_A); 1770 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1771 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1772 pipecb (EV_A_ &pipe_w, EV_READ);
1536 } 1773 }
1537 1774
1538 postfork = 0; 1775 postfork = 0;
1539} 1776}
1540 1777
1541#if EV_MULTIPLICITY 1778#if EV_MULTIPLICITY
1542 1779
1543struct ev_loop * 1780struct ev_loop *
1544ev_loop_new (unsigned int flags) 1781ev_loop_new (unsigned int flags)
1545{ 1782{
1546 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1783 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1547 1784
1548 memset (loop, 0, sizeof (struct ev_loop)); 1785 memset (EV_A, 0, sizeof (struct ev_loop));
1549
1550 loop_init (EV_A_ flags); 1786 loop_init (EV_A_ flags);
1551 1787
1552 if (ev_backend (EV_A)) 1788 if (ev_backend (EV_A))
1553 return loop; 1789 return EV_A;
1554 1790
1555 return 0; 1791 return 0;
1556} 1792}
1557 1793
1558void 1794void
1565void 1801void
1566ev_loop_fork (EV_P) 1802ev_loop_fork (EV_P)
1567{ 1803{
1568 postfork = 1; /* must be in line with ev_default_fork */ 1804 postfork = 1; /* must be in line with ev_default_fork */
1569} 1805}
1806#endif /* multiplicity */
1570 1807
1571#if EV_VERIFY 1808#if EV_VERIFY
1572static void noinline 1809static void noinline
1573verify_watcher (EV_P_ W w) 1810verify_watcher (EV_P_ W w)
1574{ 1811{
1602 verify_watcher (EV_A_ ws [cnt]); 1839 verify_watcher (EV_A_ ws [cnt]);
1603 } 1840 }
1604} 1841}
1605#endif 1842#endif
1606 1843
1844#if EV_MINIMAL < 2
1607void 1845void
1608ev_loop_verify (EV_P) 1846ev_loop_verify (EV_P)
1609{ 1847{
1610#if EV_VERIFY 1848#if EV_VERIFY
1611 int i; 1849 int i;
1660 assert (checkmax >= checkcnt); 1898 assert (checkmax >= checkcnt);
1661 array_verify (EV_A_ (W *)checks, checkcnt); 1899 array_verify (EV_A_ (W *)checks, checkcnt);
1662 1900
1663# if 0 1901# if 0
1664 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1902 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1665 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1903 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1666# endif
1667#endif 1904# endif
1905#endif
1668} 1906}
1669 1907#endif
1670#endif /* multiplicity */
1671 1908
1672#if EV_MULTIPLICITY 1909#if EV_MULTIPLICITY
1673struct ev_loop * 1910struct ev_loop *
1674ev_default_loop_init (unsigned int flags) 1911ev_default_loop_init (unsigned int flags)
1675#else 1912#else
1678#endif 1915#endif
1679{ 1916{
1680 if (!ev_default_loop_ptr) 1917 if (!ev_default_loop_ptr)
1681 { 1918 {
1682#if EV_MULTIPLICITY 1919#if EV_MULTIPLICITY
1683 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1920 EV_P = ev_default_loop_ptr = &default_loop_struct;
1684#else 1921#else
1685 ev_default_loop_ptr = 1; 1922 ev_default_loop_ptr = 1;
1686#endif 1923#endif
1687 1924
1688 loop_init (EV_A_ flags); 1925 loop_init (EV_A_ flags);
1705 1942
1706void 1943void
1707ev_default_destroy (void) 1944ev_default_destroy (void)
1708{ 1945{
1709#if EV_MULTIPLICITY 1946#if EV_MULTIPLICITY
1710 struct ev_loop *loop = ev_default_loop_ptr; 1947 EV_P = ev_default_loop_ptr;
1711#endif 1948#endif
1712 1949
1713 ev_default_loop_ptr = 0; 1950 ev_default_loop_ptr = 0;
1714 1951
1715#ifndef _WIN32 1952#ifndef _WIN32
1722 1959
1723void 1960void
1724ev_default_fork (void) 1961ev_default_fork (void)
1725{ 1962{
1726#if EV_MULTIPLICITY 1963#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr; 1964 EV_P = ev_default_loop_ptr;
1728#endif 1965#endif
1729 1966
1730 postfork = 1; /* must be in line with ev_loop_fork */ 1967 postfork = 1; /* must be in line with ev_loop_fork */
1731} 1968}
1732 1969
1736ev_invoke (EV_P_ void *w, int revents) 1973ev_invoke (EV_P_ void *w, int revents)
1737{ 1974{
1738 EV_CB_INVOKE ((W)w, revents); 1975 EV_CB_INVOKE ((W)w, revents);
1739} 1976}
1740 1977
1741inline_speed void 1978unsigned int
1742call_pending (EV_P) 1979ev_pending_count (EV_P)
1980{
1981 int pri;
1982 unsigned int count = 0;
1983
1984 for (pri = NUMPRI; pri--; )
1985 count += pendingcnt [pri];
1986
1987 return count;
1988}
1989
1990void noinline
1991ev_invoke_pending (EV_P)
1743{ 1992{
1744 int pri; 1993 int pri;
1745 1994
1746 for (pri = NUMPRI; pri--; ) 1995 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 1996 while (pendingcnt [pri])
1748 { 1997 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1998 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 1999
1751 if (expect_true (p->w))
1752 {
1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 2000 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2001 /* ^ this is no longer true, as pending_w could be here */
1754 2002
1755 p->w->pending = 0; 2003 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 2004 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 2005 EV_FREQUENT_CHECK;
1758 }
1759 } 2006 }
1760} 2007}
1761 2008
1762#if EV_IDLE_ENABLE 2009#if EV_IDLE_ENABLE
2010/* make idle watchers pending. this handles the "call-idle */
2011/* only when higher priorities are idle" logic */
1763inline_size void 2012inline_size void
1764idle_reify (EV_P) 2013idle_reify (EV_P)
1765{ 2014{
1766 if (expect_false (idleall)) 2015 if (expect_false (idleall))
1767 { 2016 {
1780 } 2029 }
1781 } 2030 }
1782} 2031}
1783#endif 2032#endif
1784 2033
2034/* make timers pending */
1785inline_size void 2035inline_size void
1786timers_reify (EV_P) 2036timers_reify (EV_P)
1787{ 2037{
1788 EV_FREQUENT_CHECK; 2038 EV_FREQUENT_CHECK;
1789 2039
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 2068 feed_reverse_done (EV_A_ EV_TIMEOUT);
1819 } 2069 }
1820} 2070}
1821 2071
1822#if EV_PERIODIC_ENABLE 2072#if EV_PERIODIC_ENABLE
2073/* make periodics pending */
1823inline_size void 2074inline_size void
1824periodics_reify (EV_P) 2075periodics_reify (EV_P)
1825{ 2076{
1826 EV_FREQUENT_CHECK; 2077 EV_FREQUENT_CHECK;
1827 2078
1874 2125
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 2126 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 2127 }
1877} 2128}
1878 2129
2130/* simply recalculate all periodics */
2131/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1879static void noinline 2132static void noinline
1880periodics_reschedule (EV_P) 2133periodics_reschedule (EV_P)
1881{ 2134{
1882 int i; 2135 int i;
1883 2136
1896 2149
1897 reheap (periodics, periodiccnt); 2150 reheap (periodics, periodiccnt);
1898} 2151}
1899#endif 2152#endif
1900 2153
2154/* adjust all timers by a given offset */
1901static void noinline 2155static void noinline
1902timers_reschedule (EV_P_ ev_tstamp adjust) 2156timers_reschedule (EV_P_ ev_tstamp adjust)
1903{ 2157{
1904 int i; 2158 int i;
1905 2159
1909 ANHE_w (*he)->at += adjust; 2163 ANHE_w (*he)->at += adjust;
1910 ANHE_at_cache (*he); 2164 ANHE_at_cache (*he);
1911 } 2165 }
1912} 2166}
1913 2167
2168/* fetch new monotonic and realtime times from the kernel */
2169/* also detect if there was a timejump, and act accordingly */
1914inline_speed void 2170inline_speed void
1915time_update (EV_P_ ev_tstamp max_block) 2171time_update (EV_P_ ev_tstamp max_block)
1916{ 2172{
1917 int i;
1918
1919#if EV_USE_MONOTONIC 2173#if EV_USE_MONOTONIC
1920 if (expect_true (have_monotonic)) 2174 if (expect_true (have_monotonic))
1921 { 2175 {
2176 int i;
1922 ev_tstamp odiff = rtmn_diff; 2177 ev_tstamp odiff = rtmn_diff;
1923 2178
1924 mn_now = get_clock (); 2179 mn_now = get_clock ();
1925 2180
1926 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2181 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1976 2231
1977 mn_now = ev_rt_now; 2232 mn_now = ev_rt_now;
1978 } 2233 }
1979} 2234}
1980 2235
1981static int loop_done;
1982
1983void 2236void
1984ev_loop (EV_P_ int flags) 2237ev_loop (EV_P_ int flags)
1985{ 2238{
2239#if EV_MINIMAL < 2
2240 ++loop_depth;
2241#endif
2242
2243 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2244
1986 loop_done = EVUNLOOP_CANCEL; 2245 loop_done = EVUNLOOP_CANCEL;
1987 2246
1988 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2247 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1989 2248
1990 do 2249 do
1991 { 2250 {
1992#if EV_VERIFY >= 2 2251#if EV_VERIFY >= 2
1993 ev_loop_verify (EV_A); 2252 ev_loop_verify (EV_A);
2006 /* we might have forked, so queue fork handlers */ 2265 /* we might have forked, so queue fork handlers */
2007 if (expect_false (postfork)) 2266 if (expect_false (postfork))
2008 if (forkcnt) 2267 if (forkcnt)
2009 { 2268 {
2010 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2269 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2011 call_pending (EV_A); 2270 EV_INVOKE_PENDING;
2012 } 2271 }
2013#endif 2272#endif
2014 2273
2015 /* queue prepare watchers (and execute them) */ 2274 /* queue prepare watchers (and execute them) */
2016 if (expect_false (preparecnt)) 2275 if (expect_false (preparecnt))
2017 { 2276 {
2018 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2277 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2019 call_pending (EV_A); 2278 EV_INVOKE_PENDING;
2020 } 2279 }
2280
2281 if (expect_false (loop_done))
2282 break;
2021 2283
2022 /* we might have forked, so reify kernel state if necessary */ 2284 /* we might have forked, so reify kernel state if necessary */
2023 if (expect_false (postfork)) 2285 if (expect_false (postfork))
2024 loop_fork (EV_A); 2286 loop_fork (EV_A);
2025 2287
2031 ev_tstamp waittime = 0.; 2293 ev_tstamp waittime = 0.;
2032 ev_tstamp sleeptime = 0.; 2294 ev_tstamp sleeptime = 0.;
2033 2295
2034 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2296 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2035 { 2297 {
2298 /* remember old timestamp for io_blocktime calculation */
2299 ev_tstamp prev_mn_now = mn_now;
2300
2036 /* update time to cancel out callback processing overhead */ 2301 /* update time to cancel out callback processing overhead */
2037 time_update (EV_A_ 1e100); 2302 time_update (EV_A_ 1e100);
2303
2304 waittime = MAX_BLOCKTIME;
2038 2305
2039 if (timercnt) 2306 if (timercnt)
2040 { 2307 {
2041 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2308 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2042 if (waittime > to) waittime = to; 2309 if (waittime > to) waittime = to;
2048 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2315 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2049 if (waittime > to) waittime = to; 2316 if (waittime > to) waittime = to;
2050 } 2317 }
2051#endif 2318#endif
2052 2319
2320 /* don't let timeouts decrease the waittime below timeout_blocktime */
2053 if (expect_false (waittime < timeout_blocktime)) 2321 if (expect_false (waittime < timeout_blocktime))
2054 waittime = timeout_blocktime; 2322 waittime = timeout_blocktime;
2055 2323
2056 sleeptime = waittime - backend_fudge; 2324 /* extra check because io_blocktime is commonly 0 */
2057
2058 if (expect_true (sleeptime > io_blocktime)) 2325 if (expect_false (io_blocktime))
2059 sleeptime = io_blocktime;
2060
2061 if (sleeptime)
2062 { 2326 {
2327 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2328
2329 if (sleeptime > waittime - backend_fudge)
2330 sleeptime = waittime - backend_fudge;
2331
2332 if (expect_true (sleeptime > 0.))
2333 {
2063 ev_sleep (sleeptime); 2334 ev_sleep (sleeptime);
2064 waittime -= sleeptime; 2335 waittime -= sleeptime;
2336 }
2065 } 2337 }
2066 } 2338 }
2067 2339
2340#if EV_MINIMAL < 2
2068 ++loop_count; 2341 ++loop_count;
2342#endif
2343 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2069 backend_poll (EV_A_ waittime); 2344 backend_poll (EV_A_ waittime);
2345 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2070 2346
2071 /* update ev_rt_now, do magic */ 2347 /* update ev_rt_now, do magic */
2072 time_update (EV_A_ waittime + sleeptime); 2348 time_update (EV_A_ waittime + sleeptime);
2073 } 2349 }
2074 2350
2085 2361
2086 /* queue check watchers, to be executed first */ 2362 /* queue check watchers, to be executed first */
2087 if (expect_false (checkcnt)) 2363 if (expect_false (checkcnt))
2088 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2364 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2089 2365
2090 call_pending (EV_A); 2366 EV_INVOKE_PENDING;
2091 } 2367 }
2092 while (expect_true ( 2368 while (expect_true (
2093 activecnt 2369 activecnt
2094 && !loop_done 2370 && !loop_done
2095 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2371 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2096 )); 2372 ));
2097 2373
2098 if (loop_done == EVUNLOOP_ONE) 2374 if (loop_done == EVUNLOOP_ONE)
2099 loop_done = EVUNLOOP_CANCEL; 2375 loop_done = EVUNLOOP_CANCEL;
2376
2377#if EV_MINIMAL < 2
2378 --loop_depth;
2379#endif
2100} 2380}
2101 2381
2102void 2382void
2103ev_unloop (EV_P_ int how) 2383ev_unloop (EV_P_ int how)
2104{ 2384{
2133ev_resume (EV_P) 2413ev_resume (EV_P)
2134{ 2414{
2135 ev_tstamp mn_prev = mn_now; 2415 ev_tstamp mn_prev = mn_now;
2136 2416
2137 ev_now_update (EV_A); 2417 ev_now_update (EV_A);
2138 printf ("update %f\n", mn_now - mn_prev);//D
2139 timers_reschedule (EV_A_ mn_now - mn_prev); 2418 timers_reschedule (EV_A_ mn_now - mn_prev);
2419#if EV_PERIODIC_ENABLE
2420 /* TODO: really do this? */
2140 periodics_reschedule (EV_A); 2421 periodics_reschedule (EV_A);
2422#endif
2141} 2423}
2142 2424
2143/*****************************************************************************/ 2425/*****************************************************************************/
2426/* singly-linked list management, used when the expected list length is short */
2144 2427
2145inline_size void 2428inline_size void
2146wlist_add (WL *head, WL elem) 2429wlist_add (WL *head, WL elem)
2147{ 2430{
2148 elem->next = *head; 2431 elem->next = *head;
2152inline_size void 2435inline_size void
2153wlist_del (WL *head, WL elem) 2436wlist_del (WL *head, WL elem)
2154{ 2437{
2155 while (*head) 2438 while (*head)
2156 { 2439 {
2157 if (*head == elem) 2440 if (expect_true (*head == elem))
2158 { 2441 {
2159 *head = elem->next; 2442 *head = elem->next;
2160 return; 2443 break;
2161 } 2444 }
2162 2445
2163 head = &(*head)->next; 2446 head = &(*head)->next;
2164 } 2447 }
2165} 2448}
2166 2449
2450/* internal, faster, version of ev_clear_pending */
2167inline_speed void 2451inline_speed void
2168clear_pending (EV_P_ W w) 2452clear_pending (EV_P_ W w)
2169{ 2453{
2170 if (w->pending) 2454 if (w->pending)
2171 { 2455 {
2172 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2456 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2173 w->pending = 0; 2457 w->pending = 0;
2174 } 2458 }
2175} 2459}
2176 2460
2177int 2461int
2181 int pending = w_->pending; 2465 int pending = w_->pending;
2182 2466
2183 if (expect_true (pending)) 2467 if (expect_true (pending))
2184 { 2468 {
2185 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2469 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2470 p->w = (W)&pending_w;
2186 w_->pending = 0; 2471 w_->pending = 0;
2187 p->w = 0;
2188 return p->events; 2472 return p->events;
2189 } 2473 }
2190 else 2474 else
2191 return 0; 2475 return 0;
2192} 2476}
2193 2477
2194inline_size void 2478inline_size void
2195pri_adjust (EV_P_ W w) 2479pri_adjust (EV_P_ W w)
2196{ 2480{
2197 int pri = w->priority; 2481 int pri = ev_priority (w);
2198 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2482 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2199 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2483 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2200 w->priority = pri; 2484 ev_set_priority (w, pri);
2201} 2485}
2202 2486
2203inline_speed void 2487inline_speed void
2204ev_start (EV_P_ W w, int active) 2488ev_start (EV_P_ W w, int active)
2205{ 2489{
2224 2508
2225 if (expect_false (ev_is_active (w))) 2509 if (expect_false (ev_is_active (w)))
2226 return; 2510 return;
2227 2511
2228 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2512 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2229 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2513 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2230 2514
2231 EV_FREQUENT_CHECK; 2515 EV_FREQUENT_CHECK;
2232 2516
2233 ev_start (EV_A_ (W)w, 1); 2517 ev_start (EV_A_ (W)w, 1);
2234 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2518 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2235 wlist_add (&anfds[fd].head, (WL)w); 2519 wlist_add (&anfds[fd].head, (WL)w);
2236 2520
2237 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2521 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2238 w->events &= ~EV__IOFDSET; 2522 w->events &= ~EV__IOFDSET;
2239 2523
2240 EV_FREQUENT_CHECK; 2524 EV_FREQUENT_CHECK;
2241} 2525}
2242 2526
2336 } 2620 }
2337 2621
2338 EV_FREQUENT_CHECK; 2622 EV_FREQUENT_CHECK;
2339} 2623}
2340 2624
2625ev_tstamp
2626ev_timer_remaining (EV_P_ ev_timer *w)
2627{
2628 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2629}
2630
2341#if EV_PERIODIC_ENABLE 2631#if EV_PERIODIC_ENABLE
2342void noinline 2632void noinline
2343ev_periodic_start (EV_P_ ev_periodic *w) 2633ev_periodic_start (EV_P_ ev_periodic *w)
2344{ 2634{
2345 if (expect_false (ev_is_active (w))) 2635 if (expect_false (ev_is_active (w)))
2412#endif 2702#endif
2413 2703
2414void noinline 2704void noinline
2415ev_signal_start (EV_P_ ev_signal *w) 2705ev_signal_start (EV_P_ ev_signal *w)
2416{ 2706{
2417#if EV_MULTIPLICITY
2418 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2419#endif
2420 if (expect_false (ev_is_active (w))) 2707 if (expect_false (ev_is_active (w)))
2421 return; 2708 return;
2422 2709
2423 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2710 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2424 2711
2425 evpipe_init (EV_A); 2712#if EV_MULTIPLICITY
2713 assert (("libev: a signal must not be attached to two different loops",
2714 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2426 2715
2427 EV_FREQUENT_CHECK; 2716 signals [w->signum - 1].loop = EV_A;
2717#endif
2428 2718
2719 EV_FREQUENT_CHECK;
2720
2721#if EV_USE_SIGNALFD
2722 if (sigfd == -2)
2429 { 2723 {
2430#ifndef _WIN32 2724 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2431 sigset_t full, prev; 2725 if (sigfd < 0 && errno == EINVAL)
2432 sigfillset (&full); 2726 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2433 sigprocmask (SIG_SETMASK, &full, &prev);
2434#endif
2435 2727
2436 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2728 if (sigfd >= 0)
2729 {
2730 fd_intern (sigfd); /* doing it twice will not hurt */
2437 2731
2438#ifndef _WIN32 2732 sigemptyset (&sigfd_set);
2439 sigprocmask (SIG_SETMASK, &prev, 0); 2733
2440#endif 2734 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2735 ev_set_priority (&sigfd_w, EV_MAXPRI);
2736 ev_io_start (EV_A_ &sigfd_w);
2737 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2738 }
2441 } 2739 }
2740
2741 if (sigfd >= 0)
2742 {
2743 /* TODO: check .head */
2744 sigaddset (&sigfd_set, w->signum);
2745 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2746
2747 signalfd (sigfd, &sigfd_set, 0);
2748 }
2749#endif
2442 2750
2443 ev_start (EV_A_ (W)w, 1); 2751 ev_start (EV_A_ (W)w, 1);
2444 wlist_add (&signals [w->signum - 1].head, (WL)w); 2752 wlist_add (&signals [w->signum - 1].head, (WL)w);
2445 2753
2446 if (!((WL)w)->next) 2754 if (!((WL)w)->next)
2755# if EV_USE_SIGNALFD
2756 if (sigfd < 0) /*TODO*/
2757# endif
2447 { 2758 {
2448#if _WIN32 2759# ifdef _WIN32
2760 evpipe_init (EV_A);
2761
2449 signal (w->signum, ev_sighandler); 2762 signal (w->signum, ev_sighandler);
2450#else 2763# else
2451 struct sigaction sa; 2764 struct sigaction sa;
2765
2766 evpipe_init (EV_A);
2767
2452 sa.sa_handler = ev_sighandler; 2768 sa.sa_handler = ev_sighandler;
2453 sigfillset (&sa.sa_mask); 2769 sigfillset (&sa.sa_mask);
2454 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2770 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2455 sigaction (w->signum, &sa, 0); 2771 sigaction (w->signum, &sa, 0);
2772
2773 sigemptyset (&sa.sa_mask);
2774 sigaddset (&sa.sa_mask, w->signum);
2775 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2456#endif 2776#endif
2457 } 2777 }
2458 2778
2459 EV_FREQUENT_CHECK; 2779 EV_FREQUENT_CHECK;
2460} 2780}
2461 2781
2462void noinline 2782void noinline
2470 2790
2471 wlist_del (&signals [w->signum - 1].head, (WL)w); 2791 wlist_del (&signals [w->signum - 1].head, (WL)w);
2472 ev_stop (EV_A_ (W)w); 2792 ev_stop (EV_A_ (W)w);
2473 2793
2474 if (!signals [w->signum - 1].head) 2794 if (!signals [w->signum - 1].head)
2795 {
2796#if EV_MULTIPLICITY
2797 signals [w->signum - 1].loop = 0; /* unattach from signal */
2798#endif
2799#if EV_USE_SIGNALFD
2800 if (sigfd >= 0)
2801 {
2802 sigset_t ss;
2803
2804 sigemptyset (&ss);
2805 sigaddset (&ss, w->signum);
2806 sigdelset (&sigfd_set, w->signum);
2807
2808 signalfd (sigfd, &sigfd_set, 0);
2809 sigprocmask (SIG_UNBLOCK, &ss, 0);
2810 }
2811 else
2812#endif
2475 signal (w->signum, SIG_DFL); 2813 signal (w->signum, SIG_DFL);
2814 }
2476 2815
2477 EV_FREQUENT_CHECK; 2816 EV_FREQUENT_CHECK;
2478} 2817}
2479 2818
2480void 2819void
2521#define MIN_STAT_INTERVAL 0.1074891 2860#define MIN_STAT_INTERVAL 0.1074891
2522 2861
2523static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2862static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2524 2863
2525#if EV_USE_INOTIFY 2864#if EV_USE_INOTIFY
2526# define EV_INOTIFY_BUFSIZE 8192 2865
2866/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2867# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2527 2868
2528static void noinline 2869static void noinline
2529infy_add (EV_P_ ev_stat *w) 2870infy_add (EV_P_ ev_stat *w)
2530{ 2871{
2531 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2872 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2532 2873
2533 if (w->wd < 0) 2874 if (w->wd >= 0)
2875 {
2876 struct statfs sfs;
2877
2878 /* now local changes will be tracked by inotify, but remote changes won't */
2879 /* unless the filesystem is known to be local, we therefore still poll */
2880 /* also do poll on <2.6.25, but with normal frequency */
2881
2882 if (!fs_2625)
2883 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2884 else if (!statfs (w->path, &sfs)
2885 && (sfs.f_type == 0x1373 /* devfs */
2886 || sfs.f_type == 0xEF53 /* ext2/3 */
2887 || sfs.f_type == 0x3153464a /* jfs */
2888 || sfs.f_type == 0x52654973 /* reiser3 */
2889 || sfs.f_type == 0x01021994 /* tempfs */
2890 || sfs.f_type == 0x58465342 /* xfs */))
2891 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2892 else
2893 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2534 { 2894 }
2895 else
2896 {
2897 /* can't use inotify, continue to stat */
2535 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2898 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2536 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2537 2899
2538 /* monitor some parent directory for speedup hints */ 2900 /* if path is not there, monitor some parent directory for speedup hints */
2539 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2901 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2540 /* but an efficiency issue only */ 2902 /* but an efficiency issue only */
2541 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2903 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2542 { 2904 {
2543 char path [4096]; 2905 char path [4096];
2559 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2921 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2560 } 2922 }
2561 } 2923 }
2562 2924
2563 if (w->wd >= 0) 2925 if (w->wd >= 0)
2564 {
2565 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2926 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2566 2927
2567 /* now local changes will be tracked by inotify, but remote changes won't */ 2928 /* now re-arm timer, if required */
2568 /* unless the filesystem it known to be local, we therefore still poll */ 2929 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2569 /* also do poll on <2.6.25, but with normal frequency */
2570 struct statfs sfs;
2571
2572 if (fs_2625 && !statfs (w->path, &sfs))
2573 if (sfs.f_type == 0x1373 /* devfs */
2574 || sfs.f_type == 0xEF53 /* ext2/3 */
2575 || sfs.f_type == 0x3153464a /* jfs */
2576 || sfs.f_type == 0x52654973 /* reiser3 */
2577 || sfs.f_type == 0x01021994 /* tempfs */
2578 || sfs.f_type == 0x58465342 /* xfs */)
2579 return;
2580
2581 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2582 ev_timer_again (EV_A_ &w->timer); 2930 ev_timer_again (EV_A_ &w->timer);
2583 } 2931 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2584} 2932}
2585 2933
2586static void noinline 2934static void noinline
2587infy_del (EV_P_ ev_stat *w) 2935infy_del (EV_P_ ev_stat *w)
2588{ 2936{
2633 2981
2634static void 2982static void
2635infy_cb (EV_P_ ev_io *w, int revents) 2983infy_cb (EV_P_ ev_io *w, int revents)
2636{ 2984{
2637 char buf [EV_INOTIFY_BUFSIZE]; 2985 char buf [EV_INOTIFY_BUFSIZE];
2638 struct inotify_event *ev = (struct inotify_event *)buf;
2639 int ofs; 2986 int ofs;
2640 int len = read (fs_fd, buf, sizeof (buf)); 2987 int len = read (fs_fd, buf, sizeof (buf));
2641 2988
2642 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2989 for (ofs = 0; ofs < len; )
2990 {
2991 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2643 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2992 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2993 ofs += sizeof (struct inotify_event) + ev->len;
2994 }
2644} 2995}
2645 2996
2646inline_size void 2997inline_size void
2647check_2625 (EV_P) 2998check_2625 (EV_P)
2648{ 2999{
2664 return; 3015 return;
2665 3016
2666 fs_2625 = 1; 3017 fs_2625 = 1;
2667} 3018}
2668 3019
3020inline_size int
3021infy_newfd (void)
3022{
3023#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3024 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3025 if (fd >= 0)
3026 return fd;
3027#endif
3028 return inotify_init ();
3029}
3030
2669inline_size void 3031inline_size void
2670infy_init (EV_P) 3032infy_init (EV_P)
2671{ 3033{
2672 if (fs_fd != -2) 3034 if (fs_fd != -2)
2673 return; 3035 return;
2674 3036
2675 fs_fd = -1; 3037 fs_fd = -1;
2676 3038
2677 check_2625 (EV_A); 3039 check_2625 (EV_A);
2678 3040
2679 fs_fd = inotify_init (); 3041 fs_fd = infy_newfd ();
2680 3042
2681 if (fs_fd >= 0) 3043 if (fs_fd >= 0)
2682 { 3044 {
3045 fd_intern (fs_fd);
2683 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3046 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2684 ev_set_priority (&fs_w, EV_MAXPRI); 3047 ev_set_priority (&fs_w, EV_MAXPRI);
2685 ev_io_start (EV_A_ &fs_w); 3048 ev_io_start (EV_A_ &fs_w);
3049 ev_unref (EV_A);
2686 } 3050 }
2687} 3051}
2688 3052
2689inline_size void 3053inline_size void
2690infy_fork (EV_P) 3054infy_fork (EV_P)
2692 int slot; 3056 int slot;
2693 3057
2694 if (fs_fd < 0) 3058 if (fs_fd < 0)
2695 return; 3059 return;
2696 3060
3061 ev_ref (EV_A);
3062 ev_io_stop (EV_A_ &fs_w);
2697 close (fs_fd); 3063 close (fs_fd);
2698 fs_fd = inotify_init (); 3064 fs_fd = infy_newfd ();
3065
3066 if (fs_fd >= 0)
3067 {
3068 fd_intern (fs_fd);
3069 ev_io_set (&fs_w, fs_fd, EV_READ);
3070 ev_io_start (EV_A_ &fs_w);
3071 ev_unref (EV_A);
3072 }
2699 3073
2700 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3074 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2701 { 3075 {
2702 WL w_ = fs_hash [slot].head; 3076 WL w_ = fs_hash [slot].head;
2703 fs_hash [slot].head = 0; 3077 fs_hash [slot].head = 0;
2710 w->wd = -1; 3084 w->wd = -1;
2711 3085
2712 if (fs_fd >= 0) 3086 if (fs_fd >= 0)
2713 infy_add (EV_A_ w); /* re-add, no matter what */ 3087 infy_add (EV_A_ w); /* re-add, no matter what */
2714 else 3088 else
3089 {
3090 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3091 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2715 ev_timer_again (EV_A_ &w->timer); 3092 ev_timer_again (EV_A_ &w->timer);
3093 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3094 }
2716 } 3095 }
2717 } 3096 }
2718} 3097}
2719 3098
2720#endif 3099#endif
2737static void noinline 3116static void noinline
2738stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3117stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2739{ 3118{
2740 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3119 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2741 3120
2742 /* we copy this here each the time so that */ 3121 ev_statdata prev = w->attr;
2743 /* prev has the old value when the callback gets invoked */
2744 w->prev = w->attr;
2745 ev_stat_stat (EV_A_ w); 3122 ev_stat_stat (EV_A_ w);
2746 3123
2747 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3124 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2748 if ( 3125 if (
2749 w->prev.st_dev != w->attr.st_dev 3126 prev.st_dev != w->attr.st_dev
2750 || w->prev.st_ino != w->attr.st_ino 3127 || prev.st_ino != w->attr.st_ino
2751 || w->prev.st_mode != w->attr.st_mode 3128 || prev.st_mode != w->attr.st_mode
2752 || w->prev.st_nlink != w->attr.st_nlink 3129 || prev.st_nlink != w->attr.st_nlink
2753 || w->prev.st_uid != w->attr.st_uid 3130 || prev.st_uid != w->attr.st_uid
2754 || w->prev.st_gid != w->attr.st_gid 3131 || prev.st_gid != w->attr.st_gid
2755 || w->prev.st_rdev != w->attr.st_rdev 3132 || prev.st_rdev != w->attr.st_rdev
2756 || w->prev.st_size != w->attr.st_size 3133 || prev.st_size != w->attr.st_size
2757 || w->prev.st_atime != w->attr.st_atime 3134 || prev.st_atime != w->attr.st_atime
2758 || w->prev.st_mtime != w->attr.st_mtime 3135 || prev.st_mtime != w->attr.st_mtime
2759 || w->prev.st_ctime != w->attr.st_ctime 3136 || prev.st_ctime != w->attr.st_ctime
2760 ) { 3137 ) {
3138 /* we only update w->prev on actual differences */
3139 /* in case we test more often than invoke the callback, */
3140 /* to ensure that prev is always different to attr */
3141 w->prev = prev;
3142
2761 #if EV_USE_INOTIFY 3143 #if EV_USE_INOTIFY
2762 if (fs_fd >= 0) 3144 if (fs_fd >= 0)
2763 { 3145 {
2764 infy_del (EV_A_ w); 3146 infy_del (EV_A_ w);
2765 infy_add (EV_A_ w); 3147 infy_add (EV_A_ w);
2790 3172
2791 if (fs_fd >= 0) 3173 if (fs_fd >= 0)
2792 infy_add (EV_A_ w); 3174 infy_add (EV_A_ w);
2793 else 3175 else
2794#endif 3176#endif
3177 {
2795 ev_timer_again (EV_A_ &w->timer); 3178 ev_timer_again (EV_A_ &w->timer);
3179 ev_unref (EV_A);
3180 }
2796 3181
2797 ev_start (EV_A_ (W)w, 1); 3182 ev_start (EV_A_ (W)w, 1);
2798 3183
2799 EV_FREQUENT_CHECK; 3184 EV_FREQUENT_CHECK;
2800} 3185}
2809 EV_FREQUENT_CHECK; 3194 EV_FREQUENT_CHECK;
2810 3195
2811#if EV_USE_INOTIFY 3196#if EV_USE_INOTIFY
2812 infy_del (EV_A_ w); 3197 infy_del (EV_A_ w);
2813#endif 3198#endif
3199
3200 if (ev_is_active (&w->timer))
3201 {
3202 ev_ref (EV_A);
2814 ev_timer_stop (EV_A_ &w->timer); 3203 ev_timer_stop (EV_A_ &w->timer);
3204 }
2815 3205
2816 ev_stop (EV_A_ (W)w); 3206 ev_stop (EV_A_ (W)w);
2817 3207
2818 EV_FREQUENT_CHECK; 3208 EV_FREQUENT_CHECK;
2819} 3209}
2960embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3350embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2961{ 3351{
2962 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3352 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2963 3353
2964 { 3354 {
2965 struct ev_loop *loop = w->other; 3355 EV_P = w->other;
2966 3356
2967 while (fdchangecnt) 3357 while (fdchangecnt)
2968 { 3358 {
2969 fd_reify (EV_A); 3359 fd_reify (EV_A);
2970 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3360 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2978 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3368 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2979 3369
2980 ev_embed_stop (EV_A_ w); 3370 ev_embed_stop (EV_A_ w);
2981 3371
2982 { 3372 {
2983 struct ev_loop *loop = w->other; 3373 EV_P = w->other;
2984 3374
2985 ev_loop_fork (EV_A); 3375 ev_loop_fork (EV_A);
2986 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3376 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2987 } 3377 }
2988 3378
3002{ 3392{
3003 if (expect_false (ev_is_active (w))) 3393 if (expect_false (ev_is_active (w)))
3004 return; 3394 return;
3005 3395
3006 { 3396 {
3007 struct ev_loop *loop = w->other; 3397 EV_P = w->other;
3008 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3398 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3009 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3399 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3010 } 3400 }
3011 3401
3012 EV_FREQUENT_CHECK; 3402 EV_FREQUENT_CHECK;
3124 3514
3125void 3515void
3126ev_async_send (EV_P_ ev_async *w) 3516ev_async_send (EV_P_ ev_async *w)
3127{ 3517{
3128 w->sent = 1; 3518 w->sent = 1;
3129 evpipe_write (EV_A_ &gotasync); 3519 evpipe_write (EV_A_ &async_pending);
3130} 3520}
3131#endif 3521#endif
3132 3522
3133/*****************************************************************************/ 3523/*****************************************************************************/
3134 3524
3198 } 3588 }
3199} 3589}
3200 3590
3201/*****************************************************************************/ 3591/*****************************************************************************/
3202 3592
3203#if 0 3593#if EV_WALK_ENABLE
3204void 3594void
3205ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3595ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3206{ 3596{
3207 int i, j; 3597 int i, j;
3208 ev_watcher_list *wl, *wn; 3598 ev_watcher_list *wl, *wn;
3224#if EV_USE_INOTIFY 3614#if EV_USE_INOTIFY
3225 if (ev_cb ((ev_io *)wl) == infy_cb) 3615 if (ev_cb ((ev_io *)wl) == infy_cb)
3226 ; 3616 ;
3227 else 3617 else
3228#endif 3618#endif
3229 if ((ev_io *)wl != &pipeev) 3619 if ((ev_io *)wl != &pipe_w)
3230 if (types & EV_IO) 3620 if (types & EV_IO)
3231 cb (EV_A_ EV_IO, wl); 3621 cb (EV_A_ EV_IO, wl);
3232 3622
3233 wl = wn; 3623 wl = wn;
3234 } 3624 }
3283 if (types & EV_CHECK) 3673 if (types & EV_CHECK)
3284 for (i = checkcnt; i--; ) 3674 for (i = checkcnt; i--; )
3285 cb (EV_A_ EV_CHECK, checks [i]); 3675 cb (EV_A_ EV_CHECK, checks [i]);
3286 3676
3287 if (types & EV_SIGNAL) 3677 if (types & EV_SIGNAL)
3288 for (i = 0; i < signalmax; ++i) 3678 for (i = 0; i < EV_NSIG - 1; ++i)
3289 for (wl = signals [i].head; wl; ) 3679 for (wl = signals [i].head; wl; )
3290 { 3680 {
3291 wn = wl->next; 3681 wn = wl->next;
3292 cb (EV_A_ EV_SIGNAL, wl); 3682 cb (EV_A_ EV_SIGNAL, wl);
3293 wl = wn; 3683 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines