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

Comparing libev/ev.c (file contents):
Revision 1.337 by root, Wed Mar 10 09:18:24 2010 UTC vs.
Revision 1.362 by root, Sun Oct 24 19:15: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 unsigned int v = 0;
536 struct utsname buf;
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
… …
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);
… …
1675#endif 1731#endif
1676 } 1732 }
1677} 1733}
1678 1734
1679/* free up a loop structure */ 1735/* free up a loop structure */
1680static void noinline 1736void
1681loop_destroy (EV_P) 1737ev_loop_destroy (EV_P)
1682{ 1738{
1683 int i; 1739 int i;
1740
1741#if EV_CLEANUP_ENABLE
1742 /* queue cleanup watchers (and execute them) */
1743 if (expect_false (cleanupcnt))
1744 {
1745 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1746 EV_INVOKE_PENDING;
1747 }
1748#endif
1749
1750#if EV_CHILD_ENABLE
1751 if (ev_is_active (&childev))
1752 {
1753 ev_ref (EV_A); /* child watcher */
1754 ev_signal_stop (EV_A_ &childev);
1755 }
1756#endif
1684 1757
1685 if (ev_is_active (&pipe_w)) 1758 if (ev_is_active (&pipe_w))
1686 { 1759 {
1687 /*ev_ref (EV_A);*/ 1760 /*ev_ref (EV_A);*/
1688 /*ev_io_stop (EV_A_ &pipe_w);*/ 1761 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1710#endif 1783#endif
1711 1784
1712 if (backend_fd >= 0) 1785 if (backend_fd >= 0)
1713 close (backend_fd); 1786 close (backend_fd);
1714 1787
1788#if EV_USE_IOCP
1789 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1790#endif
1715#if EV_USE_PORT 1791#if EV_USE_PORT
1716 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1792 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1717#endif 1793#endif
1718#if EV_USE_KQUEUE 1794#if EV_USE_KQUEUE
1719 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1795 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1746 array_free (periodic, EMPTY); 1822 array_free (periodic, EMPTY);
1747#endif 1823#endif
1748#if EV_FORK_ENABLE 1824#if EV_FORK_ENABLE
1749 array_free (fork, EMPTY); 1825 array_free (fork, EMPTY);
1750#endif 1826#endif
1827#if EV_CLEANUP_ENABLE
1828 array_free (cleanup, EMPTY);
1829#endif
1751 array_free (prepare, EMPTY); 1830 array_free (prepare, EMPTY);
1752 array_free (check, EMPTY); 1831 array_free (check, EMPTY);
1753#if EV_ASYNC_ENABLE 1832#if EV_ASYNC_ENABLE
1754 array_free (async, EMPTY); 1833 array_free (async, EMPTY);
1755#endif 1834#endif
1756 1835
1757 backend = 0; 1836 backend = 0;
1837
1838#if EV_MULTIPLICITY
1839 if (ev_is_default_loop (EV_A))
1840#endif
1841 ev_default_loop_ptr = 0;
1842#if EV_MULTIPLICITY
1843 else
1844 ev_free (EV_A);
1845#endif
1758} 1846}
1759 1847
1760#if EV_USE_INOTIFY 1848#if EV_USE_INOTIFY
1761inline_size void infy_fork (EV_P); 1849inline_size void infy_fork (EV_P);
1762#endif 1850#endif
… …
1821 loop_init (EV_A_ flags); 1909 loop_init (EV_A_ flags);
1822 1910
1823 if (ev_backend (EV_A)) 1911 if (ev_backend (EV_A))
1824 return EV_A; 1912 return EV_A;
1825 1913
1914 ev_free (EV_A);
1826 return 0; 1915 return 0;
1827} 1916}
1828 1917
1829void
1830ev_loop_destroy (EV_P)
1831{
1832 loop_destroy (EV_A);
1833 ev_free (loop);
1834}
1835
1836void
1837ev_loop_fork (EV_P)
1838{
1839 postfork = 1; /* must be in line with ev_default_fork */
1840}
1841#endif /* multiplicity */ 1918#endif /* multiplicity */
1842 1919
1843#if EV_VERIFY 1920#if EV_VERIFY
1844static void noinline 1921static void noinline
1845verify_watcher (EV_P_ W w) 1922verify_watcher (EV_P_ W w)
… …
1874 verify_watcher (EV_A_ ws [cnt]); 1951 verify_watcher (EV_A_ ws [cnt]);
1875 } 1952 }
1876} 1953}
1877#endif 1954#endif
1878 1955
1879#if EV_MINIMAL < 2 1956#if EV_FEATURE_API
1880void 1957void
1881ev_loop_verify (EV_P) 1958ev_verify (EV_P)
1882{ 1959{
1883#if EV_VERIFY 1960#if EV_VERIFY
1884 int i; 1961 int i;
1885 WL w; 1962 WL w;
1886 1963
… …
1920#if EV_FORK_ENABLE 1997#if EV_FORK_ENABLE
1921 assert (forkmax >= forkcnt); 1998 assert (forkmax >= forkcnt);
1922 array_verify (EV_A_ (W *)forks, forkcnt); 1999 array_verify (EV_A_ (W *)forks, forkcnt);
1923#endif 2000#endif
1924 2001
2002#if EV_CLEANUP_ENABLE
2003 assert (cleanupmax >= cleanupcnt);
2004 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2005#endif
2006
1925#if EV_ASYNC_ENABLE 2007#if EV_ASYNC_ENABLE
1926 assert (asyncmax >= asynccnt); 2008 assert (asyncmax >= asynccnt);
1927 array_verify (EV_A_ (W *)asyncs, asynccnt); 2009 array_verify (EV_A_ (W *)asyncs, asynccnt);
1928#endif 2010#endif
1929 2011
… …
1937 array_verify (EV_A_ (W *)checks, checkcnt); 2019 array_verify (EV_A_ (W *)checks, checkcnt);
1938#endif 2020#endif
1939 2021
1940# if 0 2022# if 0
1941#if EV_CHILD_ENABLE 2023#if EV_CHILD_ENABLE
1942 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2024 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1943 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 2025 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1944#endif 2026#endif
1945# endif 2027# endif
1946#endif 2028#endif
1947} 2029}
1948#endif 2030#endif
1949 2031
1950#if EV_MULTIPLICITY 2032#if EV_MULTIPLICITY
1951struct ev_loop * 2033struct ev_loop *
1952ev_default_loop_init (unsigned int flags)
1953#else 2034#else
1954int 2035int
2036#endif
1955ev_default_loop (unsigned int flags) 2037ev_default_loop (unsigned int flags)
1956#endif
1957{ 2038{
1958 if (!ev_default_loop_ptr) 2039 if (!ev_default_loop_ptr)
1959 { 2040 {
1960#if EV_MULTIPLICITY 2041#if EV_MULTIPLICITY
1961 EV_P = ev_default_loop_ptr = &default_loop_struct; 2042 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1980 2061
1981 return ev_default_loop_ptr; 2062 return ev_default_loop_ptr;
1982} 2063}
1983 2064
1984void 2065void
1985ev_default_destroy (void) 2066ev_loop_fork (EV_P)
1986{ 2067{
1987#if EV_MULTIPLICITY
1988 EV_P = ev_default_loop_ptr;
1989#endif
1990
1991 ev_default_loop_ptr = 0;
1992
1993#if EV_CHILD_ENABLE
1994 ev_ref (EV_A); /* child watcher */
1995 ev_signal_stop (EV_A_ &childev);
1996#endif
1997
1998 loop_destroy (EV_A);
1999}
2000
2001void
2002ev_default_fork (void)
2003{
2004#if EV_MULTIPLICITY
2005 EV_P = ev_default_loop_ptr;
2006#endif
2007
2008 postfork = 1; /* must be in line with ev_loop_fork */ 2068 postfork = 1; /* must be in line with ev_default_fork */
2009} 2069}
2010 2070
2011/*****************************************************************************/ 2071/*****************************************************************************/
2012 2072
2013void 2073void
… …
2104 EV_FREQUENT_CHECK; 2164 EV_FREQUENT_CHECK;
2105 feed_reverse (EV_A_ (W)w); 2165 feed_reverse (EV_A_ (W)w);
2106 } 2166 }
2107 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2167 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2108 2168
2109 feed_reverse_done (EV_A_ EV_TIMEOUT); 2169 feed_reverse_done (EV_A_ EV_TIMER);
2110 } 2170 }
2111} 2171}
2112 2172
2113#if EV_PERIODIC_ENABLE 2173#if EV_PERIODIC_ENABLE
2114/* make periodics pending */ 2174/* make periodics pending */
… …
2167 feed_reverse_done (EV_A_ EV_PERIODIC); 2227 feed_reverse_done (EV_A_ EV_PERIODIC);
2168 } 2228 }
2169} 2229}
2170 2230
2171/* simply recalculate all periodics */ 2231/* simply recalculate all periodics */
2172/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2232/* TODO: maybe ensure that at least one event happens when jumping forward? */
2173static void noinline 2233static void noinline
2174periodics_reschedule (EV_P) 2234periodics_reschedule (EV_P)
2175{ 2235{
2176 int i; 2236 int i;
2177 2237
… …
2273 mn_now = ev_rt_now; 2333 mn_now = ev_rt_now;
2274 } 2334 }
2275} 2335}
2276 2336
2277void 2337void
2278ev_loop (EV_P_ int flags) 2338ev_run (EV_P_ int flags)
2279{ 2339{
2280#if EV_MINIMAL < 2 2340#if EV_FEATURE_API
2281 ++loop_depth; 2341 ++loop_depth;
2282#endif 2342#endif
2283 2343
2284 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2344 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2285 2345
2286 loop_done = EVUNLOOP_CANCEL; 2346 loop_done = EVBREAK_CANCEL;
2287 2347
2288 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2348 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2289 2349
2290 do 2350 do
2291 { 2351 {
2292#if EV_VERIFY >= 2 2352#if EV_VERIFY >= 2
2293 ev_loop_verify (EV_A); 2353 ev_verify (EV_A);
2294#endif 2354#endif
2295 2355
2296#ifndef _WIN32 2356#ifndef _WIN32
2297 if (expect_false (curpid)) /* penalise the forking check even more */ 2357 if (expect_false (curpid)) /* penalise the forking check even more */
2298 if (expect_false (getpid () != curpid)) 2358 if (expect_false (getpid () != curpid))
… …
2334 /* calculate blocking time */ 2394 /* calculate blocking time */
2335 { 2395 {
2336 ev_tstamp waittime = 0.; 2396 ev_tstamp waittime = 0.;
2337 ev_tstamp sleeptime = 0.; 2397 ev_tstamp sleeptime = 0.;
2338 2398
2399 /* remember old timestamp for io_blocktime calculation */
2400 ev_tstamp prev_mn_now = mn_now;
2401
2402 /* update time to cancel out callback processing overhead */
2403 time_update (EV_A_ 1e100);
2404
2339 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2405 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2340 { 2406 {
2341 /* remember old timestamp for io_blocktime calculation */
2342 ev_tstamp prev_mn_now = mn_now;
2343
2344 /* update time to cancel out callback processing overhead */
2345 time_update (EV_A_ 1e100);
2346
2347 waittime = MAX_BLOCKTIME; 2407 waittime = MAX_BLOCKTIME;
2348 2408
2349 if (timercnt) 2409 if (timercnt)
2350 { 2410 {
2351 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2411 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2378 waittime -= sleeptime; 2438 waittime -= sleeptime;
2379 } 2439 }
2380 } 2440 }
2381 } 2441 }
2382 2442
2383#if EV_MINIMAL < 2 2443#if EV_FEATURE_API
2384 ++loop_count; 2444 ++loop_count;
2385#endif 2445#endif
2386 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2446 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2387 backend_poll (EV_A_ waittime); 2447 backend_poll (EV_A_ waittime);
2388 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2448 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2389 2449
2390 /* update ev_rt_now, do magic */ 2450 /* update ev_rt_now, do magic */
2391 time_update (EV_A_ waittime + sleeptime); 2451 time_update (EV_A_ waittime + sleeptime);
2392 } 2452 }
2393 2453
… …
2411 EV_INVOKE_PENDING; 2471 EV_INVOKE_PENDING;
2412 } 2472 }
2413 while (expect_true ( 2473 while (expect_true (
2414 activecnt 2474 activecnt
2415 && !loop_done 2475 && !loop_done
2416 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2476 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2417 )); 2477 ));
2418 2478
2419 if (loop_done == EVUNLOOP_ONE) 2479 if (loop_done == EVBREAK_ONE)
2420 loop_done = EVUNLOOP_CANCEL; 2480 loop_done = EVBREAK_CANCEL;
2421 2481
2422#if EV_MINIMAL < 2 2482#if EV_FEATURE_API
2423 --loop_depth; 2483 --loop_depth;
2424#endif 2484#endif
2425} 2485}
2426 2486
2427void 2487void
2428ev_unloop (EV_P_ int how) 2488ev_break (EV_P_ int how)
2429{ 2489{
2430 loop_done = how; 2490 loop_done = how;
2431} 2491}
2432 2492
2433void 2493void
… …
2581 EV_FREQUENT_CHECK; 2641 EV_FREQUENT_CHECK;
2582 2642
2583 wlist_del (&anfds[w->fd].head, (WL)w); 2643 wlist_del (&anfds[w->fd].head, (WL)w);
2584 ev_stop (EV_A_ (W)w); 2644 ev_stop (EV_A_ (W)w);
2585 2645
2586 fd_change (EV_A_ w->fd, 1); 2646 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2587 2647
2588 EV_FREQUENT_CHECK; 2648 EV_FREQUENT_CHECK;
2589} 2649}
2590 2650
2591void noinline 2651void noinline
… …
2877 return; 2937 return;
2878 2938
2879 EV_FREQUENT_CHECK; 2939 EV_FREQUENT_CHECK;
2880 2940
2881 ev_start (EV_A_ (W)w, 1); 2941 ev_start (EV_A_ (W)w, 1);
2882 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2942 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2883 2943
2884 EV_FREQUENT_CHECK; 2944 EV_FREQUENT_CHECK;
2885} 2945}
2886 2946
2887void 2947void
… …
2891 if (expect_false (!ev_is_active (w))) 2951 if (expect_false (!ev_is_active (w)))
2892 return; 2952 return;
2893 2953
2894 EV_FREQUENT_CHECK; 2954 EV_FREQUENT_CHECK;
2895 2955
2896 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2956 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2897 ev_stop (EV_A_ (W)w); 2957 ev_stop (EV_A_ (W)w);
2898 2958
2899 EV_FREQUENT_CHECK; 2959 EV_FREQUENT_CHECK;
2900} 2960}
2901 2961
… …
2974 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3034 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2975 } 3035 }
2976 } 3036 }
2977 3037
2978 if (w->wd >= 0) 3038 if (w->wd >= 0)
2979 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3039 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2980 3040
2981 /* now re-arm timer, if required */ 3041 /* now re-arm timer, if required */
2982 if (ev_is_active (&w->timer)) ev_ref (EV_A); 3042 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2983 ev_timer_again (EV_A_ &w->timer); 3043 ev_timer_again (EV_A_ &w->timer);
2984 if (ev_is_active (&w->timer)) ev_unref (EV_A); 3044 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2992 3052
2993 if (wd < 0) 3053 if (wd < 0)
2994 return; 3054 return;
2995 3055
2996 w->wd = -2; 3056 w->wd = -2;
2997 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3057 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2998 wlist_del (&fs_hash [slot].head, (WL)w); 3058 wlist_del (&fs_hash [slot].head, (WL)w);
2999 3059
3000 /* remove this watcher, if others are watching it, they will rearm */ 3060 /* remove this watcher, if others are watching it, they will rearm */
3001 inotify_rm_watch (fs_fd, wd); 3061 inotify_rm_watch (fs_fd, wd);
3002} 3062}
… …
3004static void noinline 3064static void noinline
3005infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3065infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
3006{ 3066{
3007 if (slot < 0) 3067 if (slot < 0)
3008 /* overflow, need to check for all hash slots */ 3068 /* overflow, need to check for all hash slots */
3009 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3069 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3010 infy_wd (EV_A_ slot, wd, ev); 3070 infy_wd (EV_A_ slot, wd, ev);
3011 else 3071 else
3012 { 3072 {
3013 WL w_; 3073 WL w_;
3014 3074
3015 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3075 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
3016 { 3076 {
3017 ev_stat *w = (ev_stat *)w_; 3077 ev_stat *w = (ev_stat *)w_;
3018 w_ = w_->next; /* lets us remove this watcher and all before it */ 3078 w_ = w_->next; /* lets us remove this watcher and all before it */
3019 3079
3020 if (w->wd == wd || wd == -1) 3080 if (w->wd == wd || wd == -1)
3021 { 3081 {
3022 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3082 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
3023 { 3083 {
3024 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3084 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
3025 w->wd = -1; 3085 w->wd = -1;
3026 infy_add (EV_A_ w); /* re-add, no matter what */ 3086 infy_add (EV_A_ w); /* re-add, no matter what */
3027 } 3087 }
3028 3088
3029 stat_timer_cb (EV_A_ &w->timer, 0); 3089 stat_timer_cb (EV_A_ &w->timer, 0);
… …
3043 { 3103 {
3044 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3104 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3045 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3105 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3046 ofs += sizeof (struct inotify_event) + ev->len; 3106 ofs += sizeof (struct inotify_event) + ev->len;
3047 } 3107 }
3048}
3049
3050inline_size unsigned int
3051ev_linux_version (void)
3052{
3053 struct utsname buf;
3054 unsigned int v;
3055 int i;
3056 char *p = buf.release;
3057
3058 if (uname (&buf))
3059 return 0;
3060
3061 for (i = 3+1; --i; )
3062 {
3063 unsigned int c = 0;
3064
3065 for (;;)
3066 {
3067 if (*p >= '0' && *p <= '9')
3068 c = c * 10 + *p++ - '0';
3069 else
3070 {
3071 p += *p == '.';
3072 break;
3073 }
3074 }
3075
3076 v = (v << 8) | c;
3077 }
3078
3079 return v;
3080} 3108}
3081 3109
3082inline_size void 3110inline_size void
3083ev_check_2625 (EV_P) 3111ev_check_2625 (EV_P)
3084{ 3112{
… …
3143 ev_io_set (&fs_w, fs_fd, EV_READ); 3171 ev_io_set (&fs_w, fs_fd, EV_READ);
3144 ev_io_start (EV_A_ &fs_w); 3172 ev_io_start (EV_A_ &fs_w);
3145 ev_unref (EV_A); 3173 ev_unref (EV_A);
3146 } 3174 }
3147 3175
3148 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3176 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3149 { 3177 {
3150 WL w_ = fs_hash [slot].head; 3178 WL w_ = fs_hash [slot].head;
3151 fs_hash [slot].head = 0; 3179 fs_hash [slot].head = 0;
3152 3180
3153 while (w_) 3181 while (w_)
… …
3408 3436
3409#if EV_EMBED_ENABLE 3437#if EV_EMBED_ENABLE
3410void noinline 3438void noinline
3411ev_embed_sweep (EV_P_ ev_embed *w) 3439ev_embed_sweep (EV_P_ ev_embed *w)
3412{ 3440{
3413 ev_loop (w->other, EVLOOP_NONBLOCK); 3441 ev_run (w->other, EVRUN_NOWAIT);
3414} 3442}
3415 3443
3416static void 3444static void
3417embed_io_cb (EV_P_ ev_io *io, int revents) 3445embed_io_cb (EV_P_ ev_io *io, int revents)
3418{ 3446{
3419 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3447 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3420 3448
3421 if (ev_cb (w)) 3449 if (ev_cb (w))
3422 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3450 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3423 else 3451 else
3424 ev_loop (w->other, EVLOOP_NONBLOCK); 3452 ev_run (w->other, EVRUN_NOWAIT);
3425} 3453}
3426 3454
3427static void 3455static void
3428embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3456embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3429{ 3457{
… …
3433 EV_P = w->other; 3461 EV_P = w->other;
3434 3462
3435 while (fdchangecnt) 3463 while (fdchangecnt)
3436 { 3464 {
3437 fd_reify (EV_A); 3465 fd_reify (EV_A);
3438 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3466 ev_run (EV_A_ EVRUN_NOWAIT);
3439 } 3467 }
3440 } 3468 }
3441} 3469}
3442 3470
3443static void 3471static void
… …
3449 3477
3450 { 3478 {
3451 EV_P = w->other; 3479 EV_P = w->other;
3452 3480
3453 ev_loop_fork (EV_A); 3481 ev_loop_fork (EV_A);
3454 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3482 ev_run (EV_A_ EVRUN_NOWAIT);
3455 } 3483 }
3456 3484
3457 ev_embed_start (EV_A_ w); 3485 ev_embed_start (EV_A_ w);
3458} 3486}
3459 3487
… …
3551 3579
3552 EV_FREQUENT_CHECK; 3580 EV_FREQUENT_CHECK;
3553} 3581}
3554#endif 3582#endif
3555 3583
3556#if EV_ASYNC_ENABLE 3584#if EV_CLEANUP_ENABLE
3557void 3585void
3558ev_async_start (EV_P_ ev_async *w) 3586ev_cleanup_start (EV_P_ ev_cleanup *w)
3559{ 3587{
3560 if (expect_false (ev_is_active (w))) 3588 if (expect_false (ev_is_active (w)))
3561 return; 3589 return;
3590
3591 EV_FREQUENT_CHECK;
3592
3593 ev_start (EV_A_ (W)w, ++cleanupcnt);
3594 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3595 cleanups [cleanupcnt - 1] = w;
3596
3597 /* cleanup watchers should never keep a refcount on the loop */
3598 ev_unref (EV_A);
3599 EV_FREQUENT_CHECK;
3600}
3601
3602void
3603ev_cleanup_stop (EV_P_ ev_cleanup *w)
3604{
3605 clear_pending (EV_A_ (W)w);
3606 if (expect_false (!ev_is_active (w)))
3607 return;
3608
3609 EV_FREQUENT_CHECK;
3610 ev_ref (EV_A);
3611
3612 {
3613 int active = ev_active (w);
3614
3615 cleanups [active - 1] = cleanups [--cleanupcnt];
3616 ev_active (cleanups [active - 1]) = active;
3617 }
3618
3619 ev_stop (EV_A_ (W)w);
3620
3621 EV_FREQUENT_CHECK;
3622}
3623#endif
3624
3625#if EV_ASYNC_ENABLE
3626void
3627ev_async_start (EV_P_ ev_async *w)
3628{
3629 if (expect_false (ev_is_active (w)))
3630 return;
3631
3632 w->sent = 0;
3562 3633
3563 evpipe_init (EV_A); 3634 evpipe_init (EV_A);
3564 3635
3565 EV_FREQUENT_CHECK; 3636 EV_FREQUENT_CHECK;
3566 3637
… …
3644{ 3715{
3645 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3716 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3646 3717
3647 if (expect_false (!once)) 3718 if (expect_false (!once))
3648 { 3719 {
3649 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3720 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3650 return; 3721 return;
3651 } 3722 }
3652 3723
3653 once->cb = cb; 3724 once->cb = cb;
3654 once->arg = arg; 3725 once->arg = arg;
… …
3769 } 3840 }
3770#endif 3841#endif
3771 3842
3772#if EV_CHILD_ENABLE 3843#if EV_CHILD_ENABLE
3773 if (types & EV_CHILD) 3844 if (types & EV_CHILD)
3774 for (i = EV_PID_HASHSIZE; i--; ) 3845 for (i = (EV_PID_HASHSIZE); i--; )
3775 for (wl = childs [i]; wl; ) 3846 for (wl = childs [i]; wl; )
3776 { 3847 {
3777 wn = wl->next; 3848 wn = wl->next;
3778 cb (EV_A_ EV_CHILD, wl); 3849 cb (EV_A_ EV_CHILD, wl);
3779 wl = wn; 3850 wl = wn;
… …
3786 3857
3787#if EV_MULTIPLICITY 3858#if EV_MULTIPLICITY
3788 #include "ev_wrap.h" 3859 #include "ev_wrap.h"
3789#endif 3860#endif
3790 3861
3791#ifdef __cplusplus 3862EV_CPP(})
3792}
3793#endif
3794 3863

Diff Legend

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