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

Diff Legend

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