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

Comparing libev/ev.c (file contents):
Revision 1.247 by root, Wed May 21 21:22:10 2008 UTC vs.
Revision 1.312 by root, Wed Aug 12 18:48:17 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines