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

Comparing libev/ev.c (file contents):
Revision 1.409 by root, Sat Feb 4 15:17:34 2012 UTC vs.
Revision 1.429 by root, Tue May 8 15:50:49 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
193# include <io.h> 204# include <io.h>
194# define WIN32_LEAN_AND_MEAN 205# define WIN32_LEAN_AND_MEAN
195# include <windows.h> 206# include <windows.h>
207# include <winsock2.h>
196# ifndef EV_SELECT_IS_WINSOCKET 208# ifndef EV_SELECT_IS_WINSOCKET
197# define EV_SELECT_IS_WINSOCKET 1 209# define EV_SELECT_IS_WINSOCKET 1
198# endif 210# endif
199# undef EV_AVOID_STDIO 211# undef EV_AVOID_STDIO
200#endif 212#endif
… …
208#define _DARWIN_UNLIMITED_SELECT 1 220#define _DARWIN_UNLIMITED_SELECT 1
209 221
210/* 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 */
211 223
212/* try to deduce the maximum number of signals on this platform */ 224/* try to deduce the maximum number of signals on this platform */
213#if defined (EV_NSIG) 225#if defined EV_NSIG
214/* use what's provided */ 226/* use what's provided */
215#elif defined (NSIG) 227#elif defined NSIG
216# define EV_NSIG (NSIG) 228# define EV_NSIG (NSIG)
217#elif defined(_NSIG) 229#elif defined _NSIG
218# define EV_NSIG (_NSIG) 230# define EV_NSIG (_NSIG)
219#elif defined (SIGMAX) 231#elif defined SIGMAX
220# define EV_NSIG (SIGMAX+1) 232# define EV_NSIG (SIGMAX+1)
221#elif defined (SIG_MAX) 233#elif defined SIG_MAX
222# define EV_NSIG (SIG_MAX+1) 234# define EV_NSIG (SIG_MAX+1)
223#elif defined (_SIG_MAX) 235#elif defined _SIG_MAX
224# define EV_NSIG (_SIG_MAX+1) 236# define EV_NSIG (_SIG_MAX+1)
225#elif defined (MAXSIG) 237#elif defined MAXSIG
226# define EV_NSIG (MAXSIG+1) 238# define EV_NSIG (MAXSIG+1)
227#elif defined (MAX_SIG) 239#elif defined MAX_SIG
228# define EV_NSIG (MAX_SIG+1) 240# define EV_NSIG (MAX_SIG+1)
229#elif defined (SIGARRAYSIZE) 241#elif defined SIGARRAYSIZE
230# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */ 242# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
231#elif defined (_sys_nsig) 243#elif defined _sys_nsig
232# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 244# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
233#else 245#else
234# error "unable to find value for NSIG, please report" 246# error "unable to find value for NSIG, please report"
235/* to make it compile regardless, just remove the above line, */ 247/* to make it compile regardless, just remove the above line, */
236/* but consider reporting it, too! :) */ 248/* but consider reporting it, too! :) */
… …
248# define EV_USE_CLOCK_SYSCALL 0 260# define EV_USE_CLOCK_SYSCALL 0
249# endif 261# endif
250#endif 262#endif
251 263
252#ifndef EV_USE_MONOTONIC 264#ifndef EV_USE_MONOTONIC
253# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 265# if defined _POSIX_MONOTONIC_CLOCK && _POSIX_MONOTONIC_CLOCK >= 0
254# define EV_USE_MONOTONIC EV_FEATURE_OS 266# define EV_USE_MONOTONIC EV_FEATURE_OS
255# else 267# else
256# define EV_USE_MONOTONIC 0 268# define EV_USE_MONOTONIC 0
257# endif 269# endif
258#endif 270#endif
… …
348#endif 360#endif
349 361
350/* 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, */
351/* which makes programs even slower. might work on other unices, too. */ 363/* which makes programs even slower. might work on other unices, too. */
352#if EV_USE_CLOCK_SYSCALL 364#if EV_USE_CLOCK_SYSCALL
353# include <syscall.h> 365# include <sys/syscall.h>
354# ifdef SYS_clock_gettime 366# ifdef SYS_clock_gettime
355# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 367# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
356# undef EV_USE_MONOTONIC 368# undef EV_USE_MONOTONIC
357# define EV_USE_MONOTONIC 1 369# define EV_USE_MONOTONIC 1
358# else 370# else
… …
384# define EV_USE_INOTIFY 0 396# define EV_USE_INOTIFY 0
385#endif 397#endif
386 398
387#if !EV_USE_NANOSLEEP 399#if !EV_USE_NANOSLEEP
388/* 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 */
389# if !defined(_WIN32) && !defined(__hpux) 401# if !defined _WIN32 && !defined __hpux
390# include <sys/select.h> 402# include <sys/select.h>
391# endif 403# endif
392#endif 404#endif
393 405
394#if EV_USE_INOTIFY 406#if EV_USE_INOTIFY
… …
522 * or so. 534 * or so.
523 * we try to detect these and simply assume they are not gcc - if they have 535 * 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. 536 * an issue with that they should have done it right in the first place.
525 */ 537 */
526#ifndef ECB_GCC_VERSION 538#ifndef ECB_GCC_VERSION
527 #if !defined(__GNUC_MINOR__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__llvm__) || defined(__clang__) 539 #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 540 #define ECB_GCC_VERSION(major,minor) 0
529 #else 541 #else
530 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 542 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
531 #endif 543 #endif
532#endif 544#endif
… …
534/*****************************************************************************/ 546/*****************************************************************************/
535 547
536/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */ 548/* 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 */ 549/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
538 550
551#if ECB_NO_THREADS
552# define ECB_NO_SMP 1
553#endif
554
539#if ECB_NO_THREADS || ECB_NO_SMP 555#if ECB_NO_THREADS || ECB_NO_SMP
540 #define ECB_MEMORY_FENCE do { } while (0) 556 #define ECB_MEMORY_FENCE do { } while (0)
541#endif 557#endif
542 558
543#ifndef ECB_MEMORY_FENCE 559#ifndef ECB_MEMORY_FENCE
544 #if ECB_GCC_VERSION(2,5) || defined(__INTEL_COMPILER) || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110 560 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
545 #if __i386 || __i386__ 561 #if __i386 || __i386__
546 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory") 562 #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 */ 563 #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 */ 564 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */
549 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__ 565 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__
550 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 566 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
551 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory") 567 #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 */ 568 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */
553 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 569 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
554 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 570 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
555 #elif defined(__ARM_ARCH_6__ ) || defined(__ARM_ARCH_6J__ ) \ 571 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \
556 || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6ZK__) 572 || 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") 573 #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__ ) \ 574 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
559 || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7R__ ) 575 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
560 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 576 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
561 #elif __sparc || __sparc__ 577 #elif __sparc || __sparc__
562 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad | " : : : "memory") 578 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad | " : : : "memory")
563 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 579 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
564 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 580 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
565 #elif defined(__s390__) || defined(__s390x__) 581 #elif defined __s390__ || defined __s390x__
566 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 582 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
583 #elif defined __mips__
584 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
585 #elif defined __alpha__
586 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
567 #endif 587 #endif
568 #endif 588 #endif
569#endif 589#endif
570 590
571#ifndef ECB_MEMORY_FENCE 591#ifndef ECB_MEMORY_FENCE
572 #if ECB_GCC_VERSION(4,4) || defined(__INTEL_COMPILER) || defined(__clang__) 592 #if ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
573 #define ECB_MEMORY_FENCE __sync_synchronize () 593 #define ECB_MEMORY_FENCE __sync_synchronize ()
574 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */ 594 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */
575 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */ 595 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */
576 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 596 #elif _MSC_VER >= 1400 /* VC++ 2005 */
577 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 597 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
578 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 598 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
579 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 599 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
580 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 600 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
581 #elif defined(_WIN32) 601 #elif defined _WIN32
582 #include <WinNT.h> 602 #include <WinNT.h>
583 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */ 603 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */
584 #elif __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110 604 #elif __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
585 #include <mbarrier.h> 605 #include <mbarrier.h>
586 #define ECB_MEMORY_FENCE __machine_rw_barrier () 606 #define ECB_MEMORY_FENCE __machine_rw_barrier ()
587 #define ECB_MEMORY_FENCE_ACQUIRE __machine_r_barrier () 607 #define ECB_MEMORY_FENCE_ACQUIRE __machine_r_barrier ()
588 #define ECB_MEMORY_FENCE_RELEASE __machine_w_barrier () 608 #define ECB_MEMORY_FENCE_RELEASE __machine_w_barrier ()
609 #elif __xlC__
610 #define ECB_MEMORY_FENCE __sync ()
589 #endif 611 #endif
590#endif 612#endif
591 613
592#ifndef ECB_MEMORY_FENCE 614#ifndef ECB_MEMORY_FENCE
593 #if !ECB_AVOID_PTHREADS 615 #if !ECB_AVOID_PTHREADS
… …
605 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER; 627 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
606 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0) 628 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
607 #endif 629 #endif
608#endif 630#endif
609 631
610#if !defined(ECB_MEMORY_FENCE_ACQUIRE) && defined(ECB_MEMORY_FENCE) 632#if !defined ECB_MEMORY_FENCE_ACQUIRE && defined ECB_MEMORY_FENCE
611 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE 633 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
612#endif 634#endif
613 635
614#if !defined(ECB_MEMORY_FENCE_RELEASE) && defined(ECB_MEMORY_FENCE) 636#if !defined ECB_MEMORY_FENCE_RELEASE && defined ECB_MEMORY_FENCE
615 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 637 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
616#endif 638#endif
617 639
618/*****************************************************************************/ 640/*****************************************************************************/
619 641
… …
1084{ 1106{
1085 write (STDERR_FILENO, msg, strlen (msg)); 1107 write (STDERR_FILENO, msg, strlen (msg));
1086} 1108}
1087#endif 1109#endif
1088 1110
1089static void (*syserr_cb)(const char *msg); 1111static void (*syserr_cb)(const char *msg) EV_THROW;
1090 1112
1091void ecb_cold 1113void ecb_cold
1092ev_set_syserr_cb (void (*cb)(const char *msg)) 1114ev_set_syserr_cb (void (*cb)(const char *msg)) EV_THROW
1093{ 1115{
1094 syserr_cb = cb; 1116 syserr_cb = cb;
1095} 1117}
1096 1118
1097static void noinline ecb_cold 1119static void noinline ecb_cold
… …
1133 free (ptr); 1155 free (ptr);
1134 return 0; 1156 return 0;
1135#endif 1157#endif
1136} 1158}
1137 1159
1138static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 1160static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1139 1161
1140void ecb_cold 1162void ecb_cold
1141ev_set_allocator (void *(*cb)(void *ptr, long size)) 1163ev_set_allocator (void *(*cb)(void *ptr, long size)) EV_THROW
1142{ 1164{
1143 alloc = cb; 1165 alloc = cb;
1144} 1166}
1145 1167
1146inline_speed void * 1168inline_speed void *
… …
1263 1285
1264/*****************************************************************************/ 1286/*****************************************************************************/
1265 1287
1266#ifndef EV_HAVE_EV_TIME 1288#ifndef EV_HAVE_EV_TIME
1267ev_tstamp 1289ev_tstamp
1268ev_time (void) 1290ev_time (void) EV_THROW
1269{ 1291{
1270#if EV_USE_REALTIME 1292#if EV_USE_REALTIME
1271 if (expect_true (have_realtime)) 1293 if (expect_true (have_realtime))
1272 { 1294 {
1273 struct timespec ts; 1295 struct timespec ts;
… …
1297 return ev_time (); 1319 return ev_time ();
1298} 1320}
1299 1321
1300#if EV_MULTIPLICITY 1322#if EV_MULTIPLICITY
1301ev_tstamp 1323ev_tstamp
1302ev_now (EV_P) 1324ev_now (EV_P) EV_THROW
1303{ 1325{
1304 return ev_rt_now; 1326 return ev_rt_now;
1305} 1327}
1306#endif 1328#endif
1307 1329
1308void 1330void
1309ev_sleep (ev_tstamp delay) 1331ev_sleep (ev_tstamp delay) EV_THROW
1310{ 1332{
1311 if (delay > 0.) 1333 if (delay > 0.)
1312 { 1334 {
1313#if EV_USE_NANOSLEEP 1335#if EV_USE_NANOSLEEP
1314 struct timespec ts; 1336 struct timespec ts;
1315 1337
1316 EV_TS_SET (ts, delay); 1338 EV_TS_SET (ts, delay);
1317 nanosleep (&ts, 0); 1339 nanosleep (&ts, 0);
1318#elif defined(_WIN32) 1340#elif defined _WIN32
1319 Sleep ((unsigned long)(delay * 1e3)); 1341 Sleep ((unsigned long)(delay * 1e3));
1320#else 1342#else
1321 struct timeval tv; 1343 struct timeval tv;
1322 1344
1323 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 1345 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
… …
1395pendingcb (EV_P_ ev_prepare *w, int revents) 1417pendingcb (EV_P_ ev_prepare *w, int revents)
1396{ 1418{
1397} 1419}
1398 1420
1399void noinline 1421void noinline
1400ev_feed_event (EV_P_ void *w, int revents) 1422ev_feed_event (EV_P_ void *w, int revents) EV_THROW
1401{ 1423{
1402 W w_ = (W)w; 1424 W w_ = (W)w;
1403 int pri = ABSPRI (w_); 1425 int pri = ABSPRI (w_);
1404 1426
1405 if (expect_false (w_->pending)) 1427 if (expect_false (w_->pending))
… …
1409 w_->pending = ++pendingcnt [pri]; 1431 w_->pending = ++pendingcnt [pri];
1410 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2); 1432 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
1411 pendings [pri][w_->pending - 1].w = w_; 1433 pendings [pri][w_->pending - 1].w = w_;
1412 pendings [pri][w_->pending - 1].events = revents; 1434 pendings [pri][w_->pending - 1].events = revents;
1413 } 1435 }
1436
1437 pendingpri = NUMPRI - 1;
1414} 1438}
1415 1439
1416inline_speed void 1440inline_speed void
1417feed_reverse (EV_P_ W w) 1441feed_reverse (EV_P_ W w)
1418{ 1442{
… …
1464 if (expect_true (!anfd->reify)) 1488 if (expect_true (!anfd->reify))
1465 fd_event_nocheck (EV_A_ fd, revents); 1489 fd_event_nocheck (EV_A_ fd, revents);
1466} 1490}
1467 1491
1468void 1492void
1469ev_feed_fd_event (EV_P_ int fd, int revents) 1493ev_feed_fd_event (EV_P_ int fd, int revents) EV_THROW
1470{ 1494{
1471 if (fd >= 0 && fd < anfdmax) 1495 if (fd >= 0 && fd < anfdmax)
1472 fd_event_nocheck (EV_A_ fd, revents); 1496 fd_event_nocheck (EV_A_ fd, revents);
1473} 1497}
1474 1498
… …
1823} 1847}
1824 1848
1825inline_speed void 1849inline_speed void
1826evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1850evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1827{ 1851{
1852 ECB_MEMORY_FENCE; /* push out the write before this function was called, acquire flag */
1853
1828 if (expect_true (*flag)) 1854 if (expect_true (*flag))
1829 return; 1855 return;
1830 1856
1831 *flag = 1; 1857 *flag = 1;
1832 1858
… …
1851 write (evfd, &counter, sizeof (uint64_t)); 1877 write (evfd, &counter, sizeof (uint64_t));
1852 } 1878 }
1853 else 1879 else
1854#endif 1880#endif
1855 { 1881 {
1856 /* win32 people keep sending patches that change this write() to send() */ 1882#ifdef _WIN32
1857 /* and then run away. but send() is wrong, it wants a socket handle on win32 */ 1883 WSABUF buf;
1858 /* so when you think this write should be a send instead, please find out */ 1884 DWORD sent;
1859 /* where your send() is from - it's definitely not the microsoft send, and */ 1885 buf.buf = &buf;
1860 /* tell me. thank you. */ 1886 buf.len = 1;
1887 WSASend (EV_FD_TO_WIN32_HANDLE (evpipe [1]), &buf, 1, &sent, 0, 0, 0);
1888#else
1861 write (evpipe [1], &(evpipe [1]), 1); 1889 write (evpipe [1], &(evpipe [1]), 1);
1890#endif
1862 } 1891 }
1863 1892
1864 errno = old_errno; 1893 errno = old_errno;
1865 } 1894 }
1866} 1895}
… …
1881 read (evfd, &counter, sizeof (uint64_t)); 1910 read (evfd, &counter, sizeof (uint64_t));
1882 } 1911 }
1883 else 1912 else
1884#endif 1913#endif
1885 { 1914 {
1886 char dummy; 1915 char dummy[4];
1887 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1916#ifdef _WIN32
1917 WSABUF buf;
1918 DWORD recvd;
1919 buf.buf = dummy;
1920 buf.len = sizeof (dummy);
1921 WSARecv (EV_FD_TO_WIN32_HANDLE (evpipe [0]), &buf, 1, &recvd, 0, 0, 0);
1922#else
1888 read (evpipe [0], &dummy, 1); 1923 read (evpipe [0], &dummy, sizeof (dummy));
1924#endif
1889 } 1925 }
1890 } 1926 }
1891 1927
1892 pipe_write_skipped = 0; 1928 pipe_write_skipped = 0;
1929
1930 ECB_MEMORY_FENCE; /* push out skipped, acquire flags */
1893 1931
1894#if EV_SIGNAL_ENABLE 1932#if EV_SIGNAL_ENABLE
1895 if (sig_pending) 1933 if (sig_pending)
1896 { 1934 {
1897 sig_pending = 0; 1935 sig_pending = 0;
1936
1937 ECB_MEMORY_FENCE_RELEASE;
1898 1938
1899 for (i = EV_NSIG - 1; i--; ) 1939 for (i = EV_NSIG - 1; i--; )
1900 if (expect_false (signals [i].pending)) 1940 if (expect_false (signals [i].pending))
1901 ev_feed_signal_event (EV_A_ i + 1); 1941 ev_feed_signal_event (EV_A_ i + 1);
1902 } 1942 }
… …
1904 1944
1905#if EV_ASYNC_ENABLE 1945#if EV_ASYNC_ENABLE
1906 if (async_pending) 1946 if (async_pending)
1907 { 1947 {
1908 async_pending = 0; 1948 async_pending = 0;
1949
1950 ECB_MEMORY_FENCE_RELEASE;
1909 1951
1910 for (i = asynccnt; i--; ) 1952 for (i = asynccnt; i--; )
1911 if (asyncs [i]->sent) 1953 if (asyncs [i]->sent)
1912 { 1954 {
1913 asyncs [i]->sent = 0; 1955 asyncs [i]->sent = 0;
… …
1918} 1960}
1919 1961
1920/*****************************************************************************/ 1962/*****************************************************************************/
1921 1963
1922void 1964void
1923ev_feed_signal (int signum) 1965ev_feed_signal (int signum) EV_THROW
1924{ 1966{
1925#if EV_MULTIPLICITY 1967#if EV_MULTIPLICITY
1926 EV_P = signals [signum - 1].loop; 1968 EV_P = signals [signum - 1].loop;
1927 1969
1928 if (!EV_A) 1970 if (!EV_A)
… …
1945 1987
1946 ev_feed_signal (signum); 1988 ev_feed_signal (signum);
1947} 1989}
1948 1990
1949void noinline 1991void noinline
1950ev_feed_signal_event (EV_P_ int signum) 1992ev_feed_signal_event (EV_P_ int signum) EV_THROW
1951{ 1993{
1952 WL w; 1994 WL w;
1953 1995
1954 if (expect_false (signum <= 0 || signum > EV_NSIG)) 1996 if (expect_false (signum <= 0 || signum > EV_NSIG))
1955 return; 1997 return;
… …
2071#if EV_USE_SELECT 2113#if EV_USE_SELECT
2072# include "ev_select.c" 2114# include "ev_select.c"
2073#endif 2115#endif
2074 2116
2075int ecb_cold 2117int ecb_cold
2076ev_version_major (void) 2118ev_version_major (void) EV_THROW
2077{ 2119{
2078 return EV_VERSION_MAJOR; 2120 return EV_VERSION_MAJOR;
2079} 2121}
2080 2122
2081int ecb_cold 2123int ecb_cold
2082ev_version_minor (void) 2124ev_version_minor (void) EV_THROW
2083{ 2125{
2084 return EV_VERSION_MINOR; 2126 return EV_VERSION_MINOR;
2085} 2127}
2086 2128
2087/* return true if we are running with elevated privileges and should ignore env variables */ 2129/* return true if we are running with elevated privileges and should ignore env variables */
… …
2095 || getgid () != getegid (); 2137 || getgid () != getegid ();
2096#endif 2138#endif
2097} 2139}
2098 2140
2099unsigned int ecb_cold 2141unsigned int ecb_cold
2100ev_supported_backends (void) 2142ev_supported_backends (void) EV_THROW
2101{ 2143{
2102 unsigned int flags = 0; 2144 unsigned int flags = 0;
2103 2145
2104 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 2146 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
2105 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE; 2147 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
… …
2109 2151
2110 return flags; 2152 return flags;
2111} 2153}
2112 2154
2113unsigned int ecb_cold 2155unsigned int ecb_cold
2114ev_recommended_backends (void) 2156ev_recommended_backends (void) EV_THROW
2115{ 2157{
2116 unsigned int flags = ev_supported_backends (); 2158 unsigned int flags = ev_supported_backends ();
2117 2159
2118#ifndef __NetBSD__ 2160#ifndef __NetBSD__
2119 /* kqueue is borked on everything but netbsd apparently */ 2161 /* kqueue is borked on everything but netbsd apparently */
… …
2131 2173
2132 return flags; 2174 return flags;
2133} 2175}
2134 2176
2135unsigned int ecb_cold 2177unsigned int ecb_cold
2136ev_embeddable_backends (void) 2178ev_embeddable_backends (void) EV_THROW
2137{ 2179{
2138 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 2180 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
2139 2181
2140 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 2182 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
2141 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */ 2183 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
… …
2143 2185
2144 return flags; 2186 return flags;
2145} 2187}
2146 2188
2147unsigned int 2189unsigned int
2148ev_backend (EV_P) 2190ev_backend (EV_P) EV_THROW
2149{ 2191{
2150 return backend; 2192 return backend;
2151} 2193}
2152 2194
2153#if EV_FEATURE_API 2195#if EV_FEATURE_API
2154unsigned int 2196unsigned int
2155ev_iteration (EV_P) 2197ev_iteration (EV_P) EV_THROW
2156{ 2198{
2157 return loop_count; 2199 return loop_count;
2158} 2200}
2159 2201
2160unsigned int 2202unsigned int
2161ev_depth (EV_P) 2203ev_depth (EV_P) EV_THROW
2162{ 2204{
2163 return loop_depth; 2205 return loop_depth;
2164} 2206}
2165 2207
2166void 2208void
2167ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 2209ev_set_io_collect_interval (EV_P_ ev_tstamp interval) EV_THROW
2168{ 2210{
2169 io_blocktime = interval; 2211 io_blocktime = interval;
2170} 2212}
2171 2213
2172void 2214void
2173ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 2215ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) EV_THROW
2174{ 2216{
2175 timeout_blocktime = interval; 2217 timeout_blocktime = interval;
2176} 2218}
2177 2219
2178void 2220void
2179ev_set_userdata (EV_P_ void *data) 2221ev_set_userdata (EV_P_ void *data) EV_THROW
2180{ 2222{
2181 userdata = data; 2223 userdata = data;
2182} 2224}
2183 2225
2184void * 2226void *
2185ev_userdata (EV_P) 2227ev_userdata (EV_P) EV_THROW
2186{ 2228{
2187 return userdata; 2229 return userdata;
2188} 2230}
2189 2231
2190void 2232void
2191ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 2233ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) EV_THROW
2192{ 2234{
2193 invoke_cb = invoke_pending_cb; 2235 invoke_cb = invoke_pending_cb;
2194} 2236}
2195 2237
2196void 2238void
2197ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 2239ev_set_loop_release_cb (EV_P_ void (*release)(EV_P) EV_THROW, void (*acquire)(EV_P) EV_THROW) EV_THROW
2198{ 2240{
2199 release_cb = release; 2241 release_cb = release;
2200 acquire_cb = acquire; 2242 acquire_cb = acquire;
2201} 2243}
2202#endif 2244#endif
2203 2245
2204/* initialise a loop structure, must be zero-initialised */ 2246/* initialise a loop structure, must be zero-initialised */
2205static void noinline ecb_cold 2247static void noinline ecb_cold
2206loop_init (EV_P_ unsigned int flags) 2248loop_init (EV_P_ unsigned int flags) EV_THROW
2207{ 2249{
2208 if (!backend) 2250 if (!backend)
2209 { 2251 {
2210 origflags = flags; 2252 origflags = flags;
2211 2253
… …
2464} 2506}
2465 2507
2466#if EV_MULTIPLICITY 2508#if EV_MULTIPLICITY
2467 2509
2468struct ev_loop * ecb_cold 2510struct ev_loop * ecb_cold
2469ev_loop_new (unsigned int flags) 2511ev_loop_new (unsigned int flags) EV_THROW
2470{ 2512{
2471 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2513 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
2472 2514
2473 memset (EV_A, 0, sizeof (struct ev_loop)); 2515 memset (EV_A, 0, sizeof (struct ev_loop));
2474 loop_init (EV_A_ flags); 2516 loop_init (EV_A_ flags);
… …
2518} 2560}
2519#endif 2561#endif
2520 2562
2521#if EV_FEATURE_API 2563#if EV_FEATURE_API
2522void ecb_cold 2564void ecb_cold
2523ev_verify (EV_P) 2565ev_verify (EV_P) EV_THROW
2524{ 2566{
2525#if EV_VERIFY 2567#if EV_VERIFY
2526 int i; 2568 int i;
2527 WL w; 2569 WL w, w2;
2528 2570
2529 assert (activecnt >= -1); 2571 assert (activecnt >= -1);
2530 2572
2531 assert (fdchangemax >= fdchangecnt); 2573 assert (fdchangemax >= fdchangecnt);
2532 for (i = 0; i < fdchangecnt; ++i) 2574 for (i = 0; i < fdchangecnt; ++i)
2533 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0)); 2575 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
2534 2576
2535 assert (anfdmax >= 0); 2577 assert (anfdmax >= 0);
2536 for (i = 0; i < anfdmax; ++i) 2578 for (i = 0; i < anfdmax; ++i)
2579 {
2580 int j = 0;
2581
2537 for (w = anfds [i].head; w; w = w->next) 2582 for (w = w2 = anfds [i].head; w; w = w->next)
2538 { 2583 {
2539 verify_watcher (EV_A_ (W)w); 2584 verify_watcher (EV_A_ (W)w);
2585
2586 if (j++ & 1)
2587 {
2588 assert (("libev: io watcher list contains a loop", w != w2));
2589 w2 = w2->next;
2590 }
2591
2540 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1)); 2592 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
2541 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 2593 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
2542 } 2594 }
2595 }
2543 2596
2544 assert (timermax >= timercnt); 2597 assert (timermax >= timercnt);
2545 verify_heap (EV_A_ timers, timercnt); 2598 verify_heap (EV_A_ timers, timercnt);
2546 2599
2547#if EV_PERIODIC_ENABLE 2600#if EV_PERIODIC_ENABLE
… …
2597#if EV_MULTIPLICITY 2650#if EV_MULTIPLICITY
2598struct ev_loop * ecb_cold 2651struct ev_loop * ecb_cold
2599#else 2652#else
2600int 2653int
2601#endif 2654#endif
2602ev_default_loop (unsigned int flags) 2655ev_default_loop (unsigned int flags) EV_THROW
2603{ 2656{
2604 if (!ev_default_loop_ptr) 2657 if (!ev_default_loop_ptr)
2605 { 2658 {
2606#if EV_MULTIPLICITY 2659#if EV_MULTIPLICITY
2607 EV_P = ev_default_loop_ptr = &default_loop_struct; 2660 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
2626 2679
2627 return ev_default_loop_ptr; 2680 return ev_default_loop_ptr;
2628} 2681}
2629 2682
2630void 2683void
2631ev_loop_fork (EV_P) 2684ev_loop_fork (EV_P) EV_THROW
2632{ 2685{
2633 postfork = 1; /* must be in line with ev_default_fork */ 2686 postfork = 1; /* must be in line with ev_default_fork */
2634} 2687}
2635 2688
2636/*****************************************************************************/ 2689/*****************************************************************************/
… …
2640{ 2693{
2641 EV_CB_INVOKE ((W)w, revents); 2694 EV_CB_INVOKE ((W)w, revents);
2642} 2695}
2643 2696
2644unsigned int 2697unsigned int
2645ev_pending_count (EV_P) 2698ev_pending_count (EV_P) EV_THROW
2646{ 2699{
2647 int pri; 2700 int pri;
2648 unsigned int count = 0; 2701 unsigned int count = 0;
2649 2702
2650 for (pri = NUMPRI; pri--; ) 2703 for (pri = NUMPRI; pri--; )
… …
2654} 2707}
2655 2708
2656void noinline 2709void noinline
2657ev_invoke_pending (EV_P) 2710ev_invoke_pending (EV_P)
2658{ 2711{
2659 int pri; 2712 for (pendingpri = NUMPRI; pendingpri--; ) /* pendingpri is modified during the loop */
2660
2661 for (pri = NUMPRI; pri--; )
2662 while (pendingcnt [pri]) 2713 while (pendingcnt [pendingpri])
2663 { 2714 {
2664 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2715 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2665 2716
2666 p->w->pending = 0; 2717 p->w->pending = 0;
2667 EV_CB_INVOKE (p->w, p->events); 2718 EV_CB_INVOKE (p->w, p->events);
2668 EV_FREQUENT_CHECK; 2719 EV_FREQUENT_CHECK;
2669 } 2720 }
… …
2909 2960
2910 mn_now = ev_rt_now; 2961 mn_now = ev_rt_now;
2911 } 2962 }
2912} 2963}
2913 2964
2914void 2965int
2915ev_run (EV_P_ int flags) 2966ev_run (EV_P_ int flags)
2916{ 2967{
2917#if EV_FEATURE_API 2968#if EV_FEATURE_API
2918 ++loop_depth; 2969 ++loop_depth;
2919#endif 2970#endif
… …
3076 loop_done = EVBREAK_CANCEL; 3127 loop_done = EVBREAK_CANCEL;
3077 3128
3078#if EV_FEATURE_API 3129#if EV_FEATURE_API
3079 --loop_depth; 3130 --loop_depth;
3080#endif 3131#endif
3132
3133 return activecnt;
3081} 3134}
3082 3135
3083void 3136void
3084ev_break (EV_P_ int how) 3137ev_break (EV_P_ int how) EV_THROW
3085{ 3138{
3086 loop_done = how; 3139 loop_done = how;
3087} 3140}
3088 3141
3089void 3142void
3090ev_ref (EV_P) 3143ev_ref (EV_P) EV_THROW
3091{ 3144{
3092 ++activecnt; 3145 ++activecnt;
3093} 3146}
3094 3147
3095void 3148void
3096ev_unref (EV_P) 3149ev_unref (EV_P) EV_THROW
3097{ 3150{
3098 --activecnt; 3151 --activecnt;
3099} 3152}
3100 3153
3101void 3154void
3102ev_now_update (EV_P) 3155ev_now_update (EV_P) EV_THROW
3103{ 3156{
3104 time_update (EV_A_ 1e100); 3157 time_update (EV_A_ 1e100);
3105} 3158}
3106 3159
3107void 3160void
3108ev_suspend (EV_P) 3161ev_suspend (EV_P) EV_THROW
3109{ 3162{
3110 ev_now_update (EV_A); 3163 ev_now_update (EV_A);
3111} 3164}
3112 3165
3113void 3166void
3114ev_resume (EV_P) 3167ev_resume (EV_P) EV_THROW
3115{ 3168{
3116 ev_tstamp mn_prev = mn_now; 3169 ev_tstamp mn_prev = mn_now;
3117 3170
3118 ev_now_update (EV_A); 3171 ev_now_update (EV_A);
3119 timers_reschedule (EV_A_ mn_now - mn_prev); 3172 timers_reschedule (EV_A_ mn_now - mn_prev);
… …
3158 w->pending = 0; 3211 w->pending = 0;
3159 } 3212 }
3160} 3213}
3161 3214
3162int 3215int
3163ev_clear_pending (EV_P_ void *w) 3216ev_clear_pending (EV_P_ void *w) EV_THROW
3164{ 3217{
3165 W w_ = (W)w; 3218 W w_ = (W)w;
3166 int pending = w_->pending; 3219 int pending = w_->pending;
3167 3220
3168 if (expect_true (pending)) 3221 if (expect_true (pending))
… …
3201} 3254}
3202 3255
3203/*****************************************************************************/ 3256/*****************************************************************************/
3204 3257
3205void noinline 3258void noinline
3206ev_io_start (EV_P_ ev_io *w) 3259ev_io_start (EV_P_ ev_io *w) EV_THROW
3207{ 3260{
3208 int fd = w->fd; 3261 int fd = w->fd;
3209 3262
3210 if (expect_false (ev_is_active (w))) 3263 if (expect_false (ev_is_active (w)))
3211 return; 3264 return;
… …
3217 3270
3218 ev_start (EV_A_ (W)w, 1); 3271 ev_start (EV_A_ (W)w, 1);
3219 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 3272 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
3220 wlist_add (&anfds[fd].head, (WL)w); 3273 wlist_add (&anfds[fd].head, (WL)w);
3221 3274
3275 /* common bug, apparently */
3276 assert (("libev: ev_io_start called with corrupted watcher", ((WL)w)->next != (WL)w));
3277
3222 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY); 3278 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
3223 w->events &= ~EV__IOFDSET; 3279 w->events &= ~EV__IOFDSET;
3224 3280
3225 EV_FREQUENT_CHECK; 3281 EV_FREQUENT_CHECK;
3226} 3282}
3227 3283
3228void noinline 3284void noinline
3229ev_io_stop (EV_P_ ev_io *w) 3285ev_io_stop (EV_P_ ev_io *w) EV_THROW
3230{ 3286{
3231 clear_pending (EV_A_ (W)w); 3287 clear_pending (EV_A_ (W)w);
3232 if (expect_false (!ev_is_active (w))) 3288 if (expect_false (!ev_is_active (w)))
3233 return; 3289 return;
3234 3290
… …
3243 3299
3244 EV_FREQUENT_CHECK; 3300 EV_FREQUENT_CHECK;
3245} 3301}
3246 3302
3247void noinline 3303void noinline
3248ev_timer_start (EV_P_ ev_timer *w) 3304ev_timer_start (EV_P_ ev_timer *w) EV_THROW
3249{ 3305{
3250 if (expect_false (ev_is_active (w))) 3306 if (expect_false (ev_is_active (w)))
3251 return; 3307 return;
3252 3308
3253 ev_at (w) += mn_now; 3309 ev_at (w) += mn_now;
… …
3267 3323
3268 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 3324 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
3269} 3325}
3270 3326
3271void noinline 3327void noinline
3272ev_timer_stop (EV_P_ ev_timer *w) 3328ev_timer_stop (EV_P_ ev_timer *w) EV_THROW
3273{ 3329{
3274 clear_pending (EV_A_ (W)w); 3330 clear_pending (EV_A_ (W)w);
3275 if (expect_false (!ev_is_active (w))) 3331 if (expect_false (!ev_is_active (w)))
3276 return; 3332 return;
3277 3333
… …
3297 3353
3298 EV_FREQUENT_CHECK; 3354 EV_FREQUENT_CHECK;
3299} 3355}
3300 3356
3301void noinline 3357void noinline
3302ev_timer_again (EV_P_ ev_timer *w) 3358ev_timer_again (EV_P_ ev_timer *w) EV_THROW
3303{ 3359{
3304 EV_FREQUENT_CHECK; 3360 EV_FREQUENT_CHECK;
3305 3361
3306 clear_pending (EV_A_ (W)w); 3362 clear_pending (EV_A_ (W)w);
3307 3363
… …
3324 3380
3325 EV_FREQUENT_CHECK; 3381 EV_FREQUENT_CHECK;
3326} 3382}
3327 3383
3328ev_tstamp 3384ev_tstamp
3329ev_timer_remaining (EV_P_ ev_timer *w) 3385ev_timer_remaining (EV_P_ ev_timer *w) EV_THROW
3330{ 3386{
3331 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.); 3387 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
3332} 3388}
3333 3389
3334#if EV_PERIODIC_ENABLE 3390#if EV_PERIODIC_ENABLE
3335void noinline 3391void noinline
3336ev_periodic_start (EV_P_ ev_periodic *w) 3392ev_periodic_start (EV_P_ ev_periodic *w) EV_THROW
3337{ 3393{
3338 if (expect_false (ev_is_active (w))) 3394 if (expect_false (ev_is_active (w)))
3339 return; 3395 return;
3340 3396
3341 if (w->reschedule_cb) 3397 if (w->reschedule_cb)
… …
3361 3417
3362 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 3418 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
3363} 3419}
3364 3420
3365void noinline 3421void noinline
3366ev_periodic_stop (EV_P_ ev_periodic *w) 3422ev_periodic_stop (EV_P_ ev_periodic *w) EV_THROW
3367{ 3423{
3368 clear_pending (EV_A_ (W)w); 3424 clear_pending (EV_A_ (W)w);
3369 if (expect_false (!ev_is_active (w))) 3425 if (expect_false (!ev_is_active (w)))
3370 return; 3426 return;
3371 3427
… …
3389 3445
3390 EV_FREQUENT_CHECK; 3446 EV_FREQUENT_CHECK;
3391} 3447}
3392 3448
3393void noinline 3449void noinline
3394ev_periodic_again (EV_P_ ev_periodic *w) 3450ev_periodic_again (EV_P_ ev_periodic *w) EV_THROW
3395{ 3451{
3396 /* TODO: use adjustheap and recalculation */ 3452 /* TODO: use adjustheap and recalculation */
3397 ev_periodic_stop (EV_A_ w); 3453 ev_periodic_stop (EV_A_ w);
3398 ev_periodic_start (EV_A_ w); 3454 ev_periodic_start (EV_A_ w);
3399} 3455}
… …
3404#endif 3460#endif
3405 3461
3406#if EV_SIGNAL_ENABLE 3462#if EV_SIGNAL_ENABLE
3407 3463
3408void noinline 3464void noinline
3409ev_signal_start (EV_P_ ev_signal *w) 3465ev_signal_start (EV_P_ ev_signal *w) EV_THROW
3410{ 3466{
3411 if (expect_false (ev_is_active (w))) 3467 if (expect_false (ev_is_active (w)))
3412 return; 3468 return;
3413 3469
3414 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG)); 3470 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
… …
3485 3541
3486 EV_FREQUENT_CHECK; 3542 EV_FREQUENT_CHECK;
3487} 3543}
3488 3544
3489void noinline 3545void noinline
3490ev_signal_stop (EV_P_ ev_signal *w) 3546ev_signal_stop (EV_P_ ev_signal *w) EV_THROW
3491{ 3547{
3492 clear_pending (EV_A_ (W)w); 3548 clear_pending (EV_A_ (W)w);
3493 if (expect_false (!ev_is_active (w))) 3549 if (expect_false (!ev_is_active (w)))
3494 return; 3550 return;
3495 3551
… …
3526#endif 3582#endif
3527 3583
3528#if EV_CHILD_ENABLE 3584#if EV_CHILD_ENABLE
3529 3585
3530void 3586void
3531ev_child_start (EV_P_ ev_child *w) 3587ev_child_start (EV_P_ ev_child *w) EV_THROW
3532{ 3588{
3533#if EV_MULTIPLICITY 3589#if EV_MULTIPLICITY
3534 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 3590 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
3535#endif 3591#endif
3536 if (expect_false (ev_is_active (w))) 3592 if (expect_false (ev_is_active (w)))
… …
3543 3599
3544 EV_FREQUENT_CHECK; 3600 EV_FREQUENT_CHECK;
3545} 3601}
3546 3602
3547void 3603void
3548ev_child_stop (EV_P_ ev_child *w) 3604ev_child_stop (EV_P_ ev_child *w) EV_THROW
3549{ 3605{
3550 clear_pending (EV_A_ (W)w); 3606 clear_pending (EV_A_ (W)w);
3551 if (expect_false (!ev_is_active (w))) 3607 if (expect_false (!ev_is_active (w)))
3552 return; 3608 return;
3553 3609
… …
3720} 3776}
3721 3777
3722inline_size int 3778inline_size int
3723infy_newfd (void) 3779infy_newfd (void)
3724{ 3780{
3725#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK) 3781#if defined IN_CLOEXEC && defined IN_NONBLOCK
3726 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK); 3782 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3727 if (fd >= 0) 3783 if (fd >= 0)
3728 return fd; 3784 return fd;
3729#endif 3785#endif
3730 return inotify_init (); 3786 return inotify_init ();
… …
3805#else 3861#else
3806# define EV_LSTAT(p,b) lstat (p, b) 3862# define EV_LSTAT(p,b) lstat (p, b)
3807#endif 3863#endif
3808 3864
3809void 3865void
3810ev_stat_stat (EV_P_ ev_stat *w) 3866ev_stat_stat (EV_P_ ev_stat *w) EV_THROW
3811{ 3867{
3812 if (lstat (w->path, &w->attr) < 0) 3868 if (lstat (w->path, &w->attr) < 0)
3813 w->attr.st_nlink = 0; 3869 w->attr.st_nlink = 0;
3814 else if (!w->attr.st_nlink) 3870 else if (!w->attr.st_nlink)
3815 w->attr.st_nlink = 1; 3871 w->attr.st_nlink = 1;
… …
3854 ev_feed_event (EV_A_ w, EV_STAT); 3910 ev_feed_event (EV_A_ w, EV_STAT);
3855 } 3911 }
3856} 3912}
3857 3913
3858void 3914void
3859ev_stat_start (EV_P_ ev_stat *w) 3915ev_stat_start (EV_P_ ev_stat *w) EV_THROW
3860{ 3916{
3861 if (expect_false (ev_is_active (w))) 3917 if (expect_false (ev_is_active (w)))
3862 return; 3918 return;
3863 3919
3864 ev_stat_stat (EV_A_ w); 3920 ev_stat_stat (EV_A_ w);
… …
3885 3941
3886 EV_FREQUENT_CHECK; 3942 EV_FREQUENT_CHECK;
3887} 3943}
3888 3944
3889void 3945void
3890ev_stat_stop (EV_P_ ev_stat *w) 3946ev_stat_stop (EV_P_ ev_stat *w) EV_THROW
3891{ 3947{
3892 clear_pending (EV_A_ (W)w); 3948 clear_pending (EV_A_ (W)w);
3893 if (expect_false (!ev_is_active (w))) 3949 if (expect_false (!ev_is_active (w)))
3894 return; 3950 return;
3895 3951
… …
3911} 3967}
3912#endif 3968#endif
3913 3969
3914#if EV_IDLE_ENABLE 3970#if EV_IDLE_ENABLE
3915void 3971void
3916ev_idle_start (EV_P_ ev_idle *w) 3972ev_idle_start (EV_P_ ev_idle *w) EV_THROW
3917{ 3973{
3918 if (expect_false (ev_is_active (w))) 3974 if (expect_false (ev_is_active (w)))
3919 return; 3975 return;
3920 3976
3921 pri_adjust (EV_A_ (W)w); 3977 pri_adjust (EV_A_ (W)w);
… …
3934 3990
3935 EV_FREQUENT_CHECK; 3991 EV_FREQUENT_CHECK;
3936} 3992}
3937 3993
3938void 3994void
3939ev_idle_stop (EV_P_ ev_idle *w) 3995ev_idle_stop (EV_P_ ev_idle *w) EV_THROW
3940{ 3996{
3941 clear_pending (EV_A_ (W)w); 3997 clear_pending (EV_A_ (W)w);
3942 if (expect_false (!ev_is_active (w))) 3998 if (expect_false (!ev_is_active (w)))
3943 return; 3999 return;
3944 4000
… …
3958} 4014}
3959#endif 4015#endif
3960 4016
3961#if EV_PREPARE_ENABLE 4017#if EV_PREPARE_ENABLE
3962void 4018void
3963ev_prepare_start (EV_P_ ev_prepare *w) 4019ev_prepare_start (EV_P_ ev_prepare *w) EV_THROW
3964{ 4020{
3965 if (expect_false (ev_is_active (w))) 4021 if (expect_false (ev_is_active (w)))
3966 return; 4022 return;
3967 4023
3968 EV_FREQUENT_CHECK; 4024 EV_FREQUENT_CHECK;
… …
3973 4029
3974 EV_FREQUENT_CHECK; 4030 EV_FREQUENT_CHECK;
3975} 4031}
3976 4032
3977void 4033void
3978ev_prepare_stop (EV_P_ ev_prepare *w) 4034ev_prepare_stop (EV_P_ ev_prepare *w) EV_THROW
3979{ 4035{
3980 clear_pending (EV_A_ (W)w); 4036 clear_pending (EV_A_ (W)w);
3981 if (expect_false (!ev_is_active (w))) 4037 if (expect_false (!ev_is_active (w)))
3982 return; 4038 return;
3983 4039
… …
3996} 4052}
3997#endif 4053#endif
3998 4054
3999#if EV_CHECK_ENABLE 4055#if EV_CHECK_ENABLE
4000void 4056void
4001ev_check_start (EV_P_ ev_check *w) 4057ev_check_start (EV_P_ ev_check *w) EV_THROW
4002{ 4058{
4003 if (expect_false (ev_is_active (w))) 4059 if (expect_false (ev_is_active (w)))
4004 return; 4060 return;
4005 4061
4006 EV_FREQUENT_CHECK; 4062 EV_FREQUENT_CHECK;
… …
4011 4067
4012 EV_FREQUENT_CHECK; 4068 EV_FREQUENT_CHECK;
4013} 4069}
4014 4070
4015void 4071void
4016ev_check_stop (EV_P_ ev_check *w) 4072ev_check_stop (EV_P_ ev_check *w) EV_THROW
4017{ 4073{
4018 clear_pending (EV_A_ (W)w); 4074 clear_pending (EV_A_ (W)w);
4019 if (expect_false (!ev_is_active (w))) 4075 if (expect_false (!ev_is_active (w)))
4020 return; 4076 return;
4021 4077
… …
4034} 4090}
4035#endif 4091#endif
4036 4092
4037#if EV_EMBED_ENABLE 4093#if EV_EMBED_ENABLE
4038void noinline 4094void noinline
4039ev_embed_sweep (EV_P_ ev_embed *w) 4095ev_embed_sweep (EV_P_ ev_embed *w) EV_THROW
4040{ 4096{
4041 ev_run (w->other, EVRUN_NOWAIT); 4097 ev_run (w->other, EVRUN_NOWAIT);
4042} 4098}
4043 4099
4044static void 4100static void
… …
4092 ev_idle_stop (EV_A_ idle); 4148 ev_idle_stop (EV_A_ idle);
4093} 4149}
4094#endif 4150#endif
4095 4151
4096void 4152void
4097ev_embed_start (EV_P_ ev_embed *w) 4153ev_embed_start (EV_P_ ev_embed *w) EV_THROW
4098{ 4154{
4099 if (expect_false (ev_is_active (w))) 4155 if (expect_false (ev_is_active (w)))
4100 return; 4156 return;
4101 4157
4102 { 4158 {
… …
4123 4179
4124 EV_FREQUENT_CHECK; 4180 EV_FREQUENT_CHECK;
4125} 4181}
4126 4182
4127void 4183void
4128ev_embed_stop (EV_P_ ev_embed *w) 4184ev_embed_stop (EV_P_ ev_embed *w) EV_THROW
4129{ 4185{
4130 clear_pending (EV_A_ (W)w); 4186 clear_pending (EV_A_ (W)w);
4131 if (expect_false (!ev_is_active (w))) 4187 if (expect_false (!ev_is_active (w)))
4132 return; 4188 return;
4133 4189
… …
4143} 4199}
4144#endif 4200#endif
4145 4201
4146#if EV_FORK_ENABLE 4202#if EV_FORK_ENABLE
4147void 4203void
4148ev_fork_start (EV_P_ ev_fork *w) 4204ev_fork_start (EV_P_ ev_fork *w) EV_THROW
4149{ 4205{
4150 if (expect_false (ev_is_active (w))) 4206 if (expect_false (ev_is_active (w)))
4151 return; 4207 return;
4152 4208
4153 EV_FREQUENT_CHECK; 4209 EV_FREQUENT_CHECK;
… …
4158 4214
4159 EV_FREQUENT_CHECK; 4215 EV_FREQUENT_CHECK;
4160} 4216}
4161 4217
4162void 4218void
4163ev_fork_stop (EV_P_ ev_fork *w) 4219ev_fork_stop (EV_P_ ev_fork *w) EV_THROW
4164{ 4220{
4165 clear_pending (EV_A_ (W)w); 4221 clear_pending (EV_A_ (W)w);
4166 if (expect_false (!ev_is_active (w))) 4222 if (expect_false (!ev_is_active (w)))
4167 return; 4223 return;
4168 4224
… …
4181} 4237}
4182#endif 4238#endif
4183 4239
4184#if EV_CLEANUP_ENABLE 4240#if EV_CLEANUP_ENABLE
4185void 4241void
4186ev_cleanup_start (EV_P_ ev_cleanup *w) 4242ev_cleanup_start (EV_P_ ev_cleanup *w) EV_THROW
4187{ 4243{
4188 if (expect_false (ev_is_active (w))) 4244 if (expect_false (ev_is_active (w)))
4189 return; 4245 return;
4190 4246
4191 EV_FREQUENT_CHECK; 4247 EV_FREQUENT_CHECK;
… …
4198 ev_unref (EV_A); 4254 ev_unref (EV_A);
4199 EV_FREQUENT_CHECK; 4255 EV_FREQUENT_CHECK;
4200} 4256}
4201 4257
4202void 4258void
4203ev_cleanup_stop (EV_P_ ev_cleanup *w) 4259ev_cleanup_stop (EV_P_ ev_cleanup *w) EV_THROW
4204{ 4260{
4205 clear_pending (EV_A_ (W)w); 4261 clear_pending (EV_A_ (W)w);
4206 if (expect_false (!ev_is_active (w))) 4262 if (expect_false (!ev_is_active (w)))
4207 return; 4263 return;
4208 4264
… …
4222} 4278}
4223#endif 4279#endif
4224 4280
4225#if EV_ASYNC_ENABLE 4281#if EV_ASYNC_ENABLE
4226void 4282void
4227ev_async_start (EV_P_ ev_async *w) 4283ev_async_start (EV_P_ ev_async *w) EV_THROW
4228{ 4284{
4229 if (expect_false (ev_is_active (w))) 4285 if (expect_false (ev_is_active (w)))
4230 return; 4286 return;
4231 4287
4232 w->sent = 0; 4288 w->sent = 0;
… …
4241 4297
4242 EV_FREQUENT_CHECK; 4298 EV_FREQUENT_CHECK;
4243} 4299}
4244 4300
4245void 4301void
4246ev_async_stop (EV_P_ ev_async *w) 4302ev_async_stop (EV_P_ ev_async *w) EV_THROW
4247{ 4303{
4248 clear_pending (EV_A_ (W)w); 4304 clear_pending (EV_A_ (W)w);
4249 if (expect_false (!ev_is_active (w))) 4305 if (expect_false (!ev_is_active (w)))
4250 return; 4306 return;
4251 4307
… …
4262 4318
4263 EV_FREQUENT_CHECK; 4319 EV_FREQUENT_CHECK;
4264} 4320}
4265 4321
4266void 4322void
4267ev_async_send (EV_P_ ev_async *w) 4323ev_async_send (EV_P_ ev_async *w) EV_THROW
4268{ 4324{
4269 w->sent = 1; 4325 w->sent = 1;
4270 evpipe_write (EV_A_ &async_pending); 4326 evpipe_write (EV_A_ &async_pending);
4271} 4327}
4272#endif 4328#endif
… …
4309 4365
4310 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io)); 4366 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
4311} 4367}
4312 4368
4313void 4369void
4314ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 4370ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) EV_THROW
4315{ 4371{
4316 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 4372 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
4317 4373
4318 if (expect_false (!once)) 4374 if (expect_false (!once))
4319 { 4375 {
… …
4341 4397
4342/*****************************************************************************/ 4398/*****************************************************************************/
4343 4399
4344#if EV_WALK_ENABLE 4400#if EV_WALK_ENABLE
4345void ecb_cold 4401void ecb_cold
4346ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 4402ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) EV_THROW
4347{ 4403{
4348 int i, j; 4404 int i, j;
4349 ev_watcher_list *wl, *wn; 4405 ev_watcher_list *wl, *wn;
4350 4406
4351 if (types & (EV_IO | EV_EMBED)) 4407 if (types & (EV_IO | EV_EMBED))

Diff Legend

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