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

Comparing libev/ev.c (file contents):
Revision 1.330 by root, Tue Mar 9 08:46:17 2010 UTC vs.
Revision 1.381 by root, Mon Jun 27 21:29:35 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,2010 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
114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H 120# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 121# ifndef EV_USE_KQUEUE
117# else 122# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
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>
158#include <string.h> 168#include <string.h>
159#include <fcntl.h> 169#include <fcntl.h>
160#include <stddef.h> 170#include <stddef.h>
161 171
… …
172#ifdef EV_H 182#ifdef EV_H
173# include EV_H 183# include EV_H
174#else 184#else
175# include "ev.h" 185# include "ev.h"
176#endif 186#endif
187
188EV_CPP(extern "C" {)
177 189
178#ifndef _WIN32 190#ifndef _WIN32
179# include <sys/time.h> 191# include <sys/time.h>
180# include <sys/wait.h> 192# include <sys/wait.h>
181# include <unistd.h> 193# include <unistd.h>
… …
184# define WIN32_LEAN_AND_MEAN 196# define WIN32_LEAN_AND_MEAN
185# include <windows.h> 197# include <windows.h>
186# ifndef EV_SELECT_IS_WINSOCKET 198# ifndef EV_SELECT_IS_WINSOCKET
187# define EV_SELECT_IS_WINSOCKET 1 199# define EV_SELECT_IS_WINSOCKET 1
188# endif 200# endif
201# undef EV_AVOID_STDIO
189#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
190 211
191/* 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 */
192 213
193/* try to deduce the maximum number of signals on this platform */ 214/* try to deduce the maximum number of signals on this platform */
194#if defined (EV_NSIG) 215#if defined (EV_NSIG)
… …
206#elif defined (MAXSIG) 227#elif defined (MAXSIG)
207# define EV_NSIG (MAXSIG+1) 228# define EV_NSIG (MAXSIG+1)
208#elif defined (MAX_SIG) 229#elif defined (MAX_SIG)
209# define EV_NSIG (MAX_SIG+1) 230# define EV_NSIG (MAX_SIG+1)
210#elif defined (SIGARRAYSIZE) 231#elif defined (SIGARRAYSIZE)
211# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 232# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
212#elif defined (_sys_nsig) 233#elif defined (_sys_nsig)
213# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 234# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
214#else 235#else
215# error "unable to find value for NSIG, please report" 236# error "unable to find value for NSIG, please report"
216/* 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! :) */
217# define EV_NSIG 65 239# define EV_NSIG 65
240#endif
241
242#ifndef EV_USE_FLOOR
243# define EV_USE_FLOOR 0
218#endif 244#endif
219 245
220#ifndef EV_USE_CLOCK_SYSCALL 246#ifndef EV_USE_CLOCK_SYSCALL
221# if __linux && __GLIBC__ >= 2 247# if __linux && __GLIBC__ >= 2
222# define EV_USE_CLOCK_SYSCALL 1 248# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
223# else 249# else
224# define EV_USE_CLOCK_SYSCALL 0 250# define EV_USE_CLOCK_SYSCALL 0
225# endif 251# endif
226#endif 252#endif
227 253
228#ifndef EV_USE_MONOTONIC 254#ifndef EV_USE_MONOTONIC
229# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 255# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
230# define EV_USE_MONOTONIC 1 256# define EV_USE_MONOTONIC EV_FEATURE_OS
231# else 257# else
232# define EV_USE_MONOTONIC 0 258# define EV_USE_MONOTONIC 0
233# endif 259# endif
234#endif 260#endif
235 261
… …
237# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 263# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
238#endif 264#endif
239 265
240#ifndef EV_USE_NANOSLEEP 266#ifndef EV_USE_NANOSLEEP
241# if _POSIX_C_SOURCE >= 199309L 267# if _POSIX_C_SOURCE >= 199309L
242# define EV_USE_NANOSLEEP 1 268# define EV_USE_NANOSLEEP EV_FEATURE_OS
243# else 269# else
244# define EV_USE_NANOSLEEP 0 270# define EV_USE_NANOSLEEP 0
245# endif 271# endif
246#endif 272#endif
247 273
248#ifndef EV_USE_SELECT 274#ifndef EV_USE_SELECT
249# define EV_USE_SELECT 1 275# define EV_USE_SELECT EV_FEATURE_BACKENDS
250#endif 276#endif
251 277
252#ifndef EV_USE_POLL 278#ifndef EV_USE_POLL
253# ifdef _WIN32 279# ifdef _WIN32
254# define EV_USE_POLL 0 280# define EV_USE_POLL 0
255# else 281# else
256# define EV_USE_POLL 1 282# define EV_USE_POLL EV_FEATURE_BACKENDS
257# endif 283# endif
258#endif 284#endif
259 285
260#ifndef EV_USE_EPOLL 286#ifndef EV_USE_EPOLL
261# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 287# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
262# define EV_USE_EPOLL 1 288# define EV_USE_EPOLL EV_FEATURE_BACKENDS
263# else 289# else
264# define EV_USE_EPOLL 0 290# define EV_USE_EPOLL 0
265# endif 291# endif
266#endif 292#endif
267 293
… …
273# define EV_USE_PORT 0 299# define EV_USE_PORT 0
274#endif 300#endif
275 301
276#ifndef EV_USE_INOTIFY 302#ifndef EV_USE_INOTIFY
277# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
278# define EV_USE_INOTIFY 1 304# define EV_USE_INOTIFY EV_FEATURE_OS
279# else 305# else
280# define EV_USE_INOTIFY 0 306# define EV_USE_INOTIFY 0
281# endif 307# endif
282#endif 308#endif
283 309
284#ifndef EV_PID_HASHSIZE 310#ifndef EV_PID_HASHSIZE
285# if EV_MINIMAL 311# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
286# define EV_PID_HASHSIZE 1
287# else
288# define EV_PID_HASHSIZE 16
289# endif
290#endif 312#endif
291 313
292#ifndef EV_INOTIFY_HASHSIZE 314#ifndef EV_INOTIFY_HASHSIZE
293# if EV_MINIMAL 315# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
294# define EV_INOTIFY_HASHSIZE 1
295# else
296# define EV_INOTIFY_HASHSIZE 16
297# endif
298#endif 316#endif
299 317
300#ifndef EV_USE_EVENTFD 318#ifndef EV_USE_EVENTFD
301# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 319# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
302# define EV_USE_EVENTFD 1 320# define EV_USE_EVENTFD EV_FEATURE_OS
303# else 321# else
304# define EV_USE_EVENTFD 0 322# define EV_USE_EVENTFD 0
305# endif 323# endif
306#endif 324#endif
307 325
308#ifndef EV_USE_SIGNALFD 326#ifndef EV_USE_SIGNALFD
309# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 327# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
310# define EV_USE_SIGNALFD 1 328# define EV_USE_SIGNALFD EV_FEATURE_OS
311# else 329# else
312# define EV_USE_SIGNALFD 0 330# define EV_USE_SIGNALFD 0
313# endif 331# endif
314#endif 332#endif
315 333
… …
318# define EV_USE_4HEAP 1 336# define EV_USE_4HEAP 1
319# define EV_HEAP_CACHE_AT 1 337# define EV_HEAP_CACHE_AT 1
320#endif 338#endif
321 339
322#ifndef EV_VERIFY 340#ifndef EV_VERIFY
323# define EV_VERIFY !EV_MINIMAL 341# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
324#endif 342#endif
325 343
326#ifndef EV_USE_4HEAP 344#ifndef EV_USE_4HEAP
327# define EV_USE_4HEAP !EV_MINIMAL 345# define EV_USE_4HEAP EV_FEATURE_DATA
328#endif 346#endif
329 347
330#ifndef EV_HEAP_CACHE_AT 348#ifndef EV_HEAP_CACHE_AT
331# define EV_HEAP_CACHE_AT !EV_MINIMAL 349# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
332#endif 350#endif
333 351
334/* 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, */
335/* which makes programs even slower. might work on other unices, too. */ 353/* which makes programs even slower. might work on other unices, too. */
336#if EV_USE_CLOCK_SYSCALL 354#if EV_USE_CLOCK_SYSCALL
… …
367# undef EV_USE_INOTIFY 385# undef EV_USE_INOTIFY
368# define EV_USE_INOTIFY 0 386# define EV_USE_INOTIFY 0
369#endif 387#endif
370 388
371#if !EV_USE_NANOSLEEP 389#if !EV_USE_NANOSLEEP
372# ifndef _WIN32 390/* hp-ux has it in sys/time.h, which we unconditionally include above */
391# if !defined(_WIN32) && !defined(__hpux)
373# include <sys/select.h> 392# include <sys/select.h>
374# endif 393# endif
375#endif 394#endif
376 395
377#if EV_USE_INOTIFY 396#if EV_USE_INOTIFY
378# include <sys/utsname.h>
379# include <sys/statfs.h> 397# include <sys/statfs.h>
380# include <sys/inotify.h> 398# include <sys/inotify.h>
381/* 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 */
382# ifndef IN_DONT_FOLLOW 400# ifndef IN_DONT_FOLLOW
383# undef EV_USE_INOTIFY 401# undef EV_USE_INOTIFY
… …
400# define EFD_CLOEXEC O_CLOEXEC 418# define EFD_CLOEXEC O_CLOEXEC
401# else 419# else
402# define EFD_CLOEXEC 02000000 420# define EFD_CLOEXEC 02000000
403# endif 421# endif
404# endif 422# endif
405# ifdef __cplusplus
406extern "C" {
407# endif
408int (eventfd) (unsigned int initval, int flags); 423EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
409# ifdef __cplusplus
410}
411# endif
412#endif 424#endif
413 425
414#if EV_USE_SIGNALFD 426#if EV_USE_SIGNALFD
415/* 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 */
416# include <stdint.h> 428# include <stdint.h>
… …
422# define SFD_CLOEXEC O_CLOEXEC 434# define SFD_CLOEXEC O_CLOEXEC
423# else 435# else
424# define SFD_CLOEXEC 02000000 436# define SFD_CLOEXEC 02000000
425# endif 437# endif
426# endif 438# endif
427# ifdef __cplusplus
428extern "C" {
429# endif
430int signalfd (int fd, const sigset_t *mask, int flags); 439EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
431 440
432struct signalfd_siginfo 441struct signalfd_siginfo
433{ 442{
434 uint32_t ssi_signo; 443 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)]; 444 char pad[128 - sizeof (uint32_t)];
436}; 445};
437# ifdef __cplusplus
438}
439# endif 446#endif
440#endif
441
442 447
443/**/ 448/**/
444 449
445#if EV_VERIFY >= 3 450#if EV_VERIFY >= 3
446# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 451# define EV_FREQUENT_CHECK ev_verify (EV_A)
447#else 452#else
448# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
449#endif 454#endif
450 455
451/* 456/*
452 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
453 * It is added to ev_rt_now when scheduling periodics
454 * to ensure progress, time-wise, even when rounding
455 * errors are against us.
456 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
457 * Better solutions welcome.
458 */ 459 */
459#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 */
460 462
461#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) */
462#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) */
463 465
464#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)
465# 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)
466# 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
467#else 493#else
468# define expect(expr,value) (expr) 494 #define ecb_inline static
469# define noinline
470# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
471# define inline
472# endif 495#endif
473#endif
474 496
497#if ECB_GCC_VERSION(3,1)
498 #define ecb_attribute(attrlist) __attribute__(attrlist)
499 #define ecb_is_constant(expr) __builtin_constant_p (expr)
500 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
501 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
502#else
503 #define ecb_attribute(attrlist)
504 #define ecb_is_constant(expr) 0
505 #define ecb_expect(expr,value) (expr)
506 #define ecb_prefetch(addr,rw,locality)
507#endif
508
509#define ecb_noinline ecb_attribute ((__noinline__))
510#define ecb_noreturn ecb_attribute ((__noreturn__))
511#define ecb_unused ecb_attribute ((__unused__))
512#define ecb_const ecb_attribute ((__const__))
513#define ecb_pure ecb_attribute ((__pure__))
514
515#if ECB_GCC_VERSION(4,3)
516 #define ecb_artificial ecb_attribute ((__artificial__))
517 #define ecb_hot ecb_attribute ((__hot__))
518 #define ecb_cold ecb_attribute ((__cold__))
519#else
520 #define ecb_artificial
521 #define ecb_hot
522 #define ecb_cold
523#endif
524
525/* put around conditional expressions if you are very sure that the */
526/* expression is mostly true or mostly false. note that these return */
527/* booleans, not the expression. */
475#define expect_false(expr) expect ((expr) != 0, 0) 528#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
476#define expect_true(expr) expect ((expr) != 0, 1) 529#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
530/* ecb.h end */
531
532#define expect_false(cond) ecb_expect_false (cond)
533#define expect_true(cond) ecb_expect_true (cond)
534#define noinline ecb_noinline
535
477#define inline_size static inline 536#define inline_size ecb_inline
478 537
479#if EV_MINIMAL 538#if EV_FEATURE_CODE
539# define inline_speed ecb_inline
540#else
480# define inline_speed static noinline 541# define inline_speed static noinline
481#else
482# define inline_speed static inline
483#endif 542#endif
484 543
485#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 544#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
486 545
487#if EV_MINPRI == EV_MAXPRI 546#if EV_MINPRI == EV_MAXPRI
… …
500#define ev_active(w) ((W)(w))->active 559#define ev_active(w) ((W)(w))->active
501#define ev_at(w) ((WT)(w))->at 560#define ev_at(w) ((WT)(w))->at
502 561
503#if EV_USE_REALTIME 562#if EV_USE_REALTIME
504/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 563/* sig_atomic_t is used to avoid per-thread variables or locking but still */
505/* giving it a reasonably high chance of working on typical architetcures */ 564/* giving it a reasonably high chance of working on typical architectures */
506static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 565static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
507#endif 566#endif
508 567
509#if EV_USE_MONOTONIC 568#if EV_USE_MONOTONIC
510static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 569static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
524# include "ev_win32.c" 583# include "ev_win32.c"
525#endif 584#endif
526 585
527/*****************************************************************************/ 586/*****************************************************************************/
528 587
588/* define a suitable floor function (only used by periodics atm) */
589
590#if EV_USE_FLOOR
591# include <math.h>
592# define ev_floor(v) floor (v)
593#else
594
595#include <float.h>
596
597/* a floor() replacement function, should be independent of ev_tstamp type */
598static ev_tstamp noinline
599ev_floor (ev_tstamp v)
600{
601 /* the choice of shift factor is not terribly important */
602#if FLT_RADIX != 2 /* assume FLT_RADIX == 10 */
603 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 10000000000000000000. : 1000000000.;
604#else
605 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 18446744073709551616. : 4294967296.;
606#endif
607
608 /* argument too large for an unsigned long? */
609 if (expect_false (v >= shift))
610 {
611 ev_tstamp f;
612
613 if (v == v - 1.)
614 return v; /* very large number */
615
616 f = shift * ev_floor (v * (1. / shift));
617 return f + ev_floor (v - f);
618 }
619
620 /* special treatment for negative args? */
621 if (expect_false (v < 0.))
622 {
623 ev_tstamp f = -ev_floor (-v);
624
625 return f - (f == v ? 0 : 1);
626 }
627
628 /* fits into an unsigned long */
629 return (unsigned long)v;
630}
631
632#endif
633
634/*****************************************************************************/
635
636#ifdef __linux
637# include <sys/utsname.h>
638#endif
639
640static unsigned int noinline ecb_cold
641ev_linux_version (void)
642{
643#ifdef __linux
644 unsigned int v = 0;
645 struct utsname buf;
646 int i;
647 char *p = buf.release;
648
649 if (uname (&buf))
650 return 0;
651
652 for (i = 3+1; --i; )
653 {
654 unsigned int c = 0;
655
656 for (;;)
657 {
658 if (*p >= '0' && *p <= '9')
659 c = c * 10 + *p++ - '0';
660 else
661 {
662 p += *p == '.';
663 break;
664 }
665 }
666
667 v = (v << 8) | c;
668 }
669
670 return v;
671#else
672 return 0;
673#endif
674}
675
676/*****************************************************************************/
677
678#if EV_AVOID_STDIO
679static void noinline ecb_cold
680ev_printerr (const char *msg)
681{
682 write (STDERR_FILENO, msg, strlen (msg));
683}
684#endif
685
529static void (*syserr_cb)(const char *msg); 686static void (*syserr_cb)(const char *msg);
530 687
531void 688void ecb_cold
532ev_set_syserr_cb (void (*cb)(const char *msg)) 689ev_set_syserr_cb (void (*cb)(const char *msg))
533{ 690{
534 syserr_cb = cb; 691 syserr_cb = cb;
535} 692}
536 693
537static void noinline 694static void noinline ecb_cold
538ev_syserr (const char *msg) 695ev_syserr (const char *msg)
539{ 696{
540 if (!msg) 697 if (!msg)
541 msg = "(libev) system error"; 698 msg = "(libev) system error";
542 699
543 if (syserr_cb) 700 if (syserr_cb)
544 syserr_cb (msg); 701 syserr_cb (msg);
545 else 702 else
546 { 703 {
547#if EV_AVOID_STDIO 704#if EV_AVOID_STDIO
548 write (STDERR_FILENO, msg, strlen (msg)); 705 ev_printerr (msg);
549 write (STDERR_FILENO, ": ", 2); 706 ev_printerr (": ");
550 msg = strerror (errno); 707 ev_printerr (strerror (errno));
551 write (STDERR_FILENO, msg, strlen (msg)); 708 ev_printerr ("\n");
552 write (STDERR_FILENO, "\n", 1);
553#else 709#else
554 perror (msg); 710 perror (msg);
555#endif 711#endif
556 abort (); 712 abort ();
557 } 713 }
558} 714}
559 715
560static void * 716static void *
561ev_realloc_emul (void *ptr, long size) 717ev_realloc_emul (void *ptr, long size)
562{ 718{
719#if __GLIBC__
720 return realloc (ptr, size);
721#else
563 /* some systems, notably openbsd and darwin, fail to properly 722 /* some systems, notably openbsd and darwin, fail to properly
564 * implement realloc (x, 0) (as required by both ansi c-98 and 723 * implement realloc (x, 0) (as required by both ansi c-89 and
565 * the single unix specification, so work around them here. 724 * the single unix specification, so work around them here.
566 */ 725 */
567 726
568 if (size) 727 if (size)
569 return realloc (ptr, size); 728 return realloc (ptr, size);
570 729
571 free (ptr); 730 free (ptr);
572 return 0; 731 return 0;
732#endif
573} 733}
574 734
575static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 735static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
576 736
577void 737void ecb_cold
578ev_set_allocator (void *(*cb)(void *ptr, long size)) 738ev_set_allocator (void *(*cb)(void *ptr, long size))
579{ 739{
580 alloc = cb; 740 alloc = cb;
581} 741}
582 742
… …
586 ptr = alloc (ptr, size); 746 ptr = alloc (ptr, size);
587 747
588 if (!ptr && size) 748 if (!ptr && size)
589 { 749 {
590#if EV_AVOID_STDIO 750#if EV_AVOID_STDIO
591 write (STDERR_FILENO, "libev: memory allocation failed, aborting.", 751 ev_printerr ("(libev) memory allocation failed, aborting.\n");
592 sizeof ("libev: memory allocation failed, aborting.") - 1);
593#else 752#else
594 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 753 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
595#endif 754#endif
596 abort (); 755 abort ();
597 } 756 }
598 757
599 return ptr; 758 return ptr;
… …
616 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 775 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
617 unsigned char unused; 776 unsigned char unused;
618#if EV_USE_EPOLL 777#if EV_USE_EPOLL
619 unsigned int egen; /* generation counter to counter epoll bugs */ 778 unsigned int egen; /* generation counter to counter epoll bugs */
620#endif 779#endif
621#if EV_SELECT_IS_WINSOCKET 780#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
622 SOCKET handle; 781 SOCKET handle;
782#endif
783#if EV_USE_IOCP
784 OVERLAPPED or, ow;
623#endif 785#endif
624} ANFD; 786} ANFD;
625 787
626/* stores the pending event set for a given watcher */ 788/* stores the pending event set for a given watcher */
627typedef struct 789typedef struct
… …
682 844
683 static int ev_default_loop_ptr; 845 static int ev_default_loop_ptr;
684 846
685#endif 847#endif
686 848
687#if EV_MINIMAL < 2 849#if EV_FEATURE_API
688# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 850# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
689# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 851# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
690# define EV_INVOKE_PENDING invoke_cb (EV_A) 852# define EV_INVOKE_PENDING invoke_cb (EV_A)
691#else 853#else
692# define EV_RELEASE_CB (void)0 854# define EV_RELEASE_CB (void)0
693# define EV_ACQUIRE_CB (void)0 855# define EV_ACQUIRE_CB (void)0
694# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 856# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
695#endif 857#endif
696 858
697#define EVUNLOOP_RECURSE 0x80 859#define EVBREAK_RECURSE 0x80
698 860
699/*****************************************************************************/ 861/*****************************************************************************/
700 862
701#ifndef EV_HAVE_EV_TIME 863#ifndef EV_HAVE_EV_TIME
702ev_tstamp 864ev_tstamp
… …
746 if (delay > 0.) 908 if (delay > 0.)
747 { 909 {
748#if EV_USE_NANOSLEEP 910#if EV_USE_NANOSLEEP
749 struct timespec ts; 911 struct timespec ts;
750 912
751 ts.tv_sec = (time_t)delay; 913 EV_TS_SET (ts, delay);
752 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
753
754 nanosleep (&ts, 0); 914 nanosleep (&ts, 0);
755#elif defined(_WIN32) 915#elif defined(_WIN32)
756 Sleep ((unsigned long)(delay * 1e3)); 916 Sleep ((unsigned long)(delay * 1e3));
757#else 917#else
758 struct timeval tv; 918 struct timeval tv;
759 919
760 tv.tv_sec = (time_t)delay;
761 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
762
763 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 920 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
764 /* something not guaranteed by newer posix versions, but guaranteed */ 921 /* something not guaranteed by newer posix versions, but guaranteed */
765 /* by older ones */ 922 /* by older ones */
923 EV_TV_SET (tv, delay);
766 select (0, 0, 0, 0, &tv); 924 select (0, 0, 0, 0, &tv);
767#endif 925#endif
768 } 926 }
769} 927}
770 928
771/*****************************************************************************/ 929/*****************************************************************************/
772 930
773#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 931#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
774 932
775/* find a suitable new size for the given array, */ 933/* find a suitable new size for the given array, */
776/* hopefully by rounding to a ncie-to-malloc size */ 934/* hopefully by rounding to a nice-to-malloc size */
777inline_size int 935inline_size int
778array_nextsize (int elem, int cur, int cnt) 936array_nextsize (int elem, int cur, int cnt)
779{ 937{
780 int ncur = cur + 1; 938 int ncur = cur + 1;
781 939
… …
793 } 951 }
794 952
795 return ncur; 953 return ncur;
796} 954}
797 955
798static noinline void * 956static void * noinline ecb_cold
799array_realloc (int elem, void *base, int *cur, int cnt) 957array_realloc (int elem, void *base, int *cur, int cnt)
800{ 958{
801 *cur = array_nextsize (elem, *cur, cnt); 959 *cur = array_nextsize (elem, *cur, cnt);
802 return ev_realloc (base, elem * *cur); 960 return ev_realloc (base, elem * *cur);
803} 961}
… …
877} 1035}
878 1036
879/*****************************************************************************/ 1037/*****************************************************************************/
880 1038
881inline_speed void 1039inline_speed void
882fd_event_nc (EV_P_ int fd, int revents) 1040fd_event_nocheck (EV_P_ int fd, int revents)
883{ 1041{
884 ANFD *anfd = anfds + fd; 1042 ANFD *anfd = anfds + fd;
885 ev_io *w; 1043 ev_io *w;
886 1044
887 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1045 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
899fd_event (EV_P_ int fd, int revents) 1057fd_event (EV_P_ int fd, int revents)
900{ 1058{
901 ANFD *anfd = anfds + fd; 1059 ANFD *anfd = anfds + fd;
902 1060
903 if (expect_true (!anfd->reify)) 1061 if (expect_true (!anfd->reify))
904 fd_event_nc (EV_A_ fd, revents); 1062 fd_event_nocheck (EV_A_ fd, revents);
905} 1063}
906 1064
907void 1065void
908ev_feed_fd_event (EV_P_ int fd, int revents) 1066ev_feed_fd_event (EV_P_ int fd, int revents)
909{ 1067{
910 if (fd >= 0 && fd < anfdmax) 1068 if (fd >= 0 && fd < anfdmax)
911 fd_event_nc (EV_A_ fd, revents); 1069 fd_event_nocheck (EV_A_ fd, revents);
912} 1070}
913 1071
914/* make sure the external fd watch events are in-sync */ 1072/* make sure the external fd watch events are in-sync */
915/* with the kernel/libev internal state */ 1073/* with the kernel/libev internal state */
916inline_size void 1074inline_size void
917fd_reify (EV_P) 1075fd_reify (EV_P)
918{ 1076{
919 int i; 1077 int i;
920 1078
1079#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1080 for (i = 0; i < fdchangecnt; ++i)
1081 {
1082 int fd = fdchanges [i];
1083 ANFD *anfd = anfds + fd;
1084
1085 if (anfd->reify & EV__IOFDSET && anfd->head)
1086 {
1087 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1088
1089 if (handle != anfd->handle)
1090 {
1091 unsigned long arg;
1092
1093 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1094
1095 /* handle changed, but fd didn't - we need to do it in two steps */
1096 backend_modify (EV_A_ fd, anfd->events, 0);
1097 anfd->events = 0;
1098 anfd->handle = handle;
1099 }
1100 }
1101 }
1102#endif
1103
921 for (i = 0; i < fdchangecnt; ++i) 1104 for (i = 0; i < fdchangecnt; ++i)
922 { 1105 {
923 int fd = fdchanges [i]; 1106 int fd = fdchanges [i];
924 ANFD *anfd = anfds + fd; 1107 ANFD *anfd = anfds + fd;
925 ev_io *w; 1108 ev_io *w;
926 1109
927 unsigned char events = 0; 1110 unsigned char o_events = anfd->events;
1111 unsigned char o_reify = anfd->reify;
928 1112
929 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1113 anfd->reify = 0;
930 events |= (unsigned char)w->events;
931 1114
932#if EV_SELECT_IS_WINSOCKET 1115 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
933 if (events)
934 { 1116 {
935 unsigned long arg; 1117 anfd->events = 0;
936 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 1118
937 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 1119 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1120 anfd->events |= (unsigned char)w->events;
1121
1122 if (o_events != anfd->events)
1123 o_reify = EV__IOFDSET; /* actually |= */
938 } 1124 }
939#endif
940 1125
941 { 1126 if (o_reify & EV__IOFDSET)
942 unsigned char o_events = anfd->events;
943 unsigned char o_reify = anfd->reify;
944
945 anfd->reify = 0;
946 anfd->events = events;
947
948 if (o_events != events || o_reify & EV__IOFDSET)
949 backend_modify (EV_A_ fd, o_events, events); 1127 backend_modify (EV_A_ fd, o_events, anfd->events);
950 }
951 } 1128 }
952 1129
953 fdchangecnt = 0; 1130 fdchangecnt = 0;
954} 1131}
955 1132
… …
967 fdchanges [fdchangecnt - 1] = fd; 1144 fdchanges [fdchangecnt - 1] = fd;
968 } 1145 }
969} 1146}
970 1147
971/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */ 1148/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
972inline_speed void 1149inline_speed void ecb_cold
973fd_kill (EV_P_ int fd) 1150fd_kill (EV_P_ int fd)
974{ 1151{
975 ev_io *w; 1152 ev_io *w;
976 1153
977 while ((w = (ev_io *)anfds [fd].head)) 1154 while ((w = (ev_io *)anfds [fd].head))
… …
979 ev_io_stop (EV_A_ w); 1156 ev_io_stop (EV_A_ w);
980 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1157 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
981 } 1158 }
982} 1159}
983 1160
984/* check whether the given fd is atcually valid, for error recovery */ 1161/* check whether the given fd is actually valid, for error recovery */
985inline_size int 1162inline_size int ecb_cold
986fd_valid (int fd) 1163fd_valid (int fd)
987{ 1164{
988#ifdef _WIN32 1165#ifdef _WIN32
989 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1166 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
990#else 1167#else
991 return fcntl (fd, F_GETFD) != -1; 1168 return fcntl (fd, F_GETFD) != -1;
992#endif 1169#endif
993} 1170}
994 1171
995/* called on EBADF to verify fds */ 1172/* called on EBADF to verify fds */
996static void noinline 1173static void noinline ecb_cold
997fd_ebadf (EV_P) 1174fd_ebadf (EV_P)
998{ 1175{
999 int fd; 1176 int fd;
1000 1177
1001 for (fd = 0; fd < anfdmax; ++fd) 1178 for (fd = 0; fd < anfdmax; ++fd)
… …
1003 if (!fd_valid (fd) && errno == EBADF) 1180 if (!fd_valid (fd) && errno == EBADF)
1004 fd_kill (EV_A_ fd); 1181 fd_kill (EV_A_ fd);
1005} 1182}
1006 1183
1007/* called on ENOMEM in select/poll to kill some fds and retry */ 1184/* called on ENOMEM in select/poll to kill some fds and retry */
1008static void noinline 1185static void noinline ecb_cold
1009fd_enomem (EV_P) 1186fd_enomem (EV_P)
1010{ 1187{
1011 int fd; 1188 int fd;
1012 1189
1013 for (fd = anfdmax; fd--; ) 1190 for (fd = anfdmax; fd--; )
… …
1031 anfds [fd].emask = 0; 1208 anfds [fd].emask = 0;
1032 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1209 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1033 } 1210 }
1034} 1211}
1035 1212
1213/* used to prepare libev internal fd's */
1214/* this is not fork-safe */
1215inline_speed void
1216fd_intern (int fd)
1217{
1218#ifdef _WIN32
1219 unsigned long arg = 1;
1220 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1221#else
1222 fcntl (fd, F_SETFD, FD_CLOEXEC);
1223 fcntl (fd, F_SETFL, O_NONBLOCK);
1224#endif
1225}
1226
1036/*****************************************************************************/ 1227/*****************************************************************************/
1037 1228
1038/* 1229/*
1039 * the heap functions want a real array index. array index 0 uis guaranteed to not 1230 * the heap functions want a real array index. array index 0 is guaranteed to not
1040 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1231 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1041 * the branching factor of the d-tree. 1232 * the branching factor of the d-tree.
1042 */ 1233 */
1043 1234
1044/* 1235/*
… …
1192 1383
1193static ANSIG signals [EV_NSIG - 1]; 1384static ANSIG signals [EV_NSIG - 1];
1194 1385
1195/*****************************************************************************/ 1386/*****************************************************************************/
1196 1387
1197/* used to prepare libev internal fd's */ 1388#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1198/* this is not fork-safe */
1199inline_speed void
1200fd_intern (int fd)
1201{
1202#ifdef _WIN32
1203 unsigned long arg = 1;
1204 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1205#else
1206 fcntl (fd, F_SETFD, FD_CLOEXEC);
1207 fcntl (fd, F_SETFL, O_NONBLOCK);
1208#endif
1209}
1210 1389
1211static void noinline 1390static void noinline ecb_cold
1212evpipe_init (EV_P) 1391evpipe_init (EV_P)
1213{ 1392{
1214 if (!ev_is_active (&pipe_w)) 1393 if (!ev_is_active (&pipe_w))
1215 { 1394 {
1216#if EV_USE_EVENTFD 1395# if EV_USE_EVENTFD
1217 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1396 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1218 if (evfd < 0 && errno == EINVAL) 1397 if (evfd < 0 && errno == EINVAL)
1219 evfd = eventfd (0, 0); 1398 evfd = eventfd (0, 0);
1220 1399
1221 if (evfd >= 0) 1400 if (evfd >= 0)
… …
1223 evpipe [0] = -1; 1402 evpipe [0] = -1;
1224 fd_intern (evfd); /* doing it twice doesn't hurt */ 1403 fd_intern (evfd); /* doing it twice doesn't hurt */
1225 ev_io_set (&pipe_w, evfd, EV_READ); 1404 ev_io_set (&pipe_w, evfd, EV_READ);
1226 } 1405 }
1227 else 1406 else
1228#endif 1407# endif
1229 { 1408 {
1230 while (pipe (evpipe)) 1409 while (pipe (evpipe))
1231 ev_syserr ("(libev) error creating signal/async pipe"); 1410 ev_syserr ("(libev) error creating signal/async pipe");
1232 1411
1233 fd_intern (evpipe [0]); 1412 fd_intern (evpipe [0]);
… …
1238 ev_io_start (EV_A_ &pipe_w); 1417 ev_io_start (EV_A_ &pipe_w);
1239 ev_unref (EV_A); /* watcher should not keep loop alive */ 1418 ev_unref (EV_A); /* watcher should not keep loop alive */
1240 } 1419 }
1241} 1420}
1242 1421
1243inline_size void 1422inline_speed void
1244evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1423evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1245{ 1424{
1246 if (!*flag) 1425 if (!*flag)
1247 { 1426 {
1248 int old_errno = errno; /* save errno because write might clobber it */
1249
1250 *flag = 1; 1427 *flag = 1;
1251 1428
1429 pipe_write_skipped = 1;
1430
1431 if (pipe_write_wanted)
1432 {
1433 int old_errno;
1434
1435 pipe_write_skipped = 0;
1436
1437 old_errno = errno; /* save errno because write will clobber it */
1438
1252#if EV_USE_EVENTFD 1439#if EV_USE_EVENTFD
1253 if (evfd >= 0) 1440 if (evfd >= 0)
1254 { 1441 {
1255 uint64_t counter = 1; 1442 uint64_t counter = 1;
1256 write (evfd, &counter, sizeof (uint64_t)); 1443 write (evfd, &counter, sizeof (uint64_t));
1444 }
1445 else
1446#endif
1447 {
1448 /* win32 people keep sending patches that change this write() to send() */
1449 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1450 /* so when you think this write should be a send instead, please find out */
1451 /* where your send() is from - it's definitely not the microsoft send, and */
1452 /* tell me. thank you. */
1453 write (evpipe [1], &(evpipe [1]), 1);
1454 }
1455
1456 errno = old_errno;
1257 } 1457 }
1258 else
1259#endif
1260 write (evpipe [1], &old_errno, 1);
1261
1262 errno = old_errno;
1263 } 1458 }
1264} 1459}
1265 1460
1266/* called whenever the libev signal pipe */ 1461/* called whenever the libev signal pipe */
1267/* got some events (signal, async) */ 1462/* got some events (signal, async) */
1268static void 1463static void
1269pipecb (EV_P_ ev_io *iow, int revents) 1464pipecb (EV_P_ ev_io *iow, int revents)
1270{ 1465{
1271 int i; 1466 int i;
1272 1467
1468 if (revents & EV_READ)
1469 {
1273#if EV_USE_EVENTFD 1470#if EV_USE_EVENTFD
1274 if (evfd >= 0) 1471 if (evfd >= 0)
1275 { 1472 {
1276 uint64_t counter; 1473 uint64_t counter;
1277 read (evfd, &counter, sizeof (uint64_t)); 1474 read (evfd, &counter, sizeof (uint64_t));
1278 } 1475 }
1279 else 1476 else
1280#endif 1477#endif
1281 { 1478 {
1282 char dummy; 1479 char dummy;
1480 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1283 read (evpipe [0], &dummy, 1); 1481 read (evpipe [0], &dummy, 1);
1482 }
1284 } 1483 }
1285 1484
1485 pipe_write_skipped = 0;
1486
1487#if EV_SIGNAL_ENABLE
1286 if (sig_pending) 1488 if (sig_pending)
1287 { 1489 {
1288 sig_pending = 0; 1490 sig_pending = 0;
1289 1491
1290 for (i = EV_NSIG - 1; i--; ) 1492 for (i = EV_NSIG - 1; i--; )
1291 if (expect_false (signals [i].pending)) 1493 if (expect_false (signals [i].pending))
1292 ev_feed_signal_event (EV_A_ i + 1); 1494 ev_feed_signal_event (EV_A_ i + 1);
1293 } 1495 }
1496#endif
1294 1497
1295#if EV_ASYNC_ENABLE 1498#if EV_ASYNC_ENABLE
1296 if (async_pending) 1499 if (async_pending)
1297 { 1500 {
1298 async_pending = 0; 1501 async_pending = 0;
… …
1307#endif 1510#endif
1308} 1511}
1309 1512
1310/*****************************************************************************/ 1513/*****************************************************************************/
1311 1514
1515void
1516ev_feed_signal (int signum)
1517{
1518#if EV_MULTIPLICITY
1519 EV_P = signals [signum - 1].loop;
1520
1521 if (!EV_A)
1522 return;
1523#endif
1524
1525 if (!ev_active (&pipe_w))
1526 return;
1527
1528 signals [signum - 1].pending = 1;
1529 evpipe_write (EV_A_ &sig_pending);
1530}
1531
1312static void 1532static void
1313ev_sighandler (int signum) 1533ev_sighandler (int signum)
1314{ 1534{
1315#if EV_MULTIPLICITY
1316 EV_P = signals [signum - 1].loop;
1317#endif
1318
1319#ifdef _WIN32 1535#ifdef _WIN32
1320 signal (signum, ev_sighandler); 1536 signal (signum, ev_sighandler);
1321#endif 1537#endif
1322 1538
1323 signals [signum - 1].pending = 1; 1539 ev_feed_signal (signum);
1324 evpipe_write (EV_A_ &sig_pending);
1325} 1540}
1326 1541
1327void noinline 1542void noinline
1328ev_feed_signal_event (EV_P_ int signum) 1543ev_feed_signal_event (EV_P_ int signum)
1329{ 1544{
… …
1366 break; 1581 break;
1367 } 1582 }
1368} 1583}
1369#endif 1584#endif
1370 1585
1586#endif
1587
1371/*****************************************************************************/ 1588/*****************************************************************************/
1372 1589
1590#if EV_CHILD_ENABLE
1373static WL childs [EV_PID_HASHSIZE]; 1591static WL childs [EV_PID_HASHSIZE];
1374
1375#ifndef _WIN32
1376 1592
1377static ev_signal childev; 1593static ev_signal childev;
1378 1594
1379#ifndef WIFCONTINUED 1595#ifndef WIFCONTINUED
1380# define WIFCONTINUED(status) 0 1596# define WIFCONTINUED(status) 0
… …
1385child_reap (EV_P_ int chain, int pid, int status) 1601child_reap (EV_P_ int chain, int pid, int status)
1386{ 1602{
1387 ev_child *w; 1603 ev_child *w;
1388 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1604 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1389 1605
1390 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1606 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1391 { 1607 {
1392 if ((w->pid == pid || !w->pid) 1608 if ((w->pid == pid || !w->pid)
1393 && (!traced || (w->flags & 1))) 1609 && (!traced || (w->flags & 1)))
1394 { 1610 {
1395 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1611 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1420 /* make sure we are called again until all children have been reaped */ 1636 /* make sure we are called again until all children have been reaped */
1421 /* we need to do it this way so that the callback gets called before we continue */ 1637 /* we need to do it this way so that the callback gets called before we continue */
1422 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1638 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1423 1639
1424 child_reap (EV_A_ pid, pid, status); 1640 child_reap (EV_A_ pid, pid, status);
1425 if (EV_PID_HASHSIZE > 1) 1641 if ((EV_PID_HASHSIZE) > 1)
1426 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1642 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1427} 1643}
1428 1644
1429#endif 1645#endif
1430 1646
1431/*****************************************************************************/ 1647/*****************************************************************************/
1432 1648
1649#if EV_USE_IOCP
1650# include "ev_iocp.c"
1651#endif
1433#if EV_USE_PORT 1652#if EV_USE_PORT
1434# include "ev_port.c" 1653# include "ev_port.c"
1435#endif 1654#endif
1436#if EV_USE_KQUEUE 1655#if EV_USE_KQUEUE
1437# include "ev_kqueue.c" 1656# include "ev_kqueue.c"
… …
1444#endif 1663#endif
1445#if EV_USE_SELECT 1664#if EV_USE_SELECT
1446# include "ev_select.c" 1665# include "ev_select.c"
1447#endif 1666#endif
1448 1667
1449int 1668int ecb_cold
1450ev_version_major (void) 1669ev_version_major (void)
1451{ 1670{
1452 return EV_VERSION_MAJOR; 1671 return EV_VERSION_MAJOR;
1453} 1672}
1454 1673
1455int 1674int ecb_cold
1456ev_version_minor (void) 1675ev_version_minor (void)
1457{ 1676{
1458 return EV_VERSION_MINOR; 1677 return EV_VERSION_MINOR;
1459} 1678}
1460 1679
1461/* return true if we are running with elevated privileges and should ignore env variables */ 1680/* return true if we are running with elevated privileges and should ignore env variables */
1462int inline_size 1681int inline_size ecb_cold
1463enable_secure (void) 1682enable_secure (void)
1464{ 1683{
1465#ifdef _WIN32 1684#ifdef _WIN32
1466 return 0; 1685 return 0;
1467#else 1686#else
1468 return getuid () != geteuid () 1687 return getuid () != geteuid ()
1469 || getgid () != getegid (); 1688 || getgid () != getegid ();
1470#endif 1689#endif
1471} 1690}
1472 1691
1473unsigned int 1692unsigned int ecb_cold
1474ev_supported_backends (void) 1693ev_supported_backends (void)
1475{ 1694{
1476 unsigned int flags = 0; 1695 unsigned int flags = 0;
1477 1696
1478 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 1697 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
… …
1482 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 1701 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1483 1702
1484 return flags; 1703 return flags;
1485} 1704}
1486 1705
1487unsigned int 1706unsigned int ecb_cold
1488ev_recommended_backends (void) 1707ev_recommended_backends (void)
1489{ 1708{
1490 unsigned int flags = ev_supported_backends (); 1709 unsigned int flags = ev_supported_backends ();
1491 1710
1492#ifndef __NetBSD__ 1711#ifndef __NetBSD__
… …
1497#ifdef __APPLE__ 1716#ifdef __APPLE__
1498 /* only select works correctly on that "unix-certified" platform */ 1717 /* only select works correctly on that "unix-certified" platform */
1499 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1718 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1500 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1719 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1501#endif 1720#endif
1721#ifdef __FreeBSD__
1722 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1723#endif
1502 1724
1503 return flags; 1725 return flags;
1504} 1726}
1505 1727
1506unsigned int 1728unsigned int ecb_cold
1507ev_embeddable_backends (void) 1729ev_embeddable_backends (void)
1508{ 1730{
1509 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1731 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1510 1732
1511 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1733 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1512 /* please fix it and tell me how to detect the fix */ 1734 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1513 flags &= ~EVBACKEND_EPOLL; 1735 flags &= ~EVBACKEND_EPOLL;
1514 1736
1515 return flags; 1737 return flags;
1516} 1738}
1517 1739
1518unsigned int 1740unsigned int
1519ev_backend (EV_P) 1741ev_backend (EV_P)
1520{ 1742{
1521 return backend; 1743 return backend;
1522} 1744}
1523 1745
1524#if EV_MINIMAL < 2 1746#if EV_FEATURE_API
1525unsigned int 1747unsigned int
1526ev_loop_count (EV_P) 1748ev_iteration (EV_P)
1527{ 1749{
1528 return loop_count; 1750 return loop_count;
1529} 1751}
1530 1752
1531unsigned int 1753unsigned int
1532ev_loop_depth (EV_P) 1754ev_depth (EV_P)
1533{ 1755{
1534 return loop_depth; 1756 return loop_depth;
1535} 1757}
1536 1758
1537void 1759void
… …
1556ev_userdata (EV_P) 1778ev_userdata (EV_P)
1557{ 1779{
1558 return userdata; 1780 return userdata;
1559} 1781}
1560 1782
1783void
1561void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1784ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1562{ 1785{
1563 invoke_cb = invoke_pending_cb; 1786 invoke_cb = invoke_pending_cb;
1564} 1787}
1565 1788
1789void
1566void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 1790ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1567{ 1791{
1568 release_cb = release; 1792 release_cb = release;
1569 acquire_cb = acquire; 1793 acquire_cb = acquire;
1570} 1794}
1571#endif 1795#endif
1572 1796
1573/* initialise a loop structure, must be zero-initialised */ 1797/* initialise a loop structure, must be zero-initialised */
1574static void noinline 1798static void noinline ecb_cold
1575loop_init (EV_P_ unsigned int flags) 1799loop_init (EV_P_ unsigned int flags)
1576{ 1800{
1577 if (!backend) 1801 if (!backend)
1578 { 1802 {
1803 origflags = flags;
1804
1579#if EV_USE_REALTIME 1805#if EV_USE_REALTIME
1580 if (!have_realtime) 1806 if (!have_realtime)
1581 { 1807 {
1582 struct timespec ts; 1808 struct timespec ts;
1583 1809
… …
1605 if (!(flags & EVFLAG_NOENV) 1831 if (!(flags & EVFLAG_NOENV)
1606 && !enable_secure () 1832 && !enable_secure ()
1607 && getenv ("LIBEV_FLAGS")) 1833 && getenv ("LIBEV_FLAGS"))
1608 flags = atoi (getenv ("LIBEV_FLAGS")); 1834 flags = atoi (getenv ("LIBEV_FLAGS"));
1609 1835
1610 ev_rt_now = ev_time (); 1836 ev_rt_now = ev_time ();
1611 mn_now = get_clock (); 1837 mn_now = get_clock ();
1612 now_floor = mn_now; 1838 now_floor = mn_now;
1613 rtmn_diff = ev_rt_now - mn_now; 1839 rtmn_diff = ev_rt_now - mn_now;
1614#if EV_MINIMAL < 2 1840#if EV_FEATURE_API
1615 invoke_cb = ev_invoke_pending; 1841 invoke_cb = ev_invoke_pending;
1616#endif 1842#endif
1617 1843
1618 io_blocktime = 0.; 1844 io_blocktime = 0.;
1619 timeout_blocktime = 0.; 1845 timeout_blocktime = 0.;
1620 backend = 0; 1846 backend = 0;
1621 backend_fd = -1; 1847 backend_fd = -1;
1622 sig_pending = 0; 1848 sig_pending = 0;
1623#if EV_ASYNC_ENABLE 1849#if EV_ASYNC_ENABLE
1624 async_pending = 0; 1850 async_pending = 0;
1625#endif 1851#endif
1852 pipe_write_skipped = 0;
1853 pipe_write_wanted = 0;
1626#if EV_USE_INOTIFY 1854#if EV_USE_INOTIFY
1627 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1855 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1628#endif 1856#endif
1629#if EV_USE_SIGNALFD 1857#if EV_USE_SIGNALFD
1630 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1858 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1631#endif 1859#endif
1632 1860
1633 if (!(flags & 0x0000ffffU)) 1861 if (!(flags & EVBACKEND_MASK))
1634 flags |= ev_recommended_backends (); 1862 flags |= ev_recommended_backends ();
1635 1863
1864#if EV_USE_IOCP
1865 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1866#endif
1636#if EV_USE_PORT 1867#if EV_USE_PORT
1637 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1868 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1638#endif 1869#endif
1639#if EV_USE_KQUEUE 1870#if EV_USE_KQUEUE
1640 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1871 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1649 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1880 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1650#endif 1881#endif
1651 1882
1652 ev_prepare_init (&pending_w, pendingcb); 1883 ev_prepare_init (&pending_w, pendingcb);
1653 1884
1885#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1654 ev_init (&pipe_w, pipecb); 1886 ev_init (&pipe_w, pipecb);
1655 ev_set_priority (&pipe_w, EV_MAXPRI); 1887 ev_set_priority (&pipe_w, EV_MAXPRI);
1888#endif
1656 } 1889 }
1657} 1890}
1658 1891
1659/* free up a loop structure */ 1892/* free up a loop structure */
1660static void noinline 1893void ecb_cold
1661loop_destroy (EV_P) 1894ev_loop_destroy (EV_P)
1662{ 1895{
1663 int i; 1896 int i;
1897
1898#if EV_MULTIPLICITY
1899 /* mimic free (0) */
1900 if (!EV_A)
1901 return;
1902#endif
1903
1904#if EV_CLEANUP_ENABLE
1905 /* queue cleanup watchers (and execute them) */
1906 if (expect_false (cleanupcnt))
1907 {
1908 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1909 EV_INVOKE_PENDING;
1910 }
1911#endif
1912
1913#if EV_CHILD_ENABLE
1914 if (ev_is_active (&childev))
1915 {
1916 ev_ref (EV_A); /* child watcher */
1917 ev_signal_stop (EV_A_ &childev);
1918 }
1919#endif
1664 1920
1665 if (ev_is_active (&pipe_w)) 1921 if (ev_is_active (&pipe_w))
1666 { 1922 {
1667 /*ev_ref (EV_A);*/ 1923 /*ev_ref (EV_A);*/
1668 /*ev_io_stop (EV_A_ &pipe_w);*/ 1924 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1690#endif 1946#endif
1691 1947
1692 if (backend_fd >= 0) 1948 if (backend_fd >= 0)
1693 close (backend_fd); 1949 close (backend_fd);
1694 1950
1951#if EV_USE_IOCP
1952 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1953#endif
1695#if EV_USE_PORT 1954#if EV_USE_PORT
1696 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1955 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1697#endif 1956#endif
1698#if EV_USE_KQUEUE 1957#if EV_USE_KQUEUE
1699 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1958 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1726 array_free (periodic, EMPTY); 1985 array_free (periodic, EMPTY);
1727#endif 1986#endif
1728#if EV_FORK_ENABLE 1987#if EV_FORK_ENABLE
1729 array_free (fork, EMPTY); 1988 array_free (fork, EMPTY);
1730#endif 1989#endif
1990#if EV_CLEANUP_ENABLE
1991 array_free (cleanup, EMPTY);
1992#endif
1731 array_free (prepare, EMPTY); 1993 array_free (prepare, EMPTY);
1732 array_free (check, EMPTY); 1994 array_free (check, EMPTY);
1733#if EV_ASYNC_ENABLE 1995#if EV_ASYNC_ENABLE
1734 array_free (async, EMPTY); 1996 array_free (async, EMPTY);
1735#endif 1997#endif
1736 1998
1737 backend = 0; 1999 backend = 0;
2000
2001#if EV_MULTIPLICITY
2002 if (ev_is_default_loop (EV_A))
2003#endif
2004 ev_default_loop_ptr = 0;
2005#if EV_MULTIPLICITY
2006 else
2007 ev_free (EV_A);
2008#endif
1738} 2009}
1739 2010
1740#if EV_USE_INOTIFY 2011#if EV_USE_INOTIFY
1741inline_size void infy_fork (EV_P); 2012inline_size void infy_fork (EV_P);
1742#endif 2013#endif
… …
1757 infy_fork (EV_A); 2028 infy_fork (EV_A);
1758#endif 2029#endif
1759 2030
1760 if (ev_is_active (&pipe_w)) 2031 if (ev_is_active (&pipe_w))
1761 { 2032 {
1762 /* this "locks" the handlers against writing to the pipe */ 2033 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1763 /* while we modify the fd vars */
1764 sig_pending = 1;
1765#if EV_ASYNC_ENABLE
1766 async_pending = 1;
1767#endif
1768 2034
1769 ev_ref (EV_A); 2035 ev_ref (EV_A);
1770 ev_io_stop (EV_A_ &pipe_w); 2036 ev_io_stop (EV_A_ &pipe_w);
1771 2037
1772#if EV_USE_EVENTFD 2038#if EV_USE_EVENTFD
… …
1778 { 2044 {
1779 EV_WIN32_CLOSE_FD (evpipe [0]); 2045 EV_WIN32_CLOSE_FD (evpipe [0]);
1780 EV_WIN32_CLOSE_FD (evpipe [1]); 2046 EV_WIN32_CLOSE_FD (evpipe [1]);
1781 } 2047 }
1782 2048
2049#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1783 evpipe_init (EV_A); 2050 evpipe_init (EV_A);
1784 /* now iterate over everything, in case we missed something */ 2051 /* now iterate over everything, in case we missed something */
1785 pipecb (EV_A_ &pipe_w, EV_READ); 2052 pipecb (EV_A_ &pipe_w, EV_READ);
2053#endif
1786 } 2054 }
1787 2055
1788 postfork = 0; 2056 postfork = 0;
1789} 2057}
1790 2058
1791#if EV_MULTIPLICITY 2059#if EV_MULTIPLICITY
1792 2060
1793struct ev_loop * 2061struct ev_loop * ecb_cold
1794ev_loop_new (unsigned int flags) 2062ev_loop_new (unsigned int flags)
1795{ 2063{
1796 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2064 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1797 2065
1798 memset (EV_A, 0, sizeof (struct ev_loop)); 2066 memset (EV_A, 0, sizeof (struct ev_loop));
1799 loop_init (EV_A_ flags); 2067 loop_init (EV_A_ flags);
1800 2068
1801 if (ev_backend (EV_A)) 2069 if (ev_backend (EV_A))
1802 return EV_A; 2070 return EV_A;
1803 2071
2072 ev_free (EV_A);
1804 return 0; 2073 return 0;
1805} 2074}
1806 2075
1807void
1808ev_loop_destroy (EV_P)
1809{
1810 loop_destroy (EV_A);
1811 ev_free (loop);
1812}
1813
1814void
1815ev_loop_fork (EV_P)
1816{
1817 postfork = 1; /* must be in line with ev_default_fork */
1818}
1819#endif /* multiplicity */ 2076#endif /* multiplicity */
1820 2077
1821#if EV_VERIFY 2078#if EV_VERIFY
1822static void noinline 2079static void noinline ecb_cold
1823verify_watcher (EV_P_ W w) 2080verify_watcher (EV_P_ W w)
1824{ 2081{
1825 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2082 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1826 2083
1827 if (w->pending) 2084 if (w->pending)
1828 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2085 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1829} 2086}
1830 2087
1831static void noinline 2088static void noinline ecb_cold
1832verify_heap (EV_P_ ANHE *heap, int N) 2089verify_heap (EV_P_ ANHE *heap, int N)
1833{ 2090{
1834 int i; 2091 int i;
1835 2092
1836 for (i = HEAP0; i < N + HEAP0; ++i) 2093 for (i = HEAP0; i < N + HEAP0; ++i)
… …
1841 2098
1842 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2099 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1843 } 2100 }
1844} 2101}
1845 2102
1846static void noinline 2103static void noinline ecb_cold
1847array_verify (EV_P_ W *ws, int cnt) 2104array_verify (EV_P_ W *ws, int cnt)
1848{ 2105{
1849 while (cnt--) 2106 while (cnt--)
1850 { 2107 {
1851 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2108 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1852 verify_watcher (EV_A_ ws [cnt]); 2109 verify_watcher (EV_A_ ws [cnt]);
1853 } 2110 }
1854} 2111}
1855#endif 2112#endif
1856 2113
1857#if EV_MINIMAL < 2 2114#if EV_FEATURE_API
1858void 2115void ecb_cold
1859ev_loop_verify (EV_P) 2116ev_verify (EV_P)
1860{ 2117{
1861#if EV_VERIFY 2118#if EV_VERIFY
1862 int i; 2119 int i;
1863 WL w; 2120 WL w;
1864 2121
… …
1898#if EV_FORK_ENABLE 2155#if EV_FORK_ENABLE
1899 assert (forkmax >= forkcnt); 2156 assert (forkmax >= forkcnt);
1900 array_verify (EV_A_ (W *)forks, forkcnt); 2157 array_verify (EV_A_ (W *)forks, forkcnt);
1901#endif 2158#endif
1902 2159
2160#if EV_CLEANUP_ENABLE
2161 assert (cleanupmax >= cleanupcnt);
2162 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2163#endif
2164
1903#if EV_ASYNC_ENABLE 2165#if EV_ASYNC_ENABLE
1904 assert (asyncmax >= asynccnt); 2166 assert (asyncmax >= asynccnt);
1905 array_verify (EV_A_ (W *)asyncs, asynccnt); 2167 array_verify (EV_A_ (W *)asyncs, asynccnt);
1906#endif 2168#endif
1907 2169
2170#if EV_PREPARE_ENABLE
1908 assert (preparemax >= preparecnt); 2171 assert (preparemax >= preparecnt);
1909 array_verify (EV_A_ (W *)prepares, preparecnt); 2172 array_verify (EV_A_ (W *)prepares, preparecnt);
2173#endif
1910 2174
2175#if EV_CHECK_ENABLE
1911 assert (checkmax >= checkcnt); 2176 assert (checkmax >= checkcnt);
1912 array_verify (EV_A_ (W *)checks, checkcnt); 2177 array_verify (EV_A_ (W *)checks, checkcnt);
2178#endif
1913 2179
1914# if 0 2180# if 0
2181#if EV_CHILD_ENABLE
1915 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2182 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1916 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 2183 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2184#endif
1917# endif 2185# endif
1918#endif 2186#endif
1919} 2187}
1920#endif 2188#endif
1921 2189
1922#if EV_MULTIPLICITY 2190#if EV_MULTIPLICITY
1923struct ev_loop * 2191struct ev_loop * ecb_cold
1924ev_default_loop_init (unsigned int flags)
1925#else 2192#else
1926int 2193int
2194#endif
1927ev_default_loop (unsigned int flags) 2195ev_default_loop (unsigned int flags)
1928#endif
1929{ 2196{
1930 if (!ev_default_loop_ptr) 2197 if (!ev_default_loop_ptr)
1931 { 2198 {
1932#if EV_MULTIPLICITY 2199#if EV_MULTIPLICITY
1933 EV_P = ev_default_loop_ptr = &default_loop_struct; 2200 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1937 2204
1938 loop_init (EV_A_ flags); 2205 loop_init (EV_A_ flags);
1939 2206
1940 if (ev_backend (EV_A)) 2207 if (ev_backend (EV_A))
1941 { 2208 {
1942#ifndef _WIN32 2209#if EV_CHILD_ENABLE
1943 ev_signal_init (&childev, childcb, SIGCHLD); 2210 ev_signal_init (&childev, childcb, SIGCHLD);
1944 ev_set_priority (&childev, EV_MAXPRI); 2211 ev_set_priority (&childev, EV_MAXPRI);
1945 ev_signal_start (EV_A_ &childev); 2212 ev_signal_start (EV_A_ &childev);
1946 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2213 ev_unref (EV_A); /* child watcher should not keep loop alive */
1947#endif 2214#endif
… …
1952 2219
1953 return ev_default_loop_ptr; 2220 return ev_default_loop_ptr;
1954} 2221}
1955 2222
1956void 2223void
1957ev_default_destroy (void) 2224ev_loop_fork (EV_P)
1958{ 2225{
1959#if EV_MULTIPLICITY
1960 EV_P = ev_default_loop_ptr;
1961#endif
1962
1963 ev_default_loop_ptr = 0;
1964
1965#ifndef _WIN32
1966 ev_ref (EV_A); /* child watcher */
1967 ev_signal_stop (EV_A_ &childev);
1968#endif
1969
1970 loop_destroy (EV_A);
1971}
1972
1973void
1974ev_default_fork (void)
1975{
1976#if EV_MULTIPLICITY
1977 EV_P = ev_default_loop_ptr;
1978#endif
1979
1980 postfork = 1; /* must be in line with ev_loop_fork */ 2226 postfork = 1; /* must be in line with ev_default_fork */
1981} 2227}
1982 2228
1983/*****************************************************************************/ 2229/*****************************************************************************/
1984 2230
1985void 2231void
… …
2007 2253
2008 for (pri = NUMPRI; pri--; ) 2254 for (pri = NUMPRI; pri--; )
2009 while (pendingcnt [pri]) 2255 while (pendingcnt [pri])
2010 { 2256 {
2011 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2257 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2012
2013 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2014 /* ^ this is no longer true, as pending_w could be here */
2015 2258
2016 p->w->pending = 0; 2259 p->w->pending = 0;
2017 EV_CB_INVOKE (p->w, p->events); 2260 EV_CB_INVOKE (p->w, p->events);
2018 EV_FREQUENT_CHECK; 2261 EV_FREQUENT_CHECK;
2019 } 2262 }
… …
2076 EV_FREQUENT_CHECK; 2319 EV_FREQUENT_CHECK;
2077 feed_reverse (EV_A_ (W)w); 2320 feed_reverse (EV_A_ (W)w);
2078 } 2321 }
2079 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2322 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2080 2323
2081 feed_reverse_done (EV_A_ EV_TIMEOUT); 2324 feed_reverse_done (EV_A_ EV_TIMER);
2082 } 2325 }
2083} 2326}
2084 2327
2085#if EV_PERIODIC_ENABLE 2328#if EV_PERIODIC_ENABLE
2329
2330static void noinline
2331periodic_recalc (EV_P_ ev_periodic *w)
2332{
2333 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2334 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2335
2336 /* the above almost always errs on the low side */
2337 while (at <= ev_rt_now)
2338 {
2339 ev_tstamp nat = at + w->interval;
2340
2341 /* when resolution fails us, we use ev_rt_now */
2342 if (expect_false (nat == at))
2343 {
2344 at = ev_rt_now;
2345 break;
2346 }
2347
2348 at = nat;
2349 }
2350
2351 ev_at (w) = at;
2352}
2353
2086/* make periodics pending */ 2354/* make periodics pending */
2087inline_size void 2355inline_size void
2088periodics_reify (EV_P) 2356periodics_reify (EV_P)
2089{ 2357{
2090 EV_FREQUENT_CHECK; 2358 EV_FREQUENT_CHECK;
… …
2109 ANHE_at_cache (periodics [HEAP0]); 2377 ANHE_at_cache (periodics [HEAP0]);
2110 downheap (periodics, periodiccnt, HEAP0); 2378 downheap (periodics, periodiccnt, HEAP0);
2111 } 2379 }
2112 else if (w->interval) 2380 else if (w->interval)
2113 { 2381 {
2114 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2382 periodic_recalc (EV_A_ w);
2115 /* if next trigger time is not sufficiently in the future, put it there */
2116 /* this might happen because of floating point inexactness */
2117 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2118 {
2119 ev_at (w) += w->interval;
2120
2121 /* if interval is unreasonably low we might still have a time in the past */
2122 /* so correct this. this will make the periodic very inexact, but the user */
2123 /* has effectively asked to get triggered more often than possible */
2124 if (ev_at (w) < ev_rt_now)
2125 ev_at (w) = ev_rt_now;
2126 }
2127
2128 ANHE_at_cache (periodics [HEAP0]); 2383 ANHE_at_cache (periodics [HEAP0]);
2129 downheap (periodics, periodiccnt, HEAP0); 2384 downheap (periodics, periodiccnt, HEAP0);
2130 } 2385 }
2131 else 2386 else
2132 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2387 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2139 feed_reverse_done (EV_A_ EV_PERIODIC); 2394 feed_reverse_done (EV_A_ EV_PERIODIC);
2140 } 2395 }
2141} 2396}
2142 2397
2143/* simply recalculate all periodics */ 2398/* simply recalculate all periodics */
2144/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2399/* TODO: maybe ensure that at least one event happens when jumping forward? */
2145static void noinline 2400static void noinline ecb_cold
2146periodics_reschedule (EV_P) 2401periodics_reschedule (EV_P)
2147{ 2402{
2148 int i; 2403 int i;
2149 2404
2150 /* adjust periodics after time jump */ 2405 /* adjust periodics after time jump */
… …
2153 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2408 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2154 2409
2155 if (w->reschedule_cb) 2410 if (w->reschedule_cb)
2156 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2411 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2157 else if (w->interval) 2412 else if (w->interval)
2158 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2413 periodic_recalc (EV_A_ w);
2159 2414
2160 ANHE_at_cache (periodics [i]); 2415 ANHE_at_cache (periodics [i]);
2161 } 2416 }
2162 2417
2163 reheap (periodics, periodiccnt); 2418 reheap (periodics, periodiccnt);
2164} 2419}
2165#endif 2420#endif
2166 2421
2167/* adjust all timers by a given offset */ 2422/* adjust all timers by a given offset */
2168static void noinline 2423static void noinline ecb_cold
2169timers_reschedule (EV_P_ ev_tstamp adjust) 2424timers_reschedule (EV_P_ ev_tstamp adjust)
2170{ 2425{
2171 int i; 2426 int i;
2172 2427
2173 for (i = 0; i < timercnt; ++i) 2428 for (i = 0; i < timercnt; ++i)
… …
2210 * doesn't hurt either as we only do this on time-jumps or 2465 * doesn't hurt either as we only do this on time-jumps or
2211 * in the unlikely event of having been preempted here. 2466 * in the unlikely event of having been preempted here.
2212 */ 2467 */
2213 for (i = 4; --i; ) 2468 for (i = 4; --i; )
2214 { 2469 {
2470 ev_tstamp diff;
2215 rtmn_diff = ev_rt_now - mn_now; 2471 rtmn_diff = ev_rt_now - mn_now;
2216 2472
2473 diff = odiff - rtmn_diff;
2474
2217 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2475 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2218 return; /* all is well */ 2476 return; /* all is well */
2219 2477
2220 ev_rt_now = ev_time (); 2478 ev_rt_now = ev_time ();
2221 mn_now = get_clock (); 2479 mn_now = get_clock ();
2222 now_floor = mn_now; 2480 now_floor = mn_now;
… …
2245 mn_now = ev_rt_now; 2503 mn_now = ev_rt_now;
2246 } 2504 }
2247} 2505}
2248 2506
2249void 2507void
2250ev_loop (EV_P_ int flags) 2508ev_run (EV_P_ int flags)
2251{ 2509{
2252#if EV_MINIMAL < 2 2510#if EV_FEATURE_API
2253 ++loop_depth; 2511 ++loop_depth;
2254#endif 2512#endif
2255 2513
2256 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2514 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2257 2515
2258 loop_done = EVUNLOOP_CANCEL; 2516 loop_done = EVBREAK_CANCEL;
2259 2517
2260 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2518 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2261 2519
2262 do 2520 do
2263 { 2521 {
2264#if EV_VERIFY >= 2 2522#if EV_VERIFY >= 2
2265 ev_loop_verify (EV_A); 2523 ev_verify (EV_A);
2266#endif 2524#endif
2267 2525
2268#ifndef _WIN32 2526#ifndef _WIN32
2269 if (expect_false (curpid)) /* penalise the forking check even more */ 2527 if (expect_false (curpid)) /* penalise the forking check even more */
2270 if (expect_false (getpid () != curpid)) 2528 if (expect_false (getpid () != curpid))
… …
2282 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2540 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2283 EV_INVOKE_PENDING; 2541 EV_INVOKE_PENDING;
2284 } 2542 }
2285#endif 2543#endif
2286 2544
2545#if EV_PREPARE_ENABLE
2287 /* queue prepare watchers (and execute them) */ 2546 /* queue prepare watchers (and execute them) */
2288 if (expect_false (preparecnt)) 2547 if (expect_false (preparecnt))
2289 { 2548 {
2290 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2549 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2291 EV_INVOKE_PENDING; 2550 EV_INVOKE_PENDING;
2292 } 2551 }
2552#endif
2293 2553
2294 if (expect_false (loop_done)) 2554 if (expect_false (loop_done))
2295 break; 2555 break;
2296 2556
2297 /* we might have forked, so reify kernel state if necessary */ 2557 /* we might have forked, so reify kernel state if necessary */
… …
2304 /* calculate blocking time */ 2564 /* calculate blocking time */
2305 { 2565 {
2306 ev_tstamp waittime = 0.; 2566 ev_tstamp waittime = 0.;
2307 ev_tstamp sleeptime = 0.; 2567 ev_tstamp sleeptime = 0.;
2308 2568
2569 /* remember old timestamp for io_blocktime calculation */
2570 ev_tstamp prev_mn_now = mn_now;
2571
2572 /* update time to cancel out callback processing overhead */
2573 time_update (EV_A_ 1e100);
2574
2575 /* from now on, we want a pipe-wake-up */
2576 pipe_write_wanted = 1;
2577
2309 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2578 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2310 { 2579 {
2311 /* remember old timestamp for io_blocktime calculation */
2312 ev_tstamp prev_mn_now = mn_now;
2313
2314 /* update time to cancel out callback processing overhead */
2315 time_update (EV_A_ 1e100);
2316
2317 waittime = MAX_BLOCKTIME; 2580 waittime = MAX_BLOCKTIME;
2318 2581
2319 if (timercnt) 2582 if (timercnt)
2320 { 2583 {
2321 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2584 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2322 if (waittime > to) waittime = to; 2585 if (waittime > to) waittime = to;
2323 } 2586 }
2324 2587
2325#if EV_PERIODIC_ENABLE 2588#if EV_PERIODIC_ENABLE
2326 if (periodiccnt) 2589 if (periodiccnt)
2327 { 2590 {
2328 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2591 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2329 if (waittime > to) waittime = to; 2592 if (waittime > to) waittime = to;
2330 } 2593 }
2331#endif 2594#endif
2332 2595
2333 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2596 /* don't let timeouts decrease the waittime below timeout_blocktime */
2334 if (expect_false (waittime < timeout_blocktime)) 2597 if (expect_false (waittime < timeout_blocktime))
2335 waittime = timeout_blocktime; 2598 waittime = timeout_blocktime;
2599
2600 /* at this point, we NEED to wait, so we have to ensure */
2601 /* to pass a minimum nonzero value to the backend */
2602 if (expect_false (waittime < backend_mintime))
2603 waittime = backend_mintime;
2336 2604
2337 /* extra check because io_blocktime is commonly 0 */ 2605 /* extra check because io_blocktime is commonly 0 */
2338 if (expect_false (io_blocktime)) 2606 if (expect_false (io_blocktime))
2339 { 2607 {
2340 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2608 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2341 2609
2342 if (sleeptime > waittime - backend_fudge) 2610 if (sleeptime > waittime - backend_mintime)
2343 sleeptime = waittime - backend_fudge; 2611 sleeptime = waittime - backend_mintime;
2344 2612
2345 if (expect_true (sleeptime > 0.)) 2613 if (expect_true (sleeptime > 0.))
2346 { 2614 {
2347 ev_sleep (sleeptime); 2615 ev_sleep (sleeptime);
2348 waittime -= sleeptime; 2616 waittime -= sleeptime;
2349 } 2617 }
2350 } 2618 }
2351 } 2619 }
2352 2620
2353#if EV_MINIMAL < 2 2621#if EV_FEATURE_API
2354 ++loop_count; 2622 ++loop_count;
2355#endif 2623#endif
2356 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2624 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2357 backend_poll (EV_A_ waittime); 2625 backend_poll (EV_A_ waittime);
2358 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2626 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2627
2628 pipe_write_wanted = 0;
2629
2630 if (pipe_write_skipped)
2631 {
2632 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2633 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2634 }
2635
2359 2636
2360 /* update ev_rt_now, do magic */ 2637 /* update ev_rt_now, do magic */
2361 time_update (EV_A_ waittime + sleeptime); 2638 time_update (EV_A_ waittime + sleeptime);
2362 } 2639 }
2363 2640
… …
2370#if EV_IDLE_ENABLE 2647#if EV_IDLE_ENABLE
2371 /* queue idle watchers unless other events are pending */ 2648 /* queue idle watchers unless other events are pending */
2372 idle_reify (EV_A); 2649 idle_reify (EV_A);
2373#endif 2650#endif
2374 2651
2652#if EV_CHECK_ENABLE
2375 /* queue check watchers, to be executed first */ 2653 /* queue check watchers, to be executed first */
2376 if (expect_false (checkcnt)) 2654 if (expect_false (checkcnt))
2377 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2655 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2656#endif
2378 2657
2379 EV_INVOKE_PENDING; 2658 EV_INVOKE_PENDING;
2380 } 2659 }
2381 while (expect_true ( 2660 while (expect_true (
2382 activecnt 2661 activecnt
2383 && !loop_done 2662 && !loop_done
2384 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2663 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2385 )); 2664 ));
2386 2665
2387 if (loop_done == EVUNLOOP_ONE) 2666 if (loop_done == EVBREAK_ONE)
2388 loop_done = EVUNLOOP_CANCEL; 2667 loop_done = EVBREAK_CANCEL;
2389 2668
2390#if EV_MINIMAL < 2 2669#if EV_FEATURE_API
2391 --loop_depth; 2670 --loop_depth;
2392#endif 2671#endif
2393} 2672}
2394 2673
2395void 2674void
2396ev_unloop (EV_P_ int how) 2675ev_break (EV_P_ int how)
2397{ 2676{
2398 loop_done = how; 2677 loop_done = how;
2399} 2678}
2400 2679
2401void 2680void
… …
2549 EV_FREQUENT_CHECK; 2828 EV_FREQUENT_CHECK;
2550 2829
2551 wlist_del (&anfds[w->fd].head, (WL)w); 2830 wlist_del (&anfds[w->fd].head, (WL)w);
2552 ev_stop (EV_A_ (W)w); 2831 ev_stop (EV_A_ (W)w);
2553 2832
2554 fd_change (EV_A_ w->fd, 1); 2833 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2555 2834
2556 EV_FREQUENT_CHECK; 2835 EV_FREQUENT_CHECK;
2557} 2836}
2558 2837
2559void noinline 2838void noinline
… …
2651 if (w->reschedule_cb) 2930 if (w->reschedule_cb)
2652 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2931 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2653 else if (w->interval) 2932 else if (w->interval)
2654 { 2933 {
2655 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2934 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2656 /* this formula differs from the one in periodic_reify because we do not always round up */ 2935 periodic_recalc (EV_A_ w);
2657 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2658 } 2936 }
2659 else 2937 else
2660 ev_at (w) = w->offset; 2938 ev_at (w) = w->offset;
2661 2939
2662 EV_FREQUENT_CHECK; 2940 EV_FREQUENT_CHECK;
… …
2711#endif 2989#endif
2712 2990
2713#ifndef SA_RESTART 2991#ifndef SA_RESTART
2714# define SA_RESTART 0 2992# define SA_RESTART 0
2715#endif 2993#endif
2994
2995#if EV_SIGNAL_ENABLE
2716 2996
2717void noinline 2997void noinline
2718ev_signal_start (EV_P_ ev_signal *w) 2998ev_signal_start (EV_P_ ev_signal *w)
2719{ 2999{
2720 if (expect_false (ev_is_active (w))) 3000 if (expect_false (ev_is_active (w)))
… …
2781 sa.sa_handler = ev_sighandler; 3061 sa.sa_handler = ev_sighandler;
2782 sigfillset (&sa.sa_mask); 3062 sigfillset (&sa.sa_mask);
2783 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 3063 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2784 sigaction (w->signum, &sa, 0); 3064 sigaction (w->signum, &sa, 0);
2785 3065
3066 if (origflags & EVFLAG_NOSIGMASK)
3067 {
2786 sigemptyset (&sa.sa_mask); 3068 sigemptyset (&sa.sa_mask);
2787 sigaddset (&sa.sa_mask, w->signum); 3069 sigaddset (&sa.sa_mask, w->signum);
2788 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 3070 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
3071 }
2789#endif 3072#endif
2790 } 3073 }
2791 3074
2792 EV_FREQUENT_CHECK; 3075 EV_FREQUENT_CHECK;
2793} 3076}
… …
2827 } 3110 }
2828 3111
2829 EV_FREQUENT_CHECK; 3112 EV_FREQUENT_CHECK;
2830} 3113}
2831 3114
3115#endif
3116
3117#if EV_CHILD_ENABLE
3118
2832void 3119void
2833ev_child_start (EV_P_ ev_child *w) 3120ev_child_start (EV_P_ ev_child *w)
2834{ 3121{
2835#if EV_MULTIPLICITY 3122#if EV_MULTIPLICITY
2836 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 3123 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2839 return; 3126 return;
2840 3127
2841 EV_FREQUENT_CHECK; 3128 EV_FREQUENT_CHECK;
2842 3129
2843 ev_start (EV_A_ (W)w, 1); 3130 ev_start (EV_A_ (W)w, 1);
2844 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3131 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2845 3132
2846 EV_FREQUENT_CHECK; 3133 EV_FREQUENT_CHECK;
2847} 3134}
2848 3135
2849void 3136void
… …
2853 if (expect_false (!ev_is_active (w))) 3140 if (expect_false (!ev_is_active (w)))
2854 return; 3141 return;
2855 3142
2856 EV_FREQUENT_CHECK; 3143 EV_FREQUENT_CHECK;
2857 3144
2858 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3145 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2859 ev_stop (EV_A_ (W)w); 3146 ev_stop (EV_A_ (W)w);
2860 3147
2861 EV_FREQUENT_CHECK; 3148 EV_FREQUENT_CHECK;
2862} 3149}
3150
3151#endif
2863 3152
2864#if EV_STAT_ENABLE 3153#if EV_STAT_ENABLE
2865 3154
2866# ifdef _WIN32 3155# ifdef _WIN32
2867# undef lstat 3156# undef lstat
… …
2928 if (!pend || pend == path) 3217 if (!pend || pend == path)
2929 break; 3218 break;
2930 3219
2931 *pend = 0; 3220 *pend = 0;
2932 w->wd = inotify_add_watch (fs_fd, path, mask); 3221 w->wd = inotify_add_watch (fs_fd, path, mask);
2933 } 3222 }
2934 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3223 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2935 } 3224 }
2936 } 3225 }
2937 3226
2938 if (w->wd >= 0) 3227 if (w->wd >= 0)
2939 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3228 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2940 3229
2941 /* now re-arm timer, if required */ 3230 /* now re-arm timer, if required */
2942 if (ev_is_active (&w->timer)) ev_ref (EV_A); 3231 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2943 ev_timer_again (EV_A_ &w->timer); 3232 ev_timer_again (EV_A_ &w->timer);
2944 if (ev_is_active (&w->timer)) ev_unref (EV_A); 3233 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2952 3241
2953 if (wd < 0) 3242 if (wd < 0)
2954 return; 3243 return;
2955 3244
2956 w->wd = -2; 3245 w->wd = -2;
2957 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3246 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2958 wlist_del (&fs_hash [slot].head, (WL)w); 3247 wlist_del (&fs_hash [slot].head, (WL)w);
2959 3248
2960 /* remove this watcher, if others are watching it, they will rearm */ 3249 /* remove this watcher, if others are watching it, they will rearm */
2961 inotify_rm_watch (fs_fd, wd); 3250 inotify_rm_watch (fs_fd, wd);
2962} 3251}
… …
2964static void noinline 3253static void noinline
2965infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3254infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2966{ 3255{
2967 if (slot < 0) 3256 if (slot < 0)
2968 /* overflow, need to check for all hash slots */ 3257 /* overflow, need to check for all hash slots */
2969 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3258 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2970 infy_wd (EV_A_ slot, wd, ev); 3259 infy_wd (EV_A_ slot, wd, ev);
2971 else 3260 else
2972 { 3261 {
2973 WL w_; 3262 WL w_;
2974 3263
2975 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3264 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2976 { 3265 {
2977 ev_stat *w = (ev_stat *)w_; 3266 ev_stat *w = (ev_stat *)w_;
2978 w_ = w_->next; /* lets us remove this watcher and all before it */ 3267 w_ = w_->next; /* lets us remove this watcher and all before it */
2979 3268
2980 if (w->wd == wd || wd == -1) 3269 if (w->wd == wd || wd == -1)
2981 { 3270 {
2982 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3271 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2983 { 3272 {
2984 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3273 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2985 w->wd = -1; 3274 w->wd = -1;
2986 infy_add (EV_A_ w); /* re-add, no matter what */ 3275 infy_add (EV_A_ w); /* re-add, no matter what */
2987 } 3276 }
2988 3277
2989 stat_timer_cb (EV_A_ &w->timer, 0); 3278 stat_timer_cb (EV_A_ &w->timer, 0);
… …
3005 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3294 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3006 ofs += sizeof (struct inotify_event) + ev->len; 3295 ofs += sizeof (struct inotify_event) + ev->len;
3007 } 3296 }
3008} 3297}
3009 3298
3010inline_size unsigned int
3011ev_linux_version (void)
3012{
3013 struct utsname buf;
3014 unsigned int v;
3015 int i;
3016 char *p = buf.release;
3017
3018 if (uname (&buf))
3019 return 0;
3020
3021 for (i = 3+1; --i; )
3022 {
3023 unsigned int c = 0;
3024
3025 for (;;)
3026 {
3027 if (*p >= '0' && *p <= '9')
3028 c = c * 10 + *p++ - '0';
3029 else
3030 {
3031 p += *p == '.';
3032 break;
3033 }
3034 }
3035
3036 v = (v << 8) | c;
3037 }
3038
3039 return v;
3040}
3041
3042inline_size void 3299inline_size void ecb_cold
3043ev_check_2625 (EV_P) 3300ev_check_2625 (EV_P)
3044{ 3301{
3045 /* kernels < 2.6.25 are borked 3302 /* kernels < 2.6.25 are borked
3046 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3303 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3047 */ 3304 */
… …
3103 ev_io_set (&fs_w, fs_fd, EV_READ); 3360 ev_io_set (&fs_w, fs_fd, EV_READ);
3104 ev_io_start (EV_A_ &fs_w); 3361 ev_io_start (EV_A_ &fs_w);
3105 ev_unref (EV_A); 3362 ev_unref (EV_A);
3106 } 3363 }
3107 3364
3108 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3365 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3109 { 3366 {
3110 WL w_ = fs_hash [slot].head; 3367 WL w_ = fs_hash [slot].head;
3111 fs_hash [slot].head = 0; 3368 fs_hash [slot].head = 0;
3112 3369
3113 while (w_) 3370 while (w_)
… …
3288 3545
3289 EV_FREQUENT_CHECK; 3546 EV_FREQUENT_CHECK;
3290} 3547}
3291#endif 3548#endif
3292 3549
3550#if EV_PREPARE_ENABLE
3293void 3551void
3294ev_prepare_start (EV_P_ ev_prepare *w) 3552ev_prepare_start (EV_P_ ev_prepare *w)
3295{ 3553{
3296 if (expect_false (ev_is_active (w))) 3554 if (expect_false (ev_is_active (w)))
3297 return; 3555 return;
… …
3323 3581
3324 ev_stop (EV_A_ (W)w); 3582 ev_stop (EV_A_ (W)w);
3325 3583
3326 EV_FREQUENT_CHECK; 3584 EV_FREQUENT_CHECK;
3327} 3585}
3586#endif
3328 3587
3588#if EV_CHECK_ENABLE
3329void 3589void
3330ev_check_start (EV_P_ ev_check *w) 3590ev_check_start (EV_P_ ev_check *w)
3331{ 3591{
3332 if (expect_false (ev_is_active (w))) 3592 if (expect_false (ev_is_active (w)))
3333 return; 3593 return;
… …
3359 3619
3360 ev_stop (EV_A_ (W)w); 3620 ev_stop (EV_A_ (W)w);
3361 3621
3362 EV_FREQUENT_CHECK; 3622 EV_FREQUENT_CHECK;
3363} 3623}
3624#endif
3364 3625
3365#if EV_EMBED_ENABLE 3626#if EV_EMBED_ENABLE
3366void noinline 3627void noinline
3367ev_embed_sweep (EV_P_ ev_embed *w) 3628ev_embed_sweep (EV_P_ ev_embed *w)
3368{ 3629{
3369 ev_loop (w->other, EVLOOP_NONBLOCK); 3630 ev_run (w->other, EVRUN_NOWAIT);
3370} 3631}
3371 3632
3372static void 3633static void
3373embed_io_cb (EV_P_ ev_io *io, int revents) 3634embed_io_cb (EV_P_ ev_io *io, int revents)
3374{ 3635{
3375 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3636 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3376 3637
3377 if (ev_cb (w)) 3638 if (ev_cb (w))
3378 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3639 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3379 else 3640 else
3380 ev_loop (w->other, EVLOOP_NONBLOCK); 3641 ev_run (w->other, EVRUN_NOWAIT);
3381} 3642}
3382 3643
3383static void 3644static void
3384embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3645embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3385{ 3646{
… …
3389 EV_P = w->other; 3650 EV_P = w->other;
3390 3651
3391 while (fdchangecnt) 3652 while (fdchangecnt)
3392 { 3653 {
3393 fd_reify (EV_A); 3654 fd_reify (EV_A);
3394 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3655 ev_run (EV_A_ EVRUN_NOWAIT);
3395 } 3656 }
3396 } 3657 }
3397} 3658}
3398 3659
3399static void 3660static void
… …
3405 3666
3406 { 3667 {
3407 EV_P = w->other; 3668 EV_P = w->other;
3408 3669
3409 ev_loop_fork (EV_A); 3670 ev_loop_fork (EV_A);
3410 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3671 ev_run (EV_A_ EVRUN_NOWAIT);
3411 } 3672 }
3412 3673
3413 ev_embed_start (EV_A_ w); 3674 ev_embed_start (EV_A_ w);
3414} 3675}
3415 3676
… …
3507 3768
3508 EV_FREQUENT_CHECK; 3769 EV_FREQUENT_CHECK;
3509} 3770}
3510#endif 3771#endif
3511 3772
3773#if EV_CLEANUP_ENABLE
3774void
3775ev_cleanup_start (EV_P_ ev_cleanup *w)
3776{
3777 if (expect_false (ev_is_active (w)))
3778 return;
3779
3780 EV_FREQUENT_CHECK;
3781
3782 ev_start (EV_A_ (W)w, ++cleanupcnt);
3783 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3784 cleanups [cleanupcnt - 1] = w;
3785
3786 /* cleanup watchers should never keep a refcount on the loop */
3787 ev_unref (EV_A);
3788 EV_FREQUENT_CHECK;
3789}
3790
3791void
3792ev_cleanup_stop (EV_P_ ev_cleanup *w)
3793{
3794 clear_pending (EV_A_ (W)w);
3795 if (expect_false (!ev_is_active (w)))
3796 return;
3797
3798 EV_FREQUENT_CHECK;
3799 ev_ref (EV_A);
3800
3801 {
3802 int active = ev_active (w);
3803
3804 cleanups [active - 1] = cleanups [--cleanupcnt];
3805 ev_active (cleanups [active - 1]) = active;
3806 }
3807
3808 ev_stop (EV_A_ (W)w);
3809
3810 EV_FREQUENT_CHECK;
3811}
3812#endif
3813
3512#if EV_ASYNC_ENABLE 3814#if EV_ASYNC_ENABLE
3513void 3815void
3514ev_async_start (EV_P_ ev_async *w) 3816ev_async_start (EV_P_ ev_async *w)
3515{ 3817{
3516 if (expect_false (ev_is_active (w))) 3818 if (expect_false (ev_is_active (w)))
3517 return; 3819 return;
3820
3821 w->sent = 0;
3518 3822
3519 evpipe_init (EV_A); 3823 evpipe_init (EV_A);
3520 3824
3521 EV_FREQUENT_CHECK; 3825 EV_FREQUENT_CHECK;
3522 3826
… …
3600{ 3904{
3601 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3905 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3602 3906
3603 if (expect_false (!once)) 3907 if (expect_false (!once))
3604 { 3908 {
3605 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3909 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3606 return; 3910 return;
3607 } 3911 }
3608 3912
3609 once->cb = cb; 3913 once->cb = cb;
3610 once->arg = arg; 3914 once->arg = arg;
… …
3625} 3929}
3626 3930
3627/*****************************************************************************/ 3931/*****************************************************************************/
3628 3932
3629#if EV_WALK_ENABLE 3933#if EV_WALK_ENABLE
3630void 3934void ecb_cold
3631ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3935ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3632{ 3936{
3633 int i, j; 3937 int i, j;
3634 ev_watcher_list *wl, *wn; 3938 ev_watcher_list *wl, *wn;
3635 3939
… …
3697 if (types & EV_ASYNC) 4001 if (types & EV_ASYNC)
3698 for (i = asynccnt; i--; ) 4002 for (i = asynccnt; i--; )
3699 cb (EV_A_ EV_ASYNC, asyncs [i]); 4003 cb (EV_A_ EV_ASYNC, asyncs [i]);
3700#endif 4004#endif
3701 4005
4006#if EV_PREPARE_ENABLE
3702 if (types & EV_PREPARE) 4007 if (types & EV_PREPARE)
3703 for (i = preparecnt; i--; ) 4008 for (i = preparecnt; i--; )
3704#if EV_EMBED_ENABLE 4009# if EV_EMBED_ENABLE
3705 if (ev_cb (prepares [i]) != embed_prepare_cb) 4010 if (ev_cb (prepares [i]) != embed_prepare_cb)
3706#endif 4011# endif
3707 cb (EV_A_ EV_PREPARE, prepares [i]); 4012 cb (EV_A_ EV_PREPARE, prepares [i]);
4013#endif
3708 4014
4015#if EV_CHECK_ENABLE
3709 if (types & EV_CHECK) 4016 if (types & EV_CHECK)
3710 for (i = checkcnt; i--; ) 4017 for (i = checkcnt; i--; )
3711 cb (EV_A_ EV_CHECK, checks [i]); 4018 cb (EV_A_ EV_CHECK, checks [i]);
4019#endif
3712 4020
4021#if EV_SIGNAL_ENABLE
3713 if (types & EV_SIGNAL) 4022 if (types & EV_SIGNAL)
3714 for (i = 0; i < EV_NSIG - 1; ++i) 4023 for (i = 0; i < EV_NSIG - 1; ++i)
3715 for (wl = signals [i].head; wl; ) 4024 for (wl = signals [i].head; wl; )
3716 { 4025 {
3717 wn = wl->next; 4026 wn = wl->next;
3718 cb (EV_A_ EV_SIGNAL, wl); 4027 cb (EV_A_ EV_SIGNAL, wl);
3719 wl = wn; 4028 wl = wn;
3720 } 4029 }
4030#endif
3721 4031
4032#if EV_CHILD_ENABLE
3722 if (types & EV_CHILD) 4033 if (types & EV_CHILD)
3723 for (i = EV_PID_HASHSIZE; i--; ) 4034 for (i = (EV_PID_HASHSIZE); i--; )
3724 for (wl = childs [i]; wl; ) 4035 for (wl = childs [i]; wl; )
3725 { 4036 {
3726 wn = wl->next; 4037 wn = wl->next;
3727 cb (EV_A_ EV_CHILD, wl); 4038 cb (EV_A_ EV_CHILD, wl);
3728 wl = wn; 4039 wl = wn;
3729 } 4040 }
4041#endif
3730/* EV_STAT 0x00001000 /* stat data changed */ 4042/* EV_STAT 0x00001000 /* stat data changed */
3731/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 4043/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3732} 4044}
3733#endif 4045#endif
3734 4046
3735#if EV_MULTIPLICITY 4047#if EV_MULTIPLICITY
3736 #include "ev_wrap.h" 4048 #include "ev_wrap.h"
3737#endif 4049#endif
3738 4050
3739#ifdef __cplusplus 4051EV_CPP(})
3740}
3741#endif
3742 4052

Diff Legend

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