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

Comparing libev/ev.c (file contents):
Revision 1.271 by root, Mon Nov 3 12:13:15 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
… …
260# define EV_USE_4HEAP !EV_MINIMAL 325# define EV_USE_4HEAP !EV_MINIMAL
261#endif 326#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
330#endif
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
265#endif 344#endif
266 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
… …
303#endif 382#endif
304 383
305#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
306/* 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 */
307# 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
308# ifdef __cplusplus 397# ifdef __cplusplus
309extern "C" { 398extern "C" {
310# endif 399# endif
311int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
312# ifdef __cplusplus 401# ifdef __cplusplus
313} 402}
314# endif 403# endif
404#endif
405
406#if EV_USE_SIGNALFD
407# include <sys/signalfd.h>
315#endif 408#endif
316 409
317/**/ 410/**/
318 411
319#if EV_VERIFY >= 3 412#if EV_VERIFY >= 3
… …
355# define inline_speed static noinline 448# define inline_speed static noinline
356#else 449#else
357# define inline_speed static inline 450# define inline_speed static inline
358#endif 451#endif
359 452
360#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
361#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 458# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
459#endif
362 460
363#define EMPTY /* required for microsofts broken pseudo-c compiler */ 461#define EMPTY /* required for microsofts broken pseudo-c compiler */
364#define EMPTY2(a,b) /* used to suppress some warnings */ 462#define EMPTY2(a,b) /* used to suppress some warnings */
365 463
366typedef ev_watcher *W; 464typedef ev_watcher *W;
… …
368typedef ev_watcher_time *WT; 466typedef ev_watcher_time *WT;
369 467
370#define ev_active(w) ((W)(w))->active 468#define ev_active(w) ((W)(w))->active
371#define ev_at(w) ((WT)(w))->at 469#define ev_at(w) ((WT)(w))->at
372 470
373#if EV_USE_MONOTONIC 471#if EV_USE_REALTIME
374/* 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 */
375/* 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
376static 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)
377#endif 489#endif
378 490
379#ifdef _WIN32 491#ifdef _WIN32
380# include "ev_win32.c" 492# include "ev_win32.c"
381#endif 493#endif
… …
445#define ev_malloc(size) ev_realloc (0, (size)) 557#define ev_malloc(size) ev_realloc (0, (size))
446#define ev_free(ptr) ev_realloc ((ptr), 0) 558#define ev_free(ptr) ev_realloc ((ptr), 0)
447 559
448/*****************************************************************************/ 560/*****************************************************************************/
449 561
562/* set in reify when reification needed */
563#define EV_ANFD_REIFY 1
564
565/* file descriptor info structure */
450typedef struct 566typedef struct
451{ 567{
452 WL head; 568 WL head;
453 unsigned char events; 569 unsigned char events; /* the events watched for */
454 unsigned char reify; 570 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 */ 571 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
456 unsigned char unused; 572 unsigned char unused;
457#if EV_USE_EPOLL 573#if EV_USE_EPOLL
458 unsigned int egen; /* generation counter to counter epoll bugs */ 574 unsigned int egen; /* generation counter to counter epoll bugs */
459#endif 575#endif
460#if EV_SELECT_IS_WINSOCKET 576#if EV_SELECT_IS_WINSOCKET
461 SOCKET handle; 577 SOCKET handle;
462#endif 578#endif
463} ANFD; 579} ANFD;
464 580
581/* stores the pending event set for a given watcher */
465typedef struct 582typedef struct
466{ 583{
467 W w; 584 W w;
468 int events; 585 int events; /* the pending event set for the given watcher */
469} ANPENDING; 586} ANPENDING;
470 587
471#if EV_USE_INOTIFY 588#if EV_USE_INOTIFY
472/* hash table entry per inotify-id */ 589/* hash table entry per inotify-id */
473typedef struct 590typedef struct
… …
476} ANFS; 593} ANFS;
477#endif 594#endif
478 595
479/* Heap Entry */ 596/* Heap Entry */
480#if EV_HEAP_CACHE_AT 597#if EV_HEAP_CACHE_AT
598 /* a heap element */
481 typedef struct { 599 typedef struct {
482 ev_tstamp at; 600 ev_tstamp at;
483 WT w; 601 WT w;
484 } ANHE; 602 } ANHE;
485 603
486 #define ANHE_w(he) (he).w /* access watcher, read-write */ 604 #define ANHE_w(he) (he).w /* access watcher, read-write */
487 #define ANHE_at(he) (he).at /* access cached at, read-only */ 605 #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 */ 606 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
489#else 607#else
608 /* a heap element */
490 typedef WT ANHE; 609 typedef WT ANHE;
491 610
492 #define ANHE_w(he) (he) 611 #define ANHE_w(he) (he)
493 #define ANHE_at(he) (he)->at 612 #define ANHE_at(he) (he)->at
494 #define ANHE_at_cache(he) 613 #define ANHE_at_cache(he)
… …
518 637
519 static int ev_default_loop_ptr; 638 static int ev_default_loop_ptr;
520 639
521#endif 640#endif
522 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
523/*****************************************************************************/ 654/*****************************************************************************/
524 655
656#ifndef EV_HAVE_EV_TIME
525ev_tstamp 657ev_tstamp
526ev_time (void) 658ev_time (void)
527{ 659{
528#if EV_USE_REALTIME 660#if EV_USE_REALTIME
661 if (expect_true (have_realtime))
662 {
529 struct timespec ts; 663 struct timespec ts;
530 clock_gettime (CLOCK_REALTIME, &ts); 664 clock_gettime (CLOCK_REALTIME, &ts);
531 return ts.tv_sec + ts.tv_nsec * 1e-9; 665 return ts.tv_sec + ts.tv_nsec * 1e-9;
532#else 666 }
667#endif
668
533 struct timeval tv; 669 struct timeval tv;
534 gettimeofday (&tv, 0); 670 gettimeofday (&tv, 0);
535 return tv.tv_sec + tv.tv_usec * 1e-6; 671 return tv.tv_sec + tv.tv_usec * 1e-6;
536#endif
537} 672}
673#endif
538 674
539ev_tstamp inline_size 675inline_size ev_tstamp
540get_clock (void) 676get_clock (void)
541{ 677{
542#if EV_USE_MONOTONIC 678#if EV_USE_MONOTONIC
543 if (expect_true (have_monotonic)) 679 if (expect_true (have_monotonic))
544 { 680 {
… …
578 714
579 tv.tv_sec = (time_t)delay; 715 tv.tv_sec = (time_t)delay;
580 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 716 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
581 717
582 /* 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 */
583 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 719 /* something not guaranteed by newer posix versions, but guaranteed */
584 /* by older ones */ 720 /* by older ones */
585 select (0, 0, 0, 0, &tv); 721 select (0, 0, 0, 0, &tv);
586#endif 722#endif
587 } 723 }
588} 724}
589 725
590/*****************************************************************************/ 726/*****************************************************************************/
591 727
592#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 */
593 729
594int 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
595array_nextsize (int elem, int cur, int cnt) 733array_nextsize (int elem, int cur, int cnt)
596{ 734{
597 int ncur = cur + 1; 735 int ncur = cur + 1;
598 736
599 do 737 do
… …
640 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 778 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
641 } 779 }
642#endif 780#endif
643 781
644#define array_free(stem, idx) \ 782#define array_free(stem, idx) \
645 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
646 784
647/*****************************************************************************/ 785/*****************************************************************************/
786
787/* dummy callback for pending events */
788static void noinline
789pendingcb (EV_P_ ev_prepare *w, int revents)
790{
791}
648 792
649void noinline 793void noinline
650ev_feed_event (EV_P_ void *w, int revents) 794ev_feed_event (EV_P_ void *w, int revents)
651{ 795{
652 W w_ = (W)w; 796 W w_ = (W)w;
… …
661 pendings [pri][w_->pending - 1].w = w_; 805 pendings [pri][w_->pending - 1].w = w_;
662 pendings [pri][w_->pending - 1].events = revents; 806 pendings [pri][w_->pending - 1].events = revents;
663 } 807 }
664} 808}
665 809
666void 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
667queue_events (EV_P_ W *events, int eventcnt, int type) 826queue_events (EV_P_ W *events, int eventcnt, int type)
668{ 827{
669 int i; 828 int i;
670 829
671 for (i = 0; i < eventcnt; ++i) 830 for (i = 0; i < eventcnt; ++i)
672 ev_feed_event (EV_A_ events [i], type); 831 ev_feed_event (EV_A_ events [i], type);
673} 832}
674 833
675/*****************************************************************************/ 834/*****************************************************************************/
676 835
677void inline_speed 836inline_speed void
678fd_event (EV_P_ int fd, int revents) 837fd_event_nc (EV_P_ int fd, int revents)
679{ 838{
680 ANFD *anfd = anfds + fd; 839 ANFD *anfd = anfds + fd;
681 ev_io *w; 840 ev_io *w;
682 841
683 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)
… …
687 if (ev) 846 if (ev)
688 ev_feed_event (EV_A_ (W)w, ev); 847 ev_feed_event (EV_A_ (W)w, ev);
689 } 848 }
690} 849}
691 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
692void 862void
693ev_feed_fd_event (EV_P_ int fd, int revents) 863ev_feed_fd_event (EV_P_ int fd, int revents)
694{ 864{
695 if (fd >= 0 && fd < anfdmax) 865 if (fd >= 0 && fd < anfdmax)
696 fd_event (EV_A_ fd, revents); 866 fd_event_nc (EV_A_ fd, revents);
697} 867}
698 868
699void inline_size 869/* make sure the external fd watch events are in-sync */
870/* with the kernel/libev internal state */
871inline_size void
700fd_reify (EV_P) 872fd_reify (EV_P)
701{ 873{
702 int i; 874 int i;
703 875
704 for (i = 0; i < fdchangecnt; ++i) 876 for (i = 0; i < fdchangecnt; ++i)
… …
714 886
715#if EV_SELECT_IS_WINSOCKET 887#if EV_SELECT_IS_WINSOCKET
716 if (events) 888 if (events)
717 { 889 {
718 unsigned long arg; 890 unsigned long arg;
719 #ifdef EV_FD_TO_WIN32_HANDLE
720 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 891 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
721 #else
722 anfd->handle = _get_osfhandle (fd);
723 #endif
724 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));
725 } 893 }
726#endif 894#endif
727 895
728 { 896 {
729 unsigned char o_events = anfd->events; 897 unsigned char o_events = anfd->events;
730 unsigned char o_reify = anfd->reify; 898 unsigned char o_reify = anfd->reify;
731 899
732 anfd->reify = 0; 900 anfd->reify = 0;
733 anfd->events = events; 901 anfd->events = events;
734 902
735 if (o_events != events || o_reify & EV_IOFDSET) 903 if (o_events != events || o_reify & EV__IOFDSET)
736 backend_modify (EV_A_ fd, o_events, events); 904 backend_modify (EV_A_ fd, o_events, events);
737 } 905 }
738 } 906 }
739 907
740 fdchangecnt = 0; 908 fdchangecnt = 0;
741} 909}
742 910
743void inline_size 911/* something about the given fd changed */
912inline_size void
744fd_change (EV_P_ int fd, int flags) 913fd_change (EV_P_ int fd, int flags)
745{ 914{
746 unsigned char reify = anfds [fd].reify; 915 unsigned char reify = anfds [fd].reify;
747 anfds [fd].reify |= flags; 916 anfds [fd].reify |= flags;
748 917
… …
752 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 921 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
753 fdchanges [fdchangecnt - 1] = fd; 922 fdchanges [fdchangecnt - 1] = fd;
754 } 923 }
755} 924}
756 925
757void inline_speed 926/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
927inline_speed void
758fd_kill (EV_P_ int fd) 928fd_kill (EV_P_ int fd)
759{ 929{
760 ev_io *w; 930 ev_io *w;
761 931
762 while ((w = (ev_io *)anfds [fd].head)) 932 while ((w = (ev_io *)anfds [fd].head))
… …
764 ev_io_stop (EV_A_ w); 934 ev_io_stop (EV_A_ w);
765 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);
766 } 936 }
767} 937}
768 938
769int inline_size 939/* check whether the given fd is atcually valid, for error recovery */
940inline_size int
770fd_valid (int fd) 941fd_valid (int fd)
771{ 942{
772#ifdef _WIN32 943#ifdef _WIN32
773 return _get_osfhandle (fd) != -1; 944 return _get_osfhandle (fd) != -1;
774#else 945#else
… …
796 967
797 for (fd = anfdmax; fd--; ) 968 for (fd = anfdmax; fd--; )
798 if (anfds [fd].events) 969 if (anfds [fd].events)
799 { 970 {
800 fd_kill (EV_A_ fd); 971 fd_kill (EV_A_ fd);
801 return; 972 break;
802 } 973 }
803} 974}
804 975
805/* 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 */
806static void noinline 977static void noinline
… …
811 for (fd = 0; fd < anfdmax; ++fd) 982 for (fd = 0; fd < anfdmax; ++fd)
812 if (anfds [fd].events) 983 if (anfds [fd].events)
813 { 984 {
814 anfds [fd].events = 0; 985 anfds [fd].events = 0;
815 anfds [fd].emask = 0; 986 anfds [fd].emask = 0;
816 fd_change (EV_A_ fd, EV_IOFDSET | 1); 987 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
817 } 988 }
818} 989}
819 990
820/*****************************************************************************/ 991/*****************************************************************************/
821 992
… …
837#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1008#define HEAP0 (DHEAP - 1) /* index of first element in heap */
838#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1009#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
839#define UPHEAP_DONE(p,k) ((p) == (k)) 1010#define UPHEAP_DONE(p,k) ((p) == (k))
840 1011
841/* away from the root */ 1012/* away from the root */
842void inline_speed 1013inline_speed void
843downheap (ANHE *heap, int N, int k) 1014downheap (ANHE *heap, int N, int k)
844{ 1015{
845 ANHE he = heap [k]; 1016 ANHE he = heap [k];
846 ANHE *E = heap + N + HEAP0; 1017 ANHE *E = heap + N + HEAP0;
847 1018
… …
887#define HEAP0 1 1058#define HEAP0 1
888#define HPARENT(k) ((k) >> 1) 1059#define HPARENT(k) ((k) >> 1)
889#define UPHEAP_DONE(p,k) (!(p)) 1060#define UPHEAP_DONE(p,k) (!(p))
890 1061
891/* away from the root */ 1062/* away from the root */
892void inline_speed 1063inline_speed void
893downheap (ANHE *heap, int N, int k) 1064downheap (ANHE *heap, int N, int k)
894{ 1065{
895 ANHE he = heap [k]; 1066 ANHE he = heap [k];
896 1067
897 for (;;) 1068 for (;;)
898 { 1069 {
899 int c = k << 1; 1070 int c = k << 1;
900 1071
901 if (c > N + HEAP0 - 1) 1072 if (c >= N + HEAP0)
902 break; 1073 break;
903 1074
904 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])
905 ? 1 : 0; 1076 ? 1 : 0;
906 1077
… …
917 ev_active (ANHE_w (he)) = k; 1088 ev_active (ANHE_w (he)) = k;
918} 1089}
919#endif 1090#endif
920 1091
921/* towards the root */ 1092/* towards the root */
922void inline_speed 1093inline_speed void
923upheap (ANHE *heap, int k) 1094upheap (ANHE *heap, int k)
924{ 1095{
925 ANHE he = heap [k]; 1096 ANHE he = heap [k];
926 1097
927 for (;;) 1098 for (;;)
… …
938 1109
939 heap [k] = he; 1110 heap [k] = he;
940 ev_active (ANHE_w (he)) = k; 1111 ev_active (ANHE_w (he)) = k;
941} 1112}
942 1113
943void inline_size 1114/* move an element suitably so it is in a correct place */
1115inline_size void
944adjustheap (ANHE *heap, int N, int k) 1116adjustheap (ANHE *heap, int N, int k)
945{ 1117{
946 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)]))
947 upheap (heap, k); 1119 upheap (heap, k);
948 else 1120 else
949 downheap (heap, N, k); 1121 downheap (heap, N, k);
950} 1122}
951 1123
952/* 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 */
953void inline_size 1125inline_size void
954reheap (ANHE *heap, int N) 1126reheap (ANHE *heap, int N)
955{ 1127{
956 int i; 1128 int i;
957 1129
958 /* 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 */
… …
961 upheap (heap, i + HEAP0); 1133 upheap (heap, i + HEAP0);
962} 1134}
963 1135
964/*****************************************************************************/ 1136/*****************************************************************************/
965 1137
1138/* associate signal watchers to a signal signal */
966typedef struct 1139typedef struct
967{ 1140{
1141 EV_ATOMIC_T pending;
1142#if EV_MULTIPLICITY
1143 EV_P;
1144#endif
968 WL head; 1145 WL head;
969 EV_ATOMIC_T gotsig;
970} ANSIG; 1146} ANSIG;
971 1147
972static ANSIG *signals; 1148static ANSIG signals [EV_NSIG - 1];
973static int signalmax;
974
975static EV_ATOMIC_T gotsig;
976 1149
977/*****************************************************************************/ 1150/*****************************************************************************/
978 1151
979void inline_speed 1152/* used to prepare libev internal fd's */
1153/* this is not fork-safe */
1154inline_speed void
980fd_intern (int fd) 1155fd_intern (int fd)
981{ 1156{
982#ifdef _WIN32 1157#ifdef _WIN32
983 unsigned long arg = 1; 1158 unsigned long arg = 1;
984 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1159 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
989} 1164}
990 1165
991static void noinline 1166static void noinline
992evpipe_init (EV_P) 1167evpipe_init (EV_P)
993{ 1168{
994 if (!ev_is_active (&pipeev)) 1169 if (!ev_is_active (&pipe_w))
995 { 1170 {
996#if EV_USE_EVENTFD 1171#if EV_USE_EVENTFD
1172 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1173 if (evfd < 0 && errno == EINVAL)
997 if ((evfd = eventfd (0, 0)) >= 0) 1174 evfd = eventfd (0, 0);
1175
1176 if (evfd >= 0)
998 { 1177 {
999 evpipe [0] = -1; 1178 evpipe [0] = -1;
1000 fd_intern (evfd); 1179 fd_intern (evfd); /* doing it twice doesn't hurt */
1001 ev_io_set (&pipeev, evfd, EV_READ); 1180 ev_io_set (&pipe_w, evfd, EV_READ);
1002 } 1181 }
1003 else 1182 else
1004#endif 1183#endif
1005 { 1184 {
1006 while (pipe (evpipe)) 1185 while (pipe (evpipe))
1007 ev_syserr ("(libev) error creating signal/async pipe"); 1186 ev_syserr ("(libev) error creating signal/async pipe");
1008 1187
1009 fd_intern (evpipe [0]); 1188 fd_intern (evpipe [0]);
1010 fd_intern (evpipe [1]); 1189 fd_intern (evpipe [1]);
1011 ev_io_set (&pipeev, evpipe [0], EV_READ); 1190 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1012 } 1191 }
1013 1192
1014 ev_io_start (EV_A_ &pipeev); 1193 ev_io_start (EV_A_ &pipe_w);
1015 ev_unref (EV_A); /* watcher should not keep loop alive */ 1194 ev_unref (EV_A); /* watcher should not keep loop alive */
1016 } 1195 }
1017} 1196}
1018 1197
1019void inline_size 1198inline_size void
1020evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1199evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1021{ 1200{
1022 if (!*flag) 1201 if (!*flag)
1023 { 1202 {
1024 int old_errno = errno; /* save errno because write might clobber it */ 1203 int old_errno = errno; /* save errno because write might clobber it */
… …
1037 1216
1038 errno = old_errno; 1217 errno = old_errno;
1039 } 1218 }
1040} 1219}
1041 1220
1221/* called whenever the libev signal pipe */
1222/* got some events (signal, async) */
1042static void 1223static void
1043pipecb (EV_P_ ev_io *iow, int revents) 1224pipecb (EV_P_ ev_io *iow, int revents)
1044{ 1225{
1226 int i;
1227
1045#if EV_USE_EVENTFD 1228#if EV_USE_EVENTFD
1046 if (evfd >= 0) 1229 if (evfd >= 0)
1047 { 1230 {
1048 uint64_t counter; 1231 uint64_t counter;
1049 read (evfd, &counter, sizeof (uint64_t)); 1232 read (evfd, &counter, sizeof (uint64_t));
… …
1053 { 1236 {
1054 char dummy; 1237 char dummy;
1055 read (evpipe [0], &dummy, 1); 1238 read (evpipe [0], &dummy, 1);
1056 } 1239 }
1057 1240
1058 if (gotsig && ev_is_default_loop (EV_A)) 1241 if (sig_pending)
1059 { 1242 {
1060 int signum; 1243 sig_pending = 0;
1061 gotsig = 0;
1062 1244
1063 for (signum = signalmax; signum--; ) 1245 for (i = EV_NSIG - 1; i--; )
1064 if (signals [signum].gotsig) 1246 if (expect_false (signals [i].pending))
1065 ev_feed_signal_event (EV_A_ signum + 1); 1247 ev_feed_signal_event (EV_A_ i + 1);
1066 } 1248 }
1067 1249
1068#if EV_ASYNC_ENABLE 1250#if EV_ASYNC_ENABLE
1069 if (gotasync) 1251 if (async_pending)
1070 { 1252 {
1071 int i; 1253 async_pending = 0;
1072 gotasync = 0;
1073 1254
1074 for (i = asynccnt; i--; ) 1255 for (i = asynccnt; i--; )
1075 if (asyncs [i]->sent) 1256 if (asyncs [i]->sent)
1076 { 1257 {
1077 asyncs [i]->sent = 0; 1258 asyncs [i]->sent = 0;
… …
1085 1266
1086static void 1267static void
1087ev_sighandler (int signum) 1268ev_sighandler (int signum)
1088{ 1269{
1089#if EV_MULTIPLICITY 1270#if EV_MULTIPLICITY
1090 struct ev_loop *loop = &default_loop_struct; 1271 EV_P = signals [signum - 1].loop;
1091#endif 1272#endif
1092 1273
1093#if _WIN32 1274#if _WIN32
1094 signal (signum, ev_sighandler); 1275 signal (signum, ev_sighandler);
1095#endif 1276#endif
1096 1277
1097 signals [signum - 1].gotsig = 1; 1278 signals [signum - 1].pending = 1;
1098 evpipe_write (EV_A_ &gotsig); 1279 evpipe_write (EV_A_ &sig_pending);
1099} 1280}
1100 1281
1101void noinline 1282void noinline
1102ev_feed_signal_event (EV_P_ int signum) 1283ev_feed_signal_event (EV_P_ int signum)
1103{ 1284{
1104 WL w; 1285 WL w;
1105 1286
1287 if (expect_false (signum <= 0 || signum > EV_NSIG))
1288 return;
1289
1290 --signum;
1291
1106#if EV_MULTIPLICITY 1292#if EV_MULTIPLICITY
1107 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 */
1108#endif 1294 /* or, likely more useful, feeding a signal nobody is waiting for */
1109 1295
1110 --signum; 1296 if (expect_false (signals [signum].loop != EV_A))
1111
1112 if (signum < 0 || signum >= signalmax)
1113 return; 1297 return;
1298#endif
1114 1299
1115 signals [signum].gotsig = 0; 1300 signals [signum].pending = 0;
1116 1301
1117 for (w = signals [signum].head; w; w = w->next) 1302 for (w = signals [signum].head; w; w = w->next)
1118 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1303 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1119} 1304}
1120 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
1121/*****************************************************************************/ 1326/*****************************************************************************/
1122 1327
1123static WL childs [EV_PID_HASHSIZE]; 1328static WL childs [EV_PID_HASHSIZE];
1124 1329
1125#ifndef _WIN32 1330#ifndef _WIN32
… …
1128 1333
1129#ifndef WIFCONTINUED 1334#ifndef WIFCONTINUED
1130# define WIFCONTINUED(status) 0 1335# define WIFCONTINUED(status) 0
1131#endif 1336#endif
1132 1337
1133void inline_speed 1338/* handle a single child status event */
1339inline_speed void
1134child_reap (EV_P_ int chain, int pid, int status) 1340child_reap (EV_P_ int chain, int pid, int status)
1135{ 1341{
1136 ev_child *w; 1342 ev_child *w;
1137 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1343 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1138 1344
… …
1151 1357
1152#ifndef WCONTINUED 1358#ifndef WCONTINUED
1153# define WCONTINUED 0 1359# define WCONTINUED 0
1154#endif 1360#endif
1155 1361
1362/* called on sigchld etc., calls waitpid */
1156static void 1363static void
1157childcb (EV_P_ ev_signal *sw, int revents) 1364childcb (EV_P_ ev_signal *sw, int revents)
1158{ 1365{
1159 int pid, status; 1366 int pid, status;
1160 1367
… …
1241 /* kqueue is borked on everything but netbsd apparently */ 1448 /* kqueue is borked on everything but netbsd apparently */
1242 /* 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 */
1243 flags &= ~EVBACKEND_KQUEUE; 1450 flags &= ~EVBACKEND_KQUEUE;
1244#endif 1451#endif
1245#ifdef __APPLE__ 1452#ifdef __APPLE__
1246 // flags &= ~EVBACKEND_KQUEUE; for documentation 1453 /* only select works correctly on that "unix-certified" platform */
1247 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 */
1248#endif 1456#endif
1249 1457
1250 return flags; 1458 return flags;
1251} 1459}
1252 1460
… …
1266ev_backend (EV_P) 1474ev_backend (EV_P)
1267{ 1475{
1268 return backend; 1476 return backend;
1269} 1477}
1270 1478
1479#if EV_MINIMAL < 2
1271unsigned int 1480unsigned int
1272ev_loop_count (EV_P) 1481ev_loop_count (EV_P)
1273{ 1482{
1274 return loop_count; 1483 return loop_count;
1275} 1484}
1276 1485
1486unsigned int
1487ev_loop_depth (EV_P)
1488{
1489 return loop_depth;
1490}
1491
1277void 1492void
1278ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1493ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1279{ 1494{
1280 io_blocktime = interval; 1495 io_blocktime = interval;
1281} 1496}
… …
1284ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1499ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1285{ 1500{
1286 timeout_blocktime = interval; 1501 timeout_blocktime = interval;
1287} 1502}
1288 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 */
1289static void noinline 1529static void noinline
1290loop_init (EV_P_ unsigned int flags) 1530loop_init (EV_P_ unsigned int flags)
1291{ 1531{
1292 if (!backend) 1532 if (!backend)
1293 { 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
1294#if EV_USE_MONOTONIC 1544#if EV_USE_MONOTONIC
1545 if (!have_monotonic)
1295 { 1546 {
1296 struct timespec ts; 1547 struct timespec ts;
1548
1297 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1549 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1298 have_monotonic = 1; 1550 have_monotonic = 1;
1299 } 1551 }
1300#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"));
1301 1564
1302 ev_rt_now = ev_time (); 1565 ev_rt_now = ev_time ();
1303 mn_now = get_clock (); 1566 mn_now = get_clock ();
1304 now_floor = mn_now; 1567 now_floor = mn_now;
1305 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
1306 1572
1307 io_blocktime = 0.; 1573 io_blocktime = 0.;
1308 timeout_blocktime = 0.; 1574 timeout_blocktime = 0.;
1309 backend = 0; 1575 backend = 0;
1310 backend_fd = -1; 1576 backend_fd = -1;
1311 gotasync = 0; 1577 sig_pending = 0;
1578#if EV_ASYNC_ENABLE
1579 async_pending = 0;
1580#endif
1312#if EV_USE_INOTIFY 1581#if EV_USE_INOTIFY
1313 fs_fd = -2; 1582 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1314#endif 1583#endif
1315 1584#if EV_USE_SIGNALFD
1316 /* pid check not overridable via env */ 1585 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1317#ifndef _WIN32
1318 if (flags & EVFLAG_FORKCHECK)
1319 curpid = getpid ();
1320#endif 1586#endif
1321
1322 if (!(flags & EVFLAG_NOENV)
1323 && !enable_secure ()
1324 && getenv ("LIBEV_FLAGS"))
1325 flags = atoi (getenv ("LIBEV_FLAGS"));
1326 1587
1327 if (!(flags & 0x0000ffffU)) 1588 if (!(flags & 0x0000ffffU))
1328 flags |= ev_recommended_backends (); 1589 flags |= ev_recommended_backends ();
1329 1590
1330#if EV_USE_PORT 1591#if EV_USE_PORT
… …
1341#endif 1602#endif
1342#if EV_USE_SELECT 1603#if EV_USE_SELECT
1343 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1604 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1344#endif 1605#endif
1345 1606
1607 ev_prepare_init (&pending_w, pendingcb);
1608
1346 ev_init (&pipeev, pipecb); 1609 ev_init (&pipe_w, pipecb);
1347 ev_set_priority (&pipeev, EV_MAXPRI); 1610 ev_set_priority (&pipe_w, EV_MAXPRI);
1348 } 1611 }
1349} 1612}
1350 1613
1614/* free up a loop structure */
1351static void noinline 1615static void noinline
1352loop_destroy (EV_P) 1616loop_destroy (EV_P)
1353{ 1617{
1354 int i; 1618 int i;
1355 1619
1356 if (ev_is_active (&pipeev)) 1620 if (ev_is_active (&pipe_w))
1357 { 1621 {
1358 ev_ref (EV_A); /* signal watcher */ 1622 /*ev_ref (EV_A);*/
1359 ev_io_stop (EV_A_ &pipeev); 1623 /*ev_io_stop (EV_A_ &pipe_w);*/
1360 1624
1361#if EV_USE_EVENTFD 1625#if EV_USE_EVENTFD
1362 if (evfd >= 0) 1626 if (evfd >= 0)
1363 close (evfd); 1627 close (evfd);
1364#endif 1628#endif
1365 1629
1366 if (evpipe [0] >= 0) 1630 if (evpipe [0] >= 0)
1367 { 1631 {
1368 close (evpipe [0]); 1632 EV_WIN32_CLOSE_FD (evpipe [0]);
1369 close (evpipe [1]); 1633 EV_WIN32_CLOSE_FD (evpipe [1]);
1370 } 1634 }
1371 } 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
1372 1646
1373#if EV_USE_INOTIFY 1647#if EV_USE_INOTIFY
1374 if (fs_fd >= 0) 1648 if (fs_fd >= 0)
1375 close (fs_fd); 1649 close (fs_fd);
1376#endif 1650#endif
… …
1400#if EV_IDLE_ENABLE 1674#if EV_IDLE_ENABLE
1401 array_free (idle, [i]); 1675 array_free (idle, [i]);
1402#endif 1676#endif
1403 } 1677 }
1404 1678
1405 ev_free (anfds); anfdmax = 0; 1679 ev_free (anfds); anfds = 0; anfdmax = 0;
1406 1680
1407 /* 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);
1408 array_free (fdchange, EMPTY); 1683 array_free (fdchange, EMPTY);
1409 array_free (timer, EMPTY); 1684 array_free (timer, EMPTY);
1410#if EV_PERIODIC_ENABLE 1685#if EV_PERIODIC_ENABLE
1411 array_free (periodic, EMPTY); 1686 array_free (periodic, EMPTY);
1412#endif 1687#endif
… …
1421 1696
1422 backend = 0; 1697 backend = 0;
1423} 1698}
1424 1699
1425#if EV_USE_INOTIFY 1700#if EV_USE_INOTIFY
1426void inline_size infy_fork (EV_P); 1701inline_size void infy_fork (EV_P);
1427#endif 1702#endif
1428 1703
1429void inline_size 1704inline_size void
1430loop_fork (EV_P) 1705loop_fork (EV_P)
1431{ 1706{
1432#if EV_USE_PORT 1707#if EV_USE_PORT
1433 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1708 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1434#endif 1709#endif
… …
1440#endif 1715#endif
1441#if EV_USE_INOTIFY 1716#if EV_USE_INOTIFY
1442 infy_fork (EV_A); 1717 infy_fork (EV_A);
1443#endif 1718#endif
1444 1719
1445 if (ev_is_active (&pipeev)) 1720 if (ev_is_active (&pipe_w))
1446 { 1721 {
1447 /* this "locks" the handlers against writing to the pipe */ 1722 /* this "locks" the handlers against writing to the pipe */
1448 /* while we modify the fd vars */ 1723 /* while we modify the fd vars */
1449 gotsig = 1; 1724 sig_pending = 1;
1450#if EV_ASYNC_ENABLE 1725#if EV_ASYNC_ENABLE
1451 gotasync = 1; 1726 async_pending = 1;
1452#endif 1727#endif
1453 1728
1454 ev_ref (EV_A); 1729 ev_ref (EV_A);
1455 ev_io_stop (EV_A_ &pipeev); 1730 ev_io_stop (EV_A_ &pipe_w);
1456 1731
1457#if EV_USE_EVENTFD 1732#if EV_USE_EVENTFD
1458 if (evfd >= 0) 1733 if (evfd >= 0)
1459 close (evfd); 1734 close (evfd);
1460#endif 1735#endif
1461 1736
1462 if (evpipe [0] >= 0) 1737 if (evpipe [0] >= 0)
1463 { 1738 {
1464 close (evpipe [0]); 1739 EV_WIN32_CLOSE_FD (evpipe [0]);
1465 close (evpipe [1]); 1740 EV_WIN32_CLOSE_FD (evpipe [1]);
1466 } 1741 }
1467 1742
1468 evpipe_init (EV_A); 1743 evpipe_init (EV_A);
1469 /* now iterate over everything, in case we missed something */ 1744 /* now iterate over everything, in case we missed something */
1470 pipecb (EV_A_ &pipeev, EV_READ); 1745 pipecb (EV_A_ &pipe_w, EV_READ);
1471 } 1746 }
1472 1747
1473 postfork = 0; 1748 postfork = 0;
1474} 1749}
1475 1750
1476#if EV_MULTIPLICITY 1751#if EV_MULTIPLICITY
1477 1752
1478struct ev_loop * 1753struct ev_loop *
1479ev_loop_new (unsigned int flags) 1754ev_loop_new (unsigned int flags)
1480{ 1755{
1481 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));
1482 1757
1483 memset (loop, 0, sizeof (struct ev_loop)); 1758 memset (EV_A, 0, sizeof (struct ev_loop));
1484
1485 loop_init (EV_A_ flags); 1759 loop_init (EV_A_ flags);
1486 1760
1487 if (ev_backend (EV_A)) 1761 if (ev_backend (EV_A))
1488 return loop; 1762 return EV_A;
1489 1763
1490 return 0; 1764 return 0;
1491} 1765}
1492 1766
1493void 1767void
… …
1500void 1774void
1501ev_loop_fork (EV_P) 1775ev_loop_fork (EV_P)
1502{ 1776{
1503 postfork = 1; /* must be in line with ev_default_fork */ 1777 postfork = 1; /* must be in line with ev_default_fork */
1504} 1778}
1779#endif /* multiplicity */
1505 1780
1506#if EV_VERIFY 1781#if EV_VERIFY
1507static void noinline 1782static void noinline
1508verify_watcher (EV_P_ W w) 1783verify_watcher (EV_P_ W w)
1509{ 1784{
1510 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1785 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1511 1786
1512 if (w->pending) 1787 if (w->pending)
1513 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));
1514} 1789}
1515 1790
1516static void noinline 1791static void noinline
1517verify_heap (EV_P_ ANHE *heap, int N) 1792verify_heap (EV_P_ ANHE *heap, int N)
1518{ 1793{
1519 int i; 1794 int i;
1520 1795
1521 for (i = HEAP0; i < N + HEAP0; ++i) 1796 for (i = HEAP0; i < N + HEAP0; ++i)
1522 { 1797 {
1523 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));
1524 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])));
1525 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]))));
1526 1801
1527 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1802 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1528 } 1803 }
1529} 1804}
1530 1805
1531static void noinline 1806static void noinline
1532array_verify (EV_P_ W *ws, int cnt) 1807array_verify (EV_P_ W *ws, int cnt)
1533{ 1808{
1534 while (cnt--) 1809 while (cnt--)
1535 { 1810 {
1536 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1811 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1537 verify_watcher (EV_A_ ws [cnt]); 1812 verify_watcher (EV_A_ ws [cnt]);
1538 } 1813 }
1539} 1814}
1540#endif 1815#endif
1541 1816
1817#if EV_MINIMAL < 2
1542void 1818void
1543ev_loop_verify (EV_P) 1819ev_loop_verify (EV_P)
1544{ 1820{
1545#if EV_VERIFY 1821#if EV_VERIFY
1546 int i; 1822 int i;
… …
1548 1824
1549 assert (activecnt >= -1); 1825 assert (activecnt >= -1);
1550 1826
1551 assert (fdchangemax >= fdchangecnt); 1827 assert (fdchangemax >= fdchangecnt);
1552 for (i = 0; i < fdchangecnt; ++i) 1828 for (i = 0; i < fdchangecnt; ++i)
1553 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1829 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1554 1830
1555 assert (anfdmax >= 0); 1831 assert (anfdmax >= 0);
1556 for (i = 0; i < anfdmax; ++i) 1832 for (i = 0; i < anfdmax; ++i)
1557 for (w = anfds [i].head; w; w = w->next) 1833 for (w = anfds [i].head; w; w = w->next)
1558 { 1834 {
1559 verify_watcher (EV_A_ (W)w); 1835 verify_watcher (EV_A_ (W)w);
1560 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1836 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)); 1837 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1562 } 1838 }
1563 1839
1564 assert (timermax >= timercnt); 1840 assert (timermax >= timercnt);
1565 verify_heap (EV_A_ timers, timercnt); 1841 verify_heap (EV_A_ timers, timercnt);
1566 1842
… …
1595 assert (checkmax >= checkcnt); 1871 assert (checkmax >= checkcnt);
1596 array_verify (EV_A_ (W *)checks, checkcnt); 1872 array_verify (EV_A_ (W *)checks, checkcnt);
1597 1873
1598# if 0 1874# if 0
1599 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)
1600 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1876 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1601# endif 1877# endif
1602#endif 1878#endif
1603} 1879}
1604 1880#endif
1605#endif /* multiplicity */
1606 1881
1607#if EV_MULTIPLICITY 1882#if EV_MULTIPLICITY
1608struct ev_loop * 1883struct ev_loop *
1609ev_default_loop_init (unsigned int flags) 1884ev_default_loop_init (unsigned int flags)
1610#else 1885#else
… …
1613#endif 1888#endif
1614{ 1889{
1615 if (!ev_default_loop_ptr) 1890 if (!ev_default_loop_ptr)
1616 { 1891 {
1617#if EV_MULTIPLICITY 1892#if EV_MULTIPLICITY
1618 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1893 EV_P = ev_default_loop_ptr = &default_loop_struct;
1619#else 1894#else
1620 ev_default_loop_ptr = 1; 1895 ev_default_loop_ptr = 1;
1621#endif 1896#endif
1622 1897
1623 loop_init (EV_A_ flags); 1898 loop_init (EV_A_ flags);
… …
1640 1915
1641void 1916void
1642ev_default_destroy (void) 1917ev_default_destroy (void)
1643{ 1918{
1644#if EV_MULTIPLICITY 1919#if EV_MULTIPLICITY
1645 struct ev_loop *loop = ev_default_loop_ptr; 1920 EV_P = ev_default_loop_ptr;
1646#endif 1921#endif
1647 1922
1648 ev_default_loop_ptr = 0; 1923 ev_default_loop_ptr = 0;
1649 1924
1650#ifndef _WIN32 1925#ifndef _WIN32
… …
1657 1932
1658void 1933void
1659ev_default_fork (void) 1934ev_default_fork (void)
1660{ 1935{
1661#if EV_MULTIPLICITY 1936#if EV_MULTIPLICITY
1662 struct ev_loop *loop = ev_default_loop_ptr; 1937 EV_P = ev_default_loop_ptr;
1663#endif 1938#endif
1664 1939
1665 postfork = 1; /* must be in line with ev_loop_fork */ 1940 postfork = 1; /* must be in line with ev_loop_fork */
1666} 1941}
1667 1942
… …
1671ev_invoke (EV_P_ void *w, int revents) 1946ev_invoke (EV_P_ void *w, int revents)
1672{ 1947{
1673 EV_CB_INVOKE ((W)w, revents); 1948 EV_CB_INVOKE ((W)w, revents);
1674} 1949}
1675 1950
1676void inline_speed 1951unsigned int
1677call_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)
1678{ 1965{
1679 int pri; 1966 int pri;
1680 1967
1681 for (pri = NUMPRI; pri--; ) 1968 for (pri = NUMPRI; pri--; )
1682 while (pendingcnt [pri]) 1969 while (pendingcnt [pri])
1683 { 1970 {
1684 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1971 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1685 1972
1686 if (expect_true (p->w))
1687 {
1688 /*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 */
1689 1975
1690 p->w->pending = 0; 1976 p->w->pending = 0;
1691 EV_CB_INVOKE (p->w, p->events); 1977 EV_CB_INVOKE (p->w, p->events);
1692 EV_FREQUENT_CHECK; 1978 EV_FREQUENT_CHECK;
1693 }
1694 } 1979 }
1695} 1980}
1696 1981
1697#if EV_IDLE_ENABLE 1982#if EV_IDLE_ENABLE
1698void inline_size 1983/* make idle watchers pending. this handles the "call-idle */
1984/* only when higher priorities are idle" logic */
1985inline_size void
1699idle_reify (EV_P) 1986idle_reify (EV_P)
1700{ 1987{
1701 if (expect_false (idleall)) 1988 if (expect_false (idleall))
1702 { 1989 {
1703 int pri; 1990 int pri;
… …
1715 } 2002 }
1716 } 2003 }
1717} 2004}
1718#endif 2005#endif
1719 2006
1720void inline_size 2007/* make timers pending */
2008inline_size void
1721timers_reify (EV_P) 2009timers_reify (EV_P)
1722{ 2010{
1723 EV_FREQUENT_CHECK; 2011 EV_FREQUENT_CHECK;
1724 2012
1725 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2013 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1726 { 2014 {
1727 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2015 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 { 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 {
1734 ev_at (w) += w->repeat; 2024 ev_at (w) += w->repeat;
1735 if (ev_at (w) < mn_now) 2025 if (ev_at (w) < mn_now)
1736 ev_at (w) = mn_now; 2026 ev_at (w) = mn_now;
1737 2027
1738 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.));
1739 2029
1740 ANHE_at_cache (timers [HEAP0]); 2030 ANHE_at_cache (timers [HEAP0]);
1741 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);
1742 } 2038 }
1743 else 2039 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1744 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1745 2040
1746 EV_FREQUENT_CHECK;
1747 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2041 feed_reverse_done (EV_A_ EV_TIMEOUT);
1748 } 2042 }
1749} 2043}
1750 2044
1751#if EV_PERIODIC_ENABLE 2045#if EV_PERIODIC_ENABLE
1752void inline_size 2046/* make periodics pending */
2047inline_size void
1753periodics_reify (EV_P) 2048periodics_reify (EV_P)
1754{ 2049{
1755 EV_FREQUENT_CHECK; 2050 EV_FREQUENT_CHECK;
1756 2051
1757 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2052 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1758 { 2053 {
1759 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2054 int feed_count = 0;
1760 2055
1761 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2056 do
1762
1763 /* first reschedule or stop timer */
1764 if (w->reschedule_cb)
1765 { 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 {
1766 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2065 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1767 2066
1768 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));
1769 2068
1770 ANHE_at_cache (periodics [HEAP0]); 2069 ANHE_at_cache (periodics [HEAP0]);
1771 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);
1772 } 2096 }
1773 else if (w->interval) 2097 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 2098
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); 2099 feed_reverse_done (EV_A_ EV_PERIODIC);
1797 } 2100 }
1798} 2101}
1799 2102
2103/* simply recalculate all periodics */
2104/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1800static void noinline 2105static void noinline
1801periodics_reschedule (EV_P) 2106periodics_reschedule (EV_P)
1802{ 2107{
1803 int i; 2108 int i;
1804 2109
… …
1817 2122
1818 reheap (periodics, periodiccnt); 2123 reheap (periodics, periodiccnt);
1819} 2124}
1820#endif 2125#endif
1821 2126
1822void 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
1823time_update (EV_P_ ev_tstamp max_block) 2144time_update (EV_P_ ev_tstamp max_block)
1824{ 2145{
1825 int i;
1826
1827#if EV_USE_MONOTONIC 2146#if EV_USE_MONOTONIC
1828 if (expect_true (have_monotonic)) 2147 if (expect_true (have_monotonic))
1829 { 2148 {
2149 int i;
1830 ev_tstamp odiff = rtmn_diff; 2150 ev_tstamp odiff = rtmn_diff;
1831 2151
1832 mn_now = get_clock (); 2152 mn_now = get_clock ();
1833 2153
1834 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2154 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1860 ev_rt_now = ev_time (); 2180 ev_rt_now = ev_time ();
1861 mn_now = get_clock (); 2181 mn_now = get_clock ();
1862 now_floor = mn_now; 2182 now_floor = mn_now;
1863 } 2183 }
1864 2184
2185 /* no timer adjustment, as the monotonic clock doesn't jump */
2186 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1865# if EV_PERIODIC_ENABLE 2187# if EV_PERIODIC_ENABLE
1866 periodics_reschedule (EV_A); 2188 periodics_reschedule (EV_A);
1867# endif 2189# endif
1868 /* no timer adjustment, as the monotonic clock doesn't jump */
1869 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1870 } 2190 }
1871 else 2191 else
1872#endif 2192#endif
1873 { 2193 {
1874 ev_rt_now = ev_time (); 2194 ev_rt_now = ev_time ();
1875 2195
1876 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))
1877 { 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);
1878#if EV_PERIODIC_ENABLE 2200#if EV_PERIODIC_ENABLE
1879 periodics_reschedule (EV_A); 2201 periodics_reschedule (EV_A);
1880#endif 2202#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 } 2203 }
1889 2204
1890 mn_now = ev_rt_now; 2205 mn_now = ev_rt_now;
1891 } 2206 }
1892} 2207}
1893 2208
1894void 2209void
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) 2210ev_loop (EV_P_ int flags)
1916{ 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
1917 loop_done = EVUNLOOP_CANCEL; 2218 loop_done = EVUNLOOP_CANCEL;
1918 2219
1919 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 */
1920 2221
1921 do 2222 do
1922 { 2223 {
1923#if EV_VERIFY >= 2 2224#if EV_VERIFY >= 2
1924 ev_loop_verify (EV_A); 2225 ev_loop_verify (EV_A);
… …
1937 /* we might have forked, so queue fork handlers */ 2238 /* we might have forked, so queue fork handlers */
1938 if (expect_false (postfork)) 2239 if (expect_false (postfork))
1939 if (forkcnt) 2240 if (forkcnt)
1940 { 2241 {
1941 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2242 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1942 call_pending (EV_A); 2243 EV_INVOKE_PENDING;
1943 } 2244 }
1944#endif 2245#endif
1945 2246
1946 /* queue prepare watchers (and execute them) */ 2247 /* queue prepare watchers (and execute them) */
1947 if (expect_false (preparecnt)) 2248 if (expect_false (preparecnt))
1948 { 2249 {
1949 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2250 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1950 call_pending (EV_A); 2251 EV_INVOKE_PENDING;
1951 } 2252 }
1952 2253
1953 if (expect_false (!activecnt)) 2254 if (expect_false (loop_done))
1954 break; 2255 break;
1955 2256
1956 /* we might have forked, so reify kernel state if necessary */ 2257 /* we might have forked, so reify kernel state if necessary */
1957 if (expect_false (postfork)) 2258 if (expect_false (postfork))
1958 loop_fork (EV_A); 2259 loop_fork (EV_A);
… …
1965 ev_tstamp waittime = 0.; 2266 ev_tstamp waittime = 0.;
1966 ev_tstamp sleeptime = 0.; 2267 ev_tstamp sleeptime = 0.;
1967 2268
1968 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2269 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1969 { 2270 {
2271 /* remember old timestamp for io_blocktime calculation */
2272 ev_tstamp prev_mn_now = mn_now;
2273
1970 /* update time to cancel out callback processing overhead */ 2274 /* update time to cancel out callback processing overhead */
1971 time_update (EV_A_ 1e100); 2275 time_update (EV_A_ 1e100);
1972 2276
1973 waittime = MAX_BLOCKTIME; 2277 waittime = MAX_BLOCKTIME;
1974 2278
… …
1984 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;
1985 if (waittime > to) waittime = to; 2289 if (waittime > to) waittime = to;
1986 } 2290 }
1987#endif 2291#endif
1988 2292
2293 /* don't let timeouts decrease the waittime below timeout_blocktime */
1989 if (expect_false (waittime < timeout_blocktime)) 2294 if (expect_false (waittime < timeout_blocktime))
1990 waittime = timeout_blocktime; 2295 waittime = timeout_blocktime;
1991 2296
1992 sleeptime = waittime - backend_fudge; 2297 /* extra check because io_blocktime is commonly 0 */
1993
1994 if (expect_true (sleeptime > io_blocktime)) 2298 if (expect_false (io_blocktime))
1995 sleeptime = io_blocktime;
1996
1997 if (sleeptime)
1998 { 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 {
1999 ev_sleep (sleeptime); 2307 ev_sleep (sleeptime);
2000 waittime -= sleeptime; 2308 waittime -= sleeptime;
2309 }
2001 } 2310 }
2002 } 2311 }
2003 2312
2313#if EV_MINIMAL < 2
2004 ++loop_count; 2314 ++loop_count;
2315#endif
2316 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2005 backend_poll (EV_A_ waittime); 2317 backend_poll (EV_A_ waittime);
2318 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2006 2319
2007 /* update ev_rt_now, do magic */ 2320 /* update ev_rt_now, do magic */
2008 time_update (EV_A_ waittime + sleeptime); 2321 time_update (EV_A_ waittime + sleeptime);
2009 } 2322 }
2010 2323
… …
2021 2334
2022 /* queue check watchers, to be executed first */ 2335 /* queue check watchers, to be executed first */
2023 if (expect_false (checkcnt)) 2336 if (expect_false (checkcnt))
2024 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2337 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2025 2338
2026 call_pending (EV_A); 2339 EV_INVOKE_PENDING;
2027 } 2340 }
2028 while (expect_true ( 2341 while (expect_true (
2029 activecnt 2342 activecnt
2030 && !loop_done 2343 && !loop_done
2031 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2344 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2032 )); 2345 ));
2033 2346
2034 if (loop_done == EVUNLOOP_ONE) 2347 if (loop_done == EVUNLOOP_ONE)
2035 loop_done = EVUNLOOP_CANCEL; 2348 loop_done = EVUNLOOP_CANCEL;
2349
2350#if EV_MINIMAL < 2
2351 --loop_depth;
2352#endif
2036} 2353}
2037 2354
2038void 2355void
2039ev_unloop (EV_P_ int how) 2356ev_unloop (EV_P_ int how)
2040{ 2357{
2041 loop_done = how; 2358 loop_done = how;
2042} 2359}
2043 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
2044/*****************************************************************************/ 2398/*****************************************************************************/
2399/* singly-linked list management, used when the expected list length is short */
2045 2400
2046void inline_size 2401inline_size void
2047wlist_add (WL *head, WL elem) 2402wlist_add (WL *head, WL elem)
2048{ 2403{
2049 elem->next = *head; 2404 elem->next = *head;
2050 *head = elem; 2405 *head = elem;
2051} 2406}
2052 2407
2053void inline_size 2408inline_size void
2054wlist_del (WL *head, WL elem) 2409wlist_del (WL *head, WL elem)
2055{ 2410{
2056 while (*head) 2411 while (*head)
2057 { 2412 {
2058 if (*head == elem) 2413 if (expect_true (*head == elem))
2059 { 2414 {
2060 *head = elem->next; 2415 *head = elem->next;
2061 return; 2416 break;
2062 } 2417 }
2063 2418
2064 head = &(*head)->next; 2419 head = &(*head)->next;
2065 } 2420 }
2066} 2421}
2067 2422
2068void inline_speed 2423/* internal, faster, version of ev_clear_pending */
2424inline_speed void
2069clear_pending (EV_P_ W w) 2425clear_pending (EV_P_ W w)
2070{ 2426{
2071 if (w->pending) 2427 if (w->pending)
2072 { 2428 {
2073 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2429 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2074 w->pending = 0; 2430 w->pending = 0;
2075 } 2431 }
2076} 2432}
2077 2433
2078int 2434int
… …
2082 int pending = w_->pending; 2438 int pending = w_->pending;
2083 2439
2084 if (expect_true (pending)) 2440 if (expect_true (pending))
2085 { 2441 {
2086 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2442 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2443 p->w = (W)&pending_w;
2087 w_->pending = 0; 2444 w_->pending = 0;
2088 p->w = 0;
2089 return p->events; 2445 return p->events;
2090 } 2446 }
2091 else 2447 else
2092 return 0; 2448 return 0;
2093} 2449}
2094 2450
2095void inline_size 2451inline_size void
2096pri_adjust (EV_P_ W w) 2452pri_adjust (EV_P_ W w)
2097{ 2453{
2098 int pri = w->priority; 2454 int pri = ev_priority (w);
2099 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2455 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2100 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2456 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2101 w->priority = pri; 2457 ev_set_priority (w, pri);
2102} 2458}
2103 2459
2104void inline_speed 2460inline_speed void
2105ev_start (EV_P_ W w, int active) 2461ev_start (EV_P_ W w, int active)
2106{ 2462{
2107 pri_adjust (EV_A_ w); 2463 pri_adjust (EV_A_ w);
2108 w->active = active; 2464 w->active = active;
2109 ev_ref (EV_A); 2465 ev_ref (EV_A);
2110} 2466}
2111 2467
2112void inline_size 2468inline_size void
2113ev_stop (EV_P_ W w) 2469ev_stop (EV_P_ W w)
2114{ 2470{
2115 ev_unref (EV_A); 2471 ev_unref (EV_A);
2116 w->active = 0; 2472 w->active = 0;
2117} 2473}
… …
2124 int fd = w->fd; 2480 int fd = w->fd;
2125 2481
2126 if (expect_false (ev_is_active (w))) 2482 if (expect_false (ev_is_active (w)))
2127 return; 2483 return;
2128 2484
2129 assert (("ev_io_start called with negative fd", fd >= 0)); 2485 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)))); 2486 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2131 2487
2132 EV_FREQUENT_CHECK; 2488 EV_FREQUENT_CHECK;
2133 2489
2134 ev_start (EV_A_ (W)w, 1); 2490 ev_start (EV_A_ (W)w, 1);
2135 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2491 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2136 wlist_add (&anfds[fd].head, (WL)w); 2492 wlist_add (&anfds[fd].head, (WL)w);
2137 2493
2138 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2494 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2139 w->events &= ~EV_IOFDSET; 2495 w->events &= ~EV__IOFDSET;
2140 2496
2141 EV_FREQUENT_CHECK; 2497 EV_FREQUENT_CHECK;
2142} 2498}
2143 2499
2144void noinline 2500void noinline
… …
2146{ 2502{
2147 clear_pending (EV_A_ (W)w); 2503 clear_pending (EV_A_ (W)w);
2148 if (expect_false (!ev_is_active (w))) 2504 if (expect_false (!ev_is_active (w)))
2149 return; 2505 return;
2150 2506
2151 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));
2152 2508
2153 EV_FREQUENT_CHECK; 2509 EV_FREQUENT_CHECK;
2154 2510
2155 wlist_del (&anfds[w->fd].head, (WL)w); 2511 wlist_del (&anfds[w->fd].head, (WL)w);
2156 ev_stop (EV_A_ (W)w); 2512 ev_stop (EV_A_ (W)w);
… …
2166 if (expect_false (ev_is_active (w))) 2522 if (expect_false (ev_is_active (w)))
2167 return; 2523 return;
2168 2524
2169 ev_at (w) += mn_now; 2525 ev_at (w) += mn_now;
2170 2526
2171 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.));
2172 2528
2173 EV_FREQUENT_CHECK; 2529 EV_FREQUENT_CHECK;
2174 2530
2175 ++timercnt; 2531 ++timercnt;
2176 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2532 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2179 ANHE_at_cache (timers [ev_active (w)]); 2535 ANHE_at_cache (timers [ev_active (w)]);
2180 upheap (timers, ev_active (w)); 2536 upheap (timers, ev_active (w));
2181 2537
2182 EV_FREQUENT_CHECK; 2538 EV_FREQUENT_CHECK;
2183 2539
2184 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2540 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2185} 2541}
2186 2542
2187void noinline 2543void noinline
2188ev_timer_stop (EV_P_ ev_timer *w) 2544ev_timer_stop (EV_P_ ev_timer *w)
2189{ 2545{
… …
2194 EV_FREQUENT_CHECK; 2550 EV_FREQUENT_CHECK;
2195 2551
2196 { 2552 {
2197 int active = ev_active (w); 2553 int active = ev_active (w);
2198 2554
2199 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2555 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2200 2556
2201 --timercnt; 2557 --timercnt;
2202 2558
2203 if (expect_true (active < timercnt + HEAP0)) 2559 if (expect_true (active < timercnt + HEAP0))
2204 { 2560 {
… …
2237 } 2593 }
2238 2594
2239 EV_FREQUENT_CHECK; 2595 EV_FREQUENT_CHECK;
2240} 2596}
2241 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
2242#if EV_PERIODIC_ENABLE 2604#if EV_PERIODIC_ENABLE
2243void noinline 2605void noinline
2244ev_periodic_start (EV_P_ ev_periodic *w) 2606ev_periodic_start (EV_P_ ev_periodic *w)
2245{ 2607{
2246 if (expect_false (ev_is_active (w))) 2608 if (expect_false (ev_is_active (w)))
… …
2248 2610
2249 if (w->reschedule_cb) 2611 if (w->reschedule_cb)
2250 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2612 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2251 else if (w->interval) 2613 else if (w->interval)
2252 { 2614 {
2253 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.));
2254 /* 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 */
2255 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;
2256 } 2618 }
2257 else 2619 else
2258 ev_at (w) = w->offset; 2620 ev_at (w) = w->offset;
… …
2266 ANHE_at_cache (periodics [ev_active (w)]); 2628 ANHE_at_cache (periodics [ev_active (w)]);
2267 upheap (periodics, ev_active (w)); 2629 upheap (periodics, ev_active (w));
2268 2630
2269 EV_FREQUENT_CHECK; 2631 EV_FREQUENT_CHECK;
2270 2632
2271 /*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));*/
2272} 2634}
2273 2635
2274void noinline 2636void noinline
2275ev_periodic_stop (EV_P_ ev_periodic *w) 2637ev_periodic_stop (EV_P_ ev_periodic *w)
2276{ 2638{
… …
2281 EV_FREQUENT_CHECK; 2643 EV_FREQUENT_CHECK;
2282 2644
2283 { 2645 {
2284 int active = ev_active (w); 2646 int active = ev_active (w);
2285 2647
2286 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2648 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2287 2649
2288 --periodiccnt; 2650 --periodiccnt;
2289 2651
2290 if (expect_true (active < periodiccnt + HEAP0)) 2652 if (expect_true (active < periodiccnt + HEAP0))
2291 { 2653 {
… …
2313#endif 2675#endif
2314 2676
2315void noinline 2677void noinline
2316ev_signal_start (EV_P_ ev_signal *w) 2678ev_signal_start (EV_P_ ev_signal *w)
2317{ 2679{
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))) 2680 if (expect_false (ev_is_active (w)))
2322 return; 2681 return;
2323 2682
2324 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));
2325 2684
2326 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));
2327 2688
2328 EV_FREQUENT_CHECK; 2689 signals [w->signum - 1].loop = EV_A;
2690#endif
2329 2691
2692 EV_FREQUENT_CHECK;
2693
2694#if EV_USE_SIGNALFD
2695 if (sigfd == -2)
2330 { 2696 {
2331#ifndef _WIN32 2697 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2332 sigset_t full, prev; 2698 if (sigfd < 0 && errno == EINVAL)
2333 sigfillset (&full); 2699 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2334 sigprocmask (SIG_SETMASK, &full, &prev);
2335#endif
2336 2700
2337 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 */
2338 2704
2339#ifndef _WIN32 2705 sigemptyset (&sigfd_set);
2340 sigprocmask (SIG_SETMASK, &prev, 0); 2706
2341#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 }
2342 } 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
2343 2723
2344 ev_start (EV_A_ (W)w, 1); 2724 ev_start (EV_A_ (W)w, 1);
2345 wlist_add (&signals [w->signum - 1].head, (WL)w); 2725 wlist_add (&signals [w->signum - 1].head, (WL)w);
2346 2726
2347 if (!((WL)w)->next) 2727 if (!((WL)w)->next)
2728# if EV_USE_SIGNALFD
2729 if (sigfd < 0) /*TODO*/
2730# endif
2348 { 2731 {
2349#if _WIN32 2732# if _WIN32
2350 signal (w->signum, ev_sighandler); 2733 signal (w->signum, ev_sighandler);
2351#else 2734# else
2352 struct sigaction sa; 2735 struct sigaction sa;
2736
2737 evpipe_init (EV_A);
2738
2353 sa.sa_handler = ev_sighandler; 2739 sa.sa_handler = ev_sighandler;
2354 sigfillset (&sa.sa_mask); 2740 sigfillset (&sa.sa_mask);
2355 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 */
2356 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);
2357#endif 2747#endif
2358 } 2748 }
2359 2749
2360 EV_FREQUENT_CHECK; 2750 EV_FREQUENT_CHECK;
2361} 2751}
2362 2752
2363void noinline 2753void noinline
… …
2371 2761
2372 wlist_del (&signals [w->signum - 1].head, (WL)w); 2762 wlist_del (&signals [w->signum - 1].head, (WL)w);
2373 ev_stop (EV_A_ (W)w); 2763 ev_stop (EV_A_ (W)w);
2374 2764
2375 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
2376 signal (w->signum, SIG_DFL); 2781 signal (w->signum, SIG_DFL);
2782 }
2377 2783
2378 EV_FREQUENT_CHECK; 2784 EV_FREQUENT_CHECK;
2379} 2785}
2380 2786
2381void 2787void
2382ev_child_start (EV_P_ ev_child *w) 2788ev_child_start (EV_P_ ev_child *w)
2383{ 2789{
2384#if EV_MULTIPLICITY 2790#if EV_MULTIPLICITY
2385 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));
2386#endif 2792#endif
2387 if (expect_false (ev_is_active (w))) 2793 if (expect_false (ev_is_active (w)))
2388 return; 2794 return;
2389 2795
2390 EV_FREQUENT_CHECK; 2796 EV_FREQUENT_CHECK;
… …
2415# ifdef _WIN32 2821# ifdef _WIN32
2416# undef lstat 2822# undef lstat
2417# define lstat(a,b) _stati64 (a,b) 2823# define lstat(a,b) _stati64 (a,b)
2418# endif 2824# endif
2419 2825
2420#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 */
2421#define MIN_STAT_INTERVAL 0.1074891 2828#define MIN_STAT_INTERVAL 0.1074891
2422 2829
2423static 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);
2424 2831
2425#if EV_USE_INOTIFY 2832#if EV_USE_INOTIFY
2426# define EV_INOTIFY_BUFSIZE 8192 2833# define EV_INOTIFY_BUFSIZE 8192
… …
2430{ 2837{
2431 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);
2432 2839
2433 if (w->wd < 0) 2840 if (w->wd < 0)
2434 { 2841 {
2842 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2435 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 */
2436 2844
2437 /* monitor some parent directory for speedup hints */ 2845 /* monitor some parent directory for speedup hints */
2438 /* 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, */
2439 /* but an efficiency issue only */ 2847 /* but an efficiency issue only */
2440 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2848 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
… …
2447 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2855 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2448 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2856 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2449 2857
2450 char *pend = strrchr (path, '/'); 2858 char *pend = strrchr (path, '/');
2451 2859
2452 if (!pend) 2860 if (!pend || pend == path)
2453 break; /* whoops, no '/', complain to your admin */ 2861 break;
2454 2862
2455 *pend = 0; 2863 *pend = 0;
2456 w->wd = inotify_add_watch (fs_fd, path, mask); 2864 w->wd = inotify_add_watch (fs_fd, path, mask);
2457 } 2865 }
2458 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2866 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2459 } 2867 }
2460 } 2868 }
2461 else
2462 todo, on nfs etc., we need to poll every 60s or so
2463 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2464 2869
2465 if (w->wd >= 0) 2870 if (w->wd >= 0)
2871 {
2872 struct statfs sfs;
2873
2466 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 }
2467} 2892}
2468 2893
2469static void noinline 2894static void noinline
2470infy_del (EV_P_ ev_stat *w) 2895infy_del (EV_P_ ev_stat *w)
2471{ 2896{
… …
2501 2926
2502 if (w->wd == wd || wd == -1) 2927 if (w->wd == wd || wd == -1)
2503 { 2928 {
2504 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2929 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2505 { 2930 {
2931 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2506 w->wd = -1; 2932 w->wd = -1;
2507 infy_add (EV_A_ w); /* re-add, no matter what */ 2933 infy_add (EV_A_ w); /* re-add, no matter what */
2508 } 2934 }
2509 2935
2510 stat_timer_cb (EV_A_ &w->timer, 0); 2936 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2523 2949
2524 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)
2525 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2951 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2526} 2952}
2527 2953
2528void inline_size 2954inline_size void
2529infy_init (EV_P) 2955check_2625 (EV_P)
2530{ 2956{
2531 if (fs_fd != -2)
2532 return;
2533
2534 /* kernels < 2.6.25 are borked 2957 /* kernels < 2.6.25 are borked
2535 * 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
2536 */ 2959 */
2537 {
2538 struct utsname buf; 2960 struct utsname buf;
2539 int major, minor, micro; 2961 int major, minor, micro;
2540 2962
2541 fs_fd = -1;
2542
2543 if (uname (&buf)) 2963 if (uname (&buf))
2544 return; 2964 return;
2545 2965
2546 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3) 2966 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2547 return; 2967 return;
2548 2968
2549 if (major < 2 2969 if (major < 2
2550 || (major == 2 && minor < 6) 2970 || (major == 2 && minor < 6)
2551 || (major == 2 && minor == 6 && micro < 25)) 2971 || (major == 2 && minor == 6 && micro < 25))
2552 return; 2972 return;
2553 } 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);
2554 2986
2555 fs_fd = inotify_init (); 2987 fs_fd = inotify_init ();
2556 2988
2557 if (fs_fd >= 0) 2989 if (fs_fd >= 0)
2558 { 2990 {
… …
2560 ev_set_priority (&fs_w, EV_MAXPRI); 2992 ev_set_priority (&fs_w, EV_MAXPRI);
2561 ev_io_start (EV_A_ &fs_w); 2993 ev_io_start (EV_A_ &fs_w);
2562 } 2994 }
2563} 2995}
2564 2996
2565void inline_size 2997inline_size void
2566infy_fork (EV_P) 2998infy_fork (EV_P)
2567{ 2999{
2568 int slot; 3000 int slot;
2569 3001
2570 if (fs_fd < 0) 3002 if (fs_fd < 0)
… …
2586 w->wd = -1; 3018 w->wd = -1;
2587 3019
2588 if (fs_fd >= 0) 3020 if (fs_fd >= 0)
2589 infy_add (EV_A_ w); /* re-add, no matter what */ 3021 infy_add (EV_A_ w); /* re-add, no matter what */
2590 else 3022 else
2591 ev_timer_start (EV_A_ &w->timer); 3023 ev_timer_again (EV_A_ &w->timer);
2592 } 3024 }
2593 } 3025 }
2594} 3026}
2595 3027
2596#endif 3028#endif
… …
2651ev_stat_start (EV_P_ ev_stat *w) 3083ev_stat_start (EV_P_ ev_stat *w)
2652{ 3084{
2653 if (expect_false (ev_is_active (w))) 3085 if (expect_false (ev_is_active (w)))
2654 return; 3086 return;
2655 3087
2656 /* since we use memcmp, we need to clear any padding data etc. */
2657 memset (&w->prev, 0, sizeof (ev_statdata));
2658 memset (&w->attr, 0, sizeof (ev_statdata));
2659
2660 ev_stat_stat (EV_A_ w); 3088 ev_stat_stat (EV_A_ w);
2661 3089
3090 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2662 if (w->interval < MIN_STAT_INTERVAL) 3091 w->interval = MIN_STAT_INTERVAL;
2663 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2664 3092
2665 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);
2666 ev_set_priority (&w->timer, ev_priority (w)); 3094 ev_set_priority (&w->timer, ev_priority (w));
2667 3095
2668#if EV_USE_INOTIFY 3096#if EV_USE_INOTIFY
2669 infy_init (EV_A); 3097 infy_init (EV_A);
2670 3098
2671 if (fs_fd >= 0) 3099 if (fs_fd >= 0)
2672 infy_add (EV_A_ w); 3100 infy_add (EV_A_ w);
2673 else 3101 else
2674#endif 3102#endif
2675 ev_timer_start (EV_A_ &w->timer); 3103 ev_timer_again (EV_A_ &w->timer);
2676 3104
2677 ev_start (EV_A_ (W)w, 1); 3105 ev_start (EV_A_ (W)w, 1);
2678 3106
2679 EV_FREQUENT_CHECK; 3107 EV_FREQUENT_CHECK;
2680} 3108}
… …
2840embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3268embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2841{ 3269{
2842 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3270 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2843 3271
2844 { 3272 {
2845 struct ev_loop *loop = w->other; 3273 EV_P = w->other;
2846 3274
2847 while (fdchangecnt) 3275 while (fdchangecnt)
2848 { 3276 {
2849 fd_reify (EV_A); 3277 fd_reify (EV_A);
2850 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3278 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2855static void 3283static void
2856embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3284embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2857{ 3285{
2858 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));
2859 3287
3288 ev_embed_stop (EV_A_ w);
3289
2860 { 3290 {
2861 struct ev_loop *loop = w->other; 3291 EV_P = w->other;
2862 3292
2863 ev_loop_fork (EV_A); 3293 ev_loop_fork (EV_A);
3294 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2864 } 3295 }
3296
3297 ev_embed_start (EV_A_ w);
2865} 3298}
2866 3299
2867#if 0 3300#if 0
2868static void 3301static void
2869embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3302embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2877{ 3310{
2878 if (expect_false (ev_is_active (w))) 3311 if (expect_false (ev_is_active (w)))
2879 return; 3312 return;
2880 3313
2881 { 3314 {
2882 struct ev_loop *loop = w->other; 3315 EV_P = w->other;
2883 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 ()));
2884 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);
2885 } 3318 }
2886 3319
2887 EV_FREQUENT_CHECK; 3320 EV_FREQUENT_CHECK;
2888 3321
… …
2999 3432
3000void 3433void
3001ev_async_send (EV_P_ ev_async *w) 3434ev_async_send (EV_P_ ev_async *w)
3002{ 3435{
3003 w->sent = 1; 3436 w->sent = 1;
3004 evpipe_write (EV_A_ &gotasync); 3437 evpipe_write (EV_A_ &async_pending);
3005} 3438}
3006#endif 3439#endif
3007 3440
3008/*****************************************************************************/ 3441/*****************************************************************************/
3009 3442
… …
3071 ev_timer_set (&once->to, timeout, 0.); 3504 ev_timer_set (&once->to, timeout, 0.);
3072 ev_timer_start (EV_A_ &once->to); 3505 ev_timer_start (EV_A_ &once->to);
3073 } 3506 }
3074} 3507}
3075 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
3076#if EV_MULTIPLICITY 3617#if EV_MULTIPLICITY
3077 #include "ev_wrap.h" 3618 #include "ev_wrap.h"
3078#endif 3619#endif
3079 3620
3080#ifdef __cplusplus 3621#ifdef __cplusplus

Diff Legend

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