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

Comparing libev/ev.c (file contents):
Revision 1.289 by root, Sat Jun 6 11:13:16 2009 UTC vs.
Revision 1.356 by root, Fri Oct 22 11:21:52 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
… …
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
… …
306# include <sys/select.h> 382# include <sys/select.h>
307# endif 383# endif
308#endif 384#endif
309 385
310#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h> 387# include <sys/statfs.h>
313# include <sys/inotify.h> 388# include <sys/inotify.h>
314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
315# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
316# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
320 395
321#if EV_SELECT_IS_WINSOCKET 396#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 397# include <winsock.h>
323#endif 398#endif
324 399
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 400#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 401/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 402# include <stdint.h>
337# ifdef __cplusplus 403# ifndef EFD_NONBLOCK
338extern "C" { 404# define EFD_NONBLOCK O_NONBLOCK
339# endif 405# endif
340int eventfd (unsigned int initval, int flags); 406# ifndef EFD_CLOEXEC
341# ifdef __cplusplus 407# ifdef O_CLOEXEC
342} 408# define EFD_CLOEXEC O_CLOEXEC
409# else
410# define EFD_CLOEXEC 02000000
411# endif
343# endif 412# endif
413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
414#endif
415
416#if EV_USE_SIGNALFD
417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
418# include <stdint.h>
419# ifndef SFD_NONBLOCK
420# define SFD_NONBLOCK O_NONBLOCK
421# endif
422# ifndef SFD_CLOEXEC
423# ifdef O_CLOEXEC
424# define SFD_CLOEXEC O_CLOEXEC
425# else
426# define SFD_CLOEXEC 02000000
427# endif
428# endif
429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
430
431struct signalfd_siginfo
432{
433 uint32_t ssi_signo;
434 char pad[128 - sizeof (uint32_t)];
435};
344#endif 436#endif
345 437
346/**/ 438/**/
347 439
348#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
350#else 442#else
351# define EV_FREQUENT_CHECK do { } while (0) 443# define EV_FREQUENT_CHECK do { } while (0)
352#endif 444#endif
353 445
354/* 446/*
… …
361 */ 453 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 455
364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 456#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) */ 457#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 */ 458
459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
460#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
367 461
368#if __GNUC__ >= 4 462#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
371#else 465#else
… …
378 472
379#define expect_false(expr) expect ((expr) != 0, 0) 473#define expect_false(expr) expect ((expr) != 0, 0)
380#define expect_true(expr) expect ((expr) != 0, 1) 474#define expect_true(expr) expect ((expr) != 0, 1)
381#define inline_size static inline 475#define inline_size static inline
382 476
383#if EV_MINIMAL 477#if EV_FEATURE_CODE
478# define inline_speed static inline
479#else
384# define inline_speed static noinline 480# define inline_speed static noinline
481#endif
482
483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
484
485#if EV_MINPRI == EV_MAXPRI
486# define ABSPRI(w) (((W)w), 0)
385#else 487#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) 488# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
489#endif
391 490
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 491#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 492#define EMPTY2(a,b) /* used to suppress some warnings */
394 493
395typedef ev_watcher *W; 494typedef ev_watcher *W;
… …
399#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
400#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
401 500
402#if EV_USE_REALTIME 501#if EV_USE_REALTIME
403/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 502/* 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 */ 503/* giving it a reasonably high chance of working on typical architectures */
405static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
406#endif 505#endif
407 506
408#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 509#endif
411 510
511#ifndef EV_FD_TO_WIN32_HANDLE
512# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
513#endif
514#ifndef EV_WIN32_HANDLE_TO_FD
515# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
516#endif
517#ifndef EV_WIN32_CLOSE_FD
518# define EV_WIN32_CLOSE_FD(fd) close (fd)
519#endif
520
412#ifdef _WIN32 521#ifdef _WIN32
413# include "ev_win32.c" 522# include "ev_win32.c"
414#endif 523#endif
415 524
416/*****************************************************************************/ 525/*****************************************************************************/
526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
531static unsigned int noinline
532ev_linux_version (void)
533{
534#ifdef __linux
535 struct utsname buf;
536 unsigned int v;
537 int i;
538 char *p = buf.release;
539
540 if (uname (&buf))
541 return 0;
542
543 for (i = 3+1; --i; )
544 {
545 unsigned int c = 0;
546
547 for (;;)
548 {
549 if (*p >= '0' && *p <= '9')
550 c = c * 10 + *p++ - '0';
551 else
552 {
553 p += *p == '.';
554 break;
555 }
556 }
557
558 v = (v << 8) | c;
559 }
560
561 return v;
562#else
563 return 0;
564#endif
565}
566
567/*****************************************************************************/
568
569#if EV_AVOID_STDIO
570static void noinline
571ev_printerr (const char *msg)
572{
573 write (STDERR_FILENO, msg, strlen (msg));
574}
575#endif
417 576
418static void (*syserr_cb)(const char *msg); 577static void (*syserr_cb)(const char *msg);
419 578
420void 579void
421ev_set_syserr_cb (void (*cb)(const char *msg)) 580ev_set_syserr_cb (void (*cb)(const char *msg))
… …
431 590
432 if (syserr_cb) 591 if (syserr_cb)
433 syserr_cb (msg); 592 syserr_cb (msg);
434 else 593 else
435 { 594 {
595#if EV_AVOID_STDIO
596 const char *err = strerror (errno);
597
598 ev_printerr (msg);
599 ev_printerr (": ");
600 ev_printerr (err);
601 ev_printerr ("\n");
602#else
436 perror (msg); 603 perror (msg);
604#endif
437 abort (); 605 abort ();
438 } 606 }
439} 607}
440 608
441static void * 609static void *
442ev_realloc_emul (void *ptr, long size) 610ev_realloc_emul (void *ptr, long size)
443{ 611{
612#if __GLIBC__
613 return realloc (ptr, size);
614#else
444 /* some systems, notably openbsd and darwin, fail to properly 615 /* some systems, notably openbsd and darwin, fail to properly
445 * implement realloc (x, 0) (as required by both ansi c-98 and 616 * implement realloc (x, 0) (as required by both ansi c-89 and
446 * the single unix specification, so work around them here. 617 * the single unix specification, so work around them here.
447 */ 618 */
448 619
449 if (size) 620 if (size)
450 return realloc (ptr, size); 621 return realloc (ptr, size);
451 622
452 free (ptr); 623 free (ptr);
453 return 0; 624 return 0;
625#endif
454} 626}
455 627
456static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 628static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
457 629
458void 630void
… …
466{ 638{
467 ptr = alloc (ptr, size); 639 ptr = alloc (ptr, size);
468 640
469 if (!ptr && size) 641 if (!ptr && size)
470 { 642 {
643#if EV_AVOID_STDIO
644 ev_printerr ("libev: memory allocation failed, aborting.\n");
645#else
471 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 646 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
647#endif
472 abort (); 648 abort ();
473 } 649 }
474 650
475 return ptr; 651 return ptr;
476} 652}
… …
478#define ev_malloc(size) ev_realloc (0, (size)) 654#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 655#define ev_free(ptr) ev_realloc ((ptr), 0)
480 656
481/*****************************************************************************/ 657/*****************************************************************************/
482 658
659/* set in reify when reification needed */
660#define EV_ANFD_REIFY 1
661
483/* file descriptor info structure */ 662/* file descriptor info structure */
484typedef struct 663typedef struct
485{ 664{
486 WL head; 665 WL head;
487 unsigned char events; /* the events watched for */ 666 unsigned char events; /* the events watched for */
488 unsigned char reify; /* flag set when this ANFD needs reification */ 667 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
489 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 668 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
490 unsigned char unused; 669 unsigned char unused;
491#if EV_USE_EPOLL 670#if EV_USE_EPOLL
492 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
493#endif 672#endif
… …
555 734
556 static int ev_default_loop_ptr; 735 static int ev_default_loop_ptr;
557 736
558#endif 737#endif
559 738
739#if EV_FEATURE_API
740# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
741# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
742# define EV_INVOKE_PENDING invoke_cb (EV_A)
743#else
744# define EV_RELEASE_CB (void)0
745# define EV_ACQUIRE_CB (void)0
746# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
747#endif
748
749#define EVBREAK_RECURSE 0x80
750
560/*****************************************************************************/ 751/*****************************************************************************/
561 752
753#ifndef EV_HAVE_EV_TIME
562ev_tstamp 754ev_tstamp
563ev_time (void) 755ev_time (void)
564{ 756{
565#if EV_USE_REALTIME 757#if EV_USE_REALTIME
566 if (expect_true (have_realtime)) 758 if (expect_true (have_realtime))
… …
573 765
574 struct timeval tv; 766 struct timeval tv;
575 gettimeofday (&tv, 0); 767 gettimeofday (&tv, 0);
576 return tv.tv_sec + tv.tv_usec * 1e-6; 768 return tv.tv_sec + tv.tv_usec * 1e-6;
577} 769}
770#endif
578 771
579inline_size ev_tstamp 772inline_size ev_tstamp
580get_clock (void) 773get_clock (void)
581{ 774{
582#if EV_USE_MONOTONIC 775#if EV_USE_MONOTONIC
… …
605 if (delay > 0.) 798 if (delay > 0.)
606 { 799 {
607#if EV_USE_NANOSLEEP 800#if EV_USE_NANOSLEEP
608 struct timespec ts; 801 struct timespec ts;
609 802
610 ts.tv_sec = (time_t)delay; 803 EV_TS_SET (ts, delay);
611 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
612
613 nanosleep (&ts, 0); 804 nanosleep (&ts, 0);
614#elif defined(_WIN32) 805#elif defined(_WIN32)
615 Sleep ((unsigned long)(delay * 1e3)); 806 Sleep ((unsigned long)(delay * 1e3));
616#else 807#else
617 struct timeval tv; 808 struct timeval tv;
618 809
619 tv.tv_sec = (time_t)delay;
620 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
621
622 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 810 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
623 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 811 /* something not guaranteed by newer posix versions, but guaranteed */
624 /* by older ones */ 812 /* by older ones */
813 EV_TV_SET (tv, delay);
625 select (0, 0, 0, 0, &tv); 814 select (0, 0, 0, 0, &tv);
626#endif 815#endif
627 } 816 }
628} 817}
629 818
630/*****************************************************************************/ 819/*****************************************************************************/
631 820
632#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 821#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
633 822
634/* find a suitable new size for the given array, */ 823/* find a suitable new size for the given array, */
635/* hopefully by rounding to a ncie-to-malloc size */ 824/* hopefully by rounding to a nice-to-malloc size */
636inline_size int 825inline_size int
637array_nextsize (int elem, int cur, int cnt) 826array_nextsize (int elem, int cur, int cnt)
638{ 827{
639 int ncur = cur + 1; 828 int ncur = cur + 1;
640 829
… …
736} 925}
737 926
738/*****************************************************************************/ 927/*****************************************************************************/
739 928
740inline_speed void 929inline_speed void
741fd_event (EV_P_ int fd, int revents) 930fd_event_nocheck (EV_P_ int fd, int revents)
742{ 931{
743 ANFD *anfd = anfds + fd; 932 ANFD *anfd = anfds + fd;
744 ev_io *w; 933 ev_io *w;
745 934
746 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 935 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
750 if (ev) 939 if (ev)
751 ev_feed_event (EV_A_ (W)w, ev); 940 ev_feed_event (EV_A_ (W)w, ev);
752 } 941 }
753} 942}
754 943
944/* do not submit kernel events for fds that have reify set */
945/* because that means they changed while we were polling for new events */
946inline_speed void
947fd_event (EV_P_ int fd, int revents)
948{
949 ANFD *anfd = anfds + fd;
950
951 if (expect_true (!anfd->reify))
952 fd_event_nocheck (EV_A_ fd, revents);
953}
954
755void 955void
756ev_feed_fd_event (EV_P_ int fd, int revents) 956ev_feed_fd_event (EV_P_ int fd, int revents)
757{ 957{
758 if (fd >= 0 && fd < anfdmax) 958 if (fd >= 0 && fd < anfdmax)
759 fd_event (EV_A_ fd, revents); 959 fd_event_nocheck (EV_A_ fd, revents);
760} 960}
761 961
762/* make sure the external fd watch events are in-sync */ 962/* make sure the external fd watch events are in-sync */
763/* with the kernel/libev internal state */ 963/* with the kernel/libev internal state */
764inline_size void 964inline_size void
… …
770 { 970 {
771 int fd = fdchanges [i]; 971 int fd = fdchanges [i];
772 ANFD *anfd = anfds + fd; 972 ANFD *anfd = anfds + fd;
773 ev_io *w; 973 ev_io *w;
774 974
775 unsigned char events = 0; 975 unsigned char o_events = anfd->events;
976 unsigned char o_reify = anfd->reify;
776 977
777 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 978 anfd->reify = 0;
778 events |= (unsigned char)w->events;
779 979
780#if EV_SELECT_IS_WINSOCKET 980#if EV_SELECT_IS_WINSOCKET
781 if (events) 981 if (o_reify & EV__IOFDSET)
782 { 982 {
783 unsigned long arg; 983 unsigned long arg;
784 #ifdef EV_FD_TO_WIN32_HANDLE
785 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 984 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
786 #else
787 anfd->handle = _get_osfhandle (fd);
788 #endif
789 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 985 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
790 } 986 }
791#endif 987#endif
792 988
989 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
793 { 990 {
794 unsigned char o_events = anfd->events;
795 unsigned char o_reify = anfd->reify;
796
797 anfd->reify = 0;
798 anfd->events = events; 991 anfd->events = 0;
799 992
800 if (o_events != events || o_reify & EV__IOFDSET) 993 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
994 anfd->events |= (unsigned char)w->events;
995
996 if (o_events != anfd->events)
997 o_reify = EV__IOFDSET; /* actually |= */
998 }
999
1000 if (o_reify & EV__IOFDSET)
801 backend_modify (EV_A_ fd, o_events, events); 1001 backend_modify (EV_A_ fd, o_events, anfd->events);
802 }
803 } 1002 }
804 1003
805 fdchangecnt = 0; 1004 fdchangecnt = 0;
806} 1005}
807 1006
… …
831 ev_io_stop (EV_A_ w); 1030 ev_io_stop (EV_A_ w);
832 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1031 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
833 } 1032 }
834} 1033}
835 1034
836/* check whether the given fd is atcually valid, for error recovery */ 1035/* check whether the given fd is actually valid, for error recovery */
837inline_size int 1036inline_size int
838fd_valid (int fd) 1037fd_valid (int fd)
839{ 1038{
840#ifdef _WIN32 1039#ifdef _WIN32
841 return _get_osfhandle (fd) != -1; 1040 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
842#else 1041#else
843 return fcntl (fd, F_GETFD) != -1; 1042 return fcntl (fd, F_GETFD) != -1;
844#endif 1043#endif
845} 1044}
846 1045
… …
864 1063
865 for (fd = anfdmax; fd--; ) 1064 for (fd = anfdmax; fd--; )
866 if (anfds [fd].events) 1065 if (anfds [fd].events)
867 { 1066 {
868 fd_kill (EV_A_ fd); 1067 fd_kill (EV_A_ fd);
869 return; 1068 break;
870 } 1069 }
871} 1070}
872 1071
873/* usually called after fork if backend needs to re-arm all fds from scratch */ 1072/* usually called after fork if backend needs to re-arm all fds from scratch */
874static void noinline 1073static void noinline
… …
879 for (fd = 0; fd < anfdmax; ++fd) 1078 for (fd = 0; fd < anfdmax; ++fd)
880 if (anfds [fd].events) 1079 if (anfds [fd].events)
881 { 1080 {
882 anfds [fd].events = 0; 1081 anfds [fd].events = 0;
883 anfds [fd].emask = 0; 1082 anfds [fd].emask = 0;
884 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1083 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
885 } 1084 }
886} 1085}
887 1086
1087/* used to prepare libev internal fd's */
1088/* this is not fork-safe */
1089inline_speed void
1090fd_intern (int fd)
1091{
1092#ifdef _WIN32
1093 unsigned long arg = 1;
1094 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1095#else
1096 fcntl (fd, F_SETFD, FD_CLOEXEC);
1097 fcntl (fd, F_SETFL, O_NONBLOCK);
1098#endif
1099}
1100
888/*****************************************************************************/ 1101/*****************************************************************************/
889 1102
890/* 1103/*
891 * the heap functions want a real array index. array index 0 uis guaranteed to not 1104 * the heap functions want a real array index. array index 0 is guaranteed to not
892 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1105 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
893 * the branching factor of the d-tree. 1106 * the branching factor of the d-tree.
894 */ 1107 */
895 1108
896/* 1109/*
… …
964 1177
965 for (;;) 1178 for (;;)
966 { 1179 {
967 int c = k << 1; 1180 int c = k << 1;
968 1181
969 if (c > N + HEAP0 - 1) 1182 if (c >= N + HEAP0)
970 break; 1183 break;
971 1184
972 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1185 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
973 ? 1 : 0; 1186 ? 1 : 0;
974 1187
… …
1010 1223
1011/* move an element suitably so it is in a correct place */ 1224/* move an element suitably so it is in a correct place */
1012inline_size void 1225inline_size void
1013adjustheap (ANHE *heap, int N, int k) 1226adjustheap (ANHE *heap, int N, int k)
1014{ 1227{
1015 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1228 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1016 upheap (heap, k); 1229 upheap (heap, k);
1017 else 1230 else
1018 downheap (heap, N, k); 1231 downheap (heap, N, k);
1019} 1232}
1020 1233
… …
1033/*****************************************************************************/ 1246/*****************************************************************************/
1034 1247
1035/* associate signal watchers to a signal signal */ 1248/* associate signal watchers to a signal signal */
1036typedef struct 1249typedef struct
1037{ 1250{
1251 EV_ATOMIC_T pending;
1252#if EV_MULTIPLICITY
1253 EV_P;
1254#endif
1038 WL head; 1255 WL head;
1039 EV_ATOMIC_T gotsig;
1040} ANSIG; 1256} ANSIG;
1041 1257
1042static ANSIG *signals; 1258static ANSIG signals [EV_NSIG - 1];
1043static int signalmax;
1044
1045static EV_ATOMIC_T gotsig;
1046 1259
1047/*****************************************************************************/ 1260/*****************************************************************************/
1048 1261
1049/* used to prepare libev internal fd's */ 1262#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1050/* this is not fork-safe */
1051inline_speed void
1052fd_intern (int fd)
1053{
1054#ifdef _WIN32
1055 unsigned long arg = 1;
1056 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1057#else
1058 fcntl (fd, F_SETFD, FD_CLOEXEC);
1059 fcntl (fd, F_SETFL, O_NONBLOCK);
1060#endif
1061}
1062 1263
1063static void noinline 1264static void noinline
1064evpipe_init (EV_P) 1265evpipe_init (EV_P)
1065{ 1266{
1066 if (!ev_is_active (&pipe_w)) 1267 if (!ev_is_active (&pipe_w))
1067 { 1268 {
1068#if EV_USE_EVENTFD 1269# if EV_USE_EVENTFD
1270 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1271 if (evfd < 0 && errno == EINVAL)
1069 if ((evfd = eventfd (0, 0)) >= 0) 1272 evfd = eventfd (0, 0);
1273
1274 if (evfd >= 0)
1070 { 1275 {
1071 evpipe [0] = -1; 1276 evpipe [0] = -1;
1072 fd_intern (evfd); 1277 fd_intern (evfd); /* doing it twice doesn't hurt */
1073 ev_io_set (&pipe_w, evfd, EV_READ); 1278 ev_io_set (&pipe_w, evfd, EV_READ);
1074 } 1279 }
1075 else 1280 else
1076#endif 1281# endif
1077 { 1282 {
1078 while (pipe (evpipe)) 1283 while (pipe (evpipe))
1079 ev_syserr ("(libev) error creating signal/async pipe"); 1284 ev_syserr ("(libev) error creating signal/async pipe");
1080 1285
1081 fd_intern (evpipe [0]); 1286 fd_intern (evpipe [0]);
… …
1092evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1297evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1093{ 1298{
1094 if (!*flag) 1299 if (!*flag)
1095 { 1300 {
1096 int old_errno = errno; /* save errno because write might clobber it */ 1301 int old_errno = errno; /* save errno because write might clobber it */
1302 char dummy;
1097 1303
1098 *flag = 1; 1304 *flag = 1;
1099 1305
1100#if EV_USE_EVENTFD 1306#if EV_USE_EVENTFD
1101 if (evfd >= 0) 1307 if (evfd >= 0)
… …
1103 uint64_t counter = 1; 1309 uint64_t counter = 1;
1104 write (evfd, &counter, sizeof (uint64_t)); 1310 write (evfd, &counter, sizeof (uint64_t));
1105 } 1311 }
1106 else 1312 else
1107#endif 1313#endif
1314 /* win32 people keep sending patches that change this write() to send() */
1315 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1316 /* so when you think this write should be a send instead, please find out */
1317 /* where your send() is from - it's definitely not the microsoft send, and */
1318 /* tell me. thank you. */
1108 write (evpipe [1], &old_errno, 1); 1319 write (evpipe [1], &dummy, 1);
1109 1320
1110 errno = old_errno; 1321 errno = old_errno;
1111 } 1322 }
1112} 1323}
1113 1324
1114/* called whenever the libev signal pipe */ 1325/* called whenever the libev signal pipe */
1115/* got some events (signal, async) */ 1326/* got some events (signal, async) */
1116static void 1327static void
1117pipecb (EV_P_ ev_io *iow, int revents) 1328pipecb (EV_P_ ev_io *iow, int revents)
1118{ 1329{
1330 int i;
1331
1119#if EV_USE_EVENTFD 1332#if EV_USE_EVENTFD
1120 if (evfd >= 0) 1333 if (evfd >= 0)
1121 { 1334 {
1122 uint64_t counter; 1335 uint64_t counter;
1123 read (evfd, &counter, sizeof (uint64_t)); 1336 read (evfd, &counter, sizeof (uint64_t));
1124 } 1337 }
1125 else 1338 else
1126#endif 1339#endif
1127 { 1340 {
1128 char dummy; 1341 char dummy;
1342 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1129 read (evpipe [0], &dummy, 1); 1343 read (evpipe [0], &dummy, 1);
1130 } 1344 }
1131 1345
1132 if (gotsig && ev_is_default_loop (EV_A)) 1346 if (sig_pending)
1133 { 1347 {
1134 int signum; 1348 sig_pending = 0;
1135 gotsig = 0;
1136 1349
1137 for (signum = signalmax; signum--; ) 1350 for (i = EV_NSIG - 1; i--; )
1138 if (signals [signum].gotsig) 1351 if (expect_false (signals [i].pending))
1139 ev_feed_signal_event (EV_A_ signum + 1); 1352 ev_feed_signal_event (EV_A_ i + 1);
1140 } 1353 }
1141 1354
1142#if EV_ASYNC_ENABLE 1355#if EV_ASYNC_ENABLE
1143 if (gotasync) 1356 if (async_pending)
1144 { 1357 {
1145 int i; 1358 async_pending = 0;
1146 gotasync = 0;
1147 1359
1148 for (i = asynccnt; i--; ) 1360 for (i = asynccnt; i--; )
1149 if (asyncs [i]->sent) 1361 if (asyncs [i]->sent)
1150 { 1362 {
1151 asyncs [i]->sent = 0; 1363 asyncs [i]->sent = 0;
… …
1159 1371
1160static void 1372static void
1161ev_sighandler (int signum) 1373ev_sighandler (int signum)
1162{ 1374{
1163#if EV_MULTIPLICITY 1375#if EV_MULTIPLICITY
1164 struct ev_loop *loop = &default_loop_struct; 1376 EV_P = signals [signum - 1].loop;
1165#endif 1377#endif
1166 1378
1167#if _WIN32 1379#ifdef _WIN32
1168 signal (signum, ev_sighandler); 1380 signal (signum, ev_sighandler);
1169#endif 1381#endif
1170 1382
1171 signals [signum - 1].gotsig = 1; 1383 signals [signum - 1].pending = 1;
1172 evpipe_write (EV_A_ &gotsig); 1384 evpipe_write (EV_A_ &sig_pending);
1173} 1385}
1174 1386
1175void noinline 1387void noinline
1176ev_feed_signal_event (EV_P_ int signum) 1388ev_feed_signal_event (EV_P_ int signum)
1177{ 1389{
1178 WL w; 1390 WL w;
1179 1391
1392 if (expect_false (signum <= 0 || signum > EV_NSIG))
1393 return;
1394
1395 --signum;
1396
1180#if EV_MULTIPLICITY 1397#if EV_MULTIPLICITY
1181 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1398 /* it is permissible to try to feed a signal to the wrong loop */
1182#endif 1399 /* or, likely more useful, feeding a signal nobody is waiting for */
1183 1400
1184 --signum; 1401 if (expect_false (signals [signum].loop != EV_A))
1185
1186 if (signum < 0 || signum >= signalmax)
1187 return; 1402 return;
1403#endif
1188 1404
1189 signals [signum].gotsig = 0; 1405 signals [signum].pending = 0;
1190 1406
1191 for (w = signals [signum].head; w; w = w->next) 1407 for (w = signals [signum].head; w; w = w->next)
1192 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1408 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1193} 1409}
1194 1410
1411#if EV_USE_SIGNALFD
1412static void
1413sigfdcb (EV_P_ ev_io *iow, int revents)
1414{
1415 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1416
1417 for (;;)
1418 {
1419 ssize_t res = read (sigfd, si, sizeof (si));
1420
1421 /* not ISO-C, as res might be -1, but works with SuS */
1422 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1423 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1424
1425 if (res < (ssize_t)sizeof (si))
1426 break;
1427 }
1428}
1429#endif
1430
1431#endif
1432
1195/*****************************************************************************/ 1433/*****************************************************************************/
1196 1434
1435#if EV_CHILD_ENABLE
1197static WL childs [EV_PID_HASHSIZE]; 1436static WL childs [EV_PID_HASHSIZE];
1198
1199#ifndef _WIN32
1200 1437
1201static ev_signal childev; 1438static ev_signal childev;
1202 1439
1203#ifndef WIFCONTINUED 1440#ifndef WIFCONTINUED
1204# define WIFCONTINUED(status) 0 1441# define WIFCONTINUED(status) 0
… …
1209child_reap (EV_P_ int chain, int pid, int status) 1446child_reap (EV_P_ int chain, int pid, int status)
1210{ 1447{
1211 ev_child *w; 1448 ev_child *w;
1212 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1449 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1213 1450
1214 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1451 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1215 { 1452 {
1216 if ((w->pid == pid || !w->pid) 1453 if ((w->pid == pid || !w->pid)
1217 && (!traced || (w->flags & 1))) 1454 && (!traced || (w->flags & 1)))
1218 { 1455 {
1219 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1456 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1244 /* make sure we are called again until all children have been reaped */ 1481 /* make sure we are called again until all children have been reaped */
1245 /* we need to do it this way so that the callback gets called before we continue */ 1482 /* we need to do it this way so that the callback gets called before we continue */
1246 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1483 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1247 1484
1248 child_reap (EV_A_ pid, pid, status); 1485 child_reap (EV_A_ pid, pid, status);
1249 if (EV_PID_HASHSIZE > 1) 1486 if ((EV_PID_HASHSIZE) > 1)
1250 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1487 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1251} 1488}
1252 1489
1253#endif 1490#endif
1254 1491
… …
1321#ifdef __APPLE__ 1558#ifdef __APPLE__
1322 /* only select works correctly on that "unix-certified" platform */ 1559 /* only select works correctly on that "unix-certified" platform */
1323 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1560 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1324 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1561 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1325#endif 1562#endif
1563#ifdef __FreeBSD__
1564 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1565#endif
1326 1566
1327 return flags; 1567 return flags;
1328} 1568}
1329 1569
1330unsigned int 1570unsigned int
1331ev_embeddable_backends (void) 1571ev_embeddable_backends (void)
1332{ 1572{
1333 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1573 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1334 1574
1335 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1575 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1336 /* please fix it and tell me how to detect the fix */ 1576 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1337 flags &= ~EVBACKEND_EPOLL; 1577 flags &= ~EVBACKEND_EPOLL;
1338 1578
1339 return flags; 1579 return flags;
1340} 1580}
1341 1581
1342unsigned int 1582unsigned int
1343ev_backend (EV_P) 1583ev_backend (EV_P)
1344{ 1584{
1345 return backend; 1585 return backend;
1346} 1586}
1347 1587
1588#if EV_FEATURE_API
1348unsigned int 1589unsigned int
1349ev_loop_count (EV_P) 1590ev_iteration (EV_P)
1350{ 1591{
1351 return loop_count; 1592 return loop_count;
1352} 1593}
1353 1594
1595unsigned int
1596ev_depth (EV_P)
1597{
1598 return loop_depth;
1599}
1600
1354void 1601void
1355ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1602ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1356{ 1603{
1357 io_blocktime = interval; 1604 io_blocktime = interval;
1358} 1605}
… …
1360void 1607void
1361ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1608ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1362{ 1609{
1363 timeout_blocktime = interval; 1610 timeout_blocktime = interval;
1364} 1611}
1612
1613void
1614ev_set_userdata (EV_P_ void *data)
1615{
1616 userdata = data;
1617}
1618
1619void *
1620ev_userdata (EV_P)
1621{
1622 return userdata;
1623}
1624
1625void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1626{
1627 invoke_cb = invoke_pending_cb;
1628}
1629
1630void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1631{
1632 release_cb = release;
1633 acquire_cb = acquire;
1634}
1635#endif
1365 1636
1366/* initialise a loop structure, must be zero-initialised */ 1637/* initialise a loop structure, must be zero-initialised */
1367static void noinline 1638static void noinline
1368loop_init (EV_P_ unsigned int flags) 1639loop_init (EV_P_ unsigned int flags)
1369{ 1640{
… …
1387 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1658 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1388 have_monotonic = 1; 1659 have_monotonic = 1;
1389 } 1660 }
1390#endif 1661#endif
1391 1662
1663 /* pid check not overridable via env */
1664#ifndef _WIN32
1665 if (flags & EVFLAG_FORKCHECK)
1666 curpid = getpid ();
1667#endif
1668
1669 if (!(flags & EVFLAG_NOENV)
1670 && !enable_secure ()
1671 && getenv ("LIBEV_FLAGS"))
1672 flags = atoi (getenv ("LIBEV_FLAGS"));
1673
1392 ev_rt_now = ev_time (); 1674 ev_rt_now = ev_time ();
1393 mn_now = get_clock (); 1675 mn_now = get_clock ();
1394 now_floor = mn_now; 1676 now_floor = mn_now;
1395 rtmn_diff = ev_rt_now - mn_now; 1677 rtmn_diff = ev_rt_now - mn_now;
1678#if EV_FEATURE_API
1679 invoke_cb = ev_invoke_pending;
1680#endif
1396 1681
1397 io_blocktime = 0.; 1682 io_blocktime = 0.;
1398 timeout_blocktime = 0.; 1683 timeout_blocktime = 0.;
1399 backend = 0; 1684 backend = 0;
1400 backend_fd = -1; 1685 backend_fd = -1;
1401 gotasync = 0; 1686 sig_pending = 0;
1687#if EV_ASYNC_ENABLE
1688 async_pending = 0;
1689#endif
1402#if EV_USE_INOTIFY 1690#if EV_USE_INOTIFY
1403 fs_fd = -2; 1691 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1404#endif 1692#endif
1405 1693#if EV_USE_SIGNALFD
1406 /* pid check not overridable via env */ 1694 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1407#ifndef _WIN32
1408 if (flags & EVFLAG_FORKCHECK)
1409 curpid = getpid ();
1410#endif 1695#endif
1411
1412 if (!(flags & EVFLAG_NOENV)
1413 && !enable_secure ()
1414 && getenv ("LIBEV_FLAGS"))
1415 flags = atoi (getenv ("LIBEV_FLAGS"));
1416 1696
1417 if (!(flags & 0x0000ffffU)) 1697 if (!(flags & 0x0000ffffU))
1418 flags |= ev_recommended_backends (); 1698 flags |= ev_recommended_backends ();
1419 1699
1420#if EV_USE_PORT 1700#if EV_USE_PORT
… …
1433 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1713 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1434#endif 1714#endif
1435 1715
1436 ev_prepare_init (&pending_w, pendingcb); 1716 ev_prepare_init (&pending_w, pendingcb);
1437 1717
1718#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1438 ev_init (&pipe_w, pipecb); 1719 ev_init (&pipe_w, pipecb);
1439 ev_set_priority (&pipe_w, EV_MAXPRI); 1720 ev_set_priority (&pipe_w, EV_MAXPRI);
1721#endif
1440 } 1722 }
1441} 1723}
1442 1724
1443/* free up a loop structure */ 1725/* free up a loop structure */
1444static void noinline 1726static void noinline
… …
1446{ 1728{
1447 int i; 1729 int i;
1448 1730
1449 if (ev_is_active (&pipe_w)) 1731 if (ev_is_active (&pipe_w))
1450 { 1732 {
1451 ev_ref (EV_A); /* signal watcher */ 1733 /*ev_ref (EV_A);*/
1452 ev_io_stop (EV_A_ &pipe_w); 1734 /*ev_io_stop (EV_A_ &pipe_w);*/
1453 1735
1454#if EV_USE_EVENTFD 1736#if EV_USE_EVENTFD
1455 if (evfd >= 0) 1737 if (evfd >= 0)
1456 close (evfd); 1738 close (evfd);
1457#endif 1739#endif
1458 1740
1459 if (evpipe [0] >= 0) 1741 if (evpipe [0] >= 0)
1460 { 1742 {
1461 close (evpipe [0]); 1743 EV_WIN32_CLOSE_FD (evpipe [0]);
1462 close (evpipe [1]); 1744 EV_WIN32_CLOSE_FD (evpipe [1]);
1463 } 1745 }
1464 } 1746 }
1747
1748#if EV_USE_SIGNALFD
1749 if (ev_is_active (&sigfd_w))
1750 close (sigfd);
1751#endif
1465 1752
1466#if EV_USE_INOTIFY 1753#if EV_USE_INOTIFY
1467 if (fs_fd >= 0) 1754 if (fs_fd >= 0)
1468 close (fs_fd); 1755 close (fs_fd);
1469#endif 1756#endif
… …
1493#if EV_IDLE_ENABLE 1780#if EV_IDLE_ENABLE
1494 array_free (idle, [i]); 1781 array_free (idle, [i]);
1495#endif 1782#endif
1496 } 1783 }
1497 1784
1498 ev_free (anfds); anfdmax = 0; 1785 ev_free (anfds); anfds = 0; anfdmax = 0;
1499 1786
1500 /* have to use the microsoft-never-gets-it-right macro */ 1787 /* have to use the microsoft-never-gets-it-right macro */
1501 array_free (rfeed, EMPTY); 1788 array_free (rfeed, EMPTY);
1502 array_free (fdchange, EMPTY); 1789 array_free (fdchange, EMPTY);
1503 array_free (timer, EMPTY); 1790 array_free (timer, EMPTY);
… …
1538 1825
1539 if (ev_is_active (&pipe_w)) 1826 if (ev_is_active (&pipe_w))
1540 { 1827 {
1541 /* this "locks" the handlers against writing to the pipe */ 1828 /* this "locks" the handlers against writing to the pipe */
1542 /* while we modify the fd vars */ 1829 /* while we modify the fd vars */
1543 gotsig = 1; 1830 sig_pending = 1;
1544#if EV_ASYNC_ENABLE 1831#if EV_ASYNC_ENABLE
1545 gotasync = 1; 1832 async_pending = 1;
1546#endif 1833#endif
1547 1834
1548 ev_ref (EV_A); 1835 ev_ref (EV_A);
1549 ev_io_stop (EV_A_ &pipe_w); 1836 ev_io_stop (EV_A_ &pipe_w);
1550 1837
… …
1553 close (evfd); 1840 close (evfd);
1554#endif 1841#endif
1555 1842
1556 if (evpipe [0] >= 0) 1843 if (evpipe [0] >= 0)
1557 { 1844 {
1558 close (evpipe [0]); 1845 EV_WIN32_CLOSE_FD (evpipe [0]);
1559 close (evpipe [1]); 1846 EV_WIN32_CLOSE_FD (evpipe [1]);
1560 } 1847 }
1561 1848
1849#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1562 evpipe_init (EV_A); 1850 evpipe_init (EV_A);
1563 /* now iterate over everything, in case we missed something */ 1851 /* now iterate over everything, in case we missed something */
1564 pipecb (EV_A_ &pipe_w, EV_READ); 1852 pipecb (EV_A_ &pipe_w, EV_READ);
1853#endif
1565 } 1854 }
1566 1855
1567 postfork = 0; 1856 postfork = 0;
1568} 1857}
1569 1858
1570#if EV_MULTIPLICITY 1859#if EV_MULTIPLICITY
1571 1860
1572struct ev_loop * 1861struct ev_loop *
1573ev_loop_new (unsigned int flags) 1862ev_loop_new (unsigned int flags)
1574{ 1863{
1575 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1864 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1576 1865
1577 memset (loop, 0, sizeof (struct ev_loop)); 1866 memset (EV_A, 0, sizeof (struct ev_loop));
1578
1579 loop_init (EV_A_ flags); 1867 loop_init (EV_A_ flags);
1580 1868
1581 if (ev_backend (EV_A)) 1869 if (ev_backend (EV_A))
1582 return loop; 1870 return EV_A;
1583 1871
1584 return 0; 1872 return 0;
1585} 1873}
1586 1874
1587void 1875void
… …
1594void 1882void
1595ev_loop_fork (EV_P) 1883ev_loop_fork (EV_P)
1596{ 1884{
1597 postfork = 1; /* must be in line with ev_default_fork */ 1885 postfork = 1; /* must be in line with ev_default_fork */
1598} 1886}
1887#endif /* multiplicity */
1599 1888
1600#if EV_VERIFY 1889#if EV_VERIFY
1601static void noinline 1890static void noinline
1602verify_watcher (EV_P_ W w) 1891verify_watcher (EV_P_ W w)
1603{ 1892{
… …
1631 verify_watcher (EV_A_ ws [cnt]); 1920 verify_watcher (EV_A_ ws [cnt]);
1632 } 1921 }
1633} 1922}
1634#endif 1923#endif
1635 1924
1925#if EV_FEATURE_API
1636void 1926void
1637ev_loop_verify (EV_P) 1927ev_verify (EV_P)
1638{ 1928{
1639#if EV_VERIFY 1929#if EV_VERIFY
1640 int i; 1930 int i;
1641 WL w; 1931 WL w;
1642 1932
… …
1681#if EV_ASYNC_ENABLE 1971#if EV_ASYNC_ENABLE
1682 assert (asyncmax >= asynccnt); 1972 assert (asyncmax >= asynccnt);
1683 array_verify (EV_A_ (W *)asyncs, asynccnt); 1973 array_verify (EV_A_ (W *)asyncs, asynccnt);
1684#endif 1974#endif
1685 1975
1976#if EV_PREPARE_ENABLE
1686 assert (preparemax >= preparecnt); 1977 assert (preparemax >= preparecnt);
1687 array_verify (EV_A_ (W *)prepares, preparecnt); 1978 array_verify (EV_A_ (W *)prepares, preparecnt);
1979#endif
1688 1980
1981#if EV_CHECK_ENABLE
1689 assert (checkmax >= checkcnt); 1982 assert (checkmax >= checkcnt);
1690 array_verify (EV_A_ (W *)checks, checkcnt); 1983 array_verify (EV_A_ (W *)checks, checkcnt);
1984#endif
1691 1985
1692# if 0 1986# if 0
1987#if EV_CHILD_ENABLE
1693 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1988 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1694 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1989 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1990#endif
1695# endif 1991# endif
1696#endif 1992#endif
1697} 1993}
1698 1994#endif
1699#endif /* multiplicity */
1700 1995
1701#if EV_MULTIPLICITY 1996#if EV_MULTIPLICITY
1702struct ev_loop * 1997struct ev_loop *
1703ev_default_loop_init (unsigned int flags) 1998ev_default_loop_init (unsigned int flags)
1704#else 1999#else
… …
1707#endif 2002#endif
1708{ 2003{
1709 if (!ev_default_loop_ptr) 2004 if (!ev_default_loop_ptr)
1710 { 2005 {
1711#if EV_MULTIPLICITY 2006#if EV_MULTIPLICITY
1712 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2007 EV_P = ev_default_loop_ptr = &default_loop_struct;
1713#else 2008#else
1714 ev_default_loop_ptr = 1; 2009 ev_default_loop_ptr = 1;
1715#endif 2010#endif
1716 2011
1717 loop_init (EV_A_ flags); 2012 loop_init (EV_A_ flags);
1718 2013
1719 if (ev_backend (EV_A)) 2014 if (ev_backend (EV_A))
1720 { 2015 {
1721#ifndef _WIN32 2016#if EV_CHILD_ENABLE
1722 ev_signal_init (&childev, childcb, SIGCHLD); 2017 ev_signal_init (&childev, childcb, SIGCHLD);
1723 ev_set_priority (&childev, EV_MAXPRI); 2018 ev_set_priority (&childev, EV_MAXPRI);
1724 ev_signal_start (EV_A_ &childev); 2019 ev_signal_start (EV_A_ &childev);
1725 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2020 ev_unref (EV_A); /* child watcher should not keep loop alive */
1726#endif 2021#endif
… …
1734 2029
1735void 2030void
1736ev_default_destroy (void) 2031ev_default_destroy (void)
1737{ 2032{
1738#if EV_MULTIPLICITY 2033#if EV_MULTIPLICITY
1739 struct ev_loop *loop = ev_default_loop_ptr; 2034 EV_P = ev_default_loop_ptr;
1740#endif 2035#endif
1741 2036
1742 ev_default_loop_ptr = 0; 2037 ev_default_loop_ptr = 0;
1743 2038
1744#ifndef _WIN32 2039#if EV_CHILD_ENABLE
1745 ev_ref (EV_A); /* child watcher */ 2040 ev_ref (EV_A); /* child watcher */
1746 ev_signal_stop (EV_A_ &childev); 2041 ev_signal_stop (EV_A_ &childev);
1747#endif 2042#endif
1748 2043
1749 loop_destroy (EV_A); 2044 loop_destroy (EV_A);
… …
1751 2046
1752void 2047void
1753ev_default_fork (void) 2048ev_default_fork (void)
1754{ 2049{
1755#if EV_MULTIPLICITY 2050#if EV_MULTIPLICITY
1756 struct ev_loop *loop = ev_default_loop_ptr; 2051 EV_P = ev_default_loop_ptr;
1757#endif 2052#endif
1758 2053
1759 postfork = 1; /* must be in line with ev_loop_fork */ 2054 postfork = 1; /* must be in line with ev_loop_fork */
1760} 2055}
1761 2056
… …
1765ev_invoke (EV_P_ void *w, int revents) 2060ev_invoke (EV_P_ void *w, int revents)
1766{ 2061{
1767 EV_CB_INVOKE ((W)w, revents); 2062 EV_CB_INVOKE ((W)w, revents);
1768} 2063}
1769 2064
1770inline_speed void 2065unsigned int
1771call_pending (EV_P) 2066ev_pending_count (EV_P)
2067{
2068 int pri;
2069 unsigned int count = 0;
2070
2071 for (pri = NUMPRI; pri--; )
2072 count += pendingcnt [pri];
2073
2074 return count;
2075}
2076
2077void noinline
2078ev_invoke_pending (EV_P)
1772{ 2079{
1773 int pri; 2080 int pri;
1774 2081
1775 for (pri = NUMPRI; pri--; ) 2082 for (pri = NUMPRI; pri--; )
1776 while (pendingcnt [pri]) 2083 while (pendingcnt [pri])
… …
1843 EV_FREQUENT_CHECK; 2150 EV_FREQUENT_CHECK;
1844 feed_reverse (EV_A_ (W)w); 2151 feed_reverse (EV_A_ (W)w);
1845 } 2152 }
1846 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2153 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1847 2154
1848 feed_reverse_done (EV_A_ EV_TIMEOUT); 2155 feed_reverse_done (EV_A_ EV_TIMER);
1849 } 2156 }
1850} 2157}
1851 2158
1852#if EV_PERIODIC_ENABLE 2159#if EV_PERIODIC_ENABLE
1853/* make periodics pending */ 2160/* make periodics pending */
… …
1906 feed_reverse_done (EV_A_ EV_PERIODIC); 2213 feed_reverse_done (EV_A_ EV_PERIODIC);
1907 } 2214 }
1908} 2215}
1909 2216
1910/* simply recalculate all periodics */ 2217/* simply recalculate all periodics */
1911/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2218/* TODO: maybe ensure that at least one event happens when jumping forward? */
1912static void noinline 2219static void noinline
1913periodics_reschedule (EV_P) 2220periodics_reschedule (EV_P)
1914{ 2221{
1915 int i; 2222 int i;
1916 2223
… …
1944 ANHE_at_cache (*he); 2251 ANHE_at_cache (*he);
1945 } 2252 }
1946} 2253}
1947 2254
1948/* fetch new monotonic and realtime times from the kernel */ 2255/* fetch new monotonic and realtime times from the kernel */
1949/* also detetc if there was a timejump, and act accordingly */ 2256/* also detect if there was a timejump, and act accordingly */
1950inline_speed void 2257inline_speed void
1951time_update (EV_P_ ev_tstamp max_block) 2258time_update (EV_P_ ev_tstamp max_block)
1952{ 2259{
1953#if EV_USE_MONOTONIC 2260#if EV_USE_MONOTONIC
1954 if (expect_true (have_monotonic)) 2261 if (expect_true (have_monotonic))
… …
2011 2318
2012 mn_now = ev_rt_now; 2319 mn_now = ev_rt_now;
2013 } 2320 }
2014} 2321}
2015 2322
2016static int loop_done;
2017
2018void 2323void
2019ev_loop (EV_P_ int flags) 2324ev_run (EV_P_ int flags)
2020{ 2325{
2326#if EV_FEATURE_API
2327 ++loop_depth;
2328#endif
2329
2330 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2331
2021 loop_done = EVUNLOOP_CANCEL; 2332 loop_done = EVBREAK_CANCEL;
2022 2333
2023 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2334 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2024 2335
2025 do 2336 do
2026 { 2337 {
2027#if EV_VERIFY >= 2 2338#if EV_VERIFY >= 2
2028 ev_loop_verify (EV_A); 2339 ev_verify (EV_A);
2029#endif 2340#endif
2030 2341
2031#ifndef _WIN32 2342#ifndef _WIN32
2032 if (expect_false (curpid)) /* penalise the forking check even more */ 2343 if (expect_false (curpid)) /* penalise the forking check even more */
2033 if (expect_false (getpid () != curpid)) 2344 if (expect_false (getpid () != curpid))
… …
2041 /* we might have forked, so queue fork handlers */ 2352 /* we might have forked, so queue fork handlers */
2042 if (expect_false (postfork)) 2353 if (expect_false (postfork))
2043 if (forkcnt) 2354 if (forkcnt)
2044 { 2355 {
2045 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2356 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2046 call_pending (EV_A); 2357 EV_INVOKE_PENDING;
2047 } 2358 }
2048#endif 2359#endif
2049 2360
2361#if EV_PREPARE_ENABLE
2050 /* queue prepare watchers (and execute them) */ 2362 /* queue prepare watchers (and execute them) */
2051 if (expect_false (preparecnt)) 2363 if (expect_false (preparecnt))
2052 { 2364 {
2053 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2365 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2054 call_pending (EV_A); 2366 EV_INVOKE_PENDING;
2055 } 2367 }
2368#endif
2369
2370 if (expect_false (loop_done))
2371 break;
2056 2372
2057 /* we might have forked, so reify kernel state if necessary */ 2373 /* we might have forked, so reify kernel state if necessary */
2058 if (expect_false (postfork)) 2374 if (expect_false (postfork))
2059 loop_fork (EV_A); 2375 loop_fork (EV_A);
2060 2376
… …
2064 /* calculate blocking time */ 2380 /* calculate blocking time */
2065 { 2381 {
2066 ev_tstamp waittime = 0.; 2382 ev_tstamp waittime = 0.;
2067 ev_tstamp sleeptime = 0.; 2383 ev_tstamp sleeptime = 0.;
2068 2384
2385 /* remember old timestamp for io_blocktime calculation */
2386 ev_tstamp prev_mn_now = mn_now;
2387
2388 /* update time to cancel out callback processing overhead */
2389 time_update (EV_A_ 1e100);
2390
2069 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2391 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2070 { 2392 {
2071 /* update time to cancel out callback processing overhead */
2072 time_update (EV_A_ 1e100);
2073
2074 waittime = MAX_BLOCKTIME; 2393 waittime = MAX_BLOCKTIME;
2075 2394
2076 if (timercnt) 2395 if (timercnt)
2077 { 2396 {
2078 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2397 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2085 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2404 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2086 if (waittime > to) waittime = to; 2405 if (waittime > to) waittime = to;
2087 } 2406 }
2088#endif 2407#endif
2089 2408
2409 /* don't let timeouts decrease the waittime below timeout_blocktime */
2090 if (expect_false (waittime < timeout_blocktime)) 2410 if (expect_false (waittime < timeout_blocktime))
2091 waittime = timeout_blocktime; 2411 waittime = timeout_blocktime;
2092 2412
2093 sleeptime = waittime - backend_fudge; 2413 /* extra check because io_blocktime is commonly 0 */
2094
2095 if (expect_true (sleeptime > io_blocktime)) 2414 if (expect_false (io_blocktime))
2096 sleeptime = io_blocktime;
2097
2098 if (sleeptime)
2099 { 2415 {
2416 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2417
2418 if (sleeptime > waittime - backend_fudge)
2419 sleeptime = waittime - backend_fudge;
2420
2421 if (expect_true (sleeptime > 0.))
2422 {
2100 ev_sleep (sleeptime); 2423 ev_sleep (sleeptime);
2101 waittime -= sleeptime; 2424 waittime -= sleeptime;
2425 }
2102 } 2426 }
2103 } 2427 }
2104 2428
2429#if EV_FEATURE_API
2105 ++loop_count; 2430 ++loop_count;
2431#endif
2432 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2106 backend_poll (EV_A_ waittime); 2433 backend_poll (EV_A_ waittime);
2434 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2107 2435
2108 /* update ev_rt_now, do magic */ 2436 /* update ev_rt_now, do magic */
2109 time_update (EV_A_ waittime + sleeptime); 2437 time_update (EV_A_ waittime + sleeptime);
2110 } 2438 }
2111 2439
… …
2118#if EV_IDLE_ENABLE 2446#if EV_IDLE_ENABLE
2119 /* queue idle watchers unless other events are pending */ 2447 /* queue idle watchers unless other events are pending */
2120 idle_reify (EV_A); 2448 idle_reify (EV_A);
2121#endif 2449#endif
2122 2450
2451#if EV_CHECK_ENABLE
2123 /* queue check watchers, to be executed first */ 2452 /* queue check watchers, to be executed first */
2124 if (expect_false (checkcnt)) 2453 if (expect_false (checkcnt))
2125 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2454 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2455#endif
2126 2456
2127 call_pending (EV_A); 2457 EV_INVOKE_PENDING;
2128 } 2458 }
2129 while (expect_true ( 2459 while (expect_true (
2130 activecnt 2460 activecnt
2131 && !loop_done 2461 && !loop_done
2132 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2462 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2133 )); 2463 ));
2134 2464
2135 if (loop_done == EVUNLOOP_ONE) 2465 if (loop_done == EVBREAK_ONE)
2136 loop_done = EVUNLOOP_CANCEL; 2466 loop_done = EVBREAK_CANCEL;
2137}
2138 2467
2468#if EV_FEATURE_API
2469 --loop_depth;
2470#endif
2471}
2472
2139void 2473void
2140ev_unloop (EV_P_ int how) 2474ev_break (EV_P_ int how)
2141{ 2475{
2142 loop_done = how; 2476 loop_done = how;
2143} 2477}
2144 2478
2145void 2479void
… …
2192inline_size void 2526inline_size void
2193wlist_del (WL *head, WL elem) 2527wlist_del (WL *head, WL elem)
2194{ 2528{
2195 while (*head) 2529 while (*head)
2196 { 2530 {
2197 if (*head == elem) 2531 if (expect_true (*head == elem))
2198 { 2532 {
2199 *head = elem->next; 2533 *head = elem->next;
2200 return; 2534 break;
2201 } 2535 }
2202 2536
2203 head = &(*head)->next; 2537 head = &(*head)->next;
2204 } 2538 }
2205} 2539}
… …
2233} 2567}
2234 2568
2235inline_size void 2569inline_size void
2236pri_adjust (EV_P_ W w) 2570pri_adjust (EV_P_ W w)
2237{ 2571{
2238 int pri = w->priority; 2572 int pri = ev_priority (w);
2239 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2573 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2240 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2574 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2241 w->priority = pri; 2575 ev_set_priority (w, pri);
2242} 2576}
2243 2577
2244inline_speed void 2578inline_speed void
2245ev_start (EV_P_ W w, int active) 2579ev_start (EV_P_ W w, int active)
2246{ 2580{
… …
2265 2599
2266 if (expect_false (ev_is_active (w))) 2600 if (expect_false (ev_is_active (w)))
2267 return; 2601 return;
2268 2602
2269 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2603 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2270 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2604 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2271 2605
2272 EV_FREQUENT_CHECK; 2606 EV_FREQUENT_CHECK;
2273 2607
2274 ev_start (EV_A_ (W)w, 1); 2608 ev_start (EV_A_ (W)w, 1);
2275 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2609 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2276 wlist_add (&anfds[fd].head, (WL)w); 2610 wlist_add (&anfds[fd].head, (WL)w);
2277 2611
2278 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2612 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2279 w->events &= ~EV__IOFDSET; 2613 w->events &= ~EV__IOFDSET;
2280 2614
2281 EV_FREQUENT_CHECK; 2615 EV_FREQUENT_CHECK;
2282} 2616}
2283 2617
… …
2293 EV_FREQUENT_CHECK; 2627 EV_FREQUENT_CHECK;
2294 2628
2295 wlist_del (&anfds[w->fd].head, (WL)w); 2629 wlist_del (&anfds[w->fd].head, (WL)w);
2296 ev_stop (EV_A_ (W)w); 2630 ev_stop (EV_A_ (W)w);
2297 2631
2298 fd_change (EV_A_ w->fd, 1); 2632 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2299 2633
2300 EV_FREQUENT_CHECK; 2634 EV_FREQUENT_CHECK;
2301} 2635}
2302 2636
2303void noinline 2637void noinline
… …
2345 timers [active] = timers [timercnt + HEAP0]; 2679 timers [active] = timers [timercnt + HEAP0];
2346 adjustheap (timers, timercnt, active); 2680 adjustheap (timers, timercnt, active);
2347 } 2681 }
2348 } 2682 }
2349 2683
2350 EV_FREQUENT_CHECK;
2351
2352 ev_at (w) -= mn_now; 2684 ev_at (w) -= mn_now;
2353 2685
2354 ev_stop (EV_A_ (W)w); 2686 ev_stop (EV_A_ (W)w);
2687
2688 EV_FREQUENT_CHECK;
2355} 2689}
2356 2690
2357void noinline 2691void noinline
2358ev_timer_again (EV_P_ ev_timer *w) 2692ev_timer_again (EV_P_ ev_timer *w)
2359{ 2693{
… …
2377 } 2711 }
2378 2712
2379 EV_FREQUENT_CHECK; 2713 EV_FREQUENT_CHECK;
2380} 2714}
2381 2715
2716ev_tstamp
2717ev_timer_remaining (EV_P_ ev_timer *w)
2718{
2719 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2720}
2721
2382#if EV_PERIODIC_ENABLE 2722#if EV_PERIODIC_ENABLE
2383void noinline 2723void noinline
2384ev_periodic_start (EV_P_ ev_periodic *w) 2724ev_periodic_start (EV_P_ ev_periodic *w)
2385{ 2725{
2386 if (expect_false (ev_is_active (w))) 2726 if (expect_false (ev_is_active (w)))
… …
2432 periodics [active] = periodics [periodiccnt + HEAP0]; 2772 periodics [active] = periodics [periodiccnt + HEAP0];
2433 adjustheap (periodics, periodiccnt, active); 2773 adjustheap (periodics, periodiccnt, active);
2434 } 2774 }
2435 } 2775 }
2436 2776
2437 EV_FREQUENT_CHECK;
2438
2439 ev_stop (EV_A_ (W)w); 2777 ev_stop (EV_A_ (W)w);
2778
2779 EV_FREQUENT_CHECK;
2440} 2780}
2441 2781
2442void noinline 2782void noinline
2443ev_periodic_again (EV_P_ ev_periodic *w) 2783ev_periodic_again (EV_P_ ev_periodic *w)
2444{ 2784{
… …
2450 2790
2451#ifndef SA_RESTART 2791#ifndef SA_RESTART
2452# define SA_RESTART 0 2792# define SA_RESTART 0
2453#endif 2793#endif
2454 2794
2795#if EV_SIGNAL_ENABLE
2796
2455void noinline 2797void noinline
2456ev_signal_start (EV_P_ ev_signal *w) 2798ev_signal_start (EV_P_ ev_signal *w)
2457{ 2799{
2458#if EV_MULTIPLICITY
2459 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2460#endif
2461 if (expect_false (ev_is_active (w))) 2800 if (expect_false (ev_is_active (w)))
2462 return; 2801 return;
2463 2802
2464 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2803 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2465 2804
2466 evpipe_init (EV_A); 2805#if EV_MULTIPLICITY
2806 assert (("libev: a signal must not be attached to two different loops",
2807 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2467 2808
2468 EV_FREQUENT_CHECK; 2809 signals [w->signum - 1].loop = EV_A;
2810#endif
2469 2811
2812 EV_FREQUENT_CHECK;
2813
2814#if EV_USE_SIGNALFD
2815 if (sigfd == -2)
2470 { 2816 {
2471#ifndef _WIN32 2817 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2472 sigset_t full, prev; 2818 if (sigfd < 0 && errno == EINVAL)
2473 sigfillset (&full); 2819 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2474 sigprocmask (SIG_SETMASK, &full, &prev);
2475#endif
2476 2820
2477 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2821 if (sigfd >= 0)
2822 {
2823 fd_intern (sigfd); /* doing it twice will not hurt */
2478 2824
2479#ifndef _WIN32 2825 sigemptyset (&sigfd_set);
2480 sigprocmask (SIG_SETMASK, &prev, 0); 2826
2481#endif 2827 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2828 ev_set_priority (&sigfd_w, EV_MAXPRI);
2829 ev_io_start (EV_A_ &sigfd_w);
2830 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2831 }
2482 } 2832 }
2833
2834 if (sigfd >= 0)
2835 {
2836 /* TODO: check .head */
2837 sigaddset (&sigfd_set, w->signum);
2838 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2839
2840 signalfd (sigfd, &sigfd_set, 0);
2841 }
2842#endif
2483 2843
2484 ev_start (EV_A_ (W)w, 1); 2844 ev_start (EV_A_ (W)w, 1);
2485 wlist_add (&signals [w->signum - 1].head, (WL)w); 2845 wlist_add (&signals [w->signum - 1].head, (WL)w);
2486 2846
2487 if (!((WL)w)->next) 2847 if (!((WL)w)->next)
2848# if EV_USE_SIGNALFD
2849 if (sigfd < 0) /*TODO*/
2850# endif
2488 { 2851 {
2489#if _WIN32 2852# ifdef _WIN32
2853 evpipe_init (EV_A);
2854
2490 signal (w->signum, ev_sighandler); 2855 signal (w->signum, ev_sighandler);
2491#else 2856# else
2492 struct sigaction sa; 2857 struct sigaction sa;
2858
2859 evpipe_init (EV_A);
2860
2493 sa.sa_handler = ev_sighandler; 2861 sa.sa_handler = ev_sighandler;
2494 sigfillset (&sa.sa_mask); 2862 sigfillset (&sa.sa_mask);
2495 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2863 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2496 sigaction (w->signum, &sa, 0); 2864 sigaction (w->signum, &sa, 0);
2865
2866 sigemptyset (&sa.sa_mask);
2867 sigaddset (&sa.sa_mask, w->signum);
2868 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2497#endif 2869#endif
2498 } 2870 }
2499 2871
2500 EV_FREQUENT_CHECK; 2872 EV_FREQUENT_CHECK;
2501} 2873}
2502 2874
2503void noinline 2875void noinline
… …
2511 2883
2512 wlist_del (&signals [w->signum - 1].head, (WL)w); 2884 wlist_del (&signals [w->signum - 1].head, (WL)w);
2513 ev_stop (EV_A_ (W)w); 2885 ev_stop (EV_A_ (W)w);
2514 2886
2515 if (!signals [w->signum - 1].head) 2887 if (!signals [w->signum - 1].head)
2888 {
2889#if EV_MULTIPLICITY
2890 signals [w->signum - 1].loop = 0; /* unattach from signal */
2891#endif
2892#if EV_USE_SIGNALFD
2893 if (sigfd >= 0)
2894 {
2895 sigset_t ss;
2896
2897 sigemptyset (&ss);
2898 sigaddset (&ss, w->signum);
2899 sigdelset (&sigfd_set, w->signum);
2900
2901 signalfd (sigfd, &sigfd_set, 0);
2902 sigprocmask (SIG_UNBLOCK, &ss, 0);
2903 }
2904 else
2905#endif
2516 signal (w->signum, SIG_DFL); 2906 signal (w->signum, SIG_DFL);
2907 }
2517 2908
2518 EV_FREQUENT_CHECK; 2909 EV_FREQUENT_CHECK;
2519} 2910}
2911
2912#endif
2913
2914#if EV_CHILD_ENABLE
2520 2915
2521void 2916void
2522ev_child_start (EV_P_ ev_child *w) 2917ev_child_start (EV_P_ ev_child *w)
2523{ 2918{
2524#if EV_MULTIPLICITY 2919#if EV_MULTIPLICITY
… …
2528 return; 2923 return;
2529 2924
2530 EV_FREQUENT_CHECK; 2925 EV_FREQUENT_CHECK;
2531 2926
2532 ev_start (EV_A_ (W)w, 1); 2927 ev_start (EV_A_ (W)w, 1);
2533 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2928 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2534 2929
2535 EV_FREQUENT_CHECK; 2930 EV_FREQUENT_CHECK;
2536} 2931}
2537 2932
2538void 2933void
… …
2542 if (expect_false (!ev_is_active (w))) 2937 if (expect_false (!ev_is_active (w)))
2543 return; 2938 return;
2544 2939
2545 EV_FREQUENT_CHECK; 2940 EV_FREQUENT_CHECK;
2546 2941
2547 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2942 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2548 ev_stop (EV_A_ (W)w); 2943 ev_stop (EV_A_ (W)w);
2549 2944
2550 EV_FREQUENT_CHECK; 2945 EV_FREQUENT_CHECK;
2551} 2946}
2947
2948#endif
2552 2949
2553#if EV_STAT_ENABLE 2950#if EV_STAT_ENABLE
2554 2951
2555# ifdef _WIN32 2952# ifdef _WIN32
2556# undef lstat 2953# undef lstat
… …
2562#define MIN_STAT_INTERVAL 0.1074891 2959#define MIN_STAT_INTERVAL 0.1074891
2563 2960
2564static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2961static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2565 2962
2566#if EV_USE_INOTIFY 2963#if EV_USE_INOTIFY
2567# define EV_INOTIFY_BUFSIZE 8192 2964
2965/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2966# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2568 2967
2569static void noinline 2968static void noinline
2570infy_add (EV_P_ ev_stat *w) 2969infy_add (EV_P_ ev_stat *w)
2571{ 2970{
2572 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); 2971 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);
2573 2972
2574 if (w->wd < 0) 2973 if (w->wd >= 0)
2974 {
2975 struct statfs sfs;
2976
2977 /* now local changes will be tracked by inotify, but remote changes won't */
2978 /* unless the filesystem is known to be local, we therefore still poll */
2979 /* also do poll on <2.6.25, but with normal frequency */
2980
2981 if (!fs_2625)
2982 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2983 else if (!statfs (w->path, &sfs)
2984 && (sfs.f_type == 0x1373 /* devfs */
2985 || sfs.f_type == 0xEF53 /* ext2/3 */
2986 || sfs.f_type == 0x3153464a /* jfs */
2987 || sfs.f_type == 0x52654973 /* reiser3 */
2988 || sfs.f_type == 0x01021994 /* tempfs */
2989 || sfs.f_type == 0x58465342 /* xfs */))
2990 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2991 else
2992 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2575 { 2993 }
2994 else
2995 {
2996 /* can't use inotify, continue to stat */
2576 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2997 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2577 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2578 2998
2579 /* monitor some parent directory for speedup hints */ 2999 /* if path is not there, monitor some parent directory for speedup hints */
2580 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3000 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2581 /* but an efficiency issue only */ 3001 /* but an efficiency issue only */
2582 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3002 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2583 { 3003 {
2584 char path [4096]; 3004 char path [4096];
… …
2600 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3020 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2601 } 3021 }
2602 } 3022 }
2603 3023
2604 if (w->wd >= 0) 3024 if (w->wd >= 0)
2605 {
2606 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3025 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2607 3026
2608 /* now local changes will be tracked by inotify, but remote changes won't */ 3027 /* now re-arm timer, if required */
2609 /* unless the filesystem it known to be local, we therefore still poll */ 3028 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2610 /* also do poll on <2.6.25, but with normal frequency */
2611 struct statfs sfs;
2612
2613 if (fs_2625 && !statfs (w->path, &sfs))
2614 if (sfs.f_type == 0x1373 /* devfs */
2615 || sfs.f_type == 0xEF53 /* ext2/3 */
2616 || sfs.f_type == 0x3153464a /* jfs */
2617 || sfs.f_type == 0x52654973 /* reiser3 */
2618 || sfs.f_type == 0x01021994 /* tempfs */
2619 || sfs.f_type == 0x58465342 /* xfs */)
2620 return;
2621
2622 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2623 ev_timer_again (EV_A_ &w->timer); 3029 ev_timer_again (EV_A_ &w->timer);
2624 } 3030 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2625} 3031}
2626 3032
2627static void noinline 3033static void noinline
2628infy_del (EV_P_ ev_stat *w) 3034infy_del (EV_P_ ev_stat *w)
2629{ 3035{
… …
2632 3038
2633 if (wd < 0) 3039 if (wd < 0)
2634 return; 3040 return;
2635 3041
2636 w->wd = -2; 3042 w->wd = -2;
2637 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3043 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2638 wlist_del (&fs_hash [slot].head, (WL)w); 3044 wlist_del (&fs_hash [slot].head, (WL)w);
2639 3045
2640 /* remove this watcher, if others are watching it, they will rearm */ 3046 /* remove this watcher, if others are watching it, they will rearm */
2641 inotify_rm_watch (fs_fd, wd); 3047 inotify_rm_watch (fs_fd, wd);
2642} 3048}
… …
2644static void noinline 3050static void noinline
2645infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3051infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2646{ 3052{
2647 if (slot < 0) 3053 if (slot < 0)
2648 /* overflow, need to check for all hash slots */ 3054 /* overflow, need to check for all hash slots */
2649 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3055 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2650 infy_wd (EV_A_ slot, wd, ev); 3056 infy_wd (EV_A_ slot, wd, ev);
2651 else 3057 else
2652 { 3058 {
2653 WL w_; 3059 WL w_;
2654 3060
2655 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3061 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2656 { 3062 {
2657 ev_stat *w = (ev_stat *)w_; 3063 ev_stat *w = (ev_stat *)w_;
2658 w_ = w_->next; /* lets us remove this watcher and all before it */ 3064 w_ = w_->next; /* lets us remove this watcher and all before it */
2659 3065
2660 if (w->wd == wd || wd == -1) 3066 if (w->wd == wd || wd == -1)
2661 { 3067 {
2662 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3068 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2663 { 3069 {
2664 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3070 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2665 w->wd = -1; 3071 w->wd = -1;
2666 infy_add (EV_A_ w); /* re-add, no matter what */ 3072 infy_add (EV_A_ w); /* re-add, no matter what */
2667 } 3073 }
2668 3074
2669 stat_timer_cb (EV_A_ &w->timer, 0); 3075 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2674 3080
2675static void 3081static void
2676infy_cb (EV_P_ ev_io *w, int revents) 3082infy_cb (EV_P_ ev_io *w, int revents)
2677{ 3083{
2678 char buf [EV_INOTIFY_BUFSIZE]; 3084 char buf [EV_INOTIFY_BUFSIZE];
2679 struct inotify_event *ev = (struct inotify_event *)buf;
2680 int ofs; 3085 int ofs;
2681 int len = read (fs_fd, buf, sizeof (buf)); 3086 int len = read (fs_fd, buf, sizeof (buf));
2682 3087
2683 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3088 for (ofs = 0; ofs < len; )
3089 {
3090 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2684 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3091 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3092 ofs += sizeof (struct inotify_event) + ev->len;
3093 }
2685} 3094}
2686 3095
2687inline_size void 3096inline_size void
2688check_2625 (EV_P) 3097ev_check_2625 (EV_P)
2689{ 3098{
2690 /* kernels < 2.6.25 are borked 3099 /* kernels < 2.6.25 are borked
2691 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3100 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2692 */ 3101 */
2693 struct utsname buf; 3102 if (ev_linux_version () < 0x020619)
2694 int major, minor, micro;
2695
2696 if (uname (&buf))
2697 return; 3103 return;
2698 3104
2699 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2700 return;
2701
2702 if (major < 2
2703 || (major == 2 && minor < 6)
2704 || (major == 2 && minor == 6 && micro < 25))
2705 return;
2706
2707 fs_2625 = 1; 3105 fs_2625 = 1;
3106}
3107
3108inline_size int
3109infy_newfd (void)
3110{
3111#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3112 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3113 if (fd >= 0)
3114 return fd;
3115#endif
3116 return inotify_init ();
2708} 3117}
2709 3118
2710inline_size void 3119inline_size void
2711infy_init (EV_P) 3120infy_init (EV_P)
2712{ 3121{
2713 if (fs_fd != -2) 3122 if (fs_fd != -2)
2714 return; 3123 return;
2715 3124
2716 fs_fd = -1; 3125 fs_fd = -1;
2717 3126
2718 check_2625 (EV_A); 3127 ev_check_2625 (EV_A);
2719 3128
2720 fs_fd = inotify_init (); 3129 fs_fd = infy_newfd ();
2721 3130
2722 if (fs_fd >= 0) 3131 if (fs_fd >= 0)
2723 { 3132 {
3133 fd_intern (fs_fd);
2724 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3134 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2725 ev_set_priority (&fs_w, EV_MAXPRI); 3135 ev_set_priority (&fs_w, EV_MAXPRI);
2726 ev_io_start (EV_A_ &fs_w); 3136 ev_io_start (EV_A_ &fs_w);
3137 ev_unref (EV_A);
2727 } 3138 }
2728} 3139}
2729 3140
2730inline_size void 3141inline_size void
2731infy_fork (EV_P) 3142infy_fork (EV_P)
… …
2733 int slot; 3144 int slot;
2734 3145
2735 if (fs_fd < 0) 3146 if (fs_fd < 0)
2736 return; 3147 return;
2737 3148
3149 ev_ref (EV_A);
3150 ev_io_stop (EV_A_ &fs_w);
2738 close (fs_fd); 3151 close (fs_fd);
2739 fs_fd = inotify_init (); 3152 fs_fd = infy_newfd ();
2740 3153
3154 if (fs_fd >= 0)
3155 {
3156 fd_intern (fs_fd);
3157 ev_io_set (&fs_w, fs_fd, EV_READ);
3158 ev_io_start (EV_A_ &fs_w);
3159 ev_unref (EV_A);
3160 }
3161
2741 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3162 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2742 { 3163 {
2743 WL w_ = fs_hash [slot].head; 3164 WL w_ = fs_hash [slot].head;
2744 fs_hash [slot].head = 0; 3165 fs_hash [slot].head = 0;
2745 3166
2746 while (w_) 3167 while (w_)
… …
2751 w->wd = -1; 3172 w->wd = -1;
2752 3173
2753 if (fs_fd >= 0) 3174 if (fs_fd >= 0)
2754 infy_add (EV_A_ w); /* re-add, no matter what */ 3175 infy_add (EV_A_ w); /* re-add, no matter what */
2755 else 3176 else
3177 {
3178 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3179 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2756 ev_timer_again (EV_A_ &w->timer); 3180 ev_timer_again (EV_A_ &w->timer);
3181 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3182 }
2757 } 3183 }
2758 } 3184 }
2759} 3185}
2760 3186
2761#endif 3187#endif
… …
2778static void noinline 3204static void noinline
2779stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3205stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2780{ 3206{
2781 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3207 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2782 3208
2783 /* we copy this here each the time so that */ 3209 ev_statdata prev = w->attr;
2784 /* prev has the old value when the callback gets invoked */
2785 w->prev = w->attr;
2786 ev_stat_stat (EV_A_ w); 3210 ev_stat_stat (EV_A_ w);
2787 3211
2788 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3212 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2789 if ( 3213 if (
2790 w->prev.st_dev != w->attr.st_dev 3214 prev.st_dev != w->attr.st_dev
2791 || w->prev.st_ino != w->attr.st_ino 3215 || prev.st_ino != w->attr.st_ino
2792 || w->prev.st_mode != w->attr.st_mode 3216 || prev.st_mode != w->attr.st_mode
2793 || w->prev.st_nlink != w->attr.st_nlink 3217 || prev.st_nlink != w->attr.st_nlink
2794 || w->prev.st_uid != w->attr.st_uid 3218 || prev.st_uid != w->attr.st_uid
2795 || w->prev.st_gid != w->attr.st_gid 3219 || prev.st_gid != w->attr.st_gid
2796 || w->prev.st_rdev != w->attr.st_rdev 3220 || prev.st_rdev != w->attr.st_rdev
2797 || w->prev.st_size != w->attr.st_size 3221 || prev.st_size != w->attr.st_size
2798 || w->prev.st_atime != w->attr.st_atime 3222 || prev.st_atime != w->attr.st_atime
2799 || w->prev.st_mtime != w->attr.st_mtime 3223 || prev.st_mtime != w->attr.st_mtime
2800 || w->prev.st_ctime != w->attr.st_ctime 3224 || prev.st_ctime != w->attr.st_ctime
2801 ) { 3225 ) {
3226 /* we only update w->prev on actual differences */
3227 /* in case we test more often than invoke the callback, */
3228 /* to ensure that prev is always different to attr */
3229 w->prev = prev;
3230
2802 #if EV_USE_INOTIFY 3231 #if EV_USE_INOTIFY
2803 if (fs_fd >= 0) 3232 if (fs_fd >= 0)
2804 { 3233 {
2805 infy_del (EV_A_ w); 3234 infy_del (EV_A_ w);
2806 infy_add (EV_A_ w); 3235 infy_add (EV_A_ w);
… …
2831 3260
2832 if (fs_fd >= 0) 3261 if (fs_fd >= 0)
2833 infy_add (EV_A_ w); 3262 infy_add (EV_A_ w);
2834 else 3263 else
2835#endif 3264#endif
3265 {
2836 ev_timer_again (EV_A_ &w->timer); 3266 ev_timer_again (EV_A_ &w->timer);
3267 ev_unref (EV_A);
3268 }
2837 3269
2838 ev_start (EV_A_ (W)w, 1); 3270 ev_start (EV_A_ (W)w, 1);
2839 3271
2840 EV_FREQUENT_CHECK; 3272 EV_FREQUENT_CHECK;
2841} 3273}
… …
2850 EV_FREQUENT_CHECK; 3282 EV_FREQUENT_CHECK;
2851 3283
2852#if EV_USE_INOTIFY 3284#if EV_USE_INOTIFY
2853 infy_del (EV_A_ w); 3285 infy_del (EV_A_ w);
2854#endif 3286#endif
3287
3288 if (ev_is_active (&w->timer))
3289 {
3290 ev_ref (EV_A);
2855 ev_timer_stop (EV_A_ &w->timer); 3291 ev_timer_stop (EV_A_ &w->timer);
3292 }
2856 3293
2857 ev_stop (EV_A_ (W)w); 3294 ev_stop (EV_A_ (W)w);
2858 3295
2859 EV_FREQUENT_CHECK; 3296 EV_FREQUENT_CHECK;
2860} 3297}
… …
2905 3342
2906 EV_FREQUENT_CHECK; 3343 EV_FREQUENT_CHECK;
2907} 3344}
2908#endif 3345#endif
2909 3346
3347#if EV_PREPARE_ENABLE
2910void 3348void
2911ev_prepare_start (EV_P_ ev_prepare *w) 3349ev_prepare_start (EV_P_ ev_prepare *w)
2912{ 3350{
2913 if (expect_false (ev_is_active (w))) 3351 if (expect_false (ev_is_active (w)))
2914 return; 3352 return;
… …
2940 3378
2941 ev_stop (EV_A_ (W)w); 3379 ev_stop (EV_A_ (W)w);
2942 3380
2943 EV_FREQUENT_CHECK; 3381 EV_FREQUENT_CHECK;
2944} 3382}
3383#endif
2945 3384
3385#if EV_CHECK_ENABLE
2946void 3386void
2947ev_check_start (EV_P_ ev_check *w) 3387ev_check_start (EV_P_ ev_check *w)
2948{ 3388{
2949 if (expect_false (ev_is_active (w))) 3389 if (expect_false (ev_is_active (w)))
2950 return; 3390 return;
… …
2976 3416
2977 ev_stop (EV_A_ (W)w); 3417 ev_stop (EV_A_ (W)w);
2978 3418
2979 EV_FREQUENT_CHECK; 3419 EV_FREQUENT_CHECK;
2980} 3420}
3421#endif
2981 3422
2982#if EV_EMBED_ENABLE 3423#if EV_EMBED_ENABLE
2983void noinline 3424void noinline
2984ev_embed_sweep (EV_P_ ev_embed *w) 3425ev_embed_sweep (EV_P_ ev_embed *w)
2985{ 3426{
2986 ev_loop (w->other, EVLOOP_NONBLOCK); 3427 ev_run (w->other, EVRUN_NOWAIT);
2987} 3428}
2988 3429
2989static void 3430static void
2990embed_io_cb (EV_P_ ev_io *io, int revents) 3431embed_io_cb (EV_P_ ev_io *io, int revents)
2991{ 3432{
2992 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3433 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2993 3434
2994 if (ev_cb (w)) 3435 if (ev_cb (w))
2995 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3436 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2996 else 3437 else
2997 ev_loop (w->other, EVLOOP_NONBLOCK); 3438 ev_run (w->other, EVRUN_NOWAIT);
2998} 3439}
2999 3440
3000static void 3441static void
3001embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3442embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3002{ 3443{
3003 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3444 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3004 3445
3005 { 3446 {
3006 struct ev_loop *loop = w->other; 3447 EV_P = w->other;
3007 3448
3008 while (fdchangecnt) 3449 while (fdchangecnt)
3009 { 3450 {
3010 fd_reify (EV_A); 3451 fd_reify (EV_A);
3011 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3452 ev_run (EV_A_ EVRUN_NOWAIT);
3012 } 3453 }
3013 } 3454 }
3014} 3455}
3015 3456
3016static void 3457static void
… …
3019 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3460 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3020 3461
3021 ev_embed_stop (EV_A_ w); 3462 ev_embed_stop (EV_A_ w);
3022 3463
3023 { 3464 {
3024 struct ev_loop *loop = w->other; 3465 EV_P = w->other;
3025 3466
3026 ev_loop_fork (EV_A); 3467 ev_loop_fork (EV_A);
3027 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3468 ev_run (EV_A_ EVRUN_NOWAIT);
3028 } 3469 }
3029 3470
3030 ev_embed_start (EV_A_ w); 3471 ev_embed_start (EV_A_ w);
3031} 3472}
3032 3473
… …
3043{ 3484{
3044 if (expect_false (ev_is_active (w))) 3485 if (expect_false (ev_is_active (w)))
3045 return; 3486 return;
3046 3487
3047 { 3488 {
3048 struct ev_loop *loop = w->other; 3489 EV_P = w->other;
3049 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3490 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3050 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3491 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3051 } 3492 }
3052 3493
3053 EV_FREQUENT_CHECK; 3494 EV_FREQUENT_CHECK;
… …
3080 3521
3081 ev_io_stop (EV_A_ &w->io); 3522 ev_io_stop (EV_A_ &w->io);
3082 ev_prepare_stop (EV_A_ &w->prepare); 3523 ev_prepare_stop (EV_A_ &w->prepare);
3083 ev_fork_stop (EV_A_ &w->fork); 3524 ev_fork_stop (EV_A_ &w->fork);
3084 3525
3526 ev_stop (EV_A_ (W)w);
3527
3085 EV_FREQUENT_CHECK; 3528 EV_FREQUENT_CHECK;
3086} 3529}
3087#endif 3530#endif
3088 3531
3089#if EV_FORK_ENABLE 3532#if EV_FORK_ENABLE
… …
3129ev_async_start (EV_P_ ev_async *w) 3572ev_async_start (EV_P_ ev_async *w)
3130{ 3573{
3131 if (expect_false (ev_is_active (w))) 3574 if (expect_false (ev_is_active (w)))
3132 return; 3575 return;
3133 3576
3577 w->sent = 0;
3578
3134 evpipe_init (EV_A); 3579 evpipe_init (EV_A);
3135 3580
3136 EV_FREQUENT_CHECK; 3581 EV_FREQUENT_CHECK;
3137 3582
3138 ev_start (EV_A_ (W)w, ++asynccnt); 3583 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3165 3610
3166void 3611void
3167ev_async_send (EV_P_ ev_async *w) 3612ev_async_send (EV_P_ ev_async *w)
3168{ 3613{
3169 w->sent = 1; 3614 w->sent = 1;
3170 evpipe_write (EV_A_ &gotasync); 3615 evpipe_write (EV_A_ &async_pending);
3171} 3616}
3172#endif 3617#endif
3173 3618
3174/*****************************************************************************/ 3619/*****************************************************************************/
3175 3620
… …
3215{ 3660{
3216 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3661 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3217 3662
3218 if (expect_false (!once)) 3663 if (expect_false (!once))
3219 { 3664 {
3220 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3665 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3221 return; 3666 return;
3222 } 3667 }
3223 3668
3224 once->cb = cb; 3669 once->cb = cb;
3225 once->arg = arg; 3670 once->arg = arg;
… …
3312 if (types & EV_ASYNC) 3757 if (types & EV_ASYNC)
3313 for (i = asynccnt; i--; ) 3758 for (i = asynccnt; i--; )
3314 cb (EV_A_ EV_ASYNC, asyncs [i]); 3759 cb (EV_A_ EV_ASYNC, asyncs [i]);
3315#endif 3760#endif
3316 3761
3762#if EV_PREPARE_ENABLE
3317 if (types & EV_PREPARE) 3763 if (types & EV_PREPARE)
3318 for (i = preparecnt; i--; ) 3764 for (i = preparecnt; i--; )
3319#if EV_EMBED_ENABLE 3765# if EV_EMBED_ENABLE
3320 if (ev_cb (prepares [i]) != embed_prepare_cb) 3766 if (ev_cb (prepares [i]) != embed_prepare_cb)
3321#endif 3767# endif
3322 cb (EV_A_ EV_PREPARE, prepares [i]); 3768 cb (EV_A_ EV_PREPARE, prepares [i]);
3769#endif
3323 3770
3771#if EV_CHECK_ENABLE
3324 if (types & EV_CHECK) 3772 if (types & EV_CHECK)
3325 for (i = checkcnt; i--; ) 3773 for (i = checkcnt; i--; )
3326 cb (EV_A_ EV_CHECK, checks [i]); 3774 cb (EV_A_ EV_CHECK, checks [i]);
3775#endif
3327 3776
3777#if EV_SIGNAL_ENABLE
3328 if (types & EV_SIGNAL) 3778 if (types & EV_SIGNAL)
3329 for (i = 0; i < signalmax; ++i) 3779 for (i = 0; i < EV_NSIG - 1; ++i)
3330 for (wl = signals [i].head; wl; ) 3780 for (wl = signals [i].head; wl; )
3331 { 3781 {
3332 wn = wl->next; 3782 wn = wl->next;
3333 cb (EV_A_ EV_SIGNAL, wl); 3783 cb (EV_A_ EV_SIGNAL, wl);
3334 wl = wn; 3784 wl = wn;
3335 } 3785 }
3786#endif
3336 3787
3788#if EV_CHILD_ENABLE
3337 if (types & EV_CHILD) 3789 if (types & EV_CHILD)
3338 for (i = EV_PID_HASHSIZE; i--; ) 3790 for (i = (EV_PID_HASHSIZE); i--; )
3339 for (wl = childs [i]; wl; ) 3791 for (wl = childs [i]; wl; )
3340 { 3792 {
3341 wn = wl->next; 3793 wn = wl->next;
3342 cb (EV_A_ EV_CHILD, wl); 3794 cb (EV_A_ EV_CHILD, wl);
3343 wl = wn; 3795 wl = wn;
3344 } 3796 }
3797#endif
3345/* EV_STAT 0x00001000 /* stat data changed */ 3798/* EV_STAT 0x00001000 /* stat data changed */
3346/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3799/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3347} 3800}
3348#endif 3801#endif
3349 3802
3350#if EV_MULTIPLICITY 3803#if EV_MULTIPLICITY
3351 #include "ev_wrap.h" 3804 #include "ev_wrap.h"
3352#endif 3805#endif
3353 3806
3354#ifdef __cplusplus 3807EV_CPP(})
3355}
3356#endif
3357 3808

Diff Legend

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