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

Comparing libev/ev.c (file contents):
Revision 1.316 by root, Fri Sep 18 21:02:12 2009 UTC vs.
Revision 1.355 by root, Fri Oct 22 10:09:12 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/*
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 459
460#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
461#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
462
456#if __GNUC__ >= 4 463#if __GNUC__ >= 4
457# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
458# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
459#else 466#else
460# define expect(expr,value) (expr) 467# define expect(expr,value) (expr)
466 473
467#define expect_false(expr) expect ((expr) != 0, 0) 474#define expect_false(expr) expect ((expr) != 0, 0)
468#define expect_true(expr) expect ((expr) != 0, 1) 475#define expect_true(expr) expect ((expr) != 0, 1)
469#define inline_size static inline 476#define inline_size static inline
470 477
471#if EV_MINIMAL 478#if EV_FEATURE_CODE
479# define inline_speed static inline
480#else
472# define inline_speed static noinline 481# define inline_speed static noinline
473#else
474# define inline_speed static inline
475#endif 482#endif
476 483
477#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
478 485
479#if EV_MINPRI == EV_MAXPRI 486#if EV_MINPRI == EV_MAXPRI
492#define ev_active(w) ((W)(w))->active 499#define ev_active(w) ((W)(w))->active
493#define ev_at(w) ((WT)(w))->at 500#define ev_at(w) ((WT)(w))->at
494 501
495#if EV_USE_REALTIME 502#if EV_USE_REALTIME
496/* 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 */
497/* giving it a reasonably high chance of working on typical architetcures */ 504/* giving it a reasonably high chance of working on typical architectures */
498static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
499#endif 506#endif
500 507
501#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
502static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
504 511
505#ifndef EV_FD_TO_WIN32_HANDLE 512#ifndef EV_FD_TO_WIN32_HANDLE
506# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 513# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
507#endif 514#endif
508#ifndef EV_WIN32_HANDLE_TO_FD 515#ifndef EV_WIN32_HANDLE_TO_FD
509# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 516# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
510#endif 517#endif
511#ifndef EV_WIN32_CLOSE_FD 518#ifndef EV_WIN32_CLOSE_FD
512# define EV_WIN32_CLOSE_FD(fd) close (fd) 519# define EV_WIN32_CLOSE_FD(fd) close (fd)
513#endif 520#endif
514 521
515#ifdef _WIN32 522#ifdef _WIN32
516# include "ev_win32.c" 523# include "ev_win32.c"
517#endif 524#endif
518 525
519/*****************************************************************************/ 526/*****************************************************************************/
527
528static unsigned int noinline
529ev_linux_version (void)
530{
531#ifdef __linux
532 struct utsname buf;
533 unsigned int v;
534 int i;
535 char *p = buf.release;
536
537 if (uname (&buf))
538 return 0;
539
540 for (i = 3+1; --i; )
541 {
542 unsigned int c = 0;
543
544 for (;;)
545 {
546 if (*p >= '0' && *p <= '9')
547 c = c * 10 + *p++ - '0';
548 else
549 {
550 p += *p == '.';
551 break;
552 }
553 }
554
555 v = (v << 8) | c;
556 }
557
558 return v;
559#else
560 return 0;
561#endif
562}
563
564/*****************************************************************************/
565
566#if EV_AVOID_STDIO
567static void noinline
568ev_printerr (const char *msg)
569{
570 write (STDERR_FILENO, msg, strlen (msg));
571}
572#endif
520 573
521static void (*syserr_cb)(const char *msg); 574static void (*syserr_cb)(const char *msg);
522 575
523void 576void
524ev_set_syserr_cb (void (*cb)(const char *msg)) 577ev_set_syserr_cb (void (*cb)(const char *msg))
534 587
535 if (syserr_cb) 588 if (syserr_cb)
536 syserr_cb (msg); 589 syserr_cb (msg);
537 else 590 else
538 { 591 {
592#if EV_AVOID_STDIO
593 const char *err = strerror (errno);
594
595 ev_printerr (msg);
596 ev_printerr (": ");
597 ev_printerr (err);
598 ev_printerr ("\n");
599#else
539 perror (msg); 600 perror (msg);
601#endif
540 abort (); 602 abort ();
541 } 603 }
542} 604}
543 605
544static void * 606static void *
545ev_realloc_emul (void *ptr, long size) 607ev_realloc_emul (void *ptr, long size)
546{ 608{
609#if __GLIBC__
610 return realloc (ptr, size);
611#else
547 /* some systems, notably openbsd and darwin, fail to properly 612 /* some systems, notably openbsd and darwin, fail to properly
548 * implement realloc (x, 0) (as required by both ansi c-98 and 613 * implement realloc (x, 0) (as required by both ansi c-89 and
549 * the single unix specification, so work around them here. 614 * the single unix specification, so work around them here.
550 */ 615 */
551 616
552 if (size) 617 if (size)
553 return realloc (ptr, size); 618 return realloc (ptr, size);
554 619
555 free (ptr); 620 free (ptr);
556 return 0; 621 return 0;
622#endif
557} 623}
558 624
559static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 625static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
560 626
561void 627void
569{ 635{
570 ptr = alloc (ptr, size); 636 ptr = alloc (ptr, size);
571 637
572 if (!ptr && size) 638 if (!ptr && size)
573 { 639 {
640#if EV_AVOID_STDIO
641 ev_printerr ("libev: memory allocation failed, aborting.\n");
642#else
574 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 643 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
644#endif
575 abort (); 645 abort ();
576 } 646 }
577 647
578 return ptr; 648 return ptr;
579} 649}
661 731
662 static int ev_default_loop_ptr; 732 static int ev_default_loop_ptr;
663 733
664#endif 734#endif
665 735
666#if EV_MINIMAL < 2 736#if EV_FEATURE_API
667# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 737# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
668# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 738# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
669# define EV_INVOKE_PENDING invoke_cb (EV_A) 739# define EV_INVOKE_PENDING invoke_cb (EV_A)
670#else 740#else
671# define EV_RELEASE_CB (void)0 741# define EV_RELEASE_CB (void)0
672# define EV_ACQUIRE_CB (void)0 742# define EV_ACQUIRE_CB (void)0
673# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 743# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
674#endif 744#endif
675 745
676#define EVUNLOOP_RECURSE 0x80 746#define EVBREAK_RECURSE 0x80
677 747
678/*****************************************************************************/ 748/*****************************************************************************/
679 749
680#ifndef EV_HAVE_EV_TIME 750#ifndef EV_HAVE_EV_TIME
681ev_tstamp 751ev_tstamp
725 if (delay > 0.) 795 if (delay > 0.)
726 { 796 {
727#if EV_USE_NANOSLEEP 797#if EV_USE_NANOSLEEP
728 struct timespec ts; 798 struct timespec ts;
729 799
730 ts.tv_sec = (time_t)delay; 800 EV_TS_SET (ts, delay);
731 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
732
733 nanosleep (&ts, 0); 801 nanosleep (&ts, 0);
734#elif defined(_WIN32) 802#elif defined(_WIN32)
735 Sleep ((unsigned long)(delay * 1e3)); 803 Sleep ((unsigned long)(delay * 1e3));
736#else 804#else
737 struct timeval tv; 805 struct timeval tv;
738 806
739 tv.tv_sec = (time_t)delay;
740 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
741
742 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 807 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
743 /* something not guaranteed by newer posix versions, but guaranteed */ 808 /* something not guaranteed by newer posix versions, but guaranteed */
744 /* by older ones */ 809 /* by older ones */
810 EV_TV_SET (tv, delay);
745 select (0, 0, 0, 0, &tv); 811 select (0, 0, 0, 0, &tv);
746#endif 812#endif
747 } 813 }
748} 814}
749 815
750/*****************************************************************************/ 816/*****************************************************************************/
751 817
752#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 818#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
753 819
754/* find a suitable new size for the given array, */ 820/* find a suitable new size for the given array, */
755/* hopefully by rounding to a ncie-to-malloc size */ 821/* hopefully by rounding to a nice-to-malloc size */
756inline_size int 822inline_size int
757array_nextsize (int elem, int cur, int cnt) 823array_nextsize (int elem, int cur, int cnt)
758{ 824{
759 int ncur = cur + 1; 825 int ncur = cur + 1;
760 826
856} 922}
857 923
858/*****************************************************************************/ 924/*****************************************************************************/
859 925
860inline_speed void 926inline_speed void
861fd_event_nc (EV_P_ int fd, int revents) 927fd_event_nocheck (EV_P_ int fd, int revents)
862{ 928{
863 ANFD *anfd = anfds + fd; 929 ANFD *anfd = anfds + fd;
864 ev_io *w; 930 ev_io *w;
865 931
866 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 932 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
878fd_event (EV_P_ int fd, int revents) 944fd_event (EV_P_ int fd, int revents)
879{ 945{
880 ANFD *anfd = anfds + fd; 946 ANFD *anfd = anfds + fd;
881 947
882 if (expect_true (!anfd->reify)) 948 if (expect_true (!anfd->reify))
883 fd_event_nc (EV_A_ fd, revents); 949 fd_event_nocheck (EV_A_ fd, revents);
884} 950}
885 951
886void 952void
887ev_feed_fd_event (EV_P_ int fd, int revents) 953ev_feed_fd_event (EV_P_ int fd, int revents)
888{ 954{
889 if (fd >= 0 && fd < anfdmax) 955 if (fd >= 0 && fd < anfdmax)
890 fd_event_nc (EV_A_ fd, revents); 956 fd_event_nocheck (EV_A_ fd, revents);
891} 957}
892 958
893/* make sure the external fd watch events are in-sync */ 959/* make sure the external fd watch events are in-sync */
894/* with the kernel/libev internal state */ 960/* with the kernel/libev internal state */
895inline_size void 961inline_size void
901 { 967 {
902 int fd = fdchanges [i]; 968 int fd = fdchanges [i];
903 ANFD *anfd = anfds + fd; 969 ANFD *anfd = anfds + fd;
904 ev_io *w; 970 ev_io *w;
905 971
906 unsigned char events = 0; 972 unsigned char o_events = anfd->events;
973 unsigned char o_reify = anfd->reify;
907 974
908 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 975 anfd->reify = 0;
909 events |= (unsigned char)w->events;
910 976
911#if EV_SELECT_IS_WINSOCKET 977#if EV_SELECT_IS_WINSOCKET
912 if (events) 978 if (o_reify & EV__IOFDSET)
913 { 979 {
914 unsigned long arg; 980 unsigned long arg;
915 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 981 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
916 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 982 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
917 } 983 }
918#endif 984#endif
919 985
986 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
920 { 987 {
921 unsigned char o_events = anfd->events;
922 unsigned char o_reify = anfd->reify;
923
924 anfd->reify = 0;
925 anfd->events = events; 988 anfd->events = 0;
926 989
927 if (o_events != events || o_reify & EV__IOFDSET) 990 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
991 anfd->events |= (unsigned char)w->events;
992
993 if (o_events != anfd->events)
994 o_reify = EV__IOFDSET; /* actually |= */
995 }
996
997 if (o_reify & EV__IOFDSET)
928 backend_modify (EV_A_ fd, o_events, events); 998 backend_modify (EV_A_ fd, o_events, anfd->events);
929 }
930 } 999 }
931 1000
932 fdchangecnt = 0; 1001 fdchangecnt = 0;
933} 1002}
934 1003
958 ev_io_stop (EV_A_ w); 1027 ev_io_stop (EV_A_ w);
959 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1028 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
960 } 1029 }
961} 1030}
962 1031
963/* check whether the given fd is atcually valid, for error recovery */ 1032/* check whether the given fd is actually valid, for error recovery */
964inline_size int 1033inline_size int
965fd_valid (int fd) 1034fd_valid (int fd)
966{ 1035{
967#ifdef _WIN32 1036#ifdef _WIN32
968 return _get_osfhandle (fd) != -1; 1037 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
969#else 1038#else
970 return fcntl (fd, F_GETFD) != -1; 1039 return fcntl (fd, F_GETFD) != -1;
971#endif 1040#endif
972} 1041}
973 1042
1010 anfds [fd].emask = 0; 1079 anfds [fd].emask = 0;
1011 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1080 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1012 } 1081 }
1013} 1082}
1014 1083
1084/* used to prepare libev internal fd's */
1085/* this is not fork-safe */
1086inline_speed void
1087fd_intern (int fd)
1088{
1089#ifdef _WIN32
1090 unsigned long arg = 1;
1091 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1092#else
1093 fcntl (fd, F_SETFD, FD_CLOEXEC);
1094 fcntl (fd, F_SETFL, O_NONBLOCK);
1095#endif
1096}
1097
1015/*****************************************************************************/ 1098/*****************************************************************************/
1016 1099
1017/* 1100/*
1018 * the heap functions want a real array index. array index 0 uis guaranteed to not 1101 * the heap functions want a real array index. array index 0 is guaranteed to not
1019 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1102 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1020 * the branching factor of the d-tree. 1103 * the branching factor of the d-tree.
1021 */ 1104 */
1022 1105
1023/* 1106/*
1171 1254
1172static ANSIG signals [EV_NSIG - 1]; 1255static ANSIG signals [EV_NSIG - 1];
1173 1256
1174/*****************************************************************************/ 1257/*****************************************************************************/
1175 1258
1176/* used to prepare libev internal fd's */ 1259#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1177/* this is not fork-safe */
1178inline_speed void
1179fd_intern (int fd)
1180{
1181#ifdef _WIN32
1182 unsigned long arg = 1;
1183 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1184#else
1185 fcntl (fd, F_SETFD, FD_CLOEXEC);
1186 fcntl (fd, F_SETFL, O_NONBLOCK);
1187#endif
1188}
1189 1260
1190static void noinline 1261static void noinline
1191evpipe_init (EV_P) 1262evpipe_init (EV_P)
1192{ 1263{
1193 if (!ev_is_active (&pipe_w)) 1264 if (!ev_is_active (&pipe_w))
1194 { 1265 {
1195#if EV_USE_EVENTFD 1266# if EV_USE_EVENTFD
1196 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1267 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1197 if (evfd < 0 && errno == EINVAL) 1268 if (evfd < 0 && errno == EINVAL)
1198 evfd = eventfd (0, 0); 1269 evfd = eventfd (0, 0);
1199 1270
1200 if (evfd >= 0) 1271 if (evfd >= 0)
1202 evpipe [0] = -1; 1273 evpipe [0] = -1;
1203 fd_intern (evfd); /* doing it twice doesn't hurt */ 1274 fd_intern (evfd); /* doing it twice doesn't hurt */
1204 ev_io_set (&pipe_w, evfd, EV_READ); 1275 ev_io_set (&pipe_w, evfd, EV_READ);
1205 } 1276 }
1206 else 1277 else
1207#endif 1278# endif
1208 { 1279 {
1209 while (pipe (evpipe)) 1280 while (pipe (evpipe))
1210 ev_syserr ("(libev) error creating signal/async pipe"); 1281 ev_syserr ("(libev) error creating signal/async pipe");
1211 1282
1212 fd_intern (evpipe [0]); 1283 fd_intern (evpipe [0]);
1223evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1294evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1224{ 1295{
1225 if (!*flag) 1296 if (!*flag)
1226 { 1297 {
1227 int old_errno = errno; /* save errno because write might clobber it */ 1298 int old_errno = errno; /* save errno because write might clobber it */
1299 char dummy;
1228 1300
1229 *flag = 1; 1301 *flag = 1;
1230 1302
1231#if EV_USE_EVENTFD 1303#if EV_USE_EVENTFD
1232 if (evfd >= 0) 1304 if (evfd >= 0)
1234 uint64_t counter = 1; 1306 uint64_t counter = 1;
1235 write (evfd, &counter, sizeof (uint64_t)); 1307 write (evfd, &counter, sizeof (uint64_t));
1236 } 1308 }
1237 else 1309 else
1238#endif 1310#endif
1311 /* win32 people keep sending patches that change this write() to send() */
1312 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1313 /* so when you think this write should be a send instead, please find out */
1314 /* where your send() is from - it's definitely not the microsoft send, and */
1315 /* tell me. thank you. */
1239 write (evpipe [1], &old_errno, 1); 1316 write (evpipe [1], &dummy, 1);
1240 1317
1241 errno = old_errno; 1318 errno = old_errno;
1242 } 1319 }
1243} 1320}
1244 1321
1257 } 1334 }
1258 else 1335 else
1259#endif 1336#endif
1260 { 1337 {
1261 char dummy; 1338 char dummy;
1339 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1262 read (evpipe [0], &dummy, 1); 1340 read (evpipe [0], &dummy, 1);
1263 } 1341 }
1264 1342
1265 if (sig_pending) 1343 if (sig_pending)
1266 { 1344 {
1293{ 1371{
1294#if EV_MULTIPLICITY 1372#if EV_MULTIPLICITY
1295 EV_P = signals [signum - 1].loop; 1373 EV_P = signals [signum - 1].loop;
1296#endif 1374#endif
1297 1375
1298#if _WIN32 1376#ifdef _WIN32
1299 signal (signum, ev_sighandler); 1377 signal (signum, ev_sighandler);
1300#endif 1378#endif
1301 1379
1302 signals [signum - 1].pending = 1; 1380 signals [signum - 1].pending = 1;
1303 evpipe_write (EV_A_ &sig_pending); 1381 evpipe_write (EV_A_ &sig_pending);
1345 break; 1423 break;
1346 } 1424 }
1347} 1425}
1348#endif 1426#endif
1349 1427
1428#endif
1429
1350/*****************************************************************************/ 1430/*****************************************************************************/
1351 1431
1432#if EV_CHILD_ENABLE
1352static WL childs [EV_PID_HASHSIZE]; 1433static WL childs [EV_PID_HASHSIZE];
1353
1354#ifndef _WIN32
1355 1434
1356static ev_signal childev; 1435static ev_signal childev;
1357 1436
1358#ifndef WIFCONTINUED 1437#ifndef WIFCONTINUED
1359# define WIFCONTINUED(status) 0 1438# define WIFCONTINUED(status) 0
1364child_reap (EV_P_ int chain, int pid, int status) 1443child_reap (EV_P_ int chain, int pid, int status)
1365{ 1444{
1366 ev_child *w; 1445 ev_child *w;
1367 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1446 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1368 1447
1369 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1448 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1370 { 1449 {
1371 if ((w->pid == pid || !w->pid) 1450 if ((w->pid == pid || !w->pid)
1372 && (!traced || (w->flags & 1))) 1451 && (!traced || (w->flags & 1)))
1373 { 1452 {
1374 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1453 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
1399 /* make sure we are called again until all children have been reaped */ 1478 /* make sure we are called again until all children have been reaped */
1400 /* we need to do it this way so that the callback gets called before we continue */ 1479 /* we need to do it this way so that the callback gets called before we continue */
1401 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1480 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1402 1481
1403 child_reap (EV_A_ pid, pid, status); 1482 child_reap (EV_A_ pid, pid, status);
1404 if (EV_PID_HASHSIZE > 1) 1483 if ((EV_PID_HASHSIZE) > 1)
1405 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1484 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1406} 1485}
1407 1486
1408#endif 1487#endif
1409 1488
1476#ifdef __APPLE__ 1555#ifdef __APPLE__
1477 /* only select works correctly on that "unix-certified" platform */ 1556 /* only select works correctly on that "unix-certified" platform */
1478 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1557 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1479 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1558 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1480#endif 1559#endif
1560#ifdef __FreeBSD__
1561 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1562#endif
1481 1563
1482 return flags; 1564 return flags;
1483} 1565}
1484 1566
1485unsigned int 1567unsigned int
1486ev_embeddable_backends (void) 1568ev_embeddable_backends (void)
1487{ 1569{
1488 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1570 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1489 1571
1490 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1572 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1491 /* please fix it and tell me how to detect the fix */ 1573 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1492 flags &= ~EVBACKEND_EPOLL; 1574 flags &= ~EVBACKEND_EPOLL;
1493 1575
1494 return flags; 1576 return flags;
1495} 1577}
1496 1578
1497unsigned int 1579unsigned int
1498ev_backend (EV_P) 1580ev_backend (EV_P)
1499{ 1581{
1500 return backend; 1582 return backend;
1501} 1583}
1502 1584
1503#if EV_MINIMAL < 2 1585#if EV_FEATURE_API
1504unsigned int 1586unsigned int
1505ev_loop_count (EV_P) 1587ev_iteration (EV_P)
1506{ 1588{
1507 return loop_count; 1589 return loop_count;
1508} 1590}
1509 1591
1510unsigned int 1592unsigned int
1511ev_loop_depth (EV_P) 1593ev_depth (EV_P)
1512{ 1594{
1513 return loop_depth; 1595 return loop_depth;
1514} 1596}
1515 1597
1516void 1598void
1588 1670
1589 ev_rt_now = ev_time (); 1671 ev_rt_now = ev_time ();
1590 mn_now = get_clock (); 1672 mn_now = get_clock ();
1591 now_floor = mn_now; 1673 now_floor = mn_now;
1592 rtmn_diff = ev_rt_now - mn_now; 1674 rtmn_diff = ev_rt_now - mn_now;
1593#if EV_MINIMAL < 2 1675#if EV_FEATURE_API
1594 invoke_cb = ev_invoke_pending; 1676 invoke_cb = ev_invoke_pending;
1595#endif 1677#endif
1596 1678
1597 io_blocktime = 0.; 1679 io_blocktime = 0.;
1598 timeout_blocktime = 0.; 1680 timeout_blocktime = 0.;
1604#endif 1686#endif
1605#if EV_USE_INOTIFY 1687#if EV_USE_INOTIFY
1606 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1688 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1607#endif 1689#endif
1608#if EV_USE_SIGNALFD 1690#if EV_USE_SIGNALFD
1609 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1691 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1610#endif 1692#endif
1611 1693
1612 if (!(flags & 0x0000ffffU)) 1694 if (!(flags & 0x0000ffffU))
1613 flags |= ev_recommended_backends (); 1695 flags |= ev_recommended_backends ();
1614 1696
1628 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1710 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1629#endif 1711#endif
1630 1712
1631 ev_prepare_init (&pending_w, pendingcb); 1713 ev_prepare_init (&pending_w, pendingcb);
1632 1714
1715#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1633 ev_init (&pipe_w, pipecb); 1716 ev_init (&pipe_w, pipecb);
1634 ev_set_priority (&pipe_w, EV_MAXPRI); 1717 ev_set_priority (&pipe_w, EV_MAXPRI);
1718#endif
1635 } 1719 }
1636} 1720}
1637 1721
1638/* free up a loop structure */ 1722/* free up a loop structure */
1639static void noinline 1723static void noinline
1658 } 1742 }
1659 } 1743 }
1660 1744
1661#if EV_USE_SIGNALFD 1745#if EV_USE_SIGNALFD
1662 if (ev_is_active (&sigfd_w)) 1746 if (ev_is_active (&sigfd_w))
1663 {
1664 /*ev_ref (EV_A);*/
1665 /*ev_io_stop (EV_A_ &sigfd_w);*/
1666
1667 close (sigfd); 1747 close (sigfd);
1668 }
1669#endif 1748#endif
1670 1749
1671#if EV_USE_INOTIFY 1750#if EV_USE_INOTIFY
1672 if (fs_fd >= 0) 1751 if (fs_fd >= 0)
1673 close (fs_fd); 1752 close (fs_fd);
1762 { 1841 {
1763 EV_WIN32_CLOSE_FD (evpipe [0]); 1842 EV_WIN32_CLOSE_FD (evpipe [0]);
1764 EV_WIN32_CLOSE_FD (evpipe [1]); 1843 EV_WIN32_CLOSE_FD (evpipe [1]);
1765 } 1844 }
1766 1845
1846#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1767 evpipe_init (EV_A); 1847 evpipe_init (EV_A);
1768 /* now iterate over everything, in case we missed something */ 1848 /* now iterate over everything, in case we missed something */
1769 pipecb (EV_A_ &pipe_w, EV_READ); 1849 pipecb (EV_A_ &pipe_w, EV_READ);
1850#endif
1770 } 1851 }
1771 1852
1772 postfork = 0; 1853 postfork = 0;
1773} 1854}
1774 1855
1836 verify_watcher (EV_A_ ws [cnt]); 1917 verify_watcher (EV_A_ ws [cnt]);
1837 } 1918 }
1838} 1919}
1839#endif 1920#endif
1840 1921
1841#if EV_MINIMAL < 2 1922#if EV_FEATURE_API
1842void 1923void
1843ev_loop_verify (EV_P) 1924ev_verify (EV_P)
1844{ 1925{
1845#if EV_VERIFY 1926#if EV_VERIFY
1846 int i; 1927 int i;
1847 WL w; 1928 WL w;
1848 1929
1887#if EV_ASYNC_ENABLE 1968#if EV_ASYNC_ENABLE
1888 assert (asyncmax >= asynccnt); 1969 assert (asyncmax >= asynccnt);
1889 array_verify (EV_A_ (W *)asyncs, asynccnt); 1970 array_verify (EV_A_ (W *)asyncs, asynccnt);
1890#endif 1971#endif
1891 1972
1973#if EV_PREPARE_ENABLE
1892 assert (preparemax >= preparecnt); 1974 assert (preparemax >= preparecnt);
1893 array_verify (EV_A_ (W *)prepares, preparecnt); 1975 array_verify (EV_A_ (W *)prepares, preparecnt);
1976#endif
1894 1977
1978#if EV_CHECK_ENABLE
1895 assert (checkmax >= checkcnt); 1979 assert (checkmax >= checkcnt);
1896 array_verify (EV_A_ (W *)checks, checkcnt); 1980 array_verify (EV_A_ (W *)checks, checkcnt);
1981#endif
1897 1982
1898# if 0 1983# if 0
1984#if EV_CHILD_ENABLE
1899 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1985 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1900 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1986 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1987#endif
1901# endif 1988# endif
1902#endif 1989#endif
1903} 1990}
1904#endif 1991#endif
1905 1992
1921 2008
1922 loop_init (EV_A_ flags); 2009 loop_init (EV_A_ flags);
1923 2010
1924 if (ev_backend (EV_A)) 2011 if (ev_backend (EV_A))
1925 { 2012 {
1926#ifndef _WIN32 2013#if EV_CHILD_ENABLE
1927 ev_signal_init (&childev, childcb, SIGCHLD); 2014 ev_signal_init (&childev, childcb, SIGCHLD);
1928 ev_set_priority (&childev, EV_MAXPRI); 2015 ev_set_priority (&childev, EV_MAXPRI);
1929 ev_signal_start (EV_A_ &childev); 2016 ev_signal_start (EV_A_ &childev);
1930 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2017 ev_unref (EV_A); /* child watcher should not keep loop alive */
1931#endif 2018#endif
1944 EV_P = ev_default_loop_ptr; 2031 EV_P = ev_default_loop_ptr;
1945#endif 2032#endif
1946 2033
1947 ev_default_loop_ptr = 0; 2034 ev_default_loop_ptr = 0;
1948 2035
1949#ifndef _WIN32 2036#if EV_CHILD_ENABLE
1950 ev_ref (EV_A); /* child watcher */ 2037 ev_ref (EV_A); /* child watcher */
1951 ev_signal_stop (EV_A_ &childev); 2038 ev_signal_stop (EV_A_ &childev);
1952#endif 2039#endif
1953 2040
1954 loop_destroy (EV_A); 2041 loop_destroy (EV_A);
2060 EV_FREQUENT_CHECK; 2147 EV_FREQUENT_CHECK;
2061 feed_reverse (EV_A_ (W)w); 2148 feed_reverse (EV_A_ (W)w);
2062 } 2149 }
2063 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2150 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2064 2151
2065 feed_reverse_done (EV_A_ EV_TIMEOUT); 2152 feed_reverse_done (EV_A_ EV_TIMER);
2066 } 2153 }
2067} 2154}
2068 2155
2069#if EV_PERIODIC_ENABLE 2156#if EV_PERIODIC_ENABLE
2070/* make periodics pending */ 2157/* make periodics pending */
2123 feed_reverse_done (EV_A_ EV_PERIODIC); 2210 feed_reverse_done (EV_A_ EV_PERIODIC);
2124 } 2211 }
2125} 2212}
2126 2213
2127/* simply recalculate all periodics */ 2214/* simply recalculate all periodics */
2128/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2215/* TODO: maybe ensure that at least one event happens when jumping forward? */
2129static void noinline 2216static void noinline
2130periodics_reschedule (EV_P) 2217periodics_reschedule (EV_P)
2131{ 2218{
2132 int i; 2219 int i;
2133 2220
2161 ANHE_at_cache (*he); 2248 ANHE_at_cache (*he);
2162 } 2249 }
2163} 2250}
2164 2251
2165/* fetch new monotonic and realtime times from the kernel */ 2252/* fetch new monotonic and realtime times from the kernel */
2166/* also detetc if there was a timejump, and act accordingly */ 2253/* also detect if there was a timejump, and act accordingly */
2167inline_speed void 2254inline_speed void
2168time_update (EV_P_ ev_tstamp max_block) 2255time_update (EV_P_ ev_tstamp max_block)
2169{ 2256{
2170#if EV_USE_MONOTONIC 2257#if EV_USE_MONOTONIC
2171 if (expect_true (have_monotonic)) 2258 if (expect_true (have_monotonic))
2229 mn_now = ev_rt_now; 2316 mn_now = ev_rt_now;
2230 } 2317 }
2231} 2318}
2232 2319
2233void 2320void
2234ev_loop (EV_P_ int flags) 2321ev_run (EV_P_ int flags)
2235{ 2322{
2236#if EV_MINIMAL < 2 2323#if EV_FEATURE_API
2237 ++loop_depth; 2324 ++loop_depth;
2238#endif 2325#endif
2239 2326
2240 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2327 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2241 2328
2242 loop_done = EVUNLOOP_CANCEL; 2329 loop_done = EVBREAK_CANCEL;
2243 2330
2244 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2331 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2245 2332
2246 do 2333 do
2247 { 2334 {
2248#if EV_VERIFY >= 2 2335#if EV_VERIFY >= 2
2249 ev_loop_verify (EV_A); 2336 ev_verify (EV_A);
2250#endif 2337#endif
2251 2338
2252#ifndef _WIN32 2339#ifndef _WIN32
2253 if (expect_false (curpid)) /* penalise the forking check even more */ 2340 if (expect_false (curpid)) /* penalise the forking check even more */
2254 if (expect_false (getpid () != curpid)) 2341 if (expect_false (getpid () != curpid))
2266 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2353 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2267 EV_INVOKE_PENDING; 2354 EV_INVOKE_PENDING;
2268 } 2355 }
2269#endif 2356#endif
2270 2357
2358#if EV_PREPARE_ENABLE
2271 /* queue prepare watchers (and execute them) */ 2359 /* queue prepare watchers (and execute them) */
2272 if (expect_false (preparecnt)) 2360 if (expect_false (preparecnt))
2273 { 2361 {
2274 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2362 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2275 EV_INVOKE_PENDING; 2363 EV_INVOKE_PENDING;
2276 } 2364 }
2365#endif
2277 2366
2278 if (expect_false (loop_done)) 2367 if (expect_false (loop_done))
2279 break; 2368 break;
2280 2369
2281 /* we might have forked, so reify kernel state if necessary */ 2370 /* we might have forked, so reify kernel state if necessary */
2288 /* calculate blocking time */ 2377 /* calculate blocking time */
2289 { 2378 {
2290 ev_tstamp waittime = 0.; 2379 ev_tstamp waittime = 0.;
2291 ev_tstamp sleeptime = 0.; 2380 ev_tstamp sleeptime = 0.;
2292 2381
2382 /* remember old timestamp for io_blocktime calculation */
2383 ev_tstamp prev_mn_now = mn_now;
2384
2385 /* update time to cancel out callback processing overhead */
2386 time_update (EV_A_ 1e100);
2387
2293 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2388 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2294 { 2389 {
2295 /* remember old timestamp for io_blocktime calculation */
2296 ev_tstamp prev_mn_now = mn_now;
2297
2298 /* update time to cancel out callback processing overhead */
2299 time_update (EV_A_ 1e100);
2300
2301 waittime = MAX_BLOCKTIME; 2390 waittime = MAX_BLOCKTIME;
2302 2391
2303 if (timercnt) 2392 if (timercnt)
2304 { 2393 {
2305 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2394 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2332 waittime -= sleeptime; 2421 waittime -= sleeptime;
2333 } 2422 }
2334 } 2423 }
2335 } 2424 }
2336 2425
2337#if EV_MINIMAL < 2 2426#if EV_FEATURE_API
2338 ++loop_count; 2427 ++loop_count;
2339#endif 2428#endif
2340 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2429 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2341 backend_poll (EV_A_ waittime); 2430 backend_poll (EV_A_ waittime);
2342 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2431 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2343 2432
2344 /* update ev_rt_now, do magic */ 2433 /* update ev_rt_now, do magic */
2345 time_update (EV_A_ waittime + sleeptime); 2434 time_update (EV_A_ waittime + sleeptime);
2346 } 2435 }
2347 2436
2354#if EV_IDLE_ENABLE 2443#if EV_IDLE_ENABLE
2355 /* queue idle watchers unless other events are pending */ 2444 /* queue idle watchers unless other events are pending */
2356 idle_reify (EV_A); 2445 idle_reify (EV_A);
2357#endif 2446#endif
2358 2447
2448#if EV_CHECK_ENABLE
2359 /* queue check watchers, to be executed first */ 2449 /* queue check watchers, to be executed first */
2360 if (expect_false (checkcnt)) 2450 if (expect_false (checkcnt))
2361 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2451 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2452#endif
2362 2453
2363 EV_INVOKE_PENDING; 2454 EV_INVOKE_PENDING;
2364 } 2455 }
2365 while (expect_true ( 2456 while (expect_true (
2366 activecnt 2457 activecnt
2367 && !loop_done 2458 && !loop_done
2368 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2459 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2369 )); 2460 ));
2370 2461
2371 if (loop_done == EVUNLOOP_ONE) 2462 if (loop_done == EVBREAK_ONE)
2372 loop_done = EVUNLOOP_CANCEL; 2463 loop_done = EVBREAK_CANCEL;
2373 2464
2374#if EV_MINIMAL < 2 2465#if EV_FEATURE_API
2375 --loop_depth; 2466 --loop_depth;
2376#endif 2467#endif
2377} 2468}
2378 2469
2379void 2470void
2380ev_unloop (EV_P_ int how) 2471ev_break (EV_P_ int how)
2381{ 2472{
2382 loop_done = how; 2473 loop_done = how;
2383} 2474}
2384 2475
2385void 2476void
2505 2596
2506 if (expect_false (ev_is_active (w))) 2597 if (expect_false (ev_is_active (w)))
2507 return; 2598 return;
2508 2599
2509 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2600 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2510 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2601 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2511 2602
2512 EV_FREQUENT_CHECK; 2603 EV_FREQUENT_CHECK;
2513 2604
2514 ev_start (EV_A_ (W)w, 1); 2605 ev_start (EV_A_ (W)w, 1);
2515 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2606 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2533 EV_FREQUENT_CHECK; 2624 EV_FREQUENT_CHECK;
2534 2625
2535 wlist_del (&anfds[w->fd].head, (WL)w); 2626 wlist_del (&anfds[w->fd].head, (WL)w);
2536 ev_stop (EV_A_ (W)w); 2627 ev_stop (EV_A_ (W)w);
2537 2628
2538 fd_change (EV_A_ w->fd, 1); 2629 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2539 2630
2540 EV_FREQUENT_CHECK; 2631 EV_FREQUENT_CHECK;
2541} 2632}
2542 2633
2543void noinline 2634void noinline
2585 timers [active] = timers [timercnt + HEAP0]; 2676 timers [active] = timers [timercnt + HEAP0];
2586 adjustheap (timers, timercnt, active); 2677 adjustheap (timers, timercnt, active);
2587 } 2678 }
2588 } 2679 }
2589 2680
2590 EV_FREQUENT_CHECK;
2591
2592 ev_at (w) -= mn_now; 2681 ev_at (w) -= mn_now;
2593 2682
2594 ev_stop (EV_A_ (W)w); 2683 ev_stop (EV_A_ (W)w);
2684
2685 EV_FREQUENT_CHECK;
2595} 2686}
2596 2687
2597void noinline 2688void noinline
2598ev_timer_again (EV_P_ ev_timer *w) 2689ev_timer_again (EV_P_ ev_timer *w)
2599{ 2690{
2678 periodics [active] = periodics [periodiccnt + HEAP0]; 2769 periodics [active] = periodics [periodiccnt + HEAP0];
2679 adjustheap (periodics, periodiccnt, active); 2770 adjustheap (periodics, periodiccnt, active);
2680 } 2771 }
2681 } 2772 }
2682 2773
2683 EV_FREQUENT_CHECK;
2684
2685 ev_stop (EV_A_ (W)w); 2774 ev_stop (EV_A_ (W)w);
2775
2776 EV_FREQUENT_CHECK;
2686} 2777}
2687 2778
2688void noinline 2779void noinline
2689ev_periodic_again (EV_P_ ev_periodic *w) 2780ev_periodic_again (EV_P_ ev_periodic *w)
2690{ 2781{
2695#endif 2786#endif
2696 2787
2697#ifndef SA_RESTART 2788#ifndef SA_RESTART
2698# define SA_RESTART 0 2789# define SA_RESTART 0
2699#endif 2790#endif
2791
2792#if EV_SIGNAL_ENABLE
2700 2793
2701void noinline 2794void noinline
2702ev_signal_start (EV_P_ ev_signal *w) 2795ev_signal_start (EV_P_ ev_signal *w)
2703{ 2796{
2704 if (expect_false (ev_is_active (w))) 2797 if (expect_false (ev_is_active (w)))
2751 if (!((WL)w)->next) 2844 if (!((WL)w)->next)
2752# if EV_USE_SIGNALFD 2845# if EV_USE_SIGNALFD
2753 if (sigfd < 0) /*TODO*/ 2846 if (sigfd < 0) /*TODO*/
2754# endif 2847# endif
2755 { 2848 {
2756# if _WIN32 2849# ifdef _WIN32
2850 evpipe_init (EV_A);
2851
2757 signal (w->signum, ev_sighandler); 2852 signal (w->signum, ev_sighandler);
2758# else 2853# else
2759 struct sigaction sa; 2854 struct sigaction sa;
2760 2855
2761 evpipe_init (EV_A); 2856 evpipe_init (EV_A);
2792 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2887 signals [w->signum - 1].loop = 0; /* unattach from signal */
2793#endif 2888#endif
2794#if EV_USE_SIGNALFD 2889#if EV_USE_SIGNALFD
2795 if (sigfd >= 0) 2890 if (sigfd >= 0)
2796 { 2891 {
2797 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2892 sigset_t ss;
2893
2894 sigemptyset (&ss);
2895 sigaddset (&ss, w->signum);
2798 sigdelset (&sigfd_set, w->signum); 2896 sigdelset (&sigfd_set, w->signum);
2897
2799 signalfd (sigfd, &sigfd_set, 0); 2898 signalfd (sigfd, &sigfd_set, 0);
2800 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2899 sigprocmask (SIG_UNBLOCK, &ss, 0);
2801 /*TODO: maybe unblock signal? */
2802 } 2900 }
2803 else 2901 else
2804#endif 2902#endif
2805 signal (w->signum, SIG_DFL); 2903 signal (w->signum, SIG_DFL);
2806 } 2904 }
2807 2905
2808 EV_FREQUENT_CHECK; 2906 EV_FREQUENT_CHECK;
2809} 2907}
2810 2908
2909#endif
2910
2911#if EV_CHILD_ENABLE
2912
2811void 2913void
2812ev_child_start (EV_P_ ev_child *w) 2914ev_child_start (EV_P_ ev_child *w)
2813{ 2915{
2814#if EV_MULTIPLICITY 2916#if EV_MULTIPLICITY
2815 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2917 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2818 return; 2920 return;
2819 2921
2820 EV_FREQUENT_CHECK; 2922 EV_FREQUENT_CHECK;
2821 2923
2822 ev_start (EV_A_ (W)w, 1); 2924 ev_start (EV_A_ (W)w, 1);
2823 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2925 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2824 2926
2825 EV_FREQUENT_CHECK; 2927 EV_FREQUENT_CHECK;
2826} 2928}
2827 2929
2828void 2930void
2832 if (expect_false (!ev_is_active (w))) 2934 if (expect_false (!ev_is_active (w)))
2833 return; 2935 return;
2834 2936
2835 EV_FREQUENT_CHECK; 2937 EV_FREQUENT_CHECK;
2836 2938
2837 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2939 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2838 ev_stop (EV_A_ (W)w); 2940 ev_stop (EV_A_ (W)w);
2839 2941
2840 EV_FREQUENT_CHECK; 2942 EV_FREQUENT_CHECK;
2841} 2943}
2944
2945#endif
2842 2946
2843#if EV_STAT_ENABLE 2947#if EV_STAT_ENABLE
2844 2948
2845# ifdef _WIN32 2949# ifdef _WIN32
2846# undef lstat 2950# undef lstat
2852#define MIN_STAT_INTERVAL 0.1074891 2956#define MIN_STAT_INTERVAL 0.1074891
2853 2957
2854static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2958static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2855 2959
2856#if EV_USE_INOTIFY 2960#if EV_USE_INOTIFY
2857# define EV_INOTIFY_BUFSIZE 8192 2961
2962/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2963# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2858 2964
2859static void noinline 2965static void noinline
2860infy_add (EV_P_ ev_stat *w) 2966infy_add (EV_P_ ev_stat *w)
2861{ 2967{
2862 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); 2968 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);
2863 2969
2864 if (w->wd < 0) 2970 if (w->wd >= 0)
2971 {
2972 struct statfs sfs;
2973
2974 /* now local changes will be tracked by inotify, but remote changes won't */
2975 /* unless the filesystem is known to be local, we therefore still poll */
2976 /* also do poll on <2.6.25, but with normal frequency */
2977
2978 if (!fs_2625)
2979 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2980 else if (!statfs (w->path, &sfs)
2981 && (sfs.f_type == 0x1373 /* devfs */
2982 || sfs.f_type == 0xEF53 /* ext2/3 */
2983 || sfs.f_type == 0x3153464a /* jfs */
2984 || sfs.f_type == 0x52654973 /* reiser3 */
2985 || sfs.f_type == 0x01021994 /* tempfs */
2986 || sfs.f_type == 0x58465342 /* xfs */))
2987 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2988 else
2989 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2865 { 2990 }
2991 else
2992 {
2993 /* can't use inotify, continue to stat */
2866 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2994 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2867 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2868 2995
2869 /* monitor some parent directory for speedup hints */ 2996 /* if path is not there, monitor some parent directory for speedup hints */
2870 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2997 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2871 /* but an efficiency issue only */ 2998 /* but an efficiency issue only */
2872 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2999 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2873 { 3000 {
2874 char path [4096]; 3001 char path [4096];
2890 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3017 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2891 } 3018 }
2892 } 3019 }
2893 3020
2894 if (w->wd >= 0) 3021 if (w->wd >= 0)
2895 {
2896 struct statfs sfs;
2897
2898 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3022 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2899 3023
2900 /* now local changes will be tracked by inotify, but remote changes won't */ 3024 /* now re-arm timer, if required */
2901 /* unless the filesystem it known to be local, we therefore still poll */ 3025 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2902 /* also do poll on <2.6.25, but with normal frequency */
2903
2904 if (fs_2625 && !statfs (w->path, &sfs))
2905 if (sfs.f_type == 0x1373 /* devfs */
2906 || sfs.f_type == 0xEF53 /* ext2/3 */
2907 || sfs.f_type == 0x3153464a /* jfs */
2908 || sfs.f_type == 0x52654973 /* reiser3 */
2909 || sfs.f_type == 0x01021994 /* tempfs */
2910 || sfs.f_type == 0x58465342 /* xfs */)
2911 return;
2912
2913 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2914 ev_timer_again (EV_A_ &w->timer); 3026 ev_timer_again (EV_A_ &w->timer);
2915 } 3027 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2916} 3028}
2917 3029
2918static void noinline 3030static void noinline
2919infy_del (EV_P_ ev_stat *w) 3031infy_del (EV_P_ ev_stat *w)
2920{ 3032{
2923 3035
2924 if (wd < 0) 3036 if (wd < 0)
2925 return; 3037 return;
2926 3038
2927 w->wd = -2; 3039 w->wd = -2;
2928 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3040 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2929 wlist_del (&fs_hash [slot].head, (WL)w); 3041 wlist_del (&fs_hash [slot].head, (WL)w);
2930 3042
2931 /* remove this watcher, if others are watching it, they will rearm */ 3043 /* remove this watcher, if others are watching it, they will rearm */
2932 inotify_rm_watch (fs_fd, wd); 3044 inotify_rm_watch (fs_fd, wd);
2933} 3045}
2935static void noinline 3047static void noinline
2936infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3048infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2937{ 3049{
2938 if (slot < 0) 3050 if (slot < 0)
2939 /* overflow, need to check for all hash slots */ 3051 /* overflow, need to check for all hash slots */
2940 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3052 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2941 infy_wd (EV_A_ slot, wd, ev); 3053 infy_wd (EV_A_ slot, wd, ev);
2942 else 3054 else
2943 { 3055 {
2944 WL w_; 3056 WL w_;
2945 3057
2946 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3058 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2947 { 3059 {
2948 ev_stat *w = (ev_stat *)w_; 3060 ev_stat *w = (ev_stat *)w_;
2949 w_ = w_->next; /* lets us remove this watcher and all before it */ 3061 w_ = w_->next; /* lets us remove this watcher and all before it */
2950 3062
2951 if (w->wd == wd || wd == -1) 3063 if (w->wd == wd || wd == -1)
2952 { 3064 {
2953 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3065 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2954 { 3066 {
2955 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3067 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2956 w->wd = -1; 3068 w->wd = -1;
2957 infy_add (EV_A_ w); /* re-add, no matter what */ 3069 infy_add (EV_A_ w); /* re-add, no matter what */
2958 } 3070 }
2959 3071
2960 stat_timer_cb (EV_A_ &w->timer, 0); 3072 stat_timer_cb (EV_A_ &w->timer, 0);
2965 3077
2966static void 3078static void
2967infy_cb (EV_P_ ev_io *w, int revents) 3079infy_cb (EV_P_ ev_io *w, int revents)
2968{ 3080{
2969 char buf [EV_INOTIFY_BUFSIZE]; 3081 char buf [EV_INOTIFY_BUFSIZE];
2970 struct inotify_event *ev = (struct inotify_event *)buf;
2971 int ofs; 3082 int ofs;
2972 int len = read (fs_fd, buf, sizeof (buf)); 3083 int len = read (fs_fd, buf, sizeof (buf));
2973 3084
2974 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3085 for (ofs = 0; ofs < len; )
3086 {
3087 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2975 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3088 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3089 ofs += sizeof (struct inotify_event) + ev->len;
3090 }
2976} 3091}
2977 3092
2978inline_size void 3093inline_size void
2979check_2625 (EV_P) 3094ev_check_2625 (EV_P)
2980{ 3095{
2981 /* kernels < 2.6.25 are borked 3096 /* kernels < 2.6.25 are borked
2982 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3097 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2983 */ 3098 */
2984 struct utsname buf; 3099 if (ev_linux_version () < 0x020619)
2985 int major, minor, micro;
2986
2987 if (uname (&buf))
2988 return;
2989
2990 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2991 return;
2992
2993 if (major < 2
2994 || (major == 2 && minor < 6)
2995 || (major == 2 && minor == 6 && micro < 25))
2996 return; 3100 return;
2997 3101
2998 fs_2625 = 1; 3102 fs_2625 = 1;
2999} 3103}
3000 3104
3015 if (fs_fd != -2) 3119 if (fs_fd != -2)
3016 return; 3120 return;
3017 3121
3018 fs_fd = -1; 3122 fs_fd = -1;
3019 3123
3020 check_2625 (EV_A); 3124 ev_check_2625 (EV_A);
3021 3125
3022 fs_fd = infy_newfd (); 3126 fs_fd = infy_newfd ();
3023 3127
3024 if (fs_fd >= 0) 3128 if (fs_fd >= 0)
3025 { 3129 {
3026 fd_intern (fs_fd); 3130 fd_intern (fs_fd);
3027 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3131 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
3028 ev_set_priority (&fs_w, EV_MAXPRI); 3132 ev_set_priority (&fs_w, EV_MAXPRI);
3029 ev_io_start (EV_A_ &fs_w); 3133 ev_io_start (EV_A_ &fs_w);
3134 ev_unref (EV_A);
3030 } 3135 }
3031} 3136}
3032 3137
3033inline_size void 3138inline_size void
3034infy_fork (EV_P) 3139infy_fork (EV_P)
3036 int slot; 3141 int slot;
3037 3142
3038 if (fs_fd < 0) 3143 if (fs_fd < 0)
3039 return; 3144 return;
3040 3145
3146 ev_ref (EV_A);
3041 ev_io_stop (EV_A_ &fs_w); 3147 ev_io_stop (EV_A_ &fs_w);
3042 close (fs_fd); 3148 close (fs_fd);
3043 fs_fd = infy_newfd (); 3149 fs_fd = infy_newfd ();
3044 3150
3045 if (fs_fd >= 0) 3151 if (fs_fd >= 0)
3046 { 3152 {
3047 fd_intern (fs_fd); 3153 fd_intern (fs_fd);
3048 ev_io_set (&fs_w, fs_fd, EV_READ); 3154 ev_io_set (&fs_w, fs_fd, EV_READ);
3049 ev_io_start (EV_A_ &fs_w); 3155 ev_io_start (EV_A_ &fs_w);
3156 ev_unref (EV_A);
3050 } 3157 }
3051 3158
3052 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3159 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3053 { 3160 {
3054 WL w_ = fs_hash [slot].head; 3161 WL w_ = fs_hash [slot].head;
3055 fs_hash [slot].head = 0; 3162 fs_hash [slot].head = 0;
3056 3163
3057 while (w_) 3164 while (w_)
3062 w->wd = -1; 3169 w->wd = -1;
3063 3170
3064 if (fs_fd >= 0) 3171 if (fs_fd >= 0)
3065 infy_add (EV_A_ w); /* re-add, no matter what */ 3172 infy_add (EV_A_ w); /* re-add, no matter what */
3066 else 3173 else
3174 {
3175 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3176 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3067 ev_timer_again (EV_A_ &w->timer); 3177 ev_timer_again (EV_A_ &w->timer);
3178 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3179 }
3068 } 3180 }
3069 } 3181 }
3070} 3182}
3071 3183
3072#endif 3184#endif
3089static void noinline 3201static void noinline
3090stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3202stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3091{ 3203{
3092 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3204 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3093 3205
3094 /* we copy this here each the time so that */ 3206 ev_statdata prev = w->attr;
3095 /* prev has the old value when the callback gets invoked */
3096 w->prev = w->attr;
3097 ev_stat_stat (EV_A_ w); 3207 ev_stat_stat (EV_A_ w);
3098 3208
3099 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3209 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3100 if ( 3210 if (
3101 w->prev.st_dev != w->attr.st_dev 3211 prev.st_dev != w->attr.st_dev
3102 || w->prev.st_ino != w->attr.st_ino 3212 || prev.st_ino != w->attr.st_ino
3103 || w->prev.st_mode != w->attr.st_mode 3213 || prev.st_mode != w->attr.st_mode
3104 || w->prev.st_nlink != w->attr.st_nlink 3214 || prev.st_nlink != w->attr.st_nlink
3105 || w->prev.st_uid != w->attr.st_uid 3215 || prev.st_uid != w->attr.st_uid
3106 || w->prev.st_gid != w->attr.st_gid 3216 || prev.st_gid != w->attr.st_gid
3107 || w->prev.st_rdev != w->attr.st_rdev 3217 || prev.st_rdev != w->attr.st_rdev
3108 || w->prev.st_size != w->attr.st_size 3218 || prev.st_size != w->attr.st_size
3109 || w->prev.st_atime != w->attr.st_atime 3219 || prev.st_atime != w->attr.st_atime
3110 || w->prev.st_mtime != w->attr.st_mtime 3220 || prev.st_mtime != w->attr.st_mtime
3111 || w->prev.st_ctime != w->attr.st_ctime 3221 || prev.st_ctime != w->attr.st_ctime
3112 ) { 3222 ) {
3223 /* we only update w->prev on actual differences */
3224 /* in case we test more often than invoke the callback, */
3225 /* to ensure that prev is always different to attr */
3226 w->prev = prev;
3227
3113 #if EV_USE_INOTIFY 3228 #if EV_USE_INOTIFY
3114 if (fs_fd >= 0) 3229 if (fs_fd >= 0)
3115 { 3230 {
3116 infy_del (EV_A_ w); 3231 infy_del (EV_A_ w);
3117 infy_add (EV_A_ w); 3232 infy_add (EV_A_ w);
3142 3257
3143 if (fs_fd >= 0) 3258 if (fs_fd >= 0)
3144 infy_add (EV_A_ w); 3259 infy_add (EV_A_ w);
3145 else 3260 else
3146#endif 3261#endif
3262 {
3147 ev_timer_again (EV_A_ &w->timer); 3263 ev_timer_again (EV_A_ &w->timer);
3264 ev_unref (EV_A);
3265 }
3148 3266
3149 ev_start (EV_A_ (W)w, 1); 3267 ev_start (EV_A_ (W)w, 1);
3150 3268
3151 EV_FREQUENT_CHECK; 3269 EV_FREQUENT_CHECK;
3152} 3270}
3161 EV_FREQUENT_CHECK; 3279 EV_FREQUENT_CHECK;
3162 3280
3163#if EV_USE_INOTIFY 3281#if EV_USE_INOTIFY
3164 infy_del (EV_A_ w); 3282 infy_del (EV_A_ w);
3165#endif 3283#endif
3284
3285 if (ev_is_active (&w->timer))
3286 {
3287 ev_ref (EV_A);
3166 ev_timer_stop (EV_A_ &w->timer); 3288 ev_timer_stop (EV_A_ &w->timer);
3289 }
3167 3290
3168 ev_stop (EV_A_ (W)w); 3291 ev_stop (EV_A_ (W)w);
3169 3292
3170 EV_FREQUENT_CHECK; 3293 EV_FREQUENT_CHECK;
3171} 3294}
3216 3339
3217 EV_FREQUENT_CHECK; 3340 EV_FREQUENT_CHECK;
3218} 3341}
3219#endif 3342#endif
3220 3343
3344#if EV_PREPARE_ENABLE
3221void 3345void
3222ev_prepare_start (EV_P_ ev_prepare *w) 3346ev_prepare_start (EV_P_ ev_prepare *w)
3223{ 3347{
3224 if (expect_false (ev_is_active (w))) 3348 if (expect_false (ev_is_active (w)))
3225 return; 3349 return;
3251 3375
3252 ev_stop (EV_A_ (W)w); 3376 ev_stop (EV_A_ (W)w);
3253 3377
3254 EV_FREQUENT_CHECK; 3378 EV_FREQUENT_CHECK;
3255} 3379}
3380#endif
3256 3381
3382#if EV_CHECK_ENABLE
3257void 3383void
3258ev_check_start (EV_P_ ev_check *w) 3384ev_check_start (EV_P_ ev_check *w)
3259{ 3385{
3260 if (expect_false (ev_is_active (w))) 3386 if (expect_false (ev_is_active (w)))
3261 return; 3387 return;
3287 3413
3288 ev_stop (EV_A_ (W)w); 3414 ev_stop (EV_A_ (W)w);
3289 3415
3290 EV_FREQUENT_CHECK; 3416 EV_FREQUENT_CHECK;
3291} 3417}
3418#endif
3292 3419
3293#if EV_EMBED_ENABLE 3420#if EV_EMBED_ENABLE
3294void noinline 3421void noinline
3295ev_embed_sweep (EV_P_ ev_embed *w) 3422ev_embed_sweep (EV_P_ ev_embed *w)
3296{ 3423{
3297 ev_loop (w->other, EVLOOP_NONBLOCK); 3424 ev_run (w->other, EVRUN_NOWAIT);
3298} 3425}
3299 3426
3300static void 3427static void
3301embed_io_cb (EV_P_ ev_io *io, int revents) 3428embed_io_cb (EV_P_ ev_io *io, int revents)
3302{ 3429{
3303 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3430 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3304 3431
3305 if (ev_cb (w)) 3432 if (ev_cb (w))
3306 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3433 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3307 else 3434 else
3308 ev_loop (w->other, EVLOOP_NONBLOCK); 3435 ev_run (w->other, EVRUN_NOWAIT);
3309} 3436}
3310 3437
3311static void 3438static void
3312embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3439embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3313{ 3440{
3317 EV_P = w->other; 3444 EV_P = w->other;
3318 3445
3319 while (fdchangecnt) 3446 while (fdchangecnt)
3320 { 3447 {
3321 fd_reify (EV_A); 3448 fd_reify (EV_A);
3322 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3449 ev_run (EV_A_ EVRUN_NOWAIT);
3323 } 3450 }
3324 } 3451 }
3325} 3452}
3326 3453
3327static void 3454static void
3333 3460
3334 { 3461 {
3335 EV_P = w->other; 3462 EV_P = w->other;
3336 3463
3337 ev_loop_fork (EV_A); 3464 ev_loop_fork (EV_A);
3338 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3465 ev_run (EV_A_ EVRUN_NOWAIT);
3339 } 3466 }
3340 3467
3341 ev_embed_start (EV_A_ w); 3468 ev_embed_start (EV_A_ w);
3342} 3469}
3343 3470
3391 3518
3392 ev_io_stop (EV_A_ &w->io); 3519 ev_io_stop (EV_A_ &w->io);
3393 ev_prepare_stop (EV_A_ &w->prepare); 3520 ev_prepare_stop (EV_A_ &w->prepare);
3394 ev_fork_stop (EV_A_ &w->fork); 3521 ev_fork_stop (EV_A_ &w->fork);
3395 3522
3523 ev_stop (EV_A_ (W)w);
3524
3396 EV_FREQUENT_CHECK; 3525 EV_FREQUENT_CHECK;
3397} 3526}
3398#endif 3527#endif
3399 3528
3400#if EV_FORK_ENABLE 3529#if EV_FORK_ENABLE
3439void 3568void
3440ev_async_start (EV_P_ ev_async *w) 3569ev_async_start (EV_P_ ev_async *w)
3441{ 3570{
3442 if (expect_false (ev_is_active (w))) 3571 if (expect_false (ev_is_active (w)))
3443 return; 3572 return;
3573
3574 w->sent = 0;
3444 3575
3445 evpipe_init (EV_A); 3576 evpipe_init (EV_A);
3446 3577
3447 EV_FREQUENT_CHECK; 3578 EV_FREQUENT_CHECK;
3448 3579
3526{ 3657{
3527 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3658 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3528 3659
3529 if (expect_false (!once)) 3660 if (expect_false (!once))
3530 { 3661 {
3531 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3662 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3532 return; 3663 return;
3533 } 3664 }
3534 3665
3535 once->cb = cb; 3666 once->cb = cb;
3536 once->arg = arg; 3667 once->arg = arg;
3623 if (types & EV_ASYNC) 3754 if (types & EV_ASYNC)
3624 for (i = asynccnt; i--; ) 3755 for (i = asynccnt; i--; )
3625 cb (EV_A_ EV_ASYNC, asyncs [i]); 3756 cb (EV_A_ EV_ASYNC, asyncs [i]);
3626#endif 3757#endif
3627 3758
3759#if EV_PREPARE_ENABLE
3628 if (types & EV_PREPARE) 3760 if (types & EV_PREPARE)
3629 for (i = preparecnt; i--; ) 3761 for (i = preparecnt; i--; )
3630#if EV_EMBED_ENABLE 3762# if EV_EMBED_ENABLE
3631 if (ev_cb (prepares [i]) != embed_prepare_cb) 3763 if (ev_cb (prepares [i]) != embed_prepare_cb)
3632#endif 3764# endif
3633 cb (EV_A_ EV_PREPARE, prepares [i]); 3765 cb (EV_A_ EV_PREPARE, prepares [i]);
3766#endif
3634 3767
3768#if EV_CHECK_ENABLE
3635 if (types & EV_CHECK) 3769 if (types & EV_CHECK)
3636 for (i = checkcnt; i--; ) 3770 for (i = checkcnt; i--; )
3637 cb (EV_A_ EV_CHECK, checks [i]); 3771 cb (EV_A_ EV_CHECK, checks [i]);
3772#endif
3638 3773
3774#if EV_SIGNAL_ENABLE
3639 if (types & EV_SIGNAL) 3775 if (types & EV_SIGNAL)
3640 for (i = 0; i < EV_NSIG - 1; ++i) 3776 for (i = 0; i < EV_NSIG - 1; ++i)
3641 for (wl = signals [i].head; wl; ) 3777 for (wl = signals [i].head; wl; )
3642 { 3778 {
3643 wn = wl->next; 3779 wn = wl->next;
3644 cb (EV_A_ EV_SIGNAL, wl); 3780 cb (EV_A_ EV_SIGNAL, wl);
3645 wl = wn; 3781 wl = wn;
3646 } 3782 }
3783#endif
3647 3784
3785#if EV_CHILD_ENABLE
3648 if (types & EV_CHILD) 3786 if (types & EV_CHILD)
3649 for (i = EV_PID_HASHSIZE; i--; ) 3787 for (i = (EV_PID_HASHSIZE); i--; )
3650 for (wl = childs [i]; wl; ) 3788 for (wl = childs [i]; wl; )
3651 { 3789 {
3652 wn = wl->next; 3790 wn = wl->next;
3653 cb (EV_A_ EV_CHILD, wl); 3791 cb (EV_A_ EV_CHILD, wl);
3654 wl = wn; 3792 wl = wn;
3655 } 3793 }
3794#endif
3656/* EV_STAT 0x00001000 /* stat data changed */ 3795/* EV_STAT 0x00001000 /* stat data changed */
3657/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3796/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3658} 3797}
3659#endif 3798#endif
3660 3799
3661#if EV_MULTIPLICITY 3800#if EV_MULTIPLICITY
3662 #include "ev_wrap.h" 3801 #include "ev_wrap.h"
3663#endif 3802#endif
3664 3803
3665#ifdef __cplusplus 3804EV_CPP(})
3666}
3667#endif
3668 3805

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines