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

Comparing libev/ev.c (file contents):
Revision 1.326 by root, Tue Jan 26 04:19:37 2010 UTC vs.
Revision 1.352 by root, Thu Oct 21 02:33:08 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
… …
403# endif 414# endif
404# endif 415# endif
405# ifdef __cplusplus 416# ifdef __cplusplus
406extern "C" { 417extern "C" {
407# endif 418# endif
408int eventfd (unsigned int initval, int flags); 419int (eventfd) (unsigned int initval, int flags);
409# ifdef __cplusplus 420# ifdef __cplusplus
410} 421}
411# endif 422# endif
412#endif 423#endif
413 424
… …
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))
… …
542 563
543 if (syserr_cb) 564 if (syserr_cb)
544 syserr_cb (msg); 565 syserr_cb (msg);
545 else 566 else
546 { 567 {
568#if EV_AVOID_STDIO
569 const char *err = strerror (errno);
570
571 ev_printerr (msg);
572 ev_printerr (": ");
573 ev_printerr (err);
574 ev_printerr ("\n");
575#else
547 perror (msg); 576 perror (msg);
577#endif
548 abort (); 578 abort ();
549 } 579 }
550} 580}
551 581
552static void * 582static void *
553ev_realloc_emul (void *ptr, long size) 583ev_realloc_emul (void *ptr, long size)
554{ 584{
585#if __GLIBC__
586 return realloc (ptr, size);
587#else
555 /* some systems, notably openbsd and darwin, fail to properly 588 /* some systems, notably openbsd and darwin, fail to properly
556 * 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
557 * the single unix specification, so work around them here. 590 * the single unix specification, so work around them here.
558 */ 591 */
559 592
560 if (size) 593 if (size)
561 return realloc (ptr, size); 594 return realloc (ptr, size);
562 595
563 free (ptr); 596 free (ptr);
564 return 0; 597 return 0;
598#endif
565} 599}
566 600
567static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 601static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
568 602
569void 603void
… …
577{ 611{
578 ptr = alloc (ptr, size); 612 ptr = alloc (ptr, size);
579 613
580 if (!ptr && size) 614 if (!ptr && size)
581 { 615 {
616#if EV_AVOID_STDIO
617 ev_printerr ("libev: memory allocation failed, aborting.\n");
618#else
582 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 619 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
620#endif
583 abort (); 621 abort ();
584 } 622 }
585 623
586 return ptr; 624 return ptr;
587} 625}
… …
669 707
670 static int ev_default_loop_ptr; 708 static int ev_default_loop_ptr;
671 709
672#endif 710#endif
673 711
674#if EV_MINIMAL < 2 712#if EV_FEATURE_API
675# 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)
676# 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)
677# define EV_INVOKE_PENDING invoke_cb (EV_A) 715# define EV_INVOKE_PENDING invoke_cb (EV_A)
678#else 716#else
679# define EV_RELEASE_CB (void)0 717# define EV_RELEASE_CB (void)0
… …
733 if (delay > 0.) 771 if (delay > 0.)
734 { 772 {
735#if EV_USE_NANOSLEEP 773#if EV_USE_NANOSLEEP
736 struct timespec ts; 774 struct timespec ts;
737 775
738 ts.tv_sec = (time_t)delay; 776 EV_TS_SET (ts, delay);
739 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
740
741 nanosleep (&ts, 0); 777 nanosleep (&ts, 0);
742#elif defined(_WIN32) 778#elif defined(_WIN32)
743 Sleep ((unsigned long)(delay * 1e3)); 779 Sleep ((unsigned long)(delay * 1e3));
744#else 780#else
745 struct timeval tv; 781 struct timeval tv;
746 782
747 tv.tv_sec = (time_t)delay;
748 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
749
750 /* 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 */
751 /* something not guaranteed by newer posix versions, but guaranteed */ 784 /* something not guaranteed by newer posix versions, but guaranteed */
752 /* by older ones */ 785 /* by older ones */
786 EV_TV_SET (tv, delay);
753 select (0, 0, 0, 0, &tv); 787 select (0, 0, 0, 0, &tv);
754#endif 788#endif
755 } 789 }
756} 790}
757 791
758/*****************************************************************************/ 792/*****************************************************************************/
759 793
760#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 */
761 795
762/* find a suitable new size for the given array, */ 796/* find a suitable new size for the given array, */
763/* hopefully by rounding to a ncie-to-malloc size */ 797/* hopefully by rounding to a nice-to-malloc size */
764inline_size int 798inline_size int
765array_nextsize (int elem, int cur, int cnt) 799array_nextsize (int elem, int cur, int cnt)
766{ 800{
767 int ncur = cur + 1; 801 int ncur = cur + 1;
768 802
… …
864} 898}
865 899
866/*****************************************************************************/ 900/*****************************************************************************/
867 901
868inline_speed void 902inline_speed void
869fd_event_nc (EV_P_ int fd, int revents) 903fd_event_nocheck (EV_P_ int fd, int revents)
870{ 904{
871 ANFD *anfd = anfds + fd; 905 ANFD *anfd = anfds + fd;
872 ev_io *w; 906 ev_io *w;
873 907
874 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)
… …
886fd_event (EV_P_ int fd, int revents) 920fd_event (EV_P_ int fd, int revents)
887{ 921{
888 ANFD *anfd = anfds + fd; 922 ANFD *anfd = anfds + fd;
889 923
890 if (expect_true (!anfd->reify)) 924 if (expect_true (!anfd->reify))
891 fd_event_nc (EV_A_ fd, revents); 925 fd_event_nocheck (EV_A_ fd, revents);
892} 926}
893 927
894void 928void
895ev_feed_fd_event (EV_P_ int fd, int revents) 929ev_feed_fd_event (EV_P_ int fd, int revents)
896{ 930{
897 if (fd >= 0 && fd < anfdmax) 931 if (fd >= 0 && fd < anfdmax)
898 fd_event_nc (EV_A_ fd, revents); 932 fd_event_nocheck (EV_A_ fd, revents);
899} 933}
900 934
901/* make sure the external fd watch events are in-sync */ 935/* make sure the external fd watch events are in-sync */
902/* with the kernel/libev internal state */ 936/* with the kernel/libev internal state */
903inline_size void 937inline_size void
… …
909 { 943 {
910 int fd = fdchanges [i]; 944 int fd = fdchanges [i];
911 ANFD *anfd = anfds + fd; 945 ANFD *anfd = anfds + fd;
912 ev_io *w; 946 ev_io *w;
913 947
914 unsigned char events = 0; 948 unsigned char o_events = anfd->events;
949 unsigned char o_reify = anfd->reify;
915 950
916 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 951 anfd->reify = 0;
917 events |= (unsigned char)w->events;
918 952
919#if EV_SELECT_IS_WINSOCKET 953#if EV_SELECT_IS_WINSOCKET
920 if (events) 954 if (o_reify & EV__IOFDSET)
921 { 955 {
922 unsigned long arg; 956 unsigned long arg;
923 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 957 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
924 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));
925 } 959 }
926#endif 960#endif
927 961
962 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
928 { 963 {
929 unsigned char o_events = anfd->events;
930 unsigned char o_reify = anfd->reify;
931
932 anfd->reify = 0;
933 anfd->events = events; 964 anfd->events = 0;
934 965
935 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)
936 backend_modify (EV_A_ fd, o_events, events); 974 backend_modify (EV_A_ fd, o_events, anfd->events);
937 }
938 } 975 }
939 976
940 fdchangecnt = 0; 977 fdchangecnt = 0;
941} 978}
942 979
… …
966 ev_io_stop (EV_A_ w); 1003 ev_io_stop (EV_A_ w);
967 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);
968 } 1005 }
969} 1006}
970 1007
971/* check whether the given fd is atcually valid, for error recovery */ 1008/* check whether the given fd is actually valid, for error recovery */
972inline_size int 1009inline_size int
973fd_valid (int fd) 1010fd_valid (int fd)
974{ 1011{
975#ifdef _WIN32 1012#ifdef _WIN32
976 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1013 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
… …
1018 anfds [fd].emask = 0; 1055 anfds [fd].emask = 0;
1019 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1056 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1020 } 1057 }
1021} 1058}
1022 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
1023/*****************************************************************************/ 1074/*****************************************************************************/
1024 1075
1025/* 1076/*
1026 * 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
1027 * 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
1028 * the branching factor of the d-tree. 1079 * the branching factor of the d-tree.
1029 */ 1080 */
1030 1081
1031/* 1082/*
… …
1179 1230
1180static ANSIG signals [EV_NSIG - 1]; 1231static ANSIG signals [EV_NSIG - 1];
1181 1232
1182/*****************************************************************************/ 1233/*****************************************************************************/
1183 1234
1184/* used to prepare libev internal fd's */ 1235#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1185/* this is not fork-safe */
1186inline_speed void
1187fd_intern (int fd)
1188{
1189#ifdef _WIN32
1190 unsigned long arg = 1;
1191 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1192#else
1193 fcntl (fd, F_SETFD, FD_CLOEXEC);
1194 fcntl (fd, F_SETFL, O_NONBLOCK);
1195#endif
1196}
1197 1236
1198static void noinline 1237static void noinline
1199evpipe_init (EV_P) 1238evpipe_init (EV_P)
1200{ 1239{
1201 if (!ev_is_active (&pipe_w)) 1240 if (!ev_is_active (&pipe_w))
1202 { 1241 {
1203#if EV_USE_EVENTFD 1242# if EV_USE_EVENTFD
1204 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1243 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1205 if (evfd < 0 && errno == EINVAL) 1244 if (evfd < 0 && errno == EINVAL)
1206 evfd = eventfd (0, 0); 1245 evfd = eventfd (0, 0);
1207 1246
1208 if (evfd >= 0) 1247 if (evfd >= 0)
… …
1210 evpipe [0] = -1; 1249 evpipe [0] = -1;
1211 fd_intern (evfd); /* doing it twice doesn't hurt */ 1250 fd_intern (evfd); /* doing it twice doesn't hurt */
1212 ev_io_set (&pipe_w, evfd, EV_READ); 1251 ev_io_set (&pipe_w, evfd, EV_READ);
1213 } 1252 }
1214 else 1253 else
1215#endif 1254# endif
1216 { 1255 {
1217 while (pipe (evpipe)) 1256 while (pipe (evpipe))
1218 ev_syserr ("(libev) error creating signal/async pipe"); 1257 ev_syserr ("(libev) error creating signal/async pipe");
1219 1258
1220 fd_intern (evpipe [0]); 1259 fd_intern (evpipe [0]);
… …
1231evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1270evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1232{ 1271{
1233 if (!*flag) 1272 if (!*flag)
1234 { 1273 {
1235 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;
1236 1276
1237 *flag = 1; 1277 *flag = 1;
1238 1278
1239#if EV_USE_EVENTFD 1279#if EV_USE_EVENTFD
1240 if (evfd >= 0) 1280 if (evfd >= 0)
… …
1242 uint64_t counter = 1; 1282 uint64_t counter = 1;
1243 write (evfd, &counter, sizeof (uint64_t)); 1283 write (evfd, &counter, sizeof (uint64_t));
1244 } 1284 }
1245 else 1285 else
1246#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. */
1247 write (evpipe [1], &old_errno, 1); 1292 write (evpipe [1], &dummy, 1);
1248 1293
1249 errno = old_errno; 1294 errno = old_errno;
1250 } 1295 }
1251} 1296}
1252 1297
… …
1265 } 1310 }
1266 else 1311 else
1267#endif 1312#endif
1268 { 1313 {
1269 char dummy; 1314 char dummy;
1315 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1270 read (evpipe [0], &dummy, 1); 1316 read (evpipe [0], &dummy, 1);
1271 } 1317 }
1272 1318
1273 if (sig_pending) 1319 if (sig_pending)
1274 { 1320 {
… …
1353 break; 1399 break;
1354 } 1400 }
1355} 1401}
1356#endif 1402#endif
1357 1403
1404#endif
1405
1358/*****************************************************************************/ 1406/*****************************************************************************/
1359 1407
1408#if EV_CHILD_ENABLE
1360static WL childs [EV_PID_HASHSIZE]; 1409static WL childs [EV_PID_HASHSIZE];
1361
1362#ifndef _WIN32
1363 1410
1364static ev_signal childev; 1411static ev_signal childev;
1365 1412
1366#ifndef WIFCONTINUED 1413#ifndef WIFCONTINUED
1367# define WIFCONTINUED(status) 0 1414# define WIFCONTINUED(status) 0
… …
1372child_reap (EV_P_ int chain, int pid, int status) 1419child_reap (EV_P_ int chain, int pid, int status)
1373{ 1420{
1374 ev_child *w; 1421 ev_child *w;
1375 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1422 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1376 1423
1377 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)
1378 { 1425 {
1379 if ((w->pid == pid || !w->pid) 1426 if ((w->pid == pid || !w->pid)
1380 && (!traced || (w->flags & 1))) 1427 && (!traced || (w->flags & 1)))
1381 { 1428 {
1382 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 */
… …
1407 /* 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 */
1408 /* 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 */
1409 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1456 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1410 1457
1411 child_reap (EV_A_ pid, pid, status); 1458 child_reap (EV_A_ pid, pid, status);
1412 if (EV_PID_HASHSIZE > 1) 1459 if ((EV_PID_HASHSIZE) > 1)
1413 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 */
1414} 1461}
1415 1462
1416#endif 1463#endif
1417 1464
… …
1484#ifdef __APPLE__ 1531#ifdef __APPLE__
1485 /* only select works correctly on that "unix-certified" platform */ 1532 /* only select works correctly on that "unix-certified" platform */
1486 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1533 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1487 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 */
1488#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
1489 1539
1490 return flags; 1540 return flags;
1491} 1541}
1492 1542
1493unsigned int 1543unsigned int
… …
1506ev_backend (EV_P) 1556ev_backend (EV_P)
1507{ 1557{
1508 return backend; 1558 return backend;
1509} 1559}
1510 1560
1511#if EV_MINIMAL < 2 1561#if EV_FEATURE_API
1512unsigned int 1562unsigned int
1513ev_loop_count (EV_P) 1563ev_iteration (EV_P)
1514{ 1564{
1515 return loop_count; 1565 return loop_count;
1516} 1566}
1517 1567
1518unsigned int 1568unsigned int
1519ev_loop_depth (EV_P) 1569ev_depth (EV_P)
1520{ 1570{
1521 return loop_depth; 1571 return loop_depth;
1522} 1572}
1523 1573
1524void 1574void
… …
1596 1646
1597 ev_rt_now = ev_time (); 1647 ev_rt_now = ev_time ();
1598 mn_now = get_clock (); 1648 mn_now = get_clock ();
1599 now_floor = mn_now; 1649 now_floor = mn_now;
1600 rtmn_diff = ev_rt_now - mn_now; 1650 rtmn_diff = ev_rt_now - mn_now;
1601#if EV_MINIMAL < 2 1651#if EV_FEATURE_API
1602 invoke_cb = ev_invoke_pending; 1652 invoke_cb = ev_invoke_pending;
1603#endif 1653#endif
1604 1654
1605 io_blocktime = 0.; 1655 io_blocktime = 0.;
1606 timeout_blocktime = 0.; 1656 timeout_blocktime = 0.;
… …
1636 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1686 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1637#endif 1687#endif
1638 1688
1639 ev_prepare_init (&pending_w, pendingcb); 1689 ev_prepare_init (&pending_w, pendingcb);
1640 1690
1691#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1641 ev_init (&pipe_w, pipecb); 1692 ev_init (&pipe_w, pipecb);
1642 ev_set_priority (&pipe_w, EV_MAXPRI); 1693 ev_set_priority (&pipe_w, EV_MAXPRI);
1694#endif
1643 } 1695 }
1644} 1696}
1645 1697
1646/* free up a loop structure */ 1698/* free up a loop structure */
1647static void noinline 1699static void noinline
… …
1765 { 1817 {
1766 EV_WIN32_CLOSE_FD (evpipe [0]); 1818 EV_WIN32_CLOSE_FD (evpipe [0]);
1767 EV_WIN32_CLOSE_FD (evpipe [1]); 1819 EV_WIN32_CLOSE_FD (evpipe [1]);
1768 } 1820 }
1769 1821
1822#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1770 evpipe_init (EV_A); 1823 evpipe_init (EV_A);
1771 /* now iterate over everything, in case we missed something */ 1824 /* now iterate over everything, in case we missed something */
1772 pipecb (EV_A_ &pipe_w, EV_READ); 1825 pipecb (EV_A_ &pipe_w, EV_READ);
1826#endif
1773 } 1827 }
1774 1828
1775 postfork = 0; 1829 postfork = 0;
1776} 1830}
1777 1831
… …
1839 verify_watcher (EV_A_ ws [cnt]); 1893 verify_watcher (EV_A_ ws [cnt]);
1840 } 1894 }
1841} 1895}
1842#endif 1896#endif
1843 1897
1844#if EV_MINIMAL < 2 1898#if EV_FEATURE_API
1845void 1899void
1846ev_loop_verify (EV_P) 1900ev_verify (EV_P)
1847{ 1901{
1848#if EV_VERIFY 1902#if EV_VERIFY
1849 int i; 1903 int i;
1850 WL w; 1904 WL w;
1851 1905
… …
1890#if EV_ASYNC_ENABLE 1944#if EV_ASYNC_ENABLE
1891 assert (asyncmax >= asynccnt); 1945 assert (asyncmax >= asynccnt);
1892 array_verify (EV_A_ (W *)asyncs, asynccnt); 1946 array_verify (EV_A_ (W *)asyncs, asynccnt);
1893#endif 1947#endif
1894 1948
1949#if EV_PREPARE_ENABLE
1895 assert (preparemax >= preparecnt); 1950 assert (preparemax >= preparecnt);
1896 array_verify (EV_A_ (W *)prepares, preparecnt); 1951 array_verify (EV_A_ (W *)prepares, preparecnt);
1952#endif
1897 1953
1954#if EV_CHECK_ENABLE
1898 assert (checkmax >= checkcnt); 1955 assert (checkmax >= checkcnt);
1899 array_verify (EV_A_ (W *)checks, checkcnt); 1956 array_verify (EV_A_ (W *)checks, checkcnt);
1957#endif
1900 1958
1901# if 0 1959# if 0
1960#if EV_CHILD_ENABLE
1902 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)
1903 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1962 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1963#endif
1904# endif 1964# endif
1905#endif 1965#endif
1906} 1966}
1907#endif 1967#endif
1908 1968
… …
1924 1984
1925 loop_init (EV_A_ flags); 1985 loop_init (EV_A_ flags);
1926 1986
1927 if (ev_backend (EV_A)) 1987 if (ev_backend (EV_A))
1928 { 1988 {
1929#ifndef _WIN32 1989#if EV_CHILD_ENABLE
1930 ev_signal_init (&childev, childcb, SIGCHLD); 1990 ev_signal_init (&childev, childcb, SIGCHLD);
1931 ev_set_priority (&childev, EV_MAXPRI); 1991 ev_set_priority (&childev, EV_MAXPRI);
1932 ev_signal_start (EV_A_ &childev); 1992 ev_signal_start (EV_A_ &childev);
1933 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1993 ev_unref (EV_A); /* child watcher should not keep loop alive */
1934#endif 1994#endif
… …
1947 EV_P = ev_default_loop_ptr; 2007 EV_P = ev_default_loop_ptr;
1948#endif 2008#endif
1949 2009
1950 ev_default_loop_ptr = 0; 2010 ev_default_loop_ptr = 0;
1951 2011
1952#ifndef _WIN32 2012#if EV_CHILD_ENABLE
1953 ev_ref (EV_A); /* child watcher */ 2013 ev_ref (EV_A); /* child watcher */
1954 ev_signal_stop (EV_A_ &childev); 2014 ev_signal_stop (EV_A_ &childev);
1955#endif 2015#endif
1956 2016
1957 loop_destroy (EV_A); 2017 loop_destroy (EV_A);
… …
2063 EV_FREQUENT_CHECK; 2123 EV_FREQUENT_CHECK;
2064 feed_reverse (EV_A_ (W)w); 2124 feed_reverse (EV_A_ (W)w);
2065 } 2125 }
2066 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2126 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2067 2127
2068 feed_reverse_done (EV_A_ EV_TIMEOUT); 2128 feed_reverse_done (EV_A_ EV_TIMER);
2069 } 2129 }
2070} 2130}
2071 2131
2072#if EV_PERIODIC_ENABLE 2132#if EV_PERIODIC_ENABLE
2073/* make periodics pending */ 2133/* make periodics pending */
… …
2126 feed_reverse_done (EV_A_ EV_PERIODIC); 2186 feed_reverse_done (EV_A_ EV_PERIODIC);
2127 } 2187 }
2128} 2188}
2129 2189
2130/* simply recalculate all periodics */ 2190/* simply recalculate all periodics */
2131/* 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? */
2132static void noinline 2192static void noinline
2133periodics_reschedule (EV_P) 2193periodics_reschedule (EV_P)
2134{ 2194{
2135 int i; 2195 int i;
2136 2196
… …
2234} 2294}
2235 2295
2236void 2296void
2237ev_loop (EV_P_ int flags) 2297ev_loop (EV_P_ int flags)
2238{ 2298{
2239#if EV_MINIMAL < 2 2299#if EV_FEATURE_API
2240 ++loop_depth; 2300 ++loop_depth;
2241#endif 2301#endif
2242 2302
2243 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2303 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2244 2304
… …
2247 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 */
2248 2308
2249 do 2309 do
2250 { 2310 {
2251#if EV_VERIFY >= 2 2311#if EV_VERIFY >= 2
2252 ev_loop_verify (EV_A); 2312 ev_verify (EV_A);
2253#endif 2313#endif
2254 2314
2255#ifndef _WIN32 2315#ifndef _WIN32
2256 if (expect_false (curpid)) /* penalise the forking check even more */ 2316 if (expect_false (curpid)) /* penalise the forking check even more */
2257 if (expect_false (getpid () != curpid)) 2317 if (expect_false (getpid () != curpid))
… …
2269 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2329 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2270 EV_INVOKE_PENDING; 2330 EV_INVOKE_PENDING;
2271 } 2331 }
2272#endif 2332#endif
2273 2333
2334#if EV_PREPARE_ENABLE
2274 /* queue prepare watchers (and execute them) */ 2335 /* queue prepare watchers (and execute them) */
2275 if (expect_false (preparecnt)) 2336 if (expect_false (preparecnt))
2276 { 2337 {
2277 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2338 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2278 EV_INVOKE_PENDING; 2339 EV_INVOKE_PENDING;
2279 } 2340 }
2341#endif
2280 2342
2281 if (expect_false (loop_done)) 2343 if (expect_false (loop_done))
2282 break; 2344 break;
2283 2345
2284 /* we might have forked, so reify kernel state if necessary */ 2346 /* we might have forked, so reify kernel state if necessary */
… …
2335 waittime -= sleeptime; 2397 waittime -= sleeptime;
2336 } 2398 }
2337 } 2399 }
2338 } 2400 }
2339 2401
2340#if EV_MINIMAL < 2 2402#if EV_FEATURE_API
2341 ++loop_count; 2403 ++loop_count;
2342#endif 2404#endif
2343 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2405 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2344 backend_poll (EV_A_ waittime); 2406 backend_poll (EV_A_ waittime);
2345 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2407 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
… …
2357#if EV_IDLE_ENABLE 2419#if EV_IDLE_ENABLE
2358 /* queue idle watchers unless other events are pending */ 2420 /* queue idle watchers unless other events are pending */
2359 idle_reify (EV_A); 2421 idle_reify (EV_A);
2360#endif 2422#endif
2361 2423
2424#if EV_CHECK_ENABLE
2362 /* queue check watchers, to be executed first */ 2425 /* queue check watchers, to be executed first */
2363 if (expect_false (checkcnt)) 2426 if (expect_false (checkcnt))
2364 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2427 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2428#endif
2365 2429
2366 EV_INVOKE_PENDING; 2430 EV_INVOKE_PENDING;
2367 } 2431 }
2368 while (expect_true ( 2432 while (expect_true (
2369 activecnt 2433 activecnt
… …
2372 )); 2436 ));
2373 2437
2374 if (loop_done == EVUNLOOP_ONE) 2438 if (loop_done == EVUNLOOP_ONE)
2375 loop_done = EVUNLOOP_CANCEL; 2439 loop_done = EVUNLOOP_CANCEL;
2376 2440
2377#if EV_MINIMAL < 2 2441#if EV_FEATURE_API
2378 --loop_depth; 2442 --loop_depth;
2379#endif 2443#endif
2380} 2444}
2381 2445
2382void 2446void
… …
2508 2572
2509 if (expect_false (ev_is_active (w))) 2573 if (expect_false (ev_is_active (w)))
2510 return; 2574 return;
2511 2575
2512 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2576 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2513 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2577 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2514 2578
2515 EV_FREQUENT_CHECK; 2579 EV_FREQUENT_CHECK;
2516 2580
2517 ev_start (EV_A_ (W)w, 1); 2581 ev_start (EV_A_ (W)w, 1);
2518 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2582 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2536 EV_FREQUENT_CHECK; 2600 EV_FREQUENT_CHECK;
2537 2601
2538 wlist_del (&anfds[w->fd].head, (WL)w); 2602 wlist_del (&anfds[w->fd].head, (WL)w);
2539 ev_stop (EV_A_ (W)w); 2603 ev_stop (EV_A_ (W)w);
2540 2604
2541 fd_change (EV_A_ w->fd, 1); 2605 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2542 2606
2543 EV_FREQUENT_CHECK; 2607 EV_FREQUENT_CHECK;
2544} 2608}
2545 2609
2546void noinline 2610void noinline
… …
2588 timers [active] = timers [timercnt + HEAP0]; 2652 timers [active] = timers [timercnt + HEAP0];
2589 adjustheap (timers, timercnt, active); 2653 adjustheap (timers, timercnt, active);
2590 } 2654 }
2591 } 2655 }
2592 2656
2593 EV_FREQUENT_CHECK;
2594
2595 ev_at (w) -= mn_now; 2657 ev_at (w) -= mn_now;
2596 2658
2597 ev_stop (EV_A_ (W)w); 2659 ev_stop (EV_A_ (W)w);
2660
2661 EV_FREQUENT_CHECK;
2598} 2662}
2599 2663
2600void noinline 2664void noinline
2601ev_timer_again (EV_P_ ev_timer *w) 2665ev_timer_again (EV_P_ ev_timer *w)
2602{ 2666{
… …
2681 periodics [active] = periodics [periodiccnt + HEAP0]; 2745 periodics [active] = periodics [periodiccnt + HEAP0];
2682 adjustheap (periodics, periodiccnt, active); 2746 adjustheap (periodics, periodiccnt, active);
2683 } 2747 }
2684 } 2748 }
2685 2749
2686 EV_FREQUENT_CHECK;
2687
2688 ev_stop (EV_A_ (W)w); 2750 ev_stop (EV_A_ (W)w);
2751
2752 EV_FREQUENT_CHECK;
2689} 2753}
2690 2754
2691void noinline 2755void noinline
2692ev_periodic_again (EV_P_ ev_periodic *w) 2756ev_periodic_again (EV_P_ ev_periodic *w)
2693{ 2757{
… …
2698#endif 2762#endif
2699 2763
2700#ifndef SA_RESTART 2764#ifndef SA_RESTART
2701# define SA_RESTART 0 2765# define SA_RESTART 0
2702#endif 2766#endif
2767
2768#if EV_SIGNAL_ENABLE
2703 2769
2704void noinline 2770void noinline
2705ev_signal_start (EV_P_ ev_signal *w) 2771ev_signal_start (EV_P_ ev_signal *w)
2706{ 2772{
2707 if (expect_false (ev_is_active (w))) 2773 if (expect_false (ev_is_active (w)))
… …
2814 } 2880 }
2815 2881
2816 EV_FREQUENT_CHECK; 2882 EV_FREQUENT_CHECK;
2817} 2883}
2818 2884
2885#endif
2886
2887#if EV_CHILD_ENABLE
2888
2819void 2889void
2820ev_child_start (EV_P_ ev_child *w) 2890ev_child_start (EV_P_ ev_child *w)
2821{ 2891{
2822#if EV_MULTIPLICITY 2892#if EV_MULTIPLICITY
2823 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));
… …
2826 return; 2896 return;
2827 2897
2828 EV_FREQUENT_CHECK; 2898 EV_FREQUENT_CHECK;
2829 2899
2830 ev_start (EV_A_ (W)w, 1); 2900 ev_start (EV_A_ (W)w, 1);
2831 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2901 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2832 2902
2833 EV_FREQUENT_CHECK; 2903 EV_FREQUENT_CHECK;
2834} 2904}
2835 2905
2836void 2906void
… …
2840 if (expect_false (!ev_is_active (w))) 2910 if (expect_false (!ev_is_active (w)))
2841 return; 2911 return;
2842 2912
2843 EV_FREQUENT_CHECK; 2913 EV_FREQUENT_CHECK;
2844 2914
2845 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2915 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2846 ev_stop (EV_A_ (W)w); 2916 ev_stop (EV_A_ (W)w);
2847 2917
2848 EV_FREQUENT_CHECK; 2918 EV_FREQUENT_CHECK;
2849} 2919}
2920
2921#endif
2850 2922
2851#if EV_STAT_ENABLE 2923#if EV_STAT_ENABLE
2852 2924
2853# ifdef _WIN32 2925# ifdef _WIN32
2854# undef lstat 2926# undef lstat
… …
2921 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2993 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2922 } 2994 }
2923 } 2995 }
2924 2996
2925 if (w->wd >= 0) 2997 if (w->wd >= 0)
2926 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);
2927 2999
2928 /* now re-arm timer, if required */ 3000 /* now re-arm timer, if required */
2929 if (ev_is_active (&w->timer)) ev_ref (EV_A); 3001 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2930 ev_timer_again (EV_A_ &w->timer); 3002 ev_timer_again (EV_A_ &w->timer);
2931 if (ev_is_active (&w->timer)) ev_unref (EV_A); 3003 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2939 3011
2940 if (wd < 0) 3012 if (wd < 0)
2941 return; 3013 return;
2942 3014
2943 w->wd = -2; 3015 w->wd = -2;
2944 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3016 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2945 wlist_del (&fs_hash [slot].head, (WL)w); 3017 wlist_del (&fs_hash [slot].head, (WL)w);
2946 3018
2947 /* remove this watcher, if others are watching it, they will rearm */ 3019 /* remove this watcher, if others are watching it, they will rearm */
2948 inotify_rm_watch (fs_fd, wd); 3020 inotify_rm_watch (fs_fd, wd);
2949} 3021}
… …
2951static void noinline 3023static void noinline
2952infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3024infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2953{ 3025{
2954 if (slot < 0) 3026 if (slot < 0)
2955 /* overflow, need to check for all hash slots */ 3027 /* overflow, need to check for all hash slots */
2956 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3028 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2957 infy_wd (EV_A_ slot, wd, ev); 3029 infy_wd (EV_A_ slot, wd, ev);
2958 else 3030 else
2959 { 3031 {
2960 WL w_; 3032 WL w_;
2961 3033
2962 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3034 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2963 { 3035 {
2964 ev_stat *w = (ev_stat *)w_; 3036 ev_stat *w = (ev_stat *)w_;
2965 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 */
2966 3038
2967 if (w->wd == wd || wd == -1) 3039 if (w->wd == wd || wd == -1)
2968 { 3040 {
2969 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3041 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2970 { 3042 {
2971 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);
2972 w->wd = -1; 3044 w->wd = -1;
2973 infy_add (EV_A_ w); /* re-add, no matter what */ 3045 infy_add (EV_A_ w); /* re-add, no matter what */
2974 } 3046 }
2975 3047
2976 stat_timer_cb (EV_A_ &w->timer, 0); 3048 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2992 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3064 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2993 ofs += sizeof (struct inotify_event) + ev->len; 3065 ofs += sizeof (struct inotify_event) + ev->len;
2994 } 3066 }
2995} 3067}
2996 3068
3069inline_size unsigned int
3070ev_linux_version (void)
3071{
3072 struct utsname buf;
3073 unsigned int v;
3074 int i;
3075 char *p = buf.release;
3076
3077 if (uname (&buf))
3078 return 0;
3079
3080 for (i = 3+1; --i; )
3081 {
3082 unsigned int c = 0;
3083
3084 for (;;)
3085 {
3086 if (*p >= '0' && *p <= '9')
3087 c = c * 10 + *p++ - '0';
3088 else
3089 {
3090 p += *p == '.';
3091 break;
3092 }
3093 }
3094
3095 v = (v << 8) | c;
3096 }
3097
3098 return v;
3099}
3100
2997inline_size void 3101inline_size void
2998check_2625 (EV_P) 3102ev_check_2625 (EV_P)
2999{ 3103{
3000 /* kernels < 2.6.25 are borked 3104 /* kernels < 2.6.25 are borked
3001 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3105 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3002 */ 3106 */
3003 struct utsname buf; 3107 if (ev_linux_version () < 0x020619)
3004 int major, minor, micro;
3005
3006 if (uname (&buf))
3007 return;
3008
3009 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
3010 return;
3011
3012 if (major < 2
3013 || (major == 2 && minor < 6)
3014 || (major == 2 && minor == 6 && micro < 25))
3015 return; 3108 return;
3016 3109
3017 fs_2625 = 1; 3110 fs_2625 = 1;
3018} 3111}
3019 3112
… …
3034 if (fs_fd != -2) 3127 if (fs_fd != -2)
3035 return; 3128 return;
3036 3129
3037 fs_fd = -1; 3130 fs_fd = -1;
3038 3131
3039 check_2625 (EV_A); 3132 ev_check_2625 (EV_A);
3040 3133
3041 fs_fd = infy_newfd (); 3134 fs_fd = infy_newfd ();
3042 3135
3043 if (fs_fd >= 0) 3136 if (fs_fd >= 0)
3044 { 3137 {
… …
3069 ev_io_set (&fs_w, fs_fd, EV_READ); 3162 ev_io_set (&fs_w, fs_fd, EV_READ);
3070 ev_io_start (EV_A_ &fs_w); 3163 ev_io_start (EV_A_ &fs_w);
3071 ev_unref (EV_A); 3164 ev_unref (EV_A);
3072 } 3165 }
3073 3166
3074 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3167 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3075 { 3168 {
3076 WL w_ = fs_hash [slot].head; 3169 WL w_ = fs_hash [slot].head;
3077 fs_hash [slot].head = 0; 3170 fs_hash [slot].head = 0;
3078 3171
3079 while (w_) 3172 while (w_)
… …
3254 3347
3255 EV_FREQUENT_CHECK; 3348 EV_FREQUENT_CHECK;
3256} 3349}
3257#endif 3350#endif
3258 3351
3352#if EV_PREPARE_ENABLE
3259void 3353void
3260ev_prepare_start (EV_P_ ev_prepare *w) 3354ev_prepare_start (EV_P_ ev_prepare *w)
3261{ 3355{
3262 if (expect_false (ev_is_active (w))) 3356 if (expect_false (ev_is_active (w)))
3263 return; 3357 return;
… …
3289 3383
3290 ev_stop (EV_A_ (W)w); 3384 ev_stop (EV_A_ (W)w);
3291 3385
3292 EV_FREQUENT_CHECK; 3386 EV_FREQUENT_CHECK;
3293} 3387}
3388#endif
3294 3389
3390#if EV_CHECK_ENABLE
3295void 3391void
3296ev_check_start (EV_P_ ev_check *w) 3392ev_check_start (EV_P_ ev_check *w)
3297{ 3393{
3298 if (expect_false (ev_is_active (w))) 3394 if (expect_false (ev_is_active (w)))
3299 return; 3395 return;
… …
3325 3421
3326 ev_stop (EV_A_ (W)w); 3422 ev_stop (EV_A_ (W)w);
3327 3423
3328 EV_FREQUENT_CHECK; 3424 EV_FREQUENT_CHECK;
3329} 3425}
3426#endif
3330 3427
3331#if EV_EMBED_ENABLE 3428#if EV_EMBED_ENABLE
3332void noinline 3429void noinline
3333ev_embed_sweep (EV_P_ ev_embed *w) 3430ev_embed_sweep (EV_P_ ev_embed *w)
3334{ 3431{
… …
3429 3526
3430 ev_io_stop (EV_A_ &w->io); 3527 ev_io_stop (EV_A_ &w->io);
3431 ev_prepare_stop (EV_A_ &w->prepare); 3528 ev_prepare_stop (EV_A_ &w->prepare);
3432 ev_fork_stop (EV_A_ &w->fork); 3529 ev_fork_stop (EV_A_ &w->fork);
3433 3530
3531 ev_stop (EV_A_ (W)w);
3532
3434 EV_FREQUENT_CHECK; 3533 EV_FREQUENT_CHECK;
3435} 3534}
3436#endif 3535#endif
3437 3536
3438#if EV_FORK_ENABLE 3537#if EV_FORK_ENABLE
… …
3477void 3576void
3478ev_async_start (EV_P_ ev_async *w) 3577ev_async_start (EV_P_ ev_async *w)
3479{ 3578{
3480 if (expect_false (ev_is_active (w))) 3579 if (expect_false (ev_is_active (w)))
3481 return; 3580 return;
3581
3582 w->sent = 0;
3482 3583
3483 evpipe_init (EV_A); 3584 evpipe_init (EV_A);
3484 3585
3485 EV_FREQUENT_CHECK; 3586 EV_FREQUENT_CHECK;
3486 3587
… …
3564{ 3665{
3565 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));
3566 3667
3567 if (expect_false (!once)) 3668 if (expect_false (!once))
3568 { 3669 {
3569 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3670 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3570 return; 3671 return;
3571 } 3672 }
3572 3673
3573 once->cb = cb; 3674 once->cb = cb;
3574 once->arg = arg; 3675 once->arg = arg;
… …
3661 if (types & EV_ASYNC) 3762 if (types & EV_ASYNC)
3662 for (i = asynccnt; i--; ) 3763 for (i = asynccnt; i--; )
3663 cb (EV_A_ EV_ASYNC, asyncs [i]); 3764 cb (EV_A_ EV_ASYNC, asyncs [i]);
3664#endif 3765#endif
3665 3766
3767#if EV_PREPARE_ENABLE
3666 if (types & EV_PREPARE) 3768 if (types & EV_PREPARE)
3667 for (i = preparecnt; i--; ) 3769 for (i = preparecnt; i--; )
3668#if EV_EMBED_ENABLE 3770# if EV_EMBED_ENABLE
3669 if (ev_cb (prepares [i]) != embed_prepare_cb) 3771 if (ev_cb (prepares [i]) != embed_prepare_cb)
3670#endif 3772# endif
3671 cb (EV_A_ EV_PREPARE, prepares [i]); 3773 cb (EV_A_ EV_PREPARE, prepares [i]);
3774#endif
3672 3775
3776#if EV_CHECK_ENABLE
3673 if (types & EV_CHECK) 3777 if (types & EV_CHECK)
3674 for (i = checkcnt; i--; ) 3778 for (i = checkcnt; i--; )
3675 cb (EV_A_ EV_CHECK, checks [i]); 3779 cb (EV_A_ EV_CHECK, checks [i]);
3780#endif
3676 3781
3782#if EV_SIGNAL_ENABLE
3677 if (types & EV_SIGNAL) 3783 if (types & EV_SIGNAL)
3678 for (i = 0; i < EV_NSIG - 1; ++i) 3784 for (i = 0; i < EV_NSIG - 1; ++i)
3679 for (wl = signals [i].head; wl; ) 3785 for (wl = signals [i].head; wl; )
3680 { 3786 {
3681 wn = wl->next; 3787 wn = wl->next;
3682 cb (EV_A_ EV_SIGNAL, wl); 3788 cb (EV_A_ EV_SIGNAL, wl);
3683 wl = wn; 3789 wl = wn;
3684 } 3790 }
3791#endif
3685 3792
3793#if EV_CHILD_ENABLE
3686 if (types & EV_CHILD) 3794 if (types & EV_CHILD)
3687 for (i = EV_PID_HASHSIZE; i--; ) 3795 for (i = (EV_PID_HASHSIZE); i--; )
3688 for (wl = childs [i]; wl; ) 3796 for (wl = childs [i]; wl; )
3689 { 3797 {
3690 wn = wl->next; 3798 wn = wl->next;
3691 cb (EV_A_ EV_CHILD, wl); 3799 cb (EV_A_ EV_CHILD, wl);
3692 wl = wn; 3800 wl = wn;
3693 } 3801 }
3802#endif
3694/* EV_STAT 0x00001000 /* stat data changed */ 3803/* EV_STAT 0x00001000 /* stat data changed */
3695/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3804/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3696} 3805}
3697#endif 3806#endif
3698 3807

Diff Legend

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