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

Comparing libev/ev.c (file contents):
Revision 1.330 by root, Tue Mar 9 08:46:17 2010 UTC vs.
Revision 1.353 by root, Thu Oct 21 12:32:47 2010 UTC

… …
77# ifndef EV_USE_REALTIME 77# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 78# define EV_USE_REALTIME 0
79# endif 79# endif
80# endif 80# endif
81 81
82# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 83# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 84# define EV_USE_NANOSLEEP EV_FEATURE_OS
85# endif
85# else 86# else
87# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 88# define EV_USE_NANOSLEEP 0
89# endif
90
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# ifndef EV_USE_SELECT
93# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 94# endif
95# else
96# undef EV_USE_SELECT
97# define EV_USE_SELECT 0
88# endif 98# endif
89 99
100# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 101# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 102# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 103# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 104# else
105# undef EV_USE_POLL
102# define EV_USE_POLL 0 106# define EV_USE_POLL 0
103# endif
104# endif 107# endif
105 108
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 109# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 110# ifndef EV_USE_EPOLL
109# else 111# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 112# endif
113# else
114# undef EV_USE_EPOLL
115# define EV_USE_EPOLL 0
112# endif 116# endif
113 117
114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H 118# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 119# ifndef EV_USE_KQUEUE
117# else 120# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
118# define EV_USE_KQUEUE 0
119# endif 121# endif
122# else
123# undef EV_USE_KQUEUE
124# define EV_USE_KQUEUE 0
120# endif 125# endif
121 126
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 127# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 128# ifndef EV_USE_PORT
125# else 129# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 130# endif
131# else
132# undef EV_USE_PORT
133# define EV_USE_PORT 0
128# endif 134# endif
129 135
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 136# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 137# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 138# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 139# endif
140# else
141# undef EV_USE_INOTIFY
142# define EV_USE_INOTIFY 0
136# endif 143# endif
137 144
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 145# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 146# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 147# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 148# endif
149# else
150# undef EV_USE_SIGNALFD
151# define EV_USE_SIGNALFD 0
144# endif 152# endif
145 153
154# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 155# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 156# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 157# endif
158# else
159# undef EV_USE_EVENTFD
160# define EV_USE_EVENTFD 0
152# endif 161# endif
153 162
154#endif 163#endif
155 164
156#include <math.h> 165#include <math.h>
… …
184# define WIN32_LEAN_AND_MEAN 193# define WIN32_LEAN_AND_MEAN
185# include <windows.h> 194# include <windows.h>
186# ifndef EV_SELECT_IS_WINSOCKET 195# ifndef EV_SELECT_IS_WINSOCKET
187# define EV_SELECT_IS_WINSOCKET 1 196# define EV_SELECT_IS_WINSOCKET 1
188# endif 197# endif
198# undef EV_AVOID_STDIO
189#endif 199#endif
200
201/* OS X, in its infinite idiocy, actually HARDCODES
202 * a limit of 1024 into their select. Where people have brains,
203 * OS X engineers apparently have a vacuum. Or maybe they were
204 * ordered to have a vacuum, or they do anything for money.
205 * This might help. Or not.
206 */
207#define _DARWIN_UNLIMITED_SELECT 1
190 208
191/* this block tries to deduce configuration from header-defined symbols and defaults */ 209/* this block tries to deduce configuration from header-defined symbols and defaults */
192 210
193/* try to deduce the maximum number of signals on this platform */ 211/* try to deduce the maximum number of signals on this platform */
194#if defined (EV_NSIG) 212#if defined (EV_NSIG)
… …
206#elif defined (MAXSIG) 224#elif defined (MAXSIG)
207# define EV_NSIG (MAXSIG+1) 225# define EV_NSIG (MAXSIG+1)
208#elif defined (MAX_SIG) 226#elif defined (MAX_SIG)
209# define EV_NSIG (MAX_SIG+1) 227# define EV_NSIG (MAX_SIG+1)
210#elif defined (SIGARRAYSIZE) 228#elif defined (SIGARRAYSIZE)
211# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 229# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
212#elif defined (_sys_nsig) 230#elif defined (_sys_nsig)
213# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 231# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
214#else 232#else
215# error "unable to find value for NSIG, please report" 233# error "unable to find value for NSIG, please report"
216/* to make it compile regardless, just remove the above line */ 234/* to make it compile regardless, just remove the above line, */
235/* but consider reporting it, too! :) */
217# define EV_NSIG 65 236# define EV_NSIG 65
218#endif 237#endif
219 238
220#ifndef EV_USE_CLOCK_SYSCALL 239#ifndef EV_USE_CLOCK_SYSCALL
221# if __linux && __GLIBC__ >= 2 240# if __linux && __GLIBC__ >= 2
222# define EV_USE_CLOCK_SYSCALL 1 241# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
223# else 242# else
224# define EV_USE_CLOCK_SYSCALL 0 243# define EV_USE_CLOCK_SYSCALL 0
225# endif 244# endif
226#endif 245#endif
227 246
228#ifndef EV_USE_MONOTONIC 247#ifndef EV_USE_MONOTONIC
229# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 248# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
230# define EV_USE_MONOTONIC 1 249# define EV_USE_MONOTONIC EV_FEATURE_OS
231# else 250# else
232# define EV_USE_MONOTONIC 0 251# define EV_USE_MONOTONIC 0
233# endif 252# endif
234#endif 253#endif
235 254
… …
237# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 256# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
238#endif 257#endif
239 258
240#ifndef EV_USE_NANOSLEEP 259#ifndef EV_USE_NANOSLEEP
241# if _POSIX_C_SOURCE >= 199309L 260# if _POSIX_C_SOURCE >= 199309L
242# define EV_USE_NANOSLEEP 1 261# define EV_USE_NANOSLEEP EV_FEATURE_OS
243# else 262# else
244# define EV_USE_NANOSLEEP 0 263# define EV_USE_NANOSLEEP 0
245# endif 264# endif
246#endif 265#endif
247 266
248#ifndef EV_USE_SELECT 267#ifndef EV_USE_SELECT
249# define EV_USE_SELECT 1 268# define EV_USE_SELECT EV_FEATURE_BACKENDS
250#endif 269#endif
251 270
252#ifndef EV_USE_POLL 271#ifndef EV_USE_POLL
253# ifdef _WIN32 272# ifdef _WIN32
254# define EV_USE_POLL 0 273# define EV_USE_POLL 0
255# else 274# else
256# define EV_USE_POLL 1 275# define EV_USE_POLL EV_FEATURE_BACKENDS
257# endif 276# endif
258#endif 277#endif
259 278
260#ifndef EV_USE_EPOLL 279#ifndef EV_USE_EPOLL
261# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
262# define EV_USE_EPOLL 1 281# define EV_USE_EPOLL EV_FEATURE_BACKENDS
263# else 282# else
264# define EV_USE_EPOLL 0 283# define EV_USE_EPOLL 0
265# endif 284# endif
266#endif 285#endif
267 286
… …
273# define EV_USE_PORT 0 292# define EV_USE_PORT 0
274#endif 293#endif
275 294
276#ifndef EV_USE_INOTIFY 295#ifndef EV_USE_INOTIFY
277# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 296# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
278# define EV_USE_INOTIFY 1 297# define EV_USE_INOTIFY EV_FEATURE_OS
279# else 298# else
280# define EV_USE_INOTIFY 0 299# define EV_USE_INOTIFY 0
281# endif 300# endif
282#endif 301#endif
283 302
284#ifndef EV_PID_HASHSIZE 303#ifndef EV_PID_HASHSIZE
285# if EV_MINIMAL 304# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
286# define EV_PID_HASHSIZE 1
287# else
288# define EV_PID_HASHSIZE 16
289# endif
290#endif 305#endif
291 306
292#ifndef EV_INOTIFY_HASHSIZE 307#ifndef EV_INOTIFY_HASHSIZE
293# if EV_MINIMAL 308# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
294# define EV_INOTIFY_HASHSIZE 1
295# else
296# define EV_INOTIFY_HASHSIZE 16
297# endif
298#endif 309#endif
299 310
300#ifndef EV_USE_EVENTFD 311#ifndef EV_USE_EVENTFD
301# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
302# define EV_USE_EVENTFD 1 313# define EV_USE_EVENTFD EV_FEATURE_OS
303# else 314# else
304# define EV_USE_EVENTFD 0 315# define EV_USE_EVENTFD 0
305# endif 316# endif
306#endif 317#endif
307 318
308#ifndef EV_USE_SIGNALFD 319#ifndef EV_USE_SIGNALFD
309# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 320# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
310# define EV_USE_SIGNALFD 1 321# define EV_USE_SIGNALFD EV_FEATURE_OS
311# else 322# else
312# define EV_USE_SIGNALFD 0 323# define EV_USE_SIGNALFD 0
313# endif 324# endif
314#endif 325#endif
315 326
… …
318# define EV_USE_4HEAP 1 329# define EV_USE_4HEAP 1
319# define EV_HEAP_CACHE_AT 1 330# define EV_HEAP_CACHE_AT 1
320#endif 331#endif
321 332
322#ifndef EV_VERIFY 333#ifndef EV_VERIFY
323# define EV_VERIFY !EV_MINIMAL 334# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
324#endif 335#endif
325 336
326#ifndef EV_USE_4HEAP 337#ifndef EV_USE_4HEAP
327# define EV_USE_4HEAP !EV_MINIMAL 338# define EV_USE_4HEAP EV_FEATURE_DATA
328#endif 339#endif
329 340
330#ifndef EV_HEAP_CACHE_AT 341#ifndef EV_HEAP_CACHE_AT
331# define EV_HEAP_CACHE_AT !EV_MINIMAL 342# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
332#endif 343#endif
333 344
334/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 345/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
335/* which makes programs even slower. might work on other unices, too. */ 346/* which makes programs even slower. might work on other unices, too. */
336#if EV_USE_CLOCK_SYSCALL 347#if EV_USE_CLOCK_SYSCALL
… …
437# ifdef __cplusplus 448# ifdef __cplusplus
438} 449}
439# endif 450# endif
440#endif 451#endif
441 452
442
443/**/ 453/**/
444 454
445#if EV_VERIFY >= 3 455#if EV_VERIFY >= 3
446# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 456# define EV_FREQUENT_CHECK ev_verify (EV_A)
447#else 457#else
448# define EV_FREQUENT_CHECK do { } while (0) 458# define EV_FREQUENT_CHECK do { } while (0)
449#endif 459#endif
450 460
451/* 461/*
… …
459#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 469#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
460 470
461#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 471#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
462#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 472#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
463 473
474#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
475#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
476
464#if __GNUC__ >= 4 477#if __GNUC__ >= 4
465# define expect(expr,value) __builtin_expect ((expr),(value)) 478# define expect(expr,value) __builtin_expect ((expr),(value))
466# define noinline __attribute__ ((noinline)) 479# define noinline __attribute__ ((noinline))
467#else 480#else
468# define expect(expr,value) (expr) 481# define expect(expr,value) (expr)
… …
474 487
475#define expect_false(expr) expect ((expr) != 0, 0) 488#define expect_false(expr) expect ((expr) != 0, 0)
476#define expect_true(expr) expect ((expr) != 0, 1) 489#define expect_true(expr) expect ((expr) != 0, 1)
477#define inline_size static inline 490#define inline_size static inline
478 491
479#if EV_MINIMAL 492#if EV_FEATURE_CODE
493# define inline_speed static inline
494#else
480# define inline_speed static noinline 495# define inline_speed static noinline
481#else
482# define inline_speed static inline
483#endif 496#endif
484 497
485#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 498#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
486 499
487#if EV_MINPRI == EV_MAXPRI 500#if EV_MINPRI == EV_MAXPRI
… …
500#define ev_active(w) ((W)(w))->active 513#define ev_active(w) ((W)(w))->active
501#define ev_at(w) ((WT)(w))->at 514#define ev_at(w) ((WT)(w))->at
502 515
503#if EV_USE_REALTIME 516#if EV_USE_REALTIME
504/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 517/* sig_atomic_t is used to avoid per-thread variables or locking but still */
505/* giving it a reasonably high chance of working on typical architetcures */ 518/* giving it a reasonably high chance of working on typical architectures */
506static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 519static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
507#endif 520#endif
508 521
509#if EV_USE_MONOTONIC 522#if EV_USE_MONOTONIC
510static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 523static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
523#ifdef _WIN32 536#ifdef _WIN32
524# include "ev_win32.c" 537# include "ev_win32.c"
525#endif 538#endif
526 539
527/*****************************************************************************/ 540/*****************************************************************************/
541
542#if EV_AVOID_STDIO
543static void noinline
544ev_printerr (const char *msg)
545{
546 write (STDERR_FILENO, msg, strlen (msg));
547}
548#endif
528 549
529static void (*syserr_cb)(const char *msg); 550static void (*syserr_cb)(const char *msg);
530 551
531void 552void
532ev_set_syserr_cb (void (*cb)(const char *msg)) 553ev_set_syserr_cb (void (*cb)(const char *msg))
… …
543 if (syserr_cb) 564 if (syserr_cb)
544 syserr_cb (msg); 565 syserr_cb (msg);
545 else 566 else
546 { 567 {
547#if EV_AVOID_STDIO 568#if EV_AVOID_STDIO
548 write (STDERR_FILENO, msg, strlen (msg));
549 write (STDERR_FILENO, ": ", 2);
550 msg = strerror (errno); 569 const char *err = strerror (errno);
551 write (STDERR_FILENO, msg, strlen (msg)); 570
552 write (STDERR_FILENO, "\n", 1); 571 ev_printerr (msg);
572 ev_printerr (": ");
573 ev_printerr (err);
574 ev_printerr ("\n");
553#else 575#else
554 perror (msg); 576 perror (msg);
555#endif 577#endif
556 abort (); 578 abort ();
557 } 579 }
558} 580}
559 581
560static void * 582static void *
561ev_realloc_emul (void *ptr, long size) 583ev_realloc_emul (void *ptr, long size)
562{ 584{
585#if __GLIBC__
586 return realloc (ptr, size);
587#else
563 /* some systems, notably openbsd and darwin, fail to properly 588 /* some systems, notably openbsd and darwin, fail to properly
564 * implement realloc (x, 0) (as required by both ansi c-98 and 589 * implement realloc (x, 0) (as required by both ansi c-89 and
565 * the single unix specification, so work around them here. 590 * the single unix specification, so work around them here.
566 */ 591 */
567 592
568 if (size) 593 if (size)
569 return realloc (ptr, size); 594 return realloc (ptr, size);
570 595
571 free (ptr); 596 free (ptr);
572 return 0; 597 return 0;
598#endif
573} 599}
574 600
575static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 601static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
576 602
577void 603void
… …
586 ptr = alloc (ptr, size); 612 ptr = alloc (ptr, size);
587 613
588 if (!ptr && size) 614 if (!ptr && size)
589 { 615 {
590#if EV_AVOID_STDIO 616#if EV_AVOID_STDIO
591 write (STDERR_FILENO, "libev: memory allocation failed, aborting.", 617 ev_printerr ("libev: memory allocation failed, aborting.\n");
592 sizeof ("libev: memory allocation failed, aborting.") - 1);
593#else 618#else
594 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 619 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
595#endif 620#endif
596 abort (); 621 abort ();
597 } 622 }
… …
682 707
683 static int ev_default_loop_ptr; 708 static int ev_default_loop_ptr;
684 709
685#endif 710#endif
686 711
687#if EV_MINIMAL < 2 712#if EV_FEATURE_API
688# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 713# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
689# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 714# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
690# define EV_INVOKE_PENDING invoke_cb (EV_A) 715# define EV_INVOKE_PENDING invoke_cb (EV_A)
691#else 716#else
692# define EV_RELEASE_CB (void)0 717# define EV_RELEASE_CB (void)0
693# define EV_ACQUIRE_CB (void)0 718# define EV_ACQUIRE_CB (void)0
694# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 719# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
695#endif 720#endif
696 721
697#define EVUNLOOP_RECURSE 0x80 722#define EVBREAK_RECURSE 0x80
698 723
699/*****************************************************************************/ 724/*****************************************************************************/
700 725
701#ifndef EV_HAVE_EV_TIME 726#ifndef EV_HAVE_EV_TIME
702ev_tstamp 727ev_tstamp
… …
746 if (delay > 0.) 771 if (delay > 0.)
747 { 772 {
748#if EV_USE_NANOSLEEP 773#if EV_USE_NANOSLEEP
749 struct timespec ts; 774 struct timespec ts;
750 775
751 ts.tv_sec = (time_t)delay; 776 EV_TS_SET (ts, delay);
752 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
753
754 nanosleep (&ts, 0); 777 nanosleep (&ts, 0);
755#elif defined(_WIN32) 778#elif defined(_WIN32)
756 Sleep ((unsigned long)(delay * 1e3)); 779 Sleep ((unsigned long)(delay * 1e3));
757#else 780#else
758 struct timeval tv; 781 struct timeval tv;
759 782
760 tv.tv_sec = (time_t)delay;
761 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
762
763 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 783 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
764 /* something not guaranteed by newer posix versions, but guaranteed */ 784 /* something not guaranteed by newer posix versions, but guaranteed */
765 /* by older ones */ 785 /* by older ones */
786 EV_TV_SET (tv, delay);
766 select (0, 0, 0, 0, &tv); 787 select (0, 0, 0, 0, &tv);
767#endif 788#endif
768 } 789 }
769} 790}
770 791
771/*****************************************************************************/ 792/*****************************************************************************/
772 793
773#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 794#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
774 795
775/* find a suitable new size for the given array, */ 796/* find a suitable new size for the given array, */
776/* hopefully by rounding to a ncie-to-malloc size */ 797/* hopefully by rounding to a nice-to-malloc size */
777inline_size int 798inline_size int
778array_nextsize (int elem, int cur, int cnt) 799array_nextsize (int elem, int cur, int cnt)
779{ 800{
780 int ncur = cur + 1; 801 int ncur = cur + 1;
781 802
… …
877} 898}
878 899
879/*****************************************************************************/ 900/*****************************************************************************/
880 901
881inline_speed void 902inline_speed void
882fd_event_nc (EV_P_ int fd, int revents) 903fd_event_nocheck (EV_P_ int fd, int revents)
883{ 904{
884 ANFD *anfd = anfds + fd; 905 ANFD *anfd = anfds + fd;
885 ev_io *w; 906 ev_io *w;
886 907
887 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 908 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
899fd_event (EV_P_ int fd, int revents) 920fd_event (EV_P_ int fd, int revents)
900{ 921{
901 ANFD *anfd = anfds + fd; 922 ANFD *anfd = anfds + fd;
902 923
903 if (expect_true (!anfd->reify)) 924 if (expect_true (!anfd->reify))
904 fd_event_nc (EV_A_ fd, revents); 925 fd_event_nocheck (EV_A_ fd, revents);
905} 926}
906 927
907void 928void
908ev_feed_fd_event (EV_P_ int fd, int revents) 929ev_feed_fd_event (EV_P_ int fd, int revents)
909{ 930{
910 if (fd >= 0 && fd < anfdmax) 931 if (fd >= 0 && fd < anfdmax)
911 fd_event_nc (EV_A_ fd, revents); 932 fd_event_nocheck (EV_A_ fd, revents);
912} 933}
913 934
914/* make sure the external fd watch events are in-sync */ 935/* make sure the external fd watch events are in-sync */
915/* with the kernel/libev internal state */ 936/* with the kernel/libev internal state */
916inline_size void 937inline_size void
… …
922 { 943 {
923 int fd = fdchanges [i]; 944 int fd = fdchanges [i];
924 ANFD *anfd = anfds + fd; 945 ANFD *anfd = anfds + fd;
925 ev_io *w; 946 ev_io *w;
926 947
927 unsigned char events = 0; 948 unsigned char o_events = anfd->events;
949 unsigned char o_reify = anfd->reify;
928 950
929 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 951 anfd->reify = 0;
930 events |= (unsigned char)w->events;
931 952
932#if EV_SELECT_IS_WINSOCKET 953#if EV_SELECT_IS_WINSOCKET
933 if (events) 954 if (o_reify & EV__IOFDSET)
934 { 955 {
935 unsigned long arg; 956 unsigned long arg;
936 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 957 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
937 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 958 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
938 } 959 }
939#endif 960#endif
940 961
962 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
941 { 963 {
942 unsigned char o_events = anfd->events;
943 unsigned char o_reify = anfd->reify;
944
945 anfd->reify = 0;
946 anfd->events = events; 964 anfd->events = 0;
947 965
948 if (o_events != events || o_reify & EV__IOFDSET) 966 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
967 anfd->events |= (unsigned char)w->events;
968
969 if (o_events != anfd->events)
970 o_reify = EV__IOFDSET; /* actually |= */
971 }
972
973 if (o_reify & EV__IOFDSET)
949 backend_modify (EV_A_ fd, o_events, events); 974 backend_modify (EV_A_ fd, o_events, anfd->events);
950 }
951 } 975 }
952 976
953 fdchangecnt = 0; 977 fdchangecnt = 0;
954} 978}
955 979
… …
979 ev_io_stop (EV_A_ w); 1003 ev_io_stop (EV_A_ w);
980 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1004 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
981 } 1005 }
982} 1006}
983 1007
984/* check whether the given fd is atcually valid, for error recovery */ 1008/* check whether the given fd is actually valid, for error recovery */
985inline_size int 1009inline_size int
986fd_valid (int fd) 1010fd_valid (int fd)
987{ 1011{
988#ifdef _WIN32 1012#ifdef _WIN32
989 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1013 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
… …
1031 anfds [fd].emask = 0; 1055 anfds [fd].emask = 0;
1032 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1056 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1033 } 1057 }
1034} 1058}
1035 1059
1060/* used to prepare libev internal fd's */
1061/* this is not fork-safe */
1062inline_speed void
1063fd_intern (int fd)
1064{
1065#ifdef _WIN32
1066 unsigned long arg = 1;
1067 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1068#else
1069 fcntl (fd, F_SETFD, FD_CLOEXEC);
1070 fcntl (fd, F_SETFL, O_NONBLOCK);
1071#endif
1072}
1073
1036/*****************************************************************************/ 1074/*****************************************************************************/
1037 1075
1038/* 1076/*
1039 * the heap functions want a real array index. array index 0 uis guaranteed to not 1077 * the heap functions want a real array index. array index 0 is guaranteed to not
1040 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1078 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1041 * the branching factor of the d-tree. 1079 * the branching factor of the d-tree.
1042 */ 1080 */
1043 1081
1044/* 1082/*
… …
1192 1230
1193static ANSIG signals [EV_NSIG - 1]; 1231static ANSIG signals [EV_NSIG - 1];
1194 1232
1195/*****************************************************************************/ 1233/*****************************************************************************/
1196 1234
1197/* used to prepare libev internal fd's */ 1235#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1198/* this is not fork-safe */
1199inline_speed void
1200fd_intern (int fd)
1201{
1202#ifdef _WIN32
1203 unsigned long arg = 1;
1204 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1205#else
1206 fcntl (fd, F_SETFD, FD_CLOEXEC);
1207 fcntl (fd, F_SETFL, O_NONBLOCK);
1208#endif
1209}
1210 1236
1211static void noinline 1237static void noinline
1212evpipe_init (EV_P) 1238evpipe_init (EV_P)
1213{ 1239{
1214 if (!ev_is_active (&pipe_w)) 1240 if (!ev_is_active (&pipe_w))
1215 { 1241 {
1216#if EV_USE_EVENTFD 1242# if EV_USE_EVENTFD
1217 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1243 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1218 if (evfd < 0 && errno == EINVAL) 1244 if (evfd < 0 && errno == EINVAL)
1219 evfd = eventfd (0, 0); 1245 evfd = eventfd (0, 0);
1220 1246
1221 if (evfd >= 0) 1247 if (evfd >= 0)
… …
1223 evpipe [0] = -1; 1249 evpipe [0] = -1;
1224 fd_intern (evfd); /* doing it twice doesn't hurt */ 1250 fd_intern (evfd); /* doing it twice doesn't hurt */
1225 ev_io_set (&pipe_w, evfd, EV_READ); 1251 ev_io_set (&pipe_w, evfd, EV_READ);
1226 } 1252 }
1227 else 1253 else
1228#endif 1254# endif
1229 { 1255 {
1230 while (pipe (evpipe)) 1256 while (pipe (evpipe))
1231 ev_syserr ("(libev) error creating signal/async pipe"); 1257 ev_syserr ("(libev) error creating signal/async pipe");
1232 1258
1233 fd_intern (evpipe [0]); 1259 fd_intern (evpipe [0]);
… …
1244evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1270evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1245{ 1271{
1246 if (!*flag) 1272 if (!*flag)
1247 { 1273 {
1248 int old_errno = errno; /* save errno because write might clobber it */ 1274 int old_errno = errno; /* save errno because write might clobber it */
1275 char dummy;
1249 1276
1250 *flag = 1; 1277 *flag = 1;
1251 1278
1252#if EV_USE_EVENTFD 1279#if EV_USE_EVENTFD
1253 if (evfd >= 0) 1280 if (evfd >= 0)
… …
1255 uint64_t counter = 1; 1282 uint64_t counter = 1;
1256 write (evfd, &counter, sizeof (uint64_t)); 1283 write (evfd, &counter, sizeof (uint64_t));
1257 } 1284 }
1258 else 1285 else
1259#endif 1286#endif
1287 /* win32 people keep sending patches that change this write() to send() */
1288 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1289 /* so when you think this write should be a send instead, please find out */
1290 /* where your send() is from - it's definitely not the microsoft send, and */
1291 /* tell me. thank you. */
1260 write (evpipe [1], &old_errno, 1); 1292 write (evpipe [1], &dummy, 1);
1261 1293
1262 errno = old_errno; 1294 errno = old_errno;
1263 } 1295 }
1264} 1296}
1265 1297
… …
1278 } 1310 }
1279 else 1311 else
1280#endif 1312#endif
1281 { 1313 {
1282 char dummy; 1314 char dummy;
1315 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1283 read (evpipe [0], &dummy, 1); 1316 read (evpipe [0], &dummy, 1);
1284 } 1317 }
1285 1318
1286 if (sig_pending) 1319 if (sig_pending)
1287 { 1320 {
… …
1366 break; 1399 break;
1367 } 1400 }
1368} 1401}
1369#endif 1402#endif
1370 1403
1404#endif
1405
1371/*****************************************************************************/ 1406/*****************************************************************************/
1372 1407
1408#if EV_CHILD_ENABLE
1373static WL childs [EV_PID_HASHSIZE]; 1409static WL childs [EV_PID_HASHSIZE];
1374
1375#ifndef _WIN32
1376 1410
1377static ev_signal childev; 1411static ev_signal childev;
1378 1412
1379#ifndef WIFCONTINUED 1413#ifndef WIFCONTINUED
1380# define WIFCONTINUED(status) 0 1414# define WIFCONTINUED(status) 0
… …
1385child_reap (EV_P_ int chain, int pid, int status) 1419child_reap (EV_P_ int chain, int pid, int status)
1386{ 1420{
1387 ev_child *w; 1421 ev_child *w;
1388 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1422 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1389 1423
1390 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1424 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1391 { 1425 {
1392 if ((w->pid == pid || !w->pid) 1426 if ((w->pid == pid || !w->pid)
1393 && (!traced || (w->flags & 1))) 1427 && (!traced || (w->flags & 1)))
1394 { 1428 {
1395 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1429 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1420 /* make sure we are called again until all children have been reaped */ 1454 /* make sure we are called again until all children have been reaped */
1421 /* we need to do it this way so that the callback gets called before we continue */ 1455 /* we need to do it this way so that the callback gets called before we continue */
1422 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1456 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1423 1457
1424 child_reap (EV_A_ pid, pid, status); 1458 child_reap (EV_A_ pid, pid, status);
1425 if (EV_PID_HASHSIZE > 1) 1459 if ((EV_PID_HASHSIZE) > 1)
1426 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1460 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1427} 1461}
1428 1462
1429#endif 1463#endif
1430 1464
… …
1497#ifdef __APPLE__ 1531#ifdef __APPLE__
1498 /* only select works correctly on that "unix-certified" platform */ 1532 /* only select works correctly on that "unix-certified" platform */
1499 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1533 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1500 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1534 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1501#endif 1535#endif
1536#ifdef __FreeBSD__
1537 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1538#endif
1502 1539
1503 return flags; 1540 return flags;
1504} 1541}
1505 1542
1506unsigned int 1543unsigned int
… …
1519ev_backend (EV_P) 1556ev_backend (EV_P)
1520{ 1557{
1521 return backend; 1558 return backend;
1522} 1559}
1523 1560
1524#if EV_MINIMAL < 2 1561#if EV_FEATURE_API
1525unsigned int 1562unsigned int
1526ev_loop_count (EV_P) 1563ev_iteration (EV_P)
1527{ 1564{
1528 return loop_count; 1565 return loop_count;
1529} 1566}
1530 1567
1531unsigned int 1568unsigned int
1532ev_loop_depth (EV_P) 1569ev_depth (EV_P)
1533{ 1570{
1534 return loop_depth; 1571 return loop_depth;
1535} 1572}
1536 1573
1537void 1574void
… …
1609 1646
1610 ev_rt_now = ev_time (); 1647 ev_rt_now = ev_time ();
1611 mn_now = get_clock (); 1648 mn_now = get_clock ();
1612 now_floor = mn_now; 1649 now_floor = mn_now;
1613 rtmn_diff = ev_rt_now - mn_now; 1650 rtmn_diff = ev_rt_now - mn_now;
1614#if EV_MINIMAL < 2 1651#if EV_FEATURE_API
1615 invoke_cb = ev_invoke_pending; 1652 invoke_cb = ev_invoke_pending;
1616#endif 1653#endif
1617 1654
1618 io_blocktime = 0.; 1655 io_blocktime = 0.;
1619 timeout_blocktime = 0.; 1656 timeout_blocktime = 0.;
… …
1649 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1686 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1650#endif 1687#endif
1651 1688
1652 ev_prepare_init (&pending_w, pendingcb); 1689 ev_prepare_init (&pending_w, pendingcb);
1653 1690
1691#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1654 ev_init (&pipe_w, pipecb); 1692 ev_init (&pipe_w, pipecb);
1655 ev_set_priority (&pipe_w, EV_MAXPRI); 1693 ev_set_priority (&pipe_w, EV_MAXPRI);
1694#endif
1656 } 1695 }
1657} 1696}
1658 1697
1659/* free up a loop structure */ 1698/* free up a loop structure */
1660static void noinline 1699static void noinline
… …
1778 { 1817 {
1779 EV_WIN32_CLOSE_FD (evpipe [0]); 1818 EV_WIN32_CLOSE_FD (evpipe [0]);
1780 EV_WIN32_CLOSE_FD (evpipe [1]); 1819 EV_WIN32_CLOSE_FD (evpipe [1]);
1781 } 1820 }
1782 1821
1822#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1783 evpipe_init (EV_A); 1823 evpipe_init (EV_A);
1784 /* now iterate over everything, in case we missed something */ 1824 /* now iterate over everything, in case we missed something */
1785 pipecb (EV_A_ &pipe_w, EV_READ); 1825 pipecb (EV_A_ &pipe_w, EV_READ);
1826#endif
1786 } 1827 }
1787 1828
1788 postfork = 0; 1829 postfork = 0;
1789} 1830}
1790 1831
… …
1852 verify_watcher (EV_A_ ws [cnt]); 1893 verify_watcher (EV_A_ ws [cnt]);
1853 } 1894 }
1854} 1895}
1855#endif 1896#endif
1856 1897
1857#if EV_MINIMAL < 2 1898#if EV_FEATURE_API
1858void 1899void
1859ev_loop_verify (EV_P) 1900ev_verify (EV_P)
1860{ 1901{
1861#if EV_VERIFY 1902#if EV_VERIFY
1862 int i; 1903 int i;
1863 WL w; 1904 WL w;
1864 1905
… …
1903#if EV_ASYNC_ENABLE 1944#if EV_ASYNC_ENABLE
1904 assert (asyncmax >= asynccnt); 1945 assert (asyncmax >= asynccnt);
1905 array_verify (EV_A_ (W *)asyncs, asynccnt); 1946 array_verify (EV_A_ (W *)asyncs, asynccnt);
1906#endif 1947#endif
1907 1948
1949#if EV_PREPARE_ENABLE
1908 assert (preparemax >= preparecnt); 1950 assert (preparemax >= preparecnt);
1909 array_verify (EV_A_ (W *)prepares, preparecnt); 1951 array_verify (EV_A_ (W *)prepares, preparecnt);
1952#endif
1910 1953
1954#if EV_CHECK_ENABLE
1911 assert (checkmax >= checkcnt); 1955 assert (checkmax >= checkcnt);
1912 array_verify (EV_A_ (W *)checks, checkcnt); 1956 array_verify (EV_A_ (W *)checks, checkcnt);
1957#endif
1913 1958
1914# if 0 1959# if 0
1960#if EV_CHILD_ENABLE
1915 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1961 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1916 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1962 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1963#endif
1917# endif 1964# endif
1918#endif 1965#endif
1919} 1966}
1920#endif 1967#endif
1921 1968
… …
1937 1984
1938 loop_init (EV_A_ flags); 1985 loop_init (EV_A_ flags);
1939 1986
1940 if (ev_backend (EV_A)) 1987 if (ev_backend (EV_A))
1941 { 1988 {
1942#ifndef _WIN32 1989#if EV_CHILD_ENABLE
1943 ev_signal_init (&childev, childcb, SIGCHLD); 1990 ev_signal_init (&childev, childcb, SIGCHLD);
1944 ev_set_priority (&childev, EV_MAXPRI); 1991 ev_set_priority (&childev, EV_MAXPRI);
1945 ev_signal_start (EV_A_ &childev); 1992 ev_signal_start (EV_A_ &childev);
1946 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1993 ev_unref (EV_A); /* child watcher should not keep loop alive */
1947#endif 1994#endif
… …
1960 EV_P = ev_default_loop_ptr; 2007 EV_P = ev_default_loop_ptr;
1961#endif 2008#endif
1962 2009
1963 ev_default_loop_ptr = 0; 2010 ev_default_loop_ptr = 0;
1964 2011
1965#ifndef _WIN32 2012#if EV_CHILD_ENABLE
1966 ev_ref (EV_A); /* child watcher */ 2013 ev_ref (EV_A); /* child watcher */
1967 ev_signal_stop (EV_A_ &childev); 2014 ev_signal_stop (EV_A_ &childev);
1968#endif 2015#endif
1969 2016
1970 loop_destroy (EV_A); 2017 loop_destroy (EV_A);
… …
2076 EV_FREQUENT_CHECK; 2123 EV_FREQUENT_CHECK;
2077 feed_reverse (EV_A_ (W)w); 2124 feed_reverse (EV_A_ (W)w);
2078 } 2125 }
2079 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2126 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2080 2127
2081 feed_reverse_done (EV_A_ EV_TIMEOUT); 2128 feed_reverse_done (EV_A_ EV_TIMER);
2082 } 2129 }
2083} 2130}
2084 2131
2085#if EV_PERIODIC_ENABLE 2132#if EV_PERIODIC_ENABLE
2086/* make periodics pending */ 2133/* make periodics pending */
… …
2139 feed_reverse_done (EV_A_ EV_PERIODIC); 2186 feed_reverse_done (EV_A_ EV_PERIODIC);
2140 } 2187 }
2141} 2188}
2142 2189
2143/* simply recalculate all periodics */ 2190/* simply recalculate all periodics */
2144/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2191/* TODO: maybe ensure that at least one event happens when jumping forward? */
2145static void noinline 2192static void noinline
2146periodics_reschedule (EV_P) 2193periodics_reschedule (EV_P)
2147{ 2194{
2148 int i; 2195 int i;
2149 2196
… …
2245 mn_now = ev_rt_now; 2292 mn_now = ev_rt_now;
2246 } 2293 }
2247} 2294}
2248 2295
2249void 2296void
2250ev_loop (EV_P_ int flags) 2297ev_run (EV_P_ int flags)
2251{ 2298{
2252#if EV_MINIMAL < 2 2299#if EV_FEATURE_API
2253 ++loop_depth; 2300 ++loop_depth;
2254#endif 2301#endif
2255 2302
2256 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2303 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2257 2304
2258 loop_done = EVUNLOOP_CANCEL; 2305 loop_done = EVBREAK_CANCEL;
2259 2306
2260 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2307 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2261 2308
2262 do 2309 do
2263 { 2310 {
2264#if EV_VERIFY >= 2 2311#if EV_VERIFY >= 2
2265 ev_loop_verify (EV_A); 2312 ev_verify (EV_A);
2266#endif 2313#endif
2267 2314
2268#ifndef _WIN32 2315#ifndef _WIN32
2269 if (expect_false (curpid)) /* penalise the forking check even more */ 2316 if (expect_false (curpid)) /* penalise the forking check even more */
2270 if (expect_false (getpid () != curpid)) 2317 if (expect_false (getpid () != curpid))
… …
2282 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2329 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2283 EV_INVOKE_PENDING; 2330 EV_INVOKE_PENDING;
2284 } 2331 }
2285#endif 2332#endif
2286 2333
2334#if EV_PREPARE_ENABLE
2287 /* queue prepare watchers (and execute them) */ 2335 /* queue prepare watchers (and execute them) */
2288 if (expect_false (preparecnt)) 2336 if (expect_false (preparecnt))
2289 { 2337 {
2290 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2338 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2291 EV_INVOKE_PENDING; 2339 EV_INVOKE_PENDING;
2292 } 2340 }
2341#endif
2293 2342
2294 if (expect_false (loop_done)) 2343 if (expect_false (loop_done))
2295 break; 2344 break;
2296 2345
2297 /* we might have forked, so reify kernel state if necessary */ 2346 /* we might have forked, so reify kernel state if necessary */
… …
2304 /* calculate blocking time */ 2353 /* calculate blocking time */
2305 { 2354 {
2306 ev_tstamp waittime = 0.; 2355 ev_tstamp waittime = 0.;
2307 ev_tstamp sleeptime = 0.; 2356 ev_tstamp sleeptime = 0.;
2308 2357
2358 /* remember old timestamp for io_blocktime calculation */
2359 ev_tstamp prev_mn_now = mn_now;
2360
2361 /* update time to cancel out callback processing overhead */
2362 time_update (EV_A_ 1e100);
2363
2309 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2364 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2310 { 2365 {
2311 /* remember old timestamp for io_blocktime calculation */
2312 ev_tstamp prev_mn_now = mn_now;
2313
2314 /* update time to cancel out callback processing overhead */
2315 time_update (EV_A_ 1e100);
2316
2317 waittime = MAX_BLOCKTIME; 2366 waittime = MAX_BLOCKTIME;
2318 2367
2319 if (timercnt) 2368 if (timercnt)
2320 { 2369 {
2321 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2370 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2348 waittime -= sleeptime; 2397 waittime -= sleeptime;
2349 } 2398 }
2350 } 2399 }
2351 } 2400 }
2352 2401
2353#if EV_MINIMAL < 2 2402#if EV_FEATURE_API
2354 ++loop_count; 2403 ++loop_count;
2355#endif 2404#endif
2356 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2405 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2357 backend_poll (EV_A_ waittime); 2406 backend_poll (EV_A_ waittime);
2358 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2407 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2359 2408
2360 /* update ev_rt_now, do magic */ 2409 /* update ev_rt_now, do magic */
2361 time_update (EV_A_ waittime + sleeptime); 2410 time_update (EV_A_ waittime + sleeptime);
2362 } 2411 }
2363 2412
… …
2370#if EV_IDLE_ENABLE 2419#if EV_IDLE_ENABLE
2371 /* queue idle watchers unless other events are pending */ 2420 /* queue idle watchers unless other events are pending */
2372 idle_reify (EV_A); 2421 idle_reify (EV_A);
2373#endif 2422#endif
2374 2423
2424#if EV_CHECK_ENABLE
2375 /* queue check watchers, to be executed first */ 2425 /* queue check watchers, to be executed first */
2376 if (expect_false (checkcnt)) 2426 if (expect_false (checkcnt))
2377 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2427 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2428#endif
2378 2429
2379 EV_INVOKE_PENDING; 2430 EV_INVOKE_PENDING;
2380 } 2431 }
2381 while (expect_true ( 2432 while (expect_true (
2382 activecnt 2433 activecnt
2383 && !loop_done 2434 && !loop_done
2384 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2435 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2385 )); 2436 ));
2386 2437
2387 if (loop_done == EVUNLOOP_ONE) 2438 if (loop_done == EVBREAK_ONE)
2388 loop_done = EVUNLOOP_CANCEL; 2439 loop_done = EVBREAK_CANCEL;
2389 2440
2390#if EV_MINIMAL < 2 2441#if EV_FEATURE_API
2391 --loop_depth; 2442 --loop_depth;
2392#endif 2443#endif
2393} 2444}
2394 2445
2395void 2446void
2396ev_unloop (EV_P_ int how) 2447ev_break (EV_P_ int how)
2397{ 2448{
2398 loop_done = how; 2449 loop_done = how;
2399} 2450}
2400 2451
2401void 2452void
… …
2549 EV_FREQUENT_CHECK; 2600 EV_FREQUENT_CHECK;
2550 2601
2551 wlist_del (&anfds[w->fd].head, (WL)w); 2602 wlist_del (&anfds[w->fd].head, (WL)w);
2552 ev_stop (EV_A_ (W)w); 2603 ev_stop (EV_A_ (W)w);
2553 2604
2554 fd_change (EV_A_ w->fd, 1); 2605 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2555 2606
2556 EV_FREQUENT_CHECK; 2607 EV_FREQUENT_CHECK;
2557} 2608}
2558 2609
2559void noinline 2610void noinline
… …
2712 2763
2713#ifndef SA_RESTART 2764#ifndef SA_RESTART
2714# define SA_RESTART 0 2765# define SA_RESTART 0
2715#endif 2766#endif
2716 2767
2768#if EV_SIGNAL_ENABLE
2769
2717void noinline 2770void noinline
2718ev_signal_start (EV_P_ ev_signal *w) 2771ev_signal_start (EV_P_ ev_signal *w)
2719{ 2772{
2720 if (expect_false (ev_is_active (w))) 2773 if (expect_false (ev_is_active (w)))
2721 return; 2774 return;
… …
2827 } 2880 }
2828 2881
2829 EV_FREQUENT_CHECK; 2882 EV_FREQUENT_CHECK;
2830} 2883}
2831 2884
2885#endif
2886
2887#if EV_CHILD_ENABLE
2888
2832void 2889void
2833ev_child_start (EV_P_ ev_child *w) 2890ev_child_start (EV_P_ ev_child *w)
2834{ 2891{
2835#if EV_MULTIPLICITY 2892#if EV_MULTIPLICITY
2836 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2893 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2839 return; 2896 return;
2840 2897
2841 EV_FREQUENT_CHECK; 2898 EV_FREQUENT_CHECK;
2842 2899
2843 ev_start (EV_A_ (W)w, 1); 2900 ev_start (EV_A_ (W)w, 1);
2844 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2901 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2845 2902
2846 EV_FREQUENT_CHECK; 2903 EV_FREQUENT_CHECK;
2847} 2904}
2848 2905
2849void 2906void
… …
2853 if (expect_false (!ev_is_active (w))) 2910 if (expect_false (!ev_is_active (w)))
2854 return; 2911 return;
2855 2912
2856 EV_FREQUENT_CHECK; 2913 EV_FREQUENT_CHECK;
2857 2914
2858 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2915 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2859 ev_stop (EV_A_ (W)w); 2916 ev_stop (EV_A_ (W)w);
2860 2917
2861 EV_FREQUENT_CHECK; 2918 EV_FREQUENT_CHECK;
2862} 2919}
2920
2921#endif
2863 2922
2864#if EV_STAT_ENABLE 2923#if EV_STAT_ENABLE
2865 2924
2866# ifdef _WIN32 2925# ifdef _WIN32
2867# undef lstat 2926# undef lstat
… …
2934 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2993 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2935 } 2994 }
2936 } 2995 }
2937 2996
2938 if (w->wd >= 0) 2997 if (w->wd >= 0)
2939 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2998 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2940 2999
2941 /* now re-arm timer, if required */ 3000 /* now re-arm timer, if required */
2942 if (ev_is_active (&w->timer)) ev_ref (EV_A); 3001 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2943 ev_timer_again (EV_A_ &w->timer); 3002 ev_timer_again (EV_A_ &w->timer);
2944 if (ev_is_active (&w->timer)) ev_unref (EV_A); 3003 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2952 3011
2953 if (wd < 0) 3012 if (wd < 0)
2954 return; 3013 return;
2955 3014
2956 w->wd = -2; 3015 w->wd = -2;
2957 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3016 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2958 wlist_del (&fs_hash [slot].head, (WL)w); 3017 wlist_del (&fs_hash [slot].head, (WL)w);
2959 3018
2960 /* remove this watcher, if others are watching it, they will rearm */ 3019 /* remove this watcher, if others are watching it, they will rearm */
2961 inotify_rm_watch (fs_fd, wd); 3020 inotify_rm_watch (fs_fd, wd);
2962} 3021}
… …
2964static void noinline 3023static void noinline
2965infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3024infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2966{ 3025{
2967 if (slot < 0) 3026 if (slot < 0)
2968 /* overflow, need to check for all hash slots */ 3027 /* overflow, need to check for all hash slots */
2969 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3028 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2970 infy_wd (EV_A_ slot, wd, ev); 3029 infy_wd (EV_A_ slot, wd, ev);
2971 else 3030 else
2972 { 3031 {
2973 WL w_; 3032 WL w_;
2974 3033
2975 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3034 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2976 { 3035 {
2977 ev_stat *w = (ev_stat *)w_; 3036 ev_stat *w = (ev_stat *)w_;
2978 w_ = w_->next; /* lets us remove this watcher and all before it */ 3037 w_ = w_->next; /* lets us remove this watcher and all before it */
2979 3038
2980 if (w->wd == wd || wd == -1) 3039 if (w->wd == wd || wd == -1)
2981 { 3040 {
2982 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3041 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2983 { 3042 {
2984 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3043 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2985 w->wd = -1; 3044 w->wd = -1;
2986 infy_add (EV_A_ w); /* re-add, no matter what */ 3045 infy_add (EV_A_ w); /* re-add, no matter what */
2987 } 3046 }
2988 3047
2989 stat_timer_cb (EV_A_ &w->timer, 0); 3048 stat_timer_cb (EV_A_ &w->timer, 0);
… …
3103 ev_io_set (&fs_w, fs_fd, EV_READ); 3162 ev_io_set (&fs_w, fs_fd, EV_READ);
3104 ev_io_start (EV_A_ &fs_w); 3163 ev_io_start (EV_A_ &fs_w);
3105 ev_unref (EV_A); 3164 ev_unref (EV_A);
3106 } 3165 }
3107 3166
3108 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3167 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3109 { 3168 {
3110 WL w_ = fs_hash [slot].head; 3169 WL w_ = fs_hash [slot].head;
3111 fs_hash [slot].head = 0; 3170 fs_hash [slot].head = 0;
3112 3171
3113 while (w_) 3172 while (w_)
… …
3288 3347
3289 EV_FREQUENT_CHECK; 3348 EV_FREQUENT_CHECK;
3290} 3349}
3291#endif 3350#endif
3292 3351
3352#if EV_PREPARE_ENABLE
3293void 3353void
3294ev_prepare_start (EV_P_ ev_prepare *w) 3354ev_prepare_start (EV_P_ ev_prepare *w)
3295{ 3355{
3296 if (expect_false (ev_is_active (w))) 3356 if (expect_false (ev_is_active (w)))
3297 return; 3357 return;
… …
3323 3383
3324 ev_stop (EV_A_ (W)w); 3384 ev_stop (EV_A_ (W)w);
3325 3385
3326 EV_FREQUENT_CHECK; 3386 EV_FREQUENT_CHECK;
3327} 3387}
3388#endif
3328 3389
3390#if EV_CHECK_ENABLE
3329void 3391void
3330ev_check_start (EV_P_ ev_check *w) 3392ev_check_start (EV_P_ ev_check *w)
3331{ 3393{
3332 if (expect_false (ev_is_active (w))) 3394 if (expect_false (ev_is_active (w)))
3333 return; 3395 return;
… …
3359 3421
3360 ev_stop (EV_A_ (W)w); 3422 ev_stop (EV_A_ (W)w);
3361 3423
3362 EV_FREQUENT_CHECK; 3424 EV_FREQUENT_CHECK;
3363} 3425}
3426#endif
3364 3427
3365#if EV_EMBED_ENABLE 3428#if EV_EMBED_ENABLE
3366void noinline 3429void noinline
3367ev_embed_sweep (EV_P_ ev_embed *w) 3430ev_embed_sweep (EV_P_ ev_embed *w)
3368{ 3431{
3369 ev_loop (w->other, EVLOOP_NONBLOCK); 3432 ev_run (w->other, EVRUN_NOWAIT);
3370} 3433}
3371 3434
3372static void 3435static void
3373embed_io_cb (EV_P_ ev_io *io, int revents) 3436embed_io_cb (EV_P_ ev_io *io, int revents)
3374{ 3437{
3375 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3438 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3376 3439
3377 if (ev_cb (w)) 3440 if (ev_cb (w))
3378 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3441 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3379 else 3442 else
3380 ev_loop (w->other, EVLOOP_NONBLOCK); 3443 ev_run (w->other, EVRUN_NOWAIT);
3381} 3444}
3382 3445
3383static void 3446static void
3384embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3447embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3385{ 3448{
… …
3389 EV_P = w->other; 3452 EV_P = w->other;
3390 3453
3391 while (fdchangecnt) 3454 while (fdchangecnt)
3392 { 3455 {
3393 fd_reify (EV_A); 3456 fd_reify (EV_A);
3394 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3457 ev_run (EV_A_ EVRUN_NOWAIT);
3395 } 3458 }
3396 } 3459 }
3397} 3460}
3398 3461
3399static void 3462static void
… …
3405 3468
3406 { 3469 {
3407 EV_P = w->other; 3470 EV_P = w->other;
3408 3471
3409 ev_loop_fork (EV_A); 3472 ev_loop_fork (EV_A);
3410 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3473 ev_run (EV_A_ EVRUN_NOWAIT);
3411 } 3474 }
3412 3475
3413 ev_embed_start (EV_A_ w); 3476 ev_embed_start (EV_A_ w);
3414} 3477}
3415 3478
… …
3514ev_async_start (EV_P_ ev_async *w) 3577ev_async_start (EV_P_ ev_async *w)
3515{ 3578{
3516 if (expect_false (ev_is_active (w))) 3579 if (expect_false (ev_is_active (w)))
3517 return; 3580 return;
3518 3581
3582 w->sent = 0;
3583
3519 evpipe_init (EV_A); 3584 evpipe_init (EV_A);
3520 3585
3521 EV_FREQUENT_CHECK; 3586 EV_FREQUENT_CHECK;
3522 3587
3523 ev_start (EV_A_ (W)w, ++asynccnt); 3588 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3600{ 3665{
3601 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3666 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3602 3667
3603 if (expect_false (!once)) 3668 if (expect_false (!once))
3604 { 3669 {
3605 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3670 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3606 return; 3671 return;
3607 } 3672 }
3608 3673
3609 once->cb = cb; 3674 once->cb = cb;
3610 once->arg = arg; 3675 once->arg = arg;
… …
3697 if (types & EV_ASYNC) 3762 if (types & EV_ASYNC)
3698 for (i = asynccnt; i--; ) 3763 for (i = asynccnt; i--; )
3699 cb (EV_A_ EV_ASYNC, asyncs [i]); 3764 cb (EV_A_ EV_ASYNC, asyncs [i]);
3700#endif 3765#endif
3701 3766
3767#if EV_PREPARE_ENABLE
3702 if (types & EV_PREPARE) 3768 if (types & EV_PREPARE)
3703 for (i = preparecnt; i--; ) 3769 for (i = preparecnt; i--; )
3704#if EV_EMBED_ENABLE 3770# if EV_EMBED_ENABLE
3705 if (ev_cb (prepares [i]) != embed_prepare_cb) 3771 if (ev_cb (prepares [i]) != embed_prepare_cb)
3706#endif 3772# endif
3707 cb (EV_A_ EV_PREPARE, prepares [i]); 3773 cb (EV_A_ EV_PREPARE, prepares [i]);
3774#endif
3708 3775
3776#if EV_CHECK_ENABLE
3709 if (types & EV_CHECK) 3777 if (types & EV_CHECK)
3710 for (i = checkcnt; i--; ) 3778 for (i = checkcnt; i--; )
3711 cb (EV_A_ EV_CHECK, checks [i]); 3779 cb (EV_A_ EV_CHECK, checks [i]);
3780#endif
3712 3781
3782#if EV_SIGNAL_ENABLE
3713 if (types & EV_SIGNAL) 3783 if (types & EV_SIGNAL)
3714 for (i = 0; i < EV_NSIG - 1; ++i) 3784 for (i = 0; i < EV_NSIG - 1; ++i)
3715 for (wl = signals [i].head; wl; ) 3785 for (wl = signals [i].head; wl; )
3716 { 3786 {
3717 wn = wl->next; 3787 wn = wl->next;
3718 cb (EV_A_ EV_SIGNAL, wl); 3788 cb (EV_A_ EV_SIGNAL, wl);
3719 wl = wn; 3789 wl = wn;
3720 } 3790 }
3791#endif
3721 3792
3793#if EV_CHILD_ENABLE
3722 if (types & EV_CHILD) 3794 if (types & EV_CHILD)
3723 for (i = EV_PID_HASHSIZE; i--; ) 3795 for (i = (EV_PID_HASHSIZE); i--; )
3724 for (wl = childs [i]; wl; ) 3796 for (wl = childs [i]; wl; )
3725 { 3797 {
3726 wn = wl->next; 3798 wn = wl->next;
3727 cb (EV_A_ EV_CHILD, wl); 3799 cb (EV_A_ EV_CHILD, wl);
3728 wl = wn; 3800 wl = wn;
3729 } 3801 }
3802#endif
3730/* EV_STAT 0x00001000 /* stat data changed */ 3803/* EV_STAT 0x00001000 /* stat data changed */
3731/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3804/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3732} 3805}
3733#endif 3806#endif
3734 3807

Diff Legend

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