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

Comparing libev/ev.c (file contents):
Revision 1.332 by root, Tue Mar 9 08:58:17 2010 UTC vs.
Revision 1.374 by root, Sat Feb 26 15:21:01 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 ();
… …
568} 660}
569 661
570static void * 662static void *
571ev_realloc_emul (void *ptr, long size) 663ev_realloc_emul (void *ptr, long size)
572{ 664{
665#if __GLIBC__
666 return realloc (ptr, size);
667#else
573 /* some systems, notably openbsd and darwin, fail to properly 668 /* some systems, notably openbsd and darwin, fail to properly
574 * implement realloc (x, 0) (as required by both ansi c-98 and 669 * implement realloc (x, 0) (as required by both ansi c-89 and
575 * the single unix specification, so work around them here. 670 * the single unix specification, so work around them here.
576 */ 671 */
672
577 if (size) 673 if (size)
578 return realloc (ptr, size); 674 return realloc (ptr, size);
579 675
580 free (ptr); 676 free (ptr);
581 return 0; 677 return 0;
678#endif
582} 679}
583 680
584static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 681static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
585 682
586void 683void
… …
595 ptr = alloc (ptr, size); 692 ptr = alloc (ptr, size);
596 693
597 if (!ptr && size) 694 if (!ptr && size)
598 { 695 {
599#if EV_AVOID_STDIO 696#if EV_AVOID_STDIO
600 ev_printerr ("libev: memory allocation failed, aborting.\n"); 697 ev_printerr ("(libev) memory allocation failed, aborting.\n");
601#else 698#else
602 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 699 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
603#endif 700#endif
604 abort (); 701 abort ();
605 } 702 }
606 703
607 return ptr; 704 return ptr;
… …
624 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 */
625 unsigned char unused; 722 unsigned char unused;
626#if EV_USE_EPOLL 723#if EV_USE_EPOLL
627 unsigned int egen; /* generation counter to counter epoll bugs */ 724 unsigned int egen; /* generation counter to counter epoll bugs */
628#endif 725#endif
629#if EV_SELECT_IS_WINSOCKET 726#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
630 SOCKET handle; 727 SOCKET handle;
728#endif
729#if EV_USE_IOCP
730 OVERLAPPED or, ow;
631#endif 731#endif
632} ANFD; 732} ANFD;
633 733
634/* stores the pending event set for a given watcher */ 734/* stores the pending event set for a given watcher */
635typedef struct 735typedef struct
… …
690 790
691 static int ev_default_loop_ptr; 791 static int ev_default_loop_ptr;
692 792
693#endif 793#endif
694 794
695#if EV_MINIMAL < 2 795#if EV_FEATURE_API
696# 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)
697# 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)
698# define EV_INVOKE_PENDING invoke_cb (EV_A) 798# define EV_INVOKE_PENDING invoke_cb (EV_A)
699#else 799#else
700# define EV_RELEASE_CB (void)0 800# define EV_RELEASE_CB (void)0
701# define EV_ACQUIRE_CB (void)0 801# define EV_ACQUIRE_CB (void)0
702# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 802# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
703#endif 803#endif
704 804
705#define EVUNLOOP_RECURSE 0x80 805#define EVBREAK_RECURSE 0x80
706 806
707/*****************************************************************************/ 807/*****************************************************************************/
708 808
709#ifndef EV_HAVE_EV_TIME 809#ifndef EV_HAVE_EV_TIME
710ev_tstamp 810ev_tstamp
… …
754 if (delay > 0.) 854 if (delay > 0.)
755 { 855 {
756#if EV_USE_NANOSLEEP 856#if EV_USE_NANOSLEEP
757 struct timespec ts; 857 struct timespec ts;
758 858
759 ts.tv_sec = (time_t)delay; 859 EV_TS_SET (ts, delay);
760 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
761
762 nanosleep (&ts, 0); 860 nanosleep (&ts, 0);
763#elif defined(_WIN32) 861#elif defined(_WIN32)
764 Sleep ((unsigned long)(delay * 1e3)); 862 Sleep ((unsigned long)(delay * 1e3));
765#else 863#else
766 struct timeval tv; 864 struct timeval tv;
767 865
768 tv.tv_sec = (time_t)delay;
769 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
770
771 /* 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 */
772 /* something not guaranteed by newer posix versions, but guaranteed */ 867 /* something not guaranteed by newer posix versions, but guaranteed */
773 /* by older ones */ 868 /* by older ones */
869 EV_TV_SET (tv, delay);
774 select (0, 0, 0, 0, &tv); 870 select (0, 0, 0, 0, &tv);
775#endif 871#endif
776 } 872 }
777} 873}
778 874
875inline_speed int
876ev_timeout_to_ms (ev_tstamp timeout)
877{
878 int ms = timeout * 1000. + .999999;
879
880 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
881}
882
779/*****************************************************************************/ 883/*****************************************************************************/
780 884
781#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 885#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
782 886
783/* find a suitable new size for the given array, */ 887/* find a suitable new size for the given array, */
784/* hopefully by rounding to a ncie-to-malloc size */ 888/* hopefully by rounding to a nice-to-malloc size */
785inline_size int 889inline_size int
786array_nextsize (int elem, int cur, int cnt) 890array_nextsize (int elem, int cur, int cnt)
787{ 891{
788 int ncur = cur + 1; 892 int ncur = cur + 1;
789 893
… …
885} 989}
886 990
887/*****************************************************************************/ 991/*****************************************************************************/
888 992
889inline_speed void 993inline_speed void
890fd_event_nc (EV_P_ int fd, int revents) 994fd_event_nocheck (EV_P_ int fd, int revents)
891{ 995{
892 ANFD *anfd = anfds + fd; 996 ANFD *anfd = anfds + fd;
893 ev_io *w; 997 ev_io *w;
894 998
895 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 999 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
907fd_event (EV_P_ int fd, int revents) 1011fd_event (EV_P_ int fd, int revents)
908{ 1012{
909 ANFD *anfd = anfds + fd; 1013 ANFD *anfd = anfds + fd;
910 1014
911 if (expect_true (!anfd->reify)) 1015 if (expect_true (!anfd->reify))
912 fd_event_nc (EV_A_ fd, revents); 1016 fd_event_nocheck (EV_A_ fd, revents);
913} 1017}
914 1018
915void 1019void
916ev_feed_fd_event (EV_P_ int fd, int revents) 1020ev_feed_fd_event (EV_P_ int fd, int revents)
917{ 1021{
918 if (fd >= 0 && fd < anfdmax) 1022 if (fd >= 0 && fd < anfdmax)
919 fd_event_nc (EV_A_ fd, revents); 1023 fd_event_nocheck (EV_A_ fd, revents);
920} 1024}
921 1025
922/* make sure the external fd watch events are in-sync */ 1026/* make sure the external fd watch events are in-sync */
923/* with the kernel/libev internal state */ 1027/* with the kernel/libev internal state */
924inline_size void 1028inline_size void
925fd_reify (EV_P) 1029fd_reify (EV_P)
926{ 1030{
927 int i; 1031 int i;
928 1032
1033#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1034 for (i = 0; i < fdchangecnt; ++i)
1035 {
1036 int fd = fdchanges [i];
1037 ANFD *anfd = anfds + fd;
1038
1039 if (anfd->reify & EV__IOFDSET && anfd->head)
1040 {
1041 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1042
1043 if (handle != anfd->handle)
1044 {
1045 unsigned long arg;
1046
1047 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1048
1049 /* handle changed, but fd didn't - we need to do it in two steps */
1050 backend_modify (EV_A_ fd, anfd->events, 0);
1051 anfd->events = 0;
1052 anfd->handle = handle;
1053 }
1054 }
1055 }
1056#endif
1057
929 for (i = 0; i < fdchangecnt; ++i) 1058 for (i = 0; i < fdchangecnt; ++i)
930 { 1059 {
931 int fd = fdchanges [i]; 1060 int fd = fdchanges [i];
932 ANFD *anfd = anfds + fd; 1061 ANFD *anfd = anfds + fd;
933 ev_io *w; 1062 ev_io *w;
934 1063
935 unsigned char events = 0; 1064 unsigned char o_events = anfd->events;
1065 unsigned char o_reify = anfd->reify;
936 1066
937 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1067 anfd->reify = 0;
938 events |= (unsigned char)w->events;
939 1068
940#if EV_SELECT_IS_WINSOCKET 1069 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
941 if (events)
942 { 1070 {
943 unsigned long arg; 1071 anfd->events = 0;
944 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 1072
945 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 1073 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1074 anfd->events |= (unsigned char)w->events;
1075
1076 if (o_events != anfd->events)
1077 o_reify = EV__IOFDSET; /* actually |= */
946 } 1078 }
947#endif
948 1079
949 { 1080 if (o_reify & EV__IOFDSET)
950 unsigned char o_events = anfd->events;
951 unsigned char o_reify = anfd->reify;
952
953 anfd->reify = 0;
954 anfd->events = events;
955
956 if (o_events != events || o_reify & EV__IOFDSET)
957 backend_modify (EV_A_ fd, o_events, events); 1081 backend_modify (EV_A_ fd, o_events, anfd->events);
958 }
959 } 1082 }
960 1083
961 fdchangecnt = 0; 1084 fdchangecnt = 0;
962} 1085}
963 1086
… …
987 ev_io_stop (EV_A_ w); 1110 ev_io_stop (EV_A_ w);
988 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1111 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
989 } 1112 }
990} 1113}
991 1114
992/* check whether the given fd is atcually valid, for error recovery */ 1115/* check whether the given fd is actually valid, for error recovery */
993inline_size int 1116inline_size int
994fd_valid (int fd) 1117fd_valid (int fd)
995{ 1118{
996#ifdef _WIN32 1119#ifdef _WIN32
997 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1120 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
… …
1039 anfds [fd].emask = 0; 1162 anfds [fd].emask = 0;
1040 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1163 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1041 } 1164 }
1042} 1165}
1043 1166
1167/* used to prepare libev internal fd's */
1168/* this is not fork-safe */
1169inline_speed void
1170fd_intern (int fd)
1171{
1172#ifdef _WIN32
1173 unsigned long arg = 1;
1174 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1175#else
1176 fcntl (fd, F_SETFD, FD_CLOEXEC);
1177 fcntl (fd, F_SETFL, O_NONBLOCK);
1178#endif
1179}
1180
1044/*****************************************************************************/ 1181/*****************************************************************************/
1045 1182
1046/* 1183/*
1047 * the heap functions want a real array index. array index 0 uis guaranteed to not 1184 * the heap functions want a real array index. array index 0 is guaranteed to not
1048 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1185 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1049 * the branching factor of the d-tree. 1186 * the branching factor of the d-tree.
1050 */ 1187 */
1051 1188
1052/* 1189/*
… …
1200 1337
1201static ANSIG signals [EV_NSIG - 1]; 1338static ANSIG signals [EV_NSIG - 1];
1202 1339
1203/*****************************************************************************/ 1340/*****************************************************************************/
1204 1341
1205/* used to prepare libev internal fd's */ 1342#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1206/* this is not fork-safe */
1207inline_speed void
1208fd_intern (int fd)
1209{
1210#ifdef _WIN32
1211 unsigned long arg = 1;
1212 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1213#else
1214 fcntl (fd, F_SETFD, FD_CLOEXEC);
1215 fcntl (fd, F_SETFL, O_NONBLOCK);
1216#endif
1217}
1218 1343
1219static void noinline 1344static void noinline
1220evpipe_init (EV_P) 1345evpipe_init (EV_P)
1221{ 1346{
1222 if (!ev_is_active (&pipe_w)) 1347 if (!ev_is_active (&pipe_w))
1223 { 1348 {
1224#if EV_USE_EVENTFD 1349# if EV_USE_EVENTFD
1225 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1350 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1226 if (evfd < 0 && errno == EINVAL) 1351 if (evfd < 0 && errno == EINVAL)
1227 evfd = eventfd (0, 0); 1352 evfd = eventfd (0, 0);
1228 1353
1229 if (evfd >= 0) 1354 if (evfd >= 0)
… …
1231 evpipe [0] = -1; 1356 evpipe [0] = -1;
1232 fd_intern (evfd); /* doing it twice doesn't hurt */ 1357 fd_intern (evfd); /* doing it twice doesn't hurt */
1233 ev_io_set (&pipe_w, evfd, EV_READ); 1358 ev_io_set (&pipe_w, evfd, EV_READ);
1234 } 1359 }
1235 else 1360 else
1236#endif 1361# endif
1237 { 1362 {
1238 while (pipe (evpipe)) 1363 while (pipe (evpipe))
1239 ev_syserr ("(libev) error creating signal/async pipe"); 1364 ev_syserr ("(libev) error creating signal/async pipe");
1240 1365
1241 fd_intern (evpipe [0]); 1366 fd_intern (evpipe [0]);
… …
1252evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1377evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1253{ 1378{
1254 if (!*flag) 1379 if (!*flag)
1255 { 1380 {
1256 int old_errno = errno; /* save errno because write might clobber it */ 1381 int old_errno = errno; /* save errno because write might clobber it */
1382 char dummy;
1257 1383
1258 *flag = 1; 1384 *flag = 1;
1259 1385
1260#if EV_USE_EVENTFD 1386#if EV_USE_EVENTFD
1261 if (evfd >= 0) 1387 if (evfd >= 0)
… …
1263 uint64_t counter = 1; 1389 uint64_t counter = 1;
1264 write (evfd, &counter, sizeof (uint64_t)); 1390 write (evfd, &counter, sizeof (uint64_t));
1265 } 1391 }
1266 else 1392 else
1267#endif 1393#endif
1394 /* win32 people keep sending patches that change this write() to send() */
1395 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1396 /* so when you think this write should be a send instead, please find out */
1397 /* where your send() is from - it's definitely not the microsoft send, and */
1398 /* tell me. thank you. */
1268 write (evpipe [1], &old_errno, 1); 1399 write (evpipe [1], &dummy, 1);
1269 1400
1270 errno = old_errno; 1401 errno = old_errno;
1271 } 1402 }
1272} 1403}
1273 1404
… …
1286 } 1417 }
1287 else 1418 else
1288#endif 1419#endif
1289 { 1420 {
1290 char dummy; 1421 char dummy;
1422 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1291 read (evpipe [0], &dummy, 1); 1423 read (evpipe [0], &dummy, 1);
1292 } 1424 }
1293 1425
1426#if EV_SIGNAL_ENABLE
1294 if (sig_pending) 1427 if (sig_pending)
1295 { 1428 {
1296 sig_pending = 0; 1429 sig_pending = 0;
1297 1430
1298 for (i = EV_NSIG - 1; i--; ) 1431 for (i = EV_NSIG - 1; i--; )
1299 if (expect_false (signals [i].pending)) 1432 if (expect_false (signals [i].pending))
1300 ev_feed_signal_event (EV_A_ i + 1); 1433 ev_feed_signal_event (EV_A_ i + 1);
1301 } 1434 }
1435#endif
1302 1436
1303#if EV_ASYNC_ENABLE 1437#if EV_ASYNC_ENABLE
1304 if (async_pending) 1438 if (async_pending)
1305 { 1439 {
1306 async_pending = 0; 1440 async_pending = 0;
… …
1315#endif 1449#endif
1316} 1450}
1317 1451
1318/*****************************************************************************/ 1452/*****************************************************************************/
1319 1453
1454void
1455ev_feed_signal (int signum)
1456{
1457#if EV_MULTIPLICITY
1458 EV_P = signals [signum - 1].loop;
1459
1460 if (!EV_A)
1461 return;
1462#endif
1463
1464 signals [signum - 1].pending = 1;
1465 evpipe_write (EV_A_ &sig_pending);
1466}
1467
1320static void 1468static void
1321ev_sighandler (int signum) 1469ev_sighandler (int signum)
1322{ 1470{
1323#if EV_MULTIPLICITY
1324 EV_P = signals [signum - 1].loop;
1325#endif
1326
1327#ifdef _WIN32 1471#ifdef _WIN32
1328 signal (signum, ev_sighandler); 1472 signal (signum, ev_sighandler);
1329#endif 1473#endif
1330 1474
1331 signals [signum - 1].pending = 1; 1475 ev_feed_signal (signum);
1332 evpipe_write (EV_A_ &sig_pending);
1333} 1476}
1334 1477
1335void noinline 1478void noinline
1336ev_feed_signal_event (EV_P_ int signum) 1479ev_feed_signal_event (EV_P_ int signum)
1337{ 1480{
… …
1374 break; 1517 break;
1375 } 1518 }
1376} 1519}
1377#endif 1520#endif
1378 1521
1522#endif
1523
1379/*****************************************************************************/ 1524/*****************************************************************************/
1380 1525
1526#if EV_CHILD_ENABLE
1381static WL childs [EV_PID_HASHSIZE]; 1527static WL childs [EV_PID_HASHSIZE];
1382
1383#ifndef _WIN32
1384 1528
1385static ev_signal childev; 1529static ev_signal childev;
1386 1530
1387#ifndef WIFCONTINUED 1531#ifndef WIFCONTINUED
1388# define WIFCONTINUED(status) 0 1532# define WIFCONTINUED(status) 0
… …
1393child_reap (EV_P_ int chain, int pid, int status) 1537child_reap (EV_P_ int chain, int pid, int status)
1394{ 1538{
1395 ev_child *w; 1539 ev_child *w;
1396 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1540 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1397 1541
1398 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1542 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1399 { 1543 {
1400 if ((w->pid == pid || !w->pid) 1544 if ((w->pid == pid || !w->pid)
1401 && (!traced || (w->flags & 1))) 1545 && (!traced || (w->flags & 1)))
1402 { 1546 {
1403 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1547 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1428 /* make sure we are called again until all children have been reaped */ 1572 /* make sure we are called again until all children have been reaped */
1429 /* we need to do it this way so that the callback gets called before we continue */ 1573 /* we need to do it this way so that the callback gets called before we continue */
1430 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1574 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1431 1575
1432 child_reap (EV_A_ pid, pid, status); 1576 child_reap (EV_A_ pid, pid, status);
1433 if (EV_PID_HASHSIZE > 1) 1577 if ((EV_PID_HASHSIZE) > 1)
1434 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1578 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1435} 1579}
1436 1580
1437#endif 1581#endif
1438 1582
1439/*****************************************************************************/ 1583/*****************************************************************************/
1440 1584
1585#if EV_USE_IOCP
1586# include "ev_iocp.c"
1587#endif
1441#if EV_USE_PORT 1588#if EV_USE_PORT
1442# include "ev_port.c" 1589# include "ev_port.c"
1443#endif 1590#endif
1444#if EV_USE_KQUEUE 1591#if EV_USE_KQUEUE
1445# include "ev_kqueue.c" 1592# include "ev_kqueue.c"
… …
1505#ifdef __APPLE__ 1652#ifdef __APPLE__
1506 /* only select works correctly on that "unix-certified" platform */ 1653 /* only select works correctly on that "unix-certified" platform */
1507 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1654 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1508 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1655 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1509#endif 1656#endif
1657#ifdef __FreeBSD__
1658 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1659#endif
1510 1660
1511 return flags; 1661 return flags;
1512} 1662}
1513 1663
1514unsigned int 1664unsigned int
1515ev_embeddable_backends (void) 1665ev_embeddable_backends (void)
1516{ 1666{
1517 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1667 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1518 1668
1519 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1669 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1520 /* please fix it and tell me how to detect the fix */ 1670 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1521 flags &= ~EVBACKEND_EPOLL; 1671 flags &= ~EVBACKEND_EPOLL;
1522 1672
1523 return flags; 1673 return flags;
1524} 1674}
1525 1675
1526unsigned int 1676unsigned int
1527ev_backend (EV_P) 1677ev_backend (EV_P)
1528{ 1678{
1529 return backend; 1679 return backend;
1530} 1680}
1531 1681
1532#if EV_MINIMAL < 2 1682#if EV_FEATURE_API
1533unsigned int 1683unsigned int
1534ev_loop_count (EV_P) 1684ev_iteration (EV_P)
1535{ 1685{
1536 return loop_count; 1686 return loop_count;
1537} 1687}
1538 1688
1539unsigned int 1689unsigned int
1540ev_loop_depth (EV_P) 1690ev_depth (EV_P)
1541{ 1691{
1542 return loop_depth; 1692 return loop_depth;
1543} 1693}
1544 1694
1545void 1695void
… …
1582static void noinline 1732static void noinline
1583loop_init (EV_P_ unsigned int flags) 1733loop_init (EV_P_ unsigned int flags)
1584{ 1734{
1585 if (!backend) 1735 if (!backend)
1586 { 1736 {
1737 origflags = flags;
1738
1587#if EV_USE_REALTIME 1739#if EV_USE_REALTIME
1588 if (!have_realtime) 1740 if (!have_realtime)
1589 { 1741 {
1590 struct timespec ts; 1742 struct timespec ts;
1591 1743
… …
1617 1769
1618 ev_rt_now = ev_time (); 1770 ev_rt_now = ev_time ();
1619 mn_now = get_clock (); 1771 mn_now = get_clock ();
1620 now_floor = mn_now; 1772 now_floor = mn_now;
1621 rtmn_diff = ev_rt_now - mn_now; 1773 rtmn_diff = ev_rt_now - mn_now;
1622#if EV_MINIMAL < 2 1774#if EV_FEATURE_API
1623 invoke_cb = ev_invoke_pending; 1775 invoke_cb = ev_invoke_pending;
1624#endif 1776#endif
1625 1777
1626 io_blocktime = 0.; 1778 io_blocktime = 0.;
1627 timeout_blocktime = 0.; 1779 timeout_blocktime = 0.;
… …
1636#endif 1788#endif
1637#if EV_USE_SIGNALFD 1789#if EV_USE_SIGNALFD
1638 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1790 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1639#endif 1791#endif
1640 1792
1641 if (!(flags & 0x0000ffffU)) 1793 if (!(flags & EVBACKEND_MASK))
1642 flags |= ev_recommended_backends (); 1794 flags |= ev_recommended_backends ();
1643 1795
1796#if EV_USE_IOCP
1797 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1798#endif
1644#if EV_USE_PORT 1799#if EV_USE_PORT
1645 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1800 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1646#endif 1801#endif
1647#if EV_USE_KQUEUE 1802#if EV_USE_KQUEUE
1648 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1803 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1657 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1812 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1658#endif 1813#endif
1659 1814
1660 ev_prepare_init (&pending_w, pendingcb); 1815 ev_prepare_init (&pending_w, pendingcb);
1661 1816
1817#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1662 ev_init (&pipe_w, pipecb); 1818 ev_init (&pipe_w, pipecb);
1663 ev_set_priority (&pipe_w, EV_MAXPRI); 1819 ev_set_priority (&pipe_w, EV_MAXPRI);
1820#endif
1664 } 1821 }
1665} 1822}
1666 1823
1667/* free up a loop structure */ 1824/* free up a loop structure */
1668static void noinline 1825void
1669loop_destroy (EV_P) 1826ev_loop_destroy (EV_P)
1670{ 1827{
1671 int i; 1828 int i;
1829
1830#if EV_MULTIPLICITY
1831 /* mimic free (0) */
1832 if (!EV_A)
1833 return;
1834#endif
1835
1836#if EV_CLEANUP_ENABLE
1837 /* queue cleanup watchers (and execute them) */
1838 if (expect_false (cleanupcnt))
1839 {
1840 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1841 EV_INVOKE_PENDING;
1842 }
1843#endif
1844
1845#if EV_CHILD_ENABLE
1846 if (ev_is_active (&childev))
1847 {
1848 ev_ref (EV_A); /* child watcher */
1849 ev_signal_stop (EV_A_ &childev);
1850 }
1851#endif
1672 1852
1673 if (ev_is_active (&pipe_w)) 1853 if (ev_is_active (&pipe_w))
1674 { 1854 {
1675 /*ev_ref (EV_A);*/ 1855 /*ev_ref (EV_A);*/
1676 /*ev_io_stop (EV_A_ &pipe_w);*/ 1856 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1698#endif 1878#endif
1699 1879
1700 if (backend_fd >= 0) 1880 if (backend_fd >= 0)
1701 close (backend_fd); 1881 close (backend_fd);
1702 1882
1883#if EV_USE_IOCP
1884 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1885#endif
1703#if EV_USE_PORT 1886#if EV_USE_PORT
1704 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1887 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1705#endif 1888#endif
1706#if EV_USE_KQUEUE 1889#if EV_USE_KQUEUE
1707 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1890 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1734 array_free (periodic, EMPTY); 1917 array_free (periodic, EMPTY);
1735#endif 1918#endif
1736#if EV_FORK_ENABLE 1919#if EV_FORK_ENABLE
1737 array_free (fork, EMPTY); 1920 array_free (fork, EMPTY);
1738#endif 1921#endif
1922#if EV_CLEANUP_ENABLE
1923 array_free (cleanup, EMPTY);
1924#endif
1739 array_free (prepare, EMPTY); 1925 array_free (prepare, EMPTY);
1740 array_free (check, EMPTY); 1926 array_free (check, EMPTY);
1741#if EV_ASYNC_ENABLE 1927#if EV_ASYNC_ENABLE
1742 array_free (async, EMPTY); 1928 array_free (async, EMPTY);
1743#endif 1929#endif
1744 1930
1745 backend = 0; 1931 backend = 0;
1932
1933#if EV_MULTIPLICITY
1934 if (ev_is_default_loop (EV_A))
1935#endif
1936 ev_default_loop_ptr = 0;
1937#if EV_MULTIPLICITY
1938 else
1939 ev_free (EV_A);
1940#endif
1746} 1941}
1747 1942
1748#if EV_USE_INOTIFY 1943#if EV_USE_INOTIFY
1749inline_size void infy_fork (EV_P); 1944inline_size void infy_fork (EV_P);
1750#endif 1945#endif
… …
1786 { 1981 {
1787 EV_WIN32_CLOSE_FD (evpipe [0]); 1982 EV_WIN32_CLOSE_FD (evpipe [0]);
1788 EV_WIN32_CLOSE_FD (evpipe [1]); 1983 EV_WIN32_CLOSE_FD (evpipe [1]);
1789 } 1984 }
1790 1985
1986#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1791 evpipe_init (EV_A); 1987 evpipe_init (EV_A);
1792 /* now iterate over everything, in case we missed something */ 1988 /* now iterate over everything, in case we missed something */
1793 pipecb (EV_A_ &pipe_w, EV_READ); 1989 pipecb (EV_A_ &pipe_w, EV_READ);
1990#endif
1794 } 1991 }
1795 1992
1796 postfork = 0; 1993 postfork = 0;
1797} 1994}
1798 1995
… …
1807 loop_init (EV_A_ flags); 2004 loop_init (EV_A_ flags);
1808 2005
1809 if (ev_backend (EV_A)) 2006 if (ev_backend (EV_A))
1810 return EV_A; 2007 return EV_A;
1811 2008
2009 ev_free (EV_A);
1812 return 0; 2010 return 0;
1813} 2011}
1814 2012
1815void
1816ev_loop_destroy (EV_P)
1817{
1818 loop_destroy (EV_A);
1819 ev_free (loop);
1820}
1821
1822void
1823ev_loop_fork (EV_P)
1824{
1825 postfork = 1; /* must be in line with ev_default_fork */
1826}
1827#endif /* multiplicity */ 2013#endif /* multiplicity */
1828 2014
1829#if EV_VERIFY 2015#if EV_VERIFY
1830static void noinline 2016static void noinline
1831verify_watcher (EV_P_ W w) 2017verify_watcher (EV_P_ W w)
… …
1860 verify_watcher (EV_A_ ws [cnt]); 2046 verify_watcher (EV_A_ ws [cnt]);
1861 } 2047 }
1862} 2048}
1863#endif 2049#endif
1864 2050
1865#if EV_MINIMAL < 2 2051#if EV_FEATURE_API
1866void 2052void
1867ev_loop_verify (EV_P) 2053ev_verify (EV_P)
1868{ 2054{
1869#if EV_VERIFY 2055#if EV_VERIFY
1870 int i; 2056 int i;
1871 WL w; 2057 WL w;
1872 2058
… …
1906#if EV_FORK_ENABLE 2092#if EV_FORK_ENABLE
1907 assert (forkmax >= forkcnt); 2093 assert (forkmax >= forkcnt);
1908 array_verify (EV_A_ (W *)forks, forkcnt); 2094 array_verify (EV_A_ (W *)forks, forkcnt);
1909#endif 2095#endif
1910 2096
2097#if EV_CLEANUP_ENABLE
2098 assert (cleanupmax >= cleanupcnt);
2099 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2100#endif
2101
1911#if EV_ASYNC_ENABLE 2102#if EV_ASYNC_ENABLE
1912 assert (asyncmax >= asynccnt); 2103 assert (asyncmax >= asynccnt);
1913 array_verify (EV_A_ (W *)asyncs, asynccnt); 2104 array_verify (EV_A_ (W *)asyncs, asynccnt);
1914#endif 2105#endif
1915 2106
2107#if EV_PREPARE_ENABLE
1916 assert (preparemax >= preparecnt); 2108 assert (preparemax >= preparecnt);
1917 array_verify (EV_A_ (W *)prepares, preparecnt); 2109 array_verify (EV_A_ (W *)prepares, preparecnt);
2110#endif
1918 2111
2112#if EV_CHECK_ENABLE
1919 assert (checkmax >= checkcnt); 2113 assert (checkmax >= checkcnt);
1920 array_verify (EV_A_ (W *)checks, checkcnt); 2114 array_verify (EV_A_ (W *)checks, checkcnt);
2115#endif
1921 2116
1922# if 0 2117# if 0
2118#if EV_CHILD_ENABLE
1923 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2119 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1924 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 2120 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2121#endif
1925# endif 2122# endif
1926#endif 2123#endif
1927} 2124}
1928#endif 2125#endif
1929 2126
1930#if EV_MULTIPLICITY 2127#if EV_MULTIPLICITY
1931struct ev_loop * 2128struct ev_loop *
1932ev_default_loop_init (unsigned int flags)
1933#else 2129#else
1934int 2130int
2131#endif
1935ev_default_loop (unsigned int flags) 2132ev_default_loop (unsigned int flags)
1936#endif
1937{ 2133{
1938 if (!ev_default_loop_ptr) 2134 if (!ev_default_loop_ptr)
1939 { 2135 {
1940#if EV_MULTIPLICITY 2136#if EV_MULTIPLICITY
1941 EV_P = ev_default_loop_ptr = &default_loop_struct; 2137 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1945 2141
1946 loop_init (EV_A_ flags); 2142 loop_init (EV_A_ flags);
1947 2143
1948 if (ev_backend (EV_A)) 2144 if (ev_backend (EV_A))
1949 { 2145 {
1950#ifndef _WIN32 2146#if EV_CHILD_ENABLE
1951 ev_signal_init (&childev, childcb, SIGCHLD); 2147 ev_signal_init (&childev, childcb, SIGCHLD);
1952 ev_set_priority (&childev, EV_MAXPRI); 2148 ev_set_priority (&childev, EV_MAXPRI);
1953 ev_signal_start (EV_A_ &childev); 2149 ev_signal_start (EV_A_ &childev);
1954 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2150 ev_unref (EV_A); /* child watcher should not keep loop alive */
1955#endif 2151#endif
… …
1960 2156
1961 return ev_default_loop_ptr; 2157 return ev_default_loop_ptr;
1962} 2158}
1963 2159
1964void 2160void
1965ev_default_destroy (void) 2161ev_loop_fork (EV_P)
1966{ 2162{
1967#if EV_MULTIPLICITY
1968 EV_P = ev_default_loop_ptr;
1969#endif
1970
1971 ev_default_loop_ptr = 0;
1972
1973#ifndef _WIN32
1974 ev_ref (EV_A); /* child watcher */
1975 ev_signal_stop (EV_A_ &childev);
1976#endif
1977
1978 loop_destroy (EV_A);
1979}
1980
1981void
1982ev_default_fork (void)
1983{
1984#if EV_MULTIPLICITY
1985 EV_P = ev_default_loop_ptr;
1986#endif
1987
1988 postfork = 1; /* must be in line with ev_loop_fork */ 2163 postfork = 1; /* must be in line with ev_default_fork */
1989} 2164}
1990 2165
1991/*****************************************************************************/ 2166/*****************************************************************************/
1992 2167
1993void 2168void
… …
2015 2190
2016 for (pri = NUMPRI; pri--; ) 2191 for (pri = NUMPRI; pri--; )
2017 while (pendingcnt [pri]) 2192 while (pendingcnt [pri])
2018 { 2193 {
2019 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2194 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2020
2021 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2022 /* ^ this is no longer true, as pending_w could be here */
2023 2195
2024 p->w->pending = 0; 2196 p->w->pending = 0;
2025 EV_CB_INVOKE (p->w, p->events); 2197 EV_CB_INVOKE (p->w, p->events);
2026 EV_FREQUENT_CHECK; 2198 EV_FREQUENT_CHECK;
2027 } 2199 }
… …
2084 EV_FREQUENT_CHECK; 2256 EV_FREQUENT_CHECK;
2085 feed_reverse (EV_A_ (W)w); 2257 feed_reverse (EV_A_ (W)w);
2086 } 2258 }
2087 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2259 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2088 2260
2089 feed_reverse_done (EV_A_ EV_TIMEOUT); 2261 feed_reverse_done (EV_A_ EV_TIMER);
2090 } 2262 }
2091} 2263}
2092 2264
2093#if EV_PERIODIC_ENABLE 2265#if EV_PERIODIC_ENABLE
2266
2267static void noinline
2268periodic_recalc (EV_P_ ev_periodic *w)
2269{
2270 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2271 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2272
2273 /* the above almost always errs on the low side */
2274 while (at <= ev_rt_now)
2275 {
2276 ev_tstamp nat = at + w->interval;
2277
2278 /* when resolution fails us, we use ev_rt_now */
2279 if (expect_false (nat == at))
2280 {
2281 at = ev_rt_now;
2282 break;
2283 }
2284
2285 at = nat;
2286 }
2287
2288 ev_at (w) = at;
2289}
2290
2094/* make periodics pending */ 2291/* make periodics pending */
2095inline_size void 2292inline_size void
2096periodics_reify (EV_P) 2293periodics_reify (EV_P)
2097{ 2294{
2098 EV_FREQUENT_CHECK; 2295 EV_FREQUENT_CHECK;
… …
2117 ANHE_at_cache (periodics [HEAP0]); 2314 ANHE_at_cache (periodics [HEAP0]);
2118 downheap (periodics, periodiccnt, HEAP0); 2315 downheap (periodics, periodiccnt, HEAP0);
2119 } 2316 }
2120 else if (w->interval) 2317 else if (w->interval)
2121 { 2318 {
2122 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2319 periodic_recalc (EV_A_ w);
2123 /* if next trigger time is not sufficiently in the future, put it there */
2124 /* this might happen because of floating point inexactness */
2125 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2126 {
2127 ev_at (w) += w->interval;
2128
2129 /* if interval is unreasonably low we might still have a time in the past */
2130 /* so correct this. this will make the periodic very inexact, but the user */
2131 /* has effectively asked to get triggered more often than possible */
2132 if (ev_at (w) < ev_rt_now)
2133 ev_at (w) = ev_rt_now;
2134 }
2135
2136 ANHE_at_cache (periodics [HEAP0]); 2320 ANHE_at_cache (periodics [HEAP0]);
2137 downheap (periodics, periodiccnt, HEAP0); 2321 downheap (periodics, periodiccnt, HEAP0);
2138 } 2322 }
2139 else 2323 else
2140 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2324 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2147 feed_reverse_done (EV_A_ EV_PERIODIC); 2331 feed_reverse_done (EV_A_ EV_PERIODIC);
2148 } 2332 }
2149} 2333}
2150 2334
2151/* simply recalculate all periodics */ 2335/* simply recalculate all periodics */
2152/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2336/* TODO: maybe ensure that at least one event happens when jumping forward? */
2153static void noinline 2337static void noinline
2154periodics_reschedule (EV_P) 2338periodics_reschedule (EV_P)
2155{ 2339{
2156 int i; 2340 int i;
2157 2341
… …
2161 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2345 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2162 2346
2163 if (w->reschedule_cb) 2347 if (w->reschedule_cb)
2164 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2348 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2165 else if (w->interval) 2349 else if (w->interval)
2166 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2350 periodic_recalc (EV_A_ w);
2167 2351
2168 ANHE_at_cache (periodics [i]); 2352 ANHE_at_cache (periodics [i]);
2169 } 2353 }
2170 2354
2171 reheap (periodics, periodiccnt); 2355 reheap (periodics, periodiccnt);
… …
2218 * doesn't hurt either as we only do this on time-jumps or 2402 * doesn't hurt either as we only do this on time-jumps or
2219 * in the unlikely event of having been preempted here. 2403 * in the unlikely event of having been preempted here.
2220 */ 2404 */
2221 for (i = 4; --i; ) 2405 for (i = 4; --i; )
2222 { 2406 {
2407 ev_tstamp diff;
2223 rtmn_diff = ev_rt_now - mn_now; 2408 rtmn_diff = ev_rt_now - mn_now;
2224 2409
2410 diff = odiff - rtmn_diff;
2411
2225 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2412 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2226 return; /* all is well */ 2413 return; /* all is well */
2227 2414
2228 ev_rt_now = ev_time (); 2415 ev_rt_now = ev_time ();
2229 mn_now = get_clock (); 2416 mn_now = get_clock ();
2230 now_floor = mn_now; 2417 now_floor = mn_now;
… …
2253 mn_now = ev_rt_now; 2440 mn_now = ev_rt_now;
2254 } 2441 }
2255} 2442}
2256 2443
2257void 2444void
2258ev_loop (EV_P_ int flags) 2445ev_run (EV_P_ int flags)
2259{ 2446{
2260#if EV_MINIMAL < 2 2447#if EV_FEATURE_API
2261 ++loop_depth; 2448 ++loop_depth;
2262#endif 2449#endif
2263 2450
2264 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2451 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2265 2452
2266 loop_done = EVUNLOOP_CANCEL; 2453 loop_done = EVBREAK_CANCEL;
2267 2454
2268 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2455 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2269 2456
2270 do 2457 do
2271 { 2458 {
2272#if EV_VERIFY >= 2 2459#if EV_VERIFY >= 2
2273 ev_loop_verify (EV_A); 2460 ev_verify (EV_A);
2274#endif 2461#endif
2275 2462
2276#ifndef _WIN32 2463#ifndef _WIN32
2277 if (expect_false (curpid)) /* penalise the forking check even more */ 2464 if (expect_false (curpid)) /* penalise the forking check even more */
2278 if (expect_false (getpid () != curpid)) 2465 if (expect_false (getpid () != curpid))
… …
2290 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2477 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2291 EV_INVOKE_PENDING; 2478 EV_INVOKE_PENDING;
2292 } 2479 }
2293#endif 2480#endif
2294 2481
2482#if EV_PREPARE_ENABLE
2295 /* queue prepare watchers (and execute them) */ 2483 /* queue prepare watchers (and execute them) */
2296 if (expect_false (preparecnt)) 2484 if (expect_false (preparecnt))
2297 { 2485 {
2298 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2486 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2299 EV_INVOKE_PENDING; 2487 EV_INVOKE_PENDING;
2300 } 2488 }
2489#endif
2301 2490
2302 if (expect_false (loop_done)) 2491 if (expect_false (loop_done))
2303 break; 2492 break;
2304 2493
2305 /* we might have forked, so reify kernel state if necessary */ 2494 /* we might have forked, so reify kernel state if necessary */
… …
2312 /* calculate blocking time */ 2501 /* calculate blocking time */
2313 { 2502 {
2314 ev_tstamp waittime = 0.; 2503 ev_tstamp waittime = 0.;
2315 ev_tstamp sleeptime = 0.; 2504 ev_tstamp sleeptime = 0.;
2316 2505
2506 /* remember old timestamp for io_blocktime calculation */
2507 ev_tstamp prev_mn_now = mn_now;
2508
2509 /* update time to cancel out callback processing overhead */
2510 time_update (EV_A_ 1e100);
2511
2317 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2512 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2318 { 2513 {
2319 /* remember old timestamp for io_blocktime calculation */
2320 ev_tstamp prev_mn_now = mn_now;
2321
2322 /* update time to cancel out callback processing overhead */
2323 time_update (EV_A_ 1e100);
2324
2325 waittime = MAX_BLOCKTIME; 2514 waittime = MAX_BLOCKTIME;
2326 2515
2327 if (timercnt) 2516 if (timercnt)
2328 { 2517 {
2329 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2518 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2356 waittime -= sleeptime; 2545 waittime -= sleeptime;
2357 } 2546 }
2358 } 2547 }
2359 } 2548 }
2360 2549
2361#if EV_MINIMAL < 2 2550#if EV_FEATURE_API
2362 ++loop_count; 2551 ++loop_count;
2363#endif 2552#endif
2364 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2553 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2365 backend_poll (EV_A_ waittime); 2554 backend_poll (EV_A_ waittime);
2366 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2555 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2367 2556
2368 /* update ev_rt_now, do magic */ 2557 /* update ev_rt_now, do magic */
2369 time_update (EV_A_ waittime + sleeptime); 2558 time_update (EV_A_ waittime + sleeptime);
2370 } 2559 }
2371 2560
… …
2378#if EV_IDLE_ENABLE 2567#if EV_IDLE_ENABLE
2379 /* queue idle watchers unless other events are pending */ 2568 /* queue idle watchers unless other events are pending */
2380 idle_reify (EV_A); 2569 idle_reify (EV_A);
2381#endif 2570#endif
2382 2571
2572#if EV_CHECK_ENABLE
2383 /* queue check watchers, to be executed first */ 2573 /* queue check watchers, to be executed first */
2384 if (expect_false (checkcnt)) 2574 if (expect_false (checkcnt))
2385 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2575 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2576#endif
2386 2577
2387 EV_INVOKE_PENDING; 2578 EV_INVOKE_PENDING;
2388 } 2579 }
2389 while (expect_true ( 2580 while (expect_true (
2390 activecnt 2581 activecnt
2391 && !loop_done 2582 && !loop_done
2392 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2583 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2393 )); 2584 ));
2394 2585
2395 if (loop_done == EVUNLOOP_ONE) 2586 if (loop_done == EVBREAK_ONE)
2396 loop_done = EVUNLOOP_CANCEL; 2587 loop_done = EVBREAK_CANCEL;
2397 2588
2398#if EV_MINIMAL < 2 2589#if EV_FEATURE_API
2399 --loop_depth; 2590 --loop_depth;
2400#endif 2591#endif
2401} 2592}
2402 2593
2403void 2594void
2404ev_unloop (EV_P_ int how) 2595ev_break (EV_P_ int how)
2405{ 2596{
2406 loop_done = how; 2597 loop_done = how;
2407} 2598}
2408 2599
2409void 2600void
… …
2557 EV_FREQUENT_CHECK; 2748 EV_FREQUENT_CHECK;
2558 2749
2559 wlist_del (&anfds[w->fd].head, (WL)w); 2750 wlist_del (&anfds[w->fd].head, (WL)w);
2560 ev_stop (EV_A_ (W)w); 2751 ev_stop (EV_A_ (W)w);
2561 2752
2562 fd_change (EV_A_ w->fd, 1); 2753 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2563 2754
2564 EV_FREQUENT_CHECK; 2755 EV_FREQUENT_CHECK;
2565} 2756}
2566 2757
2567void noinline 2758void noinline
… …
2659 if (w->reschedule_cb) 2850 if (w->reschedule_cb)
2660 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2851 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2661 else if (w->interval) 2852 else if (w->interval)
2662 { 2853 {
2663 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2854 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2664 /* this formula differs from the one in periodic_reify because we do not always round up */ 2855 periodic_recalc (EV_A_ w);
2665 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2666 } 2856 }
2667 else 2857 else
2668 ev_at (w) = w->offset; 2858 ev_at (w) = w->offset;
2669 2859
2670 EV_FREQUENT_CHECK; 2860 EV_FREQUENT_CHECK;
… …
2719#endif 2909#endif
2720 2910
2721#ifndef SA_RESTART 2911#ifndef SA_RESTART
2722# define SA_RESTART 0 2912# define SA_RESTART 0
2723#endif 2913#endif
2914
2915#if EV_SIGNAL_ENABLE
2724 2916
2725void noinline 2917void noinline
2726ev_signal_start (EV_P_ ev_signal *w) 2918ev_signal_start (EV_P_ ev_signal *w)
2727{ 2919{
2728 if (expect_false (ev_is_active (w))) 2920 if (expect_false (ev_is_active (w)))
… …
2789 sa.sa_handler = ev_sighandler; 2981 sa.sa_handler = ev_sighandler;
2790 sigfillset (&sa.sa_mask); 2982 sigfillset (&sa.sa_mask);
2791 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2983 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2792 sigaction (w->signum, &sa, 0); 2984 sigaction (w->signum, &sa, 0);
2793 2985
2986 if (origflags & EVFLAG_NOSIGMASK)
2987 {
2794 sigemptyset (&sa.sa_mask); 2988 sigemptyset (&sa.sa_mask);
2795 sigaddset (&sa.sa_mask, w->signum); 2989 sigaddset (&sa.sa_mask, w->signum);
2796 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2990 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2991 }
2797#endif 2992#endif
2798 } 2993 }
2799 2994
2800 EV_FREQUENT_CHECK; 2995 EV_FREQUENT_CHECK;
2801} 2996}
… …
2835 } 3030 }
2836 3031
2837 EV_FREQUENT_CHECK; 3032 EV_FREQUENT_CHECK;
2838} 3033}
2839 3034
3035#endif
3036
3037#if EV_CHILD_ENABLE
3038
2840void 3039void
2841ev_child_start (EV_P_ ev_child *w) 3040ev_child_start (EV_P_ ev_child *w)
2842{ 3041{
2843#if EV_MULTIPLICITY 3042#if EV_MULTIPLICITY
2844 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 3043 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2847 return; 3046 return;
2848 3047
2849 EV_FREQUENT_CHECK; 3048 EV_FREQUENT_CHECK;
2850 3049
2851 ev_start (EV_A_ (W)w, 1); 3050 ev_start (EV_A_ (W)w, 1);
2852 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3051 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2853 3052
2854 EV_FREQUENT_CHECK; 3053 EV_FREQUENT_CHECK;
2855} 3054}
2856 3055
2857void 3056void
… …
2861 if (expect_false (!ev_is_active (w))) 3060 if (expect_false (!ev_is_active (w)))
2862 return; 3061 return;
2863 3062
2864 EV_FREQUENT_CHECK; 3063 EV_FREQUENT_CHECK;
2865 3064
2866 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3065 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2867 ev_stop (EV_A_ (W)w); 3066 ev_stop (EV_A_ (W)w);
2868 3067
2869 EV_FREQUENT_CHECK; 3068 EV_FREQUENT_CHECK;
2870} 3069}
3070
3071#endif
2871 3072
2872#if EV_STAT_ENABLE 3073#if EV_STAT_ENABLE
2873 3074
2874# ifdef _WIN32 3075# ifdef _WIN32
2875# undef lstat 3076# undef lstat
… …
2936 if (!pend || pend == path) 3137 if (!pend || pend == path)
2937 break; 3138 break;
2938 3139
2939 *pend = 0; 3140 *pend = 0;
2940 w->wd = inotify_add_watch (fs_fd, path, mask); 3141 w->wd = inotify_add_watch (fs_fd, path, mask);
2941 } 3142 }
2942 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3143 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2943 } 3144 }
2944 } 3145 }
2945 3146
2946 if (w->wd >= 0) 3147 if (w->wd >= 0)
2947 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3148 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2948 3149
2949 /* now re-arm timer, if required */ 3150 /* now re-arm timer, if required */
2950 if (ev_is_active (&w->timer)) ev_ref (EV_A); 3151 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2951 ev_timer_again (EV_A_ &w->timer); 3152 ev_timer_again (EV_A_ &w->timer);
2952 if (ev_is_active (&w->timer)) ev_unref (EV_A); 3153 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2960 3161
2961 if (wd < 0) 3162 if (wd < 0)
2962 return; 3163 return;
2963 3164
2964 w->wd = -2; 3165 w->wd = -2;
2965 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3166 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2966 wlist_del (&fs_hash [slot].head, (WL)w); 3167 wlist_del (&fs_hash [slot].head, (WL)w);
2967 3168
2968 /* remove this watcher, if others are watching it, they will rearm */ 3169 /* remove this watcher, if others are watching it, they will rearm */
2969 inotify_rm_watch (fs_fd, wd); 3170 inotify_rm_watch (fs_fd, wd);
2970} 3171}
… …
2972static void noinline 3173static void noinline
2973infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3174infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2974{ 3175{
2975 if (slot < 0) 3176 if (slot < 0)
2976 /* overflow, need to check for all hash slots */ 3177 /* overflow, need to check for all hash slots */
2977 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3178 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2978 infy_wd (EV_A_ slot, wd, ev); 3179 infy_wd (EV_A_ slot, wd, ev);
2979 else 3180 else
2980 { 3181 {
2981 WL w_; 3182 WL w_;
2982 3183
2983 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3184 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2984 { 3185 {
2985 ev_stat *w = (ev_stat *)w_; 3186 ev_stat *w = (ev_stat *)w_;
2986 w_ = w_->next; /* lets us remove this watcher and all before it */ 3187 w_ = w_->next; /* lets us remove this watcher and all before it */
2987 3188
2988 if (w->wd == wd || wd == -1) 3189 if (w->wd == wd || wd == -1)
2989 { 3190 {
2990 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3191 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2991 { 3192 {
2992 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3193 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2993 w->wd = -1; 3194 w->wd = -1;
2994 infy_add (EV_A_ w); /* re-add, no matter what */ 3195 infy_add (EV_A_ w); /* re-add, no matter what */
2995 } 3196 }
2996 3197
2997 stat_timer_cb (EV_A_ &w->timer, 0); 3198 stat_timer_cb (EV_A_ &w->timer, 0);
… …
3011 { 3212 {
3012 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3213 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3013 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3214 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3014 ofs += sizeof (struct inotify_event) + ev->len; 3215 ofs += sizeof (struct inotify_event) + ev->len;
3015 } 3216 }
3016}
3017
3018inline_size unsigned int
3019ev_linux_version (void)
3020{
3021 struct utsname buf;
3022 unsigned int v;
3023 int i;
3024 char *p = buf.release;
3025
3026 if (uname (&buf))
3027 return 0;
3028
3029 for (i = 3+1; --i; )
3030 {
3031 unsigned int c = 0;
3032
3033 for (;;)
3034 {
3035 if (*p >= '0' && *p <= '9')
3036 c = c * 10 + *p++ - '0';
3037 else
3038 {
3039 p += *p == '.';
3040 break;
3041 }
3042 }
3043
3044 v = (v << 8) | c;
3045 }
3046
3047 return v;
3048} 3217}
3049 3218
3050inline_size void 3219inline_size void
3051ev_check_2625 (EV_P) 3220ev_check_2625 (EV_P)
3052{ 3221{
… …
3111 ev_io_set (&fs_w, fs_fd, EV_READ); 3280 ev_io_set (&fs_w, fs_fd, EV_READ);
3112 ev_io_start (EV_A_ &fs_w); 3281 ev_io_start (EV_A_ &fs_w);
3113 ev_unref (EV_A); 3282 ev_unref (EV_A);
3114 } 3283 }
3115 3284
3116 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3285 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3117 { 3286 {
3118 WL w_ = fs_hash [slot].head; 3287 WL w_ = fs_hash [slot].head;
3119 fs_hash [slot].head = 0; 3288 fs_hash [slot].head = 0;
3120 3289
3121 while (w_) 3290 while (w_)
… …
3296 3465
3297 EV_FREQUENT_CHECK; 3466 EV_FREQUENT_CHECK;
3298} 3467}
3299#endif 3468#endif
3300 3469
3470#if EV_PREPARE_ENABLE
3301void 3471void
3302ev_prepare_start (EV_P_ ev_prepare *w) 3472ev_prepare_start (EV_P_ ev_prepare *w)
3303{ 3473{
3304 if (expect_false (ev_is_active (w))) 3474 if (expect_false (ev_is_active (w)))
3305 return; 3475 return;
… …
3331 3501
3332 ev_stop (EV_A_ (W)w); 3502 ev_stop (EV_A_ (W)w);
3333 3503
3334 EV_FREQUENT_CHECK; 3504 EV_FREQUENT_CHECK;
3335} 3505}
3506#endif
3336 3507
3508#if EV_CHECK_ENABLE
3337void 3509void
3338ev_check_start (EV_P_ ev_check *w) 3510ev_check_start (EV_P_ ev_check *w)
3339{ 3511{
3340 if (expect_false (ev_is_active (w))) 3512 if (expect_false (ev_is_active (w)))
3341 return; 3513 return;
… …
3367 3539
3368 ev_stop (EV_A_ (W)w); 3540 ev_stop (EV_A_ (W)w);
3369 3541
3370 EV_FREQUENT_CHECK; 3542 EV_FREQUENT_CHECK;
3371} 3543}
3544#endif
3372 3545
3373#if EV_EMBED_ENABLE 3546#if EV_EMBED_ENABLE
3374void noinline 3547void noinline
3375ev_embed_sweep (EV_P_ ev_embed *w) 3548ev_embed_sweep (EV_P_ ev_embed *w)
3376{ 3549{
3377 ev_loop (w->other, EVLOOP_NONBLOCK); 3550 ev_run (w->other, EVRUN_NOWAIT);
3378} 3551}
3379 3552
3380static void 3553static void
3381embed_io_cb (EV_P_ ev_io *io, int revents) 3554embed_io_cb (EV_P_ ev_io *io, int revents)
3382{ 3555{
3383 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3556 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3384 3557
3385 if (ev_cb (w)) 3558 if (ev_cb (w))
3386 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3559 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3387 else 3560 else
3388 ev_loop (w->other, EVLOOP_NONBLOCK); 3561 ev_run (w->other, EVRUN_NOWAIT);
3389} 3562}
3390 3563
3391static void 3564static void
3392embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3565embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3393{ 3566{
… …
3397 EV_P = w->other; 3570 EV_P = w->other;
3398 3571
3399 while (fdchangecnt) 3572 while (fdchangecnt)
3400 { 3573 {
3401 fd_reify (EV_A); 3574 fd_reify (EV_A);
3402 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3575 ev_run (EV_A_ EVRUN_NOWAIT);
3403 } 3576 }
3404 } 3577 }
3405} 3578}
3406 3579
3407static void 3580static void
… …
3413 3586
3414 { 3587 {
3415 EV_P = w->other; 3588 EV_P = w->other;
3416 3589
3417 ev_loop_fork (EV_A); 3590 ev_loop_fork (EV_A);
3418 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3591 ev_run (EV_A_ EVRUN_NOWAIT);
3419 } 3592 }
3420 3593
3421 ev_embed_start (EV_A_ w); 3594 ev_embed_start (EV_A_ w);
3422} 3595}
3423 3596
… …
3515 3688
3516 EV_FREQUENT_CHECK; 3689 EV_FREQUENT_CHECK;
3517} 3690}
3518#endif 3691#endif
3519 3692
3520#if EV_ASYNC_ENABLE 3693#if EV_CLEANUP_ENABLE
3521void 3694void
3522ev_async_start (EV_P_ ev_async *w) 3695ev_cleanup_start (EV_P_ ev_cleanup *w)
3523{ 3696{
3524 if (expect_false (ev_is_active (w))) 3697 if (expect_false (ev_is_active (w)))
3525 return; 3698 return;
3699
3700 EV_FREQUENT_CHECK;
3701
3702 ev_start (EV_A_ (W)w, ++cleanupcnt);
3703 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3704 cleanups [cleanupcnt - 1] = w;
3705
3706 /* cleanup watchers should never keep a refcount on the loop */
3707 ev_unref (EV_A);
3708 EV_FREQUENT_CHECK;
3709}
3710
3711void
3712ev_cleanup_stop (EV_P_ ev_cleanup *w)
3713{
3714 clear_pending (EV_A_ (W)w);
3715 if (expect_false (!ev_is_active (w)))
3716 return;
3717
3718 EV_FREQUENT_CHECK;
3719 ev_ref (EV_A);
3720
3721 {
3722 int active = ev_active (w);
3723
3724 cleanups [active - 1] = cleanups [--cleanupcnt];
3725 ev_active (cleanups [active - 1]) = active;
3726 }
3727
3728 ev_stop (EV_A_ (W)w);
3729
3730 EV_FREQUENT_CHECK;
3731}
3732#endif
3733
3734#if EV_ASYNC_ENABLE
3735void
3736ev_async_start (EV_P_ ev_async *w)
3737{
3738 if (expect_false (ev_is_active (w)))
3739 return;
3740
3741 w->sent = 0;
3526 3742
3527 evpipe_init (EV_A); 3743 evpipe_init (EV_A);
3528 3744
3529 EV_FREQUENT_CHECK; 3745 EV_FREQUENT_CHECK;
3530 3746
… …
3608{ 3824{
3609 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3825 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3610 3826
3611 if (expect_false (!once)) 3827 if (expect_false (!once))
3612 { 3828 {
3613 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3829 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3614 return; 3830 return;
3615 } 3831 }
3616 3832
3617 once->cb = cb; 3833 once->cb = cb;
3618 once->arg = arg; 3834 once->arg = arg;
… …
3705 if (types & EV_ASYNC) 3921 if (types & EV_ASYNC)
3706 for (i = asynccnt; i--; ) 3922 for (i = asynccnt; i--; )
3707 cb (EV_A_ EV_ASYNC, asyncs [i]); 3923 cb (EV_A_ EV_ASYNC, asyncs [i]);
3708#endif 3924#endif
3709 3925
3926#if EV_PREPARE_ENABLE
3710 if (types & EV_PREPARE) 3927 if (types & EV_PREPARE)
3711 for (i = preparecnt; i--; ) 3928 for (i = preparecnt; i--; )
3712#if EV_EMBED_ENABLE 3929# if EV_EMBED_ENABLE
3713 if (ev_cb (prepares [i]) != embed_prepare_cb) 3930 if (ev_cb (prepares [i]) != embed_prepare_cb)
3714#endif 3931# endif
3715 cb (EV_A_ EV_PREPARE, prepares [i]); 3932 cb (EV_A_ EV_PREPARE, prepares [i]);
3933#endif
3716 3934
3935#if EV_CHECK_ENABLE
3717 if (types & EV_CHECK) 3936 if (types & EV_CHECK)
3718 for (i = checkcnt; i--; ) 3937 for (i = checkcnt; i--; )
3719 cb (EV_A_ EV_CHECK, checks [i]); 3938 cb (EV_A_ EV_CHECK, checks [i]);
3939#endif
3720 3940
3941#if EV_SIGNAL_ENABLE
3721 if (types & EV_SIGNAL) 3942 if (types & EV_SIGNAL)
3722 for (i = 0; i < EV_NSIG - 1; ++i) 3943 for (i = 0; i < EV_NSIG - 1; ++i)
3723 for (wl = signals [i].head; wl; ) 3944 for (wl = signals [i].head; wl; )
3724 { 3945 {
3725 wn = wl->next; 3946 wn = wl->next;
3726 cb (EV_A_ EV_SIGNAL, wl); 3947 cb (EV_A_ EV_SIGNAL, wl);
3727 wl = wn; 3948 wl = wn;
3728 } 3949 }
3950#endif
3729 3951
3952#if EV_CHILD_ENABLE
3730 if (types & EV_CHILD) 3953 if (types & EV_CHILD)
3731 for (i = EV_PID_HASHSIZE; i--; ) 3954 for (i = (EV_PID_HASHSIZE); i--; )
3732 for (wl = childs [i]; wl; ) 3955 for (wl = childs [i]; wl; )
3733 { 3956 {
3734 wn = wl->next; 3957 wn = wl->next;
3735 cb (EV_A_ EV_CHILD, wl); 3958 cb (EV_A_ EV_CHILD, wl);
3736 wl = wn; 3959 wl = wn;
3737 } 3960 }
3961#endif
3738/* EV_STAT 0x00001000 /* stat data changed */ 3962/* EV_STAT 0x00001000 /* stat data changed */
3739/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3963/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3740} 3964}
3741#endif 3965#endif
3742 3966
3743#if EV_MULTIPLICITY 3967#if EV_MULTIPLICITY
3744 #include "ev_wrap.h" 3968 #include "ev_wrap.h"
3745#endif 3969#endif
3746 3970
3747#ifdef __cplusplus 3971EV_CPP(})
3748}
3749#endif
3750 3972

Diff Legend

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