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.306 by root, Sun Jul 19 06:35:25 2009 UTC

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

Diff Legend

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