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

Comparing libev/ev.c (file contents):
Revision 1.314 by root, Wed Aug 26 17:31:20 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__ >= 7)) 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
342# define EV_USE_CLOCK_SYSCALL 0 353# define EV_USE_CLOCK_SYSCALL 0
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 */
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
347 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
392# define EFD_CLOEXEC O_CLOEXEC 409# define EFD_CLOEXEC O_CLOEXEC
393# else 410# else
394# define EFD_CLOEXEC 02000000 411# define EFD_CLOEXEC 02000000
395# endif 412# endif
396# endif 413# endif
397# ifdef __cplusplus
398extern "C" {
399# endif
400int eventfd (unsigned int initval, int flags); 414EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
401# ifdef __cplusplus
402}
403# endif
404#endif 415#endif
405 416
406#if EV_USE_SIGNALFD 417#if EV_USE_SIGNALFD
407/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 418/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
408# include <stdint.h> 419# include <stdint.h>
414# define SFD_CLOEXEC O_CLOEXEC 425# define SFD_CLOEXEC O_CLOEXEC
415# else 426# else
416# define SFD_CLOEXEC 02000000 427# define SFD_CLOEXEC 02000000
417# endif 428# endif
418# endif 429# endif
419# ifdef __cplusplus
420extern "C" {
421# endif
422int signalfd (int fd, const sigset_t *mask, int flags); 430EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
423 431
424struct signalfd_siginfo 432struct signalfd_siginfo
425{ 433{
426 uint32_t ssi_signo; 434 uint32_t ssi_signo;
427 char pad[128 - sizeof (uint32_t)]; 435 char pad[128 - sizeof (uint32_t)];
428}; 436};
429# ifdef __cplusplus
430}
431# endif 437#endif
432#endif
433
434 438
435/**/ 439/**/
436 440
437#if EV_VERIFY >= 3 441#if EV_VERIFY >= 3
438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 442# define EV_FREQUENT_CHECK ev_verify (EV_A)
439#else 443#else
440# define EV_FREQUENT_CHECK do { } while (0) 444# define EV_FREQUENT_CHECK do { } while (0)
441#endif 445#endif
442 446
443/* 447/*
450 */ 454 */
451#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 455#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
452 456
453#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) */
454#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) */
455/*#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)
456 462
457#if __GNUC__ >= 4 463#if __GNUC__ >= 4
458# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
459# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
460#else 466#else
467 473
468#define expect_false(expr) expect ((expr) != 0, 0) 474#define expect_false(expr) expect ((expr) != 0, 0)
469#define expect_true(expr) expect ((expr) != 0, 1) 475#define expect_true(expr) expect ((expr) != 0, 1)
470#define inline_size static inline 476#define inline_size static inline
471 477
472#if EV_MINIMAL 478#if EV_FEATURE_CODE
479# define inline_speed static inline
480#else
473# define inline_speed static noinline 481# define inline_speed static noinline
474#else
475# define inline_speed static inline
476#endif 482#endif
477 483
478#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
479 485
480#if EV_MINPRI == EV_MAXPRI 486#if EV_MINPRI == EV_MAXPRI
493#define ev_active(w) ((W)(w))->active 499#define ev_active(w) ((W)(w))->active
494#define ev_at(w) ((WT)(w))->at 500#define ev_at(w) ((WT)(w))->at
495 501
496#if EV_USE_REALTIME 502#if EV_USE_REALTIME
497/* 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 */
498/* giving it a reasonably high chance of working on typical architetcures */ 504/* giving it a reasonably high chance of working on typical architectures */
499static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
500#endif 506#endif
501 507
502#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
505 511
506#ifndef EV_FD_TO_WIN32_HANDLE 512#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 513# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif 514#endif
509#ifndef EV_WIN32_HANDLE_TO_FD 515#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 516# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
511#endif 517#endif
512#ifndef EV_WIN32_CLOSE_FD 518#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd) 519# define EV_WIN32_CLOSE_FD(fd) close (fd)
514#endif 520#endif
515 521
516#ifdef _WIN32 522#ifdef _WIN32
517# include "ev_win32.c" 523# include "ev_win32.c"
518#endif 524#endif
519 525
520/*****************************************************************************/ 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
521 535
522static void (*syserr_cb)(const char *msg); 536static void (*syserr_cb)(const char *msg);
523 537
524void 538void
525ev_set_syserr_cb (void (*cb)(const char *msg)) 539ev_set_syserr_cb (void (*cb)(const char *msg))
535 549
536 if (syserr_cb) 550 if (syserr_cb)
537 syserr_cb (msg); 551 syserr_cb (msg);
538 else 552 else
539 { 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
540 perror (msg); 562 perror (msg);
563#endif
541 abort (); 564 abort ();
542 } 565 }
543} 566}
544 567
545static void * 568static void *
546ev_realloc_emul (void *ptr, long size) 569ev_realloc_emul (void *ptr, long size)
547{ 570{
571#if __GLIBC__
572 return realloc (ptr, size);
573#else
548 /* some systems, notably openbsd and darwin, fail to properly 574 /* some systems, notably openbsd and darwin, fail to properly
549 * 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
550 * the single unix specification, so work around them here. 576 * the single unix specification, so work around them here.
551 */ 577 */
552 578
553 if (size) 579 if (size)
554 return realloc (ptr, size); 580 return realloc (ptr, size);
555 581
556 free (ptr); 582 free (ptr);
557 return 0; 583 return 0;
584#endif
558} 585}
559 586
560static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 587static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
561 588
562void 589void
570{ 597{
571 ptr = alloc (ptr, size); 598 ptr = alloc (ptr, size);
572 599
573 if (!ptr && size) 600 if (!ptr && size)
574 { 601 {
602#if EV_AVOID_STDIO
603 ev_printerr ("libev: memory allocation failed, aborting.\n");
604#else
575 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 605 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
606#endif
576 abort (); 607 abort ();
577 } 608 }
578 609
579 return ptr; 610 return ptr;
580} 611}
662 693
663 static int ev_default_loop_ptr; 694 static int ev_default_loop_ptr;
664 695
665#endif 696#endif
666 697
667#if EV_MINIMAL < 2 698#if EV_FEATURE_API
668# 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)
669# 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)
670# define EV_INVOKE_PENDING invoke_cb (EV_A) 701# define EV_INVOKE_PENDING invoke_cb (EV_A)
671#else 702#else
672# define EV_RELEASE_CB (void)0 703# define EV_RELEASE_CB (void)0
673# define EV_ACQUIRE_CB (void)0 704# define EV_ACQUIRE_CB (void)0
674# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 705# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
675#endif 706#endif
676 707
677#define EVUNLOOP_RECURSE 0x80 708#define EVBREAK_RECURSE 0x80
678 709
679/*****************************************************************************/ 710/*****************************************************************************/
680 711
681#ifndef EV_HAVE_EV_TIME 712#ifndef EV_HAVE_EV_TIME
682ev_tstamp 713ev_tstamp
726 if (delay > 0.) 757 if (delay > 0.)
727 { 758 {
728#if EV_USE_NANOSLEEP 759#if EV_USE_NANOSLEEP
729 struct timespec ts; 760 struct timespec ts;
730 761
731 ts.tv_sec = (time_t)delay; 762 EV_TS_SET (ts, delay);
732 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
733
734 nanosleep (&ts, 0); 763 nanosleep (&ts, 0);
735#elif defined(_WIN32) 764#elif defined(_WIN32)
736 Sleep ((unsigned long)(delay * 1e3)); 765 Sleep ((unsigned long)(delay * 1e3));
737#else 766#else
738 struct timeval tv; 767 struct timeval tv;
739 768
740 tv.tv_sec = (time_t)delay;
741 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
742
743 /* 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 */
744 /* something not guaranteed by newer posix versions, but guaranteed */ 770 /* something not guaranteed by newer posix versions, but guaranteed */
745 /* by older ones */ 771 /* by older ones */
772 EV_TV_SET (tv, delay);
746 select (0, 0, 0, 0, &tv); 773 select (0, 0, 0, 0, &tv);
747#endif 774#endif
748 } 775 }
749} 776}
750 777
751/*****************************************************************************/ 778/*****************************************************************************/
752 779
753#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 */
754 781
755/* find a suitable new size for the given array, */ 782/* find a suitable new size for the given array, */
756/* hopefully by rounding to a ncie-to-malloc size */ 783/* hopefully by rounding to a nice-to-malloc size */
757inline_size int 784inline_size int
758array_nextsize (int elem, int cur, int cnt) 785array_nextsize (int elem, int cur, int cnt)
759{ 786{
760 int ncur = cur + 1; 787 int ncur = cur + 1;
761 788
857} 884}
858 885
859/*****************************************************************************/ 886/*****************************************************************************/
860 887
861inline_speed void 888inline_speed void
862fd_event_nc (EV_P_ int fd, int revents) 889fd_event_nocheck (EV_P_ int fd, int revents)
863{ 890{
864 ANFD *anfd = anfds + fd; 891 ANFD *anfd = anfds + fd;
865 ev_io *w; 892 ev_io *w;
866 893
867 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)
879fd_event (EV_P_ int fd, int revents) 906fd_event (EV_P_ int fd, int revents)
880{ 907{
881 ANFD *anfd = anfds + fd; 908 ANFD *anfd = anfds + fd;
882 909
883 if (expect_true (!anfd->reify)) 910 if (expect_true (!anfd->reify))
884 fd_event_nc (EV_A_ fd, revents); 911 fd_event_nocheck (EV_A_ fd, revents);
885} 912}
886 913
887void 914void
888ev_feed_fd_event (EV_P_ int fd, int revents) 915ev_feed_fd_event (EV_P_ int fd, int revents)
889{ 916{
890 if (fd >= 0 && fd < anfdmax) 917 if (fd >= 0 && fd < anfdmax)
891 fd_event_nc (EV_A_ fd, revents); 918 fd_event_nocheck (EV_A_ fd, revents);
892} 919}
893 920
894/* make sure the external fd watch events are in-sync */ 921/* make sure the external fd watch events are in-sync */
895/* with the kernel/libev internal state */ 922/* with the kernel/libev internal state */
896inline_size void 923inline_size void
902 { 929 {
903 int fd = fdchanges [i]; 930 int fd = fdchanges [i];
904 ANFD *anfd = anfds + fd; 931 ANFD *anfd = anfds + fd;
905 ev_io *w; 932 ev_io *w;
906 933
907 unsigned char events = 0; 934 unsigned char o_events = anfd->events;
935 unsigned char o_reify = anfd->reify;
908 936
909 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 937 anfd->reify = 0;
910 events |= (unsigned char)w->events;
911 938
912#if EV_SELECT_IS_WINSOCKET 939#if EV_SELECT_IS_WINSOCKET
913 if (events) 940 if (o_reify & EV__IOFDSET)
914 { 941 {
915 unsigned long arg; 942 unsigned long arg;
916 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 943 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
917 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));
918 } 945 }
919#endif 946#endif
920 947
948 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
921 { 949 {
922 unsigned char o_events = anfd->events;
923 unsigned char o_reify = anfd->reify;
924
925 anfd->reify = 0;
926 anfd->events = events; 950 anfd->events = 0;
927 951
928 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)
929 backend_modify (EV_A_ fd, o_events, events); 960 backend_modify (EV_A_ fd, o_events, anfd->events);
930 }
931 } 961 }
932 962
933 fdchangecnt = 0; 963 fdchangecnt = 0;
934} 964}
935 965
959 ev_io_stop (EV_A_ w); 989 ev_io_stop (EV_A_ w);
960 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);
961 } 991 }
962} 992}
963 993
964/* check whether the given fd is atcually valid, for error recovery */ 994/* check whether the given fd is actually valid, for error recovery */
965inline_size int 995inline_size int
966fd_valid (int fd) 996fd_valid (int fd)
967{ 997{
968#ifdef _WIN32 998#ifdef _WIN32
969 return _get_osfhandle (fd) != -1; 999 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
970#else 1000#else
971 return fcntl (fd, F_GETFD) != -1; 1001 return fcntl (fd, F_GETFD) != -1;
972#endif 1002#endif
973} 1003}
974 1004
1011 anfds [fd].emask = 0; 1041 anfds [fd].emask = 0;
1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1042 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1013 } 1043 }
1014} 1044}
1015 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
1016/*****************************************************************************/ 1060/*****************************************************************************/
1017 1061
1018/* 1062/*
1019 * 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
1020 * 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
1021 * the branching factor of the d-tree. 1065 * the branching factor of the d-tree.
1022 */ 1066 */
1023 1067
1024/* 1068/*
1172 1216
1173static ANSIG signals [EV_NSIG - 1]; 1217static ANSIG signals [EV_NSIG - 1];
1174 1218
1175/*****************************************************************************/ 1219/*****************************************************************************/
1176 1220
1177/* used to prepare libev internal fd's */ 1221#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1178/* this is not fork-safe */
1179inline_speed void
1180fd_intern (int fd)
1181{
1182#ifdef _WIN32
1183 unsigned long arg = 1;
1184 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1185#else
1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
1187 fcntl (fd, F_SETFL, O_NONBLOCK);
1188#endif
1189}
1190 1222
1191static void noinline 1223static void noinline
1192evpipe_init (EV_P) 1224evpipe_init (EV_P)
1193{ 1225{
1194 if (!ev_is_active (&pipe_w)) 1226 if (!ev_is_active (&pipe_w))
1195 { 1227 {
1196#if EV_USE_EVENTFD 1228# if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1229 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL) 1230 if (evfd < 0 && errno == EINVAL)
1199 evfd = eventfd (0, 0); 1231 evfd = eventfd (0, 0);
1200 1232
1201 if (evfd >= 0) 1233 if (evfd >= 0)
1203 evpipe [0] = -1; 1235 evpipe [0] = -1;
1204 fd_intern (evfd); /* doing it twice doesn't hurt */ 1236 fd_intern (evfd); /* doing it twice doesn't hurt */
1205 ev_io_set (&pipe_w, evfd, EV_READ); 1237 ev_io_set (&pipe_w, evfd, EV_READ);
1206 } 1238 }
1207 else 1239 else
1208#endif 1240# endif
1209 { 1241 {
1210 while (pipe (evpipe)) 1242 while (pipe (evpipe))
1211 ev_syserr ("(libev) error creating signal/async pipe"); 1243 ev_syserr ("(libev) error creating signal/async pipe");
1212 1244
1213 fd_intern (evpipe [0]); 1245 fd_intern (evpipe [0]);
1224evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1256evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1225{ 1257{
1226 if (!*flag) 1258 if (!*flag)
1227 { 1259 {
1228 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;
1229 1262
1230 *flag = 1; 1263 *flag = 1;
1231 1264
1232#if EV_USE_EVENTFD 1265#if EV_USE_EVENTFD
1233 if (evfd >= 0) 1266 if (evfd >= 0)
1235 uint64_t counter = 1; 1268 uint64_t counter = 1;
1236 write (evfd, &counter, sizeof (uint64_t)); 1269 write (evfd, &counter, sizeof (uint64_t));
1237 } 1270 }
1238 else 1271 else
1239#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. */
1240 write (evpipe [1], &old_errno, 1); 1278 write (evpipe [1], &dummy, 1);
1241 1279
1242 errno = old_errno; 1280 errno = old_errno;
1243 } 1281 }
1244} 1282}
1245 1283
1258 } 1296 }
1259 else 1297 else
1260#endif 1298#endif
1261 { 1299 {
1262 char dummy; 1300 char dummy;
1301 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1263 read (evpipe [0], &dummy, 1); 1302 read (evpipe [0], &dummy, 1);
1264 } 1303 }
1265 1304
1266 if (sig_pending) 1305 if (sig_pending)
1267 { 1306 {
1294{ 1333{
1295#if EV_MULTIPLICITY 1334#if EV_MULTIPLICITY
1296 EV_P = signals [signum - 1].loop; 1335 EV_P = signals [signum - 1].loop;
1297#endif 1336#endif
1298 1337
1299#if _WIN32 1338#ifdef _WIN32
1300 signal (signum, ev_sighandler); 1339 signal (signum, ev_sighandler);
1301#endif 1340#endif
1302 1341
1303 signals [signum - 1].pending = 1; 1342 signals [signum - 1].pending = 1;
1304 evpipe_write (EV_A_ &sig_pending); 1343 evpipe_write (EV_A_ &sig_pending);
1346 break; 1385 break;
1347 } 1386 }
1348} 1387}
1349#endif 1388#endif
1350 1389
1390#endif
1391
1351/*****************************************************************************/ 1392/*****************************************************************************/
1352 1393
1394#if EV_CHILD_ENABLE
1353static WL childs [EV_PID_HASHSIZE]; 1395static WL childs [EV_PID_HASHSIZE];
1354
1355#ifndef _WIN32
1356 1396
1357static ev_signal childev; 1397static ev_signal childev;
1358 1398
1359#ifndef WIFCONTINUED 1399#ifndef WIFCONTINUED
1360# define WIFCONTINUED(status) 0 1400# define WIFCONTINUED(status) 0
1365child_reap (EV_P_ int chain, int pid, int status) 1405child_reap (EV_P_ int chain, int pid, int status)
1366{ 1406{
1367 ev_child *w; 1407 ev_child *w;
1368 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1408 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1369 1409
1370 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)
1371 { 1411 {
1372 if ((w->pid == pid || !w->pid) 1412 if ((w->pid == pid || !w->pid)
1373 && (!traced || (w->flags & 1))) 1413 && (!traced || (w->flags & 1)))
1374 { 1414 {
1375 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 */
1400 /* 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 */
1401 /* 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 */
1402 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1442 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1403 1443
1404 child_reap (EV_A_ pid, pid, status); 1444 child_reap (EV_A_ pid, pid, status);
1405 if (EV_PID_HASHSIZE > 1) 1445 if ((EV_PID_HASHSIZE) > 1)
1406 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 */
1407} 1447}
1408 1448
1409#endif 1449#endif
1410 1450
1477#ifdef __APPLE__ 1517#ifdef __APPLE__
1478 /* only select works correctly on that "unix-certified" platform */ 1518 /* only select works correctly on that "unix-certified" platform */
1479 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1519 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1480 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 */
1481#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
1482 1525
1483 return flags; 1526 return flags;
1484} 1527}
1485 1528
1486unsigned int 1529unsigned int
1499ev_backend (EV_P) 1542ev_backend (EV_P)
1500{ 1543{
1501 return backend; 1544 return backend;
1502} 1545}
1503 1546
1504#if EV_MINIMAL < 2 1547#if EV_FEATURE_API
1505unsigned int 1548unsigned int
1506ev_loop_count (EV_P) 1549ev_iteration (EV_P)
1507{ 1550{
1508 return loop_count; 1551 return loop_count;
1509} 1552}
1510 1553
1511unsigned int 1554unsigned int
1512ev_loop_depth (EV_P) 1555ev_depth (EV_P)
1513{ 1556{
1514 return loop_depth; 1557 return loop_depth;
1515} 1558}
1516 1559
1517void 1560void
1589 1632
1590 ev_rt_now = ev_time (); 1633 ev_rt_now = ev_time ();
1591 mn_now = get_clock (); 1634 mn_now = get_clock ();
1592 now_floor = mn_now; 1635 now_floor = mn_now;
1593 rtmn_diff = ev_rt_now - mn_now; 1636 rtmn_diff = ev_rt_now - mn_now;
1594#if EV_MINIMAL < 2 1637#if EV_FEATURE_API
1595 invoke_cb = ev_invoke_pending; 1638 invoke_cb = ev_invoke_pending;
1596#endif 1639#endif
1597 1640
1598 io_blocktime = 0.; 1641 io_blocktime = 0.;
1599 timeout_blocktime = 0.; 1642 timeout_blocktime = 0.;
1605#endif 1648#endif
1606#if EV_USE_INOTIFY 1649#if EV_USE_INOTIFY
1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1650 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1608#endif 1651#endif
1609#if EV_USE_SIGNALFD 1652#if EV_USE_SIGNALFD
1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1653 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1611#endif 1654#endif
1612 1655
1613 if (!(flags & 0x0000ffffU)) 1656 if (!(flags & 0x0000ffffU))
1614 flags |= ev_recommended_backends (); 1657 flags |= ev_recommended_backends ();
1615 1658
1629 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1672 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1630#endif 1673#endif
1631 1674
1632 ev_prepare_init (&pending_w, pendingcb); 1675 ev_prepare_init (&pending_w, pendingcb);
1633 1676
1677#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1634 ev_init (&pipe_w, pipecb); 1678 ev_init (&pipe_w, pipecb);
1635 ev_set_priority (&pipe_w, EV_MAXPRI); 1679 ev_set_priority (&pipe_w, EV_MAXPRI);
1680#endif
1636 } 1681 }
1637} 1682}
1638 1683
1639/* free up a loop structure */ 1684/* free up a loop structure */
1640static void noinline 1685static void noinline
1659 } 1704 }
1660 } 1705 }
1661 1706
1662#if EV_USE_SIGNALFD 1707#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w)) 1708 if (ev_is_active (&sigfd_w))
1664 {
1665 /*ev_ref (EV_A);*/
1666 /*ev_io_stop (EV_A_ &sigfd_w);*/
1667
1668 close (sigfd); 1709 close (sigfd);
1669 }
1670#endif 1710#endif
1671 1711
1672#if EV_USE_INOTIFY 1712#if EV_USE_INOTIFY
1673 if (fs_fd >= 0) 1713 if (fs_fd >= 0)
1674 close (fs_fd); 1714 close (fs_fd);
1763 { 1803 {
1764 EV_WIN32_CLOSE_FD (evpipe [0]); 1804 EV_WIN32_CLOSE_FD (evpipe [0]);
1765 EV_WIN32_CLOSE_FD (evpipe [1]); 1805 EV_WIN32_CLOSE_FD (evpipe [1]);
1766 } 1806 }
1767 1807
1808#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1768 evpipe_init (EV_A); 1809 evpipe_init (EV_A);
1769 /* now iterate over everything, in case we missed something */ 1810 /* now iterate over everything, in case we missed something */
1770 pipecb (EV_A_ &pipe_w, EV_READ); 1811 pipecb (EV_A_ &pipe_w, EV_READ);
1812#endif
1771 } 1813 }
1772 1814
1773 postfork = 0; 1815 postfork = 0;
1774} 1816}
1775 1817
1837 verify_watcher (EV_A_ ws [cnt]); 1879 verify_watcher (EV_A_ ws [cnt]);
1838 } 1880 }
1839} 1881}
1840#endif 1882#endif
1841 1883
1842#if EV_MINIMAL < 2 1884#if EV_FEATURE_API
1843void 1885void
1844ev_loop_verify (EV_P) 1886ev_verify (EV_P)
1845{ 1887{
1846#if EV_VERIFY 1888#if EV_VERIFY
1847 int i; 1889 int i;
1848 WL w; 1890 WL w;
1849 1891
1888#if EV_ASYNC_ENABLE 1930#if EV_ASYNC_ENABLE
1889 assert (asyncmax >= asynccnt); 1931 assert (asyncmax >= asynccnt);
1890 array_verify (EV_A_ (W *)asyncs, asynccnt); 1932 array_verify (EV_A_ (W *)asyncs, asynccnt);
1891#endif 1933#endif
1892 1934
1935#if EV_PREPARE_ENABLE
1893 assert (preparemax >= preparecnt); 1936 assert (preparemax >= preparecnt);
1894 array_verify (EV_A_ (W *)prepares, preparecnt); 1937 array_verify (EV_A_ (W *)prepares, preparecnt);
1938#endif
1895 1939
1940#if EV_CHECK_ENABLE
1896 assert (checkmax >= checkcnt); 1941 assert (checkmax >= checkcnt);
1897 array_verify (EV_A_ (W *)checks, checkcnt); 1942 array_verify (EV_A_ (W *)checks, checkcnt);
1943#endif
1898 1944
1899# if 0 1945# if 0
1946#if EV_CHILD_ENABLE
1900 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)
1901 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1948 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1949#endif
1902# endif 1950# endif
1903#endif 1951#endif
1904} 1952}
1905#endif 1953#endif
1906 1954
1922 1970
1923 loop_init (EV_A_ flags); 1971 loop_init (EV_A_ flags);
1924 1972
1925 if (ev_backend (EV_A)) 1973 if (ev_backend (EV_A))
1926 { 1974 {
1927#ifndef _WIN32 1975#if EV_CHILD_ENABLE
1928 ev_signal_init (&childev, childcb, SIGCHLD); 1976 ev_signal_init (&childev, childcb, SIGCHLD);
1929 ev_set_priority (&childev, EV_MAXPRI); 1977 ev_set_priority (&childev, EV_MAXPRI);
1930 ev_signal_start (EV_A_ &childev); 1978 ev_signal_start (EV_A_ &childev);
1931 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1979 ev_unref (EV_A); /* child watcher should not keep loop alive */
1932#endif 1980#endif
1945 EV_P = ev_default_loop_ptr; 1993 EV_P = ev_default_loop_ptr;
1946#endif 1994#endif
1947 1995
1948 ev_default_loop_ptr = 0; 1996 ev_default_loop_ptr = 0;
1949 1997
1950#ifndef _WIN32 1998#if EV_CHILD_ENABLE
1951 ev_ref (EV_A); /* child watcher */ 1999 ev_ref (EV_A); /* child watcher */
1952 ev_signal_stop (EV_A_ &childev); 2000 ev_signal_stop (EV_A_ &childev);
1953#endif 2001#endif
1954 2002
1955 loop_destroy (EV_A); 2003 loop_destroy (EV_A);
2061 EV_FREQUENT_CHECK; 2109 EV_FREQUENT_CHECK;
2062 feed_reverse (EV_A_ (W)w); 2110 feed_reverse (EV_A_ (W)w);
2063 } 2111 }
2064 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2112 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2065 2113
2066 feed_reverse_done (EV_A_ EV_TIMEOUT); 2114 feed_reverse_done (EV_A_ EV_TIMER);
2067 } 2115 }
2068} 2116}
2069 2117
2070#if EV_PERIODIC_ENABLE 2118#if EV_PERIODIC_ENABLE
2071/* make periodics pending */ 2119/* make periodics pending */
2124 feed_reverse_done (EV_A_ EV_PERIODIC); 2172 feed_reverse_done (EV_A_ EV_PERIODIC);
2125 } 2173 }
2126} 2174}
2127 2175
2128/* simply recalculate all periodics */ 2176/* simply recalculate all periodics */
2129/* 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? */
2130static void noinline 2178static void noinline
2131periodics_reschedule (EV_P) 2179periodics_reschedule (EV_P)
2132{ 2180{
2133 int i; 2181 int i;
2134 2182
2162 ANHE_at_cache (*he); 2210 ANHE_at_cache (*he);
2163 } 2211 }
2164} 2212}
2165 2213
2166/* fetch new monotonic and realtime times from the kernel */ 2214/* fetch new monotonic and realtime times from the kernel */
2167/* also detetc if there was a timejump, and act accordingly */ 2215/* also detect if there was a timejump, and act accordingly */
2168inline_speed void 2216inline_speed void
2169time_update (EV_P_ ev_tstamp max_block) 2217time_update (EV_P_ ev_tstamp max_block)
2170{ 2218{
2171#if EV_USE_MONOTONIC 2219#if EV_USE_MONOTONIC
2172 if (expect_true (have_monotonic)) 2220 if (expect_true (have_monotonic))
2230 mn_now = ev_rt_now; 2278 mn_now = ev_rt_now;
2231 } 2279 }
2232} 2280}
2233 2281
2234void 2282void
2235ev_loop (EV_P_ int flags) 2283ev_run (EV_P_ int flags)
2236{ 2284{
2237#if EV_MINIMAL < 2 2285#if EV_FEATURE_API
2238 ++loop_depth; 2286 ++loop_depth;
2239#endif 2287#endif
2240 2288
2241 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));
2242 2290
2243 loop_done = EVUNLOOP_CANCEL; 2291 loop_done = EVBREAK_CANCEL;
2244 2292
2245 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 */
2246 2294
2247 do 2295 do
2248 { 2296 {
2249#if EV_VERIFY >= 2 2297#if EV_VERIFY >= 2
2250 ev_loop_verify (EV_A); 2298 ev_verify (EV_A);
2251#endif 2299#endif
2252 2300
2253#ifndef _WIN32 2301#ifndef _WIN32
2254 if (expect_false (curpid)) /* penalise the forking check even more */ 2302 if (expect_false (curpid)) /* penalise the forking check even more */
2255 if (expect_false (getpid () != curpid)) 2303 if (expect_false (getpid () != curpid))
2267 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2315 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2268 EV_INVOKE_PENDING; 2316 EV_INVOKE_PENDING;
2269 } 2317 }
2270#endif 2318#endif
2271 2319
2320#if EV_PREPARE_ENABLE
2272 /* queue prepare watchers (and execute them) */ 2321 /* queue prepare watchers (and execute them) */
2273 if (expect_false (preparecnt)) 2322 if (expect_false (preparecnt))
2274 { 2323 {
2275 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2324 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2276 EV_INVOKE_PENDING; 2325 EV_INVOKE_PENDING;
2277 } 2326 }
2327#endif
2278 2328
2279 if (expect_false (loop_done)) 2329 if (expect_false (loop_done))
2280 break; 2330 break;
2281 2331
2282 /* we might have forked, so reify kernel state if necessary */ 2332 /* we might have forked, so reify kernel state if necessary */
2289 /* calculate blocking time */ 2339 /* calculate blocking time */
2290 { 2340 {
2291 ev_tstamp waittime = 0.; 2341 ev_tstamp waittime = 0.;
2292 ev_tstamp sleeptime = 0.; 2342 ev_tstamp sleeptime = 0.;
2293 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
2294 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2350 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2295 { 2351 {
2296 /* remember old timestamp for io_blocktime calculation */
2297 ev_tstamp prev_mn_now = mn_now;
2298
2299 /* update time to cancel out callback processing overhead */
2300 time_update (EV_A_ 1e100);
2301
2302 waittime = MAX_BLOCKTIME; 2352 waittime = MAX_BLOCKTIME;
2303 2353
2304 if (timercnt) 2354 if (timercnt)
2305 { 2355 {
2306 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2356 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2333 waittime -= sleeptime; 2383 waittime -= sleeptime;
2334 } 2384 }
2335 } 2385 }
2336 } 2386 }
2337 2387
2338#if EV_MINIMAL < 2 2388#if EV_FEATURE_API
2339 ++loop_count; 2389 ++loop_count;
2340#endif 2390#endif
2341 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2391 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2342 backend_poll (EV_A_ waittime); 2392 backend_poll (EV_A_ waittime);
2343 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2393 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2344 2394
2345 /* update ev_rt_now, do magic */ 2395 /* update ev_rt_now, do magic */
2346 time_update (EV_A_ waittime + sleeptime); 2396 time_update (EV_A_ waittime + sleeptime);
2347 } 2397 }
2348 2398
2355#if EV_IDLE_ENABLE 2405#if EV_IDLE_ENABLE
2356 /* queue idle watchers unless other events are pending */ 2406 /* queue idle watchers unless other events are pending */
2357 idle_reify (EV_A); 2407 idle_reify (EV_A);
2358#endif 2408#endif
2359 2409
2410#if EV_CHECK_ENABLE
2360 /* queue check watchers, to be executed first */ 2411 /* queue check watchers, to be executed first */
2361 if (expect_false (checkcnt)) 2412 if (expect_false (checkcnt))
2362 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2413 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2414#endif
2363 2415
2364 EV_INVOKE_PENDING; 2416 EV_INVOKE_PENDING;
2365 } 2417 }
2366 while (expect_true ( 2418 while (expect_true (
2367 activecnt 2419 activecnt
2368 && !loop_done 2420 && !loop_done
2369 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2421 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2370 )); 2422 ));
2371 2423
2372 if (loop_done == EVUNLOOP_ONE) 2424 if (loop_done == EVBREAK_ONE)
2373 loop_done = EVUNLOOP_CANCEL; 2425 loop_done = EVBREAK_CANCEL;
2374 2426
2375#if EV_MINIMAL < 2 2427#if EV_FEATURE_API
2376 --loop_depth; 2428 --loop_depth;
2377#endif 2429#endif
2378} 2430}
2379 2431
2380void 2432void
2381ev_unloop (EV_P_ int how) 2433ev_break (EV_P_ int how)
2382{ 2434{
2383 loop_done = how; 2435 loop_done = how;
2384} 2436}
2385 2437
2386void 2438void
2506 2558
2507 if (expect_false (ev_is_active (w))) 2559 if (expect_false (ev_is_active (w)))
2508 return; 2560 return;
2509 2561
2510 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2562 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2511 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))));
2512 2564
2513 EV_FREQUENT_CHECK; 2565 EV_FREQUENT_CHECK;
2514 2566
2515 ev_start (EV_A_ (W)w, 1); 2567 ev_start (EV_A_ (W)w, 1);
2516 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2568 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2534 EV_FREQUENT_CHECK; 2586 EV_FREQUENT_CHECK;
2535 2587
2536 wlist_del (&anfds[w->fd].head, (WL)w); 2588 wlist_del (&anfds[w->fd].head, (WL)w);
2537 ev_stop (EV_A_ (W)w); 2589 ev_stop (EV_A_ (W)w);
2538 2590
2539 fd_change (EV_A_ w->fd, 1); 2591 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2540 2592
2541 EV_FREQUENT_CHECK; 2593 EV_FREQUENT_CHECK;
2542} 2594}
2543 2595
2544void noinline 2596void noinline
2586 timers [active] = timers [timercnt + HEAP0]; 2638 timers [active] = timers [timercnt + HEAP0];
2587 adjustheap (timers, timercnt, active); 2639 adjustheap (timers, timercnt, active);
2588 } 2640 }
2589 } 2641 }
2590 2642
2591 EV_FREQUENT_CHECK;
2592
2593 ev_at (w) -= mn_now; 2643 ev_at (w) -= mn_now;
2594 2644
2595 ev_stop (EV_A_ (W)w); 2645 ev_stop (EV_A_ (W)w);
2646
2647 EV_FREQUENT_CHECK;
2596} 2648}
2597 2649
2598void noinline 2650void noinline
2599ev_timer_again (EV_P_ ev_timer *w) 2651ev_timer_again (EV_P_ ev_timer *w)
2600{ 2652{
2679 periodics [active] = periodics [periodiccnt + HEAP0]; 2731 periodics [active] = periodics [periodiccnt + HEAP0];
2680 adjustheap (periodics, periodiccnt, active); 2732 adjustheap (periodics, periodiccnt, active);
2681 } 2733 }
2682 } 2734 }
2683 2735
2684 EV_FREQUENT_CHECK;
2685
2686 ev_stop (EV_A_ (W)w); 2736 ev_stop (EV_A_ (W)w);
2737
2738 EV_FREQUENT_CHECK;
2687} 2739}
2688 2740
2689void noinline 2741void noinline
2690ev_periodic_again (EV_P_ ev_periodic *w) 2742ev_periodic_again (EV_P_ ev_periodic *w)
2691{ 2743{
2696#endif 2748#endif
2697 2749
2698#ifndef SA_RESTART 2750#ifndef SA_RESTART
2699# define SA_RESTART 0 2751# define SA_RESTART 0
2700#endif 2752#endif
2753
2754#if EV_SIGNAL_ENABLE
2701 2755
2702void noinline 2756void noinline
2703ev_signal_start (EV_P_ ev_signal *w) 2757ev_signal_start (EV_P_ ev_signal *w)
2704{ 2758{
2705 if (expect_false (ev_is_active (w))) 2759 if (expect_false (ev_is_active (w)))
2752 if (!((WL)w)->next) 2806 if (!((WL)w)->next)
2753# if EV_USE_SIGNALFD 2807# if EV_USE_SIGNALFD
2754 if (sigfd < 0) /*TODO*/ 2808 if (sigfd < 0) /*TODO*/
2755# endif 2809# endif
2756 { 2810 {
2757# if _WIN32 2811# ifdef _WIN32
2812 evpipe_init (EV_A);
2813
2758 signal (w->signum, ev_sighandler); 2814 signal (w->signum, ev_sighandler);
2759# else 2815# else
2760 struct sigaction sa; 2816 struct sigaction sa;
2761 2817
2762 evpipe_init (EV_A); 2818 evpipe_init (EV_A);
2793 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2849 signals [w->signum - 1].loop = 0; /* unattach from signal */
2794#endif 2850#endif
2795#if EV_USE_SIGNALFD 2851#if EV_USE_SIGNALFD
2796 if (sigfd >= 0) 2852 if (sigfd >= 0)
2797 { 2853 {
2798 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2854 sigset_t ss;
2855
2856 sigemptyset (&ss);
2857 sigaddset (&ss, w->signum);
2799 sigdelset (&sigfd_set, w->signum); 2858 sigdelset (&sigfd_set, w->signum);
2859
2800 signalfd (sigfd, &sigfd_set, 0); 2860 signalfd (sigfd, &sigfd_set, 0);
2801 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2861 sigprocmask (SIG_UNBLOCK, &ss, 0);
2802 /*TODO: maybe unblock signal? */
2803 } 2862 }
2804 else 2863 else
2805#endif 2864#endif
2806 signal (w->signum, SIG_DFL); 2865 signal (w->signum, SIG_DFL);
2807 } 2866 }
2808 2867
2809 EV_FREQUENT_CHECK; 2868 EV_FREQUENT_CHECK;
2810} 2869}
2811 2870
2871#endif
2872
2873#if EV_CHILD_ENABLE
2874
2812void 2875void
2813ev_child_start (EV_P_ ev_child *w) 2876ev_child_start (EV_P_ ev_child *w)
2814{ 2877{
2815#if EV_MULTIPLICITY 2878#if EV_MULTIPLICITY
2816 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));
2819 return; 2882 return;
2820 2883
2821 EV_FREQUENT_CHECK; 2884 EV_FREQUENT_CHECK;
2822 2885
2823 ev_start (EV_A_ (W)w, 1); 2886 ev_start (EV_A_ (W)w, 1);
2824 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2887 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2825 2888
2826 EV_FREQUENT_CHECK; 2889 EV_FREQUENT_CHECK;
2827} 2890}
2828 2891
2829void 2892void
2833 if (expect_false (!ev_is_active (w))) 2896 if (expect_false (!ev_is_active (w)))
2834 return; 2897 return;
2835 2898
2836 EV_FREQUENT_CHECK; 2899 EV_FREQUENT_CHECK;
2837 2900
2838 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2901 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2839 ev_stop (EV_A_ (W)w); 2902 ev_stop (EV_A_ (W)w);
2840 2903
2841 EV_FREQUENT_CHECK; 2904 EV_FREQUENT_CHECK;
2842} 2905}
2906
2907#endif
2843 2908
2844#if EV_STAT_ENABLE 2909#if EV_STAT_ENABLE
2845 2910
2846# ifdef _WIN32 2911# ifdef _WIN32
2847# undef lstat 2912# undef lstat
2853#define MIN_STAT_INTERVAL 0.1074891 2918#define MIN_STAT_INTERVAL 0.1074891
2854 2919
2855static 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);
2856 2921
2857#if EV_USE_INOTIFY 2922#if EV_USE_INOTIFY
2858# 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)
2859 2926
2860static void noinline 2927static void noinline
2861infy_add (EV_P_ ev_stat *w) 2928infy_add (EV_P_ ev_stat *w)
2862{ 2929{
2863 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);
2864 2931
2865 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 */
2866 { 2952 }
2953 else
2954 {
2955 /* can't use inotify, continue to stat */
2867 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2956 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2868 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2869 2957
2870 /* monitor some parent directory for speedup hints */ 2958 /* if path is not there, monitor some parent directory for speedup hints */
2871 /* 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, */
2872 /* but an efficiency issue only */ 2960 /* but an efficiency issue only */
2873 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2961 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2874 { 2962 {
2875 char path [4096]; 2963 char path [4096];
2891 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2979 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2892 } 2980 }
2893 } 2981 }
2894 2982
2895 if (w->wd >= 0) 2983 if (w->wd >= 0)
2896 {
2897 struct statfs sfs;
2898
2899 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);
2900 2985
2901 /* now local changes will be tracked by inotify, but remote changes won't */ 2986 /* now re-arm timer, if required */
2902 /* unless the filesystem it known to be local, we therefore still poll */ 2987 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2903 /* also do poll on <2.6.25, but with normal frequency */
2904
2905 if (fs_2625 && !statfs (w->path, &sfs))
2906 if (sfs.f_type == 0x1373 /* devfs */
2907 || sfs.f_type == 0xEF53 /* ext2/3 */
2908 || sfs.f_type == 0x3153464a /* jfs */
2909 || sfs.f_type == 0x52654973 /* reiser3 */
2910 || sfs.f_type == 0x01021994 /* tempfs */
2911 || sfs.f_type == 0x58465342 /* xfs */)
2912 return;
2913
2914 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2915 ev_timer_again (EV_A_ &w->timer); 2988 ev_timer_again (EV_A_ &w->timer);
2916 } 2989 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2917} 2990}
2918 2991
2919static void noinline 2992static void noinline
2920infy_del (EV_P_ ev_stat *w) 2993infy_del (EV_P_ ev_stat *w)
2921{ 2994{
2924 2997
2925 if (wd < 0) 2998 if (wd < 0)
2926 return; 2999 return;
2927 3000
2928 w->wd = -2; 3001 w->wd = -2;
2929 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3002 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2930 wlist_del (&fs_hash [slot].head, (WL)w); 3003 wlist_del (&fs_hash [slot].head, (WL)w);
2931 3004
2932 /* remove this watcher, if others are watching it, they will rearm */ 3005 /* remove this watcher, if others are watching it, they will rearm */
2933 inotify_rm_watch (fs_fd, wd); 3006 inotify_rm_watch (fs_fd, wd);
2934} 3007}
2936static void noinline 3009static void noinline
2937infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3010infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2938{ 3011{
2939 if (slot < 0) 3012 if (slot < 0)
2940 /* overflow, need to check for all hash slots */ 3013 /* overflow, need to check for all hash slots */
2941 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3014 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2942 infy_wd (EV_A_ slot, wd, ev); 3015 infy_wd (EV_A_ slot, wd, ev);
2943 else 3016 else
2944 { 3017 {
2945 WL w_; 3018 WL w_;
2946 3019
2947 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3020 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2948 { 3021 {
2949 ev_stat *w = (ev_stat *)w_; 3022 ev_stat *w = (ev_stat *)w_;
2950 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 */
2951 3024
2952 if (w->wd == wd || wd == -1) 3025 if (w->wd == wd || wd == -1)
2953 { 3026 {
2954 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3027 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2955 { 3028 {
2956 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);
2957 w->wd = -1; 3030 w->wd = -1;
2958 infy_add (EV_A_ w); /* re-add, no matter what */ 3031 infy_add (EV_A_ w); /* re-add, no matter what */
2959 } 3032 }
2960 3033
2961 stat_timer_cb (EV_A_ &w->timer, 0); 3034 stat_timer_cb (EV_A_ &w->timer, 0);
2966 3039
2967static void 3040static void
2968infy_cb (EV_P_ ev_io *w, int revents) 3041infy_cb (EV_P_ ev_io *w, int revents)
2969{ 3042{
2970 char buf [EV_INOTIFY_BUFSIZE]; 3043 char buf [EV_INOTIFY_BUFSIZE];
2971 struct inotify_event *ev = (struct inotify_event *)buf;
2972 int ofs; 3044 int ofs;
2973 int len = read (fs_fd, buf, sizeof (buf)); 3045 int len = read (fs_fd, buf, sizeof (buf));
2974 3046
2975 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);
2976 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;
2977} 3085}
2978 3086
2979inline_size void 3087inline_size void
2980check_2625 (EV_P) 3088ev_check_2625 (EV_P)
2981{ 3089{
2982 /* kernels < 2.6.25 are borked 3090 /* kernels < 2.6.25 are borked
2983 * 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
2984 */ 3092 */
2985 struct utsname buf; 3093 if (ev_linux_version () < 0x020619)
2986 int major, minor, micro;
2987
2988 if (uname (&buf))
2989 return; 3094 return;
2990 3095
2991 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2992 return;
2993
2994 if (major < 2
2995 || (major == 2 && minor < 6)
2996 || (major == 2 && minor == 6 && micro < 25))
2997 return;
2998
2999 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 ();
3000} 3108}
3001 3109
3002inline_size void 3110inline_size void
3003infy_init (EV_P) 3111infy_init (EV_P)
3004{ 3112{
3005 if (fs_fd != -2) 3113 if (fs_fd != -2)
3006 return; 3114 return;
3007 3115
3008 fs_fd = -1; 3116 fs_fd = -1;
3009 3117
3010 check_2625 (EV_A); 3118 ev_check_2625 (EV_A);
3011 3119
3012 fs_fd = inotify_init (); 3120 fs_fd = infy_newfd ();
3013 3121
3014 if (fs_fd >= 0) 3122 if (fs_fd >= 0)
3015 { 3123 {
3124 fd_intern (fs_fd);
3016 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3125 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
3017 ev_set_priority (&fs_w, EV_MAXPRI); 3126 ev_set_priority (&fs_w, EV_MAXPRI);
3018 ev_io_start (EV_A_ &fs_w); 3127 ev_io_start (EV_A_ &fs_w);
3128 ev_unref (EV_A);
3019 } 3129 }
3020} 3130}
3021 3131
3022inline_size void 3132inline_size void
3023infy_fork (EV_P) 3133infy_fork (EV_P)
3025 int slot; 3135 int slot;
3026 3136
3027 if (fs_fd < 0) 3137 if (fs_fd < 0)
3028 return; 3138 return;
3029 3139
3140 ev_ref (EV_A);
3141 ev_io_stop (EV_A_ &fs_w);
3030 close (fs_fd); 3142 close (fs_fd);
3031 fs_fd = inotify_init (); 3143 fs_fd = infy_newfd ();
3032 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
3033 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3153 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3034 { 3154 {
3035 WL w_ = fs_hash [slot].head; 3155 WL w_ = fs_hash [slot].head;
3036 fs_hash [slot].head = 0; 3156 fs_hash [slot].head = 0;
3037 3157
3038 while (w_) 3158 while (w_)
3043 w->wd = -1; 3163 w->wd = -1;
3044 3164
3045 if (fs_fd >= 0) 3165 if (fs_fd >= 0)
3046 infy_add (EV_A_ w); /* re-add, no matter what */ 3166 infy_add (EV_A_ w); /* re-add, no matter what */
3047 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);
3048 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 }
3049 } 3174 }
3050 } 3175 }
3051} 3176}
3052 3177
3053#endif 3178#endif
3070static void noinline 3195static void noinline
3071stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3196stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3072{ 3197{
3073 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3198 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3074 3199
3075 /* we copy this here each the time so that */ 3200 ev_statdata prev = w->attr;
3076 /* prev has the old value when the callback gets invoked */
3077 w->prev = w->attr;
3078 ev_stat_stat (EV_A_ w); 3201 ev_stat_stat (EV_A_ w);
3079 3202
3080 /* 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 */
3081 if ( 3204 if (
3082 w->prev.st_dev != w->attr.st_dev 3205 prev.st_dev != w->attr.st_dev
3083 || w->prev.st_ino != w->attr.st_ino 3206 || prev.st_ino != w->attr.st_ino
3084 || w->prev.st_mode != w->attr.st_mode 3207 || prev.st_mode != w->attr.st_mode
3085 || w->prev.st_nlink != w->attr.st_nlink 3208 || prev.st_nlink != w->attr.st_nlink
3086 || w->prev.st_uid != w->attr.st_uid 3209 || prev.st_uid != w->attr.st_uid
3087 || w->prev.st_gid != w->attr.st_gid 3210 || prev.st_gid != w->attr.st_gid
3088 || w->prev.st_rdev != w->attr.st_rdev 3211 || prev.st_rdev != w->attr.st_rdev
3089 || w->prev.st_size != w->attr.st_size 3212 || prev.st_size != w->attr.st_size
3090 || w->prev.st_atime != w->attr.st_atime 3213 || prev.st_atime != w->attr.st_atime
3091 || w->prev.st_mtime != w->attr.st_mtime 3214 || prev.st_mtime != w->attr.st_mtime
3092 || w->prev.st_ctime != w->attr.st_ctime 3215 || prev.st_ctime != w->attr.st_ctime
3093 ) { 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
3094 #if EV_USE_INOTIFY 3222 #if EV_USE_INOTIFY
3095 if (fs_fd >= 0) 3223 if (fs_fd >= 0)
3096 { 3224 {
3097 infy_del (EV_A_ w); 3225 infy_del (EV_A_ w);
3098 infy_add (EV_A_ w); 3226 infy_add (EV_A_ w);
3123 3251
3124 if (fs_fd >= 0) 3252 if (fs_fd >= 0)
3125 infy_add (EV_A_ w); 3253 infy_add (EV_A_ w);
3126 else 3254 else
3127#endif 3255#endif
3256 {
3128 ev_timer_again (EV_A_ &w->timer); 3257 ev_timer_again (EV_A_ &w->timer);
3258 ev_unref (EV_A);
3259 }
3129 3260
3130 ev_start (EV_A_ (W)w, 1); 3261 ev_start (EV_A_ (W)w, 1);
3131 3262
3132 EV_FREQUENT_CHECK; 3263 EV_FREQUENT_CHECK;
3133} 3264}
3142 EV_FREQUENT_CHECK; 3273 EV_FREQUENT_CHECK;
3143 3274
3144#if EV_USE_INOTIFY 3275#if EV_USE_INOTIFY
3145 infy_del (EV_A_ w); 3276 infy_del (EV_A_ w);
3146#endif 3277#endif
3278
3279 if (ev_is_active (&w->timer))
3280 {
3281 ev_ref (EV_A);
3147 ev_timer_stop (EV_A_ &w->timer); 3282 ev_timer_stop (EV_A_ &w->timer);
3283 }
3148 3284
3149 ev_stop (EV_A_ (W)w); 3285 ev_stop (EV_A_ (W)w);
3150 3286
3151 EV_FREQUENT_CHECK; 3287 EV_FREQUENT_CHECK;
3152} 3288}
3197 3333
3198 EV_FREQUENT_CHECK; 3334 EV_FREQUENT_CHECK;
3199} 3335}
3200#endif 3336#endif
3201 3337
3338#if EV_PREPARE_ENABLE
3202void 3339void
3203ev_prepare_start (EV_P_ ev_prepare *w) 3340ev_prepare_start (EV_P_ ev_prepare *w)
3204{ 3341{
3205 if (expect_false (ev_is_active (w))) 3342 if (expect_false (ev_is_active (w)))
3206 return; 3343 return;
3232 3369
3233 ev_stop (EV_A_ (W)w); 3370 ev_stop (EV_A_ (W)w);
3234 3371
3235 EV_FREQUENT_CHECK; 3372 EV_FREQUENT_CHECK;
3236} 3373}
3374#endif
3237 3375
3376#if EV_CHECK_ENABLE
3238void 3377void
3239ev_check_start (EV_P_ ev_check *w) 3378ev_check_start (EV_P_ ev_check *w)
3240{ 3379{
3241 if (expect_false (ev_is_active (w))) 3380 if (expect_false (ev_is_active (w)))
3242 return; 3381 return;
3268 3407
3269 ev_stop (EV_A_ (W)w); 3408 ev_stop (EV_A_ (W)w);
3270 3409
3271 EV_FREQUENT_CHECK; 3410 EV_FREQUENT_CHECK;
3272} 3411}
3412#endif
3273 3413
3274#if EV_EMBED_ENABLE 3414#if EV_EMBED_ENABLE
3275void noinline 3415void noinline
3276ev_embed_sweep (EV_P_ ev_embed *w) 3416ev_embed_sweep (EV_P_ ev_embed *w)
3277{ 3417{
3278 ev_loop (w->other, EVLOOP_NONBLOCK); 3418 ev_run (w->other, EVRUN_NOWAIT);
3279} 3419}
3280 3420
3281static void 3421static void
3282embed_io_cb (EV_P_ ev_io *io, int revents) 3422embed_io_cb (EV_P_ ev_io *io, int revents)
3283{ 3423{
3284 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3424 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3285 3425
3286 if (ev_cb (w)) 3426 if (ev_cb (w))
3287 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3427 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3288 else 3428 else
3289 ev_loop (w->other, EVLOOP_NONBLOCK); 3429 ev_run (w->other, EVRUN_NOWAIT);
3290} 3430}
3291 3431
3292static void 3432static void
3293embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3433embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3294{ 3434{
3298 EV_P = w->other; 3438 EV_P = w->other;
3299 3439
3300 while (fdchangecnt) 3440 while (fdchangecnt)
3301 { 3441 {
3302 fd_reify (EV_A); 3442 fd_reify (EV_A);
3303 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3443 ev_run (EV_A_ EVRUN_NOWAIT);
3304 } 3444 }
3305 } 3445 }
3306} 3446}
3307 3447
3308static void 3448static void
3314 3454
3315 { 3455 {
3316 EV_P = w->other; 3456 EV_P = w->other;
3317 3457
3318 ev_loop_fork (EV_A); 3458 ev_loop_fork (EV_A);
3319 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3459 ev_run (EV_A_ EVRUN_NOWAIT);
3320 } 3460 }
3321 3461
3322 ev_embed_start (EV_A_ w); 3462 ev_embed_start (EV_A_ w);
3323} 3463}
3324 3464
3372 3512
3373 ev_io_stop (EV_A_ &w->io); 3513 ev_io_stop (EV_A_ &w->io);
3374 ev_prepare_stop (EV_A_ &w->prepare); 3514 ev_prepare_stop (EV_A_ &w->prepare);
3375 ev_fork_stop (EV_A_ &w->fork); 3515 ev_fork_stop (EV_A_ &w->fork);
3376 3516
3517 ev_stop (EV_A_ (W)w);
3518
3377 EV_FREQUENT_CHECK; 3519 EV_FREQUENT_CHECK;
3378} 3520}
3379#endif 3521#endif
3380 3522
3381#if EV_FORK_ENABLE 3523#if EV_FORK_ENABLE
3420void 3562void
3421ev_async_start (EV_P_ ev_async *w) 3563ev_async_start (EV_P_ ev_async *w)
3422{ 3564{
3423 if (expect_false (ev_is_active (w))) 3565 if (expect_false (ev_is_active (w)))
3424 return; 3566 return;
3567
3568 w->sent = 0;
3425 3569
3426 evpipe_init (EV_A); 3570 evpipe_init (EV_A);
3427 3571
3428 EV_FREQUENT_CHECK; 3572 EV_FREQUENT_CHECK;
3429 3573
3507{ 3651{
3508 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));
3509 3653
3510 if (expect_false (!once)) 3654 if (expect_false (!once))
3511 { 3655 {
3512 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3656 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3513 return; 3657 return;
3514 } 3658 }
3515 3659
3516 once->cb = cb; 3660 once->cb = cb;
3517 once->arg = arg; 3661 once->arg = arg;
3604 if (types & EV_ASYNC) 3748 if (types & EV_ASYNC)
3605 for (i = asynccnt; i--; ) 3749 for (i = asynccnt; i--; )
3606 cb (EV_A_ EV_ASYNC, asyncs [i]); 3750 cb (EV_A_ EV_ASYNC, asyncs [i]);
3607#endif 3751#endif
3608 3752
3753#if EV_PREPARE_ENABLE
3609 if (types & EV_PREPARE) 3754 if (types & EV_PREPARE)
3610 for (i = preparecnt; i--; ) 3755 for (i = preparecnt; i--; )
3611#if EV_EMBED_ENABLE 3756# if EV_EMBED_ENABLE
3612 if (ev_cb (prepares [i]) != embed_prepare_cb) 3757 if (ev_cb (prepares [i]) != embed_prepare_cb)
3613#endif 3758# endif
3614 cb (EV_A_ EV_PREPARE, prepares [i]); 3759 cb (EV_A_ EV_PREPARE, prepares [i]);
3760#endif
3615 3761
3762#if EV_CHECK_ENABLE
3616 if (types & EV_CHECK) 3763 if (types & EV_CHECK)
3617 for (i = checkcnt; i--; ) 3764 for (i = checkcnt; i--; )
3618 cb (EV_A_ EV_CHECK, checks [i]); 3765 cb (EV_A_ EV_CHECK, checks [i]);
3766#endif
3619 3767
3768#if EV_SIGNAL_ENABLE
3620 if (types & EV_SIGNAL) 3769 if (types & EV_SIGNAL)
3621 for (i = 0; i < EV_NSIG - 1; ++i) 3770 for (i = 0; i < EV_NSIG - 1; ++i)
3622 for (wl = signals [i].head; wl; ) 3771 for (wl = signals [i].head; wl; )
3623 { 3772 {
3624 wn = wl->next; 3773 wn = wl->next;
3625 cb (EV_A_ EV_SIGNAL, wl); 3774 cb (EV_A_ EV_SIGNAL, wl);
3626 wl = wn; 3775 wl = wn;
3627 } 3776 }
3777#endif
3628 3778
3779#if EV_CHILD_ENABLE
3629 if (types & EV_CHILD) 3780 if (types & EV_CHILD)
3630 for (i = EV_PID_HASHSIZE; i--; ) 3781 for (i = (EV_PID_HASHSIZE); i--; )
3631 for (wl = childs [i]; wl; ) 3782 for (wl = childs [i]; wl; )
3632 { 3783 {
3633 wn = wl->next; 3784 wn = wl->next;
3634 cb (EV_A_ EV_CHILD, wl); 3785 cb (EV_A_ EV_CHILD, wl);
3635 wl = wn; 3786 wl = wn;
3636 } 3787 }
3788#endif
3637/* EV_STAT 0x00001000 /* stat data changed */ 3789/* EV_STAT 0x00001000 /* stat data changed */
3638/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3790/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3639} 3791}
3640#endif 3792#endif
3641 3793
3642#if EV_MULTIPLICITY 3794#if EV_MULTIPLICITY
3643 #include "ev_wrap.h" 3795 #include "ev_wrap.h"
3644#endif 3796#endif
3645 3797
3646#ifdef __cplusplus 3798EV_CPP(})
3647}
3648#endif
3649 3799

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines