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.371 by root, Mon Feb 7 21:45:32 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;
978
979#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
980 for (i = 0; i < fdchangecnt; ++i)
981 {
982 int fd = fdchanges [i];
983 ANFD *anfd = anfds + fd;
984
985 if (anfd->reify & EV__IOFDSET)
986 {
987 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
988
989 if (handle != anfd->handle)
990 {
991 unsigned long arg;
992
993 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
994
995 /* handle changed, but fd didn't - we need to do it in two steps */
996 backend_modify (EV_A_ fd, anfd->events, 0);
997 anfd->events = 0;
998 anfd->handle = handle;
999 }
1000 }
1001 }
1002#endif
754 1003
755 for (i = 0; i < fdchangecnt; ++i) 1004 for (i = 0; i < fdchangecnt; ++i)
756 { 1005 {
757 int fd = fdchanges [i]; 1006 int fd = fdchanges [i];
758 ANFD *anfd = anfds + fd; 1007 ANFD *anfd = anfds + fd;
759 ev_io *w; 1008 ev_io *w;
760 1009
761 unsigned char events = 0; 1010 unsigned char o_events = anfd->events;
1011 unsigned char o_reify = anfd->reify;
762 1012
763 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1013 anfd->reify = 0;
764 events |= (unsigned char)w->events;
765 1014
766#if EV_SELECT_IS_WINSOCKET 1015 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
767 if (events)
768 { 1016 {
769 unsigned long arg; 1017 anfd->events = 0;
770 #ifdef EV_FD_TO_WIN32_HANDLE 1018
771 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 1019 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
772 #else 1020 anfd->events |= (unsigned char)w->events;
773 anfd->handle = _get_osfhandle (fd); 1021
774 #endif 1022 if (o_events != anfd->events)
775 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 1023 o_reify = EV__IOFDSET; /* actually |= */
776 } 1024 }
777#endif
778 1025
779 { 1026 if (o_reify & EV__IOFDSET)
780 unsigned char o_events = anfd->events;
781 unsigned char o_reify = anfd->reify;
782
783 anfd->reify = 0;
784 anfd->events = events;
785
786 if (o_events != events || o_reify & EV__IOFDSET)
787 backend_modify (EV_A_ fd, o_events, events); 1027 backend_modify (EV_A_ fd, o_events, anfd->events);
788 }
789 } 1028 }
790 1029
791 fdchangecnt = 0; 1030 fdchangecnt = 0;
792} 1031}
793 1032
1033/* something about the given fd changed */
794inline_size void 1034inline_size void
795fd_change (EV_P_ int fd, int flags) 1035fd_change (EV_P_ int fd, int flags)
796{ 1036{
797 unsigned char reify = anfds [fd].reify; 1037 unsigned char reify = anfds [fd].reify;
798 anfds [fd].reify |= flags; 1038 anfds [fd].reify |= flags;
… …
803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 1043 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
804 fdchanges [fdchangecnt - 1] = fd; 1044 fdchanges [fdchangecnt - 1] = fd;
805 } 1045 }
806} 1046}
807 1047
1048/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
808inline_speed void 1049inline_speed void
809fd_kill (EV_P_ int fd) 1050fd_kill (EV_P_ int fd)
810{ 1051{
811 ev_io *w; 1052 ev_io *w;
812 1053
… …
815 ev_io_stop (EV_A_ w); 1056 ev_io_stop (EV_A_ w);
816 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1057 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
817 } 1058 }
818} 1059}
819 1060
1061/* check whether the given fd is actually valid, for error recovery */
820inline_size int 1062inline_size int
821fd_valid (int fd) 1063fd_valid (int fd)
822{ 1064{
823#ifdef _WIN32 1065#ifdef _WIN32
824 return _get_osfhandle (fd) != -1; 1066 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
825#else 1067#else
826 return fcntl (fd, F_GETFD) != -1; 1068 return fcntl (fd, F_GETFD) != -1;
827#endif 1069#endif
828} 1070}
829 1071
… …
847 1089
848 for (fd = anfdmax; fd--; ) 1090 for (fd = anfdmax; fd--; )
849 if (anfds [fd].events) 1091 if (anfds [fd].events)
850 { 1092 {
851 fd_kill (EV_A_ fd); 1093 fd_kill (EV_A_ fd);
852 return; 1094 break;
853 } 1095 }
854} 1096}
855 1097
856/* usually called after fork if backend needs to re-arm all fds from scratch */ 1098/* usually called after fork if backend needs to re-arm all fds from scratch */
857static void noinline 1099static void noinline
… …
862 for (fd = 0; fd < anfdmax; ++fd) 1104 for (fd = 0; fd < anfdmax; ++fd)
863 if (anfds [fd].events) 1105 if (anfds [fd].events)
864 { 1106 {
865 anfds [fd].events = 0; 1107 anfds [fd].events = 0;
866 anfds [fd].emask = 0; 1108 anfds [fd].emask = 0;
867 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1109 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
868 } 1110 }
869} 1111}
870 1112
1113/* used to prepare libev internal fd's */
1114/* this is not fork-safe */
1115inline_speed void
1116fd_intern (int fd)
1117{
1118#ifdef _WIN32
1119 unsigned long arg = 1;
1120 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1121#else
1122 fcntl (fd, F_SETFD, FD_CLOEXEC);
1123 fcntl (fd, F_SETFL, O_NONBLOCK);
1124#endif
1125}
1126
871/*****************************************************************************/ 1127/*****************************************************************************/
872 1128
873/* 1129/*
874 * the heap functions want a real array index. array index 0 uis guaranteed to not 1130 * 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 1131 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
876 * the branching factor of the d-tree. 1132 * the branching factor of the d-tree.
877 */ 1133 */
878 1134
879/* 1135/*
… …
947 1203
948 for (;;) 1204 for (;;)
949 { 1205 {
950 int c = k << 1; 1206 int c = k << 1;
951 1207
952 if (c > N + HEAP0 - 1) 1208 if (c >= N + HEAP0)
953 break; 1209 break;
954 1210
955 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1211 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
956 ? 1 : 0; 1212 ? 1 : 0;
957 1213
… …
989 1245
990 heap [k] = he; 1246 heap [k] = he;
991 ev_active (ANHE_w (he)) = k; 1247 ev_active (ANHE_w (he)) = k;
992} 1248}
993 1249
1250/* move an element suitably so it is in a correct place */
994inline_size void 1251inline_size void
995adjustheap (ANHE *heap, int N, int k) 1252adjustheap (ANHE *heap, int N, int k)
996{ 1253{
997 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1254 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
998 upheap (heap, k); 1255 upheap (heap, k);
999 else 1256 else
1000 downheap (heap, N, k); 1257 downheap (heap, N, k);
1001} 1258}
1002 1259
… …
1012 upheap (heap, i + HEAP0); 1269 upheap (heap, i + HEAP0);
1013} 1270}
1014 1271
1015/*****************************************************************************/ 1272/*****************************************************************************/
1016 1273
1274/* associate signal watchers to a signal signal */
1017typedef struct 1275typedef struct
1018{ 1276{
1277 EV_ATOMIC_T pending;
1278#if EV_MULTIPLICITY
1279 EV_P;
1280#endif
1019 WL head; 1281 WL head;
1020 EV_ATOMIC_T gotsig;
1021} ANSIG; 1282} ANSIG;
1022 1283
1023static ANSIG *signals; 1284static ANSIG signals [EV_NSIG - 1];
1024static int signalmax;
1025
1026static EV_ATOMIC_T gotsig;
1027 1285
1028/*****************************************************************************/ 1286/*****************************************************************************/
1029 1287
1030inline_speed void 1288#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 1289
1042static void noinline 1290static void noinline
1043evpipe_init (EV_P) 1291evpipe_init (EV_P)
1044{ 1292{
1045 if (!ev_is_active (&pipeev)) 1293 if (!ev_is_active (&pipe_w))
1046 { 1294 {
1047#if EV_USE_EVENTFD 1295# if EV_USE_EVENTFD
1296 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1297 if (evfd < 0 && errno == EINVAL)
1048 if ((evfd = eventfd (0, 0)) >= 0) 1298 evfd = eventfd (0, 0);
1299
1300 if (evfd >= 0)
1049 { 1301 {
1050 evpipe [0] = -1; 1302 evpipe [0] = -1;
1051 fd_intern (evfd); 1303 fd_intern (evfd); /* doing it twice doesn't hurt */
1052 ev_io_set (&pipeev, evfd, EV_READ); 1304 ev_io_set (&pipe_w, evfd, EV_READ);
1053 } 1305 }
1054 else 1306 else
1055#endif 1307# endif
1056 { 1308 {
1057 while (pipe (evpipe)) 1309 while (pipe (evpipe))
1058 ev_syserr ("(libev) error creating signal/async pipe"); 1310 ev_syserr ("(libev) error creating signal/async pipe");
1059 1311
1060 fd_intern (evpipe [0]); 1312 fd_intern (evpipe [0]);
1061 fd_intern (evpipe [1]); 1313 fd_intern (evpipe [1]);
1062 ev_io_set (&pipeev, evpipe [0], EV_READ); 1314 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1063 } 1315 }
1064 1316
1065 ev_io_start (EV_A_ &pipeev); 1317 ev_io_start (EV_A_ &pipe_w);
1066 ev_unref (EV_A); /* watcher should not keep loop alive */ 1318 ev_unref (EV_A); /* watcher should not keep loop alive */
1067 } 1319 }
1068} 1320}
1069 1321
1070inline_size void 1322inline_size void
1071evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1323evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1072{ 1324{
1073 if (!*flag) 1325 if (!*flag)
1074 { 1326 {
1075 int old_errno = errno; /* save errno because write might clobber it */ 1327 int old_errno = errno; /* save errno because write might clobber it */
1328 char dummy;
1076 1329
1077 *flag = 1; 1330 *flag = 1;
1078 1331
1079#if EV_USE_EVENTFD 1332#if EV_USE_EVENTFD
1080 if (evfd >= 0) 1333 if (evfd >= 0)
… …
1082 uint64_t counter = 1; 1335 uint64_t counter = 1;
1083 write (evfd, &counter, sizeof (uint64_t)); 1336 write (evfd, &counter, sizeof (uint64_t));
1084 } 1337 }
1085 else 1338 else
1086#endif 1339#endif
1340 /* win32 people keep sending patches that change this write() to send() */
1341 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1342 /* so when you think this write should be a send instead, please find out */
1343 /* where your send() is from - it's definitely not the microsoft send, and */
1344 /* tell me. thank you. */
1087 write (evpipe [1], &old_errno, 1); 1345 write (evpipe [1], &dummy, 1);
1088 1346
1089 errno = old_errno; 1347 errno = old_errno;
1090 } 1348 }
1091} 1349}
1092 1350
1351/* called whenever the libev signal pipe */
1352/* got some events (signal, async) */
1093static void 1353static void
1094pipecb (EV_P_ ev_io *iow, int revents) 1354pipecb (EV_P_ ev_io *iow, int revents)
1095{ 1355{
1356 int i;
1357
1096#if EV_USE_EVENTFD 1358#if EV_USE_EVENTFD
1097 if (evfd >= 0) 1359 if (evfd >= 0)
1098 { 1360 {
1099 uint64_t counter; 1361 uint64_t counter;
1100 read (evfd, &counter, sizeof (uint64_t)); 1362 read (evfd, &counter, sizeof (uint64_t));
1101 } 1363 }
1102 else 1364 else
1103#endif 1365#endif
1104 { 1366 {
1105 char dummy; 1367 char dummy;
1368 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1106 read (evpipe [0], &dummy, 1); 1369 read (evpipe [0], &dummy, 1);
1107 } 1370 }
1108 1371
1109 if (gotsig && ev_is_default_loop (EV_A)) 1372#if EV_SIGNAL_ENABLE
1373 if (sig_pending)
1110 { 1374 {
1111 int signum; 1375 sig_pending = 0;
1112 gotsig = 0;
1113 1376
1114 for (signum = signalmax; signum--; ) 1377 for (i = EV_NSIG - 1; i--; )
1115 if (signals [signum].gotsig) 1378 if (expect_false (signals [i].pending))
1116 ev_feed_signal_event (EV_A_ signum + 1); 1379 ev_feed_signal_event (EV_A_ i + 1);
1117 } 1380 }
1381#endif
1118 1382
1119#if EV_ASYNC_ENABLE 1383#if EV_ASYNC_ENABLE
1120 if (gotasync) 1384 if (async_pending)
1121 { 1385 {
1122 int i; 1386 async_pending = 0;
1123 gotasync = 0;
1124 1387
1125 for (i = asynccnt; i--; ) 1388 for (i = asynccnt; i--; )
1126 if (asyncs [i]->sent) 1389 if (asyncs [i]->sent)
1127 { 1390 {
1128 asyncs [i]->sent = 0; 1391 asyncs [i]->sent = 0;
… …
1132#endif 1395#endif
1133} 1396}
1134 1397
1135/*****************************************************************************/ 1398/*****************************************************************************/
1136 1399
1400void
1401ev_feed_signal (int signum)
1402{
1403#if EV_MULTIPLICITY
1404 EV_P = signals [signum - 1].loop;
1405
1406 if (!EV_A)
1407 return;
1408#endif
1409
1410 signals [signum - 1].pending = 1;
1411 evpipe_write (EV_A_ &sig_pending);
1412}
1413
1137static void 1414static void
1138ev_sighandler (int signum) 1415ev_sighandler (int signum)
1139{ 1416{
1140#if EV_MULTIPLICITY
1141 struct ev_loop *loop = &default_loop_struct;
1142#endif
1143
1144#if _WIN32 1417#ifdef _WIN32
1145 signal (signum, ev_sighandler); 1418 signal (signum, ev_sighandler);
1146#endif 1419#endif
1147 1420
1148 signals [signum - 1].gotsig = 1; 1421 ev_feed_signal (signum);
1149 evpipe_write (EV_A_ &gotsig);
1150} 1422}
1151 1423
1152void noinline 1424void noinline
1153ev_feed_signal_event (EV_P_ int signum) 1425ev_feed_signal_event (EV_P_ int signum)
1154{ 1426{
1155 WL w; 1427 WL w;
1156 1428
1429 if (expect_false (signum <= 0 || signum > EV_NSIG))
1430 return;
1431
1432 --signum;
1433
1157#if EV_MULTIPLICITY 1434#if EV_MULTIPLICITY
1158 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1435 /* it is permissible to try to feed a signal to the wrong loop */
1159#endif 1436 /* or, likely more useful, feeding a signal nobody is waiting for */
1160 1437
1161 --signum; 1438 if (expect_false (signals [signum].loop != EV_A))
1162
1163 if (signum < 0 || signum >= signalmax)
1164 return; 1439 return;
1440#endif
1165 1441
1166 signals [signum].gotsig = 0; 1442 signals [signum].pending = 0;
1167 1443
1168 for (w = signals [signum].head; w; w = w->next) 1444 for (w = signals [signum].head; w; w = w->next)
1169 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1445 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1170} 1446}
1171 1447
1448#if EV_USE_SIGNALFD
1449static void
1450sigfdcb (EV_P_ ev_io *iow, int revents)
1451{
1452 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1453
1454 for (;;)
1455 {
1456 ssize_t res = read (sigfd, si, sizeof (si));
1457
1458 /* not ISO-C, as res might be -1, but works with SuS */
1459 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1460 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1461
1462 if (res < (ssize_t)sizeof (si))
1463 break;
1464 }
1465}
1466#endif
1467
1468#endif
1469
1172/*****************************************************************************/ 1470/*****************************************************************************/
1173 1471
1472#if EV_CHILD_ENABLE
1174static WL childs [EV_PID_HASHSIZE]; 1473static WL childs [EV_PID_HASHSIZE];
1175
1176#ifndef _WIN32
1177 1474
1178static ev_signal childev; 1475static ev_signal childev;
1179 1476
1180#ifndef WIFCONTINUED 1477#ifndef WIFCONTINUED
1181# define WIFCONTINUED(status) 0 1478# define WIFCONTINUED(status) 0
1182#endif 1479#endif
1183 1480
1481/* handle a single child status event */
1184inline_speed void 1482inline_speed void
1185child_reap (EV_P_ int chain, int pid, int status) 1483child_reap (EV_P_ int chain, int pid, int status)
1186{ 1484{
1187 ev_child *w; 1485 ev_child *w;
1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1486 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1189 1487
1190 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1488 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1191 { 1489 {
1192 if ((w->pid == pid || !w->pid) 1490 if ((w->pid == pid || !w->pid)
1193 && (!traced || (w->flags & 1))) 1491 && (!traced || (w->flags & 1)))
1194 { 1492 {
1195 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1493 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1202 1500
1203#ifndef WCONTINUED 1501#ifndef WCONTINUED
1204# define WCONTINUED 0 1502# define WCONTINUED 0
1205#endif 1503#endif
1206 1504
1505/* called on sigchld etc., calls waitpid */
1207static void 1506static void
1208childcb (EV_P_ ev_signal *sw, int revents) 1507childcb (EV_P_ ev_signal *sw, int revents)
1209{ 1508{
1210 int pid, status; 1509 int pid, status;
1211 1510
… …
1219 /* make sure we are called again until all children have been reaped */ 1518 /* 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 */ 1519 /* 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); 1520 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1222 1521
1223 child_reap (EV_A_ pid, pid, status); 1522 child_reap (EV_A_ pid, pid, status);
1224 if (EV_PID_HASHSIZE > 1) 1523 if ((EV_PID_HASHSIZE) > 1)
1225 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1524 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1226} 1525}
1227 1526
1228#endif 1527#endif
1229 1528
1230/*****************************************************************************/ 1529/*****************************************************************************/
1231 1530
1531#if EV_USE_IOCP
1532# include "ev_iocp.c"
1533#endif
1232#if EV_USE_PORT 1534#if EV_USE_PORT
1233# include "ev_port.c" 1535# include "ev_port.c"
1234#endif 1536#endif
1235#if EV_USE_KQUEUE 1537#if EV_USE_KQUEUE
1236# include "ev_kqueue.c" 1538# include "ev_kqueue.c"
… …
1296#ifdef __APPLE__ 1598#ifdef __APPLE__
1297 /* only select works correctly on that "unix-certified" platform */ 1599 /* only select works correctly on that "unix-certified" platform */
1298 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1600 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1299 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1601 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1300#endif 1602#endif
1603#ifdef __FreeBSD__
1604 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1605#endif
1301 1606
1302 return flags; 1607 return flags;
1303} 1608}
1304 1609
1305unsigned int 1610unsigned int
1306ev_embeddable_backends (void) 1611ev_embeddable_backends (void)
1307{ 1612{
1308 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1613 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1309 1614
1310 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1615 /* 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 */ 1616 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1312 flags &= ~EVBACKEND_EPOLL; 1617 flags &= ~EVBACKEND_EPOLL;
1313 1618
1314 return flags; 1619 return flags;
1315} 1620}
1316 1621
1317unsigned int 1622unsigned int
1318ev_backend (EV_P) 1623ev_backend (EV_P)
1319{ 1624{
1320 return backend; 1625 return backend;
1321} 1626}
1322 1627
1628#if EV_FEATURE_API
1323unsigned int 1629unsigned int
1324ev_loop_count (EV_P) 1630ev_iteration (EV_P)
1325{ 1631{
1326 return loop_count; 1632 return loop_count;
1327} 1633}
1328 1634
1635unsigned int
1636ev_depth (EV_P)
1637{
1638 return loop_depth;
1639}
1640
1329void 1641void
1330ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1642ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1331{ 1643{
1332 io_blocktime = interval; 1644 io_blocktime = interval;
1333} 1645}
… …
1336ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1648ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1337{ 1649{
1338 timeout_blocktime = interval; 1650 timeout_blocktime = interval;
1339} 1651}
1340 1652
1653void
1654ev_set_userdata (EV_P_ void *data)
1655{
1656 userdata = data;
1657}
1658
1659void *
1660ev_userdata (EV_P)
1661{
1662 return userdata;
1663}
1664
1665void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1666{
1667 invoke_cb = invoke_pending_cb;
1668}
1669
1670void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1671{
1672 release_cb = release;
1673 acquire_cb = acquire;
1674}
1675#endif
1676
1677/* initialise a loop structure, must be zero-initialised */
1341static void noinline 1678static void noinline
1342loop_init (EV_P_ unsigned int flags) 1679loop_init (EV_P_ unsigned int flags)
1343{ 1680{
1344 if (!backend) 1681 if (!backend)
1345 { 1682 {
1683 origflags = flags;
1684
1346#if EV_USE_REALTIME 1685#if EV_USE_REALTIME
1347 if (!have_realtime) 1686 if (!have_realtime)
1348 { 1687 {
1349 struct timespec ts; 1688 struct timespec ts;
1350 1689
… …
1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1700 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1362 have_monotonic = 1; 1701 have_monotonic = 1;
1363 } 1702 }
1364#endif 1703#endif
1365 1704
1705 /* pid check not overridable via env */
1706#ifndef _WIN32
1707 if (flags & EVFLAG_FORKCHECK)
1708 curpid = getpid ();
1709#endif
1710
1711 if (!(flags & EVFLAG_NOENV)
1712 && !enable_secure ()
1713 && getenv ("LIBEV_FLAGS"))
1714 flags = atoi (getenv ("LIBEV_FLAGS"));
1715
1366 ev_rt_now = ev_time (); 1716 ev_rt_now = ev_time ();
1367 mn_now = get_clock (); 1717 mn_now = get_clock ();
1368 now_floor = mn_now; 1718 now_floor = mn_now;
1369 rtmn_diff = ev_rt_now - mn_now; 1719 rtmn_diff = ev_rt_now - mn_now;
1720#if EV_FEATURE_API
1721 invoke_cb = ev_invoke_pending;
1722#endif
1370 1723
1371 io_blocktime = 0.; 1724 io_blocktime = 0.;
1372 timeout_blocktime = 0.; 1725 timeout_blocktime = 0.;
1373 backend = 0; 1726 backend = 0;
1374 backend_fd = -1; 1727 backend_fd = -1;
1375 gotasync = 0; 1728 sig_pending = 0;
1729#if EV_ASYNC_ENABLE
1730 async_pending = 0;
1731#endif
1376#if EV_USE_INOTIFY 1732#if EV_USE_INOTIFY
1377 fs_fd = -2; 1733 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1378#endif 1734#endif
1379 1735#if EV_USE_SIGNALFD
1380 /* pid check not overridable via env */ 1736 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1381#ifndef _WIN32
1382 if (flags & EVFLAG_FORKCHECK)
1383 curpid = getpid ();
1384#endif 1737#endif
1385 1738
1386 if (!(flags & EVFLAG_NOENV) 1739 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 (); 1740 flags |= ev_recommended_backends ();
1393 1741
1742#if EV_USE_IOCP
1743 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1744#endif
1394#if EV_USE_PORT 1745#if EV_USE_PORT
1395 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1746 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1396#endif 1747#endif
1397#if EV_USE_KQUEUE 1748#if EV_USE_KQUEUE
1398 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1749 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1405#endif 1756#endif
1406#if EV_USE_SELECT 1757#if EV_USE_SELECT
1407 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1758 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1408#endif 1759#endif
1409 1760
1761 ev_prepare_init (&pending_w, pendingcb);
1762
1763#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1410 ev_init (&pipeev, pipecb); 1764 ev_init (&pipe_w, pipecb);
1411 ev_set_priority (&pipeev, EV_MAXPRI); 1765 ev_set_priority (&pipe_w, EV_MAXPRI);
1766#endif
1412 } 1767 }
1413} 1768}
1414 1769
1415static void noinline 1770/* free up a loop structure */
1771void
1416loop_destroy (EV_P) 1772ev_loop_destroy (EV_P)
1417{ 1773{
1418 int i; 1774 int i;
1419 1775
1776#if EV_MULTIPLICITY
1777 /* mimic free (0) */
1778 if (!EV_A)
1779 return;
1780#endif
1781
1782#if EV_CLEANUP_ENABLE
1783 /* queue cleanup watchers (and execute them) */
1784 if (expect_false (cleanupcnt))
1785 {
1786 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1787 EV_INVOKE_PENDING;
1788 }
1789#endif
1790
1791#if EV_CHILD_ENABLE
1792 if (ev_is_active (&childev))
1793 {
1794 ev_ref (EV_A); /* child watcher */
1795 ev_signal_stop (EV_A_ &childev);
1796 }
1797#endif
1798
1420 if (ev_is_active (&pipeev)) 1799 if (ev_is_active (&pipe_w))
1421 { 1800 {
1422 ev_ref (EV_A); /* signal watcher */ 1801 /*ev_ref (EV_A);*/
1423 ev_io_stop (EV_A_ &pipeev); 1802 /*ev_io_stop (EV_A_ &pipe_w);*/
1424 1803
1425#if EV_USE_EVENTFD 1804#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1805 if (evfd >= 0)
1427 close (evfd); 1806 close (evfd);
1428#endif 1807#endif
1429 1808
1430 if (evpipe [0] >= 0) 1809 if (evpipe [0] >= 0)
1431 { 1810 {
1432 close (evpipe [0]); 1811 EV_WIN32_CLOSE_FD (evpipe [0]);
1433 close (evpipe [1]); 1812 EV_WIN32_CLOSE_FD (evpipe [1]);
1434 } 1813 }
1435 } 1814 }
1815
1816#if EV_USE_SIGNALFD
1817 if (ev_is_active (&sigfd_w))
1818 close (sigfd);
1819#endif
1436 1820
1437#if EV_USE_INOTIFY 1821#if EV_USE_INOTIFY
1438 if (fs_fd >= 0) 1822 if (fs_fd >= 0)
1439 close (fs_fd); 1823 close (fs_fd);
1440#endif 1824#endif
1441 1825
1442 if (backend_fd >= 0) 1826 if (backend_fd >= 0)
1443 close (backend_fd); 1827 close (backend_fd);
1444 1828
1829#if EV_USE_IOCP
1830 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1831#endif
1445#if EV_USE_PORT 1832#if EV_USE_PORT
1446 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1833 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1447#endif 1834#endif
1448#if EV_USE_KQUEUE 1835#if EV_USE_KQUEUE
1449 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1836 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1464#if EV_IDLE_ENABLE 1851#if EV_IDLE_ENABLE
1465 array_free (idle, [i]); 1852 array_free (idle, [i]);
1466#endif 1853#endif
1467 } 1854 }
1468 1855
1469 ev_free (anfds); anfdmax = 0; 1856 ev_free (anfds); anfds = 0; anfdmax = 0;
1470 1857
1471 /* have to use the microsoft-never-gets-it-right macro */ 1858 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY); 1859 array_free (rfeed, EMPTY);
1473 array_free (fdchange, EMPTY); 1860 array_free (fdchange, EMPTY);
1474 array_free (timer, EMPTY); 1861 array_free (timer, EMPTY);
… …
1476 array_free (periodic, EMPTY); 1863 array_free (periodic, EMPTY);
1477#endif 1864#endif
1478#if EV_FORK_ENABLE 1865#if EV_FORK_ENABLE
1479 array_free (fork, EMPTY); 1866 array_free (fork, EMPTY);
1480#endif 1867#endif
1868#if EV_CLEANUP_ENABLE
1869 array_free (cleanup, EMPTY);
1870#endif
1481 array_free (prepare, EMPTY); 1871 array_free (prepare, EMPTY);
1482 array_free (check, EMPTY); 1872 array_free (check, EMPTY);
1483#if EV_ASYNC_ENABLE 1873#if EV_ASYNC_ENABLE
1484 array_free (async, EMPTY); 1874 array_free (async, EMPTY);
1485#endif 1875#endif
1486 1876
1487 backend = 0; 1877 backend = 0;
1878
1879#if EV_MULTIPLICITY
1880 if (ev_is_default_loop (EV_A))
1881#endif
1882 ev_default_loop_ptr = 0;
1883#if EV_MULTIPLICITY
1884 else
1885 ev_free (EV_A);
1886#endif
1488} 1887}
1489 1888
1490#if EV_USE_INOTIFY 1889#if EV_USE_INOTIFY
1491inline_size void infy_fork (EV_P); 1890inline_size void infy_fork (EV_P);
1492#endif 1891#endif
… …
1505#endif 1904#endif
1506#if EV_USE_INOTIFY 1905#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1906 infy_fork (EV_A);
1508#endif 1907#endif
1509 1908
1510 if (ev_is_active (&pipeev)) 1909 if (ev_is_active (&pipe_w))
1511 { 1910 {
1512 /* this "locks" the handlers against writing to the pipe */ 1911 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1912 /* while we modify the fd vars */
1514 gotsig = 1; 1913 sig_pending = 1;
1515#if EV_ASYNC_ENABLE 1914#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1915 async_pending = 1;
1517#endif 1916#endif
1518 1917
1519 ev_ref (EV_A); 1918 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1919 ev_io_stop (EV_A_ &pipe_w);
1521 1920
1522#if EV_USE_EVENTFD 1921#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1922 if (evfd >= 0)
1524 close (evfd); 1923 close (evfd);
1525#endif 1924#endif
1526 1925
1527 if (evpipe [0] >= 0) 1926 if (evpipe [0] >= 0)
1528 { 1927 {
1529 close (evpipe [0]); 1928 EV_WIN32_CLOSE_FD (evpipe [0]);
1530 close (evpipe [1]); 1929 EV_WIN32_CLOSE_FD (evpipe [1]);
1531 } 1930 }
1532 1931
1932#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1533 evpipe_init (EV_A); 1933 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1934 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1935 pipecb (EV_A_ &pipe_w, EV_READ);
1936#endif
1536 } 1937 }
1537 1938
1538 postfork = 0; 1939 postfork = 0;
1539} 1940}
1540 1941
1541#if EV_MULTIPLICITY 1942#if EV_MULTIPLICITY
1542 1943
1543struct ev_loop * 1944struct ev_loop *
1544ev_loop_new (unsigned int flags) 1945ev_loop_new (unsigned int flags)
1545{ 1946{
1546 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1947 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1547 1948
1548 memset (loop, 0, sizeof (struct ev_loop)); 1949 memset (EV_A, 0, sizeof (struct ev_loop));
1549
1550 loop_init (EV_A_ flags); 1950 loop_init (EV_A_ flags);
1551 1951
1552 if (ev_backend (EV_A)) 1952 if (ev_backend (EV_A))
1553 return loop; 1953 return EV_A;
1554 1954
1955 ev_free (EV_A);
1555 return 0; 1956 return 0;
1556} 1957}
1557 1958
1558void 1959#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 1960
1571#if EV_VERIFY 1961#if EV_VERIFY
1572static void noinline 1962static void noinline
1573verify_watcher (EV_P_ W w) 1963verify_watcher (EV_P_ W w)
1574{ 1964{
… …
1602 verify_watcher (EV_A_ ws [cnt]); 1992 verify_watcher (EV_A_ ws [cnt]);
1603 } 1993 }
1604} 1994}
1605#endif 1995#endif
1606 1996
1997#if EV_FEATURE_API
1607void 1998void
1608ev_loop_verify (EV_P) 1999ev_verify (EV_P)
1609{ 2000{
1610#if EV_VERIFY 2001#if EV_VERIFY
1611 int i; 2002 int i;
1612 WL w; 2003 WL w;
1613 2004
… …
1647#if EV_FORK_ENABLE 2038#if EV_FORK_ENABLE
1648 assert (forkmax >= forkcnt); 2039 assert (forkmax >= forkcnt);
1649 array_verify (EV_A_ (W *)forks, forkcnt); 2040 array_verify (EV_A_ (W *)forks, forkcnt);
1650#endif 2041#endif
1651 2042
2043#if EV_CLEANUP_ENABLE
2044 assert (cleanupmax >= cleanupcnt);
2045 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2046#endif
2047
1652#if EV_ASYNC_ENABLE 2048#if EV_ASYNC_ENABLE
1653 assert (asyncmax >= asynccnt); 2049 assert (asyncmax >= asynccnt);
1654 array_verify (EV_A_ (W *)asyncs, asynccnt); 2050 array_verify (EV_A_ (W *)asyncs, asynccnt);
1655#endif 2051#endif
1656 2052
2053#if EV_PREPARE_ENABLE
1657 assert (preparemax >= preparecnt); 2054 assert (preparemax >= preparecnt);
1658 array_verify (EV_A_ (W *)prepares, preparecnt); 2055 array_verify (EV_A_ (W *)prepares, preparecnt);
2056#endif
1659 2057
2058#if EV_CHECK_ENABLE
1660 assert (checkmax >= checkcnt); 2059 assert (checkmax >= checkcnt);
1661 array_verify (EV_A_ (W *)checks, checkcnt); 2060 array_verify (EV_A_ (W *)checks, checkcnt);
2061#endif
1662 2062
1663# if 0 2063# if 0
2064#if EV_CHILD_ENABLE
1664 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2065 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) 2066 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2067#endif
1666# endif 2068# endif
1667#endif 2069#endif
1668} 2070}
1669 2071#endif
1670#endif /* multiplicity */
1671 2072
1672#if EV_MULTIPLICITY 2073#if EV_MULTIPLICITY
1673struct ev_loop * 2074struct ev_loop *
1674ev_default_loop_init (unsigned int flags)
1675#else 2075#else
1676int 2076int
2077#endif
1677ev_default_loop (unsigned int flags) 2078ev_default_loop (unsigned int flags)
1678#endif
1679{ 2079{
1680 if (!ev_default_loop_ptr) 2080 if (!ev_default_loop_ptr)
1681 { 2081 {
1682#if EV_MULTIPLICITY 2082#if EV_MULTIPLICITY
1683 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2083 EV_P = ev_default_loop_ptr = &default_loop_struct;
1684#else 2084#else
1685 ev_default_loop_ptr = 1; 2085 ev_default_loop_ptr = 1;
1686#endif 2086#endif
1687 2087
1688 loop_init (EV_A_ flags); 2088 loop_init (EV_A_ flags);
1689 2089
1690 if (ev_backend (EV_A)) 2090 if (ev_backend (EV_A))
1691 { 2091 {
1692#ifndef _WIN32 2092#if EV_CHILD_ENABLE
1693 ev_signal_init (&childev, childcb, SIGCHLD); 2093 ev_signal_init (&childev, childcb, SIGCHLD);
1694 ev_set_priority (&childev, EV_MAXPRI); 2094 ev_set_priority (&childev, EV_MAXPRI);
1695 ev_signal_start (EV_A_ &childev); 2095 ev_signal_start (EV_A_ &childev);
1696 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2096 ev_unref (EV_A); /* child watcher should not keep loop alive */
1697#endif 2097#endif
… …
1702 2102
1703 return ev_default_loop_ptr; 2103 return ev_default_loop_ptr;
1704} 2104}
1705 2105
1706void 2106void
1707ev_default_destroy (void) 2107ev_loop_fork (EV_P)
1708{ 2108{
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 */ 2109 postfork = 1; /* must be in line with ev_default_fork */
1731} 2110}
1732 2111
1733/*****************************************************************************/ 2112/*****************************************************************************/
1734 2113
1735void 2114void
1736ev_invoke (EV_P_ void *w, int revents) 2115ev_invoke (EV_P_ void *w, int revents)
1737{ 2116{
1738 EV_CB_INVOKE ((W)w, revents); 2117 EV_CB_INVOKE ((W)w, revents);
1739} 2118}
1740 2119
1741inline_speed void 2120unsigned int
1742call_pending (EV_P) 2121ev_pending_count (EV_P)
2122{
2123 int pri;
2124 unsigned int count = 0;
2125
2126 for (pri = NUMPRI; pri--; )
2127 count += pendingcnt [pri];
2128
2129 return count;
2130}
2131
2132void noinline
2133ev_invoke_pending (EV_P)
1743{ 2134{
1744 int pri; 2135 int pri;
1745 2136
1746 for (pri = NUMPRI; pri--; ) 2137 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 2138 while (pendingcnt [pri])
1748 { 2139 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2140 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 2141
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; 2142 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 2143 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 2144 EV_FREQUENT_CHECK;
1758 }
1759 } 2145 }
1760} 2146}
1761 2147
1762#if EV_IDLE_ENABLE 2148#if EV_IDLE_ENABLE
2149/* make idle watchers pending. this handles the "call-idle */
2150/* only when higher priorities are idle" logic */
1763inline_size void 2151inline_size void
1764idle_reify (EV_P) 2152idle_reify (EV_P)
1765{ 2153{
1766 if (expect_false (idleall)) 2154 if (expect_false (idleall))
1767 { 2155 {
… …
1780 } 2168 }
1781 } 2169 }
1782} 2170}
1783#endif 2171#endif
1784 2172
2173/* make timers pending */
1785inline_size void 2174inline_size void
1786timers_reify (EV_P) 2175timers_reify (EV_P)
1787{ 2176{
1788 EV_FREQUENT_CHECK; 2177 EV_FREQUENT_CHECK;
1789 2178
… …
1813 EV_FREQUENT_CHECK; 2202 EV_FREQUENT_CHECK;
1814 feed_reverse (EV_A_ (W)w); 2203 feed_reverse (EV_A_ (W)w);
1815 } 2204 }
1816 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2205 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1817 2206
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 2207 feed_reverse_done (EV_A_ EV_TIMER);
1819 } 2208 }
1820} 2209}
1821 2210
1822#if EV_PERIODIC_ENABLE 2211#if EV_PERIODIC_ENABLE
2212
2213inline_speed void
2214periodic_recalc (EV_P_ ev_periodic *w)
2215{
2216 /* TODO: use slow but potentially more correct incremental algo, */
2217 /* also do not rely on ceil */
2218 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2219}
2220
2221/* make periodics pending */
1823inline_size void 2222inline_size void
1824periodics_reify (EV_P) 2223periodics_reify (EV_P)
1825{ 2224{
1826 EV_FREQUENT_CHECK; 2225 EV_FREQUENT_CHECK;
1827 2226
… …
1845 ANHE_at_cache (periodics [HEAP0]); 2244 ANHE_at_cache (periodics [HEAP0]);
1846 downheap (periodics, periodiccnt, HEAP0); 2245 downheap (periodics, periodiccnt, HEAP0);
1847 } 2246 }
1848 else if (w->interval) 2247 else if (w->interval)
1849 { 2248 {
1850 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2249 periodic_recalc (EV_A_ w);
2250
1851 /* if next trigger time is not sufficiently in the future, put it there */ 2251 /* if next trigger time is not sufficiently in the future, put it there */
1852 /* this might happen because of floating point inexactness */ 2252 /* this might happen because of floating point inexactness */
1853 if (ev_at (w) - ev_rt_now < TIME_EPSILON) 2253 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1854 { 2254 {
1855 ev_at (w) += w->interval; 2255 ev_at (w) += w->interval;
… …
1874 2274
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 2275 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 2276 }
1877} 2277}
1878 2278
2279/* simply recalculate all periodics */
2280/* TODO: maybe ensure that at least one event happens when jumping forward? */
1879static void noinline 2281static void noinline
1880periodics_reschedule (EV_P) 2282periodics_reschedule (EV_P)
1881{ 2283{
1882 int i; 2284 int i;
1883 2285
… …
1887 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2289 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1888 2290
1889 if (w->reschedule_cb) 2291 if (w->reschedule_cb)
1890 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2292 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1891 else if (w->interval) 2293 else if (w->interval)
1892 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2294 periodic_recalc (EV_A_ w);
1893 2295
1894 ANHE_at_cache (periodics [i]); 2296 ANHE_at_cache (periodics [i]);
1895 } 2297 }
1896 2298
1897 reheap (periodics, periodiccnt); 2299 reheap (periodics, periodiccnt);
1898} 2300}
1899#endif 2301#endif
1900 2302
2303/* adjust all timers by a given offset */
1901static void noinline 2304static void noinline
1902timers_reschedule (EV_P_ ev_tstamp adjust) 2305timers_reschedule (EV_P_ ev_tstamp adjust)
1903{ 2306{
1904 int i; 2307 int i;
1905 2308
… …
1909 ANHE_w (*he)->at += adjust; 2312 ANHE_w (*he)->at += adjust;
1910 ANHE_at_cache (*he); 2313 ANHE_at_cache (*he);
1911 } 2314 }
1912} 2315}
1913 2316
2317/* fetch new monotonic and realtime times from the kernel */
2318/* also detect if there was a timejump, and act accordingly */
1914inline_speed void 2319inline_speed void
1915time_update (EV_P_ ev_tstamp max_block) 2320time_update (EV_P_ ev_tstamp max_block)
1916{ 2321{
1917 int i;
1918
1919#if EV_USE_MONOTONIC 2322#if EV_USE_MONOTONIC
1920 if (expect_true (have_monotonic)) 2323 if (expect_true (have_monotonic))
1921 { 2324 {
2325 int i;
1922 ev_tstamp odiff = rtmn_diff; 2326 ev_tstamp odiff = rtmn_diff;
1923 2327
1924 mn_now = get_clock (); 2328 mn_now = get_clock ();
1925 2329
1926 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2330 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1976 2380
1977 mn_now = ev_rt_now; 2381 mn_now = ev_rt_now;
1978 } 2382 }
1979} 2383}
1980 2384
1981static int loop_done;
1982
1983void 2385void
1984ev_loop (EV_P_ int flags) 2386ev_run (EV_P_ int flags)
1985{ 2387{
2388#if EV_FEATURE_API
2389 ++loop_depth;
2390#endif
2391
2392 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2393
1986 loop_done = EVUNLOOP_CANCEL; 2394 loop_done = EVBREAK_CANCEL;
1987 2395
1988 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2396 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1989 2397
1990 do 2398 do
1991 { 2399 {
1992#if EV_VERIFY >= 2 2400#if EV_VERIFY >= 2
1993 ev_loop_verify (EV_A); 2401 ev_verify (EV_A);
1994#endif 2402#endif
1995 2403
1996#ifndef _WIN32 2404#ifndef _WIN32
1997 if (expect_false (curpid)) /* penalise the forking check even more */ 2405 if (expect_false (curpid)) /* penalise the forking check even more */
1998 if (expect_false (getpid () != curpid)) 2406 if (expect_false (getpid () != curpid))
… …
2006 /* we might have forked, so queue fork handlers */ 2414 /* we might have forked, so queue fork handlers */
2007 if (expect_false (postfork)) 2415 if (expect_false (postfork))
2008 if (forkcnt) 2416 if (forkcnt)
2009 { 2417 {
2010 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2418 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2011 call_pending (EV_A); 2419 EV_INVOKE_PENDING;
2012 } 2420 }
2013#endif 2421#endif
2014 2422
2423#if EV_PREPARE_ENABLE
2015 /* queue prepare watchers (and execute them) */ 2424 /* queue prepare watchers (and execute them) */
2016 if (expect_false (preparecnt)) 2425 if (expect_false (preparecnt))
2017 { 2426 {
2018 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2427 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2019 call_pending (EV_A); 2428 EV_INVOKE_PENDING;
2020 } 2429 }
2430#endif
2431
2432 if (expect_false (loop_done))
2433 break;
2021 2434
2022 /* we might have forked, so reify kernel state if necessary */ 2435 /* we might have forked, so reify kernel state if necessary */
2023 if (expect_false (postfork)) 2436 if (expect_false (postfork))
2024 loop_fork (EV_A); 2437 loop_fork (EV_A);
2025 2438
… …
2029 /* calculate blocking time */ 2442 /* calculate blocking time */
2030 { 2443 {
2031 ev_tstamp waittime = 0.; 2444 ev_tstamp waittime = 0.;
2032 ev_tstamp sleeptime = 0.; 2445 ev_tstamp sleeptime = 0.;
2033 2446
2447 /* remember old timestamp for io_blocktime calculation */
2448 ev_tstamp prev_mn_now = mn_now;
2449
2450 /* update time to cancel out callback processing overhead */
2451 time_update (EV_A_ 1e100);
2452
2034 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2453 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2035 { 2454 {
2036 /* update time to cancel out callback processing overhead */ 2455 waittime = MAX_BLOCKTIME;
2037 time_update (EV_A_ 1e100);
2038 2456
2039 if (timercnt) 2457 if (timercnt)
2040 { 2458 {
2041 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2459 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2042 if (waittime > to) waittime = to; 2460 if (waittime > to) waittime = to;
… …
2048 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2466 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2049 if (waittime > to) waittime = to; 2467 if (waittime > to) waittime = to;
2050 } 2468 }
2051#endif 2469#endif
2052 2470
2471 /* don't let timeouts decrease the waittime below timeout_blocktime */
2053 if (expect_false (waittime < timeout_blocktime)) 2472 if (expect_false (waittime < timeout_blocktime))
2054 waittime = timeout_blocktime; 2473 waittime = timeout_blocktime;
2055 2474
2056 sleeptime = waittime - backend_fudge; 2475 /* extra check because io_blocktime is commonly 0 */
2057
2058 if (expect_true (sleeptime > io_blocktime)) 2476 if (expect_false (io_blocktime))
2059 sleeptime = io_blocktime;
2060
2061 if (sleeptime)
2062 { 2477 {
2478 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2479
2480 if (sleeptime > waittime - backend_fudge)
2481 sleeptime = waittime - backend_fudge;
2482
2483 if (expect_true (sleeptime > 0.))
2484 {
2063 ev_sleep (sleeptime); 2485 ev_sleep (sleeptime);
2064 waittime -= sleeptime; 2486 waittime -= sleeptime;
2487 }
2065 } 2488 }
2066 } 2489 }
2067 2490
2491#if EV_FEATURE_API
2068 ++loop_count; 2492 ++loop_count;
2493#endif
2494 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2069 backend_poll (EV_A_ waittime); 2495 backend_poll (EV_A_ waittime);
2496 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2070 2497
2071 /* update ev_rt_now, do magic */ 2498 /* update ev_rt_now, do magic */
2072 time_update (EV_A_ waittime + sleeptime); 2499 time_update (EV_A_ waittime + sleeptime);
2073 } 2500 }
2074 2501
… …
2081#if EV_IDLE_ENABLE 2508#if EV_IDLE_ENABLE
2082 /* queue idle watchers unless other events are pending */ 2509 /* queue idle watchers unless other events are pending */
2083 idle_reify (EV_A); 2510 idle_reify (EV_A);
2084#endif 2511#endif
2085 2512
2513#if EV_CHECK_ENABLE
2086 /* queue check watchers, to be executed first */ 2514 /* queue check watchers, to be executed first */
2087 if (expect_false (checkcnt)) 2515 if (expect_false (checkcnt))
2088 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2516 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2517#endif
2089 2518
2090 call_pending (EV_A); 2519 EV_INVOKE_PENDING;
2091 } 2520 }
2092 while (expect_true ( 2521 while (expect_true (
2093 activecnt 2522 activecnt
2094 && !loop_done 2523 && !loop_done
2095 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2524 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2096 )); 2525 ));
2097 2526
2098 if (loop_done == EVUNLOOP_ONE) 2527 if (loop_done == EVBREAK_ONE)
2099 loop_done = EVUNLOOP_CANCEL; 2528 loop_done = EVBREAK_CANCEL;
2100}
2101 2529
2530#if EV_FEATURE_API
2531 --loop_depth;
2532#endif
2533}
2534
2102void 2535void
2103ev_unloop (EV_P_ int how) 2536ev_break (EV_P_ int how)
2104{ 2537{
2105 loop_done = how; 2538 loop_done = how;
2106} 2539}
2107 2540
2108void 2541void
… …
2135 ev_tstamp mn_prev = mn_now; 2568 ev_tstamp mn_prev = mn_now;
2136 2569
2137 ev_now_update (EV_A); 2570 ev_now_update (EV_A);
2138 timers_reschedule (EV_A_ mn_now - mn_prev); 2571 timers_reschedule (EV_A_ mn_now - mn_prev);
2139#if EV_PERIODIC_ENABLE 2572#if EV_PERIODIC_ENABLE
2573 /* TODO: really do this? */
2140 periodics_reschedule (EV_A); 2574 periodics_reschedule (EV_A);
2141#endif 2575#endif
2142} 2576}
2143 2577
2144/*****************************************************************************/ 2578/*****************************************************************************/
2579/* singly-linked list management, used when the expected list length is short */
2145 2580
2146inline_size void 2581inline_size void
2147wlist_add (WL *head, WL elem) 2582wlist_add (WL *head, WL elem)
2148{ 2583{
2149 elem->next = *head; 2584 elem->next = *head;
… …
2153inline_size void 2588inline_size void
2154wlist_del (WL *head, WL elem) 2589wlist_del (WL *head, WL elem)
2155{ 2590{
2156 while (*head) 2591 while (*head)
2157 { 2592 {
2158 if (*head == elem) 2593 if (expect_true (*head == elem))
2159 { 2594 {
2160 *head = elem->next; 2595 *head = elem->next;
2161 return; 2596 break;
2162 } 2597 }
2163 2598
2164 head = &(*head)->next; 2599 head = &(*head)->next;
2165 } 2600 }
2166} 2601}
2167 2602
2603/* internal, faster, version of ev_clear_pending */
2168inline_speed void 2604inline_speed void
2169clear_pending (EV_P_ W w) 2605clear_pending (EV_P_ W w)
2170{ 2606{
2171 if (w->pending) 2607 if (w->pending)
2172 { 2608 {
2173 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2609 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2174 w->pending = 0; 2610 w->pending = 0;
2175 } 2611 }
2176} 2612}
2177 2613
2178int 2614int
… …
2182 int pending = w_->pending; 2618 int pending = w_->pending;
2183 2619
2184 if (expect_true (pending)) 2620 if (expect_true (pending))
2185 { 2621 {
2186 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2622 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2623 p->w = (W)&pending_w;
2187 w_->pending = 0; 2624 w_->pending = 0;
2188 p->w = 0;
2189 return p->events; 2625 return p->events;
2190 } 2626 }
2191 else 2627 else
2192 return 0; 2628 return 0;
2193} 2629}
2194 2630
2195inline_size void 2631inline_size void
2196pri_adjust (EV_P_ W w) 2632pri_adjust (EV_P_ W w)
2197{ 2633{
2198 int pri = w->priority; 2634 int pri = ev_priority (w);
2199 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2635 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2200 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2636 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2201 w->priority = pri; 2637 ev_set_priority (w, pri);
2202} 2638}
2203 2639
2204inline_speed void 2640inline_speed void
2205ev_start (EV_P_ W w, int active) 2641ev_start (EV_P_ W w, int active)
2206{ 2642{
… …
2225 2661
2226 if (expect_false (ev_is_active (w))) 2662 if (expect_false (ev_is_active (w)))
2227 return; 2663 return;
2228 2664
2229 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2665 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)))); 2666 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2231 2667
2232 EV_FREQUENT_CHECK; 2668 EV_FREQUENT_CHECK;
2233 2669
2234 ev_start (EV_A_ (W)w, 1); 2670 ev_start (EV_A_ (W)w, 1);
2235 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2671 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2236 wlist_add (&anfds[fd].head, (WL)w); 2672 wlist_add (&anfds[fd].head, (WL)w);
2237 2673
2238 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2674 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2239 w->events &= ~EV__IOFDSET; 2675 w->events &= ~EV__IOFDSET;
2240 2676
2241 EV_FREQUENT_CHECK; 2677 EV_FREQUENT_CHECK;
2242} 2678}
2243 2679
… …
2253 EV_FREQUENT_CHECK; 2689 EV_FREQUENT_CHECK;
2254 2690
2255 wlist_del (&anfds[w->fd].head, (WL)w); 2691 wlist_del (&anfds[w->fd].head, (WL)w);
2256 ev_stop (EV_A_ (W)w); 2692 ev_stop (EV_A_ (W)w);
2257 2693
2258 fd_change (EV_A_ w->fd, 1); 2694 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2259 2695
2260 EV_FREQUENT_CHECK; 2696 EV_FREQUENT_CHECK;
2261} 2697}
2262 2698
2263void noinline 2699void noinline
… …
2305 timers [active] = timers [timercnt + HEAP0]; 2741 timers [active] = timers [timercnt + HEAP0];
2306 adjustheap (timers, timercnt, active); 2742 adjustheap (timers, timercnt, active);
2307 } 2743 }
2308 } 2744 }
2309 2745
2310 EV_FREQUENT_CHECK;
2311
2312 ev_at (w) -= mn_now; 2746 ev_at (w) -= mn_now;
2313 2747
2314 ev_stop (EV_A_ (W)w); 2748 ev_stop (EV_A_ (W)w);
2749
2750 EV_FREQUENT_CHECK;
2315} 2751}
2316 2752
2317void noinline 2753void noinline
2318ev_timer_again (EV_P_ ev_timer *w) 2754ev_timer_again (EV_P_ ev_timer *w)
2319{ 2755{
… …
2337 } 2773 }
2338 2774
2339 EV_FREQUENT_CHECK; 2775 EV_FREQUENT_CHECK;
2340} 2776}
2341 2777
2778ev_tstamp
2779ev_timer_remaining (EV_P_ ev_timer *w)
2780{
2781 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2782}
2783
2342#if EV_PERIODIC_ENABLE 2784#if EV_PERIODIC_ENABLE
2343void noinline 2785void noinline
2344ev_periodic_start (EV_P_ ev_periodic *w) 2786ev_periodic_start (EV_P_ ev_periodic *w)
2345{ 2787{
2346 if (expect_false (ev_is_active (w))) 2788 if (expect_false (ev_is_active (w)))
… …
2349 if (w->reschedule_cb) 2791 if (w->reschedule_cb)
2350 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2792 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2351 else if (w->interval) 2793 else if (w->interval)
2352 { 2794 {
2353 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2795 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 */ 2796 periodic_recalc (EV_A_ w);
2355 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2356 } 2797 }
2357 else 2798 else
2358 ev_at (w) = w->offset; 2799 ev_at (w) = w->offset;
2359 2800
2360 EV_FREQUENT_CHECK; 2801 EV_FREQUENT_CHECK;
… …
2392 periodics [active] = periodics [periodiccnt + HEAP0]; 2833 periodics [active] = periodics [periodiccnt + HEAP0];
2393 adjustheap (periodics, periodiccnt, active); 2834 adjustheap (periodics, periodiccnt, active);
2394 } 2835 }
2395 } 2836 }
2396 2837
2397 EV_FREQUENT_CHECK;
2398
2399 ev_stop (EV_A_ (W)w); 2838 ev_stop (EV_A_ (W)w);
2839
2840 EV_FREQUENT_CHECK;
2400} 2841}
2401 2842
2402void noinline 2843void noinline
2403ev_periodic_again (EV_P_ ev_periodic *w) 2844ev_periodic_again (EV_P_ ev_periodic *w)
2404{ 2845{
… …
2410 2851
2411#ifndef SA_RESTART 2852#ifndef SA_RESTART
2412# define SA_RESTART 0 2853# define SA_RESTART 0
2413#endif 2854#endif
2414 2855
2856#if EV_SIGNAL_ENABLE
2857
2415void noinline 2858void noinline
2416ev_signal_start (EV_P_ ev_signal *w) 2859ev_signal_start (EV_P_ ev_signal *w)
2417{ 2860{
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))) 2861 if (expect_false (ev_is_active (w)))
2422 return; 2862 return;
2423 2863
2424 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2864 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2425 2865
2426 evpipe_init (EV_A); 2866#if EV_MULTIPLICITY
2867 assert (("libev: a signal must not be attached to two different loops",
2868 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2427 2869
2428 EV_FREQUENT_CHECK; 2870 signals [w->signum - 1].loop = EV_A;
2871#endif
2429 2872
2873 EV_FREQUENT_CHECK;
2874
2875#if EV_USE_SIGNALFD
2876 if (sigfd == -2)
2430 { 2877 {
2431#ifndef _WIN32 2878 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2432 sigset_t full, prev; 2879 if (sigfd < 0 && errno == EINVAL)
2433 sigfillset (&full); 2880 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2434 sigprocmask (SIG_SETMASK, &full, &prev);
2435#endif
2436 2881
2437 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2882 if (sigfd >= 0)
2883 {
2884 fd_intern (sigfd); /* doing it twice will not hurt */
2438 2885
2439#ifndef _WIN32 2886 sigemptyset (&sigfd_set);
2440 sigprocmask (SIG_SETMASK, &prev, 0); 2887
2441#endif 2888 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2889 ev_set_priority (&sigfd_w, EV_MAXPRI);
2890 ev_io_start (EV_A_ &sigfd_w);
2891 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2892 }
2442 } 2893 }
2894
2895 if (sigfd >= 0)
2896 {
2897 /* TODO: check .head */
2898 sigaddset (&sigfd_set, w->signum);
2899 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2900
2901 signalfd (sigfd, &sigfd_set, 0);
2902 }
2903#endif
2443 2904
2444 ev_start (EV_A_ (W)w, 1); 2905 ev_start (EV_A_ (W)w, 1);
2445 wlist_add (&signals [w->signum - 1].head, (WL)w); 2906 wlist_add (&signals [w->signum - 1].head, (WL)w);
2446 2907
2447 if (!((WL)w)->next) 2908 if (!((WL)w)->next)
2909# if EV_USE_SIGNALFD
2910 if (sigfd < 0) /*TODO*/
2911# endif
2448 { 2912 {
2449#if _WIN32 2913# ifdef _WIN32
2914 evpipe_init (EV_A);
2915
2450 signal (w->signum, ev_sighandler); 2916 signal (w->signum, ev_sighandler);
2451#else 2917# else
2452 struct sigaction sa; 2918 struct sigaction sa;
2919
2920 evpipe_init (EV_A);
2921
2453 sa.sa_handler = ev_sighandler; 2922 sa.sa_handler = ev_sighandler;
2454 sigfillset (&sa.sa_mask); 2923 sigfillset (&sa.sa_mask);
2455 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2924 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2456 sigaction (w->signum, &sa, 0); 2925 sigaction (w->signum, &sa, 0);
2926
2927 if (origflags & EVFLAG_NOSIGMASK)
2928 {
2929 sigemptyset (&sa.sa_mask);
2930 sigaddset (&sa.sa_mask, w->signum);
2931 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2932 }
2457#endif 2933#endif
2458 } 2934 }
2459 2935
2460 EV_FREQUENT_CHECK; 2936 EV_FREQUENT_CHECK;
2461} 2937}
2462 2938
2463void noinline 2939void noinline
… …
2471 2947
2472 wlist_del (&signals [w->signum - 1].head, (WL)w); 2948 wlist_del (&signals [w->signum - 1].head, (WL)w);
2473 ev_stop (EV_A_ (W)w); 2949 ev_stop (EV_A_ (W)w);
2474 2950
2475 if (!signals [w->signum - 1].head) 2951 if (!signals [w->signum - 1].head)
2952 {
2953#if EV_MULTIPLICITY
2954 signals [w->signum - 1].loop = 0; /* unattach from signal */
2955#endif
2956#if EV_USE_SIGNALFD
2957 if (sigfd >= 0)
2958 {
2959 sigset_t ss;
2960
2961 sigemptyset (&ss);
2962 sigaddset (&ss, w->signum);
2963 sigdelset (&sigfd_set, w->signum);
2964
2965 signalfd (sigfd, &sigfd_set, 0);
2966 sigprocmask (SIG_UNBLOCK, &ss, 0);
2967 }
2968 else
2969#endif
2476 signal (w->signum, SIG_DFL); 2970 signal (w->signum, SIG_DFL);
2971 }
2477 2972
2478 EV_FREQUENT_CHECK; 2973 EV_FREQUENT_CHECK;
2479} 2974}
2975
2976#endif
2977
2978#if EV_CHILD_ENABLE
2480 2979
2481void 2980void
2482ev_child_start (EV_P_ ev_child *w) 2981ev_child_start (EV_P_ ev_child *w)
2483{ 2982{
2484#if EV_MULTIPLICITY 2983#if EV_MULTIPLICITY
… …
2488 return; 2987 return;
2489 2988
2490 EV_FREQUENT_CHECK; 2989 EV_FREQUENT_CHECK;
2491 2990
2492 ev_start (EV_A_ (W)w, 1); 2991 ev_start (EV_A_ (W)w, 1);
2493 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2992 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2494 2993
2495 EV_FREQUENT_CHECK; 2994 EV_FREQUENT_CHECK;
2496} 2995}
2497 2996
2498void 2997void
… …
2502 if (expect_false (!ev_is_active (w))) 3001 if (expect_false (!ev_is_active (w)))
2503 return; 3002 return;
2504 3003
2505 EV_FREQUENT_CHECK; 3004 EV_FREQUENT_CHECK;
2506 3005
2507 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3006 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2508 ev_stop (EV_A_ (W)w); 3007 ev_stop (EV_A_ (W)w);
2509 3008
2510 EV_FREQUENT_CHECK; 3009 EV_FREQUENT_CHECK;
2511} 3010}
3011
3012#endif
2512 3013
2513#if EV_STAT_ENABLE 3014#if EV_STAT_ENABLE
2514 3015
2515# ifdef _WIN32 3016# ifdef _WIN32
2516# undef lstat 3017# undef lstat
… …
2522#define MIN_STAT_INTERVAL 0.1074891 3023#define MIN_STAT_INTERVAL 0.1074891
2523 3024
2524static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 3025static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2525 3026
2526#if EV_USE_INOTIFY 3027#if EV_USE_INOTIFY
2527# define EV_INOTIFY_BUFSIZE 8192 3028
3029/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
3030# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2528 3031
2529static void noinline 3032static void noinline
2530infy_add (EV_P_ ev_stat *w) 3033infy_add (EV_P_ ev_stat *w)
2531{ 3034{
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); 3035 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 3036
2534 if (w->wd < 0) 3037 if (w->wd >= 0)
3038 {
3039 struct statfs sfs;
3040
3041 /* now local changes will be tracked by inotify, but remote changes won't */
3042 /* unless the filesystem is known to be local, we therefore still poll */
3043 /* also do poll on <2.6.25, but with normal frequency */
3044
3045 if (!fs_2625)
3046 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3047 else if (!statfs (w->path, &sfs)
3048 && (sfs.f_type == 0x1373 /* devfs */
3049 || sfs.f_type == 0xEF53 /* ext2/3 */
3050 || sfs.f_type == 0x3153464a /* jfs */
3051 || sfs.f_type == 0x52654973 /* reiser3 */
3052 || sfs.f_type == 0x01021994 /* tempfs */
3053 || sfs.f_type == 0x58465342 /* xfs */))
3054 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3055 else
3056 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2535 { 3057 }
3058 else
3059 {
3060 /* can't use inotify, continue to stat */
2536 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3061 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 3062
2539 /* monitor some parent directory for speedup hints */ 3063 /* 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, */ 3064 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2541 /* but an efficiency issue only */ 3065 /* but an efficiency issue only */
2542 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3066 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2543 { 3067 {
2544 char path [4096]; 3068 char path [4096];
… …
2560 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3084 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2561 } 3085 }
2562 } 3086 }
2563 3087
2564 if (w->wd >= 0) 3088 if (w->wd >= 0)
2565 {
2566 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3089 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2567 3090
2568 /* now local changes will be tracked by inotify, but remote changes won't */ 3091 /* now re-arm timer, if required */
2569 /* unless the filesystem it known to be local, we therefore still poll */ 3092 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); 3093 ev_timer_again (EV_A_ &w->timer);
2584 } 3094 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2585} 3095}
2586 3096
2587static void noinline 3097static void noinline
2588infy_del (EV_P_ ev_stat *w) 3098infy_del (EV_P_ ev_stat *w)
2589{ 3099{
… …
2592 3102
2593 if (wd < 0) 3103 if (wd < 0)
2594 return; 3104 return;
2595 3105
2596 w->wd = -2; 3106 w->wd = -2;
2597 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3107 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2598 wlist_del (&fs_hash [slot].head, (WL)w); 3108 wlist_del (&fs_hash [slot].head, (WL)w);
2599 3109
2600 /* remove this watcher, if others are watching it, they will rearm */ 3110 /* remove this watcher, if others are watching it, they will rearm */
2601 inotify_rm_watch (fs_fd, wd); 3111 inotify_rm_watch (fs_fd, wd);
2602} 3112}
… …
2604static void noinline 3114static void noinline
2605infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3115infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2606{ 3116{
2607 if (slot < 0) 3117 if (slot < 0)
2608 /* overflow, need to check for all hash slots */ 3118 /* overflow, need to check for all hash slots */
2609 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3119 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2610 infy_wd (EV_A_ slot, wd, ev); 3120 infy_wd (EV_A_ slot, wd, ev);
2611 else 3121 else
2612 { 3122 {
2613 WL w_; 3123 WL w_;
2614 3124
2615 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3125 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2616 { 3126 {
2617 ev_stat *w = (ev_stat *)w_; 3127 ev_stat *w = (ev_stat *)w_;
2618 w_ = w_->next; /* lets us remove this watcher and all before it */ 3128 w_ = w_->next; /* lets us remove this watcher and all before it */
2619 3129
2620 if (w->wd == wd || wd == -1) 3130 if (w->wd == wd || wd == -1)
2621 { 3131 {
2622 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3132 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2623 { 3133 {
2624 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3134 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2625 w->wd = -1; 3135 w->wd = -1;
2626 infy_add (EV_A_ w); /* re-add, no matter what */ 3136 infy_add (EV_A_ w); /* re-add, no matter what */
2627 } 3137 }
2628 3138
2629 stat_timer_cb (EV_A_ &w->timer, 0); 3139 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2634 3144
2635static void 3145static void
2636infy_cb (EV_P_ ev_io *w, int revents) 3146infy_cb (EV_P_ ev_io *w, int revents)
2637{ 3147{
2638 char buf [EV_INOTIFY_BUFSIZE]; 3148 char buf [EV_INOTIFY_BUFSIZE];
2639 struct inotify_event *ev = (struct inotify_event *)buf;
2640 int ofs; 3149 int ofs;
2641 int len = read (fs_fd, buf, sizeof (buf)); 3150 int len = read (fs_fd, buf, sizeof (buf));
2642 3151
2643 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3152 for (ofs = 0; ofs < len; )
3153 {
3154 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2644 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3155 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3156 ofs += sizeof (struct inotify_event) + ev->len;
3157 }
2645} 3158}
2646 3159
2647inline_size void 3160inline_size void
2648check_2625 (EV_P) 3161ev_check_2625 (EV_P)
2649{ 3162{
2650 /* kernels < 2.6.25 are borked 3163 /* kernels < 2.6.25 are borked
2651 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3164 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2652 */ 3165 */
2653 struct utsname buf; 3166 if (ev_linux_version () < 0x020619)
2654 int major, minor, micro;
2655
2656 if (uname (&buf))
2657 return; 3167 return;
2658 3168
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; 3169 fs_2625 = 1;
3170}
3171
3172inline_size int
3173infy_newfd (void)
3174{
3175#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3176 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3177 if (fd >= 0)
3178 return fd;
3179#endif
3180 return inotify_init ();
2668} 3181}
2669 3182
2670inline_size void 3183inline_size void
2671infy_init (EV_P) 3184infy_init (EV_P)
2672{ 3185{
2673 if (fs_fd != -2) 3186 if (fs_fd != -2)
2674 return; 3187 return;
2675 3188
2676 fs_fd = -1; 3189 fs_fd = -1;
2677 3190
2678 check_2625 (EV_A); 3191 ev_check_2625 (EV_A);
2679 3192
2680 fs_fd = inotify_init (); 3193 fs_fd = infy_newfd ();
2681 3194
2682 if (fs_fd >= 0) 3195 if (fs_fd >= 0)
2683 { 3196 {
3197 fd_intern (fs_fd);
2684 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3198 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2685 ev_set_priority (&fs_w, EV_MAXPRI); 3199 ev_set_priority (&fs_w, EV_MAXPRI);
2686 ev_io_start (EV_A_ &fs_w); 3200 ev_io_start (EV_A_ &fs_w);
3201 ev_unref (EV_A);
2687 } 3202 }
2688} 3203}
2689 3204
2690inline_size void 3205inline_size void
2691infy_fork (EV_P) 3206infy_fork (EV_P)
… …
2693 int slot; 3208 int slot;
2694 3209
2695 if (fs_fd < 0) 3210 if (fs_fd < 0)
2696 return; 3211 return;
2697 3212
3213 ev_ref (EV_A);
3214 ev_io_stop (EV_A_ &fs_w);
2698 close (fs_fd); 3215 close (fs_fd);
2699 fs_fd = inotify_init (); 3216 fs_fd = infy_newfd ();
2700 3217
3218 if (fs_fd >= 0)
3219 {
3220 fd_intern (fs_fd);
3221 ev_io_set (&fs_w, fs_fd, EV_READ);
3222 ev_io_start (EV_A_ &fs_w);
3223 ev_unref (EV_A);
3224 }
3225
2701 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3226 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2702 { 3227 {
2703 WL w_ = fs_hash [slot].head; 3228 WL w_ = fs_hash [slot].head;
2704 fs_hash [slot].head = 0; 3229 fs_hash [slot].head = 0;
2705 3230
2706 while (w_) 3231 while (w_)
… …
2711 w->wd = -1; 3236 w->wd = -1;
2712 3237
2713 if (fs_fd >= 0) 3238 if (fs_fd >= 0)
2714 infy_add (EV_A_ w); /* re-add, no matter what */ 3239 infy_add (EV_A_ w); /* re-add, no matter what */
2715 else 3240 else
3241 {
3242 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3243 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2716 ev_timer_again (EV_A_ &w->timer); 3244 ev_timer_again (EV_A_ &w->timer);
3245 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3246 }
2717 } 3247 }
2718 } 3248 }
2719} 3249}
2720 3250
2721#endif 3251#endif
… …
2738static void noinline 3268static void noinline
2739stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3269stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2740{ 3270{
2741 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3271 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2742 3272
2743 /* we copy this here each the time so that */ 3273 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); 3274 ev_stat_stat (EV_A_ w);
2747 3275
2748 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3276 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2749 if ( 3277 if (
2750 w->prev.st_dev != w->attr.st_dev 3278 prev.st_dev != w->attr.st_dev
2751 || w->prev.st_ino != w->attr.st_ino 3279 || prev.st_ino != w->attr.st_ino
2752 || w->prev.st_mode != w->attr.st_mode 3280 || prev.st_mode != w->attr.st_mode
2753 || w->prev.st_nlink != w->attr.st_nlink 3281 || prev.st_nlink != w->attr.st_nlink
2754 || w->prev.st_uid != w->attr.st_uid 3282 || prev.st_uid != w->attr.st_uid
2755 || w->prev.st_gid != w->attr.st_gid 3283 || prev.st_gid != w->attr.st_gid
2756 || w->prev.st_rdev != w->attr.st_rdev 3284 || prev.st_rdev != w->attr.st_rdev
2757 || w->prev.st_size != w->attr.st_size 3285 || prev.st_size != w->attr.st_size
2758 || w->prev.st_atime != w->attr.st_atime 3286 || prev.st_atime != w->attr.st_atime
2759 || w->prev.st_mtime != w->attr.st_mtime 3287 || prev.st_mtime != w->attr.st_mtime
2760 || w->prev.st_ctime != w->attr.st_ctime 3288 || prev.st_ctime != w->attr.st_ctime
2761 ) { 3289 ) {
3290 /* we only update w->prev on actual differences */
3291 /* in case we test more often than invoke the callback, */
3292 /* to ensure that prev is always different to attr */
3293 w->prev = prev;
3294
2762 #if EV_USE_INOTIFY 3295 #if EV_USE_INOTIFY
2763 if (fs_fd >= 0) 3296 if (fs_fd >= 0)
2764 { 3297 {
2765 infy_del (EV_A_ w); 3298 infy_del (EV_A_ w);
2766 infy_add (EV_A_ w); 3299 infy_add (EV_A_ w);
… …
2791 3324
2792 if (fs_fd >= 0) 3325 if (fs_fd >= 0)
2793 infy_add (EV_A_ w); 3326 infy_add (EV_A_ w);
2794 else 3327 else
2795#endif 3328#endif
3329 {
2796 ev_timer_again (EV_A_ &w->timer); 3330 ev_timer_again (EV_A_ &w->timer);
3331 ev_unref (EV_A);
3332 }
2797 3333
2798 ev_start (EV_A_ (W)w, 1); 3334 ev_start (EV_A_ (W)w, 1);
2799 3335
2800 EV_FREQUENT_CHECK; 3336 EV_FREQUENT_CHECK;
2801} 3337}
… …
2810 EV_FREQUENT_CHECK; 3346 EV_FREQUENT_CHECK;
2811 3347
2812#if EV_USE_INOTIFY 3348#if EV_USE_INOTIFY
2813 infy_del (EV_A_ w); 3349 infy_del (EV_A_ w);
2814#endif 3350#endif
3351
3352 if (ev_is_active (&w->timer))
3353 {
3354 ev_ref (EV_A);
2815 ev_timer_stop (EV_A_ &w->timer); 3355 ev_timer_stop (EV_A_ &w->timer);
3356 }
2816 3357
2817 ev_stop (EV_A_ (W)w); 3358 ev_stop (EV_A_ (W)w);
2818 3359
2819 EV_FREQUENT_CHECK; 3360 EV_FREQUENT_CHECK;
2820} 3361}
… …
2865 3406
2866 EV_FREQUENT_CHECK; 3407 EV_FREQUENT_CHECK;
2867} 3408}
2868#endif 3409#endif
2869 3410
3411#if EV_PREPARE_ENABLE
2870void 3412void
2871ev_prepare_start (EV_P_ ev_prepare *w) 3413ev_prepare_start (EV_P_ ev_prepare *w)
2872{ 3414{
2873 if (expect_false (ev_is_active (w))) 3415 if (expect_false (ev_is_active (w)))
2874 return; 3416 return;
… …
2900 3442
2901 ev_stop (EV_A_ (W)w); 3443 ev_stop (EV_A_ (W)w);
2902 3444
2903 EV_FREQUENT_CHECK; 3445 EV_FREQUENT_CHECK;
2904} 3446}
3447#endif
2905 3448
3449#if EV_CHECK_ENABLE
2906void 3450void
2907ev_check_start (EV_P_ ev_check *w) 3451ev_check_start (EV_P_ ev_check *w)
2908{ 3452{
2909 if (expect_false (ev_is_active (w))) 3453 if (expect_false (ev_is_active (w)))
2910 return; 3454 return;
… …
2936 3480
2937 ev_stop (EV_A_ (W)w); 3481 ev_stop (EV_A_ (W)w);
2938 3482
2939 EV_FREQUENT_CHECK; 3483 EV_FREQUENT_CHECK;
2940} 3484}
3485#endif
2941 3486
2942#if EV_EMBED_ENABLE 3487#if EV_EMBED_ENABLE
2943void noinline 3488void noinline
2944ev_embed_sweep (EV_P_ ev_embed *w) 3489ev_embed_sweep (EV_P_ ev_embed *w)
2945{ 3490{
2946 ev_loop (w->other, EVLOOP_NONBLOCK); 3491 ev_run (w->other, EVRUN_NOWAIT);
2947} 3492}
2948 3493
2949static void 3494static void
2950embed_io_cb (EV_P_ ev_io *io, int revents) 3495embed_io_cb (EV_P_ ev_io *io, int revents)
2951{ 3496{
2952 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3497 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2953 3498
2954 if (ev_cb (w)) 3499 if (ev_cb (w))
2955 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3500 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2956 else 3501 else
2957 ev_loop (w->other, EVLOOP_NONBLOCK); 3502 ev_run (w->other, EVRUN_NOWAIT);
2958} 3503}
2959 3504
2960static void 3505static void
2961embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3506embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2962{ 3507{
2963 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3508 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2964 3509
2965 { 3510 {
2966 struct ev_loop *loop = w->other; 3511 EV_P = w->other;
2967 3512
2968 while (fdchangecnt) 3513 while (fdchangecnt)
2969 { 3514 {
2970 fd_reify (EV_A); 3515 fd_reify (EV_A);
2971 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3516 ev_run (EV_A_ EVRUN_NOWAIT);
2972 } 3517 }
2973 } 3518 }
2974} 3519}
2975 3520
2976static void 3521static void
… …
2979 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3524 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2980 3525
2981 ev_embed_stop (EV_A_ w); 3526 ev_embed_stop (EV_A_ w);
2982 3527
2983 { 3528 {
2984 struct ev_loop *loop = w->other; 3529 EV_P = w->other;
2985 3530
2986 ev_loop_fork (EV_A); 3531 ev_loop_fork (EV_A);
2987 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3532 ev_run (EV_A_ EVRUN_NOWAIT);
2988 } 3533 }
2989 3534
2990 ev_embed_start (EV_A_ w); 3535 ev_embed_start (EV_A_ w);
2991} 3536}
2992 3537
… …
3003{ 3548{
3004 if (expect_false (ev_is_active (w))) 3549 if (expect_false (ev_is_active (w)))
3005 return; 3550 return;
3006 3551
3007 { 3552 {
3008 struct ev_loop *loop = w->other; 3553 EV_P = w->other;
3009 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3554 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); 3555 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3011 } 3556 }
3012 3557
3013 EV_FREQUENT_CHECK; 3558 EV_FREQUENT_CHECK;
… …
3040 3585
3041 ev_io_stop (EV_A_ &w->io); 3586 ev_io_stop (EV_A_ &w->io);
3042 ev_prepare_stop (EV_A_ &w->prepare); 3587 ev_prepare_stop (EV_A_ &w->prepare);
3043 ev_fork_stop (EV_A_ &w->fork); 3588 ev_fork_stop (EV_A_ &w->fork);
3044 3589
3590 ev_stop (EV_A_ (W)w);
3591
3045 EV_FREQUENT_CHECK; 3592 EV_FREQUENT_CHECK;
3046} 3593}
3047#endif 3594#endif
3048 3595
3049#if EV_FORK_ENABLE 3596#if EV_FORK_ENABLE
… …
3082 3629
3083 EV_FREQUENT_CHECK; 3630 EV_FREQUENT_CHECK;
3084} 3631}
3085#endif 3632#endif
3086 3633
3087#if EV_ASYNC_ENABLE 3634#if EV_CLEANUP_ENABLE
3088void 3635void
3089ev_async_start (EV_P_ ev_async *w) 3636ev_cleanup_start (EV_P_ ev_cleanup *w)
3090{ 3637{
3091 if (expect_false (ev_is_active (w))) 3638 if (expect_false (ev_is_active (w)))
3092 return; 3639 return;
3640
3641 EV_FREQUENT_CHECK;
3642
3643 ev_start (EV_A_ (W)w, ++cleanupcnt);
3644 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3645 cleanups [cleanupcnt - 1] = w;
3646
3647 /* cleanup watchers should never keep a refcount on the loop */
3648 ev_unref (EV_A);
3649 EV_FREQUENT_CHECK;
3650}
3651
3652void
3653ev_cleanup_stop (EV_P_ ev_cleanup *w)
3654{
3655 clear_pending (EV_A_ (W)w);
3656 if (expect_false (!ev_is_active (w)))
3657 return;
3658
3659 EV_FREQUENT_CHECK;
3660 ev_ref (EV_A);
3661
3662 {
3663 int active = ev_active (w);
3664
3665 cleanups [active - 1] = cleanups [--cleanupcnt];
3666 ev_active (cleanups [active - 1]) = active;
3667 }
3668
3669 ev_stop (EV_A_ (W)w);
3670
3671 EV_FREQUENT_CHECK;
3672}
3673#endif
3674
3675#if EV_ASYNC_ENABLE
3676void
3677ev_async_start (EV_P_ ev_async *w)
3678{
3679 if (expect_false (ev_is_active (w)))
3680 return;
3681
3682 w->sent = 0;
3093 3683
3094 evpipe_init (EV_A); 3684 evpipe_init (EV_A);
3095 3685
3096 EV_FREQUENT_CHECK; 3686 EV_FREQUENT_CHECK;
3097 3687
… …
3125 3715
3126void 3716void
3127ev_async_send (EV_P_ ev_async *w) 3717ev_async_send (EV_P_ ev_async *w)
3128{ 3718{
3129 w->sent = 1; 3719 w->sent = 1;
3130 evpipe_write (EV_A_ &gotasync); 3720 evpipe_write (EV_A_ &async_pending);
3131} 3721}
3132#endif 3722#endif
3133 3723
3134/*****************************************************************************/ 3724/*****************************************************************************/
3135 3725
… …
3175{ 3765{
3176 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3766 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3177 3767
3178 if (expect_false (!once)) 3768 if (expect_false (!once))
3179 { 3769 {
3180 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3770 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3181 return; 3771 return;
3182 } 3772 }
3183 3773
3184 once->cb = cb; 3774 once->cb = cb;
3185 once->arg = arg; 3775 once->arg = arg;
… …
3199 } 3789 }
3200} 3790}
3201 3791
3202/*****************************************************************************/ 3792/*****************************************************************************/
3203 3793
3204#if 0 3794#if EV_WALK_ENABLE
3205void 3795void
3206ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3796ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3207{ 3797{
3208 int i, j; 3798 int i, j;
3209 ev_watcher_list *wl, *wn; 3799 ev_watcher_list *wl, *wn;
… …
3225#if EV_USE_INOTIFY 3815#if EV_USE_INOTIFY
3226 if (ev_cb ((ev_io *)wl) == infy_cb) 3816 if (ev_cb ((ev_io *)wl) == infy_cb)
3227 ; 3817 ;
3228 else 3818 else
3229#endif 3819#endif
3230 if ((ev_io *)wl != &pipeev) 3820 if ((ev_io *)wl != &pipe_w)
3231 if (types & EV_IO) 3821 if (types & EV_IO)
3232 cb (EV_A_ EV_IO, wl); 3822 cb (EV_A_ EV_IO, wl);
3233 3823
3234 wl = wn; 3824 wl = wn;
3235 } 3825 }
… …
3272 if (types & EV_ASYNC) 3862 if (types & EV_ASYNC)
3273 for (i = asynccnt; i--; ) 3863 for (i = asynccnt; i--; )
3274 cb (EV_A_ EV_ASYNC, asyncs [i]); 3864 cb (EV_A_ EV_ASYNC, asyncs [i]);
3275#endif 3865#endif
3276 3866
3867#if EV_PREPARE_ENABLE
3277 if (types & EV_PREPARE) 3868 if (types & EV_PREPARE)
3278 for (i = preparecnt; i--; ) 3869 for (i = preparecnt; i--; )
3279#if EV_EMBED_ENABLE 3870# if EV_EMBED_ENABLE
3280 if (ev_cb (prepares [i]) != embed_prepare_cb) 3871 if (ev_cb (prepares [i]) != embed_prepare_cb)
3281#endif 3872# endif
3282 cb (EV_A_ EV_PREPARE, prepares [i]); 3873 cb (EV_A_ EV_PREPARE, prepares [i]);
3874#endif
3283 3875
3876#if EV_CHECK_ENABLE
3284 if (types & EV_CHECK) 3877 if (types & EV_CHECK)
3285 for (i = checkcnt; i--; ) 3878 for (i = checkcnt; i--; )
3286 cb (EV_A_ EV_CHECK, checks [i]); 3879 cb (EV_A_ EV_CHECK, checks [i]);
3880#endif
3287 3881
3882#if EV_SIGNAL_ENABLE
3288 if (types & EV_SIGNAL) 3883 if (types & EV_SIGNAL)
3289 for (i = 0; i < signalmax; ++i) 3884 for (i = 0; i < EV_NSIG - 1; ++i)
3290 for (wl = signals [i].head; wl; ) 3885 for (wl = signals [i].head; wl; )
3291 { 3886 {
3292 wn = wl->next; 3887 wn = wl->next;
3293 cb (EV_A_ EV_SIGNAL, wl); 3888 cb (EV_A_ EV_SIGNAL, wl);
3294 wl = wn; 3889 wl = wn;
3295 } 3890 }
3891#endif
3296 3892
3893#if EV_CHILD_ENABLE
3297 if (types & EV_CHILD) 3894 if (types & EV_CHILD)
3298 for (i = EV_PID_HASHSIZE; i--; ) 3895 for (i = (EV_PID_HASHSIZE); i--; )
3299 for (wl = childs [i]; wl; ) 3896 for (wl = childs [i]; wl; )
3300 { 3897 {
3301 wn = wl->next; 3898 wn = wl->next;
3302 cb (EV_A_ EV_CHILD, wl); 3899 cb (EV_A_ EV_CHILD, wl);
3303 wl = wn; 3900 wl = wn;
3304 } 3901 }
3902#endif
3305/* EV_STAT 0x00001000 /* stat data changed */ 3903/* EV_STAT 0x00001000 /* stat data changed */
3306/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3904/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3307} 3905}
3308#endif 3906#endif
3309 3907
3310#if EV_MULTIPLICITY 3908#if EV_MULTIPLICITY
3311 #include "ev_wrap.h" 3909 #include "ev_wrap.h"
3312#endif 3910#endif
3313 3911
3314#ifdef __cplusplus 3912EV_CPP(})
3315}
3316#endif
3317 3913

Diff Legend

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