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

Comparing libev/ev.c (file contents):
Revision 1.271 by root, Mon Nov 3 12:13:15 2008 UTC vs.
Revision 1.304 by root, Sun Jul 19 03:12:28 2009 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
64# endif
65
52# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
55# endif 69# endif
56# ifndef EV_USE_REALTIME 70# ifndef EV_USE_REALTIME
57# define EV_USE_REALTIME 1 71# define EV_USE_REALTIME 0
58# endif 72# endif
59# else 73# else
60# ifndef EV_USE_MONOTONIC 74# ifndef EV_USE_MONOTONIC
61# define EV_USE_MONOTONIC 0 75# define EV_USE_MONOTONIC 0
62# endif 76# endif
… …
119# else 133# else
120# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
121# endif 135# endif
122# endif 136# endif
123 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
124# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD 147# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
127# else 149# else
128# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
… …
164# endif 186# endif
165#endif 187#endif
166 188
167/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
168 190
191#ifndef EV_USE_CLOCK_SYSCALL
192# if __linux && __GLIBC__ >= 2
193# define EV_USE_CLOCK_SYSCALL 1
194# else
195# define EV_USE_CLOCK_SYSCALL 0
196# endif
197#endif
198
169#ifndef EV_USE_MONOTONIC 199#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 200# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 201# define EV_USE_MONOTONIC 1
172# else 202# else
173# define EV_USE_MONOTONIC 0 203# define EV_USE_MONOTONIC 0
174# endif 204# endif
175#endif 205#endif
176 206
177#ifndef EV_USE_REALTIME 207#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 208# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 209#endif
180 210
181#ifndef EV_USE_NANOSLEEP 211#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 212# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 213# define EV_USE_NANOSLEEP 1
… …
244# else 274# else
245# define EV_USE_EVENTFD 0 275# define EV_USE_EVENTFD 0
246# endif 276# endif
247#endif 277#endif
248 278
279#ifndef EV_USE_SIGNALFD
280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))
281# define EV_USE_SIGNALFD 1
282# else
283# define EV_USE_SIGNALFD 0
284# endif
285#endif
286
249#if 0 /* debugging */ 287#if 0 /* debugging */
250# define EV_VERIFY 3 288# define EV_VERIFY 3
251# define EV_USE_4HEAP 1 289# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1 290# define EV_HEAP_CACHE_AT 1
253#endif 291#endif
… …
260# define EV_USE_4HEAP !EV_MINIMAL 298# define EV_USE_4HEAP !EV_MINIMAL
261#endif 299#endif
262 300
263#ifndef EV_HEAP_CACHE_AT 301#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL 302# define EV_HEAP_CACHE_AT !EV_MINIMAL
303#endif
304
305/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
306/* which makes programs even slower. might work on other unices, too. */
307#if EV_USE_CLOCK_SYSCALL
308# include <syscall.h>
309# ifdef SYS_clock_gettime
310# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
311# undef EV_USE_MONOTONIC
312# define EV_USE_MONOTONIC 1
313# else
314# undef EV_USE_CLOCK_SYSCALL
315# define EV_USE_CLOCK_SYSCALL 0
316# endif
265#endif 317#endif
266 318
267/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 319/* this block fixes any misconfiguration where we know we run into trouble otherwise */
268 320
269#ifndef CLOCK_MONOTONIC 321#ifndef CLOCK_MONOTONIC
… …
303#endif 355#endif
304 356
305#if EV_USE_EVENTFD 357#if EV_USE_EVENTFD
306/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 358/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
307# include <stdint.h> 359# include <stdint.h>
360# ifndef EFD_NONBLOCK
361# define EFD_NONBLOCK O_NONBLOCK
362# endif
363# ifndef EFD_CLOEXEC
364# define EFD_CLOEXEC O_CLOEXEC
365# endif
308# ifdef __cplusplus 366# ifdef __cplusplus
309extern "C" { 367extern "C" {
310# endif 368# endif
311int eventfd (unsigned int initval, int flags); 369int eventfd (unsigned int initval, int flags);
312# ifdef __cplusplus 370# ifdef __cplusplus
313} 371}
314# endif 372# endif
373#endif
374
375#if EV_USE_SIGNALFD
376# include <sys/signalfd.h>
315#endif 377#endif
316 378
317/**/ 379/**/
318 380
319#if EV_VERIFY >= 3 381#if EV_VERIFY >= 3
… …
355# define inline_speed static noinline 417# define inline_speed static noinline
356#else 418#else
357# define inline_speed static inline 419# define inline_speed static inline
358#endif 420#endif
359 421
360#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 422#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
423
424#if EV_MINPRI == EV_MAXPRI
425# define ABSPRI(w) (((W)w), 0)
426#else
361#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 427# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
428#endif
362 429
363#define EMPTY /* required for microsofts broken pseudo-c compiler */ 430#define EMPTY /* required for microsofts broken pseudo-c compiler */
364#define EMPTY2(a,b) /* used to suppress some warnings */ 431#define EMPTY2(a,b) /* used to suppress some warnings */
365 432
366typedef ev_watcher *W; 433typedef ev_watcher *W;
… …
368typedef ev_watcher_time *WT; 435typedef ev_watcher_time *WT;
369 436
370#define ev_active(w) ((W)(w))->active 437#define ev_active(w) ((W)(w))->active
371#define ev_at(w) ((WT)(w))->at 438#define ev_at(w) ((WT)(w))->at
372 439
373#if EV_USE_MONOTONIC 440#if EV_USE_REALTIME
374/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 441/* sig_atomic_t is used to avoid per-thread variables or locking but still */
375/* giving it a reasonably high chance of working on typical architetcures */ 442/* giving it a reasonably high chance of working on typical architetcures */
443static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
444#endif
445
446#if EV_USE_MONOTONIC
376static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 447static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
377#endif 448#endif
378 449
379#ifdef _WIN32 450#ifdef _WIN32
380# include "ev_win32.c" 451# include "ev_win32.c"
… …
445#define ev_malloc(size) ev_realloc (0, (size)) 516#define ev_malloc(size) ev_realloc (0, (size))
446#define ev_free(ptr) ev_realloc ((ptr), 0) 517#define ev_free(ptr) ev_realloc ((ptr), 0)
447 518
448/*****************************************************************************/ 519/*****************************************************************************/
449 520
521/* set in reify when reification needed */
522#define EV_ANFD_REIFY 1
523
524/* file descriptor info structure */
450typedef struct 525typedef struct
451{ 526{
452 WL head; 527 WL head;
453 unsigned char events; 528 unsigned char events; /* the events watched for */
454 unsigned char reify; 529 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
455 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 530 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
456 unsigned char unused; 531 unsigned char unused;
457#if EV_USE_EPOLL 532#if EV_USE_EPOLL
458 unsigned int egen; /* generation counter to counter epoll bugs */ 533 unsigned int egen; /* generation counter to counter epoll bugs */
459#endif 534#endif
460#if EV_SELECT_IS_WINSOCKET 535#if EV_SELECT_IS_WINSOCKET
461 SOCKET handle; 536 SOCKET handle;
462#endif 537#endif
463} ANFD; 538} ANFD;
464 539
540/* stores the pending event set for a given watcher */
465typedef struct 541typedef struct
466{ 542{
467 W w; 543 W w;
468 int events; 544 int events; /* the pending event set for the given watcher */
469} ANPENDING; 545} ANPENDING;
470 546
471#if EV_USE_INOTIFY 547#if EV_USE_INOTIFY
472/* hash table entry per inotify-id */ 548/* hash table entry per inotify-id */
473typedef struct 549typedef struct
… …
476} ANFS; 552} ANFS;
477#endif 553#endif
478 554
479/* Heap Entry */ 555/* Heap Entry */
480#if EV_HEAP_CACHE_AT 556#if EV_HEAP_CACHE_AT
557 /* a heap element */
481 typedef struct { 558 typedef struct {
482 ev_tstamp at; 559 ev_tstamp at;
483 WT w; 560 WT w;
484 } ANHE; 561 } ANHE;
485 562
486 #define ANHE_w(he) (he).w /* access watcher, read-write */ 563 #define ANHE_w(he) (he).w /* access watcher, read-write */
487 #define ANHE_at(he) (he).at /* access cached at, read-only */ 564 #define ANHE_at(he) (he).at /* access cached at, read-only */
488 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 565 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
489#else 566#else
567 /* a heap element */
490 typedef WT ANHE; 568 typedef WT ANHE;
491 569
492 #define ANHE_w(he) (he) 570 #define ANHE_w(he) (he)
493 #define ANHE_at(he) (he)->at 571 #define ANHE_at(he) (he)->at
494 #define ANHE_at_cache(he) 572 #define ANHE_at_cache(he)
… …
518 596
519 static int ev_default_loop_ptr; 597 static int ev_default_loop_ptr;
520 598
521#endif 599#endif
522 600
601#if EV_MINIMAL < 2
602# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
603# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
604# define EV_INVOKE_PENDING invoke_cb (EV_A)
605#else
606# define EV_RELEASE_CB (void)0
607# define EV_ACQUIRE_CB (void)0
608# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
609#endif
610
611#define EVUNLOOP_RECURSE 0x80
612
523/*****************************************************************************/ 613/*****************************************************************************/
524 614
615#ifndef EV_HAVE_EV_TIME
525ev_tstamp 616ev_tstamp
526ev_time (void) 617ev_time (void)
527{ 618{
528#if EV_USE_REALTIME 619#if EV_USE_REALTIME
620 if (expect_true (have_realtime))
621 {
529 struct timespec ts; 622 struct timespec ts;
530 clock_gettime (CLOCK_REALTIME, &ts); 623 clock_gettime (CLOCK_REALTIME, &ts);
531 return ts.tv_sec + ts.tv_nsec * 1e-9; 624 return ts.tv_sec + ts.tv_nsec * 1e-9;
532#else 625 }
626#endif
627
533 struct timeval tv; 628 struct timeval tv;
534 gettimeofday (&tv, 0); 629 gettimeofday (&tv, 0);
535 return tv.tv_sec + tv.tv_usec * 1e-6; 630 return tv.tv_sec + tv.tv_usec * 1e-6;
536#endif
537} 631}
632#endif
538 633
539ev_tstamp inline_size 634inline_size ev_tstamp
540get_clock (void) 635get_clock (void)
541{ 636{
542#if EV_USE_MONOTONIC 637#if EV_USE_MONOTONIC
543 if (expect_true (have_monotonic)) 638 if (expect_true (have_monotonic))
544 { 639 {
… …
578 673
579 tv.tv_sec = (time_t)delay; 674 tv.tv_sec = (time_t)delay;
580 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 675 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
581 676
582 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 677 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
583 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 678 /* something not guaranteed by newer posix versions, but guaranteed */
584 /* by older ones */ 679 /* by older ones */
585 select (0, 0, 0, 0, &tv); 680 select (0, 0, 0, 0, &tv);
586#endif 681#endif
587 } 682 }
588} 683}
589 684
590/*****************************************************************************/ 685/*****************************************************************************/
591 686
592#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 687#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
593 688
594int inline_size 689/* find a suitable new size for the given array, */
690/* hopefully by rounding to a ncie-to-malloc size */
691inline_size int
595array_nextsize (int elem, int cur, int cnt) 692array_nextsize (int elem, int cur, int cnt)
596{ 693{
597 int ncur = cur + 1; 694 int ncur = cur + 1;
598 695
599 do 696 do
… …
640 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 737 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
641 } 738 }
642#endif 739#endif
643 740
644#define array_free(stem, idx) \ 741#define array_free(stem, idx) \
645 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 742 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
646 743
647/*****************************************************************************/ 744/*****************************************************************************/
745
746/* dummy callback for pending events */
747static void noinline
748pendingcb (EV_P_ ev_prepare *w, int revents)
749{
750}
648 751
649void noinline 752void noinline
650ev_feed_event (EV_P_ void *w, int revents) 753ev_feed_event (EV_P_ void *w, int revents)
651{ 754{
652 W w_ = (W)w; 755 W w_ = (W)w;
… …
661 pendings [pri][w_->pending - 1].w = w_; 764 pendings [pri][w_->pending - 1].w = w_;
662 pendings [pri][w_->pending - 1].events = revents; 765 pendings [pri][w_->pending - 1].events = revents;
663 } 766 }
664} 767}
665 768
666void inline_speed 769inline_speed void
770feed_reverse (EV_P_ W w)
771{
772 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
773 rfeeds [rfeedcnt++] = w;
774}
775
776inline_size void
777feed_reverse_done (EV_P_ int revents)
778{
779 do
780 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
781 while (rfeedcnt);
782}
783
784inline_speed void
667queue_events (EV_P_ W *events, int eventcnt, int type) 785queue_events (EV_P_ W *events, int eventcnt, int type)
668{ 786{
669 int i; 787 int i;
670 788
671 for (i = 0; i < eventcnt; ++i) 789 for (i = 0; i < eventcnt; ++i)
672 ev_feed_event (EV_A_ events [i], type); 790 ev_feed_event (EV_A_ events [i], type);
673} 791}
674 792
675/*****************************************************************************/ 793/*****************************************************************************/
676 794
677void inline_speed 795inline_speed void
678fd_event (EV_P_ int fd, int revents) 796fd_event_nc (EV_P_ int fd, int revents)
679{ 797{
680 ANFD *anfd = anfds + fd; 798 ANFD *anfd = anfds + fd;
681 ev_io *w; 799 ev_io *w;
682 800
683 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 801 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
687 if (ev) 805 if (ev)
688 ev_feed_event (EV_A_ (W)w, ev); 806 ev_feed_event (EV_A_ (W)w, ev);
689 } 807 }
690} 808}
691 809
810/* do not submit kernel events for fds that have reify set */
811/* because that means they changed while we were polling for new events */
812inline_speed void
813fd_event (EV_P_ int fd, int revents)
814{
815 ANFD *anfd = anfds + fd;
816
817 if (expect_true (!anfd->reify))
818 fd_event_nc (EV_A_ fd, revents);
819}
820
692void 821void
693ev_feed_fd_event (EV_P_ int fd, int revents) 822ev_feed_fd_event (EV_P_ int fd, int revents)
694{ 823{
695 if (fd >= 0 && fd < anfdmax) 824 if (fd >= 0 && fd < anfdmax)
696 fd_event (EV_A_ fd, revents); 825 fd_event_nc (EV_A_ fd, revents);
697} 826}
698 827
699void inline_size 828/* make sure the external fd watch events are in-sync */
829/* with the kernel/libev internal state */
830inline_size void
700fd_reify (EV_P) 831fd_reify (EV_P)
701{ 832{
702 int i; 833 int i;
703 834
704 for (i = 0; i < fdchangecnt; ++i) 835 for (i = 0; i < fdchangecnt; ++i)
… …
719 #ifdef EV_FD_TO_WIN32_HANDLE 850 #ifdef EV_FD_TO_WIN32_HANDLE
720 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 851 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
721 #else 852 #else
722 anfd->handle = _get_osfhandle (fd); 853 anfd->handle = _get_osfhandle (fd);
723 #endif 854 #endif
724 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 855 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
725 } 856 }
726#endif 857#endif
727 858
728 { 859 {
729 unsigned char o_events = anfd->events; 860 unsigned char o_events = anfd->events;
730 unsigned char o_reify = anfd->reify; 861 unsigned char o_reify = anfd->reify;
731 862
732 anfd->reify = 0; 863 anfd->reify = 0;
733 anfd->events = events; 864 anfd->events = events;
734 865
735 if (o_events != events || o_reify & EV_IOFDSET) 866 if (o_events != events || o_reify & EV__IOFDSET)
736 backend_modify (EV_A_ fd, o_events, events); 867 backend_modify (EV_A_ fd, o_events, events);
737 } 868 }
738 } 869 }
739 870
740 fdchangecnt = 0; 871 fdchangecnt = 0;
741} 872}
742 873
743void inline_size 874/* something about the given fd changed */
875inline_size void
744fd_change (EV_P_ int fd, int flags) 876fd_change (EV_P_ int fd, int flags)
745{ 877{
746 unsigned char reify = anfds [fd].reify; 878 unsigned char reify = anfds [fd].reify;
747 anfds [fd].reify |= flags; 879 anfds [fd].reify |= flags;
748 880
… …
752 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 884 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
753 fdchanges [fdchangecnt - 1] = fd; 885 fdchanges [fdchangecnt - 1] = fd;
754 } 886 }
755} 887}
756 888
757void inline_speed 889/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
890inline_speed void
758fd_kill (EV_P_ int fd) 891fd_kill (EV_P_ int fd)
759{ 892{
760 ev_io *w; 893 ev_io *w;
761 894
762 while ((w = (ev_io *)anfds [fd].head)) 895 while ((w = (ev_io *)anfds [fd].head))
… …
764 ev_io_stop (EV_A_ w); 897 ev_io_stop (EV_A_ w);
765 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 898 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
766 } 899 }
767} 900}
768 901
769int inline_size 902/* check whether the given fd is atcually valid, for error recovery */
903inline_size int
770fd_valid (int fd) 904fd_valid (int fd)
771{ 905{
772#ifdef _WIN32 906#ifdef _WIN32
773 return _get_osfhandle (fd) != -1; 907 return _get_osfhandle (fd) != -1;
774#else 908#else
… …
811 for (fd = 0; fd < anfdmax; ++fd) 945 for (fd = 0; fd < anfdmax; ++fd)
812 if (anfds [fd].events) 946 if (anfds [fd].events)
813 { 947 {
814 anfds [fd].events = 0; 948 anfds [fd].events = 0;
815 anfds [fd].emask = 0; 949 anfds [fd].emask = 0;
816 fd_change (EV_A_ fd, EV_IOFDSET | 1); 950 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
817 } 951 }
818} 952}
819 953
820/*****************************************************************************/ 954/*****************************************************************************/
821 955
… …
837#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 971#define HEAP0 (DHEAP - 1) /* index of first element in heap */
838#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 972#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
839#define UPHEAP_DONE(p,k) ((p) == (k)) 973#define UPHEAP_DONE(p,k) ((p) == (k))
840 974
841/* away from the root */ 975/* away from the root */
842void inline_speed 976inline_speed void
843downheap (ANHE *heap, int N, int k) 977downheap (ANHE *heap, int N, int k)
844{ 978{
845 ANHE he = heap [k]; 979 ANHE he = heap [k];
846 ANHE *E = heap + N + HEAP0; 980 ANHE *E = heap + N + HEAP0;
847 981
… …
887#define HEAP0 1 1021#define HEAP0 1
888#define HPARENT(k) ((k) >> 1) 1022#define HPARENT(k) ((k) >> 1)
889#define UPHEAP_DONE(p,k) (!(p)) 1023#define UPHEAP_DONE(p,k) (!(p))
890 1024
891/* away from the root */ 1025/* away from the root */
892void inline_speed 1026inline_speed void
893downheap (ANHE *heap, int N, int k) 1027downheap (ANHE *heap, int N, int k)
894{ 1028{
895 ANHE he = heap [k]; 1029 ANHE he = heap [k];
896 1030
897 for (;;) 1031 for (;;)
… …
917 ev_active (ANHE_w (he)) = k; 1051 ev_active (ANHE_w (he)) = k;
918} 1052}
919#endif 1053#endif
920 1054
921/* towards the root */ 1055/* towards the root */
922void inline_speed 1056inline_speed void
923upheap (ANHE *heap, int k) 1057upheap (ANHE *heap, int k)
924{ 1058{
925 ANHE he = heap [k]; 1059 ANHE he = heap [k];
926 1060
927 for (;;) 1061 for (;;)
… …
938 1072
939 heap [k] = he; 1073 heap [k] = he;
940 ev_active (ANHE_w (he)) = k; 1074 ev_active (ANHE_w (he)) = k;
941} 1075}
942 1076
943void inline_size 1077/* move an element suitably so it is in a correct place */
1078inline_size void
944adjustheap (ANHE *heap, int N, int k) 1079adjustheap (ANHE *heap, int N, int k)
945{ 1080{
946 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1081 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
947 upheap (heap, k); 1082 upheap (heap, k);
948 else 1083 else
949 downheap (heap, N, k); 1084 downheap (heap, N, k);
950} 1085}
951 1086
952/* rebuild the heap: this function is used only once and executed rarely */ 1087/* rebuild the heap: this function is used only once and executed rarely */
953void inline_size 1088inline_size void
954reheap (ANHE *heap, int N) 1089reheap (ANHE *heap, int N)
955{ 1090{
956 int i; 1091 int i;
957 1092
958 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1093 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
961 upheap (heap, i + HEAP0); 1096 upheap (heap, i + HEAP0);
962} 1097}
963 1098
964/*****************************************************************************/ 1099/*****************************************************************************/
965 1100
1101/* associate signal watchers to a signal signal */
966typedef struct 1102typedef struct
967{ 1103{
968 WL head; 1104 WL head;
969 EV_ATOMIC_T gotsig; 1105 EV_ATOMIC_T gotsig;
970} ANSIG; 1106} ANSIG;
… …
974 1110
975static EV_ATOMIC_T gotsig; 1111static EV_ATOMIC_T gotsig;
976 1112
977/*****************************************************************************/ 1113/*****************************************************************************/
978 1114
979void inline_speed 1115/* used to prepare libev internal fd's */
1116/* this is not fork-safe */
1117inline_speed void
980fd_intern (int fd) 1118fd_intern (int fd)
981{ 1119{
982#ifdef _WIN32 1120#ifdef _WIN32
983 unsigned long arg = 1; 1121 unsigned long arg = 1;
984 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1122 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
989} 1127}
990 1128
991static void noinline 1129static void noinline
992evpipe_init (EV_P) 1130evpipe_init (EV_P)
993{ 1131{
994 if (!ev_is_active (&pipeev)) 1132 if (!ev_is_active (&pipe_w))
995 { 1133 {
996#if EV_USE_EVENTFD 1134#if EV_USE_EVENTFD
1135 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1136 if (evfd < 0 && errno == EINVAL)
997 if ((evfd = eventfd (0, 0)) >= 0) 1137 evfd = eventfd (0, 0);
1138
1139 if (evfd >= 0)
998 { 1140 {
999 evpipe [0] = -1; 1141 evpipe [0] = -1;
1000 fd_intern (evfd); 1142 fd_intern (evfd); /* doing it twice doesn't hurt */
1001 ev_io_set (&pipeev, evfd, EV_READ); 1143 ev_io_set (&pipe_w, evfd, EV_READ);
1002 } 1144 }
1003 else 1145 else
1004#endif 1146#endif
1005 { 1147 {
1006 while (pipe (evpipe)) 1148 while (pipe (evpipe))
1007 ev_syserr ("(libev) error creating signal/async pipe"); 1149 ev_syserr ("(libev) error creating signal/async pipe");
1008 1150
1009 fd_intern (evpipe [0]); 1151 fd_intern (evpipe [0]);
1010 fd_intern (evpipe [1]); 1152 fd_intern (evpipe [1]);
1011 ev_io_set (&pipeev, evpipe [0], EV_READ); 1153 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1012 } 1154 }
1013 1155
1014 ev_io_start (EV_A_ &pipeev); 1156 ev_io_start (EV_A_ &pipe_w);
1015 ev_unref (EV_A); /* watcher should not keep loop alive */ 1157 ev_unref (EV_A); /* watcher should not keep loop alive */
1016 } 1158 }
1017} 1159}
1018 1160
1019void inline_size 1161inline_size void
1020evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1162evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1021{ 1163{
1022 if (!*flag) 1164 if (!*flag)
1023 { 1165 {
1024 int old_errno = errno; /* save errno because write might clobber it */ 1166 int old_errno = errno; /* save errno because write might clobber it */
… …
1037 1179
1038 errno = old_errno; 1180 errno = old_errno;
1039 } 1181 }
1040} 1182}
1041 1183
1184/* called whenever the libev signal pipe */
1185/* got some events (signal, async) */
1042static void 1186static void
1043pipecb (EV_P_ ev_io *iow, int revents) 1187pipecb (EV_P_ ev_io *iow, int revents)
1044{ 1188{
1045#if EV_USE_EVENTFD 1189#if EV_USE_EVENTFD
1046 if (evfd >= 0) 1190 if (evfd >= 0)
… …
1102ev_feed_signal_event (EV_P_ int signum) 1246ev_feed_signal_event (EV_P_ int signum)
1103{ 1247{
1104 WL w; 1248 WL w;
1105 1249
1106#if EV_MULTIPLICITY 1250#if EV_MULTIPLICITY
1107 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1251 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1108#endif 1252#endif
1109 1253
1110 --signum; 1254 --signum;
1111 1255
1112 if (signum < 0 || signum >= signalmax) 1256 if (signum < 0 || signum >= signalmax)
… …
1116 1260
1117 for (w = signals [signum].head; w; w = w->next) 1261 for (w = signals [signum].head; w; w = w->next)
1118 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1262 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1119} 1263}
1120 1264
1265#if EV_USE_SIGNALFD
1266static void
1267sigfdcb (EV_P_ ev_io *iow, int revents)
1268{
1269 struct signalfd_siginfo si[4], *sip;
1270
1271 for (;;)
1272 {
1273 ssize_t res = read (sigfd, si, sizeof (si));
1274
1275 /* not ISO-C, as res might be -1, but works with SuS */
1276 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1277 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1278
1279 if (res < (ssize_t)sizeof (si))
1280 break;
1281 }
1282}
1283#endif
1284
1121/*****************************************************************************/ 1285/*****************************************************************************/
1122 1286
1123static WL childs [EV_PID_HASHSIZE]; 1287static WL childs [EV_PID_HASHSIZE];
1124 1288
1125#ifndef _WIN32 1289#ifndef _WIN32
… …
1128 1292
1129#ifndef WIFCONTINUED 1293#ifndef WIFCONTINUED
1130# define WIFCONTINUED(status) 0 1294# define WIFCONTINUED(status) 0
1131#endif 1295#endif
1132 1296
1133void inline_speed 1297/* handle a single child status event */
1298inline_speed void
1134child_reap (EV_P_ int chain, int pid, int status) 1299child_reap (EV_P_ int chain, int pid, int status)
1135{ 1300{
1136 ev_child *w; 1301 ev_child *w;
1137 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1302 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1138 1303
… …
1151 1316
1152#ifndef WCONTINUED 1317#ifndef WCONTINUED
1153# define WCONTINUED 0 1318# define WCONTINUED 0
1154#endif 1319#endif
1155 1320
1321/* called on sigchld etc., calls waitpid */
1156static void 1322static void
1157childcb (EV_P_ ev_signal *sw, int revents) 1323childcb (EV_P_ ev_signal *sw, int revents)
1158{ 1324{
1159 int pid, status; 1325 int pid, status;
1160 1326
… …
1241 /* kqueue is borked on everything but netbsd apparently */ 1407 /* kqueue is borked on everything but netbsd apparently */
1242 /* it usually doesn't work correctly on anything but sockets and pipes */ 1408 /* it usually doesn't work correctly on anything but sockets and pipes */
1243 flags &= ~EVBACKEND_KQUEUE; 1409 flags &= ~EVBACKEND_KQUEUE;
1244#endif 1410#endif
1245#ifdef __APPLE__ 1411#ifdef __APPLE__
1246 // flags &= ~EVBACKEND_KQUEUE; for documentation 1412 /* only select works correctly on that "unix-certified" platform */
1247 flags &= ~EVBACKEND_POLL; 1413 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1414 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1248#endif 1415#endif
1249 1416
1250 return flags; 1417 return flags;
1251} 1418}
1252 1419
… …
1266ev_backend (EV_P) 1433ev_backend (EV_P)
1267{ 1434{
1268 return backend; 1435 return backend;
1269} 1436}
1270 1437
1438#if EV_MINIMAL < 2
1271unsigned int 1439unsigned int
1272ev_loop_count (EV_P) 1440ev_loop_count (EV_P)
1273{ 1441{
1274 return loop_count; 1442 return loop_count;
1275} 1443}
1276 1444
1445unsigned int
1446ev_loop_depth (EV_P)
1447{
1448 return loop_depth;
1449}
1450
1277void 1451void
1278ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1452ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1279{ 1453{
1280 io_blocktime = interval; 1454 io_blocktime = interval;
1281} 1455}
… …
1284ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1458ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1285{ 1459{
1286 timeout_blocktime = interval; 1460 timeout_blocktime = interval;
1287} 1461}
1288 1462
1463void
1464ev_set_userdata (EV_P_ void *data)
1465{
1466 userdata = data;
1467}
1468
1469void *
1470ev_userdata (EV_P)
1471{
1472 return userdata;
1473}
1474
1475void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1476{
1477 invoke_cb = invoke_pending_cb;
1478}
1479
1480void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1481{
1482 release_cb = release;
1483 acquire_cb = acquire;
1484}
1485#endif
1486
1487/* initialise a loop structure, must be zero-initialised */
1289static void noinline 1488static void noinline
1290loop_init (EV_P_ unsigned int flags) 1489loop_init (EV_P_ unsigned int flags)
1291{ 1490{
1292 if (!backend) 1491 if (!backend)
1293 { 1492 {
1493#if EV_USE_REALTIME
1494 if (!have_realtime)
1495 {
1496 struct timespec ts;
1497
1498 if (!clock_gettime (CLOCK_REALTIME, &ts))
1499 have_realtime = 1;
1500 }
1501#endif
1502
1294#if EV_USE_MONOTONIC 1503#if EV_USE_MONOTONIC
1504 if (!have_monotonic)
1295 { 1505 {
1296 struct timespec ts; 1506 struct timespec ts;
1507
1297 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1508 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1298 have_monotonic = 1; 1509 have_monotonic = 1;
1299 } 1510 }
1300#endif 1511#endif
1301 1512
1302 ev_rt_now = ev_time (); 1513 ev_rt_now = ev_time ();
1303 mn_now = get_clock (); 1514 mn_now = get_clock ();
1304 now_floor = mn_now; 1515 now_floor = mn_now;
1305 rtmn_diff = ev_rt_now - mn_now; 1516 rtmn_diff = ev_rt_now - mn_now;
1517#if EV_MINIMAL < 2
1518 invoke_cb = ev_invoke_pending;
1519#endif
1306 1520
1307 io_blocktime = 0.; 1521 io_blocktime = 0.;
1308 timeout_blocktime = 0.; 1522 timeout_blocktime = 0.;
1309 backend = 0; 1523 backend = 0;
1310 backend_fd = -1; 1524 backend_fd = -1;
1311 gotasync = 0; 1525 gotasync = 0;
1312#if EV_USE_INOTIFY 1526#if EV_USE_INOTIFY
1313 fs_fd = -2; 1527 fs_fd = -2;
1314#endif 1528#endif
1529#if EV_USE_SIGNALFD
1530 sigfd = -2;
1531#endif
1315 1532
1316 /* pid check not overridable via env */ 1533 /* pid check not overridable via env */
1317#ifndef _WIN32 1534#ifndef _WIN32
1318 if (flags & EVFLAG_FORKCHECK) 1535 if (flags & EVFLAG_FORKCHECK)
1319 curpid = getpid (); 1536 curpid = getpid ();
… …
1341#endif 1558#endif
1342#if EV_USE_SELECT 1559#if EV_USE_SELECT
1343 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1560 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1344#endif 1561#endif
1345 1562
1563 ev_prepare_init (&pending_w, pendingcb);
1564
1346 ev_init (&pipeev, pipecb); 1565 ev_init (&pipe_w, pipecb);
1347 ev_set_priority (&pipeev, EV_MAXPRI); 1566 ev_set_priority (&pipe_w, EV_MAXPRI);
1348 } 1567 }
1349} 1568}
1350 1569
1570/* free up a loop structure */
1351static void noinline 1571static void noinline
1352loop_destroy (EV_P) 1572loop_destroy (EV_P)
1353{ 1573{
1354 int i; 1574 int i;
1355 1575
1356 if (ev_is_active (&pipeev)) 1576 if (ev_is_active (&pipe_w))
1357 { 1577 {
1358 ev_ref (EV_A); /* signal watcher */ 1578 /*ev_ref (EV_A);*/
1359 ev_io_stop (EV_A_ &pipeev); 1579 /*ev_io_stop (EV_A_ &pipe_w);*/
1360 1580
1361#if EV_USE_EVENTFD 1581#if EV_USE_EVENTFD
1362 if (evfd >= 0) 1582 if (evfd >= 0)
1363 close (evfd); 1583 close (evfd);
1364#endif 1584#endif
… …
1368 close (evpipe [0]); 1588 close (evpipe [0]);
1369 close (evpipe [1]); 1589 close (evpipe [1]);
1370 } 1590 }
1371 } 1591 }
1372 1592
1593#if EV_USE_SIGNALFD
1594 if (ev_is_active (&sigfd_w))
1595 {
1596 /*ev_ref (EV_A);*/
1597 /*ev_io_stop (EV_A_ &sigfd_w);*/
1598
1599 close (sigfd);
1600 }
1601#endif
1602
1373#if EV_USE_INOTIFY 1603#if EV_USE_INOTIFY
1374 if (fs_fd >= 0) 1604 if (fs_fd >= 0)
1375 close (fs_fd); 1605 close (fs_fd);
1376#endif 1606#endif
1377 1607
… …
1403 } 1633 }
1404 1634
1405 ev_free (anfds); anfdmax = 0; 1635 ev_free (anfds); anfdmax = 0;
1406 1636
1407 /* have to use the microsoft-never-gets-it-right macro */ 1637 /* have to use the microsoft-never-gets-it-right macro */
1638 array_free (rfeed, EMPTY);
1408 array_free (fdchange, EMPTY); 1639 array_free (fdchange, EMPTY);
1409 array_free (timer, EMPTY); 1640 array_free (timer, EMPTY);
1410#if EV_PERIODIC_ENABLE 1641#if EV_PERIODIC_ENABLE
1411 array_free (periodic, EMPTY); 1642 array_free (periodic, EMPTY);
1412#endif 1643#endif
… …
1421 1652
1422 backend = 0; 1653 backend = 0;
1423} 1654}
1424 1655
1425#if EV_USE_INOTIFY 1656#if EV_USE_INOTIFY
1426void inline_size infy_fork (EV_P); 1657inline_size void infy_fork (EV_P);
1427#endif 1658#endif
1428 1659
1429void inline_size 1660inline_size void
1430loop_fork (EV_P) 1661loop_fork (EV_P)
1431{ 1662{
1432#if EV_USE_PORT 1663#if EV_USE_PORT
1433 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1664 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1434#endif 1665#endif
… …
1440#endif 1671#endif
1441#if EV_USE_INOTIFY 1672#if EV_USE_INOTIFY
1442 infy_fork (EV_A); 1673 infy_fork (EV_A);
1443#endif 1674#endif
1444 1675
1445 if (ev_is_active (&pipeev)) 1676 if (ev_is_active (&pipe_w))
1446 { 1677 {
1447 /* this "locks" the handlers against writing to the pipe */ 1678 /* this "locks" the handlers against writing to the pipe */
1448 /* while we modify the fd vars */ 1679 /* while we modify the fd vars */
1449 gotsig = 1; 1680 gotsig = 1;
1450#if EV_ASYNC_ENABLE 1681#if EV_ASYNC_ENABLE
1451 gotasync = 1; 1682 gotasync = 1;
1452#endif 1683#endif
1453 1684
1454 ev_ref (EV_A); 1685 ev_ref (EV_A);
1455 ev_io_stop (EV_A_ &pipeev); 1686 ev_io_stop (EV_A_ &pipe_w);
1456 1687
1457#if EV_USE_EVENTFD 1688#if EV_USE_EVENTFD
1458 if (evfd >= 0) 1689 if (evfd >= 0)
1459 close (evfd); 1690 close (evfd);
1460#endif 1691#endif
… …
1465 close (evpipe [1]); 1696 close (evpipe [1]);
1466 } 1697 }
1467 1698
1468 evpipe_init (EV_A); 1699 evpipe_init (EV_A);
1469 /* now iterate over everything, in case we missed something */ 1700 /* now iterate over everything, in case we missed something */
1470 pipecb (EV_A_ &pipeev, EV_READ); 1701 pipecb (EV_A_ &pipe_w, EV_READ);
1471 } 1702 }
1472 1703
1473 postfork = 0; 1704 postfork = 0;
1474} 1705}
1475 1706
… …
1479ev_loop_new (unsigned int flags) 1710ev_loop_new (unsigned int flags)
1480{ 1711{
1481 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1712 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1482 1713
1483 memset (loop, 0, sizeof (struct ev_loop)); 1714 memset (loop, 0, sizeof (struct ev_loop));
1484
1485 loop_init (EV_A_ flags); 1715 loop_init (EV_A_ flags);
1486 1716
1487 if (ev_backend (EV_A)) 1717 if (ev_backend (EV_A))
1488 return loop; 1718 return loop;
1489 1719
… …
1500void 1730void
1501ev_loop_fork (EV_P) 1731ev_loop_fork (EV_P)
1502{ 1732{
1503 postfork = 1; /* must be in line with ev_default_fork */ 1733 postfork = 1; /* must be in line with ev_default_fork */
1504} 1734}
1735#endif /* multiplicity */
1505 1736
1506#if EV_VERIFY 1737#if EV_VERIFY
1507static void noinline 1738static void noinline
1508verify_watcher (EV_P_ W w) 1739verify_watcher (EV_P_ W w)
1509{ 1740{
1510 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1741 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1511 1742
1512 if (w->pending) 1743 if (w->pending)
1513 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1744 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1514} 1745}
1515 1746
1516static void noinline 1747static void noinline
1517verify_heap (EV_P_ ANHE *heap, int N) 1748verify_heap (EV_P_ ANHE *heap, int N)
1518{ 1749{
1519 int i; 1750 int i;
1520 1751
1521 for (i = HEAP0; i < N + HEAP0; ++i) 1752 for (i = HEAP0; i < N + HEAP0; ++i)
1522 { 1753 {
1523 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1754 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1524 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1755 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1525 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1756 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1526 1757
1527 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1758 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1528 } 1759 }
1529} 1760}
1530 1761
1531static void noinline 1762static void noinline
1532array_verify (EV_P_ W *ws, int cnt) 1763array_verify (EV_P_ W *ws, int cnt)
1533{ 1764{
1534 while (cnt--) 1765 while (cnt--)
1535 { 1766 {
1536 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1767 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1537 verify_watcher (EV_A_ ws [cnt]); 1768 verify_watcher (EV_A_ ws [cnt]);
1538 } 1769 }
1539} 1770}
1540#endif 1771#endif
1541 1772
1773#if EV_MINIMAL < 2
1542void 1774void
1543ev_loop_verify (EV_P) 1775ev_loop_verify (EV_P)
1544{ 1776{
1545#if EV_VERIFY 1777#if EV_VERIFY
1546 int i; 1778 int i;
… …
1548 1780
1549 assert (activecnt >= -1); 1781 assert (activecnt >= -1);
1550 1782
1551 assert (fdchangemax >= fdchangecnt); 1783 assert (fdchangemax >= fdchangecnt);
1552 for (i = 0; i < fdchangecnt; ++i) 1784 for (i = 0; i < fdchangecnt; ++i)
1553 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1785 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1554 1786
1555 assert (anfdmax >= 0); 1787 assert (anfdmax >= 0);
1556 for (i = 0; i < anfdmax; ++i) 1788 for (i = 0; i < anfdmax; ++i)
1557 for (w = anfds [i].head; w; w = w->next) 1789 for (w = anfds [i].head; w; w = w->next)
1558 { 1790 {
1559 verify_watcher (EV_A_ (W)w); 1791 verify_watcher (EV_A_ (W)w);
1560 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1792 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1561 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1793 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1562 } 1794 }
1563 1795
1564 assert (timermax >= timercnt); 1796 assert (timermax >= timercnt);
1565 verify_heap (EV_A_ timers, timercnt); 1797 verify_heap (EV_A_ timers, timercnt);
1566 1798
… …
1599 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1831 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1600 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1832 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1601# endif 1833# endif
1602#endif 1834#endif
1603} 1835}
1604 1836#endif
1605#endif /* multiplicity */
1606 1837
1607#if EV_MULTIPLICITY 1838#if EV_MULTIPLICITY
1608struct ev_loop * 1839struct ev_loop *
1609ev_default_loop_init (unsigned int flags) 1840ev_default_loop_init (unsigned int flags)
1610#else 1841#else
… …
1671ev_invoke (EV_P_ void *w, int revents) 1902ev_invoke (EV_P_ void *w, int revents)
1672{ 1903{
1673 EV_CB_INVOKE ((W)w, revents); 1904 EV_CB_INVOKE ((W)w, revents);
1674} 1905}
1675 1906
1676void inline_speed 1907unsigned int
1677call_pending (EV_P) 1908ev_pending_count (EV_P)
1909{
1910 int pri;
1911 unsigned int count = 0;
1912
1913 for (pri = NUMPRI; pri--; )
1914 count += pendingcnt [pri];
1915
1916 return count;
1917}
1918
1919void noinline
1920ev_invoke_pending (EV_P)
1678{ 1921{
1679 int pri; 1922 int pri;
1680 1923
1681 for (pri = NUMPRI; pri--; ) 1924 for (pri = NUMPRI; pri--; )
1682 while (pendingcnt [pri]) 1925 while (pendingcnt [pri])
1683 { 1926 {
1684 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1927 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1685 1928
1686 if (expect_true (p->w))
1687 {
1688 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1929 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1930 /* ^ this is no longer true, as pending_w could be here */
1689 1931
1690 p->w->pending = 0; 1932 p->w->pending = 0;
1691 EV_CB_INVOKE (p->w, p->events); 1933 EV_CB_INVOKE (p->w, p->events);
1692 EV_FREQUENT_CHECK; 1934 EV_FREQUENT_CHECK;
1693 }
1694 } 1935 }
1695} 1936}
1696 1937
1697#if EV_IDLE_ENABLE 1938#if EV_IDLE_ENABLE
1698void inline_size 1939/* make idle watchers pending. this handles the "call-idle */
1940/* only when higher priorities are idle" logic */
1941inline_size void
1699idle_reify (EV_P) 1942idle_reify (EV_P)
1700{ 1943{
1701 if (expect_false (idleall)) 1944 if (expect_false (idleall))
1702 { 1945 {
1703 int pri; 1946 int pri;
… …
1715 } 1958 }
1716 } 1959 }
1717} 1960}
1718#endif 1961#endif
1719 1962
1720void inline_size 1963/* make timers pending */
1964inline_size void
1721timers_reify (EV_P) 1965timers_reify (EV_P)
1722{ 1966{
1723 EV_FREQUENT_CHECK; 1967 EV_FREQUENT_CHECK;
1724 1968
1725 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1969 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1726 { 1970 {
1727 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1971 do
1728
1729 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1730
1731 /* first reschedule or stop timer */
1732 if (w->repeat)
1733 { 1972 {
1973 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1974
1975 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1976
1977 /* first reschedule or stop timer */
1978 if (w->repeat)
1979 {
1734 ev_at (w) += w->repeat; 1980 ev_at (w) += w->repeat;
1735 if (ev_at (w) < mn_now) 1981 if (ev_at (w) < mn_now)
1736 ev_at (w) = mn_now; 1982 ev_at (w) = mn_now;
1737 1983
1738 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1984 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1739 1985
1740 ANHE_at_cache (timers [HEAP0]); 1986 ANHE_at_cache (timers [HEAP0]);
1741 downheap (timers, timercnt, HEAP0); 1987 downheap (timers, timercnt, HEAP0);
1988 }
1989 else
1990 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1991
1992 EV_FREQUENT_CHECK;
1993 feed_reverse (EV_A_ (W)w);
1742 } 1994 }
1743 else 1995 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1744 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1745 1996
1746 EV_FREQUENT_CHECK;
1747 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1997 feed_reverse_done (EV_A_ EV_TIMEOUT);
1748 } 1998 }
1749} 1999}
1750 2000
1751#if EV_PERIODIC_ENABLE 2001#if EV_PERIODIC_ENABLE
1752void inline_size 2002/* make periodics pending */
2003inline_size void
1753periodics_reify (EV_P) 2004periodics_reify (EV_P)
1754{ 2005{
1755 EV_FREQUENT_CHECK; 2006 EV_FREQUENT_CHECK;
1756 2007
1757 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2008 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1758 { 2009 {
1759 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2010 int feed_count = 0;
1760 2011
1761 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2012 do
1762
1763 /* first reschedule or stop timer */
1764 if (w->reschedule_cb)
1765 { 2013 {
2014 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2015
2016 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2017
2018 /* first reschedule or stop timer */
2019 if (w->reschedule_cb)
2020 {
1766 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2021 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1767 2022
1768 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2023 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1769 2024
1770 ANHE_at_cache (periodics [HEAP0]); 2025 ANHE_at_cache (periodics [HEAP0]);
1771 downheap (periodics, periodiccnt, HEAP0); 2026 downheap (periodics, periodiccnt, HEAP0);
2027 }
2028 else if (w->interval)
2029 {
2030 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2031 /* if next trigger time is not sufficiently in the future, put it there */
2032 /* this might happen because of floating point inexactness */
2033 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2034 {
2035 ev_at (w) += w->interval;
2036
2037 /* if interval is unreasonably low we might still have a time in the past */
2038 /* so correct this. this will make the periodic very inexact, but the user */
2039 /* has effectively asked to get triggered more often than possible */
2040 if (ev_at (w) < ev_rt_now)
2041 ev_at (w) = ev_rt_now;
2042 }
2043
2044 ANHE_at_cache (periodics [HEAP0]);
2045 downheap (periodics, periodiccnt, HEAP0);
2046 }
2047 else
2048 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2049
2050 EV_FREQUENT_CHECK;
2051 feed_reverse (EV_A_ (W)w);
1772 } 2052 }
1773 else if (w->interval) 2053 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1774 {
1775 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1776 /* if next trigger time is not sufficiently in the future, put it there */
1777 /* this might happen because of floating point inexactness */
1778 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1779 {
1780 ev_at (w) += w->interval;
1781 2054
1782 /* if interval is unreasonably low we might still have a time in the past */
1783 /* so correct this. this will make the periodic very inexact, but the user */
1784 /* has effectively asked to get triggered more often than possible */
1785 if (ev_at (w) < ev_rt_now)
1786 ev_at (w) = ev_rt_now;
1787 }
1788
1789 ANHE_at_cache (periodics [HEAP0]);
1790 downheap (periodics, periodiccnt, HEAP0);
1791 }
1792 else
1793 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1794
1795 EV_FREQUENT_CHECK;
1796 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2055 feed_reverse_done (EV_A_ EV_PERIODIC);
1797 } 2056 }
1798} 2057}
1799 2058
2059/* simply recalculate all periodics */
2060/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1800static void noinline 2061static void noinline
1801periodics_reschedule (EV_P) 2062periodics_reschedule (EV_P)
1802{ 2063{
1803 int i; 2064 int i;
1804 2065
… …
1817 2078
1818 reheap (periodics, periodiccnt); 2079 reheap (periodics, periodiccnt);
1819} 2080}
1820#endif 2081#endif
1821 2082
1822void inline_speed 2083/* adjust all timers by a given offset */
2084static void noinline
2085timers_reschedule (EV_P_ ev_tstamp adjust)
2086{
2087 int i;
2088
2089 for (i = 0; i < timercnt; ++i)
2090 {
2091 ANHE *he = timers + i + HEAP0;
2092 ANHE_w (*he)->at += adjust;
2093 ANHE_at_cache (*he);
2094 }
2095}
2096
2097/* fetch new monotonic and realtime times from the kernel */
2098/* also detetc if there was a timejump, and act accordingly */
2099inline_speed void
1823time_update (EV_P_ ev_tstamp max_block) 2100time_update (EV_P_ ev_tstamp max_block)
1824{ 2101{
1825 int i;
1826
1827#if EV_USE_MONOTONIC 2102#if EV_USE_MONOTONIC
1828 if (expect_true (have_monotonic)) 2103 if (expect_true (have_monotonic))
1829 { 2104 {
2105 int i;
1830 ev_tstamp odiff = rtmn_diff; 2106 ev_tstamp odiff = rtmn_diff;
1831 2107
1832 mn_now = get_clock (); 2108 mn_now = get_clock ();
1833 2109
1834 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2110 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1860 ev_rt_now = ev_time (); 2136 ev_rt_now = ev_time ();
1861 mn_now = get_clock (); 2137 mn_now = get_clock ();
1862 now_floor = mn_now; 2138 now_floor = mn_now;
1863 } 2139 }
1864 2140
2141 /* no timer adjustment, as the monotonic clock doesn't jump */
2142 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1865# if EV_PERIODIC_ENABLE 2143# if EV_PERIODIC_ENABLE
1866 periodics_reschedule (EV_A); 2144 periodics_reschedule (EV_A);
1867# endif 2145# endif
1868 /* no timer adjustment, as the monotonic clock doesn't jump */
1869 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1870 } 2146 }
1871 else 2147 else
1872#endif 2148#endif
1873 { 2149 {
1874 ev_rt_now = ev_time (); 2150 ev_rt_now = ev_time ();
1875 2151
1876 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2152 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1877 { 2153 {
2154 /* adjust timers. this is easy, as the offset is the same for all of them */
2155 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1878#if EV_PERIODIC_ENABLE 2156#if EV_PERIODIC_ENABLE
1879 periodics_reschedule (EV_A); 2157 periodics_reschedule (EV_A);
1880#endif 2158#endif
1881 /* adjust timers. this is easy, as the offset is the same for all of them */
1882 for (i = 0; i < timercnt; ++i)
1883 {
1884 ANHE *he = timers + i + HEAP0;
1885 ANHE_w (*he)->at += ev_rt_now - mn_now;
1886 ANHE_at_cache (*he);
1887 }
1888 } 2159 }
1889 2160
1890 mn_now = ev_rt_now; 2161 mn_now = ev_rt_now;
1891 } 2162 }
1892} 2163}
1893 2164
1894void 2165void
1895ev_ref (EV_P)
1896{
1897 ++activecnt;
1898}
1899
1900void
1901ev_unref (EV_P)
1902{
1903 --activecnt;
1904}
1905
1906void
1907ev_now_update (EV_P)
1908{
1909 time_update (EV_A_ 1e100);
1910}
1911
1912static int loop_done;
1913
1914void
1915ev_loop (EV_P_ int flags) 2166ev_loop (EV_P_ int flags)
1916{ 2167{
2168#if EV_MINIMAL < 2
2169 ++loop_depth;
2170#endif
2171
2172 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2173
1917 loop_done = EVUNLOOP_CANCEL; 2174 loop_done = EVUNLOOP_CANCEL;
1918 2175
1919 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2176 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1920 2177
1921 do 2178 do
1922 { 2179 {
1923#if EV_VERIFY >= 2 2180#if EV_VERIFY >= 2
1924 ev_loop_verify (EV_A); 2181 ev_loop_verify (EV_A);
… …
1937 /* we might have forked, so queue fork handlers */ 2194 /* we might have forked, so queue fork handlers */
1938 if (expect_false (postfork)) 2195 if (expect_false (postfork))
1939 if (forkcnt) 2196 if (forkcnt)
1940 { 2197 {
1941 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2198 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1942 call_pending (EV_A); 2199 EV_INVOKE_PENDING;
1943 } 2200 }
1944#endif 2201#endif
1945 2202
1946 /* queue prepare watchers (and execute them) */ 2203 /* queue prepare watchers (and execute them) */
1947 if (expect_false (preparecnt)) 2204 if (expect_false (preparecnt))
1948 { 2205 {
1949 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2206 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1950 call_pending (EV_A); 2207 EV_INVOKE_PENDING;
1951 } 2208 }
1952 2209
1953 if (expect_false (!activecnt)) 2210 if (expect_false (loop_done))
1954 break; 2211 break;
1955 2212
1956 /* we might have forked, so reify kernel state if necessary */ 2213 /* we might have forked, so reify kernel state if necessary */
1957 if (expect_false (postfork)) 2214 if (expect_false (postfork))
1958 loop_fork (EV_A); 2215 loop_fork (EV_A);
… …
1965 ev_tstamp waittime = 0.; 2222 ev_tstamp waittime = 0.;
1966 ev_tstamp sleeptime = 0.; 2223 ev_tstamp sleeptime = 0.;
1967 2224
1968 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2225 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1969 { 2226 {
2227 /* remember old timestamp for io_blocktime calculation */
2228 ev_tstamp prev_mn_now = mn_now;
2229
1970 /* update time to cancel out callback processing overhead */ 2230 /* update time to cancel out callback processing overhead */
1971 time_update (EV_A_ 1e100); 2231 time_update (EV_A_ 1e100);
1972 2232
1973 waittime = MAX_BLOCKTIME; 2233 waittime = MAX_BLOCKTIME;
1974 2234
… …
1984 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2244 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1985 if (waittime > to) waittime = to; 2245 if (waittime > to) waittime = to;
1986 } 2246 }
1987#endif 2247#endif
1988 2248
2249 /* don't let timeouts decrease the waittime below timeout_blocktime */
1989 if (expect_false (waittime < timeout_blocktime)) 2250 if (expect_false (waittime < timeout_blocktime))
1990 waittime = timeout_blocktime; 2251 waittime = timeout_blocktime;
1991 2252
1992 sleeptime = waittime - backend_fudge; 2253 /* extra check because io_blocktime is commonly 0 */
1993
1994 if (expect_true (sleeptime > io_blocktime)) 2254 if (expect_false (io_blocktime))
1995 sleeptime = io_blocktime;
1996
1997 if (sleeptime)
1998 { 2255 {
2256 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2257
2258 if (sleeptime > waittime - backend_fudge)
2259 sleeptime = waittime - backend_fudge;
2260
2261 if (expect_true (sleeptime > 0.))
2262 {
1999 ev_sleep (sleeptime); 2263 ev_sleep (sleeptime);
2000 waittime -= sleeptime; 2264 waittime -= sleeptime;
2265 }
2001 } 2266 }
2002 } 2267 }
2003 2268
2269#if EV_MINIMAL < 2
2004 ++loop_count; 2270 ++loop_count;
2271#endif
2272 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2005 backend_poll (EV_A_ waittime); 2273 backend_poll (EV_A_ waittime);
2274 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2006 2275
2007 /* update ev_rt_now, do magic */ 2276 /* update ev_rt_now, do magic */
2008 time_update (EV_A_ waittime + sleeptime); 2277 time_update (EV_A_ waittime + sleeptime);
2009 } 2278 }
2010 2279
… …
2021 2290
2022 /* queue check watchers, to be executed first */ 2291 /* queue check watchers, to be executed first */
2023 if (expect_false (checkcnt)) 2292 if (expect_false (checkcnt))
2024 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2293 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2025 2294
2026 call_pending (EV_A); 2295 EV_INVOKE_PENDING;
2027 } 2296 }
2028 while (expect_true ( 2297 while (expect_true (
2029 activecnt 2298 activecnt
2030 && !loop_done 2299 && !loop_done
2031 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2300 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2032 )); 2301 ));
2033 2302
2034 if (loop_done == EVUNLOOP_ONE) 2303 if (loop_done == EVUNLOOP_ONE)
2035 loop_done = EVUNLOOP_CANCEL; 2304 loop_done = EVUNLOOP_CANCEL;
2305
2306#if EV_MINIMAL < 2
2307 --loop_depth;
2308#endif
2036} 2309}
2037 2310
2038void 2311void
2039ev_unloop (EV_P_ int how) 2312ev_unloop (EV_P_ int how)
2040{ 2313{
2041 loop_done = how; 2314 loop_done = how;
2042} 2315}
2043 2316
2317void
2318ev_ref (EV_P)
2319{
2320 ++activecnt;
2321}
2322
2323void
2324ev_unref (EV_P)
2325{
2326 --activecnt;
2327}
2328
2329void
2330ev_now_update (EV_P)
2331{
2332 time_update (EV_A_ 1e100);
2333}
2334
2335void
2336ev_suspend (EV_P)
2337{
2338 ev_now_update (EV_A);
2339}
2340
2341void
2342ev_resume (EV_P)
2343{
2344 ev_tstamp mn_prev = mn_now;
2345
2346 ev_now_update (EV_A);
2347 timers_reschedule (EV_A_ mn_now - mn_prev);
2348#if EV_PERIODIC_ENABLE
2349 /* TODO: really do this? */
2350 periodics_reschedule (EV_A);
2351#endif
2352}
2353
2044/*****************************************************************************/ 2354/*****************************************************************************/
2355/* singly-linked list management, used when the expected list length is short */
2045 2356
2046void inline_size 2357inline_size void
2047wlist_add (WL *head, WL elem) 2358wlist_add (WL *head, WL elem)
2048{ 2359{
2049 elem->next = *head; 2360 elem->next = *head;
2050 *head = elem; 2361 *head = elem;
2051} 2362}
2052 2363
2053void inline_size 2364inline_size void
2054wlist_del (WL *head, WL elem) 2365wlist_del (WL *head, WL elem)
2055{ 2366{
2056 while (*head) 2367 while (*head)
2057 { 2368 {
2058 if (*head == elem) 2369 if (*head == elem)
… …
2063 2374
2064 head = &(*head)->next; 2375 head = &(*head)->next;
2065 } 2376 }
2066} 2377}
2067 2378
2068void inline_speed 2379/* internal, faster, version of ev_clear_pending */
2380inline_speed void
2069clear_pending (EV_P_ W w) 2381clear_pending (EV_P_ W w)
2070{ 2382{
2071 if (w->pending) 2383 if (w->pending)
2072 { 2384 {
2073 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2385 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2074 w->pending = 0; 2386 w->pending = 0;
2075 } 2387 }
2076} 2388}
2077 2389
2078int 2390int
… …
2082 int pending = w_->pending; 2394 int pending = w_->pending;
2083 2395
2084 if (expect_true (pending)) 2396 if (expect_true (pending))
2085 { 2397 {
2086 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2398 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2399 p->w = (W)&pending_w;
2087 w_->pending = 0; 2400 w_->pending = 0;
2088 p->w = 0;
2089 return p->events; 2401 return p->events;
2090 } 2402 }
2091 else 2403 else
2092 return 0; 2404 return 0;
2093} 2405}
2094 2406
2095void inline_size 2407inline_size void
2096pri_adjust (EV_P_ W w) 2408pri_adjust (EV_P_ W w)
2097{ 2409{
2098 int pri = w->priority; 2410 int pri = ev_priority (w);
2099 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2411 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2100 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2412 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2101 w->priority = pri; 2413 ev_set_priority (w, pri);
2102} 2414}
2103 2415
2104void inline_speed 2416inline_speed void
2105ev_start (EV_P_ W w, int active) 2417ev_start (EV_P_ W w, int active)
2106{ 2418{
2107 pri_adjust (EV_A_ w); 2419 pri_adjust (EV_A_ w);
2108 w->active = active; 2420 w->active = active;
2109 ev_ref (EV_A); 2421 ev_ref (EV_A);
2110} 2422}
2111 2423
2112void inline_size 2424inline_size void
2113ev_stop (EV_P_ W w) 2425ev_stop (EV_P_ W w)
2114{ 2426{
2115 ev_unref (EV_A); 2427 ev_unref (EV_A);
2116 w->active = 0; 2428 w->active = 0;
2117} 2429}
… …
2124 int fd = w->fd; 2436 int fd = w->fd;
2125 2437
2126 if (expect_false (ev_is_active (w))) 2438 if (expect_false (ev_is_active (w)))
2127 return; 2439 return;
2128 2440
2129 assert (("ev_io_start called with negative fd", fd >= 0)); 2441 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2130 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE)))); 2442 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2131 2443
2132 EV_FREQUENT_CHECK; 2444 EV_FREQUENT_CHECK;
2133 2445
2134 ev_start (EV_A_ (W)w, 1); 2446 ev_start (EV_A_ (W)w, 1);
2135 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2447 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2136 wlist_add (&anfds[fd].head, (WL)w); 2448 wlist_add (&anfds[fd].head, (WL)w);
2137 2449
2138 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2450 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2139 w->events &= ~EV_IOFDSET; 2451 w->events &= ~EV__IOFDSET;
2140 2452
2141 EV_FREQUENT_CHECK; 2453 EV_FREQUENT_CHECK;
2142} 2454}
2143 2455
2144void noinline 2456void noinline
… …
2146{ 2458{
2147 clear_pending (EV_A_ (W)w); 2459 clear_pending (EV_A_ (W)w);
2148 if (expect_false (!ev_is_active (w))) 2460 if (expect_false (!ev_is_active (w)))
2149 return; 2461 return;
2150 2462
2151 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2463 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2152 2464
2153 EV_FREQUENT_CHECK; 2465 EV_FREQUENT_CHECK;
2154 2466
2155 wlist_del (&anfds[w->fd].head, (WL)w); 2467 wlist_del (&anfds[w->fd].head, (WL)w);
2156 ev_stop (EV_A_ (W)w); 2468 ev_stop (EV_A_ (W)w);
… …
2166 if (expect_false (ev_is_active (w))) 2478 if (expect_false (ev_is_active (w)))
2167 return; 2479 return;
2168 2480
2169 ev_at (w) += mn_now; 2481 ev_at (w) += mn_now;
2170 2482
2171 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2483 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2172 2484
2173 EV_FREQUENT_CHECK; 2485 EV_FREQUENT_CHECK;
2174 2486
2175 ++timercnt; 2487 ++timercnt;
2176 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2488 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2179 ANHE_at_cache (timers [ev_active (w)]); 2491 ANHE_at_cache (timers [ev_active (w)]);
2180 upheap (timers, ev_active (w)); 2492 upheap (timers, ev_active (w));
2181 2493
2182 EV_FREQUENT_CHECK; 2494 EV_FREQUENT_CHECK;
2183 2495
2184 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2496 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2185} 2497}
2186 2498
2187void noinline 2499void noinline
2188ev_timer_stop (EV_P_ ev_timer *w) 2500ev_timer_stop (EV_P_ ev_timer *w)
2189{ 2501{
… …
2194 EV_FREQUENT_CHECK; 2506 EV_FREQUENT_CHECK;
2195 2507
2196 { 2508 {
2197 int active = ev_active (w); 2509 int active = ev_active (w);
2198 2510
2199 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2511 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2200 2512
2201 --timercnt; 2513 --timercnt;
2202 2514
2203 if (expect_true (active < timercnt + HEAP0)) 2515 if (expect_true (active < timercnt + HEAP0))
2204 { 2516 {
… …
2237 } 2549 }
2238 2550
2239 EV_FREQUENT_CHECK; 2551 EV_FREQUENT_CHECK;
2240} 2552}
2241 2553
2554ev_tstamp
2555ev_timer_remaining (EV_P_ ev_timer *w)
2556{
2557 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2558}
2559
2242#if EV_PERIODIC_ENABLE 2560#if EV_PERIODIC_ENABLE
2243void noinline 2561void noinline
2244ev_periodic_start (EV_P_ ev_periodic *w) 2562ev_periodic_start (EV_P_ ev_periodic *w)
2245{ 2563{
2246 if (expect_false (ev_is_active (w))) 2564 if (expect_false (ev_is_active (w)))
… …
2248 2566
2249 if (w->reschedule_cb) 2567 if (w->reschedule_cb)
2250 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2568 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2251 else if (w->interval) 2569 else if (w->interval)
2252 { 2570 {
2253 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2571 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2254 /* this formula differs from the one in periodic_reify because we do not always round up */ 2572 /* this formula differs from the one in periodic_reify because we do not always round up */
2255 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2573 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2256 } 2574 }
2257 else 2575 else
2258 ev_at (w) = w->offset; 2576 ev_at (w) = w->offset;
… …
2266 ANHE_at_cache (periodics [ev_active (w)]); 2584 ANHE_at_cache (periodics [ev_active (w)]);
2267 upheap (periodics, ev_active (w)); 2585 upheap (periodics, ev_active (w));
2268 2586
2269 EV_FREQUENT_CHECK; 2587 EV_FREQUENT_CHECK;
2270 2588
2271 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2589 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2272} 2590}
2273 2591
2274void noinline 2592void noinline
2275ev_periodic_stop (EV_P_ ev_periodic *w) 2593ev_periodic_stop (EV_P_ ev_periodic *w)
2276{ 2594{
… …
2281 EV_FREQUENT_CHECK; 2599 EV_FREQUENT_CHECK;
2282 2600
2283 { 2601 {
2284 int active = ev_active (w); 2602 int active = ev_active (w);
2285 2603
2286 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2604 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2287 2605
2288 --periodiccnt; 2606 --periodiccnt;
2289 2607
2290 if (expect_true (active < periodiccnt + HEAP0)) 2608 if (expect_true (active < periodiccnt + HEAP0))
2291 { 2609 {
… …
2314 2632
2315void noinline 2633void noinline
2316ev_signal_start (EV_P_ ev_signal *w) 2634ev_signal_start (EV_P_ ev_signal *w)
2317{ 2635{
2318#if EV_MULTIPLICITY 2636#if EV_MULTIPLICITY
2319 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2637 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2320#endif 2638#endif
2321 if (expect_false (ev_is_active (w))) 2639 if (expect_false (ev_is_active (w)))
2322 return; 2640 return;
2323 2641
2324 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2642 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2325 2643
2644 EV_FREQUENT_CHECK;
2645
2646#if EV_USE_SIGNALFD
2647 if (sigfd == -2)
2648 {
2649 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2650 if (sigfd < 0 && errno == EINVAL)
2651 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2652
2653 if (sigfd >= 0)
2654 {
2655 fd_intern (sigfd); /* doing it twice will not hurt */
2656
2657 sigemptyset (&sigfd_set);
2658
2659 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2660 ev_set_priority (&sigfd_w, EV_MAXPRI);
2661 ev_io_start (EV_A_ &sigfd_w);
2662 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2663 }
2664 }
2665
2666 if (sigfd >= 0)
2667 {
2668 /* TODO: check .head */
2669 sigaddset (&sigfd_set, w->signum);
2670 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2671
2672 signalfd (sigfd, &sigfd_set, 0);
2673 }
2674 else
2675#endif
2326 evpipe_init (EV_A); 2676 evpipe_init (EV_A);
2327
2328 EV_FREQUENT_CHECK;
2329 2677
2330 { 2678 {
2331#ifndef _WIN32 2679#ifndef _WIN32
2332 sigset_t full, prev; 2680 sigset_t full, prev;
2333 sigfillset (&full); 2681 sigfillset (&full);
… …
2335#endif 2683#endif
2336 2684
2337 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2685 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2338 2686
2339#ifndef _WIN32 2687#ifndef _WIN32
2688# if EV_USE_SIGNALFD
2689 if (sigfd < 0)/*TODO*/
2690# endif
2691 sigdelset (&prev, w->signum);
2340 sigprocmask (SIG_SETMASK, &prev, 0); 2692 sigprocmask (SIG_SETMASK, &prev, 0);
2341#endif 2693#endif
2342 } 2694 }
2343 2695
2344 ev_start (EV_A_ (W)w, 1); 2696 ev_start (EV_A_ (W)w, 1);
… …
2347 if (!((WL)w)->next) 2699 if (!((WL)w)->next)
2348 { 2700 {
2349#if _WIN32 2701#if _WIN32
2350 signal (w->signum, ev_sighandler); 2702 signal (w->signum, ev_sighandler);
2351#else 2703#else
2704# if EV_USE_SIGNALFD
2705 if (sigfd < 0) /*TODO*/
2706# endif
2707 {
2352 struct sigaction sa; 2708 struct sigaction sa = { };
2353 sa.sa_handler = ev_sighandler; 2709 sa.sa_handler = ev_sighandler;
2354 sigfillset (&sa.sa_mask); 2710 sigfillset (&sa.sa_mask);
2355 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2711 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2356 sigaction (w->signum, &sa, 0); 2712 sigaction (w->signum, &sa, 0);
2713 }
2357#endif 2714#endif
2358 } 2715 }
2359 2716
2360 EV_FREQUENT_CHECK; 2717 EV_FREQUENT_CHECK;
2361} 2718}
… …
2371 2728
2372 wlist_del (&signals [w->signum - 1].head, (WL)w); 2729 wlist_del (&signals [w->signum - 1].head, (WL)w);
2373 ev_stop (EV_A_ (W)w); 2730 ev_stop (EV_A_ (W)w);
2374 2731
2375 if (!signals [w->signum - 1].head) 2732 if (!signals [w->signum - 1].head)
2733#if EV_USE_SIGNALFD
2734 if (sigfd >= 0)
2735 {
2736 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2737 sigdelset (&sigfd_set, w->signum);
2738 signalfd (sigfd, &sigfd_set, 0);
2739 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2740 /*TODO: maybe unblock signal? */
2741 }
2742 else
2743#endif
2376 signal (w->signum, SIG_DFL); 2744 signal (w->signum, SIG_DFL);
2377 2745
2378 EV_FREQUENT_CHECK; 2746 EV_FREQUENT_CHECK;
2379} 2747}
2380 2748
2381void 2749void
2382ev_child_start (EV_P_ ev_child *w) 2750ev_child_start (EV_P_ ev_child *w)
2383{ 2751{
2384#if EV_MULTIPLICITY 2752#if EV_MULTIPLICITY
2385 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2753 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2386#endif 2754#endif
2387 if (expect_false (ev_is_active (w))) 2755 if (expect_false (ev_is_active (w)))
2388 return; 2756 return;
2389 2757
2390 EV_FREQUENT_CHECK; 2758 EV_FREQUENT_CHECK;
… …
2415# ifdef _WIN32 2783# ifdef _WIN32
2416# undef lstat 2784# undef lstat
2417# define lstat(a,b) _stati64 (a,b) 2785# define lstat(a,b) _stati64 (a,b)
2418# endif 2786# endif
2419 2787
2420#define DEF_STAT_INTERVAL 5.0074891 2788#define DEF_STAT_INTERVAL 5.0074891
2789#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2421#define MIN_STAT_INTERVAL 0.1074891 2790#define MIN_STAT_INTERVAL 0.1074891
2422 2791
2423static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2792static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2424 2793
2425#if EV_USE_INOTIFY 2794#if EV_USE_INOTIFY
2426# define EV_INOTIFY_BUFSIZE 8192 2795# define EV_INOTIFY_BUFSIZE 8192
… …
2430{ 2799{
2431 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2800 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2432 2801
2433 if (w->wd < 0) 2802 if (w->wd < 0)
2434 { 2803 {
2804 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2435 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2805 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2436 2806
2437 /* monitor some parent directory for speedup hints */ 2807 /* monitor some parent directory for speedup hints */
2438 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2808 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2439 /* but an efficiency issue only */ 2809 /* but an efficiency issue only */
2440 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2810 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
… …
2447 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2817 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2448 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2818 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2449 2819
2450 char *pend = strrchr (path, '/'); 2820 char *pend = strrchr (path, '/');
2451 2821
2452 if (!pend) 2822 if (!pend || pend == path)
2453 break; /* whoops, no '/', complain to your admin */ 2823 break;
2454 2824
2455 *pend = 0; 2825 *pend = 0;
2456 w->wd = inotify_add_watch (fs_fd, path, mask); 2826 w->wd = inotify_add_watch (fs_fd, path, mask);
2457 } 2827 }
2458 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2828 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2459 } 2829 }
2460 } 2830 }
2461 else
2462 todo, on nfs etc., we need to poll every 60s or so
2463 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2464 2831
2465 if (w->wd >= 0) 2832 if (w->wd >= 0)
2833 {
2466 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2834 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2835
2836 /* now local changes will be tracked by inotify, but remote changes won't */
2837 /* unless the filesystem it known to be local, we therefore still poll */
2838 /* also do poll on <2.6.25, but with normal frequency */
2839 struct statfs sfs;
2840
2841 if (fs_2625 && !statfs (w->path, &sfs))
2842 if (sfs.f_type == 0x1373 /* devfs */
2843 || sfs.f_type == 0xEF53 /* ext2/3 */
2844 || sfs.f_type == 0x3153464a /* jfs */
2845 || sfs.f_type == 0x52654973 /* reiser3 */
2846 || sfs.f_type == 0x01021994 /* tempfs */
2847 || sfs.f_type == 0x58465342 /* xfs */)
2848 return;
2849
2850 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2851 ev_timer_again (EV_A_ &w->timer);
2852 }
2467} 2853}
2468 2854
2469static void noinline 2855static void noinline
2470infy_del (EV_P_ ev_stat *w) 2856infy_del (EV_P_ ev_stat *w)
2471{ 2857{
… …
2501 2887
2502 if (w->wd == wd || wd == -1) 2888 if (w->wd == wd || wd == -1)
2503 { 2889 {
2504 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2890 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2505 { 2891 {
2892 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2506 w->wd = -1; 2893 w->wd = -1;
2507 infy_add (EV_A_ w); /* re-add, no matter what */ 2894 infy_add (EV_A_ w); /* re-add, no matter what */
2508 } 2895 }
2509 2896
2510 stat_timer_cb (EV_A_ &w->timer, 0); 2897 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2523 2910
2524 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2911 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2525 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2912 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2526} 2913}
2527 2914
2528void inline_size 2915inline_size void
2529infy_init (EV_P) 2916check_2625 (EV_P)
2530{ 2917{
2531 if (fs_fd != -2)
2532 return;
2533
2534 /* kernels < 2.6.25 are borked 2918 /* kernels < 2.6.25 are borked
2535 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2919 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2536 */ 2920 */
2537 {
2538 struct utsname buf; 2921 struct utsname buf;
2539 int major, minor, micro; 2922 int major, minor, micro;
2540 2923
2541 fs_fd = -1;
2542
2543 if (uname (&buf)) 2924 if (uname (&buf))
2544 return; 2925 return;
2545 2926
2546 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3) 2927 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2547 return; 2928 return;
2548 2929
2549 if (major < 2 2930 if (major < 2
2550 || (major == 2 && minor < 6) 2931 || (major == 2 && minor < 6)
2551 || (major == 2 && minor == 6 && micro < 25)) 2932 || (major == 2 && minor == 6 && micro < 25))
2552 return; 2933 return;
2553 } 2934
2935 fs_2625 = 1;
2936}
2937
2938inline_size void
2939infy_init (EV_P)
2940{
2941 if (fs_fd != -2)
2942 return;
2943
2944 fs_fd = -1;
2945
2946 check_2625 (EV_A);
2554 2947
2555 fs_fd = inotify_init (); 2948 fs_fd = inotify_init ();
2556 2949
2557 if (fs_fd >= 0) 2950 if (fs_fd >= 0)
2558 { 2951 {
… …
2560 ev_set_priority (&fs_w, EV_MAXPRI); 2953 ev_set_priority (&fs_w, EV_MAXPRI);
2561 ev_io_start (EV_A_ &fs_w); 2954 ev_io_start (EV_A_ &fs_w);
2562 } 2955 }
2563} 2956}
2564 2957
2565void inline_size 2958inline_size void
2566infy_fork (EV_P) 2959infy_fork (EV_P)
2567{ 2960{
2568 int slot; 2961 int slot;
2569 2962
2570 if (fs_fd < 0) 2963 if (fs_fd < 0)
… …
2586 w->wd = -1; 2979 w->wd = -1;
2587 2980
2588 if (fs_fd >= 0) 2981 if (fs_fd >= 0)
2589 infy_add (EV_A_ w); /* re-add, no matter what */ 2982 infy_add (EV_A_ w); /* re-add, no matter what */
2590 else 2983 else
2591 ev_timer_start (EV_A_ &w->timer); 2984 ev_timer_again (EV_A_ &w->timer);
2592 } 2985 }
2593 } 2986 }
2594} 2987}
2595 2988
2596#endif 2989#endif
… …
2651ev_stat_start (EV_P_ ev_stat *w) 3044ev_stat_start (EV_P_ ev_stat *w)
2652{ 3045{
2653 if (expect_false (ev_is_active (w))) 3046 if (expect_false (ev_is_active (w)))
2654 return; 3047 return;
2655 3048
2656 /* since we use memcmp, we need to clear any padding data etc. */
2657 memset (&w->prev, 0, sizeof (ev_statdata));
2658 memset (&w->attr, 0, sizeof (ev_statdata));
2659
2660 ev_stat_stat (EV_A_ w); 3049 ev_stat_stat (EV_A_ w);
2661 3050
3051 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2662 if (w->interval < MIN_STAT_INTERVAL) 3052 w->interval = MIN_STAT_INTERVAL;
2663 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2664 3053
2665 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3054 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2666 ev_set_priority (&w->timer, ev_priority (w)); 3055 ev_set_priority (&w->timer, ev_priority (w));
2667 3056
2668#if EV_USE_INOTIFY 3057#if EV_USE_INOTIFY
2669 infy_init (EV_A); 3058 infy_init (EV_A);
2670 3059
2671 if (fs_fd >= 0) 3060 if (fs_fd >= 0)
2672 infy_add (EV_A_ w); 3061 infy_add (EV_A_ w);
2673 else 3062 else
2674#endif 3063#endif
2675 ev_timer_start (EV_A_ &w->timer); 3064 ev_timer_again (EV_A_ &w->timer);
2676 3065
2677 ev_start (EV_A_ (W)w, 1); 3066 ev_start (EV_A_ (W)w, 1);
2678 3067
2679 EV_FREQUENT_CHECK; 3068 EV_FREQUENT_CHECK;
2680} 3069}
… …
2855static void 3244static void
2856embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3245embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2857{ 3246{
2858 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3247 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2859 3248
3249 ev_embed_stop (EV_A_ w);
3250
2860 { 3251 {
2861 struct ev_loop *loop = w->other; 3252 struct ev_loop *loop = w->other;
2862 3253
2863 ev_loop_fork (EV_A); 3254 ev_loop_fork (EV_A);
3255 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2864 } 3256 }
3257
3258 ev_embed_start (EV_A_ w);
2865} 3259}
2866 3260
2867#if 0 3261#if 0
2868static void 3262static void
2869embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3263embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2878 if (expect_false (ev_is_active (w))) 3272 if (expect_false (ev_is_active (w)))
2879 return; 3273 return;
2880 3274
2881 { 3275 {
2882 struct ev_loop *loop = w->other; 3276 struct ev_loop *loop = w->other;
2883 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3277 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2884 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3278 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2885 } 3279 }
2886 3280
2887 EV_FREQUENT_CHECK; 3281 EV_FREQUENT_CHECK;
2888 3282
… …
3071 ev_timer_set (&once->to, timeout, 0.); 3465 ev_timer_set (&once->to, timeout, 0.);
3072 ev_timer_start (EV_A_ &once->to); 3466 ev_timer_start (EV_A_ &once->to);
3073 } 3467 }
3074} 3468}
3075 3469
3470/*****************************************************************************/
3471
3472#if EV_WALK_ENABLE
3473void
3474ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3475{
3476 int i, j;
3477 ev_watcher_list *wl, *wn;
3478
3479 if (types & (EV_IO | EV_EMBED))
3480 for (i = 0; i < anfdmax; ++i)
3481 for (wl = anfds [i].head; wl; )
3482 {
3483 wn = wl->next;
3484
3485#if EV_EMBED_ENABLE
3486 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3487 {
3488 if (types & EV_EMBED)
3489 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3490 }
3491 else
3492#endif
3493#if EV_USE_INOTIFY
3494 if (ev_cb ((ev_io *)wl) == infy_cb)
3495 ;
3496 else
3497#endif
3498 if ((ev_io *)wl != &pipe_w)
3499 if (types & EV_IO)
3500 cb (EV_A_ EV_IO, wl);
3501
3502 wl = wn;
3503 }
3504
3505 if (types & (EV_TIMER | EV_STAT))
3506 for (i = timercnt + HEAP0; i-- > HEAP0; )
3507#if EV_STAT_ENABLE
3508 /*TODO: timer is not always active*/
3509 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3510 {
3511 if (types & EV_STAT)
3512 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3513 }
3514 else
3515#endif
3516 if (types & EV_TIMER)
3517 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3518
3519#if EV_PERIODIC_ENABLE
3520 if (types & EV_PERIODIC)
3521 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3522 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3523#endif
3524
3525#if EV_IDLE_ENABLE
3526 if (types & EV_IDLE)
3527 for (j = NUMPRI; i--; )
3528 for (i = idlecnt [j]; i--; )
3529 cb (EV_A_ EV_IDLE, idles [j][i]);
3530#endif
3531
3532#if EV_FORK_ENABLE
3533 if (types & EV_FORK)
3534 for (i = forkcnt; i--; )
3535 if (ev_cb (forks [i]) != embed_fork_cb)
3536 cb (EV_A_ EV_FORK, forks [i]);
3537#endif
3538
3539#if EV_ASYNC_ENABLE
3540 if (types & EV_ASYNC)
3541 for (i = asynccnt; i--; )
3542 cb (EV_A_ EV_ASYNC, asyncs [i]);
3543#endif
3544
3545 if (types & EV_PREPARE)
3546 for (i = preparecnt; i--; )
3547#if EV_EMBED_ENABLE
3548 if (ev_cb (prepares [i]) != embed_prepare_cb)
3549#endif
3550 cb (EV_A_ EV_PREPARE, prepares [i]);
3551
3552 if (types & EV_CHECK)
3553 for (i = checkcnt; i--; )
3554 cb (EV_A_ EV_CHECK, checks [i]);
3555
3556 if (types & EV_SIGNAL)
3557 for (i = 0; i < signalmax; ++i)
3558 for (wl = signals [i].head; wl; )
3559 {
3560 wn = wl->next;
3561 cb (EV_A_ EV_SIGNAL, wl);
3562 wl = wn;
3563 }
3564
3565 if (types & EV_CHILD)
3566 for (i = EV_PID_HASHSIZE; i--; )
3567 for (wl = childs [i]; wl; )
3568 {
3569 wn = wl->next;
3570 cb (EV_A_ EV_CHILD, wl);
3571 wl = wn;
3572 }
3573/* EV_STAT 0x00001000 /* stat data changed */
3574/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3575}
3576#endif
3577
3076#if EV_MULTIPLICITY 3578#if EV_MULTIPLICITY
3077 #include "ev_wrap.h" 3579 #include "ev_wrap.h"
3078#endif 3580#endif
3079 3581
3080#ifdef __cplusplus 3582#ifdef __cplusplus

Diff Legend

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