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

Comparing libev/ev.c (file contents):
Revision 1.335 by root, Tue Mar 9 09:02:03 2010 UTC vs.
Revision 1.376 by root, Sat Jun 4 05:33:29 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>
… …
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
189# undef EV_AVOID_STDIO 201# undef EV_AVOID_STDIO
190#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
191 211
192/* 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 */
193 213
194/* try to deduce the maximum number of signals on this platform */ 214/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG) 215#if defined (EV_NSIG)
… …
207#elif defined (MAXSIG) 227#elif defined (MAXSIG)
208# define EV_NSIG (MAXSIG+1) 228# define EV_NSIG (MAXSIG+1)
209#elif defined (MAX_SIG) 229#elif defined (MAX_SIG)
210# define EV_NSIG (MAX_SIG+1) 230# define EV_NSIG (MAX_SIG+1)
211#elif defined (SIGARRAYSIZE) 231#elif defined (SIGARRAYSIZE)
212# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 232# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
213#elif defined (_sys_nsig) 233#elif defined (_sys_nsig)
214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 234# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
215#else 235#else
216# error "unable to find value for NSIG, please report" 236# error "unable to find value for NSIG, please report"
217/* 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! :) */
218# define EV_NSIG 65 239# define EV_NSIG 65
240#endif
241
242#ifndef EV_USE_FLOOR
243# define EV_USE_FLOOR 0
219#endif 244#endif
220 245
221#ifndef EV_USE_CLOCK_SYSCALL 246#ifndef EV_USE_CLOCK_SYSCALL
222# if __linux && __GLIBC__ >= 2 247# if __linux && __GLIBC__ >= 2
223# define EV_USE_CLOCK_SYSCALL 1 248# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
224# else 249# else
225# define EV_USE_CLOCK_SYSCALL 0 250# define EV_USE_CLOCK_SYSCALL 0
226# endif 251# endif
227#endif 252#endif
228 253
229#ifndef EV_USE_MONOTONIC 254#ifndef EV_USE_MONOTONIC
230# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 255# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
231# define EV_USE_MONOTONIC 1 256# define EV_USE_MONOTONIC EV_FEATURE_OS
232# else 257# else
233# define EV_USE_MONOTONIC 0 258# define EV_USE_MONOTONIC 0
234# endif 259# endif
235#endif 260#endif
236 261
… …
238# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 263# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
239#endif 264#endif
240 265
241#ifndef EV_USE_NANOSLEEP 266#ifndef EV_USE_NANOSLEEP
242# if _POSIX_C_SOURCE >= 199309L 267# if _POSIX_C_SOURCE >= 199309L
243# define EV_USE_NANOSLEEP 1 268# define EV_USE_NANOSLEEP EV_FEATURE_OS
244# else 269# else
245# define EV_USE_NANOSLEEP 0 270# define EV_USE_NANOSLEEP 0
246# endif 271# endif
247#endif 272#endif
248 273
249#ifndef EV_USE_SELECT 274#ifndef EV_USE_SELECT
250# define EV_USE_SELECT 1 275# define EV_USE_SELECT EV_FEATURE_BACKENDS
251#endif 276#endif
252 277
253#ifndef EV_USE_POLL 278#ifndef EV_USE_POLL
254# ifdef _WIN32 279# ifdef _WIN32
255# define EV_USE_POLL 0 280# define EV_USE_POLL 0
256# else 281# else
257# define EV_USE_POLL 1 282# define EV_USE_POLL EV_FEATURE_BACKENDS
258# endif 283# endif
259#endif 284#endif
260 285
261#ifndef EV_USE_EPOLL 286#ifndef EV_USE_EPOLL
262# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 287# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
263# define EV_USE_EPOLL 1 288# define EV_USE_EPOLL EV_FEATURE_BACKENDS
264# else 289# else
265# define EV_USE_EPOLL 0 290# define EV_USE_EPOLL 0
266# endif 291# endif
267#endif 292#endif
268 293
… …
274# define EV_USE_PORT 0 299# define EV_USE_PORT 0
275#endif 300#endif
276 301
277#ifndef EV_USE_INOTIFY 302#ifndef EV_USE_INOTIFY
278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
279# define EV_USE_INOTIFY 1 304# define EV_USE_INOTIFY EV_FEATURE_OS
280# else 305# else
281# define EV_USE_INOTIFY 0 306# define EV_USE_INOTIFY 0
282# endif 307# endif
283#endif 308#endif
284 309
285#ifndef EV_PID_HASHSIZE 310#ifndef EV_PID_HASHSIZE
286# if EV_MINIMAL 311# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
287# define EV_PID_HASHSIZE 1
288# else
289# define EV_PID_HASHSIZE 16
290# endif
291#endif 312#endif
292 313
293#ifndef EV_INOTIFY_HASHSIZE 314#ifndef EV_INOTIFY_HASHSIZE
294# if EV_MINIMAL 315# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
295# define EV_INOTIFY_HASHSIZE 1
296# else
297# define EV_INOTIFY_HASHSIZE 16
298# endif
299#endif 316#endif
300 317
301#ifndef EV_USE_EVENTFD 318#ifndef EV_USE_EVENTFD
302# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 319# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
303# define EV_USE_EVENTFD 1 320# define EV_USE_EVENTFD EV_FEATURE_OS
304# else 321# else
305# define EV_USE_EVENTFD 0 322# define EV_USE_EVENTFD 0
306# endif 323# endif
307#endif 324#endif
308 325
309#ifndef EV_USE_SIGNALFD 326#ifndef EV_USE_SIGNALFD
310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 327# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
311# define EV_USE_SIGNALFD 1 328# define EV_USE_SIGNALFD EV_FEATURE_OS
312# else 329# else
313# define EV_USE_SIGNALFD 0 330# define EV_USE_SIGNALFD 0
314# endif 331# endif
315#endif 332#endif
316 333
… …
319# define EV_USE_4HEAP 1 336# define EV_USE_4HEAP 1
320# define EV_HEAP_CACHE_AT 1 337# define EV_HEAP_CACHE_AT 1
321#endif 338#endif
322 339
323#ifndef EV_VERIFY 340#ifndef EV_VERIFY
324# define EV_VERIFY !EV_MINIMAL 341# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
325#endif 342#endif
326 343
327#ifndef EV_USE_4HEAP 344#ifndef EV_USE_4HEAP
328# define EV_USE_4HEAP !EV_MINIMAL 345# define EV_USE_4HEAP EV_FEATURE_DATA
329#endif 346#endif
330 347
331#ifndef EV_HEAP_CACHE_AT 348#ifndef EV_HEAP_CACHE_AT
332# define EV_HEAP_CACHE_AT !EV_MINIMAL 349# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
333#endif 350#endif
334 351
335/* 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, */
336/* which makes programs even slower. might work on other unices, too. */ 353/* which makes programs even slower. might work on other unices, too. */
337#if EV_USE_CLOCK_SYSCALL 354#if EV_USE_CLOCK_SYSCALL
… …
368# undef EV_USE_INOTIFY 385# undef EV_USE_INOTIFY
369# define EV_USE_INOTIFY 0 386# define EV_USE_INOTIFY 0
370#endif 387#endif
371 388
372#if !EV_USE_NANOSLEEP 389#if !EV_USE_NANOSLEEP
373# ifndef _WIN32 390/* hp-ux has it in sys/time.h, which we unconditionally include above */
391# if !defined(_WIN32) && !defined(__hpux)
374# include <sys/select.h> 392# include <sys/select.h>
375# endif 393# endif
376#endif 394#endif
377 395
378#if EV_USE_INOTIFY 396#if EV_USE_INOTIFY
379# include <sys/utsname.h>
380# include <sys/statfs.h> 397# include <sys/statfs.h>
381# include <sys/inotify.h> 398# include <sys/inotify.h>
382/* 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 */
383# ifndef IN_DONT_FOLLOW 400# ifndef IN_DONT_FOLLOW
384# undef EV_USE_INOTIFY 401# undef EV_USE_INOTIFY
… …
401# define EFD_CLOEXEC O_CLOEXEC 418# define EFD_CLOEXEC O_CLOEXEC
402# else 419# else
403# define EFD_CLOEXEC 02000000 420# define EFD_CLOEXEC 02000000
404# endif 421# endif
405# endif 422# endif
406# ifdef __cplusplus
407extern "C" {
408# endif
409int (eventfd) (unsigned int initval, int flags); 423EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
410# ifdef __cplusplus
411}
412# endif
413#endif 424#endif
414 425
415#if EV_USE_SIGNALFD 426#if EV_USE_SIGNALFD
416/* 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 */
417# include <stdint.h> 428# include <stdint.h>
… …
423# define SFD_CLOEXEC O_CLOEXEC 434# define SFD_CLOEXEC O_CLOEXEC
424# else 435# else
425# define SFD_CLOEXEC 02000000 436# define SFD_CLOEXEC 02000000
426# endif 437# endif
427# endif 438# endif
428# ifdef __cplusplus
429extern "C" {
430# endif
431int signalfd (int fd, const sigset_t *mask, int flags); 439EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
432 440
433struct signalfd_siginfo 441struct signalfd_siginfo
434{ 442{
435 uint32_t ssi_signo; 443 uint32_t ssi_signo;
436 char pad[128 - sizeof (uint32_t)]; 444 char pad[128 - sizeof (uint32_t)];
437}; 445};
438# ifdef __cplusplus
439}
440# endif 446#endif
441#endif
442
443 447
444/**/ 448/**/
445 449
446#if EV_VERIFY >= 3 450#if EV_VERIFY >= 3
447# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 451# define EV_FREQUENT_CHECK ev_verify (EV_A)
448#else 452#else
449# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
450#endif 454#endif
451 455
452/* 456/*
453 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
454 * It is added to ev_rt_now when scheduling periodics
455 * to ensure progress, time-wise, even when rounding
456 * errors are against us.
457 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
458 * Better solutions welcome.
459 */ 459 */
460#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 */
461 462
462#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) */
463#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) */
465
466#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
467#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
464 468
465#if __GNUC__ >= 4 469#if __GNUC__ >= 4
466# define expect(expr,value) __builtin_expect ((expr),(value)) 470# define expect(expr,value) __builtin_expect ((expr),(value))
467# define noinline __attribute__ ((noinline)) 471# define noinline __attribute__ ((noinline))
468#else 472#else
… …
475 479
476#define expect_false(expr) expect ((expr) != 0, 0) 480#define expect_false(expr) expect ((expr) != 0, 0)
477#define expect_true(expr) expect ((expr) != 0, 1) 481#define expect_true(expr) expect ((expr) != 0, 1)
478#define inline_size static inline 482#define inline_size static inline
479 483
480#if EV_MINIMAL 484#if EV_FEATURE_CODE
485# define inline_speed static inline
486#else
481# define inline_speed static noinline 487# define inline_speed static noinline
482#else
483# define inline_speed static inline
484#endif 488#endif
485 489
486#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 490#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
487 491
488#if EV_MINPRI == EV_MAXPRI 492#if EV_MINPRI == EV_MAXPRI
… …
501#define ev_active(w) ((W)(w))->active 505#define ev_active(w) ((W)(w))->active
502#define ev_at(w) ((WT)(w))->at 506#define ev_at(w) ((WT)(w))->at
503 507
504#if EV_USE_REALTIME 508#if EV_USE_REALTIME
505/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 509/* sig_atomic_t is used to avoid per-thread variables or locking but still */
506/* giving it a reasonably high chance of working on typical architetcures */ 510/* giving it a reasonably high chance of working on typical architectures */
507static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 511static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
508#endif 512#endif
509 513
510#if EV_USE_MONOTONIC 514#if EV_USE_MONOTONIC
511static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 515static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
522#endif 526#endif
523 527
524#ifdef _WIN32 528#ifdef _WIN32
525# include "ev_win32.c" 529# include "ev_win32.c"
526#endif 530#endif
531
532/*****************************************************************************/
533
534/* define a suitable floor function (only used by periodics atm) */
535
536#if EV_USE_FLOOR
537# include <math.h>
538# define ev_floor(v) floor (v)
539#else
540
541#include <float.h>
542
543/* a floor() replacement function, should be independent of ev_tstamp type */
544static ev_tstamp noinline
545ev_floor (ev_tstamp v)
546{
547 /* the choice of shift factor is not terribly important */
548#if FLT_RADIX != 2 /* assume FLT_RADIX == 10 */
549 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 10000000000000000000. : 1000000000.;
550#else
551 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 18446744073709551616. : 4294967296.;
552#endif
553
554 /* argument too large for an unsigned long? */
555 if (expect_false (v >= shift))
556 {
557 ev_tstamp f;
558
559 if (v == v - 1.)
560 return v; /* very large number */
561
562 f = shift * ev_floor (v * (1. / shift));
563 return f + ev_floor (v - f);
564 }
565
566 /* special treatment for negative args? */
567 if (expect_false (v < 0.))
568 {
569 ev_tstamp f = -ev_floor (-v);
570
571 return f - (f == v ? 0 : 1);
572 }
573
574 /* fits into an unsigned long */
575 return (unsigned long)v;
576}
577
578#endif
579
580/*****************************************************************************/
581
582#ifdef __linux
583# include <sys/utsname.h>
584#endif
585
586static unsigned int noinline
587ev_linux_version (void)
588{
589#ifdef __linux
590 unsigned int v = 0;
591 struct utsname buf;
592 int i;
593 char *p = buf.release;
594
595 if (uname (&buf))
596 return 0;
597
598 for (i = 3+1; --i; )
599 {
600 unsigned int c = 0;
601
602 for (;;)
603 {
604 if (*p >= '0' && *p <= '9')
605 c = c * 10 + *p++ - '0';
606 else
607 {
608 p += *p == '.';
609 break;
610 }
611 }
612
613 v = (v << 8) | c;
614 }
615
616 return v;
617#else
618 return 0;
619#endif
620}
527 621
528/*****************************************************************************/ 622/*****************************************************************************/
529 623
530#if EV_AVOID_STDIO 624#if EV_AVOID_STDIO
531static void noinline 625static void noinline
… …
552 if (syserr_cb) 646 if (syserr_cb)
553 syserr_cb (msg); 647 syserr_cb (msg);
554 else 648 else
555 { 649 {
556#if EV_AVOID_STDIO 650#if EV_AVOID_STDIO
557 const char *err = strerror (errno);
558
559 ev_printerr (msg); 651 ev_printerr (msg);
560 ev_printerr (": "); 652 ev_printerr (": ");
561 ev_printerr (err); 653 ev_printerr (strerror (errno));
562 ev_printerr ("\n"); 654 ev_printerr ("\n");
563#else 655#else
564 perror (msg); 656 perror (msg);
565#endif 657#endif
566 abort (); 658 abort ();
… …
600 ptr = alloc (ptr, size); 692 ptr = alloc (ptr, size);
601 693
602 if (!ptr && size) 694 if (!ptr && size)
603 { 695 {
604#if EV_AVOID_STDIO 696#if EV_AVOID_STDIO
605 ev_printerr ("libev: memory allocation failed, aborting.\n"); 697 ev_printerr ("(libev) memory allocation failed, aborting.\n");
606#else 698#else
607 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 699 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
608#endif 700#endif
609 abort (); 701 abort ();
610 } 702 }
611 703
612 return ptr; 704 return ptr;
… …
629 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 721 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
630 unsigned char unused; 722 unsigned char unused;
631#if EV_USE_EPOLL 723#if EV_USE_EPOLL
632 unsigned int egen; /* generation counter to counter epoll bugs */ 724 unsigned int egen; /* generation counter to counter epoll bugs */
633#endif 725#endif
634#if EV_SELECT_IS_WINSOCKET 726#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
635 SOCKET handle; 727 SOCKET handle;
728#endif
729#if EV_USE_IOCP
730 OVERLAPPED or, ow;
636#endif 731#endif
637} ANFD; 732} ANFD;
638 733
639/* stores the pending event set for a given watcher */ 734/* stores the pending event set for a given watcher */
640typedef struct 735typedef struct
… …
695 790
696 static int ev_default_loop_ptr; 791 static int ev_default_loop_ptr;
697 792
698#endif 793#endif
699 794
700#if EV_MINIMAL < 2 795#if EV_FEATURE_API
701# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 796# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
702# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 797# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
703# define EV_INVOKE_PENDING invoke_cb (EV_A) 798# define EV_INVOKE_PENDING invoke_cb (EV_A)
704#else 799#else
705# define EV_RELEASE_CB (void)0 800# define EV_RELEASE_CB (void)0
706# define EV_ACQUIRE_CB (void)0 801# define EV_ACQUIRE_CB (void)0
707# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 802# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
708#endif 803#endif
709 804
710#define EVUNLOOP_RECURSE 0x80 805#define EVBREAK_RECURSE 0x80
711 806
712/*****************************************************************************/ 807/*****************************************************************************/
713 808
714#ifndef EV_HAVE_EV_TIME 809#ifndef EV_HAVE_EV_TIME
715ev_tstamp 810ev_tstamp
… …
759 if (delay > 0.) 854 if (delay > 0.)
760 { 855 {
761#if EV_USE_NANOSLEEP 856#if EV_USE_NANOSLEEP
762 struct timespec ts; 857 struct timespec ts;
763 858
764 ts.tv_sec = (time_t)delay; 859 EV_TS_SET (ts, delay);
765 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
766
767 nanosleep (&ts, 0); 860 nanosleep (&ts, 0);
768#elif defined(_WIN32) 861#elif defined(_WIN32)
769 Sleep ((unsigned long)(delay * 1e3)); 862 Sleep ((unsigned long)(delay * 1e3));
770#else 863#else
771 struct timeval tv; 864 struct timeval tv;
772 865
773 tv.tv_sec = (time_t)delay;
774 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
775
776 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 866 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
777 /* something not guaranteed by newer posix versions, but guaranteed */ 867 /* something not guaranteed by newer posix versions, but guaranteed */
778 /* by older ones */ 868 /* by older ones */
869 EV_TV_SET (tv, delay);
779 select (0, 0, 0, 0, &tv); 870 select (0, 0, 0, 0, &tv);
780#endif 871#endif
781 } 872 }
782} 873}
783 874
784/*****************************************************************************/ 875/*****************************************************************************/
785 876
786#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 877#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
787 878
788/* find a suitable new size for the given array, */ 879/* find a suitable new size for the given array, */
789/* hopefully by rounding to a ncie-to-malloc size */ 880/* hopefully by rounding to a nice-to-malloc size */
790inline_size int 881inline_size int
791array_nextsize (int elem, int cur, int cnt) 882array_nextsize (int elem, int cur, int cnt)
792{ 883{
793 int ncur = cur + 1; 884 int ncur = cur + 1;
794 885
… …
890} 981}
891 982
892/*****************************************************************************/ 983/*****************************************************************************/
893 984
894inline_speed void 985inline_speed void
895fd_event_nc (EV_P_ int fd, int revents) 986fd_event_nocheck (EV_P_ int fd, int revents)
896{ 987{
897 ANFD *anfd = anfds + fd; 988 ANFD *anfd = anfds + fd;
898 ev_io *w; 989 ev_io *w;
899 990
900 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 991 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
912fd_event (EV_P_ int fd, int revents) 1003fd_event (EV_P_ int fd, int revents)
913{ 1004{
914 ANFD *anfd = anfds + fd; 1005 ANFD *anfd = anfds + fd;
915 1006
916 if (expect_true (!anfd->reify)) 1007 if (expect_true (!anfd->reify))
917 fd_event_nc (EV_A_ fd, revents); 1008 fd_event_nocheck (EV_A_ fd, revents);
918} 1009}
919 1010
920void 1011void
921ev_feed_fd_event (EV_P_ int fd, int revents) 1012ev_feed_fd_event (EV_P_ int fd, int revents)
922{ 1013{
923 if (fd >= 0 && fd < anfdmax) 1014 if (fd >= 0 && fd < anfdmax)
924 fd_event_nc (EV_A_ fd, revents); 1015 fd_event_nocheck (EV_A_ fd, revents);
925} 1016}
926 1017
927/* make sure the external fd watch events are in-sync */ 1018/* make sure the external fd watch events are in-sync */
928/* with the kernel/libev internal state */ 1019/* with the kernel/libev internal state */
929inline_size void 1020inline_size void
930fd_reify (EV_P) 1021fd_reify (EV_P)
931{ 1022{
932 int i; 1023 int i;
933 1024
1025#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1026 for (i = 0; i < fdchangecnt; ++i)
1027 {
1028 int fd = fdchanges [i];
1029 ANFD *anfd = anfds + fd;
1030
1031 if (anfd->reify & EV__IOFDSET && anfd->head)
1032 {
1033 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1034
1035 if (handle != anfd->handle)
1036 {
1037 unsigned long arg;
1038
1039 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1040
1041 /* handle changed, but fd didn't - we need to do it in two steps */
1042 backend_modify (EV_A_ fd, anfd->events, 0);
1043 anfd->events = 0;
1044 anfd->handle = handle;
1045 }
1046 }
1047 }
1048#endif
1049
934 for (i = 0; i < fdchangecnt; ++i) 1050 for (i = 0; i < fdchangecnt; ++i)
935 { 1051 {
936 int fd = fdchanges [i]; 1052 int fd = fdchanges [i];
937 ANFD *anfd = anfds + fd; 1053 ANFD *anfd = anfds + fd;
938 ev_io *w; 1054 ev_io *w;
939 1055
940 unsigned char events = 0; 1056 unsigned char o_events = anfd->events;
1057 unsigned char o_reify = anfd->reify;
941 1058
942 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1059 anfd->reify = 0;
943 events |= (unsigned char)w->events;
944 1060
945#if EV_SELECT_IS_WINSOCKET 1061 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
946 if (events)
947 { 1062 {
948 unsigned long arg; 1063 anfd->events = 0;
949 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 1064
950 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 1065 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1066 anfd->events |= (unsigned char)w->events;
1067
1068 if (o_events != anfd->events)
1069 o_reify = EV__IOFDSET; /* actually |= */
951 } 1070 }
952#endif
953 1071
954 { 1072 if (o_reify & EV__IOFDSET)
955 unsigned char o_events = anfd->events;
956 unsigned char o_reify = anfd->reify;
957
958 anfd->reify = 0;
959 anfd->events = events;
960
961 if (o_events != events || o_reify & EV__IOFDSET)
962 backend_modify (EV_A_ fd, o_events, events); 1073 backend_modify (EV_A_ fd, o_events, anfd->events);
963 }
964 } 1074 }
965 1075
966 fdchangecnt = 0; 1076 fdchangecnt = 0;
967} 1077}
968 1078
… …
992 ev_io_stop (EV_A_ w); 1102 ev_io_stop (EV_A_ w);
993 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1103 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
994 } 1104 }
995} 1105}
996 1106
997/* check whether the given fd is atcually valid, for error recovery */ 1107/* check whether the given fd is actually valid, for error recovery */
998inline_size int 1108inline_size int
999fd_valid (int fd) 1109fd_valid (int fd)
1000{ 1110{
1001#ifdef _WIN32 1111#ifdef _WIN32
1002 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1112 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
… …
1044 anfds [fd].emask = 0; 1154 anfds [fd].emask = 0;
1045 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1155 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1046 } 1156 }
1047} 1157}
1048 1158
1159/* used to prepare libev internal fd's */
1160/* this is not fork-safe */
1161inline_speed void
1162fd_intern (int fd)
1163{
1164#ifdef _WIN32
1165 unsigned long arg = 1;
1166 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1167#else
1168 fcntl (fd, F_SETFD, FD_CLOEXEC);
1169 fcntl (fd, F_SETFL, O_NONBLOCK);
1170#endif
1171}
1172
1049/*****************************************************************************/ 1173/*****************************************************************************/
1050 1174
1051/* 1175/*
1052 * the heap functions want a real array index. array index 0 uis guaranteed to not 1176 * the heap functions want a real array index. array index 0 is guaranteed to not
1053 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1177 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1054 * the branching factor of the d-tree. 1178 * the branching factor of the d-tree.
1055 */ 1179 */
1056 1180
1057/* 1181/*
… …
1205 1329
1206static ANSIG signals [EV_NSIG - 1]; 1330static ANSIG signals [EV_NSIG - 1];
1207 1331
1208/*****************************************************************************/ 1332/*****************************************************************************/
1209 1333
1210/* used to prepare libev internal fd's */ 1334#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1211/* this is not fork-safe */
1212inline_speed void
1213fd_intern (int fd)
1214{
1215#ifdef _WIN32
1216 unsigned long arg = 1;
1217 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1218#else
1219 fcntl (fd, F_SETFD, FD_CLOEXEC);
1220 fcntl (fd, F_SETFL, O_NONBLOCK);
1221#endif
1222}
1223 1335
1224static void noinline 1336static void noinline
1225evpipe_init (EV_P) 1337evpipe_init (EV_P)
1226{ 1338{
1227 if (!ev_is_active (&pipe_w)) 1339 if (!ev_is_active (&pipe_w))
1228 { 1340 {
1229#if EV_USE_EVENTFD 1341# if EV_USE_EVENTFD
1230 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1342 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1231 if (evfd < 0 && errno == EINVAL) 1343 if (evfd < 0 && errno == EINVAL)
1232 evfd = eventfd (0, 0); 1344 evfd = eventfd (0, 0);
1233 1345
1234 if (evfd >= 0) 1346 if (evfd >= 0)
… …
1236 evpipe [0] = -1; 1348 evpipe [0] = -1;
1237 fd_intern (evfd); /* doing it twice doesn't hurt */ 1349 fd_intern (evfd); /* doing it twice doesn't hurt */
1238 ev_io_set (&pipe_w, evfd, EV_READ); 1350 ev_io_set (&pipe_w, evfd, EV_READ);
1239 } 1351 }
1240 else 1352 else
1241#endif 1353# endif
1242 { 1354 {
1243 while (pipe (evpipe)) 1355 while (pipe (evpipe))
1244 ev_syserr ("(libev) error creating signal/async pipe"); 1356 ev_syserr ("(libev) error creating signal/async pipe");
1245 1357
1246 fd_intern (evpipe [0]); 1358 fd_intern (evpipe [0]);
… …
1257evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1369evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1258{ 1370{
1259 if (!*flag) 1371 if (!*flag)
1260 { 1372 {
1261 int old_errno = errno; /* save errno because write might clobber it */ 1373 int old_errno = errno; /* save errno because write might clobber it */
1374 char dummy;
1262 1375
1263 *flag = 1; 1376 *flag = 1;
1264 1377
1265#if EV_USE_EVENTFD 1378#if EV_USE_EVENTFD
1266 if (evfd >= 0) 1379 if (evfd >= 0)
… …
1268 uint64_t counter = 1; 1381 uint64_t counter = 1;
1269 write (evfd, &counter, sizeof (uint64_t)); 1382 write (evfd, &counter, sizeof (uint64_t));
1270 } 1383 }
1271 else 1384 else
1272#endif 1385#endif
1386 /* win32 people keep sending patches that change this write() to send() */
1387 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1388 /* so when you think this write should be a send instead, please find out */
1389 /* where your send() is from - it's definitely not the microsoft send, and */
1390 /* tell me. thank you. */
1273 write (evpipe [1], &old_errno, 1); 1391 write (evpipe [1], &dummy, 1);
1274 1392
1275 errno = old_errno; 1393 errno = old_errno;
1276 } 1394 }
1277} 1395}
1278 1396
… …
1291 } 1409 }
1292 else 1410 else
1293#endif 1411#endif
1294 { 1412 {
1295 char dummy; 1413 char dummy;
1414 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1296 read (evpipe [0], &dummy, 1); 1415 read (evpipe [0], &dummy, 1);
1297 } 1416 }
1298 1417
1418#if EV_SIGNAL_ENABLE
1299 if (sig_pending) 1419 if (sig_pending)
1300 { 1420 {
1301 sig_pending = 0; 1421 sig_pending = 0;
1302 1422
1303 for (i = EV_NSIG - 1; i--; ) 1423 for (i = EV_NSIG - 1; i--; )
1304 if (expect_false (signals [i].pending)) 1424 if (expect_false (signals [i].pending))
1305 ev_feed_signal_event (EV_A_ i + 1); 1425 ev_feed_signal_event (EV_A_ i + 1);
1306 } 1426 }
1427#endif
1307 1428
1308#if EV_ASYNC_ENABLE 1429#if EV_ASYNC_ENABLE
1309 if (async_pending) 1430 if (async_pending)
1310 { 1431 {
1311 async_pending = 0; 1432 async_pending = 0;
… …
1320#endif 1441#endif
1321} 1442}
1322 1443
1323/*****************************************************************************/ 1444/*****************************************************************************/
1324 1445
1446void
1447ev_feed_signal (int signum)
1448{
1449#if EV_MULTIPLICITY
1450 EV_P = signals [signum - 1].loop;
1451
1452 if (!EV_A)
1453 return;
1454#endif
1455
1456 signals [signum - 1].pending = 1;
1457 evpipe_write (EV_A_ &sig_pending);
1458}
1459
1325static void 1460static void
1326ev_sighandler (int signum) 1461ev_sighandler (int signum)
1327{ 1462{
1328#if EV_MULTIPLICITY
1329 EV_P = signals [signum - 1].loop;
1330#endif
1331
1332#ifdef _WIN32 1463#ifdef _WIN32
1333 signal (signum, ev_sighandler); 1464 signal (signum, ev_sighandler);
1334#endif 1465#endif
1335 1466
1336 signals [signum - 1].pending = 1; 1467 ev_feed_signal (signum);
1337 evpipe_write (EV_A_ &sig_pending);
1338} 1468}
1339 1469
1340void noinline 1470void noinline
1341ev_feed_signal_event (EV_P_ int signum) 1471ev_feed_signal_event (EV_P_ int signum)
1342{ 1472{
… …
1379 break; 1509 break;
1380 } 1510 }
1381} 1511}
1382#endif 1512#endif
1383 1513
1514#endif
1515
1384/*****************************************************************************/ 1516/*****************************************************************************/
1385 1517
1518#if EV_CHILD_ENABLE
1386static WL childs [EV_PID_HASHSIZE]; 1519static WL childs [EV_PID_HASHSIZE];
1387
1388#ifndef _WIN32
1389 1520
1390static ev_signal childev; 1521static ev_signal childev;
1391 1522
1392#ifndef WIFCONTINUED 1523#ifndef WIFCONTINUED
1393# define WIFCONTINUED(status) 0 1524# define WIFCONTINUED(status) 0
… …
1398child_reap (EV_P_ int chain, int pid, int status) 1529child_reap (EV_P_ int chain, int pid, int status)
1399{ 1530{
1400 ev_child *w; 1531 ev_child *w;
1401 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1532 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1402 1533
1403 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1534 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1404 { 1535 {
1405 if ((w->pid == pid || !w->pid) 1536 if ((w->pid == pid || !w->pid)
1406 && (!traced || (w->flags & 1))) 1537 && (!traced || (w->flags & 1)))
1407 { 1538 {
1408 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1539 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1433 /* make sure we are called again until all children have been reaped */ 1564 /* make sure we are called again until all children have been reaped */
1434 /* we need to do it this way so that the callback gets called before we continue */ 1565 /* we need to do it this way so that the callback gets called before we continue */
1435 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1566 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1436 1567
1437 child_reap (EV_A_ pid, pid, status); 1568 child_reap (EV_A_ pid, pid, status);
1438 if (EV_PID_HASHSIZE > 1) 1569 if ((EV_PID_HASHSIZE) > 1)
1439 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1570 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1440} 1571}
1441 1572
1442#endif 1573#endif
1443 1574
1444/*****************************************************************************/ 1575/*****************************************************************************/
1445 1576
1577#if EV_USE_IOCP
1578# include "ev_iocp.c"
1579#endif
1446#if EV_USE_PORT 1580#if EV_USE_PORT
1447# include "ev_port.c" 1581# include "ev_port.c"
1448#endif 1582#endif
1449#if EV_USE_KQUEUE 1583#if EV_USE_KQUEUE
1450# include "ev_kqueue.c" 1584# include "ev_kqueue.c"
… …
1510#ifdef __APPLE__ 1644#ifdef __APPLE__
1511 /* only select works correctly on that "unix-certified" platform */ 1645 /* only select works correctly on that "unix-certified" platform */
1512 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1646 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1513 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1647 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1514#endif 1648#endif
1649#ifdef __FreeBSD__
1650 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1651#endif
1515 1652
1516 return flags; 1653 return flags;
1517} 1654}
1518 1655
1519unsigned int 1656unsigned int
1520ev_embeddable_backends (void) 1657ev_embeddable_backends (void)
1521{ 1658{
1522 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1659 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1523 1660
1524 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1661 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1525 /* please fix it and tell me how to detect the fix */ 1662 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1526 flags &= ~EVBACKEND_EPOLL; 1663 flags &= ~EVBACKEND_EPOLL;
1527 1664
1528 return flags; 1665 return flags;
1529} 1666}
1530 1667
1531unsigned int 1668unsigned int
1532ev_backend (EV_P) 1669ev_backend (EV_P)
1533{ 1670{
1534 return backend; 1671 return backend;
1535} 1672}
1536 1673
1537#if EV_MINIMAL < 2 1674#if EV_FEATURE_API
1538unsigned int 1675unsigned int
1539ev_loop_count (EV_P) 1676ev_iteration (EV_P)
1540{ 1677{
1541 return loop_count; 1678 return loop_count;
1542} 1679}
1543 1680
1544unsigned int 1681unsigned int
1545ev_loop_depth (EV_P) 1682ev_depth (EV_P)
1546{ 1683{
1547 return loop_depth; 1684 return loop_depth;
1548} 1685}
1549 1686
1550void 1687void
… …
1587static void noinline 1724static void noinline
1588loop_init (EV_P_ unsigned int flags) 1725loop_init (EV_P_ unsigned int flags)
1589{ 1726{
1590 if (!backend) 1727 if (!backend)
1591 { 1728 {
1729 origflags = flags;
1730
1592#if EV_USE_REALTIME 1731#if EV_USE_REALTIME
1593 if (!have_realtime) 1732 if (!have_realtime)
1594 { 1733 {
1595 struct timespec ts; 1734 struct timespec ts;
1596 1735
… …
1622 1761
1623 ev_rt_now = ev_time (); 1762 ev_rt_now = ev_time ();
1624 mn_now = get_clock (); 1763 mn_now = get_clock ();
1625 now_floor = mn_now; 1764 now_floor = mn_now;
1626 rtmn_diff = ev_rt_now - mn_now; 1765 rtmn_diff = ev_rt_now - mn_now;
1627#if EV_MINIMAL < 2 1766#if EV_FEATURE_API
1628 invoke_cb = ev_invoke_pending; 1767 invoke_cb = ev_invoke_pending;
1629#endif 1768#endif
1630 1769
1631 io_blocktime = 0.; 1770 io_blocktime = 0.;
1632 timeout_blocktime = 0.; 1771 timeout_blocktime = 0.;
… …
1641#endif 1780#endif
1642#if EV_USE_SIGNALFD 1781#if EV_USE_SIGNALFD
1643 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1782 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1644#endif 1783#endif
1645 1784
1646 if (!(flags & 0x0000ffffU)) 1785 if (!(flags & EVBACKEND_MASK))
1647 flags |= ev_recommended_backends (); 1786 flags |= ev_recommended_backends ();
1648 1787
1788#if EV_USE_IOCP
1789 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1790#endif
1649#if EV_USE_PORT 1791#if EV_USE_PORT
1650 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1792 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1651#endif 1793#endif
1652#if EV_USE_KQUEUE 1794#if EV_USE_KQUEUE
1653 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1795 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1662 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1804 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1663#endif 1805#endif
1664 1806
1665 ev_prepare_init (&pending_w, pendingcb); 1807 ev_prepare_init (&pending_w, pendingcb);
1666 1808
1809#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1667 ev_init (&pipe_w, pipecb); 1810 ev_init (&pipe_w, pipecb);
1668 ev_set_priority (&pipe_w, EV_MAXPRI); 1811 ev_set_priority (&pipe_w, EV_MAXPRI);
1812#endif
1669 } 1813 }
1670} 1814}
1671 1815
1672/* free up a loop structure */ 1816/* free up a loop structure */
1673static void noinline 1817void
1674loop_destroy (EV_P) 1818ev_loop_destroy (EV_P)
1675{ 1819{
1676 int i; 1820 int i;
1821
1822#if EV_MULTIPLICITY
1823 /* mimic free (0) */
1824 if (!EV_A)
1825 return;
1826#endif
1827
1828#if EV_CLEANUP_ENABLE
1829 /* queue cleanup watchers (and execute them) */
1830 if (expect_false (cleanupcnt))
1831 {
1832 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1833 EV_INVOKE_PENDING;
1834 }
1835#endif
1836
1837#if EV_CHILD_ENABLE
1838 if (ev_is_active (&childev))
1839 {
1840 ev_ref (EV_A); /* child watcher */
1841 ev_signal_stop (EV_A_ &childev);
1842 }
1843#endif
1677 1844
1678 if (ev_is_active (&pipe_w)) 1845 if (ev_is_active (&pipe_w))
1679 { 1846 {
1680 /*ev_ref (EV_A);*/ 1847 /*ev_ref (EV_A);*/
1681 /*ev_io_stop (EV_A_ &pipe_w);*/ 1848 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1703#endif 1870#endif
1704 1871
1705 if (backend_fd >= 0) 1872 if (backend_fd >= 0)
1706 close (backend_fd); 1873 close (backend_fd);
1707 1874
1875#if EV_USE_IOCP
1876 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1877#endif
1708#if EV_USE_PORT 1878#if EV_USE_PORT
1709 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1879 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1710#endif 1880#endif
1711#if EV_USE_KQUEUE 1881#if EV_USE_KQUEUE
1712 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1882 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1739 array_free (periodic, EMPTY); 1909 array_free (periodic, EMPTY);
1740#endif 1910#endif
1741#if EV_FORK_ENABLE 1911#if EV_FORK_ENABLE
1742 array_free (fork, EMPTY); 1912 array_free (fork, EMPTY);
1743#endif 1913#endif
1914#if EV_CLEANUP_ENABLE
1915 array_free (cleanup, EMPTY);
1916#endif
1744 array_free (prepare, EMPTY); 1917 array_free (prepare, EMPTY);
1745 array_free (check, EMPTY); 1918 array_free (check, EMPTY);
1746#if EV_ASYNC_ENABLE 1919#if EV_ASYNC_ENABLE
1747 array_free (async, EMPTY); 1920 array_free (async, EMPTY);
1748#endif 1921#endif
1749 1922
1750 backend = 0; 1923 backend = 0;
1924
1925#if EV_MULTIPLICITY
1926 if (ev_is_default_loop (EV_A))
1927#endif
1928 ev_default_loop_ptr = 0;
1929#if EV_MULTIPLICITY
1930 else
1931 ev_free (EV_A);
1932#endif
1751} 1933}
1752 1934
1753#if EV_USE_INOTIFY 1935#if EV_USE_INOTIFY
1754inline_size void infy_fork (EV_P); 1936inline_size void infy_fork (EV_P);
1755#endif 1937#endif
… …
1791 { 1973 {
1792 EV_WIN32_CLOSE_FD (evpipe [0]); 1974 EV_WIN32_CLOSE_FD (evpipe [0]);
1793 EV_WIN32_CLOSE_FD (evpipe [1]); 1975 EV_WIN32_CLOSE_FD (evpipe [1]);
1794 } 1976 }
1795 1977
1978#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1796 evpipe_init (EV_A); 1979 evpipe_init (EV_A);
1797 /* now iterate over everything, in case we missed something */ 1980 /* now iterate over everything, in case we missed something */
1798 pipecb (EV_A_ &pipe_w, EV_READ); 1981 pipecb (EV_A_ &pipe_w, EV_READ);
1982#endif
1799 } 1983 }
1800 1984
1801 postfork = 0; 1985 postfork = 0;
1802} 1986}
1803 1987
… …
1812 loop_init (EV_A_ flags); 1996 loop_init (EV_A_ flags);
1813 1997
1814 if (ev_backend (EV_A)) 1998 if (ev_backend (EV_A))
1815 return EV_A; 1999 return EV_A;
1816 2000
2001 ev_free (EV_A);
1817 return 0; 2002 return 0;
1818} 2003}
1819 2004
1820void
1821ev_loop_destroy (EV_P)
1822{
1823 loop_destroy (EV_A);
1824 ev_free (loop);
1825}
1826
1827void
1828ev_loop_fork (EV_P)
1829{
1830 postfork = 1; /* must be in line with ev_default_fork */
1831}
1832#endif /* multiplicity */ 2005#endif /* multiplicity */
1833 2006
1834#if EV_VERIFY 2007#if EV_VERIFY
1835static void noinline 2008static void noinline
1836verify_watcher (EV_P_ W w) 2009verify_watcher (EV_P_ W w)
… …
1865 verify_watcher (EV_A_ ws [cnt]); 2038 verify_watcher (EV_A_ ws [cnt]);
1866 } 2039 }
1867} 2040}
1868#endif 2041#endif
1869 2042
1870#if EV_MINIMAL < 2 2043#if EV_FEATURE_API
1871void 2044void
1872ev_loop_verify (EV_P) 2045ev_verify (EV_P)
1873{ 2046{
1874#if EV_VERIFY 2047#if EV_VERIFY
1875 int i; 2048 int i;
1876 WL w; 2049 WL w;
1877 2050
… …
1911#if EV_FORK_ENABLE 2084#if EV_FORK_ENABLE
1912 assert (forkmax >= forkcnt); 2085 assert (forkmax >= forkcnt);
1913 array_verify (EV_A_ (W *)forks, forkcnt); 2086 array_verify (EV_A_ (W *)forks, forkcnt);
1914#endif 2087#endif
1915 2088
2089#if EV_CLEANUP_ENABLE
2090 assert (cleanupmax >= cleanupcnt);
2091 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2092#endif
2093
1916#if EV_ASYNC_ENABLE 2094#if EV_ASYNC_ENABLE
1917 assert (asyncmax >= asynccnt); 2095 assert (asyncmax >= asynccnt);
1918 array_verify (EV_A_ (W *)asyncs, asynccnt); 2096 array_verify (EV_A_ (W *)asyncs, asynccnt);
1919#endif 2097#endif
1920 2098
2099#if EV_PREPARE_ENABLE
1921 assert (preparemax >= preparecnt); 2100 assert (preparemax >= preparecnt);
1922 array_verify (EV_A_ (W *)prepares, preparecnt); 2101 array_verify (EV_A_ (W *)prepares, preparecnt);
2102#endif
1923 2103
2104#if EV_CHECK_ENABLE
1924 assert (checkmax >= checkcnt); 2105 assert (checkmax >= checkcnt);
1925 array_verify (EV_A_ (W *)checks, checkcnt); 2106 array_verify (EV_A_ (W *)checks, checkcnt);
2107#endif
1926 2108
1927# if 0 2109# if 0
2110#if EV_CHILD_ENABLE
1928 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2111 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1929 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 2112 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2113#endif
1930# endif 2114# endif
1931#endif 2115#endif
1932} 2116}
1933#endif 2117#endif
1934 2118
1935#if EV_MULTIPLICITY 2119#if EV_MULTIPLICITY
1936struct ev_loop * 2120struct ev_loop *
1937ev_default_loop_init (unsigned int flags)
1938#else 2121#else
1939int 2122int
2123#endif
1940ev_default_loop (unsigned int flags) 2124ev_default_loop (unsigned int flags)
1941#endif
1942{ 2125{
1943 if (!ev_default_loop_ptr) 2126 if (!ev_default_loop_ptr)
1944 { 2127 {
1945#if EV_MULTIPLICITY 2128#if EV_MULTIPLICITY
1946 EV_P = ev_default_loop_ptr = &default_loop_struct; 2129 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1950 2133
1951 loop_init (EV_A_ flags); 2134 loop_init (EV_A_ flags);
1952 2135
1953 if (ev_backend (EV_A)) 2136 if (ev_backend (EV_A))
1954 { 2137 {
1955#ifndef _WIN32 2138#if EV_CHILD_ENABLE
1956 ev_signal_init (&childev, childcb, SIGCHLD); 2139 ev_signal_init (&childev, childcb, SIGCHLD);
1957 ev_set_priority (&childev, EV_MAXPRI); 2140 ev_set_priority (&childev, EV_MAXPRI);
1958 ev_signal_start (EV_A_ &childev); 2141 ev_signal_start (EV_A_ &childev);
1959 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2142 ev_unref (EV_A); /* child watcher should not keep loop alive */
1960#endif 2143#endif
… …
1965 2148
1966 return ev_default_loop_ptr; 2149 return ev_default_loop_ptr;
1967} 2150}
1968 2151
1969void 2152void
1970ev_default_destroy (void) 2153ev_loop_fork (EV_P)
1971{ 2154{
1972#if EV_MULTIPLICITY
1973 EV_P = ev_default_loop_ptr;
1974#endif
1975
1976 ev_default_loop_ptr = 0;
1977
1978#ifndef _WIN32
1979 ev_ref (EV_A); /* child watcher */
1980 ev_signal_stop (EV_A_ &childev);
1981#endif
1982
1983 loop_destroy (EV_A);
1984}
1985
1986void
1987ev_default_fork (void)
1988{
1989#if EV_MULTIPLICITY
1990 EV_P = ev_default_loop_ptr;
1991#endif
1992
1993 postfork = 1; /* must be in line with ev_loop_fork */ 2155 postfork = 1; /* must be in line with ev_default_fork */
1994} 2156}
1995 2157
1996/*****************************************************************************/ 2158/*****************************************************************************/
1997 2159
1998void 2160void
… …
2020 2182
2021 for (pri = NUMPRI; pri--; ) 2183 for (pri = NUMPRI; pri--; )
2022 while (pendingcnt [pri]) 2184 while (pendingcnt [pri])
2023 { 2185 {
2024 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2186 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2025
2026 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2027 /* ^ this is no longer true, as pending_w could be here */
2028 2187
2029 p->w->pending = 0; 2188 p->w->pending = 0;
2030 EV_CB_INVOKE (p->w, p->events); 2189 EV_CB_INVOKE (p->w, p->events);
2031 EV_FREQUENT_CHECK; 2190 EV_FREQUENT_CHECK;
2032 } 2191 }
… …
2089 EV_FREQUENT_CHECK; 2248 EV_FREQUENT_CHECK;
2090 feed_reverse (EV_A_ (W)w); 2249 feed_reverse (EV_A_ (W)w);
2091 } 2250 }
2092 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2251 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2093 2252
2094 feed_reverse_done (EV_A_ EV_TIMEOUT); 2253 feed_reverse_done (EV_A_ EV_TIMER);
2095 } 2254 }
2096} 2255}
2097 2256
2098#if EV_PERIODIC_ENABLE 2257#if EV_PERIODIC_ENABLE
2258
2259static void noinline
2260periodic_recalc (EV_P_ ev_periodic *w)
2261{
2262 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2263 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2264
2265 /* the above almost always errs on the low side */
2266 while (at <= ev_rt_now)
2267 {
2268 ev_tstamp nat = at + w->interval;
2269
2270 /* when resolution fails us, we use ev_rt_now */
2271 if (expect_false (nat == at))
2272 {
2273 at = ev_rt_now;
2274 break;
2275 }
2276
2277 at = nat;
2278 }
2279
2280 ev_at (w) = at;
2281}
2282
2099/* make periodics pending */ 2283/* make periodics pending */
2100inline_size void 2284inline_size void
2101periodics_reify (EV_P) 2285periodics_reify (EV_P)
2102{ 2286{
2103 EV_FREQUENT_CHECK; 2287 EV_FREQUENT_CHECK;
… …
2122 ANHE_at_cache (periodics [HEAP0]); 2306 ANHE_at_cache (periodics [HEAP0]);
2123 downheap (periodics, periodiccnt, HEAP0); 2307 downheap (periodics, periodiccnt, HEAP0);
2124 } 2308 }
2125 else if (w->interval) 2309 else if (w->interval)
2126 { 2310 {
2127 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2311 periodic_recalc (EV_A_ w);
2128 /* if next trigger time is not sufficiently in the future, put it there */
2129 /* this might happen because of floating point inexactness */
2130 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2131 {
2132 ev_at (w) += w->interval;
2133
2134 /* if interval is unreasonably low we might still have a time in the past */
2135 /* so correct this. this will make the periodic very inexact, but the user */
2136 /* has effectively asked to get triggered more often than possible */
2137 if (ev_at (w) < ev_rt_now)
2138 ev_at (w) = ev_rt_now;
2139 }
2140
2141 ANHE_at_cache (periodics [HEAP0]); 2312 ANHE_at_cache (periodics [HEAP0]);
2142 downheap (periodics, periodiccnt, HEAP0); 2313 downheap (periodics, periodiccnt, HEAP0);
2143 } 2314 }
2144 else 2315 else
2145 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2316 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2152 feed_reverse_done (EV_A_ EV_PERIODIC); 2323 feed_reverse_done (EV_A_ EV_PERIODIC);
2153 } 2324 }
2154} 2325}
2155 2326
2156/* simply recalculate all periodics */ 2327/* simply recalculate all periodics */
2157/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2328/* TODO: maybe ensure that at least one event happens when jumping forward? */
2158static void noinline 2329static void noinline
2159periodics_reschedule (EV_P) 2330periodics_reschedule (EV_P)
2160{ 2331{
2161 int i; 2332 int i;
2162 2333
… …
2166 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2337 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2167 2338
2168 if (w->reschedule_cb) 2339 if (w->reschedule_cb)
2169 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2340 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2170 else if (w->interval) 2341 else if (w->interval)
2171 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2342 periodic_recalc (EV_A_ w);
2172 2343
2173 ANHE_at_cache (periodics [i]); 2344 ANHE_at_cache (periodics [i]);
2174 } 2345 }
2175 2346
2176 reheap (periodics, periodiccnt); 2347 reheap (periodics, periodiccnt);
… …
2223 * doesn't hurt either as we only do this on time-jumps or 2394 * doesn't hurt either as we only do this on time-jumps or
2224 * in the unlikely event of having been preempted here. 2395 * in the unlikely event of having been preempted here.
2225 */ 2396 */
2226 for (i = 4; --i; ) 2397 for (i = 4; --i; )
2227 { 2398 {
2399 ev_tstamp diff;
2228 rtmn_diff = ev_rt_now - mn_now; 2400 rtmn_diff = ev_rt_now - mn_now;
2229 2401
2402 diff = odiff - rtmn_diff;
2403
2230 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2404 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2231 return; /* all is well */ 2405 return; /* all is well */
2232 2406
2233 ev_rt_now = ev_time (); 2407 ev_rt_now = ev_time ();
2234 mn_now = get_clock (); 2408 mn_now = get_clock ();
2235 now_floor = mn_now; 2409 now_floor = mn_now;
… …
2258 mn_now = ev_rt_now; 2432 mn_now = ev_rt_now;
2259 } 2433 }
2260} 2434}
2261 2435
2262void 2436void
2263ev_loop (EV_P_ int flags) 2437ev_run (EV_P_ int flags)
2264{ 2438{
2265#if EV_MINIMAL < 2 2439#if EV_FEATURE_API
2266 ++loop_depth; 2440 ++loop_depth;
2267#endif 2441#endif
2268 2442
2269 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2443 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2270 2444
2271 loop_done = EVUNLOOP_CANCEL; 2445 loop_done = EVBREAK_CANCEL;
2272 2446
2273 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2447 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2274 2448
2275 do 2449 do
2276 { 2450 {
2277#if EV_VERIFY >= 2 2451#if EV_VERIFY >= 2
2278 ev_loop_verify (EV_A); 2452 ev_verify (EV_A);
2279#endif 2453#endif
2280 2454
2281#ifndef _WIN32 2455#ifndef _WIN32
2282 if (expect_false (curpid)) /* penalise the forking check even more */ 2456 if (expect_false (curpid)) /* penalise the forking check even more */
2283 if (expect_false (getpid () != curpid)) 2457 if (expect_false (getpid () != curpid))
… …
2295 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2469 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2296 EV_INVOKE_PENDING; 2470 EV_INVOKE_PENDING;
2297 } 2471 }
2298#endif 2472#endif
2299 2473
2474#if EV_PREPARE_ENABLE
2300 /* queue prepare watchers (and execute them) */ 2475 /* queue prepare watchers (and execute them) */
2301 if (expect_false (preparecnt)) 2476 if (expect_false (preparecnt))
2302 { 2477 {
2303 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2478 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2304 EV_INVOKE_PENDING; 2479 EV_INVOKE_PENDING;
2305 } 2480 }
2481#endif
2306 2482
2307 if (expect_false (loop_done)) 2483 if (expect_false (loop_done))
2308 break; 2484 break;
2309 2485
2310 /* we might have forked, so reify kernel state if necessary */ 2486 /* we might have forked, so reify kernel state if necessary */
… …
2317 /* calculate blocking time */ 2493 /* calculate blocking time */
2318 { 2494 {
2319 ev_tstamp waittime = 0.; 2495 ev_tstamp waittime = 0.;
2320 ev_tstamp sleeptime = 0.; 2496 ev_tstamp sleeptime = 0.;
2321 2497
2498 /* remember old timestamp for io_blocktime calculation */
2499 ev_tstamp prev_mn_now = mn_now;
2500
2501 /* update time to cancel out callback processing overhead */
2502 time_update (EV_A_ 1e100);
2503
2322 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2504 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2323 { 2505 {
2324 /* remember old timestamp for io_blocktime calculation */
2325 ev_tstamp prev_mn_now = mn_now;
2326
2327 /* update time to cancel out callback processing overhead */
2328 time_update (EV_A_ 1e100);
2329
2330 waittime = MAX_BLOCKTIME; 2506 waittime = MAX_BLOCKTIME;
2331 2507
2332 if (timercnt) 2508 if (timercnt)
2333 { 2509 {
2334 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2510 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_mintime;
2335 if (waittime > to) waittime = to; 2511 if (waittime > to) waittime = to;
2336 } 2512 }
2337 2513
2338#if EV_PERIODIC_ENABLE 2514#if EV_PERIODIC_ENABLE
2339 if (periodiccnt) 2515 if (periodiccnt)
2340 { 2516 {
2341 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2517 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_mintime;
2342 if (waittime > to) waittime = to; 2518 if (waittime > to) waittime = to;
2343 } 2519 }
2344#endif 2520#endif
2345 2521
2346 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2522 /* don't let timeouts decrease the waittime below timeout_blocktime */
… …
2350 /* extra check because io_blocktime is commonly 0 */ 2526 /* extra check because io_blocktime is commonly 0 */
2351 if (expect_false (io_blocktime)) 2527 if (expect_false (io_blocktime))
2352 { 2528 {
2353 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2529 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2354 2530
2355 if (sleeptime > waittime - backend_fudge) 2531 if (sleeptime > waittime - backend_mintime)
2356 sleeptime = waittime - backend_fudge; 2532 sleeptime = waittime - backend_mintime;
2357 2533
2358 if (expect_true (sleeptime > 0.)) 2534 if (expect_true (sleeptime > 0.))
2359 { 2535 {
2360 ev_sleep (sleeptime); 2536 ev_sleep (sleeptime);
2361 waittime -= sleeptime; 2537 waittime -= sleeptime;
2362 } 2538 }
2363 } 2539 }
2364 } 2540 }
2365 2541
2366#if EV_MINIMAL < 2 2542#if EV_FEATURE_API
2367 ++loop_count; 2543 ++loop_count;
2368#endif 2544#endif
2369 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2545 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2370 backend_poll (EV_A_ waittime); 2546 backend_poll (EV_A_ waittime);
2371 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2547 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2372 2548
2373 /* update ev_rt_now, do magic */ 2549 /* update ev_rt_now, do magic */
2374 time_update (EV_A_ waittime + sleeptime); 2550 time_update (EV_A_ waittime + sleeptime);
2375 } 2551 }
2376 2552
… …
2383#if EV_IDLE_ENABLE 2559#if EV_IDLE_ENABLE
2384 /* queue idle watchers unless other events are pending */ 2560 /* queue idle watchers unless other events are pending */
2385 idle_reify (EV_A); 2561 idle_reify (EV_A);
2386#endif 2562#endif
2387 2563
2564#if EV_CHECK_ENABLE
2388 /* queue check watchers, to be executed first */ 2565 /* queue check watchers, to be executed first */
2389 if (expect_false (checkcnt)) 2566 if (expect_false (checkcnt))
2390 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2567 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2568#endif
2391 2569
2392 EV_INVOKE_PENDING; 2570 EV_INVOKE_PENDING;
2393 } 2571 }
2394 while (expect_true ( 2572 while (expect_true (
2395 activecnt 2573 activecnt
2396 && !loop_done 2574 && !loop_done
2397 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2575 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2398 )); 2576 ));
2399 2577
2400 if (loop_done == EVUNLOOP_ONE) 2578 if (loop_done == EVBREAK_ONE)
2401 loop_done = EVUNLOOP_CANCEL; 2579 loop_done = EVBREAK_CANCEL;
2402 2580
2403#if EV_MINIMAL < 2 2581#if EV_FEATURE_API
2404 --loop_depth; 2582 --loop_depth;
2405#endif 2583#endif
2406} 2584}
2407 2585
2408void 2586void
2409ev_unloop (EV_P_ int how) 2587ev_break (EV_P_ int how)
2410{ 2588{
2411 loop_done = how; 2589 loop_done = how;
2412} 2590}
2413 2591
2414void 2592void
… …
2562 EV_FREQUENT_CHECK; 2740 EV_FREQUENT_CHECK;
2563 2741
2564 wlist_del (&anfds[w->fd].head, (WL)w); 2742 wlist_del (&anfds[w->fd].head, (WL)w);
2565 ev_stop (EV_A_ (W)w); 2743 ev_stop (EV_A_ (W)w);
2566 2744
2567 fd_change (EV_A_ w->fd, 1); 2745 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2568 2746
2569 EV_FREQUENT_CHECK; 2747 EV_FREQUENT_CHECK;
2570} 2748}
2571 2749
2572void noinline 2750void noinline
… …
2664 if (w->reschedule_cb) 2842 if (w->reschedule_cb)
2665 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2843 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2666 else if (w->interval) 2844 else if (w->interval)
2667 { 2845 {
2668 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2846 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2669 /* this formula differs from the one in periodic_reify because we do not always round up */ 2847 periodic_recalc (EV_A_ w);
2670 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2671 } 2848 }
2672 else 2849 else
2673 ev_at (w) = w->offset; 2850 ev_at (w) = w->offset;
2674 2851
2675 EV_FREQUENT_CHECK; 2852 EV_FREQUENT_CHECK;
… …
2724#endif 2901#endif
2725 2902
2726#ifndef SA_RESTART 2903#ifndef SA_RESTART
2727# define SA_RESTART 0 2904# define SA_RESTART 0
2728#endif 2905#endif
2906
2907#if EV_SIGNAL_ENABLE
2729 2908
2730void noinline 2909void noinline
2731ev_signal_start (EV_P_ ev_signal *w) 2910ev_signal_start (EV_P_ ev_signal *w)
2732{ 2911{
2733 if (expect_false (ev_is_active (w))) 2912 if (expect_false (ev_is_active (w)))
… …
2794 sa.sa_handler = ev_sighandler; 2973 sa.sa_handler = ev_sighandler;
2795 sigfillset (&sa.sa_mask); 2974 sigfillset (&sa.sa_mask);
2796 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2975 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2797 sigaction (w->signum, &sa, 0); 2976 sigaction (w->signum, &sa, 0);
2798 2977
2978 if (origflags & EVFLAG_NOSIGMASK)
2979 {
2799 sigemptyset (&sa.sa_mask); 2980 sigemptyset (&sa.sa_mask);
2800 sigaddset (&sa.sa_mask, w->signum); 2981 sigaddset (&sa.sa_mask, w->signum);
2801 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2982 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2983 }
2802#endif 2984#endif
2803 } 2985 }
2804 2986
2805 EV_FREQUENT_CHECK; 2987 EV_FREQUENT_CHECK;
2806} 2988}
… …
2840 } 3022 }
2841 3023
2842 EV_FREQUENT_CHECK; 3024 EV_FREQUENT_CHECK;
2843} 3025}
2844 3026
3027#endif
3028
3029#if EV_CHILD_ENABLE
3030
2845void 3031void
2846ev_child_start (EV_P_ ev_child *w) 3032ev_child_start (EV_P_ ev_child *w)
2847{ 3033{
2848#if EV_MULTIPLICITY 3034#if EV_MULTIPLICITY
2849 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 3035 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2852 return; 3038 return;
2853 3039
2854 EV_FREQUENT_CHECK; 3040 EV_FREQUENT_CHECK;
2855 3041
2856 ev_start (EV_A_ (W)w, 1); 3042 ev_start (EV_A_ (W)w, 1);
2857 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3043 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2858 3044
2859 EV_FREQUENT_CHECK; 3045 EV_FREQUENT_CHECK;
2860} 3046}
2861 3047
2862void 3048void
… …
2866 if (expect_false (!ev_is_active (w))) 3052 if (expect_false (!ev_is_active (w)))
2867 return; 3053 return;
2868 3054
2869 EV_FREQUENT_CHECK; 3055 EV_FREQUENT_CHECK;
2870 3056
2871 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3057 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2872 ev_stop (EV_A_ (W)w); 3058 ev_stop (EV_A_ (W)w);
2873 3059
2874 EV_FREQUENT_CHECK; 3060 EV_FREQUENT_CHECK;
2875} 3061}
3062
3063#endif
2876 3064
2877#if EV_STAT_ENABLE 3065#if EV_STAT_ENABLE
2878 3066
2879# ifdef _WIN32 3067# ifdef _WIN32
2880# undef lstat 3068# undef lstat
… …
2941 if (!pend || pend == path) 3129 if (!pend || pend == path)
2942 break; 3130 break;
2943 3131
2944 *pend = 0; 3132 *pend = 0;
2945 w->wd = inotify_add_watch (fs_fd, path, mask); 3133 w->wd = inotify_add_watch (fs_fd, path, mask);
2946 } 3134 }
2947 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3135 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2948 } 3136 }
2949 } 3137 }
2950 3138
2951 if (w->wd >= 0) 3139 if (w->wd >= 0)
2952 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3140 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2953 3141
2954 /* now re-arm timer, if required */ 3142 /* now re-arm timer, if required */
2955 if (ev_is_active (&w->timer)) ev_ref (EV_A); 3143 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2956 ev_timer_again (EV_A_ &w->timer); 3144 ev_timer_again (EV_A_ &w->timer);
2957 if (ev_is_active (&w->timer)) ev_unref (EV_A); 3145 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2965 3153
2966 if (wd < 0) 3154 if (wd < 0)
2967 return; 3155 return;
2968 3156
2969 w->wd = -2; 3157 w->wd = -2;
2970 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3158 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2971 wlist_del (&fs_hash [slot].head, (WL)w); 3159 wlist_del (&fs_hash [slot].head, (WL)w);
2972 3160
2973 /* remove this watcher, if others are watching it, they will rearm */ 3161 /* remove this watcher, if others are watching it, they will rearm */
2974 inotify_rm_watch (fs_fd, wd); 3162 inotify_rm_watch (fs_fd, wd);
2975} 3163}
… …
2977static void noinline 3165static void noinline
2978infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3166infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2979{ 3167{
2980 if (slot < 0) 3168 if (slot < 0)
2981 /* overflow, need to check for all hash slots */ 3169 /* overflow, need to check for all hash slots */
2982 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3170 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2983 infy_wd (EV_A_ slot, wd, ev); 3171 infy_wd (EV_A_ slot, wd, ev);
2984 else 3172 else
2985 { 3173 {
2986 WL w_; 3174 WL w_;
2987 3175
2988 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3176 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2989 { 3177 {
2990 ev_stat *w = (ev_stat *)w_; 3178 ev_stat *w = (ev_stat *)w_;
2991 w_ = w_->next; /* lets us remove this watcher and all before it */ 3179 w_ = w_->next; /* lets us remove this watcher and all before it */
2992 3180
2993 if (w->wd == wd || wd == -1) 3181 if (w->wd == wd || wd == -1)
2994 { 3182 {
2995 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3183 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2996 { 3184 {
2997 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3185 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2998 w->wd = -1; 3186 w->wd = -1;
2999 infy_add (EV_A_ w); /* re-add, no matter what */ 3187 infy_add (EV_A_ w); /* re-add, no matter what */
3000 } 3188 }
3001 3189
3002 stat_timer_cb (EV_A_ &w->timer, 0); 3190 stat_timer_cb (EV_A_ &w->timer, 0);
… …
3016 { 3204 {
3017 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3205 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3018 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3206 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3019 ofs += sizeof (struct inotify_event) + ev->len; 3207 ofs += sizeof (struct inotify_event) + ev->len;
3020 } 3208 }
3021}
3022
3023inline_size unsigned int
3024ev_linux_version (void)
3025{
3026 struct utsname buf;
3027 unsigned int v;
3028 int i;
3029 char *p = buf.release;
3030
3031 if (uname (&buf))
3032 return 0;
3033
3034 for (i = 3+1; --i; )
3035 {
3036 unsigned int c = 0;
3037
3038 for (;;)
3039 {
3040 if (*p >= '0' && *p <= '9')
3041 c = c * 10 + *p++ - '0';
3042 else
3043 {
3044 p += *p == '.';
3045 break;
3046 }
3047 }
3048
3049 v = (v << 8) | c;
3050 }
3051
3052 return v;
3053} 3209}
3054 3210
3055inline_size void 3211inline_size void
3056ev_check_2625 (EV_P) 3212ev_check_2625 (EV_P)
3057{ 3213{
… …
3116 ev_io_set (&fs_w, fs_fd, EV_READ); 3272 ev_io_set (&fs_w, fs_fd, EV_READ);
3117 ev_io_start (EV_A_ &fs_w); 3273 ev_io_start (EV_A_ &fs_w);
3118 ev_unref (EV_A); 3274 ev_unref (EV_A);
3119 } 3275 }
3120 3276
3121 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3277 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3122 { 3278 {
3123 WL w_ = fs_hash [slot].head; 3279 WL w_ = fs_hash [slot].head;
3124 fs_hash [slot].head = 0; 3280 fs_hash [slot].head = 0;
3125 3281
3126 while (w_) 3282 while (w_)
… …
3301 3457
3302 EV_FREQUENT_CHECK; 3458 EV_FREQUENT_CHECK;
3303} 3459}
3304#endif 3460#endif
3305 3461
3462#if EV_PREPARE_ENABLE
3306void 3463void
3307ev_prepare_start (EV_P_ ev_prepare *w) 3464ev_prepare_start (EV_P_ ev_prepare *w)
3308{ 3465{
3309 if (expect_false (ev_is_active (w))) 3466 if (expect_false (ev_is_active (w)))
3310 return; 3467 return;
… …
3336 3493
3337 ev_stop (EV_A_ (W)w); 3494 ev_stop (EV_A_ (W)w);
3338 3495
3339 EV_FREQUENT_CHECK; 3496 EV_FREQUENT_CHECK;
3340} 3497}
3498#endif
3341 3499
3500#if EV_CHECK_ENABLE
3342void 3501void
3343ev_check_start (EV_P_ ev_check *w) 3502ev_check_start (EV_P_ ev_check *w)
3344{ 3503{
3345 if (expect_false (ev_is_active (w))) 3504 if (expect_false (ev_is_active (w)))
3346 return; 3505 return;
… …
3372 3531
3373 ev_stop (EV_A_ (W)w); 3532 ev_stop (EV_A_ (W)w);
3374 3533
3375 EV_FREQUENT_CHECK; 3534 EV_FREQUENT_CHECK;
3376} 3535}
3536#endif
3377 3537
3378#if EV_EMBED_ENABLE 3538#if EV_EMBED_ENABLE
3379void noinline 3539void noinline
3380ev_embed_sweep (EV_P_ ev_embed *w) 3540ev_embed_sweep (EV_P_ ev_embed *w)
3381{ 3541{
3382 ev_loop (w->other, EVLOOP_NONBLOCK); 3542 ev_run (w->other, EVRUN_NOWAIT);
3383} 3543}
3384 3544
3385static void 3545static void
3386embed_io_cb (EV_P_ ev_io *io, int revents) 3546embed_io_cb (EV_P_ ev_io *io, int revents)
3387{ 3547{
3388 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3548 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3389 3549
3390 if (ev_cb (w)) 3550 if (ev_cb (w))
3391 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3551 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3392 else 3552 else
3393 ev_loop (w->other, EVLOOP_NONBLOCK); 3553 ev_run (w->other, EVRUN_NOWAIT);
3394} 3554}
3395 3555
3396static void 3556static void
3397embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3557embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3398{ 3558{
… …
3402 EV_P = w->other; 3562 EV_P = w->other;
3403 3563
3404 while (fdchangecnt) 3564 while (fdchangecnt)
3405 { 3565 {
3406 fd_reify (EV_A); 3566 fd_reify (EV_A);
3407 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3567 ev_run (EV_A_ EVRUN_NOWAIT);
3408 } 3568 }
3409 } 3569 }
3410} 3570}
3411 3571
3412static void 3572static void
… …
3418 3578
3419 { 3579 {
3420 EV_P = w->other; 3580 EV_P = w->other;
3421 3581
3422 ev_loop_fork (EV_A); 3582 ev_loop_fork (EV_A);
3423 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3583 ev_run (EV_A_ EVRUN_NOWAIT);
3424 } 3584 }
3425 3585
3426 ev_embed_start (EV_A_ w); 3586 ev_embed_start (EV_A_ w);
3427} 3587}
3428 3588
… …
3520 3680
3521 EV_FREQUENT_CHECK; 3681 EV_FREQUENT_CHECK;
3522} 3682}
3523#endif 3683#endif
3524 3684
3525#if EV_ASYNC_ENABLE 3685#if EV_CLEANUP_ENABLE
3526void 3686void
3527ev_async_start (EV_P_ ev_async *w) 3687ev_cleanup_start (EV_P_ ev_cleanup *w)
3528{ 3688{
3529 if (expect_false (ev_is_active (w))) 3689 if (expect_false (ev_is_active (w)))
3530 return; 3690 return;
3691
3692 EV_FREQUENT_CHECK;
3693
3694 ev_start (EV_A_ (W)w, ++cleanupcnt);
3695 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3696 cleanups [cleanupcnt - 1] = w;
3697
3698 /* cleanup watchers should never keep a refcount on the loop */
3699 ev_unref (EV_A);
3700 EV_FREQUENT_CHECK;
3701}
3702
3703void
3704ev_cleanup_stop (EV_P_ ev_cleanup *w)
3705{
3706 clear_pending (EV_A_ (W)w);
3707 if (expect_false (!ev_is_active (w)))
3708 return;
3709
3710 EV_FREQUENT_CHECK;
3711 ev_ref (EV_A);
3712
3713 {
3714 int active = ev_active (w);
3715
3716 cleanups [active - 1] = cleanups [--cleanupcnt];
3717 ev_active (cleanups [active - 1]) = active;
3718 }
3719
3720 ev_stop (EV_A_ (W)w);
3721
3722 EV_FREQUENT_CHECK;
3723}
3724#endif
3725
3726#if EV_ASYNC_ENABLE
3727void
3728ev_async_start (EV_P_ ev_async *w)
3729{
3730 if (expect_false (ev_is_active (w)))
3731 return;
3732
3733 w->sent = 0;
3531 3734
3532 evpipe_init (EV_A); 3735 evpipe_init (EV_A);
3533 3736
3534 EV_FREQUENT_CHECK; 3737 EV_FREQUENT_CHECK;
3535 3738
… …
3613{ 3816{
3614 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3817 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3615 3818
3616 if (expect_false (!once)) 3819 if (expect_false (!once))
3617 { 3820 {
3618 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3821 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3619 return; 3822 return;
3620 } 3823 }
3621 3824
3622 once->cb = cb; 3825 once->cb = cb;
3623 once->arg = arg; 3826 once->arg = arg;
… …
3710 if (types & EV_ASYNC) 3913 if (types & EV_ASYNC)
3711 for (i = asynccnt; i--; ) 3914 for (i = asynccnt; i--; )
3712 cb (EV_A_ EV_ASYNC, asyncs [i]); 3915 cb (EV_A_ EV_ASYNC, asyncs [i]);
3713#endif 3916#endif
3714 3917
3918#if EV_PREPARE_ENABLE
3715 if (types & EV_PREPARE) 3919 if (types & EV_PREPARE)
3716 for (i = preparecnt; i--; ) 3920 for (i = preparecnt; i--; )
3717#if EV_EMBED_ENABLE 3921# if EV_EMBED_ENABLE
3718 if (ev_cb (prepares [i]) != embed_prepare_cb) 3922 if (ev_cb (prepares [i]) != embed_prepare_cb)
3719#endif 3923# endif
3720 cb (EV_A_ EV_PREPARE, prepares [i]); 3924 cb (EV_A_ EV_PREPARE, prepares [i]);
3925#endif
3721 3926
3927#if EV_CHECK_ENABLE
3722 if (types & EV_CHECK) 3928 if (types & EV_CHECK)
3723 for (i = checkcnt; i--; ) 3929 for (i = checkcnt; i--; )
3724 cb (EV_A_ EV_CHECK, checks [i]); 3930 cb (EV_A_ EV_CHECK, checks [i]);
3931#endif
3725 3932
3933#if EV_SIGNAL_ENABLE
3726 if (types & EV_SIGNAL) 3934 if (types & EV_SIGNAL)
3727 for (i = 0; i < EV_NSIG - 1; ++i) 3935 for (i = 0; i < EV_NSIG - 1; ++i)
3728 for (wl = signals [i].head; wl; ) 3936 for (wl = signals [i].head; wl; )
3729 { 3937 {
3730 wn = wl->next; 3938 wn = wl->next;
3731 cb (EV_A_ EV_SIGNAL, wl); 3939 cb (EV_A_ EV_SIGNAL, wl);
3732 wl = wn; 3940 wl = wn;
3733 } 3941 }
3942#endif
3734 3943
3944#if EV_CHILD_ENABLE
3735 if (types & EV_CHILD) 3945 if (types & EV_CHILD)
3736 for (i = EV_PID_HASHSIZE; i--; ) 3946 for (i = (EV_PID_HASHSIZE); i--; )
3737 for (wl = childs [i]; wl; ) 3947 for (wl = childs [i]; wl; )
3738 { 3948 {
3739 wn = wl->next; 3949 wn = wl->next;
3740 cb (EV_A_ EV_CHILD, wl); 3950 cb (EV_A_ EV_CHILD, wl);
3741 wl = wn; 3951 wl = wn;
3742 } 3952 }
3953#endif
3743/* EV_STAT 0x00001000 /* stat data changed */ 3954/* EV_STAT 0x00001000 /* stat data changed */
3744/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3955/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3745} 3956}
3746#endif 3957#endif
3747 3958
3748#if EV_MULTIPLICITY 3959#if EV_MULTIPLICITY
3749 #include "ev_wrap.h" 3960 #include "ev_wrap.h"
3750#endif 3961#endif
3751 3962
3752#ifdef __cplusplus 3963EV_CPP(})
3753}
3754#endif
3755 3964

Diff Legend

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