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.357 by root, Sat Oct 23 22:25:44 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
… …
630 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 668 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
631 unsigned char unused; 669 unsigned char unused;
632#if EV_USE_EPOLL 670#if EV_USE_EPOLL
633 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
634#endif 672#endif
635#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
636 SOCKET handle; 674 SOCKET handle;
675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
637#endif 678#endif
638} ANFD; 679} ANFD;
639 680
640/* stores the pending event set for a given watcher */ 681/* stores the pending event set for a given watcher */
641typedef struct 682typedef struct
… …
696 737
697 static int ev_default_loop_ptr; 738 static int ev_default_loop_ptr;
698 739
699#endif 740#endif
700 741
701#if EV_MINIMAL < 2 742#if EV_FEATURE_API
702# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 743# 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) 744# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
704# define EV_INVOKE_PENDING invoke_cb (EV_A) 745# define EV_INVOKE_PENDING invoke_cb (EV_A)
705#else 746#else
706# define EV_RELEASE_CB (void)0 747# define EV_RELEASE_CB (void)0
707# define EV_ACQUIRE_CB (void)0 748# define EV_ACQUIRE_CB (void)0
708# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 749# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
709#endif 750#endif
710 751
711#define EVUNLOOP_RECURSE 0x80 752#define EVBREAK_RECURSE 0x80
712 753
713/*****************************************************************************/ 754/*****************************************************************************/
714 755
715#ifndef EV_HAVE_EV_TIME 756#ifndef EV_HAVE_EV_TIME
716ev_tstamp 757ev_tstamp
… …
760 if (delay > 0.) 801 if (delay > 0.)
761 { 802 {
762#if EV_USE_NANOSLEEP 803#if EV_USE_NANOSLEEP
763 struct timespec ts; 804 struct timespec ts;
764 805
765 ts.tv_sec = (time_t)delay; 806 EV_TS_SET (ts, delay);
766 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
767
768 nanosleep (&ts, 0); 807 nanosleep (&ts, 0);
769#elif defined(_WIN32) 808#elif defined(_WIN32)
770 Sleep ((unsigned long)(delay * 1e3)); 809 Sleep ((unsigned long)(delay * 1e3));
771#else 810#else
772 struct timeval tv; 811 struct timeval tv;
773 812
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 */ 813 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
778 /* something not guaranteed by newer posix versions, but guaranteed */ 814 /* something not guaranteed by newer posix versions, but guaranteed */
779 /* by older ones */ 815 /* by older ones */
816 EV_TV_SET (tv, delay);
780 select (0, 0, 0, 0, &tv); 817 select (0, 0, 0, 0, &tv);
781#endif 818#endif
782 } 819 }
783} 820}
784 821
785/*****************************************************************************/ 822/*****************************************************************************/
786 823
787#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 824#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
788 825
789/* find a suitable new size for the given array, */ 826/* find a suitable new size for the given array, */
790/* hopefully by rounding to a ncie-to-malloc size */ 827/* hopefully by rounding to a nice-to-malloc size */
791inline_size int 828inline_size int
792array_nextsize (int elem, int cur, int cnt) 829array_nextsize (int elem, int cur, int cnt)
793{ 830{
794 int ncur = cur + 1; 831 int ncur = cur + 1;
795 832
… …
891} 928}
892 929
893/*****************************************************************************/ 930/*****************************************************************************/
894 931
895inline_speed void 932inline_speed void
896fd_event_nc (EV_P_ int fd, int revents) 933fd_event_nocheck (EV_P_ int fd, int revents)
897{ 934{
898 ANFD *anfd = anfds + fd; 935 ANFD *anfd = anfds + fd;
899 ev_io *w; 936 ev_io *w;
900 937
901 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 938 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
913fd_event (EV_P_ int fd, int revents) 950fd_event (EV_P_ int fd, int revents)
914{ 951{
915 ANFD *anfd = anfds + fd; 952 ANFD *anfd = anfds + fd;
916 953
917 if (expect_true (!anfd->reify)) 954 if (expect_true (!anfd->reify))
918 fd_event_nc (EV_A_ fd, revents); 955 fd_event_nocheck (EV_A_ fd, revents);
919} 956}
920 957
921void 958void
922ev_feed_fd_event (EV_P_ int fd, int revents) 959ev_feed_fd_event (EV_P_ int fd, int revents)
923{ 960{
924 if (fd >= 0 && fd < anfdmax) 961 if (fd >= 0 && fd < anfdmax)
925 fd_event_nc (EV_A_ fd, revents); 962 fd_event_nocheck (EV_A_ fd, revents);
926} 963}
927 964
928/* make sure the external fd watch events are in-sync */ 965/* make sure the external fd watch events are in-sync */
929/* with the kernel/libev internal state */ 966/* with the kernel/libev internal state */
930inline_size void 967inline_size void
… …
936 { 973 {
937 int fd = fdchanges [i]; 974 int fd = fdchanges [i];
938 ANFD *anfd = anfds + fd; 975 ANFD *anfd = anfds + fd;
939 ev_io *w; 976 ev_io *w;
940 977
941 unsigned char events = 0; 978 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify;
942 980
943 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 981 anfd->reify = 0;
944 events |= (unsigned char)w->events;
945 982
946#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
947 if (events) 984 if (o_reify & EV__IOFDSET)
948 { 985 {
949 unsigned long arg; 986 unsigned long arg;
950 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
951 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 988 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
989 printf ("oi %d %x\n", fd, anfd->handle);//D
952 } 990 }
953#endif 991#endif
954 992
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
955 { 994 {
956 unsigned char o_events = anfd->events;
957 unsigned char o_reify = anfd->reify;
958
959 anfd->reify = 0;
960 anfd->events = events; 995 anfd->events = 0;
961 996
962 if (o_events != events || o_reify & EV__IOFDSET) 997 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
998 anfd->events |= (unsigned char)w->events;
999
1000 if (o_events != anfd->events)
1001 o_reify = EV__IOFDSET; /* actually |= */
1002 }
1003
1004 if (o_reify & EV__IOFDSET)
963 backend_modify (EV_A_ fd, o_events, events); 1005 backend_modify (EV_A_ fd, o_events, anfd->events);
964 }
965 } 1006 }
966 1007
967 fdchangecnt = 0; 1008 fdchangecnt = 0;
968} 1009}
969 1010
… …
1062} 1103}
1063 1104
1064/*****************************************************************************/ 1105/*****************************************************************************/
1065 1106
1066/* 1107/*
1067 * the heap functions want a real array index. array index 0 uis guaranteed to not 1108 * 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 1109 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1069 * the branching factor of the d-tree. 1110 * the branching factor of the d-tree.
1070 */ 1111 */
1071 1112
1072/* 1113/*
… …
1272 uint64_t counter = 1; 1313 uint64_t counter = 1;
1273 write (evfd, &counter, sizeof (uint64_t)); 1314 write (evfd, &counter, sizeof (uint64_t));
1274 } 1315 }
1275 else 1316 else
1276#endif 1317#endif
1318 /* win32 people keep sending patches that change this write() to send() */
1319 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1320 /* so when you think this write should be a send instead, please find out */
1321 /* where your send() is from - it's definitely not the microsoft send, and */
1322 /* tell me. thank you. */
1277 write (evpipe [1], &dummy, 1); 1323 write (evpipe [1], &dummy, 1);
1278 1324
1279 errno = old_errno; 1325 errno = old_errno;
1280 } 1326 }
1281} 1327}
… …
1295 } 1341 }
1296 else 1342 else
1297#endif 1343#endif
1298 { 1344 {
1299 char dummy; 1345 char dummy;
1346 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1300 read (evpipe [0], &dummy, 1); 1347 read (evpipe [0], &dummy, 1);
1301 } 1348 }
1302 1349
1303 if (sig_pending) 1350 if (sig_pending)
1304 { 1351 {
… …
1403child_reap (EV_P_ int chain, int pid, int status) 1450child_reap (EV_P_ int chain, int pid, int status)
1404{ 1451{
1405 ev_child *w; 1452 ev_child *w;
1406 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1453 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1407 1454
1408 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1455 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1409 { 1456 {
1410 if ((w->pid == pid || !w->pid) 1457 if ((w->pid == pid || !w->pid)
1411 && (!traced || (w->flags & 1))) 1458 && (!traced || (w->flags & 1)))
1412 { 1459 {
1413 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1460 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 */ 1485 /* 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 */ 1486 /* 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); 1487 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1441 1488
1442 child_reap (EV_A_ pid, pid, status); 1489 child_reap (EV_A_ pid, pid, status);
1443 if (EV_PID_HASHSIZE > 1) 1490 if ((EV_PID_HASHSIZE) > 1)
1444 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1491 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1445} 1492}
1446 1493
1447#endif 1494#endif
1448 1495
1449/*****************************************************************************/ 1496/*****************************************************************************/
1450 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1451#if EV_USE_PORT 1501#if EV_USE_PORT
1452# include "ev_port.c" 1502# include "ev_port.c"
1453#endif 1503#endif
1454#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1455# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1515#ifdef __APPLE__ 1565#ifdef __APPLE__
1516 /* only select works correctly on that "unix-certified" platform */ 1566 /* only select works correctly on that "unix-certified" platform */
1517 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1567 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1518 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1568 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1519#endif 1569#endif
1570#ifdef __FreeBSD__
1571 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1572#endif
1520 1573
1521 return flags; 1574 return flags;
1522} 1575}
1523 1576
1524unsigned int 1577unsigned int
1525ev_embeddable_backends (void) 1578ev_embeddable_backends (void)
1526{ 1579{
1527 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1580 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1528 1581
1529 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1582 /* 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 */ 1583 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1531 flags &= ~EVBACKEND_EPOLL; 1584 flags &= ~EVBACKEND_EPOLL;
1532 1585
1533 return flags; 1586 return flags;
1534} 1587}
1535 1588
1536unsigned int 1589unsigned int
1537ev_backend (EV_P) 1590ev_backend (EV_P)
1538{ 1591{
1539 return backend; 1592 return backend;
1540} 1593}
1541 1594
1542#if EV_MINIMAL < 2 1595#if EV_FEATURE_API
1543unsigned int 1596unsigned int
1544ev_loop_count (EV_P) 1597ev_iteration (EV_P)
1545{ 1598{
1546 return loop_count; 1599 return loop_count;
1547} 1600}
1548 1601
1549unsigned int 1602unsigned int
1550ev_loop_depth (EV_P) 1603ev_depth (EV_P)
1551{ 1604{
1552 return loop_depth; 1605 return loop_depth;
1553} 1606}
1554 1607
1555void 1608void
… …
1627 1680
1628 ev_rt_now = ev_time (); 1681 ev_rt_now = ev_time ();
1629 mn_now = get_clock (); 1682 mn_now = get_clock ();
1630 now_floor = mn_now; 1683 now_floor = mn_now;
1631 rtmn_diff = ev_rt_now - mn_now; 1684 rtmn_diff = ev_rt_now - mn_now;
1632#if EV_MINIMAL < 2 1685#if EV_FEATURE_API
1633 invoke_cb = ev_invoke_pending; 1686 invoke_cb = ev_invoke_pending;
1634#endif 1687#endif
1635 1688
1636 io_blocktime = 0.; 1689 io_blocktime = 0.;
1637 timeout_blocktime = 0.; 1690 timeout_blocktime = 0.;
… …
1649#endif 1702#endif
1650 1703
1651 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1652 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1653 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1654#if EV_USE_PORT 1710#if EV_USE_PORT
1655 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1656#endif 1712#endif
1657#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1658 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1710#endif 1766#endif
1711 1767
1712 if (backend_fd >= 0) 1768 if (backend_fd >= 0)
1713 close (backend_fd); 1769 close (backend_fd);
1714 1770
1771#if EV_USE_IOCP
1772 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1773#endif
1715#if EV_USE_PORT 1774#if EV_USE_PORT
1716 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1775 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1717#endif 1776#endif
1718#if EV_USE_KQUEUE 1777#if EV_USE_KQUEUE
1719 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1778 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1798 { 1857 {
1799 EV_WIN32_CLOSE_FD (evpipe [0]); 1858 EV_WIN32_CLOSE_FD (evpipe [0]);
1800 EV_WIN32_CLOSE_FD (evpipe [1]); 1859 EV_WIN32_CLOSE_FD (evpipe [1]);
1801 } 1860 }
1802 1861
1862#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1803 evpipe_init (EV_A); 1863 evpipe_init (EV_A);
1804 /* now iterate over everything, in case we missed something */ 1864 /* now iterate over everything, in case we missed something */
1805 pipecb (EV_A_ &pipe_w, EV_READ); 1865 pipecb (EV_A_ &pipe_w, EV_READ);
1866#endif
1806 } 1867 }
1807 1868
1808 postfork = 0; 1869 postfork = 0;
1809} 1870}
1810 1871
… …
1872 verify_watcher (EV_A_ ws [cnt]); 1933 verify_watcher (EV_A_ ws [cnt]);
1873 } 1934 }
1874} 1935}
1875#endif 1936#endif
1876 1937
1877#if EV_MINIMAL < 2 1938#if EV_FEATURE_API
1878void 1939void
1879ev_loop_verify (EV_P) 1940ev_verify (EV_P)
1880{ 1941{
1881#if EV_VERIFY 1942#if EV_VERIFY
1882 int i; 1943 int i;
1883 WL w; 1944 WL w;
1884 1945
… …
1923#if EV_ASYNC_ENABLE 1984#if EV_ASYNC_ENABLE
1924 assert (asyncmax >= asynccnt); 1985 assert (asyncmax >= asynccnt);
1925 array_verify (EV_A_ (W *)asyncs, asynccnt); 1986 array_verify (EV_A_ (W *)asyncs, asynccnt);
1926#endif 1987#endif
1927 1988
1989#if EV_PREPARE_ENABLE
1928 assert (preparemax >= preparecnt); 1990 assert (preparemax >= preparecnt);
1929 array_verify (EV_A_ (W *)prepares, preparecnt); 1991 array_verify (EV_A_ (W *)prepares, preparecnt);
1992#endif
1930 1993
1994#if EV_CHECK_ENABLE
1931 assert (checkmax >= checkcnt); 1995 assert (checkmax >= checkcnt);
1932 array_verify (EV_A_ (W *)checks, checkcnt); 1996 array_verify (EV_A_ (W *)checks, checkcnt);
1997#endif
1933 1998
1934# if 0 1999# if 0
1935#if EV_CHILD_ENABLE 2000#if EV_CHILD_ENABLE
1936 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2001 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) 2002 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1938#endif 2003#endif
1939# endif 2004# endif
1940#endif 2005#endif
1941} 2006}
… …
2098 EV_FREQUENT_CHECK; 2163 EV_FREQUENT_CHECK;
2099 feed_reverse (EV_A_ (W)w); 2164 feed_reverse (EV_A_ (W)w);
2100 } 2165 }
2101 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2166 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2102 2167
2103 feed_reverse_done (EV_A_ EV_TIMEOUT); 2168 feed_reverse_done (EV_A_ EV_TIMER);
2104 } 2169 }
2105} 2170}
2106 2171
2107#if EV_PERIODIC_ENABLE 2172#if EV_PERIODIC_ENABLE
2108/* make periodics pending */ 2173/* make periodics pending */
… …
2161 feed_reverse_done (EV_A_ EV_PERIODIC); 2226 feed_reverse_done (EV_A_ EV_PERIODIC);
2162 } 2227 }
2163} 2228}
2164 2229
2165/* simply recalculate all periodics */ 2230/* simply recalculate all periodics */
2166/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2231/* TODO: maybe ensure that at least one event happens when jumping forward? */
2167static void noinline 2232static void noinline
2168periodics_reschedule (EV_P) 2233periodics_reschedule (EV_P)
2169{ 2234{
2170 int i; 2235 int i;
2171 2236
… …
2267 mn_now = ev_rt_now; 2332 mn_now = ev_rt_now;
2268 } 2333 }
2269} 2334}
2270 2335
2271void 2336void
2272ev_loop (EV_P_ int flags) 2337ev_run (EV_P_ int flags)
2273{ 2338{
2274#if EV_MINIMAL < 2 2339#if EV_FEATURE_API
2275 ++loop_depth; 2340 ++loop_depth;
2276#endif 2341#endif
2277 2342
2278 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2343 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2279 2344
2280 loop_done = EVUNLOOP_CANCEL; 2345 loop_done = EVBREAK_CANCEL;
2281 2346
2282 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2347 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2283 2348
2284 do 2349 do
2285 { 2350 {
2286#if EV_VERIFY >= 2 2351#if EV_VERIFY >= 2
2287 ev_loop_verify (EV_A); 2352 ev_verify (EV_A);
2288#endif 2353#endif
2289 2354
2290#ifndef _WIN32 2355#ifndef _WIN32
2291 if (expect_false (curpid)) /* penalise the forking check even more */ 2356 if (expect_false (curpid)) /* penalise the forking check even more */
2292 if (expect_false (getpid () != curpid)) 2357 if (expect_false (getpid () != curpid))
… …
2304 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2369 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2305 EV_INVOKE_PENDING; 2370 EV_INVOKE_PENDING;
2306 } 2371 }
2307#endif 2372#endif
2308 2373
2374#if EV_PREPARE_ENABLE
2309 /* queue prepare watchers (and execute them) */ 2375 /* queue prepare watchers (and execute them) */
2310 if (expect_false (preparecnt)) 2376 if (expect_false (preparecnt))
2311 { 2377 {
2312 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2378 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2313 EV_INVOKE_PENDING; 2379 EV_INVOKE_PENDING;
2314 } 2380 }
2381#endif
2315 2382
2316 if (expect_false (loop_done)) 2383 if (expect_false (loop_done))
2317 break; 2384 break;
2318 2385
2319 /* we might have forked, so reify kernel state if necessary */ 2386 /* we might have forked, so reify kernel state if necessary */
… …
2326 /* calculate blocking time */ 2393 /* calculate blocking time */
2327 { 2394 {
2328 ev_tstamp waittime = 0.; 2395 ev_tstamp waittime = 0.;
2329 ev_tstamp sleeptime = 0.; 2396 ev_tstamp sleeptime = 0.;
2330 2397
2398 /* remember old timestamp for io_blocktime calculation */
2399 ev_tstamp prev_mn_now = mn_now;
2400
2401 /* update time to cancel out callback processing overhead */
2402 time_update (EV_A_ 1e100);
2403
2331 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2404 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2332 { 2405 {
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; 2406 waittime = MAX_BLOCKTIME;
2340 2407
2341 if (timercnt) 2408 if (timercnt)
2342 { 2409 {
2343 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2410 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2370 waittime -= sleeptime; 2437 waittime -= sleeptime;
2371 } 2438 }
2372 } 2439 }
2373 } 2440 }
2374 2441
2375#if EV_MINIMAL < 2 2442#if EV_FEATURE_API
2376 ++loop_count; 2443 ++loop_count;
2377#endif 2444#endif
2378 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2445 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2379 backend_poll (EV_A_ waittime); 2446 backend_poll (EV_A_ waittime);
2380 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2447 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2381 2448
2382 /* update ev_rt_now, do magic */ 2449 /* update ev_rt_now, do magic */
2383 time_update (EV_A_ waittime + sleeptime); 2450 time_update (EV_A_ waittime + sleeptime);
2384 } 2451 }
2385 2452
… …
2392#if EV_IDLE_ENABLE 2459#if EV_IDLE_ENABLE
2393 /* queue idle watchers unless other events are pending */ 2460 /* queue idle watchers unless other events are pending */
2394 idle_reify (EV_A); 2461 idle_reify (EV_A);
2395#endif 2462#endif
2396 2463
2464#if EV_CHECK_ENABLE
2397 /* queue check watchers, to be executed first */ 2465 /* queue check watchers, to be executed first */
2398 if (expect_false (checkcnt)) 2466 if (expect_false (checkcnt))
2399 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2467 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2468#endif
2400 2469
2401 EV_INVOKE_PENDING; 2470 EV_INVOKE_PENDING;
2402 } 2471 }
2403 while (expect_true ( 2472 while (expect_true (
2404 activecnt 2473 activecnt
2405 && !loop_done 2474 && !loop_done
2406 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2475 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2407 )); 2476 ));
2408 2477
2409 if (loop_done == EVUNLOOP_ONE) 2478 if (loop_done == EVBREAK_ONE)
2410 loop_done = EVUNLOOP_CANCEL; 2479 loop_done = EVBREAK_CANCEL;
2411 2480
2412#if EV_MINIMAL < 2 2481#if EV_FEATURE_API
2413 --loop_depth; 2482 --loop_depth;
2414#endif 2483#endif
2415} 2484}
2416 2485
2417void 2486void
2418ev_unloop (EV_P_ int how) 2487ev_break (EV_P_ int how)
2419{ 2488{
2420 loop_done = how; 2489 loop_done = how;
2421} 2490}
2422 2491
2423void 2492void
… …
2571 EV_FREQUENT_CHECK; 2640 EV_FREQUENT_CHECK;
2572 2641
2573 wlist_del (&anfds[w->fd].head, (WL)w); 2642 wlist_del (&anfds[w->fd].head, (WL)w);
2574 ev_stop (EV_A_ (W)w); 2643 ev_stop (EV_A_ (W)w);
2575 2644
2576 fd_change (EV_A_ w->fd, 1); 2645 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2577 2646
2578 EV_FREQUENT_CHECK; 2647 EV_FREQUENT_CHECK;
2579} 2648}
2580 2649
2581void noinline 2650void noinline
… …
2867 return; 2936 return;
2868 2937
2869 EV_FREQUENT_CHECK; 2938 EV_FREQUENT_CHECK;
2870 2939
2871 ev_start (EV_A_ (W)w, 1); 2940 ev_start (EV_A_ (W)w, 1);
2872 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2941 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2873 2942
2874 EV_FREQUENT_CHECK; 2943 EV_FREQUENT_CHECK;
2875} 2944}
2876 2945
2877void 2946void
… …
2881 if (expect_false (!ev_is_active (w))) 2950 if (expect_false (!ev_is_active (w)))
2882 return; 2951 return;
2883 2952
2884 EV_FREQUENT_CHECK; 2953 EV_FREQUENT_CHECK;
2885 2954
2886 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2955 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2887 ev_stop (EV_A_ (W)w); 2956 ev_stop (EV_A_ (W)w);
2888 2957
2889 EV_FREQUENT_CHECK; 2958 EV_FREQUENT_CHECK;
2890} 2959}
2891 2960
… …
2964 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3033 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2965 } 3034 }
2966 } 3035 }
2967 3036
2968 if (w->wd >= 0) 3037 if (w->wd >= 0)
2969 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3038 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2970 3039
2971 /* now re-arm timer, if required */ 3040 /* now re-arm timer, if required */
2972 if (ev_is_active (&w->timer)) ev_ref (EV_A); 3041 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2973 ev_timer_again (EV_A_ &w->timer); 3042 ev_timer_again (EV_A_ &w->timer);
2974 if (ev_is_active (&w->timer)) ev_unref (EV_A); 3043 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2982 3051
2983 if (wd < 0) 3052 if (wd < 0)
2984 return; 3053 return;
2985 3054
2986 w->wd = -2; 3055 w->wd = -2;
2987 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3056 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2988 wlist_del (&fs_hash [slot].head, (WL)w); 3057 wlist_del (&fs_hash [slot].head, (WL)w);
2989 3058
2990 /* remove this watcher, if others are watching it, they will rearm */ 3059 /* remove this watcher, if others are watching it, they will rearm */
2991 inotify_rm_watch (fs_fd, wd); 3060 inotify_rm_watch (fs_fd, wd);
2992} 3061}
… …
2994static void noinline 3063static void noinline
2995infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3064infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2996{ 3065{
2997 if (slot < 0) 3066 if (slot < 0)
2998 /* overflow, need to check for all hash slots */ 3067 /* overflow, need to check for all hash slots */
2999 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3068 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3000 infy_wd (EV_A_ slot, wd, ev); 3069 infy_wd (EV_A_ slot, wd, ev);
3001 else 3070 else
3002 { 3071 {
3003 WL w_; 3072 WL w_;
3004 3073
3005 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3074 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
3006 { 3075 {
3007 ev_stat *w = (ev_stat *)w_; 3076 ev_stat *w = (ev_stat *)w_;
3008 w_ = w_->next; /* lets us remove this watcher and all before it */ 3077 w_ = w_->next; /* lets us remove this watcher and all before it */
3009 3078
3010 if (w->wd == wd || wd == -1) 3079 if (w->wd == wd || wd == -1)
3011 { 3080 {
3012 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3081 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
3013 { 3082 {
3014 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3083 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
3015 w->wd = -1; 3084 w->wd = -1;
3016 infy_add (EV_A_ w); /* re-add, no matter what */ 3085 infy_add (EV_A_ w); /* re-add, no matter what */
3017 } 3086 }
3018 3087
3019 stat_timer_cb (EV_A_ &w->timer, 0); 3088 stat_timer_cb (EV_A_ &w->timer, 0);
… …
3033 { 3102 {
3034 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3103 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3035 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3104 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3036 ofs += sizeof (struct inotify_event) + ev->len; 3105 ofs += sizeof (struct inotify_event) + ev->len;
3037 } 3106 }
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} 3107}
3071 3108
3072inline_size void 3109inline_size void
3073ev_check_2625 (EV_P) 3110ev_check_2625 (EV_P)
3074{ 3111{
… …
3133 ev_io_set (&fs_w, fs_fd, EV_READ); 3170 ev_io_set (&fs_w, fs_fd, EV_READ);
3134 ev_io_start (EV_A_ &fs_w); 3171 ev_io_start (EV_A_ &fs_w);
3135 ev_unref (EV_A); 3172 ev_unref (EV_A);
3136 } 3173 }
3137 3174
3138 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3175 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3139 { 3176 {
3140 WL w_ = fs_hash [slot].head; 3177 WL w_ = fs_hash [slot].head;
3141 fs_hash [slot].head = 0; 3178 fs_hash [slot].head = 0;
3142 3179
3143 while (w_) 3180 while (w_)
… …
3318 3355
3319 EV_FREQUENT_CHECK; 3356 EV_FREQUENT_CHECK;
3320} 3357}
3321#endif 3358#endif
3322 3359
3360#if EV_PREPARE_ENABLE
3323void 3361void
3324ev_prepare_start (EV_P_ ev_prepare *w) 3362ev_prepare_start (EV_P_ ev_prepare *w)
3325{ 3363{
3326 if (expect_false (ev_is_active (w))) 3364 if (expect_false (ev_is_active (w)))
3327 return; 3365 return;
… …
3353 3391
3354 ev_stop (EV_A_ (W)w); 3392 ev_stop (EV_A_ (W)w);
3355 3393
3356 EV_FREQUENT_CHECK; 3394 EV_FREQUENT_CHECK;
3357} 3395}
3396#endif
3358 3397
3398#if EV_CHECK_ENABLE
3359void 3399void
3360ev_check_start (EV_P_ ev_check *w) 3400ev_check_start (EV_P_ ev_check *w)
3361{ 3401{
3362 if (expect_false (ev_is_active (w))) 3402 if (expect_false (ev_is_active (w)))
3363 return; 3403 return;
… …
3389 3429
3390 ev_stop (EV_A_ (W)w); 3430 ev_stop (EV_A_ (W)w);
3391 3431
3392 EV_FREQUENT_CHECK; 3432 EV_FREQUENT_CHECK;
3393} 3433}
3434#endif
3394 3435
3395#if EV_EMBED_ENABLE 3436#if EV_EMBED_ENABLE
3396void noinline 3437void noinline
3397ev_embed_sweep (EV_P_ ev_embed *w) 3438ev_embed_sweep (EV_P_ ev_embed *w)
3398{ 3439{
3399 ev_loop (w->other, EVLOOP_NONBLOCK); 3440 ev_run (w->other, EVRUN_NOWAIT);
3400} 3441}
3401 3442
3402static void 3443static void
3403embed_io_cb (EV_P_ ev_io *io, int revents) 3444embed_io_cb (EV_P_ ev_io *io, int revents)
3404{ 3445{
3405 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3446 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3406 3447
3407 if (ev_cb (w)) 3448 if (ev_cb (w))
3408 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3449 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3409 else 3450 else
3410 ev_loop (w->other, EVLOOP_NONBLOCK); 3451 ev_run (w->other, EVRUN_NOWAIT);
3411} 3452}
3412 3453
3413static void 3454static void
3414embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3455embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3415{ 3456{
… …
3419 EV_P = w->other; 3460 EV_P = w->other;
3420 3461
3421 while (fdchangecnt) 3462 while (fdchangecnt)
3422 { 3463 {
3423 fd_reify (EV_A); 3464 fd_reify (EV_A);
3424 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3465 ev_run (EV_A_ EVRUN_NOWAIT);
3425 } 3466 }
3426 } 3467 }
3427} 3468}
3428 3469
3429static void 3470static void
… …
3435 3476
3436 { 3477 {
3437 EV_P = w->other; 3478 EV_P = w->other;
3438 3479
3439 ev_loop_fork (EV_A); 3480 ev_loop_fork (EV_A);
3440 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3481 ev_run (EV_A_ EVRUN_NOWAIT);
3441 } 3482 }
3442 3483
3443 ev_embed_start (EV_A_ w); 3484 ev_embed_start (EV_A_ w);
3444} 3485}
3445 3486
… …
3544ev_async_start (EV_P_ ev_async *w) 3585ev_async_start (EV_P_ ev_async *w)
3545{ 3586{
3546 if (expect_false (ev_is_active (w))) 3587 if (expect_false (ev_is_active (w)))
3547 return; 3588 return;
3548 3589
3590 w->sent = 0;
3591
3549 evpipe_init (EV_A); 3592 evpipe_init (EV_A);
3550 3593
3551 EV_FREQUENT_CHECK; 3594 EV_FREQUENT_CHECK;
3552 3595
3553 ev_start (EV_A_ (W)w, ++asynccnt); 3596 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3630{ 3673{
3631 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3674 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3632 3675
3633 if (expect_false (!once)) 3676 if (expect_false (!once))
3634 { 3677 {
3635 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3678 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3636 return; 3679 return;
3637 } 3680 }
3638 3681
3639 once->cb = cb; 3682 once->cb = cb;
3640 once->arg = arg; 3683 once->arg = arg;
… …
3727 if (types & EV_ASYNC) 3770 if (types & EV_ASYNC)
3728 for (i = asynccnt; i--; ) 3771 for (i = asynccnt; i--; )
3729 cb (EV_A_ EV_ASYNC, asyncs [i]); 3772 cb (EV_A_ EV_ASYNC, asyncs [i]);
3730#endif 3773#endif
3731 3774
3775#if EV_PREPARE_ENABLE
3732 if (types & EV_PREPARE) 3776 if (types & EV_PREPARE)
3733 for (i = preparecnt; i--; ) 3777 for (i = preparecnt; i--; )
3734#if EV_EMBED_ENABLE 3778# if EV_EMBED_ENABLE
3735 if (ev_cb (prepares [i]) != embed_prepare_cb) 3779 if (ev_cb (prepares [i]) != embed_prepare_cb)
3736#endif 3780# endif
3737 cb (EV_A_ EV_PREPARE, prepares [i]); 3781 cb (EV_A_ EV_PREPARE, prepares [i]);
3782#endif
3738 3783
3784#if EV_CHECK_ENABLE
3739 if (types & EV_CHECK) 3785 if (types & EV_CHECK)
3740 for (i = checkcnt; i--; ) 3786 for (i = checkcnt; i--; )
3741 cb (EV_A_ EV_CHECK, checks [i]); 3787 cb (EV_A_ EV_CHECK, checks [i]);
3788#endif
3742 3789
3790#if EV_SIGNAL_ENABLE
3743 if (types & EV_SIGNAL) 3791 if (types & EV_SIGNAL)
3744 for (i = 0; i < EV_NSIG - 1; ++i) 3792 for (i = 0; i < EV_NSIG - 1; ++i)
3745 for (wl = signals [i].head; wl; ) 3793 for (wl = signals [i].head; wl; )
3746 { 3794 {
3747 wn = wl->next; 3795 wn = wl->next;
3748 cb (EV_A_ EV_SIGNAL, wl); 3796 cb (EV_A_ EV_SIGNAL, wl);
3749 wl = wn; 3797 wl = wn;
3750 } 3798 }
3799#endif
3751 3800
3801#if EV_CHILD_ENABLE
3752 if (types & EV_CHILD) 3802 if (types & EV_CHILD)
3753 for (i = EV_PID_HASHSIZE; i--; ) 3803 for (i = (EV_PID_HASHSIZE); i--; )
3754 for (wl = childs [i]; wl; ) 3804 for (wl = childs [i]; wl; )
3755 { 3805 {
3756 wn = wl->next; 3806 wn = wl->next;
3757 cb (EV_A_ EV_CHILD, wl); 3807 cb (EV_A_ EV_CHILD, wl);
3758 wl = wn; 3808 wl = wn;
3759 } 3809 }
3810#endif
3760/* EV_STAT 0x00001000 /* stat data changed */ 3811/* EV_STAT 0x00001000 /* stat data changed */
3761/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3812/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3762} 3813}
3763#endif 3814#endif
3764 3815
3765#if EV_MULTIPLICITY 3816#if EV_MULTIPLICITY
3766 #include "ev_wrap.h" 3817 #include "ev_wrap.h"
3767#endif 3818#endif
3768 3819
3769#ifdef __cplusplus 3820EV_CPP(})
3770}
3771#endif
3772 3821

Diff Legend

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