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

Comparing libev/ev.c (file contents):
Revision 1.391 by root, Thu Aug 4 13:57:16 2011 UTC vs.
Revision 1.412 by root, Wed Feb 22 01:53:00 2012 UTC

… …
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>
… …
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:
… …
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 #define ECB_MEMORY_FENCE_ACQUIRE do { } while (0)
544 #define ECB_MEMORY_FENCE_RELEASE do { } while (0)
545#endif 556#endif
546 557
547#ifndef ECB_MEMORY_FENCE 558#ifndef ECB_MEMORY_FENCE
548 #if ECB_GCC_VERSION(2,5) 559 #if ECB_GCC_VERSION(2,5) || defined(__INTEL_COMPILER) || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
549 #if __x86 560 #if __i386 || __i386__
550 #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")
551 #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 */
552 #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 */
553 #elif __amd64 564 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__
554 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 565 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
555 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory") 566 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory")
556 #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 */
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")
557 #endif 584 #endif
558 #endif 585 #endif
559#endif 586#endif
560 587
561#ifndef ECB_MEMORY_FENCE 588#ifndef ECB_MEMORY_FENCE
562 #if ECB_GCC_VERSION(4,4) 589 #if ECB_GCC_VERSION(4,4) || defined(__INTEL_COMPILER) || defined(__clang__)
563 #define ECB_MEMORY_FENCE __sync_synchronize () 590 #define ECB_MEMORY_FENCE __sync_synchronize ()
564 #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); }) */
565 #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 ); }) */
566 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 593 #elif _MSC_VER >= 1400 /* VC++ 2005 */
567 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 594 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
568 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 595 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
569 #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 */
570 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 597 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
571 #elif defined(_WIN32) 598 #elif defined(_WIN32)
572 #include <WinNT.h> 599 #include <WinNT.h>
573 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */ 600 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */
574 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE 601 #elif __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
575 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 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 ()
576 #endif 606 #endif
577#endif 607#endif
578 608
579#ifndef ECB_MEMORY_FENCE 609#ifndef ECB_MEMORY_FENCE
610 #if !ECB_AVOID_PTHREADS
580 /* 611 /*
581 * if you get undefined symbol references to pthread_mutex_lock, 612 * if you get undefined symbol references to pthread_mutex_lock,
582 * or failure to find pthread.h, then you should implement 613 * or failure to find pthread.h, then you should implement
583 * the ECB_MEMORY_FENCE operations for your cpu/compiler 614 * the ECB_MEMORY_FENCE operations for your cpu/compiler
584 * OR provide pthread.h and link against the posix thread library 615 * OR provide pthread.h and link against the posix thread library
585 * of your system. 616 * of your system.
586 */ 617 */
587 #include <pthread.h> 618 #include <pthread.h>
588 #define ECB_NEEDS_PTHREADS 1 619 #define ECB_NEEDS_PTHREADS 1
589 #define ECB_MEMORY_FENCE_NEEDS_PTHREADS 1 620 #define ECB_MEMORY_FENCE_NEEDS_PTHREADS 1
590 621
591 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER; 622 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
592 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0) 623 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
624 #endif
625#endif
626
627#if !defined(ECB_MEMORY_FENCE_ACQUIRE) && defined(ECB_MEMORY_FENCE)
593 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE 628 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
629#endif
630
631#if !defined(ECB_MEMORY_FENCE_RELEASE) && defined(ECB_MEMORY_FENCE)
594 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 632 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
595#endif 633#endif
596 634
597/*****************************************************************************/ 635/*****************************************************************************/
598 636
… …
747 785
748 return r + ecb_ld32 (x); 786 return r + ecb_ld32 (x);
749 } 787 }
750#endif 788#endif
751 789
790ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const;
791ecb_function_ uint8_t ecb_bitrev8 (uint8_t x)
792{
793 return ( (x * 0x0802U & 0x22110U)
794 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
795}
796
797ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const;
798ecb_function_ uint16_t ecb_bitrev16 (uint16_t x)
799{
800 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
801 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
802 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
803 x = ( x >> 8 ) | ( x << 8);
804
805 return x;
806}
807
808ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const;
809ecb_function_ uint32_t ecb_bitrev32 (uint32_t x)
810{
811 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
812 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
813 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
814 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
815 x = ( x >> 16 ) | ( x << 16);
816
817 return x;
818}
819
752/* popcount64 is only available on 64 bit cpus as gcc builtin */ 820/* popcount64 is only available on 64 bit cpus as gcc builtin */
753/* so for this version we are lazy */ 821/* so for this version we are lazy */
754ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const; 822ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const;
755ecb_function_ int 823ecb_function_ int
756ecb_popcount64 (uint64_t x) 824ecb_popcount64 (uint64_t x)
… …
805 873
806#if ECB_GCC_VERSION(4,5) 874#if ECB_GCC_VERSION(4,5)
807 #define ecb_unreachable() __builtin_unreachable () 875 #define ecb_unreachable() __builtin_unreachable ()
808#else 876#else
809 /* this seems to work fine, but gcc always emits a warning for it :/ */ 877 /* this seems to work fine, but gcc always emits a warning for it :/ */
810 ecb_function_ void ecb_unreachable (void) ecb_noreturn; 878 ecb_inline void ecb_unreachable (void) ecb_noreturn;
811 ecb_function_ void ecb_unreachable (void) { } 879 ecb_inline void ecb_unreachable (void) { }
812#endif 880#endif
813 881
814/* try to tell the compiler that some condition is definitely true */ 882/* try to tell the compiler that some condition is definitely true */
815#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) 883#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)
816 884
817ecb_function_ unsigned char ecb_byteorder_helper (void) ecb_const; 885ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
818ecb_function_ unsigned char 886ecb_inline unsigned char
819ecb_byteorder_helper (void) 887ecb_byteorder_helper (void)
820{ 888{
821 const uint32_t u = 0x11223344; 889 const uint32_t u = 0x11223344;
822 return *(unsigned char *)&u; 890 return *(unsigned char *)&u;
823} 891}
824 892
825ecb_function_ ecb_bool ecb_big_endian (void) ecb_const; 893ecb_inline ecb_bool ecb_big_endian (void) ecb_const;
826ecb_function_ ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 894ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
827ecb_function_ ecb_bool ecb_little_endian (void) ecb_const; 895ecb_inline ecb_bool ecb_little_endian (void) ecb_const;
828ecb_function_ ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; } 896ecb_inline ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
829 897
830#if ECB_GCC_VERSION(3,0) || ECB_C99 898#if ECB_GCC_VERSION(3,0) || ECB_C99
831 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) 899 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
832#else 900#else
833 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) 901 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
902#endif
903
904#if __cplusplus
905 template<typename T>
906 static inline T ecb_div_rd (T val, T div)
907 {
908 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
909 }
910 template<typename T>
911 static inline T ecb_div_ru (T val, T div)
912 {
913 return val < 0 ? - ((-val ) / div) : (val + div - 1) / div;
914 }
915#else
916 #define ecb_div_rd(val,div) ((val) < 0 ? - ((-(val) + (div) - 1) / (div)) : ((val) ) / (div))
917 #define ecb_div_ru(val,div) ((val) < 0 ? - ((-(val) ) / (div)) : ((val) + (div) - 1) / (div))
834#endif 918#endif
835 919
836#if ecb_cplusplus_does_not_suck 920#if ecb_cplusplus_does_not_suck
837 /* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */ 921 /* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */
838 template<typename T, int N> 922 template<typename T, int N>
… …
845#endif 929#endif
846 930
847#endif 931#endif
848 932
849/* ECB.H END */ 933/* ECB.H END */
934
935#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
936/* if your architecture doesn't need memory fences, e.g. because it is
937 * single-cpu/core, or if you use libev in a project that doesn't use libev
938 * from multiple threads, then you can define ECB_AVOID_PTHREADS when compiling
939 * libev, in which cases the memory fences become nops.
940 * alternatively, you can remove this #error and link against libpthread,
941 * which will then provide the memory fences.
942 */
943# error "memory fences not defined for your architecture, please report"
944#endif
945
946#ifndef ECB_MEMORY_FENCE
947# define ECB_MEMORY_FENCE do { } while (0)
948# define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
949# define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
950#endif
850 951
851#define expect_false(cond) ecb_expect_false (cond) 952#define expect_false(cond) ecb_expect_false (cond)
852#define expect_true(cond) ecb_expect_true (cond) 953#define expect_true(cond) ecb_expect_true (cond)
853#define noinline ecb_noinline 954#define noinline ecb_noinline
854 955
… …
1150 #undef VAR 1251 #undef VAR
1151 }; 1252 };
1152 #include "ev_wrap.h" 1253 #include "ev_wrap.h"
1153 1254
1154 static struct ev_loop default_loop_struct; 1255 static struct ev_loop default_loop_struct;
1155 struct ev_loop *ev_default_loop_ptr; 1256 EV_API_DECL struct ev_loop *ev_default_loop_ptr = 0; /* needs to be initialised to make it a definition despite extern */
1156 1257
1157#else 1258#else
1158 1259
1159 ev_tstamp ev_rt_now; 1260 EV_API_DECL ev_tstamp ev_rt_now = 0; /* needs to be initialised to make it a definition despite extern */
1160 #define VAR(name,decl) static decl; 1261 #define VAR(name,decl) static decl;
1161 #include "ev_vars.h" 1262 #include "ev_vars.h"
1162 #undef VAR 1263 #undef VAR
1163 1264
1164 static int ev_default_loop_ptr; 1265 static int ev_default_loop_ptr;
… …
1258 1359
1259 do 1360 do
1260 ncur <<= 1; 1361 ncur <<= 1;
1261 while (cnt > ncur); 1362 while (cnt > ncur);
1262 1363
1263 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */ 1364 /* if size is large, round to MALLOC_ROUND - 4 * longs to accommodate malloc overhead */
1264 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4) 1365 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
1265 { 1366 {
1266 ncur *= elem; 1367 ncur *= elem;
1267 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1); 1368 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
1268 ncur = ncur - sizeof (void *) * 4; 1369 ncur = ncur - sizeof (void *) * 4;
… …
1754 1855
1755 if (pipe_write_wanted) 1856 if (pipe_write_wanted)
1756 { 1857 {
1757 int old_errno; 1858 int old_errno;
1758 1859
1759 pipe_write_skipped = 0; /* just an optimsiation, no fence needed */ 1860 pipe_write_skipped = 0; /* just an optimisation, no fence needed */
1760 1861
1761 old_errno = errno; /* save errno because write will clobber it */ 1862 old_errno = errno; /* save errno because write will clobber it */
1762 1863
1763#if EV_USE_EVENTFD 1864#if EV_USE_EVENTFD
1764 if (evfd >= 0) 1865 if (evfd >= 0)
… …
1772 /* win32 people keep sending patches that change this write() to send() */ 1873 /* win32 people keep sending patches that change this write() to send() */
1773 /* and then run away. but send() is wrong, it wants a socket handle on win32 */ 1874 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1774 /* so when you think this write should be a send instead, please find out */ 1875 /* so when you think this write should be a send instead, please find out */
1775 /* where your send() is from - it's definitely not the microsoft send, and */ 1876 /* where your send() is from - it's definitely not the microsoft send, and */
1776 /* tell me. thank you. */ 1877 /* tell me. thank you. */
1878 /* it might be that your problem is that your environment needs EV_USE_WSASOCKET */
1879 /* check the ev documentation on how to use this flag */
1777 write (evpipe [1], &(evpipe [1]), 1); 1880 write (evpipe [1], &(evpipe [1]), 1);
1778 } 1881 }
1779 1882
1780 errno = old_errno; 1883 errno = old_errno;
1781 } 1884 }
… …
2948#endif 3051#endif
2949 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 3052 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2950 backend_poll (EV_A_ waittime); 3053 backend_poll (EV_A_ waittime);
2951 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3054 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2952 3055
2953 pipe_write_wanted = 0; /* just an optimsiation, no fence needed */ 3056 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
2954 3057
2955 if (pipe_write_skipped) 3058 if (pipe_write_skipped)
2956 { 3059 {
2957 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 3060 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2958 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 3061 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
… …
3216 3319
3217void noinline 3320void noinline
3218ev_timer_again (EV_P_ ev_timer *w) 3321ev_timer_again (EV_P_ ev_timer *w)
3219{ 3322{
3220 EV_FREQUENT_CHECK; 3323 EV_FREQUENT_CHECK;
3324
3325 clear_pending (EV_A_ (W)w);
3221 3326
3222 if (ev_is_active (w)) 3327 if (ev_is_active (w))
3223 { 3328 {
3224 if (w->repeat) 3329 if (w->repeat)
3225 { 3330 {
… …
4371 4476
4372#if EV_MULTIPLICITY 4477#if EV_MULTIPLICITY
4373 #include "ev_wrap.h" 4478 #include "ev_wrap.h"
4374#endif 4479#endif
4375 4480
4376EV_CPP(})
4377

Diff Legend

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