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

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

Diff Legend

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