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

Comparing libev/ev.c (file contents):
Revision 1.274 by root, Thu Nov 20 00:35:10 2008 UTC vs.
Revision 1.313 by root, Wed Aug 19 23:44:51 2009 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
57# endif 57# endif
58# ifndef EV_USE_MONOTONIC 58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 59# define EV_USE_MONOTONIC 1
60# endif 60# endif
61# endif 61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
62# endif 64# endif
63 65
64# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
67# endif 69# endif
68# ifndef EV_USE_REALTIME 70# ifndef EV_USE_REALTIME
69# define EV_USE_REALTIME 1 71# define EV_USE_REALTIME 0
70# endif 72# endif
71# else 73# else
72# ifndef EV_USE_MONOTONIC 74# ifndef EV_USE_MONOTONIC
73# define EV_USE_MONOTONIC 0 75# define EV_USE_MONOTONIC 0
74# endif 76# endif
… …
131# else 133# else
132# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
133# endif 135# endif
134# endif 136# endif
135 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
136# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
137# if HAVE_EVENTFD 147# if HAVE_EVENTFD
138# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
139# else 149# else
140# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
… …
176# endif 186# endif
177#endif 187#endif
178 188
179/* 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 */
180 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
181#ifndef EV_USE_CLOCK_SYSCALL 218#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
184# else 221# else
185# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
… …
193# define EV_USE_MONOTONIC 0 230# define EV_USE_MONOTONIC 0
194# endif 231# endif
195#endif 232#endif
196 233
197#ifndef EV_USE_REALTIME 234#ifndef EV_USE_REALTIME
198# define EV_USE_REALTIME 0 235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
199#endif 236#endif
200 237
201#ifndef EV_USE_NANOSLEEP 238#ifndef EV_USE_NANOSLEEP
202# if _POSIX_C_SOURCE >= 199309L 239# if _POSIX_C_SOURCE >= 199309L
203# define EV_USE_NANOSLEEP 1 240# define EV_USE_NANOSLEEP 1
… …
264# else 301# else
265# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
266# endif 303# endif
267#endif 304#endif
268 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
269#if 0 /* debugging */ 314#if 0 /* debugging */
270# define EV_VERIFY 3 315# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 316# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 317# define EV_HEAP_CACHE_AT 1
273#endif 318#endif
… …
280# define EV_USE_4HEAP !EV_MINIMAL 325# define EV_USE_4HEAP !EV_MINIMAL
281#endif 326#endif
282 327
283#ifndef EV_HEAP_CACHE_AT 328#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 329# define EV_HEAP_CACHE_AT !EV_MINIMAL
330#endif
331
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
333/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL
335# include <syscall.h>
336# ifdef SYS_clock_gettime
337# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
338# undef EV_USE_MONOTONIC
339# define EV_USE_MONOTONIC 1
340# else
341# undef EV_USE_CLOCK_SYSCALL
342# define EV_USE_CLOCK_SYSCALL 0
343# endif
285#endif 344#endif
286 345
287/* 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 */
288 347
289#ifndef CLOCK_MONOTONIC 348#ifndef CLOCK_MONOTONIC
… …
320 379
321#if EV_SELECT_IS_WINSOCKET 380#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 381# include <winsock.h>
323#endif 382#endif
324 383
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
335/* 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 */
336# include <stdint.h> 386# include <stdint.h>
387# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK
389# endif
390# ifndef EFD_CLOEXEC
391# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC
393# else
394# define EFD_CLOEXEC 02000000
395# endif
396# endif
337# ifdef __cplusplus 397# ifdef __cplusplus
338extern "C" { 398extern "C" {
339# endif 399# endif
340int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
341# ifdef __cplusplus 401# ifdef __cplusplus
342} 402}
343# endif 403# endif
404#endif
405
406#if EV_USE_SIGNALFD
407# include <sys/signalfd.h>
344#endif 408#endif
345 409
346/**/ 410/**/
347 411
348#if EV_VERIFY >= 3 412#if EV_VERIFY >= 3
… …
384# define inline_speed static noinline 448# define inline_speed static noinline
385#else 449#else
386# define inline_speed static inline 450# define inline_speed static inline
387#endif 451#endif
388 452
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 453#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
454
455#if EV_MINPRI == EV_MAXPRI
456# define ABSPRI(w) (((W)w), 0)
457#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 458# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
459#endif
391 460
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 461#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 462#define EMPTY2(a,b) /* used to suppress some warnings */
394 463
395typedef ev_watcher *W; 464typedef ev_watcher *W;
… …
397typedef ev_watcher_time *WT; 466typedef ev_watcher_time *WT;
398 467
399#define ev_active(w) ((W)(w))->active 468#define ev_active(w) ((W)(w))->active
400#define ev_at(w) ((WT)(w))->at 469#define ev_at(w) ((WT)(w))->at
401 470
402#if EV_USE_MONOTONIC 471#if EV_USE_REALTIME
403/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 472/* sig_atomic_t is used to avoid per-thread variables or locking but still */
404/* giving it a reasonably high chance of working on typical architetcures */ 473/* giving it a reasonably high chance of working on typical architetcures */
474static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
475#endif
476
477#if EV_USE_MONOTONIC
405static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 478static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
479#endif
480
481#ifndef EV_FD_TO_WIN32_HANDLE
482# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
483#endif
484#ifndef EV_WIN32_HANDLE_TO_FD
485# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
486#endif
487#ifndef EV_WIN32_CLOSE_FD
488# define EV_WIN32_CLOSE_FD(fd) close (fd)
406#endif 489#endif
407 490
408#ifdef _WIN32 491#ifdef _WIN32
409# include "ev_win32.c" 492# include "ev_win32.c"
410#endif 493#endif
… …
474#define ev_malloc(size) ev_realloc (0, (size)) 557#define ev_malloc(size) ev_realloc (0, (size))
475#define ev_free(ptr) ev_realloc ((ptr), 0) 558#define ev_free(ptr) ev_realloc ((ptr), 0)
476 559
477/*****************************************************************************/ 560/*****************************************************************************/
478 561
562/* set in reify when reification needed */
563#define EV_ANFD_REIFY 1
564
565/* file descriptor info structure */
479typedef struct 566typedef struct
480{ 567{
481 WL head; 568 WL head;
482 unsigned char events; 569 unsigned char events; /* the events watched for */
483 unsigned char reify; 570 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
484 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 571 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
485 unsigned char unused; 572 unsigned char unused;
486#if EV_USE_EPOLL 573#if EV_USE_EPOLL
487 unsigned int egen; /* generation counter to counter epoll bugs */ 574 unsigned int egen; /* generation counter to counter epoll bugs */
488#endif 575#endif
489#if EV_SELECT_IS_WINSOCKET 576#if EV_SELECT_IS_WINSOCKET
490 SOCKET handle; 577 SOCKET handle;
491#endif 578#endif
492} ANFD; 579} ANFD;
493 580
581/* stores the pending event set for a given watcher */
494typedef struct 582typedef struct
495{ 583{
496 W w; 584 W w;
497 int events; 585 int events; /* the pending event set for the given watcher */
498} ANPENDING; 586} ANPENDING;
499 587
500#if EV_USE_INOTIFY 588#if EV_USE_INOTIFY
501/* hash table entry per inotify-id */ 589/* hash table entry per inotify-id */
502typedef struct 590typedef struct
… …
505} ANFS; 593} ANFS;
506#endif 594#endif
507 595
508/* Heap Entry */ 596/* Heap Entry */
509#if EV_HEAP_CACHE_AT 597#if EV_HEAP_CACHE_AT
598 /* a heap element */
510 typedef struct { 599 typedef struct {
511 ev_tstamp at; 600 ev_tstamp at;
512 WT w; 601 WT w;
513 } ANHE; 602 } ANHE;
514 603
515 #define ANHE_w(he) (he).w /* access watcher, read-write */ 604 #define ANHE_w(he) (he).w /* access watcher, read-write */
516 #define ANHE_at(he) (he).at /* access cached at, read-only */ 605 #define ANHE_at(he) (he).at /* access cached at, read-only */
517 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 606 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
518#else 607#else
608 /* a heap element */
519 typedef WT ANHE; 609 typedef WT ANHE;
520 610
521 #define ANHE_w(he) (he) 611 #define ANHE_w(he) (he)
522 #define ANHE_at(he) (he)->at 612 #define ANHE_at(he) (he)->at
523 #define ANHE_at_cache(he) 613 #define ANHE_at_cache(he)
… …
547 637
548 static int ev_default_loop_ptr; 638 static int ev_default_loop_ptr;
549 639
550#endif 640#endif
551 641
642#if EV_MINIMAL < 2
643# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
644# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
645# define EV_INVOKE_PENDING invoke_cb (EV_A)
646#else
647# define EV_RELEASE_CB (void)0
648# define EV_ACQUIRE_CB (void)0
649# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
650#endif
651
652#define EVUNLOOP_RECURSE 0x80
653
552/*****************************************************************************/ 654/*****************************************************************************/
553 655
656#ifndef EV_HAVE_EV_TIME
554ev_tstamp 657ev_tstamp
555ev_time (void) 658ev_time (void)
556{ 659{
557#if EV_USE_REALTIME 660#if EV_USE_REALTIME
661 if (expect_true (have_realtime))
662 {
558 struct timespec ts; 663 struct timespec ts;
559 clock_gettime (CLOCK_REALTIME, &ts); 664 clock_gettime (CLOCK_REALTIME, &ts);
560 return ts.tv_sec + ts.tv_nsec * 1e-9; 665 return ts.tv_sec + ts.tv_nsec * 1e-9;
561#else 666 }
667#endif
668
562 struct timeval tv; 669 struct timeval tv;
563 gettimeofday (&tv, 0); 670 gettimeofday (&tv, 0);
564 return tv.tv_sec + tv.tv_usec * 1e-6; 671 return tv.tv_sec + tv.tv_usec * 1e-6;
565#endif
566} 672}
673#endif
567 674
568ev_tstamp inline_size 675inline_size ev_tstamp
569get_clock (void) 676get_clock (void)
570{ 677{
571#if EV_USE_MONOTONIC 678#if EV_USE_MONOTONIC
572 if (expect_true (have_monotonic)) 679 if (expect_true (have_monotonic))
573 { 680 {
… …
607 714
608 tv.tv_sec = (time_t)delay; 715 tv.tv_sec = (time_t)delay;
609 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 716 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
610 717
611 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 718 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
612 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 719 /* something not guaranteed by newer posix versions, but guaranteed */
613 /* by older ones */ 720 /* by older ones */
614 select (0, 0, 0, 0, &tv); 721 select (0, 0, 0, 0, &tv);
615#endif 722#endif
616 } 723 }
617} 724}
618 725
619/*****************************************************************************/ 726/*****************************************************************************/
620 727
621#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 728#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
622 729
623int inline_size 730/* find a suitable new size for the given array, */
731/* hopefully by rounding to a ncie-to-malloc size */
732inline_size int
624array_nextsize (int elem, int cur, int cnt) 733array_nextsize (int elem, int cur, int cnt)
625{ 734{
626 int ncur = cur + 1; 735 int ncur = cur + 1;
627 736
628 do 737 do
… …
669 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 778 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
670 } 779 }
671#endif 780#endif
672 781
673#define array_free(stem, idx) \ 782#define array_free(stem, idx) \
674 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 783 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
675 784
676/*****************************************************************************/ 785/*****************************************************************************/
786
787/* dummy callback for pending events */
788static void noinline
789pendingcb (EV_P_ ev_prepare *w, int revents)
790{
791}
677 792
678void noinline 793void noinline
679ev_feed_event (EV_P_ void *w, int revents) 794ev_feed_event (EV_P_ void *w, int revents)
680{ 795{
681 W w_ = (W)w; 796 W w_ = (W)w;
… …
690 pendings [pri][w_->pending - 1].w = w_; 805 pendings [pri][w_->pending - 1].w = w_;
691 pendings [pri][w_->pending - 1].events = revents; 806 pendings [pri][w_->pending - 1].events = revents;
692 } 807 }
693} 808}
694 809
695void inline_speed 810inline_speed void
811feed_reverse (EV_P_ W w)
812{
813 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
814 rfeeds [rfeedcnt++] = w;
815}
816
817inline_size void
818feed_reverse_done (EV_P_ int revents)
819{
820 do
821 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
822 while (rfeedcnt);
823}
824
825inline_speed void
696queue_events (EV_P_ W *events, int eventcnt, int type) 826queue_events (EV_P_ W *events, int eventcnt, int type)
697{ 827{
698 int i; 828 int i;
699 829
700 for (i = 0; i < eventcnt; ++i) 830 for (i = 0; i < eventcnt; ++i)
701 ev_feed_event (EV_A_ events [i], type); 831 ev_feed_event (EV_A_ events [i], type);
702} 832}
703 833
704/*****************************************************************************/ 834/*****************************************************************************/
705 835
706void inline_speed 836inline_speed void
707fd_event (EV_P_ int fd, int revents) 837fd_event_nc (EV_P_ int fd, int revents)
708{ 838{
709 ANFD *anfd = anfds + fd; 839 ANFD *anfd = anfds + fd;
710 ev_io *w; 840 ev_io *w;
711 841
712 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 842 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
716 if (ev) 846 if (ev)
717 ev_feed_event (EV_A_ (W)w, ev); 847 ev_feed_event (EV_A_ (W)w, ev);
718 } 848 }
719} 849}
720 850
851/* do not submit kernel events for fds that have reify set */
852/* because that means they changed while we were polling for new events */
853inline_speed void
854fd_event (EV_P_ int fd, int revents)
855{
856 ANFD *anfd = anfds + fd;
857
858 if (expect_true (!anfd->reify))
859 fd_event_nc (EV_A_ fd, revents);
860}
861
721void 862void
722ev_feed_fd_event (EV_P_ int fd, int revents) 863ev_feed_fd_event (EV_P_ int fd, int revents)
723{ 864{
724 if (fd >= 0 && fd < anfdmax) 865 if (fd >= 0 && fd < anfdmax)
725 fd_event (EV_A_ fd, revents); 866 fd_event_nc (EV_A_ fd, revents);
726} 867}
727 868
728void inline_size 869/* make sure the external fd watch events are in-sync */
870/* with the kernel/libev internal state */
871inline_size void
729fd_reify (EV_P) 872fd_reify (EV_P)
730{ 873{
731 int i; 874 int i;
732 875
733 for (i = 0; i < fdchangecnt; ++i) 876 for (i = 0; i < fdchangecnt; ++i)
… …
743 886
744#if EV_SELECT_IS_WINSOCKET 887#if EV_SELECT_IS_WINSOCKET
745 if (events) 888 if (events)
746 { 889 {
747 unsigned long arg; 890 unsigned long arg;
748 #ifdef EV_FD_TO_WIN32_HANDLE
749 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 891 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
750 #else
751 anfd->handle = _get_osfhandle (fd);
752 #endif
753 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 892 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
754 } 893 }
755#endif 894#endif
756 895
757 { 896 {
758 unsigned char o_events = anfd->events; 897 unsigned char o_events = anfd->events;
759 unsigned char o_reify = anfd->reify; 898 unsigned char o_reify = anfd->reify;
760 899
761 anfd->reify = 0; 900 anfd->reify = 0;
762 anfd->events = events; 901 anfd->events = events;
763 902
764 if (o_events != events || o_reify & EV_IOFDSET) 903 if (o_events != events || o_reify & EV__IOFDSET)
765 backend_modify (EV_A_ fd, o_events, events); 904 backend_modify (EV_A_ fd, o_events, events);
766 } 905 }
767 } 906 }
768 907
769 fdchangecnt = 0; 908 fdchangecnt = 0;
770} 909}
771 910
772void inline_size 911/* something about the given fd changed */
912inline_size void
773fd_change (EV_P_ int fd, int flags) 913fd_change (EV_P_ int fd, int flags)
774{ 914{
775 unsigned char reify = anfds [fd].reify; 915 unsigned char reify = anfds [fd].reify;
776 anfds [fd].reify |= flags; 916 anfds [fd].reify |= flags;
777 917
… …
781 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 921 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
782 fdchanges [fdchangecnt - 1] = fd; 922 fdchanges [fdchangecnt - 1] = fd;
783 } 923 }
784} 924}
785 925
786void inline_speed 926/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
927inline_speed void
787fd_kill (EV_P_ int fd) 928fd_kill (EV_P_ int fd)
788{ 929{
789 ev_io *w; 930 ev_io *w;
790 931
791 while ((w = (ev_io *)anfds [fd].head)) 932 while ((w = (ev_io *)anfds [fd].head))
… …
793 ev_io_stop (EV_A_ w); 934 ev_io_stop (EV_A_ w);
794 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 935 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
795 } 936 }
796} 937}
797 938
798int inline_size 939/* check whether the given fd is atcually valid, for error recovery */
940inline_size int
799fd_valid (int fd) 941fd_valid (int fd)
800{ 942{
801#ifdef _WIN32 943#ifdef _WIN32
802 return _get_osfhandle (fd) != -1; 944 return _get_osfhandle (fd) != -1;
803#else 945#else
… …
825 967
826 for (fd = anfdmax; fd--; ) 968 for (fd = anfdmax; fd--; )
827 if (anfds [fd].events) 969 if (anfds [fd].events)
828 { 970 {
829 fd_kill (EV_A_ fd); 971 fd_kill (EV_A_ fd);
830 return; 972 break;
831 } 973 }
832} 974}
833 975
834/* usually called after fork if backend needs to re-arm all fds from scratch */ 976/* usually called after fork if backend needs to re-arm all fds from scratch */
835static void noinline 977static void noinline
… …
840 for (fd = 0; fd < anfdmax; ++fd) 982 for (fd = 0; fd < anfdmax; ++fd)
841 if (anfds [fd].events) 983 if (anfds [fd].events)
842 { 984 {
843 anfds [fd].events = 0; 985 anfds [fd].events = 0;
844 anfds [fd].emask = 0; 986 anfds [fd].emask = 0;
845 fd_change (EV_A_ fd, EV_IOFDSET | 1); 987 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
846 } 988 }
847} 989}
848 990
849/*****************************************************************************/ 991/*****************************************************************************/
850 992
… …
866#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1008#define HEAP0 (DHEAP - 1) /* index of first element in heap */
867#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1009#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
868#define UPHEAP_DONE(p,k) ((p) == (k)) 1010#define UPHEAP_DONE(p,k) ((p) == (k))
869 1011
870/* away from the root */ 1012/* away from the root */
871void inline_speed 1013inline_speed void
872downheap (ANHE *heap, int N, int k) 1014downheap (ANHE *heap, int N, int k)
873{ 1015{
874 ANHE he = heap [k]; 1016 ANHE he = heap [k];
875 ANHE *E = heap + N + HEAP0; 1017 ANHE *E = heap + N + HEAP0;
876 1018
… …
916#define HEAP0 1 1058#define HEAP0 1
917#define HPARENT(k) ((k) >> 1) 1059#define HPARENT(k) ((k) >> 1)
918#define UPHEAP_DONE(p,k) (!(p)) 1060#define UPHEAP_DONE(p,k) (!(p))
919 1061
920/* away from the root */ 1062/* away from the root */
921void inline_speed 1063inline_speed void
922downheap (ANHE *heap, int N, int k) 1064downheap (ANHE *heap, int N, int k)
923{ 1065{
924 ANHE he = heap [k]; 1066 ANHE he = heap [k];
925 1067
926 for (;;) 1068 for (;;)
927 { 1069 {
928 int c = k << 1; 1070 int c = k << 1;
929 1071
930 if (c > N + HEAP0 - 1) 1072 if (c >= N + HEAP0)
931 break; 1073 break;
932 1074
933 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1075 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
934 ? 1 : 0; 1076 ? 1 : 0;
935 1077
… …
946 ev_active (ANHE_w (he)) = k; 1088 ev_active (ANHE_w (he)) = k;
947} 1089}
948#endif 1090#endif
949 1091
950/* towards the root */ 1092/* towards the root */
951void inline_speed 1093inline_speed void
952upheap (ANHE *heap, int k) 1094upheap (ANHE *heap, int k)
953{ 1095{
954 ANHE he = heap [k]; 1096 ANHE he = heap [k];
955 1097
956 for (;;) 1098 for (;;)
… …
967 1109
968 heap [k] = he; 1110 heap [k] = he;
969 ev_active (ANHE_w (he)) = k; 1111 ev_active (ANHE_w (he)) = k;
970} 1112}
971 1113
972void inline_size 1114/* move an element suitably so it is in a correct place */
1115inline_size void
973adjustheap (ANHE *heap, int N, int k) 1116adjustheap (ANHE *heap, int N, int k)
974{ 1117{
975 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1118 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
976 upheap (heap, k); 1119 upheap (heap, k);
977 else 1120 else
978 downheap (heap, N, k); 1121 downheap (heap, N, k);
979} 1122}
980 1123
981/* rebuild the heap: this function is used only once and executed rarely */ 1124/* rebuild the heap: this function is used only once and executed rarely */
982void inline_size 1125inline_size void
983reheap (ANHE *heap, int N) 1126reheap (ANHE *heap, int N)
984{ 1127{
985 int i; 1128 int i;
986 1129
987 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1130 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
990 upheap (heap, i + HEAP0); 1133 upheap (heap, i + HEAP0);
991} 1134}
992 1135
993/*****************************************************************************/ 1136/*****************************************************************************/
994 1137
1138/* associate signal watchers to a signal signal */
995typedef struct 1139typedef struct
996{ 1140{
1141 EV_ATOMIC_T pending;
1142#if EV_MULTIPLICITY
1143 EV_P;
1144#endif
997 WL head; 1145 WL head;
998 EV_ATOMIC_T gotsig;
999} ANSIG; 1146} ANSIG;
1000 1147
1001static ANSIG *signals; 1148static ANSIG signals [EV_NSIG - 1];
1002static int signalmax;
1003
1004static EV_ATOMIC_T gotsig;
1005 1149
1006/*****************************************************************************/ 1150/*****************************************************************************/
1007 1151
1008void inline_speed 1152/* used to prepare libev internal fd's */
1153/* this is not fork-safe */
1154inline_speed void
1009fd_intern (int fd) 1155fd_intern (int fd)
1010{ 1156{
1011#ifdef _WIN32 1157#ifdef _WIN32
1012 unsigned long arg = 1; 1158 unsigned long arg = 1;
1013 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1159 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
1018} 1164}
1019 1165
1020static void noinline 1166static void noinline
1021evpipe_init (EV_P) 1167evpipe_init (EV_P)
1022{ 1168{
1023 if (!ev_is_active (&pipeev)) 1169 if (!ev_is_active (&pipe_w))
1024 { 1170 {
1025#if EV_USE_EVENTFD 1171#if EV_USE_EVENTFD
1172 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1173 if (evfd < 0 && errno == EINVAL)
1026 if ((evfd = eventfd (0, 0)) >= 0) 1174 evfd = eventfd (0, 0);
1175
1176 if (evfd >= 0)
1027 { 1177 {
1028 evpipe [0] = -1; 1178 evpipe [0] = -1;
1029 fd_intern (evfd); 1179 fd_intern (evfd); /* doing it twice doesn't hurt */
1030 ev_io_set (&pipeev, evfd, EV_READ); 1180 ev_io_set (&pipe_w, evfd, EV_READ);
1031 } 1181 }
1032 else 1182 else
1033#endif 1183#endif
1034 { 1184 {
1035 while (pipe (evpipe)) 1185 while (pipe (evpipe))
1036 ev_syserr ("(libev) error creating signal/async pipe"); 1186 ev_syserr ("(libev) error creating signal/async pipe");
1037 1187
1038 fd_intern (evpipe [0]); 1188 fd_intern (evpipe [0]);
1039 fd_intern (evpipe [1]); 1189 fd_intern (evpipe [1]);
1040 ev_io_set (&pipeev, evpipe [0], EV_READ); 1190 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1041 } 1191 }
1042 1192
1043 ev_io_start (EV_A_ &pipeev); 1193 ev_io_start (EV_A_ &pipe_w);
1044 ev_unref (EV_A); /* watcher should not keep loop alive */ 1194 ev_unref (EV_A); /* watcher should not keep loop alive */
1045 } 1195 }
1046} 1196}
1047 1197
1048void inline_size 1198inline_size void
1049evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1199evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1050{ 1200{
1051 if (!*flag) 1201 if (!*flag)
1052 { 1202 {
1053 int old_errno = errno; /* save errno because write might clobber it */ 1203 int old_errno = errno; /* save errno because write might clobber it */
… …
1066 1216
1067 errno = old_errno; 1217 errno = old_errno;
1068 } 1218 }
1069} 1219}
1070 1220
1221/* called whenever the libev signal pipe */
1222/* got some events (signal, async) */
1071static void 1223static void
1072pipecb (EV_P_ ev_io *iow, int revents) 1224pipecb (EV_P_ ev_io *iow, int revents)
1073{ 1225{
1226 int i;
1227
1074#if EV_USE_EVENTFD 1228#if EV_USE_EVENTFD
1075 if (evfd >= 0) 1229 if (evfd >= 0)
1076 { 1230 {
1077 uint64_t counter; 1231 uint64_t counter;
1078 read (evfd, &counter, sizeof (uint64_t)); 1232 read (evfd, &counter, sizeof (uint64_t));
… …
1082 { 1236 {
1083 char dummy; 1237 char dummy;
1084 read (evpipe [0], &dummy, 1); 1238 read (evpipe [0], &dummy, 1);
1085 } 1239 }
1086 1240
1087 if (gotsig && ev_is_default_loop (EV_A)) 1241 if (sig_pending)
1088 { 1242 {
1089 int signum; 1243 sig_pending = 0;
1090 gotsig = 0;
1091 1244
1092 for (signum = signalmax; signum--; ) 1245 for (i = EV_NSIG - 1; i--; )
1093 if (signals [signum].gotsig) 1246 if (expect_false (signals [i].pending))
1094 ev_feed_signal_event (EV_A_ signum + 1); 1247 ev_feed_signal_event (EV_A_ i + 1);
1095 } 1248 }
1096 1249
1097#if EV_ASYNC_ENABLE 1250#if EV_ASYNC_ENABLE
1098 if (gotasync) 1251 if (async_pending)
1099 { 1252 {
1100 int i; 1253 async_pending = 0;
1101 gotasync = 0;
1102 1254
1103 for (i = asynccnt; i--; ) 1255 for (i = asynccnt; i--; )
1104 if (asyncs [i]->sent) 1256 if (asyncs [i]->sent)
1105 { 1257 {
1106 asyncs [i]->sent = 0; 1258 asyncs [i]->sent = 0;
… …
1114 1266
1115static void 1267static void
1116ev_sighandler (int signum) 1268ev_sighandler (int signum)
1117{ 1269{
1118#if EV_MULTIPLICITY 1270#if EV_MULTIPLICITY
1119 struct ev_loop *loop = &default_loop_struct; 1271 EV_P = signals [signum - 1].loop;
1120#endif 1272#endif
1121 1273
1122#if _WIN32 1274#if _WIN32
1123 signal (signum, ev_sighandler); 1275 signal (signum, ev_sighandler);
1124#endif 1276#endif
1125 1277
1126 signals [signum - 1].gotsig = 1; 1278 signals [signum - 1].pending = 1;
1127 evpipe_write (EV_A_ &gotsig); 1279 evpipe_write (EV_A_ &sig_pending);
1128} 1280}
1129 1281
1130void noinline 1282void noinline
1131ev_feed_signal_event (EV_P_ int signum) 1283ev_feed_signal_event (EV_P_ int signum)
1132{ 1284{
1133 WL w; 1285 WL w;
1134 1286
1287 if (expect_false (signum <= 0 || signum > EV_NSIG))
1288 return;
1289
1290 --signum;
1291
1135#if EV_MULTIPLICITY 1292#if EV_MULTIPLICITY
1136 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1293 /* it is permissible to try to feed a signal to the wrong loop */
1137#endif 1294 /* or, likely more useful, feeding a signal nobody is waiting for */
1138 1295
1139 --signum; 1296 if (expect_false (signals [signum].loop != EV_A))
1140
1141 if (signum < 0 || signum >= signalmax)
1142 return; 1297 return;
1298#endif
1143 1299
1144 signals [signum].gotsig = 0; 1300 signals [signum].pending = 0;
1145 1301
1146 for (w = signals [signum].head; w; w = w->next) 1302 for (w = signals [signum].head; w; w = w->next)
1147 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1303 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1148} 1304}
1149 1305
1306#if EV_USE_SIGNALFD
1307static void
1308sigfdcb (EV_P_ ev_io *iow, int revents)
1309{
1310 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1311
1312 for (;;)
1313 {
1314 ssize_t res = read (sigfd, si, sizeof (si));
1315
1316 /* not ISO-C, as res might be -1, but works with SuS */
1317 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1318 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1319
1320 if (res < (ssize_t)sizeof (si))
1321 break;
1322 }
1323}
1324#endif
1325
1150/*****************************************************************************/ 1326/*****************************************************************************/
1151 1327
1152static WL childs [EV_PID_HASHSIZE]; 1328static WL childs [EV_PID_HASHSIZE];
1153 1329
1154#ifndef _WIN32 1330#ifndef _WIN32
… …
1157 1333
1158#ifndef WIFCONTINUED 1334#ifndef WIFCONTINUED
1159# define WIFCONTINUED(status) 0 1335# define WIFCONTINUED(status) 0
1160#endif 1336#endif
1161 1337
1162void inline_speed 1338/* handle a single child status event */
1339inline_speed void
1163child_reap (EV_P_ int chain, int pid, int status) 1340child_reap (EV_P_ int chain, int pid, int status)
1164{ 1341{
1165 ev_child *w; 1342 ev_child *w;
1166 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1343 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1167 1344
… …
1180 1357
1181#ifndef WCONTINUED 1358#ifndef WCONTINUED
1182# define WCONTINUED 0 1359# define WCONTINUED 0
1183#endif 1360#endif
1184 1361
1362/* called on sigchld etc., calls waitpid */
1185static void 1363static void
1186childcb (EV_P_ ev_signal *sw, int revents) 1364childcb (EV_P_ ev_signal *sw, int revents)
1187{ 1365{
1188 int pid, status; 1366 int pid, status;
1189 1367
… …
1270 /* kqueue is borked on everything but netbsd apparently */ 1448 /* kqueue is borked on everything but netbsd apparently */
1271 /* it usually doesn't work correctly on anything but sockets and pipes */ 1449 /* it usually doesn't work correctly on anything but sockets and pipes */
1272 flags &= ~EVBACKEND_KQUEUE; 1450 flags &= ~EVBACKEND_KQUEUE;
1273#endif 1451#endif
1274#ifdef __APPLE__ 1452#ifdef __APPLE__
1275 // flags &= ~EVBACKEND_KQUEUE; for documentation 1453 /* only select works correctly on that "unix-certified" platform */
1276 flags &= ~EVBACKEND_POLL; 1454 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1455 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1277#endif 1456#endif
1278 1457
1279 return flags; 1458 return flags;
1280} 1459}
1281 1460
… …
1295ev_backend (EV_P) 1474ev_backend (EV_P)
1296{ 1475{
1297 return backend; 1476 return backend;
1298} 1477}
1299 1478
1479#if EV_MINIMAL < 2
1300unsigned int 1480unsigned int
1301ev_loop_count (EV_P) 1481ev_loop_count (EV_P)
1302{ 1482{
1303 return loop_count; 1483 return loop_count;
1304} 1484}
1305 1485
1486unsigned int
1487ev_loop_depth (EV_P)
1488{
1489 return loop_depth;
1490}
1491
1306void 1492void
1307ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1493ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1308{ 1494{
1309 io_blocktime = interval; 1495 io_blocktime = interval;
1310} 1496}
… …
1313ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1499ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1314{ 1500{
1315 timeout_blocktime = interval; 1501 timeout_blocktime = interval;
1316} 1502}
1317 1503
1504void
1505ev_set_userdata (EV_P_ void *data)
1506{
1507 userdata = data;
1508}
1509
1510void *
1511ev_userdata (EV_P)
1512{
1513 return userdata;
1514}
1515
1516void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1517{
1518 invoke_cb = invoke_pending_cb;
1519}
1520
1521void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1522{
1523 release_cb = release;
1524 acquire_cb = acquire;
1525}
1526#endif
1527
1528/* initialise a loop structure, must be zero-initialised */
1318static void noinline 1529static void noinline
1319loop_init (EV_P_ unsigned int flags) 1530loop_init (EV_P_ unsigned int flags)
1320{ 1531{
1321 if (!backend) 1532 if (!backend)
1322 { 1533 {
1534#if EV_USE_REALTIME
1535 if (!have_realtime)
1536 {
1537 struct timespec ts;
1538
1539 if (!clock_gettime (CLOCK_REALTIME, &ts))
1540 have_realtime = 1;
1541 }
1542#endif
1543
1323#if EV_USE_MONOTONIC 1544#if EV_USE_MONOTONIC
1545 if (!have_monotonic)
1324 { 1546 {
1325 struct timespec ts; 1547 struct timespec ts;
1548
1326 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1549 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1327 have_monotonic = 1; 1550 have_monotonic = 1;
1328 } 1551 }
1329#endif 1552#endif
1553
1554 /* pid check not overridable via env */
1555#ifndef _WIN32
1556 if (flags & EVFLAG_FORKCHECK)
1557 curpid = getpid ();
1558#endif
1559
1560 if (!(flags & EVFLAG_NOENV)
1561 && !enable_secure ()
1562 && getenv ("LIBEV_FLAGS"))
1563 flags = atoi (getenv ("LIBEV_FLAGS"));
1330 1564
1331 ev_rt_now = ev_time (); 1565 ev_rt_now = ev_time ();
1332 mn_now = get_clock (); 1566 mn_now = get_clock ();
1333 now_floor = mn_now; 1567 now_floor = mn_now;
1334 rtmn_diff = ev_rt_now - mn_now; 1568 rtmn_diff = ev_rt_now - mn_now;
1569#if EV_MINIMAL < 2
1570 invoke_cb = ev_invoke_pending;
1571#endif
1335 1572
1336 io_blocktime = 0.; 1573 io_blocktime = 0.;
1337 timeout_blocktime = 0.; 1574 timeout_blocktime = 0.;
1338 backend = 0; 1575 backend = 0;
1339 backend_fd = -1; 1576 backend_fd = -1;
1340 gotasync = 0; 1577 sig_pending = 0;
1578#if EV_ASYNC_ENABLE
1579 async_pending = 0;
1580#endif
1341#if EV_USE_INOTIFY 1581#if EV_USE_INOTIFY
1342 fs_fd = -2; 1582 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1343#endif 1583#endif
1344 1584#if EV_USE_SIGNALFD
1345 /* pid check not overridable via env */ 1585 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1346#ifndef _WIN32
1347 if (flags & EVFLAG_FORKCHECK)
1348 curpid = getpid ();
1349#endif 1586#endif
1350
1351 if (!(flags & EVFLAG_NOENV)
1352 && !enable_secure ()
1353 && getenv ("LIBEV_FLAGS"))
1354 flags = atoi (getenv ("LIBEV_FLAGS"));
1355 1587
1356 if (!(flags & 0x0000ffffU)) 1588 if (!(flags & 0x0000ffffU))
1357 flags |= ev_recommended_backends (); 1589 flags |= ev_recommended_backends ();
1358 1590
1359#if EV_USE_PORT 1591#if EV_USE_PORT
… …
1370#endif 1602#endif
1371#if EV_USE_SELECT 1603#if EV_USE_SELECT
1372 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1604 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1373#endif 1605#endif
1374 1606
1607 ev_prepare_init (&pending_w, pendingcb);
1608
1375 ev_init (&pipeev, pipecb); 1609 ev_init (&pipe_w, pipecb);
1376 ev_set_priority (&pipeev, EV_MAXPRI); 1610 ev_set_priority (&pipe_w, EV_MAXPRI);
1377 } 1611 }
1378} 1612}
1379 1613
1614/* free up a loop structure */
1380static void noinline 1615static void noinline
1381loop_destroy (EV_P) 1616loop_destroy (EV_P)
1382{ 1617{
1383 int i; 1618 int i;
1384 1619
1385 if (ev_is_active (&pipeev)) 1620 if (ev_is_active (&pipe_w))
1386 { 1621 {
1387 ev_ref (EV_A); /* signal watcher */ 1622 /*ev_ref (EV_A);*/
1388 ev_io_stop (EV_A_ &pipeev); 1623 /*ev_io_stop (EV_A_ &pipe_w);*/
1389 1624
1390#if EV_USE_EVENTFD 1625#if EV_USE_EVENTFD
1391 if (evfd >= 0) 1626 if (evfd >= 0)
1392 close (evfd); 1627 close (evfd);
1393#endif 1628#endif
1394 1629
1395 if (evpipe [0] >= 0) 1630 if (evpipe [0] >= 0)
1396 { 1631 {
1397 close (evpipe [0]); 1632 EV_WIN32_CLOSE_FD (evpipe [0]);
1398 close (evpipe [1]); 1633 EV_WIN32_CLOSE_FD (evpipe [1]);
1399 } 1634 }
1400 } 1635 }
1636
1637#if EV_USE_SIGNALFD
1638 if (ev_is_active (&sigfd_w))
1639 {
1640 /*ev_ref (EV_A);*/
1641 /*ev_io_stop (EV_A_ &sigfd_w);*/
1642
1643 close (sigfd);
1644 }
1645#endif
1401 1646
1402#if EV_USE_INOTIFY 1647#if EV_USE_INOTIFY
1403 if (fs_fd >= 0) 1648 if (fs_fd >= 0)
1404 close (fs_fd); 1649 close (fs_fd);
1405#endif 1650#endif
… …
1429#if EV_IDLE_ENABLE 1674#if EV_IDLE_ENABLE
1430 array_free (idle, [i]); 1675 array_free (idle, [i]);
1431#endif 1676#endif
1432 } 1677 }
1433 1678
1434 ev_free (anfds); anfdmax = 0; 1679 ev_free (anfds); anfds = 0; anfdmax = 0;
1435 1680
1436 /* have to use the microsoft-never-gets-it-right macro */ 1681 /* have to use the microsoft-never-gets-it-right macro */
1682 array_free (rfeed, EMPTY);
1437 array_free (fdchange, EMPTY); 1683 array_free (fdchange, EMPTY);
1438 array_free (timer, EMPTY); 1684 array_free (timer, EMPTY);
1439#if EV_PERIODIC_ENABLE 1685#if EV_PERIODIC_ENABLE
1440 array_free (periodic, EMPTY); 1686 array_free (periodic, EMPTY);
1441#endif 1687#endif
… …
1450 1696
1451 backend = 0; 1697 backend = 0;
1452} 1698}
1453 1699
1454#if EV_USE_INOTIFY 1700#if EV_USE_INOTIFY
1455void inline_size infy_fork (EV_P); 1701inline_size void infy_fork (EV_P);
1456#endif 1702#endif
1457 1703
1458void inline_size 1704inline_size void
1459loop_fork (EV_P) 1705loop_fork (EV_P)
1460{ 1706{
1461#if EV_USE_PORT 1707#if EV_USE_PORT
1462 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1708 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1463#endif 1709#endif
… …
1469#endif 1715#endif
1470#if EV_USE_INOTIFY 1716#if EV_USE_INOTIFY
1471 infy_fork (EV_A); 1717 infy_fork (EV_A);
1472#endif 1718#endif
1473 1719
1474 if (ev_is_active (&pipeev)) 1720 if (ev_is_active (&pipe_w))
1475 { 1721 {
1476 /* this "locks" the handlers against writing to the pipe */ 1722 /* this "locks" the handlers against writing to the pipe */
1477 /* while we modify the fd vars */ 1723 /* while we modify the fd vars */
1478 gotsig = 1; 1724 sig_pending = 1;
1479#if EV_ASYNC_ENABLE 1725#if EV_ASYNC_ENABLE
1480 gotasync = 1; 1726 async_pending = 1;
1481#endif 1727#endif
1482 1728
1483 ev_ref (EV_A); 1729 ev_ref (EV_A);
1484 ev_io_stop (EV_A_ &pipeev); 1730 ev_io_stop (EV_A_ &pipe_w);
1485 1731
1486#if EV_USE_EVENTFD 1732#if EV_USE_EVENTFD
1487 if (evfd >= 0) 1733 if (evfd >= 0)
1488 close (evfd); 1734 close (evfd);
1489#endif 1735#endif
1490 1736
1491 if (evpipe [0] >= 0) 1737 if (evpipe [0] >= 0)
1492 { 1738 {
1493 close (evpipe [0]); 1739 EV_WIN32_CLOSE_FD (evpipe [0]);
1494 close (evpipe [1]); 1740 EV_WIN32_CLOSE_FD (evpipe [1]);
1495 } 1741 }
1496 1742
1497 evpipe_init (EV_A); 1743 evpipe_init (EV_A);
1498 /* now iterate over everything, in case we missed something */ 1744 /* now iterate over everything, in case we missed something */
1499 pipecb (EV_A_ &pipeev, EV_READ); 1745 pipecb (EV_A_ &pipe_w, EV_READ);
1500 } 1746 }
1501 1747
1502 postfork = 0; 1748 postfork = 0;
1503} 1749}
1504 1750
1505#if EV_MULTIPLICITY 1751#if EV_MULTIPLICITY
1506 1752
1507struct ev_loop * 1753struct ev_loop *
1508ev_loop_new (unsigned int flags) 1754ev_loop_new (unsigned int flags)
1509{ 1755{
1510 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1756 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1511 1757
1512 memset (loop, 0, sizeof (struct ev_loop)); 1758 memset (EV_A, 0, sizeof (struct ev_loop));
1513
1514 loop_init (EV_A_ flags); 1759 loop_init (EV_A_ flags);
1515 1760
1516 if (ev_backend (EV_A)) 1761 if (ev_backend (EV_A))
1517 return loop; 1762 return EV_A;
1518 1763
1519 return 0; 1764 return 0;
1520} 1765}
1521 1766
1522void 1767void
… …
1529void 1774void
1530ev_loop_fork (EV_P) 1775ev_loop_fork (EV_P)
1531{ 1776{
1532 postfork = 1; /* must be in line with ev_default_fork */ 1777 postfork = 1; /* must be in line with ev_default_fork */
1533} 1778}
1779#endif /* multiplicity */
1534 1780
1535#if EV_VERIFY 1781#if EV_VERIFY
1536static void noinline 1782static void noinline
1537verify_watcher (EV_P_ W w) 1783verify_watcher (EV_P_ W w)
1538{ 1784{
1539 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1785 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1540 1786
1541 if (w->pending) 1787 if (w->pending)
1542 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1788 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1543} 1789}
1544 1790
1545static void noinline 1791static void noinline
1546verify_heap (EV_P_ ANHE *heap, int N) 1792verify_heap (EV_P_ ANHE *heap, int N)
1547{ 1793{
1548 int i; 1794 int i;
1549 1795
1550 for (i = HEAP0; i < N + HEAP0; ++i) 1796 for (i = HEAP0; i < N + HEAP0; ++i)
1551 { 1797 {
1552 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1798 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1553 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1799 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1554 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1800 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1555 1801
1556 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1802 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1557 } 1803 }
1558} 1804}
1559 1805
1560static void noinline 1806static void noinline
1561array_verify (EV_P_ W *ws, int cnt) 1807array_verify (EV_P_ W *ws, int cnt)
1562{ 1808{
1563 while (cnt--) 1809 while (cnt--)
1564 { 1810 {
1565 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1811 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1566 verify_watcher (EV_A_ ws [cnt]); 1812 verify_watcher (EV_A_ ws [cnt]);
1567 } 1813 }
1568} 1814}
1569#endif 1815#endif
1570 1816
1817#if EV_MINIMAL < 2
1571void 1818void
1572ev_loop_verify (EV_P) 1819ev_loop_verify (EV_P)
1573{ 1820{
1574#if EV_VERIFY 1821#if EV_VERIFY
1575 int i; 1822 int i;
… …
1577 1824
1578 assert (activecnt >= -1); 1825 assert (activecnt >= -1);
1579 1826
1580 assert (fdchangemax >= fdchangecnt); 1827 assert (fdchangemax >= fdchangecnt);
1581 for (i = 0; i < fdchangecnt; ++i) 1828 for (i = 0; i < fdchangecnt; ++i)
1582 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1829 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1583 1830
1584 assert (anfdmax >= 0); 1831 assert (anfdmax >= 0);
1585 for (i = 0; i < anfdmax; ++i) 1832 for (i = 0; i < anfdmax; ++i)
1586 for (w = anfds [i].head; w; w = w->next) 1833 for (w = anfds [i].head; w; w = w->next)
1587 { 1834 {
1588 verify_watcher (EV_A_ (W)w); 1835 verify_watcher (EV_A_ (W)w);
1589 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1836 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1590 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1837 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1591 } 1838 }
1592 1839
1593 assert (timermax >= timercnt); 1840 assert (timermax >= timercnt);
1594 verify_heap (EV_A_ timers, timercnt); 1841 verify_heap (EV_A_ timers, timercnt);
1595 1842
… …
1624 assert (checkmax >= checkcnt); 1871 assert (checkmax >= checkcnt);
1625 array_verify (EV_A_ (W *)checks, checkcnt); 1872 array_verify (EV_A_ (W *)checks, checkcnt);
1626 1873
1627# if 0 1874# if 0
1628 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1875 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1629 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1876 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1630# endif 1877# endif
1631#endif 1878#endif
1632} 1879}
1633 1880#endif
1634#endif /* multiplicity */
1635 1881
1636#if EV_MULTIPLICITY 1882#if EV_MULTIPLICITY
1637struct ev_loop * 1883struct ev_loop *
1638ev_default_loop_init (unsigned int flags) 1884ev_default_loop_init (unsigned int flags)
1639#else 1885#else
… …
1642#endif 1888#endif
1643{ 1889{
1644 if (!ev_default_loop_ptr) 1890 if (!ev_default_loop_ptr)
1645 { 1891 {
1646#if EV_MULTIPLICITY 1892#if EV_MULTIPLICITY
1647 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1893 EV_P = ev_default_loop_ptr = &default_loop_struct;
1648#else 1894#else
1649 ev_default_loop_ptr = 1; 1895 ev_default_loop_ptr = 1;
1650#endif 1896#endif
1651 1897
1652 loop_init (EV_A_ flags); 1898 loop_init (EV_A_ flags);
… …
1669 1915
1670void 1916void
1671ev_default_destroy (void) 1917ev_default_destroy (void)
1672{ 1918{
1673#if EV_MULTIPLICITY 1919#if EV_MULTIPLICITY
1674 struct ev_loop *loop = ev_default_loop_ptr; 1920 EV_P = ev_default_loop_ptr;
1675#endif 1921#endif
1676 1922
1677 ev_default_loop_ptr = 0; 1923 ev_default_loop_ptr = 0;
1678 1924
1679#ifndef _WIN32 1925#ifndef _WIN32
… …
1686 1932
1687void 1933void
1688ev_default_fork (void) 1934ev_default_fork (void)
1689{ 1935{
1690#if EV_MULTIPLICITY 1936#if EV_MULTIPLICITY
1691 struct ev_loop *loop = ev_default_loop_ptr; 1937 EV_P = ev_default_loop_ptr;
1692#endif 1938#endif
1693 1939
1694 postfork = 1; /* must be in line with ev_loop_fork */ 1940 postfork = 1; /* must be in line with ev_loop_fork */
1695} 1941}
1696 1942
… …
1700ev_invoke (EV_P_ void *w, int revents) 1946ev_invoke (EV_P_ void *w, int revents)
1701{ 1947{
1702 EV_CB_INVOKE ((W)w, revents); 1948 EV_CB_INVOKE ((W)w, revents);
1703} 1949}
1704 1950
1705void inline_speed 1951unsigned int
1706call_pending (EV_P) 1952ev_pending_count (EV_P)
1953{
1954 int pri;
1955 unsigned int count = 0;
1956
1957 for (pri = NUMPRI; pri--; )
1958 count += pendingcnt [pri];
1959
1960 return count;
1961}
1962
1963void noinline
1964ev_invoke_pending (EV_P)
1707{ 1965{
1708 int pri; 1966 int pri;
1709 1967
1710 for (pri = NUMPRI; pri--; ) 1968 for (pri = NUMPRI; pri--; )
1711 while (pendingcnt [pri]) 1969 while (pendingcnt [pri])
1712 { 1970 {
1713 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1971 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1714 1972
1715 if (expect_true (p->w))
1716 {
1717 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1973 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1974 /* ^ this is no longer true, as pending_w could be here */
1718 1975
1719 p->w->pending = 0; 1976 p->w->pending = 0;
1720 EV_CB_INVOKE (p->w, p->events); 1977 EV_CB_INVOKE (p->w, p->events);
1721 EV_FREQUENT_CHECK; 1978 EV_FREQUENT_CHECK;
1722 }
1723 } 1979 }
1724} 1980}
1725 1981
1726#if EV_IDLE_ENABLE 1982#if EV_IDLE_ENABLE
1727void inline_size 1983/* make idle watchers pending. this handles the "call-idle */
1984/* only when higher priorities are idle" logic */
1985inline_size void
1728idle_reify (EV_P) 1986idle_reify (EV_P)
1729{ 1987{
1730 if (expect_false (idleall)) 1988 if (expect_false (idleall))
1731 { 1989 {
1732 int pri; 1990 int pri;
… …
1744 } 2002 }
1745 } 2003 }
1746} 2004}
1747#endif 2005#endif
1748 2006
1749void inline_size 2007/* make timers pending */
2008inline_size void
1750timers_reify (EV_P) 2009timers_reify (EV_P)
1751{ 2010{
1752 EV_FREQUENT_CHECK; 2011 EV_FREQUENT_CHECK;
1753 2012
1754 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2013 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1755 { 2014 {
1756 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2015 do
1757
1758 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1759
1760 /* first reschedule or stop timer */
1761 if (w->repeat)
1762 { 2016 {
2017 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2018
2019 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2020
2021 /* first reschedule or stop timer */
2022 if (w->repeat)
2023 {
1763 ev_at (w) += w->repeat; 2024 ev_at (w) += w->repeat;
1764 if (ev_at (w) < mn_now) 2025 if (ev_at (w) < mn_now)
1765 ev_at (w) = mn_now; 2026 ev_at (w) = mn_now;
1766 2027
1767 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2028 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1768 2029
1769 ANHE_at_cache (timers [HEAP0]); 2030 ANHE_at_cache (timers [HEAP0]);
1770 downheap (timers, timercnt, HEAP0); 2031 downheap (timers, timercnt, HEAP0);
2032 }
2033 else
2034 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2035
2036 EV_FREQUENT_CHECK;
2037 feed_reverse (EV_A_ (W)w);
1771 } 2038 }
1772 else 2039 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1773 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1774 2040
1775 EV_FREQUENT_CHECK;
1776 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2041 feed_reverse_done (EV_A_ EV_TIMEOUT);
1777 } 2042 }
1778} 2043}
1779 2044
1780#if EV_PERIODIC_ENABLE 2045#if EV_PERIODIC_ENABLE
1781void inline_size 2046/* make periodics pending */
2047inline_size void
1782periodics_reify (EV_P) 2048periodics_reify (EV_P)
1783{ 2049{
1784 EV_FREQUENT_CHECK; 2050 EV_FREQUENT_CHECK;
1785 2051
1786 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2052 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1787 { 2053 {
1788 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2054 int feed_count = 0;
1789 2055
1790 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2056 do
1791
1792 /* first reschedule or stop timer */
1793 if (w->reschedule_cb)
1794 { 2057 {
2058 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2059
2060 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2061
2062 /* first reschedule or stop timer */
2063 if (w->reschedule_cb)
2064 {
1795 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2065 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1796 2066
1797 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2067 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1798 2068
1799 ANHE_at_cache (periodics [HEAP0]); 2069 ANHE_at_cache (periodics [HEAP0]);
1800 downheap (periodics, periodiccnt, HEAP0); 2070 downheap (periodics, periodiccnt, HEAP0);
2071 }
2072 else if (w->interval)
2073 {
2074 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2075 /* if next trigger time is not sufficiently in the future, put it there */
2076 /* this might happen because of floating point inexactness */
2077 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2078 {
2079 ev_at (w) += w->interval;
2080
2081 /* if interval is unreasonably low we might still have a time in the past */
2082 /* so correct this. this will make the periodic very inexact, but the user */
2083 /* has effectively asked to get triggered more often than possible */
2084 if (ev_at (w) < ev_rt_now)
2085 ev_at (w) = ev_rt_now;
2086 }
2087
2088 ANHE_at_cache (periodics [HEAP0]);
2089 downheap (periodics, periodiccnt, HEAP0);
2090 }
2091 else
2092 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2093
2094 EV_FREQUENT_CHECK;
2095 feed_reverse (EV_A_ (W)w);
1801 } 2096 }
1802 else if (w->interval) 2097 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1803 {
1804 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1805 /* if next trigger time is not sufficiently in the future, put it there */
1806 /* this might happen because of floating point inexactness */
1807 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1808 {
1809 ev_at (w) += w->interval;
1810 2098
1811 /* if interval is unreasonably low we might still have a time in the past */
1812 /* so correct this. this will make the periodic very inexact, but the user */
1813 /* has effectively asked to get triggered more often than possible */
1814 if (ev_at (w) < ev_rt_now)
1815 ev_at (w) = ev_rt_now;
1816 }
1817
1818 ANHE_at_cache (periodics [HEAP0]);
1819 downheap (periodics, periodiccnt, HEAP0);
1820 }
1821 else
1822 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1823
1824 EV_FREQUENT_CHECK;
1825 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2099 feed_reverse_done (EV_A_ EV_PERIODIC);
1826 } 2100 }
1827} 2101}
1828 2102
2103/* simply recalculate all periodics */
2104/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1829static void noinline 2105static void noinline
1830periodics_reschedule (EV_P) 2106periodics_reschedule (EV_P)
1831{ 2107{
1832 int i; 2108 int i;
1833 2109
… …
1846 2122
1847 reheap (periodics, periodiccnt); 2123 reheap (periodics, periodiccnt);
1848} 2124}
1849#endif 2125#endif
1850 2126
1851void inline_speed 2127/* adjust all timers by a given offset */
2128static void noinline
2129timers_reschedule (EV_P_ ev_tstamp adjust)
2130{
2131 int i;
2132
2133 for (i = 0; i < timercnt; ++i)
2134 {
2135 ANHE *he = timers + i + HEAP0;
2136 ANHE_w (*he)->at += adjust;
2137 ANHE_at_cache (*he);
2138 }
2139}
2140
2141/* fetch new monotonic and realtime times from the kernel */
2142/* also detetc if there was a timejump, and act accordingly */
2143inline_speed void
1852time_update (EV_P_ ev_tstamp max_block) 2144time_update (EV_P_ ev_tstamp max_block)
1853{ 2145{
1854 int i;
1855
1856#if EV_USE_MONOTONIC 2146#if EV_USE_MONOTONIC
1857 if (expect_true (have_monotonic)) 2147 if (expect_true (have_monotonic))
1858 { 2148 {
2149 int i;
1859 ev_tstamp odiff = rtmn_diff; 2150 ev_tstamp odiff = rtmn_diff;
1860 2151
1861 mn_now = get_clock (); 2152 mn_now = get_clock ();
1862 2153
1863 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2154 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1889 ev_rt_now = ev_time (); 2180 ev_rt_now = ev_time ();
1890 mn_now = get_clock (); 2181 mn_now = get_clock ();
1891 now_floor = mn_now; 2182 now_floor = mn_now;
1892 } 2183 }
1893 2184
2185 /* no timer adjustment, as the monotonic clock doesn't jump */
2186 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1894# if EV_PERIODIC_ENABLE 2187# if EV_PERIODIC_ENABLE
1895 periodics_reschedule (EV_A); 2188 periodics_reschedule (EV_A);
1896# endif 2189# endif
1897 /* no timer adjustment, as the monotonic clock doesn't jump */
1898 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1899 } 2190 }
1900 else 2191 else
1901#endif 2192#endif
1902 { 2193 {
1903 ev_rt_now = ev_time (); 2194 ev_rt_now = ev_time ();
1904 2195
1905 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2196 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1906 { 2197 {
2198 /* adjust timers. this is easy, as the offset is the same for all of them */
2199 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1907#if EV_PERIODIC_ENABLE 2200#if EV_PERIODIC_ENABLE
1908 periodics_reschedule (EV_A); 2201 periodics_reschedule (EV_A);
1909#endif 2202#endif
1910 /* adjust timers. this is easy, as the offset is the same for all of them */
1911 for (i = 0; i < timercnt; ++i)
1912 {
1913 ANHE *he = timers + i + HEAP0;
1914 ANHE_w (*he)->at += ev_rt_now - mn_now;
1915 ANHE_at_cache (*he);
1916 }
1917 } 2203 }
1918 2204
1919 mn_now = ev_rt_now; 2205 mn_now = ev_rt_now;
1920 } 2206 }
1921} 2207}
1922 2208
1923void 2209void
1924ev_ref (EV_P)
1925{
1926 ++activecnt;
1927}
1928
1929void
1930ev_unref (EV_P)
1931{
1932 --activecnt;
1933}
1934
1935void
1936ev_now_update (EV_P)
1937{
1938 time_update (EV_A_ 1e100);
1939}
1940
1941static int loop_done;
1942
1943void
1944ev_loop (EV_P_ int flags) 2210ev_loop (EV_P_ int flags)
1945{ 2211{
2212#if EV_MINIMAL < 2
2213 ++loop_depth;
2214#endif
2215
2216 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2217
1946 loop_done = EVUNLOOP_CANCEL; 2218 loop_done = EVUNLOOP_CANCEL;
1947 2219
1948 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2220 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1949 2221
1950 do 2222 do
1951 { 2223 {
1952#if EV_VERIFY >= 2 2224#if EV_VERIFY >= 2
1953 ev_loop_verify (EV_A); 2225 ev_loop_verify (EV_A);
… …
1966 /* we might have forked, so queue fork handlers */ 2238 /* we might have forked, so queue fork handlers */
1967 if (expect_false (postfork)) 2239 if (expect_false (postfork))
1968 if (forkcnt) 2240 if (forkcnt)
1969 { 2241 {
1970 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2242 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1971 call_pending (EV_A); 2243 EV_INVOKE_PENDING;
1972 } 2244 }
1973#endif 2245#endif
1974 2246
1975 /* queue prepare watchers (and execute them) */ 2247 /* queue prepare watchers (and execute them) */
1976 if (expect_false (preparecnt)) 2248 if (expect_false (preparecnt))
1977 { 2249 {
1978 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2250 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1979 call_pending (EV_A); 2251 EV_INVOKE_PENDING;
1980 } 2252 }
1981 2253
1982 if (expect_false (!activecnt)) 2254 if (expect_false (loop_done))
1983 break; 2255 break;
1984 2256
1985 /* we might have forked, so reify kernel state if necessary */ 2257 /* we might have forked, so reify kernel state if necessary */
1986 if (expect_false (postfork)) 2258 if (expect_false (postfork))
1987 loop_fork (EV_A); 2259 loop_fork (EV_A);
… …
1994 ev_tstamp waittime = 0.; 2266 ev_tstamp waittime = 0.;
1995 ev_tstamp sleeptime = 0.; 2267 ev_tstamp sleeptime = 0.;
1996 2268
1997 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2269 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1998 { 2270 {
2271 /* remember old timestamp for io_blocktime calculation */
2272 ev_tstamp prev_mn_now = mn_now;
2273
1999 /* update time to cancel out callback processing overhead */ 2274 /* update time to cancel out callback processing overhead */
2000 time_update (EV_A_ 1e100); 2275 time_update (EV_A_ 1e100);
2001 2276
2002 waittime = MAX_BLOCKTIME; 2277 waittime = MAX_BLOCKTIME;
2003 2278
… …
2013 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2288 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2014 if (waittime > to) waittime = to; 2289 if (waittime > to) waittime = to;
2015 } 2290 }
2016#endif 2291#endif
2017 2292
2293 /* don't let timeouts decrease the waittime below timeout_blocktime */
2018 if (expect_false (waittime < timeout_blocktime)) 2294 if (expect_false (waittime < timeout_blocktime))
2019 waittime = timeout_blocktime; 2295 waittime = timeout_blocktime;
2020 2296
2021 sleeptime = waittime - backend_fudge; 2297 /* extra check because io_blocktime is commonly 0 */
2022
2023 if (expect_true (sleeptime > io_blocktime)) 2298 if (expect_false (io_blocktime))
2024 sleeptime = io_blocktime;
2025
2026 if (sleeptime)
2027 { 2299 {
2300 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2301
2302 if (sleeptime > waittime - backend_fudge)
2303 sleeptime = waittime - backend_fudge;
2304
2305 if (expect_true (sleeptime > 0.))
2306 {
2028 ev_sleep (sleeptime); 2307 ev_sleep (sleeptime);
2029 waittime -= sleeptime; 2308 waittime -= sleeptime;
2309 }
2030 } 2310 }
2031 } 2311 }
2032 2312
2313#if EV_MINIMAL < 2
2033 ++loop_count; 2314 ++loop_count;
2315#endif
2316 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2034 backend_poll (EV_A_ waittime); 2317 backend_poll (EV_A_ waittime);
2318 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2035 2319
2036 /* update ev_rt_now, do magic */ 2320 /* update ev_rt_now, do magic */
2037 time_update (EV_A_ waittime + sleeptime); 2321 time_update (EV_A_ waittime + sleeptime);
2038 } 2322 }
2039 2323
… …
2050 2334
2051 /* queue check watchers, to be executed first */ 2335 /* queue check watchers, to be executed first */
2052 if (expect_false (checkcnt)) 2336 if (expect_false (checkcnt))
2053 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2337 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2054 2338
2055 call_pending (EV_A); 2339 EV_INVOKE_PENDING;
2056 } 2340 }
2057 while (expect_true ( 2341 while (expect_true (
2058 activecnt 2342 activecnt
2059 && !loop_done 2343 && !loop_done
2060 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2344 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2061 )); 2345 ));
2062 2346
2063 if (loop_done == EVUNLOOP_ONE) 2347 if (loop_done == EVUNLOOP_ONE)
2064 loop_done = EVUNLOOP_CANCEL; 2348 loop_done = EVUNLOOP_CANCEL;
2349
2350#if EV_MINIMAL < 2
2351 --loop_depth;
2352#endif
2065} 2353}
2066 2354
2067void 2355void
2068ev_unloop (EV_P_ int how) 2356ev_unloop (EV_P_ int how)
2069{ 2357{
2070 loop_done = how; 2358 loop_done = how;
2071} 2359}
2072 2360
2361void
2362ev_ref (EV_P)
2363{
2364 ++activecnt;
2365}
2366
2367void
2368ev_unref (EV_P)
2369{
2370 --activecnt;
2371}
2372
2373void
2374ev_now_update (EV_P)
2375{
2376 time_update (EV_A_ 1e100);
2377}
2378
2379void
2380ev_suspend (EV_P)
2381{
2382 ev_now_update (EV_A);
2383}
2384
2385void
2386ev_resume (EV_P)
2387{
2388 ev_tstamp mn_prev = mn_now;
2389
2390 ev_now_update (EV_A);
2391 timers_reschedule (EV_A_ mn_now - mn_prev);
2392#if EV_PERIODIC_ENABLE
2393 /* TODO: really do this? */
2394 periodics_reschedule (EV_A);
2395#endif
2396}
2397
2073/*****************************************************************************/ 2398/*****************************************************************************/
2399/* singly-linked list management, used when the expected list length is short */
2074 2400
2075void inline_size 2401inline_size void
2076wlist_add (WL *head, WL elem) 2402wlist_add (WL *head, WL elem)
2077{ 2403{
2078 elem->next = *head; 2404 elem->next = *head;
2079 *head = elem; 2405 *head = elem;
2080} 2406}
2081 2407
2082void inline_size 2408inline_size void
2083wlist_del (WL *head, WL elem) 2409wlist_del (WL *head, WL elem)
2084{ 2410{
2085 while (*head) 2411 while (*head)
2086 { 2412 {
2087 if (*head == elem) 2413 if (expect_true (*head == elem))
2088 { 2414 {
2089 *head = elem->next; 2415 *head = elem->next;
2090 return; 2416 break;
2091 } 2417 }
2092 2418
2093 head = &(*head)->next; 2419 head = &(*head)->next;
2094 } 2420 }
2095} 2421}
2096 2422
2097void inline_speed 2423/* internal, faster, version of ev_clear_pending */
2424inline_speed void
2098clear_pending (EV_P_ W w) 2425clear_pending (EV_P_ W w)
2099{ 2426{
2100 if (w->pending) 2427 if (w->pending)
2101 { 2428 {
2102 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2429 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2103 w->pending = 0; 2430 w->pending = 0;
2104 } 2431 }
2105} 2432}
2106 2433
2107int 2434int
… …
2111 int pending = w_->pending; 2438 int pending = w_->pending;
2112 2439
2113 if (expect_true (pending)) 2440 if (expect_true (pending))
2114 { 2441 {
2115 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2442 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2443 p->w = (W)&pending_w;
2116 w_->pending = 0; 2444 w_->pending = 0;
2117 p->w = 0;
2118 return p->events; 2445 return p->events;
2119 } 2446 }
2120 else 2447 else
2121 return 0; 2448 return 0;
2122} 2449}
2123 2450
2124void inline_size 2451inline_size void
2125pri_adjust (EV_P_ W w) 2452pri_adjust (EV_P_ W w)
2126{ 2453{
2127 int pri = w->priority; 2454 int pri = ev_priority (w);
2128 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2455 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2129 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2456 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2130 w->priority = pri; 2457 ev_set_priority (w, pri);
2131} 2458}
2132 2459
2133void inline_speed 2460inline_speed void
2134ev_start (EV_P_ W w, int active) 2461ev_start (EV_P_ W w, int active)
2135{ 2462{
2136 pri_adjust (EV_A_ w); 2463 pri_adjust (EV_A_ w);
2137 w->active = active; 2464 w->active = active;
2138 ev_ref (EV_A); 2465 ev_ref (EV_A);
2139} 2466}
2140 2467
2141void inline_size 2468inline_size void
2142ev_stop (EV_P_ W w) 2469ev_stop (EV_P_ W w)
2143{ 2470{
2144 ev_unref (EV_A); 2471 ev_unref (EV_A);
2145 w->active = 0; 2472 w->active = 0;
2146} 2473}
… …
2153 int fd = w->fd; 2480 int fd = w->fd;
2154 2481
2155 if (expect_false (ev_is_active (w))) 2482 if (expect_false (ev_is_active (w)))
2156 return; 2483 return;
2157 2484
2158 assert (("ev_io_start called with negative fd", fd >= 0)); 2485 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2159 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE)))); 2486 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2160 2487
2161 EV_FREQUENT_CHECK; 2488 EV_FREQUENT_CHECK;
2162 2489
2163 ev_start (EV_A_ (W)w, 1); 2490 ev_start (EV_A_ (W)w, 1);
2164 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2491 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2165 wlist_add (&anfds[fd].head, (WL)w); 2492 wlist_add (&anfds[fd].head, (WL)w);
2166 2493
2167 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2494 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2168 w->events &= ~EV_IOFDSET; 2495 w->events &= ~EV__IOFDSET;
2169 2496
2170 EV_FREQUENT_CHECK; 2497 EV_FREQUENT_CHECK;
2171} 2498}
2172 2499
2173void noinline 2500void noinline
… …
2175{ 2502{
2176 clear_pending (EV_A_ (W)w); 2503 clear_pending (EV_A_ (W)w);
2177 if (expect_false (!ev_is_active (w))) 2504 if (expect_false (!ev_is_active (w)))
2178 return; 2505 return;
2179 2506
2180 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2507 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2181 2508
2182 EV_FREQUENT_CHECK; 2509 EV_FREQUENT_CHECK;
2183 2510
2184 wlist_del (&anfds[w->fd].head, (WL)w); 2511 wlist_del (&anfds[w->fd].head, (WL)w);
2185 ev_stop (EV_A_ (W)w); 2512 ev_stop (EV_A_ (W)w);
… …
2195 if (expect_false (ev_is_active (w))) 2522 if (expect_false (ev_is_active (w)))
2196 return; 2523 return;
2197 2524
2198 ev_at (w) += mn_now; 2525 ev_at (w) += mn_now;
2199 2526
2200 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2527 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2201 2528
2202 EV_FREQUENT_CHECK; 2529 EV_FREQUENT_CHECK;
2203 2530
2204 ++timercnt; 2531 ++timercnt;
2205 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2532 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2208 ANHE_at_cache (timers [ev_active (w)]); 2535 ANHE_at_cache (timers [ev_active (w)]);
2209 upheap (timers, ev_active (w)); 2536 upheap (timers, ev_active (w));
2210 2537
2211 EV_FREQUENT_CHECK; 2538 EV_FREQUENT_CHECK;
2212 2539
2213 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2540 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2214} 2541}
2215 2542
2216void noinline 2543void noinline
2217ev_timer_stop (EV_P_ ev_timer *w) 2544ev_timer_stop (EV_P_ ev_timer *w)
2218{ 2545{
… …
2223 EV_FREQUENT_CHECK; 2550 EV_FREQUENT_CHECK;
2224 2551
2225 { 2552 {
2226 int active = ev_active (w); 2553 int active = ev_active (w);
2227 2554
2228 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2555 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2229 2556
2230 --timercnt; 2557 --timercnt;
2231 2558
2232 if (expect_true (active < timercnt + HEAP0)) 2559 if (expect_true (active < timercnt + HEAP0))
2233 { 2560 {
… …
2266 } 2593 }
2267 2594
2268 EV_FREQUENT_CHECK; 2595 EV_FREQUENT_CHECK;
2269} 2596}
2270 2597
2598ev_tstamp
2599ev_timer_remaining (EV_P_ ev_timer *w)
2600{
2601 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2602}
2603
2271#if EV_PERIODIC_ENABLE 2604#if EV_PERIODIC_ENABLE
2272void noinline 2605void noinline
2273ev_periodic_start (EV_P_ ev_periodic *w) 2606ev_periodic_start (EV_P_ ev_periodic *w)
2274{ 2607{
2275 if (expect_false (ev_is_active (w))) 2608 if (expect_false (ev_is_active (w)))
… …
2277 2610
2278 if (w->reschedule_cb) 2611 if (w->reschedule_cb)
2279 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2612 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2280 else if (w->interval) 2613 else if (w->interval)
2281 { 2614 {
2282 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2615 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2283 /* this formula differs from the one in periodic_reify because we do not always round up */ 2616 /* this formula differs from the one in periodic_reify because we do not always round up */
2284 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2617 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2285 } 2618 }
2286 else 2619 else
2287 ev_at (w) = w->offset; 2620 ev_at (w) = w->offset;
… …
2295 ANHE_at_cache (periodics [ev_active (w)]); 2628 ANHE_at_cache (periodics [ev_active (w)]);
2296 upheap (periodics, ev_active (w)); 2629 upheap (periodics, ev_active (w));
2297 2630
2298 EV_FREQUENT_CHECK; 2631 EV_FREQUENT_CHECK;
2299 2632
2300 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2633 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2301} 2634}
2302 2635
2303void noinline 2636void noinline
2304ev_periodic_stop (EV_P_ ev_periodic *w) 2637ev_periodic_stop (EV_P_ ev_periodic *w)
2305{ 2638{
… …
2310 EV_FREQUENT_CHECK; 2643 EV_FREQUENT_CHECK;
2311 2644
2312 { 2645 {
2313 int active = ev_active (w); 2646 int active = ev_active (w);
2314 2647
2315 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2648 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2316 2649
2317 --periodiccnt; 2650 --periodiccnt;
2318 2651
2319 if (expect_true (active < periodiccnt + HEAP0)) 2652 if (expect_true (active < periodiccnt + HEAP0))
2320 { 2653 {
… …
2342#endif 2675#endif
2343 2676
2344void noinline 2677void noinline
2345ev_signal_start (EV_P_ ev_signal *w) 2678ev_signal_start (EV_P_ ev_signal *w)
2346{ 2679{
2347#if EV_MULTIPLICITY
2348 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2349#endif
2350 if (expect_false (ev_is_active (w))) 2680 if (expect_false (ev_is_active (w)))
2351 return; 2681 return;
2352 2682
2353 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2683 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2354 2684
2355 evpipe_init (EV_A); 2685#if EV_MULTIPLICITY
2686 assert (("libev: a signal must not be attached to two different loops",
2687 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2356 2688
2357 EV_FREQUENT_CHECK; 2689 signals [w->signum - 1].loop = EV_A;
2690#endif
2358 2691
2692 EV_FREQUENT_CHECK;
2693
2694#if EV_USE_SIGNALFD
2695 if (sigfd == -2)
2359 { 2696 {
2360#ifndef _WIN32 2697 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2361 sigset_t full, prev; 2698 if (sigfd < 0 && errno == EINVAL)
2362 sigfillset (&full); 2699 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2363 sigprocmask (SIG_SETMASK, &full, &prev);
2364#endif
2365 2700
2366 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2701 if (sigfd >= 0)
2702 {
2703 fd_intern (sigfd); /* doing it twice will not hurt */
2367 2704
2368#ifndef _WIN32 2705 sigemptyset (&sigfd_set);
2369 sigprocmask (SIG_SETMASK, &prev, 0); 2706
2370#endif 2707 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2708 ev_set_priority (&sigfd_w, EV_MAXPRI);
2709 ev_io_start (EV_A_ &sigfd_w);
2710 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2711 }
2371 } 2712 }
2713
2714 if (sigfd >= 0)
2715 {
2716 /* TODO: check .head */
2717 sigaddset (&sigfd_set, w->signum);
2718 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2719
2720 signalfd (sigfd, &sigfd_set, 0);
2721 }
2722#endif
2372 2723
2373 ev_start (EV_A_ (W)w, 1); 2724 ev_start (EV_A_ (W)w, 1);
2374 wlist_add (&signals [w->signum - 1].head, (WL)w); 2725 wlist_add (&signals [w->signum - 1].head, (WL)w);
2375 2726
2376 if (!((WL)w)->next) 2727 if (!((WL)w)->next)
2728# if EV_USE_SIGNALFD
2729 if (sigfd < 0) /*TODO*/
2730# endif
2377 { 2731 {
2378#if _WIN32 2732# if _WIN32
2379 signal (w->signum, ev_sighandler); 2733 signal (w->signum, ev_sighandler);
2380#else 2734# else
2381 struct sigaction sa; 2735 struct sigaction sa;
2736
2737 evpipe_init (EV_A);
2738
2382 sa.sa_handler = ev_sighandler; 2739 sa.sa_handler = ev_sighandler;
2383 sigfillset (&sa.sa_mask); 2740 sigfillset (&sa.sa_mask);
2384 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2741 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2385 sigaction (w->signum, &sa, 0); 2742 sigaction (w->signum, &sa, 0);
2743
2744 sigemptyset (&sa.sa_mask);
2745 sigaddset (&sa.sa_mask, w->signum);
2746 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2386#endif 2747#endif
2387 } 2748 }
2388 2749
2389 EV_FREQUENT_CHECK; 2750 EV_FREQUENT_CHECK;
2390} 2751}
2391 2752
2392void noinline 2753void noinline
… …
2400 2761
2401 wlist_del (&signals [w->signum - 1].head, (WL)w); 2762 wlist_del (&signals [w->signum - 1].head, (WL)w);
2402 ev_stop (EV_A_ (W)w); 2763 ev_stop (EV_A_ (W)w);
2403 2764
2404 if (!signals [w->signum - 1].head) 2765 if (!signals [w->signum - 1].head)
2766 {
2767#if EV_MULTIPLICITY
2768 signals [w->signum - 1].loop = 0; /* unattach from signal */
2769#endif
2770#if EV_USE_SIGNALFD
2771 if (sigfd >= 0)
2772 {
2773 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2774 sigdelset (&sigfd_set, w->signum);
2775 signalfd (sigfd, &sigfd_set, 0);
2776 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2777 /*TODO: maybe unblock signal? */
2778 }
2779 else
2780#endif
2405 signal (w->signum, SIG_DFL); 2781 signal (w->signum, SIG_DFL);
2782 }
2406 2783
2407 EV_FREQUENT_CHECK; 2784 EV_FREQUENT_CHECK;
2408} 2785}
2409 2786
2410void 2787void
2411ev_child_start (EV_P_ ev_child *w) 2788ev_child_start (EV_P_ ev_child *w)
2412{ 2789{
2413#if EV_MULTIPLICITY 2790#if EV_MULTIPLICITY
2414 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2791 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2415#endif 2792#endif
2416 if (expect_false (ev_is_active (w))) 2793 if (expect_false (ev_is_active (w)))
2417 return; 2794 return;
2418 2795
2419 EV_FREQUENT_CHECK; 2796 EV_FREQUENT_CHECK;
… …
2478 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2855 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2479 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2856 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2480 2857
2481 char *pend = strrchr (path, '/'); 2858 char *pend = strrchr (path, '/');
2482 2859
2483 if (!pend) 2860 if (!pend || pend == path)
2484 break; /* whoops, no '/', complain to your admin */ 2861 break;
2485 2862
2486 *pend = 0; 2863 *pend = 0;
2487 w->wd = inotify_add_watch (fs_fd, path, mask); 2864 w->wd = inotify_add_watch (fs_fd, path, mask);
2488 } 2865 }
2489 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2866 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2490 } 2867 }
2491 } 2868 }
2492 else 2869
2870 if (w->wd >= 0)
2493 { 2871 {
2872 struct statfs sfs;
2873
2494 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2874 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2495 2875
2496 /* now local changes will be tracked by inotify, but remote changes won't */ 2876 /* now local changes will be tracked by inotify, but remote changes won't */
2497 /* unless the filesystem it known to be local, we therefore still poll */ 2877 /* unless the filesystem it known to be local, we therefore still poll */
2498 /* also do poll on <2.6.25, but with normal frequency */ 2878 /* also do poll on <2.6.25, but with normal frequency */
2499 struct statfs sfs;
2500 2879
2501 if (fs_2625 && !statfs (w->path, &sfs)) 2880 if (fs_2625 && !statfs (w->path, &sfs))
2502 if (sfs.f_type == 0x1373 /* devfs */ 2881 if (sfs.f_type == 0x1373 /* devfs */
2503 || sfs.f_type == 0xEF53 /* ext2/3 */ 2882 || sfs.f_type == 0xEF53 /* ext2/3 */
2504 || sfs.f_type == 0x3153464a /* jfs */ 2883 || sfs.f_type == 0x3153464a /* jfs */
… …
2547 2926
2548 if (w->wd == wd || wd == -1) 2927 if (w->wd == wd || wd == -1)
2549 { 2928 {
2550 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2929 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2551 { 2930 {
2931 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2552 w->wd = -1; 2932 w->wd = -1;
2553 infy_add (EV_A_ w); /* re-add, no matter what */ 2933 infy_add (EV_A_ w); /* re-add, no matter what */
2554 } 2934 }
2555 2935
2556 stat_timer_cb (EV_A_ &w->timer, 0); 2936 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2569 2949
2570 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2950 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2571 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2951 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2572} 2952}
2573 2953
2574void inline_size 2954inline_size void
2575check_2625 (EV_P) 2955check_2625 (EV_P)
2576{ 2956{
2577 /* kernels < 2.6.25 are borked 2957 /* kernels < 2.6.25 are borked
2578 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2958 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2579 */ 2959 */
… …
2592 return; 2972 return;
2593 2973
2594 fs_2625 = 1; 2974 fs_2625 = 1;
2595} 2975}
2596 2976
2597void inline_size 2977inline_size void
2598infy_init (EV_P) 2978infy_init (EV_P)
2599{ 2979{
2600 if (fs_fd != -2) 2980 if (fs_fd != -2)
2601 return; 2981 return;
2602 2982
… …
2612 ev_set_priority (&fs_w, EV_MAXPRI); 2992 ev_set_priority (&fs_w, EV_MAXPRI);
2613 ev_io_start (EV_A_ &fs_w); 2993 ev_io_start (EV_A_ &fs_w);
2614 } 2994 }
2615} 2995}
2616 2996
2617void inline_size 2997inline_size void
2618infy_fork (EV_P) 2998infy_fork (EV_P)
2619{ 2999{
2620 int slot; 3000 int slot;
2621 3001
2622 if (fs_fd < 0) 3002 if (fs_fd < 0)
… …
2888embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3268embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2889{ 3269{
2890 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3270 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2891 3271
2892 { 3272 {
2893 struct ev_loop *loop = w->other; 3273 EV_P = w->other;
2894 3274
2895 while (fdchangecnt) 3275 while (fdchangecnt)
2896 { 3276 {
2897 fd_reify (EV_A); 3277 fd_reify (EV_A);
2898 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3278 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2903static void 3283static void
2904embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3284embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2905{ 3285{
2906 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3286 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2907 3287
3288 ev_embed_stop (EV_A_ w);
3289
2908 { 3290 {
2909 struct ev_loop *loop = w->other; 3291 EV_P = w->other;
2910 3292
2911 ev_loop_fork (EV_A); 3293 ev_loop_fork (EV_A);
3294 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2912 } 3295 }
3296
3297 ev_embed_start (EV_A_ w);
2913} 3298}
2914 3299
2915#if 0 3300#if 0
2916static void 3301static void
2917embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3302embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2925{ 3310{
2926 if (expect_false (ev_is_active (w))) 3311 if (expect_false (ev_is_active (w)))
2927 return; 3312 return;
2928 3313
2929 { 3314 {
2930 struct ev_loop *loop = w->other; 3315 EV_P = w->other;
2931 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3316 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2932 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3317 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2933 } 3318 }
2934 3319
2935 EV_FREQUENT_CHECK; 3320 EV_FREQUENT_CHECK;
2936 3321
… …
3047 3432
3048void 3433void
3049ev_async_send (EV_P_ ev_async *w) 3434ev_async_send (EV_P_ ev_async *w)
3050{ 3435{
3051 w->sent = 1; 3436 w->sent = 1;
3052 evpipe_write (EV_A_ &gotasync); 3437 evpipe_write (EV_A_ &async_pending);
3053} 3438}
3054#endif 3439#endif
3055 3440
3056/*****************************************************************************/ 3441/*****************************************************************************/
3057 3442
… …
3119 ev_timer_set (&once->to, timeout, 0.); 3504 ev_timer_set (&once->to, timeout, 0.);
3120 ev_timer_start (EV_A_ &once->to); 3505 ev_timer_start (EV_A_ &once->to);
3121 } 3506 }
3122} 3507}
3123 3508
3509/*****************************************************************************/
3510
3511#if EV_WALK_ENABLE
3512void
3513ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3514{
3515 int i, j;
3516 ev_watcher_list *wl, *wn;
3517
3518 if (types & (EV_IO | EV_EMBED))
3519 for (i = 0; i < anfdmax; ++i)
3520 for (wl = anfds [i].head; wl; )
3521 {
3522 wn = wl->next;
3523
3524#if EV_EMBED_ENABLE
3525 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3526 {
3527 if (types & EV_EMBED)
3528 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3529 }
3530 else
3531#endif
3532#if EV_USE_INOTIFY
3533 if (ev_cb ((ev_io *)wl) == infy_cb)
3534 ;
3535 else
3536#endif
3537 if ((ev_io *)wl != &pipe_w)
3538 if (types & EV_IO)
3539 cb (EV_A_ EV_IO, wl);
3540
3541 wl = wn;
3542 }
3543
3544 if (types & (EV_TIMER | EV_STAT))
3545 for (i = timercnt + HEAP0; i-- > HEAP0; )
3546#if EV_STAT_ENABLE
3547 /*TODO: timer is not always active*/
3548 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3549 {
3550 if (types & EV_STAT)
3551 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3552 }
3553 else
3554#endif
3555 if (types & EV_TIMER)
3556 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3557
3558#if EV_PERIODIC_ENABLE
3559 if (types & EV_PERIODIC)
3560 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3561 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3562#endif
3563
3564#if EV_IDLE_ENABLE
3565 if (types & EV_IDLE)
3566 for (j = NUMPRI; i--; )
3567 for (i = idlecnt [j]; i--; )
3568 cb (EV_A_ EV_IDLE, idles [j][i]);
3569#endif
3570
3571#if EV_FORK_ENABLE
3572 if (types & EV_FORK)
3573 for (i = forkcnt; i--; )
3574 if (ev_cb (forks [i]) != embed_fork_cb)
3575 cb (EV_A_ EV_FORK, forks [i]);
3576#endif
3577
3578#if EV_ASYNC_ENABLE
3579 if (types & EV_ASYNC)
3580 for (i = asynccnt; i--; )
3581 cb (EV_A_ EV_ASYNC, asyncs [i]);
3582#endif
3583
3584 if (types & EV_PREPARE)
3585 for (i = preparecnt; i--; )
3586#if EV_EMBED_ENABLE
3587 if (ev_cb (prepares [i]) != embed_prepare_cb)
3588#endif
3589 cb (EV_A_ EV_PREPARE, prepares [i]);
3590
3591 if (types & EV_CHECK)
3592 for (i = checkcnt; i--; )
3593 cb (EV_A_ EV_CHECK, checks [i]);
3594
3595 if (types & EV_SIGNAL)
3596 for (i = 0; i < EV_NSIG - 1; ++i)
3597 for (wl = signals [i].head; wl; )
3598 {
3599 wn = wl->next;
3600 cb (EV_A_ EV_SIGNAL, wl);
3601 wl = wn;
3602 }
3603
3604 if (types & EV_CHILD)
3605 for (i = EV_PID_HASHSIZE; i--; )
3606 for (wl = childs [i]; wl; )
3607 {
3608 wn = wl->next;
3609 cb (EV_A_ EV_CHILD, wl);
3610 wl = wn;
3611 }
3612/* EV_STAT 0x00001000 /* stat data changed */
3613/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3614}
3615#endif
3616
3124#if EV_MULTIPLICITY 3617#if EV_MULTIPLICITY
3125 #include "ev_wrap.h" 3618 #include "ev_wrap.h"
3126#endif 3619#endif
3127 3620
3128#ifdef __cplusplus 3621#ifdef __cplusplus

Diff Legend

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