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

Comparing libev/ev.c (file contents):
Revision 1.257 by root, Sun Jun 29 22:32:51 2008 UTC vs.
Revision 1.305 by root, Sun Jul 19 03:49:04 2009 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
64# endif
65
52# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
55# endif 69# endif
56# ifndef EV_USE_REALTIME 70# ifndef EV_USE_REALTIME
57# define EV_USE_REALTIME 1 71# define EV_USE_REALTIME 0
58# endif 72# endif
59# else 73# else
60# ifndef EV_USE_MONOTONIC 74# ifndef EV_USE_MONOTONIC
61# define EV_USE_MONOTONIC 0 75# define EV_USE_MONOTONIC 0
62# endif 76# endif
… …
119# else 133# else
120# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
121# endif 135# endif
122# endif 136# endif
123 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
124# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD 147# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
127# else 149# else
128# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
… …
164# endif 186# endif
165#endif 187#endif
166 188
167/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
168 190
191/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG)
193/* use what's provided */
194#elif defined (NSIG)
195# define EV_NSIG (NSIG)
196#elif defined(_NSIG)
197# define EV_NSIG (_NSIG)
198#elif defined (SIGMAX)
199# define EV_NSIG (SIGMAX+1)
200#elif defined (SIG_MAX)
201# define EV_NSIG (SIG_MAX+1)
202#elif defined (_SIG_MAX)
203# define EV_NSIG (_SIG_MAX+1)
204#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else
213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 64
216#endif
217
218/* Default to some arbitrary number that's big enough to get most
219 of the common signals.
220*/
221#ifndef NSIG
222# define NSIG 50
223#endif
224/* <-- NSIG logic from Configure */
225#ifndef EV_USE_CLOCK_SYSCALL
226# if __linux && __GLIBC__ >= 2
227# define EV_USE_CLOCK_SYSCALL 1
228# else
229# define EV_USE_CLOCK_SYSCALL 0
230# endif
231#endif
232
169#ifndef EV_USE_MONOTONIC 233#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 234# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 235# define EV_USE_MONOTONIC 1
172# else 236# else
173# define EV_USE_MONOTONIC 0 237# define EV_USE_MONOTONIC 0
174# endif 238# endif
175#endif 239#endif
176 240
177#ifndef EV_USE_REALTIME 241#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 242# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 243#endif
180 244
181#ifndef EV_USE_NANOSLEEP 245#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 246# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 247# define EV_USE_NANOSLEEP 1
… …
244# else 308# else
245# define EV_USE_EVENTFD 0 309# define EV_USE_EVENTFD 0
246# endif 310# endif
247#endif 311#endif
248 312
313#ifndef EV_USE_SIGNALFD
314# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))
315# define EV_USE_SIGNALFD 1
316# else
317# define EV_USE_SIGNALFD 0
318# endif
319#endif
320
249#if 0 /* debugging */ 321#if 0 /* debugging */
250# define EV_VERIFY 3 322# define EV_VERIFY 3
251# define EV_USE_4HEAP 1 323# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1 324# define EV_HEAP_CACHE_AT 1
253#endif 325#endif
… …
262 334
263#ifndef EV_HEAP_CACHE_AT 335#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL 336# define EV_HEAP_CACHE_AT !EV_MINIMAL
265#endif 337#endif
266 338
339/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
340/* which makes programs even slower. might work on other unices, too. */
341#if EV_USE_CLOCK_SYSCALL
342# include <syscall.h>
343# ifdef SYS_clock_gettime
344# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
345# undef EV_USE_MONOTONIC
346# define EV_USE_MONOTONIC 1
347# else
348# undef EV_USE_CLOCK_SYSCALL
349# define EV_USE_CLOCK_SYSCALL 0
350# endif
351#endif
352
267/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 353/* this block fixes any misconfiguration where we know we run into trouble otherwise */
268 354
269#ifndef CLOCK_MONOTONIC 355#ifndef CLOCK_MONOTONIC
270# undef EV_USE_MONOTONIC 356# undef EV_USE_MONOTONIC
271# define EV_USE_MONOTONIC 0 357# define EV_USE_MONOTONIC 0
… …
286# include <sys/select.h> 372# include <sys/select.h>
287# endif 373# endif
288#endif 374#endif
289 375
290#if EV_USE_INOTIFY 376#if EV_USE_INOTIFY
377# include <sys/utsname.h>
378# include <sys/statfs.h>
291# include <sys/inotify.h> 379# include <sys/inotify.h>
380/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
381# ifndef IN_DONT_FOLLOW
382# undef EV_USE_INOTIFY
383# define EV_USE_INOTIFY 0
384# endif
292#endif 385#endif
293 386
294#if EV_SELECT_IS_WINSOCKET 387#if EV_SELECT_IS_WINSOCKET
295# include <winsock.h> 388# include <winsock.h>
296#endif 389#endif
297 390
298#if EV_USE_EVENTFD 391#if EV_USE_EVENTFD
299/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 392/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
300# include <stdint.h> 393# include <stdint.h>
394# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK
396# endif
397# ifndef EFD_CLOEXEC
398# define EFD_CLOEXEC O_CLOEXEC
399# endif
301# ifdef __cplusplus 400# ifdef __cplusplus
302extern "C" { 401extern "C" {
303# endif 402# endif
304int eventfd (unsigned int initval, int flags); 403int eventfd (unsigned int initval, int flags);
305# ifdef __cplusplus 404# ifdef __cplusplus
306} 405}
307# endif 406# endif
407#endif
408
409#if EV_USE_SIGNALFD
410# include <sys/signalfd.h>
308#endif 411#endif
309 412
310/**/ 413/**/
311 414
312#if EV_VERIFY >= 3 415#if EV_VERIFY >= 3
… …
348# define inline_speed static noinline 451# define inline_speed static noinline
349#else 452#else
350# define inline_speed static inline 453# define inline_speed static inline
351#endif 454#endif
352 455
353#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 456#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
457
458#if EV_MINPRI == EV_MAXPRI
459# define ABSPRI(w) (((W)w), 0)
460#else
354#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 461# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
462#endif
355 463
356#define EMPTY /* required for microsofts broken pseudo-c compiler */ 464#define EMPTY /* required for microsofts broken pseudo-c compiler */
357#define EMPTY2(a,b) /* used to suppress some warnings */ 465#define EMPTY2(a,b) /* used to suppress some warnings */
358 466
359typedef ev_watcher *W; 467typedef ev_watcher *W;
… …
361typedef ev_watcher_time *WT; 469typedef ev_watcher_time *WT;
362 470
363#define ev_active(w) ((W)(w))->active 471#define ev_active(w) ((W)(w))->active
364#define ev_at(w) ((WT)(w))->at 472#define ev_at(w) ((WT)(w))->at
365 473
366#if EV_USE_MONOTONIC 474#if EV_USE_REALTIME
367/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 475/* sig_atomic_t is used to avoid per-thread variables or locking but still */
368/* giving it a reasonably high chance of working on typical architetcures */ 476/* giving it a reasonably high chance of working on typical architetcures */
477static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
478#endif
479
480#if EV_USE_MONOTONIC
369static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 481static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
370#endif 482#endif
371 483
372#ifdef _WIN32 484#ifdef _WIN32
373# include "ev_win32.c" 485# include "ev_win32.c"
… …
382{ 494{
383 syserr_cb = cb; 495 syserr_cb = cb;
384} 496}
385 497
386static void noinline 498static void noinline
387syserr (const char *msg) 499ev_syserr (const char *msg)
388{ 500{
389 if (!msg) 501 if (!msg)
390 msg = "(libev) system error"; 502 msg = "(libev) system error";
391 503
392 if (syserr_cb) 504 if (syserr_cb)
… …
438#define ev_malloc(size) ev_realloc (0, (size)) 550#define ev_malloc(size) ev_realloc (0, (size))
439#define ev_free(ptr) ev_realloc ((ptr), 0) 551#define ev_free(ptr) ev_realloc ((ptr), 0)
440 552
441/*****************************************************************************/ 553/*****************************************************************************/
442 554
555/* set in reify when reification needed */
556#define EV_ANFD_REIFY 1
557
558/* file descriptor info structure */
443typedef struct 559typedef struct
444{ 560{
445 WL head; 561 WL head;
446 unsigned char events; 562 unsigned char events; /* the events watched for */
563 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
564 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
447 unsigned char reify; 565 unsigned char unused;
566#if EV_USE_EPOLL
567 unsigned int egen; /* generation counter to counter epoll bugs */
568#endif
448#if EV_SELECT_IS_WINSOCKET 569#if EV_SELECT_IS_WINSOCKET
449 SOCKET handle; 570 SOCKET handle;
450#endif 571#endif
451} ANFD; 572} ANFD;
452 573
574/* stores the pending event set for a given watcher */
453typedef struct 575typedef struct
454{ 576{
455 W w; 577 W w;
456 int events; 578 int events; /* the pending event set for the given watcher */
457} ANPENDING; 579} ANPENDING;
458 580
459#if EV_USE_INOTIFY 581#if EV_USE_INOTIFY
460/* hash table entry per inotify-id */ 582/* hash table entry per inotify-id */
461typedef struct 583typedef struct
… …
464} ANFS; 586} ANFS;
465#endif 587#endif
466 588
467/* Heap Entry */ 589/* Heap Entry */
468#if EV_HEAP_CACHE_AT 590#if EV_HEAP_CACHE_AT
591 /* a heap element */
469 typedef struct { 592 typedef struct {
470 ev_tstamp at; 593 ev_tstamp at;
471 WT w; 594 WT w;
472 } ANHE; 595 } ANHE;
473 596
474 #define ANHE_w(he) (he).w /* access watcher, read-write */ 597 #define ANHE_w(he) (he).w /* access watcher, read-write */
475 #define ANHE_at(he) (he).at /* access cached at, read-only */ 598 #define ANHE_at(he) (he).at /* access cached at, read-only */
476 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 599 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
477#else 600#else
601 /* a heap element */
478 typedef WT ANHE; 602 typedef WT ANHE;
479 603
480 #define ANHE_w(he) (he) 604 #define ANHE_w(he) (he)
481 #define ANHE_at(he) (he)->at 605 #define ANHE_at(he) (he)->at
482 #define ANHE_at_cache(he) 606 #define ANHE_at_cache(he)
… …
506 630
507 static int ev_default_loop_ptr; 631 static int ev_default_loop_ptr;
508 632
509#endif 633#endif
510 634
635#if EV_MINIMAL < 2
636# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
637# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
638# define EV_INVOKE_PENDING invoke_cb (EV_A)
639#else
640# define EV_RELEASE_CB (void)0
641# define EV_ACQUIRE_CB (void)0
642# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
643#endif
644
645#define EVUNLOOP_RECURSE 0x80
646
511/*****************************************************************************/ 647/*****************************************************************************/
512 648
649#ifndef EV_HAVE_EV_TIME
513ev_tstamp 650ev_tstamp
514ev_time (void) 651ev_time (void)
515{ 652{
516#if EV_USE_REALTIME 653#if EV_USE_REALTIME
654 if (expect_true (have_realtime))
655 {
517 struct timespec ts; 656 struct timespec ts;
518 clock_gettime (CLOCK_REALTIME, &ts); 657 clock_gettime (CLOCK_REALTIME, &ts);
519 return ts.tv_sec + ts.tv_nsec * 1e-9; 658 return ts.tv_sec + ts.tv_nsec * 1e-9;
520#else 659 }
660#endif
661
521 struct timeval tv; 662 struct timeval tv;
522 gettimeofday (&tv, 0); 663 gettimeofday (&tv, 0);
523 return tv.tv_sec + tv.tv_usec * 1e-6; 664 return tv.tv_sec + tv.tv_usec * 1e-6;
524#endif
525} 665}
666#endif
526 667
527ev_tstamp inline_size 668inline_size ev_tstamp
528get_clock (void) 669get_clock (void)
529{ 670{
530#if EV_USE_MONOTONIC 671#if EV_USE_MONOTONIC
531 if (expect_true (have_monotonic)) 672 if (expect_true (have_monotonic))
532 { 673 {
… …
566 707
567 tv.tv_sec = (time_t)delay; 708 tv.tv_sec = (time_t)delay;
568 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 709 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
569 710
570 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 711 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
571 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 712 /* something not guaranteed by newer posix versions, but guaranteed */
572 /* by older ones */ 713 /* by older ones */
573 select (0, 0, 0, 0, &tv); 714 select (0, 0, 0, 0, &tv);
574#endif 715#endif
575 } 716 }
576} 717}
577 718
578/*****************************************************************************/ 719/*****************************************************************************/
579 720
580#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 721#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
581 722
582int inline_size 723/* find a suitable new size for the given array, */
724/* hopefully by rounding to a ncie-to-malloc size */
725inline_size int
583array_nextsize (int elem, int cur, int cnt) 726array_nextsize (int elem, int cur, int cnt)
584{ 727{
585 int ncur = cur + 1; 728 int ncur = cur + 1;
586 729
587 do 730 do
… …
604array_realloc (int elem, void *base, int *cur, int cnt) 747array_realloc (int elem, void *base, int *cur, int cnt)
605{ 748{
606 *cur = array_nextsize (elem, *cur, cnt); 749 *cur = array_nextsize (elem, *cur, cnt);
607 return ev_realloc (base, elem * *cur); 750 return ev_realloc (base, elem * *cur);
608} 751}
752
753#define array_init_zero(base,count) \
754 memset ((void *)(base), 0, sizeof (*(base)) * (count))
609 755
610#define array_needsize(type,base,cur,cnt,init) \ 756#define array_needsize(type,base,cur,cnt,init) \
611 if (expect_false ((cnt) > (cur))) \ 757 if (expect_false ((cnt) > (cur))) \
612 { \ 758 { \
613 int ocur_ = (cur); \ 759 int ocur_ = (cur); \
… …
625 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 771 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
626 } 772 }
627#endif 773#endif
628 774
629#define array_free(stem, idx) \ 775#define array_free(stem, idx) \
630 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 776 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
631 777
632/*****************************************************************************/ 778/*****************************************************************************/
779
780/* dummy callback for pending events */
781static void noinline
782pendingcb (EV_P_ ev_prepare *w, int revents)
783{
784}
633 785
634void noinline 786void noinline
635ev_feed_event (EV_P_ void *w, int revents) 787ev_feed_event (EV_P_ void *w, int revents)
636{ 788{
637 W w_ = (W)w; 789 W w_ = (W)w;
… …
646 pendings [pri][w_->pending - 1].w = w_; 798 pendings [pri][w_->pending - 1].w = w_;
647 pendings [pri][w_->pending - 1].events = revents; 799 pendings [pri][w_->pending - 1].events = revents;
648 } 800 }
649} 801}
650 802
651void inline_speed 803inline_speed void
804feed_reverse (EV_P_ W w)
805{
806 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
807 rfeeds [rfeedcnt++] = w;
808}
809
810inline_size void
811feed_reverse_done (EV_P_ int revents)
812{
813 do
814 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
815 while (rfeedcnt);
816}
817
818inline_speed void
652queue_events (EV_P_ W *events, int eventcnt, int type) 819queue_events (EV_P_ W *events, int eventcnt, int type)
653{ 820{
654 int i; 821 int i;
655 822
656 for (i = 0; i < eventcnt; ++i) 823 for (i = 0; i < eventcnt; ++i)
657 ev_feed_event (EV_A_ events [i], type); 824 ev_feed_event (EV_A_ events [i], type);
658} 825}
659 826
660/*****************************************************************************/ 827/*****************************************************************************/
661 828
662void inline_size 829inline_speed void
663anfds_init (ANFD *base, int count)
664{
665 while (count--)
666 {
667 base->head = 0;
668 base->events = EV_NONE;
669 base->reify = 0;
670
671 ++base;
672 }
673}
674
675void inline_speed
676fd_event (EV_P_ int fd, int revents) 830fd_event_nc (EV_P_ int fd, int revents)
677{ 831{
678 ANFD *anfd = anfds + fd; 832 ANFD *anfd = anfds + fd;
679 ev_io *w; 833 ev_io *w;
680 834
681 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 835 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
685 if (ev) 839 if (ev)
686 ev_feed_event (EV_A_ (W)w, ev); 840 ev_feed_event (EV_A_ (W)w, ev);
687 } 841 }
688} 842}
689 843
844/* do not submit kernel events for fds that have reify set */
845/* because that means they changed while we were polling for new events */
846inline_speed void
847fd_event (EV_P_ int fd, int revents)
848{
849 ANFD *anfd = anfds + fd;
850
851 if (expect_true (!anfd->reify))
852 fd_event_nc (EV_A_ fd, revents);
853}
854
690void 855void
691ev_feed_fd_event (EV_P_ int fd, int revents) 856ev_feed_fd_event (EV_P_ int fd, int revents)
692{ 857{
693 if (fd >= 0 && fd < anfdmax) 858 if (fd >= 0 && fd < anfdmax)
694 fd_event (EV_A_ fd, revents); 859 fd_event_nc (EV_A_ fd, revents);
695} 860}
696 861
697void inline_size 862/* make sure the external fd watch events are in-sync */
863/* with the kernel/libev internal state */
864inline_size void
698fd_reify (EV_P) 865fd_reify (EV_P)
699{ 866{
700 int i; 867 int i;
701 868
702 for (i = 0; i < fdchangecnt; ++i) 869 for (i = 0; i < fdchangecnt; ++i)
… …
717 #ifdef EV_FD_TO_WIN32_HANDLE 884 #ifdef EV_FD_TO_WIN32_HANDLE
718 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 885 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
719 #else 886 #else
720 anfd->handle = _get_osfhandle (fd); 887 anfd->handle = _get_osfhandle (fd);
721 #endif 888 #endif
722 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 889 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
723 } 890 }
724#endif 891#endif
725 892
726 { 893 {
727 unsigned char o_events = anfd->events; 894 unsigned char o_events = anfd->events;
728 unsigned char o_reify = anfd->reify; 895 unsigned char o_reify = anfd->reify;
729 896
730 anfd->reify = 0; 897 anfd->reify = 0;
731 anfd->events = events; 898 anfd->events = events;
732 899
733 if (o_events != events || o_reify & EV_IOFDSET) 900 if (o_events != events || o_reify & EV__IOFDSET)
734 backend_modify (EV_A_ fd, o_events, events); 901 backend_modify (EV_A_ fd, o_events, events);
735 } 902 }
736 } 903 }
737 904
738 fdchangecnt = 0; 905 fdchangecnt = 0;
739} 906}
740 907
741void inline_size 908/* something about the given fd changed */
909inline_size void
742fd_change (EV_P_ int fd, int flags) 910fd_change (EV_P_ int fd, int flags)
743{ 911{
744 unsigned char reify = anfds [fd].reify; 912 unsigned char reify = anfds [fd].reify;
745 anfds [fd].reify |= flags; 913 anfds [fd].reify |= flags;
746 914
… …
750 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 918 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
751 fdchanges [fdchangecnt - 1] = fd; 919 fdchanges [fdchangecnt - 1] = fd;
752 } 920 }
753} 921}
754 922
755void inline_speed 923/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
924inline_speed void
756fd_kill (EV_P_ int fd) 925fd_kill (EV_P_ int fd)
757{ 926{
758 ev_io *w; 927 ev_io *w;
759 928
760 while ((w = (ev_io *)anfds [fd].head)) 929 while ((w = (ev_io *)anfds [fd].head))
… …
762 ev_io_stop (EV_A_ w); 931 ev_io_stop (EV_A_ w);
763 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 932 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
764 } 933 }
765} 934}
766 935
767int inline_size 936/* check whether the given fd is atcually valid, for error recovery */
937inline_size int
768fd_valid (int fd) 938fd_valid (int fd)
769{ 939{
770#ifdef _WIN32 940#ifdef _WIN32
771 return _get_osfhandle (fd) != -1; 941 return _get_osfhandle (fd) != -1;
772#else 942#else
… …
808 978
809 for (fd = 0; fd < anfdmax; ++fd) 979 for (fd = 0; fd < anfdmax; ++fd)
810 if (anfds [fd].events) 980 if (anfds [fd].events)
811 { 981 {
812 anfds [fd].events = 0; 982 anfds [fd].events = 0;
983 anfds [fd].emask = 0;
813 fd_change (EV_A_ fd, EV_IOFDSET | 1); 984 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
814 } 985 }
815} 986}
816 987
817/*****************************************************************************/ 988/*****************************************************************************/
818 989
… …
834#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1005#define HEAP0 (DHEAP - 1) /* index of first element in heap */
835#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1006#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
836#define UPHEAP_DONE(p,k) ((p) == (k)) 1007#define UPHEAP_DONE(p,k) ((p) == (k))
837 1008
838/* away from the root */ 1009/* away from the root */
839void inline_speed 1010inline_speed void
840downheap (ANHE *heap, int N, int k) 1011downheap (ANHE *heap, int N, int k)
841{ 1012{
842 ANHE he = heap [k]; 1013 ANHE he = heap [k];
843 ANHE *E = heap + N + HEAP0; 1014 ANHE *E = heap + N + HEAP0;
844 1015
… …
884#define HEAP0 1 1055#define HEAP0 1
885#define HPARENT(k) ((k) >> 1) 1056#define HPARENT(k) ((k) >> 1)
886#define UPHEAP_DONE(p,k) (!(p)) 1057#define UPHEAP_DONE(p,k) (!(p))
887 1058
888/* away from the root */ 1059/* away from the root */
889void inline_speed 1060inline_speed void
890downheap (ANHE *heap, int N, int k) 1061downheap (ANHE *heap, int N, int k)
891{ 1062{
892 ANHE he = heap [k]; 1063 ANHE he = heap [k];
893 1064
894 for (;;) 1065 for (;;)
… …
914 ev_active (ANHE_w (he)) = k; 1085 ev_active (ANHE_w (he)) = k;
915} 1086}
916#endif 1087#endif
917 1088
918/* towards the root */ 1089/* towards the root */
919void inline_speed 1090inline_speed void
920upheap (ANHE *heap, int k) 1091upheap (ANHE *heap, int k)
921{ 1092{
922 ANHE he = heap [k]; 1093 ANHE he = heap [k];
923 1094
924 for (;;) 1095 for (;;)
… …
935 1106
936 heap [k] = he; 1107 heap [k] = he;
937 ev_active (ANHE_w (he)) = k; 1108 ev_active (ANHE_w (he)) = k;
938} 1109}
939 1110
940void inline_size 1111/* move an element suitably so it is in a correct place */
1112inline_size void
941adjustheap (ANHE *heap, int N, int k) 1113adjustheap (ANHE *heap, int N, int k)
942{ 1114{
943 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1115 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
944 upheap (heap, k); 1116 upheap (heap, k);
945 else 1117 else
946 downheap (heap, N, k); 1118 downheap (heap, N, k);
947} 1119}
948 1120
949/* rebuild the heap: this function is used only once and executed rarely */ 1121/* rebuild the heap: this function is used only once and executed rarely */
950void inline_size 1122inline_size void
951reheap (ANHE *heap, int N) 1123reheap (ANHE *heap, int N)
952{ 1124{
953 int i; 1125 int i;
954 1126
955 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1127 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
958 upheap (heap, i + HEAP0); 1130 upheap (heap, i + HEAP0);
959} 1131}
960 1132
961/*****************************************************************************/ 1133/*****************************************************************************/
962 1134
1135/* associate signal watchers to a signal signal */
963typedef struct 1136typedef struct
964{ 1137{
965 WL head; 1138 WL head;
966 EV_ATOMIC_T gotsig; 1139 EV_ATOMIC_T gotsig;
967} ANSIG; 1140} ANSIG;
… …
969static ANSIG *signals; 1142static ANSIG *signals;
970static int signalmax; 1143static int signalmax;
971 1144
972static EV_ATOMIC_T gotsig; 1145static EV_ATOMIC_T gotsig;
973 1146
974void inline_size
975signals_init (ANSIG *base, int count)
976{
977 while (count--)
978 {
979 base->head = 0;
980 base->gotsig = 0;
981
982 ++base;
983 }
984}
985
986/*****************************************************************************/ 1147/*****************************************************************************/
987 1148
988void inline_speed 1149/* used to prepare libev internal fd's */
1150/* this is not fork-safe */
1151inline_speed void
989fd_intern (int fd) 1152fd_intern (int fd)
990{ 1153{
991#ifdef _WIN32 1154#ifdef _WIN32
992 unsigned long arg = 1; 1155 unsigned long arg = 1;
993 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1156 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
998} 1161}
999 1162
1000static void noinline 1163static void noinline
1001evpipe_init (EV_P) 1164evpipe_init (EV_P)
1002{ 1165{
1003 if (!ev_is_active (&pipeev)) 1166 if (!ev_is_active (&pipe_w))
1004 { 1167 {
1005#if EV_USE_EVENTFD 1168#if EV_USE_EVENTFD
1169 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1170 if (evfd < 0 && errno == EINVAL)
1006 if ((evfd = eventfd (0, 0)) >= 0) 1171 evfd = eventfd (0, 0);
1172
1173 if (evfd >= 0)
1007 { 1174 {
1008 evpipe [0] = -1; 1175 evpipe [0] = -1;
1009 fd_intern (evfd); 1176 fd_intern (evfd); /* doing it twice doesn't hurt */
1010 ev_io_set (&pipeev, evfd, EV_READ); 1177 ev_io_set (&pipe_w, evfd, EV_READ);
1011 } 1178 }
1012 else 1179 else
1013#endif 1180#endif
1014 { 1181 {
1015 while (pipe (evpipe)) 1182 while (pipe (evpipe))
1016 syserr ("(libev) error creating signal/async pipe"); 1183 ev_syserr ("(libev) error creating signal/async pipe");
1017 1184
1018 fd_intern (evpipe [0]); 1185 fd_intern (evpipe [0]);
1019 fd_intern (evpipe [1]); 1186 fd_intern (evpipe [1]);
1020 ev_io_set (&pipeev, evpipe [0], EV_READ); 1187 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1021 } 1188 }
1022 1189
1023 ev_io_start (EV_A_ &pipeev); 1190 ev_io_start (EV_A_ &pipe_w);
1024 ev_unref (EV_A); /* watcher should not keep loop alive */ 1191 ev_unref (EV_A); /* watcher should not keep loop alive */
1025 } 1192 }
1026} 1193}
1027 1194
1028void inline_size 1195inline_size void
1029evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1196evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1030{ 1197{
1031 if (!*flag) 1198 if (!*flag)
1032 { 1199 {
1033 int old_errno = errno; /* save errno because write might clobber it */ 1200 int old_errno = errno; /* save errno because write might clobber it */
… …
1046 1213
1047 errno = old_errno; 1214 errno = old_errno;
1048 } 1215 }
1049} 1216}
1050 1217
1218/* called whenever the libev signal pipe */
1219/* got some events (signal, async) */
1051static void 1220static void
1052pipecb (EV_P_ ev_io *iow, int revents) 1221pipecb (EV_P_ ev_io *iow, int revents)
1053{ 1222{
1054#if EV_USE_EVENTFD 1223#if EV_USE_EVENTFD
1055 if (evfd >= 0) 1224 if (evfd >= 0)
… …
1111ev_feed_signal_event (EV_P_ int signum) 1280ev_feed_signal_event (EV_P_ int signum)
1112{ 1281{
1113 WL w; 1282 WL w;
1114 1283
1115#if EV_MULTIPLICITY 1284#if EV_MULTIPLICITY
1116 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1285 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1117#endif 1286#endif
1118 1287
1119 --signum; 1288 --signum;
1120 1289
1121 if (signum < 0 || signum >= signalmax) 1290 if (signum < 0 || signum >= signalmax)
… …
1125 1294
1126 for (w = signals [signum].head; w; w = w->next) 1295 for (w = signals [signum].head; w; w = w->next)
1127 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1296 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1128} 1297}
1129 1298
1299#if EV_USE_SIGNALFD
1300static void
1301sigfdcb (EV_P_ ev_io *iow, int revents)
1302{
1303 struct signalfd_siginfo si[4], *sip;
1304
1305 for (;;)
1306 {
1307 ssize_t res = read (sigfd, si, sizeof (si));
1308
1309 /* not ISO-C, as res might be -1, but works with SuS */
1310 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1311 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1312
1313 if (res < (ssize_t)sizeof (si))
1314 break;
1315 }
1316}
1317#endif
1318
1130/*****************************************************************************/ 1319/*****************************************************************************/
1131 1320
1132static WL childs [EV_PID_HASHSIZE]; 1321static WL childs [EV_PID_HASHSIZE];
1133 1322
1134#ifndef _WIN32 1323#ifndef _WIN32
… …
1137 1326
1138#ifndef WIFCONTINUED 1327#ifndef WIFCONTINUED
1139# define WIFCONTINUED(status) 0 1328# define WIFCONTINUED(status) 0
1140#endif 1329#endif
1141 1330
1142void inline_speed 1331/* handle a single child status event */
1332inline_speed void
1143child_reap (EV_P_ int chain, int pid, int status) 1333child_reap (EV_P_ int chain, int pid, int status)
1144{ 1334{
1145 ev_child *w; 1335 ev_child *w;
1146 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1336 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1147 1337
… …
1160 1350
1161#ifndef WCONTINUED 1351#ifndef WCONTINUED
1162# define WCONTINUED 0 1352# define WCONTINUED 0
1163#endif 1353#endif
1164 1354
1355/* called on sigchld etc., calls waitpid */
1165static void 1356static void
1166childcb (EV_P_ ev_signal *sw, int revents) 1357childcb (EV_P_ ev_signal *sw, int revents)
1167{ 1358{
1168 int pid, status; 1359 int pid, status;
1169 1360
… …
1250 /* kqueue is borked on everything but netbsd apparently */ 1441 /* kqueue is borked on everything but netbsd apparently */
1251 /* it usually doesn't work correctly on anything but sockets and pipes */ 1442 /* it usually doesn't work correctly on anything but sockets and pipes */
1252 flags &= ~EVBACKEND_KQUEUE; 1443 flags &= ~EVBACKEND_KQUEUE;
1253#endif 1444#endif
1254#ifdef __APPLE__ 1445#ifdef __APPLE__
1255 // flags &= ~EVBACKEND_KQUEUE; for documentation 1446 /* only select works correctly on that "unix-certified" platform */
1256 flags &= ~EVBACKEND_POLL; 1447 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1448 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1257#endif 1449#endif
1258 1450
1259 return flags; 1451 return flags;
1260} 1452}
1261 1453
… …
1275ev_backend (EV_P) 1467ev_backend (EV_P)
1276{ 1468{
1277 return backend; 1469 return backend;
1278} 1470}
1279 1471
1472#if EV_MINIMAL < 2
1280unsigned int 1473unsigned int
1281ev_loop_count (EV_P) 1474ev_loop_count (EV_P)
1282{ 1475{
1283 return loop_count; 1476 return loop_count;
1284} 1477}
1285 1478
1479unsigned int
1480ev_loop_depth (EV_P)
1481{
1482 return loop_depth;
1483}
1484
1286void 1485void
1287ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1486ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1288{ 1487{
1289 io_blocktime = interval; 1488 io_blocktime = interval;
1290} 1489}
… …
1293ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1492ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1294{ 1493{
1295 timeout_blocktime = interval; 1494 timeout_blocktime = interval;
1296} 1495}
1297 1496
1497void
1498ev_set_userdata (EV_P_ void *data)
1499{
1500 userdata = data;
1501}
1502
1503void *
1504ev_userdata (EV_P)
1505{
1506 return userdata;
1507}
1508
1509void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1510{
1511 invoke_cb = invoke_pending_cb;
1512}
1513
1514void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1515{
1516 release_cb = release;
1517 acquire_cb = acquire;
1518}
1519#endif
1520
1521/* initialise a loop structure, must be zero-initialised */
1298static void noinline 1522static void noinline
1299loop_init (EV_P_ unsigned int flags) 1523loop_init (EV_P_ unsigned int flags)
1300{ 1524{
1301 if (!backend) 1525 if (!backend)
1302 { 1526 {
1527#if EV_USE_REALTIME
1528 if (!have_realtime)
1529 {
1530 struct timespec ts;
1531
1532 if (!clock_gettime (CLOCK_REALTIME, &ts))
1533 have_realtime = 1;
1534 }
1535#endif
1536
1303#if EV_USE_MONOTONIC 1537#if EV_USE_MONOTONIC
1538 if (!have_monotonic)
1304 { 1539 {
1305 struct timespec ts; 1540 struct timespec ts;
1541
1306 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1542 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1307 have_monotonic = 1; 1543 have_monotonic = 1;
1308 } 1544 }
1309#endif 1545#endif
1310 1546
1311 ev_rt_now = ev_time (); 1547 ev_rt_now = ev_time ();
1312 mn_now = get_clock (); 1548 mn_now = get_clock ();
1313 now_floor = mn_now; 1549 now_floor = mn_now;
1314 rtmn_diff = ev_rt_now - mn_now; 1550 rtmn_diff = ev_rt_now - mn_now;
1551#if EV_MINIMAL < 2
1552 invoke_cb = ev_invoke_pending;
1553#endif
1315 1554
1316 io_blocktime = 0.; 1555 io_blocktime = 0.;
1317 timeout_blocktime = 0.; 1556 timeout_blocktime = 0.;
1318 backend = 0; 1557 backend = 0;
1319 backend_fd = -1; 1558 backend_fd = -1;
1320 gotasync = 0; 1559 gotasync = 0;
1321#if EV_USE_INOTIFY 1560#if EV_USE_INOTIFY
1322 fs_fd = -2; 1561 fs_fd = -2;
1323#endif 1562#endif
1563#if EV_USE_SIGNALFD
1564 sigfd = -2;
1565#endif
1324 1566
1325 /* pid check not overridable via env */ 1567 /* pid check not overridable via env */
1326#ifndef _WIN32 1568#ifndef _WIN32
1327 if (flags & EVFLAG_FORKCHECK) 1569 if (flags & EVFLAG_FORKCHECK)
1328 curpid = getpid (); 1570 curpid = getpid ();
… …
1350#endif 1592#endif
1351#if EV_USE_SELECT 1593#if EV_USE_SELECT
1352 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1594 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1353#endif 1595#endif
1354 1596
1597 ev_prepare_init (&pending_w, pendingcb);
1598
1355 ev_init (&pipeev, pipecb); 1599 ev_init (&pipe_w, pipecb);
1356 ev_set_priority (&pipeev, EV_MAXPRI); 1600 ev_set_priority (&pipe_w, EV_MAXPRI);
1357 } 1601 }
1358} 1602}
1359 1603
1604/* free up a loop structure */
1360static void noinline 1605static void noinline
1361loop_destroy (EV_P) 1606loop_destroy (EV_P)
1362{ 1607{
1363 int i; 1608 int i;
1364 1609
1365 if (ev_is_active (&pipeev)) 1610 if (ev_is_active (&pipe_w))
1366 { 1611 {
1367 ev_ref (EV_A); /* signal watcher */ 1612 /*ev_ref (EV_A);*/
1368 ev_io_stop (EV_A_ &pipeev); 1613 /*ev_io_stop (EV_A_ &pipe_w);*/
1369 1614
1370#if EV_USE_EVENTFD 1615#if EV_USE_EVENTFD
1371 if (evfd >= 0) 1616 if (evfd >= 0)
1372 close (evfd); 1617 close (evfd);
1373#endif 1618#endif
… …
1377 close (evpipe [0]); 1622 close (evpipe [0]);
1378 close (evpipe [1]); 1623 close (evpipe [1]);
1379 } 1624 }
1380 } 1625 }
1381 1626
1627#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd);
1634 }
1635#endif
1636
1382#if EV_USE_INOTIFY 1637#if EV_USE_INOTIFY
1383 if (fs_fd >= 0) 1638 if (fs_fd >= 0)
1384 close (fs_fd); 1639 close (fs_fd);
1385#endif 1640#endif
1386 1641
… …
1409#if EV_IDLE_ENABLE 1664#if EV_IDLE_ENABLE
1410 array_free (idle, [i]); 1665 array_free (idle, [i]);
1411#endif 1666#endif
1412 } 1667 }
1413 1668
1414 ev_free (anfds); anfdmax = 0; 1669 ev_free (anfds); anfds = 0; anfdmax = 0;
1415 1670
1416 /* have to use the microsoft-never-gets-it-right macro */ 1671 /* have to use the microsoft-never-gets-it-right macro */
1672 array_free (rfeed, EMPTY);
1417 array_free (fdchange, EMPTY); 1673 array_free (fdchange, EMPTY);
1418 array_free (timer, EMPTY); 1674 array_free (timer, EMPTY);
1419#if EV_PERIODIC_ENABLE 1675#if EV_PERIODIC_ENABLE
1420 array_free (periodic, EMPTY); 1676 array_free (periodic, EMPTY);
1421#endif 1677#endif
… …
1430 1686
1431 backend = 0; 1687 backend = 0;
1432} 1688}
1433 1689
1434#if EV_USE_INOTIFY 1690#if EV_USE_INOTIFY
1435void inline_size infy_fork (EV_P); 1691inline_size void infy_fork (EV_P);
1436#endif 1692#endif
1437 1693
1438void inline_size 1694inline_size void
1439loop_fork (EV_P) 1695loop_fork (EV_P)
1440{ 1696{
1441#if EV_USE_PORT 1697#if EV_USE_PORT
1442 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1698 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1443#endif 1699#endif
… …
1449#endif 1705#endif
1450#if EV_USE_INOTIFY 1706#if EV_USE_INOTIFY
1451 infy_fork (EV_A); 1707 infy_fork (EV_A);
1452#endif 1708#endif
1453 1709
1454 if (ev_is_active (&pipeev)) 1710 if (ev_is_active (&pipe_w))
1455 { 1711 {
1456 /* this "locks" the handlers against writing to the pipe */ 1712 /* this "locks" the handlers against writing to the pipe */
1457 /* while we modify the fd vars */ 1713 /* while we modify the fd vars */
1458 gotsig = 1; 1714 gotsig = 1;
1459#if EV_ASYNC_ENABLE 1715#if EV_ASYNC_ENABLE
1460 gotasync = 1; 1716 gotasync = 1;
1461#endif 1717#endif
1462 1718
1463 ev_ref (EV_A); 1719 ev_ref (EV_A);
1464 ev_io_stop (EV_A_ &pipeev); 1720 ev_io_stop (EV_A_ &pipe_w);
1465 1721
1466#if EV_USE_EVENTFD 1722#if EV_USE_EVENTFD
1467 if (evfd >= 0) 1723 if (evfd >= 0)
1468 close (evfd); 1724 close (evfd);
1469#endif 1725#endif
… …
1474 close (evpipe [1]); 1730 close (evpipe [1]);
1475 } 1731 }
1476 1732
1477 evpipe_init (EV_A); 1733 evpipe_init (EV_A);
1478 /* now iterate over everything, in case we missed something */ 1734 /* now iterate over everything, in case we missed something */
1479 pipecb (EV_A_ &pipeev, EV_READ); 1735 pipecb (EV_A_ &pipe_w, EV_READ);
1480 } 1736 }
1481 1737
1482 postfork = 0; 1738 postfork = 0;
1483} 1739}
1484 1740
… …
1488ev_loop_new (unsigned int flags) 1744ev_loop_new (unsigned int flags)
1489{ 1745{
1490 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1746 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1491 1747
1492 memset (loop, 0, sizeof (struct ev_loop)); 1748 memset (loop, 0, sizeof (struct ev_loop));
1493
1494 loop_init (EV_A_ flags); 1749 loop_init (EV_A_ flags);
1495 1750
1496 if (ev_backend (EV_A)) 1751 if (ev_backend (EV_A))
1497 return loop; 1752 return loop;
1498 1753
… …
1509void 1764void
1510ev_loop_fork (EV_P) 1765ev_loop_fork (EV_P)
1511{ 1766{
1512 postfork = 1; /* must be in line with ev_default_fork */ 1767 postfork = 1; /* must be in line with ev_default_fork */
1513} 1768}
1769#endif /* multiplicity */
1514 1770
1515#if EV_VERIFY 1771#if EV_VERIFY
1516void noinline 1772static void noinline
1517verify_watcher (EV_P_ W w) 1773verify_watcher (EV_P_ W w)
1518{ 1774{
1519 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1775 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1520 1776
1521 if (w->pending) 1777 if (w->pending)
1522 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1778 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1523} 1779}
1524 1780
1525static void noinline 1781static void noinline
1526verify_heap (EV_P_ ANHE *heap, int N) 1782verify_heap (EV_P_ ANHE *heap, int N)
1527{ 1783{
1528 int i; 1784 int i;
1529 1785
1530 for (i = HEAP0; i < N + HEAP0; ++i) 1786 for (i = HEAP0; i < N + HEAP0; ++i)
1531 { 1787 {
1532 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1788 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1533 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1789 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1534 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1790 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1535 1791
1536 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1792 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1537 } 1793 }
1538} 1794}
1539 1795
1540static void noinline 1796static void noinline
1541array_verify (EV_P_ W *ws, int cnt) 1797array_verify (EV_P_ W *ws, int cnt)
1542{ 1798{
1543 while (cnt--) 1799 while (cnt--)
1544 { 1800 {
1545 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1801 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1546 verify_watcher (EV_A_ ws [cnt]); 1802 verify_watcher (EV_A_ ws [cnt]);
1547 } 1803 }
1548} 1804}
1549#endif 1805#endif
1550 1806
1807#if EV_MINIMAL < 2
1551void 1808void
1552ev_loop_verify (EV_P) 1809ev_loop_verify (EV_P)
1553{ 1810{
1554#if EV_VERIFY 1811#if EV_VERIFY
1555 int i; 1812 int i;
… …
1557 1814
1558 assert (activecnt >= -1); 1815 assert (activecnt >= -1);
1559 1816
1560 assert (fdchangemax >= fdchangecnt); 1817 assert (fdchangemax >= fdchangecnt);
1561 for (i = 0; i < fdchangecnt; ++i) 1818 for (i = 0; i < fdchangecnt; ++i)
1562 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1819 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1563 1820
1564 assert (anfdmax >= 0); 1821 assert (anfdmax >= 0);
1565 for (i = 0; i < anfdmax; ++i) 1822 for (i = 0; i < anfdmax; ++i)
1566 for (w = anfds [i].head; w; w = w->next) 1823 for (w = anfds [i].head; w; w = w->next)
1567 { 1824 {
1568 verify_watcher (EV_A_ (W)w); 1825 verify_watcher (EV_A_ (W)w);
1569 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1826 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1570 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1827 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1571 } 1828 }
1572 1829
1573 assert (timermax >= timercnt); 1830 assert (timermax >= timercnt);
1574 verify_heap (EV_A_ timers, timercnt); 1831 verify_heap (EV_A_ timers, timercnt);
1575 1832
… …
1608 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1609 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1866 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1610# endif 1867# endif
1611#endif 1868#endif
1612} 1869}
1613 1870#endif
1614#endif /* multiplicity */
1615 1871
1616#if EV_MULTIPLICITY 1872#if EV_MULTIPLICITY
1617struct ev_loop * 1873struct ev_loop *
1618ev_default_loop_init (unsigned int flags) 1874ev_default_loop_init (unsigned int flags)
1619#else 1875#else
… …
1652{ 1908{
1653#if EV_MULTIPLICITY 1909#if EV_MULTIPLICITY
1654 struct ev_loop *loop = ev_default_loop_ptr; 1910 struct ev_loop *loop = ev_default_loop_ptr;
1655#endif 1911#endif
1656 1912
1913 ev_default_loop_ptr = 0;
1914
1657#ifndef _WIN32 1915#ifndef _WIN32
1658 ev_ref (EV_A); /* child watcher */ 1916 ev_ref (EV_A); /* child watcher */
1659 ev_signal_stop (EV_A_ &childev); 1917 ev_signal_stop (EV_A_ &childev);
1660#endif 1918#endif
1661 1919
… …
1667{ 1925{
1668#if EV_MULTIPLICITY 1926#if EV_MULTIPLICITY
1669 struct ev_loop *loop = ev_default_loop_ptr; 1927 struct ev_loop *loop = ev_default_loop_ptr;
1670#endif 1928#endif
1671 1929
1672 if (backend)
1673 postfork = 1; /* must be in line with ev_loop_fork */ 1930 postfork = 1; /* must be in line with ev_loop_fork */
1674} 1931}
1675 1932
1676/*****************************************************************************/ 1933/*****************************************************************************/
1677 1934
1678void 1935void
1679ev_invoke (EV_P_ void *w, int revents) 1936ev_invoke (EV_P_ void *w, int revents)
1680{ 1937{
1681 EV_CB_INVOKE ((W)w, revents); 1938 EV_CB_INVOKE ((W)w, revents);
1682} 1939}
1683 1940
1684void inline_speed 1941unsigned int
1685call_pending (EV_P) 1942ev_pending_count (EV_P)
1943{
1944 int pri;
1945 unsigned int count = 0;
1946
1947 for (pri = NUMPRI; pri--; )
1948 count += pendingcnt [pri];
1949
1950 return count;
1951}
1952
1953void noinline
1954ev_invoke_pending (EV_P)
1686{ 1955{
1687 int pri; 1956 int pri;
1688 1957
1689 for (pri = NUMPRI; pri--; ) 1958 for (pri = NUMPRI; pri--; )
1690 while (pendingcnt [pri]) 1959 while (pendingcnt [pri])
1691 { 1960 {
1692 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1961 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1693 1962
1694 if (expect_true (p->w))
1695 {
1696 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1963 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1964 /* ^ this is no longer true, as pending_w could be here */
1697 1965
1698 p->w->pending = 0; 1966 p->w->pending = 0;
1699 EV_CB_INVOKE (p->w, p->events); 1967 EV_CB_INVOKE (p->w, p->events);
1700 EV_FREQUENT_CHECK; 1968 EV_FREQUENT_CHECK;
1701 }
1702 } 1969 }
1703} 1970}
1704 1971
1705#if EV_IDLE_ENABLE 1972#if EV_IDLE_ENABLE
1706void inline_size 1973/* make idle watchers pending. this handles the "call-idle */
1974/* only when higher priorities are idle" logic */
1975inline_size void
1707idle_reify (EV_P) 1976idle_reify (EV_P)
1708{ 1977{
1709 if (expect_false (idleall)) 1978 if (expect_false (idleall))
1710 { 1979 {
1711 int pri; 1980 int pri;
… …
1723 } 1992 }
1724 } 1993 }
1725} 1994}
1726#endif 1995#endif
1727 1996
1728void inline_size 1997/* make timers pending */
1998inline_size void
1729timers_reify (EV_P) 1999timers_reify (EV_P)
1730{ 2000{
1731 EV_FREQUENT_CHECK; 2001 EV_FREQUENT_CHECK;
1732 2002
1733 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2003 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1734 { 2004 {
1735 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2005 do
1736
1737 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1738
1739 /* first reschedule or stop timer */
1740 if (w->repeat)
1741 { 2006 {
2007 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2008
2009 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2010
2011 /* first reschedule or stop timer */
2012 if (w->repeat)
2013 {
1742 ev_at (w) += w->repeat; 2014 ev_at (w) += w->repeat;
1743 if (ev_at (w) < mn_now) 2015 if (ev_at (w) < mn_now)
1744 ev_at (w) = mn_now; 2016 ev_at (w) = mn_now;
1745 2017
1746 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2018 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1747 2019
1748 ANHE_at_cache (timers [HEAP0]); 2020 ANHE_at_cache (timers [HEAP0]);
1749 downheap (timers, timercnt, HEAP0); 2021 downheap (timers, timercnt, HEAP0);
2022 }
2023 else
2024 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2025
2026 EV_FREQUENT_CHECK;
2027 feed_reverse (EV_A_ (W)w);
1750 } 2028 }
1751 else 2029 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1752 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1753 2030
1754 EV_FREQUENT_CHECK;
1755 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2031 feed_reverse_done (EV_A_ EV_TIMEOUT);
1756 } 2032 }
1757} 2033}
1758 2034
1759#if EV_PERIODIC_ENABLE 2035#if EV_PERIODIC_ENABLE
1760void inline_size 2036/* make periodics pending */
2037inline_size void
1761periodics_reify (EV_P) 2038periodics_reify (EV_P)
1762{ 2039{
1763 EV_FREQUENT_CHECK; 2040 EV_FREQUENT_CHECK;
1764 2041
1765 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2042 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1766 { 2043 {
1767 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2044 int feed_count = 0;
1768 2045
1769 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2046 do
1770
1771 /* first reschedule or stop timer */
1772 if (w->reschedule_cb)
1773 { 2047 {
2048 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2049
2050 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2051
2052 /* first reschedule or stop timer */
2053 if (w->reschedule_cb)
2054 {
1774 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2055 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1775 2056
1776 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2057 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1777 2058
1778 ANHE_at_cache (periodics [HEAP0]); 2059 ANHE_at_cache (periodics [HEAP0]);
1779 downheap (periodics, periodiccnt, HEAP0); 2060 downheap (periodics, periodiccnt, HEAP0);
2061 }
2062 else if (w->interval)
2063 {
2064 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2065 /* if next trigger time is not sufficiently in the future, put it there */
2066 /* this might happen because of floating point inexactness */
2067 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2068 {
2069 ev_at (w) += w->interval;
2070
2071 /* if interval is unreasonably low we might still have a time in the past */
2072 /* so correct this. this will make the periodic very inexact, but the user */
2073 /* has effectively asked to get triggered more often than possible */
2074 if (ev_at (w) < ev_rt_now)
2075 ev_at (w) = ev_rt_now;
2076 }
2077
2078 ANHE_at_cache (periodics [HEAP0]);
2079 downheap (periodics, periodiccnt, HEAP0);
2080 }
2081 else
2082 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2083
2084 EV_FREQUENT_CHECK;
2085 feed_reverse (EV_A_ (W)w);
1780 } 2086 }
1781 else if (w->interval) 2087 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1782 {
1783 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1784 /* if next trigger time is not sufficiently in the future, put it there */
1785 /* this might happen because of floating point inexactness */
1786 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1787 {
1788 ev_at (w) += w->interval;
1789 2088
1790 /* if interval is unreasonably low we might still have a time in the past */
1791 /* so correct this. this will make the periodic very inexact, but the user */
1792 /* has effectively asked to get triggered more often than possible */
1793 if (ev_at (w) < ev_rt_now)
1794 ev_at (w) = ev_rt_now;
1795 }
1796
1797 ANHE_at_cache (periodics [HEAP0]);
1798 downheap (periodics, periodiccnt, HEAP0);
1799 }
1800 else
1801 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1802
1803 EV_FREQUENT_CHECK;
1804 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2089 feed_reverse_done (EV_A_ EV_PERIODIC);
1805 } 2090 }
1806} 2091}
1807 2092
2093/* simply recalculate all periodics */
2094/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1808static void noinline 2095static void noinline
1809periodics_reschedule (EV_P) 2096periodics_reschedule (EV_P)
1810{ 2097{
1811 int i; 2098 int i;
1812 2099
… …
1825 2112
1826 reheap (periodics, periodiccnt); 2113 reheap (periodics, periodiccnt);
1827} 2114}
1828#endif 2115#endif
1829 2116
1830void inline_speed 2117/* adjust all timers by a given offset */
2118static void noinline
2119timers_reschedule (EV_P_ ev_tstamp adjust)
2120{
2121 int i;
2122
2123 for (i = 0; i < timercnt; ++i)
2124 {
2125 ANHE *he = timers + i + HEAP0;
2126 ANHE_w (*he)->at += adjust;
2127 ANHE_at_cache (*he);
2128 }
2129}
2130
2131/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */
2133inline_speed void
1831time_update (EV_P_ ev_tstamp max_block) 2134time_update (EV_P_ ev_tstamp max_block)
1832{ 2135{
1833 int i;
1834
1835#if EV_USE_MONOTONIC 2136#if EV_USE_MONOTONIC
1836 if (expect_true (have_monotonic)) 2137 if (expect_true (have_monotonic))
1837 { 2138 {
2139 int i;
1838 ev_tstamp odiff = rtmn_diff; 2140 ev_tstamp odiff = rtmn_diff;
1839 2141
1840 mn_now = get_clock (); 2142 mn_now = get_clock ();
1841 2143
1842 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2144 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1868 ev_rt_now = ev_time (); 2170 ev_rt_now = ev_time ();
1869 mn_now = get_clock (); 2171 mn_now = get_clock ();
1870 now_floor = mn_now; 2172 now_floor = mn_now;
1871 } 2173 }
1872 2174
2175 /* no timer adjustment, as the monotonic clock doesn't jump */
2176 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1873# if EV_PERIODIC_ENABLE 2177# if EV_PERIODIC_ENABLE
1874 periodics_reschedule (EV_A); 2178 periodics_reschedule (EV_A);
1875# endif 2179# endif
1876 /* no timer adjustment, as the monotonic clock doesn't jump */
1877 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1878 } 2180 }
1879 else 2181 else
1880#endif 2182#endif
1881 { 2183 {
1882 ev_rt_now = ev_time (); 2184 ev_rt_now = ev_time ();
1883 2185
1884 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2186 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1885 { 2187 {
2188 /* adjust timers. this is easy, as the offset is the same for all of them */
2189 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1886#if EV_PERIODIC_ENABLE 2190#if EV_PERIODIC_ENABLE
1887 periodics_reschedule (EV_A); 2191 periodics_reschedule (EV_A);
1888#endif 2192#endif
1889 /* adjust timers. this is easy, as the offset is the same for all of them */
1890 for (i = 0; i < timercnt; ++i)
1891 {
1892 ANHE *he = timers + i + HEAP0;
1893 ANHE_w (*he)->at += ev_rt_now - mn_now;
1894 ANHE_at_cache (*he);
1895 }
1896 } 2193 }
1897 2194
1898 mn_now = ev_rt_now; 2195 mn_now = ev_rt_now;
1899 } 2196 }
1900} 2197}
1901 2198
1902void 2199void
1903ev_ref (EV_P)
1904{
1905 ++activecnt;
1906}
1907
1908void
1909ev_unref (EV_P)
1910{
1911 --activecnt;
1912}
1913
1914static int loop_done;
1915
1916void
1917ev_loop (EV_P_ int flags) 2200ev_loop (EV_P_ int flags)
1918{ 2201{
2202#if EV_MINIMAL < 2
2203 ++loop_depth;
2204#endif
2205
2206 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2207
1919 loop_done = EVUNLOOP_CANCEL; 2208 loop_done = EVUNLOOP_CANCEL;
1920 2209
1921 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2210 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1922 2211
1923 do 2212 do
1924 { 2213 {
1925#if EV_VERIFY >= 2 2214#if EV_VERIFY >= 2
1926 ev_loop_verify (EV_A); 2215 ev_loop_verify (EV_A);
… …
1939 /* we might have forked, so queue fork handlers */ 2228 /* we might have forked, so queue fork handlers */
1940 if (expect_false (postfork)) 2229 if (expect_false (postfork))
1941 if (forkcnt) 2230 if (forkcnt)
1942 { 2231 {
1943 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1944 call_pending (EV_A); 2233 EV_INVOKE_PENDING;
1945 } 2234 }
1946#endif 2235#endif
1947 2236
1948 /* queue prepare watchers (and execute them) */ 2237 /* queue prepare watchers (and execute them) */
1949 if (expect_false (preparecnt)) 2238 if (expect_false (preparecnt))
1950 { 2239 {
1951 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1952 call_pending (EV_A); 2241 EV_INVOKE_PENDING;
1953 } 2242 }
1954 2243
1955 if (expect_false (!activecnt)) 2244 if (expect_false (loop_done))
1956 break; 2245 break;
1957 2246
1958 /* we might have forked, so reify kernel state if necessary */ 2247 /* we might have forked, so reify kernel state if necessary */
1959 if (expect_false (postfork)) 2248 if (expect_false (postfork))
1960 loop_fork (EV_A); 2249 loop_fork (EV_A);
… …
1967 ev_tstamp waittime = 0.; 2256 ev_tstamp waittime = 0.;
1968 ev_tstamp sleeptime = 0.; 2257 ev_tstamp sleeptime = 0.;
1969 2258
1970 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2259 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1971 { 2260 {
2261 /* remember old timestamp for io_blocktime calculation */
2262 ev_tstamp prev_mn_now = mn_now;
2263
1972 /* update time to cancel out callback processing overhead */ 2264 /* update time to cancel out callback processing overhead */
1973 time_update (EV_A_ 1e100); 2265 time_update (EV_A_ 1e100);
1974 2266
1975 waittime = MAX_BLOCKTIME; 2267 waittime = MAX_BLOCKTIME;
1976 2268
… …
1986 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2278 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1987 if (waittime > to) waittime = to; 2279 if (waittime > to) waittime = to;
1988 } 2280 }
1989#endif 2281#endif
1990 2282
2283 /* don't let timeouts decrease the waittime below timeout_blocktime */
1991 if (expect_false (waittime < timeout_blocktime)) 2284 if (expect_false (waittime < timeout_blocktime))
1992 waittime = timeout_blocktime; 2285 waittime = timeout_blocktime;
1993 2286
1994 sleeptime = waittime - backend_fudge; 2287 /* extra check because io_blocktime is commonly 0 */
1995
1996 if (expect_true (sleeptime > io_blocktime)) 2288 if (expect_false (io_blocktime))
1997 sleeptime = io_blocktime;
1998
1999 if (sleeptime)
2000 { 2289 {
2290 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2291
2292 if (sleeptime > waittime - backend_fudge)
2293 sleeptime = waittime - backend_fudge;
2294
2295 if (expect_true (sleeptime > 0.))
2296 {
2001 ev_sleep (sleeptime); 2297 ev_sleep (sleeptime);
2002 waittime -= sleeptime; 2298 waittime -= sleeptime;
2299 }
2003 } 2300 }
2004 } 2301 }
2005 2302
2303#if EV_MINIMAL < 2
2006 ++loop_count; 2304 ++loop_count;
2305#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2007 backend_poll (EV_A_ waittime); 2307 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2008 2309
2009 /* update ev_rt_now, do magic */ 2310 /* update ev_rt_now, do magic */
2010 time_update (EV_A_ waittime + sleeptime); 2311 time_update (EV_A_ waittime + sleeptime);
2011 } 2312 }
2012 2313
… …
2023 2324
2024 /* queue check watchers, to be executed first */ 2325 /* queue check watchers, to be executed first */
2025 if (expect_false (checkcnt)) 2326 if (expect_false (checkcnt))
2026 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2027 2328
2028 call_pending (EV_A); 2329 EV_INVOKE_PENDING;
2029 } 2330 }
2030 while (expect_true ( 2331 while (expect_true (
2031 activecnt 2332 activecnt
2032 && !loop_done 2333 && !loop_done
2033 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2334 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2034 )); 2335 ));
2035 2336
2036 if (loop_done == EVUNLOOP_ONE) 2337 if (loop_done == EVUNLOOP_ONE)
2037 loop_done = EVUNLOOP_CANCEL; 2338 loop_done = EVUNLOOP_CANCEL;
2339
2340#if EV_MINIMAL < 2
2341 --loop_depth;
2342#endif
2038} 2343}
2039 2344
2040void 2345void
2041ev_unloop (EV_P_ int how) 2346ev_unloop (EV_P_ int how)
2042{ 2347{
2043 loop_done = how; 2348 loop_done = how;
2044} 2349}
2045 2350
2351void
2352ev_ref (EV_P)
2353{
2354 ++activecnt;
2355}
2356
2357void
2358ev_unref (EV_P)
2359{
2360 --activecnt;
2361}
2362
2363void
2364ev_now_update (EV_P)
2365{
2366 time_update (EV_A_ 1e100);
2367}
2368
2369void
2370ev_suspend (EV_P)
2371{
2372 ev_now_update (EV_A);
2373}
2374
2375void
2376ev_resume (EV_P)
2377{
2378 ev_tstamp mn_prev = mn_now;
2379
2380 ev_now_update (EV_A);
2381 timers_reschedule (EV_A_ mn_now - mn_prev);
2382#if EV_PERIODIC_ENABLE
2383 /* TODO: really do this? */
2384 periodics_reschedule (EV_A);
2385#endif
2386}
2387
2046/*****************************************************************************/ 2388/*****************************************************************************/
2389/* singly-linked list management, used when the expected list length is short */
2047 2390
2048void inline_size 2391inline_size void
2049wlist_add (WL *head, WL elem) 2392wlist_add (WL *head, WL elem)
2050{ 2393{
2051 elem->next = *head; 2394 elem->next = *head;
2052 *head = elem; 2395 *head = elem;
2053} 2396}
2054 2397
2055void inline_size 2398inline_size void
2056wlist_del (WL *head, WL elem) 2399wlist_del (WL *head, WL elem)
2057{ 2400{
2058 while (*head) 2401 while (*head)
2059 { 2402 {
2060 if (*head == elem) 2403 if (*head == elem)
… …
2065 2408
2066 head = &(*head)->next; 2409 head = &(*head)->next;
2067 } 2410 }
2068} 2411}
2069 2412
2070void inline_speed 2413/* internal, faster, version of ev_clear_pending */
2414inline_speed void
2071clear_pending (EV_P_ W w) 2415clear_pending (EV_P_ W w)
2072{ 2416{
2073 if (w->pending) 2417 if (w->pending)
2074 { 2418 {
2075 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2419 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2076 w->pending = 0; 2420 w->pending = 0;
2077 } 2421 }
2078} 2422}
2079 2423
2080int 2424int
… …
2084 int pending = w_->pending; 2428 int pending = w_->pending;
2085 2429
2086 if (expect_true (pending)) 2430 if (expect_true (pending))
2087 { 2431 {
2088 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2432 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2433 p->w = (W)&pending_w;
2089 w_->pending = 0; 2434 w_->pending = 0;
2090 p->w = 0;
2091 return p->events; 2435 return p->events;
2092 } 2436 }
2093 else 2437 else
2094 return 0; 2438 return 0;
2095} 2439}
2096 2440
2097void inline_size 2441inline_size void
2098pri_adjust (EV_P_ W w) 2442pri_adjust (EV_P_ W w)
2099{ 2443{
2100 int pri = w->priority; 2444 int pri = ev_priority (w);
2101 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2445 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2102 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2446 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2103 w->priority = pri; 2447 ev_set_priority (w, pri);
2104} 2448}
2105 2449
2106void inline_speed 2450inline_speed void
2107ev_start (EV_P_ W w, int active) 2451ev_start (EV_P_ W w, int active)
2108{ 2452{
2109 pri_adjust (EV_A_ w); 2453 pri_adjust (EV_A_ w);
2110 w->active = active; 2454 w->active = active;
2111 ev_ref (EV_A); 2455 ev_ref (EV_A);
2112} 2456}
2113 2457
2114void inline_size 2458inline_size void
2115ev_stop (EV_P_ W w) 2459ev_stop (EV_P_ W w)
2116{ 2460{
2117 ev_unref (EV_A); 2461 ev_unref (EV_A);
2118 w->active = 0; 2462 w->active = 0;
2119} 2463}
… …
2126 int fd = w->fd; 2470 int fd = w->fd;
2127 2471
2128 if (expect_false (ev_is_active (w))) 2472 if (expect_false (ev_is_active (w)))
2129 return; 2473 return;
2130 2474
2131 assert (("ev_io_start called with negative fd", fd >= 0)); 2475 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2476 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2132 2477
2133 EV_FREQUENT_CHECK; 2478 EV_FREQUENT_CHECK;
2134 2479
2135 ev_start (EV_A_ (W)w, 1); 2480 ev_start (EV_A_ (W)w, 1);
2136 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2137 wlist_add (&anfds[fd].head, (WL)w); 2482 wlist_add (&anfds[fd].head, (WL)w);
2138 2483
2139 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2484 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2140 w->events &= ~EV_IOFDSET; 2485 w->events &= ~EV__IOFDSET;
2141 2486
2142 EV_FREQUENT_CHECK; 2487 EV_FREQUENT_CHECK;
2143} 2488}
2144 2489
2145void noinline 2490void noinline
… …
2147{ 2492{
2148 clear_pending (EV_A_ (W)w); 2493 clear_pending (EV_A_ (W)w);
2149 if (expect_false (!ev_is_active (w))) 2494 if (expect_false (!ev_is_active (w)))
2150 return; 2495 return;
2151 2496
2152 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2497 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2153 2498
2154 EV_FREQUENT_CHECK; 2499 EV_FREQUENT_CHECK;
2155 2500
2156 wlist_del (&anfds[w->fd].head, (WL)w); 2501 wlist_del (&anfds[w->fd].head, (WL)w);
2157 ev_stop (EV_A_ (W)w); 2502 ev_stop (EV_A_ (W)w);
… …
2167 if (expect_false (ev_is_active (w))) 2512 if (expect_false (ev_is_active (w)))
2168 return; 2513 return;
2169 2514
2170 ev_at (w) += mn_now; 2515 ev_at (w) += mn_now;
2171 2516
2172 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2517 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2173 2518
2174 EV_FREQUENT_CHECK; 2519 EV_FREQUENT_CHECK;
2175 2520
2176 ++timercnt; 2521 ++timercnt;
2177 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2522 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2180 ANHE_at_cache (timers [ev_active (w)]); 2525 ANHE_at_cache (timers [ev_active (w)]);
2181 upheap (timers, ev_active (w)); 2526 upheap (timers, ev_active (w));
2182 2527
2183 EV_FREQUENT_CHECK; 2528 EV_FREQUENT_CHECK;
2184 2529
2185 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2530 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2186} 2531}
2187 2532
2188void noinline 2533void noinline
2189ev_timer_stop (EV_P_ ev_timer *w) 2534ev_timer_stop (EV_P_ ev_timer *w)
2190{ 2535{
… …
2195 EV_FREQUENT_CHECK; 2540 EV_FREQUENT_CHECK;
2196 2541
2197 { 2542 {
2198 int active = ev_active (w); 2543 int active = ev_active (w);
2199 2544
2200 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2545 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2201 2546
2202 --timercnt; 2547 --timercnt;
2203 2548
2204 if (expect_true (active < timercnt + HEAP0)) 2549 if (expect_true (active < timercnt + HEAP0))
2205 { 2550 {
… …
2238 } 2583 }
2239 2584
2240 EV_FREQUENT_CHECK; 2585 EV_FREQUENT_CHECK;
2241} 2586}
2242 2587
2588ev_tstamp
2589ev_timer_remaining (EV_P_ ev_timer *w)
2590{
2591 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2592}
2593
2243#if EV_PERIODIC_ENABLE 2594#if EV_PERIODIC_ENABLE
2244void noinline 2595void noinline
2245ev_periodic_start (EV_P_ ev_periodic *w) 2596ev_periodic_start (EV_P_ ev_periodic *w)
2246{ 2597{
2247 if (expect_false (ev_is_active (w))) 2598 if (expect_false (ev_is_active (w)))
… …
2249 2600
2250 if (w->reschedule_cb) 2601 if (w->reschedule_cb)
2251 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2602 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2252 else if (w->interval) 2603 else if (w->interval)
2253 { 2604 {
2254 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2605 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2255 /* this formula differs from the one in periodic_reify because we do not always round up */ 2606 /* this formula differs from the one in periodic_reify because we do not always round up */
2256 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2607 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2257 } 2608 }
2258 else 2609 else
2259 ev_at (w) = w->offset; 2610 ev_at (w) = w->offset;
… …
2267 ANHE_at_cache (periodics [ev_active (w)]); 2618 ANHE_at_cache (periodics [ev_active (w)]);
2268 upheap (periodics, ev_active (w)); 2619 upheap (periodics, ev_active (w));
2269 2620
2270 EV_FREQUENT_CHECK; 2621 EV_FREQUENT_CHECK;
2271 2622
2272 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2623 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2273} 2624}
2274 2625
2275void noinline 2626void noinline
2276ev_periodic_stop (EV_P_ ev_periodic *w) 2627ev_periodic_stop (EV_P_ ev_periodic *w)
2277{ 2628{
… …
2282 EV_FREQUENT_CHECK; 2633 EV_FREQUENT_CHECK;
2283 2634
2284 { 2635 {
2285 int active = ev_active (w); 2636 int active = ev_active (w);
2286 2637
2287 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2638 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2288 2639
2289 --periodiccnt; 2640 --periodiccnt;
2290 2641
2291 if (expect_true (active < periodiccnt + HEAP0)) 2642 if (expect_true (active < periodiccnt + HEAP0))
2292 { 2643 {
… …
2315 2666
2316void noinline 2667void noinline
2317ev_signal_start (EV_P_ ev_signal *w) 2668ev_signal_start (EV_P_ ev_signal *w)
2318{ 2669{
2319#if EV_MULTIPLICITY 2670#if EV_MULTIPLICITY
2320 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2671 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2321#endif 2672#endif
2322 if (expect_false (ev_is_active (w))) 2673 if (expect_false (ev_is_active (w)))
2323 return; 2674 return;
2324 2675
2325 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2676 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2326 2677
2678 EV_FREQUENT_CHECK;
2679
2680#if EV_USE_SIGNALFD
2681 if (sigfd == -2)
2682 {
2683 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2684 if (sigfd < 0 && errno == EINVAL)
2685 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2686
2687 if (sigfd >= 0)
2688 {
2689 fd_intern (sigfd); /* doing it twice will not hurt */
2690
2691 sigemptyset (&sigfd_set);
2692
2693 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2694 ev_set_priority (&sigfd_w, EV_MAXPRI);
2695 ev_io_start (EV_A_ &sigfd_w);
2696 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2697 }
2698 }
2699
2700 if (sigfd >= 0)
2701 {
2702 /* TODO: check .head */
2703 sigaddset (&sigfd_set, w->signum);
2704 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2705
2706 signalfd (sigfd, &sigfd_set, 0);
2707 }
2708 else
2709#endif
2327 evpipe_init (EV_A); 2710 evpipe_init (EV_A);
2328
2329 EV_FREQUENT_CHECK;
2330 2711
2331 { 2712 {
2332#ifndef _WIN32 2713#ifndef _WIN32
2333 sigset_t full, prev; 2714 sigset_t full, prev;
2334 sigfillset (&full); 2715 sigfillset (&full);
2335 sigprocmask (SIG_SETMASK, &full, &prev); 2716 sigprocmask (SIG_SETMASK, &full, &prev);
2336#endif 2717#endif
2337 2718
2338 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2719 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2339 2720
2340#ifndef _WIN32 2721#ifndef _WIN32
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0)/*TODO*/
2724# endif
2725 sigdelset (&prev, w->signum);
2341 sigprocmask (SIG_SETMASK, &prev, 0); 2726 sigprocmask (SIG_SETMASK, &prev, 0);
2342#endif 2727#endif
2343 } 2728 }
2344 2729
2345 ev_start (EV_A_ (W)w, 1); 2730 ev_start (EV_A_ (W)w, 1);
… …
2348 if (!((WL)w)->next) 2733 if (!((WL)w)->next)
2349 { 2734 {
2350#if _WIN32 2735#if _WIN32
2351 signal (w->signum, ev_sighandler); 2736 signal (w->signum, ev_sighandler);
2352#else 2737#else
2738# if EV_USE_SIGNALFD
2739 if (sigfd < 0) /*TODO*/
2740# endif
2741 {
2353 struct sigaction sa; 2742 struct sigaction sa = { };
2354 sa.sa_handler = ev_sighandler; 2743 sa.sa_handler = ev_sighandler;
2355 sigfillset (&sa.sa_mask); 2744 sigfillset (&sa.sa_mask);
2356 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2745 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2357 sigaction (w->signum, &sa, 0); 2746 sigaction (w->signum, &sa, 0);
2747 }
2358#endif 2748#endif
2359 } 2749 }
2360 2750
2361 EV_FREQUENT_CHECK; 2751 EV_FREQUENT_CHECK;
2362} 2752}
… …
2372 2762
2373 wlist_del (&signals [w->signum - 1].head, (WL)w); 2763 wlist_del (&signals [w->signum - 1].head, (WL)w);
2374 ev_stop (EV_A_ (W)w); 2764 ev_stop (EV_A_ (W)w);
2375 2765
2376 if (!signals [w->signum - 1].head) 2766 if (!signals [w->signum - 1].head)
2767#if EV_USE_SIGNALFD
2768 if (sigfd >= 0)
2769 {
2770 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2771 sigdelset (&sigfd_set, w->signum);
2772 signalfd (sigfd, &sigfd_set, 0);
2773 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2774 /*TODO: maybe unblock signal? */
2775 }
2776 else
2777#endif
2377 signal (w->signum, SIG_DFL); 2778 signal (w->signum, SIG_DFL);
2378 2779
2379 EV_FREQUENT_CHECK; 2780 EV_FREQUENT_CHECK;
2380} 2781}
2381 2782
2382void 2783void
2383ev_child_start (EV_P_ ev_child *w) 2784ev_child_start (EV_P_ ev_child *w)
2384{ 2785{
2385#if EV_MULTIPLICITY 2786#if EV_MULTIPLICITY
2386 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2787 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2387#endif 2788#endif
2388 if (expect_false (ev_is_active (w))) 2789 if (expect_false (ev_is_active (w)))
2389 return; 2790 return;
2390 2791
2391 EV_FREQUENT_CHECK; 2792 EV_FREQUENT_CHECK;
… …
2416# ifdef _WIN32 2817# ifdef _WIN32
2417# undef lstat 2818# undef lstat
2418# define lstat(a,b) _stati64 (a,b) 2819# define lstat(a,b) _stati64 (a,b)
2419# endif 2820# endif
2420 2821
2421#define DEF_STAT_INTERVAL 5.0074891 2822#define DEF_STAT_INTERVAL 5.0074891
2823#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2422#define MIN_STAT_INTERVAL 0.1074891 2824#define MIN_STAT_INTERVAL 0.1074891
2423 2825
2424static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2826static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2425 2827
2426#if EV_USE_INOTIFY 2828#if EV_USE_INOTIFY
2427# define EV_INOTIFY_BUFSIZE 8192 2829# define EV_INOTIFY_BUFSIZE 8192
… …
2431{ 2833{
2432 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); 2834 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);
2433 2835
2434 if (w->wd < 0) 2836 if (w->wd < 0)
2435 { 2837 {
2838 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2436 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2839 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2437 2840
2438 /* monitor some parent directory for speedup hints */ 2841 /* monitor some parent directory for speedup hints */
2439 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2842 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2440 /* but an efficiency issue only */ 2843 /* but an efficiency issue only */
2441 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2844 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2442 { 2845 {
2443 char path [4096]; 2846 char path [4096];
2444 strcpy (path, w->path); 2847 strcpy (path, w->path);
… …
2448 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2851 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2449 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2852 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2450 2853
2451 char *pend = strrchr (path, '/'); 2854 char *pend = strrchr (path, '/');
2452 2855
2453 if (!pend) 2856 if (!pend || pend == path)
2454 break; /* whoops, no '/', complain to your admin */ 2857 break;
2455 2858
2456 *pend = 0; 2859 *pend = 0;
2457 w->wd = inotify_add_watch (fs_fd, path, mask); 2860 w->wd = inotify_add_watch (fs_fd, path, mask);
2458 } 2861 }
2459 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2862 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2460 } 2863 }
2461 } 2864 }
2462 else
2463 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2464 2865
2465 if (w->wd >= 0) 2866 if (w->wd >= 0)
2867 {
2466 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2868 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2869
2870 /* now local changes will be tracked by inotify, but remote changes won't */
2871 /* unless the filesystem it known to be local, we therefore still poll */
2872 /* also do poll on <2.6.25, but with normal frequency */
2873 struct statfs sfs;
2874
2875 if (fs_2625 && !statfs (w->path, &sfs))
2876 if (sfs.f_type == 0x1373 /* devfs */
2877 || sfs.f_type == 0xEF53 /* ext2/3 */
2878 || sfs.f_type == 0x3153464a /* jfs */
2879 || sfs.f_type == 0x52654973 /* reiser3 */
2880 || sfs.f_type == 0x01021994 /* tempfs */
2881 || sfs.f_type == 0x58465342 /* xfs */)
2882 return;
2883
2884 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2885 ev_timer_again (EV_A_ &w->timer);
2886 }
2467} 2887}
2468 2888
2469static void noinline 2889static void noinline
2470infy_del (EV_P_ ev_stat *w) 2890infy_del (EV_P_ ev_stat *w)
2471{ 2891{
… …
2485 2905
2486static void noinline 2906static void noinline
2487infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2907infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2488{ 2908{
2489 if (slot < 0) 2909 if (slot < 0)
2490 /* overflow, need to check for all hahs slots */ 2910 /* overflow, need to check for all hash slots */
2491 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2911 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2492 infy_wd (EV_A_ slot, wd, ev); 2912 infy_wd (EV_A_ slot, wd, ev);
2493 else 2913 else
2494 { 2914 {
2495 WL w_; 2915 WL w_;
… …
2501 2921
2502 if (w->wd == wd || wd == -1) 2922 if (w->wd == wd || wd == -1)
2503 { 2923 {
2504 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2924 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2505 { 2925 {
2926 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2506 w->wd = -1; 2927 w->wd = -1;
2507 infy_add (EV_A_ w); /* re-add, no matter what */ 2928 infy_add (EV_A_ w); /* re-add, no matter what */
2508 } 2929 }
2509 2930
2510 stat_timer_cb (EV_A_ &w->timer, 0); 2931 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2523 2944
2524 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2945 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2525 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2946 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2526} 2947}
2527 2948
2528void inline_size 2949inline_size void
2950check_2625 (EV_P)
2951{
2952 /* kernels < 2.6.25 are borked
2953 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2954 */
2955 struct utsname buf;
2956 int major, minor, micro;
2957
2958 if (uname (&buf))
2959 return;
2960
2961 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2962 return;
2963
2964 if (major < 2
2965 || (major == 2 && minor < 6)
2966 || (major == 2 && minor == 6 && micro < 25))
2967 return;
2968
2969 fs_2625 = 1;
2970}
2971
2972inline_size void
2529infy_init (EV_P) 2973infy_init (EV_P)
2530{ 2974{
2531 if (fs_fd != -2) 2975 if (fs_fd != -2)
2532 return; 2976 return;
2977
2978 fs_fd = -1;
2979
2980 check_2625 (EV_A);
2533 2981
2534 fs_fd = inotify_init (); 2982 fs_fd = inotify_init ();
2535 2983
2536 if (fs_fd >= 0) 2984 if (fs_fd >= 0)
2537 { 2985 {
… …
2539 ev_set_priority (&fs_w, EV_MAXPRI); 2987 ev_set_priority (&fs_w, EV_MAXPRI);
2540 ev_io_start (EV_A_ &fs_w); 2988 ev_io_start (EV_A_ &fs_w);
2541 } 2989 }
2542} 2990}
2543 2991
2544void inline_size 2992inline_size void
2545infy_fork (EV_P) 2993infy_fork (EV_P)
2546{ 2994{
2547 int slot; 2995 int slot;
2548 2996
2549 if (fs_fd < 0) 2997 if (fs_fd < 0)
… …
2565 w->wd = -1; 3013 w->wd = -1;
2566 3014
2567 if (fs_fd >= 0) 3015 if (fs_fd >= 0)
2568 infy_add (EV_A_ w); /* re-add, no matter what */ 3016 infy_add (EV_A_ w); /* re-add, no matter what */
2569 else 3017 else
2570 ev_timer_start (EV_A_ &w->timer); 3018 ev_timer_again (EV_A_ &w->timer);
2571 } 3019 }
2572
2573 } 3020 }
2574} 3021}
2575 3022
2576#endif 3023#endif
2577 3024
… …
2613 || w->prev.st_atime != w->attr.st_atime 3060 || w->prev.st_atime != w->attr.st_atime
2614 || w->prev.st_mtime != w->attr.st_mtime 3061 || w->prev.st_mtime != w->attr.st_mtime
2615 || w->prev.st_ctime != w->attr.st_ctime 3062 || w->prev.st_ctime != w->attr.st_ctime
2616 ) { 3063 ) {
2617 #if EV_USE_INOTIFY 3064 #if EV_USE_INOTIFY
3065 if (fs_fd >= 0)
3066 {
2618 infy_del (EV_A_ w); 3067 infy_del (EV_A_ w);
2619 infy_add (EV_A_ w); 3068 infy_add (EV_A_ w);
2620 ev_stat_stat (EV_A_ w); /* avoid race... */ 3069 ev_stat_stat (EV_A_ w); /* avoid race... */
3070 }
2621 #endif 3071 #endif
2622 3072
2623 ev_feed_event (EV_A_ w, EV_STAT); 3073 ev_feed_event (EV_A_ w, EV_STAT);
2624 } 3074 }
2625} 3075}
… …
2628ev_stat_start (EV_P_ ev_stat *w) 3078ev_stat_start (EV_P_ ev_stat *w)
2629{ 3079{
2630 if (expect_false (ev_is_active (w))) 3080 if (expect_false (ev_is_active (w)))
2631 return; 3081 return;
2632 3082
2633 /* since we use memcmp, we need to clear any padding data etc. */
2634 memset (&w->prev, 0, sizeof (ev_statdata));
2635 memset (&w->attr, 0, sizeof (ev_statdata));
2636
2637 ev_stat_stat (EV_A_ w); 3083 ev_stat_stat (EV_A_ w);
2638 3084
3085 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2639 if (w->interval < MIN_STAT_INTERVAL) 3086 w->interval = MIN_STAT_INTERVAL;
2640 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2641 3087
2642 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3088 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2643 ev_set_priority (&w->timer, ev_priority (w)); 3089 ev_set_priority (&w->timer, ev_priority (w));
2644 3090
2645#if EV_USE_INOTIFY 3091#if EV_USE_INOTIFY
2646 infy_init (EV_A); 3092 infy_init (EV_A);
2647 3093
2648 if (fs_fd >= 0) 3094 if (fs_fd >= 0)
2649 infy_add (EV_A_ w); 3095 infy_add (EV_A_ w);
2650 else 3096 else
2651#endif 3097#endif
2652 ev_timer_start (EV_A_ &w->timer); 3098 ev_timer_again (EV_A_ &w->timer);
2653 3099
2654 ev_start (EV_A_ (W)w, 1); 3100 ev_start (EV_A_ (W)w, 1);
2655 3101
2656 EV_FREQUENT_CHECK; 3102 EV_FREQUENT_CHECK;
2657} 3103}
… …
2827 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3273 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2828 } 3274 }
2829 } 3275 }
2830} 3276}
2831 3277
3278static void
3279embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
3280{
3281 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3282
3283 ev_embed_stop (EV_A_ w);
3284
3285 {
3286 struct ev_loop *loop = w->other;
3287
3288 ev_loop_fork (EV_A);
3289 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3290 }
3291
3292 ev_embed_start (EV_A_ w);
3293}
3294
2832#if 0 3295#if 0
2833static void 3296static void
2834embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3297embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2835{ 3298{
2836 ev_idle_stop (EV_A_ idle); 3299 ev_idle_stop (EV_A_ idle);
… …
2843 if (expect_false (ev_is_active (w))) 3306 if (expect_false (ev_is_active (w)))
2844 return; 3307 return;
2845 3308
2846 { 3309 {
2847 struct ev_loop *loop = w->other; 3310 struct ev_loop *loop = w->other;
2848 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3311 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2849 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3312 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2850 } 3313 }
2851 3314
2852 EV_FREQUENT_CHECK; 3315 EV_FREQUENT_CHECK;
2853 3316
… …
2856 3319
2857 ev_prepare_init (&w->prepare, embed_prepare_cb); 3320 ev_prepare_init (&w->prepare, embed_prepare_cb);
2858 ev_set_priority (&w->prepare, EV_MINPRI); 3321 ev_set_priority (&w->prepare, EV_MINPRI);
2859 ev_prepare_start (EV_A_ &w->prepare); 3322 ev_prepare_start (EV_A_ &w->prepare);
2860 3323
3324 ev_fork_init (&w->fork, embed_fork_cb);
3325 ev_fork_start (EV_A_ &w->fork);
3326
2861 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 3327 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2862 3328
2863 ev_start (EV_A_ (W)w, 1); 3329 ev_start (EV_A_ (W)w, 1);
2864 3330
2865 EV_FREQUENT_CHECK; 3331 EV_FREQUENT_CHECK;
… …
2872 if (expect_false (!ev_is_active (w))) 3338 if (expect_false (!ev_is_active (w)))
2873 return; 3339 return;
2874 3340
2875 EV_FREQUENT_CHECK; 3341 EV_FREQUENT_CHECK;
2876 3342
2877 ev_io_stop (EV_A_ &w->io); 3343 ev_io_stop (EV_A_ &w->io);
2878 ev_prepare_stop (EV_A_ &w->prepare); 3344 ev_prepare_stop (EV_A_ &w->prepare);
2879 3345 ev_fork_stop (EV_A_ &w->fork);
2880 ev_stop (EV_A_ (W)w);
2881 3346
2882 EV_FREQUENT_CHECK; 3347 EV_FREQUENT_CHECK;
2883} 3348}
2884#endif 3349#endif
2885 3350
… …
2982once_cb (EV_P_ struct ev_once *once, int revents) 3447once_cb (EV_P_ struct ev_once *once, int revents)
2983{ 3448{
2984 void (*cb)(int revents, void *arg) = once->cb; 3449 void (*cb)(int revents, void *arg) = once->cb;
2985 void *arg = once->arg; 3450 void *arg = once->arg;
2986 3451
2987 ev_io_stop (EV_A_ &once->io); 3452 ev_io_stop (EV_A_ &once->io);
2988 ev_timer_stop (EV_A_ &once->to); 3453 ev_timer_stop (EV_A_ &once->to);
2989 ev_free (once); 3454 ev_free (once);
2990 3455
2991 cb (revents, arg); 3456 cb (revents, arg);
2992} 3457}
2993 3458
2994static void 3459static void
2995once_cb_io (EV_P_ ev_io *w, int revents) 3460once_cb_io (EV_P_ ev_io *w, int revents)
2996{ 3461{
2997 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3462 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3463
3464 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2998} 3465}
2999 3466
3000static void 3467static void
3001once_cb_to (EV_P_ ev_timer *w, int revents) 3468once_cb_to (EV_P_ ev_timer *w, int revents)
3002{ 3469{
3003 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3470 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3471
3472 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
3004} 3473}
3005 3474
3006void 3475void
3007ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3476ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
3008{ 3477{
… …
3030 ev_timer_set (&once->to, timeout, 0.); 3499 ev_timer_set (&once->to, timeout, 0.);
3031 ev_timer_start (EV_A_ &once->to); 3500 ev_timer_start (EV_A_ &once->to);
3032 } 3501 }
3033} 3502}
3034 3503
3504/*****************************************************************************/
3505
3506#if EV_WALK_ENABLE
3507void
3508ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3509{
3510 int i, j;
3511 ev_watcher_list *wl, *wn;
3512
3513 if (types & (EV_IO | EV_EMBED))
3514 for (i = 0; i < anfdmax; ++i)
3515 for (wl = anfds [i].head; wl; )
3516 {
3517 wn = wl->next;
3518
3519#if EV_EMBED_ENABLE
3520 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3521 {
3522 if (types & EV_EMBED)
3523 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3524 }
3525 else
3526#endif
3527#if EV_USE_INOTIFY
3528 if (ev_cb ((ev_io *)wl) == infy_cb)
3529 ;
3530 else
3531#endif
3532 if ((ev_io *)wl != &pipe_w)
3533 if (types & EV_IO)
3534 cb (EV_A_ EV_IO, wl);
3535
3536 wl = wn;
3537 }
3538
3539 if (types & (EV_TIMER | EV_STAT))
3540 for (i = timercnt + HEAP0; i-- > HEAP0; )
3541#if EV_STAT_ENABLE
3542 /*TODO: timer is not always active*/
3543 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3544 {
3545 if (types & EV_STAT)
3546 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3547 }
3548 else
3549#endif
3550 if (types & EV_TIMER)
3551 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3552
3553#if EV_PERIODIC_ENABLE
3554 if (types & EV_PERIODIC)
3555 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3556 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3557#endif
3558
3559#if EV_IDLE_ENABLE
3560 if (types & EV_IDLE)
3561 for (j = NUMPRI; i--; )
3562 for (i = idlecnt [j]; i--; )
3563 cb (EV_A_ EV_IDLE, idles [j][i]);
3564#endif
3565
3566#if EV_FORK_ENABLE
3567 if (types & EV_FORK)
3568 for (i = forkcnt; i--; )
3569 if (ev_cb (forks [i]) != embed_fork_cb)
3570 cb (EV_A_ EV_FORK, forks [i]);
3571#endif
3572
3573#if EV_ASYNC_ENABLE
3574 if (types & EV_ASYNC)
3575 for (i = asynccnt; i--; )
3576 cb (EV_A_ EV_ASYNC, asyncs [i]);
3577#endif
3578
3579 if (types & EV_PREPARE)
3580 for (i = preparecnt; i--; )
3581#if EV_EMBED_ENABLE
3582 if (ev_cb (prepares [i]) != embed_prepare_cb)
3583#endif
3584 cb (EV_A_ EV_PREPARE, prepares [i]);
3585
3586 if (types & EV_CHECK)
3587 for (i = checkcnt; i--; )
3588 cb (EV_A_ EV_CHECK, checks [i]);
3589
3590 if (types & EV_SIGNAL)
3591 for (i = 0; i < signalmax; ++i)
3592 for (wl = signals [i].head; wl; )
3593 {
3594 wn = wl->next;
3595 cb (EV_A_ EV_SIGNAL, wl);
3596 wl = wn;
3597 }
3598
3599 if (types & EV_CHILD)
3600 for (i = EV_PID_HASHSIZE; i--; )
3601 for (wl = childs [i]; wl; )
3602 {
3603 wn = wl->next;
3604 cb (EV_A_ EV_CHILD, wl);
3605 wl = wn;
3606 }
3607/* EV_STAT 0x00001000 /* stat data changed */
3608/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3609}
3610#endif
3611
3035#if EV_MULTIPLICITY 3612#if EV_MULTIPLICITY
3036 #include "ev_wrap.h" 3613 #include "ev_wrap.h"
3037#endif 3614#endif
3038 3615
3039#ifdef __cplusplus 3616#ifdef __cplusplus

Diff Legend

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