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

Comparing libev/ev.c (file contents):
Revision 1.310 by root, Sun Jul 26 04:43:03 2009 UTC vs.
Revision 1.354 by root, Fri Oct 22 09:24:11 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
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# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# ifndef EV_USE_KQUEUE 115# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
116# define EV_USE_KQUEUE 1
117# else
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>
157#include <stdlib.h> 162#include <stdlib.h>
163#include <string.h>
158#include <fcntl.h> 164#include <fcntl.h>
159#include <stddef.h> 165#include <stddef.h>
160 166
161#include <stdio.h> 167#include <stdio.h>
162 168
163#include <assert.h> 169#include <assert.h>
164#include <errno.h> 170#include <errno.h>
165#include <sys/types.h> 171#include <sys/types.h>
166#include <time.h> 172#include <time.h>
173#include <limits.h>
167 174
168#include <signal.h> 175#include <signal.h>
169 176
170#ifdef EV_H 177#ifdef EV_H
171# include EV_H 178# include EV_H
172#else 179#else
173# include "ev.h" 180# include "ev.h"
174#endif 181#endif
182
183EV_CPP(extern "C" {)
175 184
176#ifndef _WIN32 185#ifndef _WIN32
177# include <sys/time.h> 186# include <sys/time.h>
178# include <sys/wait.h> 187# include <sys/wait.h>
179# include <unistd.h> 188# include <unistd.h>
182# define WIN32_LEAN_AND_MEAN 191# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 192# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
186# endif 195# endif
196# undef EV_AVOID_STDIO
187#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
188 206
189/* 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 */
190 208
191/* try to deduce the maximum number of signals on this platform */ 209/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG) 210#if defined (EV_NSIG)
204#elif defined (MAXSIG) 222#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 223# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 224#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 225# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 226#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 228#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 230#else
213# error "unable to find value for NSIG, please report" 231# error "unable to find value for NSIG, please report"
214/* 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! :) */
215# define EV_NSIG 65 234# define EV_NSIG 65
216#endif 235#endif
217 236
218#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
220# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
221# else 240# else
222# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
223# endif 242# endif
224#endif 243#endif
225 244
226#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
227# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
228# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
229# else 248# else
230# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
231# endif 250# endif
232#endif 251#endif
233 252
235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
236#endif 255#endif
237 256
238#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
239# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
240# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
241# else 260# else
242# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
243# endif 262# endif
244#endif 263#endif
245 264
246#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
247# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
248#endif 267#endif
249 268
250#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
251# ifdef _WIN32 270# ifdef _WIN32
252# define EV_USE_POLL 0 271# define EV_USE_POLL 0
253# else 272# else
254# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
255# endif 274# endif
256#endif 275#endif
257 276
258#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
259# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
260# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
261# else 280# else
262# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
263# endif 282# endif
264#endif 283#endif
265 284
271# define EV_USE_PORT 0 290# define EV_USE_PORT 0
272#endif 291#endif
273 292
274#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
275# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
276# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
277# else 296# else
278# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
279# endif 298# endif
280#endif 299#endif
281 300
282#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
283# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
284# define EV_PID_HASHSIZE 1
285# else
286# define EV_PID_HASHSIZE 16
287# endif
288#endif 303#endif
289 304
290#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
291# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
292# define EV_INOTIFY_HASHSIZE 1
293# else
294# define EV_INOTIFY_HASHSIZE 16
295# endif
296#endif 307#endif
297 308
298#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
299# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
300# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
301# else 312# else
302# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
303# endif 314# endif
304#endif 315#endif
305 316
306#ifndef EV_USE_SIGNALFD 317#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1 319# define EV_USE_SIGNALFD EV_FEATURE_OS
309# else 320# else
310# define EV_USE_SIGNALFD 0 321# define EV_USE_SIGNALFD 0
311# endif 322# endif
312#endif 323#endif
313 324
316# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
317# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
318#endif 329#endif
319 330
320#ifndef EV_VERIFY 331#ifndef EV_VERIFY
321# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
322#endif 333#endif
323 334
324#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
325# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
326#endif 337#endif
327 338
328#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
329# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
330#endif 341#endif
331 342
332/* 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, */
333/* which makes programs even slower. might work on other unices, too. */ 344/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL 345#if EV_USE_CLOCK_SYSCALL
343# endif 354# endif
344#endif 355#endif
345 356
346/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 357/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347 358
359#ifdef _AIX
360/* AIX has a completely broken poll.h header */
361# undef EV_USE_POLL
362# define EV_USE_POLL 0
363#endif
364
348#ifndef CLOCK_MONOTONIC 365#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 366# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 367# define EV_USE_MONOTONIC 0
351#endif 368#endif
352 369
386# include <stdint.h> 403# include <stdint.h>
387# ifndef EFD_NONBLOCK 404# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK 405# define EFD_NONBLOCK O_NONBLOCK
389# endif 406# endif
390# ifndef EFD_CLOEXEC 407# ifndef EFD_CLOEXEC
408# ifdef O_CLOEXEC
391# define EFD_CLOEXEC O_CLOEXEC 409# define EFD_CLOEXEC O_CLOEXEC
410# else
411# define EFD_CLOEXEC 02000000
412# endif
392# endif 413# endif
393# ifdef __cplusplus 414EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
394extern "C" { 415#endif
416
417#if EV_USE_SIGNALFD
418/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
419# include <stdint.h>
420# ifndef SFD_NONBLOCK
421# define SFD_NONBLOCK O_NONBLOCK
395# endif 422# endif
396int eventfd (unsigned int initval, int flags); 423# ifndef SFD_CLOEXEC
397# ifdef __cplusplus 424# ifdef O_CLOEXEC
398} 425# define SFD_CLOEXEC O_CLOEXEC
426# else
427# define SFD_CLOEXEC 02000000
428# endif
399# endif 429# endif
400#endif 430EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
401 431
402#if EV_USE_SIGNALFD 432struct signalfd_siginfo
403# include <sys/signalfd.h> 433{
434 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)];
436};
404#endif 437#endif
405 438
406/**/ 439/**/
407 440
408#if EV_VERIFY >= 3 441#if EV_VERIFY >= 3
409# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 442# define EV_FREQUENT_CHECK ev_verify (EV_A)
410#else 443#else
411# define EV_FREQUENT_CHECK do { } while (0) 444# define EV_FREQUENT_CHECK do { } while (0)
412#endif 445#endif
413 446
414/* 447/*
421 */ 454 */
422#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 455#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
423 456
424#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) */
425#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) */
426/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 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)
427 462
428#if __GNUC__ >= 4 463#if __GNUC__ >= 4
429# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
430# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
431#else 466#else
438 473
439#define expect_false(expr) expect ((expr) != 0, 0) 474#define expect_false(expr) expect ((expr) != 0, 0)
440#define expect_true(expr) expect ((expr) != 0, 1) 475#define expect_true(expr) expect ((expr) != 0, 1)
441#define inline_size static inline 476#define inline_size static inline
442 477
443#if EV_MINIMAL 478#if EV_FEATURE_CODE
479# define inline_speed static inline
480#else
444# define inline_speed static noinline 481# define inline_speed static noinline
445#else
446# define inline_speed static inline
447#endif 482#endif
448 483
449#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
450 485
451#if EV_MINPRI == EV_MAXPRI 486#if EV_MINPRI == EV_MAXPRI
464#define ev_active(w) ((W)(w))->active 499#define ev_active(w) ((W)(w))->active
465#define ev_at(w) ((WT)(w))->at 500#define ev_at(w) ((WT)(w))->at
466 501
467#if EV_USE_REALTIME 502#if EV_USE_REALTIME
468/* 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 */
469/* giving it a reasonably high chance of working on typical architetcures */ 504/* giving it a reasonably high chance of working on typical architectures */
470static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
471#endif 506#endif
472 507
473#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
474static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
475#endif 510#endif
476 511
512#ifndef EV_FD_TO_WIN32_HANDLE
513# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
514#endif
515#ifndef EV_WIN32_HANDLE_TO_FD
516# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
517#endif
518#ifndef EV_WIN32_CLOSE_FD
519# define EV_WIN32_CLOSE_FD(fd) close (fd)
520#endif
521
477#ifdef _WIN32 522#ifdef _WIN32
478# include "ev_win32.c" 523# include "ev_win32.c"
479#endif 524#endif
480 525
481/*****************************************************************************/ 526/*****************************************************************************/
527
528#if EV_AVOID_STDIO
529static void noinline
530ev_printerr (const char *msg)
531{
532 write (STDERR_FILENO, msg, strlen (msg));
533}
534#endif
482 535
483static void (*syserr_cb)(const char *msg); 536static void (*syserr_cb)(const char *msg);
484 537
485void 538void
486ev_set_syserr_cb (void (*cb)(const char *msg)) 539ev_set_syserr_cb (void (*cb)(const char *msg))
496 549
497 if (syserr_cb) 550 if (syserr_cb)
498 syserr_cb (msg); 551 syserr_cb (msg);
499 else 552 else
500 { 553 {
554#if EV_AVOID_STDIO
555 const char *err = strerror (errno);
556
557 ev_printerr (msg);
558 ev_printerr (": ");
559 ev_printerr (err);
560 ev_printerr ("\n");
561#else
501 perror (msg); 562 perror (msg);
563#endif
502 abort (); 564 abort ();
503 } 565 }
504} 566}
505 567
506static void * 568static void *
507ev_realloc_emul (void *ptr, long size) 569ev_realloc_emul (void *ptr, long size)
508{ 570{
571#if __GLIBC__
572 return realloc (ptr, size);
573#else
509 /* some systems, notably openbsd and darwin, fail to properly 574 /* some systems, notably openbsd and darwin, fail to properly
510 * implement realloc (x, 0) (as required by both ansi c-98 and 575 * implement realloc (x, 0) (as required by both ansi c-89 and
511 * the single unix specification, so work around them here. 576 * the single unix specification, so work around them here.
512 */ 577 */
513 578
514 if (size) 579 if (size)
515 return realloc (ptr, size); 580 return realloc (ptr, size);
516 581
517 free (ptr); 582 free (ptr);
518 return 0; 583 return 0;
584#endif
519} 585}
520 586
521static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 587static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
522 588
523void 589void
531{ 597{
532 ptr = alloc (ptr, size); 598 ptr = alloc (ptr, size);
533 599
534 if (!ptr && size) 600 if (!ptr && size)
535 { 601 {
602#if EV_AVOID_STDIO
603 ev_printerr ("libev: memory allocation failed, aborting.\n");
604#else
536 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 605 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
606#endif
537 abort (); 607 abort ();
538 } 608 }
539 609
540 return ptr; 610 return ptr;
541} 611}
623 693
624 static int ev_default_loop_ptr; 694 static int ev_default_loop_ptr;
625 695
626#endif 696#endif
627 697
628#if EV_MINIMAL < 2 698#if EV_FEATURE_API
629# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 699# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
630# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 700# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
631# define EV_INVOKE_PENDING invoke_cb (EV_A) 701# define EV_INVOKE_PENDING invoke_cb (EV_A)
632#else 702#else
633# define EV_RELEASE_CB (void)0 703# define EV_RELEASE_CB (void)0
634# define EV_ACQUIRE_CB (void)0 704# define EV_ACQUIRE_CB (void)0
635# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 705# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
636#endif 706#endif
637 707
638#define EVUNLOOP_RECURSE 0x80 708#define EVBREAK_RECURSE 0x80
639 709
640/*****************************************************************************/ 710/*****************************************************************************/
641 711
642#ifndef EV_HAVE_EV_TIME 712#ifndef EV_HAVE_EV_TIME
643ev_tstamp 713ev_tstamp
687 if (delay > 0.) 757 if (delay > 0.)
688 { 758 {
689#if EV_USE_NANOSLEEP 759#if EV_USE_NANOSLEEP
690 struct timespec ts; 760 struct timespec ts;
691 761
692 ts.tv_sec = (time_t)delay; 762 EV_TS_SET (ts, delay);
693 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
694
695 nanosleep (&ts, 0); 763 nanosleep (&ts, 0);
696#elif defined(_WIN32) 764#elif defined(_WIN32)
697 Sleep ((unsigned long)(delay * 1e3)); 765 Sleep ((unsigned long)(delay * 1e3));
698#else 766#else
699 struct timeval tv; 767 struct timeval tv;
700 768
701 tv.tv_sec = (time_t)delay;
702 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
703
704 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 769 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
705 /* something not guaranteed by newer posix versions, but guaranteed */ 770 /* something not guaranteed by newer posix versions, but guaranteed */
706 /* by older ones */ 771 /* by older ones */
772 EV_TV_SET (tv, delay);
707 select (0, 0, 0, 0, &tv); 773 select (0, 0, 0, 0, &tv);
708#endif 774#endif
709 } 775 }
710} 776}
711 777
712/*****************************************************************************/ 778/*****************************************************************************/
713 779
714#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 780#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
715 781
716/* find a suitable new size for the given array, */ 782/* find a suitable new size for the given array, */
717/* hopefully by rounding to a ncie-to-malloc size */ 783/* hopefully by rounding to a nice-to-malloc size */
718inline_size int 784inline_size int
719array_nextsize (int elem, int cur, int cnt) 785array_nextsize (int elem, int cur, int cnt)
720{ 786{
721 int ncur = cur + 1; 787 int ncur = cur + 1;
722 788
818} 884}
819 885
820/*****************************************************************************/ 886/*****************************************************************************/
821 887
822inline_speed void 888inline_speed void
823fd_event_nc (EV_P_ int fd, int revents) 889fd_event_nocheck (EV_P_ int fd, int revents)
824{ 890{
825 ANFD *anfd = anfds + fd; 891 ANFD *anfd = anfds + fd;
826 ev_io *w; 892 ev_io *w;
827 893
828 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 894 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
840fd_event (EV_P_ int fd, int revents) 906fd_event (EV_P_ int fd, int revents)
841{ 907{
842 ANFD *anfd = anfds + fd; 908 ANFD *anfd = anfds + fd;
843 909
844 if (expect_true (!anfd->reify)) 910 if (expect_true (!anfd->reify))
845 fd_event_nc (EV_A_ fd, revents); 911 fd_event_nocheck (EV_A_ fd, revents);
846} 912}
847 913
848void 914void
849ev_feed_fd_event (EV_P_ int fd, int revents) 915ev_feed_fd_event (EV_P_ int fd, int revents)
850{ 916{
851 if (fd >= 0 && fd < anfdmax) 917 if (fd >= 0 && fd < anfdmax)
852 fd_event_nc (EV_A_ fd, revents); 918 fd_event_nocheck (EV_A_ fd, revents);
853} 919}
854 920
855/* make sure the external fd watch events are in-sync */ 921/* make sure the external fd watch events are in-sync */
856/* with the kernel/libev internal state */ 922/* with the kernel/libev internal state */
857inline_size void 923inline_size void
863 { 929 {
864 int fd = fdchanges [i]; 930 int fd = fdchanges [i];
865 ANFD *anfd = anfds + fd; 931 ANFD *anfd = anfds + fd;
866 ev_io *w; 932 ev_io *w;
867 933
868 unsigned char events = 0; 934 unsigned char o_events = anfd->events;
935 unsigned char o_reify = anfd->reify;
869 936
870 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 937 anfd->reify = 0;
871 events |= (unsigned char)w->events;
872 938
873#if EV_SELECT_IS_WINSOCKET 939#if EV_SELECT_IS_WINSOCKET
874 if (events) 940 if (o_reify & EV__IOFDSET)
875 { 941 {
876 unsigned long arg; 942 unsigned long arg;
877 #ifdef EV_FD_TO_WIN32_HANDLE
878 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 943 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
879 #else
880 anfd->handle = _get_osfhandle (fd);
881 #endif
882 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 944 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
883 } 945 }
884#endif 946#endif
885 947
948 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
886 { 949 {
887 unsigned char o_events = anfd->events;
888 unsigned char o_reify = anfd->reify;
889
890 anfd->reify = 0;
891 anfd->events = events; 950 anfd->events = 0;
892 951
893 if (o_events != events || o_reify & EV__IOFDSET) 952 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
953 anfd->events |= (unsigned char)w->events;
954
955 if (o_events != anfd->events)
956 o_reify = EV__IOFDSET; /* actually |= */
957 }
958
959 if (o_reify & EV__IOFDSET)
894 backend_modify (EV_A_ fd, o_events, events); 960 backend_modify (EV_A_ fd, o_events, anfd->events);
895 }
896 } 961 }
897 962
898 fdchangecnt = 0; 963 fdchangecnt = 0;
899} 964}
900 965
924 ev_io_stop (EV_A_ w); 989 ev_io_stop (EV_A_ w);
925 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 990 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
926 } 991 }
927} 992}
928 993
929/* check whether the given fd is atcually valid, for error recovery */ 994/* check whether the given fd is actually valid, for error recovery */
930inline_size int 995inline_size int
931fd_valid (int fd) 996fd_valid (int fd)
932{ 997{
933#ifdef _WIN32 998#ifdef _WIN32
934 return _get_osfhandle (fd) != -1; 999 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
935#else 1000#else
936 return fcntl (fd, F_GETFD) != -1; 1001 return fcntl (fd, F_GETFD) != -1;
937#endif 1002#endif
938} 1003}
939 1004
976 anfds [fd].emask = 0; 1041 anfds [fd].emask = 0;
977 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1042 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
978 } 1043 }
979} 1044}
980 1045
1046/* used to prepare libev internal fd's */
1047/* this is not fork-safe */
1048inline_speed void
1049fd_intern (int fd)
1050{
1051#ifdef _WIN32
1052 unsigned long arg = 1;
1053 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1054#else
1055 fcntl (fd, F_SETFD, FD_CLOEXEC);
1056 fcntl (fd, F_SETFL, O_NONBLOCK);
1057#endif
1058}
1059
981/*****************************************************************************/ 1060/*****************************************************************************/
982 1061
983/* 1062/*
984 * the heap functions want a real array index. array index 0 uis guaranteed to not 1063 * the heap functions want a real array index. array index 0 is guaranteed to not
985 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1064 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
986 * the branching factor of the d-tree. 1065 * the branching factor of the d-tree.
987 */ 1066 */
988 1067
989/* 1068/*
1137 1216
1138static ANSIG signals [EV_NSIG - 1]; 1217static ANSIG signals [EV_NSIG - 1];
1139 1218
1140/*****************************************************************************/ 1219/*****************************************************************************/
1141 1220
1142/* used to prepare libev internal fd's */ 1221#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1143/* this is not fork-safe */
1144inline_speed void
1145fd_intern (int fd)
1146{
1147#ifdef _WIN32
1148 unsigned long arg = 1;
1149 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1150#else
1151 fcntl (fd, F_SETFD, FD_CLOEXEC);
1152 fcntl (fd, F_SETFL, O_NONBLOCK);
1153#endif
1154}
1155 1222
1156static void noinline 1223static void noinline
1157evpipe_init (EV_P) 1224evpipe_init (EV_P)
1158{ 1225{
1159 if (!ev_is_active (&pipe_w)) 1226 if (!ev_is_active (&pipe_w))
1160 { 1227 {
1161#if EV_USE_EVENTFD 1228# if EV_USE_EVENTFD
1162 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1229 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1163 if (evfd < 0 && errno == EINVAL) 1230 if (evfd < 0 && errno == EINVAL)
1164 evfd = eventfd (0, 0); 1231 evfd = eventfd (0, 0);
1165 1232
1166 if (evfd >= 0) 1233 if (evfd >= 0)
1168 evpipe [0] = -1; 1235 evpipe [0] = -1;
1169 fd_intern (evfd); /* doing it twice doesn't hurt */ 1236 fd_intern (evfd); /* doing it twice doesn't hurt */
1170 ev_io_set (&pipe_w, evfd, EV_READ); 1237 ev_io_set (&pipe_w, evfd, EV_READ);
1171 } 1238 }
1172 else 1239 else
1173#endif 1240# endif
1174 { 1241 {
1175 while (pipe (evpipe)) 1242 while (pipe (evpipe))
1176 ev_syserr ("(libev) error creating signal/async pipe"); 1243 ev_syserr ("(libev) error creating signal/async pipe");
1177 1244
1178 fd_intern (evpipe [0]); 1245 fd_intern (evpipe [0]);
1189evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1256evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1190{ 1257{
1191 if (!*flag) 1258 if (!*flag)
1192 { 1259 {
1193 int old_errno = errno; /* save errno because write might clobber it */ 1260 int old_errno = errno; /* save errno because write might clobber it */
1261 char dummy;
1194 1262
1195 *flag = 1; 1263 *flag = 1;
1196 1264
1197#if EV_USE_EVENTFD 1265#if EV_USE_EVENTFD
1198 if (evfd >= 0) 1266 if (evfd >= 0)
1200 uint64_t counter = 1; 1268 uint64_t counter = 1;
1201 write (evfd, &counter, sizeof (uint64_t)); 1269 write (evfd, &counter, sizeof (uint64_t));
1202 } 1270 }
1203 else 1271 else
1204#endif 1272#endif
1273 /* win32 people keep sending patches that change this write() to send() */
1274 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1275 /* so when you think this write should be a send instead, please find out */
1276 /* where your send() is from - it's definitely not the microsoft send, and */
1277 /* tell me. thank you. */
1205 write (evpipe [1], &old_errno, 1); 1278 write (evpipe [1], &dummy, 1);
1206 1279
1207 errno = old_errno; 1280 errno = old_errno;
1208 } 1281 }
1209} 1282}
1210 1283
1223 } 1296 }
1224 else 1297 else
1225#endif 1298#endif
1226 { 1299 {
1227 char dummy; 1300 char dummy;
1301 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1228 read (evpipe [0], &dummy, 1); 1302 read (evpipe [0], &dummy, 1);
1229 } 1303 }
1230 1304
1231 if (sig_pending) 1305 if (sig_pending)
1232 { 1306 {
1259{ 1333{
1260#if EV_MULTIPLICITY 1334#if EV_MULTIPLICITY
1261 EV_P = signals [signum - 1].loop; 1335 EV_P = signals [signum - 1].loop;
1262#endif 1336#endif
1263 1337
1264#if _WIN32 1338#ifdef _WIN32
1265 signal (signum, ev_sighandler); 1339 signal (signum, ev_sighandler);
1266#endif 1340#endif
1267 1341
1268 signals [signum - 1].pending = 1; 1342 signals [signum - 1].pending = 1;
1269 evpipe_write (EV_A_ &sig_pending); 1343 evpipe_write (EV_A_ &sig_pending);
1311 break; 1385 break;
1312 } 1386 }
1313} 1387}
1314#endif 1388#endif
1315 1389
1390#endif
1391
1316/*****************************************************************************/ 1392/*****************************************************************************/
1317 1393
1394#if EV_CHILD_ENABLE
1318static WL childs [EV_PID_HASHSIZE]; 1395static WL childs [EV_PID_HASHSIZE];
1319
1320#ifndef _WIN32
1321 1396
1322static ev_signal childev; 1397static ev_signal childev;
1323 1398
1324#ifndef WIFCONTINUED 1399#ifndef WIFCONTINUED
1325# define WIFCONTINUED(status) 0 1400# define WIFCONTINUED(status) 0
1330child_reap (EV_P_ int chain, int pid, int status) 1405child_reap (EV_P_ int chain, int pid, int status)
1331{ 1406{
1332 ev_child *w; 1407 ev_child *w;
1333 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1408 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1334 1409
1335 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1410 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1336 { 1411 {
1337 if ((w->pid == pid || !w->pid) 1412 if ((w->pid == pid || !w->pid)
1338 && (!traced || (w->flags & 1))) 1413 && (!traced || (w->flags & 1)))
1339 { 1414 {
1340 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1415 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
1365 /* make sure we are called again until all children have been reaped */ 1440 /* make sure we are called again until all children have been reaped */
1366 /* we need to do it this way so that the callback gets called before we continue */ 1441 /* we need to do it this way so that the callback gets called before we continue */
1367 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1442 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1368 1443
1369 child_reap (EV_A_ pid, pid, status); 1444 child_reap (EV_A_ pid, pid, status);
1370 if (EV_PID_HASHSIZE > 1) 1445 if ((EV_PID_HASHSIZE) > 1)
1371 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1446 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1372} 1447}
1373 1448
1374#endif 1449#endif
1375 1450
1442#ifdef __APPLE__ 1517#ifdef __APPLE__
1443 /* only select works correctly on that "unix-certified" platform */ 1518 /* only select works correctly on that "unix-certified" platform */
1444 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1519 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1445 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1520 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1446#endif 1521#endif
1522#ifdef __FreeBSD__
1523 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1524#endif
1447 1525
1448 return flags; 1526 return flags;
1449} 1527}
1450 1528
1451unsigned int 1529unsigned int
1464ev_backend (EV_P) 1542ev_backend (EV_P)
1465{ 1543{
1466 return backend; 1544 return backend;
1467} 1545}
1468 1546
1469#if EV_MINIMAL < 2 1547#if EV_FEATURE_API
1470unsigned int 1548unsigned int
1471ev_loop_count (EV_P) 1549ev_iteration (EV_P)
1472{ 1550{
1473 return loop_count; 1551 return loop_count;
1474} 1552}
1475 1553
1476unsigned int 1554unsigned int
1477ev_loop_depth (EV_P) 1555ev_depth (EV_P)
1478{ 1556{
1479 return loop_depth; 1557 return loop_depth;
1480} 1558}
1481 1559
1482void 1560void
1554 1632
1555 ev_rt_now = ev_time (); 1633 ev_rt_now = ev_time ();
1556 mn_now = get_clock (); 1634 mn_now = get_clock ();
1557 now_floor = mn_now; 1635 now_floor = mn_now;
1558 rtmn_diff = ev_rt_now - mn_now; 1636 rtmn_diff = ev_rt_now - mn_now;
1559#if EV_MINIMAL < 2 1637#if EV_FEATURE_API
1560 invoke_cb = ev_invoke_pending; 1638 invoke_cb = ev_invoke_pending;
1561#endif 1639#endif
1562 1640
1563 io_blocktime = 0.; 1641 io_blocktime = 0.;
1564 timeout_blocktime = 0.; 1642 timeout_blocktime = 0.;
1570#endif 1648#endif
1571#if EV_USE_INOTIFY 1649#if EV_USE_INOTIFY
1572 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1650 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1573#endif 1651#endif
1574#if EV_USE_SIGNALFD 1652#if EV_USE_SIGNALFD
1575 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1653 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1576#endif 1654#endif
1577 1655
1578 if (!(flags & 0x0000ffffU)) 1656 if (!(flags & 0x0000ffffU))
1579 flags |= ev_recommended_backends (); 1657 flags |= ev_recommended_backends ();
1580 1658
1594 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1672 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1595#endif 1673#endif
1596 1674
1597 ev_prepare_init (&pending_w, pendingcb); 1675 ev_prepare_init (&pending_w, pendingcb);
1598 1676
1677#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1599 ev_init (&pipe_w, pipecb); 1678 ev_init (&pipe_w, pipecb);
1600 ev_set_priority (&pipe_w, EV_MAXPRI); 1679 ev_set_priority (&pipe_w, EV_MAXPRI);
1680#endif
1601 } 1681 }
1602} 1682}
1603 1683
1604/* free up a loop structure */ 1684/* free up a loop structure */
1605static void noinline 1685static void noinline
1617 close (evfd); 1697 close (evfd);
1618#endif 1698#endif
1619 1699
1620 if (evpipe [0] >= 0) 1700 if (evpipe [0] >= 0)
1621 { 1701 {
1622 close (evpipe [0]); 1702 EV_WIN32_CLOSE_FD (evpipe [0]);
1623 close (evpipe [1]); 1703 EV_WIN32_CLOSE_FD (evpipe [1]);
1624 } 1704 }
1625 } 1705 }
1626 1706
1627#if EV_USE_SIGNALFD 1707#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w)) 1708 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd); 1709 close (sigfd);
1634 }
1635#endif 1710#endif
1636 1711
1637#if EV_USE_INOTIFY 1712#if EV_USE_INOTIFY
1638 if (fs_fd >= 0) 1713 if (fs_fd >= 0)
1639 close (fs_fd); 1714 close (fs_fd);
1724 close (evfd); 1799 close (evfd);
1725#endif 1800#endif
1726 1801
1727 if (evpipe [0] >= 0) 1802 if (evpipe [0] >= 0)
1728 { 1803 {
1729 close (evpipe [0]); 1804 EV_WIN32_CLOSE_FD (evpipe [0]);
1730 close (evpipe [1]); 1805 EV_WIN32_CLOSE_FD (evpipe [1]);
1731 } 1806 }
1732 1807
1808#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1733 evpipe_init (EV_A); 1809 evpipe_init (EV_A);
1734 /* now iterate over everything, in case we missed something */ 1810 /* now iterate over everything, in case we missed something */
1735 pipecb (EV_A_ &pipe_w, EV_READ); 1811 pipecb (EV_A_ &pipe_w, EV_READ);
1812#endif
1736 } 1813 }
1737 1814
1738 postfork = 0; 1815 postfork = 0;
1739} 1816}
1740 1817
1802 verify_watcher (EV_A_ ws [cnt]); 1879 verify_watcher (EV_A_ ws [cnt]);
1803 } 1880 }
1804} 1881}
1805#endif 1882#endif
1806 1883
1807#if EV_MINIMAL < 2 1884#if EV_FEATURE_API
1808void 1885void
1809ev_loop_verify (EV_P) 1886ev_verify (EV_P)
1810{ 1887{
1811#if EV_VERIFY 1888#if EV_VERIFY
1812 int i; 1889 int i;
1813 WL w; 1890 WL w;
1814 1891
1853#if EV_ASYNC_ENABLE 1930#if EV_ASYNC_ENABLE
1854 assert (asyncmax >= asynccnt); 1931 assert (asyncmax >= asynccnt);
1855 array_verify (EV_A_ (W *)asyncs, asynccnt); 1932 array_verify (EV_A_ (W *)asyncs, asynccnt);
1856#endif 1933#endif
1857 1934
1935#if EV_PREPARE_ENABLE
1858 assert (preparemax >= preparecnt); 1936 assert (preparemax >= preparecnt);
1859 array_verify (EV_A_ (W *)prepares, preparecnt); 1937 array_verify (EV_A_ (W *)prepares, preparecnt);
1938#endif
1860 1939
1940#if EV_CHECK_ENABLE
1861 assert (checkmax >= checkcnt); 1941 assert (checkmax >= checkcnt);
1862 array_verify (EV_A_ (W *)checks, checkcnt); 1942 array_verify (EV_A_ (W *)checks, checkcnt);
1943#endif
1863 1944
1864# if 0 1945# if 0
1946#if EV_CHILD_ENABLE
1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1947 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1866 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1948 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1949#endif
1867# endif 1950# endif
1868#endif 1951#endif
1869} 1952}
1870#endif 1953#endif
1871 1954
1887 1970
1888 loop_init (EV_A_ flags); 1971 loop_init (EV_A_ flags);
1889 1972
1890 if (ev_backend (EV_A)) 1973 if (ev_backend (EV_A))
1891 { 1974 {
1892#ifndef _WIN32 1975#if EV_CHILD_ENABLE
1893 ev_signal_init (&childev, childcb, SIGCHLD); 1976 ev_signal_init (&childev, childcb, SIGCHLD);
1894 ev_set_priority (&childev, EV_MAXPRI); 1977 ev_set_priority (&childev, EV_MAXPRI);
1895 ev_signal_start (EV_A_ &childev); 1978 ev_signal_start (EV_A_ &childev);
1896 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1979 ev_unref (EV_A); /* child watcher should not keep loop alive */
1897#endif 1980#endif
1910 EV_P = ev_default_loop_ptr; 1993 EV_P = ev_default_loop_ptr;
1911#endif 1994#endif
1912 1995
1913 ev_default_loop_ptr = 0; 1996 ev_default_loop_ptr = 0;
1914 1997
1915#ifndef _WIN32 1998#if EV_CHILD_ENABLE
1916 ev_ref (EV_A); /* child watcher */ 1999 ev_ref (EV_A); /* child watcher */
1917 ev_signal_stop (EV_A_ &childev); 2000 ev_signal_stop (EV_A_ &childev);
1918#endif 2001#endif
1919 2002
1920 loop_destroy (EV_A); 2003 loop_destroy (EV_A);
2026 EV_FREQUENT_CHECK; 2109 EV_FREQUENT_CHECK;
2027 feed_reverse (EV_A_ (W)w); 2110 feed_reverse (EV_A_ (W)w);
2028 } 2111 }
2029 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2112 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2030 2113
2031 feed_reverse_done (EV_A_ EV_TIMEOUT); 2114 feed_reverse_done (EV_A_ EV_TIMER);
2032 } 2115 }
2033} 2116}
2034 2117
2035#if EV_PERIODIC_ENABLE 2118#if EV_PERIODIC_ENABLE
2036/* make periodics pending */ 2119/* make periodics pending */
2089 feed_reverse_done (EV_A_ EV_PERIODIC); 2172 feed_reverse_done (EV_A_ EV_PERIODIC);
2090 } 2173 }
2091} 2174}
2092 2175
2093/* simply recalculate all periodics */ 2176/* simply recalculate all periodics */
2094/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2177/* TODO: maybe ensure that at least one event happens when jumping forward? */
2095static void noinline 2178static void noinline
2096periodics_reschedule (EV_P) 2179periodics_reschedule (EV_P)
2097{ 2180{
2098 int i; 2181 int i;
2099 2182
2127 ANHE_at_cache (*he); 2210 ANHE_at_cache (*he);
2128 } 2211 }
2129} 2212}
2130 2213
2131/* fetch new monotonic and realtime times from the kernel */ 2214/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */ 2215/* also detect if there was a timejump, and act accordingly */
2133inline_speed void 2216inline_speed void
2134time_update (EV_P_ ev_tstamp max_block) 2217time_update (EV_P_ ev_tstamp max_block)
2135{ 2218{
2136#if EV_USE_MONOTONIC 2219#if EV_USE_MONOTONIC
2137 if (expect_true (have_monotonic)) 2220 if (expect_true (have_monotonic))
2195 mn_now = ev_rt_now; 2278 mn_now = ev_rt_now;
2196 } 2279 }
2197} 2280}
2198 2281
2199void 2282void
2200ev_loop (EV_P_ int flags) 2283ev_run (EV_P_ int flags)
2201{ 2284{
2202#if EV_MINIMAL < 2 2285#if EV_FEATURE_API
2203 ++loop_depth; 2286 ++loop_depth;
2204#endif 2287#endif
2205 2288
2206 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2289 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2207 2290
2208 loop_done = EVUNLOOP_CANCEL; 2291 loop_done = EVBREAK_CANCEL;
2209 2292
2210 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2293 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2211 2294
2212 do 2295 do
2213 { 2296 {
2214#if EV_VERIFY >= 2 2297#if EV_VERIFY >= 2
2215 ev_loop_verify (EV_A); 2298 ev_verify (EV_A);
2216#endif 2299#endif
2217 2300
2218#ifndef _WIN32 2301#ifndef _WIN32
2219 if (expect_false (curpid)) /* penalise the forking check even more */ 2302 if (expect_false (curpid)) /* penalise the forking check even more */
2220 if (expect_false (getpid () != curpid)) 2303 if (expect_false (getpid () != curpid))
2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2315 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2233 EV_INVOKE_PENDING; 2316 EV_INVOKE_PENDING;
2234 } 2317 }
2235#endif 2318#endif
2236 2319
2320#if EV_PREPARE_ENABLE
2237 /* queue prepare watchers (and execute them) */ 2321 /* queue prepare watchers (and execute them) */
2238 if (expect_false (preparecnt)) 2322 if (expect_false (preparecnt))
2239 { 2323 {
2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2324 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2241 EV_INVOKE_PENDING; 2325 EV_INVOKE_PENDING;
2242 } 2326 }
2327#endif
2243 2328
2244 if (expect_false (loop_done)) 2329 if (expect_false (loop_done))
2245 break; 2330 break;
2246 2331
2247 /* we might have forked, so reify kernel state if necessary */ 2332 /* we might have forked, so reify kernel state if necessary */
2254 /* calculate blocking time */ 2339 /* calculate blocking time */
2255 { 2340 {
2256 ev_tstamp waittime = 0.; 2341 ev_tstamp waittime = 0.;
2257 ev_tstamp sleeptime = 0.; 2342 ev_tstamp sleeptime = 0.;
2258 2343
2344 /* remember old timestamp for io_blocktime calculation */
2345 ev_tstamp prev_mn_now = mn_now;
2346
2347 /* update time to cancel out callback processing overhead */
2348 time_update (EV_A_ 1e100);
2349
2259 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2350 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2260 { 2351 {
2261 /* remember old timestamp for io_blocktime calculation */
2262 ev_tstamp prev_mn_now = mn_now;
2263
2264 /* update time to cancel out callback processing overhead */
2265 time_update (EV_A_ 1e100);
2266
2267 waittime = MAX_BLOCKTIME; 2352 waittime = MAX_BLOCKTIME;
2268 2353
2269 if (timercnt) 2354 if (timercnt)
2270 { 2355 {
2271 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2356 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2298 waittime -= sleeptime; 2383 waittime -= sleeptime;
2299 } 2384 }
2300 } 2385 }
2301 } 2386 }
2302 2387
2303#if EV_MINIMAL < 2 2388#if EV_FEATURE_API
2304 ++loop_count; 2389 ++loop_count;
2305#endif 2390#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2391 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2307 backend_poll (EV_A_ waittime); 2392 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2393 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2309 2394
2310 /* update ev_rt_now, do magic */ 2395 /* update ev_rt_now, do magic */
2311 time_update (EV_A_ waittime + sleeptime); 2396 time_update (EV_A_ waittime + sleeptime);
2312 } 2397 }
2313 2398
2320#if EV_IDLE_ENABLE 2405#if EV_IDLE_ENABLE
2321 /* queue idle watchers unless other events are pending */ 2406 /* queue idle watchers unless other events are pending */
2322 idle_reify (EV_A); 2407 idle_reify (EV_A);
2323#endif 2408#endif
2324 2409
2410#if EV_CHECK_ENABLE
2325 /* queue check watchers, to be executed first */ 2411 /* queue check watchers, to be executed first */
2326 if (expect_false (checkcnt)) 2412 if (expect_false (checkcnt))
2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2413 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2414#endif
2328 2415
2329 EV_INVOKE_PENDING; 2416 EV_INVOKE_PENDING;
2330 } 2417 }
2331 while (expect_true ( 2418 while (expect_true (
2332 activecnt 2419 activecnt
2333 && !loop_done 2420 && !loop_done
2334 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2421 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2335 )); 2422 ));
2336 2423
2337 if (loop_done == EVUNLOOP_ONE) 2424 if (loop_done == EVBREAK_ONE)
2338 loop_done = EVUNLOOP_CANCEL; 2425 loop_done = EVBREAK_CANCEL;
2339 2426
2340#if EV_MINIMAL < 2 2427#if EV_FEATURE_API
2341 --loop_depth; 2428 --loop_depth;
2342#endif 2429#endif
2343} 2430}
2344 2431
2345void 2432void
2346ev_unloop (EV_P_ int how) 2433ev_break (EV_P_ int how)
2347{ 2434{
2348 loop_done = how; 2435 loop_done = how;
2349} 2436}
2350 2437
2351void 2438void
2471 2558
2472 if (expect_false (ev_is_active (w))) 2559 if (expect_false (ev_is_active (w)))
2473 return; 2560 return;
2474 2561
2475 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2562 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2476 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2563 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2477 2564
2478 EV_FREQUENT_CHECK; 2565 EV_FREQUENT_CHECK;
2479 2566
2480 ev_start (EV_A_ (W)w, 1); 2567 ev_start (EV_A_ (W)w, 1);
2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2568 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2499 EV_FREQUENT_CHECK; 2586 EV_FREQUENT_CHECK;
2500 2587
2501 wlist_del (&anfds[w->fd].head, (WL)w); 2588 wlist_del (&anfds[w->fd].head, (WL)w);
2502 ev_stop (EV_A_ (W)w); 2589 ev_stop (EV_A_ (W)w);
2503 2590
2504 fd_change (EV_A_ w->fd, 1); 2591 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2505 2592
2506 EV_FREQUENT_CHECK; 2593 EV_FREQUENT_CHECK;
2507} 2594}
2508 2595
2509void noinline 2596void noinline
2551 timers [active] = timers [timercnt + HEAP0]; 2638 timers [active] = timers [timercnt + HEAP0];
2552 adjustheap (timers, timercnt, active); 2639 adjustheap (timers, timercnt, active);
2553 } 2640 }
2554 } 2641 }
2555 2642
2556 EV_FREQUENT_CHECK;
2557
2558 ev_at (w) -= mn_now; 2643 ev_at (w) -= mn_now;
2559 2644
2560 ev_stop (EV_A_ (W)w); 2645 ev_stop (EV_A_ (W)w);
2646
2647 EV_FREQUENT_CHECK;
2561} 2648}
2562 2649
2563void noinline 2650void noinline
2564ev_timer_again (EV_P_ ev_timer *w) 2651ev_timer_again (EV_P_ ev_timer *w)
2565{ 2652{
2644 periodics [active] = periodics [periodiccnt + HEAP0]; 2731 periodics [active] = periodics [periodiccnt + HEAP0];
2645 adjustheap (periodics, periodiccnt, active); 2732 adjustheap (periodics, periodiccnt, active);
2646 } 2733 }
2647 } 2734 }
2648 2735
2649 EV_FREQUENT_CHECK;
2650
2651 ev_stop (EV_A_ (W)w); 2736 ev_stop (EV_A_ (W)w);
2737
2738 EV_FREQUENT_CHECK;
2652} 2739}
2653 2740
2654void noinline 2741void noinline
2655ev_periodic_again (EV_P_ ev_periodic *w) 2742ev_periodic_again (EV_P_ ev_periodic *w)
2656{ 2743{
2661#endif 2748#endif
2662 2749
2663#ifndef SA_RESTART 2750#ifndef SA_RESTART
2664# define SA_RESTART 0 2751# define SA_RESTART 0
2665#endif 2752#endif
2753
2754#if EV_SIGNAL_ENABLE
2666 2755
2667void noinline 2756void noinline
2668ev_signal_start (EV_P_ ev_signal *w) 2757ev_signal_start (EV_P_ ev_signal *w)
2669{ 2758{
2670 if (expect_false (ev_is_active (w))) 2759 if (expect_false (ev_is_active (w)))
2717 if (!((WL)w)->next) 2806 if (!((WL)w)->next)
2718# if EV_USE_SIGNALFD 2807# if EV_USE_SIGNALFD
2719 if (sigfd < 0) /*TODO*/ 2808 if (sigfd < 0) /*TODO*/
2720# endif 2809# endif
2721 { 2810 {
2722# if _WIN32 2811# ifdef _WIN32
2812 evpipe_init (EV_A);
2813
2723 signal (w->signum, ev_sighandler); 2814 signal (w->signum, ev_sighandler);
2724# else 2815# else
2725 struct sigaction sa; 2816 struct sigaction sa;
2726 2817
2727 evpipe_init (EV_A); 2818 evpipe_init (EV_A);
2758 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2849 signals [w->signum - 1].loop = 0; /* unattach from signal */
2759#endif 2850#endif
2760#if EV_USE_SIGNALFD 2851#if EV_USE_SIGNALFD
2761 if (sigfd >= 0) 2852 if (sigfd >= 0)
2762 { 2853 {
2763 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2854 sigset_t ss;
2855
2856 sigemptyset (&ss);
2857 sigaddset (&ss, w->signum);
2764 sigdelset (&sigfd_set, w->signum); 2858 sigdelset (&sigfd_set, w->signum);
2859
2765 signalfd (sigfd, &sigfd_set, 0); 2860 signalfd (sigfd, &sigfd_set, 0);
2766 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2861 sigprocmask (SIG_UNBLOCK, &ss, 0);
2767 /*TODO: maybe unblock signal? */
2768 } 2862 }
2769 else 2863 else
2770#endif 2864#endif
2771 signal (w->signum, SIG_DFL); 2865 signal (w->signum, SIG_DFL);
2772 } 2866 }
2773 2867
2774 EV_FREQUENT_CHECK; 2868 EV_FREQUENT_CHECK;
2775} 2869}
2776 2870
2871#endif
2872
2873#if EV_CHILD_ENABLE
2874
2777void 2875void
2778ev_child_start (EV_P_ ev_child *w) 2876ev_child_start (EV_P_ ev_child *w)
2779{ 2877{
2780#if EV_MULTIPLICITY 2878#if EV_MULTIPLICITY
2781 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2879 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2784 return; 2882 return;
2785 2883
2786 EV_FREQUENT_CHECK; 2884 EV_FREQUENT_CHECK;
2787 2885
2788 ev_start (EV_A_ (W)w, 1); 2886 ev_start (EV_A_ (W)w, 1);
2789 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2887 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2790 2888
2791 EV_FREQUENT_CHECK; 2889 EV_FREQUENT_CHECK;
2792} 2890}
2793 2891
2794void 2892void
2798 if (expect_false (!ev_is_active (w))) 2896 if (expect_false (!ev_is_active (w)))
2799 return; 2897 return;
2800 2898
2801 EV_FREQUENT_CHECK; 2899 EV_FREQUENT_CHECK;
2802 2900
2803 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2901 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2804 ev_stop (EV_A_ (W)w); 2902 ev_stop (EV_A_ (W)w);
2805 2903
2806 EV_FREQUENT_CHECK; 2904 EV_FREQUENT_CHECK;
2807} 2905}
2906
2907#endif
2808 2908
2809#if EV_STAT_ENABLE 2909#if EV_STAT_ENABLE
2810 2910
2811# ifdef _WIN32 2911# ifdef _WIN32
2812# undef lstat 2912# undef lstat
2818#define MIN_STAT_INTERVAL 0.1074891 2918#define MIN_STAT_INTERVAL 0.1074891
2819 2919
2820static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2920static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2821 2921
2822#if EV_USE_INOTIFY 2922#if EV_USE_INOTIFY
2823# define EV_INOTIFY_BUFSIZE 8192 2923
2924/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2925# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2824 2926
2825static void noinline 2927static void noinline
2826infy_add (EV_P_ ev_stat *w) 2928infy_add (EV_P_ ev_stat *w)
2827{ 2929{
2828 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2930 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2829 2931
2830 if (w->wd < 0) 2932 if (w->wd >= 0)
2933 {
2934 struct statfs sfs;
2935
2936 /* now local changes will be tracked by inotify, but remote changes won't */
2937 /* unless the filesystem is known to be local, we therefore still poll */
2938 /* also do poll on <2.6.25, but with normal frequency */
2939
2940 if (!fs_2625)
2941 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2942 else if (!statfs (w->path, &sfs)
2943 && (sfs.f_type == 0x1373 /* devfs */
2944 || sfs.f_type == 0xEF53 /* ext2/3 */
2945 || sfs.f_type == 0x3153464a /* jfs */
2946 || sfs.f_type == 0x52654973 /* reiser3 */
2947 || sfs.f_type == 0x01021994 /* tempfs */
2948 || sfs.f_type == 0x58465342 /* xfs */))
2949 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2950 else
2951 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2831 { 2952 }
2953 else
2954 {
2955 /* can't use inotify, continue to stat */
2832 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2956 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2833 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2834 2957
2835 /* monitor some parent directory for speedup hints */ 2958 /* if path is not there, monitor some parent directory for speedup hints */
2836 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2959 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2837 /* but an efficiency issue only */ 2960 /* but an efficiency issue only */
2838 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2961 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2839 { 2962 {
2840 char path [4096]; 2963 char path [4096];
2856 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2979 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2857 } 2980 }
2858 } 2981 }
2859 2982
2860 if (w->wd >= 0) 2983 if (w->wd >= 0)
2861 {
2862 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2984 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2863 2985
2864 /* now local changes will be tracked by inotify, but remote changes won't */ 2986 /* now re-arm timer, if required */
2865 /* unless the filesystem it known to be local, we therefore still poll */ 2987 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2866 /* also do poll on <2.6.25, but with normal frequency */
2867 struct statfs sfs;
2868
2869 if (fs_2625 && !statfs (w->path, &sfs))
2870 if (sfs.f_type == 0x1373 /* devfs */
2871 || sfs.f_type == 0xEF53 /* ext2/3 */
2872 || sfs.f_type == 0x3153464a /* jfs */
2873 || sfs.f_type == 0x52654973 /* reiser3 */
2874 || sfs.f_type == 0x01021994 /* tempfs */
2875 || sfs.f_type == 0x58465342 /* xfs */)
2876 return;
2877
2878 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2879 ev_timer_again (EV_A_ &w->timer); 2988 ev_timer_again (EV_A_ &w->timer);
2880 } 2989 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2881} 2990}
2882 2991
2883static void noinline 2992static void noinline
2884infy_del (EV_P_ ev_stat *w) 2993infy_del (EV_P_ ev_stat *w)
2885{ 2994{
2888 2997
2889 if (wd < 0) 2998 if (wd < 0)
2890 return; 2999 return;
2891 3000
2892 w->wd = -2; 3001 w->wd = -2;
2893 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3002 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2894 wlist_del (&fs_hash [slot].head, (WL)w); 3003 wlist_del (&fs_hash [slot].head, (WL)w);
2895 3004
2896 /* remove this watcher, if others are watching it, they will rearm */ 3005 /* remove this watcher, if others are watching it, they will rearm */
2897 inotify_rm_watch (fs_fd, wd); 3006 inotify_rm_watch (fs_fd, wd);
2898} 3007}
2900static void noinline 3009static void noinline
2901infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3010infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2902{ 3011{
2903 if (slot < 0) 3012 if (slot < 0)
2904 /* overflow, need to check for all hash slots */ 3013 /* overflow, need to check for all hash slots */
2905 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3014 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2906 infy_wd (EV_A_ slot, wd, ev); 3015 infy_wd (EV_A_ slot, wd, ev);
2907 else 3016 else
2908 { 3017 {
2909 WL w_; 3018 WL w_;
2910 3019
2911 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3020 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2912 { 3021 {
2913 ev_stat *w = (ev_stat *)w_; 3022 ev_stat *w = (ev_stat *)w_;
2914 w_ = w_->next; /* lets us remove this watcher and all before it */ 3023 w_ = w_->next; /* lets us remove this watcher and all before it */
2915 3024
2916 if (w->wd == wd || wd == -1) 3025 if (w->wd == wd || wd == -1)
2917 { 3026 {
2918 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3027 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2919 { 3028 {
2920 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3029 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2921 w->wd = -1; 3030 w->wd = -1;
2922 infy_add (EV_A_ w); /* re-add, no matter what */ 3031 infy_add (EV_A_ w); /* re-add, no matter what */
2923 } 3032 }
2924 3033
2925 stat_timer_cb (EV_A_ &w->timer, 0); 3034 stat_timer_cb (EV_A_ &w->timer, 0);
2930 3039
2931static void 3040static void
2932infy_cb (EV_P_ ev_io *w, int revents) 3041infy_cb (EV_P_ ev_io *w, int revents)
2933{ 3042{
2934 char buf [EV_INOTIFY_BUFSIZE]; 3043 char buf [EV_INOTIFY_BUFSIZE];
2935 struct inotify_event *ev = (struct inotify_event *)buf;
2936 int ofs; 3044 int ofs;
2937 int len = read (fs_fd, buf, sizeof (buf)); 3045 int len = read (fs_fd, buf, sizeof (buf));
2938 3046
2939 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3047 for (ofs = 0; ofs < len; )
3048 {
3049 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2940 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3050 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3051 ofs += sizeof (struct inotify_event) + ev->len;
3052 }
3053}
3054
3055inline_size unsigned int
3056ev_linux_version (void)
3057{
3058 struct utsname buf;
3059 unsigned int v;
3060 int i;
3061 char *p = buf.release;
3062
3063 if (uname (&buf))
3064 return 0;
3065
3066 for (i = 3+1; --i; )
3067 {
3068 unsigned int c = 0;
3069
3070 for (;;)
3071 {
3072 if (*p >= '0' && *p <= '9')
3073 c = c * 10 + *p++ - '0';
3074 else
3075 {
3076 p += *p == '.';
3077 break;
3078 }
3079 }
3080
3081 v = (v << 8) | c;
3082 }
3083
3084 return v;
2941} 3085}
2942 3086
2943inline_size void 3087inline_size void
2944check_2625 (EV_P) 3088ev_check_2625 (EV_P)
2945{ 3089{
2946 /* kernels < 2.6.25 are borked 3090 /* kernels < 2.6.25 are borked
2947 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3091 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2948 */ 3092 */
2949 struct utsname buf; 3093 if (ev_linux_version () < 0x020619)
2950 int major, minor, micro;
2951
2952 if (uname (&buf))
2953 return; 3094 return;
2954 3095
2955 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2956 return;
2957
2958 if (major < 2
2959 || (major == 2 && minor < 6)
2960 || (major == 2 && minor == 6 && micro < 25))
2961 return;
2962
2963 fs_2625 = 1; 3096 fs_2625 = 1;
3097}
3098
3099inline_size int
3100infy_newfd (void)
3101{
3102#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3103 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3104 if (fd >= 0)
3105 return fd;
3106#endif
3107 return inotify_init ();
2964} 3108}
2965 3109
2966inline_size void 3110inline_size void
2967infy_init (EV_P) 3111infy_init (EV_P)
2968{ 3112{
2969 if (fs_fd != -2) 3113 if (fs_fd != -2)
2970 return; 3114 return;
2971 3115
2972 fs_fd = -1; 3116 fs_fd = -1;
2973 3117
2974 check_2625 (EV_A); 3118 ev_check_2625 (EV_A);
2975 3119
2976 fs_fd = inotify_init (); 3120 fs_fd = infy_newfd ();
2977 3121
2978 if (fs_fd >= 0) 3122 if (fs_fd >= 0)
2979 { 3123 {
3124 fd_intern (fs_fd);
2980 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3125 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2981 ev_set_priority (&fs_w, EV_MAXPRI); 3126 ev_set_priority (&fs_w, EV_MAXPRI);
2982 ev_io_start (EV_A_ &fs_w); 3127 ev_io_start (EV_A_ &fs_w);
3128 ev_unref (EV_A);
2983 } 3129 }
2984} 3130}
2985 3131
2986inline_size void 3132inline_size void
2987infy_fork (EV_P) 3133infy_fork (EV_P)
2989 int slot; 3135 int slot;
2990 3136
2991 if (fs_fd < 0) 3137 if (fs_fd < 0)
2992 return; 3138 return;
2993 3139
3140 ev_ref (EV_A);
3141 ev_io_stop (EV_A_ &fs_w);
2994 close (fs_fd); 3142 close (fs_fd);
2995 fs_fd = inotify_init (); 3143 fs_fd = infy_newfd ();
2996 3144
3145 if (fs_fd >= 0)
3146 {
3147 fd_intern (fs_fd);
3148 ev_io_set (&fs_w, fs_fd, EV_READ);
3149 ev_io_start (EV_A_ &fs_w);
3150 ev_unref (EV_A);
3151 }
3152
2997 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3153 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2998 { 3154 {
2999 WL w_ = fs_hash [slot].head; 3155 WL w_ = fs_hash [slot].head;
3000 fs_hash [slot].head = 0; 3156 fs_hash [slot].head = 0;
3001 3157
3002 while (w_) 3158 while (w_)
3007 w->wd = -1; 3163 w->wd = -1;
3008 3164
3009 if (fs_fd >= 0) 3165 if (fs_fd >= 0)
3010 infy_add (EV_A_ w); /* re-add, no matter what */ 3166 infy_add (EV_A_ w); /* re-add, no matter what */
3011 else 3167 else
3168 {
3169 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3170 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3012 ev_timer_again (EV_A_ &w->timer); 3171 ev_timer_again (EV_A_ &w->timer);
3172 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3173 }
3013 } 3174 }
3014 } 3175 }
3015} 3176}
3016 3177
3017#endif 3178#endif
3034static void noinline 3195static void noinline
3035stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3196stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3036{ 3197{
3037 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3198 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3038 3199
3039 /* we copy this here each the time so that */ 3200 ev_statdata prev = w->attr;
3040 /* prev has the old value when the callback gets invoked */
3041 w->prev = w->attr;
3042 ev_stat_stat (EV_A_ w); 3201 ev_stat_stat (EV_A_ w);
3043 3202
3044 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3203 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3045 if ( 3204 if (
3046 w->prev.st_dev != w->attr.st_dev 3205 prev.st_dev != w->attr.st_dev
3047 || w->prev.st_ino != w->attr.st_ino 3206 || prev.st_ino != w->attr.st_ino
3048 || w->prev.st_mode != w->attr.st_mode 3207 || prev.st_mode != w->attr.st_mode
3049 || w->prev.st_nlink != w->attr.st_nlink 3208 || prev.st_nlink != w->attr.st_nlink
3050 || w->prev.st_uid != w->attr.st_uid 3209 || prev.st_uid != w->attr.st_uid
3051 || w->prev.st_gid != w->attr.st_gid 3210 || prev.st_gid != w->attr.st_gid
3052 || w->prev.st_rdev != w->attr.st_rdev 3211 || prev.st_rdev != w->attr.st_rdev
3053 || w->prev.st_size != w->attr.st_size 3212 || prev.st_size != w->attr.st_size
3054 || w->prev.st_atime != w->attr.st_atime 3213 || prev.st_atime != w->attr.st_atime
3055 || w->prev.st_mtime != w->attr.st_mtime 3214 || prev.st_mtime != w->attr.st_mtime
3056 || w->prev.st_ctime != w->attr.st_ctime 3215 || prev.st_ctime != w->attr.st_ctime
3057 ) { 3216 ) {
3217 /* we only update w->prev on actual differences */
3218 /* in case we test more often than invoke the callback, */
3219 /* to ensure that prev is always different to attr */
3220 w->prev = prev;
3221
3058 #if EV_USE_INOTIFY 3222 #if EV_USE_INOTIFY
3059 if (fs_fd >= 0) 3223 if (fs_fd >= 0)
3060 { 3224 {
3061 infy_del (EV_A_ w); 3225 infy_del (EV_A_ w);
3062 infy_add (EV_A_ w); 3226 infy_add (EV_A_ w);
3087 3251
3088 if (fs_fd >= 0) 3252 if (fs_fd >= 0)
3089 infy_add (EV_A_ w); 3253 infy_add (EV_A_ w);
3090 else 3254 else
3091#endif 3255#endif
3256 {
3092 ev_timer_again (EV_A_ &w->timer); 3257 ev_timer_again (EV_A_ &w->timer);
3258 ev_unref (EV_A);
3259 }
3093 3260
3094 ev_start (EV_A_ (W)w, 1); 3261 ev_start (EV_A_ (W)w, 1);
3095 3262
3096 EV_FREQUENT_CHECK; 3263 EV_FREQUENT_CHECK;
3097} 3264}
3106 EV_FREQUENT_CHECK; 3273 EV_FREQUENT_CHECK;
3107 3274
3108#if EV_USE_INOTIFY 3275#if EV_USE_INOTIFY
3109 infy_del (EV_A_ w); 3276 infy_del (EV_A_ w);
3110#endif 3277#endif
3278
3279 if (ev_is_active (&w->timer))
3280 {
3281 ev_ref (EV_A);
3111 ev_timer_stop (EV_A_ &w->timer); 3282 ev_timer_stop (EV_A_ &w->timer);
3283 }
3112 3284
3113 ev_stop (EV_A_ (W)w); 3285 ev_stop (EV_A_ (W)w);
3114 3286
3115 EV_FREQUENT_CHECK; 3287 EV_FREQUENT_CHECK;
3116} 3288}
3161 3333
3162 EV_FREQUENT_CHECK; 3334 EV_FREQUENT_CHECK;
3163} 3335}
3164#endif 3336#endif
3165 3337
3338#if EV_PREPARE_ENABLE
3166void 3339void
3167ev_prepare_start (EV_P_ ev_prepare *w) 3340ev_prepare_start (EV_P_ ev_prepare *w)
3168{ 3341{
3169 if (expect_false (ev_is_active (w))) 3342 if (expect_false (ev_is_active (w)))
3170 return; 3343 return;
3196 3369
3197 ev_stop (EV_A_ (W)w); 3370 ev_stop (EV_A_ (W)w);
3198 3371
3199 EV_FREQUENT_CHECK; 3372 EV_FREQUENT_CHECK;
3200} 3373}
3374#endif
3201 3375
3376#if EV_CHECK_ENABLE
3202void 3377void
3203ev_check_start (EV_P_ ev_check *w) 3378ev_check_start (EV_P_ ev_check *w)
3204{ 3379{
3205 if (expect_false (ev_is_active (w))) 3380 if (expect_false (ev_is_active (w)))
3206 return; 3381 return;
3232 3407
3233 ev_stop (EV_A_ (W)w); 3408 ev_stop (EV_A_ (W)w);
3234 3409
3235 EV_FREQUENT_CHECK; 3410 EV_FREQUENT_CHECK;
3236} 3411}
3412#endif
3237 3413
3238#if EV_EMBED_ENABLE 3414#if EV_EMBED_ENABLE
3239void noinline 3415void noinline
3240ev_embed_sweep (EV_P_ ev_embed *w) 3416ev_embed_sweep (EV_P_ ev_embed *w)
3241{ 3417{
3242 ev_loop (w->other, EVLOOP_NONBLOCK); 3418 ev_run (w->other, EVRUN_NOWAIT);
3243} 3419}
3244 3420
3245static void 3421static void
3246embed_io_cb (EV_P_ ev_io *io, int revents) 3422embed_io_cb (EV_P_ ev_io *io, int revents)
3247{ 3423{
3248 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3424 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3249 3425
3250 if (ev_cb (w)) 3426 if (ev_cb (w))
3251 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3427 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3252 else 3428 else
3253 ev_loop (w->other, EVLOOP_NONBLOCK); 3429 ev_run (w->other, EVRUN_NOWAIT);
3254} 3430}
3255 3431
3256static void 3432static void
3257embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3433embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3258{ 3434{
3262 EV_P = w->other; 3438 EV_P = w->other;
3263 3439
3264 while (fdchangecnt) 3440 while (fdchangecnt)
3265 { 3441 {
3266 fd_reify (EV_A); 3442 fd_reify (EV_A);
3267 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3443 ev_run (EV_A_ EVRUN_NOWAIT);
3268 } 3444 }
3269 } 3445 }
3270} 3446}
3271 3447
3272static void 3448static void
3278 3454
3279 { 3455 {
3280 EV_P = w->other; 3456 EV_P = w->other;
3281 3457
3282 ev_loop_fork (EV_A); 3458 ev_loop_fork (EV_A);
3283 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3459 ev_run (EV_A_ EVRUN_NOWAIT);
3284 } 3460 }
3285 3461
3286 ev_embed_start (EV_A_ w); 3462 ev_embed_start (EV_A_ w);
3287} 3463}
3288 3464
3336 3512
3337 ev_io_stop (EV_A_ &w->io); 3513 ev_io_stop (EV_A_ &w->io);
3338 ev_prepare_stop (EV_A_ &w->prepare); 3514 ev_prepare_stop (EV_A_ &w->prepare);
3339 ev_fork_stop (EV_A_ &w->fork); 3515 ev_fork_stop (EV_A_ &w->fork);
3340 3516
3517 ev_stop (EV_A_ (W)w);
3518
3341 EV_FREQUENT_CHECK; 3519 EV_FREQUENT_CHECK;
3342} 3520}
3343#endif 3521#endif
3344 3522
3345#if EV_FORK_ENABLE 3523#if EV_FORK_ENABLE
3384void 3562void
3385ev_async_start (EV_P_ ev_async *w) 3563ev_async_start (EV_P_ ev_async *w)
3386{ 3564{
3387 if (expect_false (ev_is_active (w))) 3565 if (expect_false (ev_is_active (w)))
3388 return; 3566 return;
3567
3568 w->sent = 0;
3389 3569
3390 evpipe_init (EV_A); 3570 evpipe_init (EV_A);
3391 3571
3392 EV_FREQUENT_CHECK; 3572 EV_FREQUENT_CHECK;
3393 3573
3471{ 3651{
3472 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3652 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3473 3653
3474 if (expect_false (!once)) 3654 if (expect_false (!once))
3475 { 3655 {
3476 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3656 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3477 return; 3657 return;
3478 } 3658 }
3479 3659
3480 once->cb = cb; 3660 once->cb = cb;
3481 once->arg = arg; 3661 once->arg = arg;
3568 if (types & EV_ASYNC) 3748 if (types & EV_ASYNC)
3569 for (i = asynccnt; i--; ) 3749 for (i = asynccnt; i--; )
3570 cb (EV_A_ EV_ASYNC, asyncs [i]); 3750 cb (EV_A_ EV_ASYNC, asyncs [i]);
3571#endif 3751#endif
3572 3752
3753#if EV_PREPARE_ENABLE
3573 if (types & EV_PREPARE) 3754 if (types & EV_PREPARE)
3574 for (i = preparecnt; i--; ) 3755 for (i = preparecnt; i--; )
3575#if EV_EMBED_ENABLE 3756# if EV_EMBED_ENABLE
3576 if (ev_cb (prepares [i]) != embed_prepare_cb) 3757 if (ev_cb (prepares [i]) != embed_prepare_cb)
3577#endif 3758# endif
3578 cb (EV_A_ EV_PREPARE, prepares [i]); 3759 cb (EV_A_ EV_PREPARE, prepares [i]);
3760#endif
3579 3761
3762#if EV_CHECK_ENABLE
3580 if (types & EV_CHECK) 3763 if (types & EV_CHECK)
3581 for (i = checkcnt; i--; ) 3764 for (i = checkcnt; i--; )
3582 cb (EV_A_ EV_CHECK, checks [i]); 3765 cb (EV_A_ EV_CHECK, checks [i]);
3766#endif
3583 3767
3768#if EV_SIGNAL_ENABLE
3584 if (types & EV_SIGNAL) 3769 if (types & EV_SIGNAL)
3585 for (i = 0; i < EV_NSIG - 1; ++i) 3770 for (i = 0; i < EV_NSIG - 1; ++i)
3586 for (wl = signals [i].head; wl; ) 3771 for (wl = signals [i].head; wl; )
3587 { 3772 {
3588 wn = wl->next; 3773 wn = wl->next;
3589 cb (EV_A_ EV_SIGNAL, wl); 3774 cb (EV_A_ EV_SIGNAL, wl);
3590 wl = wn; 3775 wl = wn;
3591 } 3776 }
3777#endif
3592 3778
3779#if EV_CHILD_ENABLE
3593 if (types & EV_CHILD) 3780 if (types & EV_CHILD)
3594 for (i = EV_PID_HASHSIZE; i--; ) 3781 for (i = (EV_PID_HASHSIZE); i--; )
3595 for (wl = childs [i]; wl; ) 3782 for (wl = childs [i]; wl; )
3596 { 3783 {
3597 wn = wl->next; 3784 wn = wl->next;
3598 cb (EV_A_ EV_CHILD, wl); 3785 cb (EV_A_ EV_CHILD, wl);
3599 wl = wn; 3786 wl = wn;
3600 } 3787 }
3788#endif
3601/* EV_STAT 0x00001000 /* stat data changed */ 3789/* EV_STAT 0x00001000 /* stat data changed */
3602/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3790/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3603} 3791}
3604#endif 3792#endif
3605 3793
3606#if EV_MULTIPLICITY 3794#if EV_MULTIPLICITY
3607 #include "ev_wrap.h" 3795 #include "ev_wrap.h"
3608#endif 3796#endif
3609 3797
3610#ifdef __cplusplus 3798EV_CPP(})
3611}
3612#endif
3613 3799

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines