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

Comparing libev/ev.c (file contents):
Revision 1.315 by root, Wed Aug 26 17:46:22 2009 UTC vs.
Revision 1.390 by root, Thu Aug 4 11:58:02 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__ >= 7)) 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
… …
392# define EFD_CLOEXEC O_CLOEXEC 418# define EFD_CLOEXEC O_CLOEXEC
393# else 419# else
394# define EFD_CLOEXEC 02000000 420# define EFD_CLOEXEC 02000000
395# endif 421# endif
396# endif 422# endif
397# ifdef __cplusplus
398extern "C" {
399# endif
400int eventfd (unsigned int initval, int flags); 423EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
401# ifdef __cplusplus
402}
403# endif
404#endif 424#endif
405 425
406#if EV_USE_SIGNALFD 426#if EV_USE_SIGNALFD
407/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 427/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
408# include <stdint.h> 428# include <stdint.h>
… …
414# define SFD_CLOEXEC O_CLOEXEC 434# define SFD_CLOEXEC O_CLOEXEC
415# else 435# else
416# define SFD_CLOEXEC 02000000 436# define SFD_CLOEXEC 02000000
417# endif 437# endif
418# endif 438# endif
419# ifdef __cplusplus
420extern "C" {
421# endif
422int signalfd (int fd, const sigset_t *mask, int flags); 439EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
423 440
424struct signalfd_siginfo 441struct signalfd_siginfo
425{ 442{
426 uint32_t ssi_signo; 443 uint32_t ssi_signo;
427 char pad[128 - sizeof (uint32_t)]; 444 char pad[128 - sizeof (uint32_t)];
428}; 445};
429# ifdef __cplusplus
430}
431# endif 446#endif
432#endif
433
434 447
435/**/ 448/**/
436 449
437#if EV_VERIFY >= 3 450#if EV_VERIFY >= 3
438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 451# define EV_FREQUENT_CHECK ev_verify (EV_A)
439#else 452#else
440# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
441#endif 454#endif
442 455
443/* 456/*
444 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
445 * It is added to ev_rt_now when scheduling periodics
446 * to ensure progress, time-wise, even when rounding
447 * errors are against us.
448 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
449 * Better solutions welcome.
450 */ 459 */
451#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 */
452 462
453#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) */
454#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) */
455/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
456 465
457#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)
458# 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)
459# 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
460#else 493#else
461# define expect(expr,value) (expr) 494 #define ecb_inline static
462# define noinline
463# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
464# define inline
465# 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 /* better be safe than sorry */
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
466#endif 508 #endif
509#endif
467 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 _MSC_VER >= 1400 /* VC++ 2005 */
517 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
518 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
519 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
520 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
521 #elif defined(_WIN32)
522 #include <WinNT.h>
523 #define ECB_MEMORY_FENCE MemoryBarrier ()
524 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
525 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
526 #endif
527#endif
528
529#ifndef ECB_MEMORY_FENCE
530 #include <pthread.h>
531
532 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
533 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
534 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
535 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
536#endif
537
538#if ECB_GCC_VERSION(3,1)
539 #define ecb_attribute(attrlist) __attribute__(attrlist)
540 #define ecb_is_constant(expr) __builtin_constant_p (expr)
541 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
542 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
543#else
544 #define ecb_attribute(attrlist)
545 #define ecb_is_constant(expr) 0
546 #define ecb_expect(expr,value) (expr)
547 #define ecb_prefetch(addr,rw,locality)
548#endif
549
550#define ecb_noinline ecb_attribute ((__noinline__))
551#define ecb_noreturn ecb_attribute ((__noreturn__))
552#define ecb_unused ecb_attribute ((__unused__))
553#define ecb_const ecb_attribute ((__const__))
554#define ecb_pure ecb_attribute ((__pure__))
555
556#if ECB_GCC_VERSION(4,3)
557 #define ecb_artificial ecb_attribute ((__artificial__))
558 #define ecb_hot ecb_attribute ((__hot__))
559 #define ecb_cold ecb_attribute ((__cold__))
560#else
561 #define ecb_artificial
562 #define ecb_hot
563 #define ecb_cold
564#endif
565
566/* put around conditional expressions if you are very sure that the */
567/* expression is mostly true or mostly false. note that these return */
568/* booleans, not the expression. */
468#define expect_false(expr) expect ((expr) != 0, 0) 569#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
469#define expect_true(expr) expect ((expr) != 0, 1) 570#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
571/* ecb.h end */
572
573#define expect_false(cond) ecb_expect_false (cond)
574#define expect_true(cond) ecb_expect_true (cond)
575#define noinline ecb_noinline
576
470#define inline_size static inline 577#define inline_size ecb_inline
471 578
472#if EV_MINIMAL 579#if EV_FEATURE_CODE
580# define inline_speed ecb_inline
581#else
473# define inline_speed static noinline 582# define inline_speed static noinline
474#else
475# define inline_speed static inline
476#endif 583#endif
477 584
478#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 585#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
479 586
480#if EV_MINPRI == EV_MAXPRI 587#if EV_MINPRI == EV_MAXPRI
… …
493#define ev_active(w) ((W)(w))->active 600#define ev_active(w) ((W)(w))->active
494#define ev_at(w) ((WT)(w))->at 601#define ev_at(w) ((WT)(w))->at
495 602
496#if EV_USE_REALTIME 603#if EV_USE_REALTIME
497/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 604/* sig_atomic_t is used to avoid per-thread variables or locking but still */
498/* giving it a reasonably high chance of working on typical architetcures */ 605/* giving it a reasonably high chance of working on typical architectures */
499static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 606static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
500#endif 607#endif
501 608
502#if EV_USE_MONOTONIC 609#if EV_USE_MONOTONIC
503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 610static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
505 612
506#ifndef EV_FD_TO_WIN32_HANDLE 613#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 614# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif 615#endif
509#ifndef EV_WIN32_HANDLE_TO_FD 616#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 617# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
511#endif 618#endif
512#ifndef EV_WIN32_CLOSE_FD 619#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd) 620# define EV_WIN32_CLOSE_FD(fd) close (fd)
514#endif 621#endif
515 622
… …
517# include "ev_win32.c" 624# include "ev_win32.c"
518#endif 625#endif
519 626
520/*****************************************************************************/ 627/*****************************************************************************/
521 628
629/* define a suitable floor function (only used by periodics atm) */
630
631#if EV_USE_FLOOR
632# include <math.h>
633# define ev_floor(v) floor (v)
634#else
635
636#include <float.h>
637
638/* a floor() replacement function, should be independent of ev_tstamp type */
639static ev_tstamp noinline
640ev_floor (ev_tstamp v)
641{
642 /* the choice of shift factor is not terribly important */
643#if FLT_RADIX != 2 /* assume FLT_RADIX == 10 */
644 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 10000000000000000000. : 1000000000.;
645#else
646 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 18446744073709551616. : 4294967296.;
647#endif
648
649 /* argument too large for an unsigned long? */
650 if (expect_false (v >= shift))
651 {
652 ev_tstamp f;
653
654 if (v == v - 1.)
655 return v; /* very large number */
656
657 f = shift * ev_floor (v * (1. / shift));
658 return f + ev_floor (v - f);
659 }
660
661 /* special treatment for negative args? */
662 if (expect_false (v < 0.))
663 {
664 ev_tstamp f = -ev_floor (-v);
665
666 return f - (f == v ? 0 : 1);
667 }
668
669 /* fits into an unsigned long */
670 return (unsigned long)v;
671}
672
673#endif
674
675/*****************************************************************************/
676
677#ifdef __linux
678# include <sys/utsname.h>
679#endif
680
681static unsigned int noinline ecb_cold
682ev_linux_version (void)
683{
684#ifdef __linux
685 unsigned int v = 0;
686 struct utsname buf;
687 int i;
688 char *p = buf.release;
689
690 if (uname (&buf))
691 return 0;
692
693 for (i = 3+1; --i; )
694 {
695 unsigned int c = 0;
696
697 for (;;)
698 {
699 if (*p >= '0' && *p <= '9')
700 c = c * 10 + *p++ - '0';
701 else
702 {
703 p += *p == '.';
704 break;
705 }
706 }
707
708 v = (v << 8) | c;
709 }
710
711 return v;
712#else
713 return 0;
714#endif
715}
716
717/*****************************************************************************/
718
719#if EV_AVOID_STDIO
720static void noinline ecb_cold
721ev_printerr (const char *msg)
722{
723 write (STDERR_FILENO, msg, strlen (msg));
724}
725#endif
726
522static void (*syserr_cb)(const char *msg); 727static void (*syserr_cb)(const char *msg);
523 728
524void 729void ecb_cold
525ev_set_syserr_cb (void (*cb)(const char *msg)) 730ev_set_syserr_cb (void (*cb)(const char *msg))
526{ 731{
527 syserr_cb = cb; 732 syserr_cb = cb;
528} 733}
529 734
530static void noinline 735static void noinline ecb_cold
531ev_syserr (const char *msg) 736ev_syserr (const char *msg)
532{ 737{
533 if (!msg) 738 if (!msg)
534 msg = "(libev) system error"; 739 msg = "(libev) system error";
535 740
536 if (syserr_cb) 741 if (syserr_cb)
537 syserr_cb (msg); 742 syserr_cb (msg);
538 else 743 else
539 { 744 {
745#if EV_AVOID_STDIO
746 ev_printerr (msg);
747 ev_printerr (": ");
748 ev_printerr (strerror (errno));
749 ev_printerr ("\n");
750#else
540 perror (msg); 751 perror (msg);
752#endif
541 abort (); 753 abort ();
542 } 754 }
543} 755}
544 756
545static void * 757static void *
546ev_realloc_emul (void *ptr, long size) 758ev_realloc_emul (void *ptr, long size)
547{ 759{
760#if __GLIBC__
761 return realloc (ptr, size);
762#else
548 /* some systems, notably openbsd and darwin, fail to properly 763 /* some systems, notably openbsd and darwin, fail to properly
549 * implement realloc (x, 0) (as required by both ansi c-98 and 764 * implement realloc (x, 0) (as required by both ansi c-89 and
550 * the single unix specification, so work around them here. 765 * the single unix specification, so work around them here.
551 */ 766 */
552 767
553 if (size) 768 if (size)
554 return realloc (ptr, size); 769 return realloc (ptr, size);
555 770
556 free (ptr); 771 free (ptr);
557 return 0; 772 return 0;
773#endif
558} 774}
559 775
560static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 776static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
561 777
562void 778void ecb_cold
563ev_set_allocator (void *(*cb)(void *ptr, long size)) 779ev_set_allocator (void *(*cb)(void *ptr, long size))
564{ 780{
565 alloc = cb; 781 alloc = cb;
566} 782}
567 783
… …
570{ 786{
571 ptr = alloc (ptr, size); 787 ptr = alloc (ptr, size);
572 788
573 if (!ptr && size) 789 if (!ptr && size)
574 { 790 {
791#if EV_AVOID_STDIO
792 ev_printerr ("(libev) memory allocation failed, aborting.\n");
793#else
575 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 794 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
795#endif
576 abort (); 796 abort ();
577 } 797 }
578 798
579 return ptr; 799 return ptr;
580} 800}
… …
596 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 816 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
597 unsigned char unused; 817 unsigned char unused;
598#if EV_USE_EPOLL 818#if EV_USE_EPOLL
599 unsigned int egen; /* generation counter to counter epoll bugs */ 819 unsigned int egen; /* generation counter to counter epoll bugs */
600#endif 820#endif
601#if EV_SELECT_IS_WINSOCKET 821#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
602 SOCKET handle; 822 SOCKET handle;
823#endif
824#if EV_USE_IOCP
825 OVERLAPPED or, ow;
603#endif 826#endif
604} ANFD; 827} ANFD;
605 828
606/* stores the pending event set for a given watcher */ 829/* stores the pending event set for a given watcher */
607typedef struct 830typedef struct
… …
662 885
663 static int ev_default_loop_ptr; 886 static int ev_default_loop_ptr;
664 887
665#endif 888#endif
666 889
667#if EV_MINIMAL < 2 890#if EV_FEATURE_API
668# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 891# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
669# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 892# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
670# define EV_INVOKE_PENDING invoke_cb (EV_A) 893# define EV_INVOKE_PENDING invoke_cb (EV_A)
671#else 894#else
672# define EV_RELEASE_CB (void)0 895# define EV_RELEASE_CB (void)0
673# define EV_ACQUIRE_CB (void)0 896# define EV_ACQUIRE_CB (void)0
674# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 897# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
675#endif 898#endif
676 899
677#define EVUNLOOP_RECURSE 0x80 900#define EVBREAK_RECURSE 0x80
678 901
679/*****************************************************************************/ 902/*****************************************************************************/
680 903
681#ifndef EV_HAVE_EV_TIME 904#ifndef EV_HAVE_EV_TIME
682ev_tstamp 905ev_tstamp
… …
726 if (delay > 0.) 949 if (delay > 0.)
727 { 950 {
728#if EV_USE_NANOSLEEP 951#if EV_USE_NANOSLEEP
729 struct timespec ts; 952 struct timespec ts;
730 953
731 ts.tv_sec = (time_t)delay; 954 EV_TS_SET (ts, delay);
732 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
733
734 nanosleep (&ts, 0); 955 nanosleep (&ts, 0);
735#elif defined(_WIN32) 956#elif defined(_WIN32)
736 Sleep ((unsigned long)(delay * 1e3)); 957 Sleep ((unsigned long)(delay * 1e3));
737#else 958#else
738 struct timeval tv; 959 struct timeval tv;
739 960
740 tv.tv_sec = (time_t)delay;
741 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
742
743 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 961 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
744 /* something not guaranteed by newer posix versions, but guaranteed */ 962 /* something not guaranteed by newer posix versions, but guaranteed */
745 /* by older ones */ 963 /* by older ones */
964 EV_TV_SET (tv, delay);
746 select (0, 0, 0, 0, &tv); 965 select (0, 0, 0, 0, &tv);
747#endif 966#endif
748 } 967 }
749} 968}
750 969
751/*****************************************************************************/ 970/*****************************************************************************/
752 971
753#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 972#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
754 973
755/* find a suitable new size for the given array, */ 974/* find a suitable new size for the given array, */
756/* hopefully by rounding to a ncie-to-malloc size */ 975/* hopefully by rounding to a nice-to-malloc size */
757inline_size int 976inline_size int
758array_nextsize (int elem, int cur, int cnt) 977array_nextsize (int elem, int cur, int cnt)
759{ 978{
760 int ncur = cur + 1; 979 int ncur = cur + 1;
761 980
… …
773 } 992 }
774 993
775 return ncur; 994 return ncur;
776} 995}
777 996
778static noinline void * 997static void * noinline ecb_cold
779array_realloc (int elem, void *base, int *cur, int cnt) 998array_realloc (int elem, void *base, int *cur, int cnt)
780{ 999{
781 *cur = array_nextsize (elem, *cur, cnt); 1000 *cur = array_nextsize (elem, *cur, cnt);
782 return ev_realloc (base, elem * *cur); 1001 return ev_realloc (base, elem * *cur);
783} 1002}
… …
786 memset ((void *)(base), 0, sizeof (*(base)) * (count)) 1005 memset ((void *)(base), 0, sizeof (*(base)) * (count))
787 1006
788#define array_needsize(type,base,cur,cnt,init) \ 1007#define array_needsize(type,base,cur,cnt,init) \
789 if (expect_false ((cnt) > (cur))) \ 1008 if (expect_false ((cnt) > (cur))) \
790 { \ 1009 { \
791 int ocur_ = (cur); \ 1010 int ecb_unused ocur_ = (cur); \
792 (base) = (type *)array_realloc \ 1011 (base) = (type *)array_realloc \
793 (sizeof (type), (base), &(cur), (cnt)); \ 1012 (sizeof (type), (base), &(cur), (cnt)); \
794 init ((base) + (ocur_), (cur) - ocur_); \ 1013 init ((base) + (ocur_), (cur) - ocur_); \
795 } 1014 }
796 1015
… …
857} 1076}
858 1077
859/*****************************************************************************/ 1078/*****************************************************************************/
860 1079
861inline_speed void 1080inline_speed void
862fd_event_nc (EV_P_ int fd, int revents) 1081fd_event_nocheck (EV_P_ int fd, int revents)
863{ 1082{
864 ANFD *anfd = anfds + fd; 1083 ANFD *anfd = anfds + fd;
865 ev_io *w; 1084 ev_io *w;
866 1085
867 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1086 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
879fd_event (EV_P_ int fd, int revents) 1098fd_event (EV_P_ int fd, int revents)
880{ 1099{
881 ANFD *anfd = anfds + fd; 1100 ANFD *anfd = anfds + fd;
882 1101
883 if (expect_true (!anfd->reify)) 1102 if (expect_true (!anfd->reify))
884 fd_event_nc (EV_A_ fd, revents); 1103 fd_event_nocheck (EV_A_ fd, revents);
885} 1104}
886 1105
887void 1106void
888ev_feed_fd_event (EV_P_ int fd, int revents) 1107ev_feed_fd_event (EV_P_ int fd, int revents)
889{ 1108{
890 if (fd >= 0 && fd < anfdmax) 1109 if (fd >= 0 && fd < anfdmax)
891 fd_event_nc (EV_A_ fd, revents); 1110 fd_event_nocheck (EV_A_ fd, revents);
892} 1111}
893 1112
894/* make sure the external fd watch events are in-sync */ 1113/* make sure the external fd watch events are in-sync */
895/* with the kernel/libev internal state */ 1114/* with the kernel/libev internal state */
896inline_size void 1115inline_size void
897fd_reify (EV_P) 1116fd_reify (EV_P)
898{ 1117{
899 int i; 1118 int i;
900 1119
1120#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1121 for (i = 0; i < fdchangecnt; ++i)
1122 {
1123 int fd = fdchanges [i];
1124 ANFD *anfd = anfds + fd;
1125
1126 if (anfd->reify & EV__IOFDSET && anfd->head)
1127 {
1128 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1129
1130 if (handle != anfd->handle)
1131 {
1132 unsigned long arg;
1133
1134 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1135
1136 /* handle changed, but fd didn't - we need to do it in two steps */
1137 backend_modify (EV_A_ fd, anfd->events, 0);
1138 anfd->events = 0;
1139 anfd->handle = handle;
1140 }
1141 }
1142 }
1143#endif
1144
901 for (i = 0; i < fdchangecnt; ++i) 1145 for (i = 0; i < fdchangecnt; ++i)
902 { 1146 {
903 int fd = fdchanges [i]; 1147 int fd = fdchanges [i];
904 ANFD *anfd = anfds + fd; 1148 ANFD *anfd = anfds + fd;
905 ev_io *w; 1149 ev_io *w;
906 1150
907 unsigned char events = 0; 1151 unsigned char o_events = anfd->events;
1152 unsigned char o_reify = anfd->reify;
908 1153
909 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1154 anfd->reify = 0;
910 events |= (unsigned char)w->events;
911 1155
912#if EV_SELECT_IS_WINSOCKET 1156 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
913 if (events)
914 { 1157 {
915 unsigned long arg; 1158 anfd->events = 0;
916 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 1159
917 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 1160 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1161 anfd->events |= (unsigned char)w->events;
1162
1163 if (o_events != anfd->events)
1164 o_reify = EV__IOFDSET; /* actually |= */
918 } 1165 }
919#endif
920 1166
921 { 1167 if (o_reify & EV__IOFDSET)
922 unsigned char o_events = anfd->events;
923 unsigned char o_reify = anfd->reify;
924
925 anfd->reify = 0;
926 anfd->events = events;
927
928 if (o_events != events || o_reify & EV__IOFDSET)
929 backend_modify (EV_A_ fd, o_events, events); 1168 backend_modify (EV_A_ fd, o_events, anfd->events);
930 }
931 } 1169 }
932 1170
933 fdchangecnt = 0; 1171 fdchangecnt = 0;
934} 1172}
935 1173
… …
947 fdchanges [fdchangecnt - 1] = fd; 1185 fdchanges [fdchangecnt - 1] = fd;
948 } 1186 }
949} 1187}
950 1188
951/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */ 1189/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
952inline_speed void 1190inline_speed void ecb_cold
953fd_kill (EV_P_ int fd) 1191fd_kill (EV_P_ int fd)
954{ 1192{
955 ev_io *w; 1193 ev_io *w;
956 1194
957 while ((w = (ev_io *)anfds [fd].head)) 1195 while ((w = (ev_io *)anfds [fd].head))
… …
959 ev_io_stop (EV_A_ w); 1197 ev_io_stop (EV_A_ w);
960 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1198 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
961 } 1199 }
962} 1200}
963 1201
964/* check whether the given fd is atcually valid, for error recovery */ 1202/* check whether the given fd is actually valid, for error recovery */
965inline_size int 1203inline_size int ecb_cold
966fd_valid (int fd) 1204fd_valid (int fd)
967{ 1205{
968#ifdef _WIN32 1206#ifdef _WIN32
969 return _get_osfhandle (fd) != -1; 1207 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
970#else 1208#else
971 return fcntl (fd, F_GETFD) != -1; 1209 return fcntl (fd, F_GETFD) != -1;
972#endif 1210#endif
973} 1211}
974 1212
975/* called on EBADF to verify fds */ 1213/* called on EBADF to verify fds */
976static void noinline 1214static void noinline ecb_cold
977fd_ebadf (EV_P) 1215fd_ebadf (EV_P)
978{ 1216{
979 int fd; 1217 int fd;
980 1218
981 for (fd = 0; fd < anfdmax; ++fd) 1219 for (fd = 0; fd < anfdmax; ++fd)
… …
983 if (!fd_valid (fd) && errno == EBADF) 1221 if (!fd_valid (fd) && errno == EBADF)
984 fd_kill (EV_A_ fd); 1222 fd_kill (EV_A_ fd);
985} 1223}
986 1224
987/* called on ENOMEM in select/poll to kill some fds and retry */ 1225/* called on ENOMEM in select/poll to kill some fds and retry */
988static void noinline 1226static void noinline ecb_cold
989fd_enomem (EV_P) 1227fd_enomem (EV_P)
990{ 1228{
991 int fd; 1229 int fd;
992 1230
993 for (fd = anfdmax; fd--; ) 1231 for (fd = anfdmax; fd--; )
… …
1011 anfds [fd].emask = 0; 1249 anfds [fd].emask = 0;
1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1250 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1013 } 1251 }
1014} 1252}
1015 1253
1254/* used to prepare libev internal fd's */
1255/* this is not fork-safe */
1256inline_speed void
1257fd_intern (int fd)
1258{
1259#ifdef _WIN32
1260 unsigned long arg = 1;
1261 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1262#else
1263 fcntl (fd, F_SETFD, FD_CLOEXEC);
1264 fcntl (fd, F_SETFL, O_NONBLOCK);
1265#endif
1266}
1267
1016/*****************************************************************************/ 1268/*****************************************************************************/
1017 1269
1018/* 1270/*
1019 * the heap functions want a real array index. array index 0 uis guaranteed to not 1271 * the heap functions want a real array index. array index 0 is guaranteed to not
1020 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1272 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1021 * the branching factor of the d-tree. 1273 * the branching factor of the d-tree.
1022 */ 1274 */
1023 1275
1024/* 1276/*
… …
1172 1424
1173static ANSIG signals [EV_NSIG - 1]; 1425static ANSIG signals [EV_NSIG - 1];
1174 1426
1175/*****************************************************************************/ 1427/*****************************************************************************/
1176 1428
1177/* used to prepare libev internal fd's */ 1429#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1178/* this is not fork-safe */
1179inline_speed void
1180fd_intern (int fd)
1181{
1182#ifdef _WIN32
1183 unsigned long arg = 1;
1184 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1185#else
1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
1187 fcntl (fd, F_SETFL, O_NONBLOCK);
1188#endif
1189}
1190 1430
1191static void noinline 1431static void noinline ecb_cold
1192evpipe_init (EV_P) 1432evpipe_init (EV_P)
1193{ 1433{
1194 if (!ev_is_active (&pipe_w)) 1434 if (!ev_is_active (&pipe_w))
1195 { 1435 {
1196#if EV_USE_EVENTFD 1436# if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1437 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL) 1438 if (evfd < 0 && errno == EINVAL)
1199 evfd = eventfd (0, 0); 1439 evfd = eventfd (0, 0);
1200 1440
1201 if (evfd >= 0) 1441 if (evfd >= 0)
… …
1203 evpipe [0] = -1; 1443 evpipe [0] = -1;
1204 fd_intern (evfd); /* doing it twice doesn't hurt */ 1444 fd_intern (evfd); /* doing it twice doesn't hurt */
1205 ev_io_set (&pipe_w, evfd, EV_READ); 1445 ev_io_set (&pipe_w, evfd, EV_READ);
1206 } 1446 }
1207 else 1447 else
1208#endif 1448# endif
1209 { 1449 {
1210 while (pipe (evpipe)) 1450 while (pipe (evpipe))
1211 ev_syserr ("(libev) error creating signal/async pipe"); 1451 ev_syserr ("(libev) error creating signal/async pipe");
1212 1452
1213 fd_intern (evpipe [0]); 1453 fd_intern (evpipe [0]);
… …
1218 ev_io_start (EV_A_ &pipe_w); 1458 ev_io_start (EV_A_ &pipe_w);
1219 ev_unref (EV_A); /* watcher should not keep loop alive */ 1459 ev_unref (EV_A); /* watcher should not keep loop alive */
1220 } 1460 }
1221} 1461}
1222 1462
1223inline_size void 1463inline_speed void
1224evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1464evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1225{ 1465{
1226 if (!*flag) 1466 if (expect_true (*flag))
1467 return;
1468
1469 *flag = 1;
1470
1471 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1472
1473 pipe_write_skipped = 1;
1474
1475 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1476
1477 if (pipe_write_wanted)
1227 { 1478 {
1479 int old_errno;
1480
1481 pipe_write_skipped = 0; /* just an optimsiation, no fence needed */
1482
1228 int old_errno = errno; /* save errno because write might clobber it */ 1483 old_errno = errno; /* save errno because write will clobber it */
1229
1230 *flag = 1;
1231 1484
1232#if EV_USE_EVENTFD 1485#if EV_USE_EVENTFD
1233 if (evfd >= 0) 1486 if (evfd >= 0)
1234 { 1487 {
1235 uint64_t counter = 1; 1488 uint64_t counter = 1;
1236 write (evfd, &counter, sizeof (uint64_t)); 1489 write (evfd, &counter, sizeof (uint64_t));
1237 } 1490 }
1238 else 1491 else
1239#endif 1492#endif
1493 {
1494 /* win32 people keep sending patches that change this write() to send() */
1495 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1496 /* so when you think this write should be a send instead, please find out */
1497 /* where your send() is from - it's definitely not the microsoft send, and */
1498 /* tell me. thank you. */
1240 write (evpipe [1], &old_errno, 1); 1499 write (evpipe [1], &(evpipe [1]), 1);
1500 }
1241 1501
1242 errno = old_errno; 1502 errno = old_errno;
1243 } 1503 }
1244} 1504}
1245 1505
… …
1248static void 1508static void
1249pipecb (EV_P_ ev_io *iow, int revents) 1509pipecb (EV_P_ ev_io *iow, int revents)
1250{ 1510{
1251 int i; 1511 int i;
1252 1512
1513 if (revents & EV_READ)
1514 {
1253#if EV_USE_EVENTFD 1515#if EV_USE_EVENTFD
1254 if (evfd >= 0) 1516 if (evfd >= 0)
1255 { 1517 {
1256 uint64_t counter; 1518 uint64_t counter;
1257 read (evfd, &counter, sizeof (uint64_t)); 1519 read (evfd, &counter, sizeof (uint64_t));
1258 } 1520 }
1259 else 1521 else
1260#endif 1522#endif
1261 { 1523 {
1262 char dummy; 1524 char dummy;
1525 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1263 read (evpipe [0], &dummy, 1); 1526 read (evpipe [0], &dummy, 1);
1527 }
1264 } 1528 }
1265 1529
1530 pipe_write_skipped = 0;
1531
1532#if EV_SIGNAL_ENABLE
1266 if (sig_pending) 1533 if (sig_pending)
1267 { 1534 {
1268 sig_pending = 0; 1535 sig_pending = 0;
1269 1536
1270 for (i = EV_NSIG - 1; i--; ) 1537 for (i = EV_NSIG - 1; i--; )
1271 if (expect_false (signals [i].pending)) 1538 if (expect_false (signals [i].pending))
1272 ev_feed_signal_event (EV_A_ i + 1); 1539 ev_feed_signal_event (EV_A_ i + 1);
1273 } 1540 }
1541#endif
1274 1542
1275#if EV_ASYNC_ENABLE 1543#if EV_ASYNC_ENABLE
1276 if (async_pending) 1544 if (async_pending)
1277 { 1545 {
1278 async_pending = 0; 1546 async_pending = 0;
… …
1287#endif 1555#endif
1288} 1556}
1289 1557
1290/*****************************************************************************/ 1558/*****************************************************************************/
1291 1559
1560void
1561ev_feed_signal (int signum)
1562{
1563#if EV_MULTIPLICITY
1564 EV_P = signals [signum - 1].loop;
1565
1566 if (!EV_A)
1567 return;
1568#endif
1569
1570 if (!ev_active (&pipe_w))
1571 return;
1572
1573 signals [signum - 1].pending = 1;
1574 evpipe_write (EV_A_ &sig_pending);
1575}
1576
1292static void 1577static void
1293ev_sighandler (int signum) 1578ev_sighandler (int signum)
1294{ 1579{
1295#if EV_MULTIPLICITY
1296 EV_P = signals [signum - 1].loop;
1297#endif
1298
1299#if _WIN32 1580#ifdef _WIN32
1300 signal (signum, ev_sighandler); 1581 signal (signum, ev_sighandler);
1301#endif 1582#endif
1302 1583
1303 signals [signum - 1].pending = 1; 1584 ev_feed_signal (signum);
1304 evpipe_write (EV_A_ &sig_pending);
1305} 1585}
1306 1586
1307void noinline 1587void noinline
1308ev_feed_signal_event (EV_P_ int signum) 1588ev_feed_signal_event (EV_P_ int signum)
1309{ 1589{
… …
1346 break; 1626 break;
1347 } 1627 }
1348} 1628}
1349#endif 1629#endif
1350 1630
1631#endif
1632
1351/*****************************************************************************/ 1633/*****************************************************************************/
1352 1634
1635#if EV_CHILD_ENABLE
1353static WL childs [EV_PID_HASHSIZE]; 1636static WL childs [EV_PID_HASHSIZE];
1354
1355#ifndef _WIN32
1356 1637
1357static ev_signal childev; 1638static ev_signal childev;
1358 1639
1359#ifndef WIFCONTINUED 1640#ifndef WIFCONTINUED
1360# define WIFCONTINUED(status) 0 1641# define WIFCONTINUED(status) 0
… …
1365child_reap (EV_P_ int chain, int pid, int status) 1646child_reap (EV_P_ int chain, int pid, int status)
1366{ 1647{
1367 ev_child *w; 1648 ev_child *w;
1368 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1649 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1369 1650
1370 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1651 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1371 { 1652 {
1372 if ((w->pid == pid || !w->pid) 1653 if ((w->pid == pid || !w->pid)
1373 && (!traced || (w->flags & 1))) 1654 && (!traced || (w->flags & 1)))
1374 { 1655 {
1375 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1656 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1400 /* make sure we are called again until all children have been reaped */ 1681 /* make sure we are called again until all children have been reaped */
1401 /* we need to do it this way so that the callback gets called before we continue */ 1682 /* we need to do it this way so that the callback gets called before we continue */
1402 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1683 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1403 1684
1404 child_reap (EV_A_ pid, pid, status); 1685 child_reap (EV_A_ pid, pid, status);
1405 if (EV_PID_HASHSIZE > 1) 1686 if ((EV_PID_HASHSIZE) > 1)
1406 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1687 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1407} 1688}
1408 1689
1409#endif 1690#endif
1410 1691
1411/*****************************************************************************/ 1692/*****************************************************************************/
1412 1693
1694#if EV_USE_IOCP
1695# include "ev_iocp.c"
1696#endif
1413#if EV_USE_PORT 1697#if EV_USE_PORT
1414# include "ev_port.c" 1698# include "ev_port.c"
1415#endif 1699#endif
1416#if EV_USE_KQUEUE 1700#if EV_USE_KQUEUE
1417# include "ev_kqueue.c" 1701# include "ev_kqueue.c"
… …
1424#endif 1708#endif
1425#if EV_USE_SELECT 1709#if EV_USE_SELECT
1426# include "ev_select.c" 1710# include "ev_select.c"
1427#endif 1711#endif
1428 1712
1429int 1713int ecb_cold
1430ev_version_major (void) 1714ev_version_major (void)
1431{ 1715{
1432 return EV_VERSION_MAJOR; 1716 return EV_VERSION_MAJOR;
1433} 1717}
1434 1718
1435int 1719int ecb_cold
1436ev_version_minor (void) 1720ev_version_minor (void)
1437{ 1721{
1438 return EV_VERSION_MINOR; 1722 return EV_VERSION_MINOR;
1439} 1723}
1440 1724
1441/* return true if we are running with elevated privileges and should ignore env variables */ 1725/* return true if we are running with elevated privileges and should ignore env variables */
1442int inline_size 1726int inline_size ecb_cold
1443enable_secure (void) 1727enable_secure (void)
1444{ 1728{
1445#ifdef _WIN32 1729#ifdef _WIN32
1446 return 0; 1730 return 0;
1447#else 1731#else
1448 return getuid () != geteuid () 1732 return getuid () != geteuid ()
1449 || getgid () != getegid (); 1733 || getgid () != getegid ();
1450#endif 1734#endif
1451} 1735}
1452 1736
1453unsigned int 1737unsigned int ecb_cold
1454ev_supported_backends (void) 1738ev_supported_backends (void)
1455{ 1739{
1456 unsigned int flags = 0; 1740 unsigned int flags = 0;
1457 1741
1458 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 1742 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
… …
1462 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 1746 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1463 1747
1464 return flags; 1748 return flags;
1465} 1749}
1466 1750
1467unsigned int 1751unsigned int ecb_cold
1468ev_recommended_backends (void) 1752ev_recommended_backends (void)
1469{ 1753{
1470 unsigned int flags = ev_supported_backends (); 1754 unsigned int flags = ev_supported_backends ();
1471 1755
1472#ifndef __NetBSD__ 1756#ifndef __NetBSD__
… …
1477#ifdef __APPLE__ 1761#ifdef __APPLE__
1478 /* only select works correctly on that "unix-certified" platform */ 1762 /* only select works correctly on that "unix-certified" platform */
1479 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1763 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1480 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1764 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1481#endif 1765#endif
1766#ifdef __FreeBSD__
1767 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1768#endif
1482 1769
1483 return flags; 1770 return flags;
1484} 1771}
1485 1772
1486unsigned int 1773unsigned int ecb_cold
1487ev_embeddable_backends (void) 1774ev_embeddable_backends (void)
1488{ 1775{
1489 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1776 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1490 1777
1491 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1778 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1492 /* please fix it and tell me how to detect the fix */ 1779 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1493 flags &= ~EVBACKEND_EPOLL; 1780 flags &= ~EVBACKEND_EPOLL;
1494 1781
1495 return flags; 1782 return flags;
1496} 1783}
1497 1784
1498unsigned int 1785unsigned int
1499ev_backend (EV_P) 1786ev_backend (EV_P)
1500{ 1787{
1501 return backend; 1788 return backend;
1502} 1789}
1503 1790
1504#if EV_MINIMAL < 2 1791#if EV_FEATURE_API
1505unsigned int 1792unsigned int
1506ev_loop_count (EV_P) 1793ev_iteration (EV_P)
1507{ 1794{
1508 return loop_count; 1795 return loop_count;
1509} 1796}
1510 1797
1511unsigned int 1798unsigned int
1512ev_loop_depth (EV_P) 1799ev_depth (EV_P)
1513{ 1800{
1514 return loop_depth; 1801 return loop_depth;
1515} 1802}
1516 1803
1517void 1804void
… …
1536ev_userdata (EV_P) 1823ev_userdata (EV_P)
1537{ 1824{
1538 return userdata; 1825 return userdata;
1539} 1826}
1540 1827
1828void
1541void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1829ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1542{ 1830{
1543 invoke_cb = invoke_pending_cb; 1831 invoke_cb = invoke_pending_cb;
1544} 1832}
1545 1833
1834void
1546void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 1835ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1547{ 1836{
1548 release_cb = release; 1837 release_cb = release;
1549 acquire_cb = acquire; 1838 acquire_cb = acquire;
1550} 1839}
1551#endif 1840#endif
1552 1841
1553/* initialise a loop structure, must be zero-initialised */ 1842/* initialise a loop structure, must be zero-initialised */
1554static void noinline 1843static void noinline ecb_cold
1555loop_init (EV_P_ unsigned int flags) 1844loop_init (EV_P_ unsigned int flags)
1556{ 1845{
1557 if (!backend) 1846 if (!backend)
1558 { 1847 {
1848 origflags = flags;
1849
1559#if EV_USE_REALTIME 1850#if EV_USE_REALTIME
1560 if (!have_realtime) 1851 if (!have_realtime)
1561 { 1852 {
1562 struct timespec ts; 1853 struct timespec ts;
1563 1854
… …
1585 if (!(flags & EVFLAG_NOENV) 1876 if (!(flags & EVFLAG_NOENV)
1586 && !enable_secure () 1877 && !enable_secure ()
1587 && getenv ("LIBEV_FLAGS")) 1878 && getenv ("LIBEV_FLAGS"))
1588 flags = atoi (getenv ("LIBEV_FLAGS")); 1879 flags = atoi (getenv ("LIBEV_FLAGS"));
1589 1880
1590 ev_rt_now = ev_time (); 1881 ev_rt_now = ev_time ();
1591 mn_now = get_clock (); 1882 mn_now = get_clock ();
1592 now_floor = mn_now; 1883 now_floor = mn_now;
1593 rtmn_diff = ev_rt_now - mn_now; 1884 rtmn_diff = ev_rt_now - mn_now;
1594#if EV_MINIMAL < 2 1885#if EV_FEATURE_API
1595 invoke_cb = ev_invoke_pending; 1886 invoke_cb = ev_invoke_pending;
1596#endif 1887#endif
1597 1888
1598 io_blocktime = 0.; 1889 io_blocktime = 0.;
1599 timeout_blocktime = 0.; 1890 timeout_blocktime = 0.;
1600 backend = 0; 1891 backend = 0;
1601 backend_fd = -1; 1892 backend_fd = -1;
1602 sig_pending = 0; 1893 sig_pending = 0;
1603#if EV_ASYNC_ENABLE 1894#if EV_ASYNC_ENABLE
1604 async_pending = 0; 1895 async_pending = 0;
1605#endif 1896#endif
1897 pipe_write_skipped = 0;
1898 pipe_write_wanted = 0;
1606#if EV_USE_INOTIFY 1899#if EV_USE_INOTIFY
1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1900 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1608#endif 1901#endif
1609#if EV_USE_SIGNALFD 1902#if EV_USE_SIGNALFD
1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1903 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1611#endif 1904#endif
1612 1905
1613 if (!(flags & 0x0000ffffU)) 1906 if (!(flags & EVBACKEND_MASK))
1614 flags |= ev_recommended_backends (); 1907 flags |= ev_recommended_backends ();
1615 1908
1909#if EV_USE_IOCP
1910 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1911#endif
1616#if EV_USE_PORT 1912#if EV_USE_PORT
1617 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1913 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1618#endif 1914#endif
1619#if EV_USE_KQUEUE 1915#if EV_USE_KQUEUE
1620 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1916 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1629 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1925 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1630#endif 1926#endif
1631 1927
1632 ev_prepare_init (&pending_w, pendingcb); 1928 ev_prepare_init (&pending_w, pendingcb);
1633 1929
1930#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1634 ev_init (&pipe_w, pipecb); 1931 ev_init (&pipe_w, pipecb);
1635 ev_set_priority (&pipe_w, EV_MAXPRI); 1932 ev_set_priority (&pipe_w, EV_MAXPRI);
1933#endif
1636 } 1934 }
1637} 1935}
1638 1936
1639/* free up a loop structure */ 1937/* free up a loop structure */
1640static void noinline 1938void ecb_cold
1641loop_destroy (EV_P) 1939ev_loop_destroy (EV_P)
1642{ 1940{
1643 int i; 1941 int i;
1942
1943#if EV_MULTIPLICITY
1944 /* mimic free (0) */
1945 if (!EV_A)
1946 return;
1947#endif
1948
1949#if EV_CLEANUP_ENABLE
1950 /* queue cleanup watchers (and execute them) */
1951 if (expect_false (cleanupcnt))
1952 {
1953 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1954 EV_INVOKE_PENDING;
1955 }
1956#endif
1957
1958#if EV_CHILD_ENABLE
1959 if (ev_is_active (&childev))
1960 {
1961 ev_ref (EV_A); /* child watcher */
1962 ev_signal_stop (EV_A_ &childev);
1963 }
1964#endif
1644 1965
1645 if (ev_is_active (&pipe_w)) 1966 if (ev_is_active (&pipe_w))
1646 { 1967 {
1647 /*ev_ref (EV_A);*/ 1968 /*ev_ref (EV_A);*/
1648 /*ev_io_stop (EV_A_ &pipe_w);*/ 1969 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1659 } 1980 }
1660 } 1981 }
1661 1982
1662#if EV_USE_SIGNALFD 1983#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w)) 1984 if (ev_is_active (&sigfd_w))
1664 {
1665 /*ev_ref (EV_A);*/
1666 /*ev_io_stop (EV_A_ &sigfd_w);*/
1667
1668 close (sigfd); 1985 close (sigfd);
1669 }
1670#endif 1986#endif
1671 1987
1672#if EV_USE_INOTIFY 1988#if EV_USE_INOTIFY
1673 if (fs_fd >= 0) 1989 if (fs_fd >= 0)
1674 close (fs_fd); 1990 close (fs_fd);
1675#endif 1991#endif
1676 1992
1677 if (backend_fd >= 0) 1993 if (backend_fd >= 0)
1678 close (backend_fd); 1994 close (backend_fd);
1679 1995
1996#if EV_USE_IOCP
1997 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1998#endif
1680#if EV_USE_PORT 1999#if EV_USE_PORT
1681 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 2000 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1682#endif 2001#endif
1683#if EV_USE_KQUEUE 2002#if EV_USE_KQUEUE
1684 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 2003 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1711 array_free (periodic, EMPTY); 2030 array_free (periodic, EMPTY);
1712#endif 2031#endif
1713#if EV_FORK_ENABLE 2032#if EV_FORK_ENABLE
1714 array_free (fork, EMPTY); 2033 array_free (fork, EMPTY);
1715#endif 2034#endif
2035#if EV_CLEANUP_ENABLE
2036 array_free (cleanup, EMPTY);
2037#endif
1716 array_free (prepare, EMPTY); 2038 array_free (prepare, EMPTY);
1717 array_free (check, EMPTY); 2039 array_free (check, EMPTY);
1718#if EV_ASYNC_ENABLE 2040#if EV_ASYNC_ENABLE
1719 array_free (async, EMPTY); 2041 array_free (async, EMPTY);
1720#endif 2042#endif
1721 2043
1722 backend = 0; 2044 backend = 0;
2045
2046#if EV_MULTIPLICITY
2047 if (ev_is_default_loop (EV_A))
2048#endif
2049 ev_default_loop_ptr = 0;
2050#if EV_MULTIPLICITY
2051 else
2052 ev_free (EV_A);
2053#endif
1723} 2054}
1724 2055
1725#if EV_USE_INOTIFY 2056#if EV_USE_INOTIFY
1726inline_size void infy_fork (EV_P); 2057inline_size void infy_fork (EV_P);
1727#endif 2058#endif
… …
1742 infy_fork (EV_A); 2073 infy_fork (EV_A);
1743#endif 2074#endif
1744 2075
1745 if (ev_is_active (&pipe_w)) 2076 if (ev_is_active (&pipe_w))
1746 { 2077 {
1747 /* this "locks" the handlers against writing to the pipe */ 2078 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1748 /* while we modify the fd vars */
1749 sig_pending = 1;
1750#if EV_ASYNC_ENABLE
1751 async_pending = 1;
1752#endif
1753 2079
1754 ev_ref (EV_A); 2080 ev_ref (EV_A);
1755 ev_io_stop (EV_A_ &pipe_w); 2081 ev_io_stop (EV_A_ &pipe_w);
1756 2082
1757#if EV_USE_EVENTFD 2083#if EV_USE_EVENTFD
… …
1763 { 2089 {
1764 EV_WIN32_CLOSE_FD (evpipe [0]); 2090 EV_WIN32_CLOSE_FD (evpipe [0]);
1765 EV_WIN32_CLOSE_FD (evpipe [1]); 2091 EV_WIN32_CLOSE_FD (evpipe [1]);
1766 } 2092 }
1767 2093
2094#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1768 evpipe_init (EV_A); 2095 evpipe_init (EV_A);
1769 /* now iterate over everything, in case we missed something */ 2096 /* now iterate over everything, in case we missed something */
1770 pipecb (EV_A_ &pipe_w, EV_READ); 2097 pipecb (EV_A_ &pipe_w, EV_READ);
2098#endif
1771 } 2099 }
1772 2100
1773 postfork = 0; 2101 postfork = 0;
1774} 2102}
1775 2103
1776#if EV_MULTIPLICITY 2104#if EV_MULTIPLICITY
1777 2105
1778struct ev_loop * 2106struct ev_loop * ecb_cold
1779ev_loop_new (unsigned int flags) 2107ev_loop_new (unsigned int flags)
1780{ 2108{
1781 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2109 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1782 2110
1783 memset (EV_A, 0, sizeof (struct ev_loop)); 2111 memset (EV_A, 0, sizeof (struct ev_loop));
1784 loop_init (EV_A_ flags); 2112 loop_init (EV_A_ flags);
1785 2113
1786 if (ev_backend (EV_A)) 2114 if (ev_backend (EV_A))
1787 return EV_A; 2115 return EV_A;
1788 2116
2117 ev_free (EV_A);
1789 return 0; 2118 return 0;
1790} 2119}
1791 2120
1792void
1793ev_loop_destroy (EV_P)
1794{
1795 loop_destroy (EV_A);
1796 ev_free (loop);
1797}
1798
1799void
1800ev_loop_fork (EV_P)
1801{
1802 postfork = 1; /* must be in line with ev_default_fork */
1803}
1804#endif /* multiplicity */ 2121#endif /* multiplicity */
1805 2122
1806#if EV_VERIFY 2123#if EV_VERIFY
1807static void noinline 2124static void noinline ecb_cold
1808verify_watcher (EV_P_ W w) 2125verify_watcher (EV_P_ W w)
1809{ 2126{
1810 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2127 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1811 2128
1812 if (w->pending) 2129 if (w->pending)
1813 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2130 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1814} 2131}
1815 2132
1816static void noinline 2133static void noinline ecb_cold
1817verify_heap (EV_P_ ANHE *heap, int N) 2134verify_heap (EV_P_ ANHE *heap, int N)
1818{ 2135{
1819 int i; 2136 int i;
1820 2137
1821 for (i = HEAP0; i < N + HEAP0; ++i) 2138 for (i = HEAP0; i < N + HEAP0; ++i)
… …
1826 2143
1827 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2144 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1828 } 2145 }
1829} 2146}
1830 2147
1831static void noinline 2148static void noinline ecb_cold
1832array_verify (EV_P_ W *ws, int cnt) 2149array_verify (EV_P_ W *ws, int cnt)
1833{ 2150{
1834 while (cnt--) 2151 while (cnt--)
1835 { 2152 {
1836 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2153 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1837 verify_watcher (EV_A_ ws [cnt]); 2154 verify_watcher (EV_A_ ws [cnt]);
1838 } 2155 }
1839} 2156}
1840#endif 2157#endif
1841 2158
1842#if EV_MINIMAL < 2 2159#if EV_FEATURE_API
1843void 2160void ecb_cold
1844ev_loop_verify (EV_P) 2161ev_verify (EV_P)
1845{ 2162{
1846#if EV_VERIFY 2163#if EV_VERIFY
1847 int i; 2164 int i;
1848 WL w; 2165 WL w;
1849 2166
… …
1883#if EV_FORK_ENABLE 2200#if EV_FORK_ENABLE
1884 assert (forkmax >= forkcnt); 2201 assert (forkmax >= forkcnt);
1885 array_verify (EV_A_ (W *)forks, forkcnt); 2202 array_verify (EV_A_ (W *)forks, forkcnt);
1886#endif 2203#endif
1887 2204
2205#if EV_CLEANUP_ENABLE
2206 assert (cleanupmax >= cleanupcnt);
2207 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2208#endif
2209
1888#if EV_ASYNC_ENABLE 2210#if EV_ASYNC_ENABLE
1889 assert (asyncmax >= asynccnt); 2211 assert (asyncmax >= asynccnt);
1890 array_verify (EV_A_ (W *)asyncs, asynccnt); 2212 array_verify (EV_A_ (W *)asyncs, asynccnt);
1891#endif 2213#endif
1892 2214
2215#if EV_PREPARE_ENABLE
1893 assert (preparemax >= preparecnt); 2216 assert (preparemax >= preparecnt);
1894 array_verify (EV_A_ (W *)prepares, preparecnt); 2217 array_verify (EV_A_ (W *)prepares, preparecnt);
2218#endif
1895 2219
2220#if EV_CHECK_ENABLE
1896 assert (checkmax >= checkcnt); 2221 assert (checkmax >= checkcnt);
1897 array_verify (EV_A_ (W *)checks, checkcnt); 2222 array_verify (EV_A_ (W *)checks, checkcnt);
2223#endif
1898 2224
1899# if 0 2225# if 0
2226#if EV_CHILD_ENABLE
1900 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2227 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1901 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 2228 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2229#endif
1902# endif 2230# endif
1903#endif 2231#endif
1904} 2232}
1905#endif 2233#endif
1906 2234
1907#if EV_MULTIPLICITY 2235#if EV_MULTIPLICITY
1908struct ev_loop * 2236struct ev_loop * ecb_cold
1909ev_default_loop_init (unsigned int flags)
1910#else 2237#else
1911int 2238int
2239#endif
1912ev_default_loop (unsigned int flags) 2240ev_default_loop (unsigned int flags)
1913#endif
1914{ 2241{
1915 if (!ev_default_loop_ptr) 2242 if (!ev_default_loop_ptr)
1916 { 2243 {
1917#if EV_MULTIPLICITY 2244#if EV_MULTIPLICITY
1918 EV_P = ev_default_loop_ptr = &default_loop_struct; 2245 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1922 2249
1923 loop_init (EV_A_ flags); 2250 loop_init (EV_A_ flags);
1924 2251
1925 if (ev_backend (EV_A)) 2252 if (ev_backend (EV_A))
1926 { 2253 {
1927#ifndef _WIN32 2254#if EV_CHILD_ENABLE
1928 ev_signal_init (&childev, childcb, SIGCHLD); 2255 ev_signal_init (&childev, childcb, SIGCHLD);
1929 ev_set_priority (&childev, EV_MAXPRI); 2256 ev_set_priority (&childev, EV_MAXPRI);
1930 ev_signal_start (EV_A_ &childev); 2257 ev_signal_start (EV_A_ &childev);
1931 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2258 ev_unref (EV_A); /* child watcher should not keep loop alive */
1932#endif 2259#endif
… …
1937 2264
1938 return ev_default_loop_ptr; 2265 return ev_default_loop_ptr;
1939} 2266}
1940 2267
1941void 2268void
1942ev_default_destroy (void) 2269ev_loop_fork (EV_P)
1943{ 2270{
1944#if EV_MULTIPLICITY
1945 EV_P = ev_default_loop_ptr;
1946#endif
1947
1948 ev_default_loop_ptr = 0;
1949
1950#ifndef _WIN32
1951 ev_ref (EV_A); /* child watcher */
1952 ev_signal_stop (EV_A_ &childev);
1953#endif
1954
1955 loop_destroy (EV_A);
1956}
1957
1958void
1959ev_default_fork (void)
1960{
1961#if EV_MULTIPLICITY
1962 EV_P = ev_default_loop_ptr;
1963#endif
1964
1965 postfork = 1; /* must be in line with ev_loop_fork */ 2271 postfork = 1; /* must be in line with ev_default_fork */
1966} 2272}
1967 2273
1968/*****************************************************************************/ 2274/*****************************************************************************/
1969 2275
1970void 2276void
… …
1992 2298
1993 for (pri = NUMPRI; pri--; ) 2299 for (pri = NUMPRI; pri--; )
1994 while (pendingcnt [pri]) 2300 while (pendingcnt [pri])
1995 { 2301 {
1996 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2302 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1997
1998 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1999 /* ^ this is no longer true, as pending_w could be here */
2000 2303
2001 p->w->pending = 0; 2304 p->w->pending = 0;
2002 EV_CB_INVOKE (p->w, p->events); 2305 EV_CB_INVOKE (p->w, p->events);
2003 EV_FREQUENT_CHECK; 2306 EV_FREQUENT_CHECK;
2004 } 2307 }
… …
2061 EV_FREQUENT_CHECK; 2364 EV_FREQUENT_CHECK;
2062 feed_reverse (EV_A_ (W)w); 2365 feed_reverse (EV_A_ (W)w);
2063 } 2366 }
2064 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2367 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2065 2368
2066 feed_reverse_done (EV_A_ EV_TIMEOUT); 2369 feed_reverse_done (EV_A_ EV_TIMER);
2067 } 2370 }
2068} 2371}
2069 2372
2070#if EV_PERIODIC_ENABLE 2373#if EV_PERIODIC_ENABLE
2374
2375static void noinline
2376periodic_recalc (EV_P_ ev_periodic *w)
2377{
2378 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2379 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2380
2381 /* the above almost always errs on the low side */
2382 while (at <= ev_rt_now)
2383 {
2384 ev_tstamp nat = at + w->interval;
2385
2386 /* when resolution fails us, we use ev_rt_now */
2387 if (expect_false (nat == at))
2388 {
2389 at = ev_rt_now;
2390 break;
2391 }
2392
2393 at = nat;
2394 }
2395
2396 ev_at (w) = at;
2397}
2398
2071/* make periodics pending */ 2399/* make periodics pending */
2072inline_size void 2400inline_size void
2073periodics_reify (EV_P) 2401periodics_reify (EV_P)
2074{ 2402{
2075 EV_FREQUENT_CHECK; 2403 EV_FREQUENT_CHECK;
… …
2094 ANHE_at_cache (periodics [HEAP0]); 2422 ANHE_at_cache (periodics [HEAP0]);
2095 downheap (periodics, periodiccnt, HEAP0); 2423 downheap (periodics, periodiccnt, HEAP0);
2096 } 2424 }
2097 else if (w->interval) 2425 else if (w->interval)
2098 { 2426 {
2099 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2427 periodic_recalc (EV_A_ w);
2100 /* if next trigger time is not sufficiently in the future, put it there */
2101 /* this might happen because of floating point inexactness */
2102 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2103 {
2104 ev_at (w) += w->interval;
2105
2106 /* if interval is unreasonably low we might still have a time in the past */
2107 /* so correct this. this will make the periodic very inexact, but the user */
2108 /* has effectively asked to get triggered more often than possible */
2109 if (ev_at (w) < ev_rt_now)
2110 ev_at (w) = ev_rt_now;
2111 }
2112
2113 ANHE_at_cache (periodics [HEAP0]); 2428 ANHE_at_cache (periodics [HEAP0]);
2114 downheap (periodics, periodiccnt, HEAP0); 2429 downheap (periodics, periodiccnt, HEAP0);
2115 } 2430 }
2116 else 2431 else
2117 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2432 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2124 feed_reverse_done (EV_A_ EV_PERIODIC); 2439 feed_reverse_done (EV_A_ EV_PERIODIC);
2125 } 2440 }
2126} 2441}
2127 2442
2128/* simply recalculate all periodics */ 2443/* simply recalculate all periodics */
2129/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2444/* TODO: maybe ensure that at least one event happens when jumping forward? */
2130static void noinline 2445static void noinline ecb_cold
2131periodics_reschedule (EV_P) 2446periodics_reschedule (EV_P)
2132{ 2447{
2133 int i; 2448 int i;
2134 2449
2135 /* adjust periodics after time jump */ 2450 /* adjust periodics after time jump */
… …
2138 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2453 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2139 2454
2140 if (w->reschedule_cb) 2455 if (w->reschedule_cb)
2141 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2456 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2142 else if (w->interval) 2457 else if (w->interval)
2143 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2458 periodic_recalc (EV_A_ w);
2144 2459
2145 ANHE_at_cache (periodics [i]); 2460 ANHE_at_cache (periodics [i]);
2146 } 2461 }
2147 2462
2148 reheap (periodics, periodiccnt); 2463 reheap (periodics, periodiccnt);
2149} 2464}
2150#endif 2465#endif
2151 2466
2152/* adjust all timers by a given offset */ 2467/* adjust all timers by a given offset */
2153static void noinline 2468static void noinline ecb_cold
2154timers_reschedule (EV_P_ ev_tstamp adjust) 2469timers_reschedule (EV_P_ ev_tstamp adjust)
2155{ 2470{
2156 int i; 2471 int i;
2157 2472
2158 for (i = 0; i < timercnt; ++i) 2473 for (i = 0; i < timercnt; ++i)
… …
2162 ANHE_at_cache (*he); 2477 ANHE_at_cache (*he);
2163 } 2478 }
2164} 2479}
2165 2480
2166/* fetch new monotonic and realtime times from the kernel */ 2481/* fetch new monotonic and realtime times from the kernel */
2167/* also detetc if there was a timejump, and act accordingly */ 2482/* also detect if there was a timejump, and act accordingly */
2168inline_speed void 2483inline_speed void
2169time_update (EV_P_ ev_tstamp max_block) 2484time_update (EV_P_ ev_tstamp max_block)
2170{ 2485{
2171#if EV_USE_MONOTONIC 2486#if EV_USE_MONOTONIC
2172 if (expect_true (have_monotonic)) 2487 if (expect_true (have_monotonic))
… …
2195 * doesn't hurt either as we only do this on time-jumps or 2510 * doesn't hurt either as we only do this on time-jumps or
2196 * in the unlikely event of having been preempted here. 2511 * in the unlikely event of having been preempted here.
2197 */ 2512 */
2198 for (i = 4; --i; ) 2513 for (i = 4; --i; )
2199 { 2514 {
2515 ev_tstamp diff;
2200 rtmn_diff = ev_rt_now - mn_now; 2516 rtmn_diff = ev_rt_now - mn_now;
2201 2517
2518 diff = odiff - rtmn_diff;
2519
2202 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2520 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2203 return; /* all is well */ 2521 return; /* all is well */
2204 2522
2205 ev_rt_now = ev_time (); 2523 ev_rt_now = ev_time ();
2206 mn_now = get_clock (); 2524 mn_now = get_clock ();
2207 now_floor = mn_now; 2525 now_floor = mn_now;
… …
2230 mn_now = ev_rt_now; 2548 mn_now = ev_rt_now;
2231 } 2549 }
2232} 2550}
2233 2551
2234void 2552void
2235ev_loop (EV_P_ int flags) 2553ev_run (EV_P_ int flags)
2236{ 2554{
2237#if EV_MINIMAL < 2 2555#if EV_FEATURE_API
2238 ++loop_depth; 2556 ++loop_depth;
2239#endif 2557#endif
2240 2558
2241 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2559 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2242 2560
2243 loop_done = EVUNLOOP_CANCEL; 2561 loop_done = EVBREAK_CANCEL;
2244 2562
2245 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2563 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2246 2564
2247 do 2565 do
2248 { 2566 {
2249#if EV_VERIFY >= 2 2567#if EV_VERIFY >= 2
2250 ev_loop_verify (EV_A); 2568 ev_verify (EV_A);
2251#endif 2569#endif
2252 2570
2253#ifndef _WIN32 2571#ifndef _WIN32
2254 if (expect_false (curpid)) /* penalise the forking check even more */ 2572 if (expect_false (curpid)) /* penalise the forking check even more */
2255 if (expect_false (getpid () != curpid)) 2573 if (expect_false (getpid () != curpid))
… …
2267 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2585 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2268 EV_INVOKE_PENDING; 2586 EV_INVOKE_PENDING;
2269 } 2587 }
2270#endif 2588#endif
2271 2589
2590#if EV_PREPARE_ENABLE
2272 /* queue prepare watchers (and execute them) */ 2591 /* queue prepare watchers (and execute them) */
2273 if (expect_false (preparecnt)) 2592 if (expect_false (preparecnt))
2274 { 2593 {
2275 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2594 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2276 EV_INVOKE_PENDING; 2595 EV_INVOKE_PENDING;
2277 } 2596 }
2597#endif
2278 2598
2279 if (expect_false (loop_done)) 2599 if (expect_false (loop_done))
2280 break; 2600 break;
2281 2601
2282 /* we might have forked, so reify kernel state if necessary */ 2602 /* we might have forked, so reify kernel state if necessary */
… …
2289 /* calculate blocking time */ 2609 /* calculate blocking time */
2290 { 2610 {
2291 ev_tstamp waittime = 0.; 2611 ev_tstamp waittime = 0.;
2292 ev_tstamp sleeptime = 0.; 2612 ev_tstamp sleeptime = 0.;
2293 2613
2614 /* remember old timestamp for io_blocktime calculation */
2615 ev_tstamp prev_mn_now = mn_now;
2616
2617 /* update time to cancel out callback processing overhead */
2618 time_update (EV_A_ 1e100);
2619
2620 /* from now on, we want a pipe-wake-up */
2621 pipe_write_wanted = 1;
2622
2623 ECB_MEMORY_FENCE; /* make sure pipe_write_wanted is visible before we check for potential skips */
2624
2294 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2625 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2295 { 2626 {
2296 /* remember old timestamp for io_blocktime calculation */
2297 ev_tstamp prev_mn_now = mn_now;
2298
2299 /* update time to cancel out callback processing overhead */
2300 time_update (EV_A_ 1e100);
2301
2302 waittime = MAX_BLOCKTIME; 2627 waittime = MAX_BLOCKTIME;
2303 2628
2304 if (timercnt) 2629 if (timercnt)
2305 { 2630 {
2306 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2631 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2307 if (waittime > to) waittime = to; 2632 if (waittime > to) waittime = to;
2308 } 2633 }
2309 2634
2310#if EV_PERIODIC_ENABLE 2635#if EV_PERIODIC_ENABLE
2311 if (periodiccnt) 2636 if (periodiccnt)
2312 { 2637 {
2313 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2638 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2314 if (waittime > to) waittime = to; 2639 if (waittime > to) waittime = to;
2315 } 2640 }
2316#endif 2641#endif
2317 2642
2318 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2643 /* don't let timeouts decrease the waittime below timeout_blocktime */
2319 if (expect_false (waittime < timeout_blocktime)) 2644 if (expect_false (waittime < timeout_blocktime))
2320 waittime = timeout_blocktime; 2645 waittime = timeout_blocktime;
2646
2647 /* at this point, we NEED to wait, so we have to ensure */
2648 /* to pass a minimum nonzero value to the backend */
2649 if (expect_false (waittime < backend_mintime))
2650 waittime = backend_mintime;
2321 2651
2322 /* extra check because io_blocktime is commonly 0 */ 2652 /* extra check because io_blocktime is commonly 0 */
2323 if (expect_false (io_blocktime)) 2653 if (expect_false (io_blocktime))
2324 { 2654 {
2325 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2655 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2326 2656
2327 if (sleeptime > waittime - backend_fudge) 2657 if (sleeptime > waittime - backend_mintime)
2328 sleeptime = waittime - backend_fudge; 2658 sleeptime = waittime - backend_mintime;
2329 2659
2330 if (expect_true (sleeptime > 0.)) 2660 if (expect_true (sleeptime > 0.))
2331 { 2661 {
2332 ev_sleep (sleeptime); 2662 ev_sleep (sleeptime);
2333 waittime -= sleeptime; 2663 waittime -= sleeptime;
2334 } 2664 }
2335 } 2665 }
2336 } 2666 }
2337 2667
2338#if EV_MINIMAL < 2 2668#if EV_FEATURE_API
2339 ++loop_count; 2669 ++loop_count;
2340#endif 2670#endif
2341 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2671 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2342 backend_poll (EV_A_ waittime); 2672 backend_poll (EV_A_ waittime);
2343 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2673 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2674
2675 pipe_write_wanted = 0; /* just an optimsiation, no fence needed */
2676
2677 if (pipe_write_skipped)
2678 {
2679 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2680 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2681 }
2682
2344 2683
2345 /* update ev_rt_now, do magic */ 2684 /* update ev_rt_now, do magic */
2346 time_update (EV_A_ waittime + sleeptime); 2685 time_update (EV_A_ waittime + sleeptime);
2347 } 2686 }
2348 2687
… …
2355#if EV_IDLE_ENABLE 2694#if EV_IDLE_ENABLE
2356 /* queue idle watchers unless other events are pending */ 2695 /* queue idle watchers unless other events are pending */
2357 idle_reify (EV_A); 2696 idle_reify (EV_A);
2358#endif 2697#endif
2359 2698
2699#if EV_CHECK_ENABLE
2360 /* queue check watchers, to be executed first */ 2700 /* queue check watchers, to be executed first */
2361 if (expect_false (checkcnt)) 2701 if (expect_false (checkcnt))
2362 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2702 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2703#endif
2363 2704
2364 EV_INVOKE_PENDING; 2705 EV_INVOKE_PENDING;
2365 } 2706 }
2366 while (expect_true ( 2707 while (expect_true (
2367 activecnt 2708 activecnt
2368 && !loop_done 2709 && !loop_done
2369 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2710 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2370 )); 2711 ));
2371 2712
2372 if (loop_done == EVUNLOOP_ONE) 2713 if (loop_done == EVBREAK_ONE)
2373 loop_done = EVUNLOOP_CANCEL; 2714 loop_done = EVBREAK_CANCEL;
2374 2715
2375#if EV_MINIMAL < 2 2716#if EV_FEATURE_API
2376 --loop_depth; 2717 --loop_depth;
2377#endif 2718#endif
2378} 2719}
2379 2720
2380void 2721void
2381ev_unloop (EV_P_ int how) 2722ev_break (EV_P_ int how)
2382{ 2723{
2383 loop_done = how; 2724 loop_done = how;
2384} 2725}
2385 2726
2386void 2727void
… …
2506 2847
2507 if (expect_false (ev_is_active (w))) 2848 if (expect_false (ev_is_active (w)))
2508 return; 2849 return;
2509 2850
2510 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2851 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2511 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2852 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2512 2853
2513 EV_FREQUENT_CHECK; 2854 EV_FREQUENT_CHECK;
2514 2855
2515 ev_start (EV_A_ (W)w, 1); 2856 ev_start (EV_A_ (W)w, 1);
2516 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2857 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2534 EV_FREQUENT_CHECK; 2875 EV_FREQUENT_CHECK;
2535 2876
2536 wlist_del (&anfds[w->fd].head, (WL)w); 2877 wlist_del (&anfds[w->fd].head, (WL)w);
2537 ev_stop (EV_A_ (W)w); 2878 ev_stop (EV_A_ (W)w);
2538 2879
2539 fd_change (EV_A_ w->fd, 1); 2880 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2540 2881
2541 EV_FREQUENT_CHECK; 2882 EV_FREQUENT_CHECK;
2542} 2883}
2543 2884
2544void noinline 2885void noinline
… …
2586 timers [active] = timers [timercnt + HEAP0]; 2927 timers [active] = timers [timercnt + HEAP0];
2587 adjustheap (timers, timercnt, active); 2928 adjustheap (timers, timercnt, active);
2588 } 2929 }
2589 } 2930 }
2590 2931
2591 EV_FREQUENT_CHECK;
2592
2593 ev_at (w) -= mn_now; 2932 ev_at (w) -= mn_now;
2594 2933
2595 ev_stop (EV_A_ (W)w); 2934 ev_stop (EV_A_ (W)w);
2935
2936 EV_FREQUENT_CHECK;
2596} 2937}
2597 2938
2598void noinline 2939void noinline
2599ev_timer_again (EV_P_ ev_timer *w) 2940ev_timer_again (EV_P_ ev_timer *w)
2600{ 2941{
… …
2636 if (w->reschedule_cb) 2977 if (w->reschedule_cb)
2637 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2978 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2638 else if (w->interval) 2979 else if (w->interval)
2639 { 2980 {
2640 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2981 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2641 /* this formula differs from the one in periodic_reify because we do not always round up */ 2982 periodic_recalc (EV_A_ w);
2642 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2643 } 2983 }
2644 else 2984 else
2645 ev_at (w) = w->offset; 2985 ev_at (w) = w->offset;
2646 2986
2647 EV_FREQUENT_CHECK; 2987 EV_FREQUENT_CHECK;
… …
2679 periodics [active] = periodics [periodiccnt + HEAP0]; 3019 periodics [active] = periodics [periodiccnt + HEAP0];
2680 adjustheap (periodics, periodiccnt, active); 3020 adjustheap (periodics, periodiccnt, active);
2681 } 3021 }
2682 } 3022 }
2683 3023
2684 EV_FREQUENT_CHECK;
2685
2686 ev_stop (EV_A_ (W)w); 3024 ev_stop (EV_A_ (W)w);
3025
3026 EV_FREQUENT_CHECK;
2687} 3027}
2688 3028
2689void noinline 3029void noinline
2690ev_periodic_again (EV_P_ ev_periodic *w) 3030ev_periodic_again (EV_P_ ev_periodic *w)
2691{ 3031{
… …
2696#endif 3036#endif
2697 3037
2698#ifndef SA_RESTART 3038#ifndef SA_RESTART
2699# define SA_RESTART 0 3039# define SA_RESTART 0
2700#endif 3040#endif
3041
3042#if EV_SIGNAL_ENABLE
2701 3043
2702void noinline 3044void noinline
2703ev_signal_start (EV_P_ ev_signal *w) 3045ev_signal_start (EV_P_ ev_signal *w)
2704{ 3046{
2705 if (expect_false (ev_is_active (w))) 3047 if (expect_false (ev_is_active (w)))
… …
2752 if (!((WL)w)->next) 3094 if (!((WL)w)->next)
2753# if EV_USE_SIGNALFD 3095# if EV_USE_SIGNALFD
2754 if (sigfd < 0) /*TODO*/ 3096 if (sigfd < 0) /*TODO*/
2755# endif 3097# endif
2756 { 3098 {
2757# if _WIN32 3099# ifdef _WIN32
3100 evpipe_init (EV_A);
3101
2758 signal (w->signum, ev_sighandler); 3102 signal (w->signum, ev_sighandler);
2759# else 3103# else
2760 struct sigaction sa; 3104 struct sigaction sa;
2761 3105
2762 evpipe_init (EV_A); 3106 evpipe_init (EV_A);
… …
2764 sa.sa_handler = ev_sighandler; 3108 sa.sa_handler = ev_sighandler;
2765 sigfillset (&sa.sa_mask); 3109 sigfillset (&sa.sa_mask);
2766 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 3110 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2767 sigaction (w->signum, &sa, 0); 3111 sigaction (w->signum, &sa, 0);
2768 3112
3113 if (origflags & EVFLAG_NOSIGMASK)
3114 {
2769 sigemptyset (&sa.sa_mask); 3115 sigemptyset (&sa.sa_mask);
2770 sigaddset (&sa.sa_mask, w->signum); 3116 sigaddset (&sa.sa_mask, w->signum);
2771 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 3117 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
3118 }
2772#endif 3119#endif
2773 } 3120 }
2774 3121
2775 EV_FREQUENT_CHECK; 3122 EV_FREQUENT_CHECK;
2776} 3123}
… …
2793 signals [w->signum - 1].loop = 0; /* unattach from signal */ 3140 signals [w->signum - 1].loop = 0; /* unattach from signal */
2794#endif 3141#endif
2795#if EV_USE_SIGNALFD 3142#if EV_USE_SIGNALFD
2796 if (sigfd >= 0) 3143 if (sigfd >= 0)
2797 { 3144 {
2798 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 3145 sigset_t ss;
3146
3147 sigemptyset (&ss);
3148 sigaddset (&ss, w->signum);
2799 sigdelset (&sigfd_set, w->signum); 3149 sigdelset (&sigfd_set, w->signum);
3150
2800 signalfd (sigfd, &sigfd_set, 0); 3151 signalfd (sigfd, &sigfd_set, 0);
2801 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 3152 sigprocmask (SIG_UNBLOCK, &ss, 0);
2802 /*TODO: maybe unblock signal? */
2803 } 3153 }
2804 else 3154 else
2805#endif 3155#endif
2806 signal (w->signum, SIG_DFL); 3156 signal (w->signum, SIG_DFL);
2807 } 3157 }
2808 3158
2809 EV_FREQUENT_CHECK; 3159 EV_FREQUENT_CHECK;
2810} 3160}
2811 3161
3162#endif
3163
3164#if EV_CHILD_ENABLE
3165
2812void 3166void
2813ev_child_start (EV_P_ ev_child *w) 3167ev_child_start (EV_P_ ev_child *w)
2814{ 3168{
2815#if EV_MULTIPLICITY 3169#if EV_MULTIPLICITY
2816 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 3170 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2819 return; 3173 return;
2820 3174
2821 EV_FREQUENT_CHECK; 3175 EV_FREQUENT_CHECK;
2822 3176
2823 ev_start (EV_A_ (W)w, 1); 3177 ev_start (EV_A_ (W)w, 1);
2824 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3178 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2825 3179
2826 EV_FREQUENT_CHECK; 3180 EV_FREQUENT_CHECK;
2827} 3181}
2828 3182
2829void 3183void
… …
2833 if (expect_false (!ev_is_active (w))) 3187 if (expect_false (!ev_is_active (w)))
2834 return; 3188 return;
2835 3189
2836 EV_FREQUENT_CHECK; 3190 EV_FREQUENT_CHECK;
2837 3191
2838 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3192 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2839 ev_stop (EV_A_ (W)w); 3193 ev_stop (EV_A_ (W)w);
2840 3194
2841 EV_FREQUENT_CHECK; 3195 EV_FREQUENT_CHECK;
2842} 3196}
3197
3198#endif
2843 3199
2844#if EV_STAT_ENABLE 3200#if EV_STAT_ENABLE
2845 3201
2846# ifdef _WIN32 3202# ifdef _WIN32
2847# undef lstat 3203# undef lstat
… …
2853#define MIN_STAT_INTERVAL 0.1074891 3209#define MIN_STAT_INTERVAL 0.1074891
2854 3210
2855static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 3211static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2856 3212
2857#if EV_USE_INOTIFY 3213#if EV_USE_INOTIFY
2858# define EV_INOTIFY_BUFSIZE 8192 3214
3215/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
3216# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2859 3217
2860static void noinline 3218static void noinline
2861infy_add (EV_P_ ev_stat *w) 3219infy_add (EV_P_ ev_stat *w)
2862{ 3220{
2863 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); 3221 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);
2864 3222
2865 if (w->wd < 0) 3223 if (w->wd >= 0)
3224 {
3225 struct statfs sfs;
3226
3227 /* now local changes will be tracked by inotify, but remote changes won't */
3228 /* unless the filesystem is known to be local, we therefore still poll */
3229 /* also do poll on <2.6.25, but with normal frequency */
3230
3231 if (!fs_2625)
3232 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3233 else if (!statfs (w->path, &sfs)
3234 && (sfs.f_type == 0x1373 /* devfs */
3235 || sfs.f_type == 0xEF53 /* ext2/3 */
3236 || sfs.f_type == 0x3153464a /* jfs */
3237 || sfs.f_type == 0x52654973 /* reiser3 */
3238 || sfs.f_type == 0x01021994 /* tempfs */
3239 || sfs.f_type == 0x58465342 /* xfs */))
3240 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3241 else
3242 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2866 { 3243 }
3244 else
3245 {
3246 /* can't use inotify, continue to stat */
2867 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3247 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2868 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2869 3248
2870 /* monitor some parent directory for speedup hints */ 3249 /* if path is not there, monitor some parent directory for speedup hints */
2871 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3250 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2872 /* but an efficiency issue only */ 3251 /* but an efficiency issue only */
2873 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3252 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2874 { 3253 {
2875 char path [4096]; 3254 char path [4096];
… …
2885 if (!pend || pend == path) 3264 if (!pend || pend == path)
2886 break; 3265 break;
2887 3266
2888 *pend = 0; 3267 *pend = 0;
2889 w->wd = inotify_add_watch (fs_fd, path, mask); 3268 w->wd = inotify_add_watch (fs_fd, path, mask);
2890 } 3269 }
2891 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3270 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2892 } 3271 }
2893 } 3272 }
2894 3273
2895 if (w->wd >= 0) 3274 if (w->wd >= 0)
2896 {
2897 struct statfs sfs;
2898
2899 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3275 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2900 3276
2901 /* now local changes will be tracked by inotify, but remote changes won't */ 3277 /* now re-arm timer, if required */
2902 /* unless the filesystem it known to be local, we therefore still poll */ 3278 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2903 /* also do poll on <2.6.25, but with normal frequency */
2904
2905 if (fs_2625 && !statfs (w->path, &sfs))
2906 if (sfs.f_type == 0x1373 /* devfs */
2907 || sfs.f_type == 0xEF53 /* ext2/3 */
2908 || sfs.f_type == 0x3153464a /* jfs */
2909 || sfs.f_type == 0x52654973 /* reiser3 */
2910 || sfs.f_type == 0x01021994 /* tempfs */
2911 || sfs.f_type == 0x58465342 /* xfs */)
2912 return;
2913
2914 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2915 ev_timer_again (EV_A_ &w->timer); 3279 ev_timer_again (EV_A_ &w->timer);
2916 } 3280 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2917} 3281}
2918 3282
2919static void noinline 3283static void noinline
2920infy_del (EV_P_ ev_stat *w) 3284infy_del (EV_P_ ev_stat *w)
2921{ 3285{
… …
2924 3288
2925 if (wd < 0) 3289 if (wd < 0)
2926 return; 3290 return;
2927 3291
2928 w->wd = -2; 3292 w->wd = -2;
2929 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3293 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2930 wlist_del (&fs_hash [slot].head, (WL)w); 3294 wlist_del (&fs_hash [slot].head, (WL)w);
2931 3295
2932 /* remove this watcher, if others are watching it, they will rearm */ 3296 /* remove this watcher, if others are watching it, they will rearm */
2933 inotify_rm_watch (fs_fd, wd); 3297 inotify_rm_watch (fs_fd, wd);
2934} 3298}
… …
2936static void noinline 3300static void noinline
2937infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3301infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2938{ 3302{
2939 if (slot < 0) 3303 if (slot < 0)
2940 /* overflow, need to check for all hash slots */ 3304 /* overflow, need to check for all hash slots */
2941 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3305 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2942 infy_wd (EV_A_ slot, wd, ev); 3306 infy_wd (EV_A_ slot, wd, ev);
2943 else 3307 else
2944 { 3308 {
2945 WL w_; 3309 WL w_;
2946 3310
2947 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3311 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2948 { 3312 {
2949 ev_stat *w = (ev_stat *)w_; 3313 ev_stat *w = (ev_stat *)w_;
2950 w_ = w_->next; /* lets us remove this watcher and all before it */ 3314 w_ = w_->next; /* lets us remove this watcher and all before it */
2951 3315
2952 if (w->wd == wd || wd == -1) 3316 if (w->wd == wd || wd == -1)
2953 { 3317 {
2954 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3318 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2955 { 3319 {
2956 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3320 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2957 w->wd = -1; 3321 w->wd = -1;
2958 infy_add (EV_A_ w); /* re-add, no matter what */ 3322 infy_add (EV_A_ w); /* re-add, no matter what */
2959 } 3323 }
2960 3324
2961 stat_timer_cb (EV_A_ &w->timer, 0); 3325 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2966 3330
2967static void 3331static void
2968infy_cb (EV_P_ ev_io *w, int revents) 3332infy_cb (EV_P_ ev_io *w, int revents)
2969{ 3333{
2970 char buf [EV_INOTIFY_BUFSIZE]; 3334 char buf [EV_INOTIFY_BUFSIZE];
2971 struct inotify_event *ev = (struct inotify_event *)buf;
2972 int ofs; 3335 int ofs;
2973 int len = read (fs_fd, buf, sizeof (buf)); 3336 int len = read (fs_fd, buf, sizeof (buf));
2974 3337
2975 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3338 for (ofs = 0; ofs < len; )
3339 {
3340 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2976 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3341 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3342 ofs += sizeof (struct inotify_event) + ev->len;
3343 }
2977} 3344}
2978 3345
2979inline_size void 3346inline_size void ecb_cold
2980check_2625 (EV_P) 3347ev_check_2625 (EV_P)
2981{ 3348{
2982 /* kernels < 2.6.25 are borked 3349 /* kernels < 2.6.25 are borked
2983 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3350 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2984 */ 3351 */
2985 struct utsname buf; 3352 if (ev_linux_version () < 0x020619)
2986 int major, minor, micro;
2987
2988 if (uname (&buf))
2989 return;
2990
2991 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2992 return;
2993
2994 if (major < 2
2995 || (major == 2 && minor < 6)
2996 || (major == 2 && minor == 6 && micro < 25))
2997 return; 3353 return;
2998 3354
2999 fs_2625 = 1; 3355 fs_2625 = 1;
3000} 3356}
3001 3357
… …
3016 if (fs_fd != -2) 3372 if (fs_fd != -2)
3017 return; 3373 return;
3018 3374
3019 fs_fd = -1; 3375 fs_fd = -1;
3020 3376
3021 check_2625 (EV_A); 3377 ev_check_2625 (EV_A);
3022 3378
3023 fs_fd = infy_newfd (); 3379 fs_fd = infy_newfd ();
3024 3380
3025 if (fs_fd >= 0) 3381 if (fs_fd >= 0)
3026 { 3382 {
3027 fd_intern (fs_fd); 3383 fd_intern (fs_fd);
3028 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3384 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
3029 ev_set_priority (&fs_w, EV_MAXPRI); 3385 ev_set_priority (&fs_w, EV_MAXPRI);
3030 ev_io_start (EV_A_ &fs_w); 3386 ev_io_start (EV_A_ &fs_w);
3387 ev_unref (EV_A);
3031 } 3388 }
3032} 3389}
3033 3390
3034inline_size void 3391inline_size void
3035infy_fork (EV_P) 3392infy_fork (EV_P)
… …
3037 int slot; 3394 int slot;
3038 3395
3039 if (fs_fd < 0) 3396 if (fs_fd < 0)
3040 return; 3397 return;
3041 3398
3399 ev_ref (EV_A);
3042 ev_io_stop (EV_A_ &fs_w); 3400 ev_io_stop (EV_A_ &fs_w);
3043 close (fs_fd); 3401 close (fs_fd);
3044 fs_fd = infy_newfd (); 3402 fs_fd = infy_newfd ();
3045 3403
3046 if (fs_fd >= 0) 3404 if (fs_fd >= 0)
3047 { 3405 {
3048 fd_intern (fs_fd); 3406 fd_intern (fs_fd);
3049 ev_io_set (&fs_w, fs_fd, EV_READ); 3407 ev_io_set (&fs_w, fs_fd, EV_READ);
3050 ev_io_start (EV_A_ &fs_w); 3408 ev_io_start (EV_A_ &fs_w);
3409 ev_unref (EV_A);
3051 } 3410 }
3052 3411
3053 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3412 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3054 { 3413 {
3055 WL w_ = fs_hash [slot].head; 3414 WL w_ = fs_hash [slot].head;
3056 fs_hash [slot].head = 0; 3415 fs_hash [slot].head = 0;
3057 3416
3058 while (w_) 3417 while (w_)
… …
3063 w->wd = -1; 3422 w->wd = -1;
3064 3423
3065 if (fs_fd >= 0) 3424 if (fs_fd >= 0)
3066 infy_add (EV_A_ w); /* re-add, no matter what */ 3425 infy_add (EV_A_ w); /* re-add, no matter what */
3067 else 3426 else
3427 {
3428 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3429 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3068 ev_timer_again (EV_A_ &w->timer); 3430 ev_timer_again (EV_A_ &w->timer);
3431 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3432 }
3069 } 3433 }
3070 } 3434 }
3071} 3435}
3072 3436
3073#endif 3437#endif
… …
3090static void noinline 3454static void noinline
3091stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3455stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3092{ 3456{
3093 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3457 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3094 3458
3095 /* we copy this here each the time so that */ 3459 ev_statdata prev = w->attr;
3096 /* prev has the old value when the callback gets invoked */
3097 w->prev = w->attr;
3098 ev_stat_stat (EV_A_ w); 3460 ev_stat_stat (EV_A_ w);
3099 3461
3100 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3462 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3101 if ( 3463 if (
3102 w->prev.st_dev != w->attr.st_dev 3464 prev.st_dev != w->attr.st_dev
3103 || w->prev.st_ino != w->attr.st_ino 3465 || prev.st_ino != w->attr.st_ino
3104 || w->prev.st_mode != w->attr.st_mode 3466 || prev.st_mode != w->attr.st_mode
3105 || w->prev.st_nlink != w->attr.st_nlink 3467 || prev.st_nlink != w->attr.st_nlink
3106 || w->prev.st_uid != w->attr.st_uid 3468 || prev.st_uid != w->attr.st_uid
3107 || w->prev.st_gid != w->attr.st_gid 3469 || prev.st_gid != w->attr.st_gid
3108 || w->prev.st_rdev != w->attr.st_rdev 3470 || prev.st_rdev != w->attr.st_rdev
3109 || w->prev.st_size != w->attr.st_size 3471 || prev.st_size != w->attr.st_size
3110 || w->prev.st_atime != w->attr.st_atime 3472 || prev.st_atime != w->attr.st_atime
3111 || w->prev.st_mtime != w->attr.st_mtime 3473 || prev.st_mtime != w->attr.st_mtime
3112 || w->prev.st_ctime != w->attr.st_ctime 3474 || prev.st_ctime != w->attr.st_ctime
3113 ) { 3475 ) {
3476 /* we only update w->prev on actual differences */
3477 /* in case we test more often than invoke the callback, */
3478 /* to ensure that prev is always different to attr */
3479 w->prev = prev;
3480
3114 #if EV_USE_INOTIFY 3481 #if EV_USE_INOTIFY
3115 if (fs_fd >= 0) 3482 if (fs_fd >= 0)
3116 { 3483 {
3117 infy_del (EV_A_ w); 3484 infy_del (EV_A_ w);
3118 infy_add (EV_A_ w); 3485 infy_add (EV_A_ w);
… …
3143 3510
3144 if (fs_fd >= 0) 3511 if (fs_fd >= 0)
3145 infy_add (EV_A_ w); 3512 infy_add (EV_A_ w);
3146 else 3513 else
3147#endif 3514#endif
3515 {
3148 ev_timer_again (EV_A_ &w->timer); 3516 ev_timer_again (EV_A_ &w->timer);
3517 ev_unref (EV_A);
3518 }
3149 3519
3150 ev_start (EV_A_ (W)w, 1); 3520 ev_start (EV_A_ (W)w, 1);
3151 3521
3152 EV_FREQUENT_CHECK; 3522 EV_FREQUENT_CHECK;
3153} 3523}
… …
3162 EV_FREQUENT_CHECK; 3532 EV_FREQUENT_CHECK;
3163 3533
3164#if EV_USE_INOTIFY 3534#if EV_USE_INOTIFY
3165 infy_del (EV_A_ w); 3535 infy_del (EV_A_ w);
3166#endif 3536#endif
3537
3538 if (ev_is_active (&w->timer))
3539 {
3540 ev_ref (EV_A);
3167 ev_timer_stop (EV_A_ &w->timer); 3541 ev_timer_stop (EV_A_ &w->timer);
3542 }
3168 3543
3169 ev_stop (EV_A_ (W)w); 3544 ev_stop (EV_A_ (W)w);
3170 3545
3171 EV_FREQUENT_CHECK; 3546 EV_FREQUENT_CHECK;
3172} 3547}
… …
3217 3592
3218 EV_FREQUENT_CHECK; 3593 EV_FREQUENT_CHECK;
3219} 3594}
3220#endif 3595#endif
3221 3596
3597#if EV_PREPARE_ENABLE
3222void 3598void
3223ev_prepare_start (EV_P_ ev_prepare *w) 3599ev_prepare_start (EV_P_ ev_prepare *w)
3224{ 3600{
3225 if (expect_false (ev_is_active (w))) 3601 if (expect_false (ev_is_active (w)))
3226 return; 3602 return;
… …
3252 3628
3253 ev_stop (EV_A_ (W)w); 3629 ev_stop (EV_A_ (W)w);
3254 3630
3255 EV_FREQUENT_CHECK; 3631 EV_FREQUENT_CHECK;
3256} 3632}
3633#endif
3257 3634
3635#if EV_CHECK_ENABLE
3258void 3636void
3259ev_check_start (EV_P_ ev_check *w) 3637ev_check_start (EV_P_ ev_check *w)
3260{ 3638{
3261 if (expect_false (ev_is_active (w))) 3639 if (expect_false (ev_is_active (w)))
3262 return; 3640 return;
… …
3288 3666
3289 ev_stop (EV_A_ (W)w); 3667 ev_stop (EV_A_ (W)w);
3290 3668
3291 EV_FREQUENT_CHECK; 3669 EV_FREQUENT_CHECK;
3292} 3670}
3671#endif
3293 3672
3294#if EV_EMBED_ENABLE 3673#if EV_EMBED_ENABLE
3295void noinline 3674void noinline
3296ev_embed_sweep (EV_P_ ev_embed *w) 3675ev_embed_sweep (EV_P_ ev_embed *w)
3297{ 3676{
3298 ev_loop (w->other, EVLOOP_NONBLOCK); 3677 ev_run (w->other, EVRUN_NOWAIT);
3299} 3678}
3300 3679
3301static void 3680static void
3302embed_io_cb (EV_P_ ev_io *io, int revents) 3681embed_io_cb (EV_P_ ev_io *io, int revents)
3303{ 3682{
3304 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3683 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3305 3684
3306 if (ev_cb (w)) 3685 if (ev_cb (w))
3307 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3686 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3308 else 3687 else
3309 ev_loop (w->other, EVLOOP_NONBLOCK); 3688 ev_run (w->other, EVRUN_NOWAIT);
3310} 3689}
3311 3690
3312static void 3691static void
3313embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3692embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3314{ 3693{
… …
3318 EV_P = w->other; 3697 EV_P = w->other;
3319 3698
3320 while (fdchangecnt) 3699 while (fdchangecnt)
3321 { 3700 {
3322 fd_reify (EV_A); 3701 fd_reify (EV_A);
3323 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3702 ev_run (EV_A_ EVRUN_NOWAIT);
3324 } 3703 }
3325 } 3704 }
3326} 3705}
3327 3706
3328static void 3707static void
… …
3334 3713
3335 { 3714 {
3336 EV_P = w->other; 3715 EV_P = w->other;
3337 3716
3338 ev_loop_fork (EV_A); 3717 ev_loop_fork (EV_A);
3339 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3718 ev_run (EV_A_ EVRUN_NOWAIT);
3340 } 3719 }
3341 3720
3342 ev_embed_start (EV_A_ w); 3721 ev_embed_start (EV_A_ w);
3343} 3722}
3344 3723
… …
3392 3771
3393 ev_io_stop (EV_A_ &w->io); 3772 ev_io_stop (EV_A_ &w->io);
3394 ev_prepare_stop (EV_A_ &w->prepare); 3773 ev_prepare_stop (EV_A_ &w->prepare);
3395 ev_fork_stop (EV_A_ &w->fork); 3774 ev_fork_stop (EV_A_ &w->fork);
3396 3775
3776 ev_stop (EV_A_ (W)w);
3777
3397 EV_FREQUENT_CHECK; 3778 EV_FREQUENT_CHECK;
3398} 3779}
3399#endif 3780#endif
3400 3781
3401#if EV_FORK_ENABLE 3782#if EV_FORK_ENABLE
… …
3434 3815
3435 EV_FREQUENT_CHECK; 3816 EV_FREQUENT_CHECK;
3436} 3817}
3437#endif 3818#endif
3438 3819
3820#if EV_CLEANUP_ENABLE
3821void
3822ev_cleanup_start (EV_P_ ev_cleanup *w)
3823{
3824 if (expect_false (ev_is_active (w)))
3825 return;
3826
3827 EV_FREQUENT_CHECK;
3828
3829 ev_start (EV_A_ (W)w, ++cleanupcnt);
3830 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3831 cleanups [cleanupcnt - 1] = w;
3832
3833 /* cleanup watchers should never keep a refcount on the loop */
3834 ev_unref (EV_A);
3835 EV_FREQUENT_CHECK;
3836}
3837
3838void
3839ev_cleanup_stop (EV_P_ ev_cleanup *w)
3840{
3841 clear_pending (EV_A_ (W)w);
3842 if (expect_false (!ev_is_active (w)))
3843 return;
3844
3845 EV_FREQUENT_CHECK;
3846 ev_ref (EV_A);
3847
3848 {
3849 int active = ev_active (w);
3850
3851 cleanups [active - 1] = cleanups [--cleanupcnt];
3852 ev_active (cleanups [active - 1]) = active;
3853 }
3854
3855 ev_stop (EV_A_ (W)w);
3856
3857 EV_FREQUENT_CHECK;
3858}
3859#endif
3860
3439#if EV_ASYNC_ENABLE 3861#if EV_ASYNC_ENABLE
3440void 3862void
3441ev_async_start (EV_P_ ev_async *w) 3863ev_async_start (EV_P_ ev_async *w)
3442{ 3864{
3443 if (expect_false (ev_is_active (w))) 3865 if (expect_false (ev_is_active (w)))
3444 return; 3866 return;
3867
3868 w->sent = 0;
3445 3869
3446 evpipe_init (EV_A); 3870 evpipe_init (EV_A);
3447 3871
3448 EV_FREQUENT_CHECK; 3872 EV_FREQUENT_CHECK;
3449 3873
… …
3527{ 3951{
3528 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3952 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3529 3953
3530 if (expect_false (!once)) 3954 if (expect_false (!once))
3531 { 3955 {
3532 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3956 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3533 return; 3957 return;
3534 } 3958 }
3535 3959
3536 once->cb = cb; 3960 once->cb = cb;
3537 once->arg = arg; 3961 once->arg = arg;
… …
3552} 3976}
3553 3977
3554/*****************************************************************************/ 3978/*****************************************************************************/
3555 3979
3556#if EV_WALK_ENABLE 3980#if EV_WALK_ENABLE
3557void 3981void ecb_cold
3558ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3982ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3559{ 3983{
3560 int i, j; 3984 int i, j;
3561 ev_watcher_list *wl, *wn; 3985 ev_watcher_list *wl, *wn;
3562 3986
… …
3606 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i])); 4030 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3607#endif 4031#endif
3608 4032
3609#if EV_IDLE_ENABLE 4033#if EV_IDLE_ENABLE
3610 if (types & EV_IDLE) 4034 if (types & EV_IDLE)
3611 for (j = NUMPRI; i--; ) 4035 for (j = NUMPRI; j--; )
3612 for (i = idlecnt [j]; i--; ) 4036 for (i = idlecnt [j]; i--; )
3613 cb (EV_A_ EV_IDLE, idles [j][i]); 4037 cb (EV_A_ EV_IDLE, idles [j][i]);
3614#endif 4038#endif
3615 4039
3616#if EV_FORK_ENABLE 4040#if EV_FORK_ENABLE
… …
3624 if (types & EV_ASYNC) 4048 if (types & EV_ASYNC)
3625 for (i = asynccnt; i--; ) 4049 for (i = asynccnt; i--; )
3626 cb (EV_A_ EV_ASYNC, asyncs [i]); 4050 cb (EV_A_ EV_ASYNC, asyncs [i]);
3627#endif 4051#endif
3628 4052
4053#if EV_PREPARE_ENABLE
3629 if (types & EV_PREPARE) 4054 if (types & EV_PREPARE)
3630 for (i = preparecnt; i--; ) 4055 for (i = preparecnt; i--; )
3631#if EV_EMBED_ENABLE 4056# if EV_EMBED_ENABLE
3632 if (ev_cb (prepares [i]) != embed_prepare_cb) 4057 if (ev_cb (prepares [i]) != embed_prepare_cb)
3633#endif 4058# endif
3634 cb (EV_A_ EV_PREPARE, prepares [i]); 4059 cb (EV_A_ EV_PREPARE, prepares [i]);
4060#endif
3635 4061
4062#if EV_CHECK_ENABLE
3636 if (types & EV_CHECK) 4063 if (types & EV_CHECK)
3637 for (i = checkcnt; i--; ) 4064 for (i = checkcnt; i--; )
3638 cb (EV_A_ EV_CHECK, checks [i]); 4065 cb (EV_A_ EV_CHECK, checks [i]);
4066#endif
3639 4067
4068#if EV_SIGNAL_ENABLE
3640 if (types & EV_SIGNAL) 4069 if (types & EV_SIGNAL)
3641 for (i = 0; i < EV_NSIG - 1; ++i) 4070 for (i = 0; i < EV_NSIG - 1; ++i)
3642 for (wl = signals [i].head; wl; ) 4071 for (wl = signals [i].head; wl; )
3643 { 4072 {
3644 wn = wl->next; 4073 wn = wl->next;
3645 cb (EV_A_ EV_SIGNAL, wl); 4074 cb (EV_A_ EV_SIGNAL, wl);
3646 wl = wn; 4075 wl = wn;
3647 } 4076 }
4077#endif
3648 4078
4079#if EV_CHILD_ENABLE
3649 if (types & EV_CHILD) 4080 if (types & EV_CHILD)
3650 for (i = EV_PID_HASHSIZE; i--; ) 4081 for (i = (EV_PID_HASHSIZE); i--; )
3651 for (wl = childs [i]; wl; ) 4082 for (wl = childs [i]; wl; )
3652 { 4083 {
3653 wn = wl->next; 4084 wn = wl->next;
3654 cb (EV_A_ EV_CHILD, wl); 4085 cb (EV_A_ EV_CHILD, wl);
3655 wl = wn; 4086 wl = wn;
3656 } 4087 }
4088#endif
3657/* EV_STAT 0x00001000 /* stat data changed */ 4089/* EV_STAT 0x00001000 /* stat data changed */
3658/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 4090/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3659} 4091}
3660#endif 4092#endif
3661 4093
3662#if EV_MULTIPLICITY 4094#if EV_MULTIPLICITY
3663 #include "ev_wrap.h" 4095 #include "ev_wrap.h"
3664#endif 4096#endif
3665 4097
3666#ifdef __cplusplus 4098EV_CPP(})
3667}
3668#endif
3669 4099

Diff Legend

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