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

Comparing libev/ev.c (file contents):
Revision 1.277 by root, Sun Dec 14 21:58:08 2008 UTC vs.
Revision 1.315 by root, Wed Aug 26 17:46:22 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
… …
128# ifndef EV_USE_INOTIFY 130# ifndef EV_USE_INOTIFY
129# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
130# define EV_USE_INOTIFY 1 132# define EV_USE_INOTIFY 1
131# else 133# else
132# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif
136# endif
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
133# endif 143# endif
134# endif 144# endif
135 145
136# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
137# if HAVE_EVENTFD 147# if HAVE_EVENTFD
… …
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__ >= 7))
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
344#endif 404#endif
405
406#if EV_USE_SIGNALFD
407/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
408# include <stdint.h>
409# ifndef SFD_NONBLOCK
410# define SFD_NONBLOCK O_NONBLOCK
411# endif
412# ifndef SFD_CLOEXEC
413# ifdef O_CLOEXEC
414# define SFD_CLOEXEC O_CLOEXEC
415# else
416# define SFD_CLOEXEC 02000000
417# endif
418# endif
419# ifdef __cplusplus
420extern "C" {
421# endif
422int signalfd (int fd, const sigset_t *mask, int flags);
423
424struct signalfd_siginfo
425{
426 uint32_t ssi_signo;
427 char pad[128 - sizeof (uint32_t)];
428};
429# ifdef __cplusplus
430}
431# endif
432#endif
433
345 434
346/**/ 435/**/
347 436
348#if EV_VERIFY >= 3 437#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
384# define inline_speed static noinline 473# define inline_speed static noinline
385#else 474#else
386# define inline_speed static inline 475# define inline_speed static inline
387#endif 476#endif
388 477
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 478#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
479
480#if EV_MINPRI == EV_MAXPRI
481# define ABSPRI(w) (((W)w), 0)
482#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 483# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
484#endif
391 485
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 486#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 487#define EMPTY2(a,b) /* used to suppress some warnings */
394 488
395typedef ev_watcher *W; 489typedef ev_watcher *W;
… …
397typedef ev_watcher_time *WT; 491typedef ev_watcher_time *WT;
398 492
399#define ev_active(w) ((W)(w))->active 493#define ev_active(w) ((W)(w))->active
400#define ev_at(w) ((WT)(w))->at 494#define ev_at(w) ((WT)(w))->at
401 495
402#if EV_USE_MONOTONIC 496#if EV_USE_REALTIME
403/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 497/* 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 */ 498/* giving it a reasonably high chance of working on typical architetcures */
499static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
500#endif
501
502#if EV_USE_MONOTONIC
405static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
504#endif
505
506#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif
509#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
511#endif
512#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd)
406#endif 514#endif
407 515
408#ifdef _WIN32 516#ifdef _WIN32
409# include "ev_win32.c" 517# include "ev_win32.c"
410#endif 518#endif
… …
474#define ev_malloc(size) ev_realloc (0, (size)) 582#define ev_malloc(size) ev_realloc (0, (size))
475#define ev_free(ptr) ev_realloc ((ptr), 0) 583#define ev_free(ptr) ev_realloc ((ptr), 0)
476 584
477/*****************************************************************************/ 585/*****************************************************************************/
478 586
587/* set in reify when reification needed */
588#define EV_ANFD_REIFY 1
589
590/* file descriptor info structure */
479typedef struct 591typedef struct
480{ 592{
481 WL head; 593 WL head;
482 unsigned char events; 594 unsigned char events; /* the events watched for */
483 unsigned char reify; 595 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 */ 596 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
485 unsigned char unused; 597 unsigned char unused;
486#if EV_USE_EPOLL 598#if EV_USE_EPOLL
487 unsigned int egen; /* generation counter to counter epoll bugs */ 599 unsigned int egen; /* generation counter to counter epoll bugs */
488#endif 600#endif
489#if EV_SELECT_IS_WINSOCKET 601#if EV_SELECT_IS_WINSOCKET
490 SOCKET handle; 602 SOCKET handle;
491#endif 603#endif
492} ANFD; 604} ANFD;
493 605
606/* stores the pending event set for a given watcher */
494typedef struct 607typedef struct
495{ 608{
496 W w; 609 W w;
497 int events; 610 int events; /* the pending event set for the given watcher */
498} ANPENDING; 611} ANPENDING;
499 612
500#if EV_USE_INOTIFY 613#if EV_USE_INOTIFY
501/* hash table entry per inotify-id */ 614/* hash table entry per inotify-id */
502typedef struct 615typedef struct
… …
505} ANFS; 618} ANFS;
506#endif 619#endif
507 620
508/* Heap Entry */ 621/* Heap Entry */
509#if EV_HEAP_CACHE_AT 622#if EV_HEAP_CACHE_AT
623 /* a heap element */
510 typedef struct { 624 typedef struct {
511 ev_tstamp at; 625 ev_tstamp at;
512 WT w; 626 WT w;
513 } ANHE; 627 } ANHE;
514 628
515 #define ANHE_w(he) (he).w /* access watcher, read-write */ 629 #define ANHE_w(he) (he).w /* access watcher, read-write */
516 #define ANHE_at(he) (he).at /* access cached at, read-only */ 630 #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 */ 631 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
518#else 632#else
633 /* a heap element */
519 typedef WT ANHE; 634 typedef WT ANHE;
520 635
521 #define ANHE_w(he) (he) 636 #define ANHE_w(he) (he)
522 #define ANHE_at(he) (he)->at 637 #define ANHE_at(he) (he)->at
523 #define ANHE_at_cache(he) 638 #define ANHE_at_cache(he)
… …
547 662
548 static int ev_default_loop_ptr; 663 static int ev_default_loop_ptr;
549 664
550#endif 665#endif
551 666
667#if EV_MINIMAL < 2
668# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
669# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
670# define EV_INVOKE_PENDING invoke_cb (EV_A)
671#else
672# define EV_RELEASE_CB (void)0
673# define EV_ACQUIRE_CB (void)0
674# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
675#endif
676
677#define EVUNLOOP_RECURSE 0x80
678
552/*****************************************************************************/ 679/*****************************************************************************/
553 680
681#ifndef EV_HAVE_EV_TIME
554ev_tstamp 682ev_tstamp
555ev_time (void) 683ev_time (void)
556{ 684{
557#if EV_USE_REALTIME 685#if EV_USE_REALTIME
686 if (expect_true (have_realtime))
687 {
558 struct timespec ts; 688 struct timespec ts;
559 clock_gettime (CLOCK_REALTIME, &ts); 689 clock_gettime (CLOCK_REALTIME, &ts);
560 return ts.tv_sec + ts.tv_nsec * 1e-9; 690 return ts.tv_sec + ts.tv_nsec * 1e-9;
561#else 691 }
692#endif
693
562 struct timeval tv; 694 struct timeval tv;
563 gettimeofday (&tv, 0); 695 gettimeofday (&tv, 0);
564 return tv.tv_sec + tv.tv_usec * 1e-6; 696 return tv.tv_sec + tv.tv_usec * 1e-6;
565#endif
566} 697}
698#endif
567 699
568ev_tstamp inline_size 700inline_size ev_tstamp
569get_clock (void) 701get_clock (void)
570{ 702{
571#if EV_USE_MONOTONIC 703#if EV_USE_MONOTONIC
572 if (expect_true (have_monotonic)) 704 if (expect_true (have_monotonic))
573 { 705 {
… …
607 739
608 tv.tv_sec = (time_t)delay; 740 tv.tv_sec = (time_t)delay;
609 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 741 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
610 742
611 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 743 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
612 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 744 /* something not guaranteed by newer posix versions, but guaranteed */
613 /* by older ones */ 745 /* by older ones */
614 select (0, 0, 0, 0, &tv); 746 select (0, 0, 0, 0, &tv);
615#endif 747#endif
616 } 748 }
617} 749}
618 750
619/*****************************************************************************/ 751/*****************************************************************************/
620 752
621#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 753#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
622 754
623int inline_size 755/* find a suitable new size for the given array, */
756/* hopefully by rounding to a ncie-to-malloc size */
757inline_size int
624array_nextsize (int elem, int cur, int cnt) 758array_nextsize (int elem, int cur, int cnt)
625{ 759{
626 int ncur = cur + 1; 760 int ncur = cur + 1;
627 761
628 do 762 do
… …
669 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 803 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
670 } 804 }
671#endif 805#endif
672 806
673#define array_free(stem, idx) \ 807#define array_free(stem, idx) \
674 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 808 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
675 809
676/*****************************************************************************/ 810/*****************************************************************************/
811
812/* dummy callback for pending events */
813static void noinline
814pendingcb (EV_P_ ev_prepare *w, int revents)
815{
816}
677 817
678void noinline 818void noinline
679ev_feed_event (EV_P_ void *w, int revents) 819ev_feed_event (EV_P_ void *w, int revents)
680{ 820{
681 W w_ = (W)w; 821 W w_ = (W)w;
… …
690 pendings [pri][w_->pending - 1].w = w_; 830 pendings [pri][w_->pending - 1].w = w_;
691 pendings [pri][w_->pending - 1].events = revents; 831 pendings [pri][w_->pending - 1].events = revents;
692 } 832 }
693} 833}
694 834
695void inline_speed 835inline_speed void
836feed_reverse (EV_P_ W w)
837{
838 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
839 rfeeds [rfeedcnt++] = w;
840}
841
842inline_size void
843feed_reverse_done (EV_P_ int revents)
844{
845 do
846 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
847 while (rfeedcnt);
848}
849
850inline_speed void
696queue_events (EV_P_ W *events, int eventcnt, int type) 851queue_events (EV_P_ W *events, int eventcnt, int type)
697{ 852{
698 int i; 853 int i;
699 854
700 for (i = 0; i < eventcnt; ++i) 855 for (i = 0; i < eventcnt; ++i)
701 ev_feed_event (EV_A_ events [i], type); 856 ev_feed_event (EV_A_ events [i], type);
702} 857}
703 858
704/*****************************************************************************/ 859/*****************************************************************************/
705 860
706void inline_speed 861inline_speed void
707fd_event (EV_P_ int fd, int revents) 862fd_event_nc (EV_P_ int fd, int revents)
708{ 863{
709 ANFD *anfd = anfds + fd; 864 ANFD *anfd = anfds + fd;
710 ev_io *w; 865 ev_io *w;
711 866
712 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 867 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
716 if (ev) 871 if (ev)
717 ev_feed_event (EV_A_ (W)w, ev); 872 ev_feed_event (EV_A_ (W)w, ev);
718 } 873 }
719} 874}
720 875
876/* do not submit kernel events for fds that have reify set */
877/* because that means they changed while we were polling for new events */
878inline_speed void
879fd_event (EV_P_ int fd, int revents)
880{
881 ANFD *anfd = anfds + fd;
882
883 if (expect_true (!anfd->reify))
884 fd_event_nc (EV_A_ fd, revents);
885}
886
721void 887void
722ev_feed_fd_event (EV_P_ int fd, int revents) 888ev_feed_fd_event (EV_P_ int fd, int revents)
723{ 889{
724 if (fd >= 0 && fd < anfdmax) 890 if (fd >= 0 && fd < anfdmax)
725 fd_event (EV_A_ fd, revents); 891 fd_event_nc (EV_A_ fd, revents);
726} 892}
727 893
728void inline_size 894/* make sure the external fd watch events are in-sync */
895/* with the kernel/libev internal state */
896inline_size void
729fd_reify (EV_P) 897fd_reify (EV_P)
730{ 898{
731 int i; 899 int i;
732 900
733 for (i = 0; i < fdchangecnt; ++i) 901 for (i = 0; i < fdchangecnt; ++i)
… …
743 911
744#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
745 if (events) 913 if (events)
746 { 914 {
747 unsigned long arg; 915 unsigned long arg;
748 #ifdef EV_FD_TO_WIN32_HANDLE
749 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 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)); 917 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
754 } 918 }
755#endif 919#endif
756 920
757 { 921 {
758 unsigned char o_events = anfd->events; 922 unsigned char o_events = anfd->events;
759 unsigned char o_reify = anfd->reify; 923 unsigned char o_reify = anfd->reify;
760 924
761 anfd->reify = 0; 925 anfd->reify = 0;
762 anfd->events = events; 926 anfd->events = events;
763 927
764 if (o_events != events || o_reify & EV_IOFDSET) 928 if (o_events != events || o_reify & EV__IOFDSET)
765 backend_modify (EV_A_ fd, o_events, events); 929 backend_modify (EV_A_ fd, o_events, events);
766 } 930 }
767 } 931 }
768 932
769 fdchangecnt = 0; 933 fdchangecnt = 0;
770} 934}
771 935
772void inline_size 936/* something about the given fd changed */
937inline_size void
773fd_change (EV_P_ int fd, int flags) 938fd_change (EV_P_ int fd, int flags)
774{ 939{
775 unsigned char reify = anfds [fd].reify; 940 unsigned char reify = anfds [fd].reify;
776 anfds [fd].reify |= flags; 941 anfds [fd].reify |= flags;
777 942
… …
781 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 946 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
782 fdchanges [fdchangecnt - 1] = fd; 947 fdchanges [fdchangecnt - 1] = fd;
783 } 948 }
784} 949}
785 950
786void inline_speed 951/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
952inline_speed void
787fd_kill (EV_P_ int fd) 953fd_kill (EV_P_ int fd)
788{ 954{
789 ev_io *w; 955 ev_io *w;
790 956
791 while ((w = (ev_io *)anfds [fd].head)) 957 while ((w = (ev_io *)anfds [fd].head))
… …
793 ev_io_stop (EV_A_ w); 959 ev_io_stop (EV_A_ w);
794 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 960 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
795 } 961 }
796} 962}
797 963
798int inline_size 964/* check whether the given fd is atcually valid, for error recovery */
965inline_size int
799fd_valid (int fd) 966fd_valid (int fd)
800{ 967{
801#ifdef _WIN32 968#ifdef _WIN32
802 return _get_osfhandle (fd) != -1; 969 return _get_osfhandle (fd) != -1;
803#else 970#else
… …
825 992
826 for (fd = anfdmax; fd--; ) 993 for (fd = anfdmax; fd--; )
827 if (anfds [fd].events) 994 if (anfds [fd].events)
828 { 995 {
829 fd_kill (EV_A_ fd); 996 fd_kill (EV_A_ fd);
830 return; 997 break;
831 } 998 }
832} 999}
833 1000
834/* usually called after fork if backend needs to re-arm all fds from scratch */ 1001/* usually called after fork if backend needs to re-arm all fds from scratch */
835static void noinline 1002static void noinline
… …
840 for (fd = 0; fd < anfdmax; ++fd) 1007 for (fd = 0; fd < anfdmax; ++fd)
841 if (anfds [fd].events) 1008 if (anfds [fd].events)
842 { 1009 {
843 anfds [fd].events = 0; 1010 anfds [fd].events = 0;
844 anfds [fd].emask = 0; 1011 anfds [fd].emask = 0;
845 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
846 } 1013 }
847} 1014}
848 1015
849/*****************************************************************************/ 1016/*****************************************************************************/
850 1017
… …
866#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1033#define HEAP0 (DHEAP - 1) /* index of first element in heap */
867#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1034#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
868#define UPHEAP_DONE(p,k) ((p) == (k)) 1035#define UPHEAP_DONE(p,k) ((p) == (k))
869 1036
870/* away from the root */ 1037/* away from the root */
871void inline_speed 1038inline_speed void
872downheap (ANHE *heap, int N, int k) 1039downheap (ANHE *heap, int N, int k)
873{ 1040{
874 ANHE he = heap [k]; 1041 ANHE he = heap [k];
875 ANHE *E = heap + N + HEAP0; 1042 ANHE *E = heap + N + HEAP0;
876 1043
… …
916#define HEAP0 1 1083#define HEAP0 1
917#define HPARENT(k) ((k) >> 1) 1084#define HPARENT(k) ((k) >> 1)
918#define UPHEAP_DONE(p,k) (!(p)) 1085#define UPHEAP_DONE(p,k) (!(p))
919 1086
920/* away from the root */ 1087/* away from the root */
921void inline_speed 1088inline_speed void
922downheap (ANHE *heap, int N, int k) 1089downheap (ANHE *heap, int N, int k)
923{ 1090{
924 ANHE he = heap [k]; 1091 ANHE he = heap [k];
925 1092
926 for (;;) 1093 for (;;)
927 { 1094 {
928 int c = k << 1; 1095 int c = k << 1;
929 1096
930 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
931 break; 1098 break;
932 1099
933 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1100 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
934 ? 1 : 0; 1101 ? 1 : 0;
935 1102
… …
946 ev_active (ANHE_w (he)) = k; 1113 ev_active (ANHE_w (he)) = k;
947} 1114}
948#endif 1115#endif
949 1116
950/* towards the root */ 1117/* towards the root */
951void inline_speed 1118inline_speed void
952upheap (ANHE *heap, int k) 1119upheap (ANHE *heap, int k)
953{ 1120{
954 ANHE he = heap [k]; 1121 ANHE he = heap [k];
955 1122
956 for (;;) 1123 for (;;)
… …
967 1134
968 heap [k] = he; 1135 heap [k] = he;
969 ev_active (ANHE_w (he)) = k; 1136 ev_active (ANHE_w (he)) = k;
970} 1137}
971 1138
972void inline_size 1139/* move an element suitably so it is in a correct place */
1140inline_size void
973adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
974{ 1142{
975 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1143 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
976 upheap (heap, k); 1144 upheap (heap, k);
977 else 1145 else
978 downheap (heap, N, k); 1146 downheap (heap, N, k);
979} 1147}
980 1148
981/* rebuild the heap: this function is used only once and executed rarely */ 1149/* rebuild the heap: this function is used only once and executed rarely */
982void inline_size 1150inline_size void
983reheap (ANHE *heap, int N) 1151reheap (ANHE *heap, int N)
984{ 1152{
985 int i; 1153 int i;
986 1154
987 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1155 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
990 upheap (heap, i + HEAP0); 1158 upheap (heap, i + HEAP0);
991} 1159}
992 1160
993/*****************************************************************************/ 1161/*****************************************************************************/
994 1162
1163/* associate signal watchers to a signal signal */
995typedef struct 1164typedef struct
996{ 1165{
1166 EV_ATOMIC_T pending;
1167#if EV_MULTIPLICITY
1168 EV_P;
1169#endif
997 WL head; 1170 WL head;
998 EV_ATOMIC_T gotsig;
999} ANSIG; 1171} ANSIG;
1000 1172
1001static ANSIG *signals; 1173static ANSIG signals [EV_NSIG - 1];
1002static int signalmax;
1003
1004static EV_ATOMIC_T gotsig;
1005 1174
1006/*****************************************************************************/ 1175/*****************************************************************************/
1007 1176
1008void inline_speed 1177/* used to prepare libev internal fd's */
1178/* this is not fork-safe */
1179inline_speed void
1009fd_intern (int fd) 1180fd_intern (int fd)
1010{ 1181{
1011#ifdef _WIN32 1182#ifdef _WIN32
1012 unsigned long arg = 1; 1183 unsigned long arg = 1;
1013 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1184 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
1018} 1189}
1019 1190
1020static void noinline 1191static void noinline
1021evpipe_init (EV_P) 1192evpipe_init (EV_P)
1022{ 1193{
1023 if (!ev_is_active (&pipeev)) 1194 if (!ev_is_active (&pipe_w))
1024 { 1195 {
1025#if EV_USE_EVENTFD 1196#if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL)
1026 if ((evfd = eventfd (0, 0)) >= 0) 1199 evfd = eventfd (0, 0);
1200
1201 if (evfd >= 0)
1027 { 1202 {
1028 evpipe [0] = -1; 1203 evpipe [0] = -1;
1029 fd_intern (evfd); 1204 fd_intern (evfd); /* doing it twice doesn't hurt */
1030 ev_io_set (&pipeev, evfd, EV_READ); 1205 ev_io_set (&pipe_w, evfd, EV_READ);
1031 } 1206 }
1032 else 1207 else
1033#endif 1208#endif
1034 { 1209 {
1035 while (pipe (evpipe)) 1210 while (pipe (evpipe))
1036 ev_syserr ("(libev) error creating signal/async pipe"); 1211 ev_syserr ("(libev) error creating signal/async pipe");
1037 1212
1038 fd_intern (evpipe [0]); 1213 fd_intern (evpipe [0]);
1039 fd_intern (evpipe [1]); 1214 fd_intern (evpipe [1]);
1040 ev_io_set (&pipeev, evpipe [0], EV_READ); 1215 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1041 } 1216 }
1042 1217
1043 ev_io_start (EV_A_ &pipeev); 1218 ev_io_start (EV_A_ &pipe_w);
1044 ev_unref (EV_A); /* watcher should not keep loop alive */ 1219 ev_unref (EV_A); /* watcher should not keep loop alive */
1045 } 1220 }
1046} 1221}
1047 1222
1048void inline_size 1223inline_size void
1049evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1224evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1050{ 1225{
1051 if (!*flag) 1226 if (!*flag)
1052 { 1227 {
1053 int old_errno = errno; /* save errno because write might clobber it */ 1228 int old_errno = errno; /* save errno because write might clobber it */
… …
1066 1241
1067 errno = old_errno; 1242 errno = old_errno;
1068 } 1243 }
1069} 1244}
1070 1245
1246/* called whenever the libev signal pipe */
1247/* got some events (signal, async) */
1071static void 1248static void
1072pipecb (EV_P_ ev_io *iow, int revents) 1249pipecb (EV_P_ ev_io *iow, int revents)
1073{ 1250{
1251 int i;
1252
1074#if EV_USE_EVENTFD 1253#if EV_USE_EVENTFD
1075 if (evfd >= 0) 1254 if (evfd >= 0)
1076 { 1255 {
1077 uint64_t counter; 1256 uint64_t counter;
1078 read (evfd, &counter, sizeof (uint64_t)); 1257 read (evfd, &counter, sizeof (uint64_t));
… …
1082 { 1261 {
1083 char dummy; 1262 char dummy;
1084 read (evpipe [0], &dummy, 1); 1263 read (evpipe [0], &dummy, 1);
1085 } 1264 }
1086 1265
1087 if (gotsig && ev_is_default_loop (EV_A)) 1266 if (sig_pending)
1088 { 1267 {
1089 int signum; 1268 sig_pending = 0;
1090 gotsig = 0;
1091 1269
1092 for (signum = signalmax; signum--; ) 1270 for (i = EV_NSIG - 1; i--; )
1093 if (signals [signum].gotsig) 1271 if (expect_false (signals [i].pending))
1094 ev_feed_signal_event (EV_A_ signum + 1); 1272 ev_feed_signal_event (EV_A_ i + 1);
1095 } 1273 }
1096 1274
1097#if EV_ASYNC_ENABLE 1275#if EV_ASYNC_ENABLE
1098 if (gotasync) 1276 if (async_pending)
1099 { 1277 {
1100 int i; 1278 async_pending = 0;
1101 gotasync = 0;
1102 1279
1103 for (i = asynccnt; i--; ) 1280 for (i = asynccnt; i--; )
1104 if (asyncs [i]->sent) 1281 if (asyncs [i]->sent)
1105 { 1282 {
1106 asyncs [i]->sent = 0; 1283 asyncs [i]->sent = 0;
… …
1114 1291
1115static void 1292static void
1116ev_sighandler (int signum) 1293ev_sighandler (int signum)
1117{ 1294{
1118#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1119 struct ev_loop *loop = &default_loop_struct; 1296 EV_P = signals [signum - 1].loop;
1120#endif 1297#endif
1121 1298
1122#if _WIN32 1299#if _WIN32
1123 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1124#endif 1301#endif
1125 1302
1126 signals [signum - 1].gotsig = 1; 1303 signals [signum - 1].pending = 1;
1127 evpipe_write (EV_A_ &gotsig); 1304 evpipe_write (EV_A_ &sig_pending);
1128} 1305}
1129 1306
1130void noinline 1307void noinline
1131ev_feed_signal_event (EV_P_ int signum) 1308ev_feed_signal_event (EV_P_ int signum)
1132{ 1309{
1133 WL w; 1310 WL w;
1134 1311
1312 if (expect_false (signum <= 0 || signum > EV_NSIG))
1313 return;
1314
1315 --signum;
1316
1135#if EV_MULTIPLICITY 1317#if EV_MULTIPLICITY
1136 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1318 /* it is permissible to try to feed a signal to the wrong loop */
1137#endif 1319 /* or, likely more useful, feeding a signal nobody is waiting for */
1138 1320
1139 --signum; 1321 if (expect_false (signals [signum].loop != EV_A))
1140
1141 if (signum < 0 || signum >= signalmax)
1142 return; 1322 return;
1323#endif
1143 1324
1144 signals [signum].gotsig = 0; 1325 signals [signum].pending = 0;
1145 1326
1146 for (w = signals [signum].head; w; w = w->next) 1327 for (w = signals [signum].head; w; w = w->next)
1147 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1328 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1148} 1329}
1149 1330
1331#if EV_USE_SIGNALFD
1332static void
1333sigfdcb (EV_P_ ev_io *iow, int revents)
1334{
1335 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1336
1337 for (;;)
1338 {
1339 ssize_t res = read (sigfd, si, sizeof (si));
1340
1341 /* not ISO-C, as res might be -1, but works with SuS */
1342 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1343 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1344
1345 if (res < (ssize_t)sizeof (si))
1346 break;
1347 }
1348}
1349#endif
1350
1150/*****************************************************************************/ 1351/*****************************************************************************/
1151 1352
1152static WL childs [EV_PID_HASHSIZE]; 1353static WL childs [EV_PID_HASHSIZE];
1153 1354
1154#ifndef _WIN32 1355#ifndef _WIN32
… …
1157 1358
1158#ifndef WIFCONTINUED 1359#ifndef WIFCONTINUED
1159# define WIFCONTINUED(status) 0 1360# define WIFCONTINUED(status) 0
1160#endif 1361#endif
1161 1362
1162void inline_speed 1363/* handle a single child status event */
1364inline_speed void
1163child_reap (EV_P_ int chain, int pid, int status) 1365child_reap (EV_P_ int chain, int pid, int status)
1164{ 1366{
1165 ev_child *w; 1367 ev_child *w;
1166 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1368 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1167 1369
… …
1180 1382
1181#ifndef WCONTINUED 1383#ifndef WCONTINUED
1182# define WCONTINUED 0 1384# define WCONTINUED 0
1183#endif 1385#endif
1184 1386
1387/* called on sigchld etc., calls waitpid */
1185static void 1388static void
1186childcb (EV_P_ ev_signal *sw, int revents) 1389childcb (EV_P_ ev_signal *sw, int revents)
1187{ 1390{
1188 int pid, status; 1391 int pid, status;
1189 1392
… …
1270 /* kqueue is borked on everything but netbsd apparently */ 1473 /* kqueue is borked on everything but netbsd apparently */
1271 /* it usually doesn't work correctly on anything but sockets and pipes */ 1474 /* it usually doesn't work correctly on anything but sockets and pipes */
1272 flags &= ~EVBACKEND_KQUEUE; 1475 flags &= ~EVBACKEND_KQUEUE;
1273#endif 1476#endif
1274#ifdef __APPLE__ 1477#ifdef __APPLE__
1275 // flags &= ~EVBACKEND_KQUEUE & ~EVBACKEND_POLL; for documentation 1478 /* only select works correctly on that "unix-certified" platform */
1276 flags &= ~EVBACKEND_SELECT; 1479 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1480 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1277#endif 1481#endif
1278 1482
1279 return flags; 1483 return flags;
1280} 1484}
1281 1485
… …
1295ev_backend (EV_P) 1499ev_backend (EV_P)
1296{ 1500{
1297 return backend; 1501 return backend;
1298} 1502}
1299 1503
1504#if EV_MINIMAL < 2
1300unsigned int 1505unsigned int
1301ev_loop_count (EV_P) 1506ev_loop_count (EV_P)
1302{ 1507{
1303 return loop_count; 1508 return loop_count;
1304} 1509}
1305 1510
1511unsigned int
1512ev_loop_depth (EV_P)
1513{
1514 return loop_depth;
1515}
1516
1306void 1517void
1307ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1518ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1308{ 1519{
1309 io_blocktime = interval; 1520 io_blocktime = interval;
1310} 1521}
… …
1313ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1314{ 1525{
1315 timeout_blocktime = interval; 1526 timeout_blocktime = interval;
1316} 1527}
1317 1528
1529void
1530ev_set_userdata (EV_P_ void *data)
1531{
1532 userdata = data;
1533}
1534
1535void *
1536ev_userdata (EV_P)
1537{
1538 return userdata;
1539}
1540
1541void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1542{
1543 invoke_cb = invoke_pending_cb;
1544}
1545
1546void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1547{
1548 release_cb = release;
1549 acquire_cb = acquire;
1550}
1551#endif
1552
1553/* initialise a loop structure, must be zero-initialised */
1318static void noinline 1554static void noinline
1319loop_init (EV_P_ unsigned int flags) 1555loop_init (EV_P_ unsigned int flags)
1320{ 1556{
1321 if (!backend) 1557 if (!backend)
1322 { 1558 {
1559#if EV_USE_REALTIME
1560 if (!have_realtime)
1561 {
1562 struct timespec ts;
1563
1564 if (!clock_gettime (CLOCK_REALTIME, &ts))
1565 have_realtime = 1;
1566 }
1567#endif
1568
1323#if EV_USE_MONOTONIC 1569#if EV_USE_MONOTONIC
1570 if (!have_monotonic)
1324 { 1571 {
1325 struct timespec ts; 1572 struct timespec ts;
1573
1326 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1574 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1327 have_monotonic = 1; 1575 have_monotonic = 1;
1328 } 1576 }
1329#endif 1577#endif
1578
1579 /* pid check not overridable via env */
1580#ifndef _WIN32
1581 if (flags & EVFLAG_FORKCHECK)
1582 curpid = getpid ();
1583#endif
1584
1585 if (!(flags & EVFLAG_NOENV)
1586 && !enable_secure ()
1587 && getenv ("LIBEV_FLAGS"))
1588 flags = atoi (getenv ("LIBEV_FLAGS"));
1330 1589
1331 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1332 mn_now = get_clock (); 1591 mn_now = get_clock ();
1333 now_floor = mn_now; 1592 now_floor = mn_now;
1334 rtmn_diff = ev_rt_now - mn_now; 1593 rtmn_diff = ev_rt_now - mn_now;
1594#if EV_MINIMAL < 2
1595 invoke_cb = ev_invoke_pending;
1596#endif
1335 1597
1336 io_blocktime = 0.; 1598 io_blocktime = 0.;
1337 timeout_blocktime = 0.; 1599 timeout_blocktime = 0.;
1338 backend = 0; 1600 backend = 0;
1339 backend_fd = -1; 1601 backend_fd = -1;
1340 gotasync = 0; 1602 sig_pending = 0;
1603#if EV_ASYNC_ENABLE
1604 async_pending = 0;
1605#endif
1341#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1342 fs_fd = -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1343#endif 1608#endif
1344 1609#if EV_USE_SIGNALFD
1345 /* pid check not overridable via env */ 1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1346#ifndef _WIN32
1347 if (flags & EVFLAG_FORKCHECK)
1348 curpid = getpid ();
1349#endif 1611#endif
1350
1351 if (!(flags & EVFLAG_NOENV)
1352 && !enable_secure ()
1353 && getenv ("LIBEV_FLAGS"))
1354 flags = atoi (getenv ("LIBEV_FLAGS"));
1355 1612
1356 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1357 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1358 1615
1359#if EV_USE_PORT 1616#if EV_USE_PORT
… …
1370#endif 1627#endif
1371#if EV_USE_SELECT 1628#if EV_USE_SELECT
1372 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1629 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1373#endif 1630#endif
1374 1631
1632 ev_prepare_init (&pending_w, pendingcb);
1633
1375 ev_init (&pipeev, pipecb); 1634 ev_init (&pipe_w, pipecb);
1376 ev_set_priority (&pipeev, EV_MAXPRI); 1635 ev_set_priority (&pipe_w, EV_MAXPRI);
1377 } 1636 }
1378} 1637}
1379 1638
1639/* free up a loop structure */
1380static void noinline 1640static void noinline
1381loop_destroy (EV_P) 1641loop_destroy (EV_P)
1382{ 1642{
1383 int i; 1643 int i;
1384 1644
1385 if (ev_is_active (&pipeev)) 1645 if (ev_is_active (&pipe_w))
1386 { 1646 {
1387 ev_ref (EV_A); /* signal watcher */ 1647 /*ev_ref (EV_A);*/
1388 ev_io_stop (EV_A_ &pipeev); 1648 /*ev_io_stop (EV_A_ &pipe_w);*/
1389 1649
1390#if EV_USE_EVENTFD 1650#if EV_USE_EVENTFD
1391 if (evfd >= 0) 1651 if (evfd >= 0)
1392 close (evfd); 1652 close (evfd);
1393#endif 1653#endif
1394 1654
1395 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1396 { 1656 {
1397 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1398 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1399 } 1659 }
1400 } 1660 }
1661
1662#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w))
1664 {
1665 /*ev_ref (EV_A);*/
1666 /*ev_io_stop (EV_A_ &sigfd_w);*/
1667
1668 close (sigfd);
1669 }
1670#endif
1401 1671
1402#if EV_USE_INOTIFY 1672#if EV_USE_INOTIFY
1403 if (fs_fd >= 0) 1673 if (fs_fd >= 0)
1404 close (fs_fd); 1674 close (fs_fd);
1405#endif 1675#endif
… …
1429#if EV_IDLE_ENABLE 1699#if EV_IDLE_ENABLE
1430 array_free (idle, [i]); 1700 array_free (idle, [i]);
1431#endif 1701#endif
1432 } 1702 }
1433 1703
1434 ev_free (anfds); anfdmax = 0; 1704 ev_free (anfds); anfds = 0; anfdmax = 0;
1435 1705
1436 /* have to use the microsoft-never-gets-it-right macro */ 1706 /* have to use the microsoft-never-gets-it-right macro */
1707 array_free (rfeed, EMPTY);
1437 array_free (fdchange, EMPTY); 1708 array_free (fdchange, EMPTY);
1438 array_free (timer, EMPTY); 1709 array_free (timer, EMPTY);
1439#if EV_PERIODIC_ENABLE 1710#if EV_PERIODIC_ENABLE
1440 array_free (periodic, EMPTY); 1711 array_free (periodic, EMPTY);
1441#endif 1712#endif
… …
1450 1721
1451 backend = 0; 1722 backend = 0;
1452} 1723}
1453 1724
1454#if EV_USE_INOTIFY 1725#if EV_USE_INOTIFY
1455void inline_size infy_fork (EV_P); 1726inline_size void infy_fork (EV_P);
1456#endif 1727#endif
1457 1728
1458void inline_size 1729inline_size void
1459loop_fork (EV_P) 1730loop_fork (EV_P)
1460{ 1731{
1461#if EV_USE_PORT 1732#if EV_USE_PORT
1462 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1733 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1463#endif 1734#endif
… …
1469#endif 1740#endif
1470#if EV_USE_INOTIFY 1741#if EV_USE_INOTIFY
1471 infy_fork (EV_A); 1742 infy_fork (EV_A);
1472#endif 1743#endif
1473 1744
1474 if (ev_is_active (&pipeev)) 1745 if (ev_is_active (&pipe_w))
1475 { 1746 {
1476 /* this "locks" the handlers against writing to the pipe */ 1747 /* this "locks" the handlers against writing to the pipe */
1477 /* while we modify the fd vars */ 1748 /* while we modify the fd vars */
1478 gotsig = 1; 1749 sig_pending = 1;
1479#if EV_ASYNC_ENABLE 1750#if EV_ASYNC_ENABLE
1480 gotasync = 1; 1751 async_pending = 1;
1481#endif 1752#endif
1482 1753
1483 ev_ref (EV_A); 1754 ev_ref (EV_A);
1484 ev_io_stop (EV_A_ &pipeev); 1755 ev_io_stop (EV_A_ &pipe_w);
1485 1756
1486#if EV_USE_EVENTFD 1757#if EV_USE_EVENTFD
1487 if (evfd >= 0) 1758 if (evfd >= 0)
1488 close (evfd); 1759 close (evfd);
1489#endif 1760#endif
1490 1761
1491 if (evpipe [0] >= 0) 1762 if (evpipe [0] >= 0)
1492 { 1763 {
1493 close (evpipe [0]); 1764 EV_WIN32_CLOSE_FD (evpipe [0]);
1494 close (evpipe [1]); 1765 EV_WIN32_CLOSE_FD (evpipe [1]);
1495 } 1766 }
1496 1767
1497 evpipe_init (EV_A); 1768 evpipe_init (EV_A);
1498 /* now iterate over everything, in case we missed something */ 1769 /* now iterate over everything, in case we missed something */
1499 pipecb (EV_A_ &pipeev, EV_READ); 1770 pipecb (EV_A_ &pipe_w, EV_READ);
1500 } 1771 }
1501 1772
1502 postfork = 0; 1773 postfork = 0;
1503} 1774}
1504 1775
1505#if EV_MULTIPLICITY 1776#if EV_MULTIPLICITY
1506 1777
1507struct ev_loop * 1778struct ev_loop *
1508ev_loop_new (unsigned int flags) 1779ev_loop_new (unsigned int flags)
1509{ 1780{
1510 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1781 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1511 1782
1512 memset (loop, 0, sizeof (struct ev_loop)); 1783 memset (EV_A, 0, sizeof (struct ev_loop));
1513
1514 loop_init (EV_A_ flags); 1784 loop_init (EV_A_ flags);
1515 1785
1516 if (ev_backend (EV_A)) 1786 if (ev_backend (EV_A))
1517 return loop; 1787 return EV_A;
1518 1788
1519 return 0; 1789 return 0;
1520} 1790}
1521 1791
1522void 1792void
… …
1529void 1799void
1530ev_loop_fork (EV_P) 1800ev_loop_fork (EV_P)
1531{ 1801{
1532 postfork = 1; /* must be in line with ev_default_fork */ 1802 postfork = 1; /* must be in line with ev_default_fork */
1533} 1803}
1804#endif /* multiplicity */
1534 1805
1535#if EV_VERIFY 1806#if EV_VERIFY
1536static void noinline 1807static void noinline
1537verify_watcher (EV_P_ W w) 1808verify_watcher (EV_P_ W w)
1538{ 1809{
1539 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1810 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1540 1811
1541 if (w->pending) 1812 if (w->pending)
1542 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1813 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1543} 1814}
1544 1815
1545static void noinline 1816static void noinline
1546verify_heap (EV_P_ ANHE *heap, int N) 1817verify_heap (EV_P_ ANHE *heap, int N)
1547{ 1818{
1548 int i; 1819 int i;
1549 1820
1550 for (i = HEAP0; i < N + HEAP0; ++i) 1821 for (i = HEAP0; i < N + HEAP0; ++i)
1551 { 1822 {
1552 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1823 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]))); 1824 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])))); 1825 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1555 1826
1556 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1827 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1557 } 1828 }
1558} 1829}
1559 1830
1560static void noinline 1831static void noinline
1561array_verify (EV_P_ W *ws, int cnt) 1832array_verify (EV_P_ W *ws, int cnt)
1562{ 1833{
1563 while (cnt--) 1834 while (cnt--)
1564 { 1835 {
1565 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1836 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1566 verify_watcher (EV_A_ ws [cnt]); 1837 verify_watcher (EV_A_ ws [cnt]);
1567 } 1838 }
1568} 1839}
1569#endif 1840#endif
1570 1841
1842#if EV_MINIMAL < 2
1571void 1843void
1572ev_loop_verify (EV_P) 1844ev_loop_verify (EV_P)
1573{ 1845{
1574#if EV_VERIFY 1846#if EV_VERIFY
1575 int i; 1847 int i;
… …
1577 1849
1578 assert (activecnt >= -1); 1850 assert (activecnt >= -1);
1579 1851
1580 assert (fdchangemax >= fdchangecnt); 1852 assert (fdchangemax >= fdchangecnt);
1581 for (i = 0; i < fdchangecnt; ++i) 1853 for (i = 0; i < fdchangecnt; ++i)
1582 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1854 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1583 1855
1584 assert (anfdmax >= 0); 1856 assert (anfdmax >= 0);
1585 for (i = 0; i < anfdmax; ++i) 1857 for (i = 0; i < anfdmax; ++i)
1586 for (w = anfds [i].head; w; w = w->next) 1858 for (w = anfds [i].head; w; w = w->next)
1587 { 1859 {
1588 verify_watcher (EV_A_ (W)w); 1860 verify_watcher (EV_A_ (W)w);
1589 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1861 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)); 1862 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1591 } 1863 }
1592 1864
1593 assert (timermax >= timercnt); 1865 assert (timermax >= timercnt);
1594 verify_heap (EV_A_ timers, timercnt); 1866 verify_heap (EV_A_ timers, timercnt);
1595 1867
… …
1624 assert (checkmax >= checkcnt); 1896 assert (checkmax >= checkcnt);
1625 array_verify (EV_A_ (W *)checks, checkcnt); 1897 array_verify (EV_A_ (W *)checks, checkcnt);
1626 1898
1627# if 0 1899# if 0
1628 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1900 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) 1901 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1630# endif
1631#endif 1902# endif
1903#endif
1632} 1904}
1633 1905#endif
1634#endif /* multiplicity */
1635 1906
1636#if EV_MULTIPLICITY 1907#if EV_MULTIPLICITY
1637struct ev_loop * 1908struct ev_loop *
1638ev_default_loop_init (unsigned int flags) 1909ev_default_loop_init (unsigned int flags)
1639#else 1910#else
… …
1642#endif 1913#endif
1643{ 1914{
1644 if (!ev_default_loop_ptr) 1915 if (!ev_default_loop_ptr)
1645 { 1916 {
1646#if EV_MULTIPLICITY 1917#if EV_MULTIPLICITY
1647 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1918 EV_P = ev_default_loop_ptr = &default_loop_struct;
1648#else 1919#else
1649 ev_default_loop_ptr = 1; 1920 ev_default_loop_ptr = 1;
1650#endif 1921#endif
1651 1922
1652 loop_init (EV_A_ flags); 1923 loop_init (EV_A_ flags);
… …
1669 1940
1670void 1941void
1671ev_default_destroy (void) 1942ev_default_destroy (void)
1672{ 1943{
1673#if EV_MULTIPLICITY 1944#if EV_MULTIPLICITY
1674 struct ev_loop *loop = ev_default_loop_ptr; 1945 EV_P = ev_default_loop_ptr;
1675#endif 1946#endif
1676 1947
1677 ev_default_loop_ptr = 0; 1948 ev_default_loop_ptr = 0;
1678 1949
1679#ifndef _WIN32 1950#ifndef _WIN32
… …
1686 1957
1687void 1958void
1688ev_default_fork (void) 1959ev_default_fork (void)
1689{ 1960{
1690#if EV_MULTIPLICITY 1961#if EV_MULTIPLICITY
1691 struct ev_loop *loop = ev_default_loop_ptr; 1962 EV_P = ev_default_loop_ptr;
1692#endif 1963#endif
1693 1964
1694 postfork = 1; /* must be in line with ev_loop_fork */ 1965 postfork = 1; /* must be in line with ev_loop_fork */
1695} 1966}
1696 1967
… …
1700ev_invoke (EV_P_ void *w, int revents) 1971ev_invoke (EV_P_ void *w, int revents)
1701{ 1972{
1702 EV_CB_INVOKE ((W)w, revents); 1973 EV_CB_INVOKE ((W)w, revents);
1703} 1974}
1704 1975
1705void inline_speed 1976unsigned int
1706call_pending (EV_P) 1977ev_pending_count (EV_P)
1978{
1979 int pri;
1980 unsigned int count = 0;
1981
1982 for (pri = NUMPRI; pri--; )
1983 count += pendingcnt [pri];
1984
1985 return count;
1986}
1987
1988void noinline
1989ev_invoke_pending (EV_P)
1707{ 1990{
1708 int pri; 1991 int pri;
1709 1992
1710 for (pri = NUMPRI; pri--; ) 1993 for (pri = NUMPRI; pri--; )
1711 while (pendingcnt [pri]) 1994 while (pendingcnt [pri])
1712 { 1995 {
1713 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1996 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1714 1997
1715 if (expect_true (p->w))
1716 {
1717 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1998 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1999 /* ^ this is no longer true, as pending_w could be here */
1718 2000
1719 p->w->pending = 0; 2001 p->w->pending = 0;
1720 EV_CB_INVOKE (p->w, p->events); 2002 EV_CB_INVOKE (p->w, p->events);
1721 EV_FREQUENT_CHECK; 2003 EV_FREQUENT_CHECK;
1722 }
1723 } 2004 }
1724} 2005}
1725 2006
1726#if EV_IDLE_ENABLE 2007#if EV_IDLE_ENABLE
1727void inline_size 2008/* make idle watchers pending. this handles the "call-idle */
2009/* only when higher priorities are idle" logic */
2010inline_size void
1728idle_reify (EV_P) 2011idle_reify (EV_P)
1729{ 2012{
1730 if (expect_false (idleall)) 2013 if (expect_false (idleall))
1731 { 2014 {
1732 int pri; 2015 int pri;
… …
1744 } 2027 }
1745 } 2028 }
1746} 2029}
1747#endif 2030#endif
1748 2031
1749void inline_size 2032/* make timers pending */
2033inline_size void
1750timers_reify (EV_P) 2034timers_reify (EV_P)
1751{ 2035{
1752 EV_FREQUENT_CHECK; 2036 EV_FREQUENT_CHECK;
1753 2037
1754 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2038 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1755 { 2039 {
1756 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2040 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 { 2041 {
2042 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2043
2044 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2045
2046 /* first reschedule or stop timer */
2047 if (w->repeat)
2048 {
1763 ev_at (w) += w->repeat; 2049 ev_at (w) += w->repeat;
1764 if (ev_at (w) < mn_now) 2050 if (ev_at (w) < mn_now)
1765 ev_at (w) = mn_now; 2051 ev_at (w) = mn_now;
1766 2052
1767 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2053 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1768 2054
1769 ANHE_at_cache (timers [HEAP0]); 2055 ANHE_at_cache (timers [HEAP0]);
1770 downheap (timers, timercnt, HEAP0); 2056 downheap (timers, timercnt, HEAP0);
2057 }
2058 else
2059 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2060
2061 EV_FREQUENT_CHECK;
2062 feed_reverse (EV_A_ (W)w);
1771 } 2063 }
1772 else 2064 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1773 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1774 2065
1775 EV_FREQUENT_CHECK;
1776 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2066 feed_reverse_done (EV_A_ EV_TIMEOUT);
1777 } 2067 }
1778} 2068}
1779 2069
1780#if EV_PERIODIC_ENABLE 2070#if EV_PERIODIC_ENABLE
1781void inline_size 2071/* make periodics pending */
2072inline_size void
1782periodics_reify (EV_P) 2073periodics_reify (EV_P)
1783{ 2074{
1784 EV_FREQUENT_CHECK; 2075 EV_FREQUENT_CHECK;
1785 2076
1786 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2077 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1787 { 2078 {
1788 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2079 int feed_count = 0;
1789 2080
1790 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2081 do
1791
1792 /* first reschedule or stop timer */
1793 if (w->reschedule_cb)
1794 { 2082 {
2083 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2084
2085 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2086
2087 /* first reschedule or stop timer */
2088 if (w->reschedule_cb)
2089 {
1795 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2090 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1796 2091
1797 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2092 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1798 2093
1799 ANHE_at_cache (periodics [HEAP0]); 2094 ANHE_at_cache (periodics [HEAP0]);
1800 downheap (periodics, periodiccnt, HEAP0); 2095 downheap (periodics, periodiccnt, HEAP0);
2096 }
2097 else if (w->interval)
2098 {
2099 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2100 /* if next trigger time is not sufficiently in the future, put it there */
2101 /* this might happen because of floating point inexactness */
2102 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2103 {
2104 ev_at (w) += w->interval;
2105
2106 /* if interval is unreasonably low we might still have a time in the past */
2107 /* so correct this. this will make the periodic very inexact, but the user */
2108 /* has effectively asked to get triggered more often than possible */
2109 if (ev_at (w) < ev_rt_now)
2110 ev_at (w) = ev_rt_now;
2111 }
2112
2113 ANHE_at_cache (periodics [HEAP0]);
2114 downheap (periodics, periodiccnt, HEAP0);
2115 }
2116 else
2117 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2118
2119 EV_FREQUENT_CHECK;
2120 feed_reverse (EV_A_ (W)w);
1801 } 2121 }
1802 else if (w->interval) 2122 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 2123
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); 2124 feed_reverse_done (EV_A_ EV_PERIODIC);
1826 } 2125 }
1827} 2126}
1828 2127
2128/* simply recalculate all periodics */
2129/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1829static void noinline 2130static void noinline
1830periodics_reschedule (EV_P) 2131periodics_reschedule (EV_P)
1831{ 2132{
1832 int i; 2133 int i;
1833 2134
… …
1846 2147
1847 reheap (periodics, periodiccnt); 2148 reheap (periodics, periodiccnt);
1848} 2149}
1849#endif 2150#endif
1850 2151
1851void inline_speed 2152/* adjust all timers by a given offset */
2153static void noinline
2154timers_reschedule (EV_P_ ev_tstamp adjust)
2155{
2156 int i;
2157
2158 for (i = 0; i < timercnt; ++i)
2159 {
2160 ANHE *he = timers + i + HEAP0;
2161 ANHE_w (*he)->at += adjust;
2162 ANHE_at_cache (*he);
2163 }
2164}
2165
2166/* fetch new monotonic and realtime times from the kernel */
2167/* also detetc if there was a timejump, and act accordingly */
2168inline_speed void
1852time_update (EV_P_ ev_tstamp max_block) 2169time_update (EV_P_ ev_tstamp max_block)
1853{ 2170{
1854 int i;
1855
1856#if EV_USE_MONOTONIC 2171#if EV_USE_MONOTONIC
1857 if (expect_true (have_monotonic)) 2172 if (expect_true (have_monotonic))
1858 { 2173 {
2174 int i;
1859 ev_tstamp odiff = rtmn_diff; 2175 ev_tstamp odiff = rtmn_diff;
1860 2176
1861 mn_now = get_clock (); 2177 mn_now = get_clock ();
1862 2178
1863 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2179 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1889 ev_rt_now = ev_time (); 2205 ev_rt_now = ev_time ();
1890 mn_now = get_clock (); 2206 mn_now = get_clock ();
1891 now_floor = mn_now; 2207 now_floor = mn_now;
1892 } 2208 }
1893 2209
2210 /* no timer adjustment, as the monotonic clock doesn't jump */
2211 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1894# if EV_PERIODIC_ENABLE 2212# if EV_PERIODIC_ENABLE
1895 periodics_reschedule (EV_A); 2213 periodics_reschedule (EV_A);
1896# endif 2214# endif
1897 /* no timer adjustment, as the monotonic clock doesn't jump */
1898 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1899 } 2215 }
1900 else 2216 else
1901#endif 2217#endif
1902 { 2218 {
1903 ev_rt_now = ev_time (); 2219 ev_rt_now = ev_time ();
1904 2220
1905 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2221 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1906 { 2222 {
2223 /* adjust timers. this is easy, as the offset is the same for all of them */
2224 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1907#if EV_PERIODIC_ENABLE 2225#if EV_PERIODIC_ENABLE
1908 periodics_reschedule (EV_A); 2226 periodics_reschedule (EV_A);
1909#endif 2227#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 } 2228 }
1918 2229
1919 mn_now = ev_rt_now; 2230 mn_now = ev_rt_now;
1920 } 2231 }
1921} 2232}
1922 2233
1923void 2234void
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) 2235ev_loop (EV_P_ int flags)
1945{ 2236{
2237#if EV_MINIMAL < 2
2238 ++loop_depth;
2239#endif
2240
2241 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2242
1946 loop_done = EVUNLOOP_CANCEL; 2243 loop_done = EVUNLOOP_CANCEL;
1947 2244
1948 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2245 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1949 2246
1950 do 2247 do
1951 { 2248 {
1952#if EV_VERIFY >= 2 2249#if EV_VERIFY >= 2
1953 ev_loop_verify (EV_A); 2250 ev_loop_verify (EV_A);
… …
1966 /* we might have forked, so queue fork handlers */ 2263 /* we might have forked, so queue fork handlers */
1967 if (expect_false (postfork)) 2264 if (expect_false (postfork))
1968 if (forkcnt) 2265 if (forkcnt)
1969 { 2266 {
1970 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2267 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1971 call_pending (EV_A); 2268 EV_INVOKE_PENDING;
1972 } 2269 }
1973#endif 2270#endif
1974 2271
1975 /* queue prepare watchers (and execute them) */ 2272 /* queue prepare watchers (and execute them) */
1976 if (expect_false (preparecnt)) 2273 if (expect_false (preparecnt))
1977 { 2274 {
1978 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2275 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1979 call_pending (EV_A); 2276 EV_INVOKE_PENDING;
1980 } 2277 }
1981 2278
1982 if (expect_false (!activecnt)) 2279 if (expect_false (loop_done))
1983 break; 2280 break;
1984 2281
1985 /* we might have forked, so reify kernel state if necessary */ 2282 /* we might have forked, so reify kernel state if necessary */
1986 if (expect_false (postfork)) 2283 if (expect_false (postfork))
1987 loop_fork (EV_A); 2284 loop_fork (EV_A);
… …
1994 ev_tstamp waittime = 0.; 2291 ev_tstamp waittime = 0.;
1995 ev_tstamp sleeptime = 0.; 2292 ev_tstamp sleeptime = 0.;
1996 2293
1997 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2294 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1998 { 2295 {
2296 /* remember old timestamp for io_blocktime calculation */
2297 ev_tstamp prev_mn_now = mn_now;
2298
1999 /* update time to cancel out callback processing overhead */ 2299 /* update time to cancel out callback processing overhead */
2000 time_update (EV_A_ 1e100); 2300 time_update (EV_A_ 1e100);
2001 2301
2002 waittime = MAX_BLOCKTIME; 2302 waittime = MAX_BLOCKTIME;
2003 2303
… …
2013 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2313 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2014 if (waittime > to) waittime = to; 2314 if (waittime > to) waittime = to;
2015 } 2315 }
2016#endif 2316#endif
2017 2317
2318 /* don't let timeouts decrease the waittime below timeout_blocktime */
2018 if (expect_false (waittime < timeout_blocktime)) 2319 if (expect_false (waittime < timeout_blocktime))
2019 waittime = timeout_blocktime; 2320 waittime = timeout_blocktime;
2020 2321
2021 sleeptime = waittime - backend_fudge; 2322 /* extra check because io_blocktime is commonly 0 */
2022
2023 if (expect_true (sleeptime > io_blocktime)) 2323 if (expect_false (io_blocktime))
2024 sleeptime = io_blocktime;
2025
2026 if (sleeptime)
2027 { 2324 {
2325 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2326
2327 if (sleeptime > waittime - backend_fudge)
2328 sleeptime = waittime - backend_fudge;
2329
2330 if (expect_true (sleeptime > 0.))
2331 {
2028 ev_sleep (sleeptime); 2332 ev_sleep (sleeptime);
2029 waittime -= sleeptime; 2333 waittime -= sleeptime;
2334 }
2030 } 2335 }
2031 } 2336 }
2032 2337
2338#if EV_MINIMAL < 2
2033 ++loop_count; 2339 ++loop_count;
2340#endif
2341 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2034 backend_poll (EV_A_ waittime); 2342 backend_poll (EV_A_ waittime);
2343 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2035 2344
2036 /* update ev_rt_now, do magic */ 2345 /* update ev_rt_now, do magic */
2037 time_update (EV_A_ waittime + sleeptime); 2346 time_update (EV_A_ waittime + sleeptime);
2038 } 2347 }
2039 2348
… …
2050 2359
2051 /* queue check watchers, to be executed first */ 2360 /* queue check watchers, to be executed first */
2052 if (expect_false (checkcnt)) 2361 if (expect_false (checkcnt))
2053 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2362 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2054 2363
2055 call_pending (EV_A); 2364 EV_INVOKE_PENDING;
2056 } 2365 }
2057 while (expect_true ( 2366 while (expect_true (
2058 activecnt 2367 activecnt
2059 && !loop_done 2368 && !loop_done
2060 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2369 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2061 )); 2370 ));
2062 2371
2063 if (loop_done == EVUNLOOP_ONE) 2372 if (loop_done == EVUNLOOP_ONE)
2064 loop_done = EVUNLOOP_CANCEL; 2373 loop_done = EVUNLOOP_CANCEL;
2374
2375#if EV_MINIMAL < 2
2376 --loop_depth;
2377#endif
2065} 2378}
2066 2379
2067void 2380void
2068ev_unloop (EV_P_ int how) 2381ev_unloop (EV_P_ int how)
2069{ 2382{
2070 loop_done = how; 2383 loop_done = how;
2071} 2384}
2072 2385
2386void
2387ev_ref (EV_P)
2388{
2389 ++activecnt;
2390}
2391
2392void
2393ev_unref (EV_P)
2394{
2395 --activecnt;
2396}
2397
2398void
2399ev_now_update (EV_P)
2400{
2401 time_update (EV_A_ 1e100);
2402}
2403
2404void
2405ev_suspend (EV_P)
2406{
2407 ev_now_update (EV_A);
2408}
2409
2410void
2411ev_resume (EV_P)
2412{
2413 ev_tstamp mn_prev = mn_now;
2414
2415 ev_now_update (EV_A);
2416 timers_reschedule (EV_A_ mn_now - mn_prev);
2417#if EV_PERIODIC_ENABLE
2418 /* TODO: really do this? */
2419 periodics_reschedule (EV_A);
2420#endif
2421}
2422
2073/*****************************************************************************/ 2423/*****************************************************************************/
2424/* singly-linked list management, used when the expected list length is short */
2074 2425
2075void inline_size 2426inline_size void
2076wlist_add (WL *head, WL elem) 2427wlist_add (WL *head, WL elem)
2077{ 2428{
2078 elem->next = *head; 2429 elem->next = *head;
2079 *head = elem; 2430 *head = elem;
2080} 2431}
2081 2432
2082void inline_size 2433inline_size void
2083wlist_del (WL *head, WL elem) 2434wlist_del (WL *head, WL elem)
2084{ 2435{
2085 while (*head) 2436 while (*head)
2086 { 2437 {
2087 if (*head == elem) 2438 if (expect_true (*head == elem))
2088 { 2439 {
2089 *head = elem->next; 2440 *head = elem->next;
2090 return; 2441 break;
2091 } 2442 }
2092 2443
2093 head = &(*head)->next; 2444 head = &(*head)->next;
2094 } 2445 }
2095} 2446}
2096 2447
2097void inline_speed 2448/* internal, faster, version of ev_clear_pending */
2449inline_speed void
2098clear_pending (EV_P_ W w) 2450clear_pending (EV_P_ W w)
2099{ 2451{
2100 if (w->pending) 2452 if (w->pending)
2101 { 2453 {
2102 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2454 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2103 w->pending = 0; 2455 w->pending = 0;
2104 } 2456 }
2105} 2457}
2106 2458
2107int 2459int
… …
2111 int pending = w_->pending; 2463 int pending = w_->pending;
2112 2464
2113 if (expect_true (pending)) 2465 if (expect_true (pending))
2114 { 2466 {
2115 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2467 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2468 p->w = (W)&pending_w;
2116 w_->pending = 0; 2469 w_->pending = 0;
2117 p->w = 0;
2118 return p->events; 2470 return p->events;
2119 } 2471 }
2120 else 2472 else
2121 return 0; 2473 return 0;
2122} 2474}
2123 2475
2124void inline_size 2476inline_size void
2125pri_adjust (EV_P_ W w) 2477pri_adjust (EV_P_ W w)
2126{ 2478{
2127 int pri = w->priority; 2479 int pri = ev_priority (w);
2128 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2480 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2129 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2481 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2130 w->priority = pri; 2482 ev_set_priority (w, pri);
2131} 2483}
2132 2484
2133void inline_speed 2485inline_speed void
2134ev_start (EV_P_ W w, int active) 2486ev_start (EV_P_ W w, int active)
2135{ 2487{
2136 pri_adjust (EV_A_ w); 2488 pri_adjust (EV_A_ w);
2137 w->active = active; 2489 w->active = active;
2138 ev_ref (EV_A); 2490 ev_ref (EV_A);
2139} 2491}
2140 2492
2141void inline_size 2493inline_size void
2142ev_stop (EV_P_ W w) 2494ev_stop (EV_P_ W w)
2143{ 2495{
2144 ev_unref (EV_A); 2496 ev_unref (EV_A);
2145 w->active = 0; 2497 w->active = 0;
2146} 2498}
… …
2153 int fd = w->fd; 2505 int fd = w->fd;
2154 2506
2155 if (expect_false (ev_is_active (w))) 2507 if (expect_false (ev_is_active (w)))
2156 return; 2508 return;
2157 2509
2158 assert (("ev_io_start called with negative fd", fd >= 0)); 2510 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)))); 2511 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2160 2512
2161 EV_FREQUENT_CHECK; 2513 EV_FREQUENT_CHECK;
2162 2514
2163 ev_start (EV_A_ (W)w, 1); 2515 ev_start (EV_A_ (W)w, 1);
2164 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2516 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2165 wlist_add (&anfds[fd].head, (WL)w); 2517 wlist_add (&anfds[fd].head, (WL)w);
2166 2518
2167 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2519 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2168 w->events &= ~EV_IOFDSET; 2520 w->events &= ~EV__IOFDSET;
2169 2521
2170 EV_FREQUENT_CHECK; 2522 EV_FREQUENT_CHECK;
2171} 2523}
2172 2524
2173void noinline 2525void noinline
… …
2175{ 2527{
2176 clear_pending (EV_A_ (W)w); 2528 clear_pending (EV_A_ (W)w);
2177 if (expect_false (!ev_is_active (w))) 2529 if (expect_false (!ev_is_active (w)))
2178 return; 2530 return;
2179 2531
2180 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2532 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2181 2533
2182 EV_FREQUENT_CHECK; 2534 EV_FREQUENT_CHECK;
2183 2535
2184 wlist_del (&anfds[w->fd].head, (WL)w); 2536 wlist_del (&anfds[w->fd].head, (WL)w);
2185 ev_stop (EV_A_ (W)w); 2537 ev_stop (EV_A_ (W)w);
… …
2195 if (expect_false (ev_is_active (w))) 2547 if (expect_false (ev_is_active (w)))
2196 return; 2548 return;
2197 2549
2198 ev_at (w) += mn_now; 2550 ev_at (w) += mn_now;
2199 2551
2200 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2552 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2201 2553
2202 EV_FREQUENT_CHECK; 2554 EV_FREQUENT_CHECK;
2203 2555
2204 ++timercnt; 2556 ++timercnt;
2205 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2557 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2208 ANHE_at_cache (timers [ev_active (w)]); 2560 ANHE_at_cache (timers [ev_active (w)]);
2209 upheap (timers, ev_active (w)); 2561 upheap (timers, ev_active (w));
2210 2562
2211 EV_FREQUENT_CHECK; 2563 EV_FREQUENT_CHECK;
2212 2564
2213 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2565 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2214} 2566}
2215 2567
2216void noinline 2568void noinline
2217ev_timer_stop (EV_P_ ev_timer *w) 2569ev_timer_stop (EV_P_ ev_timer *w)
2218{ 2570{
… …
2223 EV_FREQUENT_CHECK; 2575 EV_FREQUENT_CHECK;
2224 2576
2225 { 2577 {
2226 int active = ev_active (w); 2578 int active = ev_active (w);
2227 2579
2228 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2580 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2229 2581
2230 --timercnt; 2582 --timercnt;
2231 2583
2232 if (expect_true (active < timercnt + HEAP0)) 2584 if (expect_true (active < timercnt + HEAP0))
2233 { 2585 {
… …
2266 } 2618 }
2267 2619
2268 EV_FREQUENT_CHECK; 2620 EV_FREQUENT_CHECK;
2269} 2621}
2270 2622
2623ev_tstamp
2624ev_timer_remaining (EV_P_ ev_timer *w)
2625{
2626 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2627}
2628
2271#if EV_PERIODIC_ENABLE 2629#if EV_PERIODIC_ENABLE
2272void noinline 2630void noinline
2273ev_periodic_start (EV_P_ ev_periodic *w) 2631ev_periodic_start (EV_P_ ev_periodic *w)
2274{ 2632{
2275 if (expect_false (ev_is_active (w))) 2633 if (expect_false (ev_is_active (w)))
… …
2277 2635
2278 if (w->reschedule_cb) 2636 if (w->reschedule_cb)
2279 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2637 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2280 else if (w->interval) 2638 else if (w->interval)
2281 { 2639 {
2282 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2640 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 */ 2641 /* 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; 2642 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2285 } 2643 }
2286 else 2644 else
2287 ev_at (w) = w->offset; 2645 ev_at (w) = w->offset;
… …
2295 ANHE_at_cache (periodics [ev_active (w)]); 2653 ANHE_at_cache (periodics [ev_active (w)]);
2296 upheap (periodics, ev_active (w)); 2654 upheap (periodics, ev_active (w));
2297 2655
2298 EV_FREQUENT_CHECK; 2656 EV_FREQUENT_CHECK;
2299 2657
2300 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2658 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2301} 2659}
2302 2660
2303void noinline 2661void noinline
2304ev_periodic_stop (EV_P_ ev_periodic *w) 2662ev_periodic_stop (EV_P_ ev_periodic *w)
2305{ 2663{
… …
2310 EV_FREQUENT_CHECK; 2668 EV_FREQUENT_CHECK;
2311 2669
2312 { 2670 {
2313 int active = ev_active (w); 2671 int active = ev_active (w);
2314 2672
2315 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2673 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2316 2674
2317 --periodiccnt; 2675 --periodiccnt;
2318 2676
2319 if (expect_true (active < periodiccnt + HEAP0)) 2677 if (expect_true (active < periodiccnt + HEAP0))
2320 { 2678 {
… …
2342#endif 2700#endif
2343 2701
2344void noinline 2702void noinline
2345ev_signal_start (EV_P_ ev_signal *w) 2703ev_signal_start (EV_P_ ev_signal *w)
2346{ 2704{
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))) 2705 if (expect_false (ev_is_active (w)))
2351 return; 2706 return;
2352 2707
2353 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2708 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2354 2709
2355 evpipe_init (EV_A); 2710#if EV_MULTIPLICITY
2711 assert (("libev: a signal must not be attached to two different loops",
2712 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2356 2713
2357 EV_FREQUENT_CHECK; 2714 signals [w->signum - 1].loop = EV_A;
2715#endif
2358 2716
2717 EV_FREQUENT_CHECK;
2718
2719#if EV_USE_SIGNALFD
2720 if (sigfd == -2)
2359 { 2721 {
2360#ifndef _WIN32 2722 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2361 sigset_t full, prev; 2723 if (sigfd < 0 && errno == EINVAL)
2362 sigfillset (&full); 2724 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2363 sigprocmask (SIG_SETMASK, &full, &prev);
2364#endif
2365 2725
2366 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2726 if (sigfd >= 0)
2727 {
2728 fd_intern (sigfd); /* doing it twice will not hurt */
2367 2729
2368#ifndef _WIN32 2730 sigemptyset (&sigfd_set);
2369 sigprocmask (SIG_SETMASK, &prev, 0); 2731
2370#endif 2732 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2733 ev_set_priority (&sigfd_w, EV_MAXPRI);
2734 ev_io_start (EV_A_ &sigfd_w);
2735 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2736 }
2371 } 2737 }
2738
2739 if (sigfd >= 0)
2740 {
2741 /* TODO: check .head */
2742 sigaddset (&sigfd_set, w->signum);
2743 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2744
2745 signalfd (sigfd, &sigfd_set, 0);
2746 }
2747#endif
2372 2748
2373 ev_start (EV_A_ (W)w, 1); 2749 ev_start (EV_A_ (W)w, 1);
2374 wlist_add (&signals [w->signum - 1].head, (WL)w); 2750 wlist_add (&signals [w->signum - 1].head, (WL)w);
2375 2751
2376 if (!((WL)w)->next) 2752 if (!((WL)w)->next)
2753# if EV_USE_SIGNALFD
2754 if (sigfd < 0) /*TODO*/
2755# endif
2377 { 2756 {
2378#if _WIN32 2757# if _WIN32
2379 signal (w->signum, ev_sighandler); 2758 signal (w->signum, ev_sighandler);
2380#else 2759# else
2381 struct sigaction sa; 2760 struct sigaction sa;
2761
2762 evpipe_init (EV_A);
2763
2382 sa.sa_handler = ev_sighandler; 2764 sa.sa_handler = ev_sighandler;
2383 sigfillset (&sa.sa_mask); 2765 sigfillset (&sa.sa_mask);
2384 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2766 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2385 sigaction (w->signum, &sa, 0); 2767 sigaction (w->signum, &sa, 0);
2768
2769 sigemptyset (&sa.sa_mask);
2770 sigaddset (&sa.sa_mask, w->signum);
2771 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2386#endif 2772#endif
2387 } 2773 }
2388 2774
2389 EV_FREQUENT_CHECK; 2775 EV_FREQUENT_CHECK;
2390} 2776}
2391 2777
2392void noinline 2778void noinline
… …
2400 2786
2401 wlist_del (&signals [w->signum - 1].head, (WL)w); 2787 wlist_del (&signals [w->signum - 1].head, (WL)w);
2402 ev_stop (EV_A_ (W)w); 2788 ev_stop (EV_A_ (W)w);
2403 2789
2404 if (!signals [w->signum - 1].head) 2790 if (!signals [w->signum - 1].head)
2791 {
2792#if EV_MULTIPLICITY
2793 signals [w->signum - 1].loop = 0; /* unattach from signal */
2794#endif
2795#if EV_USE_SIGNALFD
2796 if (sigfd >= 0)
2797 {
2798 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2799 sigdelset (&sigfd_set, w->signum);
2800 signalfd (sigfd, &sigfd_set, 0);
2801 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2802 /*TODO: maybe unblock signal? */
2803 }
2804 else
2805#endif
2405 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2807 }
2406 2808
2407 EV_FREQUENT_CHECK; 2809 EV_FREQUENT_CHECK;
2408} 2810}
2409 2811
2410void 2812void
2411ev_child_start (EV_P_ ev_child *w) 2813ev_child_start (EV_P_ ev_child *w)
2412{ 2814{
2413#if EV_MULTIPLICITY 2815#if EV_MULTIPLICITY
2414 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2816 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2415#endif 2817#endif
2416 if (expect_false (ev_is_active (w))) 2818 if (expect_false (ev_is_active (w)))
2417 return; 2819 return;
2418 2820
2419 EV_FREQUENT_CHECK; 2821 EV_FREQUENT_CHECK;
… …
2490 } 2892 }
2491 } 2893 }
2492 2894
2493 if (w->wd >= 0) 2895 if (w->wd >= 0)
2494 { 2896 {
2897 struct statfs sfs;
2898
2495 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2899 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2496 2900
2497 /* now local changes will be tracked by inotify, but remote changes won't */ 2901 /* now local changes will be tracked by inotify, but remote changes won't */
2498 /* unless the filesystem it known to be local, we therefore still poll */ 2902 /* unless the filesystem it known to be local, we therefore still poll */
2499 /* also do poll on <2.6.25, but with normal frequency */ 2903 /* also do poll on <2.6.25, but with normal frequency */
2500 struct statfs sfs;
2501 2904
2502 if (fs_2625 && !statfs (w->path, &sfs)) 2905 if (fs_2625 && !statfs (w->path, &sfs))
2503 if (sfs.f_type == 0x1373 /* devfs */ 2906 if (sfs.f_type == 0x1373 /* devfs */
2504 || sfs.f_type == 0xEF53 /* ext2/3 */ 2907 || sfs.f_type == 0xEF53 /* ext2/3 */
2505 || sfs.f_type == 0x3153464a /* jfs */ 2908 || sfs.f_type == 0x3153464a /* jfs */
… …
2571 2974
2572 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2975 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2573 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2976 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2574} 2977}
2575 2978
2576void inline_size 2979inline_size void
2577check_2625 (EV_P) 2980check_2625 (EV_P)
2578{ 2981{
2579 /* kernels < 2.6.25 are borked 2982 /* kernels < 2.6.25 are borked
2580 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2983 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2581 */ 2984 */
… …
2594 return; 2997 return;
2595 2998
2596 fs_2625 = 1; 2999 fs_2625 = 1;
2597} 3000}
2598 3001
2599void inline_size 3002inline_size int
3003infy_newfd (void)
3004{
3005#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3006 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3007 if (fd >= 0)
3008 return fd;
3009#endif
3010 return inotify_init ();
3011}
3012
3013inline_size void
2600infy_init (EV_P) 3014infy_init (EV_P)
2601{ 3015{
2602 if (fs_fd != -2) 3016 if (fs_fd != -2)
2603 return; 3017 return;
2604 3018
2605 fs_fd = -1; 3019 fs_fd = -1;
2606 3020
2607 check_2625 (EV_A); 3021 check_2625 (EV_A);
2608 3022
2609 fs_fd = inotify_init (); 3023 fs_fd = infy_newfd ();
2610 3024
2611 if (fs_fd >= 0) 3025 if (fs_fd >= 0)
2612 { 3026 {
3027 fd_intern (fs_fd);
2613 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3028 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2614 ev_set_priority (&fs_w, EV_MAXPRI); 3029 ev_set_priority (&fs_w, EV_MAXPRI);
2615 ev_io_start (EV_A_ &fs_w); 3030 ev_io_start (EV_A_ &fs_w);
2616 } 3031 }
2617} 3032}
2618 3033
2619void inline_size 3034inline_size void
2620infy_fork (EV_P) 3035infy_fork (EV_P)
2621{ 3036{
2622 int slot; 3037 int slot;
2623 3038
2624 if (fs_fd < 0) 3039 if (fs_fd < 0)
2625 return; 3040 return;
2626 3041
3042 ev_io_stop (EV_A_ &fs_w);
2627 close (fs_fd); 3043 close (fs_fd);
2628 fs_fd = inotify_init (); 3044 fs_fd = infy_newfd ();
3045
3046 if (fs_fd >= 0)
3047 {
3048 fd_intern (fs_fd);
3049 ev_io_set (&fs_w, fs_fd, EV_READ);
3050 ev_io_start (EV_A_ &fs_w);
3051 }
2629 3052
2630 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3053 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2631 { 3054 {
2632 WL w_ = fs_hash [slot].head; 3055 WL w_ = fs_hash [slot].head;
2633 fs_hash [slot].head = 0; 3056 fs_hash [slot].head = 0;
… …
2890embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3313embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2891{ 3314{
2892 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3315 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2893 3316
2894 { 3317 {
2895 struct ev_loop *loop = w->other; 3318 EV_P = w->other;
2896 3319
2897 while (fdchangecnt) 3320 while (fdchangecnt)
2898 { 3321 {
2899 fd_reify (EV_A); 3322 fd_reify (EV_A);
2900 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3323 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2908 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3331 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2909 3332
2910 ev_embed_stop (EV_A_ w); 3333 ev_embed_stop (EV_A_ w);
2911 3334
2912 { 3335 {
2913 struct ev_loop *loop = w->other; 3336 EV_P = w->other;
2914 3337
2915 ev_loop_fork (EV_A); 3338 ev_loop_fork (EV_A);
2916 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3339 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2917 } 3340 }
2918 3341
… …
2932{ 3355{
2933 if (expect_false (ev_is_active (w))) 3356 if (expect_false (ev_is_active (w)))
2934 return; 3357 return;
2935 3358
2936 { 3359 {
2937 struct ev_loop *loop = w->other; 3360 EV_P = w->other;
2938 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3361 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2939 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3362 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2940 } 3363 }
2941 3364
2942 EV_FREQUENT_CHECK; 3365 EV_FREQUENT_CHECK;
2943 3366
… …
3054 3477
3055void 3478void
3056ev_async_send (EV_P_ ev_async *w) 3479ev_async_send (EV_P_ ev_async *w)
3057{ 3480{
3058 w->sent = 1; 3481 w->sent = 1;
3059 evpipe_write (EV_A_ &gotasync); 3482 evpipe_write (EV_A_ &async_pending);
3060} 3483}
3061#endif 3484#endif
3062 3485
3063/*****************************************************************************/ 3486/*****************************************************************************/
3064 3487
… …
3126 ev_timer_set (&once->to, timeout, 0.); 3549 ev_timer_set (&once->to, timeout, 0.);
3127 ev_timer_start (EV_A_ &once->to); 3550 ev_timer_start (EV_A_ &once->to);
3128 } 3551 }
3129} 3552}
3130 3553
3554/*****************************************************************************/
3555
3556#if EV_WALK_ENABLE
3557void
3558ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3559{
3560 int i, j;
3561 ev_watcher_list *wl, *wn;
3562
3563 if (types & (EV_IO | EV_EMBED))
3564 for (i = 0; i < anfdmax; ++i)
3565 for (wl = anfds [i].head; wl; )
3566 {
3567 wn = wl->next;
3568
3569#if EV_EMBED_ENABLE
3570 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3571 {
3572 if (types & EV_EMBED)
3573 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3574 }
3575 else
3576#endif
3577#if EV_USE_INOTIFY
3578 if (ev_cb ((ev_io *)wl) == infy_cb)
3579 ;
3580 else
3581#endif
3582 if ((ev_io *)wl != &pipe_w)
3583 if (types & EV_IO)
3584 cb (EV_A_ EV_IO, wl);
3585
3586 wl = wn;
3587 }
3588
3589 if (types & (EV_TIMER | EV_STAT))
3590 for (i = timercnt + HEAP0; i-- > HEAP0; )
3591#if EV_STAT_ENABLE
3592 /*TODO: timer is not always active*/
3593 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3594 {
3595 if (types & EV_STAT)
3596 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3597 }
3598 else
3599#endif
3600 if (types & EV_TIMER)
3601 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3602
3603#if EV_PERIODIC_ENABLE
3604 if (types & EV_PERIODIC)
3605 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3606 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3607#endif
3608
3609#if EV_IDLE_ENABLE
3610 if (types & EV_IDLE)
3611 for (j = NUMPRI; i--; )
3612 for (i = idlecnt [j]; i--; )
3613 cb (EV_A_ EV_IDLE, idles [j][i]);
3614#endif
3615
3616#if EV_FORK_ENABLE
3617 if (types & EV_FORK)
3618 for (i = forkcnt; i--; )
3619 if (ev_cb (forks [i]) != embed_fork_cb)
3620 cb (EV_A_ EV_FORK, forks [i]);
3621#endif
3622
3623#if EV_ASYNC_ENABLE
3624 if (types & EV_ASYNC)
3625 for (i = asynccnt; i--; )
3626 cb (EV_A_ EV_ASYNC, asyncs [i]);
3627#endif
3628
3629 if (types & EV_PREPARE)
3630 for (i = preparecnt; i--; )
3631#if EV_EMBED_ENABLE
3632 if (ev_cb (prepares [i]) != embed_prepare_cb)
3633#endif
3634 cb (EV_A_ EV_PREPARE, prepares [i]);
3635
3636 if (types & EV_CHECK)
3637 for (i = checkcnt; i--; )
3638 cb (EV_A_ EV_CHECK, checks [i]);
3639
3640 if (types & EV_SIGNAL)
3641 for (i = 0; i < EV_NSIG - 1; ++i)
3642 for (wl = signals [i].head; wl; )
3643 {
3644 wn = wl->next;
3645 cb (EV_A_ EV_SIGNAL, wl);
3646 wl = wn;
3647 }
3648
3649 if (types & EV_CHILD)
3650 for (i = EV_PID_HASHSIZE; i--; )
3651 for (wl = childs [i]; wl; )
3652 {
3653 wn = wl->next;
3654 cb (EV_A_ EV_CHILD, wl);
3655 wl = wn;
3656 }
3657/* EV_STAT 0x00001000 /* stat data changed */
3658/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3659}
3660#endif
3661
3131#if EV_MULTIPLICITY 3662#if EV_MULTIPLICITY
3132 #include "ev_wrap.h" 3663 #include "ev_wrap.h"
3133#endif 3664#endif
3134 3665
3135#ifdef __cplusplus 3666#ifdef __cplusplus

Diff Legend

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