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

Comparing libev/ev.c (file contents):
Revision 1.263 by root, Wed Oct 1 18:50:03 2008 UTC vs.
Revision 1.311 by root, Wed Jul 29 09:36:05 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
… …
286# include <sys/select.h> 365# include <sys/select.h>
287# endif 366# endif
288#endif 367#endif
289 368
290#if EV_USE_INOTIFY 369#if EV_USE_INOTIFY
370# include <sys/utsname.h>
371# include <sys/statfs.h>
291# include <sys/inotify.h> 372# include <sys/inotify.h>
292/* 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 */
293# ifndef IN_DONT_FOLLOW 374# ifndef IN_DONT_FOLLOW
294# undef EV_USE_INOTIFY 375# undef EV_USE_INOTIFY
295# define EV_USE_INOTIFY 0 376# define EV_USE_INOTIFY 0
… …
301#endif 382#endif
302 383
303#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
304/* 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 */
305# 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
306# ifdef __cplusplus 397# ifdef __cplusplus
307extern "C" { 398extern "C" {
308# endif 399# endif
309int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
310# ifdef __cplusplus 401# ifdef __cplusplus
311} 402}
312# endif 403# endif
404#endif
405
406#if EV_USE_SIGNALFD
407# include <sys/signalfd.h>
313#endif 408#endif
314 409
315/**/ 410/**/
316 411
317#if EV_VERIFY >= 3 412#if EV_VERIFY >= 3
… …
353# define inline_speed static noinline 448# define inline_speed static noinline
354#else 449#else
355# define inline_speed static inline 450# define inline_speed static inline
356#endif 451#endif
357 452
358#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
359#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 458# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
459#endif
360 460
361#define EMPTY /* required for microsofts broken pseudo-c compiler */ 461#define EMPTY /* required for microsofts broken pseudo-c compiler */
362#define EMPTY2(a,b) /* used to suppress some warnings */ 462#define EMPTY2(a,b) /* used to suppress some warnings */
363 463
364typedef ev_watcher *W; 464typedef ev_watcher *W;
… …
366typedef ev_watcher_time *WT; 466typedef ev_watcher_time *WT;
367 467
368#define ev_active(w) ((W)(w))->active 468#define ev_active(w) ((W)(w))->active
369#define ev_at(w) ((WT)(w))->at 469#define ev_at(w) ((WT)(w))->at
370 470
371#if EV_USE_MONOTONIC 471#if EV_USE_REALTIME
372/* 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 */
373/* 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
374static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 478static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
375#endif 479#endif
376 480
377#ifdef _WIN32 481#ifdef _WIN32
378# include "ev_win32.c" 482# include "ev_win32.c"
… …
387{ 491{
388 syserr_cb = cb; 492 syserr_cb = cb;
389} 493}
390 494
391static void noinline 495static void noinline
392syserr (const char *msg) 496ev_syserr (const char *msg)
393{ 497{
394 if (!msg) 498 if (!msg)
395 msg = "(libev) system error"; 499 msg = "(libev) system error";
396 500
397 if (syserr_cb) 501 if (syserr_cb)
… …
443#define ev_malloc(size) ev_realloc (0, (size)) 547#define ev_malloc(size) ev_realloc (0, (size))
444#define ev_free(ptr) ev_realloc ((ptr), 0) 548#define ev_free(ptr) ev_realloc ((ptr), 0)
445 549
446/*****************************************************************************/ 550/*****************************************************************************/
447 551
552/* set in reify when reification needed */
553#define EV_ANFD_REIFY 1
554
555/* file descriptor info structure */
448typedef struct 556typedef struct
449{ 557{
450 WL head; 558 WL head;
451 unsigned char events; 559 unsigned char events; /* the events watched for */
560 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
561 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
452 unsigned char reify; 562 unsigned char unused;
563#if EV_USE_EPOLL
564 unsigned int egen; /* generation counter to counter epoll bugs */
565#endif
453#if EV_SELECT_IS_WINSOCKET 566#if EV_SELECT_IS_WINSOCKET
454 SOCKET handle; 567 SOCKET handle;
455#endif 568#endif
456} ANFD; 569} ANFD;
457 570
571/* stores the pending event set for a given watcher */
458typedef struct 572typedef struct
459{ 573{
460 W w; 574 W w;
461 int events; 575 int events; /* the pending event set for the given watcher */
462} ANPENDING; 576} ANPENDING;
463 577
464#if EV_USE_INOTIFY 578#if EV_USE_INOTIFY
465/* hash table entry per inotify-id */ 579/* hash table entry per inotify-id */
466typedef struct 580typedef struct
… …
469} ANFS; 583} ANFS;
470#endif 584#endif
471 585
472/* Heap Entry */ 586/* Heap Entry */
473#if EV_HEAP_CACHE_AT 587#if EV_HEAP_CACHE_AT
588 /* a heap element */
474 typedef struct { 589 typedef struct {
475 ev_tstamp at; 590 ev_tstamp at;
476 WT w; 591 WT w;
477 } ANHE; 592 } ANHE;
478 593
479 #define ANHE_w(he) (he).w /* access watcher, read-write */ 594 #define ANHE_w(he) (he).w /* access watcher, read-write */
480 #define ANHE_at(he) (he).at /* access cached at, read-only */ 595 #define ANHE_at(he) (he).at /* access cached at, read-only */
481 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 596 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
482#else 597#else
598 /* a heap element */
483 typedef WT ANHE; 599 typedef WT ANHE;
484 600
485 #define ANHE_w(he) (he) 601 #define ANHE_w(he) (he)
486 #define ANHE_at(he) (he)->at 602 #define ANHE_at(he) (he)->at
487 #define ANHE_at_cache(he) 603 #define ANHE_at_cache(he)
… …
511 627
512 static int ev_default_loop_ptr; 628 static int ev_default_loop_ptr;
513 629
514#endif 630#endif
515 631
632#if EV_MINIMAL < 2
633# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
634# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
635# define EV_INVOKE_PENDING invoke_cb (EV_A)
636#else
637# define EV_RELEASE_CB (void)0
638# define EV_ACQUIRE_CB (void)0
639# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
640#endif
641
642#define EVUNLOOP_RECURSE 0x80
643
516/*****************************************************************************/ 644/*****************************************************************************/
517 645
646#ifndef EV_HAVE_EV_TIME
518ev_tstamp 647ev_tstamp
519ev_time (void) 648ev_time (void)
520{ 649{
521#if EV_USE_REALTIME 650#if EV_USE_REALTIME
651 if (expect_true (have_realtime))
652 {
522 struct timespec ts; 653 struct timespec ts;
523 clock_gettime (CLOCK_REALTIME, &ts); 654 clock_gettime (CLOCK_REALTIME, &ts);
524 return ts.tv_sec + ts.tv_nsec * 1e-9; 655 return ts.tv_sec + ts.tv_nsec * 1e-9;
525#else 656 }
657#endif
658
526 struct timeval tv; 659 struct timeval tv;
527 gettimeofday (&tv, 0); 660 gettimeofday (&tv, 0);
528 return tv.tv_sec + tv.tv_usec * 1e-6; 661 return tv.tv_sec + tv.tv_usec * 1e-6;
529#endif
530} 662}
663#endif
531 664
532ev_tstamp inline_size 665inline_size ev_tstamp
533get_clock (void) 666get_clock (void)
534{ 667{
535#if EV_USE_MONOTONIC 668#if EV_USE_MONOTONIC
536 if (expect_true (have_monotonic)) 669 if (expect_true (have_monotonic))
537 { 670 {
… …
571 704
572 tv.tv_sec = (time_t)delay; 705 tv.tv_sec = (time_t)delay;
573 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 706 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
574 707
575 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 708 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
576 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 709 /* something not guaranteed by newer posix versions, but guaranteed */
577 /* by older ones */ 710 /* by older ones */
578 select (0, 0, 0, 0, &tv); 711 select (0, 0, 0, 0, &tv);
579#endif 712#endif
580 } 713 }
581} 714}
582 715
583/*****************************************************************************/ 716/*****************************************************************************/
584 717
585#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 718#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
586 719
587int inline_size 720/* find a suitable new size for the given array, */
721/* hopefully by rounding to a ncie-to-malloc size */
722inline_size int
588array_nextsize (int elem, int cur, int cnt) 723array_nextsize (int elem, int cur, int cnt)
589{ 724{
590 int ncur = cur + 1; 725 int ncur = cur + 1;
591 726
592 do 727 do
… …
609array_realloc (int elem, void *base, int *cur, int cnt) 744array_realloc (int elem, void *base, int *cur, int cnt)
610{ 745{
611 *cur = array_nextsize (elem, *cur, cnt); 746 *cur = array_nextsize (elem, *cur, cnt);
612 return ev_realloc (base, elem * *cur); 747 return ev_realloc (base, elem * *cur);
613} 748}
749
750#define array_init_zero(base,count) \
751 memset ((void *)(base), 0, sizeof (*(base)) * (count))
614 752
615#define array_needsize(type,base,cur,cnt,init) \ 753#define array_needsize(type,base,cur,cnt,init) \
616 if (expect_false ((cnt) > (cur))) \ 754 if (expect_false ((cnt) > (cur))) \
617 { \ 755 { \
618 int ocur_ = (cur); \ 756 int ocur_ = (cur); \
… …
630 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 768 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
631 } 769 }
632#endif 770#endif
633 771
634#define array_free(stem, idx) \ 772#define array_free(stem, idx) \
635 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 773 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
636 774
637/*****************************************************************************/ 775/*****************************************************************************/
776
777/* dummy callback for pending events */
778static void noinline
779pendingcb (EV_P_ ev_prepare *w, int revents)
780{
781}
638 782
639void noinline 783void noinline
640ev_feed_event (EV_P_ void *w, int revents) 784ev_feed_event (EV_P_ void *w, int revents)
641{ 785{
642 W w_ = (W)w; 786 W w_ = (W)w;
… …
651 pendings [pri][w_->pending - 1].w = w_; 795 pendings [pri][w_->pending - 1].w = w_;
652 pendings [pri][w_->pending - 1].events = revents; 796 pendings [pri][w_->pending - 1].events = revents;
653 } 797 }
654} 798}
655 799
656void inline_speed 800inline_speed void
801feed_reverse (EV_P_ W w)
802{
803 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
804 rfeeds [rfeedcnt++] = w;
805}
806
807inline_size void
808feed_reverse_done (EV_P_ int revents)
809{
810 do
811 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
812 while (rfeedcnt);
813}
814
815inline_speed void
657queue_events (EV_P_ W *events, int eventcnt, int type) 816queue_events (EV_P_ W *events, int eventcnt, int type)
658{ 817{
659 int i; 818 int i;
660 819
661 for (i = 0; i < eventcnt; ++i) 820 for (i = 0; i < eventcnt; ++i)
662 ev_feed_event (EV_A_ events [i], type); 821 ev_feed_event (EV_A_ events [i], type);
663} 822}
664 823
665/*****************************************************************************/ 824/*****************************************************************************/
666 825
667void inline_size 826inline_speed void
668anfds_init (ANFD *base, int count)
669{
670 while (count--)
671 {
672 base->head = 0;
673 base->events = EV_NONE;
674 base->reify = 0;
675
676 ++base;
677 }
678}
679
680void inline_speed
681fd_event (EV_P_ int fd, int revents) 827fd_event_nc (EV_P_ int fd, int revents)
682{ 828{
683 ANFD *anfd = anfds + fd; 829 ANFD *anfd = anfds + fd;
684 ev_io *w; 830 ev_io *w;
685 831
686 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 832 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
690 if (ev) 836 if (ev)
691 ev_feed_event (EV_A_ (W)w, ev); 837 ev_feed_event (EV_A_ (W)w, ev);
692 } 838 }
693} 839}
694 840
841/* do not submit kernel events for fds that have reify set */
842/* because that means they changed while we were polling for new events */
843inline_speed void
844fd_event (EV_P_ int fd, int revents)
845{
846 ANFD *anfd = anfds + fd;
847
848 if (expect_true (!anfd->reify))
849 fd_event_nc (EV_A_ fd, revents);
850}
851
695void 852void
696ev_feed_fd_event (EV_P_ int fd, int revents) 853ev_feed_fd_event (EV_P_ int fd, int revents)
697{ 854{
698 if (fd >= 0 && fd < anfdmax) 855 if (fd >= 0 && fd < anfdmax)
699 fd_event (EV_A_ fd, revents); 856 fd_event_nc (EV_A_ fd, revents);
700} 857}
701 858
702void inline_size 859/* make sure the external fd watch events are in-sync */
860/* with the kernel/libev internal state */
861inline_size void
703fd_reify (EV_P) 862fd_reify (EV_P)
704{ 863{
705 int i; 864 int i;
706 865
707 for (i = 0; i < fdchangecnt; ++i) 866 for (i = 0; i < fdchangecnt; ++i)
… …
722 #ifdef EV_FD_TO_WIN32_HANDLE 881 #ifdef EV_FD_TO_WIN32_HANDLE
723 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 882 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
724 #else 883 #else
725 anfd->handle = _get_osfhandle (fd); 884 anfd->handle = _get_osfhandle (fd);
726 #endif 885 #endif
727 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 886 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
728 } 887 }
729#endif 888#endif
730 889
731 { 890 {
732 unsigned char o_events = anfd->events; 891 unsigned char o_events = anfd->events;
733 unsigned char o_reify = anfd->reify; 892 unsigned char o_reify = anfd->reify;
734 893
735 anfd->reify = 0; 894 anfd->reify = 0;
736 anfd->events = events; 895 anfd->events = events;
737 896
738 if (o_events != events || o_reify & EV_IOFDSET) 897 if (o_events != events || o_reify & EV__IOFDSET)
739 backend_modify (EV_A_ fd, o_events, events); 898 backend_modify (EV_A_ fd, o_events, events);
740 } 899 }
741 } 900 }
742 901
743 fdchangecnt = 0; 902 fdchangecnt = 0;
744} 903}
745 904
746void inline_size 905/* something about the given fd changed */
906inline_size void
747fd_change (EV_P_ int fd, int flags) 907fd_change (EV_P_ int fd, int flags)
748{ 908{
749 unsigned char reify = anfds [fd].reify; 909 unsigned char reify = anfds [fd].reify;
750 anfds [fd].reify |= flags; 910 anfds [fd].reify |= flags;
751 911
… …
755 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 915 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
756 fdchanges [fdchangecnt - 1] = fd; 916 fdchanges [fdchangecnt - 1] = fd;
757 } 917 }
758} 918}
759 919
760void inline_speed 920/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
921inline_speed void
761fd_kill (EV_P_ int fd) 922fd_kill (EV_P_ int fd)
762{ 923{
763 ev_io *w; 924 ev_io *w;
764 925
765 while ((w = (ev_io *)anfds [fd].head)) 926 while ((w = (ev_io *)anfds [fd].head))
… …
767 ev_io_stop (EV_A_ w); 928 ev_io_stop (EV_A_ w);
768 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 929 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
769 } 930 }
770} 931}
771 932
772int inline_size 933/* check whether the given fd is atcually valid, for error recovery */
934inline_size int
773fd_valid (int fd) 935fd_valid (int fd)
774{ 936{
775#ifdef _WIN32 937#ifdef _WIN32
776 return _get_osfhandle (fd) != -1; 938 return _get_osfhandle (fd) != -1;
777#else 939#else
… …
799 961
800 for (fd = anfdmax; fd--; ) 962 for (fd = anfdmax; fd--; )
801 if (anfds [fd].events) 963 if (anfds [fd].events)
802 { 964 {
803 fd_kill (EV_A_ fd); 965 fd_kill (EV_A_ fd);
804 return; 966 break;
805 } 967 }
806} 968}
807 969
808/* usually called after fork if backend needs to re-arm all fds from scratch */ 970/* usually called after fork if backend needs to re-arm all fds from scratch */
809static void noinline 971static void noinline
… …
813 975
814 for (fd = 0; fd < anfdmax; ++fd) 976 for (fd = 0; fd < anfdmax; ++fd)
815 if (anfds [fd].events) 977 if (anfds [fd].events)
816 { 978 {
817 anfds [fd].events = 0; 979 anfds [fd].events = 0;
980 anfds [fd].emask = 0;
818 fd_change (EV_A_ fd, EV_IOFDSET | 1); 981 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
819 } 982 }
820} 983}
821 984
822/*****************************************************************************/ 985/*****************************************************************************/
823 986
… …
839#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1002#define HEAP0 (DHEAP - 1) /* index of first element in heap */
840#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1003#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
841#define UPHEAP_DONE(p,k) ((p) == (k)) 1004#define UPHEAP_DONE(p,k) ((p) == (k))
842 1005
843/* away from the root */ 1006/* away from the root */
844void inline_speed 1007inline_speed void
845downheap (ANHE *heap, int N, int k) 1008downheap (ANHE *heap, int N, int k)
846{ 1009{
847 ANHE he = heap [k]; 1010 ANHE he = heap [k];
848 ANHE *E = heap + N + HEAP0; 1011 ANHE *E = heap + N + HEAP0;
849 1012
… …
889#define HEAP0 1 1052#define HEAP0 1
890#define HPARENT(k) ((k) >> 1) 1053#define HPARENT(k) ((k) >> 1)
891#define UPHEAP_DONE(p,k) (!(p)) 1054#define UPHEAP_DONE(p,k) (!(p))
892 1055
893/* away from the root */ 1056/* away from the root */
894void inline_speed 1057inline_speed void
895downheap (ANHE *heap, int N, int k) 1058downheap (ANHE *heap, int N, int k)
896{ 1059{
897 ANHE he = heap [k]; 1060 ANHE he = heap [k];
898 1061
899 for (;;) 1062 for (;;)
900 { 1063 {
901 int c = k << 1; 1064 int c = k << 1;
902 1065
903 if (c > N + HEAP0 - 1) 1066 if (c >= N + HEAP0)
904 break; 1067 break;
905 1068
906 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1069 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
907 ? 1 : 0; 1070 ? 1 : 0;
908 1071
… …
919 ev_active (ANHE_w (he)) = k; 1082 ev_active (ANHE_w (he)) = k;
920} 1083}
921#endif 1084#endif
922 1085
923/* towards the root */ 1086/* towards the root */
924void inline_speed 1087inline_speed void
925upheap (ANHE *heap, int k) 1088upheap (ANHE *heap, int k)
926{ 1089{
927 ANHE he = heap [k]; 1090 ANHE he = heap [k];
928 1091
929 for (;;) 1092 for (;;)
… …
940 1103
941 heap [k] = he; 1104 heap [k] = he;
942 ev_active (ANHE_w (he)) = k; 1105 ev_active (ANHE_w (he)) = k;
943} 1106}
944 1107
945void inline_size 1108/* move an element suitably so it is in a correct place */
1109inline_size void
946adjustheap (ANHE *heap, int N, int k) 1110adjustheap (ANHE *heap, int N, int k)
947{ 1111{
948 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1112 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
949 upheap (heap, k); 1113 upheap (heap, k);
950 else 1114 else
951 downheap (heap, N, k); 1115 downheap (heap, N, k);
952} 1116}
953 1117
954/* rebuild the heap: this function is used only once and executed rarely */ 1118/* rebuild the heap: this function is used only once and executed rarely */
955void inline_size 1119inline_size void
956reheap (ANHE *heap, int N) 1120reheap (ANHE *heap, int N)
957{ 1121{
958 int i; 1122 int i;
959 1123
960 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1124 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
963 upheap (heap, i + HEAP0); 1127 upheap (heap, i + HEAP0);
964} 1128}
965 1129
966/*****************************************************************************/ 1130/*****************************************************************************/
967 1131
1132/* associate signal watchers to a signal signal */
968typedef struct 1133typedef struct
969{ 1134{
1135 EV_ATOMIC_T pending;
1136#if EV_MULTIPLICITY
1137 EV_P;
1138#endif
970 WL head; 1139 WL head;
971 EV_ATOMIC_T gotsig;
972} ANSIG; 1140} ANSIG;
973 1141
974static ANSIG *signals; 1142static ANSIG signals [EV_NSIG - 1];
975static int signalmax;
976
977static EV_ATOMIC_T gotsig;
978
979void inline_size
980signals_init (ANSIG *base, int count)
981{
982 while (count--)
983 {
984 base->head = 0;
985 base->gotsig = 0;
986
987 ++base;
988 }
989}
990 1143
991/*****************************************************************************/ 1144/*****************************************************************************/
992 1145
993void inline_speed 1146/* used to prepare libev internal fd's */
1147/* this is not fork-safe */
1148inline_speed void
994fd_intern (int fd) 1149fd_intern (int fd)
995{ 1150{
996#ifdef _WIN32 1151#ifdef _WIN32
997 unsigned long arg = 1; 1152 unsigned long arg = 1;
998 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1153 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
1003} 1158}
1004 1159
1005static void noinline 1160static void noinline
1006evpipe_init (EV_P) 1161evpipe_init (EV_P)
1007{ 1162{
1008 if (!ev_is_active (&pipeev)) 1163 if (!ev_is_active (&pipe_w))
1009 { 1164 {
1010#if EV_USE_EVENTFD 1165#if EV_USE_EVENTFD
1166 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1167 if (evfd < 0 && errno == EINVAL)
1011 if ((evfd = eventfd (0, 0)) >= 0) 1168 evfd = eventfd (0, 0);
1169
1170 if (evfd >= 0)
1012 { 1171 {
1013 evpipe [0] = -1; 1172 evpipe [0] = -1;
1014 fd_intern (evfd); 1173 fd_intern (evfd); /* doing it twice doesn't hurt */
1015 ev_io_set (&pipeev, evfd, EV_READ); 1174 ev_io_set (&pipe_w, evfd, EV_READ);
1016 } 1175 }
1017 else 1176 else
1018#endif 1177#endif
1019 { 1178 {
1020 while (pipe (evpipe)) 1179 while (pipe (evpipe))
1021 syserr ("(libev) error creating signal/async pipe"); 1180 ev_syserr ("(libev) error creating signal/async pipe");
1022 1181
1023 fd_intern (evpipe [0]); 1182 fd_intern (evpipe [0]);
1024 fd_intern (evpipe [1]); 1183 fd_intern (evpipe [1]);
1025 ev_io_set (&pipeev, evpipe [0], EV_READ); 1184 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1026 } 1185 }
1027 1186
1028 ev_io_start (EV_A_ &pipeev); 1187 ev_io_start (EV_A_ &pipe_w);
1029 ev_unref (EV_A); /* watcher should not keep loop alive */ 1188 ev_unref (EV_A); /* watcher should not keep loop alive */
1030 } 1189 }
1031} 1190}
1032 1191
1033void inline_size 1192inline_size void
1034evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1193evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1035{ 1194{
1036 if (!*flag) 1195 if (!*flag)
1037 { 1196 {
1038 int old_errno = errno; /* save errno because write might clobber it */ 1197 int old_errno = errno; /* save errno because write might clobber it */
… …
1051 1210
1052 errno = old_errno; 1211 errno = old_errno;
1053 } 1212 }
1054} 1213}
1055 1214
1215/* called whenever the libev signal pipe */
1216/* got some events (signal, async) */
1056static void 1217static void
1057pipecb (EV_P_ ev_io *iow, int revents) 1218pipecb (EV_P_ ev_io *iow, int revents)
1058{ 1219{
1220 int i;
1221
1059#if EV_USE_EVENTFD 1222#if EV_USE_EVENTFD
1060 if (evfd >= 0) 1223 if (evfd >= 0)
1061 { 1224 {
1062 uint64_t counter; 1225 uint64_t counter;
1063 read (evfd, &counter, sizeof (uint64_t)); 1226 read (evfd, &counter, sizeof (uint64_t));
… …
1067 { 1230 {
1068 char dummy; 1231 char dummy;
1069 read (evpipe [0], &dummy, 1); 1232 read (evpipe [0], &dummy, 1);
1070 } 1233 }
1071 1234
1072 if (gotsig && ev_is_default_loop (EV_A)) 1235 if (sig_pending)
1073 { 1236 {
1074 int signum; 1237 sig_pending = 0;
1075 gotsig = 0;
1076 1238
1077 for (signum = signalmax; signum--; ) 1239 for (i = EV_NSIG - 1; i--; )
1078 if (signals [signum].gotsig) 1240 if (expect_false (signals [i].pending))
1079 ev_feed_signal_event (EV_A_ signum + 1); 1241 ev_feed_signal_event (EV_A_ i + 1);
1080 } 1242 }
1081 1243
1082#if EV_ASYNC_ENABLE 1244#if EV_ASYNC_ENABLE
1083 if (gotasync) 1245 if (async_pending)
1084 { 1246 {
1085 int i; 1247 async_pending = 0;
1086 gotasync = 0;
1087 1248
1088 for (i = asynccnt; i--; ) 1249 for (i = asynccnt; i--; )
1089 if (asyncs [i]->sent) 1250 if (asyncs [i]->sent)
1090 { 1251 {
1091 asyncs [i]->sent = 0; 1252 asyncs [i]->sent = 0;
… …
1099 1260
1100static void 1261static void
1101ev_sighandler (int signum) 1262ev_sighandler (int signum)
1102{ 1263{
1103#if EV_MULTIPLICITY 1264#if EV_MULTIPLICITY
1104 struct ev_loop *loop = &default_loop_struct; 1265 EV_P = signals [signum - 1].loop;
1105#endif 1266#endif
1106 1267
1107#if _WIN32 1268#if _WIN32
1108 signal (signum, ev_sighandler); 1269 signal (signum, ev_sighandler);
1109#endif 1270#endif
1110 1271
1111 signals [signum - 1].gotsig = 1; 1272 signals [signum - 1].pending = 1;
1112 evpipe_write (EV_A_ &gotsig); 1273 evpipe_write (EV_A_ &sig_pending);
1113} 1274}
1114 1275
1115void noinline 1276void noinline
1116ev_feed_signal_event (EV_P_ int signum) 1277ev_feed_signal_event (EV_P_ int signum)
1117{ 1278{
1118 WL w; 1279 WL w;
1119 1280
1281 if (expect_false (signum <= 0 || signum > EV_NSIG))
1282 return;
1283
1284 --signum;
1285
1120#if EV_MULTIPLICITY 1286#if EV_MULTIPLICITY
1121 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1287 /* it is permissible to try to feed a signal to the wrong loop */
1122#endif 1288 /* or, likely more useful, feeding a signal nobody is waiting for */
1123 1289
1124 --signum; 1290 if (expect_false (signals [signum].loop != EV_A))
1125
1126 if (signum < 0 || signum >= signalmax)
1127 return; 1291 return;
1292#endif
1128 1293
1129 signals [signum].gotsig = 0; 1294 signals [signum].pending = 0;
1130 1295
1131 for (w = signals [signum].head; w; w = w->next) 1296 for (w = signals [signum].head; w; w = w->next)
1132 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1297 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1133} 1298}
1134 1299
1300#if EV_USE_SIGNALFD
1301static void
1302sigfdcb (EV_P_ ev_io *iow, int revents)
1303{
1304 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1305
1306 for (;;)
1307 {
1308 ssize_t res = read (sigfd, si, sizeof (si));
1309
1310 /* not ISO-C, as res might be -1, but works with SuS */
1311 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1312 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1313
1314 if (res < (ssize_t)sizeof (si))
1315 break;
1316 }
1317}
1318#endif
1319
1135/*****************************************************************************/ 1320/*****************************************************************************/
1136 1321
1137static WL childs [EV_PID_HASHSIZE]; 1322static WL childs [EV_PID_HASHSIZE];
1138 1323
1139#ifndef _WIN32 1324#ifndef _WIN32
… …
1142 1327
1143#ifndef WIFCONTINUED 1328#ifndef WIFCONTINUED
1144# define WIFCONTINUED(status) 0 1329# define WIFCONTINUED(status) 0
1145#endif 1330#endif
1146 1331
1147void inline_speed 1332/* handle a single child status event */
1333inline_speed void
1148child_reap (EV_P_ int chain, int pid, int status) 1334child_reap (EV_P_ int chain, int pid, int status)
1149{ 1335{
1150 ev_child *w; 1336 ev_child *w;
1151 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1337 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1152 1338
… …
1165 1351
1166#ifndef WCONTINUED 1352#ifndef WCONTINUED
1167# define WCONTINUED 0 1353# define WCONTINUED 0
1168#endif 1354#endif
1169 1355
1356/* called on sigchld etc., calls waitpid */
1170static void 1357static void
1171childcb (EV_P_ ev_signal *sw, int revents) 1358childcb (EV_P_ ev_signal *sw, int revents)
1172{ 1359{
1173 int pid, status; 1360 int pid, status;
1174 1361
… …
1255 /* kqueue is borked on everything but netbsd apparently */ 1442 /* kqueue is borked on everything but netbsd apparently */
1256 /* it usually doesn't work correctly on anything but sockets and pipes */ 1443 /* it usually doesn't work correctly on anything but sockets and pipes */
1257 flags &= ~EVBACKEND_KQUEUE; 1444 flags &= ~EVBACKEND_KQUEUE;
1258#endif 1445#endif
1259#ifdef __APPLE__ 1446#ifdef __APPLE__
1260 // flags &= ~EVBACKEND_KQUEUE; for documentation 1447 /* only select works correctly on that "unix-certified" platform */
1261 flags &= ~EVBACKEND_POLL; 1448 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1449 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1262#endif 1450#endif
1263 1451
1264 return flags; 1452 return flags;
1265} 1453}
1266 1454
… …
1280ev_backend (EV_P) 1468ev_backend (EV_P)
1281{ 1469{
1282 return backend; 1470 return backend;
1283} 1471}
1284 1472
1473#if EV_MINIMAL < 2
1285unsigned int 1474unsigned int
1286ev_loop_count (EV_P) 1475ev_loop_count (EV_P)
1287{ 1476{
1288 return loop_count; 1477 return loop_count;
1289} 1478}
1290 1479
1480unsigned int
1481ev_loop_depth (EV_P)
1482{
1483 return loop_depth;
1484}
1485
1291void 1486void
1292ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1487ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1293{ 1488{
1294 io_blocktime = interval; 1489 io_blocktime = interval;
1295} 1490}
… …
1298ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1493ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1299{ 1494{
1300 timeout_blocktime = interval; 1495 timeout_blocktime = interval;
1301} 1496}
1302 1497
1498void
1499ev_set_userdata (EV_P_ void *data)
1500{
1501 userdata = data;
1502}
1503
1504void *
1505ev_userdata (EV_P)
1506{
1507 return userdata;
1508}
1509
1510void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1511{
1512 invoke_cb = invoke_pending_cb;
1513}
1514
1515void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1516{
1517 release_cb = release;
1518 acquire_cb = acquire;
1519}
1520#endif
1521
1522/* initialise a loop structure, must be zero-initialised */
1303static void noinline 1523static void noinline
1304loop_init (EV_P_ unsigned int flags) 1524loop_init (EV_P_ unsigned int flags)
1305{ 1525{
1306 if (!backend) 1526 if (!backend)
1307 { 1527 {
1528#if EV_USE_REALTIME
1529 if (!have_realtime)
1530 {
1531 struct timespec ts;
1532
1533 if (!clock_gettime (CLOCK_REALTIME, &ts))
1534 have_realtime = 1;
1535 }
1536#endif
1537
1308#if EV_USE_MONOTONIC 1538#if EV_USE_MONOTONIC
1539 if (!have_monotonic)
1309 { 1540 {
1310 struct timespec ts; 1541 struct timespec ts;
1542
1311 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1543 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1312 have_monotonic = 1; 1544 have_monotonic = 1;
1313 } 1545 }
1314#endif 1546#endif
1547
1548 /* pid check not overridable via env */
1549#ifndef _WIN32
1550 if (flags & EVFLAG_FORKCHECK)
1551 curpid = getpid ();
1552#endif
1553
1554 if (!(flags & EVFLAG_NOENV)
1555 && !enable_secure ()
1556 && getenv ("LIBEV_FLAGS"))
1557 flags = atoi (getenv ("LIBEV_FLAGS"));
1315 1558
1316 ev_rt_now = ev_time (); 1559 ev_rt_now = ev_time ();
1317 mn_now = get_clock (); 1560 mn_now = get_clock ();
1318 now_floor = mn_now; 1561 now_floor = mn_now;
1319 rtmn_diff = ev_rt_now - mn_now; 1562 rtmn_diff = ev_rt_now - mn_now;
1563#if EV_MINIMAL < 2
1564 invoke_cb = ev_invoke_pending;
1565#endif
1320 1566
1321 io_blocktime = 0.; 1567 io_blocktime = 0.;
1322 timeout_blocktime = 0.; 1568 timeout_blocktime = 0.;
1323 backend = 0; 1569 backend = 0;
1324 backend_fd = -1; 1570 backend_fd = -1;
1325 gotasync = 0; 1571 sig_pending = 0;
1572#if EV_ASYNC_ENABLE
1573 async_pending = 0;
1574#endif
1326#if EV_USE_INOTIFY 1575#if EV_USE_INOTIFY
1327 fs_fd = -2; 1576 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1328#endif 1577#endif
1329 1578#if EV_USE_SIGNALFD
1330 /* pid check not overridable via env */ 1579 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1331#ifndef _WIN32
1332 if (flags & EVFLAG_FORKCHECK)
1333 curpid = getpid ();
1334#endif 1580#endif
1335
1336 if (!(flags & EVFLAG_NOENV)
1337 && !enable_secure ()
1338 && getenv ("LIBEV_FLAGS"))
1339 flags = atoi (getenv ("LIBEV_FLAGS"));
1340 1581
1341 if (!(flags & 0x0000ffffU)) 1582 if (!(flags & 0x0000ffffU))
1342 flags |= ev_recommended_backends (); 1583 flags |= ev_recommended_backends ();
1343 1584
1344#if EV_USE_PORT 1585#if EV_USE_PORT
… …
1355#endif 1596#endif
1356#if EV_USE_SELECT 1597#if EV_USE_SELECT
1357 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1598 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1358#endif 1599#endif
1359 1600
1601 ev_prepare_init (&pending_w, pendingcb);
1602
1360 ev_init (&pipeev, pipecb); 1603 ev_init (&pipe_w, pipecb);
1361 ev_set_priority (&pipeev, EV_MAXPRI); 1604 ev_set_priority (&pipe_w, EV_MAXPRI);
1362 } 1605 }
1363} 1606}
1364 1607
1608/* free up a loop structure */
1365static void noinline 1609static void noinline
1366loop_destroy (EV_P) 1610loop_destroy (EV_P)
1367{ 1611{
1368 int i; 1612 int i;
1369 1613
1370 if (ev_is_active (&pipeev)) 1614 if (ev_is_active (&pipe_w))
1371 { 1615 {
1372 ev_ref (EV_A); /* signal watcher */ 1616 /*ev_ref (EV_A);*/
1373 ev_io_stop (EV_A_ &pipeev); 1617 /*ev_io_stop (EV_A_ &pipe_w);*/
1374 1618
1375#if EV_USE_EVENTFD 1619#if EV_USE_EVENTFD
1376 if (evfd >= 0) 1620 if (evfd >= 0)
1377 close (evfd); 1621 close (evfd);
1378#endif 1622#endif
… …
1382 close (evpipe [0]); 1626 close (evpipe [0]);
1383 close (evpipe [1]); 1627 close (evpipe [1]);
1384 } 1628 }
1385 } 1629 }
1386 1630
1631#if EV_USE_SIGNALFD
1632 if (ev_is_active (&sigfd_w))
1633 {
1634 /*ev_ref (EV_A);*/
1635 /*ev_io_stop (EV_A_ &sigfd_w);*/
1636
1637 close (sigfd);
1638 }
1639#endif
1640
1387#if EV_USE_INOTIFY 1641#if EV_USE_INOTIFY
1388 if (fs_fd >= 0) 1642 if (fs_fd >= 0)
1389 close (fs_fd); 1643 close (fs_fd);
1390#endif 1644#endif
1391 1645
… …
1414#if EV_IDLE_ENABLE 1668#if EV_IDLE_ENABLE
1415 array_free (idle, [i]); 1669 array_free (idle, [i]);
1416#endif 1670#endif
1417 } 1671 }
1418 1672
1419 ev_free (anfds); anfdmax = 0; 1673 ev_free (anfds); anfds = 0; anfdmax = 0;
1420 1674
1421 /* have to use the microsoft-never-gets-it-right macro */ 1675 /* have to use the microsoft-never-gets-it-right macro */
1676 array_free (rfeed, EMPTY);
1422 array_free (fdchange, EMPTY); 1677 array_free (fdchange, EMPTY);
1423 array_free (timer, EMPTY); 1678 array_free (timer, EMPTY);
1424#if EV_PERIODIC_ENABLE 1679#if EV_PERIODIC_ENABLE
1425 array_free (periodic, EMPTY); 1680 array_free (periodic, EMPTY);
1426#endif 1681#endif
… …
1435 1690
1436 backend = 0; 1691 backend = 0;
1437} 1692}
1438 1693
1439#if EV_USE_INOTIFY 1694#if EV_USE_INOTIFY
1440void inline_size infy_fork (EV_P); 1695inline_size void infy_fork (EV_P);
1441#endif 1696#endif
1442 1697
1443void inline_size 1698inline_size void
1444loop_fork (EV_P) 1699loop_fork (EV_P)
1445{ 1700{
1446#if EV_USE_PORT 1701#if EV_USE_PORT
1447 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1702 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1448#endif 1703#endif
… …
1454#endif 1709#endif
1455#if EV_USE_INOTIFY 1710#if EV_USE_INOTIFY
1456 infy_fork (EV_A); 1711 infy_fork (EV_A);
1457#endif 1712#endif
1458 1713
1459 if (ev_is_active (&pipeev)) 1714 if (ev_is_active (&pipe_w))
1460 { 1715 {
1461 /* this "locks" the handlers against writing to the pipe */ 1716 /* this "locks" the handlers against writing to the pipe */
1462 /* while we modify the fd vars */ 1717 /* while we modify the fd vars */
1463 gotsig = 1; 1718 sig_pending = 1;
1464#if EV_ASYNC_ENABLE 1719#if EV_ASYNC_ENABLE
1465 gotasync = 1; 1720 async_pending = 1;
1466#endif 1721#endif
1467 1722
1468 ev_ref (EV_A); 1723 ev_ref (EV_A);
1469 ev_io_stop (EV_A_ &pipeev); 1724 ev_io_stop (EV_A_ &pipe_w);
1470 1725
1471#if EV_USE_EVENTFD 1726#if EV_USE_EVENTFD
1472 if (evfd >= 0) 1727 if (evfd >= 0)
1473 close (evfd); 1728 close (evfd);
1474#endif 1729#endif
… …
1479 close (evpipe [1]); 1734 close (evpipe [1]);
1480 } 1735 }
1481 1736
1482 evpipe_init (EV_A); 1737 evpipe_init (EV_A);
1483 /* now iterate over everything, in case we missed something */ 1738 /* now iterate over everything, in case we missed something */
1484 pipecb (EV_A_ &pipeev, EV_READ); 1739 pipecb (EV_A_ &pipe_w, EV_READ);
1485 } 1740 }
1486 1741
1487 postfork = 0; 1742 postfork = 0;
1488} 1743}
1489 1744
1490#if EV_MULTIPLICITY 1745#if EV_MULTIPLICITY
1491 1746
1492struct ev_loop * 1747struct ev_loop *
1493ev_loop_new (unsigned int flags) 1748ev_loop_new (unsigned int flags)
1494{ 1749{
1495 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1750 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1496 1751
1497 memset (loop, 0, sizeof (struct ev_loop)); 1752 memset (EV_A, 0, sizeof (struct ev_loop));
1498
1499 loop_init (EV_A_ flags); 1753 loop_init (EV_A_ flags);
1500 1754
1501 if (ev_backend (EV_A)) 1755 if (ev_backend (EV_A))
1502 return loop; 1756 return EV_A;
1503 1757
1504 return 0; 1758 return 0;
1505} 1759}
1506 1760
1507void 1761void
… …
1514void 1768void
1515ev_loop_fork (EV_P) 1769ev_loop_fork (EV_P)
1516{ 1770{
1517 postfork = 1; /* must be in line with ev_default_fork */ 1771 postfork = 1; /* must be in line with ev_default_fork */
1518} 1772}
1773#endif /* multiplicity */
1519 1774
1520#if EV_VERIFY 1775#if EV_VERIFY
1521static void noinline 1776static void noinline
1522verify_watcher (EV_P_ W w) 1777verify_watcher (EV_P_ W w)
1523{ 1778{
1524 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1779 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1525 1780
1526 if (w->pending) 1781 if (w->pending)
1527 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1782 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1528} 1783}
1529 1784
1530static void noinline 1785static void noinline
1531verify_heap (EV_P_ ANHE *heap, int N) 1786verify_heap (EV_P_ ANHE *heap, int N)
1532{ 1787{
1533 int i; 1788 int i;
1534 1789
1535 for (i = HEAP0; i < N + HEAP0; ++i) 1790 for (i = HEAP0; i < N + HEAP0; ++i)
1536 { 1791 {
1537 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1792 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1538 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1793 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1539 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1794 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1540 1795
1541 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1796 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1542 } 1797 }
1543} 1798}
1544 1799
1545static void noinline 1800static void noinline
1546array_verify (EV_P_ W *ws, int cnt) 1801array_verify (EV_P_ W *ws, int cnt)
1547{ 1802{
1548 while (cnt--) 1803 while (cnt--)
1549 { 1804 {
1550 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1805 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1551 verify_watcher (EV_A_ ws [cnt]); 1806 verify_watcher (EV_A_ ws [cnt]);
1552 } 1807 }
1553} 1808}
1554#endif 1809#endif
1555 1810
1811#if EV_MINIMAL < 2
1556void 1812void
1557ev_loop_verify (EV_P) 1813ev_loop_verify (EV_P)
1558{ 1814{
1559#if EV_VERIFY 1815#if EV_VERIFY
1560 int i; 1816 int i;
… …
1562 1818
1563 assert (activecnt >= -1); 1819 assert (activecnt >= -1);
1564 1820
1565 assert (fdchangemax >= fdchangecnt); 1821 assert (fdchangemax >= fdchangecnt);
1566 for (i = 0; i < fdchangecnt; ++i) 1822 for (i = 0; i < fdchangecnt; ++i)
1567 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1823 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1568 1824
1569 assert (anfdmax >= 0); 1825 assert (anfdmax >= 0);
1570 for (i = 0; i < anfdmax; ++i) 1826 for (i = 0; i < anfdmax; ++i)
1571 for (w = anfds [i].head; w; w = w->next) 1827 for (w = anfds [i].head; w; w = w->next)
1572 { 1828 {
1573 verify_watcher (EV_A_ (W)w); 1829 verify_watcher (EV_A_ (W)w);
1574 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1830 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1575 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1831 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1576 } 1832 }
1577 1833
1578 assert (timermax >= timercnt); 1834 assert (timermax >= timercnt);
1579 verify_heap (EV_A_ timers, timercnt); 1835 verify_heap (EV_A_ timers, timercnt);
1580 1836
… …
1609 assert (checkmax >= checkcnt); 1865 assert (checkmax >= checkcnt);
1610 array_verify (EV_A_ (W *)checks, checkcnt); 1866 array_verify (EV_A_ (W *)checks, checkcnt);
1611 1867
1612# if 0 1868# if 0
1613 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1869 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1614 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1870 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1615# endif 1871# endif
1616#endif 1872#endif
1617} 1873}
1618 1874#endif
1619#endif /* multiplicity */
1620 1875
1621#if EV_MULTIPLICITY 1876#if EV_MULTIPLICITY
1622struct ev_loop * 1877struct ev_loop *
1623ev_default_loop_init (unsigned int flags) 1878ev_default_loop_init (unsigned int flags)
1624#else 1879#else
… …
1627#endif 1882#endif
1628{ 1883{
1629 if (!ev_default_loop_ptr) 1884 if (!ev_default_loop_ptr)
1630 { 1885 {
1631#if EV_MULTIPLICITY 1886#if EV_MULTIPLICITY
1632 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1887 EV_P = ev_default_loop_ptr = &default_loop_struct;
1633#else 1888#else
1634 ev_default_loop_ptr = 1; 1889 ev_default_loop_ptr = 1;
1635#endif 1890#endif
1636 1891
1637 loop_init (EV_A_ flags); 1892 loop_init (EV_A_ flags);
… …
1654 1909
1655void 1910void
1656ev_default_destroy (void) 1911ev_default_destroy (void)
1657{ 1912{
1658#if EV_MULTIPLICITY 1913#if EV_MULTIPLICITY
1659 struct ev_loop *loop = ev_default_loop_ptr; 1914 EV_P = ev_default_loop_ptr;
1660#endif 1915#endif
1916
1917 ev_default_loop_ptr = 0;
1661 1918
1662#ifndef _WIN32 1919#ifndef _WIN32
1663 ev_ref (EV_A); /* child watcher */ 1920 ev_ref (EV_A); /* child watcher */
1664 ev_signal_stop (EV_A_ &childev); 1921 ev_signal_stop (EV_A_ &childev);
1665#endif 1922#endif
… …
1669 1926
1670void 1927void
1671ev_default_fork (void) 1928ev_default_fork (void)
1672{ 1929{
1673#if EV_MULTIPLICITY 1930#if EV_MULTIPLICITY
1674 struct ev_loop *loop = ev_default_loop_ptr; 1931 EV_P = ev_default_loop_ptr;
1675#endif 1932#endif
1676 1933
1677 if (backend)
1678 postfork = 1; /* must be in line with ev_loop_fork */ 1934 postfork = 1; /* must be in line with ev_loop_fork */
1679} 1935}
1680 1936
1681/*****************************************************************************/ 1937/*****************************************************************************/
1682 1938
1683void 1939void
1684ev_invoke (EV_P_ void *w, int revents) 1940ev_invoke (EV_P_ void *w, int revents)
1685{ 1941{
1686 EV_CB_INVOKE ((W)w, revents); 1942 EV_CB_INVOKE ((W)w, revents);
1687} 1943}
1688 1944
1689void inline_speed 1945unsigned int
1690call_pending (EV_P) 1946ev_pending_count (EV_P)
1947{
1948 int pri;
1949 unsigned int count = 0;
1950
1951 for (pri = NUMPRI; pri--; )
1952 count += pendingcnt [pri];
1953
1954 return count;
1955}
1956
1957void noinline
1958ev_invoke_pending (EV_P)
1691{ 1959{
1692 int pri; 1960 int pri;
1693 1961
1694 for (pri = NUMPRI; pri--; ) 1962 for (pri = NUMPRI; pri--; )
1695 while (pendingcnt [pri]) 1963 while (pendingcnt [pri])
1696 { 1964 {
1697 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1965 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1698 1966
1699 if (expect_true (p->w))
1700 {
1701 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1967 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1968 /* ^ this is no longer true, as pending_w could be here */
1702 1969
1703 p->w->pending = 0; 1970 p->w->pending = 0;
1704 EV_CB_INVOKE (p->w, p->events); 1971 EV_CB_INVOKE (p->w, p->events);
1705 EV_FREQUENT_CHECK; 1972 EV_FREQUENT_CHECK;
1706 }
1707 } 1973 }
1708} 1974}
1709 1975
1710#if EV_IDLE_ENABLE 1976#if EV_IDLE_ENABLE
1711void inline_size 1977/* make idle watchers pending. this handles the "call-idle */
1978/* only when higher priorities are idle" logic */
1979inline_size void
1712idle_reify (EV_P) 1980idle_reify (EV_P)
1713{ 1981{
1714 if (expect_false (idleall)) 1982 if (expect_false (idleall))
1715 { 1983 {
1716 int pri; 1984 int pri;
… …
1728 } 1996 }
1729 } 1997 }
1730} 1998}
1731#endif 1999#endif
1732 2000
1733void inline_size 2001/* make timers pending */
2002inline_size void
1734timers_reify (EV_P) 2003timers_reify (EV_P)
1735{ 2004{
1736 EV_FREQUENT_CHECK; 2005 EV_FREQUENT_CHECK;
1737 2006
1738 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2007 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1739 { 2008 {
1740 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2009 do
1741
1742 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1743
1744 /* first reschedule or stop timer */
1745 if (w->repeat)
1746 { 2010 {
2011 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2012
2013 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2014
2015 /* first reschedule or stop timer */
2016 if (w->repeat)
2017 {
1747 ev_at (w) += w->repeat; 2018 ev_at (w) += w->repeat;
1748 if (ev_at (w) < mn_now) 2019 if (ev_at (w) < mn_now)
1749 ev_at (w) = mn_now; 2020 ev_at (w) = mn_now;
1750 2021
1751 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2022 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1752 2023
1753 ANHE_at_cache (timers [HEAP0]); 2024 ANHE_at_cache (timers [HEAP0]);
1754 downheap (timers, timercnt, HEAP0); 2025 downheap (timers, timercnt, HEAP0);
2026 }
2027 else
2028 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2029
2030 EV_FREQUENT_CHECK;
2031 feed_reverse (EV_A_ (W)w);
1755 } 2032 }
1756 else 2033 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1757 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1758 2034
1759 EV_FREQUENT_CHECK;
1760 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2035 feed_reverse_done (EV_A_ EV_TIMEOUT);
1761 } 2036 }
1762} 2037}
1763 2038
1764#if EV_PERIODIC_ENABLE 2039#if EV_PERIODIC_ENABLE
1765void inline_size 2040/* make periodics pending */
2041inline_size void
1766periodics_reify (EV_P) 2042periodics_reify (EV_P)
1767{ 2043{
1768 EV_FREQUENT_CHECK; 2044 EV_FREQUENT_CHECK;
1769 2045
1770 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2046 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1771 { 2047 {
1772 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2048 int feed_count = 0;
1773 2049
1774 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2050 do
1775
1776 /* first reschedule or stop timer */
1777 if (w->reschedule_cb)
1778 { 2051 {
2052 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2053
2054 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2055
2056 /* first reschedule or stop timer */
2057 if (w->reschedule_cb)
2058 {
1779 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2059 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1780 2060
1781 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2061 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1782 2062
1783 ANHE_at_cache (periodics [HEAP0]); 2063 ANHE_at_cache (periodics [HEAP0]);
1784 downheap (periodics, periodiccnt, HEAP0); 2064 downheap (periodics, periodiccnt, HEAP0);
2065 }
2066 else if (w->interval)
2067 {
2068 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2069 /* if next trigger time is not sufficiently in the future, put it there */
2070 /* this might happen because of floating point inexactness */
2071 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2072 {
2073 ev_at (w) += w->interval;
2074
2075 /* if interval is unreasonably low we might still have a time in the past */
2076 /* so correct this. this will make the periodic very inexact, but the user */
2077 /* has effectively asked to get triggered more often than possible */
2078 if (ev_at (w) < ev_rt_now)
2079 ev_at (w) = ev_rt_now;
2080 }
2081
2082 ANHE_at_cache (periodics [HEAP0]);
2083 downheap (periodics, periodiccnt, HEAP0);
2084 }
2085 else
2086 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2087
2088 EV_FREQUENT_CHECK;
2089 feed_reverse (EV_A_ (W)w);
1785 } 2090 }
1786 else if (w->interval) 2091 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1787 {
1788 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1789 /* if next trigger time is not sufficiently in the future, put it there */
1790 /* this might happen because of floating point inexactness */
1791 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1792 {
1793 ev_at (w) += w->interval;
1794 2092
1795 /* if interval is unreasonably low we might still have a time in the past */
1796 /* so correct this. this will make the periodic very inexact, but the user */
1797 /* has effectively asked to get triggered more often than possible */
1798 if (ev_at (w) < ev_rt_now)
1799 ev_at (w) = ev_rt_now;
1800 }
1801
1802 ANHE_at_cache (periodics [HEAP0]);
1803 downheap (periodics, periodiccnt, HEAP0);
1804 }
1805 else
1806 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1807
1808 EV_FREQUENT_CHECK;
1809 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2093 feed_reverse_done (EV_A_ EV_PERIODIC);
1810 } 2094 }
1811} 2095}
1812 2096
2097/* simply recalculate all periodics */
2098/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1813static void noinline 2099static void noinline
1814periodics_reschedule (EV_P) 2100periodics_reschedule (EV_P)
1815{ 2101{
1816 int i; 2102 int i;
1817 2103
… …
1830 2116
1831 reheap (periodics, periodiccnt); 2117 reheap (periodics, periodiccnt);
1832} 2118}
1833#endif 2119#endif
1834 2120
1835void inline_speed 2121/* adjust all timers by a given offset */
2122static void noinline
2123timers_reschedule (EV_P_ ev_tstamp adjust)
2124{
2125 int i;
2126
2127 for (i = 0; i < timercnt; ++i)
2128 {
2129 ANHE *he = timers + i + HEAP0;
2130 ANHE_w (*he)->at += adjust;
2131 ANHE_at_cache (*he);
2132 }
2133}
2134
2135/* fetch new monotonic and realtime times from the kernel */
2136/* also detetc if there was a timejump, and act accordingly */
2137inline_speed void
1836time_update (EV_P_ ev_tstamp max_block) 2138time_update (EV_P_ ev_tstamp max_block)
1837{ 2139{
1838 int i;
1839
1840#if EV_USE_MONOTONIC 2140#if EV_USE_MONOTONIC
1841 if (expect_true (have_monotonic)) 2141 if (expect_true (have_monotonic))
1842 { 2142 {
2143 int i;
1843 ev_tstamp odiff = rtmn_diff; 2144 ev_tstamp odiff = rtmn_diff;
1844 2145
1845 mn_now = get_clock (); 2146 mn_now = get_clock ();
1846 2147
1847 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2148 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1873 ev_rt_now = ev_time (); 2174 ev_rt_now = ev_time ();
1874 mn_now = get_clock (); 2175 mn_now = get_clock ();
1875 now_floor = mn_now; 2176 now_floor = mn_now;
1876 } 2177 }
1877 2178
2179 /* no timer adjustment, as the monotonic clock doesn't jump */
2180 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1878# if EV_PERIODIC_ENABLE 2181# if EV_PERIODIC_ENABLE
1879 periodics_reschedule (EV_A); 2182 periodics_reschedule (EV_A);
1880# endif 2183# endif
1881 /* no timer adjustment, as the monotonic clock doesn't jump */
1882 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1883 } 2184 }
1884 else 2185 else
1885#endif 2186#endif
1886 { 2187 {
1887 ev_rt_now = ev_time (); 2188 ev_rt_now = ev_time ();
1888 2189
1889 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2190 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1890 { 2191 {
2192 /* adjust timers. this is easy, as the offset is the same for all of them */
2193 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1891#if EV_PERIODIC_ENABLE 2194#if EV_PERIODIC_ENABLE
1892 periodics_reschedule (EV_A); 2195 periodics_reschedule (EV_A);
1893#endif 2196#endif
1894 /* adjust timers. this is easy, as the offset is the same for all of them */
1895 for (i = 0; i < timercnt; ++i)
1896 {
1897 ANHE *he = timers + i + HEAP0;
1898 ANHE_w (*he)->at += ev_rt_now - mn_now;
1899 ANHE_at_cache (*he);
1900 }
1901 } 2197 }
1902 2198
1903 mn_now = ev_rt_now; 2199 mn_now = ev_rt_now;
1904 } 2200 }
1905} 2201}
1906 2202
1907void 2203void
1908ev_ref (EV_P)
1909{
1910 ++activecnt;
1911}
1912
1913void
1914ev_unref (EV_P)
1915{
1916 --activecnt;
1917}
1918
1919void
1920ev_now_update (EV_P)
1921{
1922 time_update (EV_A_ 1e100);
1923}
1924
1925static int loop_done;
1926
1927void
1928ev_loop (EV_P_ int flags) 2204ev_loop (EV_P_ int flags)
1929{ 2205{
2206#if EV_MINIMAL < 2
2207 ++loop_depth;
2208#endif
2209
2210 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2211
1930 loop_done = EVUNLOOP_CANCEL; 2212 loop_done = EVUNLOOP_CANCEL;
1931 2213
1932 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2214 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1933 2215
1934 do 2216 do
1935 { 2217 {
1936#if EV_VERIFY >= 2 2218#if EV_VERIFY >= 2
1937 ev_loop_verify (EV_A); 2219 ev_loop_verify (EV_A);
… …
1950 /* we might have forked, so queue fork handlers */ 2232 /* we might have forked, so queue fork handlers */
1951 if (expect_false (postfork)) 2233 if (expect_false (postfork))
1952 if (forkcnt) 2234 if (forkcnt)
1953 { 2235 {
1954 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2236 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1955 call_pending (EV_A); 2237 EV_INVOKE_PENDING;
1956 } 2238 }
1957#endif 2239#endif
1958 2240
1959 /* queue prepare watchers (and execute them) */ 2241 /* queue prepare watchers (and execute them) */
1960 if (expect_false (preparecnt)) 2242 if (expect_false (preparecnt))
1961 { 2243 {
1962 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2244 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1963 call_pending (EV_A); 2245 EV_INVOKE_PENDING;
1964 } 2246 }
1965 2247
1966 if (expect_false (!activecnt)) 2248 if (expect_false (loop_done))
1967 break; 2249 break;
1968 2250
1969 /* we might have forked, so reify kernel state if necessary */ 2251 /* we might have forked, so reify kernel state if necessary */
1970 if (expect_false (postfork)) 2252 if (expect_false (postfork))
1971 loop_fork (EV_A); 2253 loop_fork (EV_A);
… …
1978 ev_tstamp waittime = 0.; 2260 ev_tstamp waittime = 0.;
1979 ev_tstamp sleeptime = 0.; 2261 ev_tstamp sleeptime = 0.;
1980 2262
1981 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2263 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1982 { 2264 {
2265 /* remember old timestamp for io_blocktime calculation */
2266 ev_tstamp prev_mn_now = mn_now;
2267
1983 /* update time to cancel out callback processing overhead */ 2268 /* update time to cancel out callback processing overhead */
1984 time_update (EV_A_ 1e100); 2269 time_update (EV_A_ 1e100);
1985 2270
1986 waittime = MAX_BLOCKTIME; 2271 waittime = MAX_BLOCKTIME;
1987 2272
… …
1997 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2282 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1998 if (waittime > to) waittime = to; 2283 if (waittime > to) waittime = to;
1999 } 2284 }
2000#endif 2285#endif
2001 2286
2287 /* don't let timeouts decrease the waittime below timeout_blocktime */
2002 if (expect_false (waittime < timeout_blocktime)) 2288 if (expect_false (waittime < timeout_blocktime))
2003 waittime = timeout_blocktime; 2289 waittime = timeout_blocktime;
2004 2290
2005 sleeptime = waittime - backend_fudge; 2291 /* extra check because io_blocktime is commonly 0 */
2006
2007 if (expect_true (sleeptime > io_blocktime)) 2292 if (expect_false (io_blocktime))
2008 sleeptime = io_blocktime;
2009
2010 if (sleeptime)
2011 { 2293 {
2294 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2295
2296 if (sleeptime > waittime - backend_fudge)
2297 sleeptime = waittime - backend_fudge;
2298
2299 if (expect_true (sleeptime > 0.))
2300 {
2012 ev_sleep (sleeptime); 2301 ev_sleep (sleeptime);
2013 waittime -= sleeptime; 2302 waittime -= sleeptime;
2303 }
2014 } 2304 }
2015 } 2305 }
2016 2306
2307#if EV_MINIMAL < 2
2017 ++loop_count; 2308 ++loop_count;
2309#endif
2310 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2018 backend_poll (EV_A_ waittime); 2311 backend_poll (EV_A_ waittime);
2312 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2019 2313
2020 /* update ev_rt_now, do magic */ 2314 /* update ev_rt_now, do magic */
2021 time_update (EV_A_ waittime + sleeptime); 2315 time_update (EV_A_ waittime + sleeptime);
2022 } 2316 }
2023 2317
… …
2034 2328
2035 /* queue check watchers, to be executed first */ 2329 /* queue check watchers, to be executed first */
2036 if (expect_false (checkcnt)) 2330 if (expect_false (checkcnt))
2037 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2331 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2038 2332
2039 call_pending (EV_A); 2333 EV_INVOKE_PENDING;
2040 } 2334 }
2041 while (expect_true ( 2335 while (expect_true (
2042 activecnt 2336 activecnt
2043 && !loop_done 2337 && !loop_done
2044 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2338 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2045 )); 2339 ));
2046 2340
2047 if (loop_done == EVUNLOOP_ONE) 2341 if (loop_done == EVUNLOOP_ONE)
2048 loop_done = EVUNLOOP_CANCEL; 2342 loop_done = EVUNLOOP_CANCEL;
2343
2344#if EV_MINIMAL < 2
2345 --loop_depth;
2346#endif
2049} 2347}
2050 2348
2051void 2349void
2052ev_unloop (EV_P_ int how) 2350ev_unloop (EV_P_ int how)
2053{ 2351{
2054 loop_done = how; 2352 loop_done = how;
2055} 2353}
2056 2354
2355void
2356ev_ref (EV_P)
2357{
2358 ++activecnt;
2359}
2360
2361void
2362ev_unref (EV_P)
2363{
2364 --activecnt;
2365}
2366
2367void
2368ev_now_update (EV_P)
2369{
2370 time_update (EV_A_ 1e100);
2371}
2372
2373void
2374ev_suspend (EV_P)
2375{
2376 ev_now_update (EV_A);
2377}
2378
2379void
2380ev_resume (EV_P)
2381{
2382 ev_tstamp mn_prev = mn_now;
2383
2384 ev_now_update (EV_A);
2385 timers_reschedule (EV_A_ mn_now - mn_prev);
2386#if EV_PERIODIC_ENABLE
2387 /* TODO: really do this? */
2388 periodics_reschedule (EV_A);
2389#endif
2390}
2391
2057/*****************************************************************************/ 2392/*****************************************************************************/
2393/* singly-linked list management, used when the expected list length is short */
2058 2394
2059void inline_size 2395inline_size void
2060wlist_add (WL *head, WL elem) 2396wlist_add (WL *head, WL elem)
2061{ 2397{
2062 elem->next = *head; 2398 elem->next = *head;
2063 *head = elem; 2399 *head = elem;
2064} 2400}
2065 2401
2066void inline_size 2402inline_size void
2067wlist_del (WL *head, WL elem) 2403wlist_del (WL *head, WL elem)
2068{ 2404{
2069 while (*head) 2405 while (*head)
2070 { 2406 {
2071 if (*head == elem) 2407 if (expect_true (*head == elem))
2072 { 2408 {
2073 *head = elem->next; 2409 *head = elem->next;
2074 return; 2410 break;
2075 } 2411 }
2076 2412
2077 head = &(*head)->next; 2413 head = &(*head)->next;
2078 } 2414 }
2079} 2415}
2080 2416
2081void inline_speed 2417/* internal, faster, version of ev_clear_pending */
2418inline_speed void
2082clear_pending (EV_P_ W w) 2419clear_pending (EV_P_ W w)
2083{ 2420{
2084 if (w->pending) 2421 if (w->pending)
2085 { 2422 {
2086 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2423 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2087 w->pending = 0; 2424 w->pending = 0;
2088 } 2425 }
2089} 2426}
2090 2427
2091int 2428int
… …
2095 int pending = w_->pending; 2432 int pending = w_->pending;
2096 2433
2097 if (expect_true (pending)) 2434 if (expect_true (pending))
2098 { 2435 {
2099 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2436 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2437 p->w = (W)&pending_w;
2100 w_->pending = 0; 2438 w_->pending = 0;
2101 p->w = 0;
2102 return p->events; 2439 return p->events;
2103 } 2440 }
2104 else 2441 else
2105 return 0; 2442 return 0;
2106} 2443}
2107 2444
2108void inline_size 2445inline_size void
2109pri_adjust (EV_P_ W w) 2446pri_adjust (EV_P_ W w)
2110{ 2447{
2111 int pri = w->priority; 2448 int pri = ev_priority (w);
2112 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2449 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2113 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2450 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2114 w->priority = pri; 2451 ev_set_priority (w, pri);
2115} 2452}
2116 2453
2117void inline_speed 2454inline_speed void
2118ev_start (EV_P_ W w, int active) 2455ev_start (EV_P_ W w, int active)
2119{ 2456{
2120 pri_adjust (EV_A_ w); 2457 pri_adjust (EV_A_ w);
2121 w->active = active; 2458 w->active = active;
2122 ev_ref (EV_A); 2459 ev_ref (EV_A);
2123} 2460}
2124 2461
2125void inline_size 2462inline_size void
2126ev_stop (EV_P_ W w) 2463ev_stop (EV_P_ W w)
2127{ 2464{
2128 ev_unref (EV_A); 2465 ev_unref (EV_A);
2129 w->active = 0; 2466 w->active = 0;
2130} 2467}
… …
2137 int fd = w->fd; 2474 int fd = w->fd;
2138 2475
2139 if (expect_false (ev_is_active (w))) 2476 if (expect_false (ev_is_active (w)))
2140 return; 2477 return;
2141 2478
2142 assert (("ev_io_start called with negative fd", fd >= 0)); 2479 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2480 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2143 2481
2144 EV_FREQUENT_CHECK; 2482 EV_FREQUENT_CHECK;
2145 2483
2146 ev_start (EV_A_ (W)w, 1); 2484 ev_start (EV_A_ (W)w, 1);
2147 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2485 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2148 wlist_add (&anfds[fd].head, (WL)w); 2486 wlist_add (&anfds[fd].head, (WL)w);
2149 2487
2150 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2488 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2151 w->events &= ~EV_IOFDSET; 2489 w->events &= ~EV__IOFDSET;
2152 2490
2153 EV_FREQUENT_CHECK; 2491 EV_FREQUENT_CHECK;
2154} 2492}
2155 2493
2156void noinline 2494void noinline
… …
2158{ 2496{
2159 clear_pending (EV_A_ (W)w); 2497 clear_pending (EV_A_ (W)w);
2160 if (expect_false (!ev_is_active (w))) 2498 if (expect_false (!ev_is_active (w)))
2161 return; 2499 return;
2162 2500
2163 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2501 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2164 2502
2165 EV_FREQUENT_CHECK; 2503 EV_FREQUENT_CHECK;
2166 2504
2167 wlist_del (&anfds[w->fd].head, (WL)w); 2505 wlist_del (&anfds[w->fd].head, (WL)w);
2168 ev_stop (EV_A_ (W)w); 2506 ev_stop (EV_A_ (W)w);
… …
2178 if (expect_false (ev_is_active (w))) 2516 if (expect_false (ev_is_active (w)))
2179 return; 2517 return;
2180 2518
2181 ev_at (w) += mn_now; 2519 ev_at (w) += mn_now;
2182 2520
2183 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2521 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2184 2522
2185 EV_FREQUENT_CHECK; 2523 EV_FREQUENT_CHECK;
2186 2524
2187 ++timercnt; 2525 ++timercnt;
2188 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2526 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2191 ANHE_at_cache (timers [ev_active (w)]); 2529 ANHE_at_cache (timers [ev_active (w)]);
2192 upheap (timers, ev_active (w)); 2530 upheap (timers, ev_active (w));
2193 2531
2194 EV_FREQUENT_CHECK; 2532 EV_FREQUENT_CHECK;
2195 2533
2196 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2534 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2197} 2535}
2198 2536
2199void noinline 2537void noinline
2200ev_timer_stop (EV_P_ ev_timer *w) 2538ev_timer_stop (EV_P_ ev_timer *w)
2201{ 2539{
… …
2206 EV_FREQUENT_CHECK; 2544 EV_FREQUENT_CHECK;
2207 2545
2208 { 2546 {
2209 int active = ev_active (w); 2547 int active = ev_active (w);
2210 2548
2211 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2549 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2212 2550
2213 --timercnt; 2551 --timercnt;
2214 2552
2215 if (expect_true (active < timercnt + HEAP0)) 2553 if (expect_true (active < timercnt + HEAP0))
2216 { 2554 {
… …
2249 } 2587 }
2250 2588
2251 EV_FREQUENT_CHECK; 2589 EV_FREQUENT_CHECK;
2252} 2590}
2253 2591
2592ev_tstamp
2593ev_timer_remaining (EV_P_ ev_timer *w)
2594{
2595 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2596}
2597
2254#if EV_PERIODIC_ENABLE 2598#if EV_PERIODIC_ENABLE
2255void noinline 2599void noinline
2256ev_periodic_start (EV_P_ ev_periodic *w) 2600ev_periodic_start (EV_P_ ev_periodic *w)
2257{ 2601{
2258 if (expect_false (ev_is_active (w))) 2602 if (expect_false (ev_is_active (w)))
… …
2260 2604
2261 if (w->reschedule_cb) 2605 if (w->reschedule_cb)
2262 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2606 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2263 else if (w->interval) 2607 else if (w->interval)
2264 { 2608 {
2265 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2609 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2266 /* this formula differs from the one in periodic_reify because we do not always round up */ 2610 /* this formula differs from the one in periodic_reify because we do not always round up */
2267 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2611 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2268 } 2612 }
2269 else 2613 else
2270 ev_at (w) = w->offset; 2614 ev_at (w) = w->offset;
… …
2278 ANHE_at_cache (periodics [ev_active (w)]); 2622 ANHE_at_cache (periodics [ev_active (w)]);
2279 upheap (periodics, ev_active (w)); 2623 upheap (periodics, ev_active (w));
2280 2624
2281 EV_FREQUENT_CHECK; 2625 EV_FREQUENT_CHECK;
2282 2626
2283 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2627 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2284} 2628}
2285 2629
2286void noinline 2630void noinline
2287ev_periodic_stop (EV_P_ ev_periodic *w) 2631ev_periodic_stop (EV_P_ ev_periodic *w)
2288{ 2632{
… …
2293 EV_FREQUENT_CHECK; 2637 EV_FREQUENT_CHECK;
2294 2638
2295 { 2639 {
2296 int active = ev_active (w); 2640 int active = ev_active (w);
2297 2641
2298 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2642 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2299 2643
2300 --periodiccnt; 2644 --periodiccnt;
2301 2645
2302 if (expect_true (active < periodiccnt + HEAP0)) 2646 if (expect_true (active < periodiccnt + HEAP0))
2303 { 2647 {
… …
2325#endif 2669#endif
2326 2670
2327void noinline 2671void noinline
2328ev_signal_start (EV_P_ ev_signal *w) 2672ev_signal_start (EV_P_ ev_signal *w)
2329{ 2673{
2330#if EV_MULTIPLICITY
2331 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2332#endif
2333 if (expect_false (ev_is_active (w))) 2674 if (expect_false (ev_is_active (w)))
2334 return; 2675 return;
2335 2676
2336 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2677 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2337 2678
2338 evpipe_init (EV_A); 2679#if EV_MULTIPLICITY
2680 assert (("libev: a signal must not be attached to two different loops",
2681 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2339 2682
2340 EV_FREQUENT_CHECK; 2683 signals [w->signum - 1].loop = EV_A;
2684#endif
2341 2685
2686 EV_FREQUENT_CHECK;
2687
2688#if EV_USE_SIGNALFD
2689 if (sigfd == -2)
2342 { 2690 {
2343#ifndef _WIN32 2691 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2344 sigset_t full, prev; 2692 if (sigfd < 0 && errno == EINVAL)
2345 sigfillset (&full); 2693 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2346 sigprocmask (SIG_SETMASK, &full, &prev);
2347#endif
2348 2694
2349 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2695 if (sigfd >= 0)
2696 {
2697 fd_intern (sigfd); /* doing it twice will not hurt */
2350 2698
2351#ifndef _WIN32 2699 sigemptyset (&sigfd_set);
2352 sigprocmask (SIG_SETMASK, &prev, 0); 2700
2353#endif 2701 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2702 ev_set_priority (&sigfd_w, EV_MAXPRI);
2703 ev_io_start (EV_A_ &sigfd_w);
2704 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2705 }
2354 } 2706 }
2707
2708 if (sigfd >= 0)
2709 {
2710 /* TODO: check .head */
2711 sigaddset (&sigfd_set, w->signum);
2712 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2713
2714 signalfd (sigfd, &sigfd_set, 0);
2715 }
2716#endif
2355 2717
2356 ev_start (EV_A_ (W)w, 1); 2718 ev_start (EV_A_ (W)w, 1);
2357 wlist_add (&signals [w->signum - 1].head, (WL)w); 2719 wlist_add (&signals [w->signum - 1].head, (WL)w);
2358 2720
2359 if (!((WL)w)->next) 2721 if (!((WL)w)->next)
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0) /*TODO*/
2724# endif
2360 { 2725 {
2361#if _WIN32 2726# if _WIN32
2362 signal (w->signum, ev_sighandler); 2727 signal (w->signum, ev_sighandler);
2363#else 2728# else
2364 struct sigaction sa; 2729 struct sigaction sa;
2730
2731 evpipe_init (EV_A);
2732
2365 sa.sa_handler = ev_sighandler; 2733 sa.sa_handler = ev_sighandler;
2366 sigfillset (&sa.sa_mask); 2734 sigfillset (&sa.sa_mask);
2367 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2735 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2368 sigaction (w->signum, &sa, 0); 2736 sigaction (w->signum, &sa, 0);
2737
2738 sigemptyset (&sa.sa_mask);
2739 sigaddset (&sa.sa_mask, w->signum);
2740 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2369#endif 2741#endif
2370 } 2742 }
2371 2743
2372 EV_FREQUENT_CHECK; 2744 EV_FREQUENT_CHECK;
2373} 2745}
2374 2746
2375void noinline 2747void noinline
… …
2383 2755
2384 wlist_del (&signals [w->signum - 1].head, (WL)w); 2756 wlist_del (&signals [w->signum - 1].head, (WL)w);
2385 ev_stop (EV_A_ (W)w); 2757 ev_stop (EV_A_ (W)w);
2386 2758
2387 if (!signals [w->signum - 1].head) 2759 if (!signals [w->signum - 1].head)
2760 {
2761#if EV_MULTIPLICITY
2762 signals [w->signum - 1].loop = 0; /* unattach from signal */
2763#endif
2764#if EV_USE_SIGNALFD
2765 if (sigfd >= 0)
2766 {
2767 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2768 sigdelset (&sigfd_set, w->signum);
2769 signalfd (sigfd, &sigfd_set, 0);
2770 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2771 /*TODO: maybe unblock signal? */
2772 }
2773 else
2774#endif
2388 signal (w->signum, SIG_DFL); 2775 signal (w->signum, SIG_DFL);
2776 }
2389 2777
2390 EV_FREQUENT_CHECK; 2778 EV_FREQUENT_CHECK;
2391} 2779}
2392 2780
2393void 2781void
2394ev_child_start (EV_P_ ev_child *w) 2782ev_child_start (EV_P_ ev_child *w)
2395{ 2783{
2396#if EV_MULTIPLICITY 2784#if EV_MULTIPLICITY
2397 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2785 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2398#endif 2786#endif
2399 if (expect_false (ev_is_active (w))) 2787 if (expect_false (ev_is_active (w)))
2400 return; 2788 return;
2401 2789
2402 EV_FREQUENT_CHECK; 2790 EV_FREQUENT_CHECK;
… …
2427# ifdef _WIN32 2815# ifdef _WIN32
2428# undef lstat 2816# undef lstat
2429# define lstat(a,b) _stati64 (a,b) 2817# define lstat(a,b) _stati64 (a,b)
2430# endif 2818# endif
2431 2819
2432#define DEF_STAT_INTERVAL 5.0074891 2820#define DEF_STAT_INTERVAL 5.0074891
2821#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2433#define MIN_STAT_INTERVAL 0.1074891 2822#define MIN_STAT_INTERVAL 0.1074891
2434 2823
2435static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2824static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2436 2825
2437#if EV_USE_INOTIFY 2826#if EV_USE_INOTIFY
2438# define EV_INOTIFY_BUFSIZE 8192 2827# define EV_INOTIFY_BUFSIZE 8192
… …
2442{ 2831{
2443 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); 2832 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);
2444 2833
2445 if (w->wd < 0) 2834 if (w->wd < 0)
2446 { 2835 {
2836 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2447 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2837 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2448 2838
2449 /* monitor some parent directory for speedup hints */ 2839 /* monitor some parent directory for speedup hints */
2450 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2840 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2451 /* but an efficiency issue only */ 2841 /* but an efficiency issue only */
2452 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2842 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2453 { 2843 {
2454 char path [4096]; 2844 char path [4096];
2455 strcpy (path, w->path); 2845 strcpy (path, w->path);
… …
2459 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2849 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2460 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2850 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2461 2851
2462 char *pend = strrchr (path, '/'); 2852 char *pend = strrchr (path, '/');
2463 2853
2464 if (!pend) 2854 if (!pend || pend == path)
2465 break; /* whoops, no '/', complain to your admin */ 2855 break;
2466 2856
2467 *pend = 0; 2857 *pend = 0;
2468 w->wd = inotify_add_watch (fs_fd, path, mask); 2858 w->wd = inotify_add_watch (fs_fd, path, mask);
2469 } 2859 }
2470 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2860 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2471 } 2861 }
2472 } 2862 }
2473 else
2474 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2475 2863
2476 if (w->wd >= 0) 2864 if (w->wd >= 0)
2865 {
2477 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2866 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2867
2868 /* now local changes will be tracked by inotify, but remote changes won't */
2869 /* unless the filesystem it known to be local, we therefore still poll */
2870 /* also do poll on <2.6.25, but with normal frequency */
2871 struct statfs sfs;
2872
2873 if (fs_2625 && !statfs (w->path, &sfs))
2874 if (sfs.f_type == 0x1373 /* devfs */
2875 || sfs.f_type == 0xEF53 /* ext2/3 */
2876 || sfs.f_type == 0x3153464a /* jfs */
2877 || sfs.f_type == 0x52654973 /* reiser3 */
2878 || sfs.f_type == 0x01021994 /* tempfs */
2879 || sfs.f_type == 0x58465342 /* xfs */)
2880 return;
2881
2882 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2883 ev_timer_again (EV_A_ &w->timer);
2884 }
2478} 2885}
2479 2886
2480static void noinline 2887static void noinline
2481infy_del (EV_P_ ev_stat *w) 2888infy_del (EV_P_ ev_stat *w)
2482{ 2889{
… …
2496 2903
2497static void noinline 2904static void noinline
2498infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2905infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2499{ 2906{
2500 if (slot < 0) 2907 if (slot < 0)
2501 /* overflow, need to check for all hahs slots */ 2908 /* overflow, need to check for all hash slots */
2502 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2909 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2503 infy_wd (EV_A_ slot, wd, ev); 2910 infy_wd (EV_A_ slot, wd, ev);
2504 else 2911 else
2505 { 2912 {
2506 WL w_; 2913 WL w_;
… …
2512 2919
2513 if (w->wd == wd || wd == -1) 2920 if (w->wd == wd || wd == -1)
2514 { 2921 {
2515 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2922 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2516 { 2923 {
2924 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2517 w->wd = -1; 2925 w->wd = -1;
2518 infy_add (EV_A_ w); /* re-add, no matter what */ 2926 infy_add (EV_A_ w); /* re-add, no matter what */
2519 } 2927 }
2520 2928
2521 stat_timer_cb (EV_A_ &w->timer, 0); 2929 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2534 2942
2535 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2943 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2536 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2944 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2537} 2945}
2538 2946
2539void inline_size 2947inline_size void
2948check_2625 (EV_P)
2949{
2950 /* kernels < 2.6.25 are borked
2951 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2952 */
2953 struct utsname buf;
2954 int major, minor, micro;
2955
2956 if (uname (&buf))
2957 return;
2958
2959 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2960 return;
2961
2962 if (major < 2
2963 || (major == 2 && minor < 6)
2964 || (major == 2 && minor == 6 && micro < 25))
2965 return;
2966
2967 fs_2625 = 1;
2968}
2969
2970inline_size void
2540infy_init (EV_P) 2971infy_init (EV_P)
2541{ 2972{
2542 if (fs_fd != -2) 2973 if (fs_fd != -2)
2543 return; 2974 return;
2975
2976 fs_fd = -1;
2977
2978 check_2625 (EV_A);
2544 2979
2545 fs_fd = inotify_init (); 2980 fs_fd = inotify_init ();
2546 2981
2547 if (fs_fd >= 0) 2982 if (fs_fd >= 0)
2548 { 2983 {
… …
2550 ev_set_priority (&fs_w, EV_MAXPRI); 2985 ev_set_priority (&fs_w, EV_MAXPRI);
2551 ev_io_start (EV_A_ &fs_w); 2986 ev_io_start (EV_A_ &fs_w);
2552 } 2987 }
2553} 2988}
2554 2989
2555void inline_size 2990inline_size void
2556infy_fork (EV_P) 2991infy_fork (EV_P)
2557{ 2992{
2558 int slot; 2993 int slot;
2559 2994
2560 if (fs_fd < 0) 2995 if (fs_fd < 0)
… …
2576 w->wd = -1; 3011 w->wd = -1;
2577 3012
2578 if (fs_fd >= 0) 3013 if (fs_fd >= 0)
2579 infy_add (EV_A_ w); /* re-add, no matter what */ 3014 infy_add (EV_A_ w); /* re-add, no matter what */
2580 else 3015 else
2581 ev_timer_start (EV_A_ &w->timer); 3016 ev_timer_again (EV_A_ &w->timer);
2582 } 3017 }
2583
2584 } 3018 }
2585} 3019}
2586 3020
2587#endif 3021#endif
2588 3022
… …
2624 || w->prev.st_atime != w->attr.st_atime 3058 || w->prev.st_atime != w->attr.st_atime
2625 || w->prev.st_mtime != w->attr.st_mtime 3059 || w->prev.st_mtime != w->attr.st_mtime
2626 || w->prev.st_ctime != w->attr.st_ctime 3060 || w->prev.st_ctime != w->attr.st_ctime
2627 ) { 3061 ) {
2628 #if EV_USE_INOTIFY 3062 #if EV_USE_INOTIFY
3063 if (fs_fd >= 0)
3064 {
2629 infy_del (EV_A_ w); 3065 infy_del (EV_A_ w);
2630 infy_add (EV_A_ w); 3066 infy_add (EV_A_ w);
2631 ev_stat_stat (EV_A_ w); /* avoid race... */ 3067 ev_stat_stat (EV_A_ w); /* avoid race... */
3068 }
2632 #endif 3069 #endif
2633 3070
2634 ev_feed_event (EV_A_ w, EV_STAT); 3071 ev_feed_event (EV_A_ w, EV_STAT);
2635 } 3072 }
2636} 3073}
… …
2639ev_stat_start (EV_P_ ev_stat *w) 3076ev_stat_start (EV_P_ ev_stat *w)
2640{ 3077{
2641 if (expect_false (ev_is_active (w))) 3078 if (expect_false (ev_is_active (w)))
2642 return; 3079 return;
2643 3080
2644 /* since we use memcmp, we need to clear any padding data etc. */
2645 memset (&w->prev, 0, sizeof (ev_statdata));
2646 memset (&w->attr, 0, sizeof (ev_statdata));
2647
2648 ev_stat_stat (EV_A_ w); 3081 ev_stat_stat (EV_A_ w);
2649 3082
3083 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2650 if (w->interval < MIN_STAT_INTERVAL) 3084 w->interval = MIN_STAT_INTERVAL;
2651 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2652 3085
2653 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3086 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2654 ev_set_priority (&w->timer, ev_priority (w)); 3087 ev_set_priority (&w->timer, ev_priority (w));
2655 3088
2656#if EV_USE_INOTIFY 3089#if EV_USE_INOTIFY
2657 infy_init (EV_A); 3090 infy_init (EV_A);
2658 3091
2659 if (fs_fd >= 0) 3092 if (fs_fd >= 0)
2660 infy_add (EV_A_ w); 3093 infy_add (EV_A_ w);
2661 else 3094 else
2662#endif 3095#endif
2663 ev_timer_start (EV_A_ &w->timer); 3096 ev_timer_again (EV_A_ &w->timer);
2664 3097
2665 ev_start (EV_A_ (W)w, 1); 3098 ev_start (EV_A_ (W)w, 1);
2666 3099
2667 EV_FREQUENT_CHECK; 3100 EV_FREQUENT_CHECK;
2668} 3101}
… …
2828embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3261embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2829{ 3262{
2830 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3263 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2831 3264
2832 { 3265 {
2833 struct ev_loop *loop = w->other; 3266 EV_P = w->other;
2834 3267
2835 while (fdchangecnt) 3268 while (fdchangecnt)
2836 { 3269 {
2837 fd_reify (EV_A); 3270 fd_reify (EV_A);
2838 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3271 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2843static void 3276static void
2844embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3277embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2845{ 3278{
2846 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3279 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2847 3280
3281 ev_embed_stop (EV_A_ w);
3282
2848 { 3283 {
2849 struct ev_loop *loop = w->other; 3284 EV_P = w->other;
2850 3285
2851 ev_loop_fork (EV_A); 3286 ev_loop_fork (EV_A);
3287 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2852 } 3288 }
3289
3290 ev_embed_start (EV_A_ w);
2853} 3291}
2854 3292
2855#if 0 3293#if 0
2856static void 3294static void
2857embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3295embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2865{ 3303{
2866 if (expect_false (ev_is_active (w))) 3304 if (expect_false (ev_is_active (w)))
2867 return; 3305 return;
2868 3306
2869 { 3307 {
2870 struct ev_loop *loop = w->other; 3308 EV_P = w->other;
2871 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3309 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2872 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3310 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2873 } 3311 }
2874 3312
2875 EV_FREQUENT_CHECK; 3313 EV_FREQUENT_CHECK;
2876 3314
… …
2987 3425
2988void 3426void
2989ev_async_send (EV_P_ ev_async *w) 3427ev_async_send (EV_P_ ev_async *w)
2990{ 3428{
2991 w->sent = 1; 3429 w->sent = 1;
2992 evpipe_write (EV_A_ &gotasync); 3430 evpipe_write (EV_A_ &async_pending);
2993} 3431}
2994#endif 3432#endif
2995 3433
2996/*****************************************************************************/ 3434/*****************************************************************************/
2997 3435
… …
3059 ev_timer_set (&once->to, timeout, 0.); 3497 ev_timer_set (&once->to, timeout, 0.);
3060 ev_timer_start (EV_A_ &once->to); 3498 ev_timer_start (EV_A_ &once->to);
3061 } 3499 }
3062} 3500}
3063 3501
3502/*****************************************************************************/
3503
3504#if EV_WALK_ENABLE
3505void
3506ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3507{
3508 int i, j;
3509 ev_watcher_list *wl, *wn;
3510
3511 if (types & (EV_IO | EV_EMBED))
3512 for (i = 0; i < anfdmax; ++i)
3513 for (wl = anfds [i].head; wl; )
3514 {
3515 wn = wl->next;
3516
3517#if EV_EMBED_ENABLE
3518 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3519 {
3520 if (types & EV_EMBED)
3521 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3522 }
3523 else
3524#endif
3525#if EV_USE_INOTIFY
3526 if (ev_cb ((ev_io *)wl) == infy_cb)
3527 ;
3528 else
3529#endif
3530 if ((ev_io *)wl != &pipe_w)
3531 if (types & EV_IO)
3532 cb (EV_A_ EV_IO, wl);
3533
3534 wl = wn;
3535 }
3536
3537 if (types & (EV_TIMER | EV_STAT))
3538 for (i = timercnt + HEAP0; i-- > HEAP0; )
3539#if EV_STAT_ENABLE
3540 /*TODO: timer is not always active*/
3541 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3542 {
3543 if (types & EV_STAT)
3544 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3545 }
3546 else
3547#endif
3548 if (types & EV_TIMER)
3549 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3550
3551#if EV_PERIODIC_ENABLE
3552 if (types & EV_PERIODIC)
3553 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3554 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3555#endif
3556
3557#if EV_IDLE_ENABLE
3558 if (types & EV_IDLE)
3559 for (j = NUMPRI; i--; )
3560 for (i = idlecnt [j]; i--; )
3561 cb (EV_A_ EV_IDLE, idles [j][i]);
3562#endif
3563
3564#if EV_FORK_ENABLE
3565 if (types & EV_FORK)
3566 for (i = forkcnt; i--; )
3567 if (ev_cb (forks [i]) != embed_fork_cb)
3568 cb (EV_A_ EV_FORK, forks [i]);
3569#endif
3570
3571#if EV_ASYNC_ENABLE
3572 if (types & EV_ASYNC)
3573 for (i = asynccnt; i--; )
3574 cb (EV_A_ EV_ASYNC, asyncs [i]);
3575#endif
3576
3577 if (types & EV_PREPARE)
3578 for (i = preparecnt; i--; )
3579#if EV_EMBED_ENABLE
3580 if (ev_cb (prepares [i]) != embed_prepare_cb)
3581#endif
3582 cb (EV_A_ EV_PREPARE, prepares [i]);
3583
3584 if (types & EV_CHECK)
3585 for (i = checkcnt; i--; )
3586 cb (EV_A_ EV_CHECK, checks [i]);
3587
3588 if (types & EV_SIGNAL)
3589 for (i = 0; i < EV_NSIG - 1; ++i)
3590 for (wl = signals [i].head; wl; )
3591 {
3592 wn = wl->next;
3593 cb (EV_A_ EV_SIGNAL, wl);
3594 wl = wn;
3595 }
3596
3597 if (types & EV_CHILD)
3598 for (i = EV_PID_HASHSIZE; i--; )
3599 for (wl = childs [i]; wl; )
3600 {
3601 wn = wl->next;
3602 cb (EV_A_ EV_CHILD, wl);
3603 wl = wn;
3604 }
3605/* EV_STAT 0x00001000 /* stat data changed */
3606/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3607}
3608#endif
3609
3064#if EV_MULTIPLICITY 3610#if EV_MULTIPLICITY
3065 #include "ev_wrap.h" 3611 #include "ev_wrap.h"
3066#endif 3612#endif
3067 3613
3068#ifdef __cplusplus 3614#ifdef __cplusplus

Diff Legend

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