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

Comparing libev/ev.c (file contents):
Revision 1.403 by root, Wed Jan 18 12:13:14 2012 UTC vs.
Revision 1.426 by root, Sun May 6 13:42:10 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
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
198
188#ifndef _WIN32 199#ifndef _WIN32
189# include <sys/time.h> 200# include <sys/time.h>
190# include <sys/wait.h> 201# include <sys/wait.h>
191# include <unistd.h> 202# include <unistd.h>
192#else 203#else
… …
208#define _DARWIN_UNLIMITED_SELECT 1 219#define _DARWIN_UNLIMITED_SELECT 1
209 220
210/* 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 */
211 222
212/* try to deduce the maximum number of signals on this platform */ 223/* try to deduce the maximum number of signals on this platform */
213#if defined (EV_NSIG) 224#if defined EV_NSIG
214/* use what's provided */ 225/* use what's provided */
215#elif defined (NSIG) 226#elif defined NSIG
216# define EV_NSIG (NSIG) 227# define EV_NSIG (NSIG)
217#elif defined(_NSIG) 228#elif defined _NSIG
218# define EV_NSIG (_NSIG) 229# define EV_NSIG (_NSIG)
219#elif defined (SIGMAX) 230#elif defined SIGMAX
220# define EV_NSIG (SIGMAX+1) 231# define EV_NSIG (SIGMAX+1)
221#elif defined (SIG_MAX) 232#elif defined SIG_MAX
222# define EV_NSIG (SIG_MAX+1) 233# define EV_NSIG (SIG_MAX+1)
223#elif defined (_SIG_MAX) 234#elif defined _SIG_MAX
224# define EV_NSIG (_SIG_MAX+1) 235# define EV_NSIG (_SIG_MAX+1)
225#elif defined (MAXSIG) 236#elif defined MAXSIG
226# define EV_NSIG (MAXSIG+1) 237# define EV_NSIG (MAXSIG+1)
227#elif defined (MAX_SIG) 238#elif defined MAX_SIG
228# define EV_NSIG (MAX_SIG+1) 239# define EV_NSIG (MAX_SIG+1)
229#elif defined (SIGARRAYSIZE) 240#elif defined SIGARRAYSIZE
230# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */ 241# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
231#elif defined (_sys_nsig) 242#elif defined _sys_nsig
232# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 243# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
233#else 244#else
234# error "unable to find value for NSIG, please report" 245# error "unable to find value for NSIG, please report"
235/* to make it compile regardless, just remove the above line, */ 246/* to make it compile regardless, just remove the above line, */
236/* but consider reporting it, too! :) */ 247/* but consider reporting it, too! :) */
… …
248# define EV_USE_CLOCK_SYSCALL 0 259# define EV_USE_CLOCK_SYSCALL 0
249# endif 260# endif
250#endif 261#endif
251 262
252#ifndef EV_USE_MONOTONIC 263#ifndef EV_USE_MONOTONIC
253# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 264# if defined _POSIX_MONOTONIC_CLOCK && _POSIX_MONOTONIC_CLOCK >= 0
254# define EV_USE_MONOTONIC EV_FEATURE_OS 265# define EV_USE_MONOTONIC EV_FEATURE_OS
255# else 266# else
256# define EV_USE_MONOTONIC 0 267# define EV_USE_MONOTONIC 0
257# endif 268# endif
258#endif 269#endif
… …
348#endif 359#endif
349 360
350/* 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, */
351/* which makes programs even slower. might work on other unices, too. */ 362/* which makes programs even slower. might work on other unices, too. */
352#if EV_USE_CLOCK_SYSCALL 363#if EV_USE_CLOCK_SYSCALL
353# include <syscall.h> 364# include <sys/syscall.h>
354# ifdef SYS_clock_gettime 365# ifdef SYS_clock_gettime
355# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 366# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
356# undef EV_USE_MONOTONIC 367# undef EV_USE_MONOTONIC
357# define EV_USE_MONOTONIC 1 368# define EV_USE_MONOTONIC 1
358# else 369# else
… …
384# define EV_USE_INOTIFY 0 395# define EV_USE_INOTIFY 0
385#endif 396#endif
386 397
387#if !EV_USE_NANOSLEEP 398#if !EV_USE_NANOSLEEP
388/* 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 */
389# if !defined(_WIN32) && !defined(__hpux) 400# if !defined _WIN32 && !defined __hpux
390# include <sys/select.h> 401# include <sys/select.h>
391# endif 402# endif
392#endif 403#endif
393 404
394#if EV_USE_INOTIFY 405#if EV_USE_INOTIFY
… …
522 * or so. 533 * or so.
523 * 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
524 * 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.
525 */ 536 */
526#ifndef ECB_GCC_VERSION 537#ifndef ECB_GCC_VERSION
527 #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__
528 #define ECB_GCC_VERSION(major,minor) 0 539 #define ECB_GCC_VERSION(major,minor) 0
529 #else 540 #else
530 #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)))
531 #endif 542 #endif
532#endif 543#endif
… …
534/*****************************************************************************/ 545/*****************************************************************************/
535 546
536/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */ 547/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */
537/* 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 */
538 549
550#if ECB_NO_THREADS
551# define ECB_NO_SMP 1
552#endif
553
539#if ECB_NO_THREADS || ECB_NO_SMP 554#if ECB_NO_THREADS || ECB_NO_SMP
540 #define ECB_MEMORY_FENCE do { } while (0) 555 #define ECB_MEMORY_FENCE do { } while (0)
541#endif 556#endif
542 557
543#ifndef ECB_MEMORY_FENCE 558#ifndef ECB_MEMORY_FENCE
544 #if ECB_GCC_VERSION(2,5) || defined(__INTEL_COMPILER) || defined(__clang__) || __SUNPRO_C >= 0x5110 || __SUNPRO_xC >= 0x5110 559 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
545 #if __i386__ 560 #if __i386 || __i386__
546 #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")
547 #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 */
548 #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 */
549 #elif __amd64 564 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__
550 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 565 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
551 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory") 566 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory")
552 #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 */
553 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 568 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
554 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 569 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
555 #elif defined(__ARM_ARCH_6__ ) || defined(__ARM_ARCH_6J__ ) \ 570 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \
556 || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6ZK__) 571 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__
557 #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")
558 #elif defined(__ARM_ARCH_7__ ) || defined(__ARM_ARCH_7A__ ) \ 573 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
559 || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7R__ ) 574 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
560 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 575 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
561 #elif defined(__sparc) 576 #elif __sparc || __sparc__
562 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #StoreLoad | #LoadLoad | #StoreStore" : : : "memory") 577 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad | " : : : "memory")
563 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadLoad" : : : "memory") 578 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
564 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #StoreStore") 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")
565 #endif 586 #endif
566 #endif 587 #endif
567#endif 588#endif
568 589
569#ifndef ECB_MEMORY_FENCE 590#ifndef ECB_MEMORY_FENCE
570 #if ECB_GCC_VERSION(4,4) || defined(__INTEL_COMPILER) || defined(__clang__) 591 #if ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
571 #define ECB_MEMORY_FENCE __sync_synchronize () 592 #define ECB_MEMORY_FENCE __sync_synchronize ()
572 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */ 593 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */
573 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */ 594 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */
574 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 595 #elif _MSC_VER >= 1400 /* VC++ 2005 */
575 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 596 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
576 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 597 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
577 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 598 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
578 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 599 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
579 #elif defined(_WIN32) 600 #elif defined _WIN32
580 #include <WinNT.h> 601 #include <WinNT.h>
581 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */ 602 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */
582 #elif __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110 603 #elif __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
583 #include <mbarrier.h> 604 #include <mbarrier.h>
584 #define ECB_MEMORY_FENCE __machine_rw_barrier () 605 #define ECB_MEMORY_FENCE __machine_rw_barrier ()
585 #define ECB_MEMORY_FENCE_ACQUIRE __machine_r_barrier () 606 #define ECB_MEMORY_FENCE_ACQUIRE __machine_r_barrier ()
586 #define ECB_MEMORY_FENCE_RELEASE __machine_w_barrier () 607 #define ECB_MEMORY_FENCE_RELEASE __machine_w_barrier ()
608 #elif __xlC__
609 #define ECB_MEMORY_FENCE __sync ()
587 #endif 610 #endif
588#endif 611#endif
589 612
590#ifndef ECB_MEMORY_FENCE 613#ifndef ECB_MEMORY_FENCE
591 #if !ECB_AVOID_PTHREADS 614 #if !ECB_AVOID_PTHREADS
… …
603 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER; 626 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
604 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0) 627 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
605 #endif 628 #endif
606#endif 629#endif
607 630
608#if !defined(ECB_MEMORY_FENCE_ACQUIRE) && defined(ECB_MEMORY_FENCE) 631#if !defined ECB_MEMORY_FENCE_ACQUIRE && defined ECB_MEMORY_FENCE
609 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE 632 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
610#endif 633#endif
611 634
612#if !defined(ECB_MEMORY_FENCE_RELEASE) && defined(ECB_MEMORY_FENCE) 635#if !defined ECB_MEMORY_FENCE_RELEASE && defined ECB_MEMORY_FENCE
613 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 636 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
614#endif 637#endif
615 638
616/*****************************************************************************/ 639/*****************************************************************************/
617 640
… …
854 877
855#if ECB_GCC_VERSION(4,5) 878#if ECB_GCC_VERSION(4,5)
856 #define ecb_unreachable() __builtin_unreachable () 879 #define ecb_unreachable() __builtin_unreachable ()
857#else 880#else
858 /* this seems to work fine, but gcc always emits a warning for it :/ */ 881 /* this seems to work fine, but gcc always emits a warning for it :/ */
859 ecb_function_ void ecb_unreachable (void) ecb_noreturn; 882 ecb_inline void ecb_unreachable (void) ecb_noreturn;
860 ecb_function_ void ecb_unreachable (void) { } 883 ecb_inline void ecb_unreachable (void) { }
861#endif 884#endif
862 885
863/* try to tell the compiler that some condition is definitely true */ 886/* try to tell the compiler that some condition is definitely true */
864#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) 887#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)
865 888
866ecb_function_ unsigned char ecb_byteorder_helper (void) ecb_const; 889ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
867ecb_function_ unsigned char 890ecb_inline unsigned char
868ecb_byteorder_helper (void) 891ecb_byteorder_helper (void)
869{ 892{
870 const uint32_t u = 0x11223344; 893 const uint32_t u = 0x11223344;
871 return *(unsigned char *)&u; 894 return *(unsigned char *)&u;
872} 895}
873 896
874ecb_function_ ecb_bool ecb_big_endian (void) ecb_const; 897ecb_inline ecb_bool ecb_big_endian (void) ecb_const;
875ecb_function_ ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 898ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
876ecb_function_ ecb_bool ecb_little_endian (void) ecb_const; 899ecb_inline ecb_bool ecb_little_endian (void) ecb_const;
877ecb_function_ ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; } 900ecb_inline ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
878 901
879#if ECB_GCC_VERSION(3,0) || ECB_C99 902#if ECB_GCC_VERSION(3,0) || ECB_C99
880 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) 903 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
881#else 904#else
882 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) 905 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
… …
1082{ 1105{
1083 write (STDERR_FILENO, msg, strlen (msg)); 1106 write (STDERR_FILENO, msg, strlen (msg));
1084} 1107}
1085#endif 1108#endif
1086 1109
1087static void (*syserr_cb)(const char *msg); 1110static void (*syserr_cb)(const char *msg) EV_THROW;
1088 1111
1089void ecb_cold 1112void ecb_cold
1090ev_set_syserr_cb (void (*cb)(const char *msg)) 1113ev_set_syserr_cb (void (*cb)(const char *msg)) EV_THROW
1091{ 1114{
1092 syserr_cb = cb; 1115 syserr_cb = cb;
1093} 1116}
1094 1117
1095static void noinline ecb_cold 1118static void noinline ecb_cold
… …
1131 free (ptr); 1154 free (ptr);
1132 return 0; 1155 return 0;
1133#endif 1156#endif
1134} 1157}
1135 1158
1136static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 1159static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1137 1160
1138void ecb_cold 1161void ecb_cold
1139ev_set_allocator (void *(*cb)(void *ptr, long size)) 1162ev_set_allocator (void *(*cb)(void *ptr, long size)) EV_THROW
1140{ 1163{
1141 alloc = cb; 1164 alloc = cb;
1142} 1165}
1143 1166
1144inline_speed void * 1167inline_speed void *
… …
1261 1284
1262/*****************************************************************************/ 1285/*****************************************************************************/
1263 1286
1264#ifndef EV_HAVE_EV_TIME 1287#ifndef EV_HAVE_EV_TIME
1265ev_tstamp 1288ev_tstamp
1266ev_time (void) 1289ev_time (void) EV_THROW
1267{ 1290{
1268#if EV_USE_REALTIME 1291#if EV_USE_REALTIME
1269 if (expect_true (have_realtime)) 1292 if (expect_true (have_realtime))
1270 { 1293 {
1271 struct timespec ts; 1294 struct timespec ts;
… …
1295 return ev_time (); 1318 return ev_time ();
1296} 1319}
1297 1320
1298#if EV_MULTIPLICITY 1321#if EV_MULTIPLICITY
1299ev_tstamp 1322ev_tstamp
1300ev_now (EV_P) 1323ev_now (EV_P) EV_THROW
1301{ 1324{
1302 return ev_rt_now; 1325 return ev_rt_now;
1303} 1326}
1304#endif 1327#endif
1305 1328
1306void 1329void
1307ev_sleep (ev_tstamp delay) 1330ev_sleep (ev_tstamp delay) EV_THROW
1308{ 1331{
1309 if (delay > 0.) 1332 if (delay > 0.)
1310 { 1333 {
1311#if EV_USE_NANOSLEEP 1334#if EV_USE_NANOSLEEP
1312 struct timespec ts; 1335 struct timespec ts;
1313 1336
1314 EV_TS_SET (ts, delay); 1337 EV_TS_SET (ts, delay);
1315 nanosleep (&ts, 0); 1338 nanosleep (&ts, 0);
1316#elif defined(_WIN32) 1339#elif defined _WIN32
1317 Sleep ((unsigned long)(delay * 1e3)); 1340 Sleep ((unsigned long)(delay * 1e3));
1318#else 1341#else
1319 struct timeval tv; 1342 struct timeval tv;
1320 1343
1321 /* 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 */
… …
1393pendingcb (EV_P_ ev_prepare *w, int revents) 1416pendingcb (EV_P_ ev_prepare *w, int revents)
1394{ 1417{
1395} 1418}
1396 1419
1397void noinline 1420void noinline
1398ev_feed_event (EV_P_ void *w, int revents) 1421ev_feed_event (EV_P_ void *w, int revents) EV_THROW
1399{ 1422{
1400 W w_ = (W)w; 1423 W w_ = (W)w;
1401 int pri = ABSPRI (w_); 1424 int pri = ABSPRI (w_);
1402 1425
1403 if (expect_false (w_->pending)) 1426 if (expect_false (w_->pending))
… …
1407 w_->pending = ++pendingcnt [pri]; 1430 w_->pending = ++pendingcnt [pri];
1408 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2); 1431 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
1409 pendings [pri][w_->pending - 1].w = w_; 1432 pendings [pri][w_->pending - 1].w = w_;
1410 pendings [pri][w_->pending - 1].events = revents; 1433 pendings [pri][w_->pending - 1].events = revents;
1411 } 1434 }
1435
1436 pendingpri = NUMPRI - 1;
1412} 1437}
1413 1438
1414inline_speed void 1439inline_speed void
1415feed_reverse (EV_P_ W w) 1440feed_reverse (EV_P_ W w)
1416{ 1441{
… …
1462 if (expect_true (!anfd->reify)) 1487 if (expect_true (!anfd->reify))
1463 fd_event_nocheck (EV_A_ fd, revents); 1488 fd_event_nocheck (EV_A_ fd, revents);
1464} 1489}
1465 1490
1466void 1491void
1467ev_feed_fd_event (EV_P_ int fd, int revents) 1492ev_feed_fd_event (EV_P_ int fd, int revents) EV_THROW
1468{ 1493{
1469 if (fd >= 0 && fd < anfdmax) 1494 if (fd >= 0 && fd < anfdmax)
1470 fd_event_nocheck (EV_A_ fd, revents); 1495 fd_event_nocheck (EV_A_ fd, revents);
1471} 1496}
1472 1497
… …
1821} 1846}
1822 1847
1823inline_speed void 1848inline_speed void
1824evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1849evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1825{ 1850{
1851 ECB_MEMORY_FENCE; /* push out the write before this function was called, acquire flag */
1852
1826 if (expect_true (*flag)) 1853 if (expect_true (*flag))
1827 return; 1854 return;
1828 1855
1829 *flag = 1; 1856 *flag = 1;
1830 1857
… …
1854 /* win32 people keep sending patches that change this write() to send() */ 1881 /* win32 people keep sending patches that change this write() to send() */
1855 /* and then run away. but send() is wrong, it wants a socket handle on win32 */ 1882 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1856 /* so when you think this write should be a send instead, please find out */ 1883 /* so when you think this write should be a send instead, please find out */
1857 /* where your send() is from - it's definitely not the microsoft send, and */ 1884 /* where your send() is from - it's definitely not the microsoft send, and */
1858 /* tell me. thank you. */ 1885 /* tell me. thank you. */
1886 /* it might be that your problem is that your environment needs EV_USE_WSASOCKET */
1887 /* check the ev documentation on how to use this flag */
1859 write (evpipe [1], &(evpipe [1]), 1); 1888 write (evpipe [1], &(evpipe [1]), 1);
1860 } 1889 }
1861 1890
1862 errno = old_errno; 1891 errno = old_errno;
1863 } 1892 }
… …
1887 } 1916 }
1888 } 1917 }
1889 1918
1890 pipe_write_skipped = 0; 1919 pipe_write_skipped = 0;
1891 1920
1921 ECB_MEMORY_FENCE; /* push out skipped, acquire flags */
1922
1892#if EV_SIGNAL_ENABLE 1923#if EV_SIGNAL_ENABLE
1893 if (sig_pending) 1924 if (sig_pending)
1894 { 1925 {
1895 sig_pending = 0; 1926 sig_pending = 0;
1927
1928 ECB_MEMORY_FENCE_RELEASE;
1896 1929
1897 for (i = EV_NSIG - 1; i--; ) 1930 for (i = EV_NSIG - 1; i--; )
1898 if (expect_false (signals [i].pending)) 1931 if (expect_false (signals [i].pending))
1899 ev_feed_signal_event (EV_A_ i + 1); 1932 ev_feed_signal_event (EV_A_ i + 1);
1900 } 1933 }
… …
1902 1935
1903#if EV_ASYNC_ENABLE 1936#if EV_ASYNC_ENABLE
1904 if (async_pending) 1937 if (async_pending)
1905 { 1938 {
1906 async_pending = 0; 1939 async_pending = 0;
1940
1941 ECB_MEMORY_FENCE_RELEASE;
1907 1942
1908 for (i = asynccnt; i--; ) 1943 for (i = asynccnt; i--; )
1909 if (asyncs [i]->sent) 1944 if (asyncs [i]->sent)
1910 { 1945 {
1911 asyncs [i]->sent = 0; 1946 asyncs [i]->sent = 0;
… …
1916} 1951}
1917 1952
1918/*****************************************************************************/ 1953/*****************************************************************************/
1919 1954
1920void 1955void
1921ev_feed_signal (int signum) 1956ev_feed_signal (int signum) EV_THROW
1922{ 1957{
1923#if EV_MULTIPLICITY 1958#if EV_MULTIPLICITY
1924 EV_P = signals [signum - 1].loop; 1959 EV_P = signals [signum - 1].loop;
1925 1960
1926 if (!EV_A) 1961 if (!EV_A)
… …
1943 1978
1944 ev_feed_signal (signum); 1979 ev_feed_signal (signum);
1945} 1980}
1946 1981
1947void noinline 1982void noinline
1948ev_feed_signal_event (EV_P_ int signum) 1983ev_feed_signal_event (EV_P_ int signum) EV_THROW
1949{ 1984{
1950 WL w; 1985 WL w;
1951 1986
1952 if (expect_false (signum <= 0 || signum > EV_NSIG)) 1987 if (expect_false (signum <= 0 || signum > EV_NSIG))
1953 return; 1988 return;
… …
2069#if EV_USE_SELECT 2104#if EV_USE_SELECT
2070# include "ev_select.c" 2105# include "ev_select.c"
2071#endif 2106#endif
2072 2107
2073int ecb_cold 2108int ecb_cold
2074ev_version_major (void) 2109ev_version_major (void) EV_THROW
2075{ 2110{
2076 return EV_VERSION_MAJOR; 2111 return EV_VERSION_MAJOR;
2077} 2112}
2078 2113
2079int ecb_cold 2114int ecb_cold
2080ev_version_minor (void) 2115ev_version_minor (void) EV_THROW
2081{ 2116{
2082 return EV_VERSION_MINOR; 2117 return EV_VERSION_MINOR;
2083} 2118}
2084 2119
2085/* return true if we are running with elevated privileges and should ignore env variables */ 2120/* return true if we are running with elevated privileges and should ignore env variables */
… …
2093 || getgid () != getegid (); 2128 || getgid () != getegid ();
2094#endif 2129#endif
2095} 2130}
2096 2131
2097unsigned int ecb_cold 2132unsigned int ecb_cold
2098ev_supported_backends (void) 2133ev_supported_backends (void) EV_THROW
2099{ 2134{
2100 unsigned int flags = 0; 2135 unsigned int flags = 0;
2101 2136
2102 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 2137 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
2103 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE; 2138 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
… …
2107 2142
2108 return flags; 2143 return flags;
2109} 2144}
2110 2145
2111unsigned int ecb_cold 2146unsigned int ecb_cold
2112ev_recommended_backends (void) 2147ev_recommended_backends (void) EV_THROW
2113{ 2148{
2114 unsigned int flags = ev_supported_backends (); 2149 unsigned int flags = ev_supported_backends ();
2115 2150
2116#ifndef __NetBSD__ 2151#ifndef __NetBSD__
2117 /* kqueue is borked on everything but netbsd apparently */ 2152 /* kqueue is borked on everything but netbsd apparently */
… …
2129 2164
2130 return flags; 2165 return flags;
2131} 2166}
2132 2167
2133unsigned int ecb_cold 2168unsigned int ecb_cold
2134ev_embeddable_backends (void) 2169ev_embeddable_backends (void) EV_THROW
2135{ 2170{
2136 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 2171 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
2137 2172
2138 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 2173 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
2139 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */ 2174 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
… …
2141 2176
2142 return flags; 2177 return flags;
2143} 2178}
2144 2179
2145unsigned int 2180unsigned int
2146ev_backend (EV_P) 2181ev_backend (EV_P) EV_THROW
2147{ 2182{
2148 return backend; 2183 return backend;
2149} 2184}
2150 2185
2151#if EV_FEATURE_API 2186#if EV_FEATURE_API
2152unsigned int 2187unsigned int
2153ev_iteration (EV_P) 2188ev_iteration (EV_P) EV_THROW
2154{ 2189{
2155 return loop_count; 2190 return loop_count;
2156} 2191}
2157 2192
2158unsigned int 2193unsigned int
2159ev_depth (EV_P) 2194ev_depth (EV_P) EV_THROW
2160{ 2195{
2161 return loop_depth; 2196 return loop_depth;
2162} 2197}
2163 2198
2164void 2199void
2165ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 2200ev_set_io_collect_interval (EV_P_ ev_tstamp interval) EV_THROW
2166{ 2201{
2167 io_blocktime = interval; 2202 io_blocktime = interval;
2168} 2203}
2169 2204
2170void 2205void
2171ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 2206ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) EV_THROW
2172{ 2207{
2173 timeout_blocktime = interval; 2208 timeout_blocktime = interval;
2174} 2209}
2175 2210
2176void 2211void
2177ev_set_userdata (EV_P_ void *data) 2212ev_set_userdata (EV_P_ void *data) EV_THROW
2178{ 2213{
2179 userdata = data; 2214 userdata = data;
2180} 2215}
2181 2216
2182void * 2217void *
2183ev_userdata (EV_P) 2218ev_userdata (EV_P) EV_THROW
2184{ 2219{
2185 return userdata; 2220 return userdata;
2186} 2221}
2187 2222
2188void 2223void
2189ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 2224ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) EV_THROW
2190{ 2225{
2191 invoke_cb = invoke_pending_cb; 2226 invoke_cb = invoke_pending_cb;
2192} 2227}
2193 2228
2194void 2229void
2195ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 2230ev_set_loop_release_cb (EV_P_ void (*release)(EV_P) EV_THROW, void (*acquire)(EV_P) EV_THROW) EV_THROW
2196{ 2231{
2197 release_cb = release; 2232 release_cb = release;
2198 acquire_cb = acquire; 2233 acquire_cb = acquire;
2199} 2234}
2200#endif 2235#endif
2201 2236
2202/* initialise a loop structure, must be zero-initialised */ 2237/* initialise a loop structure, must be zero-initialised */
2203static void noinline ecb_cold 2238static void noinline ecb_cold
2204loop_init (EV_P_ unsigned int flags) 2239loop_init (EV_P_ unsigned int flags) EV_THROW
2205{ 2240{
2206 if (!backend) 2241 if (!backend)
2207 { 2242 {
2208 origflags = flags; 2243 origflags = flags;
2209 2244
… …
2462} 2497}
2463 2498
2464#if EV_MULTIPLICITY 2499#if EV_MULTIPLICITY
2465 2500
2466struct ev_loop * ecb_cold 2501struct ev_loop * ecb_cold
2467ev_loop_new (unsigned int flags) 2502ev_loop_new (unsigned int flags) EV_THROW
2468{ 2503{
2469 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2504 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
2470 2505
2471 memset (EV_A, 0, sizeof (struct ev_loop)); 2506 memset (EV_A, 0, sizeof (struct ev_loop));
2472 loop_init (EV_A_ flags); 2507 loop_init (EV_A_ flags);
… …
2516} 2551}
2517#endif 2552#endif
2518 2553
2519#if EV_FEATURE_API 2554#if EV_FEATURE_API
2520void ecb_cold 2555void ecb_cold
2521ev_verify (EV_P) 2556ev_verify (EV_P) EV_THROW
2522{ 2557{
2523#if EV_VERIFY 2558#if EV_VERIFY
2524 int i; 2559 int i, j;
2525 WL w; 2560 WL w, w2;
2526 2561
2527 assert (activecnt >= -1); 2562 assert (activecnt >= -1);
2528 2563
2529 assert (fdchangemax >= fdchangecnt); 2564 assert (fdchangemax >= fdchangecnt);
2530 for (i = 0; i < fdchangecnt; ++i) 2565 for (i = 0; i < fdchangecnt; ++i)
2531 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0)); 2566 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
2532 2567
2533 assert (anfdmax >= 0); 2568 assert (anfdmax >= 0);
2534 for (i = 0; i < anfdmax; ++i) 2569 for (i = j = 0; i < anfdmax; ++i)
2535 for (w = anfds [i].head; w; w = w->next) 2570 for (w = w2 = anfds [i].head; w; w = w->next)
2536 { 2571 {
2537 verify_watcher (EV_A_ (W)w); 2572 verify_watcher (EV_A_ (W)w);
2573
2574 if (++j & 1)
2575 w2 = w2->next;
2576
2577 assert (("libev: io watcher list contains a loop", w != w2));
2538 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1)); 2578 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
2539 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 2579 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
2540 } 2580 }
2541 2581
2542 assert (timermax >= timercnt); 2582 assert (timermax >= timercnt);
… …
2595#if EV_MULTIPLICITY 2635#if EV_MULTIPLICITY
2596struct ev_loop * ecb_cold 2636struct ev_loop * ecb_cold
2597#else 2637#else
2598int 2638int
2599#endif 2639#endif
2600ev_default_loop (unsigned int flags) 2640ev_default_loop (unsigned int flags) EV_THROW
2601{ 2641{
2602 if (!ev_default_loop_ptr) 2642 if (!ev_default_loop_ptr)
2603 { 2643 {
2604#if EV_MULTIPLICITY 2644#if EV_MULTIPLICITY
2605 EV_P = ev_default_loop_ptr = &default_loop_struct; 2645 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
2624 2664
2625 return ev_default_loop_ptr; 2665 return ev_default_loop_ptr;
2626} 2666}
2627 2667
2628void 2668void
2629ev_loop_fork (EV_P) 2669ev_loop_fork (EV_P) EV_THROW
2630{ 2670{
2631 postfork = 1; /* must be in line with ev_default_fork */ 2671 postfork = 1; /* must be in line with ev_default_fork */
2632} 2672}
2633 2673
2634/*****************************************************************************/ 2674/*****************************************************************************/
… …
2638{ 2678{
2639 EV_CB_INVOKE ((W)w, revents); 2679 EV_CB_INVOKE ((W)w, revents);
2640} 2680}
2641 2681
2642unsigned int 2682unsigned int
2643ev_pending_count (EV_P) 2683ev_pending_count (EV_P) EV_THROW
2644{ 2684{
2645 int pri; 2685 int pri;
2646 unsigned int count = 0; 2686 unsigned int count = 0;
2647 2687
2648 for (pri = NUMPRI; pri--; ) 2688 for (pri = NUMPRI; pri--; )
… …
2652} 2692}
2653 2693
2654void noinline 2694void noinline
2655ev_invoke_pending (EV_P) 2695ev_invoke_pending (EV_P)
2656{ 2696{
2657 int pri; 2697 for (pendingpri = NUMPRI; pendingpri--; ) /* pendingpri is modified during the loop */
2658
2659 for (pri = NUMPRI; pri--; )
2660 while (pendingcnt [pri]) 2698 while (pendingcnt [pendingpri])
2661 { 2699 {
2662 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2700 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2663 2701
2664 p->w->pending = 0; 2702 p->w->pending = 0;
2665 EV_CB_INVOKE (p->w, p->events); 2703 EV_CB_INVOKE (p->w, p->events);
2666 EV_FREQUENT_CHECK; 2704 EV_FREQUENT_CHECK;
2667 } 2705 }
… …
2907 2945
2908 mn_now = ev_rt_now; 2946 mn_now = ev_rt_now;
2909 } 2947 }
2910} 2948}
2911 2949
2912void 2950int
2913ev_run (EV_P_ int flags) 2951ev_run (EV_P_ int flags)
2914{ 2952{
2915#if EV_FEATURE_API 2953#if EV_FEATURE_API
2916 ++loop_depth; 2954 ++loop_depth;
2917#endif 2955#endif
… …
3074 loop_done = EVBREAK_CANCEL; 3112 loop_done = EVBREAK_CANCEL;
3075 3113
3076#if EV_FEATURE_API 3114#if EV_FEATURE_API
3077 --loop_depth; 3115 --loop_depth;
3078#endif 3116#endif
3117
3118 return activecnt;
3079} 3119}
3080 3120
3081void 3121void
3082ev_break (EV_P_ int how) 3122ev_break (EV_P_ int how) EV_THROW
3083{ 3123{
3084 loop_done = how; 3124 loop_done = how;
3085} 3125}
3086 3126
3087void 3127void
3088ev_ref (EV_P) 3128ev_ref (EV_P) EV_THROW
3089{ 3129{
3090 ++activecnt; 3130 ++activecnt;
3091} 3131}
3092 3132
3093void 3133void
3094ev_unref (EV_P) 3134ev_unref (EV_P) EV_THROW
3095{ 3135{
3096 --activecnt; 3136 --activecnt;
3097} 3137}
3098 3138
3099void 3139void
3100ev_now_update (EV_P) 3140ev_now_update (EV_P) EV_THROW
3101{ 3141{
3102 time_update (EV_A_ 1e100); 3142 time_update (EV_A_ 1e100);
3103} 3143}
3104 3144
3105void 3145void
3106ev_suspend (EV_P) 3146ev_suspend (EV_P) EV_THROW
3107{ 3147{
3108 ev_now_update (EV_A); 3148 ev_now_update (EV_A);
3109} 3149}
3110 3150
3111void 3151void
3112ev_resume (EV_P) 3152ev_resume (EV_P) EV_THROW
3113{ 3153{
3114 ev_tstamp mn_prev = mn_now; 3154 ev_tstamp mn_prev = mn_now;
3115 3155
3116 ev_now_update (EV_A); 3156 ev_now_update (EV_A);
3117 timers_reschedule (EV_A_ mn_now - mn_prev); 3157 timers_reschedule (EV_A_ mn_now - mn_prev);
… …
3156 w->pending = 0; 3196 w->pending = 0;
3157 } 3197 }
3158} 3198}
3159 3199
3160int 3200int
3161ev_clear_pending (EV_P_ void *w) 3201ev_clear_pending (EV_P_ void *w) EV_THROW
3162{ 3202{
3163 W w_ = (W)w; 3203 W w_ = (W)w;
3164 int pending = w_->pending; 3204 int pending = w_->pending;
3165 3205
3166 if (expect_true (pending)) 3206 if (expect_true (pending))
… …
3199} 3239}
3200 3240
3201/*****************************************************************************/ 3241/*****************************************************************************/
3202 3242
3203void noinline 3243void noinline
3204ev_io_start (EV_P_ ev_io *w) 3244ev_io_start (EV_P_ ev_io *w) EV_THROW
3205{ 3245{
3206 int fd = w->fd; 3246 int fd = w->fd;
3207 3247
3208 if (expect_false (ev_is_active (w))) 3248 if (expect_false (ev_is_active (w)))
3209 return; 3249 return;
… …
3215 3255
3216 ev_start (EV_A_ (W)w, 1); 3256 ev_start (EV_A_ (W)w, 1);
3217 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 3257 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
3218 wlist_add (&anfds[fd].head, (WL)w); 3258 wlist_add (&anfds[fd].head, (WL)w);
3219 3259
3260 /* common bug, apparently */
3261 assert (("libev: ev_io_start called with corrupted watcher", ((WL)w)->next != (WL)w));
3262
3220 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY); 3263 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
3221 w->events &= ~EV__IOFDSET; 3264 w->events &= ~EV__IOFDSET;
3222 3265
3223 EV_FREQUENT_CHECK; 3266 EV_FREQUENT_CHECK;
3224} 3267}
3225 3268
3226void noinline 3269void noinline
3227ev_io_stop (EV_P_ ev_io *w) 3270ev_io_stop (EV_P_ ev_io *w) EV_THROW
3228{ 3271{
3229 clear_pending (EV_A_ (W)w); 3272 clear_pending (EV_A_ (W)w);
3230 if (expect_false (!ev_is_active (w))) 3273 if (expect_false (!ev_is_active (w)))
3231 return; 3274 return;
3232 3275
… …
3241 3284
3242 EV_FREQUENT_CHECK; 3285 EV_FREQUENT_CHECK;
3243} 3286}
3244 3287
3245void noinline 3288void noinline
3246ev_timer_start (EV_P_ ev_timer *w) 3289ev_timer_start (EV_P_ ev_timer *w) EV_THROW
3247{ 3290{
3248 if (expect_false (ev_is_active (w))) 3291 if (expect_false (ev_is_active (w)))
3249 return; 3292 return;
3250 3293
3251 ev_at (w) += mn_now; 3294 ev_at (w) += mn_now;
… …
3265 3308
3266 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 3309 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
3267} 3310}
3268 3311
3269void noinline 3312void noinline
3270ev_timer_stop (EV_P_ ev_timer *w) 3313ev_timer_stop (EV_P_ ev_timer *w) EV_THROW
3271{ 3314{
3272 clear_pending (EV_A_ (W)w); 3315 clear_pending (EV_A_ (W)w);
3273 if (expect_false (!ev_is_active (w))) 3316 if (expect_false (!ev_is_active (w)))
3274 return; 3317 return;
3275 3318
… …
3295 3338
3296 EV_FREQUENT_CHECK; 3339 EV_FREQUENT_CHECK;
3297} 3340}
3298 3341
3299void noinline 3342void noinline
3300ev_timer_again (EV_P_ ev_timer *w) 3343ev_timer_again (EV_P_ ev_timer *w) EV_THROW
3301{ 3344{
3302 EV_FREQUENT_CHECK; 3345 EV_FREQUENT_CHECK;
3346
3347 clear_pending (EV_A_ (W)w);
3303 3348
3304 if (ev_is_active (w)) 3349 if (ev_is_active (w))
3305 { 3350 {
3306 if (w->repeat) 3351 if (w->repeat)
3307 { 3352 {
… …
3320 3365
3321 EV_FREQUENT_CHECK; 3366 EV_FREQUENT_CHECK;
3322} 3367}
3323 3368
3324ev_tstamp 3369ev_tstamp
3325ev_timer_remaining (EV_P_ ev_timer *w) 3370ev_timer_remaining (EV_P_ ev_timer *w) EV_THROW
3326{ 3371{
3327 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.); 3372 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
3328} 3373}
3329 3374
3330#if EV_PERIODIC_ENABLE 3375#if EV_PERIODIC_ENABLE
3331void noinline 3376void noinline
3332ev_periodic_start (EV_P_ ev_periodic *w) 3377ev_periodic_start (EV_P_ ev_periodic *w) EV_THROW
3333{ 3378{
3334 if (expect_false (ev_is_active (w))) 3379 if (expect_false (ev_is_active (w)))
3335 return; 3380 return;
3336 3381
3337 if (w->reschedule_cb) 3382 if (w->reschedule_cb)
… …
3357 3402
3358 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 3403 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
3359} 3404}
3360 3405
3361void noinline 3406void noinline
3362ev_periodic_stop (EV_P_ ev_periodic *w) 3407ev_periodic_stop (EV_P_ ev_periodic *w) EV_THROW
3363{ 3408{
3364 clear_pending (EV_A_ (W)w); 3409 clear_pending (EV_A_ (W)w);
3365 if (expect_false (!ev_is_active (w))) 3410 if (expect_false (!ev_is_active (w)))
3366 return; 3411 return;
3367 3412
… …
3385 3430
3386 EV_FREQUENT_CHECK; 3431 EV_FREQUENT_CHECK;
3387} 3432}
3388 3433
3389void noinline 3434void noinline
3390ev_periodic_again (EV_P_ ev_periodic *w) 3435ev_periodic_again (EV_P_ ev_periodic *w) EV_THROW
3391{ 3436{
3392 /* TODO: use adjustheap and recalculation */ 3437 /* TODO: use adjustheap and recalculation */
3393 ev_periodic_stop (EV_A_ w); 3438 ev_periodic_stop (EV_A_ w);
3394 ev_periodic_start (EV_A_ w); 3439 ev_periodic_start (EV_A_ w);
3395} 3440}
… …
3400#endif 3445#endif
3401 3446
3402#if EV_SIGNAL_ENABLE 3447#if EV_SIGNAL_ENABLE
3403 3448
3404void noinline 3449void noinline
3405ev_signal_start (EV_P_ ev_signal *w) 3450ev_signal_start (EV_P_ ev_signal *w) EV_THROW
3406{ 3451{
3407 if (expect_false (ev_is_active (w))) 3452 if (expect_false (ev_is_active (w)))
3408 return; 3453 return;
3409 3454
3410 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG)); 3455 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
… …
3481 3526
3482 EV_FREQUENT_CHECK; 3527 EV_FREQUENT_CHECK;
3483} 3528}
3484 3529
3485void noinline 3530void noinline
3486ev_signal_stop (EV_P_ ev_signal *w) 3531ev_signal_stop (EV_P_ ev_signal *w) EV_THROW
3487{ 3532{
3488 clear_pending (EV_A_ (W)w); 3533 clear_pending (EV_A_ (W)w);
3489 if (expect_false (!ev_is_active (w))) 3534 if (expect_false (!ev_is_active (w)))
3490 return; 3535 return;
3491 3536
… …
3522#endif 3567#endif
3523 3568
3524#if EV_CHILD_ENABLE 3569#if EV_CHILD_ENABLE
3525 3570
3526void 3571void
3527ev_child_start (EV_P_ ev_child *w) 3572ev_child_start (EV_P_ ev_child *w) EV_THROW
3528{ 3573{
3529#if EV_MULTIPLICITY 3574#if EV_MULTIPLICITY
3530 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 3575 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
3531#endif 3576#endif
3532 if (expect_false (ev_is_active (w))) 3577 if (expect_false (ev_is_active (w)))
… …
3539 3584
3540 EV_FREQUENT_CHECK; 3585 EV_FREQUENT_CHECK;
3541} 3586}
3542 3587
3543void 3588void
3544ev_child_stop (EV_P_ ev_child *w) 3589ev_child_stop (EV_P_ ev_child *w) EV_THROW
3545{ 3590{
3546 clear_pending (EV_A_ (W)w); 3591 clear_pending (EV_A_ (W)w);
3547 if (expect_false (!ev_is_active (w))) 3592 if (expect_false (!ev_is_active (w)))
3548 return; 3593 return;
3549 3594
… …
3716} 3761}
3717 3762
3718inline_size int 3763inline_size int
3719infy_newfd (void) 3764infy_newfd (void)
3720{ 3765{
3721#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK) 3766#if defined IN_CLOEXEC && defined IN_NONBLOCK
3722 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK); 3767 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3723 if (fd >= 0) 3768 if (fd >= 0)
3724 return fd; 3769 return fd;
3725#endif 3770#endif
3726 return inotify_init (); 3771 return inotify_init ();
… …
3801#else 3846#else
3802# define EV_LSTAT(p,b) lstat (p, b) 3847# define EV_LSTAT(p,b) lstat (p, b)
3803#endif 3848#endif
3804 3849
3805void 3850void
3806ev_stat_stat (EV_P_ ev_stat *w) 3851ev_stat_stat (EV_P_ ev_stat *w) EV_THROW
3807{ 3852{
3808 if (lstat (w->path, &w->attr) < 0) 3853 if (lstat (w->path, &w->attr) < 0)
3809 w->attr.st_nlink = 0; 3854 w->attr.st_nlink = 0;
3810 else if (!w->attr.st_nlink) 3855 else if (!w->attr.st_nlink)
3811 w->attr.st_nlink = 1; 3856 w->attr.st_nlink = 1;
… …
3850 ev_feed_event (EV_A_ w, EV_STAT); 3895 ev_feed_event (EV_A_ w, EV_STAT);
3851 } 3896 }
3852} 3897}
3853 3898
3854void 3899void
3855ev_stat_start (EV_P_ ev_stat *w) 3900ev_stat_start (EV_P_ ev_stat *w) EV_THROW
3856{ 3901{
3857 if (expect_false (ev_is_active (w))) 3902 if (expect_false (ev_is_active (w)))
3858 return; 3903 return;
3859 3904
3860 ev_stat_stat (EV_A_ w); 3905 ev_stat_stat (EV_A_ w);
… …
3881 3926
3882 EV_FREQUENT_CHECK; 3927 EV_FREQUENT_CHECK;
3883} 3928}
3884 3929
3885void 3930void
3886ev_stat_stop (EV_P_ ev_stat *w) 3931ev_stat_stop (EV_P_ ev_stat *w) EV_THROW
3887{ 3932{
3888 clear_pending (EV_A_ (W)w); 3933 clear_pending (EV_A_ (W)w);
3889 if (expect_false (!ev_is_active (w))) 3934 if (expect_false (!ev_is_active (w)))
3890 return; 3935 return;
3891 3936
… …
3907} 3952}
3908#endif 3953#endif
3909 3954
3910#if EV_IDLE_ENABLE 3955#if EV_IDLE_ENABLE
3911void 3956void
3912ev_idle_start (EV_P_ ev_idle *w) 3957ev_idle_start (EV_P_ ev_idle *w) EV_THROW
3913{ 3958{
3914 if (expect_false (ev_is_active (w))) 3959 if (expect_false (ev_is_active (w)))
3915 return; 3960 return;
3916 3961
3917 pri_adjust (EV_A_ (W)w); 3962 pri_adjust (EV_A_ (W)w);
… …
3930 3975
3931 EV_FREQUENT_CHECK; 3976 EV_FREQUENT_CHECK;
3932} 3977}
3933 3978
3934void 3979void
3935ev_idle_stop (EV_P_ ev_idle *w) 3980ev_idle_stop (EV_P_ ev_idle *w) EV_THROW
3936{ 3981{
3937 clear_pending (EV_A_ (W)w); 3982 clear_pending (EV_A_ (W)w);
3938 if (expect_false (!ev_is_active (w))) 3983 if (expect_false (!ev_is_active (w)))
3939 return; 3984 return;
3940 3985
… …
3954} 3999}
3955#endif 4000#endif
3956 4001
3957#if EV_PREPARE_ENABLE 4002#if EV_PREPARE_ENABLE
3958void 4003void
3959ev_prepare_start (EV_P_ ev_prepare *w) 4004ev_prepare_start (EV_P_ ev_prepare *w) EV_THROW
3960{ 4005{
3961 if (expect_false (ev_is_active (w))) 4006 if (expect_false (ev_is_active (w)))
3962 return; 4007 return;
3963 4008
3964 EV_FREQUENT_CHECK; 4009 EV_FREQUENT_CHECK;
… …
3969 4014
3970 EV_FREQUENT_CHECK; 4015 EV_FREQUENT_CHECK;
3971} 4016}
3972 4017
3973void 4018void
3974ev_prepare_stop (EV_P_ ev_prepare *w) 4019ev_prepare_stop (EV_P_ ev_prepare *w) EV_THROW
3975{ 4020{
3976 clear_pending (EV_A_ (W)w); 4021 clear_pending (EV_A_ (W)w);
3977 if (expect_false (!ev_is_active (w))) 4022 if (expect_false (!ev_is_active (w)))
3978 return; 4023 return;
3979 4024
… …
3992} 4037}
3993#endif 4038#endif
3994 4039
3995#if EV_CHECK_ENABLE 4040#if EV_CHECK_ENABLE
3996void 4041void
3997ev_check_start (EV_P_ ev_check *w) 4042ev_check_start (EV_P_ ev_check *w) EV_THROW
3998{ 4043{
3999 if (expect_false (ev_is_active (w))) 4044 if (expect_false (ev_is_active (w)))
4000 return; 4045 return;
4001 4046
4002 EV_FREQUENT_CHECK; 4047 EV_FREQUENT_CHECK;
… …
4007 4052
4008 EV_FREQUENT_CHECK; 4053 EV_FREQUENT_CHECK;
4009} 4054}
4010 4055
4011void 4056void
4012ev_check_stop (EV_P_ ev_check *w) 4057ev_check_stop (EV_P_ ev_check *w) EV_THROW
4013{ 4058{
4014 clear_pending (EV_A_ (W)w); 4059 clear_pending (EV_A_ (W)w);
4015 if (expect_false (!ev_is_active (w))) 4060 if (expect_false (!ev_is_active (w)))
4016 return; 4061 return;
4017 4062
… …
4030} 4075}
4031#endif 4076#endif
4032 4077
4033#if EV_EMBED_ENABLE 4078#if EV_EMBED_ENABLE
4034void noinline 4079void noinline
4035ev_embed_sweep (EV_P_ ev_embed *w) 4080ev_embed_sweep (EV_P_ ev_embed *w) EV_THROW
4036{ 4081{
4037 ev_run (w->other, EVRUN_NOWAIT); 4082 ev_run (w->other, EVRUN_NOWAIT);
4038} 4083}
4039 4084
4040static void 4085static void
… …
4088 ev_idle_stop (EV_A_ idle); 4133 ev_idle_stop (EV_A_ idle);
4089} 4134}
4090#endif 4135#endif
4091 4136
4092void 4137void
4093ev_embed_start (EV_P_ ev_embed *w) 4138ev_embed_start (EV_P_ ev_embed *w) EV_THROW
4094{ 4139{
4095 if (expect_false (ev_is_active (w))) 4140 if (expect_false (ev_is_active (w)))
4096 return; 4141 return;
4097 4142
4098 { 4143 {
… …
4119 4164
4120 EV_FREQUENT_CHECK; 4165 EV_FREQUENT_CHECK;
4121} 4166}
4122 4167
4123void 4168void
4124ev_embed_stop (EV_P_ ev_embed *w) 4169ev_embed_stop (EV_P_ ev_embed *w) EV_THROW
4125{ 4170{
4126 clear_pending (EV_A_ (W)w); 4171 clear_pending (EV_A_ (W)w);
4127 if (expect_false (!ev_is_active (w))) 4172 if (expect_false (!ev_is_active (w)))
4128 return; 4173 return;
4129 4174
… …
4139} 4184}
4140#endif 4185#endif
4141 4186
4142#if EV_FORK_ENABLE 4187#if EV_FORK_ENABLE
4143void 4188void
4144ev_fork_start (EV_P_ ev_fork *w) 4189ev_fork_start (EV_P_ ev_fork *w) EV_THROW
4145{ 4190{
4146 if (expect_false (ev_is_active (w))) 4191 if (expect_false (ev_is_active (w)))
4147 return; 4192 return;
4148 4193
4149 EV_FREQUENT_CHECK; 4194 EV_FREQUENT_CHECK;
… …
4154 4199
4155 EV_FREQUENT_CHECK; 4200 EV_FREQUENT_CHECK;
4156} 4201}
4157 4202
4158void 4203void
4159ev_fork_stop (EV_P_ ev_fork *w) 4204ev_fork_stop (EV_P_ ev_fork *w) EV_THROW
4160{ 4205{
4161 clear_pending (EV_A_ (W)w); 4206 clear_pending (EV_A_ (W)w);
4162 if (expect_false (!ev_is_active (w))) 4207 if (expect_false (!ev_is_active (w)))
4163 return; 4208 return;
4164 4209
… …
4177} 4222}
4178#endif 4223#endif
4179 4224
4180#if EV_CLEANUP_ENABLE 4225#if EV_CLEANUP_ENABLE
4181void 4226void
4182ev_cleanup_start (EV_P_ ev_cleanup *w) 4227ev_cleanup_start (EV_P_ ev_cleanup *w) EV_THROW
4183{ 4228{
4184 if (expect_false (ev_is_active (w))) 4229 if (expect_false (ev_is_active (w)))
4185 return; 4230 return;
4186 4231
4187 EV_FREQUENT_CHECK; 4232 EV_FREQUENT_CHECK;
… …
4194 ev_unref (EV_A); 4239 ev_unref (EV_A);
4195 EV_FREQUENT_CHECK; 4240 EV_FREQUENT_CHECK;
4196} 4241}
4197 4242
4198void 4243void
4199ev_cleanup_stop (EV_P_ ev_cleanup *w) 4244ev_cleanup_stop (EV_P_ ev_cleanup *w) EV_THROW
4200{ 4245{
4201 clear_pending (EV_A_ (W)w); 4246 clear_pending (EV_A_ (W)w);
4202 if (expect_false (!ev_is_active (w))) 4247 if (expect_false (!ev_is_active (w)))
4203 return; 4248 return;
4204 4249
… …
4218} 4263}
4219#endif 4264#endif
4220 4265
4221#if EV_ASYNC_ENABLE 4266#if EV_ASYNC_ENABLE
4222void 4267void
4223ev_async_start (EV_P_ ev_async *w) 4268ev_async_start (EV_P_ ev_async *w) EV_THROW
4224{ 4269{
4225 if (expect_false (ev_is_active (w))) 4270 if (expect_false (ev_is_active (w)))
4226 return; 4271 return;
4227 4272
4228 w->sent = 0; 4273 w->sent = 0;
… …
4237 4282
4238 EV_FREQUENT_CHECK; 4283 EV_FREQUENT_CHECK;
4239} 4284}
4240 4285
4241void 4286void
4242ev_async_stop (EV_P_ ev_async *w) 4287ev_async_stop (EV_P_ ev_async *w) EV_THROW
4243{ 4288{
4244 clear_pending (EV_A_ (W)w); 4289 clear_pending (EV_A_ (W)w);
4245 if (expect_false (!ev_is_active (w))) 4290 if (expect_false (!ev_is_active (w)))
4246 return; 4291 return;
4247 4292
… …
4258 4303
4259 EV_FREQUENT_CHECK; 4304 EV_FREQUENT_CHECK;
4260} 4305}
4261 4306
4262void 4307void
4263ev_async_send (EV_P_ ev_async *w) 4308ev_async_send (EV_P_ ev_async *w) EV_THROW
4264{ 4309{
4265 w->sent = 1; 4310 w->sent = 1;
4266 evpipe_write (EV_A_ &async_pending); 4311 evpipe_write (EV_A_ &async_pending);
4267} 4312}
4268#endif 4313#endif
… …
4305 4350
4306 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io)); 4351 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
4307} 4352}
4308 4353
4309void 4354void
4310ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 4355ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) EV_THROW
4311{ 4356{
4312 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 4357 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
4313 4358
4314 if (expect_false (!once)) 4359 if (expect_false (!once))
4315 { 4360 {
… …
4337 4382
4338/*****************************************************************************/ 4383/*****************************************************************************/
4339 4384
4340#if EV_WALK_ENABLE 4385#if EV_WALK_ENABLE
4341void ecb_cold 4386void ecb_cold
4342ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 4387ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) EV_THROW
4343{ 4388{
4344 int i, j; 4389 int i, j;
4345 ev_watcher_list *wl, *wn; 4390 ev_watcher_list *wl, *wn;
4346 4391
4347 if (types & (EV_IO | EV_EMBED)) 4392 if (types & (EV_IO | EV_EMBED))

Diff Legend

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