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

Comparing libev/ev.c (file contents):
Revision 1.378 by root, Mon Jun 13 09:52:36 2011 UTC vs.
Revision 1.427 by root, Sun May 6 19:29:59 2012 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011,2012 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 *
59# endif 59# endif
60# ifndef EV_USE_MONOTONIC 60# ifndef EV_USE_MONOTONIC
61# define EV_USE_MONOTONIC 1 61# define EV_USE_MONOTONIC 1
62# endif 62# endif
63# endif 63# endif
64# elif !defined(EV_USE_CLOCK_SYSCALL) 64# elif !defined EV_USE_CLOCK_SYSCALL
65# define EV_USE_CLOCK_SYSCALL 0 65# define EV_USE_CLOCK_SYSCALL 0
66# endif 66# endif
67 67
68# if HAVE_CLOCK_GETTIME 68# if HAVE_CLOCK_GETTIME
69# ifndef EV_USE_MONOTONIC 69# ifndef EV_USE_MONOTONIC
183# include EV_H 183# include EV_H
184#else 184#else
185# include "ev.h" 185# include "ev.h"
186#endif 186#endif
187 187
188EV_CPP(extern "C" {) 188#if EV_NO_THREADS
189# undef EV_NO_SMP
190# define EV_NO_SMP 1
191# undef ECB_NO_THREADS
192# define ECB_NO_THREADS 1
193#endif
194#if EV_NO_SMP
195# undef EV_NO_SMP
196# define ECB_NO_SMP 1
197#endif
189 198
190#ifndef _WIN32 199#ifndef _WIN32
191# include <sys/time.h> 200# include <sys/time.h>
192# include <sys/wait.h> 201# include <sys/wait.h>
193# include <unistd.h> 202# include <unistd.h>
210#define _DARWIN_UNLIMITED_SELECT 1 219#define _DARWIN_UNLIMITED_SELECT 1
211 220
212/* this block tries to deduce configuration from header-defined symbols and defaults */ 221/* this block tries to deduce configuration from header-defined symbols and defaults */
213 222
214/* try to deduce the maximum number of signals on this platform */ 223/* try to deduce the maximum number of signals on this platform */
215#if defined (EV_NSIG) 224#if defined EV_NSIG
216/* use what's provided */ 225/* use what's provided */
217#elif defined (NSIG) 226#elif defined NSIG
218# define EV_NSIG (NSIG) 227# define EV_NSIG (NSIG)
219#elif defined(_NSIG) 228#elif defined _NSIG
220# define EV_NSIG (_NSIG) 229# define EV_NSIG (_NSIG)
221#elif defined (SIGMAX) 230#elif defined SIGMAX
222# define EV_NSIG (SIGMAX+1) 231# define EV_NSIG (SIGMAX+1)
223#elif defined (SIG_MAX) 232#elif defined SIG_MAX
224# define EV_NSIG (SIG_MAX+1) 233# define EV_NSIG (SIG_MAX+1)
225#elif defined (_SIG_MAX) 234#elif defined _SIG_MAX
226# define EV_NSIG (_SIG_MAX+1) 235# define EV_NSIG (_SIG_MAX+1)
227#elif defined (MAXSIG) 236#elif defined MAXSIG
228# define EV_NSIG (MAXSIG+1) 237# define EV_NSIG (MAXSIG+1)
229#elif defined (MAX_SIG) 238#elif defined MAX_SIG
230# define EV_NSIG (MAX_SIG+1) 239# define EV_NSIG (MAX_SIG+1)
231#elif defined (SIGARRAYSIZE) 240#elif defined SIGARRAYSIZE
232# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */ 241# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
233#elif defined (_sys_nsig) 242#elif defined _sys_nsig
234# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 243# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
235#else 244#else
236# error "unable to find value for NSIG, please report" 245# error "unable to find value for NSIG, please report"
237/* to make it compile regardless, just remove the above line, */ 246/* to make it compile regardless, just remove the above line, */
238/* but consider reporting it, too! :) */ 247/* but consider reporting it, too! :) */
250# define EV_USE_CLOCK_SYSCALL 0 259# define EV_USE_CLOCK_SYSCALL 0
251# endif 260# endif
252#endif 261#endif
253 262
254#ifndef EV_USE_MONOTONIC 263#ifndef EV_USE_MONOTONIC
255# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 264# if defined _POSIX_MONOTONIC_CLOCK && _POSIX_MONOTONIC_CLOCK >= 0
256# define EV_USE_MONOTONIC EV_FEATURE_OS 265# define EV_USE_MONOTONIC EV_FEATURE_OS
257# else 266# else
258# define EV_USE_MONOTONIC 0 267# define EV_USE_MONOTONIC 0
259# endif 268# endif
260#endif 269#endif
350#endif 359#endif
351 360
352/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 361/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
353/* which makes programs even slower. might work on other unices, too. */ 362/* which makes programs even slower. might work on other unices, too. */
354#if EV_USE_CLOCK_SYSCALL 363#if EV_USE_CLOCK_SYSCALL
355# include <syscall.h> 364# include <sys/syscall.h>
356# ifdef SYS_clock_gettime 365# ifdef SYS_clock_gettime
357# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 366# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
358# undef EV_USE_MONOTONIC 367# undef EV_USE_MONOTONIC
359# define EV_USE_MONOTONIC 1 368# define EV_USE_MONOTONIC 1
360# else 369# else
386# define EV_USE_INOTIFY 0 395# define EV_USE_INOTIFY 0
387#endif 396#endif
388 397
389#if !EV_USE_NANOSLEEP 398#if !EV_USE_NANOSLEEP
390/* hp-ux has it in sys/time.h, which we unconditionally include above */ 399/* hp-ux has it in sys/time.h, which we unconditionally include above */
391# if !defined(_WIN32) && !defined(__hpux) 400# if !defined _WIN32 && !defined __hpux
392# include <sys/select.h> 401# include <sys/select.h>
393# endif 402# endif
394#endif 403#endif
395 404
396#if EV_USE_INOTIFY 405#if EV_USE_INOTIFY
464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 473#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
465 474
466#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0) 475#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
467#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0) 476#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
468 477
478/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */
479/* ECB.H BEGIN */
480/*
481 * libecb - http://software.schmorp.de/pkg/libecb
482 *
483 * Copyright (©) 2009-2012 Marc Alexander Lehmann <libecb@schmorp.de>
484 * Copyright (©) 2011 Emanuele Giaquinta
485 * All rights reserved.
486 *
487 * Redistribution and use in source and binary forms, with or without modifica-
488 * tion, are permitted provided that the following conditions are met:
489 *
490 * 1. Redistributions of source code must retain the above copyright notice,
491 * this list of conditions and the following disclaimer.
492 *
493 * 2. Redistributions in binary form must reproduce the above copyright
494 * notice, this list of conditions and the following disclaimer in the
495 * documentation and/or other materials provided with the distribution.
496 *
497 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
498 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
499 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
500 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
501 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
502 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
503 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
504 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
505 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
506 * OF THE POSSIBILITY OF SUCH DAMAGE.
507 */
508
509#ifndef ECB_H
510#define ECB_H
511
512#ifdef _WIN32
513 typedef signed char int8_t;
514 typedef unsigned char uint8_t;
515 typedef signed short int16_t;
516 typedef unsigned short uint16_t;
517 typedef signed int int32_t;
518 typedef unsigned int uint32_t;
469#if __GNUC__ >= 4 519 #if __GNUC__
470# define expect(expr,value) __builtin_expect ((expr),(value)) 520 typedef signed long long int64_t;
471# define noinline __attribute__ ((noinline)) 521 typedef unsigned long long uint64_t;
522 #else /* _MSC_VER || __BORLANDC__ */
523 typedef signed __int64 int64_t;
524 typedef unsigned __int64 uint64_t;
525 #endif
472#else 526#else
473# define expect(expr,value) (expr) 527 #include <inttypes.h>
474# define noinline
475# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
476# define inline
477# endif 528#endif
529
530/* many compilers define _GNUC_ to some versions but then only implement
531 * what their idiot authors think are the "more important" extensions,
532 * causing enormous grief in return for some better fake benchmark numbers.
533 * or so.
534 * we try to detect these and simply assume they are not gcc - if they have
535 * an issue with that they should have done it right in the first place.
536 */
537#ifndef ECB_GCC_VERSION
538 #if !defined __GNUC_MINOR__ || defined __INTEL_COMPILER || defined __SUNPRO_C || defined __SUNPRO_CC || defined __llvm__ || defined __clang__
539 #define ECB_GCC_VERSION(major,minor) 0
540 #else
541 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
478#endif 542 #endif
543#endif
479 544
545/*****************************************************************************/
546
547/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */
548/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
549
550#if ECB_NO_THREADS
551# define ECB_NO_SMP 1
552#endif
553
554#if ECB_NO_THREADS || ECB_NO_SMP
555 #define ECB_MEMORY_FENCE do { } while (0)
556#endif
557
558#ifndef ECB_MEMORY_FENCE
559 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
560 #if __i386 || __i386__
561 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
562 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */
563 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */
564 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__
565 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
566 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory")
567 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */
568 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
569 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
570 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \
571 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__
572 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory")
573 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
574 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
575 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
576 #elif __sparc || __sparc__
577 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad | " : : : "memory")
578 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
579 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
580 #elif defined __s390__ || defined __s390x__
581 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
582 #elif defined __mips__
583 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
584 #elif defined __alpha__
585 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
586 #endif
587 #endif
588#endif
589
590#ifndef ECB_MEMORY_FENCE
591 #if ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
592 #define ECB_MEMORY_FENCE __sync_synchronize ()
593 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */
594 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */
595 #elif _MSC_VER >= 1400 /* VC++ 2005 */
596 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
597 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
598 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
599 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
600 #elif defined _WIN32
601 #include <WinNT.h>
602 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */
603 #elif __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
604 #include <mbarrier.h>
605 #define ECB_MEMORY_FENCE __machine_rw_barrier ()
606 #define ECB_MEMORY_FENCE_ACQUIRE __machine_r_barrier ()
607 #define ECB_MEMORY_FENCE_RELEASE __machine_w_barrier ()
608 #elif __xlC__
609 #define ECB_MEMORY_FENCE __sync ()
610 #endif
611#endif
612
613#ifndef ECB_MEMORY_FENCE
614 #if !ECB_AVOID_PTHREADS
615 /*
616 * if you get undefined symbol references to pthread_mutex_lock,
617 * or failure to find pthread.h, then you should implement
618 * the ECB_MEMORY_FENCE operations for your cpu/compiler
619 * OR provide pthread.h and link against the posix thread library
620 * of your system.
621 */
622 #include <pthread.h>
623 #define ECB_NEEDS_PTHREADS 1
624 #define ECB_MEMORY_FENCE_NEEDS_PTHREADS 1
625
626 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
627 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
628 #endif
629#endif
630
631#if !defined ECB_MEMORY_FENCE_ACQUIRE && defined ECB_MEMORY_FENCE
632 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
633#endif
634
635#if !defined ECB_MEMORY_FENCE_RELEASE && defined ECB_MEMORY_FENCE
636 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
637#endif
638
639/*****************************************************************************/
640
641#define ECB_C99 (__STDC_VERSION__ >= 199901L)
642
643#if __cplusplus
644 #define ecb_inline static inline
645#elif ECB_GCC_VERSION(2,5)
646 #define ecb_inline static __inline__
647#elif ECB_C99
648 #define ecb_inline static inline
649#else
650 #define ecb_inline static
651#endif
652
653#if ECB_GCC_VERSION(3,3)
654 #define ecb_restrict __restrict__
655#elif ECB_C99
656 #define ecb_restrict restrict
657#else
658 #define ecb_restrict
659#endif
660
661typedef int ecb_bool;
662
663#define ECB_CONCAT_(a, b) a ## b
664#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
665#define ECB_STRINGIFY_(a) # a
666#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
667
668#define ecb_function_ ecb_inline
669
670#if ECB_GCC_VERSION(3,1)
671 #define ecb_attribute(attrlist) __attribute__(attrlist)
672 #define ecb_is_constant(expr) __builtin_constant_p (expr)
673 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
674 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
675#else
676 #define ecb_attribute(attrlist)
677 #define ecb_is_constant(expr) 0
678 #define ecb_expect(expr,value) (expr)
679 #define ecb_prefetch(addr,rw,locality)
680#endif
681
682/* no emulation for ecb_decltype */
683#if ECB_GCC_VERSION(4,5)
684 #define ecb_decltype(x) __decltype(x)
685#elif ECB_GCC_VERSION(3,0)
686 #define ecb_decltype(x) __typeof(x)
687#endif
688
689#define ecb_noinline ecb_attribute ((__noinline__))
690#define ecb_noreturn ecb_attribute ((__noreturn__))
691#define ecb_unused ecb_attribute ((__unused__))
692#define ecb_const ecb_attribute ((__const__))
693#define ecb_pure ecb_attribute ((__pure__))
694
695#if ECB_GCC_VERSION(4,3)
696 #define ecb_artificial ecb_attribute ((__artificial__))
697 #define ecb_hot ecb_attribute ((__hot__))
698 #define ecb_cold ecb_attribute ((__cold__))
699#else
700 #define ecb_artificial
701 #define ecb_hot
702 #define ecb_cold
703#endif
704
705/* put around conditional expressions if you are very sure that the */
706/* expression is mostly true or mostly false. note that these return */
707/* booleans, not the expression. */
480#define expect_false(expr) expect ((expr) != 0, 0) 708#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
481#define expect_true(expr) expect ((expr) != 0, 1) 709#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
710/* for compatibility to the rest of the world */
711#define ecb_likely(expr) ecb_expect_true (expr)
712#define ecb_unlikely(expr) ecb_expect_false (expr)
713
714/* count trailing zero bits and count # of one bits */
715#if ECB_GCC_VERSION(3,4)
716 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */
717 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
718 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
719 #define ecb_ctz32(x) __builtin_ctz (x)
720 #define ecb_ctz64(x) __builtin_ctzll (x)
721 #define ecb_popcount32(x) __builtin_popcount (x)
722 /* no popcountll */
723#else
724 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const;
725 ecb_function_ int
726 ecb_ctz32 (uint32_t x)
727 {
728 int r = 0;
729
730 x &= ~x + 1; /* this isolates the lowest bit */
731
732#if ECB_branchless_on_i386
733 r += !!(x & 0xaaaaaaaa) << 0;
734 r += !!(x & 0xcccccccc) << 1;
735 r += !!(x & 0xf0f0f0f0) << 2;
736 r += !!(x & 0xff00ff00) << 3;
737 r += !!(x & 0xffff0000) << 4;
738#else
739 if (x & 0xaaaaaaaa) r += 1;
740 if (x & 0xcccccccc) r += 2;
741 if (x & 0xf0f0f0f0) r += 4;
742 if (x & 0xff00ff00) r += 8;
743 if (x & 0xffff0000) r += 16;
744#endif
745
746 return r;
747 }
748
749 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const;
750 ecb_function_ int
751 ecb_ctz64 (uint64_t x)
752 {
753 int shift = x & 0xffffffffU ? 0 : 32;
754 return ecb_ctz32 (x >> shift) + shift;
755 }
756
757 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const;
758 ecb_function_ int
759 ecb_popcount32 (uint32_t x)
760 {
761 x -= (x >> 1) & 0x55555555;
762 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
763 x = ((x >> 4) + x) & 0x0f0f0f0f;
764 x *= 0x01010101;
765
766 return x >> 24;
767 }
768
769 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const;
770 ecb_function_ int ecb_ld32 (uint32_t x)
771 {
772 int r = 0;
773
774 if (x >> 16) { x >>= 16; r += 16; }
775 if (x >> 8) { x >>= 8; r += 8; }
776 if (x >> 4) { x >>= 4; r += 4; }
777 if (x >> 2) { x >>= 2; r += 2; }
778 if (x >> 1) { r += 1; }
779
780 return r;
781 }
782
783 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const;
784 ecb_function_ int ecb_ld64 (uint64_t x)
785 {
786 int r = 0;
787
788 if (x >> 32) { x >>= 32; r += 32; }
789
790 return r + ecb_ld32 (x);
791 }
792#endif
793
794ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const;
795ecb_function_ uint8_t ecb_bitrev8 (uint8_t x)
796{
797 return ( (x * 0x0802U & 0x22110U)
798 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
799}
800
801ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const;
802ecb_function_ uint16_t ecb_bitrev16 (uint16_t x)
803{
804 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
805 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
806 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
807 x = ( x >> 8 ) | ( x << 8);
808
809 return x;
810}
811
812ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const;
813ecb_function_ uint32_t ecb_bitrev32 (uint32_t x)
814{
815 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
816 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
817 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
818 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
819 x = ( x >> 16 ) | ( x << 16);
820
821 return x;
822}
823
824/* popcount64 is only available on 64 bit cpus as gcc builtin */
825/* so for this version we are lazy */
826ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const;
827ecb_function_ int
828ecb_popcount64 (uint64_t x)
829{
830 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
831}
832
833ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) ecb_const;
834ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) ecb_const;
835ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) ecb_const;
836ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) ecb_const;
837ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const;
838ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const;
839ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) ecb_const;
840ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) ecb_const;
841
842ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); }
843ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); }
844ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); }
845ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); }
846ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); }
847ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); }
848ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); }
849ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); }
850
851#if ECB_GCC_VERSION(4,3)
852 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
853 #define ecb_bswap32(x) __builtin_bswap32 (x)
854 #define ecb_bswap64(x) __builtin_bswap64 (x)
855#else
856 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const;
857 ecb_function_ uint16_t
858 ecb_bswap16 (uint16_t x)
859 {
860 return ecb_rotl16 (x, 8);
861 }
862
863 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const;
864 ecb_function_ uint32_t
865 ecb_bswap32 (uint32_t x)
866 {
867 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
868 }
869
870 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const;
871 ecb_function_ uint64_t
872 ecb_bswap64 (uint64_t x)
873 {
874 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
875 }
876#endif
877
878#if ECB_GCC_VERSION(4,5)
879 #define ecb_unreachable() __builtin_unreachable ()
880#else
881 /* this seems to work fine, but gcc always emits a warning for it :/ */
882 ecb_inline void ecb_unreachable (void) ecb_noreturn;
883 ecb_inline void ecb_unreachable (void) { }
884#endif
885
886/* try to tell the compiler that some condition is definitely true */
887#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)
888
889ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
890ecb_inline unsigned char
891ecb_byteorder_helper (void)
892{
893 const uint32_t u = 0x11223344;
894 return *(unsigned char *)&u;
895}
896
897ecb_inline ecb_bool ecb_big_endian (void) ecb_const;
898ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
899ecb_inline ecb_bool ecb_little_endian (void) ecb_const;
900ecb_inline ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
901
902#if ECB_GCC_VERSION(3,0) || ECB_C99
903 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
904#else
905 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
906#endif
907
908#if __cplusplus
909 template<typename T>
910 static inline T ecb_div_rd (T val, T div)
911 {
912 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
913 }
914 template<typename T>
915 static inline T ecb_div_ru (T val, T div)
916 {
917 return val < 0 ? - ((-val ) / div) : (val + div - 1) / div;
918 }
919#else
920 #define ecb_div_rd(val,div) ((val) < 0 ? - ((-(val) + (div) - 1) / (div)) : ((val) ) / (div))
921 #define ecb_div_ru(val,div) ((val) < 0 ? - ((-(val) ) / (div)) : ((val) + (div) - 1) / (div))
922#endif
923
924#if ecb_cplusplus_does_not_suck
925 /* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */
926 template<typename T, int N>
927 static inline int ecb_array_length (const T (&arr)[N])
928 {
929 return N;
930 }
931#else
932 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
933#endif
934
935#endif
936
937/* ECB.H END */
938
939#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
940/* if your architecture doesn't need memory fences, e.g. because it is
941 * single-cpu/core, or if you use libev in a project that doesn't use libev
942 * from multiple threads, then you can define ECB_AVOID_PTHREADS when compiling
943 * libev, in which cases the memory fences become nops.
944 * alternatively, you can remove this #error and link against libpthread,
945 * which will then provide the memory fences.
946 */
947# error "memory fences not defined for your architecture, please report"
948#endif
949
950#ifndef ECB_MEMORY_FENCE
951# define ECB_MEMORY_FENCE do { } while (0)
952# define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
953# define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
954#endif
955
956#define expect_false(cond) ecb_expect_false (cond)
957#define expect_true(cond) ecb_expect_true (cond)
958#define noinline ecb_noinline
959
482#define inline_size static inline 960#define inline_size ecb_inline
483 961
484#if EV_FEATURE_CODE 962#if EV_FEATURE_CODE
485# define inline_speed static inline 963# define inline_speed ecb_inline
486#else 964#else
487# define inline_speed static noinline 965# define inline_speed static noinline
488#endif 966#endif
489 967
490#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 968#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
581 1059
582#ifdef __linux 1060#ifdef __linux
583# include <sys/utsname.h> 1061# include <sys/utsname.h>
584#endif 1062#endif
585 1063
586static unsigned int noinline 1064static unsigned int noinline ecb_cold
587ev_linux_version (void) 1065ev_linux_version (void)
588{ 1066{
589#ifdef __linux 1067#ifdef __linux
590 unsigned int v = 0; 1068 unsigned int v = 0;
591 struct utsname buf; 1069 struct utsname buf;
620} 1098}
621 1099
622/*****************************************************************************/ 1100/*****************************************************************************/
623 1101
624#if EV_AVOID_STDIO 1102#if EV_AVOID_STDIO
625static void noinline 1103static void noinline ecb_cold
626ev_printerr (const char *msg) 1104ev_printerr (const char *msg)
627{ 1105{
628 write (STDERR_FILENO, msg, strlen (msg)); 1106 write (STDERR_FILENO, msg, strlen (msg));
629} 1107}
630#endif 1108#endif
631 1109
632static void (*syserr_cb)(const char *msg); 1110static void (*syserr_cb)(const char *msg) EV_THROW;
633 1111
634void 1112void ecb_cold
635ev_set_syserr_cb (void (*cb)(const char *msg)) 1113ev_set_syserr_cb (void (*cb)(const char *msg)) EV_THROW
636{ 1114{
637 syserr_cb = cb; 1115 syserr_cb = cb;
638} 1116}
639 1117
640static void noinline 1118static void noinline ecb_cold
641ev_syserr (const char *msg) 1119ev_syserr (const char *msg)
642{ 1120{
643 if (!msg) 1121 if (!msg)
644 msg = "(libev) system error"; 1122 msg = "(libev) system error";
645 1123
676 free (ptr); 1154 free (ptr);
677 return 0; 1155 return 0;
678#endif 1156#endif
679} 1157}
680 1158
681static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 1159static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
682 1160
683void 1161void ecb_cold
684ev_set_allocator (void *(*cb)(void *ptr, long size)) 1162ev_set_allocator (void *(*cb)(void *ptr, long size)) EV_THROW
685{ 1163{
686 alloc = cb; 1164 alloc = cb;
687} 1165}
688 1166
689inline_speed void * 1167inline_speed void *
777 #undef VAR 1255 #undef VAR
778 }; 1256 };
779 #include "ev_wrap.h" 1257 #include "ev_wrap.h"
780 1258
781 static struct ev_loop default_loop_struct; 1259 static struct ev_loop default_loop_struct;
782 struct ev_loop *ev_default_loop_ptr; 1260 EV_API_DECL struct ev_loop *ev_default_loop_ptr = 0; /* needs to be initialised to make it a definition despite extern */
783 1261
784#else 1262#else
785 1263
786 ev_tstamp ev_rt_now; 1264 EV_API_DECL ev_tstamp ev_rt_now = 0; /* needs to be initialised to make it a definition despite extern */
787 #define VAR(name,decl) static decl; 1265 #define VAR(name,decl) static decl;
788 #include "ev_vars.h" 1266 #include "ev_vars.h"
789 #undef VAR 1267 #undef VAR
790 1268
791 static int ev_default_loop_ptr; 1269 static int ev_default_loop_ptr;
806 1284
807/*****************************************************************************/ 1285/*****************************************************************************/
808 1286
809#ifndef EV_HAVE_EV_TIME 1287#ifndef EV_HAVE_EV_TIME
810ev_tstamp 1288ev_tstamp
811ev_time (void) 1289ev_time (void) EV_THROW
812{ 1290{
813#if EV_USE_REALTIME 1291#if EV_USE_REALTIME
814 if (expect_true (have_realtime)) 1292 if (expect_true (have_realtime))
815 { 1293 {
816 struct timespec ts; 1294 struct timespec ts;
840 return ev_time (); 1318 return ev_time ();
841} 1319}
842 1320
843#if EV_MULTIPLICITY 1321#if EV_MULTIPLICITY
844ev_tstamp 1322ev_tstamp
845ev_now (EV_P) 1323ev_now (EV_P) EV_THROW
846{ 1324{
847 return ev_rt_now; 1325 return ev_rt_now;
848} 1326}
849#endif 1327#endif
850 1328
851void 1329void
852ev_sleep (ev_tstamp delay) 1330ev_sleep (ev_tstamp delay) EV_THROW
853{ 1331{
854 if (delay > 0.) 1332 if (delay > 0.)
855 { 1333 {
856#if EV_USE_NANOSLEEP 1334#if EV_USE_NANOSLEEP
857 struct timespec ts; 1335 struct timespec ts;
858 1336
859 EV_TS_SET (ts, delay); 1337 EV_TS_SET (ts, delay);
860 nanosleep (&ts, 0); 1338 nanosleep (&ts, 0);
861#elif defined(_WIN32) 1339#elif defined _WIN32
862 Sleep ((unsigned long)(delay * 1e3)); 1340 Sleep ((unsigned long)(delay * 1e3));
863#else 1341#else
864 struct timeval tv; 1342 struct timeval tv;
865 1343
866 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 1344 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
885 1363
886 do 1364 do
887 ncur <<= 1; 1365 ncur <<= 1;
888 while (cnt > ncur); 1366 while (cnt > ncur);
889 1367
890 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */ 1368 /* if size is large, round to MALLOC_ROUND - 4 * longs to accommodate malloc overhead */
891 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4) 1369 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
892 { 1370 {
893 ncur *= elem; 1371 ncur *= elem;
894 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1); 1372 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
895 ncur = ncur - sizeof (void *) * 4; 1373 ncur = ncur - sizeof (void *) * 4;
897 } 1375 }
898 1376
899 return ncur; 1377 return ncur;
900} 1378}
901 1379
902static noinline void * 1380static void * noinline ecb_cold
903array_realloc (int elem, void *base, int *cur, int cnt) 1381array_realloc (int elem, void *base, int *cur, int cnt)
904{ 1382{
905 *cur = array_nextsize (elem, *cur, cnt); 1383 *cur = array_nextsize (elem, *cur, cnt);
906 return ev_realloc (base, elem * *cur); 1384 return ev_realloc (base, elem * *cur);
907} 1385}
910 memset ((void *)(base), 0, sizeof (*(base)) * (count)) 1388 memset ((void *)(base), 0, sizeof (*(base)) * (count))
911 1389
912#define array_needsize(type,base,cur,cnt,init) \ 1390#define array_needsize(type,base,cur,cnt,init) \
913 if (expect_false ((cnt) > (cur))) \ 1391 if (expect_false ((cnt) > (cur))) \
914 { \ 1392 { \
915 int ocur_ = (cur); \ 1393 int ecb_unused ocur_ = (cur); \
916 (base) = (type *)array_realloc \ 1394 (base) = (type *)array_realloc \
917 (sizeof (type), (base), &(cur), (cnt)); \ 1395 (sizeof (type), (base), &(cur), (cnt)); \
918 init ((base) + (ocur_), (cur) - ocur_); \ 1396 init ((base) + (ocur_), (cur) - ocur_); \
919 } 1397 }
920 1398
938pendingcb (EV_P_ ev_prepare *w, int revents) 1416pendingcb (EV_P_ ev_prepare *w, int revents)
939{ 1417{
940} 1418}
941 1419
942void noinline 1420void noinline
943ev_feed_event (EV_P_ void *w, int revents) 1421ev_feed_event (EV_P_ void *w, int revents) EV_THROW
944{ 1422{
945 W w_ = (W)w; 1423 W w_ = (W)w;
946 int pri = ABSPRI (w_); 1424 int pri = ABSPRI (w_);
947 1425
948 if (expect_false (w_->pending)) 1426 if (expect_false (w_->pending))
952 w_->pending = ++pendingcnt [pri]; 1430 w_->pending = ++pendingcnt [pri];
953 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2); 1431 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
954 pendings [pri][w_->pending - 1].w = w_; 1432 pendings [pri][w_->pending - 1].w = w_;
955 pendings [pri][w_->pending - 1].events = revents; 1433 pendings [pri][w_->pending - 1].events = revents;
956 } 1434 }
1435
1436 pendingpri = NUMPRI - 1;
957} 1437}
958 1438
959inline_speed void 1439inline_speed void
960feed_reverse (EV_P_ W w) 1440feed_reverse (EV_P_ W w)
961{ 1441{
1007 if (expect_true (!anfd->reify)) 1487 if (expect_true (!anfd->reify))
1008 fd_event_nocheck (EV_A_ fd, revents); 1488 fd_event_nocheck (EV_A_ fd, revents);
1009} 1489}
1010 1490
1011void 1491void
1012ev_feed_fd_event (EV_P_ int fd, int revents) 1492ev_feed_fd_event (EV_P_ int fd, int revents) EV_THROW
1013{ 1493{
1014 if (fd >= 0 && fd < anfdmax) 1494 if (fd >= 0 && fd < anfdmax)
1015 fd_event_nocheck (EV_A_ fd, revents); 1495 fd_event_nocheck (EV_A_ fd, revents);
1016} 1496}
1017 1497
1090 fdchanges [fdchangecnt - 1] = fd; 1570 fdchanges [fdchangecnt - 1] = fd;
1091 } 1571 }
1092} 1572}
1093 1573
1094/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */ 1574/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
1095inline_speed void 1575inline_speed void ecb_cold
1096fd_kill (EV_P_ int fd) 1576fd_kill (EV_P_ int fd)
1097{ 1577{
1098 ev_io *w; 1578 ev_io *w;
1099 1579
1100 while ((w = (ev_io *)anfds [fd].head)) 1580 while ((w = (ev_io *)anfds [fd].head))
1103 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1583 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
1104 } 1584 }
1105} 1585}
1106 1586
1107/* check whether the given fd is actually valid, for error recovery */ 1587/* check whether the given fd is actually valid, for error recovery */
1108inline_size int 1588inline_size int ecb_cold
1109fd_valid (int fd) 1589fd_valid (int fd)
1110{ 1590{
1111#ifdef _WIN32 1591#ifdef _WIN32
1112 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1592 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
1113#else 1593#else
1114 return fcntl (fd, F_GETFD) != -1; 1594 return fcntl (fd, F_GETFD) != -1;
1115#endif 1595#endif
1116} 1596}
1117 1597
1118/* called on EBADF to verify fds */ 1598/* called on EBADF to verify fds */
1119static void noinline 1599static void noinline ecb_cold
1120fd_ebadf (EV_P) 1600fd_ebadf (EV_P)
1121{ 1601{
1122 int fd; 1602 int fd;
1123 1603
1124 for (fd = 0; fd < anfdmax; ++fd) 1604 for (fd = 0; fd < anfdmax; ++fd)
1126 if (!fd_valid (fd) && errno == EBADF) 1606 if (!fd_valid (fd) && errno == EBADF)
1127 fd_kill (EV_A_ fd); 1607 fd_kill (EV_A_ fd);
1128} 1608}
1129 1609
1130/* called on ENOMEM in select/poll to kill some fds and retry */ 1610/* called on ENOMEM in select/poll to kill some fds and retry */
1131static void noinline 1611static void noinline ecb_cold
1132fd_enomem (EV_P) 1612fd_enomem (EV_P)
1133{ 1613{
1134 int fd; 1614 int fd;
1135 1615
1136 for (fd = anfdmax; fd--; ) 1616 for (fd = anfdmax; fd--; )
1331 1811
1332/*****************************************************************************/ 1812/*****************************************************************************/
1333 1813
1334#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 1814#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1335 1815
1336static void noinline 1816static void noinline ecb_cold
1337evpipe_init (EV_P) 1817evpipe_init (EV_P)
1338{ 1818{
1339 if (!ev_is_active (&pipe_w)) 1819 if (!ev_is_active (&pipe_w))
1340 { 1820 {
1341# if EV_USE_EVENTFD 1821# if EV_USE_EVENTFD
1363 ev_io_start (EV_A_ &pipe_w); 1843 ev_io_start (EV_A_ &pipe_w);
1364 ev_unref (EV_A); /* watcher should not keep loop alive */ 1844 ev_unref (EV_A); /* watcher should not keep loop alive */
1365 } 1845 }
1366} 1846}
1367 1847
1368inline_size void 1848inline_speed void
1369evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1849evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1370{ 1850{
1371 if (!*flag) 1851 ECB_MEMORY_FENCE; /* push out the write before this function was called, acquire flag */
1372 { 1852
1853 if (expect_true (*flag))
1854 return;
1855
1373 *flag = 1; 1856 *flag = 1;
1374 1857
1858 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1859
1375 pipe_write_skipped = 1; 1860 pipe_write_skipped = 1;
1376 1861
1862 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1863
1377 if (pipe_write_wanted) 1864 if (pipe_write_wanted)
1865 {
1866 int old_errno;
1867
1868 pipe_write_skipped = 0; /* just an optimisation, no fence needed */
1869
1870 old_errno = errno; /* save errno because write will clobber it */
1871
1872#if EV_USE_EVENTFD
1873 if (evfd >= 0)
1378 { 1874 {
1379 int old_errno = errno; /* save errno because write will clobber it */
1380 char dummy;
1381
1382 pipe_write_skipped = 0;
1383
1384#if EV_USE_EVENTFD
1385 if (evfd >= 0)
1386 {
1387 uint64_t counter = 1; 1875 uint64_t counter = 1;
1388 write (evfd, &counter, sizeof (uint64_t)); 1876 write (evfd, &counter, sizeof (uint64_t));
1389 }
1390 else
1391#endif
1392 {
1393 /* win32 people keep sending patches that change this write() to send() */
1394 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1395 /* so when you think this write should be a send instead, please find out */
1396 /* where your send() is from - it's definitely not the microsoft send, and */
1397 /* tell me. thank you. */
1398 write (evpipe [1], &dummy, 1);
1399 }
1400
1401 errno = old_errno;
1402 } 1877 }
1878 else
1879#endif
1880 {
1881#ifdef _WIN32
1882 WSABUF buf;
1883 DWORD sent;
1884 buf.buf = &buf;
1885 buf.len = 1;
1886 WSASend (EV_FD_TO_WIN32_HANDLE (evpipe [1]), &buf, 1, &sent, 0, 0, 0);
1887#else
1888 write (evpipe [1], &(evpipe [1]), 1);
1889#endif
1890 }
1891
1892 errno = old_errno;
1403 } 1893 }
1404} 1894}
1405 1895
1406/* called whenever the libev signal pipe */ 1896/* called whenever the libev signal pipe */
1407/* got some events (signal, async) */ 1897/* got some events (signal, async) */
1419 read (evfd, &counter, sizeof (uint64_t)); 1909 read (evfd, &counter, sizeof (uint64_t));
1420 } 1910 }
1421 else 1911 else
1422#endif 1912#endif
1423 { 1913 {
1424 char dummy; 1914 char dummy[4];
1425 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1915#ifdef _WIN32
1916 WSABUF buf;
1917 DWORD recvd;
1918 buf.buf = dummy;
1919 buf.len = sizeof (dummy);
1920 WSARecv (EV_FD_TO_WIN32_HANDLE (evpipe [0]), &buf, 1, &recvd, 0, 0, 0);
1921#else
1426 read (evpipe [0], &dummy, 1); 1922 read (evpipe [0], &dummy, sizeof (dummy));
1923#endif
1427 } 1924 }
1428 } 1925 }
1429 1926
1430 pipe_write_skipped = 0; 1927 pipe_write_skipped = 0;
1928
1929 ECB_MEMORY_FENCE; /* push out skipped, acquire flags */
1431 1930
1432#if EV_SIGNAL_ENABLE 1931#if EV_SIGNAL_ENABLE
1433 if (sig_pending) 1932 if (sig_pending)
1434 { 1933 {
1435 sig_pending = 0; 1934 sig_pending = 0;
1935
1936 ECB_MEMORY_FENCE_RELEASE;
1436 1937
1437 for (i = EV_NSIG - 1; i--; ) 1938 for (i = EV_NSIG - 1; i--; )
1438 if (expect_false (signals [i].pending)) 1939 if (expect_false (signals [i].pending))
1439 ev_feed_signal_event (EV_A_ i + 1); 1940 ev_feed_signal_event (EV_A_ i + 1);
1440 } 1941 }
1442 1943
1443#if EV_ASYNC_ENABLE 1944#if EV_ASYNC_ENABLE
1444 if (async_pending) 1945 if (async_pending)
1445 { 1946 {
1446 async_pending = 0; 1947 async_pending = 0;
1948
1949 ECB_MEMORY_FENCE_RELEASE;
1447 1950
1448 for (i = asynccnt; i--; ) 1951 for (i = asynccnt; i--; )
1449 if (asyncs [i]->sent) 1952 if (asyncs [i]->sent)
1450 { 1953 {
1451 asyncs [i]->sent = 0; 1954 asyncs [i]->sent = 0;
1456} 1959}
1457 1960
1458/*****************************************************************************/ 1961/*****************************************************************************/
1459 1962
1460void 1963void
1461ev_feed_signal (int signum) 1964ev_feed_signal (int signum) EV_THROW
1462{ 1965{
1463#if EV_MULTIPLICITY 1966#if EV_MULTIPLICITY
1464 EV_P = signals [signum - 1].loop; 1967 EV_P = signals [signum - 1].loop;
1465 1968
1466 if (!EV_A) 1969 if (!EV_A)
1467 return; 1970 return;
1468#endif 1971#endif
1469 1972
1470 evpipe_init (EV_A); 1973 if (!ev_active (&pipe_w))
1974 return;
1471 1975
1472 signals [signum - 1].pending = 1; 1976 signals [signum - 1].pending = 1;
1473 evpipe_write (EV_A_ &sig_pending); 1977 evpipe_write (EV_A_ &sig_pending);
1474} 1978}
1475 1979
1482 1986
1483 ev_feed_signal (signum); 1987 ev_feed_signal (signum);
1484} 1988}
1485 1989
1486void noinline 1990void noinline
1487ev_feed_signal_event (EV_P_ int signum) 1991ev_feed_signal_event (EV_P_ int signum) EV_THROW
1488{ 1992{
1489 WL w; 1993 WL w;
1490 1994
1491 if (expect_false (signum <= 0 || signum > EV_NSIG)) 1995 if (expect_false (signum <= 0 || signum > EV_NSIG))
1492 return; 1996 return;
1607#endif 2111#endif
1608#if EV_USE_SELECT 2112#if EV_USE_SELECT
1609# include "ev_select.c" 2113# include "ev_select.c"
1610#endif 2114#endif
1611 2115
1612int 2116int ecb_cold
1613ev_version_major (void) 2117ev_version_major (void) EV_THROW
1614{ 2118{
1615 return EV_VERSION_MAJOR; 2119 return EV_VERSION_MAJOR;
1616} 2120}
1617 2121
1618int 2122int ecb_cold
1619ev_version_minor (void) 2123ev_version_minor (void) EV_THROW
1620{ 2124{
1621 return EV_VERSION_MINOR; 2125 return EV_VERSION_MINOR;
1622} 2126}
1623 2127
1624/* return true if we are running with elevated privileges and should ignore env variables */ 2128/* return true if we are running with elevated privileges and should ignore env variables */
1625int inline_size 2129int inline_size ecb_cold
1626enable_secure (void) 2130enable_secure (void)
1627{ 2131{
1628#ifdef _WIN32 2132#ifdef _WIN32
1629 return 0; 2133 return 0;
1630#else 2134#else
1631 return getuid () != geteuid () 2135 return getuid () != geteuid ()
1632 || getgid () != getegid (); 2136 || getgid () != getegid ();
1633#endif 2137#endif
1634} 2138}
1635 2139
1636unsigned int 2140unsigned int ecb_cold
1637ev_supported_backends (void) 2141ev_supported_backends (void) EV_THROW
1638{ 2142{
1639 unsigned int flags = 0; 2143 unsigned int flags = 0;
1640 2144
1641 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 2145 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
1642 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE; 2146 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
1645 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 2149 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1646 2150
1647 return flags; 2151 return flags;
1648} 2152}
1649 2153
1650unsigned int 2154unsigned int ecb_cold
1651ev_recommended_backends (void) 2155ev_recommended_backends (void) EV_THROW
1652{ 2156{
1653 unsigned int flags = ev_supported_backends (); 2157 unsigned int flags = ev_supported_backends ();
1654 2158
1655#ifndef __NetBSD__ 2159#ifndef __NetBSD__
1656 /* kqueue is borked on everything but netbsd apparently */ 2160 /* kqueue is borked on everything but netbsd apparently */
1667#endif 2171#endif
1668 2172
1669 return flags; 2173 return flags;
1670} 2174}
1671 2175
1672unsigned int 2176unsigned int ecb_cold
1673ev_embeddable_backends (void) 2177ev_embeddable_backends (void) EV_THROW
1674{ 2178{
1675 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 2179 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1676 2180
1677 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 2181 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1678 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */ 2182 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1680 2184
1681 return flags; 2185 return flags;
1682} 2186}
1683 2187
1684unsigned int 2188unsigned int
1685ev_backend (EV_P) 2189ev_backend (EV_P) EV_THROW
1686{ 2190{
1687 return backend; 2191 return backend;
1688} 2192}
1689 2193
1690#if EV_FEATURE_API 2194#if EV_FEATURE_API
1691unsigned int 2195unsigned int
1692ev_iteration (EV_P) 2196ev_iteration (EV_P) EV_THROW
1693{ 2197{
1694 return loop_count; 2198 return loop_count;
1695} 2199}
1696 2200
1697unsigned int 2201unsigned int
1698ev_depth (EV_P) 2202ev_depth (EV_P) EV_THROW
1699{ 2203{
1700 return loop_depth; 2204 return loop_depth;
1701} 2205}
1702 2206
1703void 2207void
1704ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 2208ev_set_io_collect_interval (EV_P_ ev_tstamp interval) EV_THROW
1705{ 2209{
1706 io_blocktime = interval; 2210 io_blocktime = interval;
1707} 2211}
1708 2212
1709void 2213void
1710ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 2214ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) EV_THROW
1711{ 2215{
1712 timeout_blocktime = interval; 2216 timeout_blocktime = interval;
1713} 2217}
1714 2218
1715void 2219void
1716ev_set_userdata (EV_P_ void *data) 2220ev_set_userdata (EV_P_ void *data) EV_THROW
1717{ 2221{
1718 userdata = data; 2222 userdata = data;
1719} 2223}
1720 2224
1721void * 2225void *
1722ev_userdata (EV_P) 2226ev_userdata (EV_P) EV_THROW
1723{ 2227{
1724 return userdata; 2228 return userdata;
1725} 2229}
1726 2230
2231void
1727void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 2232ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) EV_THROW
1728{ 2233{
1729 invoke_cb = invoke_pending_cb; 2234 invoke_cb = invoke_pending_cb;
1730} 2235}
1731 2236
2237void
1732void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 2238ev_set_loop_release_cb (EV_P_ void (*release)(EV_P) EV_THROW, void (*acquire)(EV_P) EV_THROW) EV_THROW
1733{ 2239{
1734 release_cb = release; 2240 release_cb = release;
1735 acquire_cb = acquire; 2241 acquire_cb = acquire;
1736} 2242}
1737#endif 2243#endif
1738 2244
1739/* initialise a loop structure, must be zero-initialised */ 2245/* initialise a loop structure, must be zero-initialised */
1740static void noinline 2246static void noinline ecb_cold
1741loop_init (EV_P_ unsigned int flags) 2247loop_init (EV_P_ unsigned int flags) EV_THROW
1742{ 2248{
1743 if (!backend) 2249 if (!backend)
1744 { 2250 {
1745 origflags = flags; 2251 origflags = flags;
1746 2252
1830#endif 2336#endif
1831 } 2337 }
1832} 2338}
1833 2339
1834/* free up a loop structure */ 2340/* free up a loop structure */
1835void 2341void ecb_cold
1836ev_loop_destroy (EV_P) 2342ev_loop_destroy (EV_P)
1837{ 2343{
1838 int i; 2344 int i;
1839 2345
1840#if EV_MULTIPLICITY 2346#if EV_MULTIPLICITY
1998 postfork = 0; 2504 postfork = 0;
1999} 2505}
2000 2506
2001#if EV_MULTIPLICITY 2507#if EV_MULTIPLICITY
2002 2508
2003struct ev_loop * 2509struct ev_loop * ecb_cold
2004ev_loop_new (unsigned int flags) 2510ev_loop_new (unsigned int flags) EV_THROW
2005{ 2511{
2006 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2512 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
2007 2513
2008 memset (EV_A, 0, sizeof (struct ev_loop)); 2514 memset (EV_A, 0, sizeof (struct ev_loop));
2009 loop_init (EV_A_ flags); 2515 loop_init (EV_A_ flags);
2016} 2522}
2017 2523
2018#endif /* multiplicity */ 2524#endif /* multiplicity */
2019 2525
2020#if EV_VERIFY 2526#if EV_VERIFY
2021static void noinline 2527static void noinline ecb_cold
2022verify_watcher (EV_P_ W w) 2528verify_watcher (EV_P_ W w)
2023{ 2529{
2024 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2530 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
2025 2531
2026 if (w->pending) 2532 if (w->pending)
2027 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2533 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
2028} 2534}
2029 2535
2030static void noinline 2536static void noinline ecb_cold
2031verify_heap (EV_P_ ANHE *heap, int N) 2537verify_heap (EV_P_ ANHE *heap, int N)
2032{ 2538{
2033 int i; 2539 int i;
2034 2540
2035 for (i = HEAP0; i < N + HEAP0; ++i) 2541 for (i = HEAP0; i < N + HEAP0; ++i)
2040 2546
2041 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2547 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
2042 } 2548 }
2043} 2549}
2044 2550
2045static void noinline 2551static void noinline ecb_cold
2046array_verify (EV_P_ W *ws, int cnt) 2552array_verify (EV_P_ W *ws, int cnt)
2047{ 2553{
2048 while (cnt--) 2554 while (cnt--)
2049 { 2555 {
2050 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2556 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
2052 } 2558 }
2053} 2559}
2054#endif 2560#endif
2055 2561
2056#if EV_FEATURE_API 2562#if EV_FEATURE_API
2057void 2563void ecb_cold
2058ev_verify (EV_P) 2564ev_verify (EV_P) EV_THROW
2059{ 2565{
2060#if EV_VERIFY 2566#if EV_VERIFY
2061 int i; 2567 int i, j;
2062 WL w; 2568 WL w, w2;
2063 2569
2064 assert (activecnt >= -1); 2570 assert (activecnt >= -1);
2065 2571
2066 assert (fdchangemax >= fdchangecnt); 2572 assert (fdchangemax >= fdchangecnt);
2067 for (i = 0; i < fdchangecnt; ++i) 2573 for (i = 0; i < fdchangecnt; ++i)
2068 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0)); 2574 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
2069 2575
2070 assert (anfdmax >= 0); 2576 assert (anfdmax >= 0);
2071 for (i = 0; i < anfdmax; ++i) 2577 for (i = j = 0; i < anfdmax; ++i)
2072 for (w = anfds [i].head; w; w = w->next) 2578 for (w = w2 = anfds [i].head; w; w = w->next)
2073 { 2579 {
2074 verify_watcher (EV_A_ (W)w); 2580 verify_watcher (EV_A_ (W)w);
2581
2582 if (++j & 1)
2583 w2 = w2->next;
2584
2585 assert (("libev: io watcher list contains a loop", w != w2));
2075 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1)); 2586 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
2076 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 2587 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
2077 } 2588 }
2078 2589
2079 assert (timermax >= timercnt); 2590 assert (timermax >= timercnt);
2128#endif 2639#endif
2129} 2640}
2130#endif 2641#endif
2131 2642
2132#if EV_MULTIPLICITY 2643#if EV_MULTIPLICITY
2133struct ev_loop * 2644struct ev_loop * ecb_cold
2134#else 2645#else
2135int 2646int
2136#endif 2647#endif
2137ev_default_loop (unsigned int flags) 2648ev_default_loop (unsigned int flags) EV_THROW
2138{ 2649{
2139 if (!ev_default_loop_ptr) 2650 if (!ev_default_loop_ptr)
2140 { 2651 {
2141#if EV_MULTIPLICITY 2652#if EV_MULTIPLICITY
2142 EV_P = ev_default_loop_ptr = &default_loop_struct; 2653 EV_P = ev_default_loop_ptr = &default_loop_struct;
2161 2672
2162 return ev_default_loop_ptr; 2673 return ev_default_loop_ptr;
2163} 2674}
2164 2675
2165void 2676void
2166ev_loop_fork (EV_P) 2677ev_loop_fork (EV_P) EV_THROW
2167{ 2678{
2168 postfork = 1; /* must be in line with ev_default_fork */ 2679 postfork = 1; /* must be in line with ev_default_fork */
2169} 2680}
2170 2681
2171/*****************************************************************************/ 2682/*****************************************************************************/
2175{ 2686{
2176 EV_CB_INVOKE ((W)w, revents); 2687 EV_CB_INVOKE ((W)w, revents);
2177} 2688}
2178 2689
2179unsigned int 2690unsigned int
2180ev_pending_count (EV_P) 2691ev_pending_count (EV_P) EV_THROW
2181{ 2692{
2182 int pri; 2693 int pri;
2183 unsigned int count = 0; 2694 unsigned int count = 0;
2184 2695
2185 for (pri = NUMPRI; pri--; ) 2696 for (pri = NUMPRI; pri--; )
2189} 2700}
2190 2701
2191void noinline 2702void noinline
2192ev_invoke_pending (EV_P) 2703ev_invoke_pending (EV_P)
2193{ 2704{
2194 int pri; 2705 for (pendingpri = NUMPRI; pendingpri--; ) /* pendingpri is modified during the loop */
2195
2196 for (pri = NUMPRI; pri--; )
2197 while (pendingcnt [pri]) 2706 while (pendingcnt [pendingpri])
2198 { 2707 {
2199 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2708 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2200 2709
2201 p->w->pending = 0; 2710 p->w->pending = 0;
2202 EV_CB_INVOKE (p->w, p->events); 2711 EV_CB_INVOKE (p->w, p->events);
2203 EV_FREQUENT_CHECK; 2712 EV_FREQUENT_CHECK;
2204 } 2713 }
2337 } 2846 }
2338} 2847}
2339 2848
2340/* simply recalculate all periodics */ 2849/* simply recalculate all periodics */
2341/* TODO: maybe ensure that at least one event happens when jumping forward? */ 2850/* TODO: maybe ensure that at least one event happens when jumping forward? */
2342static void noinline 2851static void noinline ecb_cold
2343periodics_reschedule (EV_P) 2852periodics_reschedule (EV_P)
2344{ 2853{
2345 int i; 2854 int i;
2346 2855
2347 /* adjust periodics after time jump */ 2856 /* adjust periodics after time jump */
2360 reheap (periodics, periodiccnt); 2869 reheap (periodics, periodiccnt);
2361} 2870}
2362#endif 2871#endif
2363 2872
2364/* adjust all timers by a given offset */ 2873/* adjust all timers by a given offset */
2365static void noinline 2874static void noinline ecb_cold
2366timers_reschedule (EV_P_ ev_tstamp adjust) 2875timers_reschedule (EV_P_ ev_tstamp adjust)
2367{ 2876{
2368 int i; 2877 int i;
2369 2878
2370 for (i = 0; i < timercnt; ++i) 2879 for (i = 0; i < timercnt; ++i)
2444 2953
2445 mn_now = ev_rt_now; 2954 mn_now = ev_rt_now;
2446 } 2955 }
2447} 2956}
2448 2957
2449void 2958int
2450ev_run (EV_P_ int flags) 2959ev_run (EV_P_ int flags)
2451{ 2960{
2452#if EV_FEATURE_API 2961#if EV_FEATURE_API
2453 ++loop_depth; 2962 ++loop_depth;
2454#endif 2963#endif
2515 time_update (EV_A_ 1e100); 3024 time_update (EV_A_ 1e100);
2516 3025
2517 /* from now on, we want a pipe-wake-up */ 3026 /* from now on, we want a pipe-wake-up */
2518 pipe_write_wanted = 1; 3027 pipe_write_wanted = 1;
2519 3028
3029 ECB_MEMORY_FENCE; /* make sure pipe_write_wanted is visible before we check for potential skips */
3030
2520 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped))) 3031 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2521 { 3032 {
2522 waittime = MAX_BLOCKTIME; 3033 waittime = MAX_BLOCKTIME;
2523 3034
2524 if (timercnt) 3035 if (timercnt)
2565#endif 3076#endif
2566 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 3077 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2567 backend_poll (EV_A_ waittime); 3078 backend_poll (EV_A_ waittime);
2568 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3079 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2569 3080
2570 pipe_write_wanted = 0; 3081 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
2571 3082
2572 if (pipe_write_skipped) 3083 if (pipe_write_skipped)
2573 { 3084 {
2574 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 3085 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2575 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 3086 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2609 loop_done = EVBREAK_CANCEL; 3120 loop_done = EVBREAK_CANCEL;
2610 3121
2611#if EV_FEATURE_API 3122#if EV_FEATURE_API
2612 --loop_depth; 3123 --loop_depth;
2613#endif 3124#endif
3125
3126 return activecnt;
2614} 3127}
2615 3128
2616void 3129void
2617ev_break (EV_P_ int how) 3130ev_break (EV_P_ int how) EV_THROW
2618{ 3131{
2619 loop_done = how; 3132 loop_done = how;
2620} 3133}
2621 3134
2622void 3135void
2623ev_ref (EV_P) 3136ev_ref (EV_P) EV_THROW
2624{ 3137{
2625 ++activecnt; 3138 ++activecnt;
2626} 3139}
2627 3140
2628void 3141void
2629ev_unref (EV_P) 3142ev_unref (EV_P) EV_THROW
2630{ 3143{
2631 --activecnt; 3144 --activecnt;
2632} 3145}
2633 3146
2634void 3147void
2635ev_now_update (EV_P) 3148ev_now_update (EV_P) EV_THROW
2636{ 3149{
2637 time_update (EV_A_ 1e100); 3150 time_update (EV_A_ 1e100);
2638} 3151}
2639 3152
2640void 3153void
2641ev_suspend (EV_P) 3154ev_suspend (EV_P) EV_THROW
2642{ 3155{
2643 ev_now_update (EV_A); 3156 ev_now_update (EV_A);
2644} 3157}
2645 3158
2646void 3159void
2647ev_resume (EV_P) 3160ev_resume (EV_P) EV_THROW
2648{ 3161{
2649 ev_tstamp mn_prev = mn_now; 3162 ev_tstamp mn_prev = mn_now;
2650 3163
2651 ev_now_update (EV_A); 3164 ev_now_update (EV_A);
2652 timers_reschedule (EV_A_ mn_now - mn_prev); 3165 timers_reschedule (EV_A_ mn_now - mn_prev);
2691 w->pending = 0; 3204 w->pending = 0;
2692 } 3205 }
2693} 3206}
2694 3207
2695int 3208int
2696ev_clear_pending (EV_P_ void *w) 3209ev_clear_pending (EV_P_ void *w) EV_THROW
2697{ 3210{
2698 W w_ = (W)w; 3211 W w_ = (W)w;
2699 int pending = w_->pending; 3212 int pending = w_->pending;
2700 3213
2701 if (expect_true (pending)) 3214 if (expect_true (pending))
2734} 3247}
2735 3248
2736/*****************************************************************************/ 3249/*****************************************************************************/
2737 3250
2738void noinline 3251void noinline
2739ev_io_start (EV_P_ ev_io *w) 3252ev_io_start (EV_P_ ev_io *w) EV_THROW
2740{ 3253{
2741 int fd = w->fd; 3254 int fd = w->fd;
2742 3255
2743 if (expect_false (ev_is_active (w))) 3256 if (expect_false (ev_is_active (w)))
2744 return; 3257 return;
2750 3263
2751 ev_start (EV_A_ (W)w, 1); 3264 ev_start (EV_A_ (W)w, 1);
2752 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 3265 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2753 wlist_add (&anfds[fd].head, (WL)w); 3266 wlist_add (&anfds[fd].head, (WL)w);
2754 3267
3268 /* common bug, apparently */
3269 assert (("libev: ev_io_start called with corrupted watcher", ((WL)w)->next != (WL)w));
3270
2755 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY); 3271 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2756 w->events &= ~EV__IOFDSET; 3272 w->events &= ~EV__IOFDSET;
2757 3273
2758 EV_FREQUENT_CHECK; 3274 EV_FREQUENT_CHECK;
2759} 3275}
2760 3276
2761void noinline 3277void noinline
2762ev_io_stop (EV_P_ ev_io *w) 3278ev_io_stop (EV_P_ ev_io *w) EV_THROW
2763{ 3279{
2764 clear_pending (EV_A_ (W)w); 3280 clear_pending (EV_A_ (W)w);
2765 if (expect_false (!ev_is_active (w))) 3281 if (expect_false (!ev_is_active (w)))
2766 return; 3282 return;
2767 3283
2776 3292
2777 EV_FREQUENT_CHECK; 3293 EV_FREQUENT_CHECK;
2778} 3294}
2779 3295
2780void noinline 3296void noinline
2781ev_timer_start (EV_P_ ev_timer *w) 3297ev_timer_start (EV_P_ ev_timer *w) EV_THROW
2782{ 3298{
2783 if (expect_false (ev_is_active (w))) 3299 if (expect_false (ev_is_active (w)))
2784 return; 3300 return;
2785 3301
2786 ev_at (w) += mn_now; 3302 ev_at (w) += mn_now;
2800 3316
2801 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 3317 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2802} 3318}
2803 3319
2804void noinline 3320void noinline
2805ev_timer_stop (EV_P_ ev_timer *w) 3321ev_timer_stop (EV_P_ ev_timer *w) EV_THROW
2806{ 3322{
2807 clear_pending (EV_A_ (W)w); 3323 clear_pending (EV_A_ (W)w);
2808 if (expect_false (!ev_is_active (w))) 3324 if (expect_false (!ev_is_active (w)))
2809 return; 3325 return;
2810 3326
2830 3346
2831 EV_FREQUENT_CHECK; 3347 EV_FREQUENT_CHECK;
2832} 3348}
2833 3349
2834void noinline 3350void noinline
2835ev_timer_again (EV_P_ ev_timer *w) 3351ev_timer_again (EV_P_ ev_timer *w) EV_THROW
2836{ 3352{
2837 EV_FREQUENT_CHECK; 3353 EV_FREQUENT_CHECK;
3354
3355 clear_pending (EV_A_ (W)w);
2838 3356
2839 if (ev_is_active (w)) 3357 if (ev_is_active (w))
2840 { 3358 {
2841 if (w->repeat) 3359 if (w->repeat)
2842 { 3360 {
2855 3373
2856 EV_FREQUENT_CHECK; 3374 EV_FREQUENT_CHECK;
2857} 3375}
2858 3376
2859ev_tstamp 3377ev_tstamp
2860ev_timer_remaining (EV_P_ ev_timer *w) 3378ev_timer_remaining (EV_P_ ev_timer *w) EV_THROW
2861{ 3379{
2862 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.); 3380 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2863} 3381}
2864 3382
2865#if EV_PERIODIC_ENABLE 3383#if EV_PERIODIC_ENABLE
2866void noinline 3384void noinline
2867ev_periodic_start (EV_P_ ev_periodic *w) 3385ev_periodic_start (EV_P_ ev_periodic *w) EV_THROW
2868{ 3386{
2869 if (expect_false (ev_is_active (w))) 3387 if (expect_false (ev_is_active (w)))
2870 return; 3388 return;
2871 3389
2872 if (w->reschedule_cb) 3390 if (w->reschedule_cb)
2892 3410
2893 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 3411 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2894} 3412}
2895 3413
2896void noinline 3414void noinline
2897ev_periodic_stop (EV_P_ ev_periodic *w) 3415ev_periodic_stop (EV_P_ ev_periodic *w) EV_THROW
2898{ 3416{
2899 clear_pending (EV_A_ (W)w); 3417 clear_pending (EV_A_ (W)w);
2900 if (expect_false (!ev_is_active (w))) 3418 if (expect_false (!ev_is_active (w)))
2901 return; 3419 return;
2902 3420
2920 3438
2921 EV_FREQUENT_CHECK; 3439 EV_FREQUENT_CHECK;
2922} 3440}
2923 3441
2924void noinline 3442void noinline
2925ev_periodic_again (EV_P_ ev_periodic *w) 3443ev_periodic_again (EV_P_ ev_periodic *w) EV_THROW
2926{ 3444{
2927 /* TODO: use adjustheap and recalculation */ 3445 /* TODO: use adjustheap and recalculation */
2928 ev_periodic_stop (EV_A_ w); 3446 ev_periodic_stop (EV_A_ w);
2929 ev_periodic_start (EV_A_ w); 3447 ev_periodic_start (EV_A_ w);
2930} 3448}
2935#endif 3453#endif
2936 3454
2937#if EV_SIGNAL_ENABLE 3455#if EV_SIGNAL_ENABLE
2938 3456
2939void noinline 3457void noinline
2940ev_signal_start (EV_P_ ev_signal *w) 3458ev_signal_start (EV_P_ ev_signal *w) EV_THROW
2941{ 3459{
2942 if (expect_false (ev_is_active (w))) 3460 if (expect_false (ev_is_active (w)))
2943 return; 3461 return;
2944 3462
2945 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG)); 3463 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
3016 3534
3017 EV_FREQUENT_CHECK; 3535 EV_FREQUENT_CHECK;
3018} 3536}
3019 3537
3020void noinline 3538void noinline
3021ev_signal_stop (EV_P_ ev_signal *w) 3539ev_signal_stop (EV_P_ ev_signal *w) EV_THROW
3022{ 3540{
3023 clear_pending (EV_A_ (W)w); 3541 clear_pending (EV_A_ (W)w);
3024 if (expect_false (!ev_is_active (w))) 3542 if (expect_false (!ev_is_active (w)))
3025 return; 3543 return;
3026 3544
3057#endif 3575#endif
3058 3576
3059#if EV_CHILD_ENABLE 3577#if EV_CHILD_ENABLE
3060 3578
3061void 3579void
3062ev_child_start (EV_P_ ev_child *w) 3580ev_child_start (EV_P_ ev_child *w) EV_THROW
3063{ 3581{
3064#if EV_MULTIPLICITY 3582#if EV_MULTIPLICITY
3065 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 3583 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
3066#endif 3584#endif
3067 if (expect_false (ev_is_active (w))) 3585 if (expect_false (ev_is_active (w)))
3074 3592
3075 EV_FREQUENT_CHECK; 3593 EV_FREQUENT_CHECK;
3076} 3594}
3077 3595
3078void 3596void
3079ev_child_stop (EV_P_ ev_child *w) 3597ev_child_stop (EV_P_ ev_child *w) EV_THROW
3080{ 3598{
3081 clear_pending (EV_A_ (W)w); 3599 clear_pending (EV_A_ (W)w);
3082 if (expect_false (!ev_is_active (w))) 3600 if (expect_false (!ev_is_active (w)))
3083 return; 3601 return;
3084 3602
3236 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3754 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3237 ofs += sizeof (struct inotify_event) + ev->len; 3755 ofs += sizeof (struct inotify_event) + ev->len;
3238 } 3756 }
3239} 3757}
3240 3758
3241inline_size void 3759inline_size void ecb_cold
3242ev_check_2625 (EV_P) 3760ev_check_2625 (EV_P)
3243{ 3761{
3244 /* kernels < 2.6.25 are borked 3762 /* kernels < 2.6.25 are borked
3245 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3763 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3246 */ 3764 */
3251} 3769}
3252 3770
3253inline_size int 3771inline_size int
3254infy_newfd (void) 3772infy_newfd (void)
3255{ 3773{
3256#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK) 3774#if defined IN_CLOEXEC && defined IN_NONBLOCK
3257 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK); 3775 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3258 if (fd >= 0) 3776 if (fd >= 0)
3259 return fd; 3777 return fd;
3260#endif 3778#endif
3261 return inotify_init (); 3779 return inotify_init ();
3336#else 3854#else
3337# define EV_LSTAT(p,b) lstat (p, b) 3855# define EV_LSTAT(p,b) lstat (p, b)
3338#endif 3856#endif
3339 3857
3340void 3858void
3341ev_stat_stat (EV_P_ ev_stat *w) 3859ev_stat_stat (EV_P_ ev_stat *w) EV_THROW
3342{ 3860{
3343 if (lstat (w->path, &w->attr) < 0) 3861 if (lstat (w->path, &w->attr) < 0)
3344 w->attr.st_nlink = 0; 3862 w->attr.st_nlink = 0;
3345 else if (!w->attr.st_nlink) 3863 else if (!w->attr.st_nlink)
3346 w->attr.st_nlink = 1; 3864 w->attr.st_nlink = 1;
3385 ev_feed_event (EV_A_ w, EV_STAT); 3903 ev_feed_event (EV_A_ w, EV_STAT);
3386 } 3904 }
3387} 3905}
3388 3906
3389void 3907void
3390ev_stat_start (EV_P_ ev_stat *w) 3908ev_stat_start (EV_P_ ev_stat *w) EV_THROW
3391{ 3909{
3392 if (expect_false (ev_is_active (w))) 3910 if (expect_false (ev_is_active (w)))
3393 return; 3911 return;
3394 3912
3395 ev_stat_stat (EV_A_ w); 3913 ev_stat_stat (EV_A_ w);
3416 3934
3417 EV_FREQUENT_CHECK; 3935 EV_FREQUENT_CHECK;
3418} 3936}
3419 3937
3420void 3938void
3421ev_stat_stop (EV_P_ ev_stat *w) 3939ev_stat_stop (EV_P_ ev_stat *w) EV_THROW
3422{ 3940{
3423 clear_pending (EV_A_ (W)w); 3941 clear_pending (EV_A_ (W)w);
3424 if (expect_false (!ev_is_active (w))) 3942 if (expect_false (!ev_is_active (w)))
3425 return; 3943 return;
3426 3944
3442} 3960}
3443#endif 3961#endif
3444 3962
3445#if EV_IDLE_ENABLE 3963#if EV_IDLE_ENABLE
3446void 3964void
3447ev_idle_start (EV_P_ ev_idle *w) 3965ev_idle_start (EV_P_ ev_idle *w) EV_THROW
3448{ 3966{
3449 if (expect_false (ev_is_active (w))) 3967 if (expect_false (ev_is_active (w)))
3450 return; 3968 return;
3451 3969
3452 pri_adjust (EV_A_ (W)w); 3970 pri_adjust (EV_A_ (W)w);
3465 3983
3466 EV_FREQUENT_CHECK; 3984 EV_FREQUENT_CHECK;
3467} 3985}
3468 3986
3469void 3987void
3470ev_idle_stop (EV_P_ ev_idle *w) 3988ev_idle_stop (EV_P_ ev_idle *w) EV_THROW
3471{ 3989{
3472 clear_pending (EV_A_ (W)w); 3990 clear_pending (EV_A_ (W)w);
3473 if (expect_false (!ev_is_active (w))) 3991 if (expect_false (!ev_is_active (w)))
3474 return; 3992 return;
3475 3993
3489} 4007}
3490#endif 4008#endif
3491 4009
3492#if EV_PREPARE_ENABLE 4010#if EV_PREPARE_ENABLE
3493void 4011void
3494ev_prepare_start (EV_P_ ev_prepare *w) 4012ev_prepare_start (EV_P_ ev_prepare *w) EV_THROW
3495{ 4013{
3496 if (expect_false (ev_is_active (w))) 4014 if (expect_false (ev_is_active (w)))
3497 return; 4015 return;
3498 4016
3499 EV_FREQUENT_CHECK; 4017 EV_FREQUENT_CHECK;
3504 4022
3505 EV_FREQUENT_CHECK; 4023 EV_FREQUENT_CHECK;
3506} 4024}
3507 4025
3508void 4026void
3509ev_prepare_stop (EV_P_ ev_prepare *w) 4027ev_prepare_stop (EV_P_ ev_prepare *w) EV_THROW
3510{ 4028{
3511 clear_pending (EV_A_ (W)w); 4029 clear_pending (EV_A_ (W)w);
3512 if (expect_false (!ev_is_active (w))) 4030 if (expect_false (!ev_is_active (w)))
3513 return; 4031 return;
3514 4032
3527} 4045}
3528#endif 4046#endif
3529 4047
3530#if EV_CHECK_ENABLE 4048#if EV_CHECK_ENABLE
3531void 4049void
3532ev_check_start (EV_P_ ev_check *w) 4050ev_check_start (EV_P_ ev_check *w) EV_THROW
3533{ 4051{
3534 if (expect_false (ev_is_active (w))) 4052 if (expect_false (ev_is_active (w)))
3535 return; 4053 return;
3536 4054
3537 EV_FREQUENT_CHECK; 4055 EV_FREQUENT_CHECK;
3542 4060
3543 EV_FREQUENT_CHECK; 4061 EV_FREQUENT_CHECK;
3544} 4062}
3545 4063
3546void 4064void
3547ev_check_stop (EV_P_ ev_check *w) 4065ev_check_stop (EV_P_ ev_check *w) EV_THROW
3548{ 4066{
3549 clear_pending (EV_A_ (W)w); 4067 clear_pending (EV_A_ (W)w);
3550 if (expect_false (!ev_is_active (w))) 4068 if (expect_false (!ev_is_active (w)))
3551 return; 4069 return;
3552 4070
3565} 4083}
3566#endif 4084#endif
3567 4085
3568#if EV_EMBED_ENABLE 4086#if EV_EMBED_ENABLE
3569void noinline 4087void noinline
3570ev_embed_sweep (EV_P_ ev_embed *w) 4088ev_embed_sweep (EV_P_ ev_embed *w) EV_THROW
3571{ 4089{
3572 ev_run (w->other, EVRUN_NOWAIT); 4090 ev_run (w->other, EVRUN_NOWAIT);
3573} 4091}
3574 4092
3575static void 4093static void
3623 ev_idle_stop (EV_A_ idle); 4141 ev_idle_stop (EV_A_ idle);
3624} 4142}
3625#endif 4143#endif
3626 4144
3627void 4145void
3628ev_embed_start (EV_P_ ev_embed *w) 4146ev_embed_start (EV_P_ ev_embed *w) EV_THROW
3629{ 4147{
3630 if (expect_false (ev_is_active (w))) 4148 if (expect_false (ev_is_active (w)))
3631 return; 4149 return;
3632 4150
3633 { 4151 {
3654 4172
3655 EV_FREQUENT_CHECK; 4173 EV_FREQUENT_CHECK;
3656} 4174}
3657 4175
3658void 4176void
3659ev_embed_stop (EV_P_ ev_embed *w) 4177ev_embed_stop (EV_P_ ev_embed *w) EV_THROW
3660{ 4178{
3661 clear_pending (EV_A_ (W)w); 4179 clear_pending (EV_A_ (W)w);
3662 if (expect_false (!ev_is_active (w))) 4180 if (expect_false (!ev_is_active (w)))
3663 return; 4181 return;
3664 4182
3674} 4192}
3675#endif 4193#endif
3676 4194
3677#if EV_FORK_ENABLE 4195#if EV_FORK_ENABLE
3678void 4196void
3679ev_fork_start (EV_P_ ev_fork *w) 4197ev_fork_start (EV_P_ ev_fork *w) EV_THROW
3680{ 4198{
3681 if (expect_false (ev_is_active (w))) 4199 if (expect_false (ev_is_active (w)))
3682 return; 4200 return;
3683 4201
3684 EV_FREQUENT_CHECK; 4202 EV_FREQUENT_CHECK;
3689 4207
3690 EV_FREQUENT_CHECK; 4208 EV_FREQUENT_CHECK;
3691} 4209}
3692 4210
3693void 4211void
3694ev_fork_stop (EV_P_ ev_fork *w) 4212ev_fork_stop (EV_P_ ev_fork *w) EV_THROW
3695{ 4213{
3696 clear_pending (EV_A_ (W)w); 4214 clear_pending (EV_A_ (W)w);
3697 if (expect_false (!ev_is_active (w))) 4215 if (expect_false (!ev_is_active (w)))
3698 return; 4216 return;
3699 4217
3712} 4230}
3713#endif 4231#endif
3714 4232
3715#if EV_CLEANUP_ENABLE 4233#if EV_CLEANUP_ENABLE
3716void 4234void
3717ev_cleanup_start (EV_P_ ev_cleanup *w) 4235ev_cleanup_start (EV_P_ ev_cleanup *w) EV_THROW
3718{ 4236{
3719 if (expect_false (ev_is_active (w))) 4237 if (expect_false (ev_is_active (w)))
3720 return; 4238 return;
3721 4239
3722 EV_FREQUENT_CHECK; 4240 EV_FREQUENT_CHECK;
3729 ev_unref (EV_A); 4247 ev_unref (EV_A);
3730 EV_FREQUENT_CHECK; 4248 EV_FREQUENT_CHECK;
3731} 4249}
3732 4250
3733void 4251void
3734ev_cleanup_stop (EV_P_ ev_cleanup *w) 4252ev_cleanup_stop (EV_P_ ev_cleanup *w) EV_THROW
3735{ 4253{
3736 clear_pending (EV_A_ (W)w); 4254 clear_pending (EV_A_ (W)w);
3737 if (expect_false (!ev_is_active (w))) 4255 if (expect_false (!ev_is_active (w)))
3738 return; 4256 return;
3739 4257
3753} 4271}
3754#endif 4272#endif
3755 4273
3756#if EV_ASYNC_ENABLE 4274#if EV_ASYNC_ENABLE
3757void 4275void
3758ev_async_start (EV_P_ ev_async *w) 4276ev_async_start (EV_P_ ev_async *w) EV_THROW
3759{ 4277{
3760 if (expect_false (ev_is_active (w))) 4278 if (expect_false (ev_is_active (w)))
3761 return; 4279 return;
3762 4280
3763 w->sent = 0; 4281 w->sent = 0;
3772 4290
3773 EV_FREQUENT_CHECK; 4291 EV_FREQUENT_CHECK;
3774} 4292}
3775 4293
3776void 4294void
3777ev_async_stop (EV_P_ ev_async *w) 4295ev_async_stop (EV_P_ ev_async *w) EV_THROW
3778{ 4296{
3779 clear_pending (EV_A_ (W)w); 4297 clear_pending (EV_A_ (W)w);
3780 if (expect_false (!ev_is_active (w))) 4298 if (expect_false (!ev_is_active (w)))
3781 return; 4299 return;
3782 4300
3793 4311
3794 EV_FREQUENT_CHECK; 4312 EV_FREQUENT_CHECK;
3795} 4313}
3796 4314
3797void 4315void
3798ev_async_send (EV_P_ ev_async *w) 4316ev_async_send (EV_P_ ev_async *w) EV_THROW
3799{ 4317{
3800 w->sent = 1; 4318 w->sent = 1;
3801 evpipe_write (EV_A_ &async_pending); 4319 evpipe_write (EV_A_ &async_pending);
3802} 4320}
3803#endif 4321#endif
3840 4358
3841 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io)); 4359 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
3842} 4360}
3843 4361
3844void 4362void
3845ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 4363ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) EV_THROW
3846{ 4364{
3847 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 4365 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3848 4366
3849 if (expect_false (!once)) 4367 if (expect_false (!once))
3850 { 4368 {
3871} 4389}
3872 4390
3873/*****************************************************************************/ 4391/*****************************************************************************/
3874 4392
3875#if EV_WALK_ENABLE 4393#if EV_WALK_ENABLE
3876void 4394void ecb_cold
3877ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 4395ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) EV_THROW
3878{ 4396{
3879 int i, j; 4397 int i, j;
3880 ev_watcher_list *wl, *wn; 4398 ev_watcher_list *wl, *wn;
3881 4399
3882 if (types & (EV_IO | EV_EMBED)) 4400 if (types & (EV_IO | EV_EMBED))
3925 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i])); 4443 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3926#endif 4444#endif
3927 4445
3928#if EV_IDLE_ENABLE 4446#if EV_IDLE_ENABLE
3929 if (types & EV_IDLE) 4447 if (types & EV_IDLE)
3930 for (j = NUMPRI; i--; ) 4448 for (j = NUMPRI; j--; )
3931 for (i = idlecnt [j]; i--; ) 4449 for (i = idlecnt [j]; i--; )
3932 cb (EV_A_ EV_IDLE, idles [j][i]); 4450 cb (EV_A_ EV_IDLE, idles [j][i]);
3933#endif 4451#endif
3934 4452
3935#if EV_FORK_ENABLE 4453#if EV_FORK_ENABLE
3988 4506
3989#if EV_MULTIPLICITY 4507#if EV_MULTIPLICITY
3990 #include "ev_wrap.h" 4508 #include "ev_wrap.h"
3991#endif 4509#endif
3992 4510
3993EV_CPP(})
3994

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines