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

Comparing libev/ev.c (file contents):
Revision 1.396 by root, Wed Aug 24 16:13:17 2011 UTC vs.
Revision 1.418 by root, Mon Apr 2 23:14:41 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
… …
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
… …
469/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */ 478/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */
470/* ECB.H BEGIN */ 479/* ECB.H BEGIN */
471/* 480/*
472 * libecb - http://software.schmorp.de/pkg/libecb 481 * libecb - http://software.schmorp.de/pkg/libecb
473 * 482 *
474 * Copyright (©) 2009-2011 Marc Alexander Lehmann <libecb@schmorp.de> 483 * Copyright (©) 2009-2012 Marc Alexander Lehmann <libecb@schmorp.de>
475 * Copyright (©) 2011 Emanuele Giaquinta 484 * Copyright (©) 2011 Emanuele Giaquinta
476 * All rights reserved. 485 * All rights reserved.
477 * 486 *
478 * Redistribution and use in source and binary forms, with or without modifica- 487 * Redistribution and use in source and binary forms, with or without modifica-
479 * tion, are permitted provided that the following conditions are met: 488 * tion, are permitted provided that the following conditions are met:
… …
524 * or so. 533 * or so.
525 * we try to detect these and simply assume they are not gcc - if they have 534 * we try to detect these and simply assume they are not gcc - if they have
526 * an issue with that they should have done it right in the first place. 535 * an issue with that they should have done it right in the first place.
527 */ 536 */
528#ifndef ECB_GCC_VERSION 537#ifndef ECB_GCC_VERSION
529 #if !defined(__GNUC_MINOR__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__llvm__) || defined(__clang__) 538 #if !defined __GNUC_MINOR__ || defined __INTEL_COMPILER || defined __SUNPRO_C || defined __SUNPRO_CC || defined __llvm__ || defined __clang__
530 #define ECB_GCC_VERSION(major,minor) 0 539 #define ECB_GCC_VERSION(major,minor) 0
531 #else 540 #else
532 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 541 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
533 #endif 542 #endif
534#endif 543#endif
… …
536/*****************************************************************************/ 545/*****************************************************************************/
537 546
538/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */ 547/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */
539/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */ 548/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
540 549
550#if ECB_NO_THREADS
551# define ECB_NO_SMP 1
552#endif
553
541#if ECB_NO_THREADS || ECB_NO_SMP 554#if ECB_NO_THREADS || ECB_NO_SMP
542 #define ECB_MEMORY_FENCE do { } while (0) 555 #define ECB_MEMORY_FENCE do { } while (0)
543#endif 556#endif
544 557
545#ifndef ECB_MEMORY_FENCE 558#ifndef ECB_MEMORY_FENCE
546 #if ECB_GCC_VERSION(2,5) 559 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
547 #if __i386__ 560 #if __i386 || __i386__
548 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory") 561 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
549 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */ 562 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */
550 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */ 563 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */
551 #elif __amd64 564 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__
552 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 565 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
553 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory") 566 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory")
554 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */ 567 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */
555 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 568 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
556 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 569 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
557 #elif defined(__ARM_ARCH_6__ ) || defined(__ARM_ARCH_6J__ ) \ 570 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \
558 || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6ZK__) 571 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__
559 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory") 572 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory")
560 #elif defined(__ARM_ARCH_7__ ) || defined(__ARM_ARCH_7A__ ) \ 573 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
561 || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7R__ ) 574 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
562 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 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")
563 #endif 584 #endif
564 #endif 585 #endif
565#endif 586#endif
566 587
567#ifndef ECB_MEMORY_FENCE 588#ifndef ECB_MEMORY_FENCE
568 #if ECB_GCC_VERSION(4,4) || defined(__INTEL_COMPILER) 589 #if ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
569 #define ECB_MEMORY_FENCE __sync_synchronize () 590 #define ECB_MEMORY_FENCE __sync_synchronize ()
570 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */ 591 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */
571 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */ 592 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */
572 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 593 #elif _MSC_VER >= 1400 /* VC++ 2005 */
573 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 594 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
574 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 595 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
575 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 596 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
576 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 597 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
577 #elif defined(_WIN32) 598 #elif defined _WIN32
578 #include <WinNT.h> 599 #include <WinNT.h>
579 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */ 600 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */
601 #elif __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
602 #include <mbarrier.h>
603 #define ECB_MEMORY_FENCE __machine_rw_barrier ()
604 #define ECB_MEMORY_FENCE_ACQUIRE __machine_r_barrier ()
605 #define ECB_MEMORY_FENCE_RELEASE __machine_w_barrier ()
606 #elif __xlC__
607 #define ECB_MEMORY_FENCE __sync ()
580 #endif 608 #endif
581#endif 609#endif
582 610
583#ifndef ECB_MEMORY_FENCE 611#ifndef ECB_MEMORY_FENCE
584 #if !ECB_AVOID_PTHREADS 612 #if !ECB_AVOID_PTHREADS
… …
596 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER; 624 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
597 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0) 625 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
598 #endif 626 #endif
599#endif 627#endif
600 628
601#if !defined(ECB_MEMORY_FENCE_ACQUIRE) && defined(ECB_MEMORY_FENCE) 629#if !defined ECB_MEMORY_FENCE_ACQUIRE && defined ECB_MEMORY_FENCE
602 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE 630 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
603#endif 631#endif
604 632
605#if !defined(ECB_MEMORY_FENCE_RELEASE) && defined(ECB_MEMORY_FENCE) 633#if !defined ECB_MEMORY_FENCE_RELEASE && defined ECB_MEMORY_FENCE
606 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 634 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
607#endif 635#endif
608 636
609/*****************************************************************************/ 637/*****************************************************************************/
610 638
… …
759 787
760 return r + ecb_ld32 (x); 788 return r + ecb_ld32 (x);
761 } 789 }
762#endif 790#endif
763 791
792ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const;
793ecb_function_ uint8_t ecb_bitrev8 (uint8_t x)
794{
795 return ( (x * 0x0802U & 0x22110U)
796 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
797}
798
799ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const;
800ecb_function_ uint16_t ecb_bitrev16 (uint16_t x)
801{
802 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
803 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
804 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
805 x = ( x >> 8 ) | ( x << 8);
806
807 return x;
808}
809
810ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const;
811ecb_function_ uint32_t ecb_bitrev32 (uint32_t x)
812{
813 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
814 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
815 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
816 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
817 x = ( x >> 16 ) | ( x << 16);
818
819 return x;
820}
821
764/* popcount64 is only available on 64 bit cpus as gcc builtin */ 822/* popcount64 is only available on 64 bit cpus as gcc builtin */
765/* so for this version we are lazy */ 823/* so for this version we are lazy */
766ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const; 824ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const;
767ecb_function_ int 825ecb_function_ int
768ecb_popcount64 (uint64_t x) 826ecb_popcount64 (uint64_t x)
… …
817 875
818#if ECB_GCC_VERSION(4,5) 876#if ECB_GCC_VERSION(4,5)
819 #define ecb_unreachable() __builtin_unreachable () 877 #define ecb_unreachable() __builtin_unreachable ()
820#else 878#else
821 /* this seems to work fine, but gcc always emits a warning for it :/ */ 879 /* this seems to work fine, but gcc always emits a warning for it :/ */
822 ecb_function_ void ecb_unreachable (void) ecb_noreturn; 880 ecb_inline void ecb_unreachable (void) ecb_noreturn;
823 ecb_function_ void ecb_unreachable (void) { } 881 ecb_inline void ecb_unreachable (void) { }
824#endif 882#endif
825 883
826/* try to tell the compiler that some condition is definitely true */ 884/* try to tell the compiler that some condition is definitely true */
827#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) 885#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)
828 886
829ecb_function_ unsigned char ecb_byteorder_helper (void) ecb_const; 887ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
830ecb_function_ unsigned char 888ecb_inline unsigned char
831ecb_byteorder_helper (void) 889ecb_byteorder_helper (void)
832{ 890{
833 const uint32_t u = 0x11223344; 891 const uint32_t u = 0x11223344;
834 return *(unsigned char *)&u; 892 return *(unsigned char *)&u;
835} 893}
836 894
837ecb_function_ ecb_bool ecb_big_endian (void) ecb_const; 895ecb_inline ecb_bool ecb_big_endian (void) ecb_const;
838ecb_function_ ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 896ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
839ecb_function_ ecb_bool ecb_little_endian (void) ecb_const; 897ecb_inline ecb_bool ecb_little_endian (void) ecb_const;
840ecb_function_ ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; } 898ecb_inline ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
841 899
842#if ECB_GCC_VERSION(3,0) || ECB_C99 900#if ECB_GCC_VERSION(3,0) || ECB_C99
843 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) 901 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
844#else 902#else
845 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) 903 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
904#endif
905
906#if __cplusplus
907 template<typename T>
908 static inline T ecb_div_rd (T val, T div)
909 {
910 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
911 }
912 template<typename T>
913 static inline T ecb_div_ru (T val, T div)
914 {
915 return val < 0 ? - ((-val ) / div) : (val + div - 1) / div;
916 }
917#else
918 #define ecb_div_rd(val,div) ((val) < 0 ? - ((-(val) + (div) - 1) / (div)) : ((val) ) / (div))
919 #define ecb_div_ru(val,div) ((val) < 0 ? - ((-(val) ) / (div)) : ((val) + (div) - 1) / (div))
846#endif 920#endif
847 921
848#if ecb_cplusplus_does_not_suck 922#if ecb_cplusplus_does_not_suck
849 /* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */ 923 /* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */
850 template<typename T, int N> 924 template<typename T, int N>
… …
859#endif 933#endif
860 934
861/* ECB.H END */ 935/* ECB.H END */
862 936
863#if ECB_MEMORY_FENCE_NEEDS_PTHREADS 937#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
864/* if your architetcure doesn't need memory fences, e.g. because it is 938/* if your architecture doesn't need memory fences, e.g. because it is
865 * single-cpu/core, or if you use libev in a project that doesn't use libev 939 * single-cpu/core, or if you use libev in a project that doesn't use libev
866 * from multiple threads, then you can define ECB_AVOID_PTHREADS when compiling 940 * from multiple threads, then you can define ECB_AVOID_PTHREADS when compiling
867 * libev, in which casess the memory fences become nops. 941 * libev, in which cases the memory fences become nops.
868 * alternatively, you can remove this #error and link against libpthread, 942 * alternatively, you can remove this #error and link against libpthread,
869 * which will then provide the memory fences. 943 * which will then provide the memory fences.
870 */ 944 */
871# error "memory fences not defined for your architecture, please report" 945# error "memory fences not defined for your architecture, please report"
872#endif 946#endif
… …
1179 #undef VAR 1253 #undef VAR
1180 }; 1254 };
1181 #include "ev_wrap.h" 1255 #include "ev_wrap.h"
1182 1256
1183 static struct ev_loop default_loop_struct; 1257 static struct ev_loop default_loop_struct;
1184 struct ev_loop *ev_default_loop_ptr; 1258 EV_API_DECL struct ev_loop *ev_default_loop_ptr = 0; /* needs to be initialised to make it a definition despite extern */
1185 1259
1186#else 1260#else
1187 1261
1188 ev_tstamp ev_rt_now; 1262 EV_API_DECL ev_tstamp ev_rt_now = 0; /* needs to be initialised to make it a definition despite extern */
1189 #define VAR(name,decl) static decl; 1263 #define VAR(name,decl) static decl;
1190 #include "ev_vars.h" 1264 #include "ev_vars.h"
1191 #undef VAR 1265 #undef VAR
1192 1266
1193 static int ev_default_loop_ptr; 1267 static int ev_default_loop_ptr;
… …
1258#if EV_USE_NANOSLEEP 1332#if EV_USE_NANOSLEEP
1259 struct timespec ts; 1333 struct timespec ts;
1260 1334
1261 EV_TS_SET (ts, delay); 1335 EV_TS_SET (ts, delay);
1262 nanosleep (&ts, 0); 1336 nanosleep (&ts, 0);
1263#elif defined(_WIN32) 1337#elif defined _WIN32
1264 Sleep ((unsigned long)(delay * 1e3)); 1338 Sleep ((unsigned long)(delay * 1e3));
1265#else 1339#else
1266 struct timeval tv; 1340 struct timeval tv;
1267 1341
1268 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 1342 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
… …
1287 1361
1288 do 1362 do
1289 ncur <<= 1; 1363 ncur <<= 1;
1290 while (cnt > ncur); 1364 while (cnt > ncur);
1291 1365
1292 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */ 1366 /* if size is large, round to MALLOC_ROUND - 4 * longs to accommodate malloc overhead */
1293 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4) 1367 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
1294 { 1368 {
1295 ncur *= elem; 1369 ncur *= elem;
1296 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1); 1370 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
1297 ncur = ncur - sizeof (void *) * 4; 1371 ncur = ncur - sizeof (void *) * 4;
… …
1801 /* win32 people keep sending patches that change this write() to send() */ 1875 /* win32 people keep sending patches that change this write() to send() */
1802 /* and then run away. but send() is wrong, it wants a socket handle on win32 */ 1876 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1803 /* so when you think this write should be a send instead, please find out */ 1877 /* so when you think this write should be a send instead, please find out */
1804 /* where your send() is from - it's definitely not the microsoft send, and */ 1878 /* where your send() is from - it's definitely not the microsoft send, and */
1805 /* tell me. thank you. */ 1879 /* tell me. thank you. */
1880 /* it might be that your problem is that your environment needs EV_USE_WSASOCKET */
1881 /* check the ev documentation on how to use this flag */
1806 write (evpipe [1], &(evpipe [1]), 1); 1882 write (evpipe [1], &(evpipe [1]), 1);
1807 } 1883 }
1808 1884
1809 errno = old_errno; 1885 errno = old_errno;
1810 } 1886 }
… …
2854 2930
2855 mn_now = ev_rt_now; 2931 mn_now = ev_rt_now;
2856 } 2932 }
2857} 2933}
2858 2934
2859void 2935int
2860ev_run (EV_P_ int flags) 2936ev_run (EV_P_ int flags)
2861{ 2937{
2862#if EV_FEATURE_API 2938#if EV_FEATURE_API
2863 ++loop_depth; 2939 ++loop_depth;
2864#endif 2940#endif
… …
2977#endif 3053#endif
2978 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 3054 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2979 backend_poll (EV_A_ waittime); 3055 backend_poll (EV_A_ waittime);
2980 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3056 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2981 3057
2982 pipe_write_wanted = 0; /* just an optimsiation, no fence needed */ 3058 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
2983 3059
2984 if (pipe_write_skipped) 3060 if (pipe_write_skipped)
2985 { 3061 {
2986 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 3062 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2987 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 3063 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
… …
3021 loop_done = EVBREAK_CANCEL; 3097 loop_done = EVBREAK_CANCEL;
3022 3098
3023#if EV_FEATURE_API 3099#if EV_FEATURE_API
3024 --loop_depth; 3100 --loop_depth;
3025#endif 3101#endif
3102
3103 return activecnt;
3026} 3104}
3027 3105
3028void 3106void
3029ev_break (EV_P_ int how) 3107ev_break (EV_P_ int how)
3030{ 3108{
… …
3245 3323
3246void noinline 3324void noinline
3247ev_timer_again (EV_P_ ev_timer *w) 3325ev_timer_again (EV_P_ ev_timer *w)
3248{ 3326{
3249 EV_FREQUENT_CHECK; 3327 EV_FREQUENT_CHECK;
3328
3329 clear_pending (EV_A_ (W)w);
3250 3330
3251 if (ev_is_active (w)) 3331 if (ev_is_active (w))
3252 { 3332 {
3253 if (w->repeat) 3333 if (w->repeat)
3254 { 3334 {
… …
3663} 3743}
3664 3744
3665inline_size int 3745inline_size int
3666infy_newfd (void) 3746infy_newfd (void)
3667{ 3747{
3668#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK) 3748#if defined IN_CLOEXEC && defined IN_NONBLOCK
3669 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK); 3749 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3670 if (fd >= 0) 3750 if (fd >= 0)
3671 return fd; 3751 return fd;
3672#endif 3752#endif
3673 return inotify_init (); 3753 return inotify_init ();
… …
4400 4480
4401#if EV_MULTIPLICITY 4481#if EV_MULTIPLICITY
4402 #include "ev_wrap.h" 4482 #include "ev_wrap.h"
4403#endif 4483#endif
4404 4484
4405EV_CPP(})
4406

Diff Legend

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