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

Comparing libev/ev.c (file contents):
Revision 1.306 by root, Sun Jul 19 06:35:25 2009 UTC vs.
Revision 1.379 by root, Sun Jun 19 17:55:13 2011 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright notice, 10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer. 11 * this list of conditions and the following disclaimer.
12 * 12 *
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
16 * 16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
… …
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
49# include "config.h" 45# include "config.h"
50# endif 46# endif
47
48#if HAVE_FLOOR
49# ifndef EV_USE_FLOOR
50# define EV_USE_FLOOR 1
51# endif
52#endif
51 53
52# if HAVE_CLOCK_SYSCALL 54# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL 55# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1 56# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME 57# ifndef EV_USE_REALTIME
… …
77# ifndef EV_USE_REALTIME 79# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 80# define EV_USE_REALTIME 0
79# endif 81# endif
80# endif 82# endif
81 83
84# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 85# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 86# define EV_USE_NANOSLEEP EV_FEATURE_OS
87# endif
85# else 88# else
89# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 90# define EV_USE_NANOSLEEP 0
91# endif
92
93# if HAVE_SELECT && HAVE_SYS_SELECT_H
94# ifndef EV_USE_SELECT
95# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 96# endif
97# else
98# undef EV_USE_SELECT
99# define EV_USE_SELECT 0
88# endif 100# endif
89 101
102# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 103# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 104# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 105# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 106# else
107# undef EV_USE_POLL
102# define EV_USE_POLL 0 108# define EV_USE_POLL 0
103# endif
104# endif 109# endif
105 110
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 111# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 112# ifndef EV_USE_EPOLL
109# else 113# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 114# endif
115# else
116# undef EV_USE_EPOLL
117# define EV_USE_EPOLL 0
112# endif 118# endif
113 119
120# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# ifndef EV_USE_KQUEUE 121# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 122# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
116# define EV_USE_KQUEUE 1
117# else
118# define EV_USE_KQUEUE 0
119# endif 123# endif
124# else
125# undef EV_USE_KQUEUE
126# define EV_USE_KQUEUE 0
120# endif 127# endif
121 128
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 129# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 130# ifndef EV_USE_PORT
125# else 131# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 132# endif
133# else
134# undef EV_USE_PORT
135# define EV_USE_PORT 0
128# endif 136# endif
129 137
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 138# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 139# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 140# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 141# endif
142# else
143# undef EV_USE_INOTIFY
144# define EV_USE_INOTIFY 0
136# endif 145# endif
137 146
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 147# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 148# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 149# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 150# endif
151# else
152# undef EV_USE_SIGNALFD
153# define EV_USE_SIGNALFD 0
144# endif 154# endif
145 155
156# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 157# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 158# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 159# endif
160# else
161# undef EV_USE_EVENTFD
162# define EV_USE_EVENTFD 0
152# endif 163# endif
153 164
154#endif 165#endif
155 166
156#include <math.h>
157#include <stdlib.h> 167#include <stdlib.h>
168#include <string.h>
158#include <fcntl.h> 169#include <fcntl.h>
159#include <stddef.h> 170#include <stddef.h>
160 171
161#include <stdio.h> 172#include <stdio.h>
162 173
163#include <assert.h> 174#include <assert.h>
164#include <errno.h> 175#include <errno.h>
165#include <sys/types.h> 176#include <sys/types.h>
166#include <time.h> 177#include <time.h>
178#include <limits.h>
167 179
168#include <signal.h> 180#include <signal.h>
169 181
170#ifdef EV_H 182#ifdef EV_H
171# include EV_H 183# include EV_H
172#else 184#else
173# include "ev.h" 185# include "ev.h"
174#endif 186#endif
187
188EV_CPP(extern "C" {)
175 189
176#ifndef _WIN32 190#ifndef _WIN32
177# include <sys/time.h> 191# include <sys/time.h>
178# include <sys/wait.h> 192# include <sys/wait.h>
179# include <unistd.h> 193# include <unistd.h>
… …
182# define WIN32_LEAN_AND_MEAN 196# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 197# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 198# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 199# define EV_SELECT_IS_WINSOCKET 1
186# endif 200# endif
201# undef EV_AVOID_STDIO
187#endif 202#endif
203
204/* OS X, in its infinite idiocy, actually HARDCODES
205 * a limit of 1024 into their select. Where people have brains,
206 * OS X engineers apparently have a vacuum. Or maybe they were
207 * ordered to have a vacuum, or they do anything for money.
208 * This might help. Or not.
209 */
210#define _DARWIN_UNLIMITED_SELECT 1
188 211
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 212/* this block tries to deduce configuration from header-defined symbols and defaults */
190 213
191/* try to deduce the maximum number of signals on this platform */ 214/* try to deduce the maximum number of signals on this platform */
192/* one some platforms, NSIG is one too large. we do not bother */
193#if defined (EV_NSIG) 215#if defined (EV_NSIG)
194/* use what's provided */ 216/* use what's provided */
195#elif defined (NSIG) 217#elif defined (NSIG)
196# define EV_NSIG (NSIG) 218# define EV_NSIG (NSIG)
197#elif defined(_NSIG) 219#elif defined(_NSIG)
… …
205#elif defined (MAXSIG) 227#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1) 228# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG) 229#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1) 230# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE) 231#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 232# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig) 233#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 234# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else 235#else
214# error "unable to find value for NSIG, please report" 236# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */ 237/* to make it compile regardless, just remove the above line, */
238/* but consider reporting it, too! :) */
216# define EV_NSIG 65 239# define EV_NSIG 65
240#endif
241
242#ifndef EV_USE_FLOOR
243# define EV_USE_FLOOR 0
217#endif 244#endif
218 245
219#ifndef EV_USE_CLOCK_SYSCALL 246#ifndef EV_USE_CLOCK_SYSCALL
220# if __linux && __GLIBC__ >= 2 247# if __linux && __GLIBC__ >= 2
221# define EV_USE_CLOCK_SYSCALL 1 248# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
222# else 249# else
223# define EV_USE_CLOCK_SYSCALL 0 250# define EV_USE_CLOCK_SYSCALL 0
224# endif 251# endif
225#endif 252#endif
226 253
227#ifndef EV_USE_MONOTONIC 254#ifndef EV_USE_MONOTONIC
228# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 255# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
229# define EV_USE_MONOTONIC 1 256# define EV_USE_MONOTONIC EV_FEATURE_OS
230# else 257# else
231# define EV_USE_MONOTONIC 0 258# define EV_USE_MONOTONIC 0
232# endif 259# endif
233#endif 260#endif
234 261
… …
236# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 263# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
237#endif 264#endif
238 265
239#ifndef EV_USE_NANOSLEEP 266#ifndef EV_USE_NANOSLEEP
240# if _POSIX_C_SOURCE >= 199309L 267# if _POSIX_C_SOURCE >= 199309L
241# define EV_USE_NANOSLEEP 1 268# define EV_USE_NANOSLEEP EV_FEATURE_OS
242# else 269# else
243# define EV_USE_NANOSLEEP 0 270# define EV_USE_NANOSLEEP 0
244# endif 271# endif
245#endif 272#endif
246 273
247#ifndef EV_USE_SELECT 274#ifndef EV_USE_SELECT
248# define EV_USE_SELECT 1 275# define EV_USE_SELECT EV_FEATURE_BACKENDS
249#endif 276#endif
250 277
251#ifndef EV_USE_POLL 278#ifndef EV_USE_POLL
252# ifdef _WIN32 279# ifdef _WIN32
253# define EV_USE_POLL 0 280# define EV_USE_POLL 0
254# else 281# else
255# define EV_USE_POLL 1 282# define EV_USE_POLL EV_FEATURE_BACKENDS
256# endif 283# endif
257#endif 284#endif
258 285
259#ifndef EV_USE_EPOLL 286#ifndef EV_USE_EPOLL
260# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 287# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
261# define EV_USE_EPOLL 1 288# define EV_USE_EPOLL EV_FEATURE_BACKENDS
262# else 289# else
263# define EV_USE_EPOLL 0 290# define EV_USE_EPOLL 0
264# endif 291# endif
265#endif 292#endif
266 293
… …
272# define EV_USE_PORT 0 299# define EV_USE_PORT 0
273#endif 300#endif
274 301
275#ifndef EV_USE_INOTIFY 302#ifndef EV_USE_INOTIFY
276# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
277# define EV_USE_INOTIFY 1 304# define EV_USE_INOTIFY EV_FEATURE_OS
278# else 305# else
279# define EV_USE_INOTIFY 0 306# define EV_USE_INOTIFY 0
280# endif 307# endif
281#endif 308#endif
282 309
283#ifndef EV_PID_HASHSIZE 310#ifndef EV_PID_HASHSIZE
284# if EV_MINIMAL 311# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
285# define EV_PID_HASHSIZE 1
286# else
287# define EV_PID_HASHSIZE 16
288# endif
289#endif 312#endif
290 313
291#ifndef EV_INOTIFY_HASHSIZE 314#ifndef EV_INOTIFY_HASHSIZE
292# if EV_MINIMAL 315# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
293# define EV_INOTIFY_HASHSIZE 1
294# else
295# define EV_INOTIFY_HASHSIZE 16
296# endif
297#endif 316#endif
298 317
299#ifndef EV_USE_EVENTFD 318#ifndef EV_USE_EVENTFD
300# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 319# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
301# define EV_USE_EVENTFD 1 320# define EV_USE_EVENTFD EV_FEATURE_OS
302# else 321# else
303# define EV_USE_EVENTFD 0 322# define EV_USE_EVENTFD 0
304# endif 323# endif
305#endif 324#endif
306 325
307#ifndef EV_USE_SIGNALFD 326#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 327# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1 328# define EV_USE_SIGNALFD EV_FEATURE_OS
310# else 329# else
311# define EV_USE_SIGNALFD 0 330# define EV_USE_SIGNALFD 0
312# endif 331# endif
313#endif 332#endif
314 333
… …
317# define EV_USE_4HEAP 1 336# define EV_USE_4HEAP 1
318# define EV_HEAP_CACHE_AT 1 337# define EV_HEAP_CACHE_AT 1
319#endif 338#endif
320 339
321#ifndef EV_VERIFY 340#ifndef EV_VERIFY
322# define EV_VERIFY !EV_MINIMAL 341# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
323#endif 342#endif
324 343
325#ifndef EV_USE_4HEAP 344#ifndef EV_USE_4HEAP
326# define EV_USE_4HEAP !EV_MINIMAL 345# define EV_USE_4HEAP EV_FEATURE_DATA
327#endif 346#endif
328 347
329#ifndef EV_HEAP_CACHE_AT 348#ifndef EV_HEAP_CACHE_AT
330# define EV_HEAP_CACHE_AT !EV_MINIMAL 349# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
331#endif 350#endif
332 351
333/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 352/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
334/* which makes programs even slower. might work on other unices, too. */ 353/* which makes programs even slower. might work on other unices, too. */
335#if EV_USE_CLOCK_SYSCALL 354#if EV_USE_CLOCK_SYSCALL
… …
344# endif 363# endif
345#endif 364#endif
346 365
347/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 366/* this block fixes any misconfiguration where we know we run into trouble otherwise */
348 367
368#ifdef _AIX
369/* AIX has a completely broken poll.h header */
370# undef EV_USE_POLL
371# define EV_USE_POLL 0
372#endif
373
349#ifndef CLOCK_MONOTONIC 374#ifndef CLOCK_MONOTONIC
350# undef EV_USE_MONOTONIC 375# undef EV_USE_MONOTONIC
351# define EV_USE_MONOTONIC 0 376# define EV_USE_MONOTONIC 0
352#endif 377#endif
353 378
… …
360# undef EV_USE_INOTIFY 385# undef EV_USE_INOTIFY
361# define EV_USE_INOTIFY 0 386# define EV_USE_INOTIFY 0
362#endif 387#endif
363 388
364#if !EV_USE_NANOSLEEP 389#if !EV_USE_NANOSLEEP
365# ifndef _WIN32 390/* hp-ux has it in sys/time.h, which we unconditionally include above */
391# if !defined(_WIN32) && !defined(__hpux)
366# include <sys/select.h> 392# include <sys/select.h>
367# endif 393# endif
368#endif 394#endif
369 395
370#if EV_USE_INOTIFY 396#if EV_USE_INOTIFY
371# include <sys/utsname.h>
372# include <sys/statfs.h> 397# include <sys/statfs.h>
373# include <sys/inotify.h> 398# include <sys/inotify.h>
374/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 399/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
375# ifndef IN_DONT_FOLLOW 400# ifndef IN_DONT_FOLLOW
376# undef EV_USE_INOTIFY 401# undef EV_USE_INOTIFY
… …
387# include <stdint.h> 412# include <stdint.h>
388# ifndef EFD_NONBLOCK 413# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK 414# define EFD_NONBLOCK O_NONBLOCK
390# endif 415# endif
391# ifndef EFD_CLOEXEC 416# ifndef EFD_CLOEXEC
417# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC 418# define EFD_CLOEXEC O_CLOEXEC
419# else
420# define EFD_CLOEXEC 02000000
421# endif
393# endif 422# endif
394# ifdef __cplusplus 423EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
395extern "C" { 424#endif
425
426#if EV_USE_SIGNALFD
427/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
428# include <stdint.h>
429# ifndef SFD_NONBLOCK
430# define SFD_NONBLOCK O_NONBLOCK
396# endif 431# endif
397int eventfd (unsigned int initval, int flags); 432# ifndef SFD_CLOEXEC
398# ifdef __cplusplus 433# ifdef O_CLOEXEC
399} 434# define SFD_CLOEXEC O_CLOEXEC
435# else
436# define SFD_CLOEXEC 02000000
437# endif
400# endif 438# endif
401#endif 439EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
402 440
403#if EV_USE_SIGNALFD 441struct signalfd_siginfo
404# include <sys/signalfd.h> 442{
443 uint32_t ssi_signo;
444 char pad[128 - sizeof (uint32_t)];
445};
405#endif 446#endif
406 447
407/**/ 448/**/
408 449
409#if EV_VERIFY >= 3 450#if EV_VERIFY >= 3
410# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 451# define EV_FREQUENT_CHECK ev_verify (EV_A)
411#else 452#else
412# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
413#endif 454#endif
414 455
415/* 456/*
416 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
417 * It is added to ev_rt_now when scheduling periodics
418 * to ensure progress, time-wise, even when rounding
419 * errors are against us.
420 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
421 * Better solutions welcome.
422 */ 459 */
423#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define MIN_INTERVAL 0.0001220703125 /* 1/2**13, good till 4000 */
461/*#define MIN_INTERVAL 0.00000095367431640625 /* 1/2**20, good till 2200 */
424 462
425#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 463#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
426#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
427/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
428 465
429#if __GNUC__ >= 4 466#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
430# define expect(expr,value) __builtin_expect ((expr),(value)) 467#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
431# define noinline __attribute__ ((noinline)) 468
469/* the following are taken from libecb */
470/* ecb.h start */
471
472/* many compilers define _GNUC_ to some versions but then only implement
473 * what their idiot authors think are the "more important" extensions,
474 * causing enourmous grief in return for some better fake benchmark numbers.
475 * or so.
476 * we try to detect these and simply assume they are not gcc - if they have
477 * an issue with that they should have done it right in the first place.
478 */
479#ifndef ECB_GCC_VERSION
480 #if !defined(__GNUC_MINOR__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__llvm__) || defined(__clang__)
481 #define ECB_GCC_VERSION(major,minor) 0
482 #else
483 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
484 #endif
485#endif
486
487#if __cplusplus
488 #define ecb_inline static inline
489#elif ECB_GCC_VERSION(2,5)
490 #define ecb_inline static __inline__
491#elif ECB_C99
492 #define ecb_inline static inline
432#else 493#else
433# define expect(expr,value) (expr) 494 #define ecb_inline static
434# define noinline
435# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
436# define inline
437# endif 495#endif
438#endif
439 496
497#if ECB_GCC_VERSION(3,1)
498 #define ecb_attribute(attrlist) __attribute__(attrlist)
499 #define ecb_is_constant(expr) __builtin_constant_p (expr)
500 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
501 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
502#else
503 #define ecb_attribute(attrlist)
504 #define ecb_is_constant(expr) 0
505 #define ecb_expect(expr,value) (expr)
506 #define ecb_prefetch(addr,rw,locality)
507#endif
508
509#define ecb_noinline ecb_attribute ((__noinline__))
510#define ecb_noreturn ecb_attribute ((__noreturn__))
511#define ecb_unused ecb_attribute ((__unused__))
512#define ecb_const ecb_attribute ((__const__))
513#define ecb_pure ecb_attribute ((__pure__))
514
515#if ECB_GCC_VERSION(4,3)
516 #define ecb_artificial ecb_attribute ((__artificial__))
517 #define ecb_hot ecb_attribute ((__hot__))
518 #define ecb_cold ecb_attribute ((__cold__))
519#else
520 #define ecb_artificial
521 #define ecb_hot
522 #define ecb_cold
523#endif
524
525/* put around conditional expressions if you are very sure that the */
526/* expression is mostly true or mostly false. note that these return */
527/* booleans, not the expression. */
440#define expect_false(expr) expect ((expr) != 0, 0) 528#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
441#define expect_true(expr) expect ((expr) != 0, 1) 529#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
530/* ecb.h end */
531
532#define expect_false(cond) ecb_expect_false (cond)
533#define expect_true(cond) ecb_expect_true (cond)
534#define noinline ecb_noinline
535
442#define inline_size static inline 536#define inline_size ecb_inline
443 537
444#if EV_MINIMAL 538#if EV_FEATURE_CODE
539# define inline_speed ecb_inline
540#else
445# define inline_speed static noinline 541# define inline_speed static noinline
446#else
447# define inline_speed static inline
448#endif 542#endif
449 543
450#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 544#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
451 545
452#if EV_MINPRI == EV_MAXPRI 546#if EV_MINPRI == EV_MAXPRI
… …
465#define ev_active(w) ((W)(w))->active 559#define ev_active(w) ((W)(w))->active
466#define ev_at(w) ((WT)(w))->at 560#define ev_at(w) ((WT)(w))->at
467 561
468#if EV_USE_REALTIME 562#if EV_USE_REALTIME
469/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 563/* sig_atomic_t is used to avoid per-thread variables or locking but still */
470/* giving it a reasonably high chance of working on typical architetcures */ 564/* giving it a reasonably high chance of working on typical architectures */
471static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 565static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
472#endif 566#endif
473 567
474#if EV_USE_MONOTONIC 568#if EV_USE_MONOTONIC
475static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 569static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
476#endif 570#endif
477 571
572#ifndef EV_FD_TO_WIN32_HANDLE
573# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
574#endif
575#ifndef EV_WIN32_HANDLE_TO_FD
576# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
577#endif
578#ifndef EV_WIN32_CLOSE_FD
579# define EV_WIN32_CLOSE_FD(fd) close (fd)
580#endif
581
478#ifdef _WIN32 582#ifdef _WIN32
479# include "ev_win32.c" 583# include "ev_win32.c"
480#endif 584#endif
481 585
482/*****************************************************************************/ 586/*****************************************************************************/
483 587
588/* define a suitable floor function (only used by periodics atm) */
589
590#if EV_USE_FLOOR
591# include <math.h>
592# define ev_floor(v) floor (v)
593#else
594
595#include <float.h>
596
597/* a floor() replacement function, should be independent of ev_tstamp type */
598static ev_tstamp noinline
599ev_floor (ev_tstamp v)
600{
601 /* the choice of shift factor is not terribly important */
602#if FLT_RADIX != 2 /* assume FLT_RADIX == 10 */
603 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 10000000000000000000. : 1000000000.;
604#else
605 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 18446744073709551616. : 4294967296.;
606#endif
607
608 /* argument too large for an unsigned long? */
609 if (expect_false (v >= shift))
610 {
611 ev_tstamp f;
612
613 if (v == v - 1.)
614 return v; /* very large number */
615
616 f = shift * ev_floor (v * (1. / shift));
617 return f + ev_floor (v - f);
618 }
619
620 /* special treatment for negative args? */
621 if (expect_false (v < 0.))
622 {
623 ev_tstamp f = -ev_floor (-v);
624
625 return f - (f == v ? 0 : 1);
626 }
627
628 /* fits into an unsigned long */
629 return (unsigned long)v;
630}
631
632#endif
633
634/*****************************************************************************/
635
636#ifdef __linux
637# include <sys/utsname.h>
638#endif
639
640static unsigned int noinline ecb_cold
641ev_linux_version (void)
642{
643#ifdef __linux
644 unsigned int v = 0;
645 struct utsname buf;
646 int i;
647 char *p = buf.release;
648
649 if (uname (&buf))
650 return 0;
651
652 for (i = 3+1; --i; )
653 {
654 unsigned int c = 0;
655
656 for (;;)
657 {
658 if (*p >= '0' && *p <= '9')
659 c = c * 10 + *p++ - '0';
660 else
661 {
662 p += *p == '.';
663 break;
664 }
665 }
666
667 v = (v << 8) | c;
668 }
669
670 return v;
671#else
672 return 0;
673#endif
674}
675
676/*****************************************************************************/
677
678#if EV_AVOID_STDIO
679static void noinline ecb_cold
680ev_printerr (const char *msg)
681{
682 write (STDERR_FILENO, msg, strlen (msg));
683}
684#endif
685
484static void (*syserr_cb)(const char *msg); 686static void (*syserr_cb)(const char *msg);
485 687
486void 688void ecb_cold
487ev_set_syserr_cb (void (*cb)(const char *msg)) 689ev_set_syserr_cb (void (*cb)(const char *msg))
488{ 690{
489 syserr_cb = cb; 691 syserr_cb = cb;
490} 692}
491 693
492static void noinline 694static void noinline ecb_cold
493ev_syserr (const char *msg) 695ev_syserr (const char *msg)
494{ 696{
495 if (!msg) 697 if (!msg)
496 msg = "(libev) system error"; 698 msg = "(libev) system error";
497 699
498 if (syserr_cb) 700 if (syserr_cb)
499 syserr_cb (msg); 701 syserr_cb (msg);
500 else 702 else
501 { 703 {
704#if EV_AVOID_STDIO
705 ev_printerr (msg);
706 ev_printerr (": ");
707 ev_printerr (strerror (errno));
708 ev_printerr ("\n");
709#else
502 perror (msg); 710 perror (msg);
711#endif
503 abort (); 712 abort ();
504 } 713 }
505} 714}
506 715
507static void * 716static void *
508ev_realloc_emul (void *ptr, long size) 717ev_realloc_emul (void *ptr, long size)
509{ 718{
719#if __GLIBC__
720 return realloc (ptr, size);
721#else
510 /* some systems, notably openbsd and darwin, fail to properly 722 /* some systems, notably openbsd and darwin, fail to properly
511 * implement realloc (x, 0) (as required by both ansi c-98 and 723 * implement realloc (x, 0) (as required by both ansi c-89 and
512 * the single unix specification, so work around them here. 724 * the single unix specification, so work around them here.
513 */ 725 */
514 726
515 if (size) 727 if (size)
516 return realloc (ptr, size); 728 return realloc (ptr, size);
517 729
518 free (ptr); 730 free (ptr);
519 return 0; 731 return 0;
732#endif
520} 733}
521 734
522static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 735static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
523 736
524void 737void ecb_cold
525ev_set_allocator (void *(*cb)(void *ptr, long size)) 738ev_set_allocator (void *(*cb)(void *ptr, long size))
526{ 739{
527 alloc = cb; 740 alloc = cb;
528} 741}
529 742
… …
532{ 745{
533 ptr = alloc (ptr, size); 746 ptr = alloc (ptr, size);
534 747
535 if (!ptr && size) 748 if (!ptr && size)
536 { 749 {
750#if EV_AVOID_STDIO
751 ev_printerr ("(libev) memory allocation failed, aborting.\n");
752#else
537 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 753 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
754#endif
538 abort (); 755 abort ();
539 } 756 }
540 757
541 return ptr; 758 return ptr;
542} 759}
… …
558 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 775 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
559 unsigned char unused; 776 unsigned char unused;
560#if EV_USE_EPOLL 777#if EV_USE_EPOLL
561 unsigned int egen; /* generation counter to counter epoll bugs */ 778 unsigned int egen; /* generation counter to counter epoll bugs */
562#endif 779#endif
563#if EV_SELECT_IS_WINSOCKET 780#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
564 SOCKET handle; 781 SOCKET handle;
782#endif
783#if EV_USE_IOCP
784 OVERLAPPED or, ow;
565#endif 785#endif
566} ANFD; 786} ANFD;
567 787
568/* stores the pending event set for a given watcher */ 788/* stores the pending event set for a given watcher */
569typedef struct 789typedef struct
… …
624 844
625 static int ev_default_loop_ptr; 845 static int ev_default_loop_ptr;
626 846
627#endif 847#endif
628 848
629#if EV_MINIMAL < 2 849#if EV_FEATURE_API
630# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 850# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
631# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 851# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
632# define EV_INVOKE_PENDING invoke_cb (EV_A) 852# define EV_INVOKE_PENDING invoke_cb (EV_A)
633#else 853#else
634# define EV_RELEASE_CB (void)0 854# define EV_RELEASE_CB (void)0
635# define EV_ACQUIRE_CB (void)0 855# define EV_ACQUIRE_CB (void)0
636# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 856# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
637#endif 857#endif
638 858
639#define EVUNLOOP_RECURSE 0x80 859#define EVBREAK_RECURSE 0x80
640 860
641/*****************************************************************************/ 861/*****************************************************************************/
642 862
643#ifndef EV_HAVE_EV_TIME 863#ifndef EV_HAVE_EV_TIME
644ev_tstamp 864ev_tstamp
… …
688 if (delay > 0.) 908 if (delay > 0.)
689 { 909 {
690#if EV_USE_NANOSLEEP 910#if EV_USE_NANOSLEEP
691 struct timespec ts; 911 struct timespec ts;
692 912
693 ts.tv_sec = (time_t)delay; 913 EV_TS_SET (ts, delay);
694 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
695
696 nanosleep (&ts, 0); 914 nanosleep (&ts, 0);
697#elif defined(_WIN32) 915#elif defined(_WIN32)
698 Sleep ((unsigned long)(delay * 1e3)); 916 Sleep ((unsigned long)(delay * 1e3));
699#else 917#else
700 struct timeval tv; 918 struct timeval tv;
701 919
702 tv.tv_sec = (time_t)delay;
703 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
704
705 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 920 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
706 /* something not guaranteed by newer posix versions, but guaranteed */ 921 /* something not guaranteed by newer posix versions, but guaranteed */
707 /* by older ones */ 922 /* by older ones */
923 EV_TV_SET (tv, delay);
708 select (0, 0, 0, 0, &tv); 924 select (0, 0, 0, 0, &tv);
709#endif 925#endif
710 } 926 }
711} 927}
712 928
713/*****************************************************************************/ 929/*****************************************************************************/
714 930
715#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 931#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
716 932
717/* find a suitable new size for the given array, */ 933/* find a suitable new size for the given array, */
718/* hopefully by rounding to a ncie-to-malloc size */ 934/* hopefully by rounding to a nice-to-malloc size */
719inline_size int 935inline_size int
720array_nextsize (int elem, int cur, int cnt) 936array_nextsize (int elem, int cur, int cnt)
721{ 937{
722 int ncur = cur + 1; 938 int ncur = cur + 1;
723 939
… …
735 } 951 }
736 952
737 return ncur; 953 return ncur;
738} 954}
739 955
740static noinline void * 956static void * noinline ecb_cold
741array_realloc (int elem, void *base, int *cur, int cnt) 957array_realloc (int elem, void *base, int *cur, int cnt)
742{ 958{
743 *cur = array_nextsize (elem, *cur, cnt); 959 *cur = array_nextsize (elem, *cur, cnt);
744 return ev_realloc (base, elem * *cur); 960 return ev_realloc (base, elem * *cur);
745} 961}
… …
819} 1035}
820 1036
821/*****************************************************************************/ 1037/*****************************************************************************/
822 1038
823inline_speed void 1039inline_speed void
824fd_event_nc (EV_P_ int fd, int revents) 1040fd_event_nocheck (EV_P_ int fd, int revents)
825{ 1041{
826 ANFD *anfd = anfds + fd; 1042 ANFD *anfd = anfds + fd;
827 ev_io *w; 1043 ev_io *w;
828 1044
829 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1045 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
841fd_event (EV_P_ int fd, int revents) 1057fd_event (EV_P_ int fd, int revents)
842{ 1058{
843 ANFD *anfd = anfds + fd; 1059 ANFD *anfd = anfds + fd;
844 1060
845 if (expect_true (!anfd->reify)) 1061 if (expect_true (!anfd->reify))
846 fd_event_nc (EV_A_ fd, revents); 1062 fd_event_nocheck (EV_A_ fd, revents);
847} 1063}
848 1064
849void 1065void
850ev_feed_fd_event (EV_P_ int fd, int revents) 1066ev_feed_fd_event (EV_P_ int fd, int revents)
851{ 1067{
852 if (fd >= 0 && fd < anfdmax) 1068 if (fd >= 0 && fd < anfdmax)
853 fd_event_nc (EV_A_ fd, revents); 1069 fd_event_nocheck (EV_A_ fd, revents);
854} 1070}
855 1071
856/* make sure the external fd watch events are in-sync */ 1072/* make sure the external fd watch events are in-sync */
857/* with the kernel/libev internal state */ 1073/* with the kernel/libev internal state */
858inline_size void 1074inline_size void
859fd_reify (EV_P) 1075fd_reify (EV_P)
860{ 1076{
861 int i; 1077 int i;
862 1078
1079#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1080 for (i = 0; i < fdchangecnt; ++i)
1081 {
1082 int fd = fdchanges [i];
1083 ANFD *anfd = anfds + fd;
1084
1085 if (anfd->reify & EV__IOFDSET && anfd->head)
1086 {
1087 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1088
1089 if (handle != anfd->handle)
1090 {
1091 unsigned long arg;
1092
1093 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1094
1095 /* handle changed, but fd didn't - we need to do it in two steps */
1096 backend_modify (EV_A_ fd, anfd->events, 0);
1097 anfd->events = 0;
1098 anfd->handle = handle;
1099 }
1100 }
1101 }
1102#endif
1103
863 for (i = 0; i < fdchangecnt; ++i) 1104 for (i = 0; i < fdchangecnt; ++i)
864 { 1105 {
865 int fd = fdchanges [i]; 1106 int fd = fdchanges [i];
866 ANFD *anfd = anfds + fd; 1107 ANFD *anfd = anfds + fd;
867 ev_io *w; 1108 ev_io *w;
868 1109
869 unsigned char events = 0; 1110 unsigned char o_events = anfd->events;
1111 unsigned char o_reify = anfd->reify;
870 1112
871 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1113 anfd->reify = 0;
872 events |= (unsigned char)w->events;
873 1114
874#if EV_SELECT_IS_WINSOCKET 1115 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
875 if (events)
876 { 1116 {
877 unsigned long arg; 1117 anfd->events = 0;
878 #ifdef EV_FD_TO_WIN32_HANDLE 1118
879 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 1119 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
880 #else 1120 anfd->events |= (unsigned char)w->events;
881 anfd->handle = _get_osfhandle (fd); 1121
882 #endif 1122 if (o_events != anfd->events)
883 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 1123 o_reify = EV__IOFDSET; /* actually |= */
884 } 1124 }
885#endif
886 1125
887 { 1126 if (o_reify & EV__IOFDSET)
888 unsigned char o_events = anfd->events;
889 unsigned char o_reify = anfd->reify;
890
891 anfd->reify = 0;
892 anfd->events = events;
893
894 if (o_events != events || o_reify & EV__IOFDSET)
895 backend_modify (EV_A_ fd, o_events, events); 1127 backend_modify (EV_A_ fd, o_events, anfd->events);
896 }
897 } 1128 }
898 1129
899 fdchangecnt = 0; 1130 fdchangecnt = 0;
900} 1131}
901 1132
… …
913 fdchanges [fdchangecnt - 1] = fd; 1144 fdchanges [fdchangecnt - 1] = fd;
914 } 1145 }
915} 1146}
916 1147
917/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */ 1148/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
918inline_speed void 1149inline_speed void ecb_cold
919fd_kill (EV_P_ int fd) 1150fd_kill (EV_P_ int fd)
920{ 1151{
921 ev_io *w; 1152 ev_io *w;
922 1153
923 while ((w = (ev_io *)anfds [fd].head)) 1154 while ((w = (ev_io *)anfds [fd].head))
… …
925 ev_io_stop (EV_A_ w); 1156 ev_io_stop (EV_A_ w);
926 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1157 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
927 } 1158 }
928} 1159}
929 1160
930/* check whether the given fd is atcually valid, for error recovery */ 1161/* check whether the given fd is actually valid, for error recovery */
931inline_size int 1162inline_size int ecb_cold
932fd_valid (int fd) 1163fd_valid (int fd)
933{ 1164{
934#ifdef _WIN32 1165#ifdef _WIN32
935 return _get_osfhandle (fd) != -1; 1166 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
936#else 1167#else
937 return fcntl (fd, F_GETFD) != -1; 1168 return fcntl (fd, F_GETFD) != -1;
938#endif 1169#endif
939} 1170}
940 1171
941/* called on EBADF to verify fds */ 1172/* called on EBADF to verify fds */
942static void noinline 1173static void noinline ecb_cold
943fd_ebadf (EV_P) 1174fd_ebadf (EV_P)
944{ 1175{
945 int fd; 1176 int fd;
946 1177
947 for (fd = 0; fd < anfdmax; ++fd) 1178 for (fd = 0; fd < anfdmax; ++fd)
… …
949 if (!fd_valid (fd) && errno == EBADF) 1180 if (!fd_valid (fd) && errno == EBADF)
950 fd_kill (EV_A_ fd); 1181 fd_kill (EV_A_ fd);
951} 1182}
952 1183
953/* called on ENOMEM in select/poll to kill some fds and retry */ 1184/* called on ENOMEM in select/poll to kill some fds and retry */
954static void noinline 1185static void noinline ecb_cold
955fd_enomem (EV_P) 1186fd_enomem (EV_P)
956{ 1187{
957 int fd; 1188 int fd;
958 1189
959 for (fd = anfdmax; fd--; ) 1190 for (fd = anfdmax; fd--; )
960 if (anfds [fd].events) 1191 if (anfds [fd].events)
961 { 1192 {
962 fd_kill (EV_A_ fd); 1193 fd_kill (EV_A_ fd);
963 return; 1194 break;
964 } 1195 }
965} 1196}
966 1197
967/* usually called after fork if backend needs to re-arm all fds from scratch */ 1198/* usually called after fork if backend needs to re-arm all fds from scratch */
968static void noinline 1199static void noinline
… …
977 anfds [fd].emask = 0; 1208 anfds [fd].emask = 0;
978 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1209 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
979 } 1210 }
980} 1211}
981 1212
1213/* used to prepare libev internal fd's */
1214/* this is not fork-safe */
1215inline_speed void
1216fd_intern (int fd)
1217{
1218#ifdef _WIN32
1219 unsigned long arg = 1;
1220 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1221#else
1222 fcntl (fd, F_SETFD, FD_CLOEXEC);
1223 fcntl (fd, F_SETFL, O_NONBLOCK);
1224#endif
1225}
1226
982/*****************************************************************************/ 1227/*****************************************************************************/
983 1228
984/* 1229/*
985 * the heap functions want a real array index. array index 0 uis guaranteed to not 1230 * the heap functions want a real array index. array index 0 is guaranteed to not
986 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1231 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
987 * the branching factor of the d-tree. 1232 * the branching factor of the d-tree.
988 */ 1233 */
989 1234
990/* 1235/*
… …
1058 1303
1059 for (;;) 1304 for (;;)
1060 { 1305 {
1061 int c = k << 1; 1306 int c = k << 1;
1062 1307
1063 if (c > N + HEAP0 - 1) 1308 if (c >= N + HEAP0)
1064 break; 1309 break;
1065 1310
1066 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1311 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1067 ? 1 : 0; 1312 ? 1 : 0;
1068 1313
… …
1104 1349
1105/* move an element suitably so it is in a correct place */ 1350/* move an element suitably so it is in a correct place */
1106inline_size void 1351inline_size void
1107adjustheap (ANHE *heap, int N, int k) 1352adjustheap (ANHE *heap, int N, int k)
1108{ 1353{
1109 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1354 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1110 upheap (heap, k); 1355 upheap (heap, k);
1111 else 1356 else
1112 downheap (heap, N, k); 1357 downheap (heap, N, k);
1113} 1358}
1114 1359
… …
1127/*****************************************************************************/ 1372/*****************************************************************************/
1128 1373
1129/* associate signal watchers to a signal signal */ 1374/* associate signal watchers to a signal signal */
1130typedef struct 1375typedef struct
1131{ 1376{
1377 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY 1378#if EV_MULTIPLICITY
1133 EV_P; 1379 EV_P;
1134#endif 1380#endif
1135 WL head; 1381 WL head;
1136 EV_ATOMIC_T gotsig;
1137} ANSIG; 1382} ANSIG;
1138 1383
1139static ANSIG signals [EV_NSIG - 1]; 1384static ANSIG signals [EV_NSIG - 1];
1140static EV_ATOMIC_T gotsig;
1141 1385
1142/*****************************************************************************/ 1386/*****************************************************************************/
1143 1387
1144/* used to prepare libev internal fd's */ 1388#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1145/* this is not fork-safe */
1146inline_speed void
1147fd_intern (int fd)
1148{
1149#ifdef _WIN32
1150 unsigned long arg = 1;
1151 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1152#else
1153 fcntl (fd, F_SETFD, FD_CLOEXEC);
1154 fcntl (fd, F_SETFL, O_NONBLOCK);
1155#endif
1156}
1157 1389
1158static void noinline 1390static void noinline ecb_cold
1159evpipe_init (EV_P) 1391evpipe_init (EV_P)
1160{ 1392{
1161 if (!ev_is_active (&pipe_w)) 1393 if (!ev_is_active (&pipe_w))
1162 { 1394 {
1163#if EV_USE_EVENTFD 1395# if EV_USE_EVENTFD
1164 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1396 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1165 if (evfd < 0 && errno == EINVAL) 1397 if (evfd < 0 && errno == EINVAL)
1166 evfd = eventfd (0, 0); 1398 evfd = eventfd (0, 0);
1167 1399
1168 if (evfd >= 0) 1400 if (evfd >= 0)
… …
1170 evpipe [0] = -1; 1402 evpipe [0] = -1;
1171 fd_intern (evfd); /* doing it twice doesn't hurt */ 1403 fd_intern (evfd); /* doing it twice doesn't hurt */
1172 ev_io_set (&pipe_w, evfd, EV_READ); 1404 ev_io_set (&pipe_w, evfd, EV_READ);
1173 } 1405 }
1174 else 1406 else
1175#endif 1407# endif
1176 { 1408 {
1177 while (pipe (evpipe)) 1409 while (pipe (evpipe))
1178 ev_syserr ("(libev) error creating signal/async pipe"); 1410 ev_syserr ("(libev) error creating signal/async pipe");
1179 1411
1180 fd_intern (evpipe [0]); 1412 fd_intern (evpipe [0]);
… …
1190inline_size void 1422inline_size void
1191evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1423evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1192{ 1424{
1193 if (!*flag) 1425 if (!*flag)
1194 { 1426 {
1195 int old_errno = errno; /* save errno because write might clobber it */
1196
1197 *flag = 1; 1427 *flag = 1;
1198 1428
1429 pipe_write_skipped = 1;
1430
1431 if (pipe_write_wanted)
1432 {
1433 int old_errno = errno; /* save errno because write will clobber it */
1434 char dummy;
1435
1436 pipe_write_skipped = 0;
1437
1199#if EV_USE_EVENTFD 1438#if EV_USE_EVENTFD
1200 if (evfd >= 0) 1439 if (evfd >= 0)
1201 { 1440 {
1202 uint64_t counter = 1; 1441 uint64_t counter = 1;
1203 write (evfd, &counter, sizeof (uint64_t)); 1442 write (evfd, &counter, sizeof (uint64_t));
1443 }
1444 else
1445#endif
1446 {
1447 /* win32 people keep sending patches that change this write() to send() */
1448 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1449 /* so when you think this write should be a send instead, please find out */
1450 /* where your send() is from - it's definitely not the microsoft send, and */
1451 /* tell me. thank you. */
1452 write (evpipe [1], &dummy, 1);
1453 }
1454
1455 errno = old_errno;
1204 } 1456 }
1205 else
1206#endif
1207 write (evpipe [1], &old_errno, 1);
1208
1209 errno = old_errno;
1210 } 1457 }
1211} 1458}
1212 1459
1213/* called whenever the libev signal pipe */ 1460/* called whenever the libev signal pipe */
1214/* got some events (signal, async) */ 1461/* got some events (signal, async) */
1215static void 1462static void
1216pipecb (EV_P_ ev_io *iow, int revents) 1463pipecb (EV_P_ ev_io *iow, int revents)
1217{ 1464{
1465 int i;
1466
1467 if (revents & EV_READ)
1468 {
1218#if EV_USE_EVENTFD 1469#if EV_USE_EVENTFD
1219 if (evfd >= 0) 1470 if (evfd >= 0)
1220 { 1471 {
1221 uint64_t counter; 1472 uint64_t counter;
1222 read (evfd, &counter, sizeof (uint64_t)); 1473 read (evfd, &counter, sizeof (uint64_t));
1223 } 1474 }
1224 else 1475 else
1225#endif 1476#endif
1226 { 1477 {
1227 char dummy; 1478 char dummy;
1479 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1228 read (evpipe [0], &dummy, 1); 1480 read (evpipe [0], &dummy, 1);
1481 }
1482 }
1483
1484 pipe_write_skipped = 0;
1485
1486#if EV_SIGNAL_ENABLE
1487 if (sig_pending)
1229 } 1488 {
1489 sig_pending = 0;
1230 1490
1231 if (gotsig && ev_is_default_loop (EV_A))
1232 {
1233 int signum;
1234 gotsig = 0;
1235
1236 for (signum = EV_NSIG - 1; signum--; ) 1491 for (i = EV_NSIG - 1; i--; )
1237 if (signals [signum].gotsig) 1492 if (expect_false (signals [i].pending))
1238 ev_feed_signal_event (EV_A_ signum + 1); 1493 ev_feed_signal_event (EV_A_ i + 1);
1239 } 1494 }
1495#endif
1240 1496
1241#if EV_ASYNC_ENABLE 1497#if EV_ASYNC_ENABLE
1242 if (gotasync) 1498 if (async_pending)
1243 { 1499 {
1244 int i; 1500 async_pending = 0;
1245 gotasync = 0;
1246 1501
1247 for (i = asynccnt; i--; ) 1502 for (i = asynccnt; i--; )
1248 if (asyncs [i]->sent) 1503 if (asyncs [i]->sent)
1249 { 1504 {
1250 asyncs [i]->sent = 0; 1505 asyncs [i]->sent = 0;
… …
1254#endif 1509#endif
1255} 1510}
1256 1511
1257/*****************************************************************************/ 1512/*****************************************************************************/
1258 1513
1514void
1515ev_feed_signal (int signum)
1516{
1517#if EV_MULTIPLICITY
1518 EV_P = signals [signum - 1].loop;
1519
1520 if (!EV_A)
1521 return;
1522#endif
1523
1524 evpipe_init (EV_A);
1525
1526 signals [signum - 1].pending = 1;
1527 evpipe_write (EV_A_ &sig_pending);
1528}
1529
1259static void 1530static void
1260ev_sighandler (int signum) 1531ev_sighandler (int signum)
1261{ 1532{
1262#if EV_MULTIPLICITY
1263 EV_P = signals [signum - 1].loop;
1264#endif
1265
1266#if _WIN32 1533#ifdef _WIN32
1267 signal (signum, ev_sighandler); 1534 signal (signum, ev_sighandler);
1268#endif 1535#endif
1269 1536
1270 signals [signum - 1].gotsig = 1; 1537 ev_feed_signal (signum);
1271 evpipe_write (EV_A_ &gotsig);
1272} 1538}
1273 1539
1274void noinline 1540void noinline
1275ev_feed_signal_event (EV_P_ int signum) 1541ev_feed_signal_event (EV_P_ int signum)
1276{ 1542{
1277 WL w; 1543 WL w;
1278 1544
1545 if (expect_false (signum <= 0 || signum > EV_NSIG))
1546 return;
1547
1548 --signum;
1549
1279#if EV_MULTIPLICITY 1550#if EV_MULTIPLICITY
1280 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1551 /* it is permissible to try to feed a signal to the wrong loop */
1281#endif 1552 /* or, likely more useful, feeding a signal nobody is waiting for */
1282 1553
1283 if (signum <= 0 || signum > EV_NSIG) 1554 if (expect_false (signals [signum].loop != EV_A))
1284 return; 1555 return;
1556#endif
1285 1557
1286 --signum;
1287
1288 signals [signum].gotsig = 0; 1558 signals [signum].pending = 0;
1289 1559
1290 for (w = signals [signum].head; w; w = w->next) 1560 for (w = signals [signum].head; w; w = w->next)
1291 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1561 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1292} 1562}
1293 1563
… …
1309 break; 1579 break;
1310 } 1580 }
1311} 1581}
1312#endif 1582#endif
1313 1583
1584#endif
1585
1314/*****************************************************************************/ 1586/*****************************************************************************/
1315 1587
1588#if EV_CHILD_ENABLE
1316static WL childs [EV_PID_HASHSIZE]; 1589static WL childs [EV_PID_HASHSIZE];
1317
1318#ifndef _WIN32
1319 1590
1320static ev_signal childev; 1591static ev_signal childev;
1321 1592
1322#ifndef WIFCONTINUED 1593#ifndef WIFCONTINUED
1323# define WIFCONTINUED(status) 0 1594# define WIFCONTINUED(status) 0
… …
1328child_reap (EV_P_ int chain, int pid, int status) 1599child_reap (EV_P_ int chain, int pid, int status)
1329{ 1600{
1330 ev_child *w; 1601 ev_child *w;
1331 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1602 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1332 1603
1333 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1604 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1334 { 1605 {
1335 if ((w->pid == pid || !w->pid) 1606 if ((w->pid == pid || !w->pid)
1336 && (!traced || (w->flags & 1))) 1607 && (!traced || (w->flags & 1)))
1337 { 1608 {
1338 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1609 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1363 /* make sure we are called again until all children have been reaped */ 1634 /* make sure we are called again until all children have been reaped */
1364 /* we need to do it this way so that the callback gets called before we continue */ 1635 /* we need to do it this way so that the callback gets called before we continue */
1365 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1636 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1366 1637
1367 child_reap (EV_A_ pid, pid, status); 1638 child_reap (EV_A_ pid, pid, status);
1368 if (EV_PID_HASHSIZE > 1) 1639 if ((EV_PID_HASHSIZE) > 1)
1369 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1640 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1370} 1641}
1371 1642
1372#endif 1643#endif
1373 1644
1374/*****************************************************************************/ 1645/*****************************************************************************/
1375 1646
1647#if EV_USE_IOCP
1648# include "ev_iocp.c"
1649#endif
1376#if EV_USE_PORT 1650#if EV_USE_PORT
1377# include "ev_port.c" 1651# include "ev_port.c"
1378#endif 1652#endif
1379#if EV_USE_KQUEUE 1653#if EV_USE_KQUEUE
1380# include "ev_kqueue.c" 1654# include "ev_kqueue.c"
… …
1387#endif 1661#endif
1388#if EV_USE_SELECT 1662#if EV_USE_SELECT
1389# include "ev_select.c" 1663# include "ev_select.c"
1390#endif 1664#endif
1391 1665
1392int 1666int ecb_cold
1393ev_version_major (void) 1667ev_version_major (void)
1394{ 1668{
1395 return EV_VERSION_MAJOR; 1669 return EV_VERSION_MAJOR;
1396} 1670}
1397 1671
1398int 1672int ecb_cold
1399ev_version_minor (void) 1673ev_version_minor (void)
1400{ 1674{
1401 return EV_VERSION_MINOR; 1675 return EV_VERSION_MINOR;
1402} 1676}
1403 1677
1404/* return true if we are running with elevated privileges and should ignore env variables */ 1678/* return true if we are running with elevated privileges and should ignore env variables */
1405int inline_size 1679int inline_size ecb_cold
1406enable_secure (void) 1680enable_secure (void)
1407{ 1681{
1408#ifdef _WIN32 1682#ifdef _WIN32
1409 return 0; 1683 return 0;
1410#else 1684#else
1411 return getuid () != geteuid () 1685 return getuid () != geteuid ()
1412 || getgid () != getegid (); 1686 || getgid () != getegid ();
1413#endif 1687#endif
1414} 1688}
1415 1689
1416unsigned int 1690unsigned int ecb_cold
1417ev_supported_backends (void) 1691ev_supported_backends (void)
1418{ 1692{
1419 unsigned int flags = 0; 1693 unsigned int flags = 0;
1420 1694
1421 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 1695 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
… …
1425 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 1699 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1426 1700
1427 return flags; 1701 return flags;
1428} 1702}
1429 1703
1430unsigned int 1704unsigned int ecb_cold
1431ev_recommended_backends (void) 1705ev_recommended_backends (void)
1432{ 1706{
1433 unsigned int flags = ev_supported_backends (); 1707 unsigned int flags = ev_supported_backends ();
1434 1708
1435#ifndef __NetBSD__ 1709#ifndef __NetBSD__
… …
1440#ifdef __APPLE__ 1714#ifdef __APPLE__
1441 /* only select works correctly on that "unix-certified" platform */ 1715 /* only select works correctly on that "unix-certified" platform */
1442 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1716 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1443 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1717 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1444#endif 1718#endif
1719#ifdef __FreeBSD__
1720 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1721#endif
1445 1722
1446 return flags; 1723 return flags;
1447} 1724}
1448 1725
1449unsigned int 1726unsigned int ecb_cold
1450ev_embeddable_backends (void) 1727ev_embeddable_backends (void)
1451{ 1728{
1452 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1729 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1453 1730
1454 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1731 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1455 /* please fix it and tell me how to detect the fix */ 1732 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1456 flags &= ~EVBACKEND_EPOLL; 1733 flags &= ~EVBACKEND_EPOLL;
1457 1734
1458 return flags; 1735 return flags;
1459} 1736}
1460 1737
1461unsigned int 1738unsigned int
1462ev_backend (EV_P) 1739ev_backend (EV_P)
1463{ 1740{
1464 return backend; 1741 return backend;
1465} 1742}
1466 1743
1467#if EV_MINIMAL < 2 1744#if EV_FEATURE_API
1468unsigned int 1745unsigned int
1469ev_loop_count (EV_P) 1746ev_iteration (EV_P)
1470{ 1747{
1471 return loop_count; 1748 return loop_count;
1472} 1749}
1473 1750
1474unsigned int 1751unsigned int
1475ev_loop_depth (EV_P) 1752ev_depth (EV_P)
1476{ 1753{
1477 return loop_depth; 1754 return loop_depth;
1478} 1755}
1479 1756
1480void 1757void
… …
1499ev_userdata (EV_P) 1776ev_userdata (EV_P)
1500{ 1777{
1501 return userdata; 1778 return userdata;
1502} 1779}
1503 1780
1781void
1504void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1782ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1505{ 1783{
1506 invoke_cb = invoke_pending_cb; 1784 invoke_cb = invoke_pending_cb;
1507} 1785}
1508 1786
1787void
1509void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 1788ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1510{ 1789{
1511 release_cb = release; 1790 release_cb = release;
1512 acquire_cb = acquire; 1791 acquire_cb = acquire;
1513} 1792}
1514#endif 1793#endif
1515 1794
1516/* initialise a loop structure, must be zero-initialised */ 1795/* initialise a loop structure, must be zero-initialised */
1517static void noinline 1796static void noinline ecb_cold
1518loop_init (EV_P_ unsigned int flags) 1797loop_init (EV_P_ unsigned int flags)
1519{ 1798{
1520 if (!backend) 1799 if (!backend)
1521 { 1800 {
1801 origflags = flags;
1802
1522#if EV_USE_REALTIME 1803#if EV_USE_REALTIME
1523 if (!have_realtime) 1804 if (!have_realtime)
1524 { 1805 {
1525 struct timespec ts; 1806 struct timespec ts;
1526 1807
… …
1548 if (!(flags & EVFLAG_NOENV) 1829 if (!(flags & EVFLAG_NOENV)
1549 && !enable_secure () 1830 && !enable_secure ()
1550 && getenv ("LIBEV_FLAGS")) 1831 && getenv ("LIBEV_FLAGS"))
1551 flags = atoi (getenv ("LIBEV_FLAGS")); 1832 flags = atoi (getenv ("LIBEV_FLAGS"));
1552 1833
1553 ev_rt_now = ev_time (); 1834 ev_rt_now = ev_time ();
1554 mn_now = get_clock (); 1835 mn_now = get_clock ();
1555 now_floor = mn_now; 1836 now_floor = mn_now;
1556 rtmn_diff = ev_rt_now - mn_now; 1837 rtmn_diff = ev_rt_now - mn_now;
1557#if EV_MINIMAL < 2 1838#if EV_FEATURE_API
1558 invoke_cb = ev_invoke_pending; 1839 invoke_cb = ev_invoke_pending;
1559#endif 1840#endif
1560 1841
1561 io_blocktime = 0.; 1842 io_blocktime = 0.;
1562 timeout_blocktime = 0.; 1843 timeout_blocktime = 0.;
1563 backend = 0; 1844 backend = 0;
1564 backend_fd = -1; 1845 backend_fd = -1;
1565 gotasync = 0; 1846 sig_pending = 0;
1847#if EV_ASYNC_ENABLE
1848 async_pending = 0;
1849#endif
1850 pipe_write_skipped = 0;
1851 pipe_write_wanted = 0;
1566#if EV_USE_INOTIFY 1852#if EV_USE_INOTIFY
1567 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1853 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1568#endif 1854#endif
1569#if EV_USE_SIGNALFD 1855#if EV_USE_SIGNALFD
1570 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1856 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1571#endif 1857#endif
1572 1858
1573 if (!(flags & 0x0000ffffU)) 1859 if (!(flags & EVBACKEND_MASK))
1574 flags |= ev_recommended_backends (); 1860 flags |= ev_recommended_backends ();
1575 1861
1862#if EV_USE_IOCP
1863 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1864#endif
1576#if EV_USE_PORT 1865#if EV_USE_PORT
1577 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1866 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1578#endif 1867#endif
1579#if EV_USE_KQUEUE 1868#if EV_USE_KQUEUE
1580 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1869 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1589 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1878 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1590#endif 1879#endif
1591 1880
1592 ev_prepare_init (&pending_w, pendingcb); 1881 ev_prepare_init (&pending_w, pendingcb);
1593 1882
1883#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1594 ev_init (&pipe_w, pipecb); 1884 ev_init (&pipe_w, pipecb);
1595 ev_set_priority (&pipe_w, EV_MAXPRI); 1885 ev_set_priority (&pipe_w, EV_MAXPRI);
1886#endif
1596 } 1887 }
1597} 1888}
1598 1889
1599/* free up a loop structure */ 1890/* free up a loop structure */
1600static void noinline 1891void ecb_cold
1601loop_destroy (EV_P) 1892ev_loop_destroy (EV_P)
1602{ 1893{
1603 int i; 1894 int i;
1895
1896#if EV_MULTIPLICITY
1897 /* mimic free (0) */
1898 if (!EV_A)
1899 return;
1900#endif
1901
1902#if EV_CLEANUP_ENABLE
1903 /* queue cleanup watchers (and execute them) */
1904 if (expect_false (cleanupcnt))
1905 {
1906 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1907 EV_INVOKE_PENDING;
1908 }
1909#endif
1910
1911#if EV_CHILD_ENABLE
1912 if (ev_is_active (&childev))
1913 {
1914 ev_ref (EV_A); /* child watcher */
1915 ev_signal_stop (EV_A_ &childev);
1916 }
1917#endif
1604 1918
1605 if (ev_is_active (&pipe_w)) 1919 if (ev_is_active (&pipe_w))
1606 { 1920 {
1607 /*ev_ref (EV_A);*/ 1921 /*ev_ref (EV_A);*/
1608 /*ev_io_stop (EV_A_ &pipe_w);*/ 1922 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1612 close (evfd); 1926 close (evfd);
1613#endif 1927#endif
1614 1928
1615 if (evpipe [0] >= 0) 1929 if (evpipe [0] >= 0)
1616 { 1930 {
1617 close (evpipe [0]); 1931 EV_WIN32_CLOSE_FD (evpipe [0]);
1618 close (evpipe [1]); 1932 EV_WIN32_CLOSE_FD (evpipe [1]);
1619 } 1933 }
1620 } 1934 }
1621 1935
1622#if EV_USE_SIGNALFD 1936#if EV_USE_SIGNALFD
1623 if (ev_is_active (&sigfd_w)) 1937 if (ev_is_active (&sigfd_w))
1624 {
1625 /*ev_ref (EV_A);*/
1626 /*ev_io_stop (EV_A_ &sigfd_w);*/
1627
1628 close (sigfd); 1938 close (sigfd);
1629 }
1630#endif 1939#endif
1631 1940
1632#if EV_USE_INOTIFY 1941#if EV_USE_INOTIFY
1633 if (fs_fd >= 0) 1942 if (fs_fd >= 0)
1634 close (fs_fd); 1943 close (fs_fd);
1635#endif 1944#endif
1636 1945
1637 if (backend_fd >= 0) 1946 if (backend_fd >= 0)
1638 close (backend_fd); 1947 close (backend_fd);
1639 1948
1949#if EV_USE_IOCP
1950 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1951#endif
1640#if EV_USE_PORT 1952#if EV_USE_PORT
1641 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1953 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1642#endif 1954#endif
1643#if EV_USE_KQUEUE 1955#if EV_USE_KQUEUE
1644 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1956 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1671 array_free (periodic, EMPTY); 1983 array_free (periodic, EMPTY);
1672#endif 1984#endif
1673#if EV_FORK_ENABLE 1985#if EV_FORK_ENABLE
1674 array_free (fork, EMPTY); 1986 array_free (fork, EMPTY);
1675#endif 1987#endif
1988#if EV_CLEANUP_ENABLE
1989 array_free (cleanup, EMPTY);
1990#endif
1676 array_free (prepare, EMPTY); 1991 array_free (prepare, EMPTY);
1677 array_free (check, EMPTY); 1992 array_free (check, EMPTY);
1678#if EV_ASYNC_ENABLE 1993#if EV_ASYNC_ENABLE
1679 array_free (async, EMPTY); 1994 array_free (async, EMPTY);
1680#endif 1995#endif
1681 1996
1682 backend = 0; 1997 backend = 0;
1998
1999#if EV_MULTIPLICITY
2000 if (ev_is_default_loop (EV_A))
2001#endif
2002 ev_default_loop_ptr = 0;
2003#if EV_MULTIPLICITY
2004 else
2005 ev_free (EV_A);
2006#endif
1683} 2007}
1684 2008
1685#if EV_USE_INOTIFY 2009#if EV_USE_INOTIFY
1686inline_size void infy_fork (EV_P); 2010inline_size void infy_fork (EV_P);
1687#endif 2011#endif
… …
1702 infy_fork (EV_A); 2026 infy_fork (EV_A);
1703#endif 2027#endif
1704 2028
1705 if (ev_is_active (&pipe_w)) 2029 if (ev_is_active (&pipe_w))
1706 { 2030 {
1707 /* this "locks" the handlers against writing to the pipe */ 2031 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1708 /* while we modify the fd vars */
1709 gotsig = 1;
1710#if EV_ASYNC_ENABLE
1711 gotasync = 1;
1712#endif
1713 2032
1714 ev_ref (EV_A); 2033 ev_ref (EV_A);
1715 ev_io_stop (EV_A_ &pipe_w); 2034 ev_io_stop (EV_A_ &pipe_w);
1716 2035
1717#if EV_USE_EVENTFD 2036#if EV_USE_EVENTFD
… …
1719 close (evfd); 2038 close (evfd);
1720#endif 2039#endif
1721 2040
1722 if (evpipe [0] >= 0) 2041 if (evpipe [0] >= 0)
1723 { 2042 {
1724 close (evpipe [0]); 2043 EV_WIN32_CLOSE_FD (evpipe [0]);
1725 close (evpipe [1]); 2044 EV_WIN32_CLOSE_FD (evpipe [1]);
1726 } 2045 }
1727 2046
2047#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1728 evpipe_init (EV_A); 2048 evpipe_init (EV_A);
1729 /* now iterate over everything, in case we missed something */ 2049 /* now iterate over everything, in case we missed something */
1730 pipecb (EV_A_ &pipe_w, EV_READ); 2050 pipecb (EV_A_ &pipe_w, EV_READ);
2051#endif
1731 } 2052 }
1732 2053
1733 postfork = 0; 2054 postfork = 0;
1734} 2055}
1735 2056
1736#if EV_MULTIPLICITY 2057#if EV_MULTIPLICITY
1737 2058
1738struct ev_loop * 2059struct ev_loop * ecb_cold
1739ev_loop_new (unsigned int flags) 2060ev_loop_new (unsigned int flags)
1740{ 2061{
1741 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2062 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1742 2063
1743 memset (EV_A, 0, sizeof (struct ev_loop)); 2064 memset (EV_A, 0, sizeof (struct ev_loop));
1744 loop_init (EV_A_ flags); 2065 loop_init (EV_A_ flags);
1745 2066
1746 if (ev_backend (EV_A)) 2067 if (ev_backend (EV_A))
1747 return EV_A; 2068 return EV_A;
1748 2069
2070 ev_free (EV_A);
1749 return 0; 2071 return 0;
1750} 2072}
1751 2073
1752void
1753ev_loop_destroy (EV_P)
1754{
1755 loop_destroy (EV_A);
1756 ev_free (loop);
1757}
1758
1759void
1760ev_loop_fork (EV_P)
1761{
1762 postfork = 1; /* must be in line with ev_default_fork */
1763}
1764#endif /* multiplicity */ 2074#endif /* multiplicity */
1765 2075
1766#if EV_VERIFY 2076#if EV_VERIFY
1767static void noinline 2077static void noinline ecb_cold
1768verify_watcher (EV_P_ W w) 2078verify_watcher (EV_P_ W w)
1769{ 2079{
1770 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2080 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1771 2081
1772 if (w->pending) 2082 if (w->pending)
1773 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2083 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1774} 2084}
1775 2085
1776static void noinline 2086static void noinline ecb_cold
1777verify_heap (EV_P_ ANHE *heap, int N) 2087verify_heap (EV_P_ ANHE *heap, int N)
1778{ 2088{
1779 int i; 2089 int i;
1780 2090
1781 for (i = HEAP0; i < N + HEAP0; ++i) 2091 for (i = HEAP0; i < N + HEAP0; ++i)
… …
1786 2096
1787 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2097 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1788 } 2098 }
1789} 2099}
1790 2100
1791static void noinline 2101static void noinline ecb_cold
1792array_verify (EV_P_ W *ws, int cnt) 2102array_verify (EV_P_ W *ws, int cnt)
1793{ 2103{
1794 while (cnt--) 2104 while (cnt--)
1795 { 2105 {
1796 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2106 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1797 verify_watcher (EV_A_ ws [cnt]); 2107 verify_watcher (EV_A_ ws [cnt]);
1798 } 2108 }
1799} 2109}
1800#endif 2110#endif
1801 2111
1802#if EV_MINIMAL < 2 2112#if EV_FEATURE_API
1803void 2113void ecb_cold
1804ev_loop_verify (EV_P) 2114ev_verify (EV_P)
1805{ 2115{
1806#if EV_VERIFY 2116#if EV_VERIFY
1807 int i; 2117 int i;
1808 WL w; 2118 WL w;
1809 2119
… …
1843#if EV_FORK_ENABLE 2153#if EV_FORK_ENABLE
1844 assert (forkmax >= forkcnt); 2154 assert (forkmax >= forkcnt);
1845 array_verify (EV_A_ (W *)forks, forkcnt); 2155 array_verify (EV_A_ (W *)forks, forkcnt);
1846#endif 2156#endif
1847 2157
2158#if EV_CLEANUP_ENABLE
2159 assert (cleanupmax >= cleanupcnt);
2160 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2161#endif
2162
1848#if EV_ASYNC_ENABLE 2163#if EV_ASYNC_ENABLE
1849 assert (asyncmax >= asynccnt); 2164 assert (asyncmax >= asynccnt);
1850 array_verify (EV_A_ (W *)asyncs, asynccnt); 2165 array_verify (EV_A_ (W *)asyncs, asynccnt);
1851#endif 2166#endif
1852 2167
2168#if EV_PREPARE_ENABLE
1853 assert (preparemax >= preparecnt); 2169 assert (preparemax >= preparecnt);
1854 array_verify (EV_A_ (W *)prepares, preparecnt); 2170 array_verify (EV_A_ (W *)prepares, preparecnt);
2171#endif
1855 2172
2173#if EV_CHECK_ENABLE
1856 assert (checkmax >= checkcnt); 2174 assert (checkmax >= checkcnt);
1857 array_verify (EV_A_ (W *)checks, checkcnt); 2175 array_verify (EV_A_ (W *)checks, checkcnt);
2176#endif
1858 2177
1859# if 0 2178# if 0
2179#if EV_CHILD_ENABLE
1860 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2180 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1861 for (signum = EV_NSIG; signum--; ) if (signals [signum].gotsig) 2181 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2182#endif
1862# endif 2183# endif
1863#endif 2184#endif
1864} 2185}
1865#endif 2186#endif
1866 2187
1867#if EV_MULTIPLICITY 2188#if EV_MULTIPLICITY
1868struct ev_loop * 2189struct ev_loop * ecb_cold
1869ev_default_loop_init (unsigned int flags)
1870#else 2190#else
1871int 2191int
2192#endif
1872ev_default_loop (unsigned int flags) 2193ev_default_loop (unsigned int flags)
1873#endif
1874{ 2194{
1875 if (!ev_default_loop_ptr) 2195 if (!ev_default_loop_ptr)
1876 { 2196 {
1877#if EV_MULTIPLICITY 2197#if EV_MULTIPLICITY
1878 EV_P = ev_default_loop_ptr = &default_loop_struct; 2198 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1882 2202
1883 loop_init (EV_A_ flags); 2203 loop_init (EV_A_ flags);
1884 2204
1885 if (ev_backend (EV_A)) 2205 if (ev_backend (EV_A))
1886 { 2206 {
1887#ifndef _WIN32 2207#if EV_CHILD_ENABLE
1888 ev_signal_init (&childev, childcb, SIGCHLD); 2208 ev_signal_init (&childev, childcb, SIGCHLD);
1889 ev_set_priority (&childev, EV_MAXPRI); 2209 ev_set_priority (&childev, EV_MAXPRI);
1890 ev_signal_start (EV_A_ &childev); 2210 ev_signal_start (EV_A_ &childev);
1891 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2211 ev_unref (EV_A); /* child watcher should not keep loop alive */
1892#endif 2212#endif
… …
1897 2217
1898 return ev_default_loop_ptr; 2218 return ev_default_loop_ptr;
1899} 2219}
1900 2220
1901void 2221void
1902ev_default_destroy (void) 2222ev_loop_fork (EV_P)
1903{ 2223{
1904#if EV_MULTIPLICITY
1905 EV_P = ev_default_loop_ptr;
1906#endif
1907
1908 ev_default_loop_ptr = 0;
1909
1910#ifndef _WIN32
1911 ev_ref (EV_A); /* child watcher */
1912 ev_signal_stop (EV_A_ &childev);
1913#endif
1914
1915 loop_destroy (EV_A);
1916}
1917
1918void
1919ev_default_fork (void)
1920{
1921#if EV_MULTIPLICITY
1922 EV_P = ev_default_loop_ptr;
1923#endif
1924
1925 postfork = 1; /* must be in line with ev_loop_fork */ 2224 postfork = 1; /* must be in line with ev_default_fork */
1926} 2225}
1927 2226
1928/*****************************************************************************/ 2227/*****************************************************************************/
1929 2228
1930void 2229void
… …
1952 2251
1953 for (pri = NUMPRI; pri--; ) 2252 for (pri = NUMPRI; pri--; )
1954 while (pendingcnt [pri]) 2253 while (pendingcnt [pri])
1955 { 2254 {
1956 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2255 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1957
1958 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1959 /* ^ this is no longer true, as pending_w could be here */
1960 2256
1961 p->w->pending = 0; 2257 p->w->pending = 0;
1962 EV_CB_INVOKE (p->w, p->events); 2258 EV_CB_INVOKE (p->w, p->events);
1963 EV_FREQUENT_CHECK; 2259 EV_FREQUENT_CHECK;
1964 } 2260 }
… …
2021 EV_FREQUENT_CHECK; 2317 EV_FREQUENT_CHECK;
2022 feed_reverse (EV_A_ (W)w); 2318 feed_reverse (EV_A_ (W)w);
2023 } 2319 }
2024 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2320 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2025 2321
2026 feed_reverse_done (EV_A_ EV_TIMEOUT); 2322 feed_reverse_done (EV_A_ EV_TIMER);
2027 } 2323 }
2028} 2324}
2029 2325
2030#if EV_PERIODIC_ENABLE 2326#if EV_PERIODIC_ENABLE
2327
2328static void noinline
2329periodic_recalc (EV_P_ ev_periodic *w)
2330{
2331 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2332 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2333
2334 /* the above almost always errs on the low side */
2335 while (at <= ev_rt_now)
2336 {
2337 ev_tstamp nat = at + w->interval;
2338
2339 /* when resolution fails us, we use ev_rt_now */
2340 if (expect_false (nat == at))
2341 {
2342 at = ev_rt_now;
2343 break;
2344 }
2345
2346 at = nat;
2347 }
2348
2349 ev_at (w) = at;
2350}
2351
2031/* make periodics pending */ 2352/* make periodics pending */
2032inline_size void 2353inline_size void
2033periodics_reify (EV_P) 2354periodics_reify (EV_P)
2034{ 2355{
2035 EV_FREQUENT_CHECK; 2356 EV_FREQUENT_CHECK;
… …
2054 ANHE_at_cache (periodics [HEAP0]); 2375 ANHE_at_cache (periodics [HEAP0]);
2055 downheap (periodics, periodiccnt, HEAP0); 2376 downheap (periodics, periodiccnt, HEAP0);
2056 } 2377 }
2057 else if (w->interval) 2378 else if (w->interval)
2058 { 2379 {
2059 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2380 periodic_recalc (EV_A_ w);
2060 /* if next trigger time is not sufficiently in the future, put it there */
2061 /* this might happen because of floating point inexactness */
2062 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2063 {
2064 ev_at (w) += w->interval;
2065
2066 /* if interval is unreasonably low we might still have a time in the past */
2067 /* so correct this. this will make the periodic very inexact, but the user */
2068 /* has effectively asked to get triggered more often than possible */
2069 if (ev_at (w) < ev_rt_now)
2070 ev_at (w) = ev_rt_now;
2071 }
2072
2073 ANHE_at_cache (periodics [HEAP0]); 2381 ANHE_at_cache (periodics [HEAP0]);
2074 downheap (periodics, periodiccnt, HEAP0); 2382 downheap (periodics, periodiccnt, HEAP0);
2075 } 2383 }
2076 else 2384 else
2077 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2385 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2084 feed_reverse_done (EV_A_ EV_PERIODIC); 2392 feed_reverse_done (EV_A_ EV_PERIODIC);
2085 } 2393 }
2086} 2394}
2087 2395
2088/* simply recalculate all periodics */ 2396/* simply recalculate all periodics */
2089/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2397/* TODO: maybe ensure that at least one event happens when jumping forward? */
2090static void noinline 2398static void noinline ecb_cold
2091periodics_reschedule (EV_P) 2399periodics_reschedule (EV_P)
2092{ 2400{
2093 int i; 2401 int i;
2094 2402
2095 /* adjust periodics after time jump */ 2403 /* adjust periodics after time jump */
… …
2098 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2406 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2099 2407
2100 if (w->reschedule_cb) 2408 if (w->reschedule_cb)
2101 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2409 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2102 else if (w->interval) 2410 else if (w->interval)
2103 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2411 periodic_recalc (EV_A_ w);
2104 2412
2105 ANHE_at_cache (periodics [i]); 2413 ANHE_at_cache (periodics [i]);
2106 } 2414 }
2107 2415
2108 reheap (periodics, periodiccnt); 2416 reheap (periodics, periodiccnt);
2109} 2417}
2110#endif 2418#endif
2111 2419
2112/* adjust all timers by a given offset */ 2420/* adjust all timers by a given offset */
2113static void noinline 2421static void noinline ecb_cold
2114timers_reschedule (EV_P_ ev_tstamp adjust) 2422timers_reschedule (EV_P_ ev_tstamp adjust)
2115{ 2423{
2116 int i; 2424 int i;
2117 2425
2118 for (i = 0; i < timercnt; ++i) 2426 for (i = 0; i < timercnt; ++i)
… …
2122 ANHE_at_cache (*he); 2430 ANHE_at_cache (*he);
2123 } 2431 }
2124} 2432}
2125 2433
2126/* fetch new monotonic and realtime times from the kernel */ 2434/* fetch new monotonic and realtime times from the kernel */
2127/* also detetc if there was a timejump, and act accordingly */ 2435/* also detect if there was a timejump, and act accordingly */
2128inline_speed void 2436inline_speed void
2129time_update (EV_P_ ev_tstamp max_block) 2437time_update (EV_P_ ev_tstamp max_block)
2130{ 2438{
2131#if EV_USE_MONOTONIC 2439#if EV_USE_MONOTONIC
2132 if (expect_true (have_monotonic)) 2440 if (expect_true (have_monotonic))
… …
2155 * doesn't hurt either as we only do this on time-jumps or 2463 * doesn't hurt either as we only do this on time-jumps or
2156 * in the unlikely event of having been preempted here. 2464 * in the unlikely event of having been preempted here.
2157 */ 2465 */
2158 for (i = 4; --i; ) 2466 for (i = 4; --i; )
2159 { 2467 {
2468 ev_tstamp diff;
2160 rtmn_diff = ev_rt_now - mn_now; 2469 rtmn_diff = ev_rt_now - mn_now;
2161 2470
2471 diff = odiff - rtmn_diff;
2472
2162 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2473 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2163 return; /* all is well */ 2474 return; /* all is well */
2164 2475
2165 ev_rt_now = ev_time (); 2476 ev_rt_now = ev_time ();
2166 mn_now = get_clock (); 2477 mn_now = get_clock ();
2167 now_floor = mn_now; 2478 now_floor = mn_now;
… …
2190 mn_now = ev_rt_now; 2501 mn_now = ev_rt_now;
2191 } 2502 }
2192} 2503}
2193 2504
2194void 2505void
2195ev_loop (EV_P_ int flags) 2506ev_run (EV_P_ int flags)
2196{ 2507{
2197#if EV_MINIMAL < 2 2508#if EV_FEATURE_API
2198 ++loop_depth; 2509 ++loop_depth;
2199#endif 2510#endif
2200 2511
2201 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2512 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2202 2513
2203 loop_done = EVUNLOOP_CANCEL; 2514 loop_done = EVBREAK_CANCEL;
2204 2515
2205 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2516 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2206 2517
2207 do 2518 do
2208 { 2519 {
2209#if EV_VERIFY >= 2 2520#if EV_VERIFY >= 2
2210 ev_loop_verify (EV_A); 2521 ev_verify (EV_A);
2211#endif 2522#endif
2212 2523
2213#ifndef _WIN32 2524#ifndef _WIN32
2214 if (expect_false (curpid)) /* penalise the forking check even more */ 2525 if (expect_false (curpid)) /* penalise the forking check even more */
2215 if (expect_false (getpid () != curpid)) 2526 if (expect_false (getpid () != curpid))
… …
2227 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2538 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2228 EV_INVOKE_PENDING; 2539 EV_INVOKE_PENDING;
2229 } 2540 }
2230#endif 2541#endif
2231 2542
2543#if EV_PREPARE_ENABLE
2232 /* queue prepare watchers (and execute them) */ 2544 /* queue prepare watchers (and execute them) */
2233 if (expect_false (preparecnt)) 2545 if (expect_false (preparecnt))
2234 { 2546 {
2235 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2547 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2236 EV_INVOKE_PENDING; 2548 EV_INVOKE_PENDING;
2237 } 2549 }
2550#endif
2238 2551
2239 if (expect_false (loop_done)) 2552 if (expect_false (loop_done))
2240 break; 2553 break;
2241 2554
2242 /* we might have forked, so reify kernel state if necessary */ 2555 /* we might have forked, so reify kernel state if necessary */
… …
2249 /* calculate blocking time */ 2562 /* calculate blocking time */
2250 { 2563 {
2251 ev_tstamp waittime = 0.; 2564 ev_tstamp waittime = 0.;
2252 ev_tstamp sleeptime = 0.; 2565 ev_tstamp sleeptime = 0.;
2253 2566
2567 /* remember old timestamp for io_blocktime calculation */
2568 ev_tstamp prev_mn_now = mn_now;
2569
2570 /* update time to cancel out callback processing overhead */
2571 time_update (EV_A_ 1e100);
2572
2573 /* from now on, we want a pipe-wake-up */
2574 pipe_write_wanted = 1;
2575
2254 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2576 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2255 { 2577 {
2256 /* remember old timestamp for io_blocktime calculation */
2257 ev_tstamp prev_mn_now = mn_now;
2258
2259 /* update time to cancel out callback processing overhead */
2260 time_update (EV_A_ 1e100);
2261
2262 waittime = MAX_BLOCKTIME; 2578 waittime = MAX_BLOCKTIME;
2263 2579
2264 if (timercnt) 2580 if (timercnt)
2265 { 2581 {
2266 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2582 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2267 if (waittime > to) waittime = to; 2583 if (waittime > to) waittime = to;
2268 } 2584 }
2269 2585
2270#if EV_PERIODIC_ENABLE 2586#if EV_PERIODIC_ENABLE
2271 if (periodiccnt) 2587 if (periodiccnt)
2272 { 2588 {
2273 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2589 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2274 if (waittime > to) waittime = to; 2590 if (waittime > to) waittime = to;
2275 } 2591 }
2276#endif 2592#endif
2277 2593
2278 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2594 /* don't let timeouts decrease the waittime below timeout_blocktime */
2279 if (expect_false (waittime < timeout_blocktime)) 2595 if (expect_false (waittime < timeout_blocktime))
2280 waittime = timeout_blocktime; 2596 waittime = timeout_blocktime;
2597
2598 /* at this point, we NEED to wait, so we have to ensure */
2599 /* to pass a minimum nonzero value to the backend */
2600 if (expect_false (waittime < backend_mintime))
2601 waittime = backend_mintime;
2281 2602
2282 /* extra check because io_blocktime is commonly 0 */ 2603 /* extra check because io_blocktime is commonly 0 */
2283 if (expect_false (io_blocktime)) 2604 if (expect_false (io_blocktime))
2284 { 2605 {
2285 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2606 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2286 2607
2287 if (sleeptime > waittime - backend_fudge) 2608 if (sleeptime > waittime - backend_mintime)
2288 sleeptime = waittime - backend_fudge; 2609 sleeptime = waittime - backend_mintime;
2289 2610
2290 if (expect_true (sleeptime > 0.)) 2611 if (expect_true (sleeptime > 0.))
2291 { 2612 {
2292 ev_sleep (sleeptime); 2613 ev_sleep (sleeptime);
2293 waittime -= sleeptime; 2614 waittime -= sleeptime;
2294 } 2615 }
2295 } 2616 }
2296 } 2617 }
2297 2618
2298#if EV_MINIMAL < 2 2619#if EV_FEATURE_API
2299 ++loop_count; 2620 ++loop_count;
2300#endif 2621#endif
2301 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2622 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2302 backend_poll (EV_A_ waittime); 2623 backend_poll (EV_A_ waittime);
2303 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2624 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2625
2626 pipe_write_wanted = 0;
2627
2628 if (pipe_write_skipped)
2629 {
2630 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2631 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2632 }
2633
2304 2634
2305 /* update ev_rt_now, do magic */ 2635 /* update ev_rt_now, do magic */
2306 time_update (EV_A_ waittime + sleeptime); 2636 time_update (EV_A_ waittime + sleeptime);
2307 } 2637 }
2308 2638
… …
2315#if EV_IDLE_ENABLE 2645#if EV_IDLE_ENABLE
2316 /* queue idle watchers unless other events are pending */ 2646 /* queue idle watchers unless other events are pending */
2317 idle_reify (EV_A); 2647 idle_reify (EV_A);
2318#endif 2648#endif
2319 2649
2650#if EV_CHECK_ENABLE
2320 /* queue check watchers, to be executed first */ 2651 /* queue check watchers, to be executed first */
2321 if (expect_false (checkcnt)) 2652 if (expect_false (checkcnt))
2322 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2653 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2654#endif
2323 2655
2324 EV_INVOKE_PENDING; 2656 EV_INVOKE_PENDING;
2325 } 2657 }
2326 while (expect_true ( 2658 while (expect_true (
2327 activecnt 2659 activecnt
2328 && !loop_done 2660 && !loop_done
2329 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2661 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2330 )); 2662 ));
2331 2663
2332 if (loop_done == EVUNLOOP_ONE) 2664 if (loop_done == EVBREAK_ONE)
2333 loop_done = EVUNLOOP_CANCEL; 2665 loop_done = EVBREAK_CANCEL;
2334 2666
2335#if EV_MINIMAL < 2 2667#if EV_FEATURE_API
2336 --loop_depth; 2668 --loop_depth;
2337#endif 2669#endif
2338} 2670}
2339 2671
2340void 2672void
2341ev_unloop (EV_P_ int how) 2673ev_break (EV_P_ int how)
2342{ 2674{
2343 loop_done = how; 2675 loop_done = how;
2344} 2676}
2345 2677
2346void 2678void
… …
2393inline_size void 2725inline_size void
2394wlist_del (WL *head, WL elem) 2726wlist_del (WL *head, WL elem)
2395{ 2727{
2396 while (*head) 2728 while (*head)
2397 { 2729 {
2398 if (*head == elem) 2730 if (expect_true (*head == elem))
2399 { 2731 {
2400 *head = elem->next; 2732 *head = elem->next;
2401 return; 2733 break;
2402 } 2734 }
2403 2735
2404 head = &(*head)->next; 2736 head = &(*head)->next;
2405 } 2737 }
2406} 2738}
… …
2466 2798
2467 if (expect_false (ev_is_active (w))) 2799 if (expect_false (ev_is_active (w)))
2468 return; 2800 return;
2469 2801
2470 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2802 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2471 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2803 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2472 2804
2473 EV_FREQUENT_CHECK; 2805 EV_FREQUENT_CHECK;
2474 2806
2475 ev_start (EV_A_ (W)w, 1); 2807 ev_start (EV_A_ (W)w, 1);
2476 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2808 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2494 EV_FREQUENT_CHECK; 2826 EV_FREQUENT_CHECK;
2495 2827
2496 wlist_del (&anfds[w->fd].head, (WL)w); 2828 wlist_del (&anfds[w->fd].head, (WL)w);
2497 ev_stop (EV_A_ (W)w); 2829 ev_stop (EV_A_ (W)w);
2498 2830
2499 fd_change (EV_A_ w->fd, 1); 2831 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2500 2832
2501 EV_FREQUENT_CHECK; 2833 EV_FREQUENT_CHECK;
2502} 2834}
2503 2835
2504void noinline 2836void noinline
… …
2546 timers [active] = timers [timercnt + HEAP0]; 2878 timers [active] = timers [timercnt + HEAP0];
2547 adjustheap (timers, timercnt, active); 2879 adjustheap (timers, timercnt, active);
2548 } 2880 }
2549 } 2881 }
2550 2882
2551 EV_FREQUENT_CHECK;
2552
2553 ev_at (w) -= mn_now; 2883 ev_at (w) -= mn_now;
2554 2884
2555 ev_stop (EV_A_ (W)w); 2885 ev_stop (EV_A_ (W)w);
2886
2887 EV_FREQUENT_CHECK;
2556} 2888}
2557 2889
2558void noinline 2890void noinline
2559ev_timer_again (EV_P_ ev_timer *w) 2891ev_timer_again (EV_P_ ev_timer *w)
2560{ 2892{
… …
2596 if (w->reschedule_cb) 2928 if (w->reschedule_cb)
2597 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2929 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2598 else if (w->interval) 2930 else if (w->interval)
2599 { 2931 {
2600 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2932 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2601 /* this formula differs from the one in periodic_reify because we do not always round up */ 2933 periodic_recalc (EV_A_ w);
2602 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2603 } 2934 }
2604 else 2935 else
2605 ev_at (w) = w->offset; 2936 ev_at (w) = w->offset;
2606 2937
2607 EV_FREQUENT_CHECK; 2938 EV_FREQUENT_CHECK;
… …
2639 periodics [active] = periodics [periodiccnt + HEAP0]; 2970 periodics [active] = periodics [periodiccnt + HEAP0];
2640 adjustheap (periodics, periodiccnt, active); 2971 adjustheap (periodics, periodiccnt, active);
2641 } 2972 }
2642 } 2973 }
2643 2974
2644 EV_FREQUENT_CHECK;
2645
2646 ev_stop (EV_A_ (W)w); 2975 ev_stop (EV_A_ (W)w);
2976
2977 EV_FREQUENT_CHECK;
2647} 2978}
2648 2979
2649void noinline 2980void noinline
2650ev_periodic_again (EV_P_ ev_periodic *w) 2981ev_periodic_again (EV_P_ ev_periodic *w)
2651{ 2982{
… …
2657 2988
2658#ifndef SA_RESTART 2989#ifndef SA_RESTART
2659# define SA_RESTART 0 2990# define SA_RESTART 0
2660#endif 2991#endif
2661 2992
2993#if EV_SIGNAL_ENABLE
2994
2662void noinline 2995void noinline
2663ev_signal_start (EV_P_ ev_signal *w) 2996ev_signal_start (EV_P_ ev_signal *w)
2664{ 2997{
2665 if (expect_false (ev_is_active (w))) 2998 if (expect_false (ev_is_active (w)))
2666 return; 2999 return;
2667 3000
2668 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG)); 3001 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2669 3002
2670#if EV_MULTIPLICITY 3003#if EV_MULTIPLICITY
2671 assert (("libev: tried to attach to a signal from two different loops", 3004 assert (("libev: a signal must not be attached to two different loops",
2672 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 3005 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2673 3006
2674 signals [w->signum - 1].loop = EV_A; 3007 signals [w->signum - 1].loop = EV_A;
2675#endif 3008#endif
2676 3009
… …
2712 if (!((WL)w)->next) 3045 if (!((WL)w)->next)
2713# if EV_USE_SIGNALFD 3046# if EV_USE_SIGNALFD
2714 if (sigfd < 0) /*TODO*/ 3047 if (sigfd < 0) /*TODO*/
2715# endif 3048# endif
2716 { 3049 {
2717# if _WIN32 3050# ifdef _WIN32
3051 evpipe_init (EV_A);
3052
2718 signal (w->signum, ev_sighandler); 3053 signal (w->signum, ev_sighandler);
2719# else 3054# else
2720 struct sigaction sa; 3055 struct sigaction sa;
2721 3056
2722 evpipe_init (EV_A); 3057 evpipe_init (EV_A);
… …
2724 sa.sa_handler = ev_sighandler; 3059 sa.sa_handler = ev_sighandler;
2725 sigfillset (&sa.sa_mask); 3060 sigfillset (&sa.sa_mask);
2726 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 3061 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2727 sigaction (w->signum, &sa, 0); 3062 sigaction (w->signum, &sa, 0);
2728 3063
3064 if (origflags & EVFLAG_NOSIGMASK)
3065 {
2729 sigemptyset (&sa.sa_mask); 3066 sigemptyset (&sa.sa_mask);
2730 sigaddset (&sa.sa_mask, w->signum); 3067 sigaddset (&sa.sa_mask, w->signum);
2731 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 3068 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
3069 }
2732#endif 3070#endif
2733 } 3071 }
2734 3072
2735 EV_FREQUENT_CHECK; 3073 EV_FREQUENT_CHECK;
2736} 3074}
… …
2747 wlist_del (&signals [w->signum - 1].head, (WL)w); 3085 wlist_del (&signals [w->signum - 1].head, (WL)w);
2748 ev_stop (EV_A_ (W)w); 3086 ev_stop (EV_A_ (W)w);
2749 3087
2750 if (!signals [w->signum - 1].head) 3088 if (!signals [w->signum - 1].head)
2751 { 3089 {
2752 #if EV_MULTIPLICITY 3090#if EV_MULTIPLICITY
2753 signals [w->signum - 1].loop = 0; /* unattach from signal */ 3091 signals [w->signum - 1].loop = 0; /* unattach from signal */
2754 #endif 3092#endif
2755 #if EV_USE_SIGNALFD 3093#if EV_USE_SIGNALFD
2756 if (sigfd >= 0) 3094 if (sigfd >= 0)
2757 { 3095 {
2758 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 3096 sigset_t ss;
3097
3098 sigemptyset (&ss);
3099 sigaddset (&ss, w->signum);
2759 sigdelset (&sigfd_set, w->signum); 3100 sigdelset (&sigfd_set, w->signum);
3101
2760 signalfd (sigfd, &sigfd_set, 0); 3102 signalfd (sigfd, &sigfd_set, 0);
2761 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 3103 sigprocmask (SIG_UNBLOCK, &ss, 0);
2762 /*TODO: maybe unblock signal? */
2763 } 3104 }
2764 else 3105 else
2765 #endif 3106#endif
2766 signal (w->signum, SIG_DFL); 3107 signal (w->signum, SIG_DFL);
2767 } 3108 }
2768 3109
2769 EV_FREQUENT_CHECK; 3110 EV_FREQUENT_CHECK;
2770} 3111}
3112
3113#endif
3114
3115#if EV_CHILD_ENABLE
2771 3116
2772void 3117void
2773ev_child_start (EV_P_ ev_child *w) 3118ev_child_start (EV_P_ ev_child *w)
2774{ 3119{
2775#if EV_MULTIPLICITY 3120#if EV_MULTIPLICITY
… …
2779 return; 3124 return;
2780 3125
2781 EV_FREQUENT_CHECK; 3126 EV_FREQUENT_CHECK;
2782 3127
2783 ev_start (EV_A_ (W)w, 1); 3128 ev_start (EV_A_ (W)w, 1);
2784 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3129 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2785 3130
2786 EV_FREQUENT_CHECK; 3131 EV_FREQUENT_CHECK;
2787} 3132}
2788 3133
2789void 3134void
… …
2793 if (expect_false (!ev_is_active (w))) 3138 if (expect_false (!ev_is_active (w)))
2794 return; 3139 return;
2795 3140
2796 EV_FREQUENT_CHECK; 3141 EV_FREQUENT_CHECK;
2797 3142
2798 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3143 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2799 ev_stop (EV_A_ (W)w); 3144 ev_stop (EV_A_ (W)w);
2800 3145
2801 EV_FREQUENT_CHECK; 3146 EV_FREQUENT_CHECK;
2802} 3147}
3148
3149#endif
2803 3150
2804#if EV_STAT_ENABLE 3151#if EV_STAT_ENABLE
2805 3152
2806# ifdef _WIN32 3153# ifdef _WIN32
2807# undef lstat 3154# undef lstat
… …
2813#define MIN_STAT_INTERVAL 0.1074891 3160#define MIN_STAT_INTERVAL 0.1074891
2814 3161
2815static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 3162static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2816 3163
2817#if EV_USE_INOTIFY 3164#if EV_USE_INOTIFY
2818# define EV_INOTIFY_BUFSIZE 8192 3165
3166/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
3167# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2819 3168
2820static void noinline 3169static void noinline
2821infy_add (EV_P_ ev_stat *w) 3170infy_add (EV_P_ ev_stat *w)
2822{ 3171{
2823 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); 3172 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);
2824 3173
2825 if (w->wd < 0) 3174 if (w->wd >= 0)
3175 {
3176 struct statfs sfs;
3177
3178 /* now local changes will be tracked by inotify, but remote changes won't */
3179 /* unless the filesystem is known to be local, we therefore still poll */
3180 /* also do poll on <2.6.25, but with normal frequency */
3181
3182 if (!fs_2625)
3183 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3184 else if (!statfs (w->path, &sfs)
3185 && (sfs.f_type == 0x1373 /* devfs */
3186 || sfs.f_type == 0xEF53 /* ext2/3 */
3187 || sfs.f_type == 0x3153464a /* jfs */
3188 || sfs.f_type == 0x52654973 /* reiser3 */
3189 || sfs.f_type == 0x01021994 /* tempfs */
3190 || sfs.f_type == 0x58465342 /* xfs */))
3191 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3192 else
3193 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2826 { 3194 }
3195 else
3196 {
3197 /* can't use inotify, continue to stat */
2827 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3198 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2828 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2829 3199
2830 /* monitor some parent directory for speedup hints */ 3200 /* if path is not there, monitor some parent directory for speedup hints */
2831 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3201 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2832 /* but an efficiency issue only */ 3202 /* but an efficiency issue only */
2833 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3203 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2834 { 3204 {
2835 char path [4096]; 3205 char path [4096];
… …
2845 if (!pend || pend == path) 3215 if (!pend || pend == path)
2846 break; 3216 break;
2847 3217
2848 *pend = 0; 3218 *pend = 0;
2849 w->wd = inotify_add_watch (fs_fd, path, mask); 3219 w->wd = inotify_add_watch (fs_fd, path, mask);
2850 } 3220 }
2851 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3221 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2852 } 3222 }
2853 } 3223 }
2854 3224
2855 if (w->wd >= 0) 3225 if (w->wd >= 0)
2856 {
2857 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3226 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2858 3227
2859 /* now local changes will be tracked by inotify, but remote changes won't */ 3228 /* now re-arm timer, if required */
2860 /* unless the filesystem it known to be local, we therefore still poll */ 3229 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2861 /* also do poll on <2.6.25, but with normal frequency */
2862 struct statfs sfs;
2863
2864 if (fs_2625 && !statfs (w->path, &sfs))
2865 if (sfs.f_type == 0x1373 /* devfs */
2866 || sfs.f_type == 0xEF53 /* ext2/3 */
2867 || sfs.f_type == 0x3153464a /* jfs */
2868 || sfs.f_type == 0x52654973 /* reiser3 */
2869 || sfs.f_type == 0x01021994 /* tempfs */
2870 || sfs.f_type == 0x58465342 /* xfs */)
2871 return;
2872
2873 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2874 ev_timer_again (EV_A_ &w->timer); 3230 ev_timer_again (EV_A_ &w->timer);
2875 } 3231 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2876} 3232}
2877 3233
2878static void noinline 3234static void noinline
2879infy_del (EV_P_ ev_stat *w) 3235infy_del (EV_P_ ev_stat *w)
2880{ 3236{
… …
2883 3239
2884 if (wd < 0) 3240 if (wd < 0)
2885 return; 3241 return;
2886 3242
2887 w->wd = -2; 3243 w->wd = -2;
2888 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3244 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2889 wlist_del (&fs_hash [slot].head, (WL)w); 3245 wlist_del (&fs_hash [slot].head, (WL)w);
2890 3246
2891 /* remove this watcher, if others are watching it, they will rearm */ 3247 /* remove this watcher, if others are watching it, they will rearm */
2892 inotify_rm_watch (fs_fd, wd); 3248 inotify_rm_watch (fs_fd, wd);
2893} 3249}
… …
2895static void noinline 3251static void noinline
2896infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3252infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2897{ 3253{
2898 if (slot < 0) 3254 if (slot < 0)
2899 /* overflow, need to check for all hash slots */ 3255 /* overflow, need to check for all hash slots */
2900 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3256 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2901 infy_wd (EV_A_ slot, wd, ev); 3257 infy_wd (EV_A_ slot, wd, ev);
2902 else 3258 else
2903 { 3259 {
2904 WL w_; 3260 WL w_;
2905 3261
2906 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3262 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2907 { 3263 {
2908 ev_stat *w = (ev_stat *)w_; 3264 ev_stat *w = (ev_stat *)w_;
2909 w_ = w_->next; /* lets us remove this watcher and all before it */ 3265 w_ = w_->next; /* lets us remove this watcher and all before it */
2910 3266
2911 if (w->wd == wd || wd == -1) 3267 if (w->wd == wd || wd == -1)
2912 { 3268 {
2913 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3269 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2914 { 3270 {
2915 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3271 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2916 w->wd = -1; 3272 w->wd = -1;
2917 infy_add (EV_A_ w); /* re-add, no matter what */ 3273 infy_add (EV_A_ w); /* re-add, no matter what */
2918 } 3274 }
2919 3275
2920 stat_timer_cb (EV_A_ &w->timer, 0); 3276 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2925 3281
2926static void 3282static void
2927infy_cb (EV_P_ ev_io *w, int revents) 3283infy_cb (EV_P_ ev_io *w, int revents)
2928{ 3284{
2929 char buf [EV_INOTIFY_BUFSIZE]; 3285 char buf [EV_INOTIFY_BUFSIZE];
2930 struct inotify_event *ev = (struct inotify_event *)buf;
2931 int ofs; 3286 int ofs;
2932 int len = read (fs_fd, buf, sizeof (buf)); 3287 int len = read (fs_fd, buf, sizeof (buf));
2933 3288
2934 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3289 for (ofs = 0; ofs < len; )
3290 {
3291 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2935 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3292 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3293 ofs += sizeof (struct inotify_event) + ev->len;
3294 }
2936} 3295}
2937 3296
2938inline_size void 3297inline_size void ecb_cold
2939check_2625 (EV_P) 3298ev_check_2625 (EV_P)
2940{ 3299{
2941 /* kernels < 2.6.25 are borked 3300 /* kernels < 2.6.25 are borked
2942 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3301 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2943 */ 3302 */
2944 struct utsname buf; 3303 if (ev_linux_version () < 0x020619)
2945 int major, minor, micro;
2946
2947 if (uname (&buf))
2948 return; 3304 return;
2949 3305
2950 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2951 return;
2952
2953 if (major < 2
2954 || (major == 2 && minor < 6)
2955 || (major == 2 && minor == 6 && micro < 25))
2956 return;
2957
2958 fs_2625 = 1; 3306 fs_2625 = 1;
3307}
3308
3309inline_size int
3310infy_newfd (void)
3311{
3312#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3313 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3314 if (fd >= 0)
3315 return fd;
3316#endif
3317 return inotify_init ();
2959} 3318}
2960 3319
2961inline_size void 3320inline_size void
2962infy_init (EV_P) 3321infy_init (EV_P)
2963{ 3322{
2964 if (fs_fd != -2) 3323 if (fs_fd != -2)
2965 return; 3324 return;
2966 3325
2967 fs_fd = -1; 3326 fs_fd = -1;
2968 3327
2969 check_2625 (EV_A); 3328 ev_check_2625 (EV_A);
2970 3329
2971 fs_fd = inotify_init (); 3330 fs_fd = infy_newfd ();
2972 3331
2973 if (fs_fd >= 0) 3332 if (fs_fd >= 0)
2974 { 3333 {
3334 fd_intern (fs_fd);
2975 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3335 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2976 ev_set_priority (&fs_w, EV_MAXPRI); 3336 ev_set_priority (&fs_w, EV_MAXPRI);
2977 ev_io_start (EV_A_ &fs_w); 3337 ev_io_start (EV_A_ &fs_w);
3338 ev_unref (EV_A);
2978 } 3339 }
2979} 3340}
2980 3341
2981inline_size void 3342inline_size void
2982infy_fork (EV_P) 3343infy_fork (EV_P)
… …
2984 int slot; 3345 int slot;
2985 3346
2986 if (fs_fd < 0) 3347 if (fs_fd < 0)
2987 return; 3348 return;
2988 3349
3350 ev_ref (EV_A);
3351 ev_io_stop (EV_A_ &fs_w);
2989 close (fs_fd); 3352 close (fs_fd);
2990 fs_fd = inotify_init (); 3353 fs_fd = infy_newfd ();
2991 3354
3355 if (fs_fd >= 0)
3356 {
3357 fd_intern (fs_fd);
3358 ev_io_set (&fs_w, fs_fd, EV_READ);
3359 ev_io_start (EV_A_ &fs_w);
3360 ev_unref (EV_A);
3361 }
3362
2992 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3363 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2993 { 3364 {
2994 WL w_ = fs_hash [slot].head; 3365 WL w_ = fs_hash [slot].head;
2995 fs_hash [slot].head = 0; 3366 fs_hash [slot].head = 0;
2996 3367
2997 while (w_) 3368 while (w_)
… …
3002 w->wd = -1; 3373 w->wd = -1;
3003 3374
3004 if (fs_fd >= 0) 3375 if (fs_fd >= 0)
3005 infy_add (EV_A_ w); /* re-add, no matter what */ 3376 infy_add (EV_A_ w); /* re-add, no matter what */
3006 else 3377 else
3378 {
3379 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3380 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3007 ev_timer_again (EV_A_ &w->timer); 3381 ev_timer_again (EV_A_ &w->timer);
3382 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3383 }
3008 } 3384 }
3009 } 3385 }
3010} 3386}
3011 3387
3012#endif 3388#endif
… …
3029static void noinline 3405static void noinline
3030stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3406stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3031{ 3407{
3032 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3408 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3033 3409
3034 /* we copy this here each the time so that */ 3410 ev_statdata prev = w->attr;
3035 /* prev has the old value when the callback gets invoked */
3036 w->prev = w->attr;
3037 ev_stat_stat (EV_A_ w); 3411 ev_stat_stat (EV_A_ w);
3038 3412
3039 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3413 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3040 if ( 3414 if (
3041 w->prev.st_dev != w->attr.st_dev 3415 prev.st_dev != w->attr.st_dev
3042 || w->prev.st_ino != w->attr.st_ino 3416 || prev.st_ino != w->attr.st_ino
3043 || w->prev.st_mode != w->attr.st_mode 3417 || prev.st_mode != w->attr.st_mode
3044 || w->prev.st_nlink != w->attr.st_nlink 3418 || prev.st_nlink != w->attr.st_nlink
3045 || w->prev.st_uid != w->attr.st_uid 3419 || prev.st_uid != w->attr.st_uid
3046 || w->prev.st_gid != w->attr.st_gid 3420 || prev.st_gid != w->attr.st_gid
3047 || w->prev.st_rdev != w->attr.st_rdev 3421 || prev.st_rdev != w->attr.st_rdev
3048 || w->prev.st_size != w->attr.st_size 3422 || prev.st_size != w->attr.st_size
3049 || w->prev.st_atime != w->attr.st_atime 3423 || prev.st_atime != w->attr.st_atime
3050 || w->prev.st_mtime != w->attr.st_mtime 3424 || prev.st_mtime != w->attr.st_mtime
3051 || w->prev.st_ctime != w->attr.st_ctime 3425 || prev.st_ctime != w->attr.st_ctime
3052 ) { 3426 ) {
3427 /* we only update w->prev on actual differences */
3428 /* in case we test more often than invoke the callback, */
3429 /* to ensure that prev is always different to attr */
3430 w->prev = prev;
3431
3053 #if EV_USE_INOTIFY 3432 #if EV_USE_INOTIFY
3054 if (fs_fd >= 0) 3433 if (fs_fd >= 0)
3055 { 3434 {
3056 infy_del (EV_A_ w); 3435 infy_del (EV_A_ w);
3057 infy_add (EV_A_ w); 3436 infy_add (EV_A_ w);
… …
3082 3461
3083 if (fs_fd >= 0) 3462 if (fs_fd >= 0)
3084 infy_add (EV_A_ w); 3463 infy_add (EV_A_ w);
3085 else 3464 else
3086#endif 3465#endif
3466 {
3087 ev_timer_again (EV_A_ &w->timer); 3467 ev_timer_again (EV_A_ &w->timer);
3468 ev_unref (EV_A);
3469 }
3088 3470
3089 ev_start (EV_A_ (W)w, 1); 3471 ev_start (EV_A_ (W)w, 1);
3090 3472
3091 EV_FREQUENT_CHECK; 3473 EV_FREQUENT_CHECK;
3092} 3474}
… …
3101 EV_FREQUENT_CHECK; 3483 EV_FREQUENT_CHECK;
3102 3484
3103#if EV_USE_INOTIFY 3485#if EV_USE_INOTIFY
3104 infy_del (EV_A_ w); 3486 infy_del (EV_A_ w);
3105#endif 3487#endif
3488
3489 if (ev_is_active (&w->timer))
3490 {
3491 ev_ref (EV_A);
3106 ev_timer_stop (EV_A_ &w->timer); 3492 ev_timer_stop (EV_A_ &w->timer);
3493 }
3107 3494
3108 ev_stop (EV_A_ (W)w); 3495 ev_stop (EV_A_ (W)w);
3109 3496
3110 EV_FREQUENT_CHECK; 3497 EV_FREQUENT_CHECK;
3111} 3498}
… …
3156 3543
3157 EV_FREQUENT_CHECK; 3544 EV_FREQUENT_CHECK;
3158} 3545}
3159#endif 3546#endif
3160 3547
3548#if EV_PREPARE_ENABLE
3161void 3549void
3162ev_prepare_start (EV_P_ ev_prepare *w) 3550ev_prepare_start (EV_P_ ev_prepare *w)
3163{ 3551{
3164 if (expect_false (ev_is_active (w))) 3552 if (expect_false (ev_is_active (w)))
3165 return; 3553 return;
… …
3191 3579
3192 ev_stop (EV_A_ (W)w); 3580 ev_stop (EV_A_ (W)w);
3193 3581
3194 EV_FREQUENT_CHECK; 3582 EV_FREQUENT_CHECK;
3195} 3583}
3584#endif
3196 3585
3586#if EV_CHECK_ENABLE
3197void 3587void
3198ev_check_start (EV_P_ ev_check *w) 3588ev_check_start (EV_P_ ev_check *w)
3199{ 3589{
3200 if (expect_false (ev_is_active (w))) 3590 if (expect_false (ev_is_active (w)))
3201 return; 3591 return;
… …
3227 3617
3228 ev_stop (EV_A_ (W)w); 3618 ev_stop (EV_A_ (W)w);
3229 3619
3230 EV_FREQUENT_CHECK; 3620 EV_FREQUENT_CHECK;
3231} 3621}
3622#endif
3232 3623
3233#if EV_EMBED_ENABLE 3624#if EV_EMBED_ENABLE
3234void noinline 3625void noinline
3235ev_embed_sweep (EV_P_ ev_embed *w) 3626ev_embed_sweep (EV_P_ ev_embed *w)
3236{ 3627{
3237 ev_loop (w->other, EVLOOP_NONBLOCK); 3628 ev_run (w->other, EVRUN_NOWAIT);
3238} 3629}
3239 3630
3240static void 3631static void
3241embed_io_cb (EV_P_ ev_io *io, int revents) 3632embed_io_cb (EV_P_ ev_io *io, int revents)
3242{ 3633{
3243 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3634 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3244 3635
3245 if (ev_cb (w)) 3636 if (ev_cb (w))
3246 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3637 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3247 else 3638 else
3248 ev_loop (w->other, EVLOOP_NONBLOCK); 3639 ev_run (w->other, EVRUN_NOWAIT);
3249} 3640}
3250 3641
3251static void 3642static void
3252embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3643embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3253{ 3644{
… …
3257 EV_P = w->other; 3648 EV_P = w->other;
3258 3649
3259 while (fdchangecnt) 3650 while (fdchangecnt)
3260 { 3651 {
3261 fd_reify (EV_A); 3652 fd_reify (EV_A);
3262 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3653 ev_run (EV_A_ EVRUN_NOWAIT);
3263 } 3654 }
3264 } 3655 }
3265} 3656}
3266 3657
3267static void 3658static void
… …
3273 3664
3274 { 3665 {
3275 EV_P = w->other; 3666 EV_P = w->other;
3276 3667
3277 ev_loop_fork (EV_A); 3668 ev_loop_fork (EV_A);
3278 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3669 ev_run (EV_A_ EVRUN_NOWAIT);
3279 } 3670 }
3280 3671
3281 ev_embed_start (EV_A_ w); 3672 ev_embed_start (EV_A_ w);
3282} 3673}
3283 3674
… …
3331 3722
3332 ev_io_stop (EV_A_ &w->io); 3723 ev_io_stop (EV_A_ &w->io);
3333 ev_prepare_stop (EV_A_ &w->prepare); 3724 ev_prepare_stop (EV_A_ &w->prepare);
3334 ev_fork_stop (EV_A_ &w->fork); 3725 ev_fork_stop (EV_A_ &w->fork);
3335 3726
3727 ev_stop (EV_A_ (W)w);
3728
3336 EV_FREQUENT_CHECK; 3729 EV_FREQUENT_CHECK;
3337} 3730}
3338#endif 3731#endif
3339 3732
3340#if EV_FORK_ENABLE 3733#if EV_FORK_ENABLE
… …
3373 3766
3374 EV_FREQUENT_CHECK; 3767 EV_FREQUENT_CHECK;
3375} 3768}
3376#endif 3769#endif
3377 3770
3771#if EV_CLEANUP_ENABLE
3772void
3773ev_cleanup_start (EV_P_ ev_cleanup *w)
3774{
3775 if (expect_false (ev_is_active (w)))
3776 return;
3777
3778 EV_FREQUENT_CHECK;
3779
3780 ev_start (EV_A_ (W)w, ++cleanupcnt);
3781 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3782 cleanups [cleanupcnt - 1] = w;
3783
3784 /* cleanup watchers should never keep a refcount on the loop */
3785 ev_unref (EV_A);
3786 EV_FREQUENT_CHECK;
3787}
3788
3789void
3790ev_cleanup_stop (EV_P_ ev_cleanup *w)
3791{
3792 clear_pending (EV_A_ (W)w);
3793 if (expect_false (!ev_is_active (w)))
3794 return;
3795
3796 EV_FREQUENT_CHECK;
3797 ev_ref (EV_A);
3798
3799 {
3800 int active = ev_active (w);
3801
3802 cleanups [active - 1] = cleanups [--cleanupcnt];
3803 ev_active (cleanups [active - 1]) = active;
3804 }
3805
3806 ev_stop (EV_A_ (W)w);
3807
3808 EV_FREQUENT_CHECK;
3809}
3810#endif
3811
3378#if EV_ASYNC_ENABLE 3812#if EV_ASYNC_ENABLE
3379void 3813void
3380ev_async_start (EV_P_ ev_async *w) 3814ev_async_start (EV_P_ ev_async *w)
3381{ 3815{
3382 if (expect_false (ev_is_active (w))) 3816 if (expect_false (ev_is_active (w)))
3383 return; 3817 return;
3384 3818
3819 w->sent = 0;
3820
3385 evpipe_init (EV_A); 3821 evpipe_init (EV_A);
3386 3822
3387 EV_FREQUENT_CHECK; 3823 EV_FREQUENT_CHECK;
3388 3824
3389 ev_start (EV_A_ (W)w, ++asynccnt); 3825 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3416 3852
3417void 3853void
3418ev_async_send (EV_P_ ev_async *w) 3854ev_async_send (EV_P_ ev_async *w)
3419{ 3855{
3420 w->sent = 1; 3856 w->sent = 1;
3421 evpipe_write (EV_A_ &gotasync); 3857 evpipe_write (EV_A_ &async_pending);
3422} 3858}
3423#endif 3859#endif
3424 3860
3425/*****************************************************************************/ 3861/*****************************************************************************/
3426 3862
… …
3466{ 3902{
3467 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3903 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3468 3904
3469 if (expect_false (!once)) 3905 if (expect_false (!once))
3470 { 3906 {
3471 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3907 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3472 return; 3908 return;
3473 } 3909 }
3474 3910
3475 once->cb = cb; 3911 once->cb = cb;
3476 once->arg = arg; 3912 once->arg = arg;
… …
3491} 3927}
3492 3928
3493/*****************************************************************************/ 3929/*****************************************************************************/
3494 3930
3495#if EV_WALK_ENABLE 3931#if EV_WALK_ENABLE
3496void 3932void ecb_cold
3497ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3933ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3498{ 3934{
3499 int i, j; 3935 int i, j;
3500 ev_watcher_list *wl, *wn; 3936 ev_watcher_list *wl, *wn;
3501 3937
… …
3563 if (types & EV_ASYNC) 3999 if (types & EV_ASYNC)
3564 for (i = asynccnt; i--; ) 4000 for (i = asynccnt; i--; )
3565 cb (EV_A_ EV_ASYNC, asyncs [i]); 4001 cb (EV_A_ EV_ASYNC, asyncs [i]);
3566#endif 4002#endif
3567 4003
4004#if EV_PREPARE_ENABLE
3568 if (types & EV_PREPARE) 4005 if (types & EV_PREPARE)
3569 for (i = preparecnt; i--; ) 4006 for (i = preparecnt; i--; )
3570#if EV_EMBED_ENABLE 4007# if EV_EMBED_ENABLE
3571 if (ev_cb (prepares [i]) != embed_prepare_cb) 4008 if (ev_cb (prepares [i]) != embed_prepare_cb)
3572#endif 4009# endif
3573 cb (EV_A_ EV_PREPARE, prepares [i]); 4010 cb (EV_A_ EV_PREPARE, prepares [i]);
4011#endif
3574 4012
4013#if EV_CHECK_ENABLE
3575 if (types & EV_CHECK) 4014 if (types & EV_CHECK)
3576 for (i = checkcnt; i--; ) 4015 for (i = checkcnt; i--; )
3577 cb (EV_A_ EV_CHECK, checks [i]); 4016 cb (EV_A_ EV_CHECK, checks [i]);
4017#endif
3578 4018
4019#if EV_SIGNAL_ENABLE
3579 if (types & EV_SIGNAL) 4020 if (types & EV_SIGNAL)
3580 for (i = 0; i < EV_NSIG - 1; ++i) 4021 for (i = 0; i < EV_NSIG - 1; ++i)
3581 for (wl = signals [i].head; wl; ) 4022 for (wl = signals [i].head; wl; )
3582 { 4023 {
3583 wn = wl->next; 4024 wn = wl->next;
3584 cb (EV_A_ EV_SIGNAL, wl); 4025 cb (EV_A_ EV_SIGNAL, wl);
3585 wl = wn; 4026 wl = wn;
3586 } 4027 }
4028#endif
3587 4029
4030#if EV_CHILD_ENABLE
3588 if (types & EV_CHILD) 4031 if (types & EV_CHILD)
3589 for (i = EV_PID_HASHSIZE; i--; ) 4032 for (i = (EV_PID_HASHSIZE); i--; )
3590 for (wl = childs [i]; wl; ) 4033 for (wl = childs [i]; wl; )
3591 { 4034 {
3592 wn = wl->next; 4035 wn = wl->next;
3593 cb (EV_A_ EV_CHILD, wl); 4036 cb (EV_A_ EV_CHILD, wl);
3594 wl = wn; 4037 wl = wn;
3595 } 4038 }
4039#endif
3596/* EV_STAT 0x00001000 /* stat data changed */ 4040/* EV_STAT 0x00001000 /* stat data changed */
3597/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 4041/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3598} 4042}
3599#endif 4043#endif
3600 4044
3601#if EV_MULTIPLICITY 4045#if EV_MULTIPLICITY
3602 #include "ev_wrap.h" 4046 #include "ev_wrap.h"
3603#endif 4047#endif
3604 4048
3605#ifdef __cplusplus 4049EV_CPP(})
3606}
3607#endif
3608 4050

Diff Legend

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