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

Comparing libev/ev.c (file contents):
Revision 1.263 by root, Wed Oct 1 18:50:03 2008 UTC vs.
Revision 1.318 by root, Tue Nov 17 00:22: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
… …
116# ifndef EV_USE_INOTIFY 130# ifndef EV_USE_INOTIFY
117# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
118# define EV_USE_INOTIFY 1 132# define EV_USE_INOTIFY 1
119# else 133# else
120# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif
136# endif
137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
121# endif 143# endif
122# endif 144# endif
123 145
124# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD 147# if HAVE_EVENTFD
… …
164# endif 186# endif
165#endif 187#endif
166 188
167/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
168 190
191/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG)
193/* use what's provided */
194#elif defined (NSIG)
195# define EV_NSIG (NSIG)
196#elif defined(_NSIG)
197# define EV_NSIG (_NSIG)
198#elif defined (SIGMAX)
199# define EV_NSIG (SIGMAX+1)
200#elif defined (SIG_MAX)
201# define EV_NSIG (SIG_MAX+1)
202#elif defined (_SIG_MAX)
203# define EV_NSIG (_SIG_MAX+1)
204#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else
213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 65
216#endif
217
218#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2
220# define EV_USE_CLOCK_SYSCALL 1
221# else
222# define EV_USE_CLOCK_SYSCALL 0
223# endif
224#endif
225
169#ifndef EV_USE_MONOTONIC 226#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 227# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 228# define EV_USE_MONOTONIC 1
172# else 229# else
173# define EV_USE_MONOTONIC 0 230# define EV_USE_MONOTONIC 0
174# endif 231# endif
175#endif 232#endif
176 233
177#ifndef EV_USE_REALTIME 234#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 236#endif
180 237
181#ifndef EV_USE_NANOSLEEP 238#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 239# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 240# define EV_USE_NANOSLEEP 1
… …
244# else 301# else
245# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
246# endif 303# endif
247#endif 304#endif
248 305
306#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1
309# else
310# define EV_USE_SIGNALFD 0
311# endif
312#endif
313
249#if 0 /* debugging */ 314#if 0 /* debugging */
250# define EV_VERIFY 3 315# define EV_VERIFY 3
251# define EV_USE_4HEAP 1 316# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1 317# define EV_HEAP_CACHE_AT 1
253#endif 318#endif
… …
262 327
263#ifndef EV_HEAP_CACHE_AT 328#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL 329# define EV_HEAP_CACHE_AT !EV_MINIMAL
265#endif 330#endif
266 331
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
333/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL
335# include <syscall.h>
336# ifdef SYS_clock_gettime
337# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
338# undef EV_USE_MONOTONIC
339# define EV_USE_MONOTONIC 1
340# else
341# undef EV_USE_CLOCK_SYSCALL
342# define EV_USE_CLOCK_SYSCALL 0
343# endif
344#endif
345
267/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 346/* this block fixes any misconfiguration where we know we run into trouble otherwise */
268 347
269#ifndef CLOCK_MONOTONIC 348#ifndef CLOCK_MONOTONIC
270# undef EV_USE_MONOTONIC 349# undef EV_USE_MONOTONIC
271# define EV_USE_MONOTONIC 0 350# define EV_USE_MONOTONIC 0
… …
286# include <sys/select.h> 365# include <sys/select.h>
287# endif 366# endif
288#endif 367#endif
289 368
290#if EV_USE_INOTIFY 369#if EV_USE_INOTIFY
370# include <sys/utsname.h>
371# include <sys/statfs.h>
291# include <sys/inotify.h> 372# include <sys/inotify.h>
292/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 373/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
293# ifndef IN_DONT_FOLLOW 374# ifndef IN_DONT_FOLLOW
294# undef EV_USE_INOTIFY 375# undef EV_USE_INOTIFY
295# define EV_USE_INOTIFY 0 376# define EV_USE_INOTIFY 0
… …
301#endif 382#endif
302 383
303#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
304/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 385/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
305# include <stdint.h> 386# include <stdint.h>
387# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK
389# endif
390# ifndef EFD_CLOEXEC
391# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC
393# else
394# define EFD_CLOEXEC 02000000
395# endif
396# endif
306# ifdef __cplusplus 397# ifdef __cplusplus
307extern "C" { 398extern "C" {
308# endif 399# endif
309int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
310# ifdef __cplusplus 401# ifdef __cplusplus
311} 402}
312# endif 403# endif
313#endif 404#endif
405
406#if EV_USE_SIGNALFD
407/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
408# include <stdint.h>
409# ifndef SFD_NONBLOCK
410# define SFD_NONBLOCK O_NONBLOCK
411# endif
412# ifndef SFD_CLOEXEC
413# ifdef O_CLOEXEC
414# define SFD_CLOEXEC O_CLOEXEC
415# else
416# define SFD_CLOEXEC 02000000
417# endif
418# endif
419# ifdef __cplusplus
420extern "C" {
421# endif
422int signalfd (int fd, const sigset_t *mask, int flags);
423
424struct signalfd_siginfo
425{
426 uint32_t ssi_signo;
427 char pad[128 - sizeof (uint32_t)];
428};
429# ifdef __cplusplus
430}
431# endif
432#endif
433
314 434
315/**/ 435/**/
316 436
317#if EV_VERIFY >= 3 437#if EV_VERIFY >= 3
318# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
330 */ 450 */
331#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 451#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
332 452
333#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 453#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
334#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 454#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
335/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
336 455
337#if __GNUC__ >= 4 456#if __GNUC__ >= 4
338# define expect(expr,value) __builtin_expect ((expr),(value)) 457# define expect(expr,value) __builtin_expect ((expr),(value))
339# define noinline __attribute__ ((noinline)) 458# define noinline __attribute__ ((noinline))
340#else 459#else
… …
353# define inline_speed static noinline 472# define inline_speed static noinline
354#else 473#else
355# define inline_speed static inline 474# define inline_speed static inline
356#endif 475#endif
357 476
358#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 477#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
478
479#if EV_MINPRI == EV_MAXPRI
480# define ABSPRI(w) (((W)w), 0)
481#else
359#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 482# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
483#endif
360 484
361#define EMPTY /* required for microsofts broken pseudo-c compiler */ 485#define EMPTY /* required for microsofts broken pseudo-c compiler */
362#define EMPTY2(a,b) /* used to suppress some warnings */ 486#define EMPTY2(a,b) /* used to suppress some warnings */
363 487
364typedef ev_watcher *W; 488typedef ev_watcher *W;
… …
366typedef ev_watcher_time *WT; 490typedef ev_watcher_time *WT;
367 491
368#define ev_active(w) ((W)(w))->active 492#define ev_active(w) ((W)(w))->active
369#define ev_at(w) ((WT)(w))->at 493#define ev_at(w) ((WT)(w))->at
370 494
371#if EV_USE_MONOTONIC 495#if EV_USE_REALTIME
372/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 496/* sig_atomic_t is used to avoid per-thread variables or locking but still */
373/* giving it a reasonably high chance of working on typical architetcures */ 497/* giving it a reasonably high chance of working on typical architetcures */
498static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
499#endif
500
501#if EV_USE_MONOTONIC
374static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 502static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
503#endif
504
505#ifndef EV_FD_TO_WIN32_HANDLE
506# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
507#endif
508#ifndef EV_WIN32_HANDLE_TO_FD
509# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
510#endif
511#ifndef EV_WIN32_CLOSE_FD
512# define EV_WIN32_CLOSE_FD(fd) close (fd)
375#endif 513#endif
376 514
377#ifdef _WIN32 515#ifdef _WIN32
378# include "ev_win32.c" 516# include "ev_win32.c"
379#endif 517#endif
… …
387{ 525{
388 syserr_cb = cb; 526 syserr_cb = cb;
389} 527}
390 528
391static void noinline 529static void noinline
392syserr (const char *msg) 530ev_syserr (const char *msg)
393{ 531{
394 if (!msg) 532 if (!msg)
395 msg = "(libev) system error"; 533 msg = "(libev) system error";
396 534
397 if (syserr_cb) 535 if (syserr_cb)
… …
443#define ev_malloc(size) ev_realloc (0, (size)) 581#define ev_malloc(size) ev_realloc (0, (size))
444#define ev_free(ptr) ev_realloc ((ptr), 0) 582#define ev_free(ptr) ev_realloc ((ptr), 0)
445 583
446/*****************************************************************************/ 584/*****************************************************************************/
447 585
586/* set in reify when reification needed */
587#define EV_ANFD_REIFY 1
588
589/* file descriptor info structure */
448typedef struct 590typedef struct
449{ 591{
450 WL head; 592 WL head;
451 unsigned char events; 593 unsigned char events; /* the events watched for */
594 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
595 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
452 unsigned char reify; 596 unsigned char unused;
597#if EV_USE_EPOLL
598 unsigned int egen; /* generation counter to counter epoll bugs */
599#endif
453#if EV_SELECT_IS_WINSOCKET 600#if EV_SELECT_IS_WINSOCKET
454 SOCKET handle; 601 SOCKET handle;
455#endif 602#endif
456} ANFD; 603} ANFD;
457 604
605/* stores the pending event set for a given watcher */
458typedef struct 606typedef struct
459{ 607{
460 W w; 608 W w;
461 int events; 609 int events; /* the pending event set for the given watcher */
462} ANPENDING; 610} ANPENDING;
463 611
464#if EV_USE_INOTIFY 612#if EV_USE_INOTIFY
465/* hash table entry per inotify-id */ 613/* hash table entry per inotify-id */
466typedef struct 614typedef struct
… …
469} ANFS; 617} ANFS;
470#endif 618#endif
471 619
472/* Heap Entry */ 620/* Heap Entry */
473#if EV_HEAP_CACHE_AT 621#if EV_HEAP_CACHE_AT
622 /* a heap element */
474 typedef struct { 623 typedef struct {
475 ev_tstamp at; 624 ev_tstamp at;
476 WT w; 625 WT w;
477 } ANHE; 626 } ANHE;
478 627
479 #define ANHE_w(he) (he).w /* access watcher, read-write */ 628 #define ANHE_w(he) (he).w /* access watcher, read-write */
480 #define ANHE_at(he) (he).at /* access cached at, read-only */ 629 #define ANHE_at(he) (he).at /* access cached at, read-only */
481 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 630 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
482#else 631#else
632 /* a heap element */
483 typedef WT ANHE; 633 typedef WT ANHE;
484 634
485 #define ANHE_w(he) (he) 635 #define ANHE_w(he) (he)
486 #define ANHE_at(he) (he)->at 636 #define ANHE_at(he) (he)->at
487 #define ANHE_at_cache(he) 637 #define ANHE_at_cache(he)
… …
511 661
512 static int ev_default_loop_ptr; 662 static int ev_default_loop_ptr;
513 663
514#endif 664#endif
515 665
666#if EV_MINIMAL < 2
667# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
668# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
669# define EV_INVOKE_PENDING invoke_cb (EV_A)
670#else
671# define EV_RELEASE_CB (void)0
672# define EV_ACQUIRE_CB (void)0
673# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
674#endif
675
676#define EVUNLOOP_RECURSE 0x80
677
516/*****************************************************************************/ 678/*****************************************************************************/
517 679
680#ifndef EV_HAVE_EV_TIME
518ev_tstamp 681ev_tstamp
519ev_time (void) 682ev_time (void)
520{ 683{
521#if EV_USE_REALTIME 684#if EV_USE_REALTIME
685 if (expect_true (have_realtime))
686 {
522 struct timespec ts; 687 struct timespec ts;
523 clock_gettime (CLOCK_REALTIME, &ts); 688 clock_gettime (CLOCK_REALTIME, &ts);
524 return ts.tv_sec + ts.tv_nsec * 1e-9; 689 return ts.tv_sec + ts.tv_nsec * 1e-9;
525#else 690 }
691#endif
692
526 struct timeval tv; 693 struct timeval tv;
527 gettimeofday (&tv, 0); 694 gettimeofday (&tv, 0);
528 return tv.tv_sec + tv.tv_usec * 1e-6; 695 return tv.tv_sec + tv.tv_usec * 1e-6;
529#endif
530} 696}
697#endif
531 698
532ev_tstamp inline_size 699inline_size ev_tstamp
533get_clock (void) 700get_clock (void)
534{ 701{
535#if EV_USE_MONOTONIC 702#if EV_USE_MONOTONIC
536 if (expect_true (have_monotonic)) 703 if (expect_true (have_monotonic))
537 { 704 {
… …
571 738
572 tv.tv_sec = (time_t)delay; 739 tv.tv_sec = (time_t)delay;
573 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 740 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
574 741
575 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 742 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
576 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 743 /* something not guaranteed by newer posix versions, but guaranteed */
577 /* by older ones */ 744 /* by older ones */
578 select (0, 0, 0, 0, &tv); 745 select (0, 0, 0, 0, &tv);
579#endif 746#endif
580 } 747 }
581} 748}
582 749
583/*****************************************************************************/ 750/*****************************************************************************/
584 751
585#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 752#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
586 753
587int inline_size 754/* find a suitable new size for the given array, */
755/* hopefully by rounding to a ncie-to-malloc size */
756inline_size int
588array_nextsize (int elem, int cur, int cnt) 757array_nextsize (int elem, int cur, int cnt)
589{ 758{
590 int ncur = cur + 1; 759 int ncur = cur + 1;
591 760
592 do 761 do
… …
609array_realloc (int elem, void *base, int *cur, int cnt) 778array_realloc (int elem, void *base, int *cur, int cnt)
610{ 779{
611 *cur = array_nextsize (elem, *cur, cnt); 780 *cur = array_nextsize (elem, *cur, cnt);
612 return ev_realloc (base, elem * *cur); 781 return ev_realloc (base, elem * *cur);
613} 782}
783
784#define array_init_zero(base,count) \
785 memset ((void *)(base), 0, sizeof (*(base)) * (count))
614 786
615#define array_needsize(type,base,cur,cnt,init) \ 787#define array_needsize(type,base,cur,cnt,init) \
616 if (expect_false ((cnt) > (cur))) \ 788 if (expect_false ((cnt) > (cur))) \
617 { \ 789 { \
618 int ocur_ = (cur); \ 790 int ocur_ = (cur); \
… …
630 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 802 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
631 } 803 }
632#endif 804#endif
633 805
634#define array_free(stem, idx) \ 806#define array_free(stem, idx) \
635 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 807 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
636 808
637/*****************************************************************************/ 809/*****************************************************************************/
810
811/* dummy callback for pending events */
812static void noinline
813pendingcb (EV_P_ ev_prepare *w, int revents)
814{
815}
638 816
639void noinline 817void noinline
640ev_feed_event (EV_P_ void *w, int revents) 818ev_feed_event (EV_P_ void *w, int revents)
641{ 819{
642 W w_ = (W)w; 820 W w_ = (W)w;
… …
651 pendings [pri][w_->pending - 1].w = w_; 829 pendings [pri][w_->pending - 1].w = w_;
652 pendings [pri][w_->pending - 1].events = revents; 830 pendings [pri][w_->pending - 1].events = revents;
653 } 831 }
654} 832}
655 833
656void inline_speed 834inline_speed void
835feed_reverse (EV_P_ W w)
836{
837 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
838 rfeeds [rfeedcnt++] = w;
839}
840
841inline_size void
842feed_reverse_done (EV_P_ int revents)
843{
844 do
845 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
846 while (rfeedcnt);
847}
848
849inline_speed void
657queue_events (EV_P_ W *events, int eventcnt, int type) 850queue_events (EV_P_ W *events, int eventcnt, int type)
658{ 851{
659 int i; 852 int i;
660 853
661 for (i = 0; i < eventcnt; ++i) 854 for (i = 0; i < eventcnt; ++i)
662 ev_feed_event (EV_A_ events [i], type); 855 ev_feed_event (EV_A_ events [i], type);
663} 856}
664 857
665/*****************************************************************************/ 858/*****************************************************************************/
666 859
667void inline_size 860inline_speed void
668anfds_init (ANFD *base, int count)
669{
670 while (count--)
671 {
672 base->head = 0;
673 base->events = EV_NONE;
674 base->reify = 0;
675
676 ++base;
677 }
678}
679
680void inline_speed
681fd_event (EV_P_ int fd, int revents) 861fd_event_nc (EV_P_ int fd, int revents)
682{ 862{
683 ANFD *anfd = anfds + fd; 863 ANFD *anfd = anfds + fd;
684 ev_io *w; 864 ev_io *w;
685 865
686 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 866 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
690 if (ev) 870 if (ev)
691 ev_feed_event (EV_A_ (W)w, ev); 871 ev_feed_event (EV_A_ (W)w, ev);
692 } 872 }
693} 873}
694 874
875/* do not submit kernel events for fds that have reify set */
876/* because that means they changed while we were polling for new events */
877inline_speed void
878fd_event (EV_P_ int fd, int revents)
879{
880 ANFD *anfd = anfds + fd;
881
882 if (expect_true (!anfd->reify))
883 fd_event_nc (EV_A_ fd, revents);
884}
885
695void 886void
696ev_feed_fd_event (EV_P_ int fd, int revents) 887ev_feed_fd_event (EV_P_ int fd, int revents)
697{ 888{
698 if (fd >= 0 && fd < anfdmax) 889 if (fd >= 0 && fd < anfdmax)
699 fd_event (EV_A_ fd, revents); 890 fd_event_nc (EV_A_ fd, revents);
700} 891}
701 892
702void inline_size 893/* make sure the external fd watch events are in-sync */
894/* with the kernel/libev internal state */
895inline_size void
703fd_reify (EV_P) 896fd_reify (EV_P)
704{ 897{
705 int i; 898 int i;
706 899
707 for (i = 0; i < fdchangecnt; ++i) 900 for (i = 0; i < fdchangecnt; ++i)
… …
717 910
718#if EV_SELECT_IS_WINSOCKET 911#if EV_SELECT_IS_WINSOCKET
719 if (events) 912 if (events)
720 { 913 {
721 unsigned long arg; 914 unsigned long arg;
722 #ifdef EV_FD_TO_WIN32_HANDLE
723 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 915 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
724 #else
725 anfd->handle = _get_osfhandle (fd);
726 #endif
727 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 916 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
728 } 917 }
729#endif 918#endif
730 919
731 { 920 {
732 unsigned char o_events = anfd->events; 921 unsigned char o_events = anfd->events;
733 unsigned char o_reify = anfd->reify; 922 unsigned char o_reify = anfd->reify;
734 923
735 anfd->reify = 0; 924 anfd->reify = 0;
736 anfd->events = events; 925 anfd->events = events;
737 926
738 if (o_events != events || o_reify & EV_IOFDSET) 927 if (o_events != events || o_reify & EV__IOFDSET)
739 backend_modify (EV_A_ fd, o_events, events); 928 backend_modify (EV_A_ fd, o_events, events);
740 } 929 }
741 } 930 }
742 931
743 fdchangecnt = 0; 932 fdchangecnt = 0;
744} 933}
745 934
746void inline_size 935/* something about the given fd changed */
936inline_size void
747fd_change (EV_P_ int fd, int flags) 937fd_change (EV_P_ int fd, int flags)
748{ 938{
749 unsigned char reify = anfds [fd].reify; 939 unsigned char reify = anfds [fd].reify;
750 anfds [fd].reify |= flags; 940 anfds [fd].reify |= flags;
751 941
… …
755 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 945 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
756 fdchanges [fdchangecnt - 1] = fd; 946 fdchanges [fdchangecnt - 1] = fd;
757 } 947 }
758} 948}
759 949
760void inline_speed 950/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
951inline_speed void
761fd_kill (EV_P_ int fd) 952fd_kill (EV_P_ int fd)
762{ 953{
763 ev_io *w; 954 ev_io *w;
764 955
765 while ((w = (ev_io *)anfds [fd].head)) 956 while ((w = (ev_io *)anfds [fd].head))
… …
767 ev_io_stop (EV_A_ w); 958 ev_io_stop (EV_A_ w);
768 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 959 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
769 } 960 }
770} 961}
771 962
772int inline_size 963/* check whether the given fd is atcually valid, for error recovery */
964inline_size int
773fd_valid (int fd) 965fd_valid (int fd)
774{ 966{
775#ifdef _WIN32 967#ifdef _WIN32
776 return _get_osfhandle (fd) != -1; 968 return _get_osfhandle (fd) != -1;
777#else 969#else
… …
799 991
800 for (fd = anfdmax; fd--; ) 992 for (fd = anfdmax; fd--; )
801 if (anfds [fd].events) 993 if (anfds [fd].events)
802 { 994 {
803 fd_kill (EV_A_ fd); 995 fd_kill (EV_A_ fd);
804 return; 996 break;
805 } 997 }
806} 998}
807 999
808/* usually called after fork if backend needs to re-arm all fds from scratch */ 1000/* usually called after fork if backend needs to re-arm all fds from scratch */
809static void noinline 1001static void noinline
… …
813 1005
814 for (fd = 0; fd < anfdmax; ++fd) 1006 for (fd = 0; fd < anfdmax; ++fd)
815 if (anfds [fd].events) 1007 if (anfds [fd].events)
816 { 1008 {
817 anfds [fd].events = 0; 1009 anfds [fd].events = 0;
1010 anfds [fd].emask = 0;
818 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1011 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
819 } 1012 }
820} 1013}
821 1014
822/*****************************************************************************/ 1015/*****************************************************************************/
823 1016
… …
839#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1032#define HEAP0 (DHEAP - 1) /* index of first element in heap */
840#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1033#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
841#define UPHEAP_DONE(p,k) ((p) == (k)) 1034#define UPHEAP_DONE(p,k) ((p) == (k))
842 1035
843/* away from the root */ 1036/* away from the root */
844void inline_speed 1037inline_speed void
845downheap (ANHE *heap, int N, int k) 1038downheap (ANHE *heap, int N, int k)
846{ 1039{
847 ANHE he = heap [k]; 1040 ANHE he = heap [k];
848 ANHE *E = heap + N + HEAP0; 1041 ANHE *E = heap + N + HEAP0;
849 1042
… …
889#define HEAP0 1 1082#define HEAP0 1
890#define HPARENT(k) ((k) >> 1) 1083#define HPARENT(k) ((k) >> 1)
891#define UPHEAP_DONE(p,k) (!(p)) 1084#define UPHEAP_DONE(p,k) (!(p))
892 1085
893/* away from the root */ 1086/* away from the root */
894void inline_speed 1087inline_speed void
895downheap (ANHE *heap, int N, int k) 1088downheap (ANHE *heap, int N, int k)
896{ 1089{
897 ANHE he = heap [k]; 1090 ANHE he = heap [k];
898 1091
899 for (;;) 1092 for (;;)
900 { 1093 {
901 int c = k << 1; 1094 int c = k << 1;
902 1095
903 if (c > N + HEAP0 - 1) 1096 if (c >= N + HEAP0)
904 break; 1097 break;
905 1098
906 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1099 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
907 ? 1 : 0; 1100 ? 1 : 0;
908 1101
… …
919 ev_active (ANHE_w (he)) = k; 1112 ev_active (ANHE_w (he)) = k;
920} 1113}
921#endif 1114#endif
922 1115
923/* towards the root */ 1116/* towards the root */
924void inline_speed 1117inline_speed void
925upheap (ANHE *heap, int k) 1118upheap (ANHE *heap, int k)
926{ 1119{
927 ANHE he = heap [k]; 1120 ANHE he = heap [k];
928 1121
929 for (;;) 1122 for (;;)
… …
940 1133
941 heap [k] = he; 1134 heap [k] = he;
942 ev_active (ANHE_w (he)) = k; 1135 ev_active (ANHE_w (he)) = k;
943} 1136}
944 1137
945void inline_size 1138/* move an element suitably so it is in a correct place */
1139inline_size void
946adjustheap (ANHE *heap, int N, int k) 1140adjustheap (ANHE *heap, int N, int k)
947{ 1141{
948 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1142 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
949 upheap (heap, k); 1143 upheap (heap, k);
950 else 1144 else
951 downheap (heap, N, k); 1145 downheap (heap, N, k);
952} 1146}
953 1147
954/* rebuild the heap: this function is used only once and executed rarely */ 1148/* rebuild the heap: this function is used only once and executed rarely */
955void inline_size 1149inline_size void
956reheap (ANHE *heap, int N) 1150reheap (ANHE *heap, int N)
957{ 1151{
958 int i; 1152 int i;
959 1153
960 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1154 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
963 upheap (heap, i + HEAP0); 1157 upheap (heap, i + HEAP0);
964} 1158}
965 1159
966/*****************************************************************************/ 1160/*****************************************************************************/
967 1161
1162/* associate signal watchers to a signal signal */
968typedef struct 1163typedef struct
969{ 1164{
1165 EV_ATOMIC_T pending;
1166#if EV_MULTIPLICITY
1167 EV_P;
1168#endif
970 WL head; 1169 WL head;
971 EV_ATOMIC_T gotsig;
972} ANSIG; 1170} ANSIG;
973 1171
974static ANSIG *signals; 1172static ANSIG signals [EV_NSIG - 1];
975static int signalmax;
976
977static EV_ATOMIC_T gotsig;
978
979void inline_size
980signals_init (ANSIG *base, int count)
981{
982 while (count--)
983 {
984 base->head = 0;
985 base->gotsig = 0;
986
987 ++base;
988 }
989}
990 1173
991/*****************************************************************************/ 1174/*****************************************************************************/
992 1175
993void inline_speed 1176/* used to prepare libev internal fd's */
1177/* this is not fork-safe */
1178inline_speed void
994fd_intern (int fd) 1179fd_intern (int fd)
995{ 1180{
996#ifdef _WIN32 1181#ifdef _WIN32
997 unsigned long arg = 1; 1182 unsigned long arg = 1;
998 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1183 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
1003} 1188}
1004 1189
1005static void noinline 1190static void noinline
1006evpipe_init (EV_P) 1191evpipe_init (EV_P)
1007{ 1192{
1008 if (!ev_is_active (&pipeev)) 1193 if (!ev_is_active (&pipe_w))
1009 { 1194 {
1010#if EV_USE_EVENTFD 1195#if EV_USE_EVENTFD
1196 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1197 if (evfd < 0 && errno == EINVAL)
1011 if ((evfd = eventfd (0, 0)) >= 0) 1198 evfd = eventfd (0, 0);
1199
1200 if (evfd >= 0)
1012 { 1201 {
1013 evpipe [0] = -1; 1202 evpipe [0] = -1;
1014 fd_intern (evfd); 1203 fd_intern (evfd); /* doing it twice doesn't hurt */
1015 ev_io_set (&pipeev, evfd, EV_READ); 1204 ev_io_set (&pipe_w, evfd, EV_READ);
1016 } 1205 }
1017 else 1206 else
1018#endif 1207#endif
1019 { 1208 {
1020 while (pipe (evpipe)) 1209 while (pipe (evpipe))
1021 syserr ("(libev) error creating signal/async pipe"); 1210 ev_syserr ("(libev) error creating signal/async pipe");
1022 1211
1023 fd_intern (evpipe [0]); 1212 fd_intern (evpipe [0]);
1024 fd_intern (evpipe [1]); 1213 fd_intern (evpipe [1]);
1025 ev_io_set (&pipeev, evpipe [0], EV_READ); 1214 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1026 } 1215 }
1027 1216
1028 ev_io_start (EV_A_ &pipeev); 1217 ev_io_start (EV_A_ &pipe_w);
1029 ev_unref (EV_A); /* watcher should not keep loop alive */ 1218 ev_unref (EV_A); /* watcher should not keep loop alive */
1030 } 1219 }
1031} 1220}
1032 1221
1033void inline_size 1222inline_size void
1034evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1223evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1035{ 1224{
1036 if (!*flag) 1225 if (!*flag)
1037 { 1226 {
1038 int old_errno = errno; /* save errno because write might clobber it */ 1227 int old_errno = errno; /* save errno because write might clobber it */
… …
1051 1240
1052 errno = old_errno; 1241 errno = old_errno;
1053 } 1242 }
1054} 1243}
1055 1244
1245/* called whenever the libev signal pipe */
1246/* got some events (signal, async) */
1056static void 1247static void
1057pipecb (EV_P_ ev_io *iow, int revents) 1248pipecb (EV_P_ ev_io *iow, int revents)
1058{ 1249{
1250 int i;
1251
1059#if EV_USE_EVENTFD 1252#if EV_USE_EVENTFD
1060 if (evfd >= 0) 1253 if (evfd >= 0)
1061 { 1254 {
1062 uint64_t counter; 1255 uint64_t counter;
1063 read (evfd, &counter, sizeof (uint64_t)); 1256 read (evfd, &counter, sizeof (uint64_t));
… …
1067 { 1260 {
1068 char dummy; 1261 char dummy;
1069 read (evpipe [0], &dummy, 1); 1262 read (evpipe [0], &dummy, 1);
1070 } 1263 }
1071 1264
1072 if (gotsig && ev_is_default_loop (EV_A)) 1265 if (sig_pending)
1073 { 1266 {
1074 int signum; 1267 sig_pending = 0;
1075 gotsig = 0;
1076 1268
1077 for (signum = signalmax; signum--; ) 1269 for (i = EV_NSIG - 1; i--; )
1078 if (signals [signum].gotsig) 1270 if (expect_false (signals [i].pending))
1079 ev_feed_signal_event (EV_A_ signum + 1); 1271 ev_feed_signal_event (EV_A_ i + 1);
1080 } 1272 }
1081 1273
1082#if EV_ASYNC_ENABLE 1274#if EV_ASYNC_ENABLE
1083 if (gotasync) 1275 if (async_pending)
1084 { 1276 {
1085 int i; 1277 async_pending = 0;
1086 gotasync = 0;
1087 1278
1088 for (i = asynccnt; i--; ) 1279 for (i = asynccnt; i--; )
1089 if (asyncs [i]->sent) 1280 if (asyncs [i]->sent)
1090 { 1281 {
1091 asyncs [i]->sent = 0; 1282 asyncs [i]->sent = 0;
… …
1099 1290
1100static void 1291static void
1101ev_sighandler (int signum) 1292ev_sighandler (int signum)
1102{ 1293{
1103#if EV_MULTIPLICITY 1294#if EV_MULTIPLICITY
1104 struct ev_loop *loop = &default_loop_struct; 1295 EV_P = signals [signum - 1].loop;
1105#endif 1296#endif
1106 1297
1107#if _WIN32 1298#if _WIN32
1108 signal (signum, ev_sighandler); 1299 signal (signum, ev_sighandler);
1109#endif 1300#endif
1110 1301
1111 signals [signum - 1].gotsig = 1; 1302 signals [signum - 1].pending = 1;
1112 evpipe_write (EV_A_ &gotsig); 1303 evpipe_write (EV_A_ &sig_pending);
1113} 1304}
1114 1305
1115void noinline 1306void noinline
1116ev_feed_signal_event (EV_P_ int signum) 1307ev_feed_signal_event (EV_P_ int signum)
1117{ 1308{
1118 WL w; 1309 WL w;
1119 1310
1311 if (expect_false (signum <= 0 || signum > EV_NSIG))
1312 return;
1313
1314 --signum;
1315
1120#if EV_MULTIPLICITY 1316#if EV_MULTIPLICITY
1121 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1317 /* it is permissible to try to feed a signal to the wrong loop */
1122#endif 1318 /* or, likely more useful, feeding a signal nobody is waiting for */
1123 1319
1124 --signum; 1320 if (expect_false (signals [signum].loop != EV_A))
1125
1126 if (signum < 0 || signum >= signalmax)
1127 return; 1321 return;
1322#endif
1128 1323
1129 signals [signum].gotsig = 0; 1324 signals [signum].pending = 0;
1130 1325
1131 for (w = signals [signum].head; w; w = w->next) 1326 for (w = signals [signum].head; w; w = w->next)
1132 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1327 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1133} 1328}
1134 1329
1330#if EV_USE_SIGNALFD
1331static void
1332sigfdcb (EV_P_ ev_io *iow, int revents)
1333{
1334 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1335
1336 for (;;)
1337 {
1338 ssize_t res = read (sigfd, si, sizeof (si));
1339
1340 /* not ISO-C, as res might be -1, but works with SuS */
1341 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1342 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1343
1344 if (res < (ssize_t)sizeof (si))
1345 break;
1346 }
1347}
1348#endif
1349
1135/*****************************************************************************/ 1350/*****************************************************************************/
1136 1351
1137static WL childs [EV_PID_HASHSIZE]; 1352static WL childs [EV_PID_HASHSIZE];
1138 1353
1139#ifndef _WIN32 1354#ifndef _WIN32
… …
1142 1357
1143#ifndef WIFCONTINUED 1358#ifndef WIFCONTINUED
1144# define WIFCONTINUED(status) 0 1359# define WIFCONTINUED(status) 0
1145#endif 1360#endif
1146 1361
1147void inline_speed 1362/* handle a single child status event */
1363inline_speed void
1148child_reap (EV_P_ int chain, int pid, int status) 1364child_reap (EV_P_ int chain, int pid, int status)
1149{ 1365{
1150 ev_child *w; 1366 ev_child *w;
1151 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1367 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1152 1368
… …
1165 1381
1166#ifndef WCONTINUED 1382#ifndef WCONTINUED
1167# define WCONTINUED 0 1383# define WCONTINUED 0
1168#endif 1384#endif
1169 1385
1386/* called on sigchld etc., calls waitpid */
1170static void 1387static void
1171childcb (EV_P_ ev_signal *sw, int revents) 1388childcb (EV_P_ ev_signal *sw, int revents)
1172{ 1389{
1173 int pid, status; 1390 int pid, status;
1174 1391
… …
1255 /* kqueue is borked on everything but netbsd apparently */ 1472 /* kqueue is borked on everything but netbsd apparently */
1256 /* it usually doesn't work correctly on anything but sockets and pipes */ 1473 /* it usually doesn't work correctly on anything but sockets and pipes */
1257 flags &= ~EVBACKEND_KQUEUE; 1474 flags &= ~EVBACKEND_KQUEUE;
1258#endif 1475#endif
1259#ifdef __APPLE__ 1476#ifdef __APPLE__
1260 // flags &= ~EVBACKEND_KQUEUE; for documentation 1477 /* only select works correctly on that "unix-certified" platform */
1261 flags &= ~EVBACKEND_POLL; 1478 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1479 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1262#endif 1480#endif
1263 1481
1264 return flags; 1482 return flags;
1265} 1483}
1266 1484
… …
1280ev_backend (EV_P) 1498ev_backend (EV_P)
1281{ 1499{
1282 return backend; 1500 return backend;
1283} 1501}
1284 1502
1503#if EV_MINIMAL < 2
1285unsigned int 1504unsigned int
1286ev_loop_count (EV_P) 1505ev_loop_count (EV_P)
1287{ 1506{
1288 return loop_count; 1507 return loop_count;
1289} 1508}
1290 1509
1510unsigned int
1511ev_loop_depth (EV_P)
1512{
1513 return loop_depth;
1514}
1515
1291void 1516void
1292ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1517ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1293{ 1518{
1294 io_blocktime = interval; 1519 io_blocktime = interval;
1295} 1520}
… …
1298ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1523ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1299{ 1524{
1300 timeout_blocktime = interval; 1525 timeout_blocktime = interval;
1301} 1526}
1302 1527
1528void
1529ev_set_userdata (EV_P_ void *data)
1530{
1531 userdata = data;
1532}
1533
1534void *
1535ev_userdata (EV_P)
1536{
1537 return userdata;
1538}
1539
1540void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1541{
1542 invoke_cb = invoke_pending_cb;
1543}
1544
1545void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1546{
1547 release_cb = release;
1548 acquire_cb = acquire;
1549}
1550#endif
1551
1552/* initialise a loop structure, must be zero-initialised */
1303static void noinline 1553static void noinline
1304loop_init (EV_P_ unsigned int flags) 1554loop_init (EV_P_ unsigned int flags)
1305{ 1555{
1306 if (!backend) 1556 if (!backend)
1307 { 1557 {
1558#if EV_USE_REALTIME
1559 if (!have_realtime)
1560 {
1561 struct timespec ts;
1562
1563 if (!clock_gettime (CLOCK_REALTIME, &ts))
1564 have_realtime = 1;
1565 }
1566#endif
1567
1308#if EV_USE_MONOTONIC 1568#if EV_USE_MONOTONIC
1569 if (!have_monotonic)
1309 { 1570 {
1310 struct timespec ts; 1571 struct timespec ts;
1572
1311 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1573 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1312 have_monotonic = 1; 1574 have_monotonic = 1;
1313 } 1575 }
1314#endif 1576#endif
1577
1578 /* pid check not overridable via env */
1579#ifndef _WIN32
1580 if (flags & EVFLAG_FORKCHECK)
1581 curpid = getpid ();
1582#endif
1583
1584 if (!(flags & EVFLAG_NOENV)
1585 && !enable_secure ()
1586 && getenv ("LIBEV_FLAGS"))
1587 flags = atoi (getenv ("LIBEV_FLAGS"));
1315 1588
1316 ev_rt_now = ev_time (); 1589 ev_rt_now = ev_time ();
1317 mn_now = get_clock (); 1590 mn_now = get_clock ();
1318 now_floor = mn_now; 1591 now_floor = mn_now;
1319 rtmn_diff = ev_rt_now - mn_now; 1592 rtmn_diff = ev_rt_now - mn_now;
1593#if EV_MINIMAL < 2
1594 invoke_cb = ev_invoke_pending;
1595#endif
1320 1596
1321 io_blocktime = 0.; 1597 io_blocktime = 0.;
1322 timeout_blocktime = 0.; 1598 timeout_blocktime = 0.;
1323 backend = 0; 1599 backend = 0;
1324 backend_fd = -1; 1600 backend_fd = -1;
1325 gotasync = 0; 1601 sig_pending = 0;
1602#if EV_ASYNC_ENABLE
1603 async_pending = 0;
1604#endif
1326#if EV_USE_INOTIFY 1605#if EV_USE_INOTIFY
1327 fs_fd = -2; 1606 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1328#endif 1607#endif
1329 1608#if EV_USE_SIGNALFD
1330 /* pid check not overridable via env */ 1609 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1331#ifndef _WIN32
1332 if (flags & EVFLAG_FORKCHECK)
1333 curpid = getpid ();
1334#endif 1610#endif
1335
1336 if (!(flags & EVFLAG_NOENV)
1337 && !enable_secure ()
1338 && getenv ("LIBEV_FLAGS"))
1339 flags = atoi (getenv ("LIBEV_FLAGS"));
1340 1611
1341 if (!(flags & 0x0000ffffU)) 1612 if (!(flags & 0x0000ffffU))
1342 flags |= ev_recommended_backends (); 1613 flags |= ev_recommended_backends ();
1343 1614
1344#if EV_USE_PORT 1615#if EV_USE_PORT
… …
1355#endif 1626#endif
1356#if EV_USE_SELECT 1627#if EV_USE_SELECT
1357 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1628 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1358#endif 1629#endif
1359 1630
1631 ev_prepare_init (&pending_w, pendingcb);
1632
1360 ev_init (&pipeev, pipecb); 1633 ev_init (&pipe_w, pipecb);
1361 ev_set_priority (&pipeev, EV_MAXPRI); 1634 ev_set_priority (&pipe_w, EV_MAXPRI);
1362 } 1635 }
1363} 1636}
1364 1637
1638/* free up a loop structure */
1365static void noinline 1639static void noinline
1366loop_destroy (EV_P) 1640loop_destroy (EV_P)
1367{ 1641{
1368 int i; 1642 int i;
1369 1643
1370 if (ev_is_active (&pipeev)) 1644 if (ev_is_active (&pipe_w))
1371 { 1645 {
1372 ev_ref (EV_A); /* signal watcher */ 1646 /*ev_ref (EV_A);*/
1373 ev_io_stop (EV_A_ &pipeev); 1647 /*ev_io_stop (EV_A_ &pipe_w);*/
1374 1648
1375#if EV_USE_EVENTFD 1649#if EV_USE_EVENTFD
1376 if (evfd >= 0) 1650 if (evfd >= 0)
1377 close (evfd); 1651 close (evfd);
1378#endif 1652#endif
1379 1653
1380 if (evpipe [0] >= 0) 1654 if (evpipe [0] >= 0)
1381 { 1655 {
1382 close (evpipe [0]); 1656 EV_WIN32_CLOSE_FD (evpipe [0]);
1383 close (evpipe [1]); 1657 EV_WIN32_CLOSE_FD (evpipe [1]);
1384 } 1658 }
1385 } 1659 }
1660
1661#if EV_USE_SIGNALFD
1662 if (ev_is_active (&sigfd_w))
1663 close (sigfd);
1664#endif
1386 1665
1387#if EV_USE_INOTIFY 1666#if EV_USE_INOTIFY
1388 if (fs_fd >= 0) 1667 if (fs_fd >= 0)
1389 close (fs_fd); 1668 close (fs_fd);
1390#endif 1669#endif
… …
1414#if EV_IDLE_ENABLE 1693#if EV_IDLE_ENABLE
1415 array_free (idle, [i]); 1694 array_free (idle, [i]);
1416#endif 1695#endif
1417 } 1696 }
1418 1697
1419 ev_free (anfds); anfdmax = 0; 1698 ev_free (anfds); anfds = 0; anfdmax = 0;
1420 1699
1421 /* have to use the microsoft-never-gets-it-right macro */ 1700 /* have to use the microsoft-never-gets-it-right macro */
1701 array_free (rfeed, EMPTY);
1422 array_free (fdchange, EMPTY); 1702 array_free (fdchange, EMPTY);
1423 array_free (timer, EMPTY); 1703 array_free (timer, EMPTY);
1424#if EV_PERIODIC_ENABLE 1704#if EV_PERIODIC_ENABLE
1425 array_free (periodic, EMPTY); 1705 array_free (periodic, EMPTY);
1426#endif 1706#endif
… …
1435 1715
1436 backend = 0; 1716 backend = 0;
1437} 1717}
1438 1718
1439#if EV_USE_INOTIFY 1719#if EV_USE_INOTIFY
1440void inline_size infy_fork (EV_P); 1720inline_size void infy_fork (EV_P);
1441#endif 1721#endif
1442 1722
1443void inline_size 1723inline_size void
1444loop_fork (EV_P) 1724loop_fork (EV_P)
1445{ 1725{
1446#if EV_USE_PORT 1726#if EV_USE_PORT
1447 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1727 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1448#endif 1728#endif
… …
1454#endif 1734#endif
1455#if EV_USE_INOTIFY 1735#if EV_USE_INOTIFY
1456 infy_fork (EV_A); 1736 infy_fork (EV_A);
1457#endif 1737#endif
1458 1738
1459 if (ev_is_active (&pipeev)) 1739 if (ev_is_active (&pipe_w))
1460 { 1740 {
1461 /* this "locks" the handlers against writing to the pipe */ 1741 /* this "locks" the handlers against writing to the pipe */
1462 /* while we modify the fd vars */ 1742 /* while we modify the fd vars */
1463 gotsig = 1; 1743 sig_pending = 1;
1464#if EV_ASYNC_ENABLE 1744#if EV_ASYNC_ENABLE
1465 gotasync = 1; 1745 async_pending = 1;
1466#endif 1746#endif
1467 1747
1468 ev_ref (EV_A); 1748 ev_ref (EV_A);
1469 ev_io_stop (EV_A_ &pipeev); 1749 ev_io_stop (EV_A_ &pipe_w);
1470 1750
1471#if EV_USE_EVENTFD 1751#if EV_USE_EVENTFD
1472 if (evfd >= 0) 1752 if (evfd >= 0)
1473 close (evfd); 1753 close (evfd);
1474#endif 1754#endif
1475 1755
1476 if (evpipe [0] >= 0) 1756 if (evpipe [0] >= 0)
1477 { 1757 {
1478 close (evpipe [0]); 1758 EV_WIN32_CLOSE_FD (evpipe [0]);
1479 close (evpipe [1]); 1759 EV_WIN32_CLOSE_FD (evpipe [1]);
1480 } 1760 }
1481 1761
1482 evpipe_init (EV_A); 1762 evpipe_init (EV_A);
1483 /* now iterate over everything, in case we missed something */ 1763 /* now iterate over everything, in case we missed something */
1484 pipecb (EV_A_ &pipeev, EV_READ); 1764 pipecb (EV_A_ &pipe_w, EV_READ);
1485 } 1765 }
1486 1766
1487 postfork = 0; 1767 postfork = 0;
1488} 1768}
1489 1769
1490#if EV_MULTIPLICITY 1770#if EV_MULTIPLICITY
1491 1771
1492struct ev_loop * 1772struct ev_loop *
1493ev_loop_new (unsigned int flags) 1773ev_loop_new (unsigned int flags)
1494{ 1774{
1495 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1775 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1496 1776
1497 memset (loop, 0, sizeof (struct ev_loop)); 1777 memset (EV_A, 0, sizeof (struct ev_loop));
1498
1499 loop_init (EV_A_ flags); 1778 loop_init (EV_A_ flags);
1500 1779
1501 if (ev_backend (EV_A)) 1780 if (ev_backend (EV_A))
1502 return loop; 1781 return EV_A;
1503 1782
1504 return 0; 1783 return 0;
1505} 1784}
1506 1785
1507void 1786void
… …
1514void 1793void
1515ev_loop_fork (EV_P) 1794ev_loop_fork (EV_P)
1516{ 1795{
1517 postfork = 1; /* must be in line with ev_default_fork */ 1796 postfork = 1; /* must be in line with ev_default_fork */
1518} 1797}
1798#endif /* multiplicity */
1519 1799
1520#if EV_VERIFY 1800#if EV_VERIFY
1521static void noinline 1801static void noinline
1522verify_watcher (EV_P_ W w) 1802verify_watcher (EV_P_ W w)
1523{ 1803{
1524 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1804 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1525 1805
1526 if (w->pending) 1806 if (w->pending)
1527 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1807 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1528} 1808}
1529 1809
1530static void noinline 1810static void noinline
1531verify_heap (EV_P_ ANHE *heap, int N) 1811verify_heap (EV_P_ ANHE *heap, int N)
1532{ 1812{
1533 int i; 1813 int i;
1534 1814
1535 for (i = HEAP0; i < N + HEAP0; ++i) 1815 for (i = HEAP0; i < N + HEAP0; ++i)
1536 { 1816 {
1537 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1817 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1538 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1818 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1539 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1819 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1540 1820
1541 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1821 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1542 } 1822 }
1543} 1823}
1544 1824
1545static void noinline 1825static void noinline
1546array_verify (EV_P_ W *ws, int cnt) 1826array_verify (EV_P_ W *ws, int cnt)
1547{ 1827{
1548 while (cnt--) 1828 while (cnt--)
1549 { 1829 {
1550 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1830 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1551 verify_watcher (EV_A_ ws [cnt]); 1831 verify_watcher (EV_A_ ws [cnt]);
1552 } 1832 }
1553} 1833}
1554#endif 1834#endif
1555 1835
1836#if EV_MINIMAL < 2
1556void 1837void
1557ev_loop_verify (EV_P) 1838ev_loop_verify (EV_P)
1558{ 1839{
1559#if EV_VERIFY 1840#if EV_VERIFY
1560 int i; 1841 int i;
… …
1562 1843
1563 assert (activecnt >= -1); 1844 assert (activecnt >= -1);
1564 1845
1565 assert (fdchangemax >= fdchangecnt); 1846 assert (fdchangemax >= fdchangecnt);
1566 for (i = 0; i < fdchangecnt; ++i) 1847 for (i = 0; i < fdchangecnt; ++i)
1567 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1848 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1568 1849
1569 assert (anfdmax >= 0); 1850 assert (anfdmax >= 0);
1570 for (i = 0; i < anfdmax; ++i) 1851 for (i = 0; i < anfdmax; ++i)
1571 for (w = anfds [i].head; w; w = w->next) 1852 for (w = anfds [i].head; w; w = w->next)
1572 { 1853 {
1573 verify_watcher (EV_A_ (W)w); 1854 verify_watcher (EV_A_ (W)w);
1574 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1855 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1575 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1856 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1576 } 1857 }
1577 1858
1578 assert (timermax >= timercnt); 1859 assert (timermax >= timercnt);
1579 verify_heap (EV_A_ timers, timercnt); 1860 verify_heap (EV_A_ timers, timercnt);
1580 1861
… …
1609 assert (checkmax >= checkcnt); 1890 assert (checkmax >= checkcnt);
1610 array_verify (EV_A_ (W *)checks, checkcnt); 1891 array_verify (EV_A_ (W *)checks, checkcnt);
1611 1892
1612# if 0 1893# if 0
1613 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1894 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1614 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1895 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1615# endif
1616#endif 1896# endif
1897#endif
1617} 1898}
1618 1899#endif
1619#endif /* multiplicity */
1620 1900
1621#if EV_MULTIPLICITY 1901#if EV_MULTIPLICITY
1622struct ev_loop * 1902struct ev_loop *
1623ev_default_loop_init (unsigned int flags) 1903ev_default_loop_init (unsigned int flags)
1624#else 1904#else
… …
1627#endif 1907#endif
1628{ 1908{
1629 if (!ev_default_loop_ptr) 1909 if (!ev_default_loop_ptr)
1630 { 1910 {
1631#if EV_MULTIPLICITY 1911#if EV_MULTIPLICITY
1632 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1912 EV_P = ev_default_loop_ptr = &default_loop_struct;
1633#else 1913#else
1634 ev_default_loop_ptr = 1; 1914 ev_default_loop_ptr = 1;
1635#endif 1915#endif
1636 1916
1637 loop_init (EV_A_ flags); 1917 loop_init (EV_A_ flags);
… …
1654 1934
1655void 1935void
1656ev_default_destroy (void) 1936ev_default_destroy (void)
1657{ 1937{
1658#if EV_MULTIPLICITY 1938#if EV_MULTIPLICITY
1659 struct ev_loop *loop = ev_default_loop_ptr; 1939 EV_P = ev_default_loop_ptr;
1660#endif 1940#endif
1941
1942 ev_default_loop_ptr = 0;
1661 1943
1662#ifndef _WIN32 1944#ifndef _WIN32
1663 ev_ref (EV_A); /* child watcher */ 1945 ev_ref (EV_A); /* child watcher */
1664 ev_signal_stop (EV_A_ &childev); 1946 ev_signal_stop (EV_A_ &childev);
1665#endif 1947#endif
… …
1669 1951
1670void 1952void
1671ev_default_fork (void) 1953ev_default_fork (void)
1672{ 1954{
1673#if EV_MULTIPLICITY 1955#if EV_MULTIPLICITY
1674 struct ev_loop *loop = ev_default_loop_ptr; 1956 EV_P = ev_default_loop_ptr;
1675#endif 1957#endif
1676 1958
1677 if (backend)
1678 postfork = 1; /* must be in line with ev_loop_fork */ 1959 postfork = 1; /* must be in line with ev_loop_fork */
1679} 1960}
1680 1961
1681/*****************************************************************************/ 1962/*****************************************************************************/
1682 1963
1683void 1964void
1684ev_invoke (EV_P_ void *w, int revents) 1965ev_invoke (EV_P_ void *w, int revents)
1685{ 1966{
1686 EV_CB_INVOKE ((W)w, revents); 1967 EV_CB_INVOKE ((W)w, revents);
1687} 1968}
1688 1969
1689void inline_speed 1970unsigned int
1690call_pending (EV_P) 1971ev_pending_count (EV_P)
1972{
1973 int pri;
1974 unsigned int count = 0;
1975
1976 for (pri = NUMPRI; pri--; )
1977 count += pendingcnt [pri];
1978
1979 return count;
1980}
1981
1982void noinline
1983ev_invoke_pending (EV_P)
1691{ 1984{
1692 int pri; 1985 int pri;
1693 1986
1694 for (pri = NUMPRI; pri--; ) 1987 for (pri = NUMPRI; pri--; )
1695 while (pendingcnt [pri]) 1988 while (pendingcnt [pri])
1696 { 1989 {
1697 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1990 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1698 1991
1699 if (expect_true (p->w))
1700 {
1701 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1992 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1993 /* ^ this is no longer true, as pending_w could be here */
1702 1994
1703 p->w->pending = 0; 1995 p->w->pending = 0;
1704 EV_CB_INVOKE (p->w, p->events); 1996 EV_CB_INVOKE (p->w, p->events);
1705 EV_FREQUENT_CHECK; 1997 EV_FREQUENT_CHECK;
1706 }
1707 } 1998 }
1708} 1999}
1709 2000
1710#if EV_IDLE_ENABLE 2001#if EV_IDLE_ENABLE
1711void inline_size 2002/* make idle watchers pending. this handles the "call-idle */
2003/* only when higher priorities are idle" logic */
2004inline_size void
1712idle_reify (EV_P) 2005idle_reify (EV_P)
1713{ 2006{
1714 if (expect_false (idleall)) 2007 if (expect_false (idleall))
1715 { 2008 {
1716 int pri; 2009 int pri;
… …
1728 } 2021 }
1729 } 2022 }
1730} 2023}
1731#endif 2024#endif
1732 2025
1733void inline_size 2026/* make timers pending */
2027inline_size void
1734timers_reify (EV_P) 2028timers_reify (EV_P)
1735{ 2029{
1736 EV_FREQUENT_CHECK; 2030 EV_FREQUENT_CHECK;
1737 2031
1738 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2032 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1739 { 2033 {
1740 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2034 do
1741
1742 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1743
1744 /* first reschedule or stop timer */
1745 if (w->repeat)
1746 { 2035 {
2036 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2037
2038 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2039
2040 /* first reschedule or stop timer */
2041 if (w->repeat)
2042 {
1747 ev_at (w) += w->repeat; 2043 ev_at (w) += w->repeat;
1748 if (ev_at (w) < mn_now) 2044 if (ev_at (w) < mn_now)
1749 ev_at (w) = mn_now; 2045 ev_at (w) = mn_now;
1750 2046
1751 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2047 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1752 2048
1753 ANHE_at_cache (timers [HEAP0]); 2049 ANHE_at_cache (timers [HEAP0]);
1754 downheap (timers, timercnt, HEAP0); 2050 downheap (timers, timercnt, HEAP0);
2051 }
2052 else
2053 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2054
2055 EV_FREQUENT_CHECK;
2056 feed_reverse (EV_A_ (W)w);
1755 } 2057 }
1756 else 2058 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1757 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1758 2059
1759 EV_FREQUENT_CHECK;
1760 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2060 feed_reverse_done (EV_A_ EV_TIMEOUT);
1761 } 2061 }
1762} 2062}
1763 2063
1764#if EV_PERIODIC_ENABLE 2064#if EV_PERIODIC_ENABLE
1765void inline_size 2065/* make periodics pending */
2066inline_size void
1766periodics_reify (EV_P) 2067periodics_reify (EV_P)
1767{ 2068{
1768 EV_FREQUENT_CHECK; 2069 EV_FREQUENT_CHECK;
1769 2070
1770 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2071 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1771 { 2072 {
1772 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2073 int feed_count = 0;
1773 2074
1774 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2075 do
1775
1776 /* first reschedule or stop timer */
1777 if (w->reschedule_cb)
1778 { 2076 {
2077 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2078
2079 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2080
2081 /* first reschedule or stop timer */
2082 if (w->reschedule_cb)
2083 {
1779 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2084 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1780 2085
1781 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2086 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1782 2087
1783 ANHE_at_cache (periodics [HEAP0]); 2088 ANHE_at_cache (periodics [HEAP0]);
1784 downheap (periodics, periodiccnt, HEAP0); 2089 downheap (periodics, periodiccnt, HEAP0);
2090 }
2091 else if (w->interval)
2092 {
2093 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2094 /* if next trigger time is not sufficiently in the future, put it there */
2095 /* this might happen because of floating point inexactness */
2096 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2097 {
2098 ev_at (w) += w->interval;
2099
2100 /* if interval is unreasonably low we might still have a time in the past */
2101 /* so correct this. this will make the periodic very inexact, but the user */
2102 /* has effectively asked to get triggered more often than possible */
2103 if (ev_at (w) < ev_rt_now)
2104 ev_at (w) = ev_rt_now;
2105 }
2106
2107 ANHE_at_cache (periodics [HEAP0]);
2108 downheap (periodics, periodiccnt, HEAP0);
2109 }
2110 else
2111 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2112
2113 EV_FREQUENT_CHECK;
2114 feed_reverse (EV_A_ (W)w);
1785 } 2115 }
1786 else if (w->interval) 2116 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1787 {
1788 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1789 /* if next trigger time is not sufficiently in the future, put it there */
1790 /* this might happen because of floating point inexactness */
1791 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1792 {
1793 ev_at (w) += w->interval;
1794 2117
1795 /* if interval is unreasonably low we might still have a time in the past */
1796 /* so correct this. this will make the periodic very inexact, but the user */
1797 /* has effectively asked to get triggered more often than possible */
1798 if (ev_at (w) < ev_rt_now)
1799 ev_at (w) = ev_rt_now;
1800 }
1801
1802 ANHE_at_cache (periodics [HEAP0]);
1803 downheap (periodics, periodiccnt, HEAP0);
1804 }
1805 else
1806 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1807
1808 EV_FREQUENT_CHECK;
1809 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2118 feed_reverse_done (EV_A_ EV_PERIODIC);
1810 } 2119 }
1811} 2120}
1812 2121
2122/* simply recalculate all periodics */
2123/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1813static void noinline 2124static void noinline
1814periodics_reschedule (EV_P) 2125periodics_reschedule (EV_P)
1815{ 2126{
1816 int i; 2127 int i;
1817 2128
… …
1830 2141
1831 reheap (periodics, periodiccnt); 2142 reheap (periodics, periodiccnt);
1832} 2143}
1833#endif 2144#endif
1834 2145
1835void inline_speed 2146/* adjust all timers by a given offset */
2147static void noinline
2148timers_reschedule (EV_P_ ev_tstamp adjust)
2149{
2150 int i;
2151
2152 for (i = 0; i < timercnt; ++i)
2153 {
2154 ANHE *he = timers + i + HEAP0;
2155 ANHE_w (*he)->at += adjust;
2156 ANHE_at_cache (*he);
2157 }
2158}
2159
2160/* fetch new monotonic and realtime times from the kernel */
2161/* also detetc if there was a timejump, and act accordingly */
2162inline_speed void
1836time_update (EV_P_ ev_tstamp max_block) 2163time_update (EV_P_ ev_tstamp max_block)
1837{ 2164{
1838 int i;
1839
1840#if EV_USE_MONOTONIC 2165#if EV_USE_MONOTONIC
1841 if (expect_true (have_monotonic)) 2166 if (expect_true (have_monotonic))
1842 { 2167 {
2168 int i;
1843 ev_tstamp odiff = rtmn_diff; 2169 ev_tstamp odiff = rtmn_diff;
1844 2170
1845 mn_now = get_clock (); 2171 mn_now = get_clock ();
1846 2172
1847 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2173 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1873 ev_rt_now = ev_time (); 2199 ev_rt_now = ev_time ();
1874 mn_now = get_clock (); 2200 mn_now = get_clock ();
1875 now_floor = mn_now; 2201 now_floor = mn_now;
1876 } 2202 }
1877 2203
2204 /* no timer adjustment, as the monotonic clock doesn't jump */
2205 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1878# if EV_PERIODIC_ENABLE 2206# if EV_PERIODIC_ENABLE
1879 periodics_reschedule (EV_A); 2207 periodics_reschedule (EV_A);
1880# endif 2208# endif
1881 /* no timer adjustment, as the monotonic clock doesn't jump */
1882 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1883 } 2209 }
1884 else 2210 else
1885#endif 2211#endif
1886 { 2212 {
1887 ev_rt_now = ev_time (); 2213 ev_rt_now = ev_time ();
1888 2214
1889 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2215 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1890 { 2216 {
2217 /* adjust timers. this is easy, as the offset is the same for all of them */
2218 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1891#if EV_PERIODIC_ENABLE 2219#if EV_PERIODIC_ENABLE
1892 periodics_reschedule (EV_A); 2220 periodics_reschedule (EV_A);
1893#endif 2221#endif
1894 /* adjust timers. this is easy, as the offset is the same for all of them */
1895 for (i = 0; i < timercnt; ++i)
1896 {
1897 ANHE *he = timers + i + HEAP0;
1898 ANHE_w (*he)->at += ev_rt_now - mn_now;
1899 ANHE_at_cache (*he);
1900 }
1901 } 2222 }
1902 2223
1903 mn_now = ev_rt_now; 2224 mn_now = ev_rt_now;
1904 } 2225 }
1905} 2226}
1906 2227
1907void 2228void
1908ev_ref (EV_P)
1909{
1910 ++activecnt;
1911}
1912
1913void
1914ev_unref (EV_P)
1915{
1916 --activecnt;
1917}
1918
1919void
1920ev_now_update (EV_P)
1921{
1922 time_update (EV_A_ 1e100);
1923}
1924
1925static int loop_done;
1926
1927void
1928ev_loop (EV_P_ int flags) 2229ev_loop (EV_P_ int flags)
1929{ 2230{
2231#if EV_MINIMAL < 2
2232 ++loop_depth;
2233#endif
2234
2235 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2236
1930 loop_done = EVUNLOOP_CANCEL; 2237 loop_done = EVUNLOOP_CANCEL;
1931 2238
1932 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2239 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1933 2240
1934 do 2241 do
1935 { 2242 {
1936#if EV_VERIFY >= 2 2243#if EV_VERIFY >= 2
1937 ev_loop_verify (EV_A); 2244 ev_loop_verify (EV_A);
… …
1950 /* we might have forked, so queue fork handlers */ 2257 /* we might have forked, so queue fork handlers */
1951 if (expect_false (postfork)) 2258 if (expect_false (postfork))
1952 if (forkcnt) 2259 if (forkcnt)
1953 { 2260 {
1954 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2261 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1955 call_pending (EV_A); 2262 EV_INVOKE_PENDING;
1956 } 2263 }
1957#endif 2264#endif
1958 2265
1959 /* queue prepare watchers (and execute them) */ 2266 /* queue prepare watchers (and execute them) */
1960 if (expect_false (preparecnt)) 2267 if (expect_false (preparecnt))
1961 { 2268 {
1962 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2269 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1963 call_pending (EV_A); 2270 EV_INVOKE_PENDING;
1964 } 2271 }
1965 2272
1966 if (expect_false (!activecnt)) 2273 if (expect_false (loop_done))
1967 break; 2274 break;
1968 2275
1969 /* we might have forked, so reify kernel state if necessary */ 2276 /* we might have forked, so reify kernel state if necessary */
1970 if (expect_false (postfork)) 2277 if (expect_false (postfork))
1971 loop_fork (EV_A); 2278 loop_fork (EV_A);
… …
1978 ev_tstamp waittime = 0.; 2285 ev_tstamp waittime = 0.;
1979 ev_tstamp sleeptime = 0.; 2286 ev_tstamp sleeptime = 0.;
1980 2287
1981 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2288 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1982 { 2289 {
2290 /* remember old timestamp for io_blocktime calculation */
2291 ev_tstamp prev_mn_now = mn_now;
2292
1983 /* update time to cancel out callback processing overhead */ 2293 /* update time to cancel out callback processing overhead */
1984 time_update (EV_A_ 1e100); 2294 time_update (EV_A_ 1e100);
1985 2295
1986 waittime = MAX_BLOCKTIME; 2296 waittime = MAX_BLOCKTIME;
1987 2297
… …
1997 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2307 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1998 if (waittime > to) waittime = to; 2308 if (waittime > to) waittime = to;
1999 } 2309 }
2000#endif 2310#endif
2001 2311
2312 /* don't let timeouts decrease the waittime below timeout_blocktime */
2002 if (expect_false (waittime < timeout_blocktime)) 2313 if (expect_false (waittime < timeout_blocktime))
2003 waittime = timeout_blocktime; 2314 waittime = timeout_blocktime;
2004 2315
2005 sleeptime = waittime - backend_fudge; 2316 /* extra check because io_blocktime is commonly 0 */
2006
2007 if (expect_true (sleeptime > io_blocktime)) 2317 if (expect_false (io_blocktime))
2008 sleeptime = io_blocktime;
2009
2010 if (sleeptime)
2011 { 2318 {
2319 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2320
2321 if (sleeptime > waittime - backend_fudge)
2322 sleeptime = waittime - backend_fudge;
2323
2324 if (expect_true (sleeptime > 0.))
2325 {
2012 ev_sleep (sleeptime); 2326 ev_sleep (sleeptime);
2013 waittime -= sleeptime; 2327 waittime -= sleeptime;
2328 }
2014 } 2329 }
2015 } 2330 }
2016 2331
2332#if EV_MINIMAL < 2
2017 ++loop_count; 2333 ++loop_count;
2334#endif
2335 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2018 backend_poll (EV_A_ waittime); 2336 backend_poll (EV_A_ waittime);
2337 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2019 2338
2020 /* update ev_rt_now, do magic */ 2339 /* update ev_rt_now, do magic */
2021 time_update (EV_A_ waittime + sleeptime); 2340 time_update (EV_A_ waittime + sleeptime);
2022 } 2341 }
2023 2342
… …
2034 2353
2035 /* queue check watchers, to be executed first */ 2354 /* queue check watchers, to be executed first */
2036 if (expect_false (checkcnt)) 2355 if (expect_false (checkcnt))
2037 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2356 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2038 2357
2039 call_pending (EV_A); 2358 EV_INVOKE_PENDING;
2040 } 2359 }
2041 while (expect_true ( 2360 while (expect_true (
2042 activecnt 2361 activecnt
2043 && !loop_done 2362 && !loop_done
2044 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2363 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2045 )); 2364 ));
2046 2365
2047 if (loop_done == EVUNLOOP_ONE) 2366 if (loop_done == EVUNLOOP_ONE)
2048 loop_done = EVUNLOOP_CANCEL; 2367 loop_done = EVUNLOOP_CANCEL;
2368
2369#if EV_MINIMAL < 2
2370 --loop_depth;
2371#endif
2049} 2372}
2050 2373
2051void 2374void
2052ev_unloop (EV_P_ int how) 2375ev_unloop (EV_P_ int how)
2053{ 2376{
2054 loop_done = how; 2377 loop_done = how;
2055} 2378}
2056 2379
2380void
2381ev_ref (EV_P)
2382{
2383 ++activecnt;
2384}
2385
2386void
2387ev_unref (EV_P)
2388{
2389 --activecnt;
2390}
2391
2392void
2393ev_now_update (EV_P)
2394{
2395 time_update (EV_A_ 1e100);
2396}
2397
2398void
2399ev_suspend (EV_P)
2400{
2401 ev_now_update (EV_A);
2402}
2403
2404void
2405ev_resume (EV_P)
2406{
2407 ev_tstamp mn_prev = mn_now;
2408
2409 ev_now_update (EV_A);
2410 timers_reschedule (EV_A_ mn_now - mn_prev);
2411#if EV_PERIODIC_ENABLE
2412 /* TODO: really do this? */
2413 periodics_reschedule (EV_A);
2414#endif
2415}
2416
2057/*****************************************************************************/ 2417/*****************************************************************************/
2418/* singly-linked list management, used when the expected list length is short */
2058 2419
2059void inline_size 2420inline_size void
2060wlist_add (WL *head, WL elem) 2421wlist_add (WL *head, WL elem)
2061{ 2422{
2062 elem->next = *head; 2423 elem->next = *head;
2063 *head = elem; 2424 *head = elem;
2064} 2425}
2065 2426
2066void inline_size 2427inline_size void
2067wlist_del (WL *head, WL elem) 2428wlist_del (WL *head, WL elem)
2068{ 2429{
2069 while (*head) 2430 while (*head)
2070 { 2431 {
2071 if (*head == elem) 2432 if (expect_true (*head == elem))
2072 { 2433 {
2073 *head = elem->next; 2434 *head = elem->next;
2074 return; 2435 break;
2075 } 2436 }
2076 2437
2077 head = &(*head)->next; 2438 head = &(*head)->next;
2078 } 2439 }
2079} 2440}
2080 2441
2081void inline_speed 2442/* internal, faster, version of ev_clear_pending */
2443inline_speed void
2082clear_pending (EV_P_ W w) 2444clear_pending (EV_P_ W w)
2083{ 2445{
2084 if (w->pending) 2446 if (w->pending)
2085 { 2447 {
2086 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2448 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2087 w->pending = 0; 2449 w->pending = 0;
2088 } 2450 }
2089} 2451}
2090 2452
2091int 2453int
… …
2095 int pending = w_->pending; 2457 int pending = w_->pending;
2096 2458
2097 if (expect_true (pending)) 2459 if (expect_true (pending))
2098 { 2460 {
2099 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2461 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2462 p->w = (W)&pending_w;
2100 w_->pending = 0; 2463 w_->pending = 0;
2101 p->w = 0;
2102 return p->events; 2464 return p->events;
2103 } 2465 }
2104 else 2466 else
2105 return 0; 2467 return 0;
2106} 2468}
2107 2469
2108void inline_size 2470inline_size void
2109pri_adjust (EV_P_ W w) 2471pri_adjust (EV_P_ W w)
2110{ 2472{
2111 int pri = w->priority; 2473 int pri = ev_priority (w);
2112 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2474 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2113 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2475 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2114 w->priority = pri; 2476 ev_set_priority (w, pri);
2115} 2477}
2116 2478
2117void inline_speed 2479inline_speed void
2118ev_start (EV_P_ W w, int active) 2480ev_start (EV_P_ W w, int active)
2119{ 2481{
2120 pri_adjust (EV_A_ w); 2482 pri_adjust (EV_A_ w);
2121 w->active = active; 2483 w->active = active;
2122 ev_ref (EV_A); 2484 ev_ref (EV_A);
2123} 2485}
2124 2486
2125void inline_size 2487inline_size void
2126ev_stop (EV_P_ W w) 2488ev_stop (EV_P_ W w)
2127{ 2489{
2128 ev_unref (EV_A); 2490 ev_unref (EV_A);
2129 w->active = 0; 2491 w->active = 0;
2130} 2492}
… …
2137 int fd = w->fd; 2499 int fd = w->fd;
2138 2500
2139 if (expect_false (ev_is_active (w))) 2501 if (expect_false (ev_is_active (w)))
2140 return; 2502 return;
2141 2503
2142 assert (("ev_io_start called with negative fd", fd >= 0)); 2504 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2505 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2143 2506
2144 EV_FREQUENT_CHECK; 2507 EV_FREQUENT_CHECK;
2145 2508
2146 ev_start (EV_A_ (W)w, 1); 2509 ev_start (EV_A_ (W)w, 1);
2147 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2510 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2148 wlist_add (&anfds[fd].head, (WL)w); 2511 wlist_add (&anfds[fd].head, (WL)w);
2149 2512
2150 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2513 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2151 w->events &= ~EV_IOFDSET; 2514 w->events &= ~EV__IOFDSET;
2152 2515
2153 EV_FREQUENT_CHECK; 2516 EV_FREQUENT_CHECK;
2154} 2517}
2155 2518
2156void noinline 2519void noinline
… …
2158{ 2521{
2159 clear_pending (EV_A_ (W)w); 2522 clear_pending (EV_A_ (W)w);
2160 if (expect_false (!ev_is_active (w))) 2523 if (expect_false (!ev_is_active (w)))
2161 return; 2524 return;
2162 2525
2163 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2526 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2164 2527
2165 EV_FREQUENT_CHECK; 2528 EV_FREQUENT_CHECK;
2166 2529
2167 wlist_del (&anfds[w->fd].head, (WL)w); 2530 wlist_del (&anfds[w->fd].head, (WL)w);
2168 ev_stop (EV_A_ (W)w); 2531 ev_stop (EV_A_ (W)w);
… …
2178 if (expect_false (ev_is_active (w))) 2541 if (expect_false (ev_is_active (w)))
2179 return; 2542 return;
2180 2543
2181 ev_at (w) += mn_now; 2544 ev_at (w) += mn_now;
2182 2545
2183 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2546 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2184 2547
2185 EV_FREQUENT_CHECK; 2548 EV_FREQUENT_CHECK;
2186 2549
2187 ++timercnt; 2550 ++timercnt;
2188 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2551 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2191 ANHE_at_cache (timers [ev_active (w)]); 2554 ANHE_at_cache (timers [ev_active (w)]);
2192 upheap (timers, ev_active (w)); 2555 upheap (timers, ev_active (w));
2193 2556
2194 EV_FREQUENT_CHECK; 2557 EV_FREQUENT_CHECK;
2195 2558
2196 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2559 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2197} 2560}
2198 2561
2199void noinline 2562void noinline
2200ev_timer_stop (EV_P_ ev_timer *w) 2563ev_timer_stop (EV_P_ ev_timer *w)
2201{ 2564{
… …
2206 EV_FREQUENT_CHECK; 2569 EV_FREQUENT_CHECK;
2207 2570
2208 { 2571 {
2209 int active = ev_active (w); 2572 int active = ev_active (w);
2210 2573
2211 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2574 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2212 2575
2213 --timercnt; 2576 --timercnt;
2214 2577
2215 if (expect_true (active < timercnt + HEAP0)) 2578 if (expect_true (active < timercnt + HEAP0))
2216 { 2579 {
… …
2249 } 2612 }
2250 2613
2251 EV_FREQUENT_CHECK; 2614 EV_FREQUENT_CHECK;
2252} 2615}
2253 2616
2617ev_tstamp
2618ev_timer_remaining (EV_P_ ev_timer *w)
2619{
2620 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2621}
2622
2254#if EV_PERIODIC_ENABLE 2623#if EV_PERIODIC_ENABLE
2255void noinline 2624void noinline
2256ev_periodic_start (EV_P_ ev_periodic *w) 2625ev_periodic_start (EV_P_ ev_periodic *w)
2257{ 2626{
2258 if (expect_false (ev_is_active (w))) 2627 if (expect_false (ev_is_active (w)))
… …
2260 2629
2261 if (w->reschedule_cb) 2630 if (w->reschedule_cb)
2262 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2631 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2263 else if (w->interval) 2632 else if (w->interval)
2264 { 2633 {
2265 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2634 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2266 /* this formula differs from the one in periodic_reify because we do not always round up */ 2635 /* this formula differs from the one in periodic_reify because we do not always round up */
2267 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2636 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2268 } 2637 }
2269 else 2638 else
2270 ev_at (w) = w->offset; 2639 ev_at (w) = w->offset;
… …
2278 ANHE_at_cache (periodics [ev_active (w)]); 2647 ANHE_at_cache (periodics [ev_active (w)]);
2279 upheap (periodics, ev_active (w)); 2648 upheap (periodics, ev_active (w));
2280 2649
2281 EV_FREQUENT_CHECK; 2650 EV_FREQUENT_CHECK;
2282 2651
2283 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2652 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2284} 2653}
2285 2654
2286void noinline 2655void noinline
2287ev_periodic_stop (EV_P_ ev_periodic *w) 2656ev_periodic_stop (EV_P_ ev_periodic *w)
2288{ 2657{
… …
2293 EV_FREQUENT_CHECK; 2662 EV_FREQUENT_CHECK;
2294 2663
2295 { 2664 {
2296 int active = ev_active (w); 2665 int active = ev_active (w);
2297 2666
2298 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2667 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2299 2668
2300 --periodiccnt; 2669 --periodiccnt;
2301 2670
2302 if (expect_true (active < periodiccnt + HEAP0)) 2671 if (expect_true (active < periodiccnt + HEAP0))
2303 { 2672 {
… …
2325#endif 2694#endif
2326 2695
2327void noinline 2696void noinline
2328ev_signal_start (EV_P_ ev_signal *w) 2697ev_signal_start (EV_P_ ev_signal *w)
2329{ 2698{
2330#if EV_MULTIPLICITY
2331 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2332#endif
2333 if (expect_false (ev_is_active (w))) 2699 if (expect_false (ev_is_active (w)))
2334 return; 2700 return;
2335 2701
2336 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2702 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2337 2703
2338 evpipe_init (EV_A); 2704#if EV_MULTIPLICITY
2705 assert (("libev: a signal must not be attached to two different loops",
2706 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2339 2707
2340 EV_FREQUENT_CHECK; 2708 signals [w->signum - 1].loop = EV_A;
2709#endif
2341 2710
2711 EV_FREQUENT_CHECK;
2712
2713#if EV_USE_SIGNALFD
2714 if (sigfd == -2)
2342 { 2715 {
2343#ifndef _WIN32 2716 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2344 sigset_t full, prev; 2717 if (sigfd < 0 && errno == EINVAL)
2345 sigfillset (&full); 2718 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2346 sigprocmask (SIG_SETMASK, &full, &prev);
2347#endif
2348 2719
2349 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2720 if (sigfd >= 0)
2721 {
2722 fd_intern (sigfd); /* doing it twice will not hurt */
2350 2723
2351#ifndef _WIN32 2724 sigemptyset (&sigfd_set);
2352 sigprocmask (SIG_SETMASK, &prev, 0); 2725
2353#endif 2726 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2727 ev_set_priority (&sigfd_w, EV_MAXPRI);
2728 ev_io_start (EV_A_ &sigfd_w);
2729 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2730 }
2354 } 2731 }
2732
2733 if (sigfd >= 0)
2734 {
2735 /* TODO: check .head */
2736 sigaddset (&sigfd_set, w->signum);
2737 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2738
2739 signalfd (sigfd, &sigfd_set, 0);
2740 }
2741#endif
2355 2742
2356 ev_start (EV_A_ (W)w, 1); 2743 ev_start (EV_A_ (W)w, 1);
2357 wlist_add (&signals [w->signum - 1].head, (WL)w); 2744 wlist_add (&signals [w->signum - 1].head, (WL)w);
2358 2745
2359 if (!((WL)w)->next) 2746 if (!((WL)w)->next)
2747# if EV_USE_SIGNALFD
2748 if (sigfd < 0) /*TODO*/
2749# endif
2360 { 2750 {
2361#if _WIN32 2751# if _WIN32
2752 evpipe_init (EV_A);
2753
2362 signal (w->signum, ev_sighandler); 2754 signal (w->signum, ev_sighandler);
2363#else 2755# else
2364 struct sigaction sa; 2756 struct sigaction sa;
2757
2758 evpipe_init (EV_A);
2759
2365 sa.sa_handler = ev_sighandler; 2760 sa.sa_handler = ev_sighandler;
2366 sigfillset (&sa.sa_mask); 2761 sigfillset (&sa.sa_mask);
2367 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2762 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2368 sigaction (w->signum, &sa, 0); 2763 sigaction (w->signum, &sa, 0);
2764
2765 sigemptyset (&sa.sa_mask);
2766 sigaddset (&sa.sa_mask, w->signum);
2767 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2369#endif 2768#endif
2370 } 2769 }
2371 2770
2372 EV_FREQUENT_CHECK; 2771 EV_FREQUENT_CHECK;
2373} 2772}
2374 2773
2375void noinline 2774void noinline
… …
2383 2782
2384 wlist_del (&signals [w->signum - 1].head, (WL)w); 2783 wlist_del (&signals [w->signum - 1].head, (WL)w);
2385 ev_stop (EV_A_ (W)w); 2784 ev_stop (EV_A_ (W)w);
2386 2785
2387 if (!signals [w->signum - 1].head) 2786 if (!signals [w->signum - 1].head)
2787 {
2788#if EV_MULTIPLICITY
2789 signals [w->signum - 1].loop = 0; /* unattach from signal */
2790#endif
2791#if EV_USE_SIGNALFD
2792 if (sigfd >= 0)
2793 {
2794 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2795 sigdelset (&sigfd_set, w->signum);
2796 signalfd (sigfd, &sigfd_set, 0);
2797 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2798 /*TODO: maybe unblock signal? */
2799 }
2800 else
2801#endif
2388 signal (w->signum, SIG_DFL); 2802 signal (w->signum, SIG_DFL);
2803 }
2389 2804
2390 EV_FREQUENT_CHECK; 2805 EV_FREQUENT_CHECK;
2391} 2806}
2392 2807
2393void 2808void
2394ev_child_start (EV_P_ ev_child *w) 2809ev_child_start (EV_P_ ev_child *w)
2395{ 2810{
2396#if EV_MULTIPLICITY 2811#if EV_MULTIPLICITY
2397 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2812 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2398#endif 2813#endif
2399 if (expect_false (ev_is_active (w))) 2814 if (expect_false (ev_is_active (w)))
2400 return; 2815 return;
2401 2816
2402 EV_FREQUENT_CHECK; 2817 EV_FREQUENT_CHECK;
… …
2427# ifdef _WIN32 2842# ifdef _WIN32
2428# undef lstat 2843# undef lstat
2429# define lstat(a,b) _stati64 (a,b) 2844# define lstat(a,b) _stati64 (a,b)
2430# endif 2845# endif
2431 2846
2432#define DEF_STAT_INTERVAL 5.0074891 2847#define DEF_STAT_INTERVAL 5.0074891
2848#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2433#define MIN_STAT_INTERVAL 0.1074891 2849#define MIN_STAT_INTERVAL 0.1074891
2434 2850
2435static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2851static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2436 2852
2437#if EV_USE_INOTIFY 2853#if EV_USE_INOTIFY
2438# define EV_INOTIFY_BUFSIZE 8192 2854# define EV_INOTIFY_BUFSIZE 8192
… …
2440static void noinline 2856static void noinline
2441infy_add (EV_P_ ev_stat *w) 2857infy_add (EV_P_ ev_stat *w)
2442{ 2858{
2443 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); 2859 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);
2444 2860
2445 if (w->wd < 0) 2861 if (w->wd >= 0)
2862 {
2863 struct statfs sfs;
2864
2865 /* now local changes will be tracked by inotify, but remote changes won't */
2866 /* unless the filesystem is known to be local, we therefore still poll */
2867 /* also do poll on <2.6.25, but with normal frequency */
2868
2869 if (!fs_2625)
2870 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2871 else if (!statfs (w->path, &sfs)
2872 && (sfs.f_type == 0x1373 /* devfs */
2873 || sfs.f_type == 0xEF53 /* ext2/3 */
2874 || sfs.f_type == 0x3153464a /* jfs */
2875 || sfs.f_type == 0x52654973 /* reiser3 */
2876 || sfs.f_type == 0x01021994 /* tempfs */
2877 || sfs.f_type == 0x58465342 /* xfs */))
2878 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2879 else
2880 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2446 { 2881 }
2447 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2882 else
2883 {
2884 /* can't use inotify, continue to stat */
2885 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2448 2886
2449 /* monitor some parent directory for speedup hints */ 2887 /* if path is not there, monitor some parent directory for speedup hints */
2450 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2888 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2451 /* but an efficiency issue only */ 2889 /* but an efficiency issue only */
2452 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2890 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2453 { 2891 {
2454 char path [4096]; 2892 char path [4096];
2455 strcpy (path, w->path); 2893 strcpy (path, w->path);
… …
2459 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2897 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2460 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2898 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2461 2899
2462 char *pend = strrchr (path, '/'); 2900 char *pend = strrchr (path, '/');
2463 2901
2464 if (!pend) 2902 if (!pend || pend == path)
2465 break; /* whoops, no '/', complain to your admin */ 2903 break;
2466 2904
2467 *pend = 0; 2905 *pend = 0;
2468 w->wd = inotify_add_watch (fs_fd, path, mask); 2906 w->wd = inotify_add_watch (fs_fd, path, mask);
2469 } 2907 }
2470 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2908 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2471 } 2909 }
2472 } 2910 }
2473 else
2474 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2475 2911
2476 if (w->wd >= 0) 2912 if (w->wd >= 0)
2477 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2913 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2914
2915 /* now re-arm timer, if required */
2916 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2917 ev_timer_again (EV_A_ &w->timer);
2918 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2478} 2919}
2479 2920
2480static void noinline 2921static void noinline
2481infy_del (EV_P_ ev_stat *w) 2922infy_del (EV_P_ ev_stat *w)
2482{ 2923{
… …
2496 2937
2497static void noinline 2938static void noinline
2498infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2939infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2499{ 2940{
2500 if (slot < 0) 2941 if (slot < 0)
2501 /* overflow, need to check for all hahs slots */ 2942 /* overflow, need to check for all hash slots */
2502 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2943 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2503 infy_wd (EV_A_ slot, wd, ev); 2944 infy_wd (EV_A_ slot, wd, ev);
2504 else 2945 else
2505 { 2946 {
2506 WL w_; 2947 WL w_;
… …
2512 2953
2513 if (w->wd == wd || wd == -1) 2954 if (w->wd == wd || wd == -1)
2514 { 2955 {
2515 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2956 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2516 { 2957 {
2958 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2517 w->wd = -1; 2959 w->wd = -1;
2518 infy_add (EV_A_ w); /* re-add, no matter what */ 2960 infy_add (EV_A_ w); /* re-add, no matter what */
2519 } 2961 }
2520 2962
2521 stat_timer_cb (EV_A_ &w->timer, 0); 2963 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2534 2976
2535 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2977 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2536 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2978 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2537} 2979}
2538 2980
2539void inline_size 2981inline_size void
2982check_2625 (EV_P)
2983{
2984 /* kernels < 2.6.25 are borked
2985 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2986 */
2987 struct utsname buf;
2988 int major, minor, micro;
2989
2990 if (uname (&buf))
2991 return;
2992
2993 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2994 return;
2995
2996 if (major < 2
2997 || (major == 2 && minor < 6)
2998 || (major == 2 && minor == 6 && micro < 25))
2999 return;
3000
3001 fs_2625 = 1;
3002}
3003
3004inline_size int
3005infy_newfd (void)
3006{
3007#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3008 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3009 if (fd >= 0)
3010 return fd;
3011#endif
3012 return inotify_init ();
3013}
3014
3015inline_size void
2540infy_init (EV_P) 3016infy_init (EV_P)
2541{ 3017{
2542 if (fs_fd != -2) 3018 if (fs_fd != -2)
2543 return; 3019 return;
2544 3020
3021 fs_fd = -1;
3022
3023 check_2625 (EV_A);
3024
2545 fs_fd = inotify_init (); 3025 fs_fd = infy_newfd ();
2546 3026
2547 if (fs_fd >= 0) 3027 if (fs_fd >= 0)
2548 { 3028 {
3029 fd_intern (fs_fd);
2549 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3030 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2550 ev_set_priority (&fs_w, EV_MAXPRI); 3031 ev_set_priority (&fs_w, EV_MAXPRI);
2551 ev_io_start (EV_A_ &fs_w); 3032 ev_io_start (EV_A_ &fs_w);
3033 ev_unref (EV_A);
2552 } 3034 }
2553} 3035}
2554 3036
2555void inline_size 3037inline_size void
2556infy_fork (EV_P) 3038infy_fork (EV_P)
2557{ 3039{
2558 int slot; 3040 int slot;
2559 3041
2560 if (fs_fd < 0) 3042 if (fs_fd < 0)
2561 return; 3043 return;
2562 3044
3045 ev_ref (EV_A);
3046 ev_io_stop (EV_A_ &fs_w);
2563 close (fs_fd); 3047 close (fs_fd);
2564 fs_fd = inotify_init (); 3048 fs_fd = infy_newfd ();
3049
3050 if (fs_fd >= 0)
3051 {
3052 fd_intern (fs_fd);
3053 ev_io_set (&fs_w, fs_fd, EV_READ);
3054 ev_io_start (EV_A_ &fs_w);
3055 ev_unref (EV_A);
3056 }
2565 3057
2566 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3058 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2567 { 3059 {
2568 WL w_ = fs_hash [slot].head; 3060 WL w_ = fs_hash [slot].head;
2569 fs_hash [slot].head = 0; 3061 fs_hash [slot].head = 0;
… …
2576 w->wd = -1; 3068 w->wd = -1;
2577 3069
2578 if (fs_fd >= 0) 3070 if (fs_fd >= 0)
2579 infy_add (EV_A_ w); /* re-add, no matter what */ 3071 infy_add (EV_A_ w); /* re-add, no matter what */
2580 else 3072 else
3073 {
3074 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3075 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2581 ev_timer_start (EV_A_ &w->timer); 3076 ev_timer_again (EV_A_ &w->timer);
3077 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3078 }
2582 } 3079 }
2583
2584 } 3080 }
2585} 3081}
2586 3082
2587#endif 3083#endif
2588 3084
… …
2624 || w->prev.st_atime != w->attr.st_atime 3120 || w->prev.st_atime != w->attr.st_atime
2625 || w->prev.st_mtime != w->attr.st_mtime 3121 || w->prev.st_mtime != w->attr.st_mtime
2626 || w->prev.st_ctime != w->attr.st_ctime 3122 || w->prev.st_ctime != w->attr.st_ctime
2627 ) { 3123 ) {
2628 #if EV_USE_INOTIFY 3124 #if EV_USE_INOTIFY
3125 if (fs_fd >= 0)
3126 {
2629 infy_del (EV_A_ w); 3127 infy_del (EV_A_ w);
2630 infy_add (EV_A_ w); 3128 infy_add (EV_A_ w);
2631 ev_stat_stat (EV_A_ w); /* avoid race... */ 3129 ev_stat_stat (EV_A_ w); /* avoid race... */
3130 }
2632 #endif 3131 #endif
2633 3132
2634 ev_feed_event (EV_A_ w, EV_STAT); 3133 ev_feed_event (EV_A_ w, EV_STAT);
2635 } 3134 }
2636} 3135}
… …
2639ev_stat_start (EV_P_ ev_stat *w) 3138ev_stat_start (EV_P_ ev_stat *w)
2640{ 3139{
2641 if (expect_false (ev_is_active (w))) 3140 if (expect_false (ev_is_active (w)))
2642 return; 3141 return;
2643 3142
2644 /* since we use memcmp, we need to clear any padding data etc. */
2645 memset (&w->prev, 0, sizeof (ev_statdata));
2646 memset (&w->attr, 0, sizeof (ev_statdata));
2647
2648 ev_stat_stat (EV_A_ w); 3143 ev_stat_stat (EV_A_ w);
2649 3144
3145 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2650 if (w->interval < MIN_STAT_INTERVAL) 3146 w->interval = MIN_STAT_INTERVAL;
2651 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2652 3147
2653 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3148 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2654 ev_set_priority (&w->timer, ev_priority (w)); 3149 ev_set_priority (&w->timer, ev_priority (w));
2655 3150
2656#if EV_USE_INOTIFY 3151#if EV_USE_INOTIFY
2657 infy_init (EV_A); 3152 infy_init (EV_A);
2658 3153
2659 if (fs_fd >= 0) 3154 if (fs_fd >= 0)
2660 infy_add (EV_A_ w); 3155 infy_add (EV_A_ w);
2661 else 3156 else
2662#endif 3157#endif
3158 {
2663 ev_timer_start (EV_A_ &w->timer); 3159 ev_timer_again (EV_A_ &w->timer);
3160 ev_unref (EV_A);
3161 }
2664 3162
2665 ev_start (EV_A_ (W)w, 1); 3163 ev_start (EV_A_ (W)w, 1);
2666 3164
2667 EV_FREQUENT_CHECK; 3165 EV_FREQUENT_CHECK;
2668} 3166}
… …
2677 EV_FREQUENT_CHECK; 3175 EV_FREQUENT_CHECK;
2678 3176
2679#if EV_USE_INOTIFY 3177#if EV_USE_INOTIFY
2680 infy_del (EV_A_ w); 3178 infy_del (EV_A_ w);
2681#endif 3179#endif
3180
3181 if (ev_is_active (&w->timer))
3182 {
3183 ev_ref (EV_A);
2682 ev_timer_stop (EV_A_ &w->timer); 3184 ev_timer_stop (EV_A_ &w->timer);
3185 }
2683 3186
2684 ev_stop (EV_A_ (W)w); 3187 ev_stop (EV_A_ (W)w);
2685 3188
2686 EV_FREQUENT_CHECK; 3189 EV_FREQUENT_CHECK;
2687} 3190}
… …
2828embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3331embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2829{ 3332{
2830 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3333 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2831 3334
2832 { 3335 {
2833 struct ev_loop *loop = w->other; 3336 EV_P = w->other;
2834 3337
2835 while (fdchangecnt) 3338 while (fdchangecnt)
2836 { 3339 {
2837 fd_reify (EV_A); 3340 fd_reify (EV_A);
2838 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3341 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2843static void 3346static void
2844embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3347embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2845{ 3348{
2846 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3349 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2847 3350
3351 ev_embed_stop (EV_A_ w);
3352
2848 { 3353 {
2849 struct ev_loop *loop = w->other; 3354 EV_P = w->other;
2850 3355
2851 ev_loop_fork (EV_A); 3356 ev_loop_fork (EV_A);
3357 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2852 } 3358 }
3359
3360 ev_embed_start (EV_A_ w);
2853} 3361}
2854 3362
2855#if 0 3363#if 0
2856static void 3364static void
2857embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3365embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2865{ 3373{
2866 if (expect_false (ev_is_active (w))) 3374 if (expect_false (ev_is_active (w)))
2867 return; 3375 return;
2868 3376
2869 { 3377 {
2870 struct ev_loop *loop = w->other; 3378 EV_P = w->other;
2871 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3379 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2872 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3380 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2873 } 3381 }
2874 3382
2875 EV_FREQUENT_CHECK; 3383 EV_FREQUENT_CHECK;
2876 3384
… …
2987 3495
2988void 3496void
2989ev_async_send (EV_P_ ev_async *w) 3497ev_async_send (EV_P_ ev_async *w)
2990{ 3498{
2991 w->sent = 1; 3499 w->sent = 1;
2992 evpipe_write (EV_A_ &gotasync); 3500 evpipe_write (EV_A_ &async_pending);
2993} 3501}
2994#endif 3502#endif
2995 3503
2996/*****************************************************************************/ 3504/*****************************************************************************/
2997 3505
… …
3059 ev_timer_set (&once->to, timeout, 0.); 3567 ev_timer_set (&once->to, timeout, 0.);
3060 ev_timer_start (EV_A_ &once->to); 3568 ev_timer_start (EV_A_ &once->to);
3061 } 3569 }
3062} 3570}
3063 3571
3572/*****************************************************************************/
3573
3574#if EV_WALK_ENABLE
3575void
3576ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3577{
3578 int i, j;
3579 ev_watcher_list *wl, *wn;
3580
3581 if (types & (EV_IO | EV_EMBED))
3582 for (i = 0; i < anfdmax; ++i)
3583 for (wl = anfds [i].head; wl; )
3584 {
3585 wn = wl->next;
3586
3587#if EV_EMBED_ENABLE
3588 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3589 {
3590 if (types & EV_EMBED)
3591 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3592 }
3593 else
3594#endif
3595#if EV_USE_INOTIFY
3596 if (ev_cb ((ev_io *)wl) == infy_cb)
3597 ;
3598 else
3599#endif
3600 if ((ev_io *)wl != &pipe_w)
3601 if (types & EV_IO)
3602 cb (EV_A_ EV_IO, wl);
3603
3604 wl = wn;
3605 }
3606
3607 if (types & (EV_TIMER | EV_STAT))
3608 for (i = timercnt + HEAP0; i-- > HEAP0; )
3609#if EV_STAT_ENABLE
3610 /*TODO: timer is not always active*/
3611 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3612 {
3613 if (types & EV_STAT)
3614 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3615 }
3616 else
3617#endif
3618 if (types & EV_TIMER)
3619 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3620
3621#if EV_PERIODIC_ENABLE
3622 if (types & EV_PERIODIC)
3623 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3624 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3625#endif
3626
3627#if EV_IDLE_ENABLE
3628 if (types & EV_IDLE)
3629 for (j = NUMPRI; i--; )
3630 for (i = idlecnt [j]; i--; )
3631 cb (EV_A_ EV_IDLE, idles [j][i]);
3632#endif
3633
3634#if EV_FORK_ENABLE
3635 if (types & EV_FORK)
3636 for (i = forkcnt; i--; )
3637 if (ev_cb (forks [i]) != embed_fork_cb)
3638 cb (EV_A_ EV_FORK, forks [i]);
3639#endif
3640
3641#if EV_ASYNC_ENABLE
3642 if (types & EV_ASYNC)
3643 for (i = asynccnt; i--; )
3644 cb (EV_A_ EV_ASYNC, asyncs [i]);
3645#endif
3646
3647 if (types & EV_PREPARE)
3648 for (i = preparecnt; i--; )
3649#if EV_EMBED_ENABLE
3650 if (ev_cb (prepares [i]) != embed_prepare_cb)
3651#endif
3652 cb (EV_A_ EV_PREPARE, prepares [i]);
3653
3654 if (types & EV_CHECK)
3655 for (i = checkcnt; i--; )
3656 cb (EV_A_ EV_CHECK, checks [i]);
3657
3658 if (types & EV_SIGNAL)
3659 for (i = 0; i < EV_NSIG - 1; ++i)
3660 for (wl = signals [i].head; wl; )
3661 {
3662 wn = wl->next;
3663 cb (EV_A_ EV_SIGNAL, wl);
3664 wl = wn;
3665 }
3666
3667 if (types & EV_CHILD)
3668 for (i = EV_PID_HASHSIZE; i--; )
3669 for (wl = childs [i]; wl; )
3670 {
3671 wn = wl->next;
3672 cb (EV_A_ EV_CHILD, wl);
3673 wl = wn;
3674 }
3675/* EV_STAT 0x00001000 /* stat data changed */
3676/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3677}
3678#endif
3679
3064#if EV_MULTIPLICITY 3680#if EV_MULTIPLICITY
3065 #include "ev_wrap.h" 3681 #include "ev_wrap.h"
3066#endif 3682#endif
3067 3683
3068#ifdef __cplusplus 3684#ifdef __cplusplus

Diff Legend

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