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

Comparing libev/ev.c (file contents):
Revision 1.280 by root, Sat Mar 14 04:45:39 2009 UTC vs.
Revision 1.330 by root, Tue Mar 9 08:46:17 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/*****************************************************************************/
… …
431 542
432 if (syserr_cb) 543 if (syserr_cb)
433 syserr_cb (msg); 544 syserr_cb (msg);
434 else 545 else
435 { 546 {
547#if EV_AVOID_STDIO
548 write (STDERR_FILENO, msg, strlen (msg));
549 write (STDERR_FILENO, ": ", 2);
550 msg = strerror (errno);
551 write (STDERR_FILENO, msg, strlen (msg));
552 write (STDERR_FILENO, "\n", 1);
553#else
436 perror (msg); 554 perror (msg);
555#endif
437 abort (); 556 abort ();
438 } 557 }
439} 558}
440 559
441static void * 560static void *
… …
466{ 585{
467 ptr = alloc (ptr, size); 586 ptr = alloc (ptr, size);
468 587
469 if (!ptr && size) 588 if (!ptr && size)
470 { 589 {
590#if EV_AVOID_STDIO
591 write (STDERR_FILENO, "libev: memory allocation failed, aborting.",
592 sizeof ("libev: memory allocation failed, aborting.") - 1);
593#else
471 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 594 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
595#endif
472 abort (); 596 abort ();
473 } 597 }
474 598
475 return ptr; 599 return ptr;
476} 600}
… …
478#define ev_malloc(size) ev_realloc (0, (size)) 602#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 603#define ev_free(ptr) ev_realloc ((ptr), 0)
480 604
481/*****************************************************************************/ 605/*****************************************************************************/
482 606
607/* set in reify when reification needed */
608#define EV_ANFD_REIFY 1
609
610/* file descriptor info structure */
483typedef struct 611typedef struct
484{ 612{
485 WL head; 613 WL head;
486 unsigned char events; 614 unsigned char events; /* the events watched for */
487 unsigned char reify; 615 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 */ 616 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 617 unsigned char unused;
490#if EV_USE_EPOLL 618#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 619 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 620#endif
493#if EV_SELECT_IS_WINSOCKET 621#if EV_SELECT_IS_WINSOCKET
494 SOCKET handle; 622 SOCKET handle;
495#endif 623#endif
496} ANFD; 624} ANFD;
497 625
626/* stores the pending event set for a given watcher */
498typedef struct 627typedef struct
499{ 628{
500 W w; 629 W w;
501 int events; 630 int events; /* the pending event set for the given watcher */
502} ANPENDING; 631} ANPENDING;
503 632
504#if EV_USE_INOTIFY 633#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 634/* hash table entry per inotify-id */
506typedef struct 635typedef struct
… …
509} ANFS; 638} ANFS;
510#endif 639#endif
511 640
512/* Heap Entry */ 641/* Heap Entry */
513#if EV_HEAP_CACHE_AT 642#if EV_HEAP_CACHE_AT
643 /* a heap element */
514 typedef struct { 644 typedef struct {
515 ev_tstamp at; 645 ev_tstamp at;
516 WT w; 646 WT w;
517 } ANHE; 647 } ANHE;
518 648
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 649 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 650 #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 */ 651 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 652#else
653 /* a heap element */
523 typedef WT ANHE; 654 typedef WT ANHE;
524 655
525 #define ANHE_w(he) (he) 656 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 657 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 658 #define ANHE_at_cache(he)
… …
551 682
552 static int ev_default_loop_ptr; 683 static int ev_default_loop_ptr;
553 684
554#endif 685#endif
555 686
687#if EV_MINIMAL < 2
688# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
689# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
690# define EV_INVOKE_PENDING invoke_cb (EV_A)
691#else
692# define EV_RELEASE_CB (void)0
693# define EV_ACQUIRE_CB (void)0
694# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
695#endif
696
697#define EVUNLOOP_RECURSE 0x80
698
556/*****************************************************************************/ 699/*****************************************************************************/
557 700
701#ifndef EV_HAVE_EV_TIME
558ev_tstamp 702ev_tstamp
559ev_time (void) 703ev_time (void)
560{ 704{
561#if EV_USE_REALTIME 705#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 706 if (expect_true (have_realtime))
… …
569 713
570 struct timeval tv; 714 struct timeval tv;
571 gettimeofday (&tv, 0); 715 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 716 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 717}
718#endif
574 719
575ev_tstamp inline_size 720inline_size ev_tstamp
576get_clock (void) 721get_clock (void)
577{ 722{
578#if EV_USE_MONOTONIC 723#if EV_USE_MONOTONIC
579 if (expect_true (have_monotonic)) 724 if (expect_true (have_monotonic))
580 { 725 {
… …
614 759
615 tv.tv_sec = (time_t)delay; 760 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 761 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617 762
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 763 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 764 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 765 /* by older ones */
621 select (0, 0, 0, 0, &tv); 766 select (0, 0, 0, 0, &tv);
622#endif 767#endif
623 } 768 }
624} 769}
625 770
626/*****************************************************************************/ 771/*****************************************************************************/
627 772
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 773#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 774
630int inline_size 775/* find a suitable new size for the given array, */
776/* hopefully by rounding to a ncie-to-malloc size */
777inline_size int
631array_nextsize (int elem, int cur, int cnt) 778array_nextsize (int elem, int cur, int cnt)
632{ 779{
633 int ncur = cur + 1; 780 int ncur = cur + 1;
634 781
635 do 782 do
… …
680#define array_free(stem, idx) \ 827#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 828 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 829
683/*****************************************************************************/ 830/*****************************************************************************/
684 831
832/* dummy callback for pending events */
833static void noinline
834pendingcb (EV_P_ ev_prepare *w, int revents)
835{
836}
837
685void noinline 838void noinline
686ev_feed_event (EV_P_ void *w, int revents) 839ev_feed_event (EV_P_ void *w, int revents)
687{ 840{
688 W w_ = (W)w; 841 W w_ = (W)w;
689 int pri = ABSPRI (w_); 842 int pri = ABSPRI (w_);
… …
697 pendings [pri][w_->pending - 1].w = w_; 850 pendings [pri][w_->pending - 1].w = w_;
698 pendings [pri][w_->pending - 1].events = revents; 851 pendings [pri][w_->pending - 1].events = revents;
699 } 852 }
700} 853}
701 854
702void inline_speed 855inline_speed void
856feed_reverse (EV_P_ W w)
857{
858 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
859 rfeeds [rfeedcnt++] = w;
860}
861
862inline_size void
863feed_reverse_done (EV_P_ int revents)
864{
865 do
866 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
867 while (rfeedcnt);
868}
869
870inline_speed void
703queue_events (EV_P_ W *events, int eventcnt, int type) 871queue_events (EV_P_ W *events, int eventcnt, int type)
704{ 872{
705 int i; 873 int i;
706 874
707 for (i = 0; i < eventcnt; ++i) 875 for (i = 0; i < eventcnt; ++i)
708 ev_feed_event (EV_A_ events [i], type); 876 ev_feed_event (EV_A_ events [i], type);
709} 877}
710 878
711/*****************************************************************************/ 879/*****************************************************************************/
712 880
713void inline_speed 881inline_speed void
714fd_event (EV_P_ int fd, int revents) 882fd_event_nc (EV_P_ int fd, int revents)
715{ 883{
716 ANFD *anfd = anfds + fd; 884 ANFD *anfd = anfds + fd;
717 ev_io *w; 885 ev_io *w;
718 886
719 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 887 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
723 if (ev) 891 if (ev)
724 ev_feed_event (EV_A_ (W)w, ev); 892 ev_feed_event (EV_A_ (W)w, ev);
725 } 893 }
726} 894}
727 895
896/* do not submit kernel events for fds that have reify set */
897/* because that means they changed while we were polling for new events */
898inline_speed void
899fd_event (EV_P_ int fd, int revents)
900{
901 ANFD *anfd = anfds + fd;
902
903 if (expect_true (!anfd->reify))
904 fd_event_nc (EV_A_ fd, revents);
905}
906
728void 907void
729ev_feed_fd_event (EV_P_ int fd, int revents) 908ev_feed_fd_event (EV_P_ int fd, int revents)
730{ 909{
731 if (fd >= 0 && fd < anfdmax) 910 if (fd >= 0 && fd < anfdmax)
732 fd_event (EV_A_ fd, revents); 911 fd_event_nc (EV_A_ fd, revents);
733} 912}
734 913
735void inline_size 914/* make sure the external fd watch events are in-sync */
915/* with the kernel/libev internal state */
916inline_size void
736fd_reify (EV_P) 917fd_reify (EV_P)
737{ 918{
738 int i; 919 int i;
739 920
740 for (i = 0; i < fdchangecnt; ++i) 921 for (i = 0; i < fdchangecnt; ++i)
… …
750 931
751#if EV_SELECT_IS_WINSOCKET 932#if EV_SELECT_IS_WINSOCKET
752 if (events) 933 if (events)
753 { 934 {
754 unsigned long arg; 935 unsigned long arg;
755 #ifdef EV_FD_TO_WIN32_HANDLE
756 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 936 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)); 937 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
761 } 938 }
762#endif 939#endif
763 940
764 { 941 {
… …
766 unsigned char o_reify = anfd->reify; 943 unsigned char o_reify = anfd->reify;
767 944
768 anfd->reify = 0; 945 anfd->reify = 0;
769 anfd->events = events; 946 anfd->events = events;
770 947
771 if (o_events != events || o_reify & EV_IOFDSET) 948 if (o_events != events || o_reify & EV__IOFDSET)
772 backend_modify (EV_A_ fd, o_events, events); 949 backend_modify (EV_A_ fd, o_events, events);
773 } 950 }
774 } 951 }
775 952
776 fdchangecnt = 0; 953 fdchangecnt = 0;
777} 954}
778 955
779void inline_size 956/* something about the given fd changed */
957inline_size void
780fd_change (EV_P_ int fd, int flags) 958fd_change (EV_P_ int fd, int flags)
781{ 959{
782 unsigned char reify = anfds [fd].reify; 960 unsigned char reify = anfds [fd].reify;
783 anfds [fd].reify |= flags; 961 anfds [fd].reify |= flags;
784 962
… …
788 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 966 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
789 fdchanges [fdchangecnt - 1] = fd; 967 fdchanges [fdchangecnt - 1] = fd;
790 } 968 }
791} 969}
792 970
793void inline_speed 971/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
972inline_speed void
794fd_kill (EV_P_ int fd) 973fd_kill (EV_P_ int fd)
795{ 974{
796 ev_io *w; 975 ev_io *w;
797 976
798 while ((w = (ev_io *)anfds [fd].head)) 977 while ((w = (ev_io *)anfds [fd].head))
… …
800 ev_io_stop (EV_A_ w); 979 ev_io_stop (EV_A_ w);
801 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 980 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
802 } 981 }
803} 982}
804 983
805int inline_size 984/* check whether the given fd is atcually valid, for error recovery */
985inline_size int
806fd_valid (int fd) 986fd_valid (int fd)
807{ 987{
808#ifdef _WIN32 988#ifdef _WIN32
809 return _get_osfhandle (fd) != -1; 989 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
810#else 990#else
811 return fcntl (fd, F_GETFD) != -1; 991 return fcntl (fd, F_GETFD) != -1;
812#endif 992#endif
813} 993}
814 994
… …
832 1012
833 for (fd = anfdmax; fd--; ) 1013 for (fd = anfdmax; fd--; )
834 if (anfds [fd].events) 1014 if (anfds [fd].events)
835 { 1015 {
836 fd_kill (EV_A_ fd); 1016 fd_kill (EV_A_ fd);
837 return; 1017 break;
838 } 1018 }
839} 1019}
840 1020
841/* usually called after fork if backend needs to re-arm all fds from scratch */ 1021/* usually called after fork if backend needs to re-arm all fds from scratch */
842static void noinline 1022static void noinline
… …
847 for (fd = 0; fd < anfdmax; ++fd) 1027 for (fd = 0; fd < anfdmax; ++fd)
848 if (anfds [fd].events) 1028 if (anfds [fd].events)
849 { 1029 {
850 anfds [fd].events = 0; 1030 anfds [fd].events = 0;
851 anfds [fd].emask = 0; 1031 anfds [fd].emask = 0;
852 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1032 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
853 } 1033 }
854} 1034}
855 1035
856/*****************************************************************************/ 1036/*****************************************************************************/
857 1037
… …
873#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1053#define HEAP0 (DHEAP - 1) /* index of first element in heap */
874#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1054#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
875#define UPHEAP_DONE(p,k) ((p) == (k)) 1055#define UPHEAP_DONE(p,k) ((p) == (k))
876 1056
877/* away from the root */ 1057/* away from the root */
878void inline_speed 1058inline_speed void
879downheap (ANHE *heap, int N, int k) 1059downheap (ANHE *heap, int N, int k)
880{ 1060{
881 ANHE he = heap [k]; 1061 ANHE he = heap [k];
882 ANHE *E = heap + N + HEAP0; 1062 ANHE *E = heap + N + HEAP0;
883 1063
… …
923#define HEAP0 1 1103#define HEAP0 1
924#define HPARENT(k) ((k) >> 1) 1104#define HPARENT(k) ((k) >> 1)
925#define UPHEAP_DONE(p,k) (!(p)) 1105#define UPHEAP_DONE(p,k) (!(p))
926 1106
927/* away from the root */ 1107/* away from the root */
928void inline_speed 1108inline_speed void
929downheap (ANHE *heap, int N, int k) 1109downheap (ANHE *heap, int N, int k)
930{ 1110{
931 ANHE he = heap [k]; 1111 ANHE he = heap [k];
932 1112
933 for (;;) 1113 for (;;)
934 { 1114 {
935 int c = k << 1; 1115 int c = k << 1;
936 1116
937 if (c > N + HEAP0 - 1) 1117 if (c >= N + HEAP0)
938 break; 1118 break;
939 1119
940 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1120 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
941 ? 1 : 0; 1121 ? 1 : 0;
942 1122
… …
953 ev_active (ANHE_w (he)) = k; 1133 ev_active (ANHE_w (he)) = k;
954} 1134}
955#endif 1135#endif
956 1136
957/* towards the root */ 1137/* towards the root */
958void inline_speed 1138inline_speed void
959upheap (ANHE *heap, int k) 1139upheap (ANHE *heap, int k)
960{ 1140{
961 ANHE he = heap [k]; 1141 ANHE he = heap [k];
962 1142
963 for (;;) 1143 for (;;)
… …
974 1154
975 heap [k] = he; 1155 heap [k] = he;
976 ev_active (ANHE_w (he)) = k; 1156 ev_active (ANHE_w (he)) = k;
977} 1157}
978 1158
979void inline_size 1159/* move an element suitably so it is in a correct place */
1160inline_size void
980adjustheap (ANHE *heap, int N, int k) 1161adjustheap (ANHE *heap, int N, int k)
981{ 1162{
982 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1163 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
983 upheap (heap, k); 1164 upheap (heap, k);
984 else 1165 else
985 downheap (heap, N, k); 1166 downheap (heap, N, k);
986} 1167}
987 1168
988/* rebuild the heap: this function is used only once and executed rarely */ 1169/* rebuild the heap: this function is used only once and executed rarely */
989void inline_size 1170inline_size void
990reheap (ANHE *heap, int N) 1171reheap (ANHE *heap, int N)
991{ 1172{
992 int i; 1173 int i;
993 1174
994 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1175 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
997 upheap (heap, i + HEAP0); 1178 upheap (heap, i + HEAP0);
998} 1179}
999 1180
1000/*****************************************************************************/ 1181/*****************************************************************************/
1001 1182
1183/* associate signal watchers to a signal signal */
1002typedef struct 1184typedef struct
1003{ 1185{
1186 EV_ATOMIC_T pending;
1187#if EV_MULTIPLICITY
1188 EV_P;
1189#endif
1004 WL head; 1190 WL head;
1005 EV_ATOMIC_T gotsig;
1006} ANSIG; 1191} ANSIG;
1007 1192
1008static ANSIG *signals; 1193static ANSIG signals [EV_NSIG - 1];
1009static int signalmax;
1010
1011static EV_ATOMIC_T gotsig;
1012 1194
1013/*****************************************************************************/ 1195/*****************************************************************************/
1014 1196
1015void inline_speed 1197/* used to prepare libev internal fd's */
1198/* this is not fork-safe */
1199inline_speed void
1016fd_intern (int fd) 1200fd_intern (int fd)
1017{ 1201{
1018#ifdef _WIN32 1202#ifdef _WIN32
1019 unsigned long arg = 1; 1203 unsigned long arg = 1;
1020 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1204 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1021#else 1205#else
1022 fcntl (fd, F_SETFD, FD_CLOEXEC); 1206 fcntl (fd, F_SETFD, FD_CLOEXEC);
1023 fcntl (fd, F_SETFL, O_NONBLOCK); 1207 fcntl (fd, F_SETFL, O_NONBLOCK);
1024#endif 1208#endif
1025} 1209}
1026 1210
1027static void noinline 1211static void noinline
1028evpipe_init (EV_P) 1212evpipe_init (EV_P)
1029{ 1213{
1030 if (!ev_is_active (&pipeev)) 1214 if (!ev_is_active (&pipe_w))
1031 { 1215 {
1032#if EV_USE_EVENTFD 1216#if EV_USE_EVENTFD
1217 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1218 if (evfd < 0 && errno == EINVAL)
1033 if ((evfd = eventfd (0, 0)) >= 0) 1219 evfd = eventfd (0, 0);
1220
1221 if (evfd >= 0)
1034 { 1222 {
1035 evpipe [0] = -1; 1223 evpipe [0] = -1;
1036 fd_intern (evfd); 1224 fd_intern (evfd); /* doing it twice doesn't hurt */
1037 ev_io_set (&pipeev, evfd, EV_READ); 1225 ev_io_set (&pipe_w, evfd, EV_READ);
1038 } 1226 }
1039 else 1227 else
1040#endif 1228#endif
1041 { 1229 {
1042 while (pipe (evpipe)) 1230 while (pipe (evpipe))
1043 ev_syserr ("(libev) error creating signal/async pipe"); 1231 ev_syserr ("(libev) error creating signal/async pipe");
1044 1232
1045 fd_intern (evpipe [0]); 1233 fd_intern (evpipe [0]);
1046 fd_intern (evpipe [1]); 1234 fd_intern (evpipe [1]);
1047 ev_io_set (&pipeev, evpipe [0], EV_READ); 1235 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1048 } 1236 }
1049 1237
1050 ev_io_start (EV_A_ &pipeev); 1238 ev_io_start (EV_A_ &pipe_w);
1051 ev_unref (EV_A); /* watcher should not keep loop alive */ 1239 ev_unref (EV_A); /* watcher should not keep loop alive */
1052 } 1240 }
1053} 1241}
1054 1242
1055void inline_size 1243inline_size void
1056evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1244evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1057{ 1245{
1058 if (!*flag) 1246 if (!*flag)
1059 { 1247 {
1060 int old_errno = errno; /* save errno because write might clobber it */ 1248 int old_errno = errno; /* save errno because write might clobber it */
… …
1073 1261
1074 errno = old_errno; 1262 errno = old_errno;
1075 } 1263 }
1076} 1264}
1077 1265
1266/* called whenever the libev signal pipe */
1267/* got some events (signal, async) */
1078static void 1268static void
1079pipecb (EV_P_ ev_io *iow, int revents) 1269pipecb (EV_P_ ev_io *iow, int revents)
1080{ 1270{
1271 int i;
1272
1081#if EV_USE_EVENTFD 1273#if EV_USE_EVENTFD
1082 if (evfd >= 0) 1274 if (evfd >= 0)
1083 { 1275 {
1084 uint64_t counter; 1276 uint64_t counter;
1085 read (evfd, &counter, sizeof (uint64_t)); 1277 read (evfd, &counter, sizeof (uint64_t));
… …
1089 { 1281 {
1090 char dummy; 1282 char dummy;
1091 read (evpipe [0], &dummy, 1); 1283 read (evpipe [0], &dummy, 1);
1092 } 1284 }
1093 1285
1094 if (gotsig && ev_is_default_loop (EV_A)) 1286 if (sig_pending)
1095 { 1287 {
1096 int signum; 1288 sig_pending = 0;
1097 gotsig = 0;
1098 1289
1099 for (signum = signalmax; signum--; ) 1290 for (i = EV_NSIG - 1; i--; )
1100 if (signals [signum].gotsig) 1291 if (expect_false (signals [i].pending))
1101 ev_feed_signal_event (EV_A_ signum + 1); 1292 ev_feed_signal_event (EV_A_ i + 1);
1102 } 1293 }
1103 1294
1104#if EV_ASYNC_ENABLE 1295#if EV_ASYNC_ENABLE
1105 if (gotasync) 1296 if (async_pending)
1106 { 1297 {
1107 int i; 1298 async_pending = 0;
1108 gotasync = 0;
1109 1299
1110 for (i = asynccnt; i--; ) 1300 for (i = asynccnt; i--; )
1111 if (asyncs [i]->sent) 1301 if (asyncs [i]->sent)
1112 { 1302 {
1113 asyncs [i]->sent = 0; 1303 asyncs [i]->sent = 0;
… …
1121 1311
1122static void 1312static void
1123ev_sighandler (int signum) 1313ev_sighandler (int signum)
1124{ 1314{
1125#if EV_MULTIPLICITY 1315#if EV_MULTIPLICITY
1126 struct ev_loop *loop = &default_loop_struct; 1316 EV_P = signals [signum - 1].loop;
1127#endif 1317#endif
1128 1318
1129#if _WIN32 1319#ifdef _WIN32
1130 signal (signum, ev_sighandler); 1320 signal (signum, ev_sighandler);
1131#endif 1321#endif
1132 1322
1133 signals [signum - 1].gotsig = 1; 1323 signals [signum - 1].pending = 1;
1134 evpipe_write (EV_A_ &gotsig); 1324 evpipe_write (EV_A_ &sig_pending);
1135} 1325}
1136 1326
1137void noinline 1327void noinline
1138ev_feed_signal_event (EV_P_ int signum) 1328ev_feed_signal_event (EV_P_ int signum)
1139{ 1329{
1140 WL w; 1330 WL w;
1141 1331
1332 if (expect_false (signum <= 0 || signum > EV_NSIG))
1333 return;
1334
1335 --signum;
1336
1142#if EV_MULTIPLICITY 1337#if EV_MULTIPLICITY
1143 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1338 /* it is permissible to try to feed a signal to the wrong loop */
1144#endif 1339 /* or, likely more useful, feeding a signal nobody is waiting for */
1145 1340
1146 --signum; 1341 if (expect_false (signals [signum].loop != EV_A))
1147
1148 if (signum < 0 || signum >= signalmax)
1149 return; 1342 return;
1343#endif
1150 1344
1151 signals [signum].gotsig = 0; 1345 signals [signum].pending = 0;
1152 1346
1153 for (w = signals [signum].head; w; w = w->next) 1347 for (w = signals [signum].head; w; w = w->next)
1154 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1348 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1155} 1349}
1156 1350
1351#if EV_USE_SIGNALFD
1352static void
1353sigfdcb (EV_P_ ev_io *iow, int revents)
1354{
1355 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1356
1357 for (;;)
1358 {
1359 ssize_t res = read (sigfd, si, sizeof (si));
1360
1361 /* not ISO-C, as res might be -1, but works with SuS */
1362 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1363 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1364
1365 if (res < (ssize_t)sizeof (si))
1366 break;
1367 }
1368}
1369#endif
1370
1157/*****************************************************************************/ 1371/*****************************************************************************/
1158 1372
1159static WL childs [EV_PID_HASHSIZE]; 1373static WL childs [EV_PID_HASHSIZE];
1160 1374
1161#ifndef _WIN32 1375#ifndef _WIN32
… …
1164 1378
1165#ifndef WIFCONTINUED 1379#ifndef WIFCONTINUED
1166# define WIFCONTINUED(status) 0 1380# define WIFCONTINUED(status) 0
1167#endif 1381#endif
1168 1382
1169void inline_speed 1383/* handle a single child status event */
1384inline_speed void
1170child_reap (EV_P_ int chain, int pid, int status) 1385child_reap (EV_P_ int chain, int pid, int status)
1171{ 1386{
1172 ev_child *w; 1387 ev_child *w;
1173 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1388 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1174 1389
… …
1187 1402
1188#ifndef WCONTINUED 1403#ifndef WCONTINUED
1189# define WCONTINUED 0 1404# define WCONTINUED 0
1190#endif 1405#endif
1191 1406
1407/* called on sigchld etc., calls waitpid */
1192static void 1408static void
1193childcb (EV_P_ ev_signal *sw, int revents) 1409childcb (EV_P_ ev_signal *sw, int revents)
1194{ 1410{
1195 int pid, status; 1411 int pid, status;
1196 1412
… …
1303ev_backend (EV_P) 1519ev_backend (EV_P)
1304{ 1520{
1305 return backend; 1521 return backend;
1306} 1522}
1307 1523
1524#if EV_MINIMAL < 2
1308unsigned int 1525unsigned int
1309ev_loop_count (EV_P) 1526ev_loop_count (EV_P)
1310{ 1527{
1311 return loop_count; 1528 return loop_count;
1312} 1529}
1313 1530
1531unsigned int
1532ev_loop_depth (EV_P)
1533{
1534 return loop_depth;
1535}
1536
1314void 1537void
1315ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1538ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1316{ 1539{
1317 io_blocktime = interval; 1540 io_blocktime = interval;
1318} 1541}
… …
1321ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1544ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1322{ 1545{
1323 timeout_blocktime = interval; 1546 timeout_blocktime = interval;
1324} 1547}
1325 1548
1549void
1550ev_set_userdata (EV_P_ void *data)
1551{
1552 userdata = data;
1553}
1554
1555void *
1556ev_userdata (EV_P)
1557{
1558 return userdata;
1559}
1560
1561void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1562{
1563 invoke_cb = invoke_pending_cb;
1564}
1565
1566void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1567{
1568 release_cb = release;
1569 acquire_cb = acquire;
1570}
1571#endif
1572
1573/* initialise a loop structure, must be zero-initialised */
1326static void noinline 1574static void noinline
1327loop_init (EV_P_ unsigned int flags) 1575loop_init (EV_P_ unsigned int flags)
1328{ 1576{
1329 if (!backend) 1577 if (!backend)
1330 { 1578 {
… …
1346 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1594 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1347 have_monotonic = 1; 1595 have_monotonic = 1;
1348 } 1596 }
1349#endif 1597#endif
1350 1598
1599 /* pid check not overridable via env */
1600#ifndef _WIN32
1601 if (flags & EVFLAG_FORKCHECK)
1602 curpid = getpid ();
1603#endif
1604
1605 if (!(flags & EVFLAG_NOENV)
1606 && !enable_secure ()
1607 && getenv ("LIBEV_FLAGS"))
1608 flags = atoi (getenv ("LIBEV_FLAGS"));
1609
1351 ev_rt_now = ev_time (); 1610 ev_rt_now = ev_time ();
1352 mn_now = get_clock (); 1611 mn_now = get_clock ();
1353 now_floor = mn_now; 1612 now_floor = mn_now;
1354 rtmn_diff = ev_rt_now - mn_now; 1613 rtmn_diff = ev_rt_now - mn_now;
1614#if EV_MINIMAL < 2
1615 invoke_cb = ev_invoke_pending;
1616#endif
1355 1617
1356 io_blocktime = 0.; 1618 io_blocktime = 0.;
1357 timeout_blocktime = 0.; 1619 timeout_blocktime = 0.;
1358 backend = 0; 1620 backend = 0;
1359 backend_fd = -1; 1621 backend_fd = -1;
1360 gotasync = 0; 1622 sig_pending = 0;
1623#if EV_ASYNC_ENABLE
1624 async_pending = 0;
1625#endif
1361#if EV_USE_INOTIFY 1626#if EV_USE_INOTIFY
1362 fs_fd = -2; 1627 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1363#endif 1628#endif
1364 1629#if EV_USE_SIGNALFD
1365 /* pid check not overridable via env */ 1630 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1366#ifndef _WIN32
1367 if (flags & EVFLAG_FORKCHECK)
1368 curpid = getpid ();
1369#endif 1631#endif
1370
1371 if (!(flags & EVFLAG_NOENV)
1372 && !enable_secure ()
1373 && getenv ("LIBEV_FLAGS"))
1374 flags = atoi (getenv ("LIBEV_FLAGS"));
1375 1632
1376 if (!(flags & 0x0000ffffU)) 1633 if (!(flags & 0x0000ffffU))
1377 flags |= ev_recommended_backends (); 1634 flags |= ev_recommended_backends ();
1378 1635
1379#if EV_USE_PORT 1636#if EV_USE_PORT
… …
1390#endif 1647#endif
1391#if EV_USE_SELECT 1648#if EV_USE_SELECT
1392 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1649 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1393#endif 1650#endif
1394 1651
1652 ev_prepare_init (&pending_w, pendingcb);
1653
1395 ev_init (&pipeev, pipecb); 1654 ev_init (&pipe_w, pipecb);
1396 ev_set_priority (&pipeev, EV_MAXPRI); 1655 ev_set_priority (&pipe_w, EV_MAXPRI);
1397 } 1656 }
1398} 1657}
1399 1658
1659/* free up a loop structure */
1400static void noinline 1660static void noinline
1401loop_destroy (EV_P) 1661loop_destroy (EV_P)
1402{ 1662{
1403 int i; 1663 int i;
1404 1664
1405 if (ev_is_active (&pipeev)) 1665 if (ev_is_active (&pipe_w))
1406 { 1666 {
1407 ev_ref (EV_A); /* signal watcher */ 1667 /*ev_ref (EV_A);*/
1408 ev_io_stop (EV_A_ &pipeev); 1668 /*ev_io_stop (EV_A_ &pipe_w);*/
1409 1669
1410#if EV_USE_EVENTFD 1670#if EV_USE_EVENTFD
1411 if (evfd >= 0) 1671 if (evfd >= 0)
1412 close (evfd); 1672 close (evfd);
1413#endif 1673#endif
1414 1674
1415 if (evpipe [0] >= 0) 1675 if (evpipe [0] >= 0)
1416 { 1676 {
1417 close (evpipe [0]); 1677 EV_WIN32_CLOSE_FD (evpipe [0]);
1418 close (evpipe [1]); 1678 EV_WIN32_CLOSE_FD (evpipe [1]);
1419 } 1679 }
1420 } 1680 }
1681
1682#if EV_USE_SIGNALFD
1683 if (ev_is_active (&sigfd_w))
1684 close (sigfd);
1685#endif
1421 1686
1422#if EV_USE_INOTIFY 1687#if EV_USE_INOTIFY
1423 if (fs_fd >= 0) 1688 if (fs_fd >= 0)
1424 close (fs_fd); 1689 close (fs_fd);
1425#endif 1690#endif
… …
1449#if EV_IDLE_ENABLE 1714#if EV_IDLE_ENABLE
1450 array_free (idle, [i]); 1715 array_free (idle, [i]);
1451#endif 1716#endif
1452 } 1717 }
1453 1718
1454 ev_free (anfds); anfdmax = 0; 1719 ev_free (anfds); anfds = 0; anfdmax = 0;
1455 1720
1456 /* have to use the microsoft-never-gets-it-right macro */ 1721 /* have to use the microsoft-never-gets-it-right macro */
1722 array_free (rfeed, EMPTY);
1457 array_free (fdchange, EMPTY); 1723 array_free (fdchange, EMPTY);
1458 array_free (timer, EMPTY); 1724 array_free (timer, EMPTY);
1459#if EV_PERIODIC_ENABLE 1725#if EV_PERIODIC_ENABLE
1460 array_free (periodic, EMPTY); 1726 array_free (periodic, EMPTY);
1461#endif 1727#endif
… …
1470 1736
1471 backend = 0; 1737 backend = 0;
1472} 1738}
1473 1739
1474#if EV_USE_INOTIFY 1740#if EV_USE_INOTIFY
1475void inline_size infy_fork (EV_P); 1741inline_size void infy_fork (EV_P);
1476#endif 1742#endif
1477 1743
1478void inline_size 1744inline_size void
1479loop_fork (EV_P) 1745loop_fork (EV_P)
1480{ 1746{
1481#if EV_USE_PORT 1747#if EV_USE_PORT
1482 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1748 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1483#endif 1749#endif
… …
1489#endif 1755#endif
1490#if EV_USE_INOTIFY 1756#if EV_USE_INOTIFY
1491 infy_fork (EV_A); 1757 infy_fork (EV_A);
1492#endif 1758#endif
1493 1759
1494 if (ev_is_active (&pipeev)) 1760 if (ev_is_active (&pipe_w))
1495 { 1761 {
1496 /* this "locks" the handlers against writing to the pipe */ 1762 /* this "locks" the handlers against writing to the pipe */
1497 /* while we modify the fd vars */ 1763 /* while we modify the fd vars */
1498 gotsig = 1; 1764 sig_pending = 1;
1499#if EV_ASYNC_ENABLE 1765#if EV_ASYNC_ENABLE
1500 gotasync = 1; 1766 async_pending = 1;
1501#endif 1767#endif
1502 1768
1503 ev_ref (EV_A); 1769 ev_ref (EV_A);
1504 ev_io_stop (EV_A_ &pipeev); 1770 ev_io_stop (EV_A_ &pipe_w);
1505 1771
1506#if EV_USE_EVENTFD 1772#if EV_USE_EVENTFD
1507 if (evfd >= 0) 1773 if (evfd >= 0)
1508 close (evfd); 1774 close (evfd);
1509#endif 1775#endif
1510 1776
1511 if (evpipe [0] >= 0) 1777 if (evpipe [0] >= 0)
1512 { 1778 {
1513 close (evpipe [0]); 1779 EV_WIN32_CLOSE_FD (evpipe [0]);
1514 close (evpipe [1]); 1780 EV_WIN32_CLOSE_FD (evpipe [1]);
1515 } 1781 }
1516 1782
1517 evpipe_init (EV_A); 1783 evpipe_init (EV_A);
1518 /* now iterate over everything, in case we missed something */ 1784 /* now iterate over everything, in case we missed something */
1519 pipecb (EV_A_ &pipeev, EV_READ); 1785 pipecb (EV_A_ &pipe_w, EV_READ);
1520 } 1786 }
1521 1787
1522 postfork = 0; 1788 postfork = 0;
1523} 1789}
1524 1790
1525#if EV_MULTIPLICITY 1791#if EV_MULTIPLICITY
1526 1792
1527struct ev_loop * 1793struct ev_loop *
1528ev_loop_new (unsigned int flags) 1794ev_loop_new (unsigned int flags)
1529{ 1795{
1530 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1796 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1531 1797
1532 memset (loop, 0, sizeof (struct ev_loop)); 1798 memset (EV_A, 0, sizeof (struct ev_loop));
1533
1534 loop_init (EV_A_ flags); 1799 loop_init (EV_A_ flags);
1535 1800
1536 if (ev_backend (EV_A)) 1801 if (ev_backend (EV_A))
1537 return loop; 1802 return EV_A;
1538 1803
1539 return 0; 1804 return 0;
1540} 1805}
1541 1806
1542void 1807void
… …
1549void 1814void
1550ev_loop_fork (EV_P) 1815ev_loop_fork (EV_P)
1551{ 1816{
1552 postfork = 1; /* must be in line with ev_default_fork */ 1817 postfork = 1; /* must be in line with ev_default_fork */
1553} 1818}
1819#endif /* multiplicity */
1554 1820
1555#if EV_VERIFY 1821#if EV_VERIFY
1556static void noinline 1822static void noinline
1557verify_watcher (EV_P_ W w) 1823verify_watcher (EV_P_ W w)
1558{ 1824{
… …
1586 verify_watcher (EV_A_ ws [cnt]); 1852 verify_watcher (EV_A_ ws [cnt]);
1587 } 1853 }
1588} 1854}
1589#endif 1855#endif
1590 1856
1857#if EV_MINIMAL < 2
1591void 1858void
1592ev_loop_verify (EV_P) 1859ev_loop_verify (EV_P)
1593{ 1860{
1594#if EV_VERIFY 1861#if EV_VERIFY
1595 int i; 1862 int i;
… …
1644 assert (checkmax >= checkcnt); 1911 assert (checkmax >= checkcnt);
1645 array_verify (EV_A_ (W *)checks, checkcnt); 1912 array_verify (EV_A_ (W *)checks, checkcnt);
1646 1913
1647# if 0 1914# if 0
1648 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1915 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) 1916 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1650# endif
1651#endif 1917# endif
1918#endif
1652} 1919}
1653 1920#endif
1654#endif /* multiplicity */
1655 1921
1656#if EV_MULTIPLICITY 1922#if EV_MULTIPLICITY
1657struct ev_loop * 1923struct ev_loop *
1658ev_default_loop_init (unsigned int flags) 1924ev_default_loop_init (unsigned int flags)
1659#else 1925#else
… …
1662#endif 1928#endif
1663{ 1929{
1664 if (!ev_default_loop_ptr) 1930 if (!ev_default_loop_ptr)
1665 { 1931 {
1666#if EV_MULTIPLICITY 1932#if EV_MULTIPLICITY
1667 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1933 EV_P = ev_default_loop_ptr = &default_loop_struct;
1668#else 1934#else
1669 ev_default_loop_ptr = 1; 1935 ev_default_loop_ptr = 1;
1670#endif 1936#endif
1671 1937
1672 loop_init (EV_A_ flags); 1938 loop_init (EV_A_ flags);
… …
1689 1955
1690void 1956void
1691ev_default_destroy (void) 1957ev_default_destroy (void)
1692{ 1958{
1693#if EV_MULTIPLICITY 1959#if EV_MULTIPLICITY
1694 struct ev_loop *loop = ev_default_loop_ptr; 1960 EV_P = ev_default_loop_ptr;
1695#endif 1961#endif
1696 1962
1697 ev_default_loop_ptr = 0; 1963 ev_default_loop_ptr = 0;
1698 1964
1699#ifndef _WIN32 1965#ifndef _WIN32
… …
1706 1972
1707void 1973void
1708ev_default_fork (void) 1974ev_default_fork (void)
1709{ 1975{
1710#if EV_MULTIPLICITY 1976#if EV_MULTIPLICITY
1711 struct ev_loop *loop = ev_default_loop_ptr; 1977 EV_P = ev_default_loop_ptr;
1712#endif 1978#endif
1713 1979
1714 postfork = 1; /* must be in line with ev_loop_fork */ 1980 postfork = 1; /* must be in line with ev_loop_fork */
1715} 1981}
1716 1982
… …
1720ev_invoke (EV_P_ void *w, int revents) 1986ev_invoke (EV_P_ void *w, int revents)
1721{ 1987{
1722 EV_CB_INVOKE ((W)w, revents); 1988 EV_CB_INVOKE ((W)w, revents);
1723} 1989}
1724 1990
1725void inline_speed 1991unsigned int
1726call_pending (EV_P) 1992ev_pending_count (EV_P)
1993{
1994 int pri;
1995 unsigned int count = 0;
1996
1997 for (pri = NUMPRI; pri--; )
1998 count += pendingcnt [pri];
1999
2000 return count;
2001}
2002
2003void noinline
2004ev_invoke_pending (EV_P)
1727{ 2005{
1728 int pri; 2006 int pri;
1729 2007
1730 for (pri = NUMPRI; pri--; ) 2008 for (pri = NUMPRI; pri--; )
1731 while (pendingcnt [pri]) 2009 while (pendingcnt [pri])
1732 { 2010 {
1733 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2011 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1734 2012
1735 if (expect_true (p->w))
1736 {
1737 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 2013 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2014 /* ^ this is no longer true, as pending_w could be here */
1738 2015
1739 p->w->pending = 0; 2016 p->w->pending = 0;
1740 EV_CB_INVOKE (p->w, p->events); 2017 EV_CB_INVOKE (p->w, p->events);
1741 EV_FREQUENT_CHECK; 2018 EV_FREQUENT_CHECK;
1742 }
1743 } 2019 }
1744} 2020}
1745 2021
1746#if EV_IDLE_ENABLE 2022#if EV_IDLE_ENABLE
1747void inline_size 2023/* make idle watchers pending. this handles the "call-idle */
2024/* only when higher priorities are idle" logic */
2025inline_size void
1748idle_reify (EV_P) 2026idle_reify (EV_P)
1749{ 2027{
1750 if (expect_false (idleall)) 2028 if (expect_false (idleall))
1751 { 2029 {
1752 int pri; 2030 int pri;
… …
1764 } 2042 }
1765 } 2043 }
1766} 2044}
1767#endif 2045#endif
1768 2046
1769void inline_size 2047/* make timers pending */
2048inline_size void
1770timers_reify (EV_P) 2049timers_reify (EV_P)
1771{ 2050{
1772 EV_FREQUENT_CHECK; 2051 EV_FREQUENT_CHECK;
1773 2052
1774 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2053 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1775 { 2054 {
1776 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2055 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 { 2056 {
2057 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2058
2059 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2060
2061 /* first reschedule or stop timer */
2062 if (w->repeat)
2063 {
1783 ev_at (w) += w->repeat; 2064 ev_at (w) += w->repeat;
1784 if (ev_at (w) < mn_now) 2065 if (ev_at (w) < mn_now)
1785 ev_at (w) = mn_now; 2066 ev_at (w) = mn_now;
1786 2067
1787 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2068 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1788 2069
1789 ANHE_at_cache (timers [HEAP0]); 2070 ANHE_at_cache (timers [HEAP0]);
1790 downheap (timers, timercnt, HEAP0); 2071 downheap (timers, timercnt, HEAP0);
2072 }
2073 else
2074 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2075
2076 EV_FREQUENT_CHECK;
2077 feed_reverse (EV_A_ (W)w);
1791 } 2078 }
1792 else 2079 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1793 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1794 2080
1795 EV_FREQUENT_CHECK;
1796 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2081 feed_reverse_done (EV_A_ EV_TIMEOUT);
1797 } 2082 }
1798} 2083}
1799 2084
1800#if EV_PERIODIC_ENABLE 2085#if EV_PERIODIC_ENABLE
1801void inline_size 2086/* make periodics pending */
2087inline_size void
1802periodics_reify (EV_P) 2088periodics_reify (EV_P)
1803{ 2089{
1804 EV_FREQUENT_CHECK; 2090 EV_FREQUENT_CHECK;
1805 2091
1806 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2092 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1807 { 2093 {
1808 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2094 int feed_count = 0;
1809 2095
1810 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/ 2096 do
1811
1812 /* first reschedule or stop timer */
1813 if (w->reschedule_cb)
1814 { 2097 {
2098 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2099
2100 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2101
2102 /* first reschedule or stop timer */
2103 if (w->reschedule_cb)
2104 {
1815 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2105 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1816 2106
1817 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2107 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1818 2108
1819 ANHE_at_cache (periodics [HEAP0]); 2109 ANHE_at_cache (periodics [HEAP0]);
1820 downheap (periodics, periodiccnt, HEAP0); 2110 downheap (periodics, periodiccnt, HEAP0);
2111 }
2112 else if (w->interval)
2113 {
2114 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2115 /* if next trigger time is not sufficiently in the future, put it there */
2116 /* this might happen because of floating point inexactness */
2117 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2118 {
2119 ev_at (w) += w->interval;
2120
2121 /* if interval is unreasonably low we might still have a time in the past */
2122 /* so correct this. this will make the periodic very inexact, but the user */
2123 /* has effectively asked to get triggered more often than possible */
2124 if (ev_at (w) < ev_rt_now)
2125 ev_at (w) = ev_rt_now;
2126 }
2127
2128 ANHE_at_cache (periodics [HEAP0]);
2129 downheap (periodics, periodiccnt, HEAP0);
2130 }
2131 else
2132 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2133
2134 EV_FREQUENT_CHECK;
2135 feed_reverse (EV_A_ (W)w);
1821 } 2136 }
1822 else if (w->interval) 2137 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 2138
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); 2139 feed_reverse_done (EV_A_ EV_PERIODIC);
1846 } 2140 }
1847} 2141}
1848 2142
2143/* simply recalculate all periodics */
2144/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1849static void noinline 2145static void noinline
1850periodics_reschedule (EV_P) 2146periodics_reschedule (EV_P)
1851{ 2147{
1852 int i; 2148 int i;
1853 2149
… …
1866 2162
1867 reheap (periodics, periodiccnt); 2163 reheap (periodics, periodiccnt);
1868} 2164}
1869#endif 2165#endif
1870 2166
1871void inline_speed 2167/* adjust all timers by a given offset */
2168static void noinline
2169timers_reschedule (EV_P_ ev_tstamp adjust)
2170{
2171 int i;
2172
2173 for (i = 0; i < timercnt; ++i)
2174 {
2175 ANHE *he = timers + i + HEAP0;
2176 ANHE_w (*he)->at += adjust;
2177 ANHE_at_cache (*he);
2178 }
2179}
2180
2181/* fetch new monotonic and realtime times from the kernel */
2182/* also detect if there was a timejump, and act accordingly */
2183inline_speed void
1872time_update (EV_P_ ev_tstamp max_block) 2184time_update (EV_P_ ev_tstamp max_block)
1873{ 2185{
1874 int i;
1875
1876#if EV_USE_MONOTONIC 2186#if EV_USE_MONOTONIC
1877 if (expect_true (have_monotonic)) 2187 if (expect_true (have_monotonic))
1878 { 2188 {
2189 int i;
1879 ev_tstamp odiff = rtmn_diff; 2190 ev_tstamp odiff = rtmn_diff;
1880 2191
1881 mn_now = get_clock (); 2192 mn_now = get_clock ();
1882 2193
1883 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2194 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1909 ev_rt_now = ev_time (); 2220 ev_rt_now = ev_time ();
1910 mn_now = get_clock (); 2221 mn_now = get_clock ();
1911 now_floor = mn_now; 2222 now_floor = mn_now;
1912 } 2223 }
1913 2224
2225 /* no timer adjustment, as the monotonic clock doesn't jump */
2226 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1914# if EV_PERIODIC_ENABLE 2227# if EV_PERIODIC_ENABLE
1915 periodics_reschedule (EV_A); 2228 periodics_reschedule (EV_A);
1916# endif 2229# endif
1917 /* no timer adjustment, as the monotonic clock doesn't jump */
1918 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1919 } 2230 }
1920 else 2231 else
1921#endif 2232#endif
1922 { 2233 {
1923 ev_rt_now = ev_time (); 2234 ev_rt_now = ev_time ();
1924 2235
1925 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2236 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1926 { 2237 {
2238 /* adjust timers. this is easy, as the offset is the same for all of them */
2239 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1927#if EV_PERIODIC_ENABLE 2240#if EV_PERIODIC_ENABLE
1928 periodics_reschedule (EV_A); 2241 periodics_reschedule (EV_A);
1929#endif 2242#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 } 2243 }
1938 2244
1939 mn_now = ev_rt_now; 2245 mn_now = ev_rt_now;
1940 } 2246 }
1941} 2247}
1942 2248
1943void 2249void
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) 2250ev_loop (EV_P_ int flags)
1965{ 2251{
2252#if EV_MINIMAL < 2
2253 ++loop_depth;
2254#endif
2255
2256 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2257
1966 loop_done = EVUNLOOP_CANCEL; 2258 loop_done = EVUNLOOP_CANCEL;
1967 2259
1968 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2260 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1969 2261
1970 do 2262 do
1971 { 2263 {
1972#if EV_VERIFY >= 2 2264#if EV_VERIFY >= 2
1973 ev_loop_verify (EV_A); 2265 ev_loop_verify (EV_A);
… …
1986 /* we might have forked, so queue fork handlers */ 2278 /* we might have forked, so queue fork handlers */
1987 if (expect_false (postfork)) 2279 if (expect_false (postfork))
1988 if (forkcnt) 2280 if (forkcnt)
1989 { 2281 {
1990 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2282 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1991 call_pending (EV_A); 2283 EV_INVOKE_PENDING;
1992 } 2284 }
1993#endif 2285#endif
1994 2286
1995 /* queue prepare watchers (and execute them) */ 2287 /* queue prepare watchers (and execute them) */
1996 if (expect_false (preparecnt)) 2288 if (expect_false (preparecnt))
1997 { 2289 {
1998 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2290 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1999 call_pending (EV_A); 2291 EV_INVOKE_PENDING;
2000 } 2292 }
2001 2293
2002 if (expect_false (!activecnt)) 2294 if (expect_false (loop_done))
2003 break; 2295 break;
2004 2296
2005 /* we might have forked, so reify kernel state if necessary */ 2297 /* we might have forked, so reify kernel state if necessary */
2006 if (expect_false (postfork)) 2298 if (expect_false (postfork))
2007 loop_fork (EV_A); 2299 loop_fork (EV_A);
… …
2014 ev_tstamp waittime = 0.; 2306 ev_tstamp waittime = 0.;
2015 ev_tstamp sleeptime = 0.; 2307 ev_tstamp sleeptime = 0.;
2016 2308
2017 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2309 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2018 { 2310 {
2311 /* remember old timestamp for io_blocktime calculation */
2312 ev_tstamp prev_mn_now = mn_now;
2313
2019 /* update time to cancel out callback processing overhead */ 2314 /* update time to cancel out callback processing overhead */
2020 time_update (EV_A_ 1e100); 2315 time_update (EV_A_ 1e100);
2021 2316
2022 waittime = MAX_BLOCKTIME; 2317 waittime = MAX_BLOCKTIME;
2023 2318
… …
2033 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2328 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2034 if (waittime > to) waittime = to; 2329 if (waittime > to) waittime = to;
2035 } 2330 }
2036#endif 2331#endif
2037 2332
2333 /* don't let timeouts decrease the waittime below timeout_blocktime */
2038 if (expect_false (waittime < timeout_blocktime)) 2334 if (expect_false (waittime < timeout_blocktime))
2039 waittime = timeout_blocktime; 2335 waittime = timeout_blocktime;
2040 2336
2041 sleeptime = waittime - backend_fudge; 2337 /* extra check because io_blocktime is commonly 0 */
2042
2043 if (expect_true (sleeptime > io_blocktime)) 2338 if (expect_false (io_blocktime))
2044 sleeptime = io_blocktime;
2045
2046 if (sleeptime)
2047 { 2339 {
2340 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2341
2342 if (sleeptime > waittime - backend_fudge)
2343 sleeptime = waittime - backend_fudge;
2344
2345 if (expect_true (sleeptime > 0.))
2346 {
2048 ev_sleep (sleeptime); 2347 ev_sleep (sleeptime);
2049 waittime -= sleeptime; 2348 waittime -= sleeptime;
2349 }
2050 } 2350 }
2051 } 2351 }
2052 2352
2353#if EV_MINIMAL < 2
2053 ++loop_count; 2354 ++loop_count;
2355#endif
2356 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2054 backend_poll (EV_A_ waittime); 2357 backend_poll (EV_A_ waittime);
2358 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2055 2359
2056 /* update ev_rt_now, do magic */ 2360 /* update ev_rt_now, do magic */
2057 time_update (EV_A_ waittime + sleeptime); 2361 time_update (EV_A_ waittime + sleeptime);
2058 } 2362 }
2059 2363
… …
2070 2374
2071 /* queue check watchers, to be executed first */ 2375 /* queue check watchers, to be executed first */
2072 if (expect_false (checkcnt)) 2376 if (expect_false (checkcnt))
2073 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2377 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2074 2378
2075 call_pending (EV_A); 2379 EV_INVOKE_PENDING;
2076 } 2380 }
2077 while (expect_true ( 2381 while (expect_true (
2078 activecnt 2382 activecnt
2079 && !loop_done 2383 && !loop_done
2080 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2384 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2081 )); 2385 ));
2082 2386
2083 if (loop_done == EVUNLOOP_ONE) 2387 if (loop_done == EVUNLOOP_ONE)
2084 loop_done = EVUNLOOP_CANCEL; 2388 loop_done = EVUNLOOP_CANCEL;
2389
2390#if EV_MINIMAL < 2
2391 --loop_depth;
2392#endif
2085} 2393}
2086 2394
2087void 2395void
2088ev_unloop (EV_P_ int how) 2396ev_unloop (EV_P_ int how)
2089{ 2397{
2090 loop_done = how; 2398 loop_done = how;
2091} 2399}
2092 2400
2401void
2402ev_ref (EV_P)
2403{
2404 ++activecnt;
2405}
2406
2407void
2408ev_unref (EV_P)
2409{
2410 --activecnt;
2411}
2412
2413void
2414ev_now_update (EV_P)
2415{
2416 time_update (EV_A_ 1e100);
2417}
2418
2419void
2420ev_suspend (EV_P)
2421{
2422 ev_now_update (EV_A);
2423}
2424
2425void
2426ev_resume (EV_P)
2427{
2428 ev_tstamp mn_prev = mn_now;
2429
2430 ev_now_update (EV_A);
2431 timers_reschedule (EV_A_ mn_now - mn_prev);
2432#if EV_PERIODIC_ENABLE
2433 /* TODO: really do this? */
2434 periodics_reschedule (EV_A);
2435#endif
2436}
2437
2093/*****************************************************************************/ 2438/*****************************************************************************/
2439/* singly-linked list management, used when the expected list length is short */
2094 2440
2095void inline_size 2441inline_size void
2096wlist_add (WL *head, WL elem) 2442wlist_add (WL *head, WL elem)
2097{ 2443{
2098 elem->next = *head; 2444 elem->next = *head;
2099 *head = elem; 2445 *head = elem;
2100} 2446}
2101 2447
2102void inline_size 2448inline_size void
2103wlist_del (WL *head, WL elem) 2449wlist_del (WL *head, WL elem)
2104{ 2450{
2105 while (*head) 2451 while (*head)
2106 { 2452 {
2107 if (*head == elem) 2453 if (expect_true (*head == elem))
2108 { 2454 {
2109 *head = elem->next; 2455 *head = elem->next;
2110 return; 2456 break;
2111 } 2457 }
2112 2458
2113 head = &(*head)->next; 2459 head = &(*head)->next;
2114 } 2460 }
2115} 2461}
2116 2462
2117void inline_speed 2463/* internal, faster, version of ev_clear_pending */
2464inline_speed void
2118clear_pending (EV_P_ W w) 2465clear_pending (EV_P_ W w)
2119{ 2466{
2120 if (w->pending) 2467 if (w->pending)
2121 { 2468 {
2122 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2469 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2123 w->pending = 0; 2470 w->pending = 0;
2124 } 2471 }
2125} 2472}
2126 2473
2127int 2474int
… …
2131 int pending = w_->pending; 2478 int pending = w_->pending;
2132 2479
2133 if (expect_true (pending)) 2480 if (expect_true (pending))
2134 { 2481 {
2135 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2482 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2483 p->w = (W)&pending_w;
2136 w_->pending = 0; 2484 w_->pending = 0;
2137 p->w = 0;
2138 return p->events; 2485 return p->events;
2139 } 2486 }
2140 else 2487 else
2141 return 0; 2488 return 0;
2142} 2489}
2143 2490
2144void inline_size 2491inline_size void
2145pri_adjust (EV_P_ W w) 2492pri_adjust (EV_P_ W w)
2146{ 2493{
2147 int pri = w->priority; 2494 int pri = ev_priority (w);
2148 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2495 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2149 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2496 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2150 w->priority = pri; 2497 ev_set_priority (w, pri);
2151} 2498}
2152 2499
2153void inline_speed 2500inline_speed void
2154ev_start (EV_P_ W w, int active) 2501ev_start (EV_P_ W w, int active)
2155{ 2502{
2156 pri_adjust (EV_A_ w); 2503 pri_adjust (EV_A_ w);
2157 w->active = active; 2504 w->active = active;
2158 ev_ref (EV_A); 2505 ev_ref (EV_A);
2159} 2506}
2160 2507
2161void inline_size 2508inline_size void
2162ev_stop (EV_P_ W w) 2509ev_stop (EV_P_ W w)
2163{ 2510{
2164 ev_unref (EV_A); 2511 ev_unref (EV_A);
2165 w->active = 0; 2512 w->active = 0;
2166} 2513}
… …
2174 2521
2175 if (expect_false (ev_is_active (w))) 2522 if (expect_false (ev_is_active (w)))
2176 return; 2523 return;
2177 2524
2178 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2525 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2179 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE)))); 2526 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2180 2527
2181 EV_FREQUENT_CHECK; 2528 EV_FREQUENT_CHECK;
2182 2529
2183 ev_start (EV_A_ (W)w, 1); 2530 ev_start (EV_A_ (W)w, 1);
2184 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2531 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2185 wlist_add (&anfds[fd].head, (WL)w); 2532 wlist_add (&anfds[fd].head, (WL)w);
2186 2533
2187 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2534 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2188 w->events &= ~EV_IOFDSET; 2535 w->events &= ~EV__IOFDSET;
2189 2536
2190 EV_FREQUENT_CHECK; 2537 EV_FREQUENT_CHECK;
2191} 2538}
2192 2539
2193void noinline 2540void noinline
… …
2254 timers [active] = timers [timercnt + HEAP0]; 2601 timers [active] = timers [timercnt + HEAP0];
2255 adjustheap (timers, timercnt, active); 2602 adjustheap (timers, timercnt, active);
2256 } 2603 }
2257 } 2604 }
2258 2605
2259 EV_FREQUENT_CHECK;
2260
2261 ev_at (w) -= mn_now; 2606 ev_at (w) -= mn_now;
2262 2607
2263 ev_stop (EV_A_ (W)w); 2608 ev_stop (EV_A_ (W)w);
2609
2610 EV_FREQUENT_CHECK;
2264} 2611}
2265 2612
2266void noinline 2613void noinline
2267ev_timer_again (EV_P_ ev_timer *w) 2614ev_timer_again (EV_P_ ev_timer *w)
2268{ 2615{
… …
2286 } 2633 }
2287 2634
2288 EV_FREQUENT_CHECK; 2635 EV_FREQUENT_CHECK;
2289} 2636}
2290 2637
2638ev_tstamp
2639ev_timer_remaining (EV_P_ ev_timer *w)
2640{
2641 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2642}
2643
2291#if EV_PERIODIC_ENABLE 2644#if EV_PERIODIC_ENABLE
2292void noinline 2645void noinline
2293ev_periodic_start (EV_P_ ev_periodic *w) 2646ev_periodic_start (EV_P_ ev_periodic *w)
2294{ 2647{
2295 if (expect_false (ev_is_active (w))) 2648 if (expect_false (ev_is_active (w)))
… …
2341 periodics [active] = periodics [periodiccnt + HEAP0]; 2694 periodics [active] = periodics [periodiccnt + HEAP0];
2342 adjustheap (periodics, periodiccnt, active); 2695 adjustheap (periodics, periodiccnt, active);
2343 } 2696 }
2344 } 2697 }
2345 2698
2346 EV_FREQUENT_CHECK;
2347
2348 ev_stop (EV_A_ (W)w); 2699 ev_stop (EV_A_ (W)w);
2700
2701 EV_FREQUENT_CHECK;
2349} 2702}
2350 2703
2351void noinline 2704void noinline
2352ev_periodic_again (EV_P_ ev_periodic *w) 2705ev_periodic_again (EV_P_ ev_periodic *w)
2353{ 2706{
… …
2362#endif 2715#endif
2363 2716
2364void noinline 2717void noinline
2365ev_signal_start (EV_P_ ev_signal *w) 2718ev_signal_start (EV_P_ ev_signal *w)
2366{ 2719{
2367#if EV_MULTIPLICITY
2368 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2369#endif
2370 if (expect_false (ev_is_active (w))) 2720 if (expect_false (ev_is_active (w)))
2371 return; 2721 return;
2372 2722
2373 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2723 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2374 2724
2375 evpipe_init (EV_A); 2725#if EV_MULTIPLICITY
2726 assert (("libev: a signal must not be attached to two different loops",
2727 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2376 2728
2377 EV_FREQUENT_CHECK; 2729 signals [w->signum - 1].loop = EV_A;
2730#endif
2378 2731
2732 EV_FREQUENT_CHECK;
2733
2734#if EV_USE_SIGNALFD
2735 if (sigfd == -2)
2379 { 2736 {
2380#ifndef _WIN32 2737 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2381 sigset_t full, prev; 2738 if (sigfd < 0 && errno == EINVAL)
2382 sigfillset (&full); 2739 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2383 sigprocmask (SIG_SETMASK, &full, &prev);
2384#endif
2385 2740
2386 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2741 if (sigfd >= 0)
2742 {
2743 fd_intern (sigfd); /* doing it twice will not hurt */
2387 2744
2388#ifndef _WIN32 2745 sigemptyset (&sigfd_set);
2389 sigprocmask (SIG_SETMASK, &prev, 0); 2746
2390#endif 2747 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2748 ev_set_priority (&sigfd_w, EV_MAXPRI);
2749 ev_io_start (EV_A_ &sigfd_w);
2750 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2751 }
2391 } 2752 }
2753
2754 if (sigfd >= 0)
2755 {
2756 /* TODO: check .head */
2757 sigaddset (&sigfd_set, w->signum);
2758 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2759
2760 signalfd (sigfd, &sigfd_set, 0);
2761 }
2762#endif
2392 2763
2393 ev_start (EV_A_ (W)w, 1); 2764 ev_start (EV_A_ (W)w, 1);
2394 wlist_add (&signals [w->signum - 1].head, (WL)w); 2765 wlist_add (&signals [w->signum - 1].head, (WL)w);
2395 2766
2396 if (!((WL)w)->next) 2767 if (!((WL)w)->next)
2768# if EV_USE_SIGNALFD
2769 if (sigfd < 0) /*TODO*/
2770# endif
2397 { 2771 {
2398#if _WIN32 2772# ifdef _WIN32
2773 evpipe_init (EV_A);
2774
2399 signal (w->signum, ev_sighandler); 2775 signal (w->signum, ev_sighandler);
2400#else 2776# else
2401 struct sigaction sa; 2777 struct sigaction sa;
2778
2779 evpipe_init (EV_A);
2780
2402 sa.sa_handler = ev_sighandler; 2781 sa.sa_handler = ev_sighandler;
2403 sigfillset (&sa.sa_mask); 2782 sigfillset (&sa.sa_mask);
2404 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2783 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2405 sigaction (w->signum, &sa, 0); 2784 sigaction (w->signum, &sa, 0);
2785
2786 sigemptyset (&sa.sa_mask);
2787 sigaddset (&sa.sa_mask, w->signum);
2788 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2406#endif 2789#endif
2407 } 2790 }
2408 2791
2409 EV_FREQUENT_CHECK; 2792 EV_FREQUENT_CHECK;
2410} 2793}
2411 2794
2412void noinline 2795void noinline
… …
2420 2803
2421 wlist_del (&signals [w->signum - 1].head, (WL)w); 2804 wlist_del (&signals [w->signum - 1].head, (WL)w);
2422 ev_stop (EV_A_ (W)w); 2805 ev_stop (EV_A_ (W)w);
2423 2806
2424 if (!signals [w->signum - 1].head) 2807 if (!signals [w->signum - 1].head)
2808 {
2809#if EV_MULTIPLICITY
2810 signals [w->signum - 1].loop = 0; /* unattach from signal */
2811#endif
2812#if EV_USE_SIGNALFD
2813 if (sigfd >= 0)
2814 {
2815 sigset_t ss;
2816
2817 sigemptyset (&ss);
2818 sigaddset (&ss, w->signum);
2819 sigdelset (&sigfd_set, w->signum);
2820
2821 signalfd (sigfd, &sigfd_set, 0);
2822 sigprocmask (SIG_UNBLOCK, &ss, 0);
2823 }
2824 else
2825#endif
2425 signal (w->signum, SIG_DFL); 2826 signal (w->signum, SIG_DFL);
2827 }
2426 2828
2427 EV_FREQUENT_CHECK; 2829 EV_FREQUENT_CHECK;
2428} 2830}
2429 2831
2430void 2832void
… …
2471#define MIN_STAT_INTERVAL 0.1074891 2873#define MIN_STAT_INTERVAL 0.1074891
2472 2874
2473static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2875static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2474 2876
2475#if EV_USE_INOTIFY 2877#if EV_USE_INOTIFY
2476# define EV_INOTIFY_BUFSIZE 8192 2878
2879/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2880# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2477 2881
2478static void noinline 2882static void noinline
2479infy_add (EV_P_ ev_stat *w) 2883infy_add (EV_P_ ev_stat *w)
2480{ 2884{
2481 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); 2885 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);
2482 2886
2483 if (w->wd < 0) 2887 if (w->wd >= 0)
2888 {
2889 struct statfs sfs;
2890
2891 /* now local changes will be tracked by inotify, but remote changes won't */
2892 /* unless the filesystem is known to be local, we therefore still poll */
2893 /* also do poll on <2.6.25, but with normal frequency */
2894
2895 if (!fs_2625)
2896 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2897 else if (!statfs (w->path, &sfs)
2898 && (sfs.f_type == 0x1373 /* devfs */
2899 || sfs.f_type == 0xEF53 /* ext2/3 */
2900 || sfs.f_type == 0x3153464a /* jfs */
2901 || sfs.f_type == 0x52654973 /* reiser3 */
2902 || sfs.f_type == 0x01021994 /* tempfs */
2903 || sfs.f_type == 0x58465342 /* xfs */))
2904 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2905 else
2906 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2484 { 2907 }
2908 else
2909 {
2910 /* can't use inotify, continue to stat */
2485 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2911 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2486 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2487 2912
2488 /* monitor some parent directory for speedup hints */ 2913 /* if path is not there, monitor some parent directory for speedup hints */
2489 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2914 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2490 /* but an efficiency issue only */ 2915 /* but an efficiency issue only */
2491 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2916 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2492 { 2917 {
2493 char path [4096]; 2918 char path [4096];
… …
2509 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2934 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2510 } 2935 }
2511 } 2936 }
2512 2937
2513 if (w->wd >= 0) 2938 if (w->wd >= 0)
2514 {
2515 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2939 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2516 2940
2517 /* now local changes will be tracked by inotify, but remote changes won't */ 2941 /* now re-arm timer, if required */
2518 /* unless the filesystem it known to be local, we therefore still poll */ 2942 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2519 /* also do poll on <2.6.25, but with normal frequency */
2520 struct statfs sfs;
2521
2522 if (fs_2625 && !statfs (w->path, &sfs))
2523 if (sfs.f_type == 0x1373 /* devfs */
2524 || sfs.f_type == 0xEF53 /* ext2/3 */
2525 || sfs.f_type == 0x3153464a /* jfs */
2526 || sfs.f_type == 0x52654973 /* reiser3 */
2527 || sfs.f_type == 0x01021994 /* tempfs */
2528 || sfs.f_type == 0x58465342 /* xfs */)
2529 return;
2530
2531 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2532 ev_timer_again (EV_A_ &w->timer); 2943 ev_timer_again (EV_A_ &w->timer);
2533 } 2944 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2534} 2945}
2535 2946
2536static void noinline 2947static void noinline
2537infy_del (EV_P_ ev_stat *w) 2948infy_del (EV_P_ ev_stat *w)
2538{ 2949{
… …
2583 2994
2584static void 2995static void
2585infy_cb (EV_P_ ev_io *w, int revents) 2996infy_cb (EV_P_ ev_io *w, int revents)
2586{ 2997{
2587 char buf [EV_INOTIFY_BUFSIZE]; 2998 char buf [EV_INOTIFY_BUFSIZE];
2588 struct inotify_event *ev = (struct inotify_event *)buf;
2589 int ofs; 2999 int ofs;
2590 int len = read (fs_fd, buf, sizeof (buf)); 3000 int len = read (fs_fd, buf, sizeof (buf));
2591 3001
2592 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3002 for (ofs = 0; ofs < len; )
3003 {
3004 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2593 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3005 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3006 ofs += sizeof (struct inotify_event) + ev->len;
3007 }
2594} 3008}
2595 3009
2596void inline_size 3010inline_size unsigned int
3011ev_linux_version (void)
3012{
3013 struct utsname buf;
3014 unsigned int v;
3015 int i;
3016 char *p = buf.release;
3017
3018 if (uname (&buf))
3019 return 0;
3020
3021 for (i = 3+1; --i; )
3022 {
3023 unsigned int c = 0;
3024
3025 for (;;)
3026 {
3027 if (*p >= '0' && *p <= '9')
3028 c = c * 10 + *p++ - '0';
3029 else
3030 {
3031 p += *p == '.';
3032 break;
3033 }
3034 }
3035
3036 v = (v << 8) | c;
3037 }
3038
3039 return v;
3040}
3041
3042inline_size void
2597check_2625 (EV_P) 3043ev_check_2625 (EV_P)
2598{ 3044{
2599 /* kernels < 2.6.25 are borked 3045 /* kernels < 2.6.25 are borked
2600 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3046 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2601 */ 3047 */
2602 struct utsname buf; 3048 if (ev_linux_version () < 0x020619)
2603 int major, minor, micro;
2604
2605 if (uname (&buf))
2606 return; 3049 return;
2607 3050
2608 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2609 return;
2610
2611 if (major < 2
2612 || (major == 2 && minor < 6)
2613 || (major == 2 && minor == 6 && micro < 25))
2614 return;
2615
2616 fs_2625 = 1; 3051 fs_2625 = 1;
2617} 3052}
2618 3053
2619void inline_size 3054inline_size int
3055infy_newfd (void)
3056{
3057#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3058 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3059 if (fd >= 0)
3060 return fd;
3061#endif
3062 return inotify_init ();
3063}
3064
3065inline_size void
2620infy_init (EV_P) 3066infy_init (EV_P)
2621{ 3067{
2622 if (fs_fd != -2) 3068 if (fs_fd != -2)
2623 return; 3069 return;
2624 3070
2625 fs_fd = -1; 3071 fs_fd = -1;
2626 3072
2627 check_2625 (EV_A); 3073 ev_check_2625 (EV_A);
2628 3074
2629 fs_fd = inotify_init (); 3075 fs_fd = infy_newfd ();
2630 3076
2631 if (fs_fd >= 0) 3077 if (fs_fd >= 0)
2632 { 3078 {
3079 fd_intern (fs_fd);
2633 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3080 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2634 ev_set_priority (&fs_w, EV_MAXPRI); 3081 ev_set_priority (&fs_w, EV_MAXPRI);
2635 ev_io_start (EV_A_ &fs_w); 3082 ev_io_start (EV_A_ &fs_w);
3083 ev_unref (EV_A);
2636 } 3084 }
2637} 3085}
2638 3086
2639void inline_size 3087inline_size void
2640infy_fork (EV_P) 3088infy_fork (EV_P)
2641{ 3089{
2642 int slot; 3090 int slot;
2643 3091
2644 if (fs_fd < 0) 3092 if (fs_fd < 0)
2645 return; 3093 return;
2646 3094
3095 ev_ref (EV_A);
3096 ev_io_stop (EV_A_ &fs_w);
2647 close (fs_fd); 3097 close (fs_fd);
2648 fs_fd = inotify_init (); 3098 fs_fd = infy_newfd ();
3099
3100 if (fs_fd >= 0)
3101 {
3102 fd_intern (fs_fd);
3103 ev_io_set (&fs_w, fs_fd, EV_READ);
3104 ev_io_start (EV_A_ &fs_w);
3105 ev_unref (EV_A);
3106 }
2649 3107
2650 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3108 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2651 { 3109 {
2652 WL w_ = fs_hash [slot].head; 3110 WL w_ = fs_hash [slot].head;
2653 fs_hash [slot].head = 0; 3111 fs_hash [slot].head = 0;
… …
2660 w->wd = -1; 3118 w->wd = -1;
2661 3119
2662 if (fs_fd >= 0) 3120 if (fs_fd >= 0)
2663 infy_add (EV_A_ w); /* re-add, no matter what */ 3121 infy_add (EV_A_ w); /* re-add, no matter what */
2664 else 3122 else
3123 {
3124 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3125 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2665 ev_timer_again (EV_A_ &w->timer); 3126 ev_timer_again (EV_A_ &w->timer);
3127 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3128 }
2666 } 3129 }
2667 } 3130 }
2668} 3131}
2669 3132
2670#endif 3133#endif
… …
2687static void noinline 3150static void noinline
2688stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3151stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2689{ 3152{
2690 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3153 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2691 3154
2692 /* we copy this here each the time so that */ 3155 ev_statdata prev = w->attr;
2693 /* prev has the old value when the callback gets invoked */
2694 w->prev = w->attr;
2695 ev_stat_stat (EV_A_ w); 3156 ev_stat_stat (EV_A_ w);
2696 3157
2697 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3158 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2698 if ( 3159 if (
2699 w->prev.st_dev != w->attr.st_dev 3160 prev.st_dev != w->attr.st_dev
2700 || w->prev.st_ino != w->attr.st_ino 3161 || prev.st_ino != w->attr.st_ino
2701 || w->prev.st_mode != w->attr.st_mode 3162 || prev.st_mode != w->attr.st_mode
2702 || w->prev.st_nlink != w->attr.st_nlink 3163 || prev.st_nlink != w->attr.st_nlink
2703 || w->prev.st_uid != w->attr.st_uid 3164 || prev.st_uid != w->attr.st_uid
2704 || w->prev.st_gid != w->attr.st_gid 3165 || prev.st_gid != w->attr.st_gid
2705 || w->prev.st_rdev != w->attr.st_rdev 3166 || prev.st_rdev != w->attr.st_rdev
2706 || w->prev.st_size != w->attr.st_size 3167 || prev.st_size != w->attr.st_size
2707 || w->prev.st_atime != w->attr.st_atime 3168 || prev.st_atime != w->attr.st_atime
2708 || w->prev.st_mtime != w->attr.st_mtime 3169 || prev.st_mtime != w->attr.st_mtime
2709 || w->prev.st_ctime != w->attr.st_ctime 3170 || prev.st_ctime != w->attr.st_ctime
2710 ) { 3171 ) {
3172 /* we only update w->prev on actual differences */
3173 /* in case we test more often than invoke the callback, */
3174 /* to ensure that prev is always different to attr */
3175 w->prev = prev;
3176
2711 #if EV_USE_INOTIFY 3177 #if EV_USE_INOTIFY
2712 if (fs_fd >= 0) 3178 if (fs_fd >= 0)
2713 { 3179 {
2714 infy_del (EV_A_ w); 3180 infy_del (EV_A_ w);
2715 infy_add (EV_A_ w); 3181 infy_add (EV_A_ w);
… …
2740 3206
2741 if (fs_fd >= 0) 3207 if (fs_fd >= 0)
2742 infy_add (EV_A_ w); 3208 infy_add (EV_A_ w);
2743 else 3209 else
2744#endif 3210#endif
3211 {
2745 ev_timer_again (EV_A_ &w->timer); 3212 ev_timer_again (EV_A_ &w->timer);
3213 ev_unref (EV_A);
3214 }
2746 3215
2747 ev_start (EV_A_ (W)w, 1); 3216 ev_start (EV_A_ (W)w, 1);
2748 3217
2749 EV_FREQUENT_CHECK; 3218 EV_FREQUENT_CHECK;
2750} 3219}
… …
2759 EV_FREQUENT_CHECK; 3228 EV_FREQUENT_CHECK;
2760 3229
2761#if EV_USE_INOTIFY 3230#if EV_USE_INOTIFY
2762 infy_del (EV_A_ w); 3231 infy_del (EV_A_ w);
2763#endif 3232#endif
3233
3234 if (ev_is_active (&w->timer))
3235 {
3236 ev_ref (EV_A);
2764 ev_timer_stop (EV_A_ &w->timer); 3237 ev_timer_stop (EV_A_ &w->timer);
3238 }
2765 3239
2766 ev_stop (EV_A_ (W)w); 3240 ev_stop (EV_A_ (W)w);
2767 3241
2768 EV_FREQUENT_CHECK; 3242 EV_FREQUENT_CHECK;
2769} 3243}
… …
2910embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3384embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2911{ 3385{
2912 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3386 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2913 3387
2914 { 3388 {
2915 struct ev_loop *loop = w->other; 3389 EV_P = w->other;
2916 3390
2917 while (fdchangecnt) 3391 while (fdchangecnt)
2918 { 3392 {
2919 fd_reify (EV_A); 3393 fd_reify (EV_A);
2920 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3394 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2928 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3402 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2929 3403
2930 ev_embed_stop (EV_A_ w); 3404 ev_embed_stop (EV_A_ w);
2931 3405
2932 { 3406 {
2933 struct ev_loop *loop = w->other; 3407 EV_P = w->other;
2934 3408
2935 ev_loop_fork (EV_A); 3409 ev_loop_fork (EV_A);
2936 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3410 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2937 } 3411 }
2938 3412
… …
2952{ 3426{
2953 if (expect_false (ev_is_active (w))) 3427 if (expect_false (ev_is_active (w)))
2954 return; 3428 return;
2955 3429
2956 { 3430 {
2957 struct ev_loop *loop = w->other; 3431 EV_P = w->other;
2958 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3432 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2959 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3433 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2960 } 3434 }
2961 3435
2962 EV_FREQUENT_CHECK; 3436 EV_FREQUENT_CHECK;
… …
2989 3463
2990 ev_io_stop (EV_A_ &w->io); 3464 ev_io_stop (EV_A_ &w->io);
2991 ev_prepare_stop (EV_A_ &w->prepare); 3465 ev_prepare_stop (EV_A_ &w->prepare);
2992 ev_fork_stop (EV_A_ &w->fork); 3466 ev_fork_stop (EV_A_ &w->fork);
2993 3467
3468 ev_stop (EV_A_ (W)w);
3469
2994 EV_FREQUENT_CHECK; 3470 EV_FREQUENT_CHECK;
2995} 3471}
2996#endif 3472#endif
2997 3473
2998#if EV_FORK_ENABLE 3474#if EV_FORK_ENABLE
… …
3074 3550
3075void 3551void
3076ev_async_send (EV_P_ ev_async *w) 3552ev_async_send (EV_P_ ev_async *w)
3077{ 3553{
3078 w->sent = 1; 3554 w->sent = 1;
3079 evpipe_write (EV_A_ &gotasync); 3555 evpipe_write (EV_A_ &async_pending);
3080} 3556}
3081#endif 3557#endif
3082 3558
3083/*****************************************************************************/ 3559/*****************************************************************************/
3084 3560
… …
3146 ev_timer_set (&once->to, timeout, 0.); 3622 ev_timer_set (&once->to, timeout, 0.);
3147 ev_timer_start (EV_A_ &once->to); 3623 ev_timer_start (EV_A_ &once->to);
3148 } 3624 }
3149} 3625}
3150 3626
3627/*****************************************************************************/
3628
3629#if EV_WALK_ENABLE
3630void
3631ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3632{
3633 int i, j;
3634 ev_watcher_list *wl, *wn;
3635
3636 if (types & (EV_IO | EV_EMBED))
3637 for (i = 0; i < anfdmax; ++i)
3638 for (wl = anfds [i].head; wl; )
3639 {
3640 wn = wl->next;
3641
3642#if EV_EMBED_ENABLE
3643 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3644 {
3645 if (types & EV_EMBED)
3646 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3647 }
3648 else
3649#endif
3650#if EV_USE_INOTIFY
3651 if (ev_cb ((ev_io *)wl) == infy_cb)
3652 ;
3653 else
3654#endif
3655 if ((ev_io *)wl != &pipe_w)
3656 if (types & EV_IO)
3657 cb (EV_A_ EV_IO, wl);
3658
3659 wl = wn;
3660 }
3661
3662 if (types & (EV_TIMER | EV_STAT))
3663 for (i = timercnt + HEAP0; i-- > HEAP0; )
3664#if EV_STAT_ENABLE
3665 /*TODO: timer is not always active*/
3666 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3667 {
3668 if (types & EV_STAT)
3669 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3670 }
3671 else
3672#endif
3673 if (types & EV_TIMER)
3674 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3675
3676#if EV_PERIODIC_ENABLE
3677 if (types & EV_PERIODIC)
3678 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3679 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3680#endif
3681
3682#if EV_IDLE_ENABLE
3683 if (types & EV_IDLE)
3684 for (j = NUMPRI; i--; )
3685 for (i = idlecnt [j]; i--; )
3686 cb (EV_A_ EV_IDLE, idles [j][i]);
3687#endif
3688
3689#if EV_FORK_ENABLE
3690 if (types & EV_FORK)
3691 for (i = forkcnt; i--; )
3692 if (ev_cb (forks [i]) != embed_fork_cb)
3693 cb (EV_A_ EV_FORK, forks [i]);
3694#endif
3695
3696#if EV_ASYNC_ENABLE
3697 if (types & EV_ASYNC)
3698 for (i = asynccnt; i--; )
3699 cb (EV_A_ EV_ASYNC, asyncs [i]);
3700#endif
3701
3702 if (types & EV_PREPARE)
3703 for (i = preparecnt; i--; )
3704#if EV_EMBED_ENABLE
3705 if (ev_cb (prepares [i]) != embed_prepare_cb)
3706#endif
3707 cb (EV_A_ EV_PREPARE, prepares [i]);
3708
3709 if (types & EV_CHECK)
3710 for (i = checkcnt; i--; )
3711 cb (EV_A_ EV_CHECK, checks [i]);
3712
3713 if (types & EV_SIGNAL)
3714 for (i = 0; i < EV_NSIG - 1; ++i)
3715 for (wl = signals [i].head; wl; )
3716 {
3717 wn = wl->next;
3718 cb (EV_A_ EV_SIGNAL, wl);
3719 wl = wn;
3720 }
3721
3722 if (types & EV_CHILD)
3723 for (i = EV_PID_HASHSIZE; i--; )
3724 for (wl = childs [i]; wl; )
3725 {
3726 wn = wl->next;
3727 cb (EV_A_ EV_CHILD, wl);
3728 wl = wn;
3729 }
3730/* EV_STAT 0x00001000 /* stat data changed */
3731/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3732}
3733#endif
3734
3151#if EV_MULTIPLICITY 3735#if EV_MULTIPLICITY
3152 #include "ev_wrap.h" 3736 #include "ev_wrap.h"
3153#endif 3737#endif
3154 3738
3155#ifdef __cplusplus 3739#ifdef __cplusplus

Diff Legend

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