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

Comparing libev/ev.c (file contents):
Revision 1.286 by root, Wed Apr 15 19:37:15 2009 UTC vs.
Revision 1.370 by root, Sun Jan 30 19:05:41 2011 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,2011 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
… …
57# endif 53# endif
58# ifndef EV_USE_MONOTONIC 54# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 55# define EV_USE_MONOTONIC 1
60# endif 56# endif
61# endif 57# endif
58# elif !defined(EV_USE_CLOCK_SYSCALL)
59# define EV_USE_CLOCK_SYSCALL 0
62# endif 60# endif
63 61
64# if HAVE_CLOCK_GETTIME 62# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 63# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 64# define EV_USE_MONOTONIC 1
… …
75# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
76# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
77# endif 75# endif
78# endif 76# endif
79 77
78# if HAVE_NANOSLEEP
80# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
81# if HAVE_NANOSLEEP
82# define EV_USE_NANOSLEEP 1 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
83# else 82# else
83# undef EV_USE_NANOSLEEP
84# 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
85# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
86# endif 94# endif
87 95
96# if HAVE_POLL && HAVE_POLL_H
88# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
89# if HAVE_SELECT && HAVE_SYS_SELECT_H 98# define EV_USE_POLL EV_FEATURE_BACKENDS
90# define EV_USE_SELECT 1
91# else
92# define EV_USE_SELECT 0
93# endif 99# endif
94# endif
95
96# ifndef EV_USE_POLL
97# if HAVE_POLL && HAVE_POLL_H
98# define EV_USE_POLL 1
99# else 100# else
101# undef EV_USE_POLL
100# define EV_USE_POLL 0 102# define EV_USE_POLL 0
101# endif
102# endif 103# endif
103 104
104# ifndef EV_USE_EPOLL
105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
106# define EV_USE_EPOLL 1 106# ifndef EV_USE_EPOLL
107# else 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
108# define EV_USE_EPOLL 0
109# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
110# endif 112# endif
111 113
114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
112# ifndef EV_USE_KQUEUE 115# ifndef EV_USE_KQUEUE
113# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
114# define EV_USE_KQUEUE 1
115# else
116# define EV_USE_KQUEUE 0
117# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
118# endif 121# endif
119 122
120# ifndef EV_USE_PORT
121# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
122# define EV_USE_PORT 1 124# ifndef EV_USE_PORT
123# else 125# define EV_USE_PORT EV_FEATURE_BACKENDS
124# define EV_USE_PORT 0
125# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
126# endif 130# endif
127 131
128# ifndef EV_USE_INOTIFY
129# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
130# define EV_USE_INOTIFY 1 133# ifndef EV_USE_INOTIFY
131# else
132# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY EV_FEATURE_OS
133# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
134# endif 139# endif
135 140
141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
136# ifndef EV_USE_EVENTFD 142# ifndef EV_USE_SIGNALFD
137# if HAVE_EVENTFD 143# define EV_USE_SIGNALFD EV_FEATURE_OS
138# define EV_USE_EVENTFD 1
139# else
140# define EV_USE_EVENTFD 0
141# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
148# endif
149
150# if HAVE_EVENTFD
151# ifndef EV_USE_EVENTFD
152# define EV_USE_EVENTFD EV_FEATURE_OS
153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
142# endif 157# endif
143 158
144#endif 159#endif
145 160
146#include <math.h> 161#include <math.h>
147#include <stdlib.h> 162#include <stdlib.h>
163#include <string.h>
148#include <fcntl.h> 164#include <fcntl.h>
149#include <stddef.h> 165#include <stddef.h>
150 166
151#include <stdio.h> 167#include <stdio.h>
152 168
153#include <assert.h> 169#include <assert.h>
154#include <errno.h> 170#include <errno.h>
155#include <sys/types.h> 171#include <sys/types.h>
156#include <time.h> 172#include <time.h>
173#include <limits.h>
157 174
158#include <signal.h> 175#include <signal.h>
159 176
160#ifdef EV_H 177#ifdef EV_H
161# include EV_H 178# include EV_H
162#else 179#else
163# include "ev.h" 180# include "ev.h"
164#endif 181#endif
182
183EV_CPP(extern "C" {)
165 184
166#ifndef _WIN32 185#ifndef _WIN32
167# include <sys/time.h> 186# include <sys/time.h>
168# include <sys/wait.h> 187# include <sys/wait.h>
169# include <unistd.h> 188# include <unistd.h>
… …
172# define WIN32_LEAN_AND_MEAN 191# define WIN32_LEAN_AND_MEAN
173# include <windows.h> 192# include <windows.h>
174# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
175# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
176# endif 195# endif
196# undef EV_AVOID_STDIO
177#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
178 206
179/* 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 */
208
209/* try to deduce the maximum number of signals on this platform */
210#if defined (EV_NSIG)
211/* use what's provided */
212#elif defined (NSIG)
213# define EV_NSIG (NSIG)
214#elif defined(_NSIG)
215# define EV_NSIG (_NSIG)
216#elif defined (SIGMAX)
217# define EV_NSIG (SIGMAX+1)
218#elif defined (SIG_MAX)
219# define EV_NSIG (SIG_MAX+1)
220#elif defined (_SIG_MAX)
221# define EV_NSIG (_SIG_MAX+1)
222#elif defined (MAXSIG)
223# define EV_NSIG (MAXSIG+1)
224#elif defined (MAX_SIG)
225# define EV_NSIG (MAX_SIG+1)
226#elif defined (SIGARRAYSIZE)
227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
228#elif defined (_sys_nsig)
229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
230#else
231# error "unable to find value for NSIG, please report"
232/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */
234# define EV_NSIG 65
235#endif
180 236
181#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
184# else 240# else
185# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
186# endif 242# endif
187#endif 243#endif
188 244
189#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
191# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
192# else 248# else
193# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
194# endif 250# endif
195#endif 251#endif
196 252
… …
198# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
199#endif 255#endif
200 256
201#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
202# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
203# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
204# else 260# else
205# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
206# endif 262# endif
207#endif 263#endif
208 264
209#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
210# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
211#endif 267#endif
212 268
213#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
214# ifdef _WIN32 270# ifdef _WIN32
215# define EV_USE_POLL 0 271# define EV_USE_POLL 0
216# else 272# else
217# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
218# endif 274# endif
219#endif 275#endif
220 276
221#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
222# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
223# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
224# else 280# else
225# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
226# endif 282# endif
227#endif 283#endif
228 284
… …
234# define EV_USE_PORT 0 290# define EV_USE_PORT 0
235#endif 291#endif
236 292
237#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
238# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
239# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
240# else 296# else
241# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
242# endif 298# endif
243#endif 299#endif
244 300
245#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
246# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
247# define EV_PID_HASHSIZE 1
248# else
249# define EV_PID_HASHSIZE 16
250# endif
251#endif 303#endif
252 304
253#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
254# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
255# define EV_INOTIFY_HASHSIZE 1
256# else
257# define EV_INOTIFY_HASHSIZE 16
258# endif
259#endif 307#endif
260 308
261#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
262# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
263# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
264# else 312# else
265# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
314# endif
315#endif
316
317#ifndef EV_USE_SIGNALFD
318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
319# define EV_USE_SIGNALFD EV_FEATURE_OS
320# else
321# define EV_USE_SIGNALFD 0
266# endif 322# endif
267#endif 323#endif
268 324
269#if 0 /* debugging */ 325#if 0 /* debugging */
270# define EV_VERIFY 3 326# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
273#endif 329#endif
274 330
275#ifndef EV_VERIFY 331#ifndef EV_VERIFY
276# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
277#endif 333#endif
278 334
279#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
280# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
281#endif 337#endif
282 338
283#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
341#endif
342
343/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
344/* which makes programs even slower. might work on other unices, too. */
345#if EV_USE_CLOCK_SYSCALL
346# include <syscall.h>
347# ifdef SYS_clock_gettime
348# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
349# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 1
351# else
352# undef EV_USE_CLOCK_SYSCALL
353# define EV_USE_CLOCK_SYSCALL 0
354# endif
285#endif 355#endif
286 356
287/* 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
288 364
289#ifndef CLOCK_MONOTONIC 365#ifndef CLOCK_MONOTONIC
290# undef EV_USE_MONOTONIC 366# undef EV_USE_MONOTONIC
291# define EV_USE_MONOTONIC 0 367# define EV_USE_MONOTONIC 0
292#endif 368#endif
… …
300# undef EV_USE_INOTIFY 376# undef EV_USE_INOTIFY
301# define EV_USE_INOTIFY 0 377# define EV_USE_INOTIFY 0
302#endif 378#endif
303 379
304#if !EV_USE_NANOSLEEP 380#if !EV_USE_NANOSLEEP
305# ifndef _WIN32 381/* hp-ux has it in sys/time.h, which we unconditionally include above */
382# if !defined(_WIN32) && !defined(__hpux)
306# include <sys/select.h> 383# include <sys/select.h>
307# endif 384# endif
308#endif 385#endif
309 386
310#if EV_USE_INOTIFY 387#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h> 388# include <sys/statfs.h>
313# include <sys/inotify.h> 389# include <sys/inotify.h>
314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 390/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
315# ifndef IN_DONT_FOLLOW 391# ifndef IN_DONT_FOLLOW
316# undef EV_USE_INOTIFY 392# undef EV_USE_INOTIFY
… …
320 396
321#if EV_SELECT_IS_WINSOCKET 397#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 398# include <winsock.h>
323#endif 399#endif
324 400
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 401#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 402/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 403# include <stdint.h>
337# ifdef __cplusplus 404# ifndef EFD_NONBLOCK
338extern "C" { 405# define EFD_NONBLOCK O_NONBLOCK
339# endif 406# endif
340int eventfd (unsigned int initval, int flags); 407# ifndef EFD_CLOEXEC
341# ifdef __cplusplus 408# ifdef O_CLOEXEC
342} 409# define EFD_CLOEXEC O_CLOEXEC
410# else
411# define EFD_CLOEXEC 02000000
412# endif
343# endif 413# endif
414EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
415#endif
416
417#if EV_USE_SIGNALFD
418/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
419# include <stdint.h>
420# ifndef SFD_NONBLOCK
421# define SFD_NONBLOCK O_NONBLOCK
422# endif
423# ifndef SFD_CLOEXEC
424# ifdef O_CLOEXEC
425# define SFD_CLOEXEC O_CLOEXEC
426# else
427# define SFD_CLOEXEC 02000000
428# endif
429# endif
430EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
431
432struct signalfd_siginfo
433{
434 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)];
436};
344#endif 437#endif
345 438
346/**/ 439/**/
347 440
348#if EV_VERIFY >= 3 441#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 442# define EV_FREQUENT_CHECK ev_verify (EV_A)
350#else 443#else
351# define EV_FREQUENT_CHECK do { } while (0) 444# define EV_FREQUENT_CHECK do { } while (0)
352#endif 445#endif
353 446
354/* 447/*
… …
361 */ 454 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 455#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 456
364#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) */
365#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) */
366/*#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)
367 462
368#if __GNUC__ >= 4 463#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
371#else 466#else
… …
378 473
379#define expect_false(expr) expect ((expr) != 0, 0) 474#define expect_false(expr) expect ((expr) != 0, 0)
380#define expect_true(expr) expect ((expr) != 0, 1) 475#define expect_true(expr) expect ((expr) != 0, 1)
381#define inline_size static inline 476#define inline_size static inline
382 477
383#if EV_MINIMAL 478#if EV_FEATURE_CODE
479# define inline_speed static inline
480#else
384# define inline_speed static noinline 481# define inline_speed static noinline
482#endif
483
484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
485
486#if EV_MINPRI == EV_MAXPRI
487# define ABSPRI(w) (((W)w), 0)
385#else 488#else
386# define inline_speed static inline
387#endif
388
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 489# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
490#endif
391 491
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 492#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 493#define EMPTY2(a,b) /* used to suppress some warnings */
394 494
395typedef ev_watcher *W; 495typedef ev_watcher *W;
… …
399#define ev_active(w) ((W)(w))->active 499#define ev_active(w) ((W)(w))->active
400#define ev_at(w) ((WT)(w))->at 500#define ev_at(w) ((WT)(w))->at
401 501
402#if EV_USE_REALTIME 502#if EV_USE_REALTIME
403/* 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 */
404/* giving it a reasonably high chance of working on typical architetcures */ 504/* giving it a reasonably high chance of working on typical architectures */
405static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
406#endif 506#endif
407 507
408#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 510#endif
411 511
512#ifndef EV_FD_TO_WIN32_HANDLE
513# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
514#endif
515#ifndef EV_WIN32_HANDLE_TO_FD
516# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
517#endif
518#ifndef EV_WIN32_CLOSE_FD
519# define EV_WIN32_CLOSE_FD(fd) close (fd)
520#endif
521
412#ifdef _WIN32 522#ifdef _WIN32
413# include "ev_win32.c" 523# include "ev_win32.c"
414#endif 524#endif
415 525
416/*****************************************************************************/ 526/*****************************************************************************/
527
528#ifdef __linux
529# include <sys/utsname.h>
530#endif
531
532static unsigned int noinline
533ev_linux_version (void)
534{
535#ifdef __linux
536 unsigned int v = 0;
537 struct utsname buf;
538 int i;
539 char *p = buf.release;
540
541 if (uname (&buf))
542 return 0;
543
544 for (i = 3+1; --i; )
545 {
546 unsigned int c = 0;
547
548 for (;;)
549 {
550 if (*p >= '0' && *p <= '9')
551 c = c * 10 + *p++ - '0';
552 else
553 {
554 p += *p == '.';
555 break;
556 }
557 }
558
559 v = (v << 8) | c;
560 }
561
562 return v;
563#else
564 return 0;
565#endif
566}
567
568/*****************************************************************************/
569
570#if EV_AVOID_STDIO
571static void noinline
572ev_printerr (const char *msg)
573{
574 write (STDERR_FILENO, msg, strlen (msg));
575}
576#endif
417 577
418static void (*syserr_cb)(const char *msg); 578static void (*syserr_cb)(const char *msg);
419 579
420void 580void
421ev_set_syserr_cb (void (*cb)(const char *msg)) 581ev_set_syserr_cb (void (*cb)(const char *msg))
… …
431 591
432 if (syserr_cb) 592 if (syserr_cb)
433 syserr_cb (msg); 593 syserr_cb (msg);
434 else 594 else
435 { 595 {
596#if EV_AVOID_STDIO
597 ev_printerr (msg);
598 ev_printerr (": ");
599 ev_printerr (strerror (errno));
600 ev_printerr ("\n");
601#else
436 perror (msg); 602 perror (msg);
603#endif
437 abort (); 604 abort ();
438 } 605 }
439} 606}
440 607
441static void * 608static void *
442ev_realloc_emul (void *ptr, long size) 609ev_realloc_emul (void *ptr, long size)
443{ 610{
611#if __GLIBC__
612 return realloc (ptr, size);
613#else
444 /* some systems, notably openbsd and darwin, fail to properly 614 /* some systems, notably openbsd and darwin, fail to properly
445 * implement realloc (x, 0) (as required by both ansi c-98 and 615 * implement realloc (x, 0) (as required by both ansi c-89 and
446 * the single unix specification, so work around them here. 616 * the single unix specification, so work around them here.
447 */ 617 */
448 618
449 if (size) 619 if (size)
450 return realloc (ptr, size); 620 return realloc (ptr, size);
451 621
452 free (ptr); 622 free (ptr);
453 return 0; 623 return 0;
624#endif
454} 625}
455 626
456static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 627static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
457 628
458void 629void
… …
466{ 637{
467 ptr = alloc (ptr, size); 638 ptr = alloc (ptr, size);
468 639
469 if (!ptr && size) 640 if (!ptr && size)
470 { 641 {
642#if EV_AVOID_STDIO
643 ev_printerr ("(libev) memory allocation failed, aborting.\n");
644#else
471 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 645 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
646#endif
472 abort (); 647 abort ();
473 } 648 }
474 649
475 return ptr; 650 return ptr;
476} 651}
… …
478#define ev_malloc(size) ev_realloc (0, (size)) 653#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 654#define ev_free(ptr) ev_realloc ((ptr), 0)
480 655
481/*****************************************************************************/ 656/*****************************************************************************/
482 657
658/* set in reify when reification needed */
659#define EV_ANFD_REIFY 1
660
661/* file descriptor info structure */
483typedef struct 662typedef struct
484{ 663{
485 WL head; 664 WL head;
486 unsigned char events; 665 unsigned char events; /* the events watched for */
487 unsigned char reify; 666 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
488 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 667 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 668 unsigned char unused;
490#if EV_USE_EPOLL 669#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 670 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 671#endif
493#if EV_SELECT_IS_WINSOCKET 672#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
494 SOCKET handle; 673 SOCKET handle;
495#endif 674#endif
675#if EV_USE_IOCP
676 OVERLAPPED or, ow;
677#endif
496} ANFD; 678} ANFD;
497 679
680/* stores the pending event set for a given watcher */
498typedef struct 681typedef struct
499{ 682{
500 W w; 683 W w;
501 int events; 684 int events; /* the pending event set for the given watcher */
502} ANPENDING; 685} ANPENDING;
503 686
504#if EV_USE_INOTIFY 687#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 688/* hash table entry per inotify-id */
506typedef struct 689typedef struct
… …
509} ANFS; 692} ANFS;
510#endif 693#endif
511 694
512/* Heap Entry */ 695/* Heap Entry */
513#if EV_HEAP_CACHE_AT 696#if EV_HEAP_CACHE_AT
697 /* a heap element */
514 typedef struct { 698 typedef struct {
515 ev_tstamp at; 699 ev_tstamp at;
516 WT w; 700 WT w;
517 } ANHE; 701 } ANHE;
518 702
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 703 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 704 #define ANHE_at(he) (he).at /* access cached at, read-only */
521 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 705 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 706#else
707 /* a heap element */
523 typedef WT ANHE; 708 typedef WT ANHE;
524 709
525 #define ANHE_w(he) (he) 710 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 711 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 712 #define ANHE_at_cache(he)
… …
551 736
552 static int ev_default_loop_ptr; 737 static int ev_default_loop_ptr;
553 738
554#endif 739#endif
555 740
741#if EV_FEATURE_API
742# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
743# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
744# define EV_INVOKE_PENDING invoke_cb (EV_A)
745#else
746# define EV_RELEASE_CB (void)0
747# define EV_ACQUIRE_CB (void)0
748# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
749#endif
750
751#define EVBREAK_RECURSE 0x80
752
556/*****************************************************************************/ 753/*****************************************************************************/
557 754
755#ifndef EV_HAVE_EV_TIME
558ev_tstamp 756ev_tstamp
559ev_time (void) 757ev_time (void)
560{ 758{
561#if EV_USE_REALTIME 759#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 760 if (expect_true (have_realtime))
… …
569 767
570 struct timeval tv; 768 struct timeval tv;
571 gettimeofday (&tv, 0); 769 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 770 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 771}
772#endif
574 773
575inline_size ev_tstamp 774inline_size ev_tstamp
576get_clock (void) 775get_clock (void)
577{ 776{
578#if EV_USE_MONOTONIC 777#if EV_USE_MONOTONIC
… …
601 if (delay > 0.) 800 if (delay > 0.)
602 { 801 {
603#if EV_USE_NANOSLEEP 802#if EV_USE_NANOSLEEP
604 struct timespec ts; 803 struct timespec ts;
605 804
606 ts.tv_sec = (time_t)delay; 805 EV_TS_SET (ts, delay);
607 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
608
609 nanosleep (&ts, 0); 806 nanosleep (&ts, 0);
610#elif defined(_WIN32) 807#elif defined(_WIN32)
611 Sleep ((unsigned long)(delay * 1e3)); 808 Sleep ((unsigned long)(delay * 1e3));
612#else 809#else
613 struct timeval tv; 810 struct timeval tv;
614 811
615 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 812 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 813 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 814 /* by older ones */
815 EV_TV_SET (tv, delay);
621 select (0, 0, 0, 0, &tv); 816 select (0, 0, 0, 0, &tv);
622#endif 817#endif
623 } 818 }
624} 819}
625 820
821inline_speed int
822ev_timeout_to_ms (ev_tstamp timeout)
823{
824 int ms = timeout * 1000. + .999999;
825
826 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
827}
828
626/*****************************************************************************/ 829/*****************************************************************************/
627 830
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 831#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 832
833/* find a suitable new size for the given array, */
834/* hopefully by rounding to a nice-to-malloc size */
630inline_size int 835inline_size int
631array_nextsize (int elem, int cur, int cnt) 836array_nextsize (int elem, int cur, int cnt)
632{ 837{
633 int ncur = cur + 1; 838 int ncur = cur + 1;
634 839
… …
680#define array_free(stem, idx) \ 885#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 886 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 887
683/*****************************************************************************/ 888/*****************************************************************************/
684 889
890/* dummy callback for pending events */
891static void noinline
892pendingcb (EV_P_ ev_prepare *w, int revents)
893{
894}
895
685void noinline 896void noinline
686ev_feed_event (EV_P_ void *w, int revents) 897ev_feed_event (EV_P_ void *w, int revents)
687{ 898{
688 W w_ = (W)w; 899 W w_ = (W)w;
689 int pri = ABSPRI (w_); 900 int pri = ABSPRI (w_);
… …
724} 935}
725 936
726/*****************************************************************************/ 937/*****************************************************************************/
727 938
728inline_speed void 939inline_speed void
729fd_event (EV_P_ int fd, int revents) 940fd_event_nocheck (EV_P_ int fd, int revents)
730{ 941{
731 ANFD *anfd = anfds + fd; 942 ANFD *anfd = anfds + fd;
732 ev_io *w; 943 ev_io *w;
733 944
734 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 945 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
738 if (ev) 949 if (ev)
739 ev_feed_event (EV_A_ (W)w, ev); 950 ev_feed_event (EV_A_ (W)w, ev);
740 } 951 }
741} 952}
742 953
954/* do not submit kernel events for fds that have reify set */
955/* because that means they changed while we were polling for new events */
956inline_speed void
957fd_event (EV_P_ int fd, int revents)
958{
959 ANFD *anfd = anfds + fd;
960
961 if (expect_true (!anfd->reify))
962 fd_event_nocheck (EV_A_ fd, revents);
963}
964
743void 965void
744ev_feed_fd_event (EV_P_ int fd, int revents) 966ev_feed_fd_event (EV_P_ int fd, int revents)
745{ 967{
746 if (fd >= 0 && fd < anfdmax) 968 if (fd >= 0 && fd < anfdmax)
747 fd_event (EV_A_ fd, revents); 969 fd_event_nocheck (EV_A_ fd, revents);
748} 970}
749 971
972/* make sure the external fd watch events are in-sync */
973/* with the kernel/libev internal state */
750inline_size void 974inline_size void
751fd_reify (EV_P) 975fd_reify (EV_P)
752{ 976{
753 int i; 977 int i;
754 978
… …
756 { 980 {
757 int fd = fdchanges [i]; 981 int fd = fdchanges [i];
758 ANFD *anfd = anfds + fd; 982 ANFD *anfd = anfds + fd;
759 ev_io *w; 983 ev_io *w;
760 984
761 unsigned char events = 0; 985 unsigned char o_events = anfd->events;
986 unsigned char o_reify = anfd->reify;
762 987
763 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 988 anfd->reify = 0;
764 events |= (unsigned char)w->events;
765 989
766#if EV_SELECT_IS_WINSOCKET 990#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
767 if (events) 991 if (o_reify & EV__IOFDSET)
768 { 992 {
769 unsigned long arg; 993 unsigned long arg;
770 #ifdef EV_FD_TO_WIN32_HANDLE
771 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 994 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
772 #else
773 anfd->handle = _get_osfhandle (fd);
774 #endif
775 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 995 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
996 printf ("oi %d %x\n", fd, anfd->handle);//D
776 } 997 }
777#endif 998#endif
778 999
1000 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
779 { 1001 {
780 unsigned char o_events = anfd->events;
781 unsigned char o_reify = anfd->reify;
782
783 anfd->reify = 0;
784 anfd->events = events; 1002 anfd->events = 0;
785 1003
786 if (o_events != events || o_reify & EV__IOFDSET) 1004 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1005 anfd->events |= (unsigned char)w->events;
1006
1007 if (o_events != anfd->events)
1008 o_reify = EV__IOFDSET; /* actually |= */
1009 }
1010
1011 if (o_reify & EV__IOFDSET)
787 backend_modify (EV_A_ fd, o_events, events); 1012 backend_modify (EV_A_ fd, o_events, anfd->events);
788 }
789 } 1013 }
790 1014
791 fdchangecnt = 0; 1015 fdchangecnt = 0;
792} 1016}
793 1017
1018/* something about the given fd changed */
794inline_size void 1019inline_size void
795fd_change (EV_P_ int fd, int flags) 1020fd_change (EV_P_ int fd, int flags)
796{ 1021{
797 unsigned char reify = anfds [fd].reify; 1022 unsigned char reify = anfds [fd].reify;
798 anfds [fd].reify |= flags; 1023 anfds [fd].reify |= flags;
… …
803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 1028 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
804 fdchanges [fdchangecnt - 1] = fd; 1029 fdchanges [fdchangecnt - 1] = fd;
805 } 1030 }
806} 1031}
807 1032
1033/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
808inline_speed void 1034inline_speed void
809fd_kill (EV_P_ int fd) 1035fd_kill (EV_P_ int fd)
810{ 1036{
811 ev_io *w; 1037 ev_io *w;
812 1038
… …
815 ev_io_stop (EV_A_ w); 1041 ev_io_stop (EV_A_ w);
816 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1042 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
817 } 1043 }
818} 1044}
819 1045
1046/* check whether the given fd is actually valid, for error recovery */
820inline_size int 1047inline_size int
821fd_valid (int fd) 1048fd_valid (int fd)
822{ 1049{
823#ifdef _WIN32 1050#ifdef _WIN32
824 return _get_osfhandle (fd) != -1; 1051 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
825#else 1052#else
826 return fcntl (fd, F_GETFD) != -1; 1053 return fcntl (fd, F_GETFD) != -1;
827#endif 1054#endif
828} 1055}
829 1056
… …
847 1074
848 for (fd = anfdmax; fd--; ) 1075 for (fd = anfdmax; fd--; )
849 if (anfds [fd].events) 1076 if (anfds [fd].events)
850 { 1077 {
851 fd_kill (EV_A_ fd); 1078 fd_kill (EV_A_ fd);
852 return; 1079 break;
853 } 1080 }
854} 1081}
855 1082
856/* usually called after fork if backend needs to re-arm all fds from scratch */ 1083/* usually called after fork if backend needs to re-arm all fds from scratch */
857static void noinline 1084static void noinline
… …
862 for (fd = 0; fd < anfdmax; ++fd) 1089 for (fd = 0; fd < anfdmax; ++fd)
863 if (anfds [fd].events) 1090 if (anfds [fd].events)
864 { 1091 {
865 anfds [fd].events = 0; 1092 anfds [fd].events = 0;
866 anfds [fd].emask = 0; 1093 anfds [fd].emask = 0;
867 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1094 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
868 } 1095 }
869} 1096}
870 1097
1098/* used to prepare libev internal fd's */
1099/* this is not fork-safe */
1100inline_speed void
1101fd_intern (int fd)
1102{
1103#ifdef _WIN32
1104 unsigned long arg = 1;
1105 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1106#else
1107 fcntl (fd, F_SETFD, FD_CLOEXEC);
1108 fcntl (fd, F_SETFL, O_NONBLOCK);
1109#endif
1110}
1111
871/*****************************************************************************/ 1112/*****************************************************************************/
872 1113
873/* 1114/*
874 * the heap functions want a real array index. array index 0 uis guaranteed to not 1115 * the heap functions want a real array index. array index 0 is guaranteed to not
875 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1116 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
876 * the branching factor of the d-tree. 1117 * the branching factor of the d-tree.
877 */ 1118 */
878 1119
879/* 1120/*
… …
947 1188
948 for (;;) 1189 for (;;)
949 { 1190 {
950 int c = k << 1; 1191 int c = k << 1;
951 1192
952 if (c > N + HEAP0 - 1) 1193 if (c >= N + HEAP0)
953 break; 1194 break;
954 1195
955 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1196 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
956 ? 1 : 0; 1197 ? 1 : 0;
957 1198
… …
989 1230
990 heap [k] = he; 1231 heap [k] = he;
991 ev_active (ANHE_w (he)) = k; 1232 ev_active (ANHE_w (he)) = k;
992} 1233}
993 1234
1235/* move an element suitably so it is in a correct place */
994inline_size void 1236inline_size void
995adjustheap (ANHE *heap, int N, int k) 1237adjustheap (ANHE *heap, int N, int k)
996{ 1238{
997 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1239 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
998 upheap (heap, k); 1240 upheap (heap, k);
999 else 1241 else
1000 downheap (heap, N, k); 1242 downheap (heap, N, k);
1001} 1243}
1002 1244
… …
1012 upheap (heap, i + HEAP0); 1254 upheap (heap, i + HEAP0);
1013} 1255}
1014 1256
1015/*****************************************************************************/ 1257/*****************************************************************************/
1016 1258
1259/* associate signal watchers to a signal signal */
1017typedef struct 1260typedef struct
1018{ 1261{
1262 EV_ATOMIC_T pending;
1263#if EV_MULTIPLICITY
1264 EV_P;
1265#endif
1019 WL head; 1266 WL head;
1020 EV_ATOMIC_T gotsig;
1021} ANSIG; 1267} ANSIG;
1022 1268
1023static ANSIG *signals; 1269static ANSIG signals [EV_NSIG - 1];
1024static int signalmax;
1025
1026static EV_ATOMIC_T gotsig;
1027 1270
1028/*****************************************************************************/ 1271/*****************************************************************************/
1029 1272
1030inline_speed void 1273#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1031fd_intern (int fd)
1032{
1033#ifdef _WIN32
1034 unsigned long arg = 1;
1035 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1036#else
1037 fcntl (fd, F_SETFD, FD_CLOEXEC);
1038 fcntl (fd, F_SETFL, O_NONBLOCK);
1039#endif
1040}
1041 1274
1042static void noinline 1275static void noinline
1043evpipe_init (EV_P) 1276evpipe_init (EV_P)
1044{ 1277{
1045 if (!ev_is_active (&pipeev)) 1278 if (!ev_is_active (&pipe_w))
1046 { 1279 {
1047#if EV_USE_EVENTFD 1280# if EV_USE_EVENTFD
1281 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1282 if (evfd < 0 && errno == EINVAL)
1048 if ((evfd = eventfd (0, 0)) >= 0) 1283 evfd = eventfd (0, 0);
1284
1285 if (evfd >= 0)
1049 { 1286 {
1050 evpipe [0] = -1; 1287 evpipe [0] = -1;
1051 fd_intern (evfd); 1288 fd_intern (evfd); /* doing it twice doesn't hurt */
1052 ev_io_set (&pipeev, evfd, EV_READ); 1289 ev_io_set (&pipe_w, evfd, EV_READ);
1053 } 1290 }
1054 else 1291 else
1055#endif 1292# endif
1056 { 1293 {
1057 while (pipe (evpipe)) 1294 while (pipe (evpipe))
1058 ev_syserr ("(libev) error creating signal/async pipe"); 1295 ev_syserr ("(libev) error creating signal/async pipe");
1059 1296
1060 fd_intern (evpipe [0]); 1297 fd_intern (evpipe [0]);
1061 fd_intern (evpipe [1]); 1298 fd_intern (evpipe [1]);
1062 ev_io_set (&pipeev, evpipe [0], EV_READ); 1299 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1063 } 1300 }
1064 1301
1065 ev_io_start (EV_A_ &pipeev); 1302 ev_io_start (EV_A_ &pipe_w);
1066 ev_unref (EV_A); /* watcher should not keep loop alive */ 1303 ev_unref (EV_A); /* watcher should not keep loop alive */
1067 } 1304 }
1068} 1305}
1069 1306
1070inline_size void 1307inline_size void
1071evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1308evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1072{ 1309{
1073 if (!*flag) 1310 if (!*flag)
1074 { 1311 {
1075 int old_errno = errno; /* save errno because write might clobber it */ 1312 int old_errno = errno; /* save errno because write might clobber it */
1313 char dummy;
1076 1314
1077 *flag = 1; 1315 *flag = 1;
1078 1316
1079#if EV_USE_EVENTFD 1317#if EV_USE_EVENTFD
1080 if (evfd >= 0) 1318 if (evfd >= 0)
… …
1082 uint64_t counter = 1; 1320 uint64_t counter = 1;
1083 write (evfd, &counter, sizeof (uint64_t)); 1321 write (evfd, &counter, sizeof (uint64_t));
1084 } 1322 }
1085 else 1323 else
1086#endif 1324#endif
1325 /* win32 people keep sending patches that change this write() to send() */
1326 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1327 /* so when you think this write should be a send instead, please find out */
1328 /* where your send() is from - it's definitely not the microsoft send, and */
1329 /* tell me. thank you. */
1087 write (evpipe [1], &old_errno, 1); 1330 write (evpipe [1], &dummy, 1);
1088 1331
1089 errno = old_errno; 1332 errno = old_errno;
1090 } 1333 }
1091} 1334}
1092 1335
1336/* called whenever the libev signal pipe */
1337/* got some events (signal, async) */
1093static void 1338static void
1094pipecb (EV_P_ ev_io *iow, int revents) 1339pipecb (EV_P_ ev_io *iow, int revents)
1095{ 1340{
1341 int i;
1342
1096#if EV_USE_EVENTFD 1343#if EV_USE_EVENTFD
1097 if (evfd >= 0) 1344 if (evfd >= 0)
1098 { 1345 {
1099 uint64_t counter; 1346 uint64_t counter;
1100 read (evfd, &counter, sizeof (uint64_t)); 1347 read (evfd, &counter, sizeof (uint64_t));
1101 } 1348 }
1102 else 1349 else
1103#endif 1350#endif
1104 { 1351 {
1105 char dummy; 1352 char dummy;
1353 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1106 read (evpipe [0], &dummy, 1); 1354 read (evpipe [0], &dummy, 1);
1107 } 1355 }
1108 1356
1109 if (gotsig && ev_is_default_loop (EV_A)) 1357#if EV_SIGNAL_ENABLE
1358 if (sig_pending)
1110 { 1359 {
1111 int signum; 1360 sig_pending = 0;
1112 gotsig = 0;
1113 1361
1114 for (signum = signalmax; signum--; ) 1362 for (i = EV_NSIG - 1; i--; )
1115 if (signals [signum].gotsig) 1363 if (expect_false (signals [i].pending))
1116 ev_feed_signal_event (EV_A_ signum + 1); 1364 ev_feed_signal_event (EV_A_ i + 1);
1117 } 1365 }
1366#endif
1118 1367
1119#if EV_ASYNC_ENABLE 1368#if EV_ASYNC_ENABLE
1120 if (gotasync) 1369 if (async_pending)
1121 { 1370 {
1122 int i; 1371 async_pending = 0;
1123 gotasync = 0;
1124 1372
1125 for (i = asynccnt; i--; ) 1373 for (i = asynccnt; i--; )
1126 if (asyncs [i]->sent) 1374 if (asyncs [i]->sent)
1127 { 1375 {
1128 asyncs [i]->sent = 0; 1376 asyncs [i]->sent = 0;
… …
1132#endif 1380#endif
1133} 1381}
1134 1382
1135/*****************************************************************************/ 1383/*****************************************************************************/
1136 1384
1385void
1386ev_feed_signal (int signum)
1387{
1388#if EV_MULTIPLICITY
1389 EV_P = signals [signum - 1].loop;
1390
1391 if (!EV_A)
1392 return;
1393#endif
1394
1395 signals [signum - 1].pending = 1;
1396 evpipe_write (EV_A_ &sig_pending);
1397}
1398
1137static void 1399static void
1138ev_sighandler (int signum) 1400ev_sighandler (int signum)
1139{ 1401{
1140#if EV_MULTIPLICITY
1141 struct ev_loop *loop = &default_loop_struct;
1142#endif
1143
1144#if _WIN32 1402#ifdef _WIN32
1145 signal (signum, ev_sighandler); 1403 signal (signum, ev_sighandler);
1146#endif 1404#endif
1147 1405
1148 signals [signum - 1].gotsig = 1; 1406 ev_feed_signal (signum);
1149 evpipe_write (EV_A_ &gotsig);
1150} 1407}
1151 1408
1152void noinline 1409void noinline
1153ev_feed_signal_event (EV_P_ int signum) 1410ev_feed_signal_event (EV_P_ int signum)
1154{ 1411{
1155 WL w; 1412 WL w;
1156 1413
1414 if (expect_false (signum <= 0 || signum > EV_NSIG))
1415 return;
1416
1417 --signum;
1418
1157#if EV_MULTIPLICITY 1419#if EV_MULTIPLICITY
1158 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1420 /* it is permissible to try to feed a signal to the wrong loop */
1159#endif 1421 /* or, likely more useful, feeding a signal nobody is waiting for */
1160 1422
1161 --signum; 1423 if (expect_false (signals [signum].loop != EV_A))
1162
1163 if (signum < 0 || signum >= signalmax)
1164 return; 1424 return;
1425#endif
1165 1426
1166 signals [signum].gotsig = 0; 1427 signals [signum].pending = 0;
1167 1428
1168 for (w = signals [signum].head; w; w = w->next) 1429 for (w = signals [signum].head; w; w = w->next)
1169 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1430 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1170} 1431}
1171 1432
1433#if EV_USE_SIGNALFD
1434static void
1435sigfdcb (EV_P_ ev_io *iow, int revents)
1436{
1437 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1438
1439 for (;;)
1440 {
1441 ssize_t res = read (sigfd, si, sizeof (si));
1442
1443 /* not ISO-C, as res might be -1, but works with SuS */
1444 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1445 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1446
1447 if (res < (ssize_t)sizeof (si))
1448 break;
1449 }
1450}
1451#endif
1452
1453#endif
1454
1172/*****************************************************************************/ 1455/*****************************************************************************/
1173 1456
1457#if EV_CHILD_ENABLE
1174static WL childs [EV_PID_HASHSIZE]; 1458static WL childs [EV_PID_HASHSIZE];
1175
1176#ifndef _WIN32
1177 1459
1178static ev_signal childev; 1460static ev_signal childev;
1179 1461
1180#ifndef WIFCONTINUED 1462#ifndef WIFCONTINUED
1181# define WIFCONTINUED(status) 0 1463# define WIFCONTINUED(status) 0
1182#endif 1464#endif
1183 1465
1466/* handle a single child status event */
1184inline_speed void 1467inline_speed void
1185child_reap (EV_P_ int chain, int pid, int status) 1468child_reap (EV_P_ int chain, int pid, int status)
1186{ 1469{
1187 ev_child *w; 1470 ev_child *w;
1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1471 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1189 1472
1190 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1473 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1191 { 1474 {
1192 if ((w->pid == pid || !w->pid) 1475 if ((w->pid == pid || !w->pid)
1193 && (!traced || (w->flags & 1))) 1476 && (!traced || (w->flags & 1)))
1194 { 1477 {
1195 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1478 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1202 1485
1203#ifndef WCONTINUED 1486#ifndef WCONTINUED
1204# define WCONTINUED 0 1487# define WCONTINUED 0
1205#endif 1488#endif
1206 1489
1490/* called on sigchld etc., calls waitpid */
1207static void 1491static void
1208childcb (EV_P_ ev_signal *sw, int revents) 1492childcb (EV_P_ ev_signal *sw, int revents)
1209{ 1493{
1210 int pid, status; 1494 int pid, status;
1211 1495
… …
1219 /* make sure we are called again until all children have been reaped */ 1503 /* make sure we are called again until all children have been reaped */
1220 /* we need to do it this way so that the callback gets called before we continue */ 1504 /* we need to do it this way so that the callback gets called before we continue */
1221 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1505 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1222 1506
1223 child_reap (EV_A_ pid, pid, status); 1507 child_reap (EV_A_ pid, pid, status);
1224 if (EV_PID_HASHSIZE > 1) 1508 if ((EV_PID_HASHSIZE) > 1)
1225 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1509 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1226} 1510}
1227 1511
1228#endif 1512#endif
1229 1513
1230/*****************************************************************************/ 1514/*****************************************************************************/
1231 1515
1516#if EV_USE_IOCP
1517# include "ev_iocp.c"
1518#endif
1232#if EV_USE_PORT 1519#if EV_USE_PORT
1233# include "ev_port.c" 1520# include "ev_port.c"
1234#endif 1521#endif
1235#if EV_USE_KQUEUE 1522#if EV_USE_KQUEUE
1236# include "ev_kqueue.c" 1523# include "ev_kqueue.c"
… …
1296#ifdef __APPLE__ 1583#ifdef __APPLE__
1297 /* only select works correctly on that "unix-certified" platform */ 1584 /* only select works correctly on that "unix-certified" platform */
1298 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1585 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1299 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1586 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1300#endif 1587#endif
1588#ifdef __FreeBSD__
1589 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1590#endif
1301 1591
1302 return flags; 1592 return flags;
1303} 1593}
1304 1594
1305unsigned int 1595unsigned int
1306ev_embeddable_backends (void) 1596ev_embeddable_backends (void)
1307{ 1597{
1308 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1598 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1309 1599
1310 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1600 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1311 /* please fix it and tell me how to detect the fix */ 1601 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1312 flags &= ~EVBACKEND_EPOLL; 1602 flags &= ~EVBACKEND_EPOLL;
1313 1603
1314 return flags; 1604 return flags;
1315} 1605}
1316 1606
1317unsigned int 1607unsigned int
1318ev_backend (EV_P) 1608ev_backend (EV_P)
1319{ 1609{
1320 return backend; 1610 return backend;
1321} 1611}
1322 1612
1613#if EV_FEATURE_API
1323unsigned int 1614unsigned int
1324ev_loop_count (EV_P) 1615ev_iteration (EV_P)
1325{ 1616{
1326 return loop_count; 1617 return loop_count;
1327} 1618}
1328 1619
1620unsigned int
1621ev_depth (EV_P)
1622{
1623 return loop_depth;
1624}
1625
1329void 1626void
1330ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1627ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1331{ 1628{
1332 io_blocktime = interval; 1629 io_blocktime = interval;
1333} 1630}
… …
1336ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1633ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1337{ 1634{
1338 timeout_blocktime = interval; 1635 timeout_blocktime = interval;
1339} 1636}
1340 1637
1638void
1639ev_set_userdata (EV_P_ void *data)
1640{
1641 userdata = data;
1642}
1643
1644void *
1645ev_userdata (EV_P)
1646{
1647 return userdata;
1648}
1649
1650void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1651{
1652 invoke_cb = invoke_pending_cb;
1653}
1654
1655void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1656{
1657 release_cb = release;
1658 acquire_cb = acquire;
1659}
1660#endif
1661
1662/* initialise a loop structure, must be zero-initialised */
1341static void noinline 1663static void noinline
1342loop_init (EV_P_ unsigned int flags) 1664loop_init (EV_P_ unsigned int flags)
1343{ 1665{
1344 if (!backend) 1666 if (!backend)
1345 { 1667 {
1668 origflags = flags;
1669
1346#if EV_USE_REALTIME 1670#if EV_USE_REALTIME
1347 if (!have_realtime) 1671 if (!have_realtime)
1348 { 1672 {
1349 struct timespec ts; 1673 struct timespec ts;
1350 1674
… …
1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1685 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1362 have_monotonic = 1; 1686 have_monotonic = 1;
1363 } 1687 }
1364#endif 1688#endif
1365 1689
1690 /* pid check not overridable via env */
1691#ifndef _WIN32
1692 if (flags & EVFLAG_FORKCHECK)
1693 curpid = getpid ();
1694#endif
1695
1696 if (!(flags & EVFLAG_NOENV)
1697 && !enable_secure ()
1698 && getenv ("LIBEV_FLAGS"))
1699 flags = atoi (getenv ("LIBEV_FLAGS"));
1700
1366 ev_rt_now = ev_time (); 1701 ev_rt_now = ev_time ();
1367 mn_now = get_clock (); 1702 mn_now = get_clock ();
1368 now_floor = mn_now; 1703 now_floor = mn_now;
1369 rtmn_diff = ev_rt_now - mn_now; 1704 rtmn_diff = ev_rt_now - mn_now;
1705#if EV_FEATURE_API
1706 invoke_cb = ev_invoke_pending;
1707#endif
1370 1708
1371 io_blocktime = 0.; 1709 io_blocktime = 0.;
1372 timeout_blocktime = 0.; 1710 timeout_blocktime = 0.;
1373 backend = 0; 1711 backend = 0;
1374 backend_fd = -1; 1712 backend_fd = -1;
1375 gotasync = 0; 1713 sig_pending = 0;
1714#if EV_ASYNC_ENABLE
1715 async_pending = 0;
1716#endif
1376#if EV_USE_INOTIFY 1717#if EV_USE_INOTIFY
1377 fs_fd = -2; 1718 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1378#endif 1719#endif
1379 1720#if EV_USE_SIGNALFD
1380 /* pid check not overridable via env */ 1721 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1381#ifndef _WIN32
1382 if (flags & EVFLAG_FORKCHECK)
1383 curpid = getpid ();
1384#endif 1722#endif
1385 1723
1386 if (!(flags & EVFLAG_NOENV) 1724 if (!(flags & EVBACKEND_MASK))
1387 && !enable_secure ()
1388 && getenv ("LIBEV_FLAGS"))
1389 flags = atoi (getenv ("LIBEV_FLAGS"));
1390
1391 if (!(flags & 0x0000ffffU))
1392 flags |= ev_recommended_backends (); 1725 flags |= ev_recommended_backends ();
1393 1726
1727#if EV_USE_IOCP
1728 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1729#endif
1394#if EV_USE_PORT 1730#if EV_USE_PORT
1395 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1731 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1396#endif 1732#endif
1397#if EV_USE_KQUEUE 1733#if EV_USE_KQUEUE
1398 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1734 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1405#endif 1741#endif
1406#if EV_USE_SELECT 1742#if EV_USE_SELECT
1407 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1743 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1408#endif 1744#endif
1409 1745
1746 ev_prepare_init (&pending_w, pendingcb);
1747
1748#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1410 ev_init (&pipeev, pipecb); 1749 ev_init (&pipe_w, pipecb);
1411 ev_set_priority (&pipeev, EV_MAXPRI); 1750 ev_set_priority (&pipe_w, EV_MAXPRI);
1751#endif
1412 } 1752 }
1413} 1753}
1414 1754
1415static void noinline 1755/* free up a loop structure */
1756void
1416loop_destroy (EV_P) 1757ev_loop_destroy (EV_P)
1417{ 1758{
1418 int i; 1759 int i;
1419 1760
1761#if EV_MULTIPLICITY
1762 /* mimic free (0) */
1763 if (!EV_A)
1764 return;
1765#endif
1766
1767#if EV_CLEANUP_ENABLE
1768 /* queue cleanup watchers (and execute them) */
1769 if (expect_false (cleanupcnt))
1770 {
1771 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1772 EV_INVOKE_PENDING;
1773 }
1774#endif
1775
1776#if EV_CHILD_ENABLE
1777 if (ev_is_active (&childev))
1778 {
1779 ev_ref (EV_A); /* child watcher */
1780 ev_signal_stop (EV_A_ &childev);
1781 }
1782#endif
1783
1420 if (ev_is_active (&pipeev)) 1784 if (ev_is_active (&pipe_w))
1421 { 1785 {
1422 ev_ref (EV_A); /* signal watcher */ 1786 /*ev_ref (EV_A);*/
1423 ev_io_stop (EV_A_ &pipeev); 1787 /*ev_io_stop (EV_A_ &pipe_w);*/
1424 1788
1425#if EV_USE_EVENTFD 1789#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1790 if (evfd >= 0)
1427 close (evfd); 1791 close (evfd);
1428#endif 1792#endif
1429 1793
1430 if (evpipe [0] >= 0) 1794 if (evpipe [0] >= 0)
1431 { 1795 {
1432 close (evpipe [0]); 1796 EV_WIN32_CLOSE_FD (evpipe [0]);
1433 close (evpipe [1]); 1797 EV_WIN32_CLOSE_FD (evpipe [1]);
1434 } 1798 }
1435 } 1799 }
1800
1801#if EV_USE_SIGNALFD
1802 if (ev_is_active (&sigfd_w))
1803 close (sigfd);
1804#endif
1436 1805
1437#if EV_USE_INOTIFY 1806#if EV_USE_INOTIFY
1438 if (fs_fd >= 0) 1807 if (fs_fd >= 0)
1439 close (fs_fd); 1808 close (fs_fd);
1440#endif 1809#endif
1441 1810
1442 if (backend_fd >= 0) 1811 if (backend_fd >= 0)
1443 close (backend_fd); 1812 close (backend_fd);
1444 1813
1814#if EV_USE_IOCP
1815 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1816#endif
1445#if EV_USE_PORT 1817#if EV_USE_PORT
1446 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1818 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1447#endif 1819#endif
1448#if EV_USE_KQUEUE 1820#if EV_USE_KQUEUE
1449 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1821 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1464#if EV_IDLE_ENABLE 1836#if EV_IDLE_ENABLE
1465 array_free (idle, [i]); 1837 array_free (idle, [i]);
1466#endif 1838#endif
1467 } 1839 }
1468 1840
1469 ev_free (anfds); anfdmax = 0; 1841 ev_free (anfds); anfds = 0; anfdmax = 0;
1470 1842
1471 /* have to use the microsoft-never-gets-it-right macro */ 1843 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY); 1844 array_free (rfeed, EMPTY);
1473 array_free (fdchange, EMPTY); 1845 array_free (fdchange, EMPTY);
1474 array_free (timer, EMPTY); 1846 array_free (timer, EMPTY);
… …
1476 array_free (periodic, EMPTY); 1848 array_free (periodic, EMPTY);
1477#endif 1849#endif
1478#if EV_FORK_ENABLE 1850#if EV_FORK_ENABLE
1479 array_free (fork, EMPTY); 1851 array_free (fork, EMPTY);
1480#endif 1852#endif
1853#if EV_CLEANUP_ENABLE
1854 array_free (cleanup, EMPTY);
1855#endif
1481 array_free (prepare, EMPTY); 1856 array_free (prepare, EMPTY);
1482 array_free (check, EMPTY); 1857 array_free (check, EMPTY);
1483#if EV_ASYNC_ENABLE 1858#if EV_ASYNC_ENABLE
1484 array_free (async, EMPTY); 1859 array_free (async, EMPTY);
1485#endif 1860#endif
1486 1861
1487 backend = 0; 1862 backend = 0;
1863
1864#if EV_MULTIPLICITY
1865 if (ev_is_default_loop (EV_A))
1866#endif
1867 ev_default_loop_ptr = 0;
1868#if EV_MULTIPLICITY
1869 else
1870 ev_free (EV_A);
1871#endif
1488} 1872}
1489 1873
1490#if EV_USE_INOTIFY 1874#if EV_USE_INOTIFY
1491inline_size void infy_fork (EV_P); 1875inline_size void infy_fork (EV_P);
1492#endif 1876#endif
… …
1505#endif 1889#endif
1506#if EV_USE_INOTIFY 1890#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1891 infy_fork (EV_A);
1508#endif 1892#endif
1509 1893
1510 if (ev_is_active (&pipeev)) 1894 if (ev_is_active (&pipe_w))
1511 { 1895 {
1512 /* this "locks" the handlers against writing to the pipe */ 1896 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1897 /* while we modify the fd vars */
1514 gotsig = 1; 1898 sig_pending = 1;
1515#if EV_ASYNC_ENABLE 1899#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1900 async_pending = 1;
1517#endif 1901#endif
1518 1902
1519 ev_ref (EV_A); 1903 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1904 ev_io_stop (EV_A_ &pipe_w);
1521 1905
1522#if EV_USE_EVENTFD 1906#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1907 if (evfd >= 0)
1524 close (evfd); 1908 close (evfd);
1525#endif 1909#endif
1526 1910
1527 if (evpipe [0] >= 0) 1911 if (evpipe [0] >= 0)
1528 { 1912 {
1529 close (evpipe [0]); 1913 EV_WIN32_CLOSE_FD (evpipe [0]);
1530 close (evpipe [1]); 1914 EV_WIN32_CLOSE_FD (evpipe [1]);
1531 } 1915 }
1532 1916
1917#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1533 evpipe_init (EV_A); 1918 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1919 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1920 pipecb (EV_A_ &pipe_w, EV_READ);
1921#endif
1536 } 1922 }
1537 1923
1538 postfork = 0; 1924 postfork = 0;
1539} 1925}
1540 1926
1541#if EV_MULTIPLICITY 1927#if EV_MULTIPLICITY
1542 1928
1543struct ev_loop * 1929struct ev_loop *
1544ev_loop_new (unsigned int flags) 1930ev_loop_new (unsigned int flags)
1545{ 1931{
1546 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1932 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1547 1933
1548 memset (loop, 0, sizeof (struct ev_loop)); 1934 memset (EV_A, 0, sizeof (struct ev_loop));
1549
1550 loop_init (EV_A_ flags); 1935 loop_init (EV_A_ flags);
1551 1936
1552 if (ev_backend (EV_A)) 1937 if (ev_backend (EV_A))
1553 return loop; 1938 return EV_A;
1554 1939
1940 ev_free (EV_A);
1555 return 0; 1941 return 0;
1556} 1942}
1557 1943
1558void 1944#endif /* multiplicity */
1559ev_loop_destroy (EV_P)
1560{
1561 loop_destroy (EV_A);
1562 ev_free (loop);
1563}
1564
1565void
1566ev_loop_fork (EV_P)
1567{
1568 postfork = 1; /* must be in line with ev_default_fork */
1569}
1570 1945
1571#if EV_VERIFY 1946#if EV_VERIFY
1572static void noinline 1947static void noinline
1573verify_watcher (EV_P_ W w) 1948verify_watcher (EV_P_ W w)
1574{ 1949{
… …
1602 verify_watcher (EV_A_ ws [cnt]); 1977 verify_watcher (EV_A_ ws [cnt]);
1603 } 1978 }
1604} 1979}
1605#endif 1980#endif
1606 1981
1982#if EV_FEATURE_API
1607void 1983void
1608ev_loop_verify (EV_P) 1984ev_verify (EV_P)
1609{ 1985{
1610#if EV_VERIFY 1986#if EV_VERIFY
1611 int i; 1987 int i;
1612 WL w; 1988 WL w;
1613 1989
… …
1647#if EV_FORK_ENABLE 2023#if EV_FORK_ENABLE
1648 assert (forkmax >= forkcnt); 2024 assert (forkmax >= forkcnt);
1649 array_verify (EV_A_ (W *)forks, forkcnt); 2025 array_verify (EV_A_ (W *)forks, forkcnt);
1650#endif 2026#endif
1651 2027
2028#if EV_CLEANUP_ENABLE
2029 assert (cleanupmax >= cleanupcnt);
2030 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2031#endif
2032
1652#if EV_ASYNC_ENABLE 2033#if EV_ASYNC_ENABLE
1653 assert (asyncmax >= asynccnt); 2034 assert (asyncmax >= asynccnt);
1654 array_verify (EV_A_ (W *)asyncs, asynccnt); 2035 array_verify (EV_A_ (W *)asyncs, asynccnt);
1655#endif 2036#endif
1656 2037
2038#if EV_PREPARE_ENABLE
1657 assert (preparemax >= preparecnt); 2039 assert (preparemax >= preparecnt);
1658 array_verify (EV_A_ (W *)prepares, preparecnt); 2040 array_verify (EV_A_ (W *)prepares, preparecnt);
2041#endif
1659 2042
2043#if EV_CHECK_ENABLE
1660 assert (checkmax >= checkcnt); 2044 assert (checkmax >= checkcnt);
1661 array_verify (EV_A_ (W *)checks, checkcnt); 2045 array_verify (EV_A_ (W *)checks, checkcnt);
2046#endif
1662 2047
1663# if 0 2048# if 0
2049#if EV_CHILD_ENABLE
1664 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2050 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1665 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 2051 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2052#endif
1666# endif 2053# endif
1667#endif 2054#endif
1668} 2055}
1669 2056#endif
1670#endif /* multiplicity */
1671 2057
1672#if EV_MULTIPLICITY 2058#if EV_MULTIPLICITY
1673struct ev_loop * 2059struct ev_loop *
1674ev_default_loop_init (unsigned int flags)
1675#else 2060#else
1676int 2061int
2062#endif
1677ev_default_loop (unsigned int flags) 2063ev_default_loop (unsigned int flags)
1678#endif
1679{ 2064{
1680 if (!ev_default_loop_ptr) 2065 if (!ev_default_loop_ptr)
1681 { 2066 {
1682#if EV_MULTIPLICITY 2067#if EV_MULTIPLICITY
1683 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2068 EV_P = ev_default_loop_ptr = &default_loop_struct;
1684#else 2069#else
1685 ev_default_loop_ptr = 1; 2070 ev_default_loop_ptr = 1;
1686#endif 2071#endif
1687 2072
1688 loop_init (EV_A_ flags); 2073 loop_init (EV_A_ flags);
1689 2074
1690 if (ev_backend (EV_A)) 2075 if (ev_backend (EV_A))
1691 { 2076 {
1692#ifndef _WIN32 2077#if EV_CHILD_ENABLE
1693 ev_signal_init (&childev, childcb, SIGCHLD); 2078 ev_signal_init (&childev, childcb, SIGCHLD);
1694 ev_set_priority (&childev, EV_MAXPRI); 2079 ev_set_priority (&childev, EV_MAXPRI);
1695 ev_signal_start (EV_A_ &childev); 2080 ev_signal_start (EV_A_ &childev);
1696 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2081 ev_unref (EV_A); /* child watcher should not keep loop alive */
1697#endif 2082#endif
… …
1702 2087
1703 return ev_default_loop_ptr; 2088 return ev_default_loop_ptr;
1704} 2089}
1705 2090
1706void 2091void
1707ev_default_destroy (void) 2092ev_loop_fork (EV_P)
1708{ 2093{
1709#if EV_MULTIPLICITY
1710 struct ev_loop *loop = ev_default_loop_ptr;
1711#endif
1712
1713 ev_default_loop_ptr = 0;
1714
1715#ifndef _WIN32
1716 ev_ref (EV_A); /* child watcher */
1717 ev_signal_stop (EV_A_ &childev);
1718#endif
1719
1720 loop_destroy (EV_A);
1721}
1722
1723void
1724ev_default_fork (void)
1725{
1726#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr;
1728#endif
1729
1730 postfork = 1; /* must be in line with ev_loop_fork */ 2094 postfork = 1; /* must be in line with ev_default_fork */
1731} 2095}
1732 2096
1733/*****************************************************************************/ 2097/*****************************************************************************/
1734 2098
1735void 2099void
1736ev_invoke (EV_P_ void *w, int revents) 2100ev_invoke (EV_P_ void *w, int revents)
1737{ 2101{
1738 EV_CB_INVOKE ((W)w, revents); 2102 EV_CB_INVOKE ((W)w, revents);
1739} 2103}
1740 2104
1741inline_speed void 2105unsigned int
1742call_pending (EV_P) 2106ev_pending_count (EV_P)
2107{
2108 int pri;
2109 unsigned int count = 0;
2110
2111 for (pri = NUMPRI; pri--; )
2112 count += pendingcnt [pri];
2113
2114 return count;
2115}
2116
2117void noinline
2118ev_invoke_pending (EV_P)
1743{ 2119{
1744 int pri; 2120 int pri;
1745 2121
1746 for (pri = NUMPRI; pri--; ) 2122 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 2123 while (pendingcnt [pri])
1748 { 2124 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2125 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 2126
1751 if (expect_true (p->w))
1752 {
1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1754
1755 p->w->pending = 0; 2127 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 2128 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 2129 EV_FREQUENT_CHECK;
1758 }
1759 } 2130 }
1760} 2131}
1761 2132
1762#if EV_IDLE_ENABLE 2133#if EV_IDLE_ENABLE
2134/* make idle watchers pending. this handles the "call-idle */
2135/* only when higher priorities are idle" logic */
1763inline_size void 2136inline_size void
1764idle_reify (EV_P) 2137idle_reify (EV_P)
1765{ 2138{
1766 if (expect_false (idleall)) 2139 if (expect_false (idleall))
1767 { 2140 {
… …
1780 } 2153 }
1781 } 2154 }
1782} 2155}
1783#endif 2156#endif
1784 2157
2158/* make timers pending */
1785inline_size void 2159inline_size void
1786timers_reify (EV_P) 2160timers_reify (EV_P)
1787{ 2161{
1788 EV_FREQUENT_CHECK; 2162 EV_FREQUENT_CHECK;
1789 2163
… …
1813 EV_FREQUENT_CHECK; 2187 EV_FREQUENT_CHECK;
1814 feed_reverse (EV_A_ (W)w); 2188 feed_reverse (EV_A_ (W)w);
1815 } 2189 }
1816 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2190 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1817 2191
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 2192 feed_reverse_done (EV_A_ EV_TIMER);
1819 } 2193 }
1820} 2194}
1821 2195
1822#if EV_PERIODIC_ENABLE 2196#if EV_PERIODIC_ENABLE
2197
2198inline_speed
2199periodic_recalc (EV_P_ ev_periodic *w)
2200{
2201 /* TODO: use slow but potentially more correct incremental algo, */
2202 /* also do not rely on ceil */
2203 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2204}
2205
2206/* make periodics pending */
1823inline_size void 2207inline_size void
1824periodics_reify (EV_P) 2208periodics_reify (EV_P)
1825{ 2209{
1826 EV_FREQUENT_CHECK; 2210 EV_FREQUENT_CHECK;
1827 2211
… …
1845 ANHE_at_cache (periodics [HEAP0]); 2229 ANHE_at_cache (periodics [HEAP0]);
1846 downheap (periodics, periodiccnt, HEAP0); 2230 downheap (periodics, periodiccnt, HEAP0);
1847 } 2231 }
1848 else if (w->interval) 2232 else if (w->interval)
1849 { 2233 {
1850 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2234 periodic_recalc (EV_A_ w);
2235
1851 /* if next trigger time is not sufficiently in the future, put it there */ 2236 /* if next trigger time is not sufficiently in the future, put it there */
1852 /* this might happen because of floating point inexactness */ 2237 /* this might happen because of floating point inexactness */
1853 if (ev_at (w) - ev_rt_now < TIME_EPSILON) 2238 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1854 { 2239 {
1855 ev_at (w) += w->interval; 2240 ev_at (w) += w->interval;
… …
1874 2259
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 2260 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 2261 }
1877} 2262}
1878 2263
2264/* simply recalculate all periodics */
2265/* TODO: maybe ensure that at least one event happens when jumping forward? */
1879static void noinline 2266static void noinline
1880periodics_reschedule (EV_P) 2267periodics_reschedule (EV_P)
1881{ 2268{
1882 int i; 2269 int i;
1883 2270
… …
1887 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2274 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1888 2275
1889 if (w->reschedule_cb) 2276 if (w->reschedule_cb)
1890 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2277 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1891 else if (w->interval) 2278 else if (w->interval)
1892 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2279 periodic_recalc (EV_A_ w);
1893 2280
1894 ANHE_at_cache (periodics [i]); 2281 ANHE_at_cache (periodics [i]);
1895 } 2282 }
1896 2283
1897 reheap (periodics, periodiccnt); 2284 reheap (periodics, periodiccnt);
1898} 2285}
1899#endif 2286#endif
1900 2287
2288/* adjust all timers by a given offset */
1901static void noinline 2289static void noinline
1902timers_reschedule (EV_P_ ev_tstamp adjust) 2290timers_reschedule (EV_P_ ev_tstamp adjust)
1903{ 2291{
1904 int i; 2292 int i;
1905 2293
… …
1909 ANHE_w (*he)->at += adjust; 2297 ANHE_w (*he)->at += adjust;
1910 ANHE_at_cache (*he); 2298 ANHE_at_cache (*he);
1911 } 2299 }
1912} 2300}
1913 2301
2302/* fetch new monotonic and realtime times from the kernel */
2303/* also detect if there was a timejump, and act accordingly */
1914inline_speed void 2304inline_speed void
1915time_update (EV_P_ ev_tstamp max_block) 2305time_update (EV_P_ ev_tstamp max_block)
1916{ 2306{
1917 int i;
1918
1919#if EV_USE_MONOTONIC 2307#if EV_USE_MONOTONIC
1920 if (expect_true (have_monotonic)) 2308 if (expect_true (have_monotonic))
1921 { 2309 {
2310 int i;
1922 ev_tstamp odiff = rtmn_diff; 2311 ev_tstamp odiff = rtmn_diff;
1923 2312
1924 mn_now = get_clock (); 2313 mn_now = get_clock ();
1925 2314
1926 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2315 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1976 2365
1977 mn_now = ev_rt_now; 2366 mn_now = ev_rt_now;
1978 } 2367 }
1979} 2368}
1980 2369
1981static int loop_done;
1982
1983void 2370void
1984ev_loop (EV_P_ int flags) 2371ev_run (EV_P_ int flags)
1985{ 2372{
2373#if EV_FEATURE_API
2374 ++loop_depth;
2375#endif
2376
2377 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2378
1986 loop_done = EVUNLOOP_CANCEL; 2379 loop_done = EVBREAK_CANCEL;
1987 2380
1988 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2381 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1989 2382
1990 do 2383 do
1991 { 2384 {
1992#if EV_VERIFY >= 2 2385#if EV_VERIFY >= 2
1993 ev_loop_verify (EV_A); 2386 ev_verify (EV_A);
1994#endif 2387#endif
1995 2388
1996#ifndef _WIN32 2389#ifndef _WIN32
1997 if (expect_false (curpid)) /* penalise the forking check even more */ 2390 if (expect_false (curpid)) /* penalise the forking check even more */
1998 if (expect_false (getpid () != curpid)) 2391 if (expect_false (getpid () != curpid))
… …
2006 /* we might have forked, so queue fork handlers */ 2399 /* we might have forked, so queue fork handlers */
2007 if (expect_false (postfork)) 2400 if (expect_false (postfork))
2008 if (forkcnt) 2401 if (forkcnt)
2009 { 2402 {
2010 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2403 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2011 call_pending (EV_A); 2404 EV_INVOKE_PENDING;
2012 } 2405 }
2013#endif 2406#endif
2014 2407
2408#if EV_PREPARE_ENABLE
2015 /* queue prepare watchers (and execute them) */ 2409 /* queue prepare watchers (and execute them) */
2016 if (expect_false (preparecnt)) 2410 if (expect_false (preparecnt))
2017 { 2411 {
2018 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2412 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2019 call_pending (EV_A); 2413 EV_INVOKE_PENDING;
2020 } 2414 }
2415#endif
2416
2417 if (expect_false (loop_done))
2418 break;
2021 2419
2022 /* we might have forked, so reify kernel state if necessary */ 2420 /* we might have forked, so reify kernel state if necessary */
2023 if (expect_false (postfork)) 2421 if (expect_false (postfork))
2024 loop_fork (EV_A); 2422 loop_fork (EV_A);
2025 2423
… …
2029 /* calculate blocking time */ 2427 /* calculate blocking time */
2030 { 2428 {
2031 ev_tstamp waittime = 0.; 2429 ev_tstamp waittime = 0.;
2032 ev_tstamp sleeptime = 0.; 2430 ev_tstamp sleeptime = 0.;
2033 2431
2432 /* remember old timestamp for io_blocktime calculation */
2433 ev_tstamp prev_mn_now = mn_now;
2434
2435 /* update time to cancel out callback processing overhead */
2436 time_update (EV_A_ 1e100);
2437
2034 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2438 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2035 { 2439 {
2036 /* update time to cancel out callback processing overhead */ 2440 waittime = MAX_BLOCKTIME;
2037 time_update (EV_A_ 1e100);
2038 2441
2039 if (timercnt) 2442 if (timercnt)
2040 { 2443 {
2041 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2444 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2042 if (waittime > to) waittime = to; 2445 if (waittime > to) waittime = to;
… …
2048 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2451 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2049 if (waittime > to) waittime = to; 2452 if (waittime > to) waittime = to;
2050 } 2453 }
2051#endif 2454#endif
2052 2455
2456 /* don't let timeouts decrease the waittime below timeout_blocktime */
2053 if (expect_false (waittime < timeout_blocktime)) 2457 if (expect_false (waittime < timeout_blocktime))
2054 waittime = timeout_blocktime; 2458 waittime = timeout_blocktime;
2055 2459
2056 sleeptime = waittime - backend_fudge; 2460 /* extra check because io_blocktime is commonly 0 */
2057
2058 if (expect_true (sleeptime > io_blocktime)) 2461 if (expect_false (io_blocktime))
2059 sleeptime = io_blocktime;
2060
2061 if (sleeptime)
2062 { 2462 {
2463 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2464
2465 if (sleeptime > waittime - backend_fudge)
2466 sleeptime = waittime - backend_fudge;
2467
2468 if (expect_true (sleeptime > 0.))
2469 {
2063 ev_sleep (sleeptime); 2470 ev_sleep (sleeptime);
2064 waittime -= sleeptime; 2471 waittime -= sleeptime;
2472 }
2065 } 2473 }
2066 } 2474 }
2067 2475
2476#if EV_FEATURE_API
2068 ++loop_count; 2477 ++loop_count;
2478#endif
2479 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2069 backend_poll (EV_A_ waittime); 2480 backend_poll (EV_A_ waittime);
2481 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2070 2482
2071 /* update ev_rt_now, do magic */ 2483 /* update ev_rt_now, do magic */
2072 time_update (EV_A_ waittime + sleeptime); 2484 time_update (EV_A_ waittime + sleeptime);
2073 } 2485 }
2074 2486
… …
2081#if EV_IDLE_ENABLE 2493#if EV_IDLE_ENABLE
2082 /* queue idle watchers unless other events are pending */ 2494 /* queue idle watchers unless other events are pending */
2083 idle_reify (EV_A); 2495 idle_reify (EV_A);
2084#endif 2496#endif
2085 2497
2498#if EV_CHECK_ENABLE
2086 /* queue check watchers, to be executed first */ 2499 /* queue check watchers, to be executed first */
2087 if (expect_false (checkcnt)) 2500 if (expect_false (checkcnt))
2088 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2501 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2502#endif
2089 2503
2090 call_pending (EV_A); 2504 EV_INVOKE_PENDING;
2091 } 2505 }
2092 while (expect_true ( 2506 while (expect_true (
2093 activecnt 2507 activecnt
2094 && !loop_done 2508 && !loop_done
2095 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2509 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2096 )); 2510 ));
2097 2511
2098 if (loop_done == EVUNLOOP_ONE) 2512 if (loop_done == EVBREAK_ONE)
2099 loop_done = EVUNLOOP_CANCEL; 2513 loop_done = EVBREAK_CANCEL;
2100}
2101 2514
2515#if EV_FEATURE_API
2516 --loop_depth;
2517#endif
2518}
2519
2102void 2520void
2103ev_unloop (EV_P_ int how) 2521ev_break (EV_P_ int how)
2104{ 2522{
2105 loop_done = how; 2523 loop_done = how;
2106} 2524}
2107 2525
2108void 2526void
… …
2135 ev_tstamp mn_prev = mn_now; 2553 ev_tstamp mn_prev = mn_now;
2136 2554
2137 ev_now_update (EV_A); 2555 ev_now_update (EV_A);
2138 timers_reschedule (EV_A_ mn_now - mn_prev); 2556 timers_reschedule (EV_A_ mn_now - mn_prev);
2139#if EV_PERIODIC_ENABLE 2557#if EV_PERIODIC_ENABLE
2558 /* TODO: really do this? */
2140 periodics_reschedule (EV_A); 2559 periodics_reschedule (EV_A);
2141#endif 2560#endif
2142} 2561}
2143 2562
2144/*****************************************************************************/ 2563/*****************************************************************************/
2564/* singly-linked list management, used when the expected list length is short */
2145 2565
2146inline_size void 2566inline_size void
2147wlist_add (WL *head, WL elem) 2567wlist_add (WL *head, WL elem)
2148{ 2568{
2149 elem->next = *head; 2569 elem->next = *head;
… …
2153inline_size void 2573inline_size void
2154wlist_del (WL *head, WL elem) 2574wlist_del (WL *head, WL elem)
2155{ 2575{
2156 while (*head) 2576 while (*head)
2157 { 2577 {
2158 if (*head == elem) 2578 if (expect_true (*head == elem))
2159 { 2579 {
2160 *head = elem->next; 2580 *head = elem->next;
2161 return; 2581 break;
2162 } 2582 }
2163 2583
2164 head = &(*head)->next; 2584 head = &(*head)->next;
2165 } 2585 }
2166} 2586}
2167 2587
2588/* internal, faster, version of ev_clear_pending */
2168inline_speed void 2589inline_speed void
2169clear_pending (EV_P_ W w) 2590clear_pending (EV_P_ W w)
2170{ 2591{
2171 if (w->pending) 2592 if (w->pending)
2172 { 2593 {
2173 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2594 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2174 w->pending = 0; 2595 w->pending = 0;
2175 } 2596 }
2176} 2597}
2177 2598
2178int 2599int
… …
2182 int pending = w_->pending; 2603 int pending = w_->pending;
2183 2604
2184 if (expect_true (pending)) 2605 if (expect_true (pending))
2185 { 2606 {
2186 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2607 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2608 p->w = (W)&pending_w;
2187 w_->pending = 0; 2609 w_->pending = 0;
2188 p->w = 0;
2189 return p->events; 2610 return p->events;
2190 } 2611 }
2191 else 2612 else
2192 return 0; 2613 return 0;
2193} 2614}
2194 2615
2195inline_size void 2616inline_size void
2196pri_adjust (EV_P_ W w) 2617pri_adjust (EV_P_ W w)
2197{ 2618{
2198 int pri = w->priority; 2619 int pri = ev_priority (w);
2199 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2620 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2200 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2621 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2201 w->priority = pri; 2622 ev_set_priority (w, pri);
2202} 2623}
2203 2624
2204inline_speed void 2625inline_speed void
2205ev_start (EV_P_ W w, int active) 2626ev_start (EV_P_ W w, int active)
2206{ 2627{
… …
2225 2646
2226 if (expect_false (ev_is_active (w))) 2647 if (expect_false (ev_is_active (w)))
2227 return; 2648 return;
2228 2649
2229 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2650 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2230 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2651 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2231 2652
2232 EV_FREQUENT_CHECK; 2653 EV_FREQUENT_CHECK;
2233 2654
2234 ev_start (EV_A_ (W)w, 1); 2655 ev_start (EV_A_ (W)w, 1);
2235 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2656 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2236 wlist_add (&anfds[fd].head, (WL)w); 2657 wlist_add (&anfds[fd].head, (WL)w);
2237 2658
2238 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2659 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2239 w->events &= ~EV__IOFDSET; 2660 w->events &= ~EV__IOFDSET;
2240 2661
2241 EV_FREQUENT_CHECK; 2662 EV_FREQUENT_CHECK;
2242} 2663}
2243 2664
… …
2253 EV_FREQUENT_CHECK; 2674 EV_FREQUENT_CHECK;
2254 2675
2255 wlist_del (&anfds[w->fd].head, (WL)w); 2676 wlist_del (&anfds[w->fd].head, (WL)w);
2256 ev_stop (EV_A_ (W)w); 2677 ev_stop (EV_A_ (W)w);
2257 2678
2258 fd_change (EV_A_ w->fd, 1); 2679 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2259 2680
2260 EV_FREQUENT_CHECK; 2681 EV_FREQUENT_CHECK;
2261} 2682}
2262 2683
2263void noinline 2684void noinline
… …
2305 timers [active] = timers [timercnt + HEAP0]; 2726 timers [active] = timers [timercnt + HEAP0];
2306 adjustheap (timers, timercnt, active); 2727 adjustheap (timers, timercnt, active);
2307 } 2728 }
2308 } 2729 }
2309 2730
2310 EV_FREQUENT_CHECK;
2311
2312 ev_at (w) -= mn_now; 2731 ev_at (w) -= mn_now;
2313 2732
2314 ev_stop (EV_A_ (W)w); 2733 ev_stop (EV_A_ (W)w);
2734
2735 EV_FREQUENT_CHECK;
2315} 2736}
2316 2737
2317void noinline 2738void noinline
2318ev_timer_again (EV_P_ ev_timer *w) 2739ev_timer_again (EV_P_ ev_timer *w)
2319{ 2740{
… …
2337 } 2758 }
2338 2759
2339 EV_FREQUENT_CHECK; 2760 EV_FREQUENT_CHECK;
2340} 2761}
2341 2762
2763ev_tstamp
2764ev_timer_remaining (EV_P_ ev_timer *w)
2765{
2766 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2767}
2768
2342#if EV_PERIODIC_ENABLE 2769#if EV_PERIODIC_ENABLE
2343void noinline 2770void noinline
2344ev_periodic_start (EV_P_ ev_periodic *w) 2771ev_periodic_start (EV_P_ ev_periodic *w)
2345{ 2772{
2346 if (expect_false (ev_is_active (w))) 2773 if (expect_false (ev_is_active (w)))
… …
2349 if (w->reschedule_cb) 2776 if (w->reschedule_cb)
2350 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2777 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2351 else if (w->interval) 2778 else if (w->interval)
2352 { 2779 {
2353 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2780 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2354 /* this formula differs from the one in periodic_reify because we do not always round up */ 2781 periodic_recalc (EV_A_ w);
2355 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2356 } 2782 }
2357 else 2783 else
2358 ev_at (w) = w->offset; 2784 ev_at (w) = w->offset;
2359 2785
2360 EV_FREQUENT_CHECK; 2786 EV_FREQUENT_CHECK;
… …
2392 periodics [active] = periodics [periodiccnt + HEAP0]; 2818 periodics [active] = periodics [periodiccnt + HEAP0];
2393 adjustheap (periodics, periodiccnt, active); 2819 adjustheap (periodics, periodiccnt, active);
2394 } 2820 }
2395 } 2821 }
2396 2822
2397 EV_FREQUENT_CHECK;
2398
2399 ev_stop (EV_A_ (W)w); 2823 ev_stop (EV_A_ (W)w);
2824
2825 EV_FREQUENT_CHECK;
2400} 2826}
2401 2827
2402void noinline 2828void noinline
2403ev_periodic_again (EV_P_ ev_periodic *w) 2829ev_periodic_again (EV_P_ ev_periodic *w)
2404{ 2830{
… …
2410 2836
2411#ifndef SA_RESTART 2837#ifndef SA_RESTART
2412# define SA_RESTART 0 2838# define SA_RESTART 0
2413#endif 2839#endif
2414 2840
2841#if EV_SIGNAL_ENABLE
2842
2415void noinline 2843void noinline
2416ev_signal_start (EV_P_ ev_signal *w) 2844ev_signal_start (EV_P_ ev_signal *w)
2417{ 2845{
2418#if EV_MULTIPLICITY
2419 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2420#endif
2421 if (expect_false (ev_is_active (w))) 2846 if (expect_false (ev_is_active (w)))
2422 return; 2847 return;
2423 2848
2424 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2849 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2425 2850
2426 evpipe_init (EV_A); 2851#if EV_MULTIPLICITY
2852 assert (("libev: a signal must not be attached to two different loops",
2853 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2427 2854
2428 EV_FREQUENT_CHECK; 2855 signals [w->signum - 1].loop = EV_A;
2856#endif
2429 2857
2858 EV_FREQUENT_CHECK;
2859
2860#if EV_USE_SIGNALFD
2861 if (sigfd == -2)
2430 { 2862 {
2431#ifndef _WIN32 2863 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2432 sigset_t full, prev; 2864 if (sigfd < 0 && errno == EINVAL)
2433 sigfillset (&full); 2865 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2434 sigprocmask (SIG_SETMASK, &full, &prev);
2435#endif
2436 2866
2437 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2867 if (sigfd >= 0)
2868 {
2869 fd_intern (sigfd); /* doing it twice will not hurt */
2438 2870
2439#ifndef _WIN32 2871 sigemptyset (&sigfd_set);
2440 sigprocmask (SIG_SETMASK, &prev, 0); 2872
2441#endif 2873 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2874 ev_set_priority (&sigfd_w, EV_MAXPRI);
2875 ev_io_start (EV_A_ &sigfd_w);
2876 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2877 }
2442 } 2878 }
2879
2880 if (sigfd >= 0)
2881 {
2882 /* TODO: check .head */
2883 sigaddset (&sigfd_set, w->signum);
2884 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2885
2886 signalfd (sigfd, &sigfd_set, 0);
2887 }
2888#endif
2443 2889
2444 ev_start (EV_A_ (W)w, 1); 2890 ev_start (EV_A_ (W)w, 1);
2445 wlist_add (&signals [w->signum - 1].head, (WL)w); 2891 wlist_add (&signals [w->signum - 1].head, (WL)w);
2446 2892
2447 if (!((WL)w)->next) 2893 if (!((WL)w)->next)
2894# if EV_USE_SIGNALFD
2895 if (sigfd < 0) /*TODO*/
2896# endif
2448 { 2897 {
2449#if _WIN32 2898# ifdef _WIN32
2899 evpipe_init (EV_A);
2900
2450 signal (w->signum, ev_sighandler); 2901 signal (w->signum, ev_sighandler);
2451#else 2902# else
2452 struct sigaction sa; 2903 struct sigaction sa;
2904
2905 evpipe_init (EV_A);
2906
2453 sa.sa_handler = ev_sighandler; 2907 sa.sa_handler = ev_sighandler;
2454 sigfillset (&sa.sa_mask); 2908 sigfillset (&sa.sa_mask);
2455 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2909 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2456 sigaction (w->signum, &sa, 0); 2910 sigaction (w->signum, &sa, 0);
2911
2912 if (origflags & EVFLAG_NOSIGMASK)
2913 {
2914 sigemptyset (&sa.sa_mask);
2915 sigaddset (&sa.sa_mask, w->signum);
2916 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2917 }
2457#endif 2918#endif
2458 } 2919 }
2459 2920
2460 EV_FREQUENT_CHECK; 2921 EV_FREQUENT_CHECK;
2461} 2922}
2462 2923
2463void noinline 2924void noinline
… …
2471 2932
2472 wlist_del (&signals [w->signum - 1].head, (WL)w); 2933 wlist_del (&signals [w->signum - 1].head, (WL)w);
2473 ev_stop (EV_A_ (W)w); 2934 ev_stop (EV_A_ (W)w);
2474 2935
2475 if (!signals [w->signum - 1].head) 2936 if (!signals [w->signum - 1].head)
2937 {
2938#if EV_MULTIPLICITY
2939 signals [w->signum - 1].loop = 0; /* unattach from signal */
2940#endif
2941#if EV_USE_SIGNALFD
2942 if (sigfd >= 0)
2943 {
2944 sigset_t ss;
2945
2946 sigemptyset (&ss);
2947 sigaddset (&ss, w->signum);
2948 sigdelset (&sigfd_set, w->signum);
2949
2950 signalfd (sigfd, &sigfd_set, 0);
2951 sigprocmask (SIG_UNBLOCK, &ss, 0);
2952 }
2953 else
2954#endif
2476 signal (w->signum, SIG_DFL); 2955 signal (w->signum, SIG_DFL);
2956 }
2477 2957
2478 EV_FREQUENT_CHECK; 2958 EV_FREQUENT_CHECK;
2479} 2959}
2960
2961#endif
2962
2963#if EV_CHILD_ENABLE
2480 2964
2481void 2965void
2482ev_child_start (EV_P_ ev_child *w) 2966ev_child_start (EV_P_ ev_child *w)
2483{ 2967{
2484#if EV_MULTIPLICITY 2968#if EV_MULTIPLICITY
… …
2488 return; 2972 return;
2489 2973
2490 EV_FREQUENT_CHECK; 2974 EV_FREQUENT_CHECK;
2491 2975
2492 ev_start (EV_A_ (W)w, 1); 2976 ev_start (EV_A_ (W)w, 1);
2493 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2977 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2494 2978
2495 EV_FREQUENT_CHECK; 2979 EV_FREQUENT_CHECK;
2496} 2980}
2497 2981
2498void 2982void
… …
2502 if (expect_false (!ev_is_active (w))) 2986 if (expect_false (!ev_is_active (w)))
2503 return; 2987 return;
2504 2988
2505 EV_FREQUENT_CHECK; 2989 EV_FREQUENT_CHECK;
2506 2990
2507 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2991 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2508 ev_stop (EV_A_ (W)w); 2992 ev_stop (EV_A_ (W)w);
2509 2993
2510 EV_FREQUENT_CHECK; 2994 EV_FREQUENT_CHECK;
2511} 2995}
2996
2997#endif
2512 2998
2513#if EV_STAT_ENABLE 2999#if EV_STAT_ENABLE
2514 3000
2515# ifdef _WIN32 3001# ifdef _WIN32
2516# undef lstat 3002# undef lstat
… …
2522#define MIN_STAT_INTERVAL 0.1074891 3008#define MIN_STAT_INTERVAL 0.1074891
2523 3009
2524static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 3010static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2525 3011
2526#if EV_USE_INOTIFY 3012#if EV_USE_INOTIFY
2527# define EV_INOTIFY_BUFSIZE 8192 3013
3014/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
3015# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2528 3016
2529static void noinline 3017static void noinline
2530infy_add (EV_P_ ev_stat *w) 3018infy_add (EV_P_ ev_stat *w)
2531{ 3019{
2532 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); 3020 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);
2533 3021
2534 if (w->wd < 0) 3022 if (w->wd >= 0)
3023 {
3024 struct statfs sfs;
3025
3026 /* now local changes will be tracked by inotify, but remote changes won't */
3027 /* unless the filesystem is known to be local, we therefore still poll */
3028 /* also do poll on <2.6.25, but with normal frequency */
3029
3030 if (!fs_2625)
3031 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3032 else if (!statfs (w->path, &sfs)
3033 && (sfs.f_type == 0x1373 /* devfs */
3034 || sfs.f_type == 0xEF53 /* ext2/3 */
3035 || sfs.f_type == 0x3153464a /* jfs */
3036 || sfs.f_type == 0x52654973 /* reiser3 */
3037 || sfs.f_type == 0x01021994 /* tempfs */
3038 || sfs.f_type == 0x58465342 /* xfs */))
3039 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3040 else
3041 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2535 { 3042 }
3043 else
3044 {
3045 /* can't use inotify, continue to stat */
2536 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3046 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2537 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2538 3047
2539 /* monitor some parent directory for speedup hints */ 3048 /* if path is not there, monitor some parent directory for speedup hints */
2540 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3049 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2541 /* but an efficiency issue only */ 3050 /* but an efficiency issue only */
2542 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3051 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2543 { 3052 {
2544 char path [4096]; 3053 char path [4096];
… …
2560 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3069 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2561 } 3070 }
2562 } 3071 }
2563 3072
2564 if (w->wd >= 0) 3073 if (w->wd >= 0)
2565 {
2566 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3074 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2567 3075
2568 /* now local changes will be tracked by inotify, but remote changes won't */ 3076 /* now re-arm timer, if required */
2569 /* unless the filesystem it known to be local, we therefore still poll */ 3077 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2570 /* also do poll on <2.6.25, but with normal frequency */
2571 struct statfs sfs;
2572
2573 if (fs_2625 && !statfs (w->path, &sfs))
2574 if (sfs.f_type == 0x1373 /* devfs */
2575 || sfs.f_type == 0xEF53 /* ext2/3 */
2576 || sfs.f_type == 0x3153464a /* jfs */
2577 || sfs.f_type == 0x52654973 /* reiser3 */
2578 || sfs.f_type == 0x01021994 /* tempfs */
2579 || sfs.f_type == 0x58465342 /* xfs */)
2580 return;
2581
2582 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2583 ev_timer_again (EV_A_ &w->timer); 3078 ev_timer_again (EV_A_ &w->timer);
2584 } 3079 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2585} 3080}
2586 3081
2587static void noinline 3082static void noinline
2588infy_del (EV_P_ ev_stat *w) 3083infy_del (EV_P_ ev_stat *w)
2589{ 3084{
… …
2592 3087
2593 if (wd < 0) 3088 if (wd < 0)
2594 return; 3089 return;
2595 3090
2596 w->wd = -2; 3091 w->wd = -2;
2597 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3092 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2598 wlist_del (&fs_hash [slot].head, (WL)w); 3093 wlist_del (&fs_hash [slot].head, (WL)w);
2599 3094
2600 /* remove this watcher, if others are watching it, they will rearm */ 3095 /* remove this watcher, if others are watching it, they will rearm */
2601 inotify_rm_watch (fs_fd, wd); 3096 inotify_rm_watch (fs_fd, wd);
2602} 3097}
… …
2604static void noinline 3099static void noinline
2605infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3100infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2606{ 3101{
2607 if (slot < 0) 3102 if (slot < 0)
2608 /* overflow, need to check for all hash slots */ 3103 /* overflow, need to check for all hash slots */
2609 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3104 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2610 infy_wd (EV_A_ slot, wd, ev); 3105 infy_wd (EV_A_ slot, wd, ev);
2611 else 3106 else
2612 { 3107 {
2613 WL w_; 3108 WL w_;
2614 3109
2615 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3110 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2616 { 3111 {
2617 ev_stat *w = (ev_stat *)w_; 3112 ev_stat *w = (ev_stat *)w_;
2618 w_ = w_->next; /* lets us remove this watcher and all before it */ 3113 w_ = w_->next; /* lets us remove this watcher and all before it */
2619 3114
2620 if (w->wd == wd || wd == -1) 3115 if (w->wd == wd || wd == -1)
2621 { 3116 {
2622 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3117 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2623 { 3118 {
2624 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3119 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2625 w->wd = -1; 3120 w->wd = -1;
2626 infy_add (EV_A_ w); /* re-add, no matter what */ 3121 infy_add (EV_A_ w); /* re-add, no matter what */
2627 } 3122 }
2628 3123
2629 stat_timer_cb (EV_A_ &w->timer, 0); 3124 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2634 3129
2635static void 3130static void
2636infy_cb (EV_P_ ev_io *w, int revents) 3131infy_cb (EV_P_ ev_io *w, int revents)
2637{ 3132{
2638 char buf [EV_INOTIFY_BUFSIZE]; 3133 char buf [EV_INOTIFY_BUFSIZE];
2639 struct inotify_event *ev = (struct inotify_event *)buf;
2640 int ofs; 3134 int ofs;
2641 int len = read (fs_fd, buf, sizeof (buf)); 3135 int len = read (fs_fd, buf, sizeof (buf));
2642 3136
2643 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3137 for (ofs = 0; ofs < len; )
3138 {
3139 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2644 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3140 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3141 ofs += sizeof (struct inotify_event) + ev->len;
3142 }
2645} 3143}
2646 3144
2647inline_size void 3145inline_size void
2648check_2625 (EV_P) 3146ev_check_2625 (EV_P)
2649{ 3147{
2650 /* kernels < 2.6.25 are borked 3148 /* kernels < 2.6.25 are borked
2651 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3149 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2652 */ 3150 */
2653 struct utsname buf; 3151 if (ev_linux_version () < 0x020619)
2654 int major, minor, micro;
2655
2656 if (uname (&buf))
2657 return; 3152 return;
2658 3153
2659 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2660 return;
2661
2662 if (major < 2
2663 || (major == 2 && minor < 6)
2664 || (major == 2 && minor == 6 && micro < 25))
2665 return;
2666
2667 fs_2625 = 1; 3154 fs_2625 = 1;
3155}
3156
3157inline_size int
3158infy_newfd (void)
3159{
3160#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3161 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3162 if (fd >= 0)
3163 return fd;
3164#endif
3165 return inotify_init ();
2668} 3166}
2669 3167
2670inline_size void 3168inline_size void
2671infy_init (EV_P) 3169infy_init (EV_P)
2672{ 3170{
2673 if (fs_fd != -2) 3171 if (fs_fd != -2)
2674 return; 3172 return;
2675 3173
2676 fs_fd = -1; 3174 fs_fd = -1;
2677 3175
2678 check_2625 (EV_A); 3176 ev_check_2625 (EV_A);
2679 3177
2680 fs_fd = inotify_init (); 3178 fs_fd = infy_newfd ();
2681 3179
2682 if (fs_fd >= 0) 3180 if (fs_fd >= 0)
2683 { 3181 {
3182 fd_intern (fs_fd);
2684 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3183 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2685 ev_set_priority (&fs_w, EV_MAXPRI); 3184 ev_set_priority (&fs_w, EV_MAXPRI);
2686 ev_io_start (EV_A_ &fs_w); 3185 ev_io_start (EV_A_ &fs_w);
3186 ev_unref (EV_A);
2687 } 3187 }
2688} 3188}
2689 3189
2690inline_size void 3190inline_size void
2691infy_fork (EV_P) 3191infy_fork (EV_P)
… …
2693 int slot; 3193 int slot;
2694 3194
2695 if (fs_fd < 0) 3195 if (fs_fd < 0)
2696 return; 3196 return;
2697 3197
3198 ev_ref (EV_A);
3199 ev_io_stop (EV_A_ &fs_w);
2698 close (fs_fd); 3200 close (fs_fd);
2699 fs_fd = inotify_init (); 3201 fs_fd = infy_newfd ();
2700 3202
3203 if (fs_fd >= 0)
3204 {
3205 fd_intern (fs_fd);
3206 ev_io_set (&fs_w, fs_fd, EV_READ);
3207 ev_io_start (EV_A_ &fs_w);
3208 ev_unref (EV_A);
3209 }
3210
2701 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3211 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2702 { 3212 {
2703 WL w_ = fs_hash [slot].head; 3213 WL w_ = fs_hash [slot].head;
2704 fs_hash [slot].head = 0; 3214 fs_hash [slot].head = 0;
2705 3215
2706 while (w_) 3216 while (w_)
… …
2711 w->wd = -1; 3221 w->wd = -1;
2712 3222
2713 if (fs_fd >= 0) 3223 if (fs_fd >= 0)
2714 infy_add (EV_A_ w); /* re-add, no matter what */ 3224 infy_add (EV_A_ w); /* re-add, no matter what */
2715 else 3225 else
3226 {
3227 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3228 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2716 ev_timer_again (EV_A_ &w->timer); 3229 ev_timer_again (EV_A_ &w->timer);
3230 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3231 }
2717 } 3232 }
2718 } 3233 }
2719} 3234}
2720 3235
2721#endif 3236#endif
… …
2738static void noinline 3253static void noinline
2739stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3254stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2740{ 3255{
2741 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3256 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2742 3257
2743 /* we copy this here each the time so that */ 3258 ev_statdata prev = w->attr;
2744 /* prev has the old value when the callback gets invoked */
2745 w->prev = w->attr;
2746 ev_stat_stat (EV_A_ w); 3259 ev_stat_stat (EV_A_ w);
2747 3260
2748 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3261 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2749 if ( 3262 if (
2750 w->prev.st_dev != w->attr.st_dev 3263 prev.st_dev != w->attr.st_dev
2751 || w->prev.st_ino != w->attr.st_ino 3264 || prev.st_ino != w->attr.st_ino
2752 || w->prev.st_mode != w->attr.st_mode 3265 || prev.st_mode != w->attr.st_mode
2753 || w->prev.st_nlink != w->attr.st_nlink 3266 || prev.st_nlink != w->attr.st_nlink
2754 || w->prev.st_uid != w->attr.st_uid 3267 || prev.st_uid != w->attr.st_uid
2755 || w->prev.st_gid != w->attr.st_gid 3268 || prev.st_gid != w->attr.st_gid
2756 || w->prev.st_rdev != w->attr.st_rdev 3269 || prev.st_rdev != w->attr.st_rdev
2757 || w->prev.st_size != w->attr.st_size 3270 || prev.st_size != w->attr.st_size
2758 || w->prev.st_atime != w->attr.st_atime 3271 || prev.st_atime != w->attr.st_atime
2759 || w->prev.st_mtime != w->attr.st_mtime 3272 || prev.st_mtime != w->attr.st_mtime
2760 || w->prev.st_ctime != w->attr.st_ctime 3273 || prev.st_ctime != w->attr.st_ctime
2761 ) { 3274 ) {
3275 /* we only update w->prev on actual differences */
3276 /* in case we test more often than invoke the callback, */
3277 /* to ensure that prev is always different to attr */
3278 w->prev = prev;
3279
2762 #if EV_USE_INOTIFY 3280 #if EV_USE_INOTIFY
2763 if (fs_fd >= 0) 3281 if (fs_fd >= 0)
2764 { 3282 {
2765 infy_del (EV_A_ w); 3283 infy_del (EV_A_ w);
2766 infy_add (EV_A_ w); 3284 infy_add (EV_A_ w);
… …
2791 3309
2792 if (fs_fd >= 0) 3310 if (fs_fd >= 0)
2793 infy_add (EV_A_ w); 3311 infy_add (EV_A_ w);
2794 else 3312 else
2795#endif 3313#endif
3314 {
2796 ev_timer_again (EV_A_ &w->timer); 3315 ev_timer_again (EV_A_ &w->timer);
3316 ev_unref (EV_A);
3317 }
2797 3318
2798 ev_start (EV_A_ (W)w, 1); 3319 ev_start (EV_A_ (W)w, 1);
2799 3320
2800 EV_FREQUENT_CHECK; 3321 EV_FREQUENT_CHECK;
2801} 3322}
… …
2810 EV_FREQUENT_CHECK; 3331 EV_FREQUENT_CHECK;
2811 3332
2812#if EV_USE_INOTIFY 3333#if EV_USE_INOTIFY
2813 infy_del (EV_A_ w); 3334 infy_del (EV_A_ w);
2814#endif 3335#endif
3336
3337 if (ev_is_active (&w->timer))
3338 {
3339 ev_ref (EV_A);
2815 ev_timer_stop (EV_A_ &w->timer); 3340 ev_timer_stop (EV_A_ &w->timer);
3341 }
2816 3342
2817 ev_stop (EV_A_ (W)w); 3343 ev_stop (EV_A_ (W)w);
2818 3344
2819 EV_FREQUENT_CHECK; 3345 EV_FREQUENT_CHECK;
2820} 3346}
… …
2865 3391
2866 EV_FREQUENT_CHECK; 3392 EV_FREQUENT_CHECK;
2867} 3393}
2868#endif 3394#endif
2869 3395
3396#if EV_PREPARE_ENABLE
2870void 3397void
2871ev_prepare_start (EV_P_ ev_prepare *w) 3398ev_prepare_start (EV_P_ ev_prepare *w)
2872{ 3399{
2873 if (expect_false (ev_is_active (w))) 3400 if (expect_false (ev_is_active (w)))
2874 return; 3401 return;
… …
2900 3427
2901 ev_stop (EV_A_ (W)w); 3428 ev_stop (EV_A_ (W)w);
2902 3429
2903 EV_FREQUENT_CHECK; 3430 EV_FREQUENT_CHECK;
2904} 3431}
3432#endif
2905 3433
3434#if EV_CHECK_ENABLE
2906void 3435void
2907ev_check_start (EV_P_ ev_check *w) 3436ev_check_start (EV_P_ ev_check *w)
2908{ 3437{
2909 if (expect_false (ev_is_active (w))) 3438 if (expect_false (ev_is_active (w)))
2910 return; 3439 return;
… …
2936 3465
2937 ev_stop (EV_A_ (W)w); 3466 ev_stop (EV_A_ (W)w);
2938 3467
2939 EV_FREQUENT_CHECK; 3468 EV_FREQUENT_CHECK;
2940} 3469}
3470#endif
2941 3471
2942#if EV_EMBED_ENABLE 3472#if EV_EMBED_ENABLE
2943void noinline 3473void noinline
2944ev_embed_sweep (EV_P_ ev_embed *w) 3474ev_embed_sweep (EV_P_ ev_embed *w)
2945{ 3475{
2946 ev_loop (w->other, EVLOOP_NONBLOCK); 3476 ev_run (w->other, EVRUN_NOWAIT);
2947} 3477}
2948 3478
2949static void 3479static void
2950embed_io_cb (EV_P_ ev_io *io, int revents) 3480embed_io_cb (EV_P_ ev_io *io, int revents)
2951{ 3481{
2952 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3482 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2953 3483
2954 if (ev_cb (w)) 3484 if (ev_cb (w))
2955 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3485 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2956 else 3486 else
2957 ev_loop (w->other, EVLOOP_NONBLOCK); 3487 ev_run (w->other, EVRUN_NOWAIT);
2958} 3488}
2959 3489
2960static void 3490static void
2961embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3491embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2962{ 3492{
2963 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3493 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2964 3494
2965 { 3495 {
2966 struct ev_loop *loop = w->other; 3496 EV_P = w->other;
2967 3497
2968 while (fdchangecnt) 3498 while (fdchangecnt)
2969 { 3499 {
2970 fd_reify (EV_A); 3500 fd_reify (EV_A);
2971 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3501 ev_run (EV_A_ EVRUN_NOWAIT);
2972 } 3502 }
2973 } 3503 }
2974} 3504}
2975 3505
2976static void 3506static void
… …
2979 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3509 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2980 3510
2981 ev_embed_stop (EV_A_ w); 3511 ev_embed_stop (EV_A_ w);
2982 3512
2983 { 3513 {
2984 struct ev_loop *loop = w->other; 3514 EV_P = w->other;
2985 3515
2986 ev_loop_fork (EV_A); 3516 ev_loop_fork (EV_A);
2987 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3517 ev_run (EV_A_ EVRUN_NOWAIT);
2988 } 3518 }
2989 3519
2990 ev_embed_start (EV_A_ w); 3520 ev_embed_start (EV_A_ w);
2991} 3521}
2992 3522
… …
3003{ 3533{
3004 if (expect_false (ev_is_active (w))) 3534 if (expect_false (ev_is_active (w)))
3005 return; 3535 return;
3006 3536
3007 { 3537 {
3008 struct ev_loop *loop = w->other; 3538 EV_P = w->other;
3009 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3539 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3010 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3540 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3011 } 3541 }
3012 3542
3013 EV_FREQUENT_CHECK; 3543 EV_FREQUENT_CHECK;
… …
3040 3570
3041 ev_io_stop (EV_A_ &w->io); 3571 ev_io_stop (EV_A_ &w->io);
3042 ev_prepare_stop (EV_A_ &w->prepare); 3572 ev_prepare_stop (EV_A_ &w->prepare);
3043 ev_fork_stop (EV_A_ &w->fork); 3573 ev_fork_stop (EV_A_ &w->fork);
3044 3574
3575 ev_stop (EV_A_ (W)w);
3576
3045 EV_FREQUENT_CHECK; 3577 EV_FREQUENT_CHECK;
3046} 3578}
3047#endif 3579#endif
3048 3580
3049#if EV_FORK_ENABLE 3581#if EV_FORK_ENABLE
… …
3082 3614
3083 EV_FREQUENT_CHECK; 3615 EV_FREQUENT_CHECK;
3084} 3616}
3085#endif 3617#endif
3086 3618
3087#if EV_ASYNC_ENABLE 3619#if EV_CLEANUP_ENABLE
3088void 3620void
3089ev_async_start (EV_P_ ev_async *w) 3621ev_cleanup_start (EV_P_ ev_cleanup *w)
3090{ 3622{
3091 if (expect_false (ev_is_active (w))) 3623 if (expect_false (ev_is_active (w)))
3092 return; 3624 return;
3625
3626 EV_FREQUENT_CHECK;
3627
3628 ev_start (EV_A_ (W)w, ++cleanupcnt);
3629 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3630 cleanups [cleanupcnt - 1] = w;
3631
3632 /* cleanup watchers should never keep a refcount on the loop */
3633 ev_unref (EV_A);
3634 EV_FREQUENT_CHECK;
3635}
3636
3637void
3638ev_cleanup_stop (EV_P_ ev_cleanup *w)
3639{
3640 clear_pending (EV_A_ (W)w);
3641 if (expect_false (!ev_is_active (w)))
3642 return;
3643
3644 EV_FREQUENT_CHECK;
3645 ev_ref (EV_A);
3646
3647 {
3648 int active = ev_active (w);
3649
3650 cleanups [active - 1] = cleanups [--cleanupcnt];
3651 ev_active (cleanups [active - 1]) = active;
3652 }
3653
3654 ev_stop (EV_A_ (W)w);
3655
3656 EV_FREQUENT_CHECK;
3657}
3658#endif
3659
3660#if EV_ASYNC_ENABLE
3661void
3662ev_async_start (EV_P_ ev_async *w)
3663{
3664 if (expect_false (ev_is_active (w)))
3665 return;
3666
3667 w->sent = 0;
3093 3668
3094 evpipe_init (EV_A); 3669 evpipe_init (EV_A);
3095 3670
3096 EV_FREQUENT_CHECK; 3671 EV_FREQUENT_CHECK;
3097 3672
… …
3125 3700
3126void 3701void
3127ev_async_send (EV_P_ ev_async *w) 3702ev_async_send (EV_P_ ev_async *w)
3128{ 3703{
3129 w->sent = 1; 3704 w->sent = 1;
3130 evpipe_write (EV_A_ &gotasync); 3705 evpipe_write (EV_A_ &async_pending);
3131} 3706}
3132#endif 3707#endif
3133 3708
3134/*****************************************************************************/ 3709/*****************************************************************************/
3135 3710
… …
3175{ 3750{
3176 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3751 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3177 3752
3178 if (expect_false (!once)) 3753 if (expect_false (!once))
3179 { 3754 {
3180 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3755 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3181 return; 3756 return;
3182 } 3757 }
3183 3758
3184 once->cb = cb; 3759 once->cb = cb;
3185 once->arg = arg; 3760 once->arg = arg;
… …
3199 } 3774 }
3200} 3775}
3201 3776
3202/*****************************************************************************/ 3777/*****************************************************************************/
3203 3778
3204#if 0 3779#if EV_WALK_ENABLE
3205void 3780void
3206ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3781ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3207{ 3782{
3208 int i, j; 3783 int i, j;
3209 ev_watcher_list *wl, *wn; 3784 ev_watcher_list *wl, *wn;
… …
3225#if EV_USE_INOTIFY 3800#if EV_USE_INOTIFY
3226 if (ev_cb ((ev_io *)wl) == infy_cb) 3801 if (ev_cb ((ev_io *)wl) == infy_cb)
3227 ; 3802 ;
3228 else 3803 else
3229#endif 3804#endif
3230 if ((ev_io *)wl != &pipeev) 3805 if ((ev_io *)wl != &pipe_w)
3231 if (types & EV_IO) 3806 if (types & EV_IO)
3232 cb (EV_A_ EV_IO, wl); 3807 cb (EV_A_ EV_IO, wl);
3233 3808
3234 wl = wn; 3809 wl = wn;
3235 } 3810 }
… …
3272 if (types & EV_ASYNC) 3847 if (types & EV_ASYNC)
3273 for (i = asynccnt; i--; ) 3848 for (i = asynccnt; i--; )
3274 cb (EV_A_ EV_ASYNC, asyncs [i]); 3849 cb (EV_A_ EV_ASYNC, asyncs [i]);
3275#endif 3850#endif
3276 3851
3852#if EV_PREPARE_ENABLE
3277 if (types & EV_PREPARE) 3853 if (types & EV_PREPARE)
3278 for (i = preparecnt; i--; ) 3854 for (i = preparecnt; i--; )
3279#if EV_EMBED_ENABLE 3855# if EV_EMBED_ENABLE
3280 if (ev_cb (prepares [i]) != embed_prepare_cb) 3856 if (ev_cb (prepares [i]) != embed_prepare_cb)
3281#endif 3857# endif
3282 cb (EV_A_ EV_PREPARE, prepares [i]); 3858 cb (EV_A_ EV_PREPARE, prepares [i]);
3859#endif
3283 3860
3861#if EV_CHECK_ENABLE
3284 if (types & EV_CHECK) 3862 if (types & EV_CHECK)
3285 for (i = checkcnt; i--; ) 3863 for (i = checkcnt; i--; )
3286 cb (EV_A_ EV_CHECK, checks [i]); 3864 cb (EV_A_ EV_CHECK, checks [i]);
3865#endif
3287 3866
3867#if EV_SIGNAL_ENABLE
3288 if (types & EV_SIGNAL) 3868 if (types & EV_SIGNAL)
3289 for (i = 0; i < signalmax; ++i) 3869 for (i = 0; i < EV_NSIG - 1; ++i)
3290 for (wl = signals [i].head; wl; ) 3870 for (wl = signals [i].head; wl; )
3291 { 3871 {
3292 wn = wl->next; 3872 wn = wl->next;
3293 cb (EV_A_ EV_SIGNAL, wl); 3873 cb (EV_A_ EV_SIGNAL, wl);
3294 wl = wn; 3874 wl = wn;
3295 } 3875 }
3876#endif
3296 3877
3878#if EV_CHILD_ENABLE
3297 if (types & EV_CHILD) 3879 if (types & EV_CHILD)
3298 for (i = EV_PID_HASHSIZE; i--; ) 3880 for (i = (EV_PID_HASHSIZE); i--; )
3299 for (wl = childs [i]; wl; ) 3881 for (wl = childs [i]; wl; )
3300 { 3882 {
3301 wn = wl->next; 3883 wn = wl->next;
3302 cb (EV_A_ EV_CHILD, wl); 3884 cb (EV_A_ EV_CHILD, wl);
3303 wl = wn; 3885 wl = wn;
3304 } 3886 }
3887#endif
3305/* EV_STAT 0x00001000 /* stat data changed */ 3888/* EV_STAT 0x00001000 /* stat data changed */
3306/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3889/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3307} 3890}
3308#endif 3891#endif
3309 3892
3310#if EV_MULTIPLICITY 3893#if EV_MULTIPLICITY
3311 #include "ev_wrap.h" 3894 #include "ev_wrap.h"
3312#endif 3895#endif
3313 3896
3314#ifdef __cplusplus 3897EV_CPP(})
3315}
3316#endif
3317 3898

Diff Legend

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