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

Comparing libev/ev.c (file contents):
Revision 1.336 by root, Wed Mar 10 08:19:38 2010 UTC vs.
Revision 1.356 by root, Fri Oct 22 11:21:52 2010 UTC

… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
… …
77# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
79# endif 75# endif
80# endif 76# endif
81 77
78# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
85# else 82# else
83# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 84# define EV_USE_NANOSLEEP 0
85# endif
86
87# if HAVE_SELECT && HAVE_SYS_SELECT_H
88# ifndef EV_USE_SELECT
89# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
88# endif 94# endif
89 95
96# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 98# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 99# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 100# else
101# undef EV_USE_POLL
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif
104# endif 103# endif
105 104
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 106# ifndef EV_USE_EPOLL
109# else 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H 114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 115# ifndef EV_USE_KQUEUE
117# else 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
118# define EV_USE_KQUEUE 0
119# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
120# endif 121# endif
121 122
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 124# ifndef EV_USE_PORT
125# else 125# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
128# endif 130# endif
129 131
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 133# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
136# endif 139# endif
137 140
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 142# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 143# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
144# endif 148# endif
145 149
150# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 151# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 152# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
152# endif 157# endif
153 158
154#endif 159#endif
155 160
156#include <math.h> 161#include <math.h>
… …
172#ifdef EV_H 177#ifdef EV_H
173# include EV_H 178# include EV_H
174#else 179#else
175# include "ev.h" 180# include "ev.h"
176#endif 181#endif
182
183EV_CPP(extern "C" {)
177 184
178#ifndef _WIN32 185#ifndef _WIN32
179# include <sys/time.h> 186# include <sys/time.h>
180# include <sys/wait.h> 187# include <sys/wait.h>
181# include <unistd.h> 188# include <unistd.h>
… …
186# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
187# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
188# endif 195# endif
189# undef EV_AVOID_STDIO 196# undef EV_AVOID_STDIO
190#endif 197#endif
198
199/* OS X, in its infinite idiocy, actually HARDCODES
200 * a limit of 1024 into their select. Where people have brains,
201 * OS X engineers apparently have a vacuum. Or maybe they were
202 * ordered to have a vacuum, or they do anything for money.
203 * This might help. Or not.
204 */
205#define _DARWIN_UNLIMITED_SELECT 1
191 206
192/* this block tries to deduce configuration from header-defined symbols and defaults */ 207/* this block tries to deduce configuration from header-defined symbols and defaults */
193 208
194/* try to deduce the maximum number of signals on this platform */ 209/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG) 210#if defined (EV_NSIG)
… …
219# define EV_NSIG 65 234# define EV_NSIG 65
220#endif 235#endif
221 236
222#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
223# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
224# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
225# else 240# else
226# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
227# endif 242# endif
228#endif 243#endif
229 244
230#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
231# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
232# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
233# else 248# else
234# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
235# endif 250# endif
236#endif 251#endif
237 252
… …
239# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
240#endif 255#endif
241 256
242#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
243# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
244# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
245# else 260# else
246# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
247# endif 262# endif
248#endif 263#endif
249 264
250#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
251# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
252#endif 267#endif
253 268
254#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
255# ifdef _WIN32 270# ifdef _WIN32
256# define EV_USE_POLL 0 271# define EV_USE_POLL 0
257# else 272# else
258# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
259# endif 274# endif
260#endif 275#endif
261 276
262#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
263# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
264# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
265# else 280# else
266# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
267# endif 282# endif
268#endif 283#endif
269 284
… …
275# define EV_USE_PORT 0 290# define EV_USE_PORT 0
276#endif 291#endif
277 292
278#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
279# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
280# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
281# else 296# else
282# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
283# endif 298# endif
284#endif 299#endif
285 300
286#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
287# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
288# define EV_PID_HASHSIZE 1
289# else
290# define EV_PID_HASHSIZE 16
291# endif
292#endif 303#endif
293 304
294#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
295# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
296# define EV_INOTIFY_HASHSIZE 1
297# else
298# define EV_INOTIFY_HASHSIZE 16
299# endif
300#endif 307#endif
301 308
302#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
304# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
305# else 312# else
306# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
307# endif 314# endif
308#endif 315#endif
309 316
310#ifndef EV_USE_SIGNALFD 317#ifndef EV_USE_SIGNALFD
311# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
312# define EV_USE_SIGNALFD 1 319# define EV_USE_SIGNALFD EV_FEATURE_OS
313# else 320# else
314# define EV_USE_SIGNALFD 0 321# define EV_USE_SIGNALFD 0
315# endif 322# endif
316#endif 323#endif
317 324
… …
320# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
321# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
322#endif 329#endif
323 330
324#ifndef EV_VERIFY 331#ifndef EV_VERIFY
325# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
326#endif 333#endif
327 334
328#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
329# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
330#endif 337#endif
331 338
332#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
333# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
334#endif 341#endif
335 342
336/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 343/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
337/* which makes programs even slower. might work on other unices, too. */ 344/* which makes programs even slower. might work on other unices, too. */
338#if EV_USE_CLOCK_SYSCALL 345#if EV_USE_CLOCK_SYSCALL
… …
375# include <sys/select.h> 382# include <sys/select.h>
376# endif 383# endif
377#endif 384#endif
378 385
379#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
380# include <sys/utsname.h>
381# include <sys/statfs.h> 387# include <sys/statfs.h>
382# include <sys/inotify.h> 388# include <sys/inotify.h>
383/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
384# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
385# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
402# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
403# else 409# else
404# define EFD_CLOEXEC 02000000 410# define EFD_CLOEXEC 02000000
405# endif 411# endif
406# endif 412# endif
407# ifdef __cplusplus
408extern "C" {
409# endif
410int (eventfd) (unsigned int initval, int flags); 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
411# ifdef __cplusplus
412}
413# endif
414#endif 414#endif
415 415
416#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
418# include <stdint.h> 418# include <stdint.h>
… …
424# define SFD_CLOEXEC O_CLOEXEC 424# define SFD_CLOEXEC O_CLOEXEC
425# else 425# else
426# define SFD_CLOEXEC 02000000 426# define SFD_CLOEXEC 02000000
427# endif 427# endif
428# endif 428# endif
429# ifdef __cplusplus
430extern "C" {
431# endif
432int signalfd (int fd, const sigset_t *mask, int flags); 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
433 430
434struct signalfd_siginfo 431struct signalfd_siginfo
435{ 432{
436 uint32_t ssi_signo; 433 uint32_t ssi_signo;
437 char pad[128 - sizeof (uint32_t)]; 434 char pad[128 - sizeof (uint32_t)];
438}; 435};
439# ifdef __cplusplus
440}
441# endif 436#endif
442#endif
443
444 437
445/**/ 438/**/
446 439
447#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
448# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
449#else 442#else
450# define EV_FREQUENT_CHECK do { } while (0) 443# define EV_FREQUENT_CHECK do { } while (0)
451#endif 444#endif
452 445
453/* 446/*
… …
461#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
462 455
463#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 456#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 457#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
465 458
459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
460#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
461
466#if __GNUC__ >= 4 462#if __GNUC__ >= 4
467# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
468# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
469#else 465#else
470# define expect(expr,value) (expr) 466# define expect(expr,value) (expr)
… …
476 472
477#define expect_false(expr) expect ((expr) != 0, 0) 473#define expect_false(expr) expect ((expr) != 0, 0)
478#define expect_true(expr) expect ((expr) != 0, 1) 474#define expect_true(expr) expect ((expr) != 0, 1)
479#define inline_size static inline 475#define inline_size static inline
480 476
481#if EV_MINIMAL 477#if EV_FEATURE_CODE
478# define inline_speed static inline
479#else
482# define inline_speed static noinline 480# define inline_speed static noinline
483#else
484# define inline_speed static inline
485#endif 481#endif
486 482
487#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
488 484
489#if EV_MINPRI == EV_MAXPRI 485#if EV_MINPRI == EV_MAXPRI
… …
502#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
503#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
504 500
505#if EV_USE_REALTIME 501#if EV_USE_REALTIME
506/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 502/* sig_atomic_t is used to avoid per-thread variables or locking but still */
507/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
508static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
509#endif 505#endif
510 506
511#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
512static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
523#endif 519#endif
524 520
525#ifdef _WIN32 521#ifdef _WIN32
526# include "ev_win32.c" 522# include "ev_win32.c"
527#endif 523#endif
524
525/*****************************************************************************/
526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
531static unsigned int noinline
532ev_linux_version (void)
533{
534#ifdef __linux
535 struct utsname buf;
536 unsigned int v;
537 int i;
538 char *p = buf.release;
539
540 if (uname (&buf))
541 return 0;
542
543 for (i = 3+1; --i; )
544 {
545 unsigned int c = 0;
546
547 for (;;)
548 {
549 if (*p >= '0' && *p <= '9')
550 c = c * 10 + *p++ - '0';
551 else
552 {
553 p += *p == '.';
554 break;
555 }
556 }
557
558 v = (v << 8) | c;
559 }
560
561 return v;
562#else
563 return 0;
564#endif
565}
528 566
529/*****************************************************************************/ 567/*****************************************************************************/
530 568
531#if EV_AVOID_STDIO 569#if EV_AVOID_STDIO
532static void noinline 570static void noinline
… …
696 734
697 static int ev_default_loop_ptr; 735 static int ev_default_loop_ptr;
698 736
699#endif 737#endif
700 738
701#if EV_MINIMAL < 2 739#if EV_FEATURE_API
702# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 740# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
703# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 741# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
704# define EV_INVOKE_PENDING invoke_cb (EV_A) 742# define EV_INVOKE_PENDING invoke_cb (EV_A)
705#else 743#else
706# define EV_RELEASE_CB (void)0 744# define EV_RELEASE_CB (void)0
707# define EV_ACQUIRE_CB (void)0 745# define EV_ACQUIRE_CB (void)0
708# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 746# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
709#endif 747#endif
710 748
711#define EVUNLOOP_RECURSE 0x80 749#define EVBREAK_RECURSE 0x80
712 750
713/*****************************************************************************/ 751/*****************************************************************************/
714 752
715#ifndef EV_HAVE_EV_TIME 753#ifndef EV_HAVE_EV_TIME
716ev_tstamp 754ev_tstamp
… …
760 if (delay > 0.) 798 if (delay > 0.)
761 { 799 {
762#if EV_USE_NANOSLEEP 800#if EV_USE_NANOSLEEP
763 struct timespec ts; 801 struct timespec ts;
764 802
765 ts.tv_sec = (time_t)delay; 803 EV_TS_SET (ts, delay);
766 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
767
768 nanosleep (&ts, 0); 804 nanosleep (&ts, 0);
769#elif defined(_WIN32) 805#elif defined(_WIN32)
770 Sleep ((unsigned long)(delay * 1e3)); 806 Sleep ((unsigned long)(delay * 1e3));
771#else 807#else
772 struct timeval tv; 808 struct timeval tv;
773 809
774 tv.tv_sec = (time_t)delay;
775 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
776
777 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 810 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
778 /* something not guaranteed by newer posix versions, but guaranteed */ 811 /* something not guaranteed by newer posix versions, but guaranteed */
779 /* by older ones */ 812 /* by older ones */
813 EV_TV_SET (tv, delay);
780 select (0, 0, 0, 0, &tv); 814 select (0, 0, 0, 0, &tv);
781#endif 815#endif
782 } 816 }
783} 817}
784 818
785/*****************************************************************************/ 819/*****************************************************************************/
786 820
787#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 821#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
788 822
789/* find a suitable new size for the given array, */ 823/* find a suitable new size for the given array, */
790/* hopefully by rounding to a ncie-to-malloc size */ 824/* hopefully by rounding to a nice-to-malloc size */
791inline_size int 825inline_size int
792array_nextsize (int elem, int cur, int cnt) 826array_nextsize (int elem, int cur, int cnt)
793{ 827{
794 int ncur = cur + 1; 828 int ncur = cur + 1;
795 829
… …
891} 925}
892 926
893/*****************************************************************************/ 927/*****************************************************************************/
894 928
895inline_speed void 929inline_speed void
896fd_event_nc (EV_P_ int fd, int revents) 930fd_event_nocheck (EV_P_ int fd, int revents)
897{ 931{
898 ANFD *anfd = anfds + fd; 932 ANFD *anfd = anfds + fd;
899 ev_io *w; 933 ev_io *w;
900 934
901 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 935 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
913fd_event (EV_P_ int fd, int revents) 947fd_event (EV_P_ int fd, int revents)
914{ 948{
915 ANFD *anfd = anfds + fd; 949 ANFD *anfd = anfds + fd;
916 950
917 if (expect_true (!anfd->reify)) 951 if (expect_true (!anfd->reify))
918 fd_event_nc (EV_A_ fd, revents); 952 fd_event_nocheck (EV_A_ fd, revents);
919} 953}
920 954
921void 955void
922ev_feed_fd_event (EV_P_ int fd, int revents) 956ev_feed_fd_event (EV_P_ int fd, int revents)
923{ 957{
924 if (fd >= 0 && fd < anfdmax) 958 if (fd >= 0 && fd < anfdmax)
925 fd_event_nc (EV_A_ fd, revents); 959 fd_event_nocheck (EV_A_ fd, revents);
926} 960}
927 961
928/* make sure the external fd watch events are in-sync */ 962/* make sure the external fd watch events are in-sync */
929/* with the kernel/libev internal state */ 963/* with the kernel/libev internal state */
930inline_size void 964inline_size void
… …
936 { 970 {
937 int fd = fdchanges [i]; 971 int fd = fdchanges [i];
938 ANFD *anfd = anfds + fd; 972 ANFD *anfd = anfds + fd;
939 ev_io *w; 973 ev_io *w;
940 974
941 unsigned char events = 0; 975 unsigned char o_events = anfd->events;
976 unsigned char o_reify = anfd->reify;
942 977
943 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 978 anfd->reify = 0;
944 events |= (unsigned char)w->events;
945 979
946#if EV_SELECT_IS_WINSOCKET 980#if EV_SELECT_IS_WINSOCKET
947 if (events) 981 if (o_reify & EV__IOFDSET)
948 { 982 {
949 unsigned long arg; 983 unsigned long arg;
950 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 984 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
951 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 985 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
952 } 986 }
953#endif 987#endif
954 988
989 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
955 { 990 {
956 unsigned char o_events = anfd->events;
957 unsigned char o_reify = anfd->reify;
958
959 anfd->reify = 0;
960 anfd->events = events; 991 anfd->events = 0;
961 992
962 if (o_events != events || o_reify & EV__IOFDSET) 993 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
994 anfd->events |= (unsigned char)w->events;
995
996 if (o_events != anfd->events)
997 o_reify = EV__IOFDSET; /* actually |= */
998 }
999
1000 if (o_reify & EV__IOFDSET)
963 backend_modify (EV_A_ fd, o_events, events); 1001 backend_modify (EV_A_ fd, o_events, anfd->events);
964 }
965 } 1002 }
966 1003
967 fdchangecnt = 0; 1004 fdchangecnt = 0;
968} 1005}
969 1006
… …
1062} 1099}
1063 1100
1064/*****************************************************************************/ 1101/*****************************************************************************/
1065 1102
1066/* 1103/*
1067 * the heap functions want a real array index. array index 0 uis guaranteed to not 1104 * the heap functions want a real array index. array index 0 is guaranteed to not
1068 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1105 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1069 * the branching factor of the d-tree. 1106 * the branching factor of the d-tree.
1070 */ 1107 */
1071 1108
1072/* 1109/*
… …
1272 uint64_t counter = 1; 1309 uint64_t counter = 1;
1273 write (evfd, &counter, sizeof (uint64_t)); 1310 write (evfd, &counter, sizeof (uint64_t));
1274 } 1311 }
1275 else 1312 else
1276#endif 1313#endif
1314 /* win32 people keep sending patches that change this write() to send() */
1315 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1316 /* so when you think this write should be a send instead, please find out */
1317 /* where your send() is from - it's definitely not the microsoft send, and */
1318 /* tell me. thank you. */
1277 write (evpipe [1], &dummy, 1); 1319 write (evpipe [1], &dummy, 1);
1278 1320
1279 errno = old_errno; 1321 errno = old_errno;
1280 } 1322 }
1281} 1323}
… …
1295 } 1337 }
1296 else 1338 else
1297#endif 1339#endif
1298 { 1340 {
1299 char dummy; 1341 char dummy;
1342 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1300 read (evpipe [0], &dummy, 1); 1343 read (evpipe [0], &dummy, 1);
1301 } 1344 }
1302 1345
1303 if (sig_pending) 1346 if (sig_pending)
1304 { 1347 {
… …
1403child_reap (EV_P_ int chain, int pid, int status) 1446child_reap (EV_P_ int chain, int pid, int status)
1404{ 1447{
1405 ev_child *w; 1448 ev_child *w;
1406 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1449 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1407 1450
1408 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1451 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1409 { 1452 {
1410 if ((w->pid == pid || !w->pid) 1453 if ((w->pid == pid || !w->pid)
1411 && (!traced || (w->flags & 1))) 1454 && (!traced || (w->flags & 1)))
1412 { 1455 {
1413 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1456 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1438 /* make sure we are called again until all children have been reaped */ 1481 /* make sure we are called again until all children have been reaped */
1439 /* we need to do it this way so that the callback gets called before we continue */ 1482 /* we need to do it this way so that the callback gets called before we continue */
1440 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1483 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1441 1484
1442 child_reap (EV_A_ pid, pid, status); 1485 child_reap (EV_A_ pid, pid, status);
1443 if (EV_PID_HASHSIZE > 1) 1486 if ((EV_PID_HASHSIZE) > 1)
1444 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1487 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1445} 1488}
1446 1489
1447#endif 1490#endif
1448 1491
… …
1515#ifdef __APPLE__ 1558#ifdef __APPLE__
1516 /* only select works correctly on that "unix-certified" platform */ 1559 /* only select works correctly on that "unix-certified" platform */
1517 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1560 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1518 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1561 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1519#endif 1562#endif
1563#ifdef __FreeBSD__
1564 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1565#endif
1520 1566
1521 return flags; 1567 return flags;
1522} 1568}
1523 1569
1524unsigned int 1570unsigned int
1525ev_embeddable_backends (void) 1571ev_embeddable_backends (void)
1526{ 1572{
1527 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1573 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1528 1574
1529 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1575 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1530 /* please fix it and tell me how to detect the fix */ 1576 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1531 flags &= ~EVBACKEND_EPOLL; 1577 flags &= ~EVBACKEND_EPOLL;
1532 1578
1533 return flags; 1579 return flags;
1534} 1580}
1535 1581
1536unsigned int 1582unsigned int
1537ev_backend (EV_P) 1583ev_backend (EV_P)
1538{ 1584{
1539 return backend; 1585 return backend;
1540} 1586}
1541 1587
1542#if EV_MINIMAL < 2 1588#if EV_FEATURE_API
1543unsigned int 1589unsigned int
1544ev_loop_count (EV_P) 1590ev_iteration (EV_P)
1545{ 1591{
1546 return loop_count; 1592 return loop_count;
1547} 1593}
1548 1594
1549unsigned int 1595unsigned int
1550ev_loop_depth (EV_P) 1596ev_depth (EV_P)
1551{ 1597{
1552 return loop_depth; 1598 return loop_depth;
1553} 1599}
1554 1600
1555void 1601void
… …
1627 1673
1628 ev_rt_now = ev_time (); 1674 ev_rt_now = ev_time ();
1629 mn_now = get_clock (); 1675 mn_now = get_clock ();
1630 now_floor = mn_now; 1676 now_floor = mn_now;
1631 rtmn_diff = ev_rt_now - mn_now; 1677 rtmn_diff = ev_rt_now - mn_now;
1632#if EV_MINIMAL < 2 1678#if EV_FEATURE_API
1633 invoke_cb = ev_invoke_pending; 1679 invoke_cb = ev_invoke_pending;
1634#endif 1680#endif
1635 1681
1636 io_blocktime = 0.; 1682 io_blocktime = 0.;
1637 timeout_blocktime = 0.; 1683 timeout_blocktime = 0.;
… …
1798 { 1844 {
1799 EV_WIN32_CLOSE_FD (evpipe [0]); 1845 EV_WIN32_CLOSE_FD (evpipe [0]);
1800 EV_WIN32_CLOSE_FD (evpipe [1]); 1846 EV_WIN32_CLOSE_FD (evpipe [1]);
1801 } 1847 }
1802 1848
1849#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1803 evpipe_init (EV_A); 1850 evpipe_init (EV_A);
1804 /* now iterate over everything, in case we missed something */ 1851 /* now iterate over everything, in case we missed something */
1805 pipecb (EV_A_ &pipe_w, EV_READ); 1852 pipecb (EV_A_ &pipe_w, EV_READ);
1853#endif
1806 } 1854 }
1807 1855
1808 postfork = 0; 1856 postfork = 0;
1809} 1857}
1810 1858
… …
1872 verify_watcher (EV_A_ ws [cnt]); 1920 verify_watcher (EV_A_ ws [cnt]);
1873 } 1921 }
1874} 1922}
1875#endif 1923#endif
1876 1924
1877#if EV_MINIMAL < 2 1925#if EV_FEATURE_API
1878void 1926void
1879ev_loop_verify (EV_P) 1927ev_verify (EV_P)
1880{ 1928{
1881#if EV_VERIFY 1929#if EV_VERIFY
1882 int i; 1930 int i;
1883 WL w; 1931 WL w;
1884 1932
… …
1923#if EV_ASYNC_ENABLE 1971#if EV_ASYNC_ENABLE
1924 assert (asyncmax >= asynccnt); 1972 assert (asyncmax >= asynccnt);
1925 array_verify (EV_A_ (W *)asyncs, asynccnt); 1973 array_verify (EV_A_ (W *)asyncs, asynccnt);
1926#endif 1974#endif
1927 1975
1976#if EV_PREPARE_ENABLE
1928 assert (preparemax >= preparecnt); 1977 assert (preparemax >= preparecnt);
1929 array_verify (EV_A_ (W *)prepares, preparecnt); 1978 array_verify (EV_A_ (W *)prepares, preparecnt);
1979#endif
1930 1980
1981#if EV_CHECK_ENABLE
1931 assert (checkmax >= checkcnt); 1982 assert (checkmax >= checkcnt);
1932 array_verify (EV_A_ (W *)checks, checkcnt); 1983 array_verify (EV_A_ (W *)checks, checkcnt);
1984#endif
1933 1985
1934# if 0 1986# if 0
1935#if EV_CHILD_ENABLE 1987#if EV_CHILD_ENABLE
1936 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1988 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1937 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1989 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1938#endif 1990#endif
1939# endif 1991# endif
1940#endif 1992#endif
1941} 1993}
… …
2098 EV_FREQUENT_CHECK; 2150 EV_FREQUENT_CHECK;
2099 feed_reverse (EV_A_ (W)w); 2151 feed_reverse (EV_A_ (W)w);
2100 } 2152 }
2101 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2153 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2102 2154
2103 feed_reverse_done (EV_A_ EV_TIMEOUT); 2155 feed_reverse_done (EV_A_ EV_TIMER);
2104 } 2156 }
2105} 2157}
2106 2158
2107#if EV_PERIODIC_ENABLE 2159#if EV_PERIODIC_ENABLE
2108/* make periodics pending */ 2160/* make periodics pending */
… …
2161 feed_reverse_done (EV_A_ EV_PERIODIC); 2213 feed_reverse_done (EV_A_ EV_PERIODIC);
2162 } 2214 }
2163} 2215}
2164 2216
2165/* simply recalculate all periodics */ 2217/* simply recalculate all periodics */
2166/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2218/* TODO: maybe ensure that at least one event happens when jumping forward? */
2167static void noinline 2219static void noinline
2168periodics_reschedule (EV_P) 2220periodics_reschedule (EV_P)
2169{ 2221{
2170 int i; 2222 int i;
2171 2223
… …
2267 mn_now = ev_rt_now; 2319 mn_now = ev_rt_now;
2268 } 2320 }
2269} 2321}
2270 2322
2271void 2323void
2272ev_loop (EV_P_ int flags) 2324ev_run (EV_P_ int flags)
2273{ 2325{
2274#if EV_MINIMAL < 2 2326#if EV_FEATURE_API
2275 ++loop_depth; 2327 ++loop_depth;
2276#endif 2328#endif
2277 2329
2278 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2330 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2279 2331
2280 loop_done = EVUNLOOP_CANCEL; 2332 loop_done = EVBREAK_CANCEL;
2281 2333
2282 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2334 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2283 2335
2284 do 2336 do
2285 { 2337 {
2286#if EV_VERIFY >= 2 2338#if EV_VERIFY >= 2
2287 ev_loop_verify (EV_A); 2339 ev_verify (EV_A);
2288#endif 2340#endif
2289 2341
2290#ifndef _WIN32 2342#ifndef _WIN32
2291 if (expect_false (curpid)) /* penalise the forking check even more */ 2343 if (expect_false (curpid)) /* penalise the forking check even more */
2292 if (expect_false (getpid () != curpid)) 2344 if (expect_false (getpid () != curpid))
… …
2304 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2356 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2305 EV_INVOKE_PENDING; 2357 EV_INVOKE_PENDING;
2306 } 2358 }
2307#endif 2359#endif
2308 2360
2361#if EV_PREPARE_ENABLE
2309 /* queue prepare watchers (and execute them) */ 2362 /* queue prepare watchers (and execute them) */
2310 if (expect_false (preparecnt)) 2363 if (expect_false (preparecnt))
2311 { 2364 {
2312 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2365 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2313 EV_INVOKE_PENDING; 2366 EV_INVOKE_PENDING;
2314 } 2367 }
2368#endif
2315 2369
2316 if (expect_false (loop_done)) 2370 if (expect_false (loop_done))
2317 break; 2371 break;
2318 2372
2319 /* we might have forked, so reify kernel state if necessary */ 2373 /* we might have forked, so reify kernel state if necessary */
… …
2326 /* calculate blocking time */ 2380 /* calculate blocking time */
2327 { 2381 {
2328 ev_tstamp waittime = 0.; 2382 ev_tstamp waittime = 0.;
2329 ev_tstamp sleeptime = 0.; 2383 ev_tstamp sleeptime = 0.;
2330 2384
2385 /* remember old timestamp for io_blocktime calculation */
2386 ev_tstamp prev_mn_now = mn_now;
2387
2388 /* update time to cancel out callback processing overhead */
2389 time_update (EV_A_ 1e100);
2390
2331 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2391 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2332 { 2392 {
2333 /* remember old timestamp for io_blocktime calculation */
2334 ev_tstamp prev_mn_now = mn_now;
2335
2336 /* update time to cancel out callback processing overhead */
2337 time_update (EV_A_ 1e100);
2338
2339 waittime = MAX_BLOCKTIME; 2393 waittime = MAX_BLOCKTIME;
2340 2394
2341 if (timercnt) 2395 if (timercnt)
2342 { 2396 {
2343 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2397 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2370 waittime -= sleeptime; 2424 waittime -= sleeptime;
2371 } 2425 }
2372 } 2426 }
2373 } 2427 }
2374 2428
2375#if EV_MINIMAL < 2 2429#if EV_FEATURE_API
2376 ++loop_count; 2430 ++loop_count;
2377#endif 2431#endif
2378 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2432 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2379 backend_poll (EV_A_ waittime); 2433 backend_poll (EV_A_ waittime);
2380 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2434 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2381 2435
2382 /* update ev_rt_now, do magic */ 2436 /* update ev_rt_now, do magic */
2383 time_update (EV_A_ waittime + sleeptime); 2437 time_update (EV_A_ waittime + sleeptime);
2384 } 2438 }
2385 2439
… …
2392#if EV_IDLE_ENABLE 2446#if EV_IDLE_ENABLE
2393 /* queue idle watchers unless other events are pending */ 2447 /* queue idle watchers unless other events are pending */
2394 idle_reify (EV_A); 2448 idle_reify (EV_A);
2395#endif 2449#endif
2396 2450
2451#if EV_CHECK_ENABLE
2397 /* queue check watchers, to be executed first */ 2452 /* queue check watchers, to be executed first */
2398 if (expect_false (checkcnt)) 2453 if (expect_false (checkcnt))
2399 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2454 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2455#endif
2400 2456
2401 EV_INVOKE_PENDING; 2457 EV_INVOKE_PENDING;
2402 } 2458 }
2403 while (expect_true ( 2459 while (expect_true (
2404 activecnt 2460 activecnt
2405 && !loop_done 2461 && !loop_done
2406 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2462 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2407 )); 2463 ));
2408 2464
2409 if (loop_done == EVUNLOOP_ONE) 2465 if (loop_done == EVBREAK_ONE)
2410 loop_done = EVUNLOOP_CANCEL; 2466 loop_done = EVBREAK_CANCEL;
2411 2467
2412#if EV_MINIMAL < 2 2468#if EV_FEATURE_API
2413 --loop_depth; 2469 --loop_depth;
2414#endif 2470#endif
2415} 2471}
2416 2472
2417void 2473void
2418ev_unloop (EV_P_ int how) 2474ev_break (EV_P_ int how)
2419{ 2475{
2420 loop_done = how; 2476 loop_done = how;
2421} 2477}
2422 2478
2423void 2479void
… …
2571 EV_FREQUENT_CHECK; 2627 EV_FREQUENT_CHECK;
2572 2628
2573 wlist_del (&anfds[w->fd].head, (WL)w); 2629 wlist_del (&anfds[w->fd].head, (WL)w);
2574 ev_stop (EV_A_ (W)w); 2630 ev_stop (EV_A_ (W)w);
2575 2631
2576 fd_change (EV_A_ w->fd, 1); 2632 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2577 2633
2578 EV_FREQUENT_CHECK; 2634 EV_FREQUENT_CHECK;
2579} 2635}
2580 2636
2581void noinline 2637void noinline
… …
2867 return; 2923 return;
2868 2924
2869 EV_FREQUENT_CHECK; 2925 EV_FREQUENT_CHECK;
2870 2926
2871 ev_start (EV_A_ (W)w, 1); 2927 ev_start (EV_A_ (W)w, 1);
2872 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2928 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2873 2929
2874 EV_FREQUENT_CHECK; 2930 EV_FREQUENT_CHECK;
2875} 2931}
2876 2932
2877void 2933void
… …
2881 if (expect_false (!ev_is_active (w))) 2937 if (expect_false (!ev_is_active (w)))
2882 return; 2938 return;
2883 2939
2884 EV_FREQUENT_CHECK; 2940 EV_FREQUENT_CHECK;
2885 2941
2886 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2942 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2887 ev_stop (EV_A_ (W)w); 2943 ev_stop (EV_A_ (W)w);
2888 2944
2889 EV_FREQUENT_CHECK; 2945 EV_FREQUENT_CHECK;
2890} 2946}
2891 2947
… …
2964 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3020 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2965 } 3021 }
2966 } 3022 }
2967 3023
2968 if (w->wd >= 0) 3024 if (w->wd >= 0)
2969 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3025 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2970 3026
2971 /* now re-arm timer, if required */ 3027 /* now re-arm timer, if required */
2972 if (ev_is_active (&w->timer)) ev_ref (EV_A); 3028 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2973 ev_timer_again (EV_A_ &w->timer); 3029 ev_timer_again (EV_A_ &w->timer);
2974 if (ev_is_active (&w->timer)) ev_unref (EV_A); 3030 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2982 3038
2983 if (wd < 0) 3039 if (wd < 0)
2984 return; 3040 return;
2985 3041
2986 w->wd = -2; 3042 w->wd = -2;
2987 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3043 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2988 wlist_del (&fs_hash [slot].head, (WL)w); 3044 wlist_del (&fs_hash [slot].head, (WL)w);
2989 3045
2990 /* remove this watcher, if others are watching it, they will rearm */ 3046 /* remove this watcher, if others are watching it, they will rearm */
2991 inotify_rm_watch (fs_fd, wd); 3047 inotify_rm_watch (fs_fd, wd);
2992} 3048}
… …
2994static void noinline 3050static void noinline
2995infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3051infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2996{ 3052{
2997 if (slot < 0) 3053 if (slot < 0)
2998 /* overflow, need to check for all hash slots */ 3054 /* overflow, need to check for all hash slots */
2999 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3055 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3000 infy_wd (EV_A_ slot, wd, ev); 3056 infy_wd (EV_A_ slot, wd, ev);
3001 else 3057 else
3002 { 3058 {
3003 WL w_; 3059 WL w_;
3004 3060
3005 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3061 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
3006 { 3062 {
3007 ev_stat *w = (ev_stat *)w_; 3063 ev_stat *w = (ev_stat *)w_;
3008 w_ = w_->next; /* lets us remove this watcher and all before it */ 3064 w_ = w_->next; /* lets us remove this watcher and all before it */
3009 3065
3010 if (w->wd == wd || wd == -1) 3066 if (w->wd == wd || wd == -1)
3011 { 3067 {
3012 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3068 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
3013 { 3069 {
3014 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3070 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
3015 w->wd = -1; 3071 w->wd = -1;
3016 infy_add (EV_A_ w); /* re-add, no matter what */ 3072 infy_add (EV_A_ w); /* re-add, no matter what */
3017 } 3073 }
3018 3074
3019 stat_timer_cb (EV_A_ &w->timer, 0); 3075 stat_timer_cb (EV_A_ &w->timer, 0);
… …
3033 { 3089 {
3034 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3090 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3035 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3091 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3036 ofs += sizeof (struct inotify_event) + ev->len; 3092 ofs += sizeof (struct inotify_event) + ev->len;
3037 } 3093 }
3038}
3039
3040inline_size unsigned int
3041ev_linux_version (void)
3042{
3043 struct utsname buf;
3044 unsigned int v;
3045 int i;
3046 char *p = buf.release;
3047
3048 if (uname (&buf))
3049 return 0;
3050
3051 for (i = 3+1; --i; )
3052 {
3053 unsigned int c = 0;
3054
3055 for (;;)
3056 {
3057 if (*p >= '0' && *p <= '9')
3058 c = c * 10 + *p++ - '0';
3059 else
3060 {
3061 p += *p == '.';
3062 break;
3063 }
3064 }
3065
3066 v = (v << 8) | c;
3067 }
3068
3069 return v;
3070} 3094}
3071 3095
3072inline_size void 3096inline_size void
3073ev_check_2625 (EV_P) 3097ev_check_2625 (EV_P)
3074{ 3098{
… …
3133 ev_io_set (&fs_w, fs_fd, EV_READ); 3157 ev_io_set (&fs_w, fs_fd, EV_READ);
3134 ev_io_start (EV_A_ &fs_w); 3158 ev_io_start (EV_A_ &fs_w);
3135 ev_unref (EV_A); 3159 ev_unref (EV_A);
3136 } 3160 }
3137 3161
3138 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3162 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3139 { 3163 {
3140 WL w_ = fs_hash [slot].head; 3164 WL w_ = fs_hash [slot].head;
3141 fs_hash [slot].head = 0; 3165 fs_hash [slot].head = 0;
3142 3166
3143 while (w_) 3167 while (w_)
… …
3318 3342
3319 EV_FREQUENT_CHECK; 3343 EV_FREQUENT_CHECK;
3320} 3344}
3321#endif 3345#endif
3322 3346
3347#if EV_PREPARE_ENABLE
3323void 3348void
3324ev_prepare_start (EV_P_ ev_prepare *w) 3349ev_prepare_start (EV_P_ ev_prepare *w)
3325{ 3350{
3326 if (expect_false (ev_is_active (w))) 3351 if (expect_false (ev_is_active (w)))
3327 return; 3352 return;
… …
3353 3378
3354 ev_stop (EV_A_ (W)w); 3379 ev_stop (EV_A_ (W)w);
3355 3380
3356 EV_FREQUENT_CHECK; 3381 EV_FREQUENT_CHECK;
3357} 3382}
3383#endif
3358 3384
3385#if EV_CHECK_ENABLE
3359void 3386void
3360ev_check_start (EV_P_ ev_check *w) 3387ev_check_start (EV_P_ ev_check *w)
3361{ 3388{
3362 if (expect_false (ev_is_active (w))) 3389 if (expect_false (ev_is_active (w)))
3363 return; 3390 return;
… …
3389 3416
3390 ev_stop (EV_A_ (W)w); 3417 ev_stop (EV_A_ (W)w);
3391 3418
3392 EV_FREQUENT_CHECK; 3419 EV_FREQUENT_CHECK;
3393} 3420}
3421#endif
3394 3422
3395#if EV_EMBED_ENABLE 3423#if EV_EMBED_ENABLE
3396void noinline 3424void noinline
3397ev_embed_sweep (EV_P_ ev_embed *w) 3425ev_embed_sweep (EV_P_ ev_embed *w)
3398{ 3426{
3399 ev_loop (w->other, EVLOOP_NONBLOCK); 3427 ev_run (w->other, EVRUN_NOWAIT);
3400} 3428}
3401 3429
3402static void 3430static void
3403embed_io_cb (EV_P_ ev_io *io, int revents) 3431embed_io_cb (EV_P_ ev_io *io, int revents)
3404{ 3432{
3405 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3433 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3406 3434
3407 if (ev_cb (w)) 3435 if (ev_cb (w))
3408 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3436 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3409 else 3437 else
3410 ev_loop (w->other, EVLOOP_NONBLOCK); 3438 ev_run (w->other, EVRUN_NOWAIT);
3411} 3439}
3412 3440
3413static void 3441static void
3414embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3442embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3415{ 3443{
… …
3419 EV_P = w->other; 3447 EV_P = w->other;
3420 3448
3421 while (fdchangecnt) 3449 while (fdchangecnt)
3422 { 3450 {
3423 fd_reify (EV_A); 3451 fd_reify (EV_A);
3424 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3452 ev_run (EV_A_ EVRUN_NOWAIT);
3425 } 3453 }
3426 } 3454 }
3427} 3455}
3428 3456
3429static void 3457static void
… …
3435 3463
3436 { 3464 {
3437 EV_P = w->other; 3465 EV_P = w->other;
3438 3466
3439 ev_loop_fork (EV_A); 3467 ev_loop_fork (EV_A);
3440 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3468 ev_run (EV_A_ EVRUN_NOWAIT);
3441 } 3469 }
3442 3470
3443 ev_embed_start (EV_A_ w); 3471 ev_embed_start (EV_A_ w);
3444} 3472}
3445 3473
… …
3544ev_async_start (EV_P_ ev_async *w) 3572ev_async_start (EV_P_ ev_async *w)
3545{ 3573{
3546 if (expect_false (ev_is_active (w))) 3574 if (expect_false (ev_is_active (w)))
3547 return; 3575 return;
3548 3576
3577 w->sent = 0;
3578
3549 evpipe_init (EV_A); 3579 evpipe_init (EV_A);
3550 3580
3551 EV_FREQUENT_CHECK; 3581 EV_FREQUENT_CHECK;
3552 3582
3553 ev_start (EV_A_ (W)w, ++asynccnt); 3583 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3630{ 3660{
3631 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3661 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3632 3662
3633 if (expect_false (!once)) 3663 if (expect_false (!once))
3634 { 3664 {
3635 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3665 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3636 return; 3666 return;
3637 } 3667 }
3638 3668
3639 once->cb = cb; 3669 once->cb = cb;
3640 once->arg = arg; 3670 once->arg = arg;
… …
3727 if (types & EV_ASYNC) 3757 if (types & EV_ASYNC)
3728 for (i = asynccnt; i--; ) 3758 for (i = asynccnt; i--; )
3729 cb (EV_A_ EV_ASYNC, asyncs [i]); 3759 cb (EV_A_ EV_ASYNC, asyncs [i]);
3730#endif 3760#endif
3731 3761
3762#if EV_PREPARE_ENABLE
3732 if (types & EV_PREPARE) 3763 if (types & EV_PREPARE)
3733 for (i = preparecnt; i--; ) 3764 for (i = preparecnt; i--; )
3734#if EV_EMBED_ENABLE 3765# if EV_EMBED_ENABLE
3735 if (ev_cb (prepares [i]) != embed_prepare_cb) 3766 if (ev_cb (prepares [i]) != embed_prepare_cb)
3736#endif 3767# endif
3737 cb (EV_A_ EV_PREPARE, prepares [i]); 3768 cb (EV_A_ EV_PREPARE, prepares [i]);
3769#endif
3738 3770
3771#if EV_CHECK_ENABLE
3739 if (types & EV_CHECK) 3772 if (types & EV_CHECK)
3740 for (i = checkcnt; i--; ) 3773 for (i = checkcnt; i--; )
3741 cb (EV_A_ EV_CHECK, checks [i]); 3774 cb (EV_A_ EV_CHECK, checks [i]);
3775#endif
3742 3776
3777#if EV_SIGNAL_ENABLE
3743 if (types & EV_SIGNAL) 3778 if (types & EV_SIGNAL)
3744 for (i = 0; i < EV_NSIG - 1; ++i) 3779 for (i = 0; i < EV_NSIG - 1; ++i)
3745 for (wl = signals [i].head; wl; ) 3780 for (wl = signals [i].head; wl; )
3746 { 3781 {
3747 wn = wl->next; 3782 wn = wl->next;
3748 cb (EV_A_ EV_SIGNAL, wl); 3783 cb (EV_A_ EV_SIGNAL, wl);
3749 wl = wn; 3784 wl = wn;
3750 } 3785 }
3786#endif
3751 3787
3788#if EV_CHILD_ENABLE
3752 if (types & EV_CHILD) 3789 if (types & EV_CHILD)
3753 for (i = EV_PID_HASHSIZE; i--; ) 3790 for (i = (EV_PID_HASHSIZE); i--; )
3754 for (wl = childs [i]; wl; ) 3791 for (wl = childs [i]; wl; )
3755 { 3792 {
3756 wn = wl->next; 3793 wn = wl->next;
3757 cb (EV_A_ EV_CHILD, wl); 3794 cb (EV_A_ EV_CHILD, wl);
3758 wl = wn; 3795 wl = wn;
3759 } 3796 }
3797#endif
3760/* EV_STAT 0x00001000 /* stat data changed */ 3798/* EV_STAT 0x00001000 /* stat data changed */
3761/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3799/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3762} 3800}
3763#endif 3801#endif
3764 3802
3765#if EV_MULTIPLICITY 3803#if EV_MULTIPLICITY
3766 #include "ev_wrap.h" 3804 #include "ev_wrap.h"
3767#endif 3805#endif
3768 3806
3769#ifdef __cplusplus 3807EV_CPP(})
3770}
3771#endif
3772 3808

Diff Legend

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