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

Comparing libev/ev.c (file contents):
Revision 1.313 by root, Wed Aug 19 23:44:51 2009 UTC vs.
Revision 1.373 by root, Sun Feb 20 02:56:23 2011 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright notice, 10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer. 11 * this list of conditions and the following disclaimer.
12 * 12 *
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
16 * 16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
49# include "config.h" 45# include "config.h"
50# endif 46# endif
47
48#if HAVE_FLOOR
49# ifndef EV_USE_FLOOR
50# define EV_USE_FLOOR 1
51# endif
52#endif
51 53
52# if HAVE_CLOCK_SYSCALL 54# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL 55# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1 56# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME 57# ifndef EV_USE_REALTIME
… …
77# ifndef EV_USE_REALTIME 79# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 80# define EV_USE_REALTIME 0
79# endif 81# endif
80# endif 82# endif
81 83
84# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 85# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 86# define EV_USE_NANOSLEEP EV_FEATURE_OS
87# endif
85# else 88# else
89# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 90# define EV_USE_NANOSLEEP 0
91# endif
92
93# if HAVE_SELECT && HAVE_SYS_SELECT_H
94# ifndef EV_USE_SELECT
95# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 96# endif
97# else
98# undef EV_USE_SELECT
99# define EV_USE_SELECT 0
88# endif 100# endif
89 101
102# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 103# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 104# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 105# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 106# else
107# undef EV_USE_POLL
102# define EV_USE_POLL 0 108# define EV_USE_POLL 0
103# endif
104# endif 109# endif
105 110
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 111# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 112# ifndef EV_USE_EPOLL
109# else 113# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 114# endif
115# else
116# undef EV_USE_EPOLL
117# define EV_USE_EPOLL 0
112# endif 118# endif
113 119
120# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# ifndef EV_USE_KQUEUE 121# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 122# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
116# define EV_USE_KQUEUE 1
117# else
118# define EV_USE_KQUEUE 0
119# endif 123# endif
124# else
125# undef EV_USE_KQUEUE
126# define EV_USE_KQUEUE 0
120# endif 127# endif
121 128
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 129# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 130# ifndef EV_USE_PORT
125# else 131# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 132# endif
133# else
134# undef EV_USE_PORT
135# define EV_USE_PORT 0
128# endif 136# endif
129 137
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 138# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 139# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 140# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 141# endif
142# else
143# undef EV_USE_INOTIFY
144# define EV_USE_INOTIFY 0
136# endif 145# endif
137 146
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 147# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 148# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 149# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 150# endif
151# else
152# undef EV_USE_SIGNALFD
153# define EV_USE_SIGNALFD 0
144# endif 154# endif
145 155
156# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 157# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 158# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 159# endif
160# else
161# undef EV_USE_EVENTFD
162# define EV_USE_EVENTFD 0
152# endif 163# endif
153 164
154#endif 165#endif
155 166
156#include <math.h>
157#include <stdlib.h> 167#include <stdlib.h>
168#include <string.h>
158#include <fcntl.h> 169#include <fcntl.h>
159#include <stddef.h> 170#include <stddef.h>
160 171
161#include <stdio.h> 172#include <stdio.h>
162 173
163#include <assert.h> 174#include <assert.h>
164#include <errno.h> 175#include <errno.h>
165#include <sys/types.h> 176#include <sys/types.h>
166#include <time.h> 177#include <time.h>
178#include <limits.h>
167 179
168#include <signal.h> 180#include <signal.h>
169 181
170#ifdef EV_H 182#ifdef EV_H
171# include EV_H 183# include EV_H
172#else 184#else
173# include "ev.h" 185# include "ev.h"
174#endif 186#endif
187
188EV_CPP(extern "C" {)
175 189
176#ifndef _WIN32 190#ifndef _WIN32
177# include <sys/time.h> 191# include <sys/time.h>
178# include <sys/wait.h> 192# include <sys/wait.h>
179# include <unistd.h> 193# include <unistd.h>
… …
182# define WIN32_LEAN_AND_MEAN 196# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 197# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 198# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 199# define EV_SELECT_IS_WINSOCKET 1
186# endif 200# endif
201# undef EV_AVOID_STDIO
187#endif 202#endif
203
204/* OS X, in its infinite idiocy, actually HARDCODES
205 * a limit of 1024 into their select. Where people have brains,
206 * OS X engineers apparently have a vacuum. Or maybe they were
207 * ordered to have a vacuum, or they do anything for money.
208 * This might help. Or not.
209 */
210#define _DARWIN_UNLIMITED_SELECT 1
188 211
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 212/* this block tries to deduce configuration from header-defined symbols and defaults */
190 213
191/* try to deduce the maximum number of signals on this platform */ 214/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG) 215#if defined (EV_NSIG)
… …
204#elif defined (MAXSIG) 227#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 228# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 229#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 230# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 231#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 232# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 233#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 234# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 235#else
213# error "unable to find value for NSIG, please report" 236# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 237/* to make it compile regardless, just remove the above line, */
238/* but consider reporting it, too! :) */
215# define EV_NSIG 65 239# define EV_NSIG 65
240#endif
241
242#ifndef EV_USE_FLOOR
243# define EV_USE_FLOOR 0
216#endif 244#endif
217 245
218#ifndef EV_USE_CLOCK_SYSCALL 246#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2 247# if __linux && __GLIBC__ >= 2
220# define EV_USE_CLOCK_SYSCALL 1 248# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
221# else 249# else
222# define EV_USE_CLOCK_SYSCALL 0 250# define EV_USE_CLOCK_SYSCALL 0
223# endif 251# endif
224#endif 252#endif
225 253
226#ifndef EV_USE_MONOTONIC 254#ifndef EV_USE_MONOTONIC
227# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 255# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
228# define EV_USE_MONOTONIC 1 256# define EV_USE_MONOTONIC EV_FEATURE_OS
229# else 257# else
230# define EV_USE_MONOTONIC 0 258# define EV_USE_MONOTONIC 0
231# endif 259# endif
232#endif 260#endif
233 261
… …
235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 263# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
236#endif 264#endif
237 265
238#ifndef EV_USE_NANOSLEEP 266#ifndef EV_USE_NANOSLEEP
239# if _POSIX_C_SOURCE >= 199309L 267# if _POSIX_C_SOURCE >= 199309L
240# define EV_USE_NANOSLEEP 1 268# define EV_USE_NANOSLEEP EV_FEATURE_OS
241# else 269# else
242# define EV_USE_NANOSLEEP 0 270# define EV_USE_NANOSLEEP 0
243# endif 271# endif
244#endif 272#endif
245 273
246#ifndef EV_USE_SELECT 274#ifndef EV_USE_SELECT
247# define EV_USE_SELECT 1 275# define EV_USE_SELECT EV_FEATURE_BACKENDS
248#endif 276#endif
249 277
250#ifndef EV_USE_POLL 278#ifndef EV_USE_POLL
251# ifdef _WIN32 279# ifdef _WIN32
252# define EV_USE_POLL 0 280# define EV_USE_POLL 0
253# else 281# else
254# define EV_USE_POLL 1 282# define EV_USE_POLL EV_FEATURE_BACKENDS
255# endif 283# endif
256#endif 284#endif
257 285
258#ifndef EV_USE_EPOLL 286#ifndef EV_USE_EPOLL
259# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 287# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
260# define EV_USE_EPOLL 1 288# define EV_USE_EPOLL EV_FEATURE_BACKENDS
261# else 289# else
262# define EV_USE_EPOLL 0 290# define EV_USE_EPOLL 0
263# endif 291# endif
264#endif 292#endif
265 293
… …
271# define EV_USE_PORT 0 299# define EV_USE_PORT 0
272#endif 300#endif
273 301
274#ifndef EV_USE_INOTIFY 302#ifndef EV_USE_INOTIFY
275# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
276# define EV_USE_INOTIFY 1 304# define EV_USE_INOTIFY EV_FEATURE_OS
277# else 305# else
278# define EV_USE_INOTIFY 0 306# define EV_USE_INOTIFY 0
279# endif 307# endif
280#endif 308#endif
281 309
282#ifndef EV_PID_HASHSIZE 310#ifndef EV_PID_HASHSIZE
283# if EV_MINIMAL 311# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
284# define EV_PID_HASHSIZE 1
285# else
286# define EV_PID_HASHSIZE 16
287# endif
288#endif 312#endif
289 313
290#ifndef EV_INOTIFY_HASHSIZE 314#ifndef EV_INOTIFY_HASHSIZE
291# if EV_MINIMAL 315# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
292# define EV_INOTIFY_HASHSIZE 1
293# else
294# define EV_INOTIFY_HASHSIZE 16
295# endif
296#endif 316#endif
297 317
298#ifndef EV_USE_EVENTFD 318#ifndef EV_USE_EVENTFD
299# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 319# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
300# define EV_USE_EVENTFD 1 320# define EV_USE_EVENTFD EV_FEATURE_OS
301# else 321# else
302# define EV_USE_EVENTFD 0 322# define EV_USE_EVENTFD 0
303# endif 323# endif
304#endif 324#endif
305 325
306#ifndef EV_USE_SIGNALFD 326#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 327# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1 328# define EV_USE_SIGNALFD EV_FEATURE_OS
309# else 329# else
310# define EV_USE_SIGNALFD 0 330# define EV_USE_SIGNALFD 0
311# endif 331# endif
312#endif 332#endif
313 333
… …
316# define EV_USE_4HEAP 1 336# define EV_USE_4HEAP 1
317# define EV_HEAP_CACHE_AT 1 337# define EV_HEAP_CACHE_AT 1
318#endif 338#endif
319 339
320#ifndef EV_VERIFY 340#ifndef EV_VERIFY
321# define EV_VERIFY !EV_MINIMAL 341# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
322#endif 342#endif
323 343
324#ifndef EV_USE_4HEAP 344#ifndef EV_USE_4HEAP
325# define EV_USE_4HEAP !EV_MINIMAL 345# define EV_USE_4HEAP EV_FEATURE_DATA
326#endif 346#endif
327 347
328#ifndef EV_HEAP_CACHE_AT 348#ifndef EV_HEAP_CACHE_AT
329# define EV_HEAP_CACHE_AT !EV_MINIMAL 349# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
330#endif 350#endif
331 351
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 352/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
333/* which makes programs even slower. might work on other unices, too. */ 353/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL 354#if EV_USE_CLOCK_SYSCALL
… …
343# endif 363# endif
344#endif 364#endif
345 365
346/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 366/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347 367
368#ifdef _AIX
369/* AIX has a completely broken poll.h header */
370# undef EV_USE_POLL
371# define EV_USE_POLL 0
372#endif
373
348#ifndef CLOCK_MONOTONIC 374#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 375# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 376# define EV_USE_MONOTONIC 0
351#endif 377#endif
352 378
… …
359# undef EV_USE_INOTIFY 385# undef EV_USE_INOTIFY
360# define EV_USE_INOTIFY 0 386# define EV_USE_INOTIFY 0
361#endif 387#endif
362 388
363#if !EV_USE_NANOSLEEP 389#if !EV_USE_NANOSLEEP
364# ifndef _WIN32 390/* hp-ux has it in sys/time.h, which we unconditionally include above */
391# if !defined(_WIN32) && !defined(__hpux)
365# include <sys/select.h> 392# include <sys/select.h>
366# endif 393# endif
367#endif 394#endif
368 395
369#if EV_USE_INOTIFY 396#if EV_USE_INOTIFY
370# include <sys/utsname.h>
371# include <sys/statfs.h> 397# include <sys/statfs.h>
372# include <sys/inotify.h> 398# include <sys/inotify.h>
373/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 399/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
374# ifndef IN_DONT_FOLLOW 400# ifndef IN_DONT_FOLLOW
375# undef EV_USE_INOTIFY 401# undef EV_USE_INOTIFY
… …
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 423EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
398extern "C" { 424#endif
425
426#if EV_USE_SIGNALFD
427/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
428# include <stdint.h>
429# ifndef SFD_NONBLOCK
430# define SFD_NONBLOCK O_NONBLOCK
399# endif 431# endif
400int eventfd (unsigned int initval, int flags); 432# ifndef SFD_CLOEXEC
401# ifdef __cplusplus 433# ifdef O_CLOEXEC
402} 434# define SFD_CLOEXEC O_CLOEXEC
435# else
436# define SFD_CLOEXEC 02000000
437# endif
403# endif 438# endif
404#endif 439EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
405 440
406#if EV_USE_SIGNALFD 441struct signalfd_siginfo
407# include <sys/signalfd.h> 442{
443 uint32_t ssi_signo;
444 char pad[128 - sizeof (uint32_t)];
445};
408#endif 446#endif
409 447
410/**/ 448/**/
411 449
412#if EV_VERIFY >= 3 450#if EV_VERIFY >= 3
413# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 451# define EV_FREQUENT_CHECK ev_verify (EV_A)
414#else 452#else
415# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
416#endif 454#endif
417 455
418/* 456/*
419 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
420 * It is added to ev_rt_now when scheduling periodics
421 * to ensure progress, time-wise, even when rounding
422 * errors are against us.
423 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
424 * Better solutions welcome.
425 */ 459 */
426#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 */
427 462
428#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) */
429#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) */
430/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 465
466#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
467#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
431 468
432#if __GNUC__ >= 4 469#if __GNUC__ >= 4
433# define expect(expr,value) __builtin_expect ((expr),(value)) 470# define expect(expr,value) __builtin_expect ((expr),(value))
434# define noinline __attribute__ ((noinline)) 471# define noinline __attribute__ ((noinline))
435#else 472#else
… …
442 479
443#define expect_false(expr) expect ((expr) != 0, 0) 480#define expect_false(expr) expect ((expr) != 0, 0)
444#define expect_true(expr) expect ((expr) != 0, 1) 481#define expect_true(expr) expect ((expr) != 0, 1)
445#define inline_size static inline 482#define inline_size static inline
446 483
447#if EV_MINIMAL 484#if EV_FEATURE_CODE
485# define inline_speed static inline
486#else
448# define inline_speed static noinline 487# define inline_speed static noinline
449#else
450# define inline_speed static inline
451#endif 488#endif
452 489
453#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 490#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
454 491
455#if EV_MINPRI == EV_MAXPRI 492#if EV_MINPRI == EV_MAXPRI
… …
468#define ev_active(w) ((W)(w))->active 505#define ev_active(w) ((W)(w))->active
469#define ev_at(w) ((WT)(w))->at 506#define ev_at(w) ((WT)(w))->at
470 507
471#if EV_USE_REALTIME 508#if EV_USE_REALTIME
472/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 509/* sig_atomic_t is used to avoid per-thread variables or locking but still */
473/* giving it a reasonably high chance of working on typical architetcures */ 510/* giving it a reasonably high chance of working on typical architectures */
474static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 511static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
475#endif 512#endif
476 513
477#if EV_USE_MONOTONIC 514#if EV_USE_MONOTONIC
478static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 515static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
480 517
481#ifndef EV_FD_TO_WIN32_HANDLE 518#ifndef EV_FD_TO_WIN32_HANDLE
482# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 519# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
483#endif 520#endif
484#ifndef EV_WIN32_HANDLE_TO_FD 521#ifndef EV_WIN32_HANDLE_TO_FD
485# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 522# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
486#endif 523#endif
487#ifndef EV_WIN32_CLOSE_FD 524#ifndef EV_WIN32_CLOSE_FD
488# define EV_WIN32_CLOSE_FD(fd) close (fd) 525# define EV_WIN32_CLOSE_FD(fd) close (fd)
489#endif 526#endif
490 527
491#ifdef _WIN32 528#ifdef _WIN32
492# include "ev_win32.c" 529# include "ev_win32.c"
493#endif 530#endif
494 531
495/*****************************************************************************/ 532/*****************************************************************************/
533
534/* define a suitable floor function (only used by periodics atm) */
535
536#if EV_USE_FLOOR
537# include <math.h>
538# define ev_floor(v) floor (v)
539#else
540
541#include <float.h>
542
543/* a floor() replacement function, should be independent of ev_tstamp type */
544static ev_tstamp noinline
545ev_floor (ev_tstamp v)
546{
547 /* the choice of shift factor is not terribly important */
548#if FLT_RADIX != 2 /* assume FLT_RADIX == 10 */
549 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 10000000000000000000. : 1000000000.;
550#else
551 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 18446744073709551616. : 4294967296.;
552#endif
553
554 /* argument too large for an unsigned long? */
555 if (expect_false (v >= shift))
556 {
557 ev_tstamp f;
558
559 if (v == v - 1.)
560 return v; /* very large number */
561
562 f = shift * ev_floor (v * (1. / shift));
563 return f + ev_floor (v - f);
564 }
565
566 /* special treatment for negative args? */
567 if (expect_false (v < 0.))
568 {
569 ev_tstamp f = -ev_floor (-v);
570
571 return f - (f == v ? 0 : 1);
572 }
573
574 /* fits into an unsigned long */
575 return (unsigned long)v;
576}
577
578#endif
579
580/*****************************************************************************/
581
582#ifdef __linux
583# include <sys/utsname.h>
584#endif
585
586static unsigned int noinline
587ev_linux_version (void)
588{
589#ifdef __linux
590 unsigned int v = 0;
591 struct utsname buf;
592 int i;
593 char *p = buf.release;
594
595 if (uname (&buf))
596 return 0;
597
598 for (i = 3+1; --i; )
599 {
600 unsigned int c = 0;
601
602 for (;;)
603 {
604 if (*p >= '0' && *p <= '9')
605 c = c * 10 + *p++ - '0';
606 else
607 {
608 p += *p == '.';
609 break;
610 }
611 }
612
613 v = (v << 8) | c;
614 }
615
616 return v;
617#else
618 return 0;
619#endif
620}
621
622/*****************************************************************************/
623
624#if EV_AVOID_STDIO
625static void noinline
626ev_printerr (const char *msg)
627{
628 write (STDERR_FILENO, msg, strlen (msg));
629}
630#endif
496 631
497static void (*syserr_cb)(const char *msg); 632static void (*syserr_cb)(const char *msg);
498 633
499void 634void
500ev_set_syserr_cb (void (*cb)(const char *msg)) 635ev_set_syserr_cb (void (*cb)(const char *msg))
… …
510 645
511 if (syserr_cb) 646 if (syserr_cb)
512 syserr_cb (msg); 647 syserr_cb (msg);
513 else 648 else
514 { 649 {
650#if EV_AVOID_STDIO
651 ev_printerr (msg);
652 ev_printerr (": ");
653 ev_printerr (strerror (errno));
654 ev_printerr ("\n");
655#else
515 perror (msg); 656 perror (msg);
657#endif
516 abort (); 658 abort ();
517 } 659 }
518} 660}
519 661
520static void * 662static void *
521ev_realloc_emul (void *ptr, long size) 663ev_realloc_emul (void *ptr, long size)
522{ 664{
665#if __GLIBC__
666 return realloc (ptr, size);
667#else
523 /* some systems, notably openbsd and darwin, fail to properly 668 /* some systems, notably openbsd and darwin, fail to properly
524 * implement realloc (x, 0) (as required by both ansi c-98 and 669 * implement realloc (x, 0) (as required by both ansi c-89 and
525 * the single unix specification, so work around them here. 670 * the single unix specification, so work around them here.
526 */ 671 */
527 672
528 if (size) 673 if (size)
529 return realloc (ptr, size); 674 return realloc (ptr, size);
530 675
531 free (ptr); 676 free (ptr);
532 return 0; 677 return 0;
678#endif
533} 679}
534 680
535static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 681static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
536 682
537void 683void
… …
545{ 691{
546 ptr = alloc (ptr, size); 692 ptr = alloc (ptr, size);
547 693
548 if (!ptr && size) 694 if (!ptr && size)
549 { 695 {
696#if EV_AVOID_STDIO
697 ev_printerr ("(libev) memory allocation failed, aborting.\n");
698#else
550 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 699 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
700#endif
551 abort (); 701 abort ();
552 } 702 }
553 703
554 return ptr; 704 return ptr;
555} 705}
… …
571 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 721 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
572 unsigned char unused; 722 unsigned char unused;
573#if EV_USE_EPOLL 723#if EV_USE_EPOLL
574 unsigned int egen; /* generation counter to counter epoll bugs */ 724 unsigned int egen; /* generation counter to counter epoll bugs */
575#endif 725#endif
576#if EV_SELECT_IS_WINSOCKET 726#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
577 SOCKET handle; 727 SOCKET handle;
728#endif
729#if EV_USE_IOCP
730 OVERLAPPED or, ow;
578#endif 731#endif
579} ANFD; 732} ANFD;
580 733
581/* stores the pending event set for a given watcher */ 734/* stores the pending event set for a given watcher */
582typedef struct 735typedef struct
… …
637 790
638 static int ev_default_loop_ptr; 791 static int ev_default_loop_ptr;
639 792
640#endif 793#endif
641 794
642#if EV_MINIMAL < 2 795#if EV_FEATURE_API
643# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 796# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
644# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 797# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
645# define EV_INVOKE_PENDING invoke_cb (EV_A) 798# define EV_INVOKE_PENDING invoke_cb (EV_A)
646#else 799#else
647# define EV_RELEASE_CB (void)0 800# define EV_RELEASE_CB (void)0
648# define EV_ACQUIRE_CB (void)0 801# define EV_ACQUIRE_CB (void)0
649# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 802# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
650#endif 803#endif
651 804
652#define EVUNLOOP_RECURSE 0x80 805#define EVBREAK_RECURSE 0x80
653 806
654/*****************************************************************************/ 807/*****************************************************************************/
655 808
656#ifndef EV_HAVE_EV_TIME 809#ifndef EV_HAVE_EV_TIME
657ev_tstamp 810ev_tstamp
… …
701 if (delay > 0.) 854 if (delay > 0.)
702 { 855 {
703#if EV_USE_NANOSLEEP 856#if EV_USE_NANOSLEEP
704 struct timespec ts; 857 struct timespec ts;
705 858
706 ts.tv_sec = (time_t)delay; 859 EV_TS_SET (ts, delay);
707 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
708
709 nanosleep (&ts, 0); 860 nanosleep (&ts, 0);
710#elif defined(_WIN32) 861#elif defined(_WIN32)
711 Sleep ((unsigned long)(delay * 1e3)); 862 Sleep ((unsigned long)(delay * 1e3));
712#else 863#else
713 struct timeval tv; 864 struct timeval tv;
714 865
715 tv.tv_sec = (time_t)delay;
716 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
717
718 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 866 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
719 /* something not guaranteed by newer posix versions, but guaranteed */ 867 /* something not guaranteed by newer posix versions, but guaranteed */
720 /* by older ones */ 868 /* by older ones */
869 EV_TV_SET (tv, delay);
721 select (0, 0, 0, 0, &tv); 870 select (0, 0, 0, 0, &tv);
722#endif 871#endif
723 } 872 }
724} 873}
725 874
875inline_speed int
876ev_timeout_to_ms (ev_tstamp timeout)
877{
878 int ms = timeout * 1000. + .999999;
879
880 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
881}
882
726/*****************************************************************************/ 883/*****************************************************************************/
727 884
728#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 885#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
729 886
730/* find a suitable new size for the given array, */ 887/* find a suitable new size for the given array, */
731/* hopefully by rounding to a ncie-to-malloc size */ 888/* hopefully by rounding to a nice-to-malloc size */
732inline_size int 889inline_size int
733array_nextsize (int elem, int cur, int cnt) 890array_nextsize (int elem, int cur, int cnt)
734{ 891{
735 int ncur = cur + 1; 892 int ncur = cur + 1;
736 893
… …
832} 989}
833 990
834/*****************************************************************************/ 991/*****************************************************************************/
835 992
836inline_speed void 993inline_speed void
837fd_event_nc (EV_P_ int fd, int revents) 994fd_event_nocheck (EV_P_ int fd, int revents)
838{ 995{
839 ANFD *anfd = anfds + fd; 996 ANFD *anfd = anfds + fd;
840 ev_io *w; 997 ev_io *w;
841 998
842 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 999 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
854fd_event (EV_P_ int fd, int revents) 1011fd_event (EV_P_ int fd, int revents)
855{ 1012{
856 ANFD *anfd = anfds + fd; 1013 ANFD *anfd = anfds + fd;
857 1014
858 if (expect_true (!anfd->reify)) 1015 if (expect_true (!anfd->reify))
859 fd_event_nc (EV_A_ fd, revents); 1016 fd_event_nocheck (EV_A_ fd, revents);
860} 1017}
861 1018
862void 1019void
863ev_feed_fd_event (EV_P_ int fd, int revents) 1020ev_feed_fd_event (EV_P_ int fd, int revents)
864{ 1021{
865 if (fd >= 0 && fd < anfdmax) 1022 if (fd >= 0 && fd < anfdmax)
866 fd_event_nc (EV_A_ fd, revents); 1023 fd_event_nocheck (EV_A_ fd, revents);
867} 1024}
868 1025
869/* make sure the external fd watch events are in-sync */ 1026/* make sure the external fd watch events are in-sync */
870/* with the kernel/libev internal state */ 1027/* with the kernel/libev internal state */
871inline_size void 1028inline_size void
872fd_reify (EV_P) 1029fd_reify (EV_P)
873{ 1030{
874 int i; 1031 int i;
875 1032
1033#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1034 for (i = 0; i < fdchangecnt; ++i)
1035 {
1036 int fd = fdchanges [i];
1037 ANFD *anfd = anfds + fd;
1038
1039 if (anfd->reify & EV__IOFDSET)
1040 {
1041 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1042
1043 if (handle != anfd->handle)
1044 {
1045 unsigned long arg;
1046
1047 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1048
1049 /* handle changed, but fd didn't - we need to do it in two steps */
1050 backend_modify (EV_A_ fd, anfd->events, 0);
1051 anfd->events = 0;
1052 anfd->handle = handle;
1053 }
1054 }
1055 }
1056#endif
1057
876 for (i = 0; i < fdchangecnt; ++i) 1058 for (i = 0; i < fdchangecnt; ++i)
877 { 1059 {
878 int fd = fdchanges [i]; 1060 int fd = fdchanges [i];
879 ANFD *anfd = anfds + fd; 1061 ANFD *anfd = anfds + fd;
880 ev_io *w; 1062 ev_io *w;
881 1063
882 unsigned char events = 0; 1064 unsigned char o_events = anfd->events;
1065 unsigned char o_reify = anfd->reify;
883 1066
884 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1067 anfd->reify = 0;
885 events |= (unsigned char)w->events;
886 1068
887#if EV_SELECT_IS_WINSOCKET 1069 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
888 if (events)
889 { 1070 {
890 unsigned long arg; 1071 anfd->events = 0;
891 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 1072
892 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 1073 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1074 anfd->events |= (unsigned char)w->events;
1075
1076 if (o_events != anfd->events)
1077 o_reify = EV__IOFDSET; /* actually |= */
893 } 1078 }
894#endif
895 1079
896 { 1080 if (o_reify & EV__IOFDSET)
897 unsigned char o_events = anfd->events;
898 unsigned char o_reify = anfd->reify;
899
900 anfd->reify = 0;
901 anfd->events = events;
902
903 if (o_events != events || o_reify & EV__IOFDSET)
904 backend_modify (EV_A_ fd, o_events, events); 1081 backend_modify (EV_A_ fd, o_events, anfd->events);
905 }
906 } 1082 }
907 1083
908 fdchangecnt = 0; 1084 fdchangecnt = 0;
909} 1085}
910 1086
… …
934 ev_io_stop (EV_A_ w); 1110 ev_io_stop (EV_A_ w);
935 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1111 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
936 } 1112 }
937} 1113}
938 1114
939/* check whether the given fd is atcually valid, for error recovery */ 1115/* check whether the given fd is actually valid, for error recovery */
940inline_size int 1116inline_size int
941fd_valid (int fd) 1117fd_valid (int fd)
942{ 1118{
943#ifdef _WIN32 1119#ifdef _WIN32
944 return _get_osfhandle (fd) != -1; 1120 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
945#else 1121#else
946 return fcntl (fd, F_GETFD) != -1; 1122 return fcntl (fd, F_GETFD) != -1;
947#endif 1123#endif
948} 1124}
949 1125
… …
986 anfds [fd].emask = 0; 1162 anfds [fd].emask = 0;
987 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1163 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
988 } 1164 }
989} 1165}
990 1166
1167/* used to prepare libev internal fd's */
1168/* this is not fork-safe */
1169inline_speed void
1170fd_intern (int fd)
1171{
1172#ifdef _WIN32
1173 unsigned long arg = 1;
1174 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1175#else
1176 fcntl (fd, F_SETFD, FD_CLOEXEC);
1177 fcntl (fd, F_SETFL, O_NONBLOCK);
1178#endif
1179}
1180
991/*****************************************************************************/ 1181/*****************************************************************************/
992 1182
993/* 1183/*
994 * the heap functions want a real array index. array index 0 uis guaranteed to not 1184 * the heap functions want a real array index. array index 0 is guaranteed to not
995 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1185 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
996 * the branching factor of the d-tree. 1186 * the branching factor of the d-tree.
997 */ 1187 */
998 1188
999/* 1189/*
… …
1147 1337
1148static ANSIG signals [EV_NSIG - 1]; 1338static ANSIG signals [EV_NSIG - 1];
1149 1339
1150/*****************************************************************************/ 1340/*****************************************************************************/
1151 1341
1152/* used to prepare libev internal fd's */ 1342#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1153/* this is not fork-safe */
1154inline_speed void
1155fd_intern (int fd)
1156{
1157#ifdef _WIN32
1158 unsigned long arg = 1;
1159 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1160#else
1161 fcntl (fd, F_SETFD, FD_CLOEXEC);
1162 fcntl (fd, F_SETFL, O_NONBLOCK);
1163#endif
1164}
1165 1343
1166static void noinline 1344static void noinline
1167evpipe_init (EV_P) 1345evpipe_init (EV_P)
1168{ 1346{
1169 if (!ev_is_active (&pipe_w)) 1347 if (!ev_is_active (&pipe_w))
1170 { 1348 {
1171#if EV_USE_EVENTFD 1349# if EV_USE_EVENTFD
1172 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1350 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1173 if (evfd < 0 && errno == EINVAL) 1351 if (evfd < 0 && errno == EINVAL)
1174 evfd = eventfd (0, 0); 1352 evfd = eventfd (0, 0);
1175 1353
1176 if (evfd >= 0) 1354 if (evfd >= 0)
… …
1178 evpipe [0] = -1; 1356 evpipe [0] = -1;
1179 fd_intern (evfd); /* doing it twice doesn't hurt */ 1357 fd_intern (evfd); /* doing it twice doesn't hurt */
1180 ev_io_set (&pipe_w, evfd, EV_READ); 1358 ev_io_set (&pipe_w, evfd, EV_READ);
1181 } 1359 }
1182 else 1360 else
1183#endif 1361# endif
1184 { 1362 {
1185 while (pipe (evpipe)) 1363 while (pipe (evpipe))
1186 ev_syserr ("(libev) error creating signal/async pipe"); 1364 ev_syserr ("(libev) error creating signal/async pipe");
1187 1365
1188 fd_intern (evpipe [0]); 1366 fd_intern (evpipe [0]);
… …
1199evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1377evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1200{ 1378{
1201 if (!*flag) 1379 if (!*flag)
1202 { 1380 {
1203 int old_errno = errno; /* save errno because write might clobber it */ 1381 int old_errno = errno; /* save errno because write might clobber it */
1382 char dummy;
1204 1383
1205 *flag = 1; 1384 *flag = 1;
1206 1385
1207#if EV_USE_EVENTFD 1386#if EV_USE_EVENTFD
1208 if (evfd >= 0) 1387 if (evfd >= 0)
… …
1210 uint64_t counter = 1; 1389 uint64_t counter = 1;
1211 write (evfd, &counter, sizeof (uint64_t)); 1390 write (evfd, &counter, sizeof (uint64_t));
1212 } 1391 }
1213 else 1392 else
1214#endif 1393#endif
1394 /* win32 people keep sending patches that change this write() to send() */
1395 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1396 /* so when you think this write should be a send instead, please find out */
1397 /* where your send() is from - it's definitely not the microsoft send, and */
1398 /* tell me. thank you. */
1215 write (evpipe [1], &old_errno, 1); 1399 write (evpipe [1], &dummy, 1);
1216 1400
1217 errno = old_errno; 1401 errno = old_errno;
1218 } 1402 }
1219} 1403}
1220 1404
… …
1233 } 1417 }
1234 else 1418 else
1235#endif 1419#endif
1236 { 1420 {
1237 char dummy; 1421 char dummy;
1422 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1238 read (evpipe [0], &dummy, 1); 1423 read (evpipe [0], &dummy, 1);
1239 } 1424 }
1240 1425
1426#if EV_SIGNAL_ENABLE
1241 if (sig_pending) 1427 if (sig_pending)
1242 { 1428 {
1243 sig_pending = 0; 1429 sig_pending = 0;
1244 1430
1245 for (i = EV_NSIG - 1; i--; ) 1431 for (i = EV_NSIG - 1; i--; )
1246 if (expect_false (signals [i].pending)) 1432 if (expect_false (signals [i].pending))
1247 ev_feed_signal_event (EV_A_ i + 1); 1433 ev_feed_signal_event (EV_A_ i + 1);
1248 } 1434 }
1435#endif
1249 1436
1250#if EV_ASYNC_ENABLE 1437#if EV_ASYNC_ENABLE
1251 if (async_pending) 1438 if (async_pending)
1252 { 1439 {
1253 async_pending = 0; 1440 async_pending = 0;
… …
1262#endif 1449#endif
1263} 1450}
1264 1451
1265/*****************************************************************************/ 1452/*****************************************************************************/
1266 1453
1454void
1455ev_feed_signal (int signum)
1456{
1457#if EV_MULTIPLICITY
1458 EV_P = signals [signum - 1].loop;
1459
1460 if (!EV_A)
1461 return;
1462#endif
1463
1464 signals [signum - 1].pending = 1;
1465 evpipe_write (EV_A_ &sig_pending);
1466}
1467
1267static void 1468static void
1268ev_sighandler (int signum) 1469ev_sighandler (int signum)
1269{ 1470{
1270#if EV_MULTIPLICITY
1271 EV_P = signals [signum - 1].loop;
1272#endif
1273
1274#if _WIN32 1471#ifdef _WIN32
1275 signal (signum, ev_sighandler); 1472 signal (signum, ev_sighandler);
1276#endif 1473#endif
1277 1474
1278 signals [signum - 1].pending = 1; 1475 ev_feed_signal (signum);
1279 evpipe_write (EV_A_ &sig_pending);
1280} 1476}
1281 1477
1282void noinline 1478void noinline
1283ev_feed_signal_event (EV_P_ int signum) 1479ev_feed_signal_event (EV_P_ int signum)
1284{ 1480{
… …
1321 break; 1517 break;
1322 } 1518 }
1323} 1519}
1324#endif 1520#endif
1325 1521
1522#endif
1523
1326/*****************************************************************************/ 1524/*****************************************************************************/
1327 1525
1526#if EV_CHILD_ENABLE
1328static WL childs [EV_PID_HASHSIZE]; 1527static WL childs [EV_PID_HASHSIZE];
1329
1330#ifndef _WIN32
1331 1528
1332static ev_signal childev; 1529static ev_signal childev;
1333 1530
1334#ifndef WIFCONTINUED 1531#ifndef WIFCONTINUED
1335# define WIFCONTINUED(status) 0 1532# define WIFCONTINUED(status) 0
… …
1340child_reap (EV_P_ int chain, int pid, int status) 1537child_reap (EV_P_ int chain, int pid, int status)
1341{ 1538{
1342 ev_child *w; 1539 ev_child *w;
1343 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1540 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1344 1541
1345 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1542 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1346 { 1543 {
1347 if ((w->pid == pid || !w->pid) 1544 if ((w->pid == pid || !w->pid)
1348 && (!traced || (w->flags & 1))) 1545 && (!traced || (w->flags & 1)))
1349 { 1546 {
1350 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1547 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1375 /* make sure we are called again until all children have been reaped */ 1572 /* make sure we are called again until all children have been reaped */
1376 /* we need to do it this way so that the callback gets called before we continue */ 1573 /* we need to do it this way so that the callback gets called before we continue */
1377 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1574 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1378 1575
1379 child_reap (EV_A_ pid, pid, status); 1576 child_reap (EV_A_ pid, pid, status);
1380 if (EV_PID_HASHSIZE > 1) 1577 if ((EV_PID_HASHSIZE) > 1)
1381 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1578 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1382} 1579}
1383 1580
1384#endif 1581#endif
1385 1582
1386/*****************************************************************************/ 1583/*****************************************************************************/
1387 1584
1585#if EV_USE_IOCP
1586# include "ev_iocp.c"
1587#endif
1388#if EV_USE_PORT 1588#if EV_USE_PORT
1389# include "ev_port.c" 1589# include "ev_port.c"
1390#endif 1590#endif
1391#if EV_USE_KQUEUE 1591#if EV_USE_KQUEUE
1392# include "ev_kqueue.c" 1592# include "ev_kqueue.c"
… …
1452#ifdef __APPLE__ 1652#ifdef __APPLE__
1453 /* only select works correctly on that "unix-certified" platform */ 1653 /* only select works correctly on that "unix-certified" platform */
1454 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1654 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1455 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1655 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1456#endif 1656#endif
1657#ifdef __FreeBSD__
1658 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1659#endif
1457 1660
1458 return flags; 1661 return flags;
1459} 1662}
1460 1663
1461unsigned int 1664unsigned int
1462ev_embeddable_backends (void) 1665ev_embeddable_backends (void)
1463{ 1666{
1464 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1667 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1465 1668
1466 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1669 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1467 /* please fix it and tell me how to detect the fix */ 1670 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1468 flags &= ~EVBACKEND_EPOLL; 1671 flags &= ~EVBACKEND_EPOLL;
1469 1672
1470 return flags; 1673 return flags;
1471} 1674}
1472 1675
1473unsigned int 1676unsigned int
1474ev_backend (EV_P) 1677ev_backend (EV_P)
1475{ 1678{
1476 return backend; 1679 return backend;
1477} 1680}
1478 1681
1479#if EV_MINIMAL < 2 1682#if EV_FEATURE_API
1480unsigned int 1683unsigned int
1481ev_loop_count (EV_P) 1684ev_iteration (EV_P)
1482{ 1685{
1483 return loop_count; 1686 return loop_count;
1484} 1687}
1485 1688
1486unsigned int 1689unsigned int
1487ev_loop_depth (EV_P) 1690ev_depth (EV_P)
1488{ 1691{
1489 return loop_depth; 1692 return loop_depth;
1490} 1693}
1491 1694
1492void 1695void
… …
1529static void noinline 1732static void noinline
1530loop_init (EV_P_ unsigned int flags) 1733loop_init (EV_P_ unsigned int flags)
1531{ 1734{
1532 if (!backend) 1735 if (!backend)
1533 { 1736 {
1737 origflags = flags;
1738
1534#if EV_USE_REALTIME 1739#if EV_USE_REALTIME
1535 if (!have_realtime) 1740 if (!have_realtime)
1536 { 1741 {
1537 struct timespec ts; 1742 struct timespec ts;
1538 1743
… …
1564 1769
1565 ev_rt_now = ev_time (); 1770 ev_rt_now = ev_time ();
1566 mn_now = get_clock (); 1771 mn_now = get_clock ();
1567 now_floor = mn_now; 1772 now_floor = mn_now;
1568 rtmn_diff = ev_rt_now - mn_now; 1773 rtmn_diff = ev_rt_now - mn_now;
1569#if EV_MINIMAL < 2 1774#if EV_FEATURE_API
1570 invoke_cb = ev_invoke_pending; 1775 invoke_cb = ev_invoke_pending;
1571#endif 1776#endif
1572 1777
1573 io_blocktime = 0.; 1778 io_blocktime = 0.;
1574 timeout_blocktime = 0.; 1779 timeout_blocktime = 0.;
… …
1580#endif 1785#endif
1581#if EV_USE_INOTIFY 1786#if EV_USE_INOTIFY
1582 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1787 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1583#endif 1788#endif
1584#if EV_USE_SIGNALFD 1789#if EV_USE_SIGNALFD
1585 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1790 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1586#endif 1791#endif
1587 1792
1588 if (!(flags & 0x0000ffffU)) 1793 if (!(flags & EVBACKEND_MASK))
1589 flags |= ev_recommended_backends (); 1794 flags |= ev_recommended_backends ();
1590 1795
1796#if EV_USE_IOCP
1797 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1798#endif
1591#if EV_USE_PORT 1799#if EV_USE_PORT
1592 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1800 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1593#endif 1801#endif
1594#if EV_USE_KQUEUE 1802#if EV_USE_KQUEUE
1595 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1803 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1604 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1812 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1605#endif 1813#endif
1606 1814
1607 ev_prepare_init (&pending_w, pendingcb); 1815 ev_prepare_init (&pending_w, pendingcb);
1608 1816
1817#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1609 ev_init (&pipe_w, pipecb); 1818 ev_init (&pipe_w, pipecb);
1610 ev_set_priority (&pipe_w, EV_MAXPRI); 1819 ev_set_priority (&pipe_w, EV_MAXPRI);
1820#endif
1611 } 1821 }
1612} 1822}
1613 1823
1614/* free up a loop structure */ 1824/* free up a loop structure */
1615static void noinline 1825void
1616loop_destroy (EV_P) 1826ev_loop_destroy (EV_P)
1617{ 1827{
1618 int i; 1828 int i;
1829
1830#if EV_MULTIPLICITY
1831 /* mimic free (0) */
1832 if (!EV_A)
1833 return;
1834#endif
1835
1836#if EV_CLEANUP_ENABLE
1837 /* queue cleanup watchers (and execute them) */
1838 if (expect_false (cleanupcnt))
1839 {
1840 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1841 EV_INVOKE_PENDING;
1842 }
1843#endif
1844
1845#if EV_CHILD_ENABLE
1846 if (ev_is_active (&childev))
1847 {
1848 ev_ref (EV_A); /* child watcher */
1849 ev_signal_stop (EV_A_ &childev);
1850 }
1851#endif
1619 1852
1620 if (ev_is_active (&pipe_w)) 1853 if (ev_is_active (&pipe_w))
1621 { 1854 {
1622 /*ev_ref (EV_A);*/ 1855 /*ev_ref (EV_A);*/
1623 /*ev_io_stop (EV_A_ &pipe_w);*/ 1856 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1634 } 1867 }
1635 } 1868 }
1636 1869
1637#if EV_USE_SIGNALFD 1870#if EV_USE_SIGNALFD
1638 if (ev_is_active (&sigfd_w)) 1871 if (ev_is_active (&sigfd_w))
1639 {
1640 /*ev_ref (EV_A);*/
1641 /*ev_io_stop (EV_A_ &sigfd_w);*/
1642
1643 close (sigfd); 1872 close (sigfd);
1644 }
1645#endif 1873#endif
1646 1874
1647#if EV_USE_INOTIFY 1875#if EV_USE_INOTIFY
1648 if (fs_fd >= 0) 1876 if (fs_fd >= 0)
1649 close (fs_fd); 1877 close (fs_fd);
1650#endif 1878#endif
1651 1879
1652 if (backend_fd >= 0) 1880 if (backend_fd >= 0)
1653 close (backend_fd); 1881 close (backend_fd);
1654 1882
1883#if EV_USE_IOCP
1884 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1885#endif
1655#if EV_USE_PORT 1886#if EV_USE_PORT
1656 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1887 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1657#endif 1888#endif
1658#if EV_USE_KQUEUE 1889#if EV_USE_KQUEUE
1659 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1890 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1686 array_free (periodic, EMPTY); 1917 array_free (periodic, EMPTY);
1687#endif 1918#endif
1688#if EV_FORK_ENABLE 1919#if EV_FORK_ENABLE
1689 array_free (fork, EMPTY); 1920 array_free (fork, EMPTY);
1690#endif 1921#endif
1922#if EV_CLEANUP_ENABLE
1923 array_free (cleanup, EMPTY);
1924#endif
1691 array_free (prepare, EMPTY); 1925 array_free (prepare, EMPTY);
1692 array_free (check, EMPTY); 1926 array_free (check, EMPTY);
1693#if EV_ASYNC_ENABLE 1927#if EV_ASYNC_ENABLE
1694 array_free (async, EMPTY); 1928 array_free (async, EMPTY);
1695#endif 1929#endif
1696 1930
1697 backend = 0; 1931 backend = 0;
1932
1933#if EV_MULTIPLICITY
1934 if (ev_is_default_loop (EV_A))
1935#endif
1936 ev_default_loop_ptr = 0;
1937#if EV_MULTIPLICITY
1938 else
1939 ev_free (EV_A);
1940#endif
1698} 1941}
1699 1942
1700#if EV_USE_INOTIFY 1943#if EV_USE_INOTIFY
1701inline_size void infy_fork (EV_P); 1944inline_size void infy_fork (EV_P);
1702#endif 1945#endif
… …
1738 { 1981 {
1739 EV_WIN32_CLOSE_FD (evpipe [0]); 1982 EV_WIN32_CLOSE_FD (evpipe [0]);
1740 EV_WIN32_CLOSE_FD (evpipe [1]); 1983 EV_WIN32_CLOSE_FD (evpipe [1]);
1741 } 1984 }
1742 1985
1986#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1743 evpipe_init (EV_A); 1987 evpipe_init (EV_A);
1744 /* now iterate over everything, in case we missed something */ 1988 /* now iterate over everything, in case we missed something */
1745 pipecb (EV_A_ &pipe_w, EV_READ); 1989 pipecb (EV_A_ &pipe_w, EV_READ);
1990#endif
1746 } 1991 }
1747 1992
1748 postfork = 0; 1993 postfork = 0;
1749} 1994}
1750 1995
… …
1759 loop_init (EV_A_ flags); 2004 loop_init (EV_A_ flags);
1760 2005
1761 if (ev_backend (EV_A)) 2006 if (ev_backend (EV_A))
1762 return EV_A; 2007 return EV_A;
1763 2008
2009 ev_free (EV_A);
1764 return 0; 2010 return 0;
1765} 2011}
1766 2012
1767void
1768ev_loop_destroy (EV_P)
1769{
1770 loop_destroy (EV_A);
1771 ev_free (loop);
1772}
1773
1774void
1775ev_loop_fork (EV_P)
1776{
1777 postfork = 1; /* must be in line with ev_default_fork */
1778}
1779#endif /* multiplicity */ 2013#endif /* multiplicity */
1780 2014
1781#if EV_VERIFY 2015#if EV_VERIFY
1782static void noinline 2016static void noinline
1783verify_watcher (EV_P_ W w) 2017verify_watcher (EV_P_ W w)
… …
1812 verify_watcher (EV_A_ ws [cnt]); 2046 verify_watcher (EV_A_ ws [cnt]);
1813 } 2047 }
1814} 2048}
1815#endif 2049#endif
1816 2050
1817#if EV_MINIMAL < 2 2051#if EV_FEATURE_API
1818void 2052void
1819ev_loop_verify (EV_P) 2053ev_verify (EV_P)
1820{ 2054{
1821#if EV_VERIFY 2055#if EV_VERIFY
1822 int i; 2056 int i;
1823 WL w; 2057 WL w;
1824 2058
… …
1858#if EV_FORK_ENABLE 2092#if EV_FORK_ENABLE
1859 assert (forkmax >= forkcnt); 2093 assert (forkmax >= forkcnt);
1860 array_verify (EV_A_ (W *)forks, forkcnt); 2094 array_verify (EV_A_ (W *)forks, forkcnt);
1861#endif 2095#endif
1862 2096
2097#if EV_CLEANUP_ENABLE
2098 assert (cleanupmax >= cleanupcnt);
2099 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2100#endif
2101
1863#if EV_ASYNC_ENABLE 2102#if EV_ASYNC_ENABLE
1864 assert (asyncmax >= asynccnt); 2103 assert (asyncmax >= asynccnt);
1865 array_verify (EV_A_ (W *)asyncs, asynccnt); 2104 array_verify (EV_A_ (W *)asyncs, asynccnt);
1866#endif 2105#endif
1867 2106
2107#if EV_PREPARE_ENABLE
1868 assert (preparemax >= preparecnt); 2108 assert (preparemax >= preparecnt);
1869 array_verify (EV_A_ (W *)prepares, preparecnt); 2109 array_verify (EV_A_ (W *)prepares, preparecnt);
2110#endif
1870 2111
2112#if EV_CHECK_ENABLE
1871 assert (checkmax >= checkcnt); 2113 assert (checkmax >= checkcnt);
1872 array_verify (EV_A_ (W *)checks, checkcnt); 2114 array_verify (EV_A_ (W *)checks, checkcnt);
2115#endif
1873 2116
1874# if 0 2117# if 0
2118#if EV_CHILD_ENABLE
1875 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2119 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1876 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 2120 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2121#endif
1877# endif 2122# endif
1878#endif 2123#endif
1879} 2124}
1880#endif 2125#endif
1881 2126
1882#if EV_MULTIPLICITY 2127#if EV_MULTIPLICITY
1883struct ev_loop * 2128struct ev_loop *
1884ev_default_loop_init (unsigned int flags)
1885#else 2129#else
1886int 2130int
2131#endif
1887ev_default_loop (unsigned int flags) 2132ev_default_loop (unsigned int flags)
1888#endif
1889{ 2133{
1890 if (!ev_default_loop_ptr) 2134 if (!ev_default_loop_ptr)
1891 { 2135 {
1892#if EV_MULTIPLICITY 2136#if EV_MULTIPLICITY
1893 EV_P = ev_default_loop_ptr = &default_loop_struct; 2137 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1897 2141
1898 loop_init (EV_A_ flags); 2142 loop_init (EV_A_ flags);
1899 2143
1900 if (ev_backend (EV_A)) 2144 if (ev_backend (EV_A))
1901 { 2145 {
1902#ifndef _WIN32 2146#if EV_CHILD_ENABLE
1903 ev_signal_init (&childev, childcb, SIGCHLD); 2147 ev_signal_init (&childev, childcb, SIGCHLD);
1904 ev_set_priority (&childev, EV_MAXPRI); 2148 ev_set_priority (&childev, EV_MAXPRI);
1905 ev_signal_start (EV_A_ &childev); 2149 ev_signal_start (EV_A_ &childev);
1906 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2150 ev_unref (EV_A); /* child watcher should not keep loop alive */
1907#endif 2151#endif
… …
1912 2156
1913 return ev_default_loop_ptr; 2157 return ev_default_loop_ptr;
1914} 2158}
1915 2159
1916void 2160void
1917ev_default_destroy (void) 2161ev_loop_fork (EV_P)
1918{ 2162{
1919#if EV_MULTIPLICITY
1920 EV_P = ev_default_loop_ptr;
1921#endif
1922
1923 ev_default_loop_ptr = 0;
1924
1925#ifndef _WIN32
1926 ev_ref (EV_A); /* child watcher */
1927 ev_signal_stop (EV_A_ &childev);
1928#endif
1929
1930 loop_destroy (EV_A);
1931}
1932
1933void
1934ev_default_fork (void)
1935{
1936#if EV_MULTIPLICITY
1937 EV_P = ev_default_loop_ptr;
1938#endif
1939
1940 postfork = 1; /* must be in line with ev_loop_fork */ 2163 postfork = 1; /* must be in line with ev_default_fork */
1941} 2164}
1942 2165
1943/*****************************************************************************/ 2166/*****************************************************************************/
1944 2167
1945void 2168void
… …
1967 2190
1968 for (pri = NUMPRI; pri--; ) 2191 for (pri = NUMPRI; pri--; )
1969 while (pendingcnt [pri]) 2192 while (pendingcnt [pri])
1970 { 2193 {
1971 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2194 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1972
1973 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1974 /* ^ this is no longer true, as pending_w could be here */
1975 2195
1976 p->w->pending = 0; 2196 p->w->pending = 0;
1977 EV_CB_INVOKE (p->w, p->events); 2197 EV_CB_INVOKE (p->w, p->events);
1978 EV_FREQUENT_CHECK; 2198 EV_FREQUENT_CHECK;
1979 } 2199 }
… …
2036 EV_FREQUENT_CHECK; 2256 EV_FREQUENT_CHECK;
2037 feed_reverse (EV_A_ (W)w); 2257 feed_reverse (EV_A_ (W)w);
2038 } 2258 }
2039 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2259 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2040 2260
2041 feed_reverse_done (EV_A_ EV_TIMEOUT); 2261 feed_reverse_done (EV_A_ EV_TIMER);
2042 } 2262 }
2043} 2263}
2044 2264
2045#if EV_PERIODIC_ENABLE 2265#if EV_PERIODIC_ENABLE
2266
2267static void noinline
2268periodic_recalc (EV_P_ ev_periodic *w)
2269{
2270 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2271 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2272
2273 /* the above almost always errs on the low side */
2274 while (at <= ev_rt_now)
2275 {
2276 ev_tstamp nat = at + w->interval;
2277
2278 /* when resolution fails us, we use ev_rt_now */
2279 if (expect_false (nat == at))
2280 {
2281 at = ev_rt_now;
2282 break;
2283 }
2284
2285 at = nat;
2286 }
2287
2288 ev_at (w) = at;
2289}
2290
2046/* make periodics pending */ 2291/* make periodics pending */
2047inline_size void 2292inline_size void
2048periodics_reify (EV_P) 2293periodics_reify (EV_P)
2049{ 2294{
2050 EV_FREQUENT_CHECK; 2295 EV_FREQUENT_CHECK;
… …
2069 ANHE_at_cache (periodics [HEAP0]); 2314 ANHE_at_cache (periodics [HEAP0]);
2070 downheap (periodics, periodiccnt, HEAP0); 2315 downheap (periodics, periodiccnt, HEAP0);
2071 } 2316 }
2072 else if (w->interval) 2317 else if (w->interval)
2073 { 2318 {
2074 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2319 periodic_recalc (EV_A_ w);
2075 /* if next trigger time is not sufficiently in the future, put it there */
2076 /* this might happen because of floating point inexactness */
2077 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2078 {
2079 ev_at (w) += w->interval;
2080
2081 /* if interval is unreasonably low we might still have a time in the past */
2082 /* so correct this. this will make the periodic very inexact, but the user */
2083 /* has effectively asked to get triggered more often than possible */
2084 if (ev_at (w) < ev_rt_now)
2085 ev_at (w) = ev_rt_now;
2086 }
2087
2088 ANHE_at_cache (periodics [HEAP0]); 2320 ANHE_at_cache (periodics [HEAP0]);
2089 downheap (periodics, periodiccnt, HEAP0); 2321 downheap (periodics, periodiccnt, HEAP0);
2090 } 2322 }
2091 else 2323 else
2092 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2324 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2099 feed_reverse_done (EV_A_ EV_PERIODIC); 2331 feed_reverse_done (EV_A_ EV_PERIODIC);
2100 } 2332 }
2101} 2333}
2102 2334
2103/* simply recalculate all periodics */ 2335/* simply recalculate all periodics */
2104/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2336/* TODO: maybe ensure that at least one event happens when jumping forward? */
2105static void noinline 2337static void noinline
2106periodics_reschedule (EV_P) 2338periodics_reschedule (EV_P)
2107{ 2339{
2108 int i; 2340 int i;
2109 2341
… …
2113 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2345 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2114 2346
2115 if (w->reschedule_cb) 2347 if (w->reschedule_cb)
2116 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2348 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2117 else if (w->interval) 2349 else if (w->interval)
2118 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2350 periodic_recalc (EV_A_ w);
2119 2351
2120 ANHE_at_cache (periodics [i]); 2352 ANHE_at_cache (periodics [i]);
2121 } 2353 }
2122 2354
2123 reheap (periodics, periodiccnt); 2355 reheap (periodics, periodiccnt);
… …
2137 ANHE_at_cache (*he); 2369 ANHE_at_cache (*he);
2138 } 2370 }
2139} 2371}
2140 2372
2141/* fetch new monotonic and realtime times from the kernel */ 2373/* fetch new monotonic and realtime times from the kernel */
2142/* also detetc if there was a timejump, and act accordingly */ 2374/* also detect if there was a timejump, and act accordingly */
2143inline_speed void 2375inline_speed void
2144time_update (EV_P_ ev_tstamp max_block) 2376time_update (EV_P_ ev_tstamp max_block)
2145{ 2377{
2146#if EV_USE_MONOTONIC 2378#if EV_USE_MONOTONIC
2147 if (expect_true (have_monotonic)) 2379 if (expect_true (have_monotonic))
… …
2170 * doesn't hurt either as we only do this on time-jumps or 2402 * doesn't hurt either as we only do this on time-jumps or
2171 * in the unlikely event of having been preempted here. 2403 * in the unlikely event of having been preempted here.
2172 */ 2404 */
2173 for (i = 4; --i; ) 2405 for (i = 4; --i; )
2174 { 2406 {
2407 ev_tstamp diff;
2175 rtmn_diff = ev_rt_now - mn_now; 2408 rtmn_diff = ev_rt_now - mn_now;
2176 2409
2410 diff = odiff - rtmn_diff;
2411
2177 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2412 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2178 return; /* all is well */ 2413 return; /* all is well */
2179 2414
2180 ev_rt_now = ev_time (); 2415 ev_rt_now = ev_time ();
2181 mn_now = get_clock (); 2416 mn_now = get_clock ();
2182 now_floor = mn_now; 2417 now_floor = mn_now;
… …
2205 mn_now = ev_rt_now; 2440 mn_now = ev_rt_now;
2206 } 2441 }
2207} 2442}
2208 2443
2209void 2444void
2210ev_loop (EV_P_ int flags) 2445ev_run (EV_P_ int flags)
2211{ 2446{
2212#if EV_MINIMAL < 2 2447#if EV_FEATURE_API
2213 ++loop_depth; 2448 ++loop_depth;
2214#endif 2449#endif
2215 2450
2216 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2451 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2217 2452
2218 loop_done = EVUNLOOP_CANCEL; 2453 loop_done = EVBREAK_CANCEL;
2219 2454
2220 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2455 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2221 2456
2222 do 2457 do
2223 { 2458 {
2224#if EV_VERIFY >= 2 2459#if EV_VERIFY >= 2
2225 ev_loop_verify (EV_A); 2460 ev_verify (EV_A);
2226#endif 2461#endif
2227 2462
2228#ifndef _WIN32 2463#ifndef _WIN32
2229 if (expect_false (curpid)) /* penalise the forking check even more */ 2464 if (expect_false (curpid)) /* penalise the forking check even more */
2230 if (expect_false (getpid () != curpid)) 2465 if (expect_false (getpid () != curpid))
… …
2242 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2477 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2243 EV_INVOKE_PENDING; 2478 EV_INVOKE_PENDING;
2244 } 2479 }
2245#endif 2480#endif
2246 2481
2482#if EV_PREPARE_ENABLE
2247 /* queue prepare watchers (and execute them) */ 2483 /* queue prepare watchers (and execute them) */
2248 if (expect_false (preparecnt)) 2484 if (expect_false (preparecnt))
2249 { 2485 {
2250 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2486 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2251 EV_INVOKE_PENDING; 2487 EV_INVOKE_PENDING;
2252 } 2488 }
2489#endif
2253 2490
2254 if (expect_false (loop_done)) 2491 if (expect_false (loop_done))
2255 break; 2492 break;
2256 2493
2257 /* we might have forked, so reify kernel state if necessary */ 2494 /* we might have forked, so reify kernel state if necessary */
… …
2264 /* calculate blocking time */ 2501 /* calculate blocking time */
2265 { 2502 {
2266 ev_tstamp waittime = 0.; 2503 ev_tstamp waittime = 0.;
2267 ev_tstamp sleeptime = 0.; 2504 ev_tstamp sleeptime = 0.;
2268 2505
2506 /* remember old timestamp for io_blocktime calculation */
2507 ev_tstamp prev_mn_now = mn_now;
2508
2509 /* update time to cancel out callback processing overhead */
2510 time_update (EV_A_ 1e100);
2511
2269 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2512 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2270 { 2513 {
2271 /* remember old timestamp for io_blocktime calculation */
2272 ev_tstamp prev_mn_now = mn_now;
2273
2274 /* update time to cancel out callback processing overhead */
2275 time_update (EV_A_ 1e100);
2276
2277 waittime = MAX_BLOCKTIME; 2514 waittime = MAX_BLOCKTIME;
2278 2515
2279 if (timercnt) 2516 if (timercnt)
2280 { 2517 {
2281 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2518 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2308 waittime -= sleeptime; 2545 waittime -= sleeptime;
2309 } 2546 }
2310 } 2547 }
2311 } 2548 }
2312 2549
2313#if EV_MINIMAL < 2 2550#if EV_FEATURE_API
2314 ++loop_count; 2551 ++loop_count;
2315#endif 2552#endif
2316 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2553 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2317 backend_poll (EV_A_ waittime); 2554 backend_poll (EV_A_ waittime);
2318 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2555 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2319 2556
2320 /* update ev_rt_now, do magic */ 2557 /* update ev_rt_now, do magic */
2321 time_update (EV_A_ waittime + sleeptime); 2558 time_update (EV_A_ waittime + sleeptime);
2322 } 2559 }
2323 2560
… …
2330#if EV_IDLE_ENABLE 2567#if EV_IDLE_ENABLE
2331 /* queue idle watchers unless other events are pending */ 2568 /* queue idle watchers unless other events are pending */
2332 idle_reify (EV_A); 2569 idle_reify (EV_A);
2333#endif 2570#endif
2334 2571
2572#if EV_CHECK_ENABLE
2335 /* queue check watchers, to be executed first */ 2573 /* queue check watchers, to be executed first */
2336 if (expect_false (checkcnt)) 2574 if (expect_false (checkcnt))
2337 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2575 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2576#endif
2338 2577
2339 EV_INVOKE_PENDING; 2578 EV_INVOKE_PENDING;
2340 } 2579 }
2341 while (expect_true ( 2580 while (expect_true (
2342 activecnt 2581 activecnt
2343 && !loop_done 2582 && !loop_done
2344 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2583 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2345 )); 2584 ));
2346 2585
2347 if (loop_done == EVUNLOOP_ONE) 2586 if (loop_done == EVBREAK_ONE)
2348 loop_done = EVUNLOOP_CANCEL; 2587 loop_done = EVBREAK_CANCEL;
2349 2588
2350#if EV_MINIMAL < 2 2589#if EV_FEATURE_API
2351 --loop_depth; 2590 --loop_depth;
2352#endif 2591#endif
2353} 2592}
2354 2593
2355void 2594void
2356ev_unloop (EV_P_ int how) 2595ev_break (EV_P_ int how)
2357{ 2596{
2358 loop_done = how; 2597 loop_done = how;
2359} 2598}
2360 2599
2361void 2600void
… …
2481 2720
2482 if (expect_false (ev_is_active (w))) 2721 if (expect_false (ev_is_active (w)))
2483 return; 2722 return;
2484 2723
2485 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2724 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2486 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2725 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2487 2726
2488 EV_FREQUENT_CHECK; 2727 EV_FREQUENT_CHECK;
2489 2728
2490 ev_start (EV_A_ (W)w, 1); 2729 ev_start (EV_A_ (W)w, 1);
2491 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2730 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2509 EV_FREQUENT_CHECK; 2748 EV_FREQUENT_CHECK;
2510 2749
2511 wlist_del (&anfds[w->fd].head, (WL)w); 2750 wlist_del (&anfds[w->fd].head, (WL)w);
2512 ev_stop (EV_A_ (W)w); 2751 ev_stop (EV_A_ (W)w);
2513 2752
2514 fd_change (EV_A_ w->fd, 1); 2753 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2515 2754
2516 EV_FREQUENT_CHECK; 2755 EV_FREQUENT_CHECK;
2517} 2756}
2518 2757
2519void noinline 2758void noinline
… …
2561 timers [active] = timers [timercnt + HEAP0]; 2800 timers [active] = timers [timercnt + HEAP0];
2562 adjustheap (timers, timercnt, active); 2801 adjustheap (timers, timercnt, active);
2563 } 2802 }
2564 } 2803 }
2565 2804
2566 EV_FREQUENT_CHECK;
2567
2568 ev_at (w) -= mn_now; 2805 ev_at (w) -= mn_now;
2569 2806
2570 ev_stop (EV_A_ (W)w); 2807 ev_stop (EV_A_ (W)w);
2808
2809 EV_FREQUENT_CHECK;
2571} 2810}
2572 2811
2573void noinline 2812void noinline
2574ev_timer_again (EV_P_ ev_timer *w) 2813ev_timer_again (EV_P_ ev_timer *w)
2575{ 2814{
… …
2611 if (w->reschedule_cb) 2850 if (w->reschedule_cb)
2612 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2851 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2613 else if (w->interval) 2852 else if (w->interval)
2614 { 2853 {
2615 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2854 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2616 /* this formula differs from the one in periodic_reify because we do not always round up */ 2855 periodic_recalc (EV_A_ w);
2617 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2618 } 2856 }
2619 else 2857 else
2620 ev_at (w) = w->offset; 2858 ev_at (w) = w->offset;
2621 2859
2622 EV_FREQUENT_CHECK; 2860 EV_FREQUENT_CHECK;
… …
2654 periodics [active] = periodics [periodiccnt + HEAP0]; 2892 periodics [active] = periodics [periodiccnt + HEAP0];
2655 adjustheap (periodics, periodiccnt, active); 2893 adjustheap (periodics, periodiccnt, active);
2656 } 2894 }
2657 } 2895 }
2658 2896
2659 EV_FREQUENT_CHECK;
2660
2661 ev_stop (EV_A_ (W)w); 2897 ev_stop (EV_A_ (W)w);
2898
2899 EV_FREQUENT_CHECK;
2662} 2900}
2663 2901
2664void noinline 2902void noinline
2665ev_periodic_again (EV_P_ ev_periodic *w) 2903ev_periodic_again (EV_P_ ev_periodic *w)
2666{ 2904{
… …
2671#endif 2909#endif
2672 2910
2673#ifndef SA_RESTART 2911#ifndef SA_RESTART
2674# define SA_RESTART 0 2912# define SA_RESTART 0
2675#endif 2913#endif
2914
2915#if EV_SIGNAL_ENABLE
2676 2916
2677void noinline 2917void noinline
2678ev_signal_start (EV_P_ ev_signal *w) 2918ev_signal_start (EV_P_ ev_signal *w)
2679{ 2919{
2680 if (expect_false (ev_is_active (w))) 2920 if (expect_false (ev_is_active (w)))
… …
2727 if (!((WL)w)->next) 2967 if (!((WL)w)->next)
2728# if EV_USE_SIGNALFD 2968# if EV_USE_SIGNALFD
2729 if (sigfd < 0) /*TODO*/ 2969 if (sigfd < 0) /*TODO*/
2730# endif 2970# endif
2731 { 2971 {
2732# if _WIN32 2972# ifdef _WIN32
2973 evpipe_init (EV_A);
2974
2733 signal (w->signum, ev_sighandler); 2975 signal (w->signum, ev_sighandler);
2734# else 2976# else
2735 struct sigaction sa; 2977 struct sigaction sa;
2736 2978
2737 evpipe_init (EV_A); 2979 evpipe_init (EV_A);
… …
2739 sa.sa_handler = ev_sighandler; 2981 sa.sa_handler = ev_sighandler;
2740 sigfillset (&sa.sa_mask); 2982 sigfillset (&sa.sa_mask);
2741 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2983 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2742 sigaction (w->signum, &sa, 0); 2984 sigaction (w->signum, &sa, 0);
2743 2985
2986 if (origflags & EVFLAG_NOSIGMASK)
2987 {
2744 sigemptyset (&sa.sa_mask); 2988 sigemptyset (&sa.sa_mask);
2745 sigaddset (&sa.sa_mask, w->signum); 2989 sigaddset (&sa.sa_mask, w->signum);
2746 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2990 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2991 }
2747#endif 2992#endif
2748 } 2993 }
2749 2994
2750 EV_FREQUENT_CHECK; 2995 EV_FREQUENT_CHECK;
2751} 2996}
… …
2768 signals [w->signum - 1].loop = 0; /* unattach from signal */ 3013 signals [w->signum - 1].loop = 0; /* unattach from signal */
2769#endif 3014#endif
2770#if EV_USE_SIGNALFD 3015#if EV_USE_SIGNALFD
2771 if (sigfd >= 0) 3016 if (sigfd >= 0)
2772 { 3017 {
2773 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 3018 sigset_t ss;
3019
3020 sigemptyset (&ss);
3021 sigaddset (&ss, w->signum);
2774 sigdelset (&sigfd_set, w->signum); 3022 sigdelset (&sigfd_set, w->signum);
3023
2775 signalfd (sigfd, &sigfd_set, 0); 3024 signalfd (sigfd, &sigfd_set, 0);
2776 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 3025 sigprocmask (SIG_UNBLOCK, &ss, 0);
2777 /*TODO: maybe unblock signal? */
2778 } 3026 }
2779 else 3027 else
2780#endif 3028#endif
2781 signal (w->signum, SIG_DFL); 3029 signal (w->signum, SIG_DFL);
2782 } 3030 }
2783 3031
2784 EV_FREQUENT_CHECK; 3032 EV_FREQUENT_CHECK;
2785} 3033}
2786 3034
3035#endif
3036
3037#if EV_CHILD_ENABLE
3038
2787void 3039void
2788ev_child_start (EV_P_ ev_child *w) 3040ev_child_start (EV_P_ ev_child *w)
2789{ 3041{
2790#if EV_MULTIPLICITY 3042#if EV_MULTIPLICITY
2791 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 3043 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2794 return; 3046 return;
2795 3047
2796 EV_FREQUENT_CHECK; 3048 EV_FREQUENT_CHECK;
2797 3049
2798 ev_start (EV_A_ (W)w, 1); 3050 ev_start (EV_A_ (W)w, 1);
2799 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3051 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2800 3052
2801 EV_FREQUENT_CHECK; 3053 EV_FREQUENT_CHECK;
2802} 3054}
2803 3055
2804void 3056void
… …
2808 if (expect_false (!ev_is_active (w))) 3060 if (expect_false (!ev_is_active (w)))
2809 return; 3061 return;
2810 3062
2811 EV_FREQUENT_CHECK; 3063 EV_FREQUENT_CHECK;
2812 3064
2813 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3065 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2814 ev_stop (EV_A_ (W)w); 3066 ev_stop (EV_A_ (W)w);
2815 3067
2816 EV_FREQUENT_CHECK; 3068 EV_FREQUENT_CHECK;
2817} 3069}
3070
3071#endif
2818 3072
2819#if EV_STAT_ENABLE 3073#if EV_STAT_ENABLE
2820 3074
2821# ifdef _WIN32 3075# ifdef _WIN32
2822# undef lstat 3076# undef lstat
… …
2828#define MIN_STAT_INTERVAL 0.1074891 3082#define MIN_STAT_INTERVAL 0.1074891
2829 3083
2830static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 3084static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2831 3085
2832#if EV_USE_INOTIFY 3086#if EV_USE_INOTIFY
2833# define EV_INOTIFY_BUFSIZE 8192 3087
3088/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
3089# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2834 3090
2835static void noinline 3091static void noinline
2836infy_add (EV_P_ ev_stat *w) 3092infy_add (EV_P_ ev_stat *w)
2837{ 3093{
2838 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); 3094 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);
2839 3095
2840 if (w->wd < 0) 3096 if (w->wd >= 0)
3097 {
3098 struct statfs sfs;
3099
3100 /* now local changes will be tracked by inotify, but remote changes won't */
3101 /* unless the filesystem is known to be local, we therefore still poll */
3102 /* also do poll on <2.6.25, but with normal frequency */
3103
3104 if (!fs_2625)
3105 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3106 else if (!statfs (w->path, &sfs)
3107 && (sfs.f_type == 0x1373 /* devfs */
3108 || sfs.f_type == 0xEF53 /* ext2/3 */
3109 || sfs.f_type == 0x3153464a /* jfs */
3110 || sfs.f_type == 0x52654973 /* reiser3 */
3111 || sfs.f_type == 0x01021994 /* tempfs */
3112 || sfs.f_type == 0x58465342 /* xfs */))
3113 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3114 else
3115 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2841 { 3116 }
3117 else
3118 {
3119 /* can't use inotify, continue to stat */
2842 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3120 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2843 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2844 3121
2845 /* monitor some parent directory for speedup hints */ 3122 /* if path is not there, monitor some parent directory for speedup hints */
2846 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3123 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2847 /* but an efficiency issue only */ 3124 /* but an efficiency issue only */
2848 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3125 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2849 { 3126 {
2850 char path [4096]; 3127 char path [4096];
… …
2860 if (!pend || pend == path) 3137 if (!pend || pend == path)
2861 break; 3138 break;
2862 3139
2863 *pend = 0; 3140 *pend = 0;
2864 w->wd = inotify_add_watch (fs_fd, path, mask); 3141 w->wd = inotify_add_watch (fs_fd, path, mask);
2865 } 3142 }
2866 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3143 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2867 } 3144 }
2868 } 3145 }
2869 3146
2870 if (w->wd >= 0) 3147 if (w->wd >= 0)
2871 {
2872 struct statfs sfs;
2873
2874 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3148 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2875 3149
2876 /* now local changes will be tracked by inotify, but remote changes won't */ 3150 /* now re-arm timer, if required */
2877 /* unless the filesystem it known to be local, we therefore still poll */ 3151 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2878 /* also do poll on <2.6.25, but with normal frequency */
2879
2880 if (fs_2625 && !statfs (w->path, &sfs))
2881 if (sfs.f_type == 0x1373 /* devfs */
2882 || sfs.f_type == 0xEF53 /* ext2/3 */
2883 || sfs.f_type == 0x3153464a /* jfs */
2884 || sfs.f_type == 0x52654973 /* reiser3 */
2885 || sfs.f_type == 0x01021994 /* tempfs */
2886 || sfs.f_type == 0x58465342 /* xfs */)
2887 return;
2888
2889 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2890 ev_timer_again (EV_A_ &w->timer); 3152 ev_timer_again (EV_A_ &w->timer);
2891 } 3153 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2892} 3154}
2893 3155
2894static void noinline 3156static void noinline
2895infy_del (EV_P_ ev_stat *w) 3157infy_del (EV_P_ ev_stat *w)
2896{ 3158{
… …
2899 3161
2900 if (wd < 0) 3162 if (wd < 0)
2901 return; 3163 return;
2902 3164
2903 w->wd = -2; 3165 w->wd = -2;
2904 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3166 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2905 wlist_del (&fs_hash [slot].head, (WL)w); 3167 wlist_del (&fs_hash [slot].head, (WL)w);
2906 3168
2907 /* remove this watcher, if others are watching it, they will rearm */ 3169 /* remove this watcher, if others are watching it, they will rearm */
2908 inotify_rm_watch (fs_fd, wd); 3170 inotify_rm_watch (fs_fd, wd);
2909} 3171}
… …
2911static void noinline 3173static void noinline
2912infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3174infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2913{ 3175{
2914 if (slot < 0) 3176 if (slot < 0)
2915 /* overflow, need to check for all hash slots */ 3177 /* overflow, need to check for all hash slots */
2916 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3178 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2917 infy_wd (EV_A_ slot, wd, ev); 3179 infy_wd (EV_A_ slot, wd, ev);
2918 else 3180 else
2919 { 3181 {
2920 WL w_; 3182 WL w_;
2921 3183
2922 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3184 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2923 { 3185 {
2924 ev_stat *w = (ev_stat *)w_; 3186 ev_stat *w = (ev_stat *)w_;
2925 w_ = w_->next; /* lets us remove this watcher and all before it */ 3187 w_ = w_->next; /* lets us remove this watcher and all before it */
2926 3188
2927 if (w->wd == wd || wd == -1) 3189 if (w->wd == wd || wd == -1)
2928 { 3190 {
2929 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3191 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2930 { 3192 {
2931 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3193 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2932 w->wd = -1; 3194 w->wd = -1;
2933 infy_add (EV_A_ w); /* re-add, no matter what */ 3195 infy_add (EV_A_ w); /* re-add, no matter what */
2934 } 3196 }
2935 3197
2936 stat_timer_cb (EV_A_ &w->timer, 0); 3198 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2941 3203
2942static void 3204static void
2943infy_cb (EV_P_ ev_io *w, int revents) 3205infy_cb (EV_P_ ev_io *w, int revents)
2944{ 3206{
2945 char buf [EV_INOTIFY_BUFSIZE]; 3207 char buf [EV_INOTIFY_BUFSIZE];
2946 struct inotify_event *ev = (struct inotify_event *)buf;
2947 int ofs; 3208 int ofs;
2948 int len = read (fs_fd, buf, sizeof (buf)); 3209 int len = read (fs_fd, buf, sizeof (buf));
2949 3210
2950 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3211 for (ofs = 0; ofs < len; )
3212 {
3213 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2951 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3214 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3215 ofs += sizeof (struct inotify_event) + ev->len;
3216 }
2952} 3217}
2953 3218
2954inline_size void 3219inline_size void
2955check_2625 (EV_P) 3220ev_check_2625 (EV_P)
2956{ 3221{
2957 /* kernels < 2.6.25 are borked 3222 /* kernels < 2.6.25 are borked
2958 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3223 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2959 */ 3224 */
2960 struct utsname buf; 3225 if (ev_linux_version () < 0x020619)
2961 int major, minor, micro;
2962
2963 if (uname (&buf))
2964 return; 3226 return;
2965 3227
2966 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2967 return;
2968
2969 if (major < 2
2970 || (major == 2 && minor < 6)
2971 || (major == 2 && minor == 6 && micro < 25))
2972 return;
2973
2974 fs_2625 = 1; 3228 fs_2625 = 1;
3229}
3230
3231inline_size int
3232infy_newfd (void)
3233{
3234#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3235 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3236 if (fd >= 0)
3237 return fd;
3238#endif
3239 return inotify_init ();
2975} 3240}
2976 3241
2977inline_size void 3242inline_size void
2978infy_init (EV_P) 3243infy_init (EV_P)
2979{ 3244{
2980 if (fs_fd != -2) 3245 if (fs_fd != -2)
2981 return; 3246 return;
2982 3247
2983 fs_fd = -1; 3248 fs_fd = -1;
2984 3249
2985 check_2625 (EV_A); 3250 ev_check_2625 (EV_A);
2986 3251
2987 fs_fd = inotify_init (); 3252 fs_fd = infy_newfd ();
2988 3253
2989 if (fs_fd >= 0) 3254 if (fs_fd >= 0)
2990 { 3255 {
3256 fd_intern (fs_fd);
2991 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3257 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2992 ev_set_priority (&fs_w, EV_MAXPRI); 3258 ev_set_priority (&fs_w, EV_MAXPRI);
2993 ev_io_start (EV_A_ &fs_w); 3259 ev_io_start (EV_A_ &fs_w);
3260 ev_unref (EV_A);
2994 } 3261 }
2995} 3262}
2996 3263
2997inline_size void 3264inline_size void
2998infy_fork (EV_P) 3265infy_fork (EV_P)
… …
3000 int slot; 3267 int slot;
3001 3268
3002 if (fs_fd < 0) 3269 if (fs_fd < 0)
3003 return; 3270 return;
3004 3271
3272 ev_ref (EV_A);
3273 ev_io_stop (EV_A_ &fs_w);
3005 close (fs_fd); 3274 close (fs_fd);
3006 fs_fd = inotify_init (); 3275 fs_fd = infy_newfd ();
3007 3276
3277 if (fs_fd >= 0)
3278 {
3279 fd_intern (fs_fd);
3280 ev_io_set (&fs_w, fs_fd, EV_READ);
3281 ev_io_start (EV_A_ &fs_w);
3282 ev_unref (EV_A);
3283 }
3284
3008 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3285 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3009 { 3286 {
3010 WL w_ = fs_hash [slot].head; 3287 WL w_ = fs_hash [slot].head;
3011 fs_hash [slot].head = 0; 3288 fs_hash [slot].head = 0;
3012 3289
3013 while (w_) 3290 while (w_)
… …
3018 w->wd = -1; 3295 w->wd = -1;
3019 3296
3020 if (fs_fd >= 0) 3297 if (fs_fd >= 0)
3021 infy_add (EV_A_ w); /* re-add, no matter what */ 3298 infy_add (EV_A_ w); /* re-add, no matter what */
3022 else 3299 else
3300 {
3301 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3302 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3023 ev_timer_again (EV_A_ &w->timer); 3303 ev_timer_again (EV_A_ &w->timer);
3304 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3305 }
3024 } 3306 }
3025 } 3307 }
3026} 3308}
3027 3309
3028#endif 3310#endif
… …
3045static void noinline 3327static void noinline
3046stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3328stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3047{ 3329{
3048 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3330 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3049 3331
3050 /* we copy this here each the time so that */ 3332 ev_statdata prev = w->attr;
3051 /* prev has the old value when the callback gets invoked */
3052 w->prev = w->attr;
3053 ev_stat_stat (EV_A_ w); 3333 ev_stat_stat (EV_A_ w);
3054 3334
3055 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3335 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3056 if ( 3336 if (
3057 w->prev.st_dev != w->attr.st_dev 3337 prev.st_dev != w->attr.st_dev
3058 || w->prev.st_ino != w->attr.st_ino 3338 || prev.st_ino != w->attr.st_ino
3059 || w->prev.st_mode != w->attr.st_mode 3339 || prev.st_mode != w->attr.st_mode
3060 || w->prev.st_nlink != w->attr.st_nlink 3340 || prev.st_nlink != w->attr.st_nlink
3061 || w->prev.st_uid != w->attr.st_uid 3341 || prev.st_uid != w->attr.st_uid
3062 || w->prev.st_gid != w->attr.st_gid 3342 || prev.st_gid != w->attr.st_gid
3063 || w->prev.st_rdev != w->attr.st_rdev 3343 || prev.st_rdev != w->attr.st_rdev
3064 || w->prev.st_size != w->attr.st_size 3344 || prev.st_size != w->attr.st_size
3065 || w->prev.st_atime != w->attr.st_atime 3345 || prev.st_atime != w->attr.st_atime
3066 || w->prev.st_mtime != w->attr.st_mtime 3346 || prev.st_mtime != w->attr.st_mtime
3067 || w->prev.st_ctime != w->attr.st_ctime 3347 || prev.st_ctime != w->attr.st_ctime
3068 ) { 3348 ) {
3349 /* we only update w->prev on actual differences */
3350 /* in case we test more often than invoke the callback, */
3351 /* to ensure that prev is always different to attr */
3352 w->prev = prev;
3353
3069 #if EV_USE_INOTIFY 3354 #if EV_USE_INOTIFY
3070 if (fs_fd >= 0) 3355 if (fs_fd >= 0)
3071 { 3356 {
3072 infy_del (EV_A_ w); 3357 infy_del (EV_A_ w);
3073 infy_add (EV_A_ w); 3358 infy_add (EV_A_ w);
… …
3098 3383
3099 if (fs_fd >= 0) 3384 if (fs_fd >= 0)
3100 infy_add (EV_A_ w); 3385 infy_add (EV_A_ w);
3101 else 3386 else
3102#endif 3387#endif
3388 {
3103 ev_timer_again (EV_A_ &w->timer); 3389 ev_timer_again (EV_A_ &w->timer);
3390 ev_unref (EV_A);
3391 }
3104 3392
3105 ev_start (EV_A_ (W)w, 1); 3393 ev_start (EV_A_ (W)w, 1);
3106 3394
3107 EV_FREQUENT_CHECK; 3395 EV_FREQUENT_CHECK;
3108} 3396}
… …
3117 EV_FREQUENT_CHECK; 3405 EV_FREQUENT_CHECK;
3118 3406
3119#if EV_USE_INOTIFY 3407#if EV_USE_INOTIFY
3120 infy_del (EV_A_ w); 3408 infy_del (EV_A_ w);
3121#endif 3409#endif
3410
3411 if (ev_is_active (&w->timer))
3412 {
3413 ev_ref (EV_A);
3122 ev_timer_stop (EV_A_ &w->timer); 3414 ev_timer_stop (EV_A_ &w->timer);
3415 }
3123 3416
3124 ev_stop (EV_A_ (W)w); 3417 ev_stop (EV_A_ (W)w);
3125 3418
3126 EV_FREQUENT_CHECK; 3419 EV_FREQUENT_CHECK;
3127} 3420}
… …
3172 3465
3173 EV_FREQUENT_CHECK; 3466 EV_FREQUENT_CHECK;
3174} 3467}
3175#endif 3468#endif
3176 3469
3470#if EV_PREPARE_ENABLE
3177void 3471void
3178ev_prepare_start (EV_P_ ev_prepare *w) 3472ev_prepare_start (EV_P_ ev_prepare *w)
3179{ 3473{
3180 if (expect_false (ev_is_active (w))) 3474 if (expect_false (ev_is_active (w)))
3181 return; 3475 return;
… …
3207 3501
3208 ev_stop (EV_A_ (W)w); 3502 ev_stop (EV_A_ (W)w);
3209 3503
3210 EV_FREQUENT_CHECK; 3504 EV_FREQUENT_CHECK;
3211} 3505}
3506#endif
3212 3507
3508#if EV_CHECK_ENABLE
3213void 3509void
3214ev_check_start (EV_P_ ev_check *w) 3510ev_check_start (EV_P_ ev_check *w)
3215{ 3511{
3216 if (expect_false (ev_is_active (w))) 3512 if (expect_false (ev_is_active (w)))
3217 return; 3513 return;
… …
3243 3539
3244 ev_stop (EV_A_ (W)w); 3540 ev_stop (EV_A_ (W)w);
3245 3541
3246 EV_FREQUENT_CHECK; 3542 EV_FREQUENT_CHECK;
3247} 3543}
3544#endif
3248 3545
3249#if EV_EMBED_ENABLE 3546#if EV_EMBED_ENABLE
3250void noinline 3547void noinline
3251ev_embed_sweep (EV_P_ ev_embed *w) 3548ev_embed_sweep (EV_P_ ev_embed *w)
3252{ 3549{
3253 ev_loop (w->other, EVLOOP_NONBLOCK); 3550 ev_run (w->other, EVRUN_NOWAIT);
3254} 3551}
3255 3552
3256static void 3553static void
3257embed_io_cb (EV_P_ ev_io *io, int revents) 3554embed_io_cb (EV_P_ ev_io *io, int revents)
3258{ 3555{
3259 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3556 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3260 3557
3261 if (ev_cb (w)) 3558 if (ev_cb (w))
3262 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3559 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3263 else 3560 else
3264 ev_loop (w->other, EVLOOP_NONBLOCK); 3561 ev_run (w->other, EVRUN_NOWAIT);
3265} 3562}
3266 3563
3267static void 3564static void
3268embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3565embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3269{ 3566{
… …
3273 EV_P = w->other; 3570 EV_P = w->other;
3274 3571
3275 while (fdchangecnt) 3572 while (fdchangecnt)
3276 { 3573 {
3277 fd_reify (EV_A); 3574 fd_reify (EV_A);
3278 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3575 ev_run (EV_A_ EVRUN_NOWAIT);
3279 } 3576 }
3280 } 3577 }
3281} 3578}
3282 3579
3283static void 3580static void
… …
3289 3586
3290 { 3587 {
3291 EV_P = w->other; 3588 EV_P = w->other;
3292 3589
3293 ev_loop_fork (EV_A); 3590 ev_loop_fork (EV_A);
3294 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3591 ev_run (EV_A_ EVRUN_NOWAIT);
3295 } 3592 }
3296 3593
3297 ev_embed_start (EV_A_ w); 3594 ev_embed_start (EV_A_ w);
3298} 3595}
3299 3596
… …
3347 3644
3348 ev_io_stop (EV_A_ &w->io); 3645 ev_io_stop (EV_A_ &w->io);
3349 ev_prepare_stop (EV_A_ &w->prepare); 3646 ev_prepare_stop (EV_A_ &w->prepare);
3350 ev_fork_stop (EV_A_ &w->fork); 3647 ev_fork_stop (EV_A_ &w->fork);
3351 3648
3649 ev_stop (EV_A_ (W)w);
3650
3352 EV_FREQUENT_CHECK; 3651 EV_FREQUENT_CHECK;
3353} 3652}
3354#endif 3653#endif
3355 3654
3356#if EV_FORK_ENABLE 3655#if EV_FORK_ENABLE
… …
3389 3688
3390 EV_FREQUENT_CHECK; 3689 EV_FREQUENT_CHECK;
3391} 3690}
3392#endif 3691#endif
3393 3692
3394#if EV_ASYNC_ENABLE 3693#if EV_CLEANUP_ENABLE
3395void 3694void
3396ev_async_start (EV_P_ ev_async *w) 3695ev_cleanup_start (EV_P_ ev_cleanup *w)
3397{ 3696{
3398 if (expect_false (ev_is_active (w))) 3697 if (expect_false (ev_is_active (w)))
3399 return; 3698 return;
3699
3700 EV_FREQUENT_CHECK;
3701
3702 ev_start (EV_A_ (W)w, ++cleanupcnt);
3703 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3704 cleanups [cleanupcnt - 1] = w;
3705
3706 /* cleanup watchers should never keep a refcount on the loop */
3707 ev_unref (EV_A);
3708 EV_FREQUENT_CHECK;
3709}
3710
3711void
3712ev_cleanup_stop (EV_P_ ev_cleanup *w)
3713{
3714 clear_pending (EV_A_ (W)w);
3715 if (expect_false (!ev_is_active (w)))
3716 return;
3717
3718 EV_FREQUENT_CHECK;
3719 ev_ref (EV_A);
3720
3721 {
3722 int active = ev_active (w);
3723
3724 cleanups [active - 1] = cleanups [--cleanupcnt];
3725 ev_active (cleanups [active - 1]) = active;
3726 }
3727
3728 ev_stop (EV_A_ (W)w);
3729
3730 EV_FREQUENT_CHECK;
3731}
3732#endif
3733
3734#if EV_ASYNC_ENABLE
3735void
3736ev_async_start (EV_P_ ev_async *w)
3737{
3738 if (expect_false (ev_is_active (w)))
3739 return;
3740
3741 w->sent = 0;
3400 3742
3401 evpipe_init (EV_A); 3743 evpipe_init (EV_A);
3402 3744
3403 EV_FREQUENT_CHECK; 3745 EV_FREQUENT_CHECK;
3404 3746
… …
3482{ 3824{
3483 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3825 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3484 3826
3485 if (expect_false (!once)) 3827 if (expect_false (!once))
3486 { 3828 {
3487 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3829 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3488 return; 3830 return;
3489 } 3831 }
3490 3832
3491 once->cb = cb; 3833 once->cb = cb;
3492 once->arg = arg; 3834 once->arg = arg;
… …
3579 if (types & EV_ASYNC) 3921 if (types & EV_ASYNC)
3580 for (i = asynccnt; i--; ) 3922 for (i = asynccnt; i--; )
3581 cb (EV_A_ EV_ASYNC, asyncs [i]); 3923 cb (EV_A_ EV_ASYNC, asyncs [i]);
3582#endif 3924#endif
3583 3925
3926#if EV_PREPARE_ENABLE
3584 if (types & EV_PREPARE) 3927 if (types & EV_PREPARE)
3585 for (i = preparecnt; i--; ) 3928 for (i = preparecnt; i--; )
3586#if EV_EMBED_ENABLE 3929# if EV_EMBED_ENABLE
3587 if (ev_cb (prepares [i]) != embed_prepare_cb) 3930 if (ev_cb (prepares [i]) != embed_prepare_cb)
3588#endif 3931# endif
3589 cb (EV_A_ EV_PREPARE, prepares [i]); 3932 cb (EV_A_ EV_PREPARE, prepares [i]);
3933#endif
3590 3934
3935#if EV_CHECK_ENABLE
3591 if (types & EV_CHECK) 3936 if (types & EV_CHECK)
3592 for (i = checkcnt; i--; ) 3937 for (i = checkcnt; i--; )
3593 cb (EV_A_ EV_CHECK, checks [i]); 3938 cb (EV_A_ EV_CHECK, checks [i]);
3939#endif
3594 3940
3941#if EV_SIGNAL_ENABLE
3595 if (types & EV_SIGNAL) 3942 if (types & EV_SIGNAL)
3596 for (i = 0; i < EV_NSIG - 1; ++i) 3943 for (i = 0; i < EV_NSIG - 1; ++i)
3597 for (wl = signals [i].head; wl; ) 3944 for (wl = signals [i].head; wl; )
3598 { 3945 {
3599 wn = wl->next; 3946 wn = wl->next;
3600 cb (EV_A_ EV_SIGNAL, wl); 3947 cb (EV_A_ EV_SIGNAL, wl);
3601 wl = wn; 3948 wl = wn;
3602 } 3949 }
3950#endif
3603 3951
3952#if EV_CHILD_ENABLE
3604 if (types & EV_CHILD) 3953 if (types & EV_CHILD)
3605 for (i = EV_PID_HASHSIZE; i--; ) 3954 for (i = (EV_PID_HASHSIZE); i--; )
3606 for (wl = childs [i]; wl; ) 3955 for (wl = childs [i]; wl; )
3607 { 3956 {
3608 wn = wl->next; 3957 wn = wl->next;
3609 cb (EV_A_ EV_CHILD, wl); 3958 cb (EV_A_ EV_CHILD, wl);
3610 wl = wn; 3959 wl = wn;
3611 } 3960 }
3961#endif
3612/* EV_STAT 0x00001000 /* stat data changed */ 3962/* EV_STAT 0x00001000 /* stat data changed */
3613/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3963/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3614} 3964}
3615#endif 3965#endif
3616 3966
3617#if EV_MULTIPLICITY 3967#if EV_MULTIPLICITY
3618 #include "ev_wrap.h" 3968 #include "ev_wrap.h"
3619#endif 3969#endif
3620 3970
3621#ifdef __cplusplus 3971EV_CPP(})
3622}
3623#endif
3624 3972

Diff Legend

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