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

Comparing libev/ev.c (file contents):
Revision 1.256 by root, Thu Jun 19 06:53:49 2008 UTC vs.
Revision 1.316 by root, Fri Sep 18 21:02:12 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>
373/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
374# ifndef IN_DONT_FOLLOW
375# undef EV_USE_INOTIFY
376# define EV_USE_INOTIFY 0
377# endif
292#endif 378#endif
293 379
294#if EV_SELECT_IS_WINSOCKET 380#if EV_SELECT_IS_WINSOCKET
295# include <winsock.h> 381# include <winsock.h>
296#endif 382#endif
297 383
298#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
299/* 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 */
300# 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
301# ifdef __cplusplus 397# ifdef __cplusplus
302extern "C" { 398extern "C" {
303# endif 399# endif
304int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
305# ifdef __cplusplus 401# ifdef __cplusplus
306} 402}
307# endif 403# endif
308#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
309 434
310/**/ 435/**/
311 436
312#if EV_VERIFY >= 3 437#if EV_VERIFY >= 3
313# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
325 */ 450 */
326#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 451#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
327 452
328#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) */
329#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) */
330/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
331 455
332#if __GNUC__ >= 4 456#if __GNUC__ >= 4
333# define expect(expr,value) __builtin_expect ((expr),(value)) 457# define expect(expr,value) __builtin_expect ((expr),(value))
334# define noinline __attribute__ ((noinline)) 458# define noinline __attribute__ ((noinline))
335#else 459#else
… …
348# define inline_speed static noinline 472# define inline_speed static noinline
349#else 473#else
350# define inline_speed static inline 474# define inline_speed static inline
351#endif 475#endif
352 476
353#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
354#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 482# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
483#endif
355 484
356#define EMPTY /* required for microsofts broken pseudo-c compiler */ 485#define EMPTY /* required for microsofts broken pseudo-c compiler */
357#define EMPTY2(a,b) /* used to suppress some warnings */ 486#define EMPTY2(a,b) /* used to suppress some warnings */
358 487
359typedef ev_watcher *W; 488typedef ev_watcher *W;
… …
361typedef ev_watcher_time *WT; 490typedef ev_watcher_time *WT;
362 491
363#define ev_active(w) ((W)(w))->active 492#define ev_active(w) ((W)(w))->active
364#define ev_at(w) ((WT)(w))->at 493#define ev_at(w) ((WT)(w))->at
365 494
366#if EV_USE_MONOTONIC 495#if EV_USE_REALTIME
367/* 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 */
368/* 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
369static 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)
370#endif 513#endif
371 514
372#ifdef _WIN32 515#ifdef _WIN32
373# include "ev_win32.c" 516# include "ev_win32.c"
374#endif 517#endif
… …
382{ 525{
383 syserr_cb = cb; 526 syserr_cb = cb;
384} 527}
385 528
386static void noinline 529static void noinline
387syserr (const char *msg) 530ev_syserr (const char *msg)
388{ 531{
389 if (!msg) 532 if (!msg)
390 msg = "(libev) system error"; 533 msg = "(libev) system error";
391 534
392 if (syserr_cb) 535 if (syserr_cb)
… …
438#define ev_malloc(size) ev_realloc (0, (size)) 581#define ev_malloc(size) ev_realloc (0, (size))
439#define ev_free(ptr) ev_realloc ((ptr), 0) 582#define ev_free(ptr) ev_realloc ((ptr), 0)
440 583
441/*****************************************************************************/ 584/*****************************************************************************/
442 585
586/* set in reify when reification needed */
587#define EV_ANFD_REIFY 1
588
589/* file descriptor info structure */
443typedef struct 590typedef struct
444{ 591{
445 WL head; 592 WL head;
446 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 */
447 unsigned char reify; 596 unsigned char unused;
597#if EV_USE_EPOLL
598 unsigned int egen; /* generation counter to counter epoll bugs */
599#endif
448#if EV_SELECT_IS_WINSOCKET 600#if EV_SELECT_IS_WINSOCKET
449 SOCKET handle; 601 SOCKET handle;
450#endif 602#endif
451} ANFD; 603} ANFD;
452 604
605/* stores the pending event set for a given watcher */
453typedef struct 606typedef struct
454{ 607{
455 W w; 608 W w;
456 int events; 609 int events; /* the pending event set for the given watcher */
457} ANPENDING; 610} ANPENDING;
458 611
459#if EV_USE_INOTIFY 612#if EV_USE_INOTIFY
460/* hash table entry per inotify-id */ 613/* hash table entry per inotify-id */
461typedef struct 614typedef struct
… …
464} ANFS; 617} ANFS;
465#endif 618#endif
466 619
467/* Heap Entry */ 620/* Heap Entry */
468#if EV_HEAP_CACHE_AT 621#if EV_HEAP_CACHE_AT
622 /* a heap element */
469 typedef struct { 623 typedef struct {
470 ev_tstamp at; 624 ev_tstamp at;
471 WT w; 625 WT w;
472 } ANHE; 626 } ANHE;
473 627
474 #define ANHE_w(he) (he).w /* access watcher, read-write */ 628 #define ANHE_w(he) (he).w /* access watcher, read-write */
475 #define ANHE_at(he) (he).at /* access cached at, read-only */ 629 #define ANHE_at(he) (he).at /* access cached at, read-only */
476 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 630 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
477#else 631#else
632 /* a heap element */
478 typedef WT ANHE; 633 typedef WT ANHE;
479 634
480 #define ANHE_w(he) (he) 635 #define ANHE_w(he) (he)
481 #define ANHE_at(he) (he)->at 636 #define ANHE_at(he) (he)->at
482 #define ANHE_at_cache(he) 637 #define ANHE_at_cache(he)
… …
506 661
507 static int ev_default_loop_ptr; 662 static int ev_default_loop_ptr;
508 663
509#endif 664#endif
510 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
511/*****************************************************************************/ 678/*****************************************************************************/
512 679
680#ifndef EV_HAVE_EV_TIME
513ev_tstamp 681ev_tstamp
514ev_time (void) 682ev_time (void)
515{ 683{
516#if EV_USE_REALTIME 684#if EV_USE_REALTIME
685 if (expect_true (have_realtime))
686 {
517 struct timespec ts; 687 struct timespec ts;
518 clock_gettime (CLOCK_REALTIME, &ts); 688 clock_gettime (CLOCK_REALTIME, &ts);
519 return ts.tv_sec + ts.tv_nsec * 1e-9; 689 return ts.tv_sec + ts.tv_nsec * 1e-9;
520#else 690 }
691#endif
692
521 struct timeval tv; 693 struct timeval tv;
522 gettimeofday (&tv, 0); 694 gettimeofday (&tv, 0);
523 return tv.tv_sec + tv.tv_usec * 1e-6; 695 return tv.tv_sec + tv.tv_usec * 1e-6;
524#endif
525} 696}
697#endif
526 698
527ev_tstamp inline_size 699inline_size ev_tstamp
528get_clock (void) 700get_clock (void)
529{ 701{
530#if EV_USE_MONOTONIC 702#if EV_USE_MONOTONIC
531 if (expect_true (have_monotonic)) 703 if (expect_true (have_monotonic))
532 { 704 {
… …
565 struct timeval tv; 737 struct timeval tv;
566 738
567 tv.tv_sec = (time_t)delay; 739 tv.tv_sec = (time_t)delay;
568 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 740 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
569 741
742 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
743 /* something not guaranteed by newer posix versions, but guaranteed */
744 /* by older ones */
570 select (0, 0, 0, 0, &tv); 745 select (0, 0, 0, 0, &tv);
571#endif 746#endif
572 } 747 }
573} 748}
574 749
575/*****************************************************************************/ 750/*****************************************************************************/
576 751
577#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 */
578 753
579int 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
580array_nextsize (int elem, int cur, int cnt) 757array_nextsize (int elem, int cur, int cnt)
581{ 758{
582 int ncur = cur + 1; 759 int ncur = cur + 1;
583 760
584 do 761 do
… …
601array_realloc (int elem, void *base, int *cur, int cnt) 778array_realloc (int elem, void *base, int *cur, int cnt)
602{ 779{
603 *cur = array_nextsize (elem, *cur, cnt); 780 *cur = array_nextsize (elem, *cur, cnt);
604 return ev_realloc (base, elem * *cur); 781 return ev_realloc (base, elem * *cur);
605} 782}
783
784#define array_init_zero(base,count) \
785 memset ((void *)(base), 0, sizeof (*(base)) * (count))
606 786
607#define array_needsize(type,base,cur,cnt,init) \ 787#define array_needsize(type,base,cur,cnt,init) \
608 if (expect_false ((cnt) > (cur))) \ 788 if (expect_false ((cnt) > (cur))) \
609 { \ 789 { \
610 int ocur_ = (cur); \ 790 int ocur_ = (cur); \
… …
622 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 802 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
623 } 803 }
624#endif 804#endif
625 805
626#define array_free(stem, idx) \ 806#define array_free(stem, idx) \
627 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
628 808
629/*****************************************************************************/ 809/*****************************************************************************/
810
811/* dummy callback for pending events */
812static void noinline
813pendingcb (EV_P_ ev_prepare *w, int revents)
814{
815}
630 816
631void noinline 817void noinline
632ev_feed_event (EV_P_ void *w, int revents) 818ev_feed_event (EV_P_ void *w, int revents)
633{ 819{
634 W w_ = (W)w; 820 W w_ = (W)w;
… …
643 pendings [pri][w_->pending - 1].w = w_; 829 pendings [pri][w_->pending - 1].w = w_;
644 pendings [pri][w_->pending - 1].events = revents; 830 pendings [pri][w_->pending - 1].events = revents;
645 } 831 }
646} 832}
647 833
648void 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
649queue_events (EV_P_ W *events, int eventcnt, int type) 850queue_events (EV_P_ W *events, int eventcnt, int type)
650{ 851{
651 int i; 852 int i;
652 853
653 for (i = 0; i < eventcnt; ++i) 854 for (i = 0; i < eventcnt; ++i)
654 ev_feed_event (EV_A_ events [i], type); 855 ev_feed_event (EV_A_ events [i], type);
655} 856}
656 857
657/*****************************************************************************/ 858/*****************************************************************************/
658 859
659void inline_size 860inline_speed void
660anfds_init (ANFD *base, int count)
661{
662 while (count--)
663 {
664 base->head = 0;
665 base->events = EV_NONE;
666 base->reify = 0;
667
668 ++base;
669 }
670}
671
672void inline_speed
673fd_event (EV_P_ int fd, int revents) 861fd_event_nc (EV_P_ int fd, int revents)
674{ 862{
675 ANFD *anfd = anfds + fd; 863 ANFD *anfd = anfds + fd;
676 ev_io *w; 864 ev_io *w;
677 865
678 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)
… …
682 if (ev) 870 if (ev)
683 ev_feed_event (EV_A_ (W)w, ev); 871 ev_feed_event (EV_A_ (W)w, ev);
684 } 872 }
685} 873}
686 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
687void 886void
688ev_feed_fd_event (EV_P_ int fd, int revents) 887ev_feed_fd_event (EV_P_ int fd, int revents)
689{ 888{
690 if (fd >= 0 && fd < anfdmax) 889 if (fd >= 0 && fd < anfdmax)
691 fd_event (EV_A_ fd, revents); 890 fd_event_nc (EV_A_ fd, revents);
692} 891}
693 892
694void inline_size 893/* make sure the external fd watch events are in-sync */
894/* with the kernel/libev internal state */
895inline_size void
695fd_reify (EV_P) 896fd_reify (EV_P)
696{ 897{
697 int i; 898 int i;
698 899
699 for (i = 0; i < fdchangecnt; ++i) 900 for (i = 0; i < fdchangecnt; ++i)
… …
709 910
710#if EV_SELECT_IS_WINSOCKET 911#if EV_SELECT_IS_WINSOCKET
711 if (events) 912 if (events)
712 { 913 {
713 unsigned long arg; 914 unsigned long arg;
714 #ifdef EV_FD_TO_WIN32_HANDLE
715 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 915 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
716 #else
717 anfd->handle = _get_osfhandle (fd);
718 #endif
719 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));
720 } 917 }
721#endif 918#endif
722 919
723 { 920 {
724 unsigned char o_events = anfd->events; 921 unsigned char o_events = anfd->events;
725 unsigned char o_reify = anfd->reify; 922 unsigned char o_reify = anfd->reify;
726 923
727 anfd->reify = 0; 924 anfd->reify = 0;
728 anfd->events = events; 925 anfd->events = events;
729 926
730 if (o_events != events || o_reify & EV_IOFDSET) 927 if (o_events != events || o_reify & EV__IOFDSET)
731 backend_modify (EV_A_ fd, o_events, events); 928 backend_modify (EV_A_ fd, o_events, events);
732 } 929 }
733 } 930 }
734 931
735 fdchangecnt = 0; 932 fdchangecnt = 0;
736} 933}
737 934
738void inline_size 935/* something about the given fd changed */
936inline_size void
739fd_change (EV_P_ int fd, int flags) 937fd_change (EV_P_ int fd, int flags)
740{ 938{
741 unsigned char reify = anfds [fd].reify; 939 unsigned char reify = anfds [fd].reify;
742 anfds [fd].reify |= flags; 940 anfds [fd].reify |= flags;
743 941
… …
747 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 945 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
748 fdchanges [fdchangecnt - 1] = fd; 946 fdchanges [fdchangecnt - 1] = fd;
749 } 947 }
750} 948}
751 949
752void inline_speed 950/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
951inline_speed void
753fd_kill (EV_P_ int fd) 952fd_kill (EV_P_ int fd)
754{ 953{
755 ev_io *w; 954 ev_io *w;
756 955
757 while ((w = (ev_io *)anfds [fd].head)) 956 while ((w = (ev_io *)anfds [fd].head))
… …
759 ev_io_stop (EV_A_ w); 958 ev_io_stop (EV_A_ w);
760 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);
761 } 960 }
762} 961}
763 962
764int inline_size 963/* check whether the given fd is atcually valid, for error recovery */
964inline_size int
765fd_valid (int fd) 965fd_valid (int fd)
766{ 966{
767#ifdef _WIN32 967#ifdef _WIN32
768 return _get_osfhandle (fd) != -1; 968 return _get_osfhandle (fd) != -1;
769#else 969#else
… …
791 991
792 for (fd = anfdmax; fd--; ) 992 for (fd = anfdmax; fd--; )
793 if (anfds [fd].events) 993 if (anfds [fd].events)
794 { 994 {
795 fd_kill (EV_A_ fd); 995 fd_kill (EV_A_ fd);
796 return; 996 break;
797 } 997 }
798} 998}
799 999
800/* 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 */
801static void noinline 1001static void noinline
… …
805 1005
806 for (fd = 0; fd < anfdmax; ++fd) 1006 for (fd = 0; fd < anfdmax; ++fd)
807 if (anfds [fd].events) 1007 if (anfds [fd].events)
808 { 1008 {
809 anfds [fd].events = 0; 1009 anfds [fd].events = 0;
1010 anfds [fd].emask = 0;
810 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1011 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
811 } 1012 }
812} 1013}
813 1014
814/*****************************************************************************/ 1015/*****************************************************************************/
815 1016
… …
831#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1032#define HEAP0 (DHEAP - 1) /* index of first element in heap */
832#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1033#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
833#define UPHEAP_DONE(p,k) ((p) == (k)) 1034#define UPHEAP_DONE(p,k) ((p) == (k))
834 1035
835/* away from the root */ 1036/* away from the root */
836void inline_speed 1037inline_speed void
837downheap (ANHE *heap, int N, int k) 1038downheap (ANHE *heap, int N, int k)
838{ 1039{
839 ANHE he = heap [k]; 1040 ANHE he = heap [k];
840 ANHE *E = heap + N + HEAP0; 1041 ANHE *E = heap + N + HEAP0;
841 1042
… …
881#define HEAP0 1 1082#define HEAP0 1
882#define HPARENT(k) ((k) >> 1) 1083#define HPARENT(k) ((k) >> 1)
883#define UPHEAP_DONE(p,k) (!(p)) 1084#define UPHEAP_DONE(p,k) (!(p))
884 1085
885/* away from the root */ 1086/* away from the root */
886void inline_speed 1087inline_speed void
887downheap (ANHE *heap, int N, int k) 1088downheap (ANHE *heap, int N, int k)
888{ 1089{
889 ANHE he = heap [k]; 1090 ANHE he = heap [k];
890 1091
891 for (;;) 1092 for (;;)
892 { 1093 {
893 int c = k << 1; 1094 int c = k << 1;
894 1095
895 if (c > N + HEAP0 - 1) 1096 if (c >= N + HEAP0)
896 break; 1097 break;
897 1098
898 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])
899 ? 1 : 0; 1100 ? 1 : 0;
900 1101
… …
911 ev_active (ANHE_w (he)) = k; 1112 ev_active (ANHE_w (he)) = k;
912} 1113}
913#endif 1114#endif
914 1115
915/* towards the root */ 1116/* towards the root */
916void inline_speed 1117inline_speed void
917upheap (ANHE *heap, int k) 1118upheap (ANHE *heap, int k)
918{ 1119{
919 ANHE he = heap [k]; 1120 ANHE he = heap [k];
920 1121
921 for (;;) 1122 for (;;)
… …
932 1133
933 heap [k] = he; 1134 heap [k] = he;
934 ev_active (ANHE_w (he)) = k; 1135 ev_active (ANHE_w (he)) = k;
935} 1136}
936 1137
937void inline_size 1138/* move an element suitably so it is in a correct place */
1139inline_size void
938adjustheap (ANHE *heap, int N, int k) 1140adjustheap (ANHE *heap, int N, int k)
939{ 1141{
940 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)]))
941 upheap (heap, k); 1143 upheap (heap, k);
942 else 1144 else
943 downheap (heap, N, k); 1145 downheap (heap, N, k);
944} 1146}
945 1147
946/* 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 */
947void inline_size 1149inline_size void
948reheap (ANHE *heap, int N) 1150reheap (ANHE *heap, int N)
949{ 1151{
950 int i; 1152 int i;
951 1153
952 /* 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 */
… …
955 upheap (heap, i + HEAP0); 1157 upheap (heap, i + HEAP0);
956} 1158}
957 1159
958/*****************************************************************************/ 1160/*****************************************************************************/
959 1161
1162/* associate signal watchers to a signal signal */
960typedef struct 1163typedef struct
961{ 1164{
1165 EV_ATOMIC_T pending;
1166#if EV_MULTIPLICITY
1167 EV_P;
1168#endif
962 WL head; 1169 WL head;
963 EV_ATOMIC_T gotsig;
964} ANSIG; 1170} ANSIG;
965 1171
966static ANSIG *signals; 1172static ANSIG signals [EV_NSIG - 1];
967static int signalmax;
968
969static EV_ATOMIC_T gotsig;
970
971void inline_size
972signals_init (ANSIG *base, int count)
973{
974 while (count--)
975 {
976 base->head = 0;
977 base->gotsig = 0;
978
979 ++base;
980 }
981}
982 1173
983/*****************************************************************************/ 1174/*****************************************************************************/
984 1175
985void inline_speed 1176/* used to prepare libev internal fd's */
1177/* this is not fork-safe */
1178inline_speed void
986fd_intern (int fd) 1179fd_intern (int fd)
987{ 1180{
988#ifdef _WIN32 1181#ifdef _WIN32
989 unsigned long arg = 1; 1182 unsigned long arg = 1;
990 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1183 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
995} 1188}
996 1189
997static void noinline 1190static void noinline
998evpipe_init (EV_P) 1191evpipe_init (EV_P)
999{ 1192{
1000 if (!ev_is_active (&pipeev)) 1193 if (!ev_is_active (&pipe_w))
1001 { 1194 {
1002#if EV_USE_EVENTFD 1195#if EV_USE_EVENTFD
1196 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1197 if (evfd < 0 && errno == EINVAL)
1003 if ((evfd = eventfd (0, 0)) >= 0) 1198 evfd = eventfd (0, 0);
1199
1200 if (evfd >= 0)
1004 { 1201 {
1005 evpipe [0] = -1; 1202 evpipe [0] = -1;
1006 fd_intern (evfd); 1203 fd_intern (evfd); /* doing it twice doesn't hurt */
1007 ev_io_set (&pipeev, evfd, EV_READ); 1204 ev_io_set (&pipe_w, evfd, EV_READ);
1008 } 1205 }
1009 else 1206 else
1010#endif 1207#endif
1011 { 1208 {
1012 while (pipe (evpipe)) 1209 while (pipe (evpipe))
1013 syserr ("(libev) error creating signal/async pipe"); 1210 ev_syserr ("(libev) error creating signal/async pipe");
1014 1211
1015 fd_intern (evpipe [0]); 1212 fd_intern (evpipe [0]);
1016 fd_intern (evpipe [1]); 1213 fd_intern (evpipe [1]);
1017 ev_io_set (&pipeev, evpipe [0], EV_READ); 1214 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1018 } 1215 }
1019 1216
1020 ev_io_start (EV_A_ &pipeev); 1217 ev_io_start (EV_A_ &pipe_w);
1021 ev_unref (EV_A); /* watcher should not keep loop alive */ 1218 ev_unref (EV_A); /* watcher should not keep loop alive */
1022 } 1219 }
1023} 1220}
1024 1221
1025void inline_size 1222inline_size void
1026evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1223evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1027{ 1224{
1028 if (!*flag) 1225 if (!*flag)
1029 { 1226 {
1030 int old_errno = errno; /* save errno because write might clobber it */ 1227 int old_errno = errno; /* save errno because write might clobber it */
… …
1043 1240
1044 errno = old_errno; 1241 errno = old_errno;
1045 } 1242 }
1046} 1243}
1047 1244
1245/* called whenever the libev signal pipe */
1246/* got some events (signal, async) */
1048static void 1247static void
1049pipecb (EV_P_ ev_io *iow, int revents) 1248pipecb (EV_P_ ev_io *iow, int revents)
1050{ 1249{
1250 int i;
1251
1051#if EV_USE_EVENTFD 1252#if EV_USE_EVENTFD
1052 if (evfd >= 0) 1253 if (evfd >= 0)
1053 { 1254 {
1054 uint64_t counter; 1255 uint64_t counter;
1055 read (evfd, &counter, sizeof (uint64_t)); 1256 read (evfd, &counter, sizeof (uint64_t));
… …
1059 { 1260 {
1060 char dummy; 1261 char dummy;
1061 read (evpipe [0], &dummy, 1); 1262 read (evpipe [0], &dummy, 1);
1062 } 1263 }
1063 1264
1064 if (gotsig && ev_is_default_loop (EV_A)) 1265 if (sig_pending)
1065 { 1266 {
1066 int signum; 1267 sig_pending = 0;
1067 gotsig = 0;
1068 1268
1069 for (signum = signalmax; signum--; ) 1269 for (i = EV_NSIG - 1; i--; )
1070 if (signals [signum].gotsig) 1270 if (expect_false (signals [i].pending))
1071 ev_feed_signal_event (EV_A_ signum + 1); 1271 ev_feed_signal_event (EV_A_ i + 1);
1072 } 1272 }
1073 1273
1074#if EV_ASYNC_ENABLE 1274#if EV_ASYNC_ENABLE
1075 if (gotasync) 1275 if (async_pending)
1076 { 1276 {
1077 int i; 1277 async_pending = 0;
1078 gotasync = 0;
1079 1278
1080 for (i = asynccnt; i--; ) 1279 for (i = asynccnt; i--; )
1081 if (asyncs [i]->sent) 1280 if (asyncs [i]->sent)
1082 { 1281 {
1083 asyncs [i]->sent = 0; 1282 asyncs [i]->sent = 0;
… …
1091 1290
1092static void 1291static void
1093ev_sighandler (int signum) 1292ev_sighandler (int signum)
1094{ 1293{
1095#if EV_MULTIPLICITY 1294#if EV_MULTIPLICITY
1096 struct ev_loop *loop = &default_loop_struct; 1295 EV_P = signals [signum - 1].loop;
1097#endif 1296#endif
1098 1297
1099#if _WIN32 1298#if _WIN32
1100 signal (signum, ev_sighandler); 1299 signal (signum, ev_sighandler);
1101#endif 1300#endif
1102 1301
1103 signals [signum - 1].gotsig = 1; 1302 signals [signum - 1].pending = 1;
1104 evpipe_write (EV_A_ &gotsig); 1303 evpipe_write (EV_A_ &sig_pending);
1105} 1304}
1106 1305
1107void noinline 1306void noinline
1108ev_feed_signal_event (EV_P_ int signum) 1307ev_feed_signal_event (EV_P_ int signum)
1109{ 1308{
1110 WL w; 1309 WL w;
1111 1310
1311 if (expect_false (signum <= 0 || signum > EV_NSIG))
1312 return;
1313
1314 --signum;
1315
1112#if EV_MULTIPLICITY 1316#if EV_MULTIPLICITY
1113 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 */
1114#endif 1318 /* or, likely more useful, feeding a signal nobody is waiting for */
1115 1319
1116 --signum; 1320 if (expect_false (signals [signum].loop != EV_A))
1117
1118 if (signum < 0 || signum >= signalmax)
1119 return; 1321 return;
1322#endif
1120 1323
1121 signals [signum].gotsig = 0; 1324 signals [signum].pending = 0;
1122 1325
1123 for (w = signals [signum].head; w; w = w->next) 1326 for (w = signals [signum].head; w; w = w->next)
1124 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1327 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1125} 1328}
1126 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
1127/*****************************************************************************/ 1350/*****************************************************************************/
1128 1351
1129static WL childs [EV_PID_HASHSIZE]; 1352static WL childs [EV_PID_HASHSIZE];
1130 1353
1131#ifndef _WIN32 1354#ifndef _WIN32
… …
1134 1357
1135#ifndef WIFCONTINUED 1358#ifndef WIFCONTINUED
1136# define WIFCONTINUED(status) 0 1359# define WIFCONTINUED(status) 0
1137#endif 1360#endif
1138 1361
1139void inline_speed 1362/* handle a single child status event */
1363inline_speed void
1140child_reap (EV_P_ int chain, int pid, int status) 1364child_reap (EV_P_ int chain, int pid, int status)
1141{ 1365{
1142 ev_child *w; 1366 ev_child *w;
1143 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1367 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1144 1368
… …
1157 1381
1158#ifndef WCONTINUED 1382#ifndef WCONTINUED
1159# define WCONTINUED 0 1383# define WCONTINUED 0
1160#endif 1384#endif
1161 1385
1386/* called on sigchld etc., calls waitpid */
1162static void 1387static void
1163childcb (EV_P_ ev_signal *sw, int revents) 1388childcb (EV_P_ ev_signal *sw, int revents)
1164{ 1389{
1165 int pid, status; 1390 int pid, status;
1166 1391
… …
1247 /* kqueue is borked on everything but netbsd apparently */ 1472 /* kqueue is borked on everything but netbsd apparently */
1248 /* 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 */
1249 flags &= ~EVBACKEND_KQUEUE; 1474 flags &= ~EVBACKEND_KQUEUE;
1250#endif 1475#endif
1251#ifdef __APPLE__ 1476#ifdef __APPLE__
1252 // flags &= ~EVBACKEND_KQUEUE; for documentation 1477 /* only select works correctly on that "unix-certified" platform */
1253 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 */
1254#endif 1480#endif
1255 1481
1256 return flags; 1482 return flags;
1257} 1483}
1258 1484
… …
1272ev_backend (EV_P) 1498ev_backend (EV_P)
1273{ 1499{
1274 return backend; 1500 return backend;
1275} 1501}
1276 1502
1503#if EV_MINIMAL < 2
1277unsigned int 1504unsigned int
1278ev_loop_count (EV_P) 1505ev_loop_count (EV_P)
1279{ 1506{
1280 return loop_count; 1507 return loop_count;
1281} 1508}
1282 1509
1510unsigned int
1511ev_loop_depth (EV_P)
1512{
1513 return loop_depth;
1514}
1515
1283void 1516void
1284ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1517ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1285{ 1518{
1286 io_blocktime = interval; 1519 io_blocktime = interval;
1287} 1520}
… …
1290ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1523ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1291{ 1524{
1292 timeout_blocktime = interval; 1525 timeout_blocktime = interval;
1293} 1526}
1294 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 */
1295static void noinline 1553static void noinline
1296loop_init (EV_P_ unsigned int flags) 1554loop_init (EV_P_ unsigned int flags)
1297{ 1555{
1298 if (!backend) 1556 if (!backend)
1299 { 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
1300#if EV_USE_MONOTONIC 1568#if EV_USE_MONOTONIC
1569 if (!have_monotonic)
1301 { 1570 {
1302 struct timespec ts; 1571 struct timespec ts;
1572
1303 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1573 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1304 have_monotonic = 1; 1574 have_monotonic = 1;
1305 } 1575 }
1306#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"));
1307 1588
1308 ev_rt_now = ev_time (); 1589 ev_rt_now = ev_time ();
1309 mn_now = get_clock (); 1590 mn_now = get_clock ();
1310 now_floor = mn_now; 1591 now_floor = mn_now;
1311 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
1312 1596
1313 io_blocktime = 0.; 1597 io_blocktime = 0.;
1314 timeout_blocktime = 0.; 1598 timeout_blocktime = 0.;
1315 backend = 0; 1599 backend = 0;
1316 backend_fd = -1; 1600 backend_fd = -1;
1317 gotasync = 0; 1601 sig_pending = 0;
1602#if EV_ASYNC_ENABLE
1603 async_pending = 0;
1604#endif
1318#if EV_USE_INOTIFY 1605#if EV_USE_INOTIFY
1319 fs_fd = -2; 1606 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1320#endif 1607#endif
1321 1608#if EV_USE_SIGNALFD
1322 /* pid check not overridable via env */ 1609 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1323#ifndef _WIN32
1324 if (flags & EVFLAG_FORKCHECK)
1325 curpid = getpid ();
1326#endif 1610#endif
1327
1328 if (!(flags & EVFLAG_NOENV)
1329 && !enable_secure ()
1330 && getenv ("LIBEV_FLAGS"))
1331 flags = atoi (getenv ("LIBEV_FLAGS"));
1332 1611
1333 if (!(flags & 0x0000ffffU)) 1612 if (!(flags & 0x0000ffffU))
1334 flags |= ev_recommended_backends (); 1613 flags |= ev_recommended_backends ();
1335 1614
1336#if EV_USE_PORT 1615#if EV_USE_PORT
… …
1347#endif 1626#endif
1348#if EV_USE_SELECT 1627#if EV_USE_SELECT
1349 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1628 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1350#endif 1629#endif
1351 1630
1631 ev_prepare_init (&pending_w, pendingcb);
1632
1352 ev_init (&pipeev, pipecb); 1633 ev_init (&pipe_w, pipecb);
1353 ev_set_priority (&pipeev, EV_MAXPRI); 1634 ev_set_priority (&pipe_w, EV_MAXPRI);
1354 } 1635 }
1355} 1636}
1356 1637
1638/* free up a loop structure */
1357static void noinline 1639static void noinline
1358loop_destroy (EV_P) 1640loop_destroy (EV_P)
1359{ 1641{
1360 int i; 1642 int i;
1361 1643
1362 if (ev_is_active (&pipeev)) 1644 if (ev_is_active (&pipe_w))
1363 { 1645 {
1364 ev_ref (EV_A); /* signal watcher */ 1646 /*ev_ref (EV_A);*/
1365 ev_io_stop (EV_A_ &pipeev); 1647 /*ev_io_stop (EV_A_ &pipe_w);*/
1366 1648
1367#if EV_USE_EVENTFD 1649#if EV_USE_EVENTFD
1368 if (evfd >= 0) 1650 if (evfd >= 0)
1369 close (evfd); 1651 close (evfd);
1370#endif 1652#endif
1371 1653
1372 if (evpipe [0] >= 0) 1654 if (evpipe [0] >= 0)
1373 { 1655 {
1374 close (evpipe [0]); 1656 EV_WIN32_CLOSE_FD (evpipe [0]);
1375 close (evpipe [1]); 1657 EV_WIN32_CLOSE_FD (evpipe [1]);
1376 } 1658 }
1377 } 1659 }
1660
1661#if EV_USE_SIGNALFD
1662 if (ev_is_active (&sigfd_w))
1663 {
1664 /*ev_ref (EV_A);*/
1665 /*ev_io_stop (EV_A_ &sigfd_w);*/
1666
1667 close (sigfd);
1668 }
1669#endif
1378 1670
1379#if EV_USE_INOTIFY 1671#if EV_USE_INOTIFY
1380 if (fs_fd >= 0) 1672 if (fs_fd >= 0)
1381 close (fs_fd); 1673 close (fs_fd);
1382#endif 1674#endif
… …
1406#if EV_IDLE_ENABLE 1698#if EV_IDLE_ENABLE
1407 array_free (idle, [i]); 1699 array_free (idle, [i]);
1408#endif 1700#endif
1409 } 1701 }
1410 1702
1411 ev_free (anfds); anfdmax = 0; 1703 ev_free (anfds); anfds = 0; anfdmax = 0;
1412 1704
1413 /* have to use the microsoft-never-gets-it-right macro */ 1705 /* have to use the microsoft-never-gets-it-right macro */
1706 array_free (rfeed, EMPTY);
1414 array_free (fdchange, EMPTY); 1707 array_free (fdchange, EMPTY);
1415 array_free (timer, EMPTY); 1708 array_free (timer, EMPTY);
1416#if EV_PERIODIC_ENABLE 1709#if EV_PERIODIC_ENABLE
1417 array_free (periodic, EMPTY); 1710 array_free (periodic, EMPTY);
1418#endif 1711#endif
… …
1427 1720
1428 backend = 0; 1721 backend = 0;
1429} 1722}
1430 1723
1431#if EV_USE_INOTIFY 1724#if EV_USE_INOTIFY
1432void inline_size infy_fork (EV_P); 1725inline_size void infy_fork (EV_P);
1433#endif 1726#endif
1434 1727
1435void inline_size 1728inline_size void
1436loop_fork (EV_P) 1729loop_fork (EV_P)
1437{ 1730{
1438#if EV_USE_PORT 1731#if EV_USE_PORT
1439 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1732 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1440#endif 1733#endif
… …
1446#endif 1739#endif
1447#if EV_USE_INOTIFY 1740#if EV_USE_INOTIFY
1448 infy_fork (EV_A); 1741 infy_fork (EV_A);
1449#endif 1742#endif
1450 1743
1451 if (ev_is_active (&pipeev)) 1744 if (ev_is_active (&pipe_w))
1452 { 1745 {
1453 /* this "locks" the handlers against writing to the pipe */ 1746 /* this "locks" the handlers against writing to the pipe */
1454 /* while we modify the fd vars */ 1747 /* while we modify the fd vars */
1455 gotsig = 1; 1748 sig_pending = 1;
1456#if EV_ASYNC_ENABLE 1749#if EV_ASYNC_ENABLE
1457 gotasync = 1; 1750 async_pending = 1;
1458#endif 1751#endif
1459 1752
1460 ev_ref (EV_A); 1753 ev_ref (EV_A);
1461 ev_io_stop (EV_A_ &pipeev); 1754 ev_io_stop (EV_A_ &pipe_w);
1462 1755
1463#if EV_USE_EVENTFD 1756#if EV_USE_EVENTFD
1464 if (evfd >= 0) 1757 if (evfd >= 0)
1465 close (evfd); 1758 close (evfd);
1466#endif 1759#endif
1467 1760
1468 if (evpipe [0] >= 0) 1761 if (evpipe [0] >= 0)
1469 { 1762 {
1470 close (evpipe [0]); 1763 EV_WIN32_CLOSE_FD (evpipe [0]);
1471 close (evpipe [1]); 1764 EV_WIN32_CLOSE_FD (evpipe [1]);
1472 } 1765 }
1473 1766
1474 evpipe_init (EV_A); 1767 evpipe_init (EV_A);
1475 /* now iterate over everything, in case we missed something */ 1768 /* now iterate over everything, in case we missed something */
1476 pipecb (EV_A_ &pipeev, EV_READ); 1769 pipecb (EV_A_ &pipe_w, EV_READ);
1477 } 1770 }
1478 1771
1479 postfork = 0; 1772 postfork = 0;
1480} 1773}
1481 1774
1482#if EV_MULTIPLICITY 1775#if EV_MULTIPLICITY
1483 1776
1484struct ev_loop * 1777struct ev_loop *
1485ev_loop_new (unsigned int flags) 1778ev_loop_new (unsigned int flags)
1486{ 1779{
1487 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1780 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1488 1781
1489 memset (loop, 0, sizeof (struct ev_loop)); 1782 memset (EV_A, 0, sizeof (struct ev_loop));
1490
1491 loop_init (EV_A_ flags); 1783 loop_init (EV_A_ flags);
1492 1784
1493 if (ev_backend (EV_A)) 1785 if (ev_backend (EV_A))
1494 return loop; 1786 return EV_A;
1495 1787
1496 return 0; 1788 return 0;
1497} 1789}
1498 1790
1499void 1791void
… …
1506void 1798void
1507ev_loop_fork (EV_P) 1799ev_loop_fork (EV_P)
1508{ 1800{
1509 postfork = 1; /* must be in line with ev_default_fork */ 1801 postfork = 1; /* must be in line with ev_default_fork */
1510} 1802}
1803#endif /* multiplicity */
1511 1804
1512#if EV_VERIFY 1805#if EV_VERIFY
1513void noinline 1806static void noinline
1514verify_watcher (EV_P_ W w) 1807verify_watcher (EV_P_ W w)
1515{ 1808{
1516 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1809 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1517 1810
1518 if (w->pending) 1811 if (w->pending)
1519 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1812 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1520} 1813}
1521 1814
1522static void noinline 1815static void noinline
1523verify_heap (EV_P_ ANHE *heap, int N) 1816verify_heap (EV_P_ ANHE *heap, int N)
1524{ 1817{
1525 int i; 1818 int i;
1526 1819
1527 for (i = HEAP0; i < N + HEAP0; ++i) 1820 for (i = HEAP0; i < N + HEAP0; ++i)
1528 { 1821 {
1529 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1822 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1530 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1823 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1531 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1824 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1532 1825
1533 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1826 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1534 } 1827 }
1535} 1828}
1536 1829
1537static void noinline 1830static void noinline
1538array_verify (EV_P_ W *ws, int cnt) 1831array_verify (EV_P_ W *ws, int cnt)
1539{ 1832{
1540 while (cnt--) 1833 while (cnt--)
1541 { 1834 {
1542 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1835 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1543 verify_watcher (EV_A_ ws [cnt]); 1836 verify_watcher (EV_A_ ws [cnt]);
1544 } 1837 }
1545} 1838}
1546#endif 1839#endif
1547 1840
1841#if EV_MINIMAL < 2
1548void 1842void
1549ev_loop_verify (EV_P) 1843ev_loop_verify (EV_P)
1550{ 1844{
1551#if EV_VERIFY 1845#if EV_VERIFY
1552 int i; 1846 int i;
… …
1554 1848
1555 assert (activecnt >= -1); 1849 assert (activecnt >= -1);
1556 1850
1557 assert (fdchangemax >= fdchangecnt); 1851 assert (fdchangemax >= fdchangecnt);
1558 for (i = 0; i < fdchangecnt; ++i) 1852 for (i = 0; i < fdchangecnt; ++i)
1559 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1853 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1560 1854
1561 assert (anfdmax >= 0); 1855 assert (anfdmax >= 0);
1562 for (i = 0; i < anfdmax; ++i) 1856 for (i = 0; i < anfdmax; ++i)
1563 for (w = anfds [i].head; w; w = w->next) 1857 for (w = anfds [i].head; w; w = w->next)
1564 { 1858 {
1565 verify_watcher (EV_A_ (W)w); 1859 verify_watcher (EV_A_ (W)w);
1566 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1860 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1567 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1861 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1568 } 1862 }
1569 1863
1570 assert (timermax >= timercnt); 1864 assert (timermax >= timercnt);
1571 verify_heap (EV_A_ timers, timercnt); 1865 verify_heap (EV_A_ timers, timercnt);
1572 1866
… …
1601 assert (checkmax >= checkcnt); 1895 assert (checkmax >= checkcnt);
1602 array_verify (EV_A_ (W *)checks, checkcnt); 1896 array_verify (EV_A_ (W *)checks, checkcnt);
1603 1897
1604# if 0 1898# if 0
1605 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1899 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1606 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1900 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1607# endif
1608#endif 1901# endif
1902#endif
1609} 1903}
1610 1904#endif
1611#endif /* multiplicity */
1612 1905
1613#if EV_MULTIPLICITY 1906#if EV_MULTIPLICITY
1614struct ev_loop * 1907struct ev_loop *
1615ev_default_loop_init (unsigned int flags) 1908ev_default_loop_init (unsigned int flags)
1616#else 1909#else
… …
1619#endif 1912#endif
1620{ 1913{
1621 if (!ev_default_loop_ptr) 1914 if (!ev_default_loop_ptr)
1622 { 1915 {
1623#if EV_MULTIPLICITY 1916#if EV_MULTIPLICITY
1624 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1917 EV_P = ev_default_loop_ptr = &default_loop_struct;
1625#else 1918#else
1626 ev_default_loop_ptr = 1; 1919 ev_default_loop_ptr = 1;
1627#endif 1920#endif
1628 1921
1629 loop_init (EV_A_ flags); 1922 loop_init (EV_A_ flags);
… …
1646 1939
1647void 1940void
1648ev_default_destroy (void) 1941ev_default_destroy (void)
1649{ 1942{
1650#if EV_MULTIPLICITY 1943#if EV_MULTIPLICITY
1651 struct ev_loop *loop = ev_default_loop_ptr; 1944 EV_P = ev_default_loop_ptr;
1652#endif 1945#endif
1946
1947 ev_default_loop_ptr = 0;
1653 1948
1654#ifndef _WIN32 1949#ifndef _WIN32
1655 ev_ref (EV_A); /* child watcher */ 1950 ev_ref (EV_A); /* child watcher */
1656 ev_signal_stop (EV_A_ &childev); 1951 ev_signal_stop (EV_A_ &childev);
1657#endif 1952#endif
… …
1661 1956
1662void 1957void
1663ev_default_fork (void) 1958ev_default_fork (void)
1664{ 1959{
1665#if EV_MULTIPLICITY 1960#if EV_MULTIPLICITY
1666 struct ev_loop *loop = ev_default_loop_ptr; 1961 EV_P = ev_default_loop_ptr;
1667#endif 1962#endif
1668 1963
1669 if (backend)
1670 postfork = 1; /* must be in line with ev_loop_fork */ 1964 postfork = 1; /* must be in line with ev_loop_fork */
1671} 1965}
1672 1966
1673/*****************************************************************************/ 1967/*****************************************************************************/
1674 1968
1675void 1969void
1676ev_invoke (EV_P_ void *w, int revents) 1970ev_invoke (EV_P_ void *w, int revents)
1677{ 1971{
1678 EV_CB_INVOKE ((W)w, revents); 1972 EV_CB_INVOKE ((W)w, revents);
1679} 1973}
1680 1974
1681void inline_speed 1975unsigned int
1682call_pending (EV_P) 1976ev_pending_count (EV_P)
1977{
1978 int pri;
1979 unsigned int count = 0;
1980
1981 for (pri = NUMPRI; pri--; )
1982 count += pendingcnt [pri];
1983
1984 return count;
1985}
1986
1987void noinline
1988ev_invoke_pending (EV_P)
1683{ 1989{
1684 int pri; 1990 int pri;
1685 1991
1686 for (pri = NUMPRI; pri--; ) 1992 for (pri = NUMPRI; pri--; )
1687 while (pendingcnt [pri]) 1993 while (pendingcnt [pri])
1688 { 1994 {
1689 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1995 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1690 1996
1691 if (expect_true (p->w))
1692 {
1693 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1997 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1998 /* ^ this is no longer true, as pending_w could be here */
1694 1999
1695 p->w->pending = 0; 2000 p->w->pending = 0;
1696 EV_CB_INVOKE (p->w, p->events); 2001 EV_CB_INVOKE (p->w, p->events);
1697 EV_FREQUENT_CHECK; 2002 EV_FREQUENT_CHECK;
1698 }
1699 } 2003 }
1700} 2004}
1701 2005
1702#if EV_IDLE_ENABLE 2006#if EV_IDLE_ENABLE
1703void inline_size 2007/* make idle watchers pending. this handles the "call-idle */
2008/* only when higher priorities are idle" logic */
2009inline_size void
1704idle_reify (EV_P) 2010idle_reify (EV_P)
1705{ 2011{
1706 if (expect_false (idleall)) 2012 if (expect_false (idleall))
1707 { 2013 {
1708 int pri; 2014 int pri;
… …
1720 } 2026 }
1721 } 2027 }
1722} 2028}
1723#endif 2029#endif
1724 2030
1725void inline_size 2031/* make timers pending */
2032inline_size void
1726timers_reify (EV_P) 2033timers_reify (EV_P)
1727{ 2034{
1728 EV_FREQUENT_CHECK; 2035 EV_FREQUENT_CHECK;
1729 2036
1730 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2037 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1731 { 2038 {
1732 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2039 do
1733
1734 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1735
1736 /* first reschedule or stop timer */
1737 if (w->repeat)
1738 { 2040 {
2041 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2042
2043 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2044
2045 /* first reschedule or stop timer */
2046 if (w->repeat)
2047 {
1739 ev_at (w) += w->repeat; 2048 ev_at (w) += w->repeat;
1740 if (ev_at (w) < mn_now) 2049 if (ev_at (w) < mn_now)
1741 ev_at (w) = mn_now; 2050 ev_at (w) = mn_now;
1742 2051
1743 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2052 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1744 2053
1745 ANHE_at_cache (timers [HEAP0]); 2054 ANHE_at_cache (timers [HEAP0]);
1746 downheap (timers, timercnt, HEAP0); 2055 downheap (timers, timercnt, HEAP0);
2056 }
2057 else
2058 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2059
2060 EV_FREQUENT_CHECK;
2061 feed_reverse (EV_A_ (W)w);
1747 } 2062 }
1748 else 2063 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1749 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1750 2064
1751 EV_FREQUENT_CHECK;
1752 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2065 feed_reverse_done (EV_A_ EV_TIMEOUT);
1753 } 2066 }
1754} 2067}
1755 2068
1756#if EV_PERIODIC_ENABLE 2069#if EV_PERIODIC_ENABLE
1757void inline_size 2070/* make periodics pending */
2071inline_size void
1758periodics_reify (EV_P) 2072periodics_reify (EV_P)
1759{ 2073{
1760 EV_FREQUENT_CHECK; 2074 EV_FREQUENT_CHECK;
1761 2075
1762 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2076 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1763 { 2077 {
1764 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2078 int feed_count = 0;
1765 2079
1766 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2080 do
1767
1768 /* first reschedule or stop timer */
1769 if (w->reschedule_cb)
1770 { 2081 {
2082 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2083
2084 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2085
2086 /* first reschedule or stop timer */
2087 if (w->reschedule_cb)
2088 {
1771 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2089 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1772 2090
1773 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2091 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1774 2092
1775 ANHE_at_cache (periodics [HEAP0]); 2093 ANHE_at_cache (periodics [HEAP0]);
1776 downheap (periodics, periodiccnt, HEAP0); 2094 downheap (periodics, periodiccnt, HEAP0);
2095 }
2096 else if (w->interval)
2097 {
2098 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2099 /* if next trigger time is not sufficiently in the future, put it there */
2100 /* this might happen because of floating point inexactness */
2101 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2102 {
2103 ev_at (w) += w->interval;
2104
2105 /* if interval is unreasonably low we might still have a time in the past */
2106 /* so correct this. this will make the periodic very inexact, but the user */
2107 /* has effectively asked to get triggered more often than possible */
2108 if (ev_at (w) < ev_rt_now)
2109 ev_at (w) = ev_rt_now;
2110 }
2111
2112 ANHE_at_cache (periodics [HEAP0]);
2113 downheap (periodics, periodiccnt, HEAP0);
2114 }
2115 else
2116 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2117
2118 EV_FREQUENT_CHECK;
2119 feed_reverse (EV_A_ (W)w);
1777 } 2120 }
1778 else if (w->interval) 2121 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1779 {
1780 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1781 /* if next trigger time is not sufficiently in the future, put it there */
1782 /* this might happen because of floating point inexactness */
1783 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1784 {
1785 ev_at (w) += w->interval;
1786 2122
1787 /* if interval is unreasonably low we might still have a time in the past */
1788 /* so correct this. this will make the periodic very inexact, but the user */
1789 /* has effectively asked to get triggered more often than possible */
1790 if (ev_at (w) < ev_rt_now)
1791 ev_at (w) = ev_rt_now;
1792 }
1793
1794 ANHE_at_cache (periodics [HEAP0]);
1795 downheap (periodics, periodiccnt, HEAP0);
1796 }
1797 else
1798 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1799
1800 EV_FREQUENT_CHECK;
1801 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2123 feed_reverse_done (EV_A_ EV_PERIODIC);
1802 } 2124 }
1803} 2125}
1804 2126
2127/* simply recalculate all periodics */
2128/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1805static void noinline 2129static void noinline
1806periodics_reschedule (EV_P) 2130periodics_reschedule (EV_P)
1807{ 2131{
1808 int i; 2132 int i;
1809 2133
… …
1822 2146
1823 reheap (periodics, periodiccnt); 2147 reheap (periodics, periodiccnt);
1824} 2148}
1825#endif 2149#endif
1826 2150
1827void inline_speed 2151/* adjust all timers by a given offset */
2152static void noinline
2153timers_reschedule (EV_P_ ev_tstamp adjust)
2154{
2155 int i;
2156
2157 for (i = 0; i < timercnt; ++i)
2158 {
2159 ANHE *he = timers + i + HEAP0;
2160 ANHE_w (*he)->at += adjust;
2161 ANHE_at_cache (*he);
2162 }
2163}
2164
2165/* fetch new monotonic and realtime times from the kernel */
2166/* also detetc if there was a timejump, and act accordingly */
2167inline_speed void
1828time_update (EV_P_ ev_tstamp max_block) 2168time_update (EV_P_ ev_tstamp max_block)
1829{ 2169{
1830 int i;
1831
1832#if EV_USE_MONOTONIC 2170#if EV_USE_MONOTONIC
1833 if (expect_true (have_monotonic)) 2171 if (expect_true (have_monotonic))
1834 { 2172 {
2173 int i;
1835 ev_tstamp odiff = rtmn_diff; 2174 ev_tstamp odiff = rtmn_diff;
1836 2175
1837 mn_now = get_clock (); 2176 mn_now = get_clock ();
1838 2177
1839 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2178 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1865 ev_rt_now = ev_time (); 2204 ev_rt_now = ev_time ();
1866 mn_now = get_clock (); 2205 mn_now = get_clock ();
1867 now_floor = mn_now; 2206 now_floor = mn_now;
1868 } 2207 }
1869 2208
2209 /* no timer adjustment, as the monotonic clock doesn't jump */
2210 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1870# if EV_PERIODIC_ENABLE 2211# if EV_PERIODIC_ENABLE
1871 periodics_reschedule (EV_A); 2212 periodics_reschedule (EV_A);
1872# endif 2213# endif
1873 /* no timer adjustment, as the monotonic clock doesn't jump */
1874 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1875 } 2214 }
1876 else 2215 else
1877#endif 2216#endif
1878 { 2217 {
1879 ev_rt_now = ev_time (); 2218 ev_rt_now = ev_time ();
1880 2219
1881 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2220 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1882 { 2221 {
2222 /* adjust timers. this is easy, as the offset is the same for all of them */
2223 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1883#if EV_PERIODIC_ENABLE 2224#if EV_PERIODIC_ENABLE
1884 periodics_reschedule (EV_A); 2225 periodics_reschedule (EV_A);
1885#endif 2226#endif
1886 /* adjust timers. this is easy, as the offset is the same for all of them */
1887 for (i = 0; i < timercnt; ++i)
1888 {
1889 ANHE *he = timers + i + HEAP0;
1890 ANHE_w (*he)->at += ev_rt_now - mn_now;
1891 ANHE_at_cache (*he);
1892 }
1893 } 2227 }
1894 2228
1895 mn_now = ev_rt_now; 2229 mn_now = ev_rt_now;
1896 } 2230 }
1897} 2231}
1898 2232
1899void 2233void
1900ev_ref (EV_P)
1901{
1902 ++activecnt;
1903}
1904
1905void
1906ev_unref (EV_P)
1907{
1908 --activecnt;
1909}
1910
1911static int loop_done;
1912
1913void
1914ev_loop (EV_P_ int flags) 2234ev_loop (EV_P_ int flags)
1915{ 2235{
2236#if EV_MINIMAL < 2
2237 ++loop_depth;
2238#endif
2239
2240 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2241
1916 loop_done = EVUNLOOP_CANCEL; 2242 loop_done = EVUNLOOP_CANCEL;
1917 2243
1918 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2244 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1919 2245
1920 do 2246 do
1921 { 2247 {
1922#if EV_VERIFY >= 2 2248#if EV_VERIFY >= 2
1923 ev_loop_verify (EV_A); 2249 ev_loop_verify (EV_A);
… …
1936 /* we might have forked, so queue fork handlers */ 2262 /* we might have forked, so queue fork handlers */
1937 if (expect_false (postfork)) 2263 if (expect_false (postfork))
1938 if (forkcnt) 2264 if (forkcnt)
1939 { 2265 {
1940 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2266 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1941 call_pending (EV_A); 2267 EV_INVOKE_PENDING;
1942 } 2268 }
1943#endif 2269#endif
1944 2270
1945 /* queue prepare watchers (and execute them) */ 2271 /* queue prepare watchers (and execute them) */
1946 if (expect_false (preparecnt)) 2272 if (expect_false (preparecnt))
1947 { 2273 {
1948 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2274 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1949 call_pending (EV_A); 2275 EV_INVOKE_PENDING;
1950 } 2276 }
1951 2277
1952 if (expect_false (!activecnt)) 2278 if (expect_false (loop_done))
1953 break; 2279 break;
1954 2280
1955 /* we might have forked, so reify kernel state if necessary */ 2281 /* we might have forked, so reify kernel state if necessary */
1956 if (expect_false (postfork)) 2282 if (expect_false (postfork))
1957 loop_fork (EV_A); 2283 loop_fork (EV_A);
… …
1964 ev_tstamp waittime = 0.; 2290 ev_tstamp waittime = 0.;
1965 ev_tstamp sleeptime = 0.; 2291 ev_tstamp sleeptime = 0.;
1966 2292
1967 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2293 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1968 { 2294 {
2295 /* remember old timestamp for io_blocktime calculation */
2296 ev_tstamp prev_mn_now = mn_now;
2297
1969 /* update time to cancel out callback processing overhead */ 2298 /* update time to cancel out callback processing overhead */
1970 time_update (EV_A_ 1e100); 2299 time_update (EV_A_ 1e100);
1971 2300
1972 waittime = MAX_BLOCKTIME; 2301 waittime = MAX_BLOCKTIME;
1973 2302
… …
1983 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2312 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1984 if (waittime > to) waittime = to; 2313 if (waittime > to) waittime = to;
1985 } 2314 }
1986#endif 2315#endif
1987 2316
2317 /* don't let timeouts decrease the waittime below timeout_blocktime */
1988 if (expect_false (waittime < timeout_blocktime)) 2318 if (expect_false (waittime < timeout_blocktime))
1989 waittime = timeout_blocktime; 2319 waittime = timeout_blocktime;
1990 2320
1991 sleeptime = waittime - backend_fudge; 2321 /* extra check because io_blocktime is commonly 0 */
1992
1993 if (expect_true (sleeptime > io_blocktime)) 2322 if (expect_false (io_blocktime))
1994 sleeptime = io_blocktime;
1995
1996 if (sleeptime)
1997 { 2323 {
2324 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2325
2326 if (sleeptime > waittime - backend_fudge)
2327 sleeptime = waittime - backend_fudge;
2328
2329 if (expect_true (sleeptime > 0.))
2330 {
1998 ev_sleep (sleeptime); 2331 ev_sleep (sleeptime);
1999 waittime -= sleeptime; 2332 waittime -= sleeptime;
2333 }
2000 } 2334 }
2001 } 2335 }
2002 2336
2337#if EV_MINIMAL < 2
2003 ++loop_count; 2338 ++loop_count;
2339#endif
2340 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2004 backend_poll (EV_A_ waittime); 2341 backend_poll (EV_A_ waittime);
2342 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2005 2343
2006 /* update ev_rt_now, do magic */ 2344 /* update ev_rt_now, do magic */
2007 time_update (EV_A_ waittime + sleeptime); 2345 time_update (EV_A_ waittime + sleeptime);
2008 } 2346 }
2009 2347
… …
2020 2358
2021 /* queue check watchers, to be executed first */ 2359 /* queue check watchers, to be executed first */
2022 if (expect_false (checkcnt)) 2360 if (expect_false (checkcnt))
2023 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2361 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2024 2362
2025 call_pending (EV_A); 2363 EV_INVOKE_PENDING;
2026 } 2364 }
2027 while (expect_true ( 2365 while (expect_true (
2028 activecnt 2366 activecnt
2029 && !loop_done 2367 && !loop_done
2030 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2368 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2031 )); 2369 ));
2032 2370
2033 if (loop_done == EVUNLOOP_ONE) 2371 if (loop_done == EVUNLOOP_ONE)
2034 loop_done = EVUNLOOP_CANCEL; 2372 loop_done = EVUNLOOP_CANCEL;
2373
2374#if EV_MINIMAL < 2
2375 --loop_depth;
2376#endif
2035} 2377}
2036 2378
2037void 2379void
2038ev_unloop (EV_P_ int how) 2380ev_unloop (EV_P_ int how)
2039{ 2381{
2040 loop_done = how; 2382 loop_done = how;
2041} 2383}
2042 2384
2385void
2386ev_ref (EV_P)
2387{
2388 ++activecnt;
2389}
2390
2391void
2392ev_unref (EV_P)
2393{
2394 --activecnt;
2395}
2396
2397void
2398ev_now_update (EV_P)
2399{
2400 time_update (EV_A_ 1e100);
2401}
2402
2403void
2404ev_suspend (EV_P)
2405{
2406 ev_now_update (EV_A);
2407}
2408
2409void
2410ev_resume (EV_P)
2411{
2412 ev_tstamp mn_prev = mn_now;
2413
2414 ev_now_update (EV_A);
2415 timers_reschedule (EV_A_ mn_now - mn_prev);
2416#if EV_PERIODIC_ENABLE
2417 /* TODO: really do this? */
2418 periodics_reschedule (EV_A);
2419#endif
2420}
2421
2043/*****************************************************************************/ 2422/*****************************************************************************/
2423/* singly-linked list management, used when the expected list length is short */
2044 2424
2045void inline_size 2425inline_size void
2046wlist_add (WL *head, WL elem) 2426wlist_add (WL *head, WL elem)
2047{ 2427{
2048 elem->next = *head; 2428 elem->next = *head;
2049 *head = elem; 2429 *head = elem;
2050} 2430}
2051 2431
2052void inline_size 2432inline_size void
2053wlist_del (WL *head, WL elem) 2433wlist_del (WL *head, WL elem)
2054{ 2434{
2055 while (*head) 2435 while (*head)
2056 { 2436 {
2057 if (*head == elem) 2437 if (expect_true (*head == elem))
2058 { 2438 {
2059 *head = elem->next; 2439 *head = elem->next;
2060 return; 2440 break;
2061 } 2441 }
2062 2442
2063 head = &(*head)->next; 2443 head = &(*head)->next;
2064 } 2444 }
2065} 2445}
2066 2446
2067void inline_speed 2447/* internal, faster, version of ev_clear_pending */
2448inline_speed void
2068clear_pending (EV_P_ W w) 2449clear_pending (EV_P_ W w)
2069{ 2450{
2070 if (w->pending) 2451 if (w->pending)
2071 { 2452 {
2072 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2453 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2073 w->pending = 0; 2454 w->pending = 0;
2074 } 2455 }
2075} 2456}
2076 2457
2077int 2458int
… …
2081 int pending = w_->pending; 2462 int pending = w_->pending;
2082 2463
2083 if (expect_true (pending)) 2464 if (expect_true (pending))
2084 { 2465 {
2085 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2466 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2467 p->w = (W)&pending_w;
2086 w_->pending = 0; 2468 w_->pending = 0;
2087 p->w = 0;
2088 return p->events; 2469 return p->events;
2089 } 2470 }
2090 else 2471 else
2091 return 0; 2472 return 0;
2092} 2473}
2093 2474
2094void inline_size 2475inline_size void
2095pri_adjust (EV_P_ W w) 2476pri_adjust (EV_P_ W w)
2096{ 2477{
2097 int pri = w->priority; 2478 int pri = ev_priority (w);
2098 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2479 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2099 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2480 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2100 w->priority = pri; 2481 ev_set_priority (w, pri);
2101} 2482}
2102 2483
2103void inline_speed 2484inline_speed void
2104ev_start (EV_P_ W w, int active) 2485ev_start (EV_P_ W w, int active)
2105{ 2486{
2106 pri_adjust (EV_A_ w); 2487 pri_adjust (EV_A_ w);
2107 w->active = active; 2488 w->active = active;
2108 ev_ref (EV_A); 2489 ev_ref (EV_A);
2109} 2490}
2110 2491
2111void inline_size 2492inline_size void
2112ev_stop (EV_P_ W w) 2493ev_stop (EV_P_ W w)
2113{ 2494{
2114 ev_unref (EV_A); 2495 ev_unref (EV_A);
2115 w->active = 0; 2496 w->active = 0;
2116} 2497}
… …
2123 int fd = w->fd; 2504 int fd = w->fd;
2124 2505
2125 if (expect_false (ev_is_active (w))) 2506 if (expect_false (ev_is_active (w)))
2126 return; 2507 return;
2127 2508
2128 assert (("ev_io_start called with negative fd", fd >= 0)); 2509 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2510 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2129 2511
2130 EV_FREQUENT_CHECK; 2512 EV_FREQUENT_CHECK;
2131 2513
2132 ev_start (EV_A_ (W)w, 1); 2514 ev_start (EV_A_ (W)w, 1);
2133 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2515 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2134 wlist_add (&anfds[fd].head, (WL)w); 2516 wlist_add (&anfds[fd].head, (WL)w);
2135 2517
2136 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2518 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2137 w->events &= ~EV_IOFDSET; 2519 w->events &= ~EV__IOFDSET;
2138 2520
2139 EV_FREQUENT_CHECK; 2521 EV_FREQUENT_CHECK;
2140} 2522}
2141 2523
2142void noinline 2524void noinline
… …
2144{ 2526{
2145 clear_pending (EV_A_ (W)w); 2527 clear_pending (EV_A_ (W)w);
2146 if (expect_false (!ev_is_active (w))) 2528 if (expect_false (!ev_is_active (w)))
2147 return; 2529 return;
2148 2530
2149 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2531 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2150 2532
2151 EV_FREQUENT_CHECK; 2533 EV_FREQUENT_CHECK;
2152 2534
2153 wlist_del (&anfds[w->fd].head, (WL)w); 2535 wlist_del (&anfds[w->fd].head, (WL)w);
2154 ev_stop (EV_A_ (W)w); 2536 ev_stop (EV_A_ (W)w);
… …
2164 if (expect_false (ev_is_active (w))) 2546 if (expect_false (ev_is_active (w)))
2165 return; 2547 return;
2166 2548
2167 ev_at (w) += mn_now; 2549 ev_at (w) += mn_now;
2168 2550
2169 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2551 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2170 2552
2171 EV_FREQUENT_CHECK; 2553 EV_FREQUENT_CHECK;
2172 2554
2173 ++timercnt; 2555 ++timercnt;
2174 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2556 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2177 ANHE_at_cache (timers [ev_active (w)]); 2559 ANHE_at_cache (timers [ev_active (w)]);
2178 upheap (timers, ev_active (w)); 2560 upheap (timers, ev_active (w));
2179 2561
2180 EV_FREQUENT_CHECK; 2562 EV_FREQUENT_CHECK;
2181 2563
2182 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2564 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2183} 2565}
2184 2566
2185void noinline 2567void noinline
2186ev_timer_stop (EV_P_ ev_timer *w) 2568ev_timer_stop (EV_P_ ev_timer *w)
2187{ 2569{
… …
2192 EV_FREQUENT_CHECK; 2574 EV_FREQUENT_CHECK;
2193 2575
2194 { 2576 {
2195 int active = ev_active (w); 2577 int active = ev_active (w);
2196 2578
2197 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2579 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2198 2580
2199 --timercnt; 2581 --timercnt;
2200 2582
2201 if (expect_true (active < timercnt + HEAP0)) 2583 if (expect_true (active < timercnt + HEAP0))
2202 { 2584 {
… …
2235 } 2617 }
2236 2618
2237 EV_FREQUENT_CHECK; 2619 EV_FREQUENT_CHECK;
2238} 2620}
2239 2621
2622ev_tstamp
2623ev_timer_remaining (EV_P_ ev_timer *w)
2624{
2625 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2626}
2627
2240#if EV_PERIODIC_ENABLE 2628#if EV_PERIODIC_ENABLE
2241void noinline 2629void noinline
2242ev_periodic_start (EV_P_ ev_periodic *w) 2630ev_periodic_start (EV_P_ ev_periodic *w)
2243{ 2631{
2244 if (expect_false (ev_is_active (w))) 2632 if (expect_false (ev_is_active (w)))
… …
2246 2634
2247 if (w->reschedule_cb) 2635 if (w->reschedule_cb)
2248 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2636 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2249 else if (w->interval) 2637 else if (w->interval)
2250 { 2638 {
2251 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2639 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2252 /* this formula differs from the one in periodic_reify because we do not always round up */ 2640 /* this formula differs from the one in periodic_reify because we do not always round up */
2253 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2641 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2254 } 2642 }
2255 else 2643 else
2256 ev_at (w) = w->offset; 2644 ev_at (w) = w->offset;
… …
2264 ANHE_at_cache (periodics [ev_active (w)]); 2652 ANHE_at_cache (periodics [ev_active (w)]);
2265 upheap (periodics, ev_active (w)); 2653 upheap (periodics, ev_active (w));
2266 2654
2267 EV_FREQUENT_CHECK; 2655 EV_FREQUENT_CHECK;
2268 2656
2269 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2657 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2270} 2658}
2271 2659
2272void noinline 2660void noinline
2273ev_periodic_stop (EV_P_ ev_periodic *w) 2661ev_periodic_stop (EV_P_ ev_periodic *w)
2274{ 2662{
… …
2279 EV_FREQUENT_CHECK; 2667 EV_FREQUENT_CHECK;
2280 2668
2281 { 2669 {
2282 int active = ev_active (w); 2670 int active = ev_active (w);
2283 2671
2284 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2672 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2285 2673
2286 --periodiccnt; 2674 --periodiccnt;
2287 2675
2288 if (expect_true (active < periodiccnt + HEAP0)) 2676 if (expect_true (active < periodiccnt + HEAP0))
2289 { 2677 {
… …
2311#endif 2699#endif
2312 2700
2313void noinline 2701void noinline
2314ev_signal_start (EV_P_ ev_signal *w) 2702ev_signal_start (EV_P_ ev_signal *w)
2315{ 2703{
2316#if EV_MULTIPLICITY
2317 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2318#endif
2319 if (expect_false (ev_is_active (w))) 2704 if (expect_false (ev_is_active (w)))
2320 return; 2705 return;
2321 2706
2322 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2707 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2323 2708
2324 evpipe_init (EV_A); 2709#if EV_MULTIPLICITY
2710 assert (("libev: a signal must not be attached to two different loops",
2711 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2325 2712
2326 EV_FREQUENT_CHECK; 2713 signals [w->signum - 1].loop = EV_A;
2714#endif
2327 2715
2716 EV_FREQUENT_CHECK;
2717
2718#if EV_USE_SIGNALFD
2719 if (sigfd == -2)
2328 { 2720 {
2329#ifndef _WIN32 2721 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2330 sigset_t full, prev; 2722 if (sigfd < 0 && errno == EINVAL)
2331 sigfillset (&full); 2723 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2332 sigprocmask (SIG_SETMASK, &full, &prev);
2333#endif
2334 2724
2335 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2725 if (sigfd >= 0)
2726 {
2727 fd_intern (sigfd); /* doing it twice will not hurt */
2336 2728
2337#ifndef _WIN32 2729 sigemptyset (&sigfd_set);
2338 sigprocmask (SIG_SETMASK, &prev, 0); 2730
2339#endif 2731 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2732 ev_set_priority (&sigfd_w, EV_MAXPRI);
2733 ev_io_start (EV_A_ &sigfd_w);
2734 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2735 }
2340 } 2736 }
2737
2738 if (sigfd >= 0)
2739 {
2740 /* TODO: check .head */
2741 sigaddset (&sigfd_set, w->signum);
2742 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2743
2744 signalfd (sigfd, &sigfd_set, 0);
2745 }
2746#endif
2341 2747
2342 ev_start (EV_A_ (W)w, 1); 2748 ev_start (EV_A_ (W)w, 1);
2343 wlist_add (&signals [w->signum - 1].head, (WL)w); 2749 wlist_add (&signals [w->signum - 1].head, (WL)w);
2344 2750
2345 if (!((WL)w)->next) 2751 if (!((WL)w)->next)
2752# if EV_USE_SIGNALFD
2753 if (sigfd < 0) /*TODO*/
2754# endif
2346 { 2755 {
2347#if _WIN32 2756# if _WIN32
2348 signal (w->signum, ev_sighandler); 2757 signal (w->signum, ev_sighandler);
2349#else 2758# else
2350 struct sigaction sa; 2759 struct sigaction sa;
2760
2761 evpipe_init (EV_A);
2762
2351 sa.sa_handler = ev_sighandler; 2763 sa.sa_handler = ev_sighandler;
2352 sigfillset (&sa.sa_mask); 2764 sigfillset (&sa.sa_mask);
2353 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2765 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2354 sigaction (w->signum, &sa, 0); 2766 sigaction (w->signum, &sa, 0);
2767
2768 sigemptyset (&sa.sa_mask);
2769 sigaddset (&sa.sa_mask, w->signum);
2770 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2355#endif 2771#endif
2356 } 2772 }
2357 2773
2358 EV_FREQUENT_CHECK; 2774 EV_FREQUENT_CHECK;
2359} 2775}
2360 2776
2361void noinline 2777void noinline
… …
2369 2785
2370 wlist_del (&signals [w->signum - 1].head, (WL)w); 2786 wlist_del (&signals [w->signum - 1].head, (WL)w);
2371 ev_stop (EV_A_ (W)w); 2787 ev_stop (EV_A_ (W)w);
2372 2788
2373 if (!signals [w->signum - 1].head) 2789 if (!signals [w->signum - 1].head)
2790 {
2791#if EV_MULTIPLICITY
2792 signals [w->signum - 1].loop = 0; /* unattach from signal */
2793#endif
2794#if EV_USE_SIGNALFD
2795 if (sigfd >= 0)
2796 {
2797 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2798 sigdelset (&sigfd_set, w->signum);
2799 signalfd (sigfd, &sigfd_set, 0);
2800 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2801 /*TODO: maybe unblock signal? */
2802 }
2803 else
2804#endif
2374 signal (w->signum, SIG_DFL); 2805 signal (w->signum, SIG_DFL);
2806 }
2375 2807
2376 EV_FREQUENT_CHECK; 2808 EV_FREQUENT_CHECK;
2377} 2809}
2378 2810
2379void 2811void
2380ev_child_start (EV_P_ ev_child *w) 2812ev_child_start (EV_P_ ev_child *w)
2381{ 2813{
2382#if EV_MULTIPLICITY 2814#if EV_MULTIPLICITY
2383 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2815 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2384#endif 2816#endif
2385 if (expect_false (ev_is_active (w))) 2817 if (expect_false (ev_is_active (w)))
2386 return; 2818 return;
2387 2819
2388 EV_FREQUENT_CHECK; 2820 EV_FREQUENT_CHECK;
… …
2413# ifdef _WIN32 2845# ifdef _WIN32
2414# undef lstat 2846# undef lstat
2415# define lstat(a,b) _stati64 (a,b) 2847# define lstat(a,b) _stati64 (a,b)
2416# endif 2848# endif
2417 2849
2418#define DEF_STAT_INTERVAL 5.0074891 2850#define DEF_STAT_INTERVAL 5.0074891
2851#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2419#define MIN_STAT_INTERVAL 0.1074891 2852#define MIN_STAT_INTERVAL 0.1074891
2420 2853
2421static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2854static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2422 2855
2423#if EV_USE_INOTIFY 2856#if EV_USE_INOTIFY
2424# define EV_INOTIFY_BUFSIZE 8192 2857# define EV_INOTIFY_BUFSIZE 8192
… …
2428{ 2861{
2429 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); 2862 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);
2430 2863
2431 if (w->wd < 0) 2864 if (w->wd < 0)
2432 { 2865 {
2866 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2433 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2867 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2434 2868
2435 /* monitor some parent directory for speedup hints */ 2869 /* monitor some parent directory for speedup hints */
2436 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2870 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2437 /* but an efficiency issue only */ 2871 /* but an efficiency issue only */
2438 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2872 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2439 { 2873 {
2440 char path [4096]; 2874 char path [4096];
2441 strcpy (path, w->path); 2875 strcpy (path, w->path);
… …
2445 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2879 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2446 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2880 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2447 2881
2448 char *pend = strrchr (path, '/'); 2882 char *pend = strrchr (path, '/');
2449 2883
2450 if (!pend) 2884 if (!pend || pend == path)
2451 break; /* whoops, no '/', complain to your admin */ 2885 break;
2452 2886
2453 *pend = 0; 2887 *pend = 0;
2454 w->wd = inotify_add_watch (fs_fd, path, mask); 2888 w->wd = inotify_add_watch (fs_fd, path, mask);
2455 } 2889 }
2456 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2890 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2457 } 2891 }
2458 } 2892 }
2459 else
2460 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2461 2893
2462 if (w->wd >= 0) 2894 if (w->wd >= 0)
2895 {
2896 struct statfs sfs;
2897
2463 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2898 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2899
2900 /* now local changes will be tracked by inotify, but remote changes won't */
2901 /* unless the filesystem it known to be local, we therefore still poll */
2902 /* also do poll on <2.6.25, but with normal frequency */
2903
2904 if (fs_2625 && !statfs (w->path, &sfs))
2905 if (sfs.f_type == 0x1373 /* devfs */
2906 || sfs.f_type == 0xEF53 /* ext2/3 */
2907 || sfs.f_type == 0x3153464a /* jfs */
2908 || sfs.f_type == 0x52654973 /* reiser3 */
2909 || sfs.f_type == 0x01021994 /* tempfs */
2910 || sfs.f_type == 0x58465342 /* xfs */)
2911 return;
2912
2913 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2914 ev_timer_again (EV_A_ &w->timer);
2915 }
2464} 2916}
2465 2917
2466static void noinline 2918static void noinline
2467infy_del (EV_P_ ev_stat *w) 2919infy_del (EV_P_ ev_stat *w)
2468{ 2920{
… …
2482 2934
2483static void noinline 2935static void noinline
2484infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2936infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2485{ 2937{
2486 if (slot < 0) 2938 if (slot < 0)
2487 /* overflow, need to check for all hahs slots */ 2939 /* overflow, need to check for all hash slots */
2488 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2940 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2489 infy_wd (EV_A_ slot, wd, ev); 2941 infy_wd (EV_A_ slot, wd, ev);
2490 else 2942 else
2491 { 2943 {
2492 WL w_; 2944 WL w_;
… …
2498 2950
2499 if (w->wd == wd || wd == -1) 2951 if (w->wd == wd || wd == -1)
2500 { 2952 {
2501 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2953 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2502 { 2954 {
2955 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2503 w->wd = -1; 2956 w->wd = -1;
2504 infy_add (EV_A_ w); /* re-add, no matter what */ 2957 infy_add (EV_A_ w); /* re-add, no matter what */
2505 } 2958 }
2506 2959
2507 stat_timer_cb (EV_A_ &w->timer, 0); 2960 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2520 2973
2521 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2974 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2522 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2975 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2523} 2976}
2524 2977
2525void inline_size 2978inline_size void
2979check_2625 (EV_P)
2980{
2981 /* kernels < 2.6.25 are borked
2982 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2983 */
2984 struct utsname buf;
2985 int major, minor, micro;
2986
2987 if (uname (&buf))
2988 return;
2989
2990 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2991 return;
2992
2993 if (major < 2
2994 || (major == 2 && minor < 6)
2995 || (major == 2 && minor == 6 && micro < 25))
2996 return;
2997
2998 fs_2625 = 1;
2999}
3000
3001inline_size int
3002infy_newfd (void)
3003{
3004#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3005 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3006 if (fd >= 0)
3007 return fd;
3008#endif
3009 return inotify_init ();
3010}
3011
3012inline_size void
2526infy_init (EV_P) 3013infy_init (EV_P)
2527{ 3014{
2528 if (fs_fd != -2) 3015 if (fs_fd != -2)
2529 return; 3016 return;
2530 3017
3018 fs_fd = -1;
3019
3020 check_2625 (EV_A);
3021
2531 fs_fd = inotify_init (); 3022 fs_fd = infy_newfd ();
2532 3023
2533 if (fs_fd >= 0) 3024 if (fs_fd >= 0)
2534 { 3025 {
3026 fd_intern (fs_fd);
2535 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3027 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2536 ev_set_priority (&fs_w, EV_MAXPRI); 3028 ev_set_priority (&fs_w, EV_MAXPRI);
2537 ev_io_start (EV_A_ &fs_w); 3029 ev_io_start (EV_A_ &fs_w);
2538 } 3030 }
2539} 3031}
2540 3032
2541void inline_size 3033inline_size void
2542infy_fork (EV_P) 3034infy_fork (EV_P)
2543{ 3035{
2544 int slot; 3036 int slot;
2545 3037
2546 if (fs_fd < 0) 3038 if (fs_fd < 0)
2547 return; 3039 return;
2548 3040
3041 ev_io_stop (EV_A_ &fs_w);
2549 close (fs_fd); 3042 close (fs_fd);
2550 fs_fd = inotify_init (); 3043 fs_fd = infy_newfd ();
3044
3045 if (fs_fd >= 0)
3046 {
3047 fd_intern (fs_fd);
3048 ev_io_set (&fs_w, fs_fd, EV_READ);
3049 ev_io_start (EV_A_ &fs_w);
3050 }
2551 3051
2552 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3052 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2553 { 3053 {
2554 WL w_ = fs_hash [slot].head; 3054 WL w_ = fs_hash [slot].head;
2555 fs_hash [slot].head = 0; 3055 fs_hash [slot].head = 0;
… …
2562 w->wd = -1; 3062 w->wd = -1;
2563 3063
2564 if (fs_fd >= 0) 3064 if (fs_fd >= 0)
2565 infy_add (EV_A_ w); /* re-add, no matter what */ 3065 infy_add (EV_A_ w); /* re-add, no matter what */
2566 else 3066 else
2567 ev_timer_start (EV_A_ &w->timer); 3067 ev_timer_again (EV_A_ &w->timer);
2568 } 3068 }
2569
2570 } 3069 }
2571} 3070}
2572 3071
2573#endif 3072#endif
2574 3073
… …
2610 || w->prev.st_atime != w->attr.st_atime 3109 || w->prev.st_atime != w->attr.st_atime
2611 || w->prev.st_mtime != w->attr.st_mtime 3110 || w->prev.st_mtime != w->attr.st_mtime
2612 || w->prev.st_ctime != w->attr.st_ctime 3111 || w->prev.st_ctime != w->attr.st_ctime
2613 ) { 3112 ) {
2614 #if EV_USE_INOTIFY 3113 #if EV_USE_INOTIFY
3114 if (fs_fd >= 0)
3115 {
2615 infy_del (EV_A_ w); 3116 infy_del (EV_A_ w);
2616 infy_add (EV_A_ w); 3117 infy_add (EV_A_ w);
2617 ev_stat_stat (EV_A_ w); /* avoid race... */ 3118 ev_stat_stat (EV_A_ w); /* avoid race... */
3119 }
2618 #endif 3120 #endif
2619 3121
2620 ev_feed_event (EV_A_ w, EV_STAT); 3122 ev_feed_event (EV_A_ w, EV_STAT);
2621 } 3123 }
2622} 3124}
… …
2625ev_stat_start (EV_P_ ev_stat *w) 3127ev_stat_start (EV_P_ ev_stat *w)
2626{ 3128{
2627 if (expect_false (ev_is_active (w))) 3129 if (expect_false (ev_is_active (w)))
2628 return; 3130 return;
2629 3131
2630 /* since we use memcmp, we need to clear any padding data etc. */
2631 memset (&w->prev, 0, sizeof (ev_statdata));
2632 memset (&w->attr, 0, sizeof (ev_statdata));
2633
2634 ev_stat_stat (EV_A_ w); 3132 ev_stat_stat (EV_A_ w);
2635 3133
3134 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2636 if (w->interval < MIN_STAT_INTERVAL) 3135 w->interval = MIN_STAT_INTERVAL;
2637 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2638 3136
2639 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3137 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2640 ev_set_priority (&w->timer, ev_priority (w)); 3138 ev_set_priority (&w->timer, ev_priority (w));
2641 3139
2642#if EV_USE_INOTIFY 3140#if EV_USE_INOTIFY
2643 infy_init (EV_A); 3141 infy_init (EV_A);
2644 3142
2645 if (fs_fd >= 0) 3143 if (fs_fd >= 0)
2646 infy_add (EV_A_ w); 3144 infy_add (EV_A_ w);
2647 else 3145 else
2648#endif 3146#endif
2649 ev_timer_start (EV_A_ &w->timer); 3147 ev_timer_again (EV_A_ &w->timer);
2650 3148
2651 ev_start (EV_A_ (W)w, 1); 3149 ev_start (EV_A_ (W)w, 1);
2652 3150
2653 EV_FREQUENT_CHECK; 3151 EV_FREQUENT_CHECK;
2654} 3152}
… …
2814embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3312embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2815{ 3313{
2816 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3314 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2817 3315
2818 { 3316 {
2819 struct ev_loop *loop = w->other; 3317 EV_P = w->other;
2820 3318
2821 while (fdchangecnt) 3319 while (fdchangecnt)
2822 { 3320 {
2823 fd_reify (EV_A); 3321 fd_reify (EV_A);
2824 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3322 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2825 } 3323 }
2826 } 3324 }
2827} 3325}
2828 3326
3327static void
3328embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
3329{
3330 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3331
3332 ev_embed_stop (EV_A_ w);
3333
3334 {
3335 EV_P = w->other;
3336
3337 ev_loop_fork (EV_A);
3338 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3339 }
3340
3341 ev_embed_start (EV_A_ w);
3342}
3343
2829#if 0 3344#if 0
2830static void 3345static void
2831embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3346embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2832{ 3347{
2833 ev_idle_stop (EV_A_ idle); 3348 ev_idle_stop (EV_A_ idle);
… …
2839{ 3354{
2840 if (expect_false (ev_is_active (w))) 3355 if (expect_false (ev_is_active (w)))
2841 return; 3356 return;
2842 3357
2843 { 3358 {
2844 struct ev_loop *loop = w->other; 3359 EV_P = w->other;
2845 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3360 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2846 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3361 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2847 } 3362 }
2848 3363
2849 EV_FREQUENT_CHECK; 3364 EV_FREQUENT_CHECK;
2850 3365
… …
2853 3368
2854 ev_prepare_init (&w->prepare, embed_prepare_cb); 3369 ev_prepare_init (&w->prepare, embed_prepare_cb);
2855 ev_set_priority (&w->prepare, EV_MINPRI); 3370 ev_set_priority (&w->prepare, EV_MINPRI);
2856 ev_prepare_start (EV_A_ &w->prepare); 3371 ev_prepare_start (EV_A_ &w->prepare);
2857 3372
3373 ev_fork_init (&w->fork, embed_fork_cb);
3374 ev_fork_start (EV_A_ &w->fork);
3375
2858 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 3376 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2859 3377
2860 ev_start (EV_A_ (W)w, 1); 3378 ev_start (EV_A_ (W)w, 1);
2861 3379
2862 EV_FREQUENT_CHECK; 3380 EV_FREQUENT_CHECK;
… …
2869 if (expect_false (!ev_is_active (w))) 3387 if (expect_false (!ev_is_active (w)))
2870 return; 3388 return;
2871 3389
2872 EV_FREQUENT_CHECK; 3390 EV_FREQUENT_CHECK;
2873 3391
2874 ev_io_stop (EV_A_ &w->io); 3392 ev_io_stop (EV_A_ &w->io);
2875 ev_prepare_stop (EV_A_ &w->prepare); 3393 ev_prepare_stop (EV_A_ &w->prepare);
2876 3394 ev_fork_stop (EV_A_ &w->fork);
2877 ev_stop (EV_A_ (W)w);
2878 3395
2879 EV_FREQUENT_CHECK; 3396 EV_FREQUENT_CHECK;
2880} 3397}
2881#endif 3398#endif
2882 3399
… …
2959 3476
2960void 3477void
2961ev_async_send (EV_P_ ev_async *w) 3478ev_async_send (EV_P_ ev_async *w)
2962{ 3479{
2963 w->sent = 1; 3480 w->sent = 1;
2964 evpipe_write (EV_A_ &gotasync); 3481 evpipe_write (EV_A_ &async_pending);
2965} 3482}
2966#endif 3483#endif
2967 3484
2968/*****************************************************************************/ 3485/*****************************************************************************/
2969 3486
… …
2979once_cb (EV_P_ struct ev_once *once, int revents) 3496once_cb (EV_P_ struct ev_once *once, int revents)
2980{ 3497{
2981 void (*cb)(int revents, void *arg) = once->cb; 3498 void (*cb)(int revents, void *arg) = once->cb;
2982 void *arg = once->arg; 3499 void *arg = once->arg;
2983 3500
2984 ev_io_stop (EV_A_ &once->io); 3501 ev_io_stop (EV_A_ &once->io);
2985 ev_timer_stop (EV_A_ &once->to); 3502 ev_timer_stop (EV_A_ &once->to);
2986 ev_free (once); 3503 ev_free (once);
2987 3504
2988 cb (revents, arg); 3505 cb (revents, arg);
2989} 3506}
2990 3507
2991static void 3508static void
2992once_cb_io (EV_P_ ev_io *w, int revents) 3509once_cb_io (EV_P_ ev_io *w, int revents)
2993{ 3510{
2994 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3511 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3512
3513 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2995} 3514}
2996 3515
2997static void 3516static void
2998once_cb_to (EV_P_ ev_timer *w, int revents) 3517once_cb_to (EV_P_ ev_timer *w, int revents)
2999{ 3518{
3000 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3519 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3520
3521 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
3001} 3522}
3002 3523
3003void 3524void
3004ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3525ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
3005{ 3526{
… …
3027 ev_timer_set (&once->to, timeout, 0.); 3548 ev_timer_set (&once->to, timeout, 0.);
3028 ev_timer_start (EV_A_ &once->to); 3549 ev_timer_start (EV_A_ &once->to);
3029 } 3550 }
3030} 3551}
3031 3552
3553/*****************************************************************************/
3554
3555#if EV_WALK_ENABLE
3556void
3557ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3558{
3559 int i, j;
3560 ev_watcher_list *wl, *wn;
3561
3562 if (types & (EV_IO | EV_EMBED))
3563 for (i = 0; i < anfdmax; ++i)
3564 for (wl = anfds [i].head; wl; )
3565 {
3566 wn = wl->next;
3567
3568#if EV_EMBED_ENABLE
3569 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3570 {
3571 if (types & EV_EMBED)
3572 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3573 }
3574 else
3575#endif
3576#if EV_USE_INOTIFY
3577 if (ev_cb ((ev_io *)wl) == infy_cb)
3578 ;
3579 else
3580#endif
3581 if ((ev_io *)wl != &pipe_w)
3582 if (types & EV_IO)
3583 cb (EV_A_ EV_IO, wl);
3584
3585 wl = wn;
3586 }
3587
3588 if (types & (EV_TIMER | EV_STAT))
3589 for (i = timercnt + HEAP0; i-- > HEAP0; )
3590#if EV_STAT_ENABLE
3591 /*TODO: timer is not always active*/
3592 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3593 {
3594 if (types & EV_STAT)
3595 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3596 }
3597 else
3598#endif
3599 if (types & EV_TIMER)
3600 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3601
3602#if EV_PERIODIC_ENABLE
3603 if (types & EV_PERIODIC)
3604 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3605 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3606#endif
3607
3608#if EV_IDLE_ENABLE
3609 if (types & EV_IDLE)
3610 for (j = NUMPRI; i--; )
3611 for (i = idlecnt [j]; i--; )
3612 cb (EV_A_ EV_IDLE, idles [j][i]);
3613#endif
3614
3615#if EV_FORK_ENABLE
3616 if (types & EV_FORK)
3617 for (i = forkcnt; i--; )
3618 if (ev_cb (forks [i]) != embed_fork_cb)
3619 cb (EV_A_ EV_FORK, forks [i]);
3620#endif
3621
3622#if EV_ASYNC_ENABLE
3623 if (types & EV_ASYNC)
3624 for (i = asynccnt; i--; )
3625 cb (EV_A_ EV_ASYNC, asyncs [i]);
3626#endif
3627
3628 if (types & EV_PREPARE)
3629 for (i = preparecnt; i--; )
3630#if EV_EMBED_ENABLE
3631 if (ev_cb (prepares [i]) != embed_prepare_cb)
3632#endif
3633 cb (EV_A_ EV_PREPARE, prepares [i]);
3634
3635 if (types & EV_CHECK)
3636 for (i = checkcnt; i--; )
3637 cb (EV_A_ EV_CHECK, checks [i]);
3638
3639 if (types & EV_SIGNAL)
3640 for (i = 0; i < EV_NSIG - 1; ++i)
3641 for (wl = signals [i].head; wl; )
3642 {
3643 wn = wl->next;
3644 cb (EV_A_ EV_SIGNAL, wl);
3645 wl = wn;
3646 }
3647
3648 if (types & EV_CHILD)
3649 for (i = EV_PID_HASHSIZE; i--; )
3650 for (wl = childs [i]; wl; )
3651 {
3652 wn = wl->next;
3653 cb (EV_A_ EV_CHILD, wl);
3654 wl = wn;
3655 }
3656/* EV_STAT 0x00001000 /* stat data changed */
3657/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3658}
3659#endif
3660
3032#if EV_MULTIPLICITY 3661#if EV_MULTIPLICITY
3033 #include "ev_wrap.h" 3662 #include "ev_wrap.h"
3034#endif 3663#endif
3035 3664
3036#ifdef __cplusplus 3665#ifdef __cplusplus

Diff Legend

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