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

Comparing libev/ev.c (file contents):
Revision 1.309 by root, Sun Jul 26 04:24:17 2009 UTC vs.
Revision 1.386 by root, Wed Jul 20 01:04:20 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#if defined (EV_NSIG) 215#if defined (EV_NSIG)
… …
204#elif defined (MAXSIG) 227#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 228# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 229#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 230# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 231#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 232# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 233#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 234# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 235#else
213# error "unable to find value for NSIG, please report" 236# error "unable to find value for NSIG, please report"
214/* 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! :) */
215# define EV_NSIG 65 239# define EV_NSIG 65
240#endif
241
242#ifndef EV_USE_FLOOR
243# define EV_USE_FLOOR 0
216#endif 244#endif
217 245
218#ifndef EV_USE_CLOCK_SYSCALL 246#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2 247# if __linux && __GLIBC__ >= 2
220# define EV_USE_CLOCK_SYSCALL 1 248# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
221# else 249# else
222# define EV_USE_CLOCK_SYSCALL 0 250# define EV_USE_CLOCK_SYSCALL 0
223# endif 251# endif
224#endif 252#endif
225 253
226#ifndef EV_USE_MONOTONIC 254#ifndef EV_USE_MONOTONIC
227# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 255# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
228# define EV_USE_MONOTONIC 1 256# define EV_USE_MONOTONIC EV_FEATURE_OS
229# else 257# else
230# define EV_USE_MONOTONIC 0 258# define EV_USE_MONOTONIC 0
231# endif 259# endif
232#endif 260#endif
233 261
… …
235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 263# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
236#endif 264#endif
237 265
238#ifndef EV_USE_NANOSLEEP 266#ifndef EV_USE_NANOSLEEP
239# if _POSIX_C_SOURCE >= 199309L 267# if _POSIX_C_SOURCE >= 199309L
240# define EV_USE_NANOSLEEP 1 268# define EV_USE_NANOSLEEP EV_FEATURE_OS
241# else 269# else
242# define EV_USE_NANOSLEEP 0 270# define EV_USE_NANOSLEEP 0
243# endif 271# endif
244#endif 272#endif
245 273
246#ifndef EV_USE_SELECT 274#ifndef EV_USE_SELECT
247# define EV_USE_SELECT 1 275# define EV_USE_SELECT EV_FEATURE_BACKENDS
248#endif 276#endif
249 277
250#ifndef EV_USE_POLL 278#ifndef EV_USE_POLL
251# ifdef _WIN32 279# ifdef _WIN32
252# define EV_USE_POLL 0 280# define EV_USE_POLL 0
253# else 281# else
254# define EV_USE_POLL 1 282# define EV_USE_POLL EV_FEATURE_BACKENDS
255# endif 283# endif
256#endif 284#endif
257 285
258#ifndef EV_USE_EPOLL 286#ifndef EV_USE_EPOLL
259# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 287# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
260# define EV_USE_EPOLL 1 288# define EV_USE_EPOLL EV_FEATURE_BACKENDS
261# else 289# else
262# define EV_USE_EPOLL 0 290# define EV_USE_EPOLL 0
263# endif 291# endif
264#endif 292#endif
265 293
… …
271# define EV_USE_PORT 0 299# define EV_USE_PORT 0
272#endif 300#endif
273 301
274#ifndef EV_USE_INOTIFY 302#ifndef EV_USE_INOTIFY
275# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
276# define EV_USE_INOTIFY 1 304# define EV_USE_INOTIFY EV_FEATURE_OS
277# else 305# else
278# define EV_USE_INOTIFY 0 306# define EV_USE_INOTIFY 0
279# endif 307# endif
280#endif 308#endif
281 309
282#ifndef EV_PID_HASHSIZE 310#ifndef EV_PID_HASHSIZE
283# if EV_MINIMAL 311# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
284# define EV_PID_HASHSIZE 1
285# else
286# define EV_PID_HASHSIZE 16
287# endif
288#endif 312#endif
289 313
290#ifndef EV_INOTIFY_HASHSIZE 314#ifndef EV_INOTIFY_HASHSIZE
291# if EV_MINIMAL 315# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
292# define EV_INOTIFY_HASHSIZE 1
293# else
294# define EV_INOTIFY_HASHSIZE 16
295# endif
296#endif 316#endif
297 317
298#ifndef EV_USE_EVENTFD 318#ifndef EV_USE_EVENTFD
299# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 319# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
300# define EV_USE_EVENTFD 1 320# define EV_USE_EVENTFD EV_FEATURE_OS
301# else 321# else
302# define EV_USE_EVENTFD 0 322# define EV_USE_EVENTFD 0
303# endif 323# endif
304#endif 324#endif
305 325
306#ifndef EV_USE_SIGNALFD 326#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 327# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1 328# define EV_USE_SIGNALFD EV_FEATURE_OS
309# else 329# else
310# define EV_USE_SIGNALFD 0 330# define EV_USE_SIGNALFD 0
311# endif 331# endif
312#endif 332#endif
313 333
… …
316# define EV_USE_4HEAP 1 336# define EV_USE_4HEAP 1
317# define EV_HEAP_CACHE_AT 1 337# define EV_HEAP_CACHE_AT 1
318#endif 338#endif
319 339
320#ifndef EV_VERIFY 340#ifndef EV_VERIFY
321# define EV_VERIFY !EV_MINIMAL 341# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
322#endif 342#endif
323 343
324#ifndef EV_USE_4HEAP 344#ifndef EV_USE_4HEAP
325# define EV_USE_4HEAP !EV_MINIMAL 345# define EV_USE_4HEAP EV_FEATURE_DATA
326#endif 346#endif
327 347
328#ifndef EV_HEAP_CACHE_AT 348#ifndef EV_HEAP_CACHE_AT
329# define EV_HEAP_CACHE_AT !EV_MINIMAL 349# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
330#endif 350#endif
331 351
332/* 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, */
333/* which makes programs even slower. might work on other unices, too. */ 353/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL 354#if EV_USE_CLOCK_SYSCALL
… …
343# endif 363# endif
344#endif 364#endif
345 365
346/* 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 */
347 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
348#ifndef CLOCK_MONOTONIC 374#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 375# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 376# define EV_USE_MONOTONIC 0
351#endif 377#endif
352 378
… …
359# undef EV_USE_INOTIFY 385# undef EV_USE_INOTIFY
360# define EV_USE_INOTIFY 0 386# define EV_USE_INOTIFY 0
361#endif 387#endif
362 388
363#if !EV_USE_NANOSLEEP 389#if !EV_USE_NANOSLEEP
364# ifndef _WIN32 390/* hp-ux has it in sys/time.h, which we unconditionally include above */
391# if !defined(_WIN32) && !defined(__hpux)
365# include <sys/select.h> 392# include <sys/select.h>
366# endif 393# endif
367#endif 394#endif
368 395
369#if EV_USE_INOTIFY 396#if EV_USE_INOTIFY
370# include <sys/utsname.h>
371# include <sys/statfs.h> 397# include <sys/statfs.h>
372# include <sys/inotify.h> 398# include <sys/inotify.h>
373/* 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 */
374# ifndef IN_DONT_FOLLOW 400# ifndef IN_DONT_FOLLOW
375# undef EV_USE_INOTIFY 401# undef EV_USE_INOTIFY
… …
386# include <stdint.h> 412# include <stdint.h>
387# ifndef EFD_NONBLOCK 413# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK 414# define EFD_NONBLOCK O_NONBLOCK
389# endif 415# endif
390# ifndef EFD_CLOEXEC 416# ifndef EFD_CLOEXEC
417# ifdef O_CLOEXEC
391# define EFD_CLOEXEC O_CLOEXEC 418# define EFD_CLOEXEC O_CLOEXEC
419# else
420# define EFD_CLOEXEC 02000000
421# endif
392# endif 422# endif
393# ifdef __cplusplus 423EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
394extern "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
395# endif 431# endif
396int eventfd (unsigned int initval, int flags); 432# ifndef SFD_CLOEXEC
397# ifdef __cplusplus 433# ifdef O_CLOEXEC
398} 434# define SFD_CLOEXEC O_CLOEXEC
435# else
436# define SFD_CLOEXEC 02000000
437# endif
399# endif 438# endif
400#endif 439EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
401 440
402#if EV_USE_SIGNALFD 441struct signalfd_siginfo
403# include <sys/signalfd.h> 442{
443 uint32_t ssi_signo;
444 char pad[128 - sizeof (uint32_t)];
445};
404#endif 446#endif
405 447
406/**/ 448/**/
407 449
408#if EV_VERIFY >= 3 450#if EV_VERIFY >= 3
409# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 451# define EV_FREQUENT_CHECK ev_verify (EV_A)
410#else 452#else
411# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
412#endif 454#endif
413 455
414/* 456/*
415 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
416 * It is added to ev_rt_now when scheduling periodics
417 * to ensure progress, time-wise, even when rounding
418 * errors are against us.
419 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
420 * Better solutions welcome.
421 */ 459 */
422#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 */
423 462
424#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) */
425#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) */
426/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
427 465
428#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)
429# 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)
430# 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
431#else 493#else
432# define expect(expr,value) (expr) 494 #define ecb_inline static
433# define noinline
434# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
435# define inline
436# endif 495#endif
496
497#ifndef ECB_MEMORY_FENCE
498 #if ECB_GCC_VERSION(2,5)
499 #if __x86
500 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
501 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
502 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
503 #elif __amd64
504 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
505 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory")
506 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence")
507 #endif
437#endif 508 #endif
509#endif
438 510
511#ifndef ECB_MEMORY_FENCE
512 #if ECB_GCC_VERSION(4,4)
513 #define ECB_MEMORY_FENCE __sync_synchronize ()
514 #define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); })
515 #define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); })
516 #elif defined(_WIN32) && defined(MemoryBarrier)
517 #define ECB_MEMORY_FENCE MemoryBarrier ()
518 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
519 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
520 #endif
521#endif
522
523#ifndef ECB_MEMORY_FENCE
524 #include <pthread.h>
525
526 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
527 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
528 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
529 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
530#endif
531
532#if ECB_GCC_VERSION(3,1)
533 #define ecb_attribute(attrlist) __attribute__(attrlist)
534 #define ecb_is_constant(expr) __builtin_constant_p (expr)
535 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
536 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
537#else
538 #define ecb_attribute(attrlist)
539 #define ecb_is_constant(expr) 0
540 #define ecb_expect(expr,value) (expr)
541 #define ecb_prefetch(addr,rw,locality)
542#endif
543
544#define ecb_noinline ecb_attribute ((__noinline__))
545#define ecb_noreturn ecb_attribute ((__noreturn__))
546#define ecb_unused ecb_attribute ((__unused__))
547#define ecb_const ecb_attribute ((__const__))
548#define ecb_pure ecb_attribute ((__pure__))
549
550#if ECB_GCC_VERSION(4,3)
551 #define ecb_artificial ecb_attribute ((__artificial__))
552 #define ecb_hot ecb_attribute ((__hot__))
553 #define ecb_cold ecb_attribute ((__cold__))
554#else
555 #define ecb_artificial
556 #define ecb_hot
557 #define ecb_cold
558#endif
559
560/* put around conditional expressions if you are very sure that the */
561/* expression is mostly true or mostly false. note that these return */
562/* booleans, not the expression. */
439#define expect_false(expr) expect ((expr) != 0, 0) 563#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
440#define expect_true(expr) expect ((expr) != 0, 1) 564#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
565/* ecb.h end */
566
567#define expect_false(cond) ecb_expect_false (cond)
568#define expect_true(cond) ecb_expect_true (cond)
569#define noinline ecb_noinline
570
441#define inline_size static inline 571#define inline_size ecb_inline
442 572
443#if EV_MINIMAL 573#if EV_FEATURE_CODE
574# define inline_speed ecb_inline
575#else
444# define inline_speed static noinline 576# define inline_speed static noinline
445#else
446# define inline_speed static inline
447#endif 577#endif
448 578
449#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 579#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
450 580
451#if EV_MINPRI == EV_MAXPRI 581#if EV_MINPRI == EV_MAXPRI
… …
464#define ev_active(w) ((W)(w))->active 594#define ev_active(w) ((W)(w))->active
465#define ev_at(w) ((WT)(w))->at 595#define ev_at(w) ((WT)(w))->at
466 596
467#if EV_USE_REALTIME 597#if EV_USE_REALTIME
468/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 598/* sig_atomic_t is used to avoid per-thread variables or locking but still */
469/* giving it a reasonably high chance of working on typical architetcures */ 599/* giving it a reasonably high chance of working on typical architectures */
470static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 600static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
471#endif 601#endif
472 602
473#if EV_USE_MONOTONIC 603#if EV_USE_MONOTONIC
474static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 604static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
475#endif 605#endif
476 606
607#ifndef EV_FD_TO_WIN32_HANDLE
608# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
609#endif
610#ifndef EV_WIN32_HANDLE_TO_FD
611# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
612#endif
613#ifndef EV_WIN32_CLOSE_FD
614# define EV_WIN32_CLOSE_FD(fd) close (fd)
615#endif
616
477#ifdef _WIN32 617#ifdef _WIN32
478# include "ev_win32.c" 618# include "ev_win32.c"
479#endif 619#endif
480 620
481/*****************************************************************************/ 621/*****************************************************************************/
482 622
623/* define a suitable floor function (only used by periodics atm) */
624
625#if EV_USE_FLOOR
626# include <math.h>
627# define ev_floor(v) floor (v)
628#else
629
630#include <float.h>
631
632/* a floor() replacement function, should be independent of ev_tstamp type */
633static ev_tstamp noinline
634ev_floor (ev_tstamp v)
635{
636 /* the choice of shift factor is not terribly important */
637#if FLT_RADIX != 2 /* assume FLT_RADIX == 10 */
638 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 10000000000000000000. : 1000000000.;
639#else
640 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 18446744073709551616. : 4294967296.;
641#endif
642
643 /* argument too large for an unsigned long? */
644 if (expect_false (v >= shift))
645 {
646 ev_tstamp f;
647
648 if (v == v - 1.)
649 return v; /* very large number */
650
651 f = shift * ev_floor (v * (1. / shift));
652 return f + ev_floor (v - f);
653 }
654
655 /* special treatment for negative args? */
656 if (expect_false (v < 0.))
657 {
658 ev_tstamp f = -ev_floor (-v);
659
660 return f - (f == v ? 0 : 1);
661 }
662
663 /* fits into an unsigned long */
664 return (unsigned long)v;
665}
666
667#endif
668
669/*****************************************************************************/
670
671#ifdef __linux
672# include <sys/utsname.h>
673#endif
674
675static unsigned int noinline ecb_cold
676ev_linux_version (void)
677{
678#ifdef __linux
679 unsigned int v = 0;
680 struct utsname buf;
681 int i;
682 char *p = buf.release;
683
684 if (uname (&buf))
685 return 0;
686
687 for (i = 3+1; --i; )
688 {
689 unsigned int c = 0;
690
691 for (;;)
692 {
693 if (*p >= '0' && *p <= '9')
694 c = c * 10 + *p++ - '0';
695 else
696 {
697 p += *p == '.';
698 break;
699 }
700 }
701
702 v = (v << 8) | c;
703 }
704
705 return v;
706#else
707 return 0;
708#endif
709}
710
711/*****************************************************************************/
712
713#if EV_AVOID_STDIO
714static void noinline ecb_cold
715ev_printerr (const char *msg)
716{
717 write (STDERR_FILENO, msg, strlen (msg));
718}
719#endif
720
483static void (*syserr_cb)(const char *msg); 721static void (*syserr_cb)(const char *msg);
484 722
485void 723void ecb_cold
486ev_set_syserr_cb (void (*cb)(const char *msg)) 724ev_set_syserr_cb (void (*cb)(const char *msg))
487{ 725{
488 syserr_cb = cb; 726 syserr_cb = cb;
489} 727}
490 728
491static void noinline 729static void noinline ecb_cold
492ev_syserr (const char *msg) 730ev_syserr (const char *msg)
493{ 731{
494 if (!msg) 732 if (!msg)
495 msg = "(libev) system error"; 733 msg = "(libev) system error";
496 734
497 if (syserr_cb) 735 if (syserr_cb)
498 syserr_cb (msg); 736 syserr_cb (msg);
499 else 737 else
500 { 738 {
739#if EV_AVOID_STDIO
740 ev_printerr (msg);
741 ev_printerr (": ");
742 ev_printerr (strerror (errno));
743 ev_printerr ("\n");
744#else
501 perror (msg); 745 perror (msg);
746#endif
502 abort (); 747 abort ();
503 } 748 }
504} 749}
505 750
506static void * 751static void *
507ev_realloc_emul (void *ptr, long size) 752ev_realloc_emul (void *ptr, long size)
508{ 753{
754#if __GLIBC__
755 return realloc (ptr, size);
756#else
509 /* some systems, notably openbsd and darwin, fail to properly 757 /* some systems, notably openbsd and darwin, fail to properly
510 * implement realloc (x, 0) (as required by both ansi c-98 and 758 * implement realloc (x, 0) (as required by both ansi c-89 and
511 * the single unix specification, so work around them here. 759 * the single unix specification, so work around them here.
512 */ 760 */
513 761
514 if (size) 762 if (size)
515 return realloc (ptr, size); 763 return realloc (ptr, size);
516 764
517 free (ptr); 765 free (ptr);
518 return 0; 766 return 0;
767#endif
519} 768}
520 769
521static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 770static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
522 771
523void 772void ecb_cold
524ev_set_allocator (void *(*cb)(void *ptr, long size)) 773ev_set_allocator (void *(*cb)(void *ptr, long size))
525{ 774{
526 alloc = cb; 775 alloc = cb;
527} 776}
528 777
… …
531{ 780{
532 ptr = alloc (ptr, size); 781 ptr = alloc (ptr, size);
533 782
534 if (!ptr && size) 783 if (!ptr && size)
535 { 784 {
785#if EV_AVOID_STDIO
786 ev_printerr ("(libev) memory allocation failed, aborting.\n");
787#else
536 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 788 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
789#endif
537 abort (); 790 abort ();
538 } 791 }
539 792
540 return ptr; 793 return ptr;
541} 794}
… …
557 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 810 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
558 unsigned char unused; 811 unsigned char unused;
559#if EV_USE_EPOLL 812#if EV_USE_EPOLL
560 unsigned int egen; /* generation counter to counter epoll bugs */ 813 unsigned int egen; /* generation counter to counter epoll bugs */
561#endif 814#endif
562#if EV_SELECT_IS_WINSOCKET 815#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
563 SOCKET handle; 816 SOCKET handle;
817#endif
818#if EV_USE_IOCP
819 OVERLAPPED or, ow;
564#endif 820#endif
565} ANFD; 821} ANFD;
566 822
567/* stores the pending event set for a given watcher */ 823/* stores the pending event set for a given watcher */
568typedef struct 824typedef struct
… …
623 879
624 static int ev_default_loop_ptr; 880 static int ev_default_loop_ptr;
625 881
626#endif 882#endif
627 883
628#if EV_MINIMAL < 2 884#if EV_FEATURE_API
629# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 885# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
630# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 886# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
631# define EV_INVOKE_PENDING invoke_cb (EV_A) 887# define EV_INVOKE_PENDING invoke_cb (EV_A)
632#else 888#else
633# define EV_RELEASE_CB (void)0 889# define EV_RELEASE_CB (void)0
634# define EV_ACQUIRE_CB (void)0 890# define EV_ACQUIRE_CB (void)0
635# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 891# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
636#endif 892#endif
637 893
638#define EVUNLOOP_RECURSE 0x80 894#define EVBREAK_RECURSE 0x80
639 895
640/*****************************************************************************/ 896/*****************************************************************************/
641 897
642#ifndef EV_HAVE_EV_TIME 898#ifndef EV_HAVE_EV_TIME
643ev_tstamp 899ev_tstamp
… …
687 if (delay > 0.) 943 if (delay > 0.)
688 { 944 {
689#if EV_USE_NANOSLEEP 945#if EV_USE_NANOSLEEP
690 struct timespec ts; 946 struct timespec ts;
691 947
692 ts.tv_sec = (time_t)delay; 948 EV_TS_SET (ts, delay);
693 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
694
695 nanosleep (&ts, 0); 949 nanosleep (&ts, 0);
696#elif defined(_WIN32) 950#elif defined(_WIN32)
697 Sleep ((unsigned long)(delay * 1e3)); 951 Sleep ((unsigned long)(delay * 1e3));
698#else 952#else
699 struct timeval tv; 953 struct timeval tv;
700 954
701 tv.tv_sec = (time_t)delay;
702 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
703
704 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 955 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
705 /* something not guaranteed by newer posix versions, but guaranteed */ 956 /* something not guaranteed by newer posix versions, but guaranteed */
706 /* by older ones */ 957 /* by older ones */
958 EV_TV_SET (tv, delay);
707 select (0, 0, 0, 0, &tv); 959 select (0, 0, 0, 0, &tv);
708#endif 960#endif
709 } 961 }
710} 962}
711 963
712/*****************************************************************************/ 964/*****************************************************************************/
713 965
714#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 966#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
715 967
716/* find a suitable new size for the given array, */ 968/* find a suitable new size for the given array, */
717/* hopefully by rounding to a ncie-to-malloc size */ 969/* hopefully by rounding to a nice-to-malloc size */
718inline_size int 970inline_size int
719array_nextsize (int elem, int cur, int cnt) 971array_nextsize (int elem, int cur, int cnt)
720{ 972{
721 int ncur = cur + 1; 973 int ncur = cur + 1;
722 974
… …
734 } 986 }
735 987
736 return ncur; 988 return ncur;
737} 989}
738 990
739static noinline void * 991static void * noinline ecb_cold
740array_realloc (int elem, void *base, int *cur, int cnt) 992array_realloc (int elem, void *base, int *cur, int cnt)
741{ 993{
742 *cur = array_nextsize (elem, *cur, cnt); 994 *cur = array_nextsize (elem, *cur, cnt);
743 return ev_realloc (base, elem * *cur); 995 return ev_realloc (base, elem * *cur);
744} 996}
… …
747 memset ((void *)(base), 0, sizeof (*(base)) * (count)) 999 memset ((void *)(base), 0, sizeof (*(base)) * (count))
748 1000
749#define array_needsize(type,base,cur,cnt,init) \ 1001#define array_needsize(type,base,cur,cnt,init) \
750 if (expect_false ((cnt) > (cur))) \ 1002 if (expect_false ((cnt) > (cur))) \
751 { \ 1003 { \
752 int ocur_ = (cur); \ 1004 int ecb_unused ocur_ = (cur); \
753 (base) = (type *)array_realloc \ 1005 (base) = (type *)array_realloc \
754 (sizeof (type), (base), &(cur), (cnt)); \ 1006 (sizeof (type), (base), &(cur), (cnt)); \
755 init ((base) + (ocur_), (cur) - ocur_); \ 1007 init ((base) + (ocur_), (cur) - ocur_); \
756 } 1008 }
757 1009
… …
818} 1070}
819 1071
820/*****************************************************************************/ 1072/*****************************************************************************/
821 1073
822inline_speed void 1074inline_speed void
823fd_event_nc (EV_P_ int fd, int revents) 1075fd_event_nocheck (EV_P_ int fd, int revents)
824{ 1076{
825 ANFD *anfd = anfds + fd; 1077 ANFD *anfd = anfds + fd;
826 ev_io *w; 1078 ev_io *w;
827 1079
828 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1080 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
840fd_event (EV_P_ int fd, int revents) 1092fd_event (EV_P_ int fd, int revents)
841{ 1093{
842 ANFD *anfd = anfds + fd; 1094 ANFD *anfd = anfds + fd;
843 1095
844 if (expect_true (!anfd->reify)) 1096 if (expect_true (!anfd->reify))
845 fd_event_nc (EV_A_ fd, revents); 1097 fd_event_nocheck (EV_A_ fd, revents);
846} 1098}
847 1099
848void 1100void
849ev_feed_fd_event (EV_P_ int fd, int revents) 1101ev_feed_fd_event (EV_P_ int fd, int revents)
850{ 1102{
851 if (fd >= 0 && fd < anfdmax) 1103 if (fd >= 0 && fd < anfdmax)
852 fd_event_nc (EV_A_ fd, revents); 1104 fd_event_nocheck (EV_A_ fd, revents);
853} 1105}
854 1106
855/* make sure the external fd watch events are in-sync */ 1107/* make sure the external fd watch events are in-sync */
856/* with the kernel/libev internal state */ 1108/* with the kernel/libev internal state */
857inline_size void 1109inline_size void
858fd_reify (EV_P) 1110fd_reify (EV_P)
859{ 1111{
860 int i; 1112 int i;
861 1113
1114#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1115 for (i = 0; i < fdchangecnt; ++i)
1116 {
1117 int fd = fdchanges [i];
1118 ANFD *anfd = anfds + fd;
1119
1120 if (anfd->reify & EV__IOFDSET && anfd->head)
1121 {
1122 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1123
1124 if (handle != anfd->handle)
1125 {
1126 unsigned long arg;
1127
1128 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1129
1130 /* handle changed, but fd didn't - we need to do it in two steps */
1131 backend_modify (EV_A_ fd, anfd->events, 0);
1132 anfd->events = 0;
1133 anfd->handle = handle;
1134 }
1135 }
1136 }
1137#endif
1138
862 for (i = 0; i < fdchangecnt; ++i) 1139 for (i = 0; i < fdchangecnt; ++i)
863 { 1140 {
864 int fd = fdchanges [i]; 1141 int fd = fdchanges [i];
865 ANFD *anfd = anfds + fd; 1142 ANFD *anfd = anfds + fd;
866 ev_io *w; 1143 ev_io *w;
867 1144
868 unsigned char events = 0; 1145 unsigned char o_events = anfd->events;
1146 unsigned char o_reify = anfd->reify;
869 1147
870 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1148 anfd->reify = 0;
871 events |= (unsigned char)w->events;
872 1149
873#if EV_SELECT_IS_WINSOCKET 1150 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
874 if (events)
875 { 1151 {
876 unsigned long arg; 1152 anfd->events = 0;
877 #ifdef EV_FD_TO_WIN32_HANDLE 1153
878 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 1154 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
879 #else 1155 anfd->events |= (unsigned char)w->events;
880 anfd->handle = _get_osfhandle (fd); 1156
881 #endif 1157 if (o_events != anfd->events)
882 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 1158 o_reify = EV__IOFDSET; /* actually |= */
883 } 1159 }
884#endif
885 1160
886 { 1161 if (o_reify & EV__IOFDSET)
887 unsigned char o_events = anfd->events;
888 unsigned char o_reify = anfd->reify;
889
890 anfd->reify = 0;
891 anfd->events = events;
892
893 if (o_events != events || o_reify & EV__IOFDSET)
894 backend_modify (EV_A_ fd, o_events, events); 1162 backend_modify (EV_A_ fd, o_events, anfd->events);
895 }
896 } 1163 }
897 1164
898 fdchangecnt = 0; 1165 fdchangecnt = 0;
899} 1166}
900 1167
… …
912 fdchanges [fdchangecnt - 1] = fd; 1179 fdchanges [fdchangecnt - 1] = fd;
913 } 1180 }
914} 1181}
915 1182
916/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */ 1183/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
917inline_speed void 1184inline_speed void ecb_cold
918fd_kill (EV_P_ int fd) 1185fd_kill (EV_P_ int fd)
919{ 1186{
920 ev_io *w; 1187 ev_io *w;
921 1188
922 while ((w = (ev_io *)anfds [fd].head)) 1189 while ((w = (ev_io *)anfds [fd].head))
… …
924 ev_io_stop (EV_A_ w); 1191 ev_io_stop (EV_A_ w);
925 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1192 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
926 } 1193 }
927} 1194}
928 1195
929/* check whether the given fd is atcually valid, for error recovery */ 1196/* check whether the given fd is actually valid, for error recovery */
930inline_size int 1197inline_size int ecb_cold
931fd_valid (int fd) 1198fd_valid (int fd)
932{ 1199{
933#ifdef _WIN32 1200#ifdef _WIN32
934 return _get_osfhandle (fd) != -1; 1201 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
935#else 1202#else
936 return fcntl (fd, F_GETFD) != -1; 1203 return fcntl (fd, F_GETFD) != -1;
937#endif 1204#endif
938} 1205}
939 1206
940/* called on EBADF to verify fds */ 1207/* called on EBADF to verify fds */
941static void noinline 1208static void noinline ecb_cold
942fd_ebadf (EV_P) 1209fd_ebadf (EV_P)
943{ 1210{
944 int fd; 1211 int fd;
945 1212
946 for (fd = 0; fd < anfdmax; ++fd) 1213 for (fd = 0; fd < anfdmax; ++fd)
… …
948 if (!fd_valid (fd) && errno == EBADF) 1215 if (!fd_valid (fd) && errno == EBADF)
949 fd_kill (EV_A_ fd); 1216 fd_kill (EV_A_ fd);
950} 1217}
951 1218
952/* called on ENOMEM in select/poll to kill some fds and retry */ 1219/* called on ENOMEM in select/poll to kill some fds and retry */
953static void noinline 1220static void noinline ecb_cold
954fd_enomem (EV_P) 1221fd_enomem (EV_P)
955{ 1222{
956 int fd; 1223 int fd;
957 1224
958 for (fd = anfdmax; fd--; ) 1225 for (fd = anfdmax; fd--; )
… …
976 anfds [fd].emask = 0; 1243 anfds [fd].emask = 0;
977 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1244 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
978 } 1245 }
979} 1246}
980 1247
1248/* used to prepare libev internal fd's */
1249/* this is not fork-safe */
1250inline_speed void
1251fd_intern (int fd)
1252{
1253#ifdef _WIN32
1254 unsigned long arg = 1;
1255 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1256#else
1257 fcntl (fd, F_SETFD, FD_CLOEXEC);
1258 fcntl (fd, F_SETFL, O_NONBLOCK);
1259#endif
1260}
1261
981/*****************************************************************************/ 1262/*****************************************************************************/
982 1263
983/* 1264/*
984 * the heap functions want a real array index. array index 0 uis guaranteed to not 1265 * the heap functions want a real array index. array index 0 is guaranteed to not
985 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1266 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
986 * the branching factor of the d-tree. 1267 * the branching factor of the d-tree.
987 */ 1268 */
988 1269
989/* 1270/*
… …
1103 1384
1104/* move an element suitably so it is in a correct place */ 1385/* move an element suitably so it is in a correct place */
1105inline_size void 1386inline_size void
1106adjustheap (ANHE *heap, int N, int k) 1387adjustheap (ANHE *heap, int N, int k)
1107{ 1388{
1108 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1389 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1109 upheap (heap, k); 1390 upheap (heap, k);
1110 else 1391 else
1111 downheap (heap, N, k); 1392 downheap (heap, N, k);
1112} 1393}
1113 1394
… …
1137 1418
1138static ANSIG signals [EV_NSIG - 1]; 1419static ANSIG signals [EV_NSIG - 1];
1139 1420
1140/*****************************************************************************/ 1421/*****************************************************************************/
1141 1422
1142/* used to prepare libev internal fd's */ 1423#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1143/* this is not fork-safe */
1144inline_speed void
1145fd_intern (int fd)
1146{
1147#ifdef _WIN32
1148 unsigned long arg = 1;
1149 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1150#else
1151 fcntl (fd, F_SETFD, FD_CLOEXEC);
1152 fcntl (fd, F_SETFL, O_NONBLOCK);
1153#endif
1154}
1155 1424
1156static void noinline 1425static void noinline ecb_cold
1157evpipe_init (EV_P) 1426evpipe_init (EV_P)
1158{ 1427{
1159 if (!ev_is_active (&pipe_w)) 1428 if (!ev_is_active (&pipe_w))
1160 { 1429 {
1161#if EV_USE_EVENTFD 1430# if EV_USE_EVENTFD
1162 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1431 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1163 if (evfd < 0 && errno == EINVAL) 1432 if (evfd < 0 && errno == EINVAL)
1164 evfd = eventfd (0, 0); 1433 evfd = eventfd (0, 0);
1165 1434
1166 if (evfd >= 0) 1435 if (evfd >= 0)
… …
1168 evpipe [0] = -1; 1437 evpipe [0] = -1;
1169 fd_intern (evfd); /* doing it twice doesn't hurt */ 1438 fd_intern (evfd); /* doing it twice doesn't hurt */
1170 ev_io_set (&pipe_w, evfd, EV_READ); 1439 ev_io_set (&pipe_w, evfd, EV_READ);
1171 } 1440 }
1172 else 1441 else
1173#endif 1442# endif
1174 { 1443 {
1175 while (pipe (evpipe)) 1444 while (pipe (evpipe))
1176 ev_syserr ("(libev) error creating signal/async pipe"); 1445 ev_syserr ("(libev) error creating signal/async pipe");
1177 1446
1178 fd_intern (evpipe [0]); 1447 fd_intern (evpipe [0]);
… …
1183 ev_io_start (EV_A_ &pipe_w); 1452 ev_io_start (EV_A_ &pipe_w);
1184 ev_unref (EV_A); /* watcher should not keep loop alive */ 1453 ev_unref (EV_A); /* watcher should not keep loop alive */
1185 } 1454 }
1186} 1455}
1187 1456
1188inline_size void 1457inline_speed void
1189evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1458evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1190{ 1459{
1191 if (!*flag) 1460 if (expect_true (*flag))
1461 /*return*//*D*/;
1462
1463 *flag = 1;
1464
1465 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1466
1467 pipe_write_skipped = 1;
1468
1469 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1470
1471 if (pipe_write_wanted)
1192 { 1472 {
1473 int old_errno;
1474
1475 pipe_write_skipped = 0; /* just an optimsiation, no fence needed */
1476
1193 int old_errno = errno; /* save errno because write might clobber it */ 1477 old_errno = errno; /* save errno because write will clobber it */
1194
1195 *flag = 1;
1196 1478
1197#if EV_USE_EVENTFD 1479#if EV_USE_EVENTFD
1198 if (evfd >= 0) 1480 if (evfd >= 0)
1199 { 1481 {
1200 uint64_t counter = 1; 1482 uint64_t counter = 1;
1201 write (evfd, &counter, sizeof (uint64_t)); 1483 write (evfd, &counter, sizeof (uint64_t));
1202 } 1484 }
1203 else 1485 else
1204#endif 1486#endif
1487 {
1488 /* win32 people keep sending patches that change this write() to send() */
1489 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1490 /* so when you think this write should be a send instead, please find out */
1491 /* where your send() is from - it's definitely not the microsoft send, and */
1492 /* tell me. thank you. */
1205 write (evpipe [1], &old_errno, 1); 1493 write (evpipe [1], &(evpipe [1]), 1);
1494 }
1206 1495
1207 errno = old_errno; 1496 errno = old_errno;
1208 } 1497 }
1209} 1498}
1210 1499
… …
1213static void 1502static void
1214pipecb (EV_P_ ev_io *iow, int revents) 1503pipecb (EV_P_ ev_io *iow, int revents)
1215{ 1504{
1216 int i; 1505 int i;
1217 1506
1507 if (revents & EV_READ)
1508 {
1218#if EV_USE_EVENTFD 1509#if EV_USE_EVENTFD
1219 if (evfd >= 0) 1510 if (evfd >= 0)
1220 { 1511 {
1221 uint64_t counter; 1512 uint64_t counter;
1222 read (evfd, &counter, sizeof (uint64_t)); 1513 read (evfd, &counter, sizeof (uint64_t));
1223 } 1514 }
1224 else 1515 else
1225#endif 1516#endif
1226 { 1517 {
1227 char dummy; 1518 char dummy;
1519 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1228 read (evpipe [0], &dummy, 1); 1520 read (evpipe [0], &dummy, 1);
1521 }
1229 } 1522 }
1230 1523
1524 pipe_write_skipped = 0;
1525
1526#if EV_SIGNAL_ENABLE
1231 if (sig_pending) 1527 if (sig_pending)
1232 { 1528 {
1233 sig_pending = 0; 1529 sig_pending = 0;
1234 1530
1235 for (i = EV_NSIG - 1; i--; ) 1531 for (i = EV_NSIG - 1; i--; )
1236 if (expect_false (signals [i].pending)) 1532 if (expect_false (signals [i].pending))
1237 ev_feed_signal_event (EV_A_ i + 1); 1533 ev_feed_signal_event (EV_A_ i + 1);
1238 } 1534 }
1535#endif
1239 1536
1240#if EV_ASYNC_ENABLE 1537#if EV_ASYNC_ENABLE
1241 if (async_pending) 1538 if (async_pending)
1242 { 1539 {
1243 async_pending = 0; 1540 async_pending = 0;
… …
1252#endif 1549#endif
1253} 1550}
1254 1551
1255/*****************************************************************************/ 1552/*****************************************************************************/
1256 1553
1554void
1555ev_feed_signal (int signum)
1556{
1557#if EV_MULTIPLICITY
1558 EV_P = signals [signum - 1].loop;
1559
1560 if (!EV_A)
1561 return;
1562#endif
1563
1564 if (!ev_active (&pipe_w))
1565 return;
1566
1567 signals [signum - 1].pending = 1;
1568 evpipe_write (EV_A_ &sig_pending);
1569}
1570
1257static void 1571static void
1258ev_sighandler (int signum) 1572ev_sighandler (int signum)
1259{ 1573{
1260#if EV_MULTIPLICITY
1261 EV_P = signals [signum - 1].loop;
1262#endif
1263
1264#if _WIN32 1574#ifdef _WIN32
1265 signal (signum, ev_sighandler); 1575 signal (signum, ev_sighandler);
1266#endif 1576#endif
1267 1577
1268 signals [signum - 1].pending = 1; 1578 ev_feed_signal (signum);
1269 evpipe_write (EV_A_ &sig_pending);
1270} 1579}
1271 1580
1272void noinline 1581void noinline
1273ev_feed_signal_event (EV_P_ int signum) 1582ev_feed_signal_event (EV_P_ int signum)
1274{ 1583{
… …
1311 break; 1620 break;
1312 } 1621 }
1313} 1622}
1314#endif 1623#endif
1315 1624
1625#endif
1626
1316/*****************************************************************************/ 1627/*****************************************************************************/
1317 1628
1629#if EV_CHILD_ENABLE
1318static WL childs [EV_PID_HASHSIZE]; 1630static WL childs [EV_PID_HASHSIZE];
1319
1320#ifndef _WIN32
1321 1631
1322static ev_signal childev; 1632static ev_signal childev;
1323 1633
1324#ifndef WIFCONTINUED 1634#ifndef WIFCONTINUED
1325# define WIFCONTINUED(status) 0 1635# define WIFCONTINUED(status) 0
… …
1330child_reap (EV_P_ int chain, int pid, int status) 1640child_reap (EV_P_ int chain, int pid, int status)
1331{ 1641{
1332 ev_child *w; 1642 ev_child *w;
1333 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1643 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1334 1644
1335 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1645 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1336 { 1646 {
1337 if ((w->pid == pid || !w->pid) 1647 if ((w->pid == pid || !w->pid)
1338 && (!traced || (w->flags & 1))) 1648 && (!traced || (w->flags & 1)))
1339 { 1649 {
1340 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1650 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1365 /* make sure we are called again until all children have been reaped */ 1675 /* make sure we are called again until all children have been reaped */
1366 /* we need to do it this way so that the callback gets called before we continue */ 1676 /* we need to do it this way so that the callback gets called before we continue */
1367 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1677 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1368 1678
1369 child_reap (EV_A_ pid, pid, status); 1679 child_reap (EV_A_ pid, pid, status);
1370 if (EV_PID_HASHSIZE > 1) 1680 if ((EV_PID_HASHSIZE) > 1)
1371 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1681 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1372} 1682}
1373 1683
1374#endif 1684#endif
1375 1685
1376/*****************************************************************************/ 1686/*****************************************************************************/
1377 1687
1688#if EV_USE_IOCP
1689# include "ev_iocp.c"
1690#endif
1378#if EV_USE_PORT 1691#if EV_USE_PORT
1379# include "ev_port.c" 1692# include "ev_port.c"
1380#endif 1693#endif
1381#if EV_USE_KQUEUE 1694#if EV_USE_KQUEUE
1382# include "ev_kqueue.c" 1695# include "ev_kqueue.c"
… …
1389#endif 1702#endif
1390#if EV_USE_SELECT 1703#if EV_USE_SELECT
1391# include "ev_select.c" 1704# include "ev_select.c"
1392#endif 1705#endif
1393 1706
1394int 1707int ecb_cold
1395ev_version_major (void) 1708ev_version_major (void)
1396{ 1709{
1397 return EV_VERSION_MAJOR; 1710 return EV_VERSION_MAJOR;
1398} 1711}
1399 1712
1400int 1713int ecb_cold
1401ev_version_minor (void) 1714ev_version_minor (void)
1402{ 1715{
1403 return EV_VERSION_MINOR; 1716 return EV_VERSION_MINOR;
1404} 1717}
1405 1718
1406/* return true if we are running with elevated privileges and should ignore env variables */ 1719/* return true if we are running with elevated privileges and should ignore env variables */
1407int inline_size 1720int inline_size ecb_cold
1408enable_secure (void) 1721enable_secure (void)
1409{ 1722{
1410#ifdef _WIN32 1723#ifdef _WIN32
1411 return 0; 1724 return 0;
1412#else 1725#else
1413 return getuid () != geteuid () 1726 return getuid () != geteuid ()
1414 || getgid () != getegid (); 1727 || getgid () != getegid ();
1415#endif 1728#endif
1416} 1729}
1417 1730
1418unsigned int 1731unsigned int ecb_cold
1419ev_supported_backends (void) 1732ev_supported_backends (void)
1420{ 1733{
1421 unsigned int flags = 0; 1734 unsigned int flags = 0;
1422 1735
1423 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 1736 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
… …
1427 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 1740 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1428 1741
1429 return flags; 1742 return flags;
1430} 1743}
1431 1744
1432unsigned int 1745unsigned int ecb_cold
1433ev_recommended_backends (void) 1746ev_recommended_backends (void)
1434{ 1747{
1435 unsigned int flags = ev_supported_backends (); 1748 unsigned int flags = ev_supported_backends ();
1436 1749
1437#ifndef __NetBSD__ 1750#ifndef __NetBSD__
… …
1442#ifdef __APPLE__ 1755#ifdef __APPLE__
1443 /* only select works correctly on that "unix-certified" platform */ 1756 /* only select works correctly on that "unix-certified" platform */
1444 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1757 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1445 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1758 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1446#endif 1759#endif
1760#ifdef __FreeBSD__
1761 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1762#endif
1447 1763
1448 return flags; 1764 return flags;
1449} 1765}
1450 1766
1451unsigned int 1767unsigned int ecb_cold
1452ev_embeddable_backends (void) 1768ev_embeddable_backends (void)
1453{ 1769{
1454 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1770 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1455 1771
1456 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1772 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1457 /* please fix it and tell me how to detect the fix */ 1773 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1458 flags &= ~EVBACKEND_EPOLL; 1774 flags &= ~EVBACKEND_EPOLL;
1459 1775
1460 return flags; 1776 return flags;
1461} 1777}
1462 1778
1463unsigned int 1779unsigned int
1464ev_backend (EV_P) 1780ev_backend (EV_P)
1465{ 1781{
1466 return backend; 1782 return backend;
1467} 1783}
1468 1784
1469#if EV_MINIMAL < 2 1785#if EV_FEATURE_API
1470unsigned int 1786unsigned int
1471ev_loop_count (EV_P) 1787ev_iteration (EV_P)
1472{ 1788{
1473 return loop_count; 1789 return loop_count;
1474} 1790}
1475 1791
1476unsigned int 1792unsigned int
1477ev_loop_depth (EV_P) 1793ev_depth (EV_P)
1478{ 1794{
1479 return loop_depth; 1795 return loop_depth;
1480} 1796}
1481 1797
1482void 1798void
… …
1501ev_userdata (EV_P) 1817ev_userdata (EV_P)
1502{ 1818{
1503 return userdata; 1819 return userdata;
1504} 1820}
1505 1821
1822void
1506void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1823ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1507{ 1824{
1508 invoke_cb = invoke_pending_cb; 1825 invoke_cb = invoke_pending_cb;
1509} 1826}
1510 1827
1828void
1511void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 1829ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1512{ 1830{
1513 release_cb = release; 1831 release_cb = release;
1514 acquire_cb = acquire; 1832 acquire_cb = acquire;
1515} 1833}
1516#endif 1834#endif
1517 1835
1518/* initialise a loop structure, must be zero-initialised */ 1836/* initialise a loop structure, must be zero-initialised */
1519static void noinline 1837static void noinline ecb_cold
1520loop_init (EV_P_ unsigned int flags) 1838loop_init (EV_P_ unsigned int flags)
1521{ 1839{
1522 if (!backend) 1840 if (!backend)
1523 { 1841 {
1842 origflags = flags;
1843
1524#if EV_USE_REALTIME 1844#if EV_USE_REALTIME
1525 if (!have_realtime) 1845 if (!have_realtime)
1526 { 1846 {
1527 struct timespec ts; 1847 struct timespec ts;
1528 1848
… …
1550 if (!(flags & EVFLAG_NOENV) 1870 if (!(flags & EVFLAG_NOENV)
1551 && !enable_secure () 1871 && !enable_secure ()
1552 && getenv ("LIBEV_FLAGS")) 1872 && getenv ("LIBEV_FLAGS"))
1553 flags = atoi (getenv ("LIBEV_FLAGS")); 1873 flags = atoi (getenv ("LIBEV_FLAGS"));
1554 1874
1555 ev_rt_now = ev_time (); 1875 ev_rt_now = ev_time ();
1556 mn_now = get_clock (); 1876 mn_now = get_clock ();
1557 now_floor = mn_now; 1877 now_floor = mn_now;
1558 rtmn_diff = ev_rt_now - mn_now; 1878 rtmn_diff = ev_rt_now - mn_now;
1559#if EV_MINIMAL < 2 1879#if EV_FEATURE_API
1560 invoke_cb = ev_invoke_pending; 1880 invoke_cb = ev_invoke_pending;
1561#endif 1881#endif
1562 1882
1563 io_blocktime = 0.; 1883 io_blocktime = 0.;
1564 timeout_blocktime = 0.; 1884 timeout_blocktime = 0.;
1565 backend = 0; 1885 backend = 0;
1566 backend_fd = -1; 1886 backend_fd = -1;
1567 sig_pending = 0; 1887 sig_pending = 0;
1568#if EV_ASYNC_ENABLE 1888#if EV_ASYNC_ENABLE
1569 async_pending = 0; 1889 async_pending = 0;
1570#endif 1890#endif
1891 pipe_write_skipped = 0;
1892 pipe_write_wanted = 0;
1571#if EV_USE_INOTIFY 1893#if EV_USE_INOTIFY
1572 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1894 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1573#endif 1895#endif
1574#if EV_USE_SIGNALFD 1896#if EV_USE_SIGNALFD
1575 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1897 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1576#endif 1898#endif
1577 1899
1578 if (!(flags & 0x0000ffffU)) 1900 if (!(flags & EVBACKEND_MASK))
1579 flags |= ev_recommended_backends (); 1901 flags |= ev_recommended_backends ();
1580 1902
1903#if EV_USE_IOCP
1904 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1905#endif
1581#if EV_USE_PORT 1906#if EV_USE_PORT
1582 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1907 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1583#endif 1908#endif
1584#if EV_USE_KQUEUE 1909#if EV_USE_KQUEUE
1585 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1910 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1594 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1919 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1595#endif 1920#endif
1596 1921
1597 ev_prepare_init (&pending_w, pendingcb); 1922 ev_prepare_init (&pending_w, pendingcb);
1598 1923
1924#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1599 ev_init (&pipe_w, pipecb); 1925 ev_init (&pipe_w, pipecb);
1600 ev_set_priority (&pipe_w, EV_MAXPRI); 1926 ev_set_priority (&pipe_w, EV_MAXPRI);
1927#endif
1601 } 1928 }
1602} 1929}
1603 1930
1604/* free up a loop structure */ 1931/* free up a loop structure */
1605static void noinline 1932void ecb_cold
1606loop_destroy (EV_P) 1933ev_loop_destroy (EV_P)
1607{ 1934{
1608 int i; 1935 int i;
1936
1937#if EV_MULTIPLICITY
1938 /* mimic free (0) */
1939 if (!EV_A)
1940 return;
1941#endif
1942
1943#if EV_CLEANUP_ENABLE
1944 /* queue cleanup watchers (and execute them) */
1945 if (expect_false (cleanupcnt))
1946 {
1947 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1948 EV_INVOKE_PENDING;
1949 }
1950#endif
1951
1952#if EV_CHILD_ENABLE
1953 if (ev_is_active (&childev))
1954 {
1955 ev_ref (EV_A); /* child watcher */
1956 ev_signal_stop (EV_A_ &childev);
1957 }
1958#endif
1609 1959
1610 if (ev_is_active (&pipe_w)) 1960 if (ev_is_active (&pipe_w))
1611 { 1961 {
1612 /*ev_ref (EV_A);*/ 1962 /*ev_ref (EV_A);*/
1613 /*ev_io_stop (EV_A_ &pipe_w);*/ 1963 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1617 close (evfd); 1967 close (evfd);
1618#endif 1968#endif
1619 1969
1620 if (evpipe [0] >= 0) 1970 if (evpipe [0] >= 0)
1621 { 1971 {
1622 close (evpipe [0]); 1972 EV_WIN32_CLOSE_FD (evpipe [0]);
1623 close (evpipe [1]); 1973 EV_WIN32_CLOSE_FD (evpipe [1]);
1624 } 1974 }
1625 } 1975 }
1626 1976
1627#if EV_USE_SIGNALFD 1977#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w)) 1978 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd); 1979 close (sigfd);
1634 }
1635#endif 1980#endif
1636 1981
1637#if EV_USE_INOTIFY 1982#if EV_USE_INOTIFY
1638 if (fs_fd >= 0) 1983 if (fs_fd >= 0)
1639 close (fs_fd); 1984 close (fs_fd);
1640#endif 1985#endif
1641 1986
1642 if (backend_fd >= 0) 1987 if (backend_fd >= 0)
1643 close (backend_fd); 1988 close (backend_fd);
1644 1989
1990#if EV_USE_IOCP
1991 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1992#endif
1645#if EV_USE_PORT 1993#if EV_USE_PORT
1646 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1994 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1647#endif 1995#endif
1648#if EV_USE_KQUEUE 1996#if EV_USE_KQUEUE
1649 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1997 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1676 array_free (periodic, EMPTY); 2024 array_free (periodic, EMPTY);
1677#endif 2025#endif
1678#if EV_FORK_ENABLE 2026#if EV_FORK_ENABLE
1679 array_free (fork, EMPTY); 2027 array_free (fork, EMPTY);
1680#endif 2028#endif
2029#if EV_CLEANUP_ENABLE
2030 array_free (cleanup, EMPTY);
2031#endif
1681 array_free (prepare, EMPTY); 2032 array_free (prepare, EMPTY);
1682 array_free (check, EMPTY); 2033 array_free (check, EMPTY);
1683#if EV_ASYNC_ENABLE 2034#if EV_ASYNC_ENABLE
1684 array_free (async, EMPTY); 2035 array_free (async, EMPTY);
1685#endif 2036#endif
1686 2037
1687 backend = 0; 2038 backend = 0;
2039
2040#if EV_MULTIPLICITY
2041 if (ev_is_default_loop (EV_A))
2042#endif
2043 ev_default_loop_ptr = 0;
2044#if EV_MULTIPLICITY
2045 else
2046 ev_free (EV_A);
2047#endif
1688} 2048}
1689 2049
1690#if EV_USE_INOTIFY 2050#if EV_USE_INOTIFY
1691inline_size void infy_fork (EV_P); 2051inline_size void infy_fork (EV_P);
1692#endif 2052#endif
… …
1707 infy_fork (EV_A); 2067 infy_fork (EV_A);
1708#endif 2068#endif
1709 2069
1710 if (ev_is_active (&pipe_w)) 2070 if (ev_is_active (&pipe_w))
1711 { 2071 {
1712 /* this "locks" the handlers against writing to the pipe */ 2072 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1713 /* while we modify the fd vars */
1714 sig_pending = 1;
1715#if EV_ASYNC_ENABLE
1716 async_pending = 1;
1717#endif
1718 2073
1719 ev_ref (EV_A); 2074 ev_ref (EV_A);
1720 ev_io_stop (EV_A_ &pipe_w); 2075 ev_io_stop (EV_A_ &pipe_w);
1721 2076
1722#if EV_USE_EVENTFD 2077#if EV_USE_EVENTFD
… …
1724 close (evfd); 2079 close (evfd);
1725#endif 2080#endif
1726 2081
1727 if (evpipe [0] >= 0) 2082 if (evpipe [0] >= 0)
1728 { 2083 {
1729 close (evpipe [0]); 2084 EV_WIN32_CLOSE_FD (evpipe [0]);
1730 close (evpipe [1]); 2085 EV_WIN32_CLOSE_FD (evpipe [1]);
1731 } 2086 }
1732 2087
2088#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1733 evpipe_init (EV_A); 2089 evpipe_init (EV_A);
1734 /* now iterate over everything, in case we missed something */ 2090 /* now iterate over everything, in case we missed something */
1735 pipecb (EV_A_ &pipe_w, EV_READ); 2091 pipecb (EV_A_ &pipe_w, EV_READ);
2092#endif
1736 } 2093 }
1737 2094
1738 postfork = 0; 2095 postfork = 0;
1739} 2096}
1740 2097
1741#if EV_MULTIPLICITY 2098#if EV_MULTIPLICITY
1742 2099
1743struct ev_loop * 2100struct ev_loop * ecb_cold
1744ev_loop_new (unsigned int flags) 2101ev_loop_new (unsigned int flags)
1745{ 2102{
1746 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2103 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1747 2104
1748 memset (EV_A, 0, sizeof (struct ev_loop)); 2105 memset (EV_A, 0, sizeof (struct ev_loop));
1749 loop_init (EV_A_ flags); 2106 loop_init (EV_A_ flags);
1750 2107
1751 if (ev_backend (EV_A)) 2108 if (ev_backend (EV_A))
1752 return EV_A; 2109 return EV_A;
1753 2110
2111 ev_free (EV_A);
1754 return 0; 2112 return 0;
1755} 2113}
1756 2114
1757void
1758ev_loop_destroy (EV_P)
1759{
1760 loop_destroy (EV_A);
1761 ev_free (loop);
1762}
1763
1764void
1765ev_loop_fork (EV_P)
1766{
1767 postfork = 1; /* must be in line with ev_default_fork */
1768}
1769#endif /* multiplicity */ 2115#endif /* multiplicity */
1770 2116
1771#if EV_VERIFY 2117#if EV_VERIFY
1772static void noinline 2118static void noinline ecb_cold
1773verify_watcher (EV_P_ W w) 2119verify_watcher (EV_P_ W w)
1774{ 2120{
1775 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2121 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1776 2122
1777 if (w->pending) 2123 if (w->pending)
1778 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2124 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1779} 2125}
1780 2126
1781static void noinline 2127static void noinline ecb_cold
1782verify_heap (EV_P_ ANHE *heap, int N) 2128verify_heap (EV_P_ ANHE *heap, int N)
1783{ 2129{
1784 int i; 2130 int i;
1785 2131
1786 for (i = HEAP0; i < N + HEAP0; ++i) 2132 for (i = HEAP0; i < N + HEAP0; ++i)
… …
1791 2137
1792 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2138 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1793 } 2139 }
1794} 2140}
1795 2141
1796static void noinline 2142static void noinline ecb_cold
1797array_verify (EV_P_ W *ws, int cnt) 2143array_verify (EV_P_ W *ws, int cnt)
1798{ 2144{
1799 while (cnt--) 2145 while (cnt--)
1800 { 2146 {
1801 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2147 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1802 verify_watcher (EV_A_ ws [cnt]); 2148 verify_watcher (EV_A_ ws [cnt]);
1803 } 2149 }
1804} 2150}
1805#endif 2151#endif
1806 2152
1807#if EV_MINIMAL < 2 2153#if EV_FEATURE_API
1808void 2154void ecb_cold
1809ev_loop_verify (EV_P) 2155ev_verify (EV_P)
1810{ 2156{
1811#if EV_VERIFY 2157#if EV_VERIFY
1812 int i; 2158 int i;
1813 WL w; 2159 WL w;
1814 2160
… …
1848#if EV_FORK_ENABLE 2194#if EV_FORK_ENABLE
1849 assert (forkmax >= forkcnt); 2195 assert (forkmax >= forkcnt);
1850 array_verify (EV_A_ (W *)forks, forkcnt); 2196 array_verify (EV_A_ (W *)forks, forkcnt);
1851#endif 2197#endif
1852 2198
2199#if EV_CLEANUP_ENABLE
2200 assert (cleanupmax >= cleanupcnt);
2201 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2202#endif
2203
1853#if EV_ASYNC_ENABLE 2204#if EV_ASYNC_ENABLE
1854 assert (asyncmax >= asynccnt); 2205 assert (asyncmax >= asynccnt);
1855 array_verify (EV_A_ (W *)asyncs, asynccnt); 2206 array_verify (EV_A_ (W *)asyncs, asynccnt);
1856#endif 2207#endif
1857 2208
2209#if EV_PREPARE_ENABLE
1858 assert (preparemax >= preparecnt); 2210 assert (preparemax >= preparecnt);
1859 array_verify (EV_A_ (W *)prepares, preparecnt); 2211 array_verify (EV_A_ (W *)prepares, preparecnt);
2212#endif
1860 2213
2214#if EV_CHECK_ENABLE
1861 assert (checkmax >= checkcnt); 2215 assert (checkmax >= checkcnt);
1862 array_verify (EV_A_ (W *)checks, checkcnt); 2216 array_verify (EV_A_ (W *)checks, checkcnt);
2217#endif
1863 2218
1864# if 0 2219# if 0
2220#if EV_CHILD_ENABLE
1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2221 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1866 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 2222 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2223#endif
1867# endif 2224# endif
1868#endif 2225#endif
1869} 2226}
1870#endif 2227#endif
1871 2228
1872#if EV_MULTIPLICITY 2229#if EV_MULTIPLICITY
1873struct ev_loop * 2230struct ev_loop * ecb_cold
1874ev_default_loop_init (unsigned int flags)
1875#else 2231#else
1876int 2232int
2233#endif
1877ev_default_loop (unsigned int flags) 2234ev_default_loop (unsigned int flags)
1878#endif
1879{ 2235{
1880 if (!ev_default_loop_ptr) 2236 if (!ev_default_loop_ptr)
1881 { 2237 {
1882#if EV_MULTIPLICITY 2238#if EV_MULTIPLICITY
1883 EV_P = ev_default_loop_ptr = &default_loop_struct; 2239 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1887 2243
1888 loop_init (EV_A_ flags); 2244 loop_init (EV_A_ flags);
1889 2245
1890 if (ev_backend (EV_A)) 2246 if (ev_backend (EV_A))
1891 { 2247 {
1892#ifndef _WIN32 2248#if EV_CHILD_ENABLE
1893 ev_signal_init (&childev, childcb, SIGCHLD); 2249 ev_signal_init (&childev, childcb, SIGCHLD);
1894 ev_set_priority (&childev, EV_MAXPRI); 2250 ev_set_priority (&childev, EV_MAXPRI);
1895 ev_signal_start (EV_A_ &childev); 2251 ev_signal_start (EV_A_ &childev);
1896 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2252 ev_unref (EV_A); /* child watcher should not keep loop alive */
1897#endif 2253#endif
… …
1902 2258
1903 return ev_default_loop_ptr; 2259 return ev_default_loop_ptr;
1904} 2260}
1905 2261
1906void 2262void
1907ev_default_destroy (void) 2263ev_loop_fork (EV_P)
1908{ 2264{
1909#if EV_MULTIPLICITY
1910 EV_P = ev_default_loop_ptr;
1911#endif
1912
1913 ev_default_loop_ptr = 0;
1914
1915#ifndef _WIN32
1916 ev_ref (EV_A); /* child watcher */
1917 ev_signal_stop (EV_A_ &childev);
1918#endif
1919
1920 loop_destroy (EV_A);
1921}
1922
1923void
1924ev_default_fork (void)
1925{
1926#if EV_MULTIPLICITY
1927 EV_P = ev_default_loop_ptr;
1928#endif
1929
1930 postfork = 1; /* must be in line with ev_loop_fork */ 2265 postfork = 1; /* must be in line with ev_default_fork */
1931} 2266}
1932 2267
1933/*****************************************************************************/ 2268/*****************************************************************************/
1934 2269
1935void 2270void
… …
1957 2292
1958 for (pri = NUMPRI; pri--; ) 2293 for (pri = NUMPRI; pri--; )
1959 while (pendingcnt [pri]) 2294 while (pendingcnt [pri])
1960 { 2295 {
1961 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2296 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1962
1963 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1964 /* ^ this is no longer true, as pending_w could be here */
1965 2297
1966 p->w->pending = 0; 2298 p->w->pending = 0;
1967 EV_CB_INVOKE (p->w, p->events); 2299 EV_CB_INVOKE (p->w, p->events);
1968 EV_FREQUENT_CHECK; 2300 EV_FREQUENT_CHECK;
1969 } 2301 }
… …
2026 EV_FREQUENT_CHECK; 2358 EV_FREQUENT_CHECK;
2027 feed_reverse (EV_A_ (W)w); 2359 feed_reverse (EV_A_ (W)w);
2028 } 2360 }
2029 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2361 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2030 2362
2031 feed_reverse_done (EV_A_ EV_TIMEOUT); 2363 feed_reverse_done (EV_A_ EV_TIMER);
2032 } 2364 }
2033} 2365}
2034 2366
2035#if EV_PERIODIC_ENABLE 2367#if EV_PERIODIC_ENABLE
2368
2369static void noinline
2370periodic_recalc (EV_P_ ev_periodic *w)
2371{
2372 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2373 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2374
2375 /* the above almost always errs on the low side */
2376 while (at <= ev_rt_now)
2377 {
2378 ev_tstamp nat = at + w->interval;
2379
2380 /* when resolution fails us, we use ev_rt_now */
2381 if (expect_false (nat == at))
2382 {
2383 at = ev_rt_now;
2384 break;
2385 }
2386
2387 at = nat;
2388 }
2389
2390 ev_at (w) = at;
2391}
2392
2036/* make periodics pending */ 2393/* make periodics pending */
2037inline_size void 2394inline_size void
2038periodics_reify (EV_P) 2395periodics_reify (EV_P)
2039{ 2396{
2040 EV_FREQUENT_CHECK; 2397 EV_FREQUENT_CHECK;
… …
2059 ANHE_at_cache (periodics [HEAP0]); 2416 ANHE_at_cache (periodics [HEAP0]);
2060 downheap (periodics, periodiccnt, HEAP0); 2417 downheap (periodics, periodiccnt, HEAP0);
2061 } 2418 }
2062 else if (w->interval) 2419 else if (w->interval)
2063 { 2420 {
2064 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2421 periodic_recalc (EV_A_ w);
2065 /* if next trigger time is not sufficiently in the future, put it there */
2066 /* this might happen because of floating point inexactness */
2067 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2068 {
2069 ev_at (w) += w->interval;
2070
2071 /* if interval is unreasonably low we might still have a time in the past */
2072 /* so correct this. this will make the periodic very inexact, but the user */
2073 /* has effectively asked to get triggered more often than possible */
2074 if (ev_at (w) < ev_rt_now)
2075 ev_at (w) = ev_rt_now;
2076 }
2077
2078 ANHE_at_cache (periodics [HEAP0]); 2422 ANHE_at_cache (periodics [HEAP0]);
2079 downheap (periodics, periodiccnt, HEAP0); 2423 downheap (periodics, periodiccnt, HEAP0);
2080 } 2424 }
2081 else 2425 else
2082 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2426 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2089 feed_reverse_done (EV_A_ EV_PERIODIC); 2433 feed_reverse_done (EV_A_ EV_PERIODIC);
2090 } 2434 }
2091} 2435}
2092 2436
2093/* simply recalculate all periodics */ 2437/* simply recalculate all periodics */
2094/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2438/* TODO: maybe ensure that at least one event happens when jumping forward? */
2095static void noinline 2439static void noinline ecb_cold
2096periodics_reschedule (EV_P) 2440periodics_reschedule (EV_P)
2097{ 2441{
2098 int i; 2442 int i;
2099 2443
2100 /* adjust periodics after time jump */ 2444 /* adjust periodics after time jump */
… …
2103 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2447 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2104 2448
2105 if (w->reschedule_cb) 2449 if (w->reschedule_cb)
2106 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2450 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2107 else if (w->interval) 2451 else if (w->interval)
2108 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2452 periodic_recalc (EV_A_ w);
2109 2453
2110 ANHE_at_cache (periodics [i]); 2454 ANHE_at_cache (periodics [i]);
2111 } 2455 }
2112 2456
2113 reheap (periodics, periodiccnt); 2457 reheap (periodics, periodiccnt);
2114} 2458}
2115#endif 2459#endif
2116 2460
2117/* adjust all timers by a given offset */ 2461/* adjust all timers by a given offset */
2118static void noinline 2462static void noinline ecb_cold
2119timers_reschedule (EV_P_ ev_tstamp adjust) 2463timers_reschedule (EV_P_ ev_tstamp adjust)
2120{ 2464{
2121 int i; 2465 int i;
2122 2466
2123 for (i = 0; i < timercnt; ++i) 2467 for (i = 0; i < timercnt; ++i)
… …
2127 ANHE_at_cache (*he); 2471 ANHE_at_cache (*he);
2128 } 2472 }
2129} 2473}
2130 2474
2131/* fetch new monotonic and realtime times from the kernel */ 2475/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */ 2476/* also detect if there was a timejump, and act accordingly */
2133inline_speed void 2477inline_speed void
2134time_update (EV_P_ ev_tstamp max_block) 2478time_update (EV_P_ ev_tstamp max_block)
2135{ 2479{
2136#if EV_USE_MONOTONIC 2480#if EV_USE_MONOTONIC
2137 if (expect_true (have_monotonic)) 2481 if (expect_true (have_monotonic))
… …
2160 * doesn't hurt either as we only do this on time-jumps or 2504 * doesn't hurt either as we only do this on time-jumps or
2161 * in the unlikely event of having been preempted here. 2505 * in the unlikely event of having been preempted here.
2162 */ 2506 */
2163 for (i = 4; --i; ) 2507 for (i = 4; --i; )
2164 { 2508 {
2509 ev_tstamp diff;
2165 rtmn_diff = ev_rt_now - mn_now; 2510 rtmn_diff = ev_rt_now - mn_now;
2166 2511
2512 diff = odiff - rtmn_diff;
2513
2167 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2514 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2168 return; /* all is well */ 2515 return; /* all is well */
2169 2516
2170 ev_rt_now = ev_time (); 2517 ev_rt_now = ev_time ();
2171 mn_now = get_clock (); 2518 mn_now = get_clock ();
2172 now_floor = mn_now; 2519 now_floor = mn_now;
… …
2195 mn_now = ev_rt_now; 2542 mn_now = ev_rt_now;
2196 } 2543 }
2197} 2544}
2198 2545
2199void 2546void
2200ev_loop (EV_P_ int flags) 2547ev_run (EV_P_ int flags)
2201{ 2548{
2202#if EV_MINIMAL < 2 2549#if EV_FEATURE_API
2203 ++loop_depth; 2550 ++loop_depth;
2204#endif 2551#endif
2205 2552
2206 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2553 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2207 2554
2208 loop_done = EVUNLOOP_CANCEL; 2555 loop_done = EVBREAK_CANCEL;
2209 2556
2210 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2557 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2211 2558
2212 do 2559 do
2213 { 2560 {
2214#if EV_VERIFY >= 2 2561#if EV_VERIFY >= 2
2215 ev_loop_verify (EV_A); 2562 ev_verify (EV_A);
2216#endif 2563#endif
2217 2564
2218#ifndef _WIN32 2565#ifndef _WIN32
2219 if (expect_false (curpid)) /* penalise the forking check even more */ 2566 if (expect_false (curpid)) /* penalise the forking check even more */
2220 if (expect_false (getpid () != curpid)) 2567 if (expect_false (getpid () != curpid))
… …
2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2579 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2233 EV_INVOKE_PENDING; 2580 EV_INVOKE_PENDING;
2234 } 2581 }
2235#endif 2582#endif
2236 2583
2584#if EV_PREPARE_ENABLE
2237 /* queue prepare watchers (and execute them) */ 2585 /* queue prepare watchers (and execute them) */
2238 if (expect_false (preparecnt)) 2586 if (expect_false (preparecnt))
2239 { 2587 {
2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2588 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2241 EV_INVOKE_PENDING; 2589 EV_INVOKE_PENDING;
2242 } 2590 }
2591#endif
2243 2592
2244 if (expect_false (loop_done)) 2593 if (expect_false (loop_done))
2245 break; 2594 break;
2246 2595
2247 /* we might have forked, so reify kernel state if necessary */ 2596 /* we might have forked, so reify kernel state if necessary */
… …
2254 /* calculate blocking time */ 2603 /* calculate blocking time */
2255 { 2604 {
2256 ev_tstamp waittime = 0.; 2605 ev_tstamp waittime = 0.;
2257 ev_tstamp sleeptime = 0.; 2606 ev_tstamp sleeptime = 0.;
2258 2607
2608 /* remember old timestamp for io_blocktime calculation */
2609 ev_tstamp prev_mn_now = mn_now;
2610
2611 /* update time to cancel out callback processing overhead */
2612 time_update (EV_A_ 1e100);
2613
2614 /* from now on, we want a pipe-wake-up */
2615 pipe_write_wanted = 1;
2616
2617 ECB_MEMORY_FENCE; /* amke sure pipe_write_wanted is visible before we check for potential skips */
2618
2259 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2619 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2260 { 2620 {
2261 /* remember old timestamp for io_blocktime calculation */
2262 ev_tstamp prev_mn_now = mn_now;
2263
2264 /* update time to cancel out callback processing overhead */
2265 time_update (EV_A_ 1e100);
2266
2267 waittime = MAX_BLOCKTIME; 2621 waittime = MAX_BLOCKTIME;
2268 2622
2269 if (timercnt) 2623 if (timercnt)
2270 { 2624 {
2271 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2625 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2272 if (waittime > to) waittime = to; 2626 if (waittime > to) waittime = to;
2273 } 2627 }
2274 2628
2275#if EV_PERIODIC_ENABLE 2629#if EV_PERIODIC_ENABLE
2276 if (periodiccnt) 2630 if (periodiccnt)
2277 { 2631 {
2278 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2632 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2279 if (waittime > to) waittime = to; 2633 if (waittime > to) waittime = to;
2280 } 2634 }
2281#endif 2635#endif
2282 2636
2283 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2637 /* don't let timeouts decrease the waittime below timeout_blocktime */
2284 if (expect_false (waittime < timeout_blocktime)) 2638 if (expect_false (waittime < timeout_blocktime))
2285 waittime = timeout_blocktime; 2639 waittime = timeout_blocktime;
2640
2641 /* at this point, we NEED to wait, so we have to ensure */
2642 /* to pass a minimum nonzero value to the backend */
2643 if (expect_false (waittime < backend_mintime))
2644 waittime = backend_mintime;
2286 2645
2287 /* extra check because io_blocktime is commonly 0 */ 2646 /* extra check because io_blocktime is commonly 0 */
2288 if (expect_false (io_blocktime)) 2647 if (expect_false (io_blocktime))
2289 { 2648 {
2290 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2649 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2291 2650
2292 if (sleeptime > waittime - backend_fudge) 2651 if (sleeptime > waittime - backend_mintime)
2293 sleeptime = waittime - backend_fudge; 2652 sleeptime = waittime - backend_mintime;
2294 2653
2295 if (expect_true (sleeptime > 0.)) 2654 if (expect_true (sleeptime > 0.))
2296 { 2655 {
2297 ev_sleep (sleeptime); 2656 ev_sleep (sleeptime);
2298 waittime -= sleeptime; 2657 waittime -= sleeptime;
2299 } 2658 }
2300 } 2659 }
2301 } 2660 }
2302 2661
2303#if EV_MINIMAL < 2 2662#if EV_FEATURE_API
2304 ++loop_count; 2663 ++loop_count;
2305#endif 2664#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2665 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2307 backend_poll (EV_A_ waittime); 2666 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2667 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2668
2669 pipe_write_wanted = 0; /* just an optimsiation, no fence needed */
2670
2671 if (pipe_write_skipped)
2672 {
2673 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2674 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2675 }
2676
2309 2677
2310 /* update ev_rt_now, do magic */ 2678 /* update ev_rt_now, do magic */
2311 time_update (EV_A_ waittime + sleeptime); 2679 time_update (EV_A_ waittime + sleeptime);
2312 } 2680 }
2313 2681
… …
2320#if EV_IDLE_ENABLE 2688#if EV_IDLE_ENABLE
2321 /* queue idle watchers unless other events are pending */ 2689 /* queue idle watchers unless other events are pending */
2322 idle_reify (EV_A); 2690 idle_reify (EV_A);
2323#endif 2691#endif
2324 2692
2693#if EV_CHECK_ENABLE
2325 /* queue check watchers, to be executed first */ 2694 /* queue check watchers, to be executed first */
2326 if (expect_false (checkcnt)) 2695 if (expect_false (checkcnt))
2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2696 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2697#endif
2328 2698
2329 EV_INVOKE_PENDING; 2699 EV_INVOKE_PENDING;
2330 } 2700 }
2331 while (expect_true ( 2701 while (expect_true (
2332 activecnt 2702 activecnt
2333 && !loop_done 2703 && !loop_done
2334 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2704 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2335 )); 2705 ));
2336 2706
2337 if (loop_done == EVUNLOOP_ONE) 2707 if (loop_done == EVBREAK_ONE)
2338 loop_done = EVUNLOOP_CANCEL; 2708 loop_done = EVBREAK_CANCEL;
2339 2709
2340#if EV_MINIMAL < 2 2710#if EV_FEATURE_API
2341 --loop_depth; 2711 --loop_depth;
2342#endif 2712#endif
2343} 2713}
2344 2714
2345void 2715void
2346ev_unloop (EV_P_ int how) 2716ev_break (EV_P_ int how)
2347{ 2717{
2348 loop_done = how; 2718 loop_done = how;
2349} 2719}
2350 2720
2351void 2721void
… …
2471 2841
2472 if (expect_false (ev_is_active (w))) 2842 if (expect_false (ev_is_active (w)))
2473 return; 2843 return;
2474 2844
2475 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2845 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2476 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2846 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2477 2847
2478 EV_FREQUENT_CHECK; 2848 EV_FREQUENT_CHECK;
2479 2849
2480 ev_start (EV_A_ (W)w, 1); 2850 ev_start (EV_A_ (W)w, 1);
2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2851 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2499 EV_FREQUENT_CHECK; 2869 EV_FREQUENT_CHECK;
2500 2870
2501 wlist_del (&anfds[w->fd].head, (WL)w); 2871 wlist_del (&anfds[w->fd].head, (WL)w);
2502 ev_stop (EV_A_ (W)w); 2872 ev_stop (EV_A_ (W)w);
2503 2873
2504 fd_change (EV_A_ w->fd, 1); 2874 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2505 2875
2506 EV_FREQUENT_CHECK; 2876 EV_FREQUENT_CHECK;
2507} 2877}
2508 2878
2509void noinline 2879void noinline
… …
2551 timers [active] = timers [timercnt + HEAP0]; 2921 timers [active] = timers [timercnt + HEAP0];
2552 adjustheap (timers, timercnt, active); 2922 adjustheap (timers, timercnt, active);
2553 } 2923 }
2554 } 2924 }
2555 2925
2556 EV_FREQUENT_CHECK;
2557
2558 ev_at (w) -= mn_now; 2926 ev_at (w) -= mn_now;
2559 2927
2560 ev_stop (EV_A_ (W)w); 2928 ev_stop (EV_A_ (W)w);
2929
2930 EV_FREQUENT_CHECK;
2561} 2931}
2562 2932
2563void noinline 2933void noinline
2564ev_timer_again (EV_P_ ev_timer *w) 2934ev_timer_again (EV_P_ ev_timer *w)
2565{ 2935{
… …
2601 if (w->reschedule_cb) 2971 if (w->reschedule_cb)
2602 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2972 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2603 else if (w->interval) 2973 else if (w->interval)
2604 { 2974 {
2605 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2975 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2606 /* this formula differs from the one in periodic_reify because we do not always round up */ 2976 periodic_recalc (EV_A_ w);
2607 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2608 } 2977 }
2609 else 2978 else
2610 ev_at (w) = w->offset; 2979 ev_at (w) = w->offset;
2611 2980
2612 EV_FREQUENT_CHECK; 2981 EV_FREQUENT_CHECK;
… …
2644 periodics [active] = periodics [periodiccnt + HEAP0]; 3013 periodics [active] = periodics [periodiccnt + HEAP0];
2645 adjustheap (periodics, periodiccnt, active); 3014 adjustheap (periodics, periodiccnt, active);
2646 } 3015 }
2647 } 3016 }
2648 3017
2649 EV_FREQUENT_CHECK;
2650
2651 ev_stop (EV_A_ (W)w); 3018 ev_stop (EV_A_ (W)w);
3019
3020 EV_FREQUENT_CHECK;
2652} 3021}
2653 3022
2654void noinline 3023void noinline
2655ev_periodic_again (EV_P_ ev_periodic *w) 3024ev_periodic_again (EV_P_ ev_periodic *w)
2656{ 3025{
… …
2661#endif 3030#endif
2662 3031
2663#ifndef SA_RESTART 3032#ifndef SA_RESTART
2664# define SA_RESTART 0 3033# define SA_RESTART 0
2665#endif 3034#endif
3035
3036#if EV_SIGNAL_ENABLE
2666 3037
2667void noinline 3038void noinline
2668ev_signal_start (EV_P_ ev_signal *w) 3039ev_signal_start (EV_P_ ev_signal *w)
2669{ 3040{
2670 if (expect_false (ev_is_active (w))) 3041 if (expect_false (ev_is_active (w)))
… …
2717 if (!((WL)w)->next) 3088 if (!((WL)w)->next)
2718# if EV_USE_SIGNALFD 3089# if EV_USE_SIGNALFD
2719 if (sigfd < 0) /*TODO*/ 3090 if (sigfd < 0) /*TODO*/
2720# endif 3091# endif
2721 { 3092 {
2722# if _WIN32 3093# ifdef _WIN32
3094 evpipe_init (EV_A);
3095
2723 signal (w->signum, ev_sighandler); 3096 signal (w->signum, ev_sighandler);
2724# else 3097# else
2725 struct sigaction sa; 3098 struct sigaction sa;
2726 3099
2727 evpipe_init (EV_A); 3100 evpipe_init (EV_A);
… …
2729 sa.sa_handler = ev_sighandler; 3102 sa.sa_handler = ev_sighandler;
2730 sigfillset (&sa.sa_mask); 3103 sigfillset (&sa.sa_mask);
2731 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 3104 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2732 sigaction (w->signum, &sa, 0); 3105 sigaction (w->signum, &sa, 0);
2733 3106
3107 if (origflags & EVFLAG_NOSIGMASK)
3108 {
2734 sigemptyset (&sa.sa_mask); 3109 sigemptyset (&sa.sa_mask);
2735 sigaddset (&sa.sa_mask, w->signum); 3110 sigaddset (&sa.sa_mask, w->signum);
2736 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 3111 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
3112 }
2737#endif 3113#endif
2738 } 3114 }
2739 3115
2740 EV_FREQUENT_CHECK; 3116 EV_FREQUENT_CHECK;
2741} 3117}
… …
2758 signals [w->signum - 1].loop = 0; /* unattach from signal */ 3134 signals [w->signum - 1].loop = 0; /* unattach from signal */
2759#endif 3135#endif
2760#if EV_USE_SIGNALFD 3136#if EV_USE_SIGNALFD
2761 if (sigfd >= 0) 3137 if (sigfd >= 0)
2762 { 3138 {
2763 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 3139 sigset_t ss;
3140
3141 sigemptyset (&ss);
3142 sigaddset (&ss, w->signum);
2764 sigdelset (&sigfd_set, w->signum); 3143 sigdelset (&sigfd_set, w->signum);
3144
2765 signalfd (sigfd, &sigfd_set, 0); 3145 signalfd (sigfd, &sigfd_set, 0);
2766 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 3146 sigprocmask (SIG_UNBLOCK, &ss, 0);
2767 /*TODO: maybe unblock signal? */
2768 } 3147 }
2769 else 3148 else
2770#endif 3149#endif
2771 signal (w->signum, SIG_DFL); 3150 signal (w->signum, SIG_DFL);
2772 } 3151 }
2773 3152
2774 EV_FREQUENT_CHECK; 3153 EV_FREQUENT_CHECK;
2775} 3154}
2776 3155
3156#endif
3157
3158#if EV_CHILD_ENABLE
3159
2777void 3160void
2778ev_child_start (EV_P_ ev_child *w) 3161ev_child_start (EV_P_ ev_child *w)
2779{ 3162{
2780#if EV_MULTIPLICITY 3163#if EV_MULTIPLICITY
2781 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 3164 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2784 return; 3167 return;
2785 3168
2786 EV_FREQUENT_CHECK; 3169 EV_FREQUENT_CHECK;
2787 3170
2788 ev_start (EV_A_ (W)w, 1); 3171 ev_start (EV_A_ (W)w, 1);
2789 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3172 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2790 3173
2791 EV_FREQUENT_CHECK; 3174 EV_FREQUENT_CHECK;
2792} 3175}
2793 3176
2794void 3177void
… …
2798 if (expect_false (!ev_is_active (w))) 3181 if (expect_false (!ev_is_active (w)))
2799 return; 3182 return;
2800 3183
2801 EV_FREQUENT_CHECK; 3184 EV_FREQUENT_CHECK;
2802 3185
2803 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3186 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2804 ev_stop (EV_A_ (W)w); 3187 ev_stop (EV_A_ (W)w);
2805 3188
2806 EV_FREQUENT_CHECK; 3189 EV_FREQUENT_CHECK;
2807} 3190}
3191
3192#endif
2808 3193
2809#if EV_STAT_ENABLE 3194#if EV_STAT_ENABLE
2810 3195
2811# ifdef _WIN32 3196# ifdef _WIN32
2812# undef lstat 3197# undef lstat
… …
2818#define MIN_STAT_INTERVAL 0.1074891 3203#define MIN_STAT_INTERVAL 0.1074891
2819 3204
2820static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 3205static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2821 3206
2822#if EV_USE_INOTIFY 3207#if EV_USE_INOTIFY
2823# define EV_INOTIFY_BUFSIZE 8192 3208
3209/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
3210# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2824 3211
2825static void noinline 3212static void noinline
2826infy_add (EV_P_ ev_stat *w) 3213infy_add (EV_P_ ev_stat *w)
2827{ 3214{
2828 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); 3215 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);
2829 3216
2830 if (w->wd < 0) 3217 if (w->wd >= 0)
3218 {
3219 struct statfs sfs;
3220
3221 /* now local changes will be tracked by inotify, but remote changes won't */
3222 /* unless the filesystem is known to be local, we therefore still poll */
3223 /* also do poll on <2.6.25, but with normal frequency */
3224
3225 if (!fs_2625)
3226 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3227 else if (!statfs (w->path, &sfs)
3228 && (sfs.f_type == 0x1373 /* devfs */
3229 || sfs.f_type == 0xEF53 /* ext2/3 */
3230 || sfs.f_type == 0x3153464a /* jfs */
3231 || sfs.f_type == 0x52654973 /* reiser3 */
3232 || sfs.f_type == 0x01021994 /* tempfs */
3233 || sfs.f_type == 0x58465342 /* xfs */))
3234 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3235 else
3236 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2831 { 3237 }
3238 else
3239 {
3240 /* can't use inotify, continue to stat */
2832 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3241 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2833 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2834 3242
2835 /* monitor some parent directory for speedup hints */ 3243 /* if path is not there, monitor some parent directory for speedup hints */
2836 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3244 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2837 /* but an efficiency issue only */ 3245 /* but an efficiency issue only */
2838 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3246 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2839 { 3247 {
2840 char path [4096]; 3248 char path [4096];
… …
2850 if (!pend || pend == path) 3258 if (!pend || pend == path)
2851 break; 3259 break;
2852 3260
2853 *pend = 0; 3261 *pend = 0;
2854 w->wd = inotify_add_watch (fs_fd, path, mask); 3262 w->wd = inotify_add_watch (fs_fd, path, mask);
2855 } 3263 }
2856 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3264 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2857 } 3265 }
2858 } 3266 }
2859 3267
2860 if (w->wd >= 0) 3268 if (w->wd >= 0)
2861 {
2862 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3269 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2863 3270
2864 /* now local changes will be tracked by inotify, but remote changes won't */ 3271 /* now re-arm timer, if required */
2865 /* unless the filesystem it known to be local, we therefore still poll */ 3272 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2866 /* also do poll on <2.6.25, but with normal frequency */
2867 struct statfs sfs;
2868
2869 if (fs_2625 && !statfs (w->path, &sfs))
2870 if (sfs.f_type == 0x1373 /* devfs */
2871 || sfs.f_type == 0xEF53 /* ext2/3 */
2872 || sfs.f_type == 0x3153464a /* jfs */
2873 || sfs.f_type == 0x52654973 /* reiser3 */
2874 || sfs.f_type == 0x01021994 /* tempfs */
2875 || sfs.f_type == 0x58465342 /* xfs */)
2876 return;
2877
2878 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2879 ev_timer_again (EV_A_ &w->timer); 3273 ev_timer_again (EV_A_ &w->timer);
2880 } 3274 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2881} 3275}
2882 3276
2883static void noinline 3277static void noinline
2884infy_del (EV_P_ ev_stat *w) 3278infy_del (EV_P_ ev_stat *w)
2885{ 3279{
… …
2888 3282
2889 if (wd < 0) 3283 if (wd < 0)
2890 return; 3284 return;
2891 3285
2892 w->wd = -2; 3286 w->wd = -2;
2893 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3287 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2894 wlist_del (&fs_hash [slot].head, (WL)w); 3288 wlist_del (&fs_hash [slot].head, (WL)w);
2895 3289
2896 /* remove this watcher, if others are watching it, they will rearm */ 3290 /* remove this watcher, if others are watching it, they will rearm */
2897 inotify_rm_watch (fs_fd, wd); 3291 inotify_rm_watch (fs_fd, wd);
2898} 3292}
… …
2900static void noinline 3294static void noinline
2901infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3295infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2902{ 3296{
2903 if (slot < 0) 3297 if (slot < 0)
2904 /* overflow, need to check for all hash slots */ 3298 /* overflow, need to check for all hash slots */
2905 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3299 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2906 infy_wd (EV_A_ slot, wd, ev); 3300 infy_wd (EV_A_ slot, wd, ev);
2907 else 3301 else
2908 { 3302 {
2909 WL w_; 3303 WL w_;
2910 3304
2911 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3305 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2912 { 3306 {
2913 ev_stat *w = (ev_stat *)w_; 3307 ev_stat *w = (ev_stat *)w_;
2914 w_ = w_->next; /* lets us remove this watcher and all before it */ 3308 w_ = w_->next; /* lets us remove this watcher and all before it */
2915 3309
2916 if (w->wd == wd || wd == -1) 3310 if (w->wd == wd || wd == -1)
2917 { 3311 {
2918 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3312 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2919 { 3313 {
2920 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3314 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2921 w->wd = -1; 3315 w->wd = -1;
2922 infy_add (EV_A_ w); /* re-add, no matter what */ 3316 infy_add (EV_A_ w); /* re-add, no matter what */
2923 } 3317 }
2924 3318
2925 stat_timer_cb (EV_A_ &w->timer, 0); 3319 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2930 3324
2931static void 3325static void
2932infy_cb (EV_P_ ev_io *w, int revents) 3326infy_cb (EV_P_ ev_io *w, int revents)
2933{ 3327{
2934 char buf [EV_INOTIFY_BUFSIZE]; 3328 char buf [EV_INOTIFY_BUFSIZE];
2935 struct inotify_event *ev = (struct inotify_event *)buf;
2936 int ofs; 3329 int ofs;
2937 int len = read (fs_fd, buf, sizeof (buf)); 3330 int len = read (fs_fd, buf, sizeof (buf));
2938 3331
2939 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3332 for (ofs = 0; ofs < len; )
3333 {
3334 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2940 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3335 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3336 ofs += sizeof (struct inotify_event) + ev->len;
3337 }
2941} 3338}
2942 3339
2943inline_size void 3340inline_size void ecb_cold
2944check_2625 (EV_P) 3341ev_check_2625 (EV_P)
2945{ 3342{
2946 /* kernels < 2.6.25 are borked 3343 /* kernels < 2.6.25 are borked
2947 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3344 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2948 */ 3345 */
2949 struct utsname buf; 3346 if (ev_linux_version () < 0x020619)
2950 int major, minor, micro;
2951
2952 if (uname (&buf))
2953 return; 3347 return;
2954 3348
2955 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2956 return;
2957
2958 if (major < 2
2959 || (major == 2 && minor < 6)
2960 || (major == 2 && minor == 6 && micro < 25))
2961 return;
2962
2963 fs_2625 = 1; 3349 fs_2625 = 1;
3350}
3351
3352inline_size int
3353infy_newfd (void)
3354{
3355#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3356 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3357 if (fd >= 0)
3358 return fd;
3359#endif
3360 return inotify_init ();
2964} 3361}
2965 3362
2966inline_size void 3363inline_size void
2967infy_init (EV_P) 3364infy_init (EV_P)
2968{ 3365{
2969 if (fs_fd != -2) 3366 if (fs_fd != -2)
2970 return; 3367 return;
2971 3368
2972 fs_fd = -1; 3369 fs_fd = -1;
2973 3370
2974 check_2625 (EV_A); 3371 ev_check_2625 (EV_A);
2975 3372
2976 fs_fd = inotify_init (); 3373 fs_fd = infy_newfd ();
2977 3374
2978 if (fs_fd >= 0) 3375 if (fs_fd >= 0)
2979 { 3376 {
3377 fd_intern (fs_fd);
2980 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3378 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2981 ev_set_priority (&fs_w, EV_MAXPRI); 3379 ev_set_priority (&fs_w, EV_MAXPRI);
2982 ev_io_start (EV_A_ &fs_w); 3380 ev_io_start (EV_A_ &fs_w);
3381 ev_unref (EV_A);
2983 } 3382 }
2984} 3383}
2985 3384
2986inline_size void 3385inline_size void
2987infy_fork (EV_P) 3386infy_fork (EV_P)
… …
2989 int slot; 3388 int slot;
2990 3389
2991 if (fs_fd < 0) 3390 if (fs_fd < 0)
2992 return; 3391 return;
2993 3392
3393 ev_ref (EV_A);
3394 ev_io_stop (EV_A_ &fs_w);
2994 close (fs_fd); 3395 close (fs_fd);
2995 fs_fd = inotify_init (); 3396 fs_fd = infy_newfd ();
2996 3397
3398 if (fs_fd >= 0)
3399 {
3400 fd_intern (fs_fd);
3401 ev_io_set (&fs_w, fs_fd, EV_READ);
3402 ev_io_start (EV_A_ &fs_w);
3403 ev_unref (EV_A);
3404 }
3405
2997 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3406 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2998 { 3407 {
2999 WL w_ = fs_hash [slot].head; 3408 WL w_ = fs_hash [slot].head;
3000 fs_hash [slot].head = 0; 3409 fs_hash [slot].head = 0;
3001 3410
3002 while (w_) 3411 while (w_)
… …
3007 w->wd = -1; 3416 w->wd = -1;
3008 3417
3009 if (fs_fd >= 0) 3418 if (fs_fd >= 0)
3010 infy_add (EV_A_ w); /* re-add, no matter what */ 3419 infy_add (EV_A_ w); /* re-add, no matter what */
3011 else 3420 else
3421 {
3422 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3423 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3012 ev_timer_again (EV_A_ &w->timer); 3424 ev_timer_again (EV_A_ &w->timer);
3425 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3426 }
3013 } 3427 }
3014 } 3428 }
3015} 3429}
3016 3430
3017#endif 3431#endif
… …
3034static void noinline 3448static void noinline
3035stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3449stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3036{ 3450{
3037 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3451 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3038 3452
3039 /* we copy this here each the time so that */ 3453 ev_statdata prev = w->attr;
3040 /* prev has the old value when the callback gets invoked */
3041 w->prev = w->attr;
3042 ev_stat_stat (EV_A_ w); 3454 ev_stat_stat (EV_A_ w);
3043 3455
3044 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3456 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3045 if ( 3457 if (
3046 w->prev.st_dev != w->attr.st_dev 3458 prev.st_dev != w->attr.st_dev
3047 || w->prev.st_ino != w->attr.st_ino 3459 || prev.st_ino != w->attr.st_ino
3048 || w->prev.st_mode != w->attr.st_mode 3460 || prev.st_mode != w->attr.st_mode
3049 || w->prev.st_nlink != w->attr.st_nlink 3461 || prev.st_nlink != w->attr.st_nlink
3050 || w->prev.st_uid != w->attr.st_uid 3462 || prev.st_uid != w->attr.st_uid
3051 || w->prev.st_gid != w->attr.st_gid 3463 || prev.st_gid != w->attr.st_gid
3052 || w->prev.st_rdev != w->attr.st_rdev 3464 || prev.st_rdev != w->attr.st_rdev
3053 || w->prev.st_size != w->attr.st_size 3465 || prev.st_size != w->attr.st_size
3054 || w->prev.st_atime != w->attr.st_atime 3466 || prev.st_atime != w->attr.st_atime
3055 || w->prev.st_mtime != w->attr.st_mtime 3467 || prev.st_mtime != w->attr.st_mtime
3056 || w->prev.st_ctime != w->attr.st_ctime 3468 || prev.st_ctime != w->attr.st_ctime
3057 ) { 3469 ) {
3470 /* we only update w->prev on actual differences */
3471 /* in case we test more often than invoke the callback, */
3472 /* to ensure that prev is always different to attr */
3473 w->prev = prev;
3474
3058 #if EV_USE_INOTIFY 3475 #if EV_USE_INOTIFY
3059 if (fs_fd >= 0) 3476 if (fs_fd >= 0)
3060 { 3477 {
3061 infy_del (EV_A_ w); 3478 infy_del (EV_A_ w);
3062 infy_add (EV_A_ w); 3479 infy_add (EV_A_ w);
… …
3087 3504
3088 if (fs_fd >= 0) 3505 if (fs_fd >= 0)
3089 infy_add (EV_A_ w); 3506 infy_add (EV_A_ w);
3090 else 3507 else
3091#endif 3508#endif
3509 {
3092 ev_timer_again (EV_A_ &w->timer); 3510 ev_timer_again (EV_A_ &w->timer);
3511 ev_unref (EV_A);
3512 }
3093 3513
3094 ev_start (EV_A_ (W)w, 1); 3514 ev_start (EV_A_ (W)w, 1);
3095 3515
3096 EV_FREQUENT_CHECK; 3516 EV_FREQUENT_CHECK;
3097} 3517}
… …
3106 EV_FREQUENT_CHECK; 3526 EV_FREQUENT_CHECK;
3107 3527
3108#if EV_USE_INOTIFY 3528#if EV_USE_INOTIFY
3109 infy_del (EV_A_ w); 3529 infy_del (EV_A_ w);
3110#endif 3530#endif
3531
3532 if (ev_is_active (&w->timer))
3533 {
3534 ev_ref (EV_A);
3111 ev_timer_stop (EV_A_ &w->timer); 3535 ev_timer_stop (EV_A_ &w->timer);
3536 }
3112 3537
3113 ev_stop (EV_A_ (W)w); 3538 ev_stop (EV_A_ (W)w);
3114 3539
3115 EV_FREQUENT_CHECK; 3540 EV_FREQUENT_CHECK;
3116} 3541}
… …
3161 3586
3162 EV_FREQUENT_CHECK; 3587 EV_FREQUENT_CHECK;
3163} 3588}
3164#endif 3589#endif
3165 3590
3591#if EV_PREPARE_ENABLE
3166void 3592void
3167ev_prepare_start (EV_P_ ev_prepare *w) 3593ev_prepare_start (EV_P_ ev_prepare *w)
3168{ 3594{
3169 if (expect_false (ev_is_active (w))) 3595 if (expect_false (ev_is_active (w)))
3170 return; 3596 return;
… …
3196 3622
3197 ev_stop (EV_A_ (W)w); 3623 ev_stop (EV_A_ (W)w);
3198 3624
3199 EV_FREQUENT_CHECK; 3625 EV_FREQUENT_CHECK;
3200} 3626}
3627#endif
3201 3628
3629#if EV_CHECK_ENABLE
3202void 3630void
3203ev_check_start (EV_P_ ev_check *w) 3631ev_check_start (EV_P_ ev_check *w)
3204{ 3632{
3205 if (expect_false (ev_is_active (w))) 3633 if (expect_false (ev_is_active (w)))
3206 return; 3634 return;
… …
3232 3660
3233 ev_stop (EV_A_ (W)w); 3661 ev_stop (EV_A_ (W)w);
3234 3662
3235 EV_FREQUENT_CHECK; 3663 EV_FREQUENT_CHECK;
3236} 3664}
3665#endif
3237 3666
3238#if EV_EMBED_ENABLE 3667#if EV_EMBED_ENABLE
3239void noinline 3668void noinline
3240ev_embed_sweep (EV_P_ ev_embed *w) 3669ev_embed_sweep (EV_P_ ev_embed *w)
3241{ 3670{
3242 ev_loop (w->other, EVLOOP_NONBLOCK); 3671 ev_run (w->other, EVRUN_NOWAIT);
3243} 3672}
3244 3673
3245static void 3674static void
3246embed_io_cb (EV_P_ ev_io *io, int revents) 3675embed_io_cb (EV_P_ ev_io *io, int revents)
3247{ 3676{
3248 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3677 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3249 3678
3250 if (ev_cb (w)) 3679 if (ev_cb (w))
3251 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3680 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3252 else 3681 else
3253 ev_loop (w->other, EVLOOP_NONBLOCK); 3682 ev_run (w->other, EVRUN_NOWAIT);
3254} 3683}
3255 3684
3256static void 3685static void
3257embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3686embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3258{ 3687{
… …
3262 EV_P = w->other; 3691 EV_P = w->other;
3263 3692
3264 while (fdchangecnt) 3693 while (fdchangecnt)
3265 { 3694 {
3266 fd_reify (EV_A); 3695 fd_reify (EV_A);
3267 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3696 ev_run (EV_A_ EVRUN_NOWAIT);
3268 } 3697 }
3269 } 3698 }
3270} 3699}
3271 3700
3272static void 3701static void
… …
3278 3707
3279 { 3708 {
3280 EV_P = w->other; 3709 EV_P = w->other;
3281 3710
3282 ev_loop_fork (EV_A); 3711 ev_loop_fork (EV_A);
3283 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3712 ev_run (EV_A_ EVRUN_NOWAIT);
3284 } 3713 }
3285 3714
3286 ev_embed_start (EV_A_ w); 3715 ev_embed_start (EV_A_ w);
3287} 3716}
3288 3717
… …
3336 3765
3337 ev_io_stop (EV_A_ &w->io); 3766 ev_io_stop (EV_A_ &w->io);
3338 ev_prepare_stop (EV_A_ &w->prepare); 3767 ev_prepare_stop (EV_A_ &w->prepare);
3339 ev_fork_stop (EV_A_ &w->fork); 3768 ev_fork_stop (EV_A_ &w->fork);
3340 3769
3770 ev_stop (EV_A_ (W)w);
3771
3341 EV_FREQUENT_CHECK; 3772 EV_FREQUENT_CHECK;
3342} 3773}
3343#endif 3774#endif
3344 3775
3345#if EV_FORK_ENABLE 3776#if EV_FORK_ENABLE
… …
3378 3809
3379 EV_FREQUENT_CHECK; 3810 EV_FREQUENT_CHECK;
3380} 3811}
3381#endif 3812#endif
3382 3813
3814#if EV_CLEANUP_ENABLE
3815void
3816ev_cleanup_start (EV_P_ ev_cleanup *w)
3817{
3818 if (expect_false (ev_is_active (w)))
3819 return;
3820
3821 EV_FREQUENT_CHECK;
3822
3823 ev_start (EV_A_ (W)w, ++cleanupcnt);
3824 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3825 cleanups [cleanupcnt - 1] = w;
3826
3827 /* cleanup watchers should never keep a refcount on the loop */
3828 ev_unref (EV_A);
3829 EV_FREQUENT_CHECK;
3830}
3831
3832void
3833ev_cleanup_stop (EV_P_ ev_cleanup *w)
3834{
3835 clear_pending (EV_A_ (W)w);
3836 if (expect_false (!ev_is_active (w)))
3837 return;
3838
3839 EV_FREQUENT_CHECK;
3840 ev_ref (EV_A);
3841
3842 {
3843 int active = ev_active (w);
3844
3845 cleanups [active - 1] = cleanups [--cleanupcnt];
3846 ev_active (cleanups [active - 1]) = active;
3847 }
3848
3849 ev_stop (EV_A_ (W)w);
3850
3851 EV_FREQUENT_CHECK;
3852}
3853#endif
3854
3383#if EV_ASYNC_ENABLE 3855#if EV_ASYNC_ENABLE
3384void 3856void
3385ev_async_start (EV_P_ ev_async *w) 3857ev_async_start (EV_P_ ev_async *w)
3386{ 3858{
3387 if (expect_false (ev_is_active (w))) 3859 if (expect_false (ev_is_active (w)))
3388 return; 3860 return;
3861
3862 w->sent = 0;
3389 3863
3390 evpipe_init (EV_A); 3864 evpipe_init (EV_A);
3391 3865
3392 EV_FREQUENT_CHECK; 3866 EV_FREQUENT_CHECK;
3393 3867
… …
3471{ 3945{
3472 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3946 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3473 3947
3474 if (expect_false (!once)) 3948 if (expect_false (!once))
3475 { 3949 {
3476 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3950 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3477 return; 3951 return;
3478 } 3952 }
3479 3953
3480 once->cb = cb; 3954 once->cb = cb;
3481 once->arg = arg; 3955 once->arg = arg;
… …
3496} 3970}
3497 3971
3498/*****************************************************************************/ 3972/*****************************************************************************/
3499 3973
3500#if EV_WALK_ENABLE 3974#if EV_WALK_ENABLE
3501void 3975void ecb_cold
3502ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3976ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3503{ 3977{
3504 int i, j; 3978 int i, j;
3505 ev_watcher_list *wl, *wn; 3979 ev_watcher_list *wl, *wn;
3506 3980
… …
3568 if (types & EV_ASYNC) 4042 if (types & EV_ASYNC)
3569 for (i = asynccnt; i--; ) 4043 for (i = asynccnt; i--; )
3570 cb (EV_A_ EV_ASYNC, asyncs [i]); 4044 cb (EV_A_ EV_ASYNC, asyncs [i]);
3571#endif 4045#endif
3572 4046
4047#if EV_PREPARE_ENABLE
3573 if (types & EV_PREPARE) 4048 if (types & EV_PREPARE)
3574 for (i = preparecnt; i--; ) 4049 for (i = preparecnt; i--; )
3575#if EV_EMBED_ENABLE 4050# if EV_EMBED_ENABLE
3576 if (ev_cb (prepares [i]) != embed_prepare_cb) 4051 if (ev_cb (prepares [i]) != embed_prepare_cb)
3577#endif 4052# endif
3578 cb (EV_A_ EV_PREPARE, prepares [i]); 4053 cb (EV_A_ EV_PREPARE, prepares [i]);
4054#endif
3579 4055
4056#if EV_CHECK_ENABLE
3580 if (types & EV_CHECK) 4057 if (types & EV_CHECK)
3581 for (i = checkcnt; i--; ) 4058 for (i = checkcnt; i--; )
3582 cb (EV_A_ EV_CHECK, checks [i]); 4059 cb (EV_A_ EV_CHECK, checks [i]);
4060#endif
3583 4061
4062#if EV_SIGNAL_ENABLE
3584 if (types & EV_SIGNAL) 4063 if (types & EV_SIGNAL)
3585 for (i = 0; i < EV_NSIG - 1; ++i) 4064 for (i = 0; i < EV_NSIG - 1; ++i)
3586 for (wl = signals [i].head; wl; ) 4065 for (wl = signals [i].head; wl; )
3587 { 4066 {
3588 wn = wl->next; 4067 wn = wl->next;
3589 cb (EV_A_ EV_SIGNAL, wl); 4068 cb (EV_A_ EV_SIGNAL, wl);
3590 wl = wn; 4069 wl = wn;
3591 } 4070 }
4071#endif
3592 4072
4073#if EV_CHILD_ENABLE
3593 if (types & EV_CHILD) 4074 if (types & EV_CHILD)
3594 for (i = EV_PID_HASHSIZE; i--; ) 4075 for (i = (EV_PID_HASHSIZE); i--; )
3595 for (wl = childs [i]; wl; ) 4076 for (wl = childs [i]; wl; )
3596 { 4077 {
3597 wn = wl->next; 4078 wn = wl->next;
3598 cb (EV_A_ EV_CHILD, wl); 4079 cb (EV_A_ EV_CHILD, wl);
3599 wl = wn; 4080 wl = wn;
3600 } 4081 }
4082#endif
3601/* EV_STAT 0x00001000 /* stat data changed */ 4083/* EV_STAT 0x00001000 /* stat data changed */
3602/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 4084/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3603} 4085}
3604#endif 4086#endif
3605 4087
3606#if EV_MULTIPLICITY 4088#if EV_MULTIPLICITY
3607 #include "ev_wrap.h" 4089 #include "ev_wrap.h"
3608#endif 4090#endif
3609 4091
3610#ifdef __cplusplus 4092EV_CPP(})
3611}
3612#endif
3613 4093

Diff Legend

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