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

Comparing libev/ev.c (file contents):
Revision 1.330 by root, Tue Mar 9 08:46:17 2010 UTC vs.
Revision 1.356 by root, Fri Oct 22 11:21:52 2010 UTC

35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
77# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
79# endif 75# endif
80# endif 76# endif
81 77
78# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
85# else 82# else
83# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 84# define EV_USE_NANOSLEEP 0
85# endif
86
87# if HAVE_SELECT && HAVE_SYS_SELECT_H
88# ifndef EV_USE_SELECT
89# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
88# endif 94# endif
89 95
96# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 98# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 99# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 100# else
101# undef EV_USE_POLL
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif
104# endif 103# endif
105 104
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 106# ifndef EV_USE_EPOLL
109# else 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H 114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 115# ifndef EV_USE_KQUEUE
117# else 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
118# define EV_USE_KQUEUE 0
119# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
120# endif 121# endif
121 122
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 124# ifndef EV_USE_PORT
125# else 125# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
128# endif 130# endif
129 131
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 133# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
136# endif 139# endif
137 140
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 142# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 143# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
144# endif 148# endif
145 149
150# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 151# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 152# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
152# endif 157# endif
153 158
154#endif 159#endif
155 160
156#include <math.h> 161#include <math.h>
172#ifdef EV_H 177#ifdef EV_H
173# include EV_H 178# include EV_H
174#else 179#else
175# include "ev.h" 180# include "ev.h"
176#endif 181#endif
182
183EV_CPP(extern "C" {)
177 184
178#ifndef _WIN32 185#ifndef _WIN32
179# include <sys/time.h> 186# include <sys/time.h>
180# include <sys/wait.h> 187# include <sys/wait.h>
181# include <unistd.h> 188# include <unistd.h>
184# define WIN32_LEAN_AND_MEAN 191# define WIN32_LEAN_AND_MEAN
185# include <windows.h> 192# include <windows.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
196# undef EV_AVOID_STDIO
189#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
190 206
191/* 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 */
192 208
193/* try to deduce the maximum number of signals on this platform */ 209/* try to deduce the maximum number of signals on this platform */
194#if defined (EV_NSIG) 210#if defined (EV_NSIG)
206#elif defined (MAXSIG) 222#elif defined (MAXSIG)
207# define EV_NSIG (MAXSIG+1) 223# define EV_NSIG (MAXSIG+1)
208#elif defined (MAX_SIG) 224#elif defined (MAX_SIG)
209# define EV_NSIG (MAX_SIG+1) 225# define EV_NSIG (MAX_SIG+1)
210#elif defined (SIGARRAYSIZE) 226#elif defined (SIGARRAYSIZE)
211# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
212#elif defined (_sys_nsig) 228#elif defined (_sys_nsig)
213# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
214#else 230#else
215# error "unable to find value for NSIG, please report" 231# error "unable to find value for NSIG, please report"
216/* to make it compile regardless, just remove the above line */ 232/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */
217# define EV_NSIG 65 234# define EV_NSIG 65
218#endif 235#endif
219 236
220#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
221# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
222# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
223# else 240# else
224# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
225# endif 242# endif
226#endif 243#endif
227 244
228#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
229# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
230# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
231# else 248# else
232# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
233# endif 250# endif
234#endif 251#endif
235 252
237# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
238#endif 255#endif
239 256
240#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
241# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
242# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
243# else 260# else
244# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
245# endif 262# endif
246#endif 263#endif
247 264
248#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
249# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
250#endif 267#endif
251 268
252#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
253# ifdef _WIN32 270# ifdef _WIN32
254# define EV_USE_POLL 0 271# define EV_USE_POLL 0
255# else 272# else
256# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
257# endif 274# endif
258#endif 275#endif
259 276
260#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
261# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
262# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
263# else 280# else
264# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
265# endif 282# endif
266#endif 283#endif
267 284
273# define EV_USE_PORT 0 290# define EV_USE_PORT 0
274#endif 291#endif
275 292
276#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
277# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
278# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
279# else 296# else
280# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
281# endif 298# endif
282#endif 299#endif
283 300
284#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
285# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
286# define EV_PID_HASHSIZE 1
287# else
288# define EV_PID_HASHSIZE 16
289# endif
290#endif 303#endif
291 304
292#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
293# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
294# define EV_INOTIFY_HASHSIZE 1
295# else
296# define EV_INOTIFY_HASHSIZE 16
297# endif
298#endif 307#endif
299 308
300#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
301# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
302# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
303# else 312# else
304# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
305# endif 314# endif
306#endif 315#endif
307 316
308#ifndef EV_USE_SIGNALFD 317#ifndef EV_USE_SIGNALFD
309# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
310# define EV_USE_SIGNALFD 1 319# define EV_USE_SIGNALFD EV_FEATURE_OS
311# else 320# else
312# define EV_USE_SIGNALFD 0 321# define EV_USE_SIGNALFD 0
313# endif 322# endif
314#endif 323#endif
315 324
318# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
319# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
320#endif 329#endif
321 330
322#ifndef EV_VERIFY 331#ifndef EV_VERIFY
323# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
324#endif 333#endif
325 334
326#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
327# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
328#endif 337#endif
329 338
330#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
331# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
332#endif 341#endif
333 342
334/* 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, */
335/* which makes programs even slower. might work on other unices, too. */ 344/* which makes programs even slower. might work on other unices, too. */
336#if EV_USE_CLOCK_SYSCALL 345#if EV_USE_CLOCK_SYSCALL
373# include <sys/select.h> 382# include <sys/select.h>
374# endif 383# endif
375#endif 384#endif
376 385
377#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
378# include <sys/utsname.h>
379# include <sys/statfs.h> 387# include <sys/statfs.h>
380# include <sys/inotify.h> 388# include <sys/inotify.h>
381/* 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 */
382# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
383# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
400# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
401# else 409# else
402# define EFD_CLOEXEC 02000000 410# define EFD_CLOEXEC 02000000
403# endif 411# endif
404# endif 412# endif
405# ifdef __cplusplus
406extern "C" {
407# endif
408int (eventfd) (unsigned int initval, int flags); 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
409# ifdef __cplusplus
410}
411# endif
412#endif 414#endif
413 415
414#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
415/* 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 */
416# include <stdint.h> 418# include <stdint.h>
422# define SFD_CLOEXEC O_CLOEXEC 424# define SFD_CLOEXEC O_CLOEXEC
423# else 425# else
424# define SFD_CLOEXEC 02000000 426# define SFD_CLOEXEC 02000000
425# endif 427# endif
426# endif 428# endif
427# ifdef __cplusplus
428extern "C" {
429# endif
430int signalfd (int fd, const sigset_t *mask, int flags); 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
431 430
432struct signalfd_siginfo 431struct signalfd_siginfo
433{ 432{
434 uint32_t ssi_signo; 433 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)]; 434 char pad[128 - sizeof (uint32_t)];
436}; 435};
437# ifdef __cplusplus
438}
439# endif 436#endif
440#endif
441
442 437
443/**/ 438/**/
444 439
445#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
446# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
447#else 442#else
448# define EV_FREQUENT_CHECK do { } while (0) 443# define EV_FREQUENT_CHECK do { } while (0)
449#endif 444#endif
450 445
451/* 446/*
459#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
460 455
461#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) */
462#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) */
463 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
464#if __GNUC__ >= 4 462#if __GNUC__ >= 4
465# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
466# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
467#else 465#else
468# define expect(expr,value) (expr) 466# define expect(expr,value) (expr)
474 472
475#define expect_false(expr) expect ((expr) != 0, 0) 473#define expect_false(expr) expect ((expr) != 0, 0)
476#define expect_true(expr) expect ((expr) != 0, 1) 474#define expect_true(expr) expect ((expr) != 0, 1)
477#define inline_size static inline 475#define inline_size static inline
478 476
479#if EV_MINIMAL 477#if EV_FEATURE_CODE
478# define inline_speed static inline
479#else
480# define inline_speed static noinline 480# define inline_speed static noinline
481#else
482# define inline_speed static inline
483#endif 481#endif
484 482
485#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
486 484
487#if EV_MINPRI == EV_MAXPRI 485#if EV_MINPRI == EV_MAXPRI
500#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
501#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
502 500
503#if EV_USE_REALTIME 501#if EV_USE_REALTIME
504/* 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 */
505/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
506static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
507#endif 505#endif
508 506
509#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
510static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
523#ifdef _WIN32 521#ifdef _WIN32
524# include "ev_win32.c" 522# include "ev_win32.c"
525#endif 523#endif
526 524
527/*****************************************************************************/ 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}
566
567/*****************************************************************************/
568
569#if EV_AVOID_STDIO
570static void noinline
571ev_printerr (const char *msg)
572{
573 write (STDERR_FILENO, msg, strlen (msg));
574}
575#endif
528 576
529static void (*syserr_cb)(const char *msg); 577static void (*syserr_cb)(const char *msg);
530 578
531void 579void
532ev_set_syserr_cb (void (*cb)(const char *msg)) 580ev_set_syserr_cb (void (*cb)(const char *msg))
543 if (syserr_cb) 591 if (syserr_cb)
544 syserr_cb (msg); 592 syserr_cb (msg);
545 else 593 else
546 { 594 {
547#if EV_AVOID_STDIO 595#if EV_AVOID_STDIO
548 write (STDERR_FILENO, msg, strlen (msg));
549 write (STDERR_FILENO, ": ", 2);
550 msg = strerror (errno); 596 const char *err = strerror (errno);
551 write (STDERR_FILENO, msg, strlen (msg)); 597
552 write (STDERR_FILENO, "\n", 1); 598 ev_printerr (msg);
599 ev_printerr (": ");
600 ev_printerr (err);
601 ev_printerr ("\n");
553#else 602#else
554 perror (msg); 603 perror (msg);
555#endif 604#endif
556 abort (); 605 abort ();
557 } 606 }
558} 607}
559 608
560static void * 609static void *
561ev_realloc_emul (void *ptr, long size) 610ev_realloc_emul (void *ptr, long size)
562{ 611{
612#if __GLIBC__
613 return realloc (ptr, size);
614#else
563 /* some systems, notably openbsd and darwin, fail to properly 615 /* some systems, notably openbsd and darwin, fail to properly
564 * implement realloc (x, 0) (as required by both ansi c-98 and 616 * implement realloc (x, 0) (as required by both ansi c-89 and
565 * the single unix specification, so work around them here. 617 * the single unix specification, so work around them here.
566 */ 618 */
567 619
568 if (size) 620 if (size)
569 return realloc (ptr, size); 621 return realloc (ptr, size);
570 622
571 free (ptr); 623 free (ptr);
572 return 0; 624 return 0;
625#endif
573} 626}
574 627
575static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 628static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
576 629
577void 630void
586 ptr = alloc (ptr, size); 639 ptr = alloc (ptr, size);
587 640
588 if (!ptr && size) 641 if (!ptr && size)
589 { 642 {
590#if EV_AVOID_STDIO 643#if EV_AVOID_STDIO
591 write (STDERR_FILENO, "libev: memory allocation failed, aborting.", 644 ev_printerr ("libev: memory allocation failed, aborting.\n");
592 sizeof ("libev: memory allocation failed, aborting.") - 1);
593#else 645#else
594 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 646 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
595#endif 647#endif
596 abort (); 648 abort ();
597 } 649 }
682 734
683 static int ev_default_loop_ptr; 735 static int ev_default_loop_ptr;
684 736
685#endif 737#endif
686 738
687#if EV_MINIMAL < 2 739#if EV_FEATURE_API
688# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 740# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
689# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 741# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
690# define EV_INVOKE_PENDING invoke_cb (EV_A) 742# define EV_INVOKE_PENDING invoke_cb (EV_A)
691#else 743#else
692# define EV_RELEASE_CB (void)0 744# define EV_RELEASE_CB (void)0
693# define EV_ACQUIRE_CB (void)0 745# define EV_ACQUIRE_CB (void)0
694# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 746# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
695#endif 747#endif
696 748
697#define EVUNLOOP_RECURSE 0x80 749#define EVBREAK_RECURSE 0x80
698 750
699/*****************************************************************************/ 751/*****************************************************************************/
700 752
701#ifndef EV_HAVE_EV_TIME 753#ifndef EV_HAVE_EV_TIME
702ev_tstamp 754ev_tstamp
746 if (delay > 0.) 798 if (delay > 0.)
747 { 799 {
748#if EV_USE_NANOSLEEP 800#if EV_USE_NANOSLEEP
749 struct timespec ts; 801 struct timespec ts;
750 802
751 ts.tv_sec = (time_t)delay; 803 EV_TS_SET (ts, delay);
752 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
753
754 nanosleep (&ts, 0); 804 nanosleep (&ts, 0);
755#elif defined(_WIN32) 805#elif defined(_WIN32)
756 Sleep ((unsigned long)(delay * 1e3)); 806 Sleep ((unsigned long)(delay * 1e3));
757#else 807#else
758 struct timeval tv; 808 struct timeval tv;
759 809
760 tv.tv_sec = (time_t)delay;
761 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
762
763 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 810 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
764 /* something not guaranteed by newer posix versions, but guaranteed */ 811 /* something not guaranteed by newer posix versions, but guaranteed */
765 /* by older ones */ 812 /* by older ones */
813 EV_TV_SET (tv, delay);
766 select (0, 0, 0, 0, &tv); 814 select (0, 0, 0, 0, &tv);
767#endif 815#endif
768 } 816 }
769} 817}
770 818
771/*****************************************************************************/ 819/*****************************************************************************/
772 820
773#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 821#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
774 822
775/* find a suitable new size for the given array, */ 823/* find a suitable new size for the given array, */
776/* hopefully by rounding to a ncie-to-malloc size */ 824/* hopefully by rounding to a nice-to-malloc size */
777inline_size int 825inline_size int
778array_nextsize (int elem, int cur, int cnt) 826array_nextsize (int elem, int cur, int cnt)
779{ 827{
780 int ncur = cur + 1; 828 int ncur = cur + 1;
781 829
877} 925}
878 926
879/*****************************************************************************/ 927/*****************************************************************************/
880 928
881inline_speed void 929inline_speed void
882fd_event_nc (EV_P_ int fd, int revents) 930fd_event_nocheck (EV_P_ int fd, int revents)
883{ 931{
884 ANFD *anfd = anfds + fd; 932 ANFD *anfd = anfds + fd;
885 ev_io *w; 933 ev_io *w;
886 934
887 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 935 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
899fd_event (EV_P_ int fd, int revents) 947fd_event (EV_P_ int fd, int revents)
900{ 948{
901 ANFD *anfd = anfds + fd; 949 ANFD *anfd = anfds + fd;
902 950
903 if (expect_true (!anfd->reify)) 951 if (expect_true (!anfd->reify))
904 fd_event_nc (EV_A_ fd, revents); 952 fd_event_nocheck (EV_A_ fd, revents);
905} 953}
906 954
907void 955void
908ev_feed_fd_event (EV_P_ int fd, int revents) 956ev_feed_fd_event (EV_P_ int fd, int revents)
909{ 957{
910 if (fd >= 0 && fd < anfdmax) 958 if (fd >= 0 && fd < anfdmax)
911 fd_event_nc (EV_A_ fd, revents); 959 fd_event_nocheck (EV_A_ fd, revents);
912} 960}
913 961
914/* make sure the external fd watch events are in-sync */ 962/* make sure the external fd watch events are in-sync */
915/* with the kernel/libev internal state */ 963/* with the kernel/libev internal state */
916inline_size void 964inline_size void
922 { 970 {
923 int fd = fdchanges [i]; 971 int fd = fdchanges [i];
924 ANFD *anfd = anfds + fd; 972 ANFD *anfd = anfds + fd;
925 ev_io *w; 973 ev_io *w;
926 974
927 unsigned char events = 0; 975 unsigned char o_events = anfd->events;
976 unsigned char o_reify = anfd->reify;
928 977
929 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 978 anfd->reify = 0;
930 events |= (unsigned char)w->events;
931 979
932#if EV_SELECT_IS_WINSOCKET 980#if EV_SELECT_IS_WINSOCKET
933 if (events) 981 if (o_reify & EV__IOFDSET)
934 { 982 {
935 unsigned long arg; 983 unsigned long arg;
936 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 984 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
937 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 985 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
938 } 986 }
939#endif 987#endif
940 988
989 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
941 { 990 {
942 unsigned char o_events = anfd->events;
943 unsigned char o_reify = anfd->reify;
944
945 anfd->reify = 0;
946 anfd->events = events; 991 anfd->events = 0;
947 992
948 if (o_events != events || o_reify & EV__IOFDSET) 993 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
994 anfd->events |= (unsigned char)w->events;
995
996 if (o_events != anfd->events)
997 o_reify = EV__IOFDSET; /* actually |= */
998 }
999
1000 if (o_reify & EV__IOFDSET)
949 backend_modify (EV_A_ fd, o_events, events); 1001 backend_modify (EV_A_ fd, o_events, anfd->events);
950 }
951 } 1002 }
952 1003
953 fdchangecnt = 0; 1004 fdchangecnt = 0;
954} 1005}
955 1006
979 ev_io_stop (EV_A_ w); 1030 ev_io_stop (EV_A_ w);
980 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1031 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
981 } 1032 }
982} 1033}
983 1034
984/* check whether the given fd is atcually valid, for error recovery */ 1035/* check whether the given fd is actually valid, for error recovery */
985inline_size int 1036inline_size int
986fd_valid (int fd) 1037fd_valid (int fd)
987{ 1038{
988#ifdef _WIN32 1039#ifdef _WIN32
989 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1040 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
1031 anfds [fd].emask = 0; 1082 anfds [fd].emask = 0;
1032 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1083 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1033 } 1084 }
1034} 1085}
1035 1086
1087/* used to prepare libev internal fd's */
1088/* this is not fork-safe */
1089inline_speed void
1090fd_intern (int fd)
1091{
1092#ifdef _WIN32
1093 unsigned long arg = 1;
1094 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1095#else
1096 fcntl (fd, F_SETFD, FD_CLOEXEC);
1097 fcntl (fd, F_SETFL, O_NONBLOCK);
1098#endif
1099}
1100
1036/*****************************************************************************/ 1101/*****************************************************************************/
1037 1102
1038/* 1103/*
1039 * the heap functions want a real array index. array index 0 uis guaranteed to not 1104 * the heap functions want a real array index. array index 0 is guaranteed to not
1040 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1105 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1041 * the branching factor of the d-tree. 1106 * the branching factor of the d-tree.
1042 */ 1107 */
1043 1108
1044/* 1109/*
1192 1257
1193static ANSIG signals [EV_NSIG - 1]; 1258static ANSIG signals [EV_NSIG - 1];
1194 1259
1195/*****************************************************************************/ 1260/*****************************************************************************/
1196 1261
1197/* used to prepare libev internal fd's */ 1262#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1198/* this is not fork-safe */
1199inline_speed void
1200fd_intern (int fd)
1201{
1202#ifdef _WIN32
1203 unsigned long arg = 1;
1204 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1205#else
1206 fcntl (fd, F_SETFD, FD_CLOEXEC);
1207 fcntl (fd, F_SETFL, O_NONBLOCK);
1208#endif
1209}
1210 1263
1211static void noinline 1264static void noinline
1212evpipe_init (EV_P) 1265evpipe_init (EV_P)
1213{ 1266{
1214 if (!ev_is_active (&pipe_w)) 1267 if (!ev_is_active (&pipe_w))
1215 { 1268 {
1216#if EV_USE_EVENTFD 1269# if EV_USE_EVENTFD
1217 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1270 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1218 if (evfd < 0 && errno == EINVAL) 1271 if (evfd < 0 && errno == EINVAL)
1219 evfd = eventfd (0, 0); 1272 evfd = eventfd (0, 0);
1220 1273
1221 if (evfd >= 0) 1274 if (evfd >= 0)
1223 evpipe [0] = -1; 1276 evpipe [0] = -1;
1224 fd_intern (evfd); /* doing it twice doesn't hurt */ 1277 fd_intern (evfd); /* doing it twice doesn't hurt */
1225 ev_io_set (&pipe_w, evfd, EV_READ); 1278 ev_io_set (&pipe_w, evfd, EV_READ);
1226 } 1279 }
1227 else 1280 else
1228#endif 1281# endif
1229 { 1282 {
1230 while (pipe (evpipe)) 1283 while (pipe (evpipe))
1231 ev_syserr ("(libev) error creating signal/async pipe"); 1284 ev_syserr ("(libev) error creating signal/async pipe");
1232 1285
1233 fd_intern (evpipe [0]); 1286 fd_intern (evpipe [0]);
1244evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1297evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1245{ 1298{
1246 if (!*flag) 1299 if (!*flag)
1247 { 1300 {
1248 int old_errno = errno; /* save errno because write might clobber it */ 1301 int old_errno = errno; /* save errno because write might clobber it */
1302 char dummy;
1249 1303
1250 *flag = 1; 1304 *flag = 1;
1251 1305
1252#if EV_USE_EVENTFD 1306#if EV_USE_EVENTFD
1253 if (evfd >= 0) 1307 if (evfd >= 0)
1255 uint64_t counter = 1; 1309 uint64_t counter = 1;
1256 write (evfd, &counter, sizeof (uint64_t)); 1310 write (evfd, &counter, sizeof (uint64_t));
1257 } 1311 }
1258 else 1312 else
1259#endif 1313#endif
1314 /* win32 people keep sending patches that change this write() to send() */
1315 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1316 /* so when you think this write should be a send instead, please find out */
1317 /* where your send() is from - it's definitely not the microsoft send, and */
1318 /* tell me. thank you. */
1260 write (evpipe [1], &old_errno, 1); 1319 write (evpipe [1], &dummy, 1);
1261 1320
1262 errno = old_errno; 1321 errno = old_errno;
1263 } 1322 }
1264} 1323}
1265 1324
1278 } 1337 }
1279 else 1338 else
1280#endif 1339#endif
1281 { 1340 {
1282 char dummy; 1341 char dummy;
1342 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1283 read (evpipe [0], &dummy, 1); 1343 read (evpipe [0], &dummy, 1);
1284 } 1344 }
1285 1345
1286 if (sig_pending) 1346 if (sig_pending)
1287 { 1347 {
1366 break; 1426 break;
1367 } 1427 }
1368} 1428}
1369#endif 1429#endif
1370 1430
1431#endif
1432
1371/*****************************************************************************/ 1433/*****************************************************************************/
1372 1434
1435#if EV_CHILD_ENABLE
1373static WL childs [EV_PID_HASHSIZE]; 1436static WL childs [EV_PID_HASHSIZE];
1374
1375#ifndef _WIN32
1376 1437
1377static ev_signal childev; 1438static ev_signal childev;
1378 1439
1379#ifndef WIFCONTINUED 1440#ifndef WIFCONTINUED
1380# define WIFCONTINUED(status) 0 1441# define WIFCONTINUED(status) 0
1385child_reap (EV_P_ int chain, int pid, int status) 1446child_reap (EV_P_ int chain, int pid, int status)
1386{ 1447{
1387 ev_child *w; 1448 ev_child *w;
1388 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1449 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1389 1450
1390 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1451 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1391 { 1452 {
1392 if ((w->pid == pid || !w->pid) 1453 if ((w->pid == pid || !w->pid)
1393 && (!traced || (w->flags & 1))) 1454 && (!traced || (w->flags & 1)))
1394 { 1455 {
1395 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1456 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
1420 /* make sure we are called again until all children have been reaped */ 1481 /* make sure we are called again until all children have been reaped */
1421 /* we need to do it this way so that the callback gets called before we continue */ 1482 /* we need to do it this way so that the callback gets called before we continue */
1422 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1483 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1423 1484
1424 child_reap (EV_A_ pid, pid, status); 1485 child_reap (EV_A_ pid, pid, status);
1425 if (EV_PID_HASHSIZE > 1) 1486 if ((EV_PID_HASHSIZE) > 1)
1426 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1487 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1427} 1488}
1428 1489
1429#endif 1490#endif
1430 1491
1497#ifdef __APPLE__ 1558#ifdef __APPLE__
1498 /* only select works correctly on that "unix-certified" platform */ 1559 /* only select works correctly on that "unix-certified" platform */
1499 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1560 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1500 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1561 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1501#endif 1562#endif
1563#ifdef __FreeBSD__
1564 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1565#endif
1502 1566
1503 return flags; 1567 return flags;
1504} 1568}
1505 1569
1506unsigned int 1570unsigned int
1507ev_embeddable_backends (void) 1571ev_embeddable_backends (void)
1508{ 1572{
1509 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1573 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1510 1574
1511 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1575 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1512 /* please fix it and tell me how to detect the fix */ 1576 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1513 flags &= ~EVBACKEND_EPOLL; 1577 flags &= ~EVBACKEND_EPOLL;
1514 1578
1515 return flags; 1579 return flags;
1516} 1580}
1517 1581
1518unsigned int 1582unsigned int
1519ev_backend (EV_P) 1583ev_backend (EV_P)
1520{ 1584{
1521 return backend; 1585 return backend;
1522} 1586}
1523 1587
1524#if EV_MINIMAL < 2 1588#if EV_FEATURE_API
1525unsigned int 1589unsigned int
1526ev_loop_count (EV_P) 1590ev_iteration (EV_P)
1527{ 1591{
1528 return loop_count; 1592 return loop_count;
1529} 1593}
1530 1594
1531unsigned int 1595unsigned int
1532ev_loop_depth (EV_P) 1596ev_depth (EV_P)
1533{ 1597{
1534 return loop_depth; 1598 return loop_depth;
1535} 1599}
1536 1600
1537void 1601void
1609 1673
1610 ev_rt_now = ev_time (); 1674 ev_rt_now = ev_time ();
1611 mn_now = get_clock (); 1675 mn_now = get_clock ();
1612 now_floor = mn_now; 1676 now_floor = mn_now;
1613 rtmn_diff = ev_rt_now - mn_now; 1677 rtmn_diff = ev_rt_now - mn_now;
1614#if EV_MINIMAL < 2 1678#if EV_FEATURE_API
1615 invoke_cb = ev_invoke_pending; 1679 invoke_cb = ev_invoke_pending;
1616#endif 1680#endif
1617 1681
1618 io_blocktime = 0.; 1682 io_blocktime = 0.;
1619 timeout_blocktime = 0.; 1683 timeout_blocktime = 0.;
1649 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1713 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1650#endif 1714#endif
1651 1715
1652 ev_prepare_init (&pending_w, pendingcb); 1716 ev_prepare_init (&pending_w, pendingcb);
1653 1717
1718#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1654 ev_init (&pipe_w, pipecb); 1719 ev_init (&pipe_w, pipecb);
1655 ev_set_priority (&pipe_w, EV_MAXPRI); 1720 ev_set_priority (&pipe_w, EV_MAXPRI);
1721#endif
1656 } 1722 }
1657} 1723}
1658 1724
1659/* free up a loop structure */ 1725/* free up a loop structure */
1660static void noinline 1726static void noinline
1778 { 1844 {
1779 EV_WIN32_CLOSE_FD (evpipe [0]); 1845 EV_WIN32_CLOSE_FD (evpipe [0]);
1780 EV_WIN32_CLOSE_FD (evpipe [1]); 1846 EV_WIN32_CLOSE_FD (evpipe [1]);
1781 } 1847 }
1782 1848
1849#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1783 evpipe_init (EV_A); 1850 evpipe_init (EV_A);
1784 /* now iterate over everything, in case we missed something */ 1851 /* now iterate over everything, in case we missed something */
1785 pipecb (EV_A_ &pipe_w, EV_READ); 1852 pipecb (EV_A_ &pipe_w, EV_READ);
1853#endif
1786 } 1854 }
1787 1855
1788 postfork = 0; 1856 postfork = 0;
1789} 1857}
1790 1858
1852 verify_watcher (EV_A_ ws [cnt]); 1920 verify_watcher (EV_A_ ws [cnt]);
1853 } 1921 }
1854} 1922}
1855#endif 1923#endif
1856 1924
1857#if EV_MINIMAL < 2 1925#if EV_FEATURE_API
1858void 1926void
1859ev_loop_verify (EV_P) 1927ev_verify (EV_P)
1860{ 1928{
1861#if EV_VERIFY 1929#if EV_VERIFY
1862 int i; 1930 int i;
1863 WL w; 1931 WL w;
1864 1932
1903#if EV_ASYNC_ENABLE 1971#if EV_ASYNC_ENABLE
1904 assert (asyncmax >= asynccnt); 1972 assert (asyncmax >= asynccnt);
1905 array_verify (EV_A_ (W *)asyncs, asynccnt); 1973 array_verify (EV_A_ (W *)asyncs, asynccnt);
1906#endif 1974#endif
1907 1975
1976#if EV_PREPARE_ENABLE
1908 assert (preparemax >= preparecnt); 1977 assert (preparemax >= preparecnt);
1909 array_verify (EV_A_ (W *)prepares, preparecnt); 1978 array_verify (EV_A_ (W *)prepares, preparecnt);
1979#endif
1910 1980
1981#if EV_CHECK_ENABLE
1911 assert (checkmax >= checkcnt); 1982 assert (checkmax >= checkcnt);
1912 array_verify (EV_A_ (W *)checks, checkcnt); 1983 array_verify (EV_A_ (W *)checks, checkcnt);
1984#endif
1913 1985
1914# if 0 1986# if 0
1987#if EV_CHILD_ENABLE
1915 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1988 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1916 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1989 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1990#endif
1917# endif 1991# endif
1918#endif 1992#endif
1919} 1993}
1920#endif 1994#endif
1921 1995
1937 2011
1938 loop_init (EV_A_ flags); 2012 loop_init (EV_A_ flags);
1939 2013
1940 if (ev_backend (EV_A)) 2014 if (ev_backend (EV_A))
1941 { 2015 {
1942#ifndef _WIN32 2016#if EV_CHILD_ENABLE
1943 ev_signal_init (&childev, childcb, SIGCHLD); 2017 ev_signal_init (&childev, childcb, SIGCHLD);
1944 ev_set_priority (&childev, EV_MAXPRI); 2018 ev_set_priority (&childev, EV_MAXPRI);
1945 ev_signal_start (EV_A_ &childev); 2019 ev_signal_start (EV_A_ &childev);
1946 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2020 ev_unref (EV_A); /* child watcher should not keep loop alive */
1947#endif 2021#endif
1960 EV_P = ev_default_loop_ptr; 2034 EV_P = ev_default_loop_ptr;
1961#endif 2035#endif
1962 2036
1963 ev_default_loop_ptr = 0; 2037 ev_default_loop_ptr = 0;
1964 2038
1965#ifndef _WIN32 2039#if EV_CHILD_ENABLE
1966 ev_ref (EV_A); /* child watcher */ 2040 ev_ref (EV_A); /* child watcher */
1967 ev_signal_stop (EV_A_ &childev); 2041 ev_signal_stop (EV_A_ &childev);
1968#endif 2042#endif
1969 2043
1970 loop_destroy (EV_A); 2044 loop_destroy (EV_A);
2076 EV_FREQUENT_CHECK; 2150 EV_FREQUENT_CHECK;
2077 feed_reverse (EV_A_ (W)w); 2151 feed_reverse (EV_A_ (W)w);
2078 } 2152 }
2079 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2153 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2080 2154
2081 feed_reverse_done (EV_A_ EV_TIMEOUT); 2155 feed_reverse_done (EV_A_ EV_TIMER);
2082 } 2156 }
2083} 2157}
2084 2158
2085#if EV_PERIODIC_ENABLE 2159#if EV_PERIODIC_ENABLE
2086/* make periodics pending */ 2160/* make periodics pending */
2139 feed_reverse_done (EV_A_ EV_PERIODIC); 2213 feed_reverse_done (EV_A_ EV_PERIODIC);
2140 } 2214 }
2141} 2215}
2142 2216
2143/* simply recalculate all periodics */ 2217/* simply recalculate all periodics */
2144/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2218/* TODO: maybe ensure that at least one event happens when jumping forward? */
2145static void noinline 2219static void noinline
2146periodics_reschedule (EV_P) 2220periodics_reschedule (EV_P)
2147{ 2221{
2148 int i; 2222 int i;
2149 2223
2245 mn_now = ev_rt_now; 2319 mn_now = ev_rt_now;
2246 } 2320 }
2247} 2321}
2248 2322
2249void 2323void
2250ev_loop (EV_P_ int flags) 2324ev_run (EV_P_ int flags)
2251{ 2325{
2252#if EV_MINIMAL < 2 2326#if EV_FEATURE_API
2253 ++loop_depth; 2327 ++loop_depth;
2254#endif 2328#endif
2255 2329
2256 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2330 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2257 2331
2258 loop_done = EVUNLOOP_CANCEL; 2332 loop_done = EVBREAK_CANCEL;
2259 2333
2260 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2334 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2261 2335
2262 do 2336 do
2263 { 2337 {
2264#if EV_VERIFY >= 2 2338#if EV_VERIFY >= 2
2265 ev_loop_verify (EV_A); 2339 ev_verify (EV_A);
2266#endif 2340#endif
2267 2341
2268#ifndef _WIN32 2342#ifndef _WIN32
2269 if (expect_false (curpid)) /* penalise the forking check even more */ 2343 if (expect_false (curpid)) /* penalise the forking check even more */
2270 if (expect_false (getpid () != curpid)) 2344 if (expect_false (getpid () != curpid))
2282 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2356 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2283 EV_INVOKE_PENDING; 2357 EV_INVOKE_PENDING;
2284 } 2358 }
2285#endif 2359#endif
2286 2360
2361#if EV_PREPARE_ENABLE
2287 /* queue prepare watchers (and execute them) */ 2362 /* queue prepare watchers (and execute them) */
2288 if (expect_false (preparecnt)) 2363 if (expect_false (preparecnt))
2289 { 2364 {
2290 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2365 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2291 EV_INVOKE_PENDING; 2366 EV_INVOKE_PENDING;
2292 } 2367 }
2368#endif
2293 2369
2294 if (expect_false (loop_done)) 2370 if (expect_false (loop_done))
2295 break; 2371 break;
2296 2372
2297 /* we might have forked, so reify kernel state if necessary */ 2373 /* we might have forked, so reify kernel state if necessary */
2304 /* calculate blocking time */ 2380 /* calculate blocking time */
2305 { 2381 {
2306 ev_tstamp waittime = 0.; 2382 ev_tstamp waittime = 0.;
2307 ev_tstamp sleeptime = 0.; 2383 ev_tstamp sleeptime = 0.;
2308 2384
2385 /* remember old timestamp for io_blocktime calculation */
2386 ev_tstamp prev_mn_now = mn_now;
2387
2388 /* update time to cancel out callback processing overhead */
2389 time_update (EV_A_ 1e100);
2390
2309 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2391 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2310 { 2392 {
2311 /* remember old timestamp for io_blocktime calculation */
2312 ev_tstamp prev_mn_now = mn_now;
2313
2314 /* update time to cancel out callback processing overhead */
2315 time_update (EV_A_ 1e100);
2316
2317 waittime = MAX_BLOCKTIME; 2393 waittime = MAX_BLOCKTIME;
2318 2394
2319 if (timercnt) 2395 if (timercnt)
2320 { 2396 {
2321 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2397 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2348 waittime -= sleeptime; 2424 waittime -= sleeptime;
2349 } 2425 }
2350 } 2426 }
2351 } 2427 }
2352 2428
2353#if EV_MINIMAL < 2 2429#if EV_FEATURE_API
2354 ++loop_count; 2430 ++loop_count;
2355#endif 2431#endif
2356 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2432 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2357 backend_poll (EV_A_ waittime); 2433 backend_poll (EV_A_ waittime);
2358 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2434 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2359 2435
2360 /* update ev_rt_now, do magic */ 2436 /* update ev_rt_now, do magic */
2361 time_update (EV_A_ waittime + sleeptime); 2437 time_update (EV_A_ waittime + sleeptime);
2362 } 2438 }
2363 2439
2370#if EV_IDLE_ENABLE 2446#if EV_IDLE_ENABLE
2371 /* queue idle watchers unless other events are pending */ 2447 /* queue idle watchers unless other events are pending */
2372 idle_reify (EV_A); 2448 idle_reify (EV_A);
2373#endif 2449#endif
2374 2450
2451#if EV_CHECK_ENABLE
2375 /* queue check watchers, to be executed first */ 2452 /* queue check watchers, to be executed first */
2376 if (expect_false (checkcnt)) 2453 if (expect_false (checkcnt))
2377 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2454 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2455#endif
2378 2456
2379 EV_INVOKE_PENDING; 2457 EV_INVOKE_PENDING;
2380 } 2458 }
2381 while (expect_true ( 2459 while (expect_true (
2382 activecnt 2460 activecnt
2383 && !loop_done 2461 && !loop_done
2384 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2462 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2385 )); 2463 ));
2386 2464
2387 if (loop_done == EVUNLOOP_ONE) 2465 if (loop_done == EVBREAK_ONE)
2388 loop_done = EVUNLOOP_CANCEL; 2466 loop_done = EVBREAK_CANCEL;
2389 2467
2390#if EV_MINIMAL < 2 2468#if EV_FEATURE_API
2391 --loop_depth; 2469 --loop_depth;
2392#endif 2470#endif
2393} 2471}
2394 2472
2395void 2473void
2396ev_unloop (EV_P_ int how) 2474ev_break (EV_P_ int how)
2397{ 2475{
2398 loop_done = how; 2476 loop_done = how;
2399} 2477}
2400 2478
2401void 2479void
2549 EV_FREQUENT_CHECK; 2627 EV_FREQUENT_CHECK;
2550 2628
2551 wlist_del (&anfds[w->fd].head, (WL)w); 2629 wlist_del (&anfds[w->fd].head, (WL)w);
2552 ev_stop (EV_A_ (W)w); 2630 ev_stop (EV_A_ (W)w);
2553 2631
2554 fd_change (EV_A_ w->fd, 1); 2632 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2555 2633
2556 EV_FREQUENT_CHECK; 2634 EV_FREQUENT_CHECK;
2557} 2635}
2558 2636
2559void noinline 2637void noinline
2712 2790
2713#ifndef SA_RESTART 2791#ifndef SA_RESTART
2714# define SA_RESTART 0 2792# define SA_RESTART 0
2715#endif 2793#endif
2716 2794
2795#if EV_SIGNAL_ENABLE
2796
2717void noinline 2797void noinline
2718ev_signal_start (EV_P_ ev_signal *w) 2798ev_signal_start (EV_P_ ev_signal *w)
2719{ 2799{
2720 if (expect_false (ev_is_active (w))) 2800 if (expect_false (ev_is_active (w)))
2721 return; 2801 return;
2827 } 2907 }
2828 2908
2829 EV_FREQUENT_CHECK; 2909 EV_FREQUENT_CHECK;
2830} 2910}
2831 2911
2912#endif
2913
2914#if EV_CHILD_ENABLE
2915
2832void 2916void
2833ev_child_start (EV_P_ ev_child *w) 2917ev_child_start (EV_P_ ev_child *w)
2834{ 2918{
2835#if EV_MULTIPLICITY 2919#if EV_MULTIPLICITY
2836 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2920 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2839 return; 2923 return;
2840 2924
2841 EV_FREQUENT_CHECK; 2925 EV_FREQUENT_CHECK;
2842 2926
2843 ev_start (EV_A_ (W)w, 1); 2927 ev_start (EV_A_ (W)w, 1);
2844 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2928 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2845 2929
2846 EV_FREQUENT_CHECK; 2930 EV_FREQUENT_CHECK;
2847} 2931}
2848 2932
2849void 2933void
2853 if (expect_false (!ev_is_active (w))) 2937 if (expect_false (!ev_is_active (w)))
2854 return; 2938 return;
2855 2939
2856 EV_FREQUENT_CHECK; 2940 EV_FREQUENT_CHECK;
2857 2941
2858 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2942 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2859 ev_stop (EV_A_ (W)w); 2943 ev_stop (EV_A_ (W)w);
2860 2944
2861 EV_FREQUENT_CHECK; 2945 EV_FREQUENT_CHECK;
2862} 2946}
2947
2948#endif
2863 2949
2864#if EV_STAT_ENABLE 2950#if EV_STAT_ENABLE
2865 2951
2866# ifdef _WIN32 2952# ifdef _WIN32
2867# undef lstat 2953# undef lstat
2934 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3020 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2935 } 3021 }
2936 } 3022 }
2937 3023
2938 if (w->wd >= 0) 3024 if (w->wd >= 0)
2939 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3025 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2940 3026
2941 /* now re-arm timer, if required */ 3027 /* now re-arm timer, if required */
2942 if (ev_is_active (&w->timer)) ev_ref (EV_A); 3028 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2943 ev_timer_again (EV_A_ &w->timer); 3029 ev_timer_again (EV_A_ &w->timer);
2944 if (ev_is_active (&w->timer)) ev_unref (EV_A); 3030 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2952 3038
2953 if (wd < 0) 3039 if (wd < 0)
2954 return; 3040 return;
2955 3041
2956 w->wd = -2; 3042 w->wd = -2;
2957 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3043 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2958 wlist_del (&fs_hash [slot].head, (WL)w); 3044 wlist_del (&fs_hash [slot].head, (WL)w);
2959 3045
2960 /* remove this watcher, if others are watching it, they will rearm */ 3046 /* remove this watcher, if others are watching it, they will rearm */
2961 inotify_rm_watch (fs_fd, wd); 3047 inotify_rm_watch (fs_fd, wd);
2962} 3048}
2964static void noinline 3050static void noinline
2965infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3051infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2966{ 3052{
2967 if (slot < 0) 3053 if (slot < 0)
2968 /* overflow, need to check for all hash slots */ 3054 /* overflow, need to check for all hash slots */
2969 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3055 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2970 infy_wd (EV_A_ slot, wd, ev); 3056 infy_wd (EV_A_ slot, wd, ev);
2971 else 3057 else
2972 { 3058 {
2973 WL w_; 3059 WL w_;
2974 3060
2975 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3061 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2976 { 3062 {
2977 ev_stat *w = (ev_stat *)w_; 3063 ev_stat *w = (ev_stat *)w_;
2978 w_ = w_->next; /* lets us remove this watcher and all before it */ 3064 w_ = w_->next; /* lets us remove this watcher and all before it */
2979 3065
2980 if (w->wd == wd || wd == -1) 3066 if (w->wd == wd || wd == -1)
2981 { 3067 {
2982 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3068 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2983 { 3069 {
2984 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3070 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2985 w->wd = -1; 3071 w->wd = -1;
2986 infy_add (EV_A_ w); /* re-add, no matter what */ 3072 infy_add (EV_A_ w); /* re-add, no matter what */
2987 } 3073 }
2988 3074
2989 stat_timer_cb (EV_A_ &w->timer, 0); 3075 stat_timer_cb (EV_A_ &w->timer, 0);
3003 { 3089 {
3004 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3090 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3005 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3091 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3006 ofs += sizeof (struct inotify_event) + ev->len; 3092 ofs += sizeof (struct inotify_event) + ev->len;
3007 } 3093 }
3008}
3009
3010inline_size unsigned int
3011ev_linux_version (void)
3012{
3013 struct utsname buf;
3014 unsigned int v;
3015 int i;
3016 char *p = buf.release;
3017
3018 if (uname (&buf))
3019 return 0;
3020
3021 for (i = 3+1; --i; )
3022 {
3023 unsigned int c = 0;
3024
3025 for (;;)
3026 {
3027 if (*p >= '0' && *p <= '9')
3028 c = c * 10 + *p++ - '0';
3029 else
3030 {
3031 p += *p == '.';
3032 break;
3033 }
3034 }
3035
3036 v = (v << 8) | c;
3037 }
3038
3039 return v;
3040} 3094}
3041 3095
3042inline_size void 3096inline_size void
3043ev_check_2625 (EV_P) 3097ev_check_2625 (EV_P)
3044{ 3098{
3103 ev_io_set (&fs_w, fs_fd, EV_READ); 3157 ev_io_set (&fs_w, fs_fd, EV_READ);
3104 ev_io_start (EV_A_ &fs_w); 3158 ev_io_start (EV_A_ &fs_w);
3105 ev_unref (EV_A); 3159 ev_unref (EV_A);
3106 } 3160 }
3107 3161
3108 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3162 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3109 { 3163 {
3110 WL w_ = fs_hash [slot].head; 3164 WL w_ = fs_hash [slot].head;
3111 fs_hash [slot].head = 0; 3165 fs_hash [slot].head = 0;
3112 3166
3113 while (w_) 3167 while (w_)
3288 3342
3289 EV_FREQUENT_CHECK; 3343 EV_FREQUENT_CHECK;
3290} 3344}
3291#endif 3345#endif
3292 3346
3347#if EV_PREPARE_ENABLE
3293void 3348void
3294ev_prepare_start (EV_P_ ev_prepare *w) 3349ev_prepare_start (EV_P_ ev_prepare *w)
3295{ 3350{
3296 if (expect_false (ev_is_active (w))) 3351 if (expect_false (ev_is_active (w)))
3297 return; 3352 return;
3323 3378
3324 ev_stop (EV_A_ (W)w); 3379 ev_stop (EV_A_ (W)w);
3325 3380
3326 EV_FREQUENT_CHECK; 3381 EV_FREQUENT_CHECK;
3327} 3382}
3383#endif
3328 3384
3385#if EV_CHECK_ENABLE
3329void 3386void
3330ev_check_start (EV_P_ ev_check *w) 3387ev_check_start (EV_P_ ev_check *w)
3331{ 3388{
3332 if (expect_false (ev_is_active (w))) 3389 if (expect_false (ev_is_active (w)))
3333 return; 3390 return;
3359 3416
3360 ev_stop (EV_A_ (W)w); 3417 ev_stop (EV_A_ (W)w);
3361 3418
3362 EV_FREQUENT_CHECK; 3419 EV_FREQUENT_CHECK;
3363} 3420}
3421#endif
3364 3422
3365#if EV_EMBED_ENABLE 3423#if EV_EMBED_ENABLE
3366void noinline 3424void noinline
3367ev_embed_sweep (EV_P_ ev_embed *w) 3425ev_embed_sweep (EV_P_ ev_embed *w)
3368{ 3426{
3369 ev_loop (w->other, EVLOOP_NONBLOCK); 3427 ev_run (w->other, EVRUN_NOWAIT);
3370} 3428}
3371 3429
3372static void 3430static void
3373embed_io_cb (EV_P_ ev_io *io, int revents) 3431embed_io_cb (EV_P_ ev_io *io, int revents)
3374{ 3432{
3375 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3433 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3376 3434
3377 if (ev_cb (w)) 3435 if (ev_cb (w))
3378 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3436 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3379 else 3437 else
3380 ev_loop (w->other, EVLOOP_NONBLOCK); 3438 ev_run (w->other, EVRUN_NOWAIT);
3381} 3439}
3382 3440
3383static void 3441static void
3384embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3442embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3385{ 3443{
3389 EV_P = w->other; 3447 EV_P = w->other;
3390 3448
3391 while (fdchangecnt) 3449 while (fdchangecnt)
3392 { 3450 {
3393 fd_reify (EV_A); 3451 fd_reify (EV_A);
3394 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3452 ev_run (EV_A_ EVRUN_NOWAIT);
3395 } 3453 }
3396 } 3454 }
3397} 3455}
3398 3456
3399static void 3457static void
3405 3463
3406 { 3464 {
3407 EV_P = w->other; 3465 EV_P = w->other;
3408 3466
3409 ev_loop_fork (EV_A); 3467 ev_loop_fork (EV_A);
3410 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3468 ev_run (EV_A_ EVRUN_NOWAIT);
3411 } 3469 }
3412 3470
3413 ev_embed_start (EV_A_ w); 3471 ev_embed_start (EV_A_ w);
3414} 3472}
3415 3473
3514ev_async_start (EV_P_ ev_async *w) 3572ev_async_start (EV_P_ ev_async *w)
3515{ 3573{
3516 if (expect_false (ev_is_active (w))) 3574 if (expect_false (ev_is_active (w)))
3517 return; 3575 return;
3518 3576
3577 w->sent = 0;
3578
3519 evpipe_init (EV_A); 3579 evpipe_init (EV_A);
3520 3580
3521 EV_FREQUENT_CHECK; 3581 EV_FREQUENT_CHECK;
3522 3582
3523 ev_start (EV_A_ (W)w, ++asynccnt); 3583 ev_start (EV_A_ (W)w, ++asynccnt);
3600{ 3660{
3601 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3661 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3602 3662
3603 if (expect_false (!once)) 3663 if (expect_false (!once))
3604 { 3664 {
3605 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3665 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3606 return; 3666 return;
3607 } 3667 }
3608 3668
3609 once->cb = cb; 3669 once->cb = cb;
3610 once->arg = arg; 3670 once->arg = arg;
3697 if (types & EV_ASYNC) 3757 if (types & EV_ASYNC)
3698 for (i = asynccnt; i--; ) 3758 for (i = asynccnt; i--; )
3699 cb (EV_A_ EV_ASYNC, asyncs [i]); 3759 cb (EV_A_ EV_ASYNC, asyncs [i]);
3700#endif 3760#endif
3701 3761
3762#if EV_PREPARE_ENABLE
3702 if (types & EV_PREPARE) 3763 if (types & EV_PREPARE)
3703 for (i = preparecnt; i--; ) 3764 for (i = preparecnt; i--; )
3704#if EV_EMBED_ENABLE 3765# if EV_EMBED_ENABLE
3705 if (ev_cb (prepares [i]) != embed_prepare_cb) 3766 if (ev_cb (prepares [i]) != embed_prepare_cb)
3706#endif 3767# endif
3707 cb (EV_A_ EV_PREPARE, prepares [i]); 3768 cb (EV_A_ EV_PREPARE, prepares [i]);
3769#endif
3708 3770
3771#if EV_CHECK_ENABLE
3709 if (types & EV_CHECK) 3772 if (types & EV_CHECK)
3710 for (i = checkcnt; i--; ) 3773 for (i = checkcnt; i--; )
3711 cb (EV_A_ EV_CHECK, checks [i]); 3774 cb (EV_A_ EV_CHECK, checks [i]);
3775#endif
3712 3776
3777#if EV_SIGNAL_ENABLE
3713 if (types & EV_SIGNAL) 3778 if (types & EV_SIGNAL)
3714 for (i = 0; i < EV_NSIG - 1; ++i) 3779 for (i = 0; i < EV_NSIG - 1; ++i)
3715 for (wl = signals [i].head; wl; ) 3780 for (wl = signals [i].head; wl; )
3716 { 3781 {
3717 wn = wl->next; 3782 wn = wl->next;
3718 cb (EV_A_ EV_SIGNAL, wl); 3783 cb (EV_A_ EV_SIGNAL, wl);
3719 wl = wn; 3784 wl = wn;
3720 } 3785 }
3786#endif
3721 3787
3788#if EV_CHILD_ENABLE
3722 if (types & EV_CHILD) 3789 if (types & EV_CHILD)
3723 for (i = EV_PID_HASHSIZE; i--; ) 3790 for (i = (EV_PID_HASHSIZE); i--; )
3724 for (wl = childs [i]; wl; ) 3791 for (wl = childs [i]; wl; )
3725 { 3792 {
3726 wn = wl->next; 3793 wn = wl->next;
3727 cb (EV_A_ EV_CHILD, wl); 3794 cb (EV_A_ EV_CHILD, wl);
3728 wl = wn; 3795 wl = wn;
3729 } 3796 }
3797#endif
3730/* EV_STAT 0x00001000 /* stat data changed */ 3798/* EV_STAT 0x00001000 /* stat data changed */
3731/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3799/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3732} 3800}
3733#endif 3801#endif
3734 3802
3735#if EV_MULTIPLICITY 3803#if EV_MULTIPLICITY
3736 #include "ev_wrap.h" 3804 #include "ev_wrap.h"
3737#endif 3805#endif
3738 3806
3739#ifdef __cplusplus 3807EV_CPP(})
3740}
3741#endif
3742 3808

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines