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

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

Diff Legend

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