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

Comparing libev/ev.c (file contents):
Revision 1.411 by root, Tue Feb 21 04:34:02 2012 UTC vs.
Revision 1.436 by root, Tue May 29 20:44:39 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
… …
201# include <sys/wait.h> 201# include <sys/wait.h>
202# include <unistd.h> 202# include <unistd.h>
203#else 203#else
204# include <io.h> 204# include <io.h>
205# define WIN32_LEAN_AND_MEAN 205# define WIN32_LEAN_AND_MEAN
206# include <winsock2.h>
206# include <windows.h> 207# include <windows.h>
207# ifndef EV_SELECT_IS_WINSOCKET 208# ifndef EV_SELECT_IS_WINSOCKET
208# define EV_SELECT_IS_WINSOCKET 1 209# define EV_SELECT_IS_WINSOCKET 1
209# endif 210# endif
210# undef EV_AVOID_STDIO 211# undef EV_AVOID_STDIO
… …
219#define _DARWIN_UNLIMITED_SELECT 1 220#define _DARWIN_UNLIMITED_SELECT 1
220 221
221/* this block tries to deduce configuration from header-defined symbols and defaults */ 222/* this block tries to deduce configuration from header-defined symbols and defaults */
222 223
223/* try to deduce the maximum number of signals on this platform */ 224/* try to deduce the maximum number of signals on this platform */
224#if defined (EV_NSIG) 225#if defined EV_NSIG
225/* use what's provided */ 226/* use what's provided */
226#elif defined (NSIG) 227#elif defined NSIG
227# define EV_NSIG (NSIG) 228# define EV_NSIG (NSIG)
228#elif defined(_NSIG) 229#elif defined _NSIG
229# define EV_NSIG (_NSIG) 230# define EV_NSIG (_NSIG)
230#elif defined (SIGMAX) 231#elif defined SIGMAX
231# define EV_NSIG (SIGMAX+1) 232# define EV_NSIG (SIGMAX+1)
232#elif defined (SIG_MAX) 233#elif defined SIG_MAX
233# define EV_NSIG (SIG_MAX+1) 234# define EV_NSIG (SIG_MAX+1)
234#elif defined (_SIG_MAX) 235#elif defined _SIG_MAX
235# define EV_NSIG (_SIG_MAX+1) 236# define EV_NSIG (_SIG_MAX+1)
236#elif defined (MAXSIG) 237#elif defined MAXSIG
237# define EV_NSIG (MAXSIG+1) 238# define EV_NSIG (MAXSIG+1)
238#elif defined (MAX_SIG) 239#elif defined MAX_SIG
239# define EV_NSIG (MAX_SIG+1) 240# define EV_NSIG (MAX_SIG+1)
240#elif defined (SIGARRAYSIZE) 241#elif defined SIGARRAYSIZE
241# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */ 242# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
242#elif defined (_sys_nsig) 243#elif defined _sys_nsig
243# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 244# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
244#else 245#else
245# error "unable to find value for NSIG, please report" 246# error "unable to find value for NSIG, please report"
246/* to make it compile regardless, just remove the above line, */ 247/* to make it compile regardless, just remove the above line, */
247/* but consider reporting it, too! :) */ 248/* but consider reporting it, too! :) */
… …
259# define EV_USE_CLOCK_SYSCALL 0 260# define EV_USE_CLOCK_SYSCALL 0
260# endif 261# endif
261#endif 262#endif
262 263
263#ifndef EV_USE_MONOTONIC 264#ifndef EV_USE_MONOTONIC
264# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 265# if defined _POSIX_MONOTONIC_CLOCK && _POSIX_MONOTONIC_CLOCK >= 0
265# define EV_USE_MONOTONIC EV_FEATURE_OS 266# define EV_USE_MONOTONIC EV_FEATURE_OS
266# else 267# else
267# define EV_USE_MONOTONIC 0 268# define EV_USE_MONOTONIC 0
268# endif 269# endif
269#endif 270#endif
… …
359#endif 360#endif
360 361
361/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 362/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
362/* which makes programs even slower. might work on other unices, too. */ 363/* which makes programs even slower. might work on other unices, too. */
363#if EV_USE_CLOCK_SYSCALL 364#if EV_USE_CLOCK_SYSCALL
364# include <syscall.h> 365# include <sys/syscall.h>
365# ifdef SYS_clock_gettime 366# ifdef SYS_clock_gettime
366# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 367# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
367# undef EV_USE_MONOTONIC 368# undef EV_USE_MONOTONIC
368# define EV_USE_MONOTONIC 1 369# define EV_USE_MONOTONIC 1
369# else 370# else
… …
395# define EV_USE_INOTIFY 0 396# define EV_USE_INOTIFY 0
396#endif 397#endif
397 398
398#if !EV_USE_NANOSLEEP 399#if !EV_USE_NANOSLEEP
399/* hp-ux has it in sys/time.h, which we unconditionally include above */ 400/* hp-ux has it in sys/time.h, which we unconditionally include above */
400# if !defined(_WIN32) && !defined(__hpux) 401# if !defined _WIN32 && !defined __hpux
401# include <sys/select.h> 402# include <sys/select.h>
402# endif 403# endif
403#endif 404#endif
404 405
405#if EV_USE_INOTIFY 406#if EV_USE_INOTIFY
… …
408/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 409/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
409# ifndef IN_DONT_FOLLOW 410# ifndef IN_DONT_FOLLOW
410# undef EV_USE_INOTIFY 411# undef EV_USE_INOTIFY
411# define EV_USE_INOTIFY 0 412# define EV_USE_INOTIFY 0
412# endif 413# endif
413#endif
414
415#if EV_SELECT_IS_WINSOCKET
416# include <winsock.h>
417#endif 414#endif
418 415
419#if EV_USE_EVENTFD 416#if EV_USE_EVENTFD
420/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
421# include <stdint.h> 418# include <stdint.h>
… …
533 * or so. 530 * or so.
534 * we try to detect these and simply assume they are not gcc - if they have 531 * we try to detect these and simply assume they are not gcc - if they have
535 * an issue with that they should have done it right in the first place. 532 * an issue with that they should have done it right in the first place.
536 */ 533 */
537#ifndef ECB_GCC_VERSION 534#ifndef ECB_GCC_VERSION
538 #if !defined(__GNUC_MINOR__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__llvm__) || defined(__clang__) 535 #if !defined __GNUC_MINOR__ || defined __INTEL_COMPILER || defined __SUNPRO_C || defined __SUNPRO_CC || defined __llvm__ || defined __clang__
539 #define ECB_GCC_VERSION(major,minor) 0 536 #define ECB_GCC_VERSION(major,minor) 0
540 #else 537 #else
541 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 538 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
542 #endif 539 #endif
543#endif 540#endif
… …
554#if ECB_NO_THREADS || ECB_NO_SMP 551#if ECB_NO_THREADS || ECB_NO_SMP
555 #define ECB_MEMORY_FENCE do { } while (0) 552 #define ECB_MEMORY_FENCE do { } while (0)
556#endif 553#endif
557 554
558#ifndef ECB_MEMORY_FENCE 555#ifndef ECB_MEMORY_FENCE
559 #if ECB_GCC_VERSION(2,5) || defined(__INTEL_COMPILER) || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110 556 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
560 #if __i386 || __i386__ 557 #if __i386 || __i386__
561 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory") 558 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
562 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */ 559 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */
563 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */ 560 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */
564 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__ 561 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__
565 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 562 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
566 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory") 563 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory")
567 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */ 564 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */
568 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 565 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
569 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 566 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
570 #elif defined(__ARM_ARCH_6__ ) || defined(__ARM_ARCH_6J__ ) \ 567 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \
571 || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6ZK__) 568 || 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") 569 #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__ ) \ 570 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
574 || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7R__ ) 571 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
575 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 572 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
576 #elif __sparc || __sparc__ 573 #elif __sparc || __sparc__
577 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad | " : : : "memory") 574 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad | " : : : "memory")
578 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 575 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
579 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 576 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
580 #elif defined(__s390__) || defined(__s390x__) 577 #elif defined __s390__ || defined __s390x__
581 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 578 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
579 #elif defined __mips__
580 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
581 #elif defined __alpha__
582 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
582 #endif 583 #endif
583 #endif 584 #endif
584#endif 585#endif
585 586
586#ifndef ECB_MEMORY_FENCE 587#ifndef ECB_MEMORY_FENCE
587 #if ECB_GCC_VERSION(4,4) || defined(__INTEL_COMPILER) || defined(__clang__) 588 #if ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
588 #define ECB_MEMORY_FENCE __sync_synchronize () 589 #define ECB_MEMORY_FENCE __sync_synchronize ()
589 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */ 590 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */
590 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */ 591 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */
591 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 592 #elif _MSC_VER >= 1400 /* VC++ 2005 */
592 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 593 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
593 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 594 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
594 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 595 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
595 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 596 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
596 #elif defined(_WIN32) 597 #elif defined _WIN32
597 #include <WinNT.h> 598 #include <WinNT.h>
598 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */ 599 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */
599 #elif __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110 600 #elif __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
600 #include <mbarrier.h> 601 #include <mbarrier.h>
601 #define ECB_MEMORY_FENCE __machine_rw_barrier () 602 #define ECB_MEMORY_FENCE __machine_rw_barrier ()
602 #define ECB_MEMORY_FENCE_ACQUIRE __machine_r_barrier () 603 #define ECB_MEMORY_FENCE_ACQUIRE __machine_r_barrier ()
603 #define ECB_MEMORY_FENCE_RELEASE __machine_w_barrier () 604 #define ECB_MEMORY_FENCE_RELEASE __machine_w_barrier ()
605 #elif __xlC__
606 #define ECB_MEMORY_FENCE __sync ()
604 #endif 607 #endif
605#endif 608#endif
606 609
607#ifndef ECB_MEMORY_FENCE 610#ifndef ECB_MEMORY_FENCE
608 #if !ECB_AVOID_PTHREADS 611 #if !ECB_AVOID_PTHREADS
… …
620 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER; 623 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
621 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0) 624 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
622 #endif 625 #endif
623#endif 626#endif
624 627
625#if !defined(ECB_MEMORY_FENCE_ACQUIRE) && defined(ECB_MEMORY_FENCE) 628#if !defined ECB_MEMORY_FENCE_ACQUIRE && defined ECB_MEMORY_FENCE
626 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE 629 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
627#endif 630#endif
628 631
629#if !defined(ECB_MEMORY_FENCE_RELEASE) && defined(ECB_MEMORY_FENCE) 632#if !defined ECB_MEMORY_FENCE_RELEASE && defined ECB_MEMORY_FENCE
630 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 633 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
631#endif 634#endif
632 635
633/*****************************************************************************/ 636/*****************************************************************************/
634 637
… …
1099{ 1102{
1100 write (STDERR_FILENO, msg, strlen (msg)); 1103 write (STDERR_FILENO, msg, strlen (msg));
1101} 1104}
1102#endif 1105#endif
1103 1106
1104static void (*syserr_cb)(const char *msg); 1107static void (*syserr_cb)(const char *msg) EV_THROW;
1105 1108
1106void ecb_cold 1109void ecb_cold
1107ev_set_syserr_cb (void (*cb)(const char *msg)) 1110ev_set_syserr_cb (void (*cb)(const char *msg) EV_THROW) EV_THROW
1108{ 1111{
1109 syserr_cb = cb; 1112 syserr_cb = cb;
1110} 1113}
1111 1114
1112static void noinline ecb_cold 1115static void noinline ecb_cold
… …
1130 abort (); 1133 abort ();
1131 } 1134 }
1132} 1135}
1133 1136
1134static void * 1137static void *
1135ev_realloc_emul (void *ptr, long size) 1138ev_realloc_emul (void *ptr, long size) EV_THROW
1136{ 1139{
1137#if __GLIBC__ 1140#if __GLIBC__
1138 return realloc (ptr, size); 1141 return realloc (ptr, size);
1139#else 1142#else
1140 /* some systems, notably openbsd and darwin, fail to properly 1143 /* some systems, notably openbsd and darwin, fail to properly
… …
1148 free (ptr); 1151 free (ptr);
1149 return 0; 1152 return 0;
1150#endif 1153#endif
1151} 1154}
1152 1155
1153static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 1156static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1154 1157
1155void ecb_cold 1158void ecb_cold
1156ev_set_allocator (void *(*cb)(void *ptr, long size)) 1159ev_set_allocator (void *(*cb)(void *ptr, long size) EV_THROW) EV_THROW
1157{ 1160{
1158 alloc = cb; 1161 alloc = cb;
1159} 1162}
1160 1163
1161inline_speed void * 1164inline_speed void *
… …
1278 1281
1279/*****************************************************************************/ 1282/*****************************************************************************/
1280 1283
1281#ifndef EV_HAVE_EV_TIME 1284#ifndef EV_HAVE_EV_TIME
1282ev_tstamp 1285ev_tstamp
1283ev_time (void) 1286ev_time (void) EV_THROW
1284{ 1287{
1285#if EV_USE_REALTIME 1288#if EV_USE_REALTIME
1286 if (expect_true (have_realtime)) 1289 if (expect_true (have_realtime))
1287 { 1290 {
1288 struct timespec ts; 1291 struct timespec ts;
… …
1312 return ev_time (); 1315 return ev_time ();
1313} 1316}
1314 1317
1315#if EV_MULTIPLICITY 1318#if EV_MULTIPLICITY
1316ev_tstamp 1319ev_tstamp
1317ev_now (EV_P) 1320ev_now (EV_P) EV_THROW
1318{ 1321{
1319 return ev_rt_now; 1322 return ev_rt_now;
1320} 1323}
1321#endif 1324#endif
1322 1325
1323void 1326void
1324ev_sleep (ev_tstamp delay) 1327ev_sleep (ev_tstamp delay) EV_THROW
1325{ 1328{
1326 if (delay > 0.) 1329 if (delay > 0.)
1327 { 1330 {
1328#if EV_USE_NANOSLEEP 1331#if EV_USE_NANOSLEEP
1329 struct timespec ts; 1332 struct timespec ts;
1330 1333
1331 EV_TS_SET (ts, delay); 1334 EV_TS_SET (ts, delay);
1332 nanosleep (&ts, 0); 1335 nanosleep (&ts, 0);
1333#elif defined(_WIN32) 1336#elif defined _WIN32
1334 Sleep ((unsigned long)(delay * 1e3)); 1337 Sleep ((unsigned long)(delay * 1e3));
1335#else 1338#else
1336 struct timeval tv; 1339 struct timeval tv;
1337 1340
1338 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 1341 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
… …
1410pendingcb (EV_P_ ev_prepare *w, int revents) 1413pendingcb (EV_P_ ev_prepare *w, int revents)
1411{ 1414{
1412} 1415}
1413 1416
1414void noinline 1417void noinline
1415ev_feed_event (EV_P_ void *w, int revents) 1418ev_feed_event (EV_P_ void *w, int revents) EV_THROW
1416{ 1419{
1417 W w_ = (W)w; 1420 W w_ = (W)w;
1418 int pri = ABSPRI (w_); 1421 int pri = ABSPRI (w_);
1419 1422
1420 if (expect_false (w_->pending)) 1423 if (expect_false (w_->pending))
… …
1424 w_->pending = ++pendingcnt [pri]; 1427 w_->pending = ++pendingcnt [pri];
1425 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2); 1428 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
1426 pendings [pri][w_->pending - 1].w = w_; 1429 pendings [pri][w_->pending - 1].w = w_;
1427 pendings [pri][w_->pending - 1].events = revents; 1430 pendings [pri][w_->pending - 1].events = revents;
1428 } 1431 }
1432
1433 pendingpri = NUMPRI - 1;
1429} 1434}
1430 1435
1431inline_speed void 1436inline_speed void
1432feed_reverse (EV_P_ W w) 1437feed_reverse (EV_P_ W w)
1433{ 1438{
… …
1479 if (expect_true (!anfd->reify)) 1484 if (expect_true (!anfd->reify))
1480 fd_event_nocheck (EV_A_ fd, revents); 1485 fd_event_nocheck (EV_A_ fd, revents);
1481} 1486}
1482 1487
1483void 1488void
1484ev_feed_fd_event (EV_P_ int fd, int revents) 1489ev_feed_fd_event (EV_P_ int fd, int revents) EV_THROW
1485{ 1490{
1486 if (fd >= 0 && fd < anfdmax) 1491 if (fd >= 0 && fd < anfdmax)
1487 fd_event_nocheck (EV_A_ fd, revents); 1492 fd_event_nocheck (EV_A_ fd, revents);
1488} 1493}
1489 1494
… …
1838} 1843}
1839 1844
1840inline_speed void 1845inline_speed void
1841evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1846evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1842{ 1847{
1848 ECB_MEMORY_FENCE; /* push out the write before this function was called, acquire flag */
1849
1843 if (expect_true (*flag)) 1850 if (expect_true (*flag))
1844 return; 1851 return;
1845 1852
1846 *flag = 1; 1853 *flag = 1;
1847
1848 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */ 1854 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1849 1855
1850 pipe_write_skipped = 1; 1856 pipe_write_skipped = 1;
1851 1857
1852 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */ 1858 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1853 1859
1854 if (pipe_write_wanted) 1860 if (pipe_write_wanted)
1855 { 1861 {
1856 int old_errno; 1862 int old_errno;
1857 1863
1858 pipe_write_skipped = 0; /* just an optimisation, no fence needed */ 1864 pipe_write_skipped = 0;
1865 ECB_MEMORY_FENCE_RELEASE;
1859 1866
1860 old_errno = errno; /* save errno because write will clobber it */ 1867 old_errno = errno; /* save errno because write will clobber it */
1861 1868
1862#if EV_USE_EVENTFD 1869#if EV_USE_EVENTFD
1863 if (evfd >= 0) 1870 if (evfd >= 0)
… …
1866 write (evfd, &counter, sizeof (uint64_t)); 1873 write (evfd, &counter, sizeof (uint64_t));
1867 } 1874 }
1868 else 1875 else
1869#endif 1876#endif
1870 { 1877 {
1871 /* win32 people keep sending patches that change this write() to send() */ 1878#ifdef _WIN32
1872 /* and then run away. but send() is wrong, it wants a socket handle on win32 */ 1879 WSABUF buf;
1873 /* so when you think this write should be a send instead, please find out */ 1880 DWORD sent;
1874 /* where your send() is from - it's definitely not the microsoft send, and */ 1881 buf.buf = &buf;
1875 /* tell me. thank you. */ 1882 buf.len = 1;
1876 /* it might be that your problem is that your environment needs EV_USE_WSASOCKET */ 1883 WSASend (EV_FD_TO_WIN32_HANDLE (evpipe [1]), &buf, 1, &sent, 0, 0, 0);
1877 /* check the ev documentation on how to use this flag */ 1884#else
1878 write (evpipe [1], &(evpipe [1]), 1); 1885 write (evpipe [1], &(evpipe [1]), 1);
1886#endif
1879 } 1887 }
1880 1888
1881 errno = old_errno; 1889 errno = old_errno;
1882 } 1890 }
1883} 1891}
… …
1898 read (evfd, &counter, sizeof (uint64_t)); 1906 read (evfd, &counter, sizeof (uint64_t));
1899 } 1907 }
1900 else 1908 else
1901#endif 1909#endif
1902 { 1910 {
1903 char dummy; 1911 char dummy[4];
1904 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1912#ifdef _WIN32
1913 WSABUF buf;
1914 DWORD recvd;
1915 DWORD flags = 0;
1916 buf.buf = dummy;
1917 buf.len = sizeof (dummy);
1918 WSARecv (EV_FD_TO_WIN32_HANDLE (evpipe [0]), &buf, 1, &recvd, &flags, 0, 0);
1919#else
1905 read (evpipe [0], &dummy, 1); 1920 read (evpipe [0], &dummy, sizeof (dummy));
1921#endif
1906 } 1922 }
1907 } 1923 }
1908 1924
1909 pipe_write_skipped = 0; 1925 pipe_write_skipped = 0;
1926
1927 ECB_MEMORY_FENCE; /* push out skipped, acquire flags */
1910 1928
1911#if EV_SIGNAL_ENABLE 1929#if EV_SIGNAL_ENABLE
1912 if (sig_pending) 1930 if (sig_pending)
1913 { 1931 {
1914 sig_pending = 0; 1932 sig_pending = 0;
1933
1934 ECB_MEMORY_FENCE;
1915 1935
1916 for (i = EV_NSIG - 1; i--; ) 1936 for (i = EV_NSIG - 1; i--; )
1917 if (expect_false (signals [i].pending)) 1937 if (expect_false (signals [i].pending))
1918 ev_feed_signal_event (EV_A_ i + 1); 1938 ev_feed_signal_event (EV_A_ i + 1);
1919 } 1939 }
… …
1921 1941
1922#if EV_ASYNC_ENABLE 1942#if EV_ASYNC_ENABLE
1923 if (async_pending) 1943 if (async_pending)
1924 { 1944 {
1925 async_pending = 0; 1945 async_pending = 0;
1946
1947 ECB_MEMORY_FENCE;
1926 1948
1927 for (i = asynccnt; i--; ) 1949 for (i = asynccnt; i--; )
1928 if (asyncs [i]->sent) 1950 if (asyncs [i]->sent)
1929 { 1951 {
1930 asyncs [i]->sent = 0; 1952 asyncs [i]->sent = 0;
1953 ECB_MEMORY_FENCE_RELEASE;
1931 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC); 1954 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1932 } 1955 }
1933 } 1956 }
1934#endif 1957#endif
1935} 1958}
1936 1959
1937/*****************************************************************************/ 1960/*****************************************************************************/
1938 1961
1939void 1962void
1940ev_feed_signal (int signum) 1963ev_feed_signal (int signum) EV_THROW
1941{ 1964{
1942#if EV_MULTIPLICITY 1965#if EV_MULTIPLICITY
1943 EV_P = signals [signum - 1].loop; 1966 EV_P = signals [signum - 1].loop;
1944 1967
1945 if (!EV_A) 1968 if (!EV_A)
… …
1962 1985
1963 ev_feed_signal (signum); 1986 ev_feed_signal (signum);
1964} 1987}
1965 1988
1966void noinline 1989void noinline
1967ev_feed_signal_event (EV_P_ int signum) 1990ev_feed_signal_event (EV_P_ int signum) EV_THROW
1968{ 1991{
1969 WL w; 1992 WL w;
1970 1993
1971 if (expect_false (signum <= 0 || signum > EV_NSIG)) 1994 if (expect_false (signum <= 0 || signum > EV_NSIG))
1972 return; 1995 return;
… …
1980 if (expect_false (signals [signum].loop != EV_A)) 2003 if (expect_false (signals [signum].loop != EV_A))
1981 return; 2004 return;
1982#endif 2005#endif
1983 2006
1984 signals [signum].pending = 0; 2007 signals [signum].pending = 0;
2008 MEMORY_FENCE_RELEASE;
1985 2009
1986 for (w = signals [signum].head; w; w = w->next) 2010 for (w = signals [signum].head; w; w = w->next)
1987 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 2011 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1988} 2012}
1989 2013
… …
2088#if EV_USE_SELECT 2112#if EV_USE_SELECT
2089# include "ev_select.c" 2113# include "ev_select.c"
2090#endif 2114#endif
2091 2115
2092int ecb_cold 2116int ecb_cold
2093ev_version_major (void) 2117ev_version_major (void) EV_THROW
2094{ 2118{
2095 return EV_VERSION_MAJOR; 2119 return EV_VERSION_MAJOR;
2096} 2120}
2097 2121
2098int ecb_cold 2122int ecb_cold
2099ev_version_minor (void) 2123ev_version_minor (void) EV_THROW
2100{ 2124{
2101 return EV_VERSION_MINOR; 2125 return EV_VERSION_MINOR;
2102} 2126}
2103 2127
2104/* return true if we are running with elevated privileges and should ignore env variables */ 2128/* return true if we are running with elevated privileges and should ignore env variables */
… …
2112 || getgid () != getegid (); 2136 || getgid () != getegid ();
2113#endif 2137#endif
2114} 2138}
2115 2139
2116unsigned int ecb_cold 2140unsigned int ecb_cold
2117ev_supported_backends (void) 2141ev_supported_backends (void) EV_THROW
2118{ 2142{
2119 unsigned int flags = 0; 2143 unsigned int flags = 0;
2120 2144
2121 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 2145 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
2122 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE; 2146 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
… …
2126 2150
2127 return flags; 2151 return flags;
2128} 2152}
2129 2153
2130unsigned int ecb_cold 2154unsigned int ecb_cold
2131ev_recommended_backends (void) 2155ev_recommended_backends (void) EV_THROW
2132{ 2156{
2133 unsigned int flags = ev_supported_backends (); 2157 unsigned int flags = ev_supported_backends ();
2134 2158
2135#ifndef __NetBSD__ 2159#ifndef __NetBSD__
2136 /* kqueue is borked on everything but netbsd apparently */ 2160 /* kqueue is borked on everything but netbsd apparently */
… …
2148 2172
2149 return flags; 2173 return flags;
2150} 2174}
2151 2175
2152unsigned int ecb_cold 2176unsigned int ecb_cold
2153ev_embeddable_backends (void) 2177ev_embeddable_backends (void) EV_THROW
2154{ 2178{
2155 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 2179 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
2156 2180
2157 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 2181 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
2158 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */ 2182 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
… …
2160 2184
2161 return flags; 2185 return flags;
2162} 2186}
2163 2187
2164unsigned int 2188unsigned int
2165ev_backend (EV_P) 2189ev_backend (EV_P) EV_THROW
2166{ 2190{
2167 return backend; 2191 return backend;
2168} 2192}
2169 2193
2170#if EV_FEATURE_API 2194#if EV_FEATURE_API
2171unsigned int 2195unsigned int
2172ev_iteration (EV_P) 2196ev_iteration (EV_P) EV_THROW
2173{ 2197{
2174 return loop_count; 2198 return loop_count;
2175} 2199}
2176 2200
2177unsigned int 2201unsigned int
2178ev_depth (EV_P) 2202ev_depth (EV_P) EV_THROW
2179{ 2203{
2180 return loop_depth; 2204 return loop_depth;
2181} 2205}
2182 2206
2183void 2207void
2184ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 2208ev_set_io_collect_interval (EV_P_ ev_tstamp interval) EV_THROW
2185{ 2209{
2186 io_blocktime = interval; 2210 io_blocktime = interval;
2187} 2211}
2188 2212
2189void 2213void
2190ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 2214ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) EV_THROW
2191{ 2215{
2192 timeout_blocktime = interval; 2216 timeout_blocktime = interval;
2193} 2217}
2194 2218
2195void 2219void
2196ev_set_userdata (EV_P_ void *data) 2220ev_set_userdata (EV_P_ void *data) EV_THROW
2197{ 2221{
2198 userdata = data; 2222 userdata = data;
2199} 2223}
2200 2224
2201void * 2225void *
2202ev_userdata (EV_P) 2226ev_userdata (EV_P) EV_THROW
2203{ 2227{
2204 return userdata; 2228 return userdata;
2205} 2229}
2206 2230
2207void 2231void
2208ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 2232ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) EV_THROW
2209{ 2233{
2210 invoke_cb = invoke_pending_cb; 2234 invoke_cb = invoke_pending_cb;
2211} 2235}
2212 2236
2213void 2237void
2214ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 2238ev_set_loop_release_cb (EV_P_ void (*release)(EV_P) EV_THROW, void (*acquire)(EV_P) EV_THROW) EV_THROW
2215{ 2239{
2216 release_cb = release; 2240 release_cb = release;
2217 acquire_cb = acquire; 2241 acquire_cb = acquire;
2218} 2242}
2219#endif 2243#endif
2220 2244
2221/* initialise a loop structure, must be zero-initialised */ 2245/* initialise a loop structure, must be zero-initialised */
2222static void noinline ecb_cold 2246static void noinline ecb_cold
2223loop_init (EV_P_ unsigned int flags) 2247loop_init (EV_P_ unsigned int flags) EV_THROW
2224{ 2248{
2225 if (!backend) 2249 if (!backend)
2226 { 2250 {
2227 origflags = flags; 2251 origflags = flags;
2228 2252
… …
2333 EV_INVOKE_PENDING; 2357 EV_INVOKE_PENDING;
2334 } 2358 }
2335#endif 2359#endif
2336 2360
2337#if EV_CHILD_ENABLE 2361#if EV_CHILD_ENABLE
2338 if (ev_is_active (&childev)) 2362 if (ev_is_default_loop (EV_A) && ev_is_active (&childev))
2339 { 2363 {
2340 ev_ref (EV_A); /* child watcher */ 2364 ev_ref (EV_A); /* child watcher */
2341 ev_signal_stop (EV_A_ &childev); 2365 ev_signal_stop (EV_A_ &childev);
2342 } 2366 }
2343#endif 2367#endif
… …
2481} 2505}
2482 2506
2483#if EV_MULTIPLICITY 2507#if EV_MULTIPLICITY
2484 2508
2485struct ev_loop * ecb_cold 2509struct ev_loop * ecb_cold
2486ev_loop_new (unsigned int flags) 2510ev_loop_new (unsigned int flags) EV_THROW
2487{ 2511{
2488 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2512 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
2489 2513
2490 memset (EV_A, 0, sizeof (struct ev_loop)); 2514 memset (EV_A, 0, sizeof (struct ev_loop));
2491 loop_init (EV_A_ flags); 2515 loop_init (EV_A_ flags);
… …
2535} 2559}
2536#endif 2560#endif
2537 2561
2538#if EV_FEATURE_API 2562#if EV_FEATURE_API
2539void ecb_cold 2563void ecb_cold
2540ev_verify (EV_P) 2564ev_verify (EV_P) EV_THROW
2541{ 2565{
2542#if EV_VERIFY 2566#if EV_VERIFY
2543 int i; 2567 int i;
2544 WL w; 2568 WL w, w2;
2545 2569
2546 assert (activecnt >= -1); 2570 assert (activecnt >= -1);
2547 2571
2548 assert (fdchangemax >= fdchangecnt); 2572 assert (fdchangemax >= fdchangecnt);
2549 for (i = 0; i < fdchangecnt; ++i) 2573 for (i = 0; i < fdchangecnt; ++i)
2550 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0)); 2574 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
2551 2575
2552 assert (anfdmax >= 0); 2576 assert (anfdmax >= 0);
2553 for (i = 0; i < anfdmax; ++i) 2577 for (i = 0; i < anfdmax; ++i)
2578 {
2579 int j = 0;
2580
2554 for (w = anfds [i].head; w; w = w->next) 2581 for (w = w2 = anfds [i].head; w; w = w->next)
2555 { 2582 {
2556 verify_watcher (EV_A_ (W)w); 2583 verify_watcher (EV_A_ (W)w);
2584
2585 if (j++ & 1)
2586 {
2587 assert (("libev: io watcher list contains a loop", w != w2));
2588 w2 = w2->next;
2589 }
2590
2557 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1)); 2591 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
2558 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 2592 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
2559 } 2593 }
2594 }
2560 2595
2561 assert (timermax >= timercnt); 2596 assert (timermax >= timercnt);
2562 verify_heap (EV_A_ timers, timercnt); 2597 verify_heap (EV_A_ timers, timercnt);
2563 2598
2564#if EV_PERIODIC_ENABLE 2599#if EV_PERIODIC_ENABLE
… …
2614#if EV_MULTIPLICITY 2649#if EV_MULTIPLICITY
2615struct ev_loop * ecb_cold 2650struct ev_loop * ecb_cold
2616#else 2651#else
2617int 2652int
2618#endif 2653#endif
2619ev_default_loop (unsigned int flags) 2654ev_default_loop (unsigned int flags) EV_THROW
2620{ 2655{
2621 if (!ev_default_loop_ptr) 2656 if (!ev_default_loop_ptr)
2622 { 2657 {
2623#if EV_MULTIPLICITY 2658#if EV_MULTIPLICITY
2624 EV_P = ev_default_loop_ptr = &default_loop_struct; 2659 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
2643 2678
2644 return ev_default_loop_ptr; 2679 return ev_default_loop_ptr;
2645} 2680}
2646 2681
2647void 2682void
2648ev_loop_fork (EV_P) 2683ev_loop_fork (EV_P) EV_THROW
2649{ 2684{
2650 postfork = 1; /* must be in line with ev_default_fork */ 2685 postfork = 1; /* must be in line with ev_default_fork */
2651} 2686}
2652 2687
2653/*****************************************************************************/ 2688/*****************************************************************************/
… …
2657{ 2692{
2658 EV_CB_INVOKE ((W)w, revents); 2693 EV_CB_INVOKE ((W)w, revents);
2659} 2694}
2660 2695
2661unsigned int 2696unsigned int
2662ev_pending_count (EV_P) 2697ev_pending_count (EV_P) EV_THROW
2663{ 2698{
2664 int pri; 2699 int pri;
2665 unsigned int count = 0; 2700 unsigned int count = 0;
2666 2701
2667 for (pri = NUMPRI; pri--; ) 2702 for (pri = NUMPRI; pri--; )
… …
2671} 2706}
2672 2707
2673void noinline 2708void noinline
2674ev_invoke_pending (EV_P) 2709ev_invoke_pending (EV_P)
2675{ 2710{
2676 int pri; 2711 for (pendingpri = NUMPRI; pendingpri--; ) /* pendingpri is modified during the loop */
2677
2678 for (pri = NUMPRI; pri--; )
2679 while (pendingcnt [pri]) 2712 while (pendingcnt [pendingpri])
2680 { 2713 {
2681 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2714 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2682 2715
2683 p->w->pending = 0; 2716 p->w->pending = 0;
2684 EV_CB_INVOKE (p->w, p->events); 2717 EV_CB_INVOKE (p->w, p->events);
2685 EV_FREQUENT_CHECK; 2718 EV_FREQUENT_CHECK;
2686 } 2719 }
… …
2781{ 2814{
2782 EV_FREQUENT_CHECK; 2815 EV_FREQUENT_CHECK;
2783 2816
2784 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2817 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
2785 { 2818 {
2786 int feed_count = 0;
2787
2788 do 2819 do
2789 { 2820 {
2790 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2821 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2791 2822
2792 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/ 2823 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
… …
2926 2957
2927 mn_now = ev_rt_now; 2958 mn_now = ev_rt_now;
2928 } 2959 }
2929} 2960}
2930 2961
2931void 2962int
2932ev_run (EV_P_ int flags) 2963ev_run (EV_P_ int flags)
2933{ 2964{
2934#if EV_FEATURE_API 2965#if EV_FEATURE_API
2935 ++loop_depth; 2966 ++loop_depth;
2936#endif 2967#endif
… …
3093 loop_done = EVBREAK_CANCEL; 3124 loop_done = EVBREAK_CANCEL;
3094 3125
3095#if EV_FEATURE_API 3126#if EV_FEATURE_API
3096 --loop_depth; 3127 --loop_depth;
3097#endif 3128#endif
3129
3130 return activecnt;
3098} 3131}
3099 3132
3100void 3133void
3101ev_break (EV_P_ int how) 3134ev_break (EV_P_ int how) EV_THROW
3102{ 3135{
3103 loop_done = how; 3136 loop_done = how;
3104} 3137}
3105 3138
3106void 3139void
3107ev_ref (EV_P) 3140ev_ref (EV_P) EV_THROW
3108{ 3141{
3109 ++activecnt; 3142 ++activecnt;
3110} 3143}
3111 3144
3112void 3145void
3113ev_unref (EV_P) 3146ev_unref (EV_P) EV_THROW
3114{ 3147{
3115 --activecnt; 3148 --activecnt;
3116} 3149}
3117 3150
3118void 3151void
3119ev_now_update (EV_P) 3152ev_now_update (EV_P) EV_THROW
3120{ 3153{
3121 time_update (EV_A_ 1e100); 3154 time_update (EV_A_ 1e100);
3122} 3155}
3123 3156
3124void 3157void
3125ev_suspend (EV_P) 3158ev_suspend (EV_P) EV_THROW
3126{ 3159{
3127 ev_now_update (EV_A); 3160 ev_now_update (EV_A);
3128} 3161}
3129 3162
3130void 3163void
3131ev_resume (EV_P) 3164ev_resume (EV_P) EV_THROW
3132{ 3165{
3133 ev_tstamp mn_prev = mn_now; 3166 ev_tstamp mn_prev = mn_now;
3134 3167
3135 ev_now_update (EV_A); 3168 ev_now_update (EV_A);
3136 timers_reschedule (EV_A_ mn_now - mn_prev); 3169 timers_reschedule (EV_A_ mn_now - mn_prev);
… …
3175 w->pending = 0; 3208 w->pending = 0;
3176 } 3209 }
3177} 3210}
3178 3211
3179int 3212int
3180ev_clear_pending (EV_P_ void *w) 3213ev_clear_pending (EV_P_ void *w) EV_THROW
3181{ 3214{
3182 W w_ = (W)w; 3215 W w_ = (W)w;
3183 int pending = w_->pending; 3216 int pending = w_->pending;
3184 3217
3185 if (expect_true (pending)) 3218 if (expect_true (pending))
… …
3218} 3251}
3219 3252
3220/*****************************************************************************/ 3253/*****************************************************************************/
3221 3254
3222void noinline 3255void noinline
3223ev_io_start (EV_P_ ev_io *w) 3256ev_io_start (EV_P_ ev_io *w) EV_THROW
3224{ 3257{
3225 int fd = w->fd; 3258 int fd = w->fd;
3226 3259
3227 if (expect_false (ev_is_active (w))) 3260 if (expect_false (ev_is_active (w)))
3228 return; 3261 return;
… …
3234 3267
3235 ev_start (EV_A_ (W)w, 1); 3268 ev_start (EV_A_ (W)w, 1);
3236 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 3269 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
3237 wlist_add (&anfds[fd].head, (WL)w); 3270 wlist_add (&anfds[fd].head, (WL)w);
3238 3271
3272 /* common bug, apparently */
3273 assert (("libev: ev_io_start called with corrupted watcher", ((WL)w)->next != (WL)w));
3274
3239 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY); 3275 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
3240 w->events &= ~EV__IOFDSET; 3276 w->events &= ~EV__IOFDSET;
3241 3277
3242 EV_FREQUENT_CHECK; 3278 EV_FREQUENT_CHECK;
3243} 3279}
3244 3280
3245void noinline 3281void noinline
3246ev_io_stop (EV_P_ ev_io *w) 3282ev_io_stop (EV_P_ ev_io *w) EV_THROW
3247{ 3283{
3248 clear_pending (EV_A_ (W)w); 3284 clear_pending (EV_A_ (W)w);
3249 if (expect_false (!ev_is_active (w))) 3285 if (expect_false (!ev_is_active (w)))
3250 return; 3286 return;
3251 3287
… …
3260 3296
3261 EV_FREQUENT_CHECK; 3297 EV_FREQUENT_CHECK;
3262} 3298}
3263 3299
3264void noinline 3300void noinline
3265ev_timer_start (EV_P_ ev_timer *w) 3301ev_timer_start (EV_P_ ev_timer *w) EV_THROW
3266{ 3302{
3267 if (expect_false (ev_is_active (w))) 3303 if (expect_false (ev_is_active (w)))
3268 return; 3304 return;
3269 3305
3270 ev_at (w) += mn_now; 3306 ev_at (w) += mn_now;
… …
3284 3320
3285 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 3321 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
3286} 3322}
3287 3323
3288void noinline 3324void noinline
3289ev_timer_stop (EV_P_ ev_timer *w) 3325ev_timer_stop (EV_P_ ev_timer *w) EV_THROW
3290{ 3326{
3291 clear_pending (EV_A_ (W)w); 3327 clear_pending (EV_A_ (W)w);
3292 if (expect_false (!ev_is_active (w))) 3328 if (expect_false (!ev_is_active (w)))
3293 return; 3329 return;
3294 3330
… …
3314 3350
3315 EV_FREQUENT_CHECK; 3351 EV_FREQUENT_CHECK;
3316} 3352}
3317 3353
3318void noinline 3354void noinline
3319ev_timer_again (EV_P_ ev_timer *w) 3355ev_timer_again (EV_P_ ev_timer *w) EV_THROW
3320{ 3356{
3321 EV_FREQUENT_CHECK; 3357 EV_FREQUENT_CHECK;
3322 3358
3323 clear_pending (EV_A_ (W)w); 3359 clear_pending (EV_A_ (W)w);
3324 3360
… …
3341 3377
3342 EV_FREQUENT_CHECK; 3378 EV_FREQUENT_CHECK;
3343} 3379}
3344 3380
3345ev_tstamp 3381ev_tstamp
3346ev_timer_remaining (EV_P_ ev_timer *w) 3382ev_timer_remaining (EV_P_ ev_timer *w) EV_THROW
3347{ 3383{
3348 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.); 3384 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
3349} 3385}
3350 3386
3351#if EV_PERIODIC_ENABLE 3387#if EV_PERIODIC_ENABLE
3352void noinline 3388void noinline
3353ev_periodic_start (EV_P_ ev_periodic *w) 3389ev_periodic_start (EV_P_ ev_periodic *w) EV_THROW
3354{ 3390{
3355 if (expect_false (ev_is_active (w))) 3391 if (expect_false (ev_is_active (w)))
3356 return; 3392 return;
3357 3393
3358 if (w->reschedule_cb) 3394 if (w->reschedule_cb)
… …
3378 3414
3379 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 3415 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
3380} 3416}
3381 3417
3382void noinline 3418void noinline
3383ev_periodic_stop (EV_P_ ev_periodic *w) 3419ev_periodic_stop (EV_P_ ev_periodic *w) EV_THROW
3384{ 3420{
3385 clear_pending (EV_A_ (W)w); 3421 clear_pending (EV_A_ (W)w);
3386 if (expect_false (!ev_is_active (w))) 3422 if (expect_false (!ev_is_active (w)))
3387 return; 3423 return;
3388 3424
… …
3406 3442
3407 EV_FREQUENT_CHECK; 3443 EV_FREQUENT_CHECK;
3408} 3444}
3409 3445
3410void noinline 3446void noinline
3411ev_periodic_again (EV_P_ ev_periodic *w) 3447ev_periodic_again (EV_P_ ev_periodic *w) EV_THROW
3412{ 3448{
3413 /* TODO: use adjustheap and recalculation */ 3449 /* TODO: use adjustheap and recalculation */
3414 ev_periodic_stop (EV_A_ w); 3450 ev_periodic_stop (EV_A_ w);
3415 ev_periodic_start (EV_A_ w); 3451 ev_periodic_start (EV_A_ w);
3416} 3452}
… …
3421#endif 3457#endif
3422 3458
3423#if EV_SIGNAL_ENABLE 3459#if EV_SIGNAL_ENABLE
3424 3460
3425void noinline 3461void noinline
3426ev_signal_start (EV_P_ ev_signal *w) 3462ev_signal_start (EV_P_ ev_signal *w) EV_THROW
3427{ 3463{
3428 if (expect_false (ev_is_active (w))) 3464 if (expect_false (ev_is_active (w)))
3429 return; 3465 return;
3430 3466
3431 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG)); 3467 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
… …
3502 3538
3503 EV_FREQUENT_CHECK; 3539 EV_FREQUENT_CHECK;
3504} 3540}
3505 3541
3506void noinline 3542void noinline
3507ev_signal_stop (EV_P_ ev_signal *w) 3543ev_signal_stop (EV_P_ ev_signal *w) EV_THROW
3508{ 3544{
3509 clear_pending (EV_A_ (W)w); 3545 clear_pending (EV_A_ (W)w);
3510 if (expect_false (!ev_is_active (w))) 3546 if (expect_false (!ev_is_active (w)))
3511 return; 3547 return;
3512 3548
… …
3543#endif 3579#endif
3544 3580
3545#if EV_CHILD_ENABLE 3581#if EV_CHILD_ENABLE
3546 3582
3547void 3583void
3548ev_child_start (EV_P_ ev_child *w) 3584ev_child_start (EV_P_ ev_child *w) EV_THROW
3549{ 3585{
3550#if EV_MULTIPLICITY 3586#if EV_MULTIPLICITY
3551 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 3587 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
3552#endif 3588#endif
3553 if (expect_false (ev_is_active (w))) 3589 if (expect_false (ev_is_active (w)))
… …
3560 3596
3561 EV_FREQUENT_CHECK; 3597 EV_FREQUENT_CHECK;
3562} 3598}
3563 3599
3564void 3600void
3565ev_child_stop (EV_P_ ev_child *w) 3601ev_child_stop (EV_P_ ev_child *w) EV_THROW
3566{ 3602{
3567 clear_pending (EV_A_ (W)w); 3603 clear_pending (EV_A_ (W)w);
3568 if (expect_false (!ev_is_active (w))) 3604 if (expect_false (!ev_is_active (w)))
3569 return; 3605 return;
3570 3606
… …
3737} 3773}
3738 3774
3739inline_size int 3775inline_size int
3740infy_newfd (void) 3776infy_newfd (void)
3741{ 3777{
3742#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK) 3778#if defined IN_CLOEXEC && defined IN_NONBLOCK
3743 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK); 3779 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3744 if (fd >= 0) 3780 if (fd >= 0)
3745 return fd; 3781 return fd;
3746#endif 3782#endif
3747 return inotify_init (); 3783 return inotify_init ();
… …
3822#else 3858#else
3823# define EV_LSTAT(p,b) lstat (p, b) 3859# define EV_LSTAT(p,b) lstat (p, b)
3824#endif 3860#endif
3825 3861
3826void 3862void
3827ev_stat_stat (EV_P_ ev_stat *w) 3863ev_stat_stat (EV_P_ ev_stat *w) EV_THROW
3828{ 3864{
3829 if (lstat (w->path, &w->attr) < 0) 3865 if (lstat (w->path, &w->attr) < 0)
3830 w->attr.st_nlink = 0; 3866 w->attr.st_nlink = 0;
3831 else if (!w->attr.st_nlink) 3867 else if (!w->attr.st_nlink)
3832 w->attr.st_nlink = 1; 3868 w->attr.st_nlink = 1;
… …
3871 ev_feed_event (EV_A_ w, EV_STAT); 3907 ev_feed_event (EV_A_ w, EV_STAT);
3872 } 3908 }
3873} 3909}
3874 3910
3875void 3911void
3876ev_stat_start (EV_P_ ev_stat *w) 3912ev_stat_start (EV_P_ ev_stat *w) EV_THROW
3877{ 3913{
3878 if (expect_false (ev_is_active (w))) 3914 if (expect_false (ev_is_active (w)))
3879 return; 3915 return;
3880 3916
3881 ev_stat_stat (EV_A_ w); 3917 ev_stat_stat (EV_A_ w);
… …
3902 3938
3903 EV_FREQUENT_CHECK; 3939 EV_FREQUENT_CHECK;
3904} 3940}
3905 3941
3906void 3942void
3907ev_stat_stop (EV_P_ ev_stat *w) 3943ev_stat_stop (EV_P_ ev_stat *w) EV_THROW
3908{ 3944{
3909 clear_pending (EV_A_ (W)w); 3945 clear_pending (EV_A_ (W)w);
3910 if (expect_false (!ev_is_active (w))) 3946 if (expect_false (!ev_is_active (w)))
3911 return; 3947 return;
3912 3948
… …
3928} 3964}
3929#endif 3965#endif
3930 3966
3931#if EV_IDLE_ENABLE 3967#if EV_IDLE_ENABLE
3932void 3968void
3933ev_idle_start (EV_P_ ev_idle *w) 3969ev_idle_start (EV_P_ ev_idle *w) EV_THROW
3934{ 3970{
3935 if (expect_false (ev_is_active (w))) 3971 if (expect_false (ev_is_active (w)))
3936 return; 3972 return;
3937 3973
3938 pri_adjust (EV_A_ (W)w); 3974 pri_adjust (EV_A_ (W)w);
… …
3951 3987
3952 EV_FREQUENT_CHECK; 3988 EV_FREQUENT_CHECK;
3953} 3989}
3954 3990
3955void 3991void
3956ev_idle_stop (EV_P_ ev_idle *w) 3992ev_idle_stop (EV_P_ ev_idle *w) EV_THROW
3957{ 3993{
3958 clear_pending (EV_A_ (W)w); 3994 clear_pending (EV_A_ (W)w);
3959 if (expect_false (!ev_is_active (w))) 3995 if (expect_false (!ev_is_active (w)))
3960 return; 3996 return;
3961 3997
… …
3975} 4011}
3976#endif 4012#endif
3977 4013
3978#if EV_PREPARE_ENABLE 4014#if EV_PREPARE_ENABLE
3979void 4015void
3980ev_prepare_start (EV_P_ ev_prepare *w) 4016ev_prepare_start (EV_P_ ev_prepare *w) EV_THROW
3981{ 4017{
3982 if (expect_false (ev_is_active (w))) 4018 if (expect_false (ev_is_active (w)))
3983 return; 4019 return;
3984 4020
3985 EV_FREQUENT_CHECK; 4021 EV_FREQUENT_CHECK;
… …
3990 4026
3991 EV_FREQUENT_CHECK; 4027 EV_FREQUENT_CHECK;
3992} 4028}
3993 4029
3994void 4030void
3995ev_prepare_stop (EV_P_ ev_prepare *w) 4031ev_prepare_stop (EV_P_ ev_prepare *w) EV_THROW
3996{ 4032{
3997 clear_pending (EV_A_ (W)w); 4033 clear_pending (EV_A_ (W)w);
3998 if (expect_false (!ev_is_active (w))) 4034 if (expect_false (!ev_is_active (w)))
3999 return; 4035 return;
4000 4036
… …
4013} 4049}
4014#endif 4050#endif
4015 4051
4016#if EV_CHECK_ENABLE 4052#if EV_CHECK_ENABLE
4017void 4053void
4018ev_check_start (EV_P_ ev_check *w) 4054ev_check_start (EV_P_ ev_check *w) EV_THROW
4019{ 4055{
4020 if (expect_false (ev_is_active (w))) 4056 if (expect_false (ev_is_active (w)))
4021 return; 4057 return;
4022 4058
4023 EV_FREQUENT_CHECK; 4059 EV_FREQUENT_CHECK;
… …
4028 4064
4029 EV_FREQUENT_CHECK; 4065 EV_FREQUENT_CHECK;
4030} 4066}
4031 4067
4032void 4068void
4033ev_check_stop (EV_P_ ev_check *w) 4069ev_check_stop (EV_P_ ev_check *w) EV_THROW
4034{ 4070{
4035 clear_pending (EV_A_ (W)w); 4071 clear_pending (EV_A_ (W)w);
4036 if (expect_false (!ev_is_active (w))) 4072 if (expect_false (!ev_is_active (w)))
4037 return; 4073 return;
4038 4074
… …
4051} 4087}
4052#endif 4088#endif
4053 4089
4054#if EV_EMBED_ENABLE 4090#if EV_EMBED_ENABLE
4055void noinline 4091void noinline
4056ev_embed_sweep (EV_P_ ev_embed *w) 4092ev_embed_sweep (EV_P_ ev_embed *w) EV_THROW
4057{ 4093{
4058 ev_run (w->other, EVRUN_NOWAIT); 4094 ev_run (w->other, EVRUN_NOWAIT);
4059} 4095}
4060 4096
4061static void 4097static void
… …
4109 ev_idle_stop (EV_A_ idle); 4145 ev_idle_stop (EV_A_ idle);
4110} 4146}
4111#endif 4147#endif
4112 4148
4113void 4149void
4114ev_embed_start (EV_P_ ev_embed *w) 4150ev_embed_start (EV_P_ ev_embed *w) EV_THROW
4115{ 4151{
4116 if (expect_false (ev_is_active (w))) 4152 if (expect_false (ev_is_active (w)))
4117 return; 4153 return;
4118 4154
4119 { 4155 {
… …
4140 4176
4141 EV_FREQUENT_CHECK; 4177 EV_FREQUENT_CHECK;
4142} 4178}
4143 4179
4144void 4180void
4145ev_embed_stop (EV_P_ ev_embed *w) 4181ev_embed_stop (EV_P_ ev_embed *w) EV_THROW
4146{ 4182{
4147 clear_pending (EV_A_ (W)w); 4183 clear_pending (EV_A_ (W)w);
4148 if (expect_false (!ev_is_active (w))) 4184 if (expect_false (!ev_is_active (w)))
4149 return; 4185 return;
4150 4186
… …
4160} 4196}
4161#endif 4197#endif
4162 4198
4163#if EV_FORK_ENABLE 4199#if EV_FORK_ENABLE
4164void 4200void
4165ev_fork_start (EV_P_ ev_fork *w) 4201ev_fork_start (EV_P_ ev_fork *w) EV_THROW
4166{ 4202{
4167 if (expect_false (ev_is_active (w))) 4203 if (expect_false (ev_is_active (w)))
4168 return; 4204 return;
4169 4205
4170 EV_FREQUENT_CHECK; 4206 EV_FREQUENT_CHECK;
… …
4175 4211
4176 EV_FREQUENT_CHECK; 4212 EV_FREQUENT_CHECK;
4177} 4213}
4178 4214
4179void 4215void
4180ev_fork_stop (EV_P_ ev_fork *w) 4216ev_fork_stop (EV_P_ ev_fork *w) EV_THROW
4181{ 4217{
4182 clear_pending (EV_A_ (W)w); 4218 clear_pending (EV_A_ (W)w);
4183 if (expect_false (!ev_is_active (w))) 4219 if (expect_false (!ev_is_active (w)))
4184 return; 4220 return;
4185 4221
… …
4198} 4234}
4199#endif 4235#endif
4200 4236
4201#if EV_CLEANUP_ENABLE 4237#if EV_CLEANUP_ENABLE
4202void 4238void
4203ev_cleanup_start (EV_P_ ev_cleanup *w) 4239ev_cleanup_start (EV_P_ ev_cleanup *w) EV_THROW
4204{ 4240{
4205 if (expect_false (ev_is_active (w))) 4241 if (expect_false (ev_is_active (w)))
4206 return; 4242 return;
4207 4243
4208 EV_FREQUENT_CHECK; 4244 EV_FREQUENT_CHECK;
… …
4215 ev_unref (EV_A); 4251 ev_unref (EV_A);
4216 EV_FREQUENT_CHECK; 4252 EV_FREQUENT_CHECK;
4217} 4253}
4218 4254
4219void 4255void
4220ev_cleanup_stop (EV_P_ ev_cleanup *w) 4256ev_cleanup_stop (EV_P_ ev_cleanup *w) EV_THROW
4221{ 4257{
4222 clear_pending (EV_A_ (W)w); 4258 clear_pending (EV_A_ (W)w);
4223 if (expect_false (!ev_is_active (w))) 4259 if (expect_false (!ev_is_active (w)))
4224 return; 4260 return;
4225 4261
… …
4239} 4275}
4240#endif 4276#endif
4241 4277
4242#if EV_ASYNC_ENABLE 4278#if EV_ASYNC_ENABLE
4243void 4279void
4244ev_async_start (EV_P_ ev_async *w) 4280ev_async_start (EV_P_ ev_async *w) EV_THROW
4245{ 4281{
4246 if (expect_false (ev_is_active (w))) 4282 if (expect_false (ev_is_active (w)))
4247 return; 4283 return;
4248 4284
4249 w->sent = 0; 4285 w->sent = 0;
… …
4258 4294
4259 EV_FREQUENT_CHECK; 4295 EV_FREQUENT_CHECK;
4260} 4296}
4261 4297
4262void 4298void
4263ev_async_stop (EV_P_ ev_async *w) 4299ev_async_stop (EV_P_ ev_async *w) EV_THROW
4264{ 4300{
4265 clear_pending (EV_A_ (W)w); 4301 clear_pending (EV_A_ (W)w);
4266 if (expect_false (!ev_is_active (w))) 4302 if (expect_false (!ev_is_active (w)))
4267 return; 4303 return;
4268 4304
… …
4279 4315
4280 EV_FREQUENT_CHECK; 4316 EV_FREQUENT_CHECK;
4281} 4317}
4282 4318
4283void 4319void
4284ev_async_send (EV_P_ ev_async *w) 4320ev_async_send (EV_P_ ev_async *w) EV_THROW
4285{ 4321{
4286 w->sent = 1; 4322 w->sent = 1;
4287 evpipe_write (EV_A_ &async_pending); 4323 evpipe_write (EV_A_ &async_pending);
4288} 4324}
4289#endif 4325#endif
… …
4326 4362
4327 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io)); 4363 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
4328} 4364}
4329 4365
4330void 4366void
4331ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 4367ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) EV_THROW
4332{ 4368{
4333 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 4369 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
4334 4370
4335 if (expect_false (!once)) 4371 if (expect_false (!once))
4336 { 4372 {
… …
4358 4394
4359/*****************************************************************************/ 4395/*****************************************************************************/
4360 4396
4361#if EV_WALK_ENABLE 4397#if EV_WALK_ENABLE
4362void ecb_cold 4398void ecb_cold
4363ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 4399ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) EV_THROW
4364{ 4400{
4365 int i, j; 4401 int i, j;
4366 ev_watcher_list *wl, *wn; 4402 ev_watcher_list *wl, *wn;
4367 4403
4368 if (types & (EV_IO | EV_EMBED)) 4404 if (types & (EV_IO | EV_EMBED))

Diff Legend

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