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

Comparing libev/ev.c (file contents):
Revision 1.273 by root, Mon Nov 3 14:27:06 2008 UTC vs.
Revision 1.306 by root, Sun Jul 19 06:35:25 2009 UTC

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

Diff Legend

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