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

Comparing libev/ev.c (file contents):
Revision 1.283 by root, Wed Apr 15 09:51:19 2009 UTC vs.
Revision 1.328 by root, Sun Feb 14 19:23:19 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
575ev_tstamp inline_size 707inline_size ev_tstamp
576get_clock (void) 708get_clock (void)
577{ 709{
578#if EV_USE_MONOTONIC 710#if EV_USE_MONOTONIC
579 if (expect_true (have_monotonic)) 711 if (expect_true (have_monotonic))
580 { 712 {
… …
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
630int inline_size 762/* find a suitable new size for the given array, */
763/* hopefully by rounding to a ncie-to-malloc size */
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
635 do 769 do
… …
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_);
… …
697 pendings [pri][w_->pending - 1].w = w_; 837 pendings [pri][w_->pending - 1].w = w_;
698 pendings [pri][w_->pending - 1].events = revents; 838 pendings [pri][w_->pending - 1].events = revents;
699 } 839 }
700} 840}
701 841
702void inline_speed 842inline_speed void
843feed_reverse (EV_P_ W w)
844{
845 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
846 rfeeds [rfeedcnt++] = w;
847}
848
849inline_size void
850feed_reverse_done (EV_P_ int revents)
851{
852 do
853 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
854 while (rfeedcnt);
855}
856
857inline_speed void
703queue_events (EV_P_ W *events, int eventcnt, int type) 858queue_events (EV_P_ W *events, int eventcnt, int type)
704{ 859{
705 int i; 860 int i;
706 861
707 for (i = 0; i < eventcnt; ++i) 862 for (i = 0; i < eventcnt; ++i)
708 ev_feed_event (EV_A_ events [i], type); 863 ev_feed_event (EV_A_ events [i], type);
709} 864}
710 865
711/*****************************************************************************/ 866/*****************************************************************************/
712 867
713void inline_speed 868inline_speed void
714fd_event (EV_P_ int fd, int revents) 869fd_event_nc (EV_P_ int fd, int revents)
715{ 870{
716 ANFD *anfd = anfds + fd; 871 ANFD *anfd = anfds + fd;
717 ev_io *w; 872 ev_io *w;
718 873
719 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)
… …
723 if (ev) 878 if (ev)
724 ev_feed_event (EV_A_ (W)w, ev); 879 ev_feed_event (EV_A_ (W)w, ev);
725 } 880 }
726} 881}
727 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
728void 894void
729ev_feed_fd_event (EV_P_ int fd, int revents) 895ev_feed_fd_event (EV_P_ int fd, int revents)
730{ 896{
731 if (fd >= 0 && fd < anfdmax) 897 if (fd >= 0 && fd < anfdmax)
732 fd_event (EV_A_ fd, revents); 898 fd_event_nc (EV_A_ fd, revents);
733} 899}
734 900
735void inline_size 901/* make sure the external fd watch events are in-sync */
902/* with the kernel/libev internal state */
903inline_size void
736fd_reify (EV_P) 904fd_reify (EV_P)
737{ 905{
738 int i; 906 int i;
739 907
740 for (i = 0; i < fdchangecnt; ++i) 908 for (i = 0; i < fdchangecnt; ++i)
… …
750 918
751#if EV_SELECT_IS_WINSOCKET 919#if EV_SELECT_IS_WINSOCKET
752 if (events) 920 if (events)
753 { 921 {
754 unsigned long arg; 922 unsigned long arg;
755 #ifdef EV_FD_TO_WIN32_HANDLE
756 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 923 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
757 #else
758 anfd->handle = _get_osfhandle (fd);
759 #endif
760 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));
761 } 925 }
762#endif 926#endif
763 927
764 { 928 {
… …
774 } 938 }
775 939
776 fdchangecnt = 0; 940 fdchangecnt = 0;
777} 941}
778 942
779void inline_size 943/* something about the given fd changed */
944inline_size void
780fd_change (EV_P_ int fd, int flags) 945fd_change (EV_P_ int fd, int flags)
781{ 946{
782 unsigned char reify = anfds [fd].reify; 947 unsigned char reify = anfds [fd].reify;
783 anfds [fd].reify |= flags; 948 anfds [fd].reify |= flags;
784 949
… …
788 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 953 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
789 fdchanges [fdchangecnt - 1] = fd; 954 fdchanges [fdchangecnt - 1] = fd;
790 } 955 }
791} 956}
792 957
793void inline_speed 958/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
959inline_speed void
794fd_kill (EV_P_ int fd) 960fd_kill (EV_P_ int fd)
795{ 961{
796 ev_io *w; 962 ev_io *w;
797 963
798 while ((w = (ev_io *)anfds [fd].head)) 964 while ((w = (ev_io *)anfds [fd].head))
… …
800 ev_io_stop (EV_A_ w); 966 ev_io_stop (EV_A_ w);
801 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);
802 } 968 }
803} 969}
804 970
805int inline_size 971/* check whether the given fd is atcually valid, for error recovery */
972inline_size int
806fd_valid (int fd) 973fd_valid (int fd)
807{ 974{
808#ifdef _WIN32 975#ifdef _WIN32
809 return _get_osfhandle (fd) != -1; 976 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
810#else 977#else
811 return fcntl (fd, F_GETFD) != -1; 978 return fcntl (fd, F_GETFD) != -1;
812#endif 979#endif
813} 980}
814 981
… …
832 999
833 for (fd = anfdmax; fd--; ) 1000 for (fd = anfdmax; fd--; )
834 if (anfds [fd].events) 1001 if (anfds [fd].events)
835 { 1002 {
836 fd_kill (EV_A_ fd); 1003 fd_kill (EV_A_ fd);
837 return; 1004 break;
838 } 1005 }
839} 1006}
840 1007
841/* 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 */
842static void noinline 1009static void noinline
… …
847 for (fd = 0; fd < anfdmax; ++fd) 1014 for (fd = 0; fd < anfdmax; ++fd)
848 if (anfds [fd].events) 1015 if (anfds [fd].events)
849 { 1016 {
850 anfds [fd].events = 0; 1017 anfds [fd].events = 0;
851 anfds [fd].emask = 0; 1018 anfds [fd].emask = 0;
852 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1019 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
853 } 1020 }
854} 1021}
855 1022
856/*****************************************************************************/ 1023/*****************************************************************************/
857 1024
… …
873#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1040#define HEAP0 (DHEAP - 1) /* index of first element in heap */
874#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1041#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
875#define UPHEAP_DONE(p,k) ((p) == (k)) 1042#define UPHEAP_DONE(p,k) ((p) == (k))
876 1043
877/* away from the root */ 1044/* away from the root */
878void inline_speed 1045inline_speed void
879downheap (ANHE *heap, int N, int k) 1046downheap (ANHE *heap, int N, int k)
880{ 1047{
881 ANHE he = heap [k]; 1048 ANHE he = heap [k];
882 ANHE *E = heap + N + HEAP0; 1049 ANHE *E = heap + N + HEAP0;
883 1050
… …
923#define HEAP0 1 1090#define HEAP0 1
924#define HPARENT(k) ((k) >> 1) 1091#define HPARENT(k) ((k) >> 1)
925#define UPHEAP_DONE(p,k) (!(p)) 1092#define UPHEAP_DONE(p,k) (!(p))
926 1093
927/* away from the root */ 1094/* away from the root */
928void inline_speed 1095inline_speed void
929downheap (ANHE *heap, int N, int k) 1096downheap (ANHE *heap, int N, int k)
930{ 1097{
931 ANHE he = heap [k]; 1098 ANHE he = heap [k];
932 1099
933 for (;;) 1100 for (;;)
934 { 1101 {
935 int c = k << 1; 1102 int c = k << 1;
936 1103
937 if (c > N + HEAP0 - 1) 1104 if (c >= N + HEAP0)
938 break; 1105 break;
939 1106
940 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])
941 ? 1 : 0; 1108 ? 1 : 0;
942 1109
… …
953 ev_active (ANHE_w (he)) = k; 1120 ev_active (ANHE_w (he)) = k;
954} 1121}
955#endif 1122#endif
956 1123
957/* towards the root */ 1124/* towards the root */
958void inline_speed 1125inline_speed void
959upheap (ANHE *heap, int k) 1126upheap (ANHE *heap, int k)
960{ 1127{
961 ANHE he = heap [k]; 1128 ANHE he = heap [k];
962 1129
963 for (;;) 1130 for (;;)
… …
974 1141
975 heap [k] = he; 1142 heap [k] = he;
976 ev_active (ANHE_w (he)) = k; 1143 ev_active (ANHE_w (he)) = k;
977} 1144}
978 1145
979void inline_size 1146/* move an element suitably so it is in a correct place */
1147inline_size void
980adjustheap (ANHE *heap, int N, int k) 1148adjustheap (ANHE *heap, int N, int k)
981{ 1149{
982 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)]))
983 upheap (heap, k); 1151 upheap (heap, k);
984 else 1152 else
985 downheap (heap, N, k); 1153 downheap (heap, N, k);
986} 1154}
987 1155
988/* rebuild the heap: this function is used only once and executed rarely */ 1156/* rebuild the heap: this function is used only once and executed rarely */
989void inline_size 1157inline_size void
990reheap (ANHE *heap, int N) 1158reheap (ANHE *heap, int N)
991{ 1159{
992 int i; 1160 int i;
993 1161
994 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1162 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
997 upheap (heap, i + HEAP0); 1165 upheap (heap, i + HEAP0);
998} 1166}
999 1167
1000/*****************************************************************************/ 1168/*****************************************************************************/
1001 1169
1170/* associate signal watchers to a signal signal */
1002typedef struct 1171typedef struct
1003{ 1172{
1173 EV_ATOMIC_T pending;
1174#if EV_MULTIPLICITY
1175 EV_P;
1176#endif
1004 WL head; 1177 WL head;
1005 EV_ATOMIC_T gotsig;
1006} ANSIG; 1178} ANSIG;
1007 1179
1008static ANSIG *signals; 1180static ANSIG signals [EV_NSIG - 1];
1009static int signalmax;
1010
1011static EV_ATOMIC_T gotsig;
1012 1181
1013/*****************************************************************************/ 1182/*****************************************************************************/
1014 1183
1015void inline_speed 1184/* used to prepare libev internal fd's */
1185/* this is not fork-safe */
1186inline_speed void
1016fd_intern (int fd) 1187fd_intern (int fd)
1017{ 1188{
1018#ifdef _WIN32 1189#ifdef _WIN32
1019 unsigned long arg = 1; 1190 unsigned long arg = 1;
1020 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1191 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1021#else 1192#else
1022 fcntl (fd, F_SETFD, FD_CLOEXEC); 1193 fcntl (fd, F_SETFD, FD_CLOEXEC);
1023 fcntl (fd, F_SETFL, O_NONBLOCK); 1194 fcntl (fd, F_SETFL, O_NONBLOCK);
1024#endif 1195#endif
1025} 1196}
1026 1197
1027static void noinline 1198static void noinline
1028evpipe_init (EV_P) 1199evpipe_init (EV_P)
1029{ 1200{
1030 if (!ev_is_active (&pipeev)) 1201 if (!ev_is_active (&pipe_w))
1031 { 1202 {
1032#if EV_USE_EVENTFD 1203#if EV_USE_EVENTFD
1204 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1205 if (evfd < 0 && errno == EINVAL)
1033 if ((evfd = eventfd (0, 0)) >= 0) 1206 evfd = eventfd (0, 0);
1207
1208 if (evfd >= 0)
1034 { 1209 {
1035 evpipe [0] = -1; 1210 evpipe [0] = -1;
1036 fd_intern (evfd); 1211 fd_intern (evfd); /* doing it twice doesn't hurt */
1037 ev_io_set (&pipeev, evfd, EV_READ); 1212 ev_io_set (&pipe_w, evfd, EV_READ);
1038 } 1213 }
1039 else 1214 else
1040#endif 1215#endif
1041 { 1216 {
1042 while (pipe (evpipe)) 1217 while (pipe (evpipe))
1043 ev_syserr ("(libev) error creating signal/async pipe"); 1218 ev_syserr ("(libev) error creating signal/async pipe");
1044 1219
1045 fd_intern (evpipe [0]); 1220 fd_intern (evpipe [0]);
1046 fd_intern (evpipe [1]); 1221 fd_intern (evpipe [1]);
1047 ev_io_set (&pipeev, evpipe [0], EV_READ); 1222 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1048 } 1223 }
1049 1224
1050 ev_io_start (EV_A_ &pipeev); 1225 ev_io_start (EV_A_ &pipe_w);
1051 ev_unref (EV_A); /* watcher should not keep loop alive */ 1226 ev_unref (EV_A); /* watcher should not keep loop alive */
1052 } 1227 }
1053} 1228}
1054 1229
1055void inline_size 1230inline_size void
1056evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1231evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1057{ 1232{
1058 if (!*flag) 1233 if (!*flag)
1059 { 1234 {
1060 int old_errno = errno; /* save errno because write might clobber it */ 1235 int old_errno = errno; /* save errno because write might clobber it */
… …
1073 1248
1074 errno = old_errno; 1249 errno = old_errno;
1075 } 1250 }
1076} 1251}
1077 1252
1253/* called whenever the libev signal pipe */
1254/* got some events (signal, async) */
1078static void 1255static void
1079pipecb (EV_P_ ev_io *iow, int revents) 1256pipecb (EV_P_ ev_io *iow, int revents)
1080{ 1257{
1258 int i;
1259
1081#if EV_USE_EVENTFD 1260#if EV_USE_EVENTFD
1082 if (evfd >= 0) 1261 if (evfd >= 0)
1083 { 1262 {
1084 uint64_t counter; 1263 uint64_t counter;
1085 read (evfd, &counter, sizeof (uint64_t)); 1264 read (evfd, &counter, sizeof (uint64_t));
… …
1089 { 1268 {
1090 char dummy; 1269 char dummy;
1091 read (evpipe [0], &dummy, 1); 1270 read (evpipe [0], &dummy, 1);
1092 } 1271 }
1093 1272
1094 if (gotsig && ev_is_default_loop (EV_A)) 1273 if (sig_pending)
1095 { 1274 {
1096 int signum; 1275 sig_pending = 0;
1097 gotsig = 0;
1098 1276
1099 for (signum = signalmax; signum--; ) 1277 for (i = EV_NSIG - 1; i--; )
1100 if (signals [signum].gotsig) 1278 if (expect_false (signals [i].pending))
1101 ev_feed_signal_event (EV_A_ signum + 1); 1279 ev_feed_signal_event (EV_A_ i + 1);
1102 } 1280 }
1103 1281
1104#if EV_ASYNC_ENABLE 1282#if EV_ASYNC_ENABLE
1105 if (gotasync) 1283 if (async_pending)
1106 { 1284 {
1107 int i; 1285 async_pending = 0;
1108 gotasync = 0;
1109 1286
1110 for (i = asynccnt; i--; ) 1287 for (i = asynccnt; i--; )
1111 if (asyncs [i]->sent) 1288 if (asyncs [i]->sent)
1112 { 1289 {
1113 asyncs [i]->sent = 0; 1290 asyncs [i]->sent = 0;
… …
1121 1298
1122static void 1299static void
1123ev_sighandler (int signum) 1300ev_sighandler (int signum)
1124{ 1301{
1125#if EV_MULTIPLICITY 1302#if EV_MULTIPLICITY
1126 struct ev_loop *loop = &default_loop_struct; 1303 EV_P = signals [signum - 1].loop;
1127#endif 1304#endif
1128 1305
1129#if _WIN32 1306#ifdef _WIN32
1130 signal (signum, ev_sighandler); 1307 signal (signum, ev_sighandler);
1131#endif 1308#endif
1132 1309
1133 signals [signum - 1].gotsig = 1; 1310 signals [signum - 1].pending = 1;
1134 evpipe_write (EV_A_ &gotsig); 1311 evpipe_write (EV_A_ &sig_pending);
1135} 1312}
1136 1313
1137void noinline 1314void noinline
1138ev_feed_signal_event (EV_P_ int signum) 1315ev_feed_signal_event (EV_P_ int signum)
1139{ 1316{
1140 WL w; 1317 WL w;
1141 1318
1319 if (expect_false (signum <= 0 || signum > EV_NSIG))
1320 return;
1321
1322 --signum;
1323
1142#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1143 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 */
1144#endif 1326 /* or, likely more useful, feeding a signal nobody is waiting for */
1145 1327
1146 --signum; 1328 if (expect_false (signals [signum].loop != EV_A))
1147
1148 if (signum < 0 || signum >= signalmax)
1149 return; 1329 return;
1330#endif
1150 1331
1151 signals [signum].gotsig = 0; 1332 signals [signum].pending = 0;
1152 1333
1153 for (w = signals [signum].head; w; w = w->next) 1334 for (w = signals [signum].head; w; w = w->next)
1154 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1335 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1155} 1336}
1156 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
1157/*****************************************************************************/ 1358/*****************************************************************************/
1158 1359
1159static WL childs [EV_PID_HASHSIZE]; 1360static WL childs [EV_PID_HASHSIZE];
1160 1361
1161#ifndef _WIN32 1362#ifndef _WIN32
… …
1164 1365
1165#ifndef WIFCONTINUED 1366#ifndef WIFCONTINUED
1166# define WIFCONTINUED(status) 0 1367# define WIFCONTINUED(status) 0
1167#endif 1368#endif
1168 1369
1169void inline_speed 1370/* handle a single child status event */
1371inline_speed void
1170child_reap (EV_P_ int chain, int pid, int status) 1372child_reap (EV_P_ int chain, int pid, int status)
1171{ 1373{
1172 ev_child *w; 1374 ev_child *w;
1173 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1375 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1174 1376
… …
1187 1389
1188#ifndef WCONTINUED 1390#ifndef WCONTINUED
1189# define WCONTINUED 0 1391# define WCONTINUED 0
1190#endif 1392#endif
1191 1393
1394/* called on sigchld etc., calls waitpid */
1192static void 1395static void
1193childcb (EV_P_ ev_signal *sw, int revents) 1396childcb (EV_P_ ev_signal *sw, int revents)
1194{ 1397{
1195 int pid, status; 1398 int pid, status;
1196 1399
… …
1303ev_backend (EV_P) 1506ev_backend (EV_P)
1304{ 1507{
1305 return backend; 1508 return backend;
1306} 1509}
1307 1510
1511#if EV_MINIMAL < 2
1308unsigned int 1512unsigned int
1309ev_loop_count (EV_P) 1513ev_loop_count (EV_P)
1310{ 1514{
1311 return loop_count; 1515 return loop_count;
1312} 1516}
1313 1517
1518unsigned int
1519ev_loop_depth (EV_P)
1520{
1521 return loop_depth;
1522}
1523
1314void 1524void
1315ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1525ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1316{ 1526{
1317 io_blocktime = interval; 1527 io_blocktime = interval;
1318} 1528}
… …
1321ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1531ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1322{ 1532{
1323 timeout_blocktime = interval; 1533 timeout_blocktime = interval;
1324} 1534}
1325 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 */
1326static void noinline 1561static void noinline
1327loop_init (EV_P_ unsigned int flags) 1562loop_init (EV_P_ unsigned int flags)
1328{ 1563{
1329 if (!backend) 1564 if (!backend)
1330 { 1565 {
… …
1346 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1581 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1347 have_monotonic = 1; 1582 have_monotonic = 1;
1348 } 1583 }
1349#endif 1584#endif
1350 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
1351 ev_rt_now = ev_time (); 1597 ev_rt_now = ev_time ();
1352 mn_now = get_clock (); 1598 mn_now = get_clock ();
1353 now_floor = mn_now; 1599 now_floor = mn_now;
1354 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
1355 1604
1356 io_blocktime = 0.; 1605 io_blocktime = 0.;
1357 timeout_blocktime = 0.; 1606 timeout_blocktime = 0.;
1358 backend = 0; 1607 backend = 0;
1359 backend_fd = -1; 1608 backend_fd = -1;
1360 gotasync = 0; 1609 sig_pending = 0;
1610#if EV_ASYNC_ENABLE
1611 async_pending = 0;
1612#endif
1361#if EV_USE_INOTIFY 1613#if EV_USE_INOTIFY
1362 fs_fd = -2; 1614 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1363#endif 1615#endif
1364 1616#if EV_USE_SIGNALFD
1365 /* pid check not overridable via env */ 1617 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1366#ifndef _WIN32
1367 if (flags & EVFLAG_FORKCHECK)
1368 curpid = getpid ();
1369#endif 1618#endif
1370
1371 if (!(flags & EVFLAG_NOENV)
1372 && !enable_secure ()
1373 && getenv ("LIBEV_FLAGS"))
1374 flags = atoi (getenv ("LIBEV_FLAGS"));
1375 1619
1376 if (!(flags & 0x0000ffffU)) 1620 if (!(flags & 0x0000ffffU))
1377 flags |= ev_recommended_backends (); 1621 flags |= ev_recommended_backends ();
1378 1622
1379#if EV_USE_PORT 1623#if EV_USE_PORT
… …
1390#endif 1634#endif
1391#if EV_USE_SELECT 1635#if EV_USE_SELECT
1392 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1636 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1393#endif 1637#endif
1394 1638
1639 ev_prepare_init (&pending_w, pendingcb);
1640
1395 ev_init (&pipeev, pipecb); 1641 ev_init (&pipe_w, pipecb);
1396 ev_set_priority (&pipeev, EV_MAXPRI); 1642 ev_set_priority (&pipe_w, EV_MAXPRI);
1397 } 1643 }
1398} 1644}
1399 1645
1646/* free up a loop structure */
1400static void noinline 1647static void noinline
1401loop_destroy (EV_P) 1648loop_destroy (EV_P)
1402{ 1649{
1403 int i; 1650 int i;
1404 1651
1405 if (ev_is_active (&pipeev)) 1652 if (ev_is_active (&pipe_w))
1406 { 1653 {
1407 ev_ref (EV_A); /* signal watcher */ 1654 /*ev_ref (EV_A);*/
1408 ev_io_stop (EV_A_ &pipeev); 1655 /*ev_io_stop (EV_A_ &pipe_w);*/
1409 1656
1410#if EV_USE_EVENTFD 1657#if EV_USE_EVENTFD
1411 if (evfd >= 0) 1658 if (evfd >= 0)
1412 close (evfd); 1659 close (evfd);
1413#endif 1660#endif
1414 1661
1415 if (evpipe [0] >= 0) 1662 if (evpipe [0] >= 0)
1416 { 1663 {
1417 close (evpipe [0]); 1664 EV_WIN32_CLOSE_FD (evpipe [0]);
1418 close (evpipe [1]); 1665 EV_WIN32_CLOSE_FD (evpipe [1]);
1419 } 1666 }
1420 } 1667 }
1668
1669#if EV_USE_SIGNALFD
1670 if (ev_is_active (&sigfd_w))
1671 close (sigfd);
1672#endif
1421 1673
1422#if EV_USE_INOTIFY 1674#if EV_USE_INOTIFY
1423 if (fs_fd >= 0) 1675 if (fs_fd >= 0)
1424 close (fs_fd); 1676 close (fs_fd);
1425#endif 1677#endif
… …
1449#if EV_IDLE_ENABLE 1701#if EV_IDLE_ENABLE
1450 array_free (idle, [i]); 1702 array_free (idle, [i]);
1451#endif 1703#endif
1452 } 1704 }
1453 1705
1454 ev_free (anfds); anfdmax = 0; 1706 ev_free (anfds); anfds = 0; anfdmax = 0;
1455 1707
1456 /* have to use the microsoft-never-gets-it-right macro */ 1708 /* have to use the microsoft-never-gets-it-right macro */
1709 array_free (rfeed, EMPTY);
1457 array_free (fdchange, EMPTY); 1710 array_free (fdchange, EMPTY);
1458 array_free (timer, EMPTY); 1711 array_free (timer, EMPTY);
1459#if EV_PERIODIC_ENABLE 1712#if EV_PERIODIC_ENABLE
1460 array_free (periodic, EMPTY); 1713 array_free (periodic, EMPTY);
1461#endif 1714#endif
… …
1470 1723
1471 backend = 0; 1724 backend = 0;
1472} 1725}
1473 1726
1474#if EV_USE_INOTIFY 1727#if EV_USE_INOTIFY
1475void inline_size infy_fork (EV_P); 1728inline_size void infy_fork (EV_P);
1476#endif 1729#endif
1477 1730
1478void inline_size 1731inline_size void
1479loop_fork (EV_P) 1732loop_fork (EV_P)
1480{ 1733{
1481#if EV_USE_PORT 1734#if EV_USE_PORT
1482 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1735 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1483#endif 1736#endif
… …
1489#endif 1742#endif
1490#if EV_USE_INOTIFY 1743#if EV_USE_INOTIFY
1491 infy_fork (EV_A); 1744 infy_fork (EV_A);
1492#endif 1745#endif
1493 1746
1494 if (ev_is_active (&pipeev)) 1747 if (ev_is_active (&pipe_w))
1495 { 1748 {
1496 /* this "locks" the handlers against writing to the pipe */ 1749 /* this "locks" the handlers against writing to the pipe */
1497 /* while we modify the fd vars */ 1750 /* while we modify the fd vars */
1498 gotsig = 1; 1751 sig_pending = 1;
1499#if EV_ASYNC_ENABLE 1752#if EV_ASYNC_ENABLE
1500 gotasync = 1; 1753 async_pending = 1;
1501#endif 1754#endif
1502 1755
1503 ev_ref (EV_A); 1756 ev_ref (EV_A);
1504 ev_io_stop (EV_A_ &pipeev); 1757 ev_io_stop (EV_A_ &pipe_w);
1505 1758
1506#if EV_USE_EVENTFD 1759#if EV_USE_EVENTFD
1507 if (evfd >= 0) 1760 if (evfd >= 0)
1508 close (evfd); 1761 close (evfd);
1509#endif 1762#endif
1510 1763
1511 if (evpipe [0] >= 0) 1764 if (evpipe [0] >= 0)
1512 { 1765 {
1513 close (evpipe [0]); 1766 EV_WIN32_CLOSE_FD (evpipe [0]);
1514 close (evpipe [1]); 1767 EV_WIN32_CLOSE_FD (evpipe [1]);
1515 } 1768 }
1516 1769
1517 evpipe_init (EV_A); 1770 evpipe_init (EV_A);
1518 /* now iterate over everything, in case we missed something */ 1771 /* now iterate over everything, in case we missed something */
1519 pipecb (EV_A_ &pipeev, EV_READ); 1772 pipecb (EV_A_ &pipe_w, EV_READ);
1520 } 1773 }
1521 1774
1522 postfork = 0; 1775 postfork = 0;
1523} 1776}
1524 1777
1525#if EV_MULTIPLICITY 1778#if EV_MULTIPLICITY
1526 1779
1527struct ev_loop * 1780struct ev_loop *
1528ev_loop_new (unsigned int flags) 1781ev_loop_new (unsigned int flags)
1529{ 1782{
1530 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));
1531 1784
1532 memset (loop, 0, sizeof (struct ev_loop)); 1785 memset (EV_A, 0, sizeof (struct ev_loop));
1533
1534 loop_init (EV_A_ flags); 1786 loop_init (EV_A_ flags);
1535 1787
1536 if (ev_backend (EV_A)) 1788 if (ev_backend (EV_A))
1537 return loop; 1789 return EV_A;
1538 1790
1539 return 0; 1791 return 0;
1540} 1792}
1541 1793
1542void 1794void
… …
1549void 1801void
1550ev_loop_fork (EV_P) 1802ev_loop_fork (EV_P)
1551{ 1803{
1552 postfork = 1; /* must be in line with ev_default_fork */ 1804 postfork = 1; /* must be in line with ev_default_fork */
1553} 1805}
1806#endif /* multiplicity */
1554 1807
1555#if EV_VERIFY 1808#if EV_VERIFY
1556static void noinline 1809static void noinline
1557verify_watcher (EV_P_ W w) 1810verify_watcher (EV_P_ W w)
1558{ 1811{
… …
1586 verify_watcher (EV_A_ ws [cnt]); 1839 verify_watcher (EV_A_ ws [cnt]);
1587 } 1840 }
1588} 1841}
1589#endif 1842#endif
1590 1843
1844#if EV_MINIMAL < 2
1591void 1845void
1592ev_loop_verify (EV_P) 1846ev_loop_verify (EV_P)
1593{ 1847{
1594#if EV_VERIFY 1848#if EV_VERIFY
1595 int i; 1849 int i;
… …
1644 assert (checkmax >= checkcnt); 1898 assert (checkmax >= checkcnt);
1645 array_verify (EV_A_ (W *)checks, checkcnt); 1899 array_verify (EV_A_ (W *)checks, checkcnt);
1646 1900
1647# if 0 1901# if 0
1648 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)
1649 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1903 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1650# endif
1651#endif 1904# endif
1905#endif
1652} 1906}
1653 1907#endif
1654#endif /* multiplicity */
1655 1908
1656#if EV_MULTIPLICITY 1909#if EV_MULTIPLICITY
1657struct ev_loop * 1910struct ev_loop *
1658ev_default_loop_init (unsigned int flags) 1911ev_default_loop_init (unsigned int flags)
1659#else 1912#else
… …
1662#endif 1915#endif
1663{ 1916{
1664 if (!ev_default_loop_ptr) 1917 if (!ev_default_loop_ptr)
1665 { 1918 {
1666#if EV_MULTIPLICITY 1919#if EV_MULTIPLICITY
1667 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1920 EV_P = ev_default_loop_ptr = &default_loop_struct;
1668#else 1921#else
1669 ev_default_loop_ptr = 1; 1922 ev_default_loop_ptr = 1;
1670#endif 1923#endif
1671 1924
1672 loop_init (EV_A_ flags); 1925 loop_init (EV_A_ flags);
… …
1689 1942
1690void 1943void
1691ev_default_destroy (void) 1944ev_default_destroy (void)
1692{ 1945{
1693#if EV_MULTIPLICITY 1946#if EV_MULTIPLICITY
1694 struct ev_loop *loop = ev_default_loop_ptr; 1947 EV_P = ev_default_loop_ptr;
1695#endif 1948#endif
1696 1949
1697 ev_default_loop_ptr = 0; 1950 ev_default_loop_ptr = 0;
1698 1951
1699#ifndef _WIN32 1952#ifndef _WIN32
… …
1706 1959
1707void 1960void
1708ev_default_fork (void) 1961ev_default_fork (void)
1709{ 1962{
1710#if EV_MULTIPLICITY 1963#if EV_MULTIPLICITY
1711 struct ev_loop *loop = ev_default_loop_ptr; 1964 EV_P = ev_default_loop_ptr;
1712#endif 1965#endif
1713 1966
1714 postfork = 1; /* must be in line with ev_loop_fork */ 1967 postfork = 1; /* must be in line with ev_loop_fork */
1715} 1968}
1716 1969
… …
1720ev_invoke (EV_P_ void *w, int revents) 1973ev_invoke (EV_P_ void *w, int revents)
1721{ 1974{
1722 EV_CB_INVOKE ((W)w, revents); 1975 EV_CB_INVOKE ((W)w, revents);
1723} 1976}
1724 1977
1725void inline_speed 1978unsigned int
1726call_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)
1727{ 1992{
1728 int pri; 1993 int pri;
1729 1994
1730 for (pri = NUMPRI; pri--; ) 1995 for (pri = NUMPRI; pri--; )
1731 while (pendingcnt [pri]) 1996 while (pendingcnt [pri])
1732 { 1997 {
1733 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1998 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1734 1999
1735 if (expect_true (p->w))
1736 {
1737 /*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 */
1738 2002
1739 p->w->pending = 0; 2003 p->w->pending = 0;
1740 EV_CB_INVOKE (p->w, p->events); 2004 EV_CB_INVOKE (p->w, p->events);
1741 EV_FREQUENT_CHECK; 2005 EV_FREQUENT_CHECK;
1742 }
1743 } 2006 }
1744} 2007}
1745 2008
1746#if EV_IDLE_ENABLE 2009#if EV_IDLE_ENABLE
1747void inline_size 2010/* make idle watchers pending. this handles the "call-idle */
2011/* only when higher priorities are idle" logic */
2012inline_size void
1748idle_reify (EV_P) 2013idle_reify (EV_P)
1749{ 2014{
1750 if (expect_false (idleall)) 2015 if (expect_false (idleall))
1751 { 2016 {
1752 int pri; 2017 int pri;
… …
1764 } 2029 }
1765 } 2030 }
1766} 2031}
1767#endif 2032#endif
1768 2033
1769void inline_size 2034/* make timers pending */
2035inline_size void
1770timers_reify (EV_P) 2036timers_reify (EV_P)
1771{ 2037{
1772 EV_FREQUENT_CHECK; 2038 EV_FREQUENT_CHECK;
1773 2039
1774 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2040 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1775 { 2041 {
1776 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2042 do
1777
1778 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1779
1780 /* first reschedule or stop timer */
1781 if (w->repeat)
1782 { 2043 {
2044 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2045
2046 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2047
2048 /* first reschedule or stop timer */
2049 if (w->repeat)
2050 {
1783 ev_at (w) += w->repeat; 2051 ev_at (w) += w->repeat;
1784 if (ev_at (w) < mn_now) 2052 if (ev_at (w) < mn_now)
1785 ev_at (w) = mn_now; 2053 ev_at (w) = mn_now;
1786 2054
1787 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2055 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1788 2056
1789 ANHE_at_cache (timers [HEAP0]); 2057 ANHE_at_cache (timers [HEAP0]);
1790 downheap (timers, timercnt, HEAP0); 2058 downheap (timers, timercnt, HEAP0);
2059 }
2060 else
2061 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2062
2063 EV_FREQUENT_CHECK;
2064 feed_reverse (EV_A_ (W)w);
1791 } 2065 }
1792 else 2066 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1793 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1794 2067
1795 EV_FREQUENT_CHECK;
1796 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2068 feed_reverse_done (EV_A_ EV_TIMEOUT);
1797 } 2069 }
1798} 2070}
1799 2071
1800#if EV_PERIODIC_ENABLE 2072#if EV_PERIODIC_ENABLE
1801void inline_size 2073/* make periodics pending */
2074inline_size void
1802periodics_reify (EV_P) 2075periodics_reify (EV_P)
1803{ 2076{
1804 EV_FREQUENT_CHECK; 2077 EV_FREQUENT_CHECK;
1805 2078
1806 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2079 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1807 { 2080 {
1808 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2081 int feed_count = 0;
1809 2082
1810 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/ 2083 do
1811
1812 /* first reschedule or stop timer */
1813 if (w->reschedule_cb)
1814 { 2084 {
2085 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2086
2087 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2088
2089 /* first reschedule or stop timer */
2090 if (w->reschedule_cb)
2091 {
1815 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2092 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1816 2093
1817 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2094 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1818 2095
1819 ANHE_at_cache (periodics [HEAP0]); 2096 ANHE_at_cache (periodics [HEAP0]);
1820 downheap (periodics, periodiccnt, HEAP0); 2097 downheap (periodics, periodiccnt, HEAP0);
2098 }
2099 else if (w->interval)
2100 {
2101 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2102 /* if next trigger time is not sufficiently in the future, put it there */
2103 /* this might happen because of floating point inexactness */
2104 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2105 {
2106 ev_at (w) += w->interval;
2107
2108 /* if interval is unreasonably low we might still have a time in the past */
2109 /* so correct this. this will make the periodic very inexact, but the user */
2110 /* has effectively asked to get triggered more often than possible */
2111 if (ev_at (w) < ev_rt_now)
2112 ev_at (w) = ev_rt_now;
2113 }
2114
2115 ANHE_at_cache (periodics [HEAP0]);
2116 downheap (periodics, periodiccnt, HEAP0);
2117 }
2118 else
2119 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2120
2121 EV_FREQUENT_CHECK;
2122 feed_reverse (EV_A_ (W)w);
1821 } 2123 }
1822 else if (w->interval) 2124 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1823 {
1824 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1825 /* if next trigger time is not sufficiently in the future, put it there */
1826 /* this might happen because of floating point inexactness */
1827 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1828 {
1829 ev_at (w) += w->interval;
1830 2125
1831 /* if interval is unreasonably low we might still have a time in the past */
1832 /* so correct this. this will make the periodic very inexact, but the user */
1833 /* has effectively asked to get triggered more often than possible */
1834 if (ev_at (w) < ev_rt_now)
1835 ev_at (w) = ev_rt_now;
1836 }
1837
1838 ANHE_at_cache (periodics [HEAP0]);
1839 downheap (periodics, periodiccnt, HEAP0);
1840 }
1841 else
1842 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1843
1844 EV_FREQUENT_CHECK;
1845 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2126 feed_reverse_done (EV_A_ EV_PERIODIC);
1846 } 2127 }
1847} 2128}
1848 2129
2130/* simply recalculate all periodics */
2131/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1849static void noinline 2132static void noinline
1850periodics_reschedule (EV_P) 2133periodics_reschedule (EV_P)
1851{ 2134{
1852 int i; 2135 int i;
1853 2136
… …
1866 2149
1867 reheap (periodics, periodiccnt); 2150 reheap (periodics, periodiccnt);
1868} 2151}
1869#endif 2152#endif
1870 2153
1871void inline_speed 2154/* adjust all timers by a given offset */
2155static void noinline
2156timers_reschedule (EV_P_ ev_tstamp adjust)
2157{
2158 int i;
2159
2160 for (i = 0; i < timercnt; ++i)
2161 {
2162 ANHE *he = timers + i + HEAP0;
2163 ANHE_w (*he)->at += adjust;
2164 ANHE_at_cache (*he);
2165 }
2166}
2167
2168/* fetch new monotonic and realtime times from the kernel */
2169/* also detect if there was a timejump, and act accordingly */
2170inline_speed void
1872time_update (EV_P_ ev_tstamp max_block) 2171time_update (EV_P_ ev_tstamp max_block)
1873{ 2172{
1874 int i;
1875
1876#if EV_USE_MONOTONIC 2173#if EV_USE_MONOTONIC
1877 if (expect_true (have_monotonic)) 2174 if (expect_true (have_monotonic))
1878 { 2175 {
2176 int i;
1879 ev_tstamp odiff = rtmn_diff; 2177 ev_tstamp odiff = rtmn_diff;
1880 2178
1881 mn_now = get_clock (); 2179 mn_now = get_clock ();
1882 2180
1883 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2181 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1909 ev_rt_now = ev_time (); 2207 ev_rt_now = ev_time ();
1910 mn_now = get_clock (); 2208 mn_now = get_clock ();
1911 now_floor = mn_now; 2209 now_floor = mn_now;
1912 } 2210 }
1913 2211
2212 /* no timer adjustment, as the monotonic clock doesn't jump */
2213 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1914# if EV_PERIODIC_ENABLE 2214# if EV_PERIODIC_ENABLE
1915 periodics_reschedule (EV_A); 2215 periodics_reschedule (EV_A);
1916# endif 2216# endif
1917 /* no timer adjustment, as the monotonic clock doesn't jump */
1918 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1919 } 2217 }
1920 else 2218 else
1921#endif 2219#endif
1922 { 2220 {
1923 ev_rt_now = ev_time (); 2221 ev_rt_now = ev_time ();
1924 2222
1925 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2223 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1926 { 2224 {
2225 /* adjust timers. this is easy, as the offset is the same for all of them */
2226 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1927#if EV_PERIODIC_ENABLE 2227#if EV_PERIODIC_ENABLE
1928 periodics_reschedule (EV_A); 2228 periodics_reschedule (EV_A);
1929#endif 2229#endif
1930 /* adjust timers. this is easy, as the offset is the same for all of them */
1931 for (i = 0; i < timercnt; ++i)
1932 {
1933 ANHE *he = timers + i + HEAP0;
1934 ANHE_w (*he)->at += ev_rt_now - mn_now;
1935 ANHE_at_cache (*he);
1936 }
1937 } 2230 }
1938 2231
1939 mn_now = ev_rt_now; 2232 mn_now = ev_rt_now;
1940 } 2233 }
1941} 2234}
1942 2235
1943void 2236void
1944ev_ref (EV_P)
1945{
1946 ++activecnt;
1947}
1948
1949void
1950ev_unref (EV_P)
1951{
1952 --activecnt;
1953}
1954
1955void
1956ev_now_update (EV_P)
1957{
1958 time_update (EV_A_ 1e100);
1959}
1960
1961static int loop_done;
1962
1963void
1964ev_loop (EV_P_ int flags) 2237ev_loop (EV_P_ int flags)
1965{ 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
1966 loop_done = EVUNLOOP_CANCEL; 2245 loop_done = EVUNLOOP_CANCEL;
1967 2246
1968 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 */
1969 2248
1970 do 2249 do
1971 { 2250 {
1972#if EV_VERIFY >= 2 2251#if EV_VERIFY >= 2
1973 ev_loop_verify (EV_A); 2252 ev_loop_verify (EV_A);
… …
1986 /* we might have forked, so queue fork handlers */ 2265 /* we might have forked, so queue fork handlers */
1987 if (expect_false (postfork)) 2266 if (expect_false (postfork))
1988 if (forkcnt) 2267 if (forkcnt)
1989 { 2268 {
1990 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2269 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1991 call_pending (EV_A); 2270 EV_INVOKE_PENDING;
1992 } 2271 }
1993#endif 2272#endif
1994 2273
1995 /* queue prepare watchers (and execute them) */ 2274 /* queue prepare watchers (and execute them) */
1996 if (expect_false (preparecnt)) 2275 if (expect_false (preparecnt))
1997 { 2276 {
1998 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2277 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1999 call_pending (EV_A); 2278 EV_INVOKE_PENDING;
2000 } 2279 }
2280
2281 if (expect_false (loop_done))
2282 break;
2001 2283
2002 /* we might have forked, so reify kernel state if necessary */ 2284 /* we might have forked, so reify kernel state if necessary */
2003 if (expect_false (postfork)) 2285 if (expect_false (postfork))
2004 loop_fork (EV_A); 2286 loop_fork (EV_A);
2005 2287
… …
2011 ev_tstamp waittime = 0.; 2293 ev_tstamp waittime = 0.;
2012 ev_tstamp sleeptime = 0.; 2294 ev_tstamp sleeptime = 0.;
2013 2295
2014 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2296 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2015 { 2297 {
2298 /* remember old timestamp for io_blocktime calculation */
2299 ev_tstamp prev_mn_now = mn_now;
2300
2016 /* update time to cancel out callback processing overhead */ 2301 /* update time to cancel out callback processing overhead */
2017 time_update (EV_A_ 1e100); 2302 time_update (EV_A_ 1e100);
2018 2303
2019 waittime = MAX_BLOCKTIME; 2304 waittime = MAX_BLOCKTIME;
2020 2305
… …
2030 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;
2031 if (waittime > to) waittime = to; 2316 if (waittime > to) waittime = to;
2032 } 2317 }
2033#endif 2318#endif
2034 2319
2320 /* don't let timeouts decrease the waittime below timeout_blocktime */
2035 if (expect_false (waittime < timeout_blocktime)) 2321 if (expect_false (waittime < timeout_blocktime))
2036 waittime = timeout_blocktime; 2322 waittime = timeout_blocktime;
2037 2323
2038 sleeptime = waittime - backend_fudge; 2324 /* extra check because io_blocktime is commonly 0 */
2039
2040 if (expect_true (sleeptime > io_blocktime)) 2325 if (expect_false (io_blocktime))
2041 sleeptime = io_blocktime;
2042
2043 if (sleeptime)
2044 { 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 {
2045 ev_sleep (sleeptime); 2334 ev_sleep (sleeptime);
2046 waittime -= sleeptime; 2335 waittime -= sleeptime;
2336 }
2047 } 2337 }
2048 } 2338 }
2049 2339
2340#if EV_MINIMAL < 2
2050 ++loop_count; 2341 ++loop_count;
2342#endif
2343 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2051 backend_poll (EV_A_ waittime); 2344 backend_poll (EV_A_ waittime);
2345 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2052 2346
2053 /* update ev_rt_now, do magic */ 2347 /* update ev_rt_now, do magic */
2054 time_update (EV_A_ waittime + sleeptime); 2348 time_update (EV_A_ waittime + sleeptime);
2055 } 2349 }
2056 2350
… …
2067 2361
2068 /* queue check watchers, to be executed first */ 2362 /* queue check watchers, to be executed first */
2069 if (expect_false (checkcnt)) 2363 if (expect_false (checkcnt))
2070 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2364 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2071 2365
2072 call_pending (EV_A); 2366 EV_INVOKE_PENDING;
2073 } 2367 }
2074 while (expect_true ( 2368 while (expect_true (
2075 activecnt 2369 activecnt
2076 && !loop_done 2370 && !loop_done
2077 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2371 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2078 )); 2372 ));
2079 2373
2080 if (loop_done == EVUNLOOP_ONE) 2374 if (loop_done == EVUNLOOP_ONE)
2081 loop_done = EVUNLOOP_CANCEL; 2375 loop_done = EVUNLOOP_CANCEL;
2376
2377#if EV_MINIMAL < 2
2378 --loop_depth;
2379#endif
2082} 2380}
2083 2381
2084void 2382void
2085ev_unloop (EV_P_ int how) 2383ev_unloop (EV_P_ int how)
2086{ 2384{
2087 loop_done = how; 2385 loop_done = how;
2088} 2386}
2089 2387
2388void
2389ev_ref (EV_P)
2390{
2391 ++activecnt;
2392}
2393
2394void
2395ev_unref (EV_P)
2396{
2397 --activecnt;
2398}
2399
2400void
2401ev_now_update (EV_P)
2402{
2403 time_update (EV_A_ 1e100);
2404}
2405
2406void
2407ev_suspend (EV_P)
2408{
2409 ev_now_update (EV_A);
2410}
2411
2412void
2413ev_resume (EV_P)
2414{
2415 ev_tstamp mn_prev = mn_now;
2416
2417 ev_now_update (EV_A);
2418 timers_reschedule (EV_A_ mn_now - mn_prev);
2419#if EV_PERIODIC_ENABLE
2420 /* TODO: really do this? */
2421 periodics_reschedule (EV_A);
2422#endif
2423}
2424
2090/*****************************************************************************/ 2425/*****************************************************************************/
2426/* singly-linked list management, used when the expected list length is short */
2091 2427
2092void inline_size 2428inline_size void
2093wlist_add (WL *head, WL elem) 2429wlist_add (WL *head, WL elem)
2094{ 2430{
2095 elem->next = *head; 2431 elem->next = *head;
2096 *head = elem; 2432 *head = elem;
2097} 2433}
2098 2434
2099void inline_size 2435inline_size void
2100wlist_del (WL *head, WL elem) 2436wlist_del (WL *head, WL elem)
2101{ 2437{
2102 while (*head) 2438 while (*head)
2103 { 2439 {
2104 if (*head == elem) 2440 if (expect_true (*head == elem))
2105 { 2441 {
2106 *head = elem->next; 2442 *head = elem->next;
2107 return; 2443 break;
2108 } 2444 }
2109 2445
2110 head = &(*head)->next; 2446 head = &(*head)->next;
2111 } 2447 }
2112} 2448}
2113 2449
2114void inline_speed 2450/* internal, faster, version of ev_clear_pending */
2451inline_speed void
2115clear_pending (EV_P_ W w) 2452clear_pending (EV_P_ W w)
2116{ 2453{
2117 if (w->pending) 2454 if (w->pending)
2118 { 2455 {
2119 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2456 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2120 w->pending = 0; 2457 w->pending = 0;
2121 } 2458 }
2122} 2459}
2123 2460
2124int 2461int
… …
2128 int pending = w_->pending; 2465 int pending = w_->pending;
2129 2466
2130 if (expect_true (pending)) 2467 if (expect_true (pending))
2131 { 2468 {
2132 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2469 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2470 p->w = (W)&pending_w;
2133 w_->pending = 0; 2471 w_->pending = 0;
2134 p->w = 0;
2135 return p->events; 2472 return p->events;
2136 } 2473 }
2137 else 2474 else
2138 return 0; 2475 return 0;
2139} 2476}
2140 2477
2141void inline_size 2478inline_size void
2142pri_adjust (EV_P_ W w) 2479pri_adjust (EV_P_ W w)
2143{ 2480{
2144 int pri = w->priority; 2481 int pri = ev_priority (w);
2145 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2482 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2146 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2483 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2147 w->priority = pri; 2484 ev_set_priority (w, pri);
2148} 2485}
2149 2486
2150void inline_speed 2487inline_speed void
2151ev_start (EV_P_ W w, int active) 2488ev_start (EV_P_ W w, int active)
2152{ 2489{
2153 pri_adjust (EV_A_ w); 2490 pri_adjust (EV_A_ w);
2154 w->active = active; 2491 w->active = active;
2155 ev_ref (EV_A); 2492 ev_ref (EV_A);
2156} 2493}
2157 2494
2158void inline_size 2495inline_size void
2159ev_stop (EV_P_ W w) 2496ev_stop (EV_P_ W w)
2160{ 2497{
2161 ev_unref (EV_A); 2498 ev_unref (EV_A);
2162 w->active = 0; 2499 w->active = 0;
2163} 2500}
… …
2171 2508
2172 if (expect_false (ev_is_active (w))) 2509 if (expect_false (ev_is_active (w)))
2173 return; 2510 return;
2174 2511
2175 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2512 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2176 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))));
2177 2514
2178 EV_FREQUENT_CHECK; 2515 EV_FREQUENT_CHECK;
2179 2516
2180 ev_start (EV_A_ (W)w, 1); 2517 ev_start (EV_A_ (W)w, 1);
2181 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2518 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2182 wlist_add (&anfds[fd].head, (WL)w); 2519 wlist_add (&anfds[fd].head, (WL)w);
2183 2520
2184 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2521 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2185 w->events &= ~EV__IOFDSET; 2522 w->events &= ~EV__IOFDSET;
2186 2523
2187 EV_FREQUENT_CHECK; 2524 EV_FREQUENT_CHECK;
2188} 2525}
2189 2526
… …
2251 timers [active] = timers [timercnt + HEAP0]; 2588 timers [active] = timers [timercnt + HEAP0];
2252 adjustheap (timers, timercnt, active); 2589 adjustheap (timers, timercnt, active);
2253 } 2590 }
2254 } 2591 }
2255 2592
2256 EV_FREQUENT_CHECK;
2257
2258 ev_at (w) -= mn_now; 2593 ev_at (w) -= mn_now;
2259 2594
2260 ev_stop (EV_A_ (W)w); 2595 ev_stop (EV_A_ (W)w);
2596
2597 EV_FREQUENT_CHECK;
2261} 2598}
2262 2599
2263void noinline 2600void noinline
2264ev_timer_again (EV_P_ ev_timer *w) 2601ev_timer_again (EV_P_ ev_timer *w)
2265{ 2602{
… …
2283 } 2620 }
2284 2621
2285 EV_FREQUENT_CHECK; 2622 EV_FREQUENT_CHECK;
2286} 2623}
2287 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
2288#if EV_PERIODIC_ENABLE 2631#if EV_PERIODIC_ENABLE
2289void noinline 2632void noinline
2290ev_periodic_start (EV_P_ ev_periodic *w) 2633ev_periodic_start (EV_P_ ev_periodic *w)
2291{ 2634{
2292 if (expect_false (ev_is_active (w))) 2635 if (expect_false (ev_is_active (w)))
… …
2338 periodics [active] = periodics [periodiccnt + HEAP0]; 2681 periodics [active] = periodics [periodiccnt + HEAP0];
2339 adjustheap (periodics, periodiccnt, active); 2682 adjustheap (periodics, periodiccnt, active);
2340 } 2683 }
2341 } 2684 }
2342 2685
2343 EV_FREQUENT_CHECK;
2344
2345 ev_stop (EV_A_ (W)w); 2686 ev_stop (EV_A_ (W)w);
2687
2688 EV_FREQUENT_CHECK;
2346} 2689}
2347 2690
2348void noinline 2691void noinline
2349ev_periodic_again (EV_P_ ev_periodic *w) 2692ev_periodic_again (EV_P_ ev_periodic *w)
2350{ 2693{
… …
2359#endif 2702#endif
2360 2703
2361void noinline 2704void noinline
2362ev_signal_start (EV_P_ ev_signal *w) 2705ev_signal_start (EV_P_ ev_signal *w)
2363{ 2706{
2364#if EV_MULTIPLICITY
2365 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2366#endif
2367 if (expect_false (ev_is_active (w))) 2707 if (expect_false (ev_is_active (w)))
2368 return; 2708 return;
2369 2709
2370 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));
2371 2711
2372 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));
2373 2715
2374 EV_FREQUENT_CHECK; 2716 signals [w->signum - 1].loop = EV_A;
2717#endif
2375 2718
2719 EV_FREQUENT_CHECK;
2720
2721#if EV_USE_SIGNALFD
2722 if (sigfd == -2)
2376 { 2723 {
2377#ifndef _WIN32 2724 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2378 sigset_t full, prev; 2725 if (sigfd < 0 && errno == EINVAL)
2379 sigfillset (&full); 2726 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2380 sigprocmask (SIG_SETMASK, &full, &prev);
2381#endif
2382 2727
2383 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 */
2384 2731
2385#ifndef _WIN32 2732 sigemptyset (&sigfd_set);
2386 sigprocmask (SIG_SETMASK, &prev, 0); 2733
2387#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 }
2388 } 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
2389 2750
2390 ev_start (EV_A_ (W)w, 1); 2751 ev_start (EV_A_ (W)w, 1);
2391 wlist_add (&signals [w->signum - 1].head, (WL)w); 2752 wlist_add (&signals [w->signum - 1].head, (WL)w);
2392 2753
2393 if (!((WL)w)->next) 2754 if (!((WL)w)->next)
2755# if EV_USE_SIGNALFD
2756 if (sigfd < 0) /*TODO*/
2757# endif
2394 { 2758 {
2395#if _WIN32 2759# ifdef _WIN32
2760 evpipe_init (EV_A);
2761
2396 signal (w->signum, ev_sighandler); 2762 signal (w->signum, ev_sighandler);
2397#else 2763# else
2398 struct sigaction sa; 2764 struct sigaction sa;
2765
2766 evpipe_init (EV_A);
2767
2399 sa.sa_handler = ev_sighandler; 2768 sa.sa_handler = ev_sighandler;
2400 sigfillset (&sa.sa_mask); 2769 sigfillset (&sa.sa_mask);
2401 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 */
2402 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);
2403#endif 2776#endif
2404 } 2777 }
2405 2778
2406 EV_FREQUENT_CHECK; 2779 EV_FREQUENT_CHECK;
2407} 2780}
2408 2781
2409void noinline 2782void noinline
… …
2417 2790
2418 wlist_del (&signals [w->signum - 1].head, (WL)w); 2791 wlist_del (&signals [w->signum - 1].head, (WL)w);
2419 ev_stop (EV_A_ (W)w); 2792 ev_stop (EV_A_ (W)w);
2420 2793
2421 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
2422 signal (w->signum, SIG_DFL); 2813 signal (w->signum, SIG_DFL);
2814 }
2423 2815
2424 EV_FREQUENT_CHECK; 2816 EV_FREQUENT_CHECK;
2425} 2817}
2426 2818
2427void 2819void
… …
2468#define MIN_STAT_INTERVAL 0.1074891 2860#define MIN_STAT_INTERVAL 0.1074891
2469 2861
2470static 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);
2471 2863
2472#if EV_USE_INOTIFY 2864#if EV_USE_INOTIFY
2473# 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)
2474 2868
2475static void noinline 2869static void noinline
2476infy_add (EV_P_ ev_stat *w) 2870infy_add (EV_P_ ev_stat *w)
2477{ 2871{
2478 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);
2479 2873
2480 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 */
2481 { 2894 }
2895 else
2896 {
2897 /* can't use inotify, continue to stat */
2482 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2898 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2483 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2484 2899
2485 /* monitor some parent directory for speedup hints */ 2900 /* if path is not there, monitor some parent directory for speedup hints */
2486 /* 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, */
2487 /* but an efficiency issue only */ 2902 /* but an efficiency issue only */
2488 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2903 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2489 { 2904 {
2490 char path [4096]; 2905 char path [4096];
… …
2506 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2921 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2507 } 2922 }
2508 } 2923 }
2509 2924
2510 if (w->wd >= 0) 2925 if (w->wd >= 0)
2511 {
2512 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);
2513 2927
2514 /* now local changes will be tracked by inotify, but remote changes won't */ 2928 /* now re-arm timer, if required */
2515 /* unless the filesystem it known to be local, we therefore still poll */ 2929 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2516 /* also do poll on <2.6.25, but with normal frequency */
2517 struct statfs sfs;
2518
2519 if (fs_2625 && !statfs (w->path, &sfs))
2520 if (sfs.f_type == 0x1373 /* devfs */
2521 || sfs.f_type == 0xEF53 /* ext2/3 */
2522 || sfs.f_type == 0x3153464a /* jfs */
2523 || sfs.f_type == 0x52654973 /* reiser3 */
2524 || sfs.f_type == 0x01021994 /* tempfs */
2525 || sfs.f_type == 0x58465342 /* xfs */)
2526 return;
2527
2528 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2529 ev_timer_again (EV_A_ &w->timer); 2930 ev_timer_again (EV_A_ &w->timer);
2530 } 2931 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2531} 2932}
2532 2933
2533static void noinline 2934static void noinline
2534infy_del (EV_P_ ev_stat *w) 2935infy_del (EV_P_ ev_stat *w)
2535{ 2936{
… …
2580 2981
2581static void 2982static void
2582infy_cb (EV_P_ ev_io *w, int revents) 2983infy_cb (EV_P_ ev_io *w, int revents)
2583{ 2984{
2584 char buf [EV_INOTIFY_BUFSIZE]; 2985 char buf [EV_INOTIFY_BUFSIZE];
2585 struct inotify_event *ev = (struct inotify_event *)buf;
2586 int ofs; 2986 int ofs;
2587 int len = read (fs_fd, buf, sizeof (buf)); 2987 int len = read (fs_fd, buf, sizeof (buf));
2588 2988
2589 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);
2590 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 }
2591} 2995}
2592 2996
2593void inline_size 2997inline_size void
2594check_2625 (EV_P) 2998check_2625 (EV_P)
2595{ 2999{
2596 /* kernels < 2.6.25 are borked 3000 /* kernels < 2.6.25 are borked
2597 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3001 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2598 */ 3002 */
… …
2611 return; 3015 return;
2612 3016
2613 fs_2625 = 1; 3017 fs_2625 = 1;
2614} 3018}
2615 3019
2616void inline_size 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
3031inline_size void
2617infy_init (EV_P) 3032infy_init (EV_P)
2618{ 3033{
2619 if (fs_fd != -2) 3034 if (fs_fd != -2)
2620 return; 3035 return;
2621 3036
2622 fs_fd = -1; 3037 fs_fd = -1;
2623 3038
2624 check_2625 (EV_A); 3039 check_2625 (EV_A);
2625 3040
2626 fs_fd = inotify_init (); 3041 fs_fd = infy_newfd ();
2627 3042
2628 if (fs_fd >= 0) 3043 if (fs_fd >= 0)
2629 { 3044 {
3045 fd_intern (fs_fd);
2630 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3046 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2631 ev_set_priority (&fs_w, EV_MAXPRI); 3047 ev_set_priority (&fs_w, EV_MAXPRI);
2632 ev_io_start (EV_A_ &fs_w); 3048 ev_io_start (EV_A_ &fs_w);
3049 ev_unref (EV_A);
2633 } 3050 }
2634} 3051}
2635 3052
2636void inline_size 3053inline_size void
2637infy_fork (EV_P) 3054infy_fork (EV_P)
2638{ 3055{
2639 int slot; 3056 int slot;
2640 3057
2641 if (fs_fd < 0) 3058 if (fs_fd < 0)
2642 return; 3059 return;
2643 3060
3061 ev_ref (EV_A);
3062 ev_io_stop (EV_A_ &fs_w);
2644 close (fs_fd); 3063 close (fs_fd);
2645 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 }
2646 3073
2647 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3074 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2648 { 3075 {
2649 WL w_ = fs_hash [slot].head; 3076 WL w_ = fs_hash [slot].head;
2650 fs_hash [slot].head = 0; 3077 fs_hash [slot].head = 0;
… …
2657 w->wd = -1; 3084 w->wd = -1;
2658 3085
2659 if (fs_fd >= 0) 3086 if (fs_fd >= 0)
2660 infy_add (EV_A_ w); /* re-add, no matter what */ 3087 infy_add (EV_A_ w); /* re-add, no matter what */
2661 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);
2662 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 }
2663 } 3095 }
2664 } 3096 }
2665} 3097}
2666 3098
2667#endif 3099#endif
… …
2684static void noinline 3116static void noinline
2685stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3117stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2686{ 3118{
2687 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3119 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2688 3120
2689 /* we copy this here each the time so that */ 3121 ev_statdata prev = w->attr;
2690 /* prev has the old value when the callback gets invoked */
2691 w->prev = w->attr;
2692 ev_stat_stat (EV_A_ w); 3122 ev_stat_stat (EV_A_ w);
2693 3123
2694 /* 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 */
2695 if ( 3125 if (
2696 w->prev.st_dev != w->attr.st_dev 3126 prev.st_dev != w->attr.st_dev
2697 || w->prev.st_ino != w->attr.st_ino 3127 || prev.st_ino != w->attr.st_ino
2698 || w->prev.st_mode != w->attr.st_mode 3128 || prev.st_mode != w->attr.st_mode
2699 || w->prev.st_nlink != w->attr.st_nlink 3129 || prev.st_nlink != w->attr.st_nlink
2700 || w->prev.st_uid != w->attr.st_uid 3130 || prev.st_uid != w->attr.st_uid
2701 || w->prev.st_gid != w->attr.st_gid 3131 || prev.st_gid != w->attr.st_gid
2702 || w->prev.st_rdev != w->attr.st_rdev 3132 || prev.st_rdev != w->attr.st_rdev
2703 || w->prev.st_size != w->attr.st_size 3133 || prev.st_size != w->attr.st_size
2704 || w->prev.st_atime != w->attr.st_atime 3134 || prev.st_atime != w->attr.st_atime
2705 || w->prev.st_mtime != w->attr.st_mtime 3135 || prev.st_mtime != w->attr.st_mtime
2706 || w->prev.st_ctime != w->attr.st_ctime 3136 || prev.st_ctime != w->attr.st_ctime
2707 ) { 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
2708 #if EV_USE_INOTIFY 3143 #if EV_USE_INOTIFY
2709 if (fs_fd >= 0) 3144 if (fs_fd >= 0)
2710 { 3145 {
2711 infy_del (EV_A_ w); 3146 infy_del (EV_A_ w);
2712 infy_add (EV_A_ w); 3147 infy_add (EV_A_ w);
… …
2737 3172
2738 if (fs_fd >= 0) 3173 if (fs_fd >= 0)
2739 infy_add (EV_A_ w); 3174 infy_add (EV_A_ w);
2740 else 3175 else
2741#endif 3176#endif
3177 {
2742 ev_timer_again (EV_A_ &w->timer); 3178 ev_timer_again (EV_A_ &w->timer);
3179 ev_unref (EV_A);
3180 }
2743 3181
2744 ev_start (EV_A_ (W)w, 1); 3182 ev_start (EV_A_ (W)w, 1);
2745 3183
2746 EV_FREQUENT_CHECK; 3184 EV_FREQUENT_CHECK;
2747} 3185}
… …
2756 EV_FREQUENT_CHECK; 3194 EV_FREQUENT_CHECK;
2757 3195
2758#if EV_USE_INOTIFY 3196#if EV_USE_INOTIFY
2759 infy_del (EV_A_ w); 3197 infy_del (EV_A_ w);
2760#endif 3198#endif
3199
3200 if (ev_is_active (&w->timer))
3201 {
3202 ev_ref (EV_A);
2761 ev_timer_stop (EV_A_ &w->timer); 3203 ev_timer_stop (EV_A_ &w->timer);
3204 }
2762 3205
2763 ev_stop (EV_A_ (W)w); 3206 ev_stop (EV_A_ (W)w);
2764 3207
2765 EV_FREQUENT_CHECK; 3208 EV_FREQUENT_CHECK;
2766} 3209}
… …
2907embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3350embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2908{ 3351{
2909 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3352 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2910 3353
2911 { 3354 {
2912 struct ev_loop *loop = w->other; 3355 EV_P = w->other;
2913 3356
2914 while (fdchangecnt) 3357 while (fdchangecnt)
2915 { 3358 {
2916 fd_reify (EV_A); 3359 fd_reify (EV_A);
2917 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3360 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2925 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));
2926 3369
2927 ev_embed_stop (EV_A_ w); 3370 ev_embed_stop (EV_A_ w);
2928 3371
2929 { 3372 {
2930 struct ev_loop *loop = w->other; 3373 EV_P = w->other;
2931 3374
2932 ev_loop_fork (EV_A); 3375 ev_loop_fork (EV_A);
2933 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3376 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2934 } 3377 }
2935 3378
… …
2949{ 3392{
2950 if (expect_false (ev_is_active (w))) 3393 if (expect_false (ev_is_active (w)))
2951 return; 3394 return;
2952 3395
2953 { 3396 {
2954 struct ev_loop *loop = w->other; 3397 EV_P = w->other;
2955 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 ()));
2956 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);
2957 } 3400 }
2958 3401
2959 EV_FREQUENT_CHECK; 3402 EV_FREQUENT_CHECK;
… …
2986 3429
2987 ev_io_stop (EV_A_ &w->io); 3430 ev_io_stop (EV_A_ &w->io);
2988 ev_prepare_stop (EV_A_ &w->prepare); 3431 ev_prepare_stop (EV_A_ &w->prepare);
2989 ev_fork_stop (EV_A_ &w->fork); 3432 ev_fork_stop (EV_A_ &w->fork);
2990 3433
3434 ev_stop (EV_A_ (W)w);
3435
2991 EV_FREQUENT_CHECK; 3436 EV_FREQUENT_CHECK;
2992} 3437}
2993#endif 3438#endif
2994 3439
2995#if EV_FORK_ENABLE 3440#if EV_FORK_ENABLE
… …
3071 3516
3072void 3517void
3073ev_async_send (EV_P_ ev_async *w) 3518ev_async_send (EV_P_ ev_async *w)
3074{ 3519{
3075 w->sent = 1; 3520 w->sent = 1;
3076 evpipe_write (EV_A_ &gotasync); 3521 evpipe_write (EV_A_ &async_pending);
3077} 3522}
3078#endif 3523#endif
3079 3524
3080/*****************************************************************************/ 3525/*****************************************************************************/
3081 3526
… …
3145 } 3590 }
3146} 3591}
3147 3592
3148/*****************************************************************************/ 3593/*****************************************************************************/
3149 3594
3150#if 0 3595#if EV_WALK_ENABLE
3151void 3596void
3152ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3597ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3153{ 3598{
3154 int i, j; 3599 int i, j;
3155 ev_watcher_list *wl, *wn; 3600 ev_watcher_list *wl, *wn;
… …
3171#if EV_USE_INOTIFY 3616#if EV_USE_INOTIFY
3172 if (ev_cb ((ev_io *)wl) == infy_cb) 3617 if (ev_cb ((ev_io *)wl) == infy_cb)
3173 ; 3618 ;
3174 else 3619 else
3175#endif 3620#endif
3176 if ((ev_io *)wl != &pipeev) 3621 if ((ev_io *)wl != &pipe_w)
3177 if (types & EV_IO) 3622 if (types & EV_IO)
3178 cb (EV_A_ EV_IO, wl); 3623 cb (EV_A_ EV_IO, wl);
3179 3624
3180 wl = wn; 3625 wl = wn;
3181 } 3626 }
… …
3230 if (types & EV_CHECK) 3675 if (types & EV_CHECK)
3231 for (i = checkcnt; i--; ) 3676 for (i = checkcnt; i--; )
3232 cb (EV_A_ EV_CHECK, checks [i]); 3677 cb (EV_A_ EV_CHECK, checks [i]);
3233 3678
3234 if (types & EV_SIGNAL) 3679 if (types & EV_SIGNAL)
3235 for (i = 0; i < signalmax; ++i) 3680 for (i = 0; i < EV_NSIG - 1; ++i)
3236 for (wl = signals [i].head; wl; ) 3681 for (wl = signals [i].head; wl; )
3237 { 3682 {
3238 wn = wl->next; 3683 wn = wl->next;
3239 cb (EV_A_ EV_SIGNAL, wl); 3684 cb (EV_A_ EV_SIGNAL, wl);
3240 wl = wn; 3685 wl = wn;

Diff Legend

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