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

Comparing libev/ev.c (file contents):
Revision 1.314 by root, Wed Aug 26 17:31:20 2009 UTC vs.
Revision 1.383 by root, Wed Jul 20 00:40:14 2011 UTC

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

Diff Legend

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