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.355 by root, Fri Oct 22 10:09:12 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
… …
402# define EFD_CLOEXEC O_CLOEXEC 409# define EFD_CLOEXEC O_CLOEXEC
403# else 410# else
404# define EFD_CLOEXEC 02000000 411# define EFD_CLOEXEC 02000000
405# endif 412# endif
406# endif 413# endif
407# ifdef __cplusplus
408extern "C" {
409# endif
410int (eventfd) (unsigned int initval, int flags); 414EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
411# ifdef __cplusplus
412}
413# endif
414#endif 415#endif
415 416
416#if EV_USE_SIGNALFD 417#if EV_USE_SIGNALFD
417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 418/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
418# include <stdint.h> 419# include <stdint.h>
… …
424# define SFD_CLOEXEC O_CLOEXEC 425# define SFD_CLOEXEC O_CLOEXEC
425# else 426# else
426# define SFD_CLOEXEC 02000000 427# define SFD_CLOEXEC 02000000
427# endif 428# endif
428# endif 429# endif
429# ifdef __cplusplus
430extern "C" {
431# endif
432int signalfd (int fd, const sigset_t *mask, int flags); 430EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
433 431
434struct signalfd_siginfo 432struct signalfd_siginfo
435{ 433{
436 uint32_t ssi_signo; 434 uint32_t ssi_signo;
437 char pad[128 - sizeof (uint32_t)]; 435 char pad[128 - sizeof (uint32_t)];
438}; 436};
439# ifdef __cplusplus
440}
441# endif 437#endif
442#endif
443
444 438
445/**/ 439/**/
446 440
447#if EV_VERIFY >= 3 441#if EV_VERIFY >= 3
448# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 442# define EV_FREQUENT_CHECK ev_verify (EV_A)
449#else 443#else
450# define EV_FREQUENT_CHECK do { } while (0) 444# define EV_FREQUENT_CHECK do { } while (0)
451#endif 445#endif
452 446
453/* 447/*
… …
461#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 455#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
462 456
463#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 457#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) */ 458#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
465 459
460#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
461#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
462
466#if __GNUC__ >= 4 463#if __GNUC__ >= 4
467# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
468# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
469#else 466#else
470# define expect(expr,value) (expr) 467# define expect(expr,value) (expr)
… …
476 473
477#define expect_false(expr) expect ((expr) != 0, 0) 474#define expect_false(expr) expect ((expr) != 0, 0)
478#define expect_true(expr) expect ((expr) != 0, 1) 475#define expect_true(expr) expect ((expr) != 0, 1)
479#define inline_size static inline 476#define inline_size static inline
480 477
481#if EV_MINIMAL 478#if EV_FEATURE_CODE
479# define inline_speed static inline
480#else
482# define inline_speed static noinline 481# define inline_speed static noinline
483#else
484# define inline_speed static inline
485#endif 482#endif
486 483
487#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
488 485
489#if EV_MINPRI == EV_MAXPRI 486#if EV_MINPRI == EV_MAXPRI
… …
502#define ev_active(w) ((W)(w))->active 499#define ev_active(w) ((W)(w))->active
503#define ev_at(w) ((WT)(w))->at 500#define ev_at(w) ((WT)(w))->at
504 501
505#if EV_USE_REALTIME 502#if EV_USE_REALTIME
506/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 503/* 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 */ 504/* giving it a reasonably high chance of working on typical architectures */
508static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
509#endif 506#endif
510 507
511#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
512static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
523#endif 520#endif
524 521
525#ifdef _WIN32 522#ifdef _WIN32
526# include "ev_win32.c" 523# include "ev_win32.c"
527#endif 524#endif
525
526/*****************************************************************************/
527
528static unsigned int noinline
529ev_linux_version (void)
530{
531#ifdef __linux
532 struct utsname buf;
533 unsigned int v;
534 int i;
535 char *p = buf.release;
536
537 if (uname (&buf))
538 return 0;
539
540 for (i = 3+1; --i; )
541 {
542 unsigned int c = 0;
543
544 for (;;)
545 {
546 if (*p >= '0' && *p <= '9')
547 c = c * 10 + *p++ - '0';
548 else
549 {
550 p += *p == '.';
551 break;
552 }
553 }
554
555 v = (v << 8) | c;
556 }
557
558 return v;
559#else
560 return 0;
561#endif
562}
528 563
529/*****************************************************************************/ 564/*****************************************************************************/
530 565
531#if EV_AVOID_STDIO 566#if EV_AVOID_STDIO
532static void noinline 567static void noinline
… …
696 731
697 static int ev_default_loop_ptr; 732 static int ev_default_loop_ptr;
698 733
699#endif 734#endif
700 735
701#if EV_MINIMAL < 2 736#if EV_FEATURE_API
702# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 737# 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) 738# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
704# define EV_INVOKE_PENDING invoke_cb (EV_A) 739# define EV_INVOKE_PENDING invoke_cb (EV_A)
705#else 740#else
706# define EV_RELEASE_CB (void)0 741# define EV_RELEASE_CB (void)0
707# define EV_ACQUIRE_CB (void)0 742# define EV_ACQUIRE_CB (void)0
708# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 743# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
709#endif 744#endif
710 745
711#define EVUNLOOP_RECURSE 0x80 746#define EVBREAK_RECURSE 0x80
712 747
713/*****************************************************************************/ 748/*****************************************************************************/
714 749
715#ifndef EV_HAVE_EV_TIME 750#ifndef EV_HAVE_EV_TIME
716ev_tstamp 751ev_tstamp
… …
760 if (delay > 0.) 795 if (delay > 0.)
761 { 796 {
762#if EV_USE_NANOSLEEP 797#if EV_USE_NANOSLEEP
763 struct timespec ts; 798 struct timespec ts;
764 799
765 ts.tv_sec = (time_t)delay; 800 EV_TS_SET (ts, delay);
766 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
767
768 nanosleep (&ts, 0); 801 nanosleep (&ts, 0);
769#elif defined(_WIN32) 802#elif defined(_WIN32)
770 Sleep ((unsigned long)(delay * 1e3)); 803 Sleep ((unsigned long)(delay * 1e3));
771#else 804#else
772 struct timeval tv; 805 struct timeval tv;
773 806
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 */ 807 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
778 /* something not guaranteed by newer posix versions, but guaranteed */ 808 /* something not guaranteed by newer posix versions, but guaranteed */
779 /* by older ones */ 809 /* by older ones */
810 EV_TV_SET (tv, delay);
780 select (0, 0, 0, 0, &tv); 811 select (0, 0, 0, 0, &tv);
781#endif 812#endif
782 } 813 }
783} 814}
784 815
785/*****************************************************************************/ 816/*****************************************************************************/
786 817
787#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 818#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
788 819
789/* find a suitable new size for the given array, */ 820/* find a suitable new size for the given array, */
790/* hopefully by rounding to a ncie-to-malloc size */ 821/* hopefully by rounding to a nice-to-malloc size */
791inline_size int 822inline_size int
792array_nextsize (int elem, int cur, int cnt) 823array_nextsize (int elem, int cur, int cnt)
793{ 824{
794 int ncur = cur + 1; 825 int ncur = cur + 1;
795 826
… …
936 { 967 {
937 int fd = fdchanges [i]; 968 int fd = fdchanges [i];
938 ANFD *anfd = anfds + fd; 969 ANFD *anfd = anfds + fd;
939 ev_io *w; 970 ev_io *w;
940 971
941 unsigned char events = 0; 972 unsigned char o_events = anfd->events;
973 unsigned char o_reify = anfd->reify;
942 974
943 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 975 anfd->reify = 0;
944 events |= (unsigned char)w->events;
945 976
946#if EV_SELECT_IS_WINSOCKET 977#if EV_SELECT_IS_WINSOCKET
947 if (events) 978 if (o_reify & EV__IOFDSET)
948 { 979 {
949 unsigned long arg; 980 unsigned long arg;
950 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 981 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
951 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 982 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
952 } 983 }
953#endif 984#endif
954 985
986 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
955 { 987 {
956 unsigned char o_events = anfd->events;
957 unsigned char o_reify = anfd->reify;
958
959 anfd->reify = 0;
960 anfd->events = events; 988 anfd->events = 0;
961 989
962 if (o_events != events || o_reify & EV__IOFDSET) 990 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
991 anfd->events |= (unsigned char)w->events;
992
993 if (o_events != anfd->events)
994 o_reify = EV__IOFDSET; /* actually |= */
995 }
996
997 if (o_reify & EV__IOFDSET)
963 backend_modify (EV_A_ fd, o_events, events); 998 backend_modify (EV_A_ fd, o_events, anfd->events);
964 }
965 } 999 }
966 1000
967 fdchangecnt = 0; 1001 fdchangecnt = 0;
968} 1002}
969 1003
… …
1062} 1096}
1063 1097
1064/*****************************************************************************/ 1098/*****************************************************************************/
1065 1099
1066/* 1100/*
1067 * the heap functions want a real array index. array index 0 uis guaranteed to not 1101 * 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 1102 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1069 * the branching factor of the d-tree. 1103 * the branching factor of the d-tree.
1070 */ 1104 */
1071 1105
1072/* 1106/*
… …
1272 uint64_t counter = 1; 1306 uint64_t counter = 1;
1273 write (evfd, &counter, sizeof (uint64_t)); 1307 write (evfd, &counter, sizeof (uint64_t));
1274 } 1308 }
1275 else 1309 else
1276#endif 1310#endif
1311 /* win32 people keep sending patches that change this write() to send() */
1312 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1313 /* so when you think this write should be a send instead, please find out */
1314 /* where your send() is from - it's definitely not the microsoft send, and */
1315 /* tell me. thank you. */
1277 write (evpipe [1], &dummy, 1); 1316 write (evpipe [1], &dummy, 1);
1278 1317
1279 errno = old_errno; 1318 errno = old_errno;
1280 } 1319 }
1281} 1320}
… …
1295 } 1334 }
1296 else 1335 else
1297#endif 1336#endif
1298 { 1337 {
1299 char dummy; 1338 char dummy;
1339 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1300 read (evpipe [0], &dummy, 1); 1340 read (evpipe [0], &dummy, 1);
1301 } 1341 }
1302 1342
1303 if (sig_pending) 1343 if (sig_pending)
1304 { 1344 {
… …
1403child_reap (EV_P_ int chain, int pid, int status) 1443child_reap (EV_P_ int chain, int pid, int status)
1404{ 1444{
1405 ev_child *w; 1445 ev_child *w;
1406 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1446 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1407 1447
1408 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1448 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1409 { 1449 {
1410 if ((w->pid == pid || !w->pid) 1450 if ((w->pid == pid || !w->pid)
1411 && (!traced || (w->flags & 1))) 1451 && (!traced || (w->flags & 1)))
1412 { 1452 {
1413 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1453 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 */ 1478 /* 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 */ 1479 /* 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); 1480 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1441 1481
1442 child_reap (EV_A_ pid, pid, status); 1482 child_reap (EV_A_ pid, pid, status);
1443 if (EV_PID_HASHSIZE > 1) 1483 if ((EV_PID_HASHSIZE) > 1)
1444 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1484 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1445} 1485}
1446 1486
1447#endif 1487#endif
1448 1488
… …
1515#ifdef __APPLE__ 1555#ifdef __APPLE__
1516 /* only select works correctly on that "unix-certified" platform */ 1556 /* only select works correctly on that "unix-certified" platform */
1517 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1557 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1518 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1558 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1519#endif 1559#endif
1560#ifdef __FreeBSD__
1561 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1562#endif
1520 1563
1521 return flags; 1564 return flags;
1522} 1565}
1523 1566
1524unsigned int 1567unsigned int
1525ev_embeddable_backends (void) 1568ev_embeddable_backends (void)
1526{ 1569{
1527 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1570 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1528 1571
1529 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1572 /* 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 */ 1573 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1531 flags &= ~EVBACKEND_EPOLL; 1574 flags &= ~EVBACKEND_EPOLL;
1532 1575
1533 return flags; 1576 return flags;
1534} 1577}
1535 1578
1536unsigned int 1579unsigned int
1537ev_backend (EV_P) 1580ev_backend (EV_P)
1538{ 1581{
1539 return backend; 1582 return backend;
1540} 1583}
1541 1584
1542#if EV_MINIMAL < 2 1585#if EV_FEATURE_API
1543unsigned int 1586unsigned int
1544ev_loop_count (EV_P) 1587ev_iteration (EV_P)
1545{ 1588{
1546 return loop_count; 1589 return loop_count;
1547} 1590}
1548 1591
1549unsigned int 1592unsigned int
1550ev_loop_depth (EV_P) 1593ev_depth (EV_P)
1551{ 1594{
1552 return loop_depth; 1595 return loop_depth;
1553} 1596}
1554 1597
1555void 1598void
… …
1627 1670
1628 ev_rt_now = ev_time (); 1671 ev_rt_now = ev_time ();
1629 mn_now = get_clock (); 1672 mn_now = get_clock ();
1630 now_floor = mn_now; 1673 now_floor = mn_now;
1631 rtmn_diff = ev_rt_now - mn_now; 1674 rtmn_diff = ev_rt_now - mn_now;
1632#if EV_MINIMAL < 2 1675#if EV_FEATURE_API
1633 invoke_cb = ev_invoke_pending; 1676 invoke_cb = ev_invoke_pending;
1634#endif 1677#endif
1635 1678
1636 io_blocktime = 0.; 1679 io_blocktime = 0.;
1637 timeout_blocktime = 0.; 1680 timeout_blocktime = 0.;
… …
1874 verify_watcher (EV_A_ ws [cnt]); 1917 verify_watcher (EV_A_ ws [cnt]);
1875 } 1918 }
1876} 1919}
1877#endif 1920#endif
1878 1921
1879#if EV_MINIMAL < 2 1922#if EV_FEATURE_API
1880void 1923void
1881ev_loop_verify (EV_P) 1924ev_verify (EV_P)
1882{ 1925{
1883#if EV_VERIFY 1926#if EV_VERIFY
1884 int i; 1927 int i;
1885 WL w; 1928 WL w;
1886 1929
… …
1937 array_verify (EV_A_ (W *)checks, checkcnt); 1980 array_verify (EV_A_ (W *)checks, checkcnt);
1938#endif 1981#endif
1939 1982
1940# if 0 1983# if 0
1941#if EV_CHILD_ENABLE 1984#if EV_CHILD_ENABLE
1942 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1985 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) 1986 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1944#endif 1987#endif
1945# endif 1988# endif
1946#endif 1989#endif
1947} 1990}
… …
2104 EV_FREQUENT_CHECK; 2147 EV_FREQUENT_CHECK;
2105 feed_reverse (EV_A_ (W)w); 2148 feed_reverse (EV_A_ (W)w);
2106 } 2149 }
2107 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2150 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2108 2151
2109 feed_reverse_done (EV_A_ EV_TIMEOUT); 2152 feed_reverse_done (EV_A_ EV_TIMER);
2110 } 2153 }
2111} 2154}
2112 2155
2113#if EV_PERIODIC_ENABLE 2156#if EV_PERIODIC_ENABLE
2114/* make periodics pending */ 2157/* make periodics pending */
… …
2167 feed_reverse_done (EV_A_ EV_PERIODIC); 2210 feed_reverse_done (EV_A_ EV_PERIODIC);
2168 } 2211 }
2169} 2212}
2170 2213
2171/* simply recalculate all periodics */ 2214/* simply recalculate all periodics */
2172/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2215/* TODO: maybe ensure that at least one event happens when jumping forward? */
2173static void noinline 2216static void noinline
2174periodics_reschedule (EV_P) 2217periodics_reschedule (EV_P)
2175{ 2218{
2176 int i; 2219 int i;
2177 2220
… …
2273 mn_now = ev_rt_now; 2316 mn_now = ev_rt_now;
2274 } 2317 }
2275} 2318}
2276 2319
2277void 2320void
2278ev_loop (EV_P_ int flags) 2321ev_run (EV_P_ int flags)
2279{ 2322{
2280#if EV_MINIMAL < 2 2323#if EV_FEATURE_API
2281 ++loop_depth; 2324 ++loop_depth;
2282#endif 2325#endif
2283 2326
2284 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2327 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2285 2328
2286 loop_done = EVUNLOOP_CANCEL; 2329 loop_done = EVBREAK_CANCEL;
2287 2330
2288 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2331 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2289 2332
2290 do 2333 do
2291 { 2334 {
2292#if EV_VERIFY >= 2 2335#if EV_VERIFY >= 2
2293 ev_loop_verify (EV_A); 2336 ev_verify (EV_A);
2294#endif 2337#endif
2295 2338
2296#ifndef _WIN32 2339#ifndef _WIN32
2297 if (expect_false (curpid)) /* penalise the forking check even more */ 2340 if (expect_false (curpid)) /* penalise the forking check even more */
2298 if (expect_false (getpid () != curpid)) 2341 if (expect_false (getpid () != curpid))
… …
2334 /* calculate blocking time */ 2377 /* calculate blocking time */
2335 { 2378 {
2336 ev_tstamp waittime = 0.; 2379 ev_tstamp waittime = 0.;
2337 ev_tstamp sleeptime = 0.; 2380 ev_tstamp sleeptime = 0.;
2338 2381
2382 /* remember old timestamp for io_blocktime calculation */
2383 ev_tstamp prev_mn_now = mn_now;
2384
2385 /* update time to cancel out callback processing overhead */
2386 time_update (EV_A_ 1e100);
2387
2339 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2388 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2340 { 2389 {
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; 2390 waittime = MAX_BLOCKTIME;
2348 2391
2349 if (timercnt) 2392 if (timercnt)
2350 { 2393 {
2351 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2394 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2378 waittime -= sleeptime; 2421 waittime -= sleeptime;
2379 } 2422 }
2380 } 2423 }
2381 } 2424 }
2382 2425
2383#if EV_MINIMAL < 2 2426#if EV_FEATURE_API
2384 ++loop_count; 2427 ++loop_count;
2385#endif 2428#endif
2386 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2429 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2387 backend_poll (EV_A_ waittime); 2430 backend_poll (EV_A_ waittime);
2388 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2431 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2389 2432
2390 /* update ev_rt_now, do magic */ 2433 /* update ev_rt_now, do magic */
2391 time_update (EV_A_ waittime + sleeptime); 2434 time_update (EV_A_ waittime + sleeptime);
2392 } 2435 }
2393 2436
… …
2411 EV_INVOKE_PENDING; 2454 EV_INVOKE_PENDING;
2412 } 2455 }
2413 while (expect_true ( 2456 while (expect_true (
2414 activecnt 2457 activecnt
2415 && !loop_done 2458 && !loop_done
2416 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2459 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2417 )); 2460 ));
2418 2461
2419 if (loop_done == EVUNLOOP_ONE) 2462 if (loop_done == EVBREAK_ONE)
2420 loop_done = EVUNLOOP_CANCEL; 2463 loop_done = EVBREAK_CANCEL;
2421 2464
2422#if EV_MINIMAL < 2 2465#if EV_FEATURE_API
2423 --loop_depth; 2466 --loop_depth;
2424#endif 2467#endif
2425} 2468}
2426 2469
2427void 2470void
2428ev_unloop (EV_P_ int how) 2471ev_break (EV_P_ int how)
2429{ 2472{
2430 loop_done = how; 2473 loop_done = how;
2431} 2474}
2432 2475
2433void 2476void
… …
2581 EV_FREQUENT_CHECK; 2624 EV_FREQUENT_CHECK;
2582 2625
2583 wlist_del (&anfds[w->fd].head, (WL)w); 2626 wlist_del (&anfds[w->fd].head, (WL)w);
2584 ev_stop (EV_A_ (W)w); 2627 ev_stop (EV_A_ (W)w);
2585 2628
2586 fd_change (EV_A_ w->fd, 1); 2629 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2587 2630
2588 EV_FREQUENT_CHECK; 2631 EV_FREQUENT_CHECK;
2589} 2632}
2590 2633
2591void noinline 2634void noinline
… …
2877 return; 2920 return;
2878 2921
2879 EV_FREQUENT_CHECK; 2922 EV_FREQUENT_CHECK;
2880 2923
2881 ev_start (EV_A_ (W)w, 1); 2924 ev_start (EV_A_ (W)w, 1);
2882 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2925 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2883 2926
2884 EV_FREQUENT_CHECK; 2927 EV_FREQUENT_CHECK;
2885} 2928}
2886 2929
2887void 2930void
… …
2891 if (expect_false (!ev_is_active (w))) 2934 if (expect_false (!ev_is_active (w)))
2892 return; 2935 return;
2893 2936
2894 EV_FREQUENT_CHECK; 2937 EV_FREQUENT_CHECK;
2895 2938
2896 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2939 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2897 ev_stop (EV_A_ (W)w); 2940 ev_stop (EV_A_ (W)w);
2898 2941
2899 EV_FREQUENT_CHECK; 2942 EV_FREQUENT_CHECK;
2900} 2943}
2901 2944
… …
2974 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3017 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2975 } 3018 }
2976 } 3019 }
2977 3020
2978 if (w->wd >= 0) 3021 if (w->wd >= 0)
2979 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3022 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2980 3023
2981 /* now re-arm timer, if required */ 3024 /* now re-arm timer, if required */
2982 if (ev_is_active (&w->timer)) ev_ref (EV_A); 3025 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2983 ev_timer_again (EV_A_ &w->timer); 3026 ev_timer_again (EV_A_ &w->timer);
2984 if (ev_is_active (&w->timer)) ev_unref (EV_A); 3027 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2992 3035
2993 if (wd < 0) 3036 if (wd < 0)
2994 return; 3037 return;
2995 3038
2996 w->wd = -2; 3039 w->wd = -2;
2997 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3040 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2998 wlist_del (&fs_hash [slot].head, (WL)w); 3041 wlist_del (&fs_hash [slot].head, (WL)w);
2999 3042
3000 /* remove this watcher, if others are watching it, they will rearm */ 3043 /* remove this watcher, if others are watching it, they will rearm */
3001 inotify_rm_watch (fs_fd, wd); 3044 inotify_rm_watch (fs_fd, wd);
3002} 3045}
… …
3004static void noinline 3047static void noinline
3005infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3048infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
3006{ 3049{
3007 if (slot < 0) 3050 if (slot < 0)
3008 /* overflow, need to check for all hash slots */ 3051 /* overflow, need to check for all hash slots */
3009 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3052 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3010 infy_wd (EV_A_ slot, wd, ev); 3053 infy_wd (EV_A_ slot, wd, ev);
3011 else 3054 else
3012 { 3055 {
3013 WL w_; 3056 WL w_;
3014 3057
3015 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3058 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
3016 { 3059 {
3017 ev_stat *w = (ev_stat *)w_; 3060 ev_stat *w = (ev_stat *)w_;
3018 w_ = w_->next; /* lets us remove this watcher and all before it */ 3061 w_ = w_->next; /* lets us remove this watcher and all before it */
3019 3062
3020 if (w->wd == wd || wd == -1) 3063 if (w->wd == wd || wd == -1)
3021 { 3064 {
3022 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3065 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
3023 { 3066 {
3024 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3067 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
3025 w->wd = -1; 3068 w->wd = -1;
3026 infy_add (EV_A_ w); /* re-add, no matter what */ 3069 infy_add (EV_A_ w); /* re-add, no matter what */
3027 } 3070 }
3028 3071
3029 stat_timer_cb (EV_A_ &w->timer, 0); 3072 stat_timer_cb (EV_A_ &w->timer, 0);
… …
3043 { 3086 {
3044 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3087 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3045 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3088 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3046 ofs += sizeof (struct inotify_event) + ev->len; 3089 ofs += sizeof (struct inotify_event) + ev->len;
3047 } 3090 }
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} 3091}
3081 3092
3082inline_size void 3093inline_size void
3083ev_check_2625 (EV_P) 3094ev_check_2625 (EV_P)
3084{ 3095{
… …
3143 ev_io_set (&fs_w, fs_fd, EV_READ); 3154 ev_io_set (&fs_w, fs_fd, EV_READ);
3144 ev_io_start (EV_A_ &fs_w); 3155 ev_io_start (EV_A_ &fs_w);
3145 ev_unref (EV_A); 3156 ev_unref (EV_A);
3146 } 3157 }
3147 3158
3148 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3159 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3149 { 3160 {
3150 WL w_ = fs_hash [slot].head; 3161 WL w_ = fs_hash [slot].head;
3151 fs_hash [slot].head = 0; 3162 fs_hash [slot].head = 0;
3152 3163
3153 while (w_) 3164 while (w_)
… …
3408 3419
3409#if EV_EMBED_ENABLE 3420#if EV_EMBED_ENABLE
3410void noinline 3421void noinline
3411ev_embed_sweep (EV_P_ ev_embed *w) 3422ev_embed_sweep (EV_P_ ev_embed *w)
3412{ 3423{
3413 ev_loop (w->other, EVLOOP_NONBLOCK); 3424 ev_run (w->other, EVRUN_NOWAIT);
3414} 3425}
3415 3426
3416static void 3427static void
3417embed_io_cb (EV_P_ ev_io *io, int revents) 3428embed_io_cb (EV_P_ ev_io *io, int revents)
3418{ 3429{
3419 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3430 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3420 3431
3421 if (ev_cb (w)) 3432 if (ev_cb (w))
3422 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3433 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3423 else 3434 else
3424 ev_loop (w->other, EVLOOP_NONBLOCK); 3435 ev_run (w->other, EVRUN_NOWAIT);
3425} 3436}
3426 3437
3427static void 3438static void
3428embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3439embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3429{ 3440{
… …
3433 EV_P = w->other; 3444 EV_P = w->other;
3434 3445
3435 while (fdchangecnt) 3446 while (fdchangecnt)
3436 { 3447 {
3437 fd_reify (EV_A); 3448 fd_reify (EV_A);
3438 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3449 ev_run (EV_A_ EVRUN_NOWAIT);
3439 } 3450 }
3440 } 3451 }
3441} 3452}
3442 3453
3443static void 3454static void
… …
3449 3460
3450 { 3461 {
3451 EV_P = w->other; 3462 EV_P = w->other;
3452 3463
3453 ev_loop_fork (EV_A); 3464 ev_loop_fork (EV_A);
3454 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3465 ev_run (EV_A_ EVRUN_NOWAIT);
3455 } 3466 }
3456 3467
3457 ev_embed_start (EV_A_ w); 3468 ev_embed_start (EV_A_ w);
3458} 3469}
3459 3470
… …
3558ev_async_start (EV_P_ ev_async *w) 3569ev_async_start (EV_P_ ev_async *w)
3559{ 3570{
3560 if (expect_false (ev_is_active (w))) 3571 if (expect_false (ev_is_active (w)))
3561 return; 3572 return;
3562 3573
3574 w->sent = 0;
3575
3563 evpipe_init (EV_A); 3576 evpipe_init (EV_A);
3564 3577
3565 EV_FREQUENT_CHECK; 3578 EV_FREQUENT_CHECK;
3566 3579
3567 ev_start (EV_A_ (W)w, ++asynccnt); 3580 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3644{ 3657{
3645 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3658 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3646 3659
3647 if (expect_false (!once)) 3660 if (expect_false (!once))
3648 { 3661 {
3649 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3662 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3650 return; 3663 return;
3651 } 3664 }
3652 3665
3653 once->cb = cb; 3666 once->cb = cb;
3654 once->arg = arg; 3667 once->arg = arg;
… …
3769 } 3782 }
3770#endif 3783#endif
3771 3784
3772#if EV_CHILD_ENABLE 3785#if EV_CHILD_ENABLE
3773 if (types & EV_CHILD) 3786 if (types & EV_CHILD)
3774 for (i = EV_PID_HASHSIZE; i--; ) 3787 for (i = (EV_PID_HASHSIZE); i--; )
3775 for (wl = childs [i]; wl; ) 3788 for (wl = childs [i]; wl; )
3776 { 3789 {
3777 wn = wl->next; 3790 wn = wl->next;
3778 cb (EV_A_ EV_CHILD, wl); 3791 cb (EV_A_ EV_CHILD, wl);
3779 wl = wn; 3792 wl = wn;
… …
3786 3799
3787#if EV_MULTIPLICITY 3800#if EV_MULTIPLICITY
3788 #include "ev_wrap.h" 3801 #include "ev_wrap.h"
3789#endif 3802#endif
3790 3803
3791#ifdef __cplusplus 3804EV_CPP(})
3792}
3793#endif
3794 3805

Diff Legend

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