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

Comparing libev/ev.c (file contents):
Revision 1.272 by root, Mon Nov 3 12:17:40 2008 UTC vs.
Revision 1.313 by root, Wed Aug 19 23:44:51 2009 UTC

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

Diff Legend

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