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

Comparing libev/ev.c (file contents):
Revision 1.283 by root, Wed Apr 15 09:51:19 2009 UTC vs.
Revision 1.360 by root, Sun Oct 24 18:12:41 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 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 *
… …
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
… …
57# endif 53# endif
58# ifndef EV_USE_MONOTONIC 54# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 55# define EV_USE_MONOTONIC 1
60# endif 56# endif
61# endif 57# endif
58# elif !defined(EV_USE_CLOCK_SYSCALL)
59# define EV_USE_CLOCK_SYSCALL 0
62# endif 60# endif
63 61
64# if HAVE_CLOCK_GETTIME 62# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 63# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 64# define EV_USE_MONOTONIC 1
… …
75# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
76# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
77# endif 75# endif
78# endif 76# endif
79 77
78# if HAVE_NANOSLEEP
80# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
81# if HAVE_NANOSLEEP
82# define EV_USE_NANOSLEEP 1 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
83# else 82# else
83# undef EV_USE_NANOSLEEP
84# define EV_USE_NANOSLEEP 0 84# define EV_USE_NANOSLEEP 0
85# endif
86
87# if HAVE_SELECT && HAVE_SYS_SELECT_H
88# ifndef EV_USE_SELECT
89# define EV_USE_SELECT EV_FEATURE_BACKENDS
85# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
86# endif 94# endif
87 95
96# if HAVE_POLL && HAVE_POLL_H
88# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
89# if HAVE_SELECT && HAVE_SYS_SELECT_H 98# define EV_USE_POLL EV_FEATURE_BACKENDS
90# define EV_USE_SELECT 1
91# else
92# define EV_USE_SELECT 0
93# endif 99# endif
94# endif
95
96# ifndef EV_USE_POLL
97# if HAVE_POLL && HAVE_POLL_H
98# define EV_USE_POLL 1
99# else 100# else
101# undef EV_USE_POLL
100# define EV_USE_POLL 0 102# define EV_USE_POLL 0
101# endif
102# endif 103# endif
103 104
104# ifndef EV_USE_EPOLL
105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
106# define EV_USE_EPOLL 1 106# ifndef EV_USE_EPOLL
107# else 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
108# define EV_USE_EPOLL 0
109# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
110# endif 112# endif
111 113
114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
112# ifndef EV_USE_KQUEUE 115# ifndef EV_USE_KQUEUE
113# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
114# define EV_USE_KQUEUE 1
115# else
116# define EV_USE_KQUEUE 0
117# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
118# endif 121# endif
119 122
120# ifndef EV_USE_PORT
121# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
122# define EV_USE_PORT 1 124# ifndef EV_USE_PORT
123# else 125# define EV_USE_PORT EV_FEATURE_BACKENDS
124# define EV_USE_PORT 0
125# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
126# endif 130# endif
127 131
128# ifndef EV_USE_INOTIFY
129# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
130# define EV_USE_INOTIFY 1 133# ifndef EV_USE_INOTIFY
131# else
132# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY EV_FEATURE_OS
133# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
134# endif 139# endif
135 140
141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
136# ifndef EV_USE_EVENTFD 142# ifndef EV_USE_SIGNALFD
137# if HAVE_EVENTFD 143# define EV_USE_SIGNALFD EV_FEATURE_OS
138# define EV_USE_EVENTFD 1
139# else
140# define EV_USE_EVENTFD 0
141# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
148# endif
149
150# if HAVE_EVENTFD
151# ifndef EV_USE_EVENTFD
152# define EV_USE_EVENTFD EV_FEATURE_OS
153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
142# endif 157# endif
143 158
144#endif 159#endif
145 160
146#include <math.h> 161#include <math.h>
147#include <stdlib.h> 162#include <stdlib.h>
163#include <string.h>
148#include <fcntl.h> 164#include <fcntl.h>
149#include <stddef.h> 165#include <stddef.h>
150 166
151#include <stdio.h> 167#include <stdio.h>
152 168
153#include <assert.h> 169#include <assert.h>
154#include <errno.h> 170#include <errno.h>
155#include <sys/types.h> 171#include <sys/types.h>
156#include <time.h> 172#include <time.h>
173#include <limits.h>
157 174
158#include <signal.h> 175#include <signal.h>
159 176
160#ifdef EV_H 177#ifdef EV_H
161# include EV_H 178# include EV_H
162#else 179#else
163# include "ev.h" 180# include "ev.h"
164#endif 181#endif
182
183EV_CPP(extern "C" {)
165 184
166#ifndef _WIN32 185#ifndef _WIN32
167# include <sys/time.h> 186# include <sys/time.h>
168# include <sys/wait.h> 187# include <sys/wait.h>
169# include <unistd.h> 188# include <unistd.h>
… …
172# define WIN32_LEAN_AND_MEAN 191# define WIN32_LEAN_AND_MEAN
173# include <windows.h> 192# include <windows.h>
174# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
175# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
176# endif 195# endif
196# undef EV_AVOID_STDIO
177#endif 197#endif
198
199/* OS X, in its infinite idiocy, actually HARDCODES
200 * a limit of 1024 into their select. Where people have brains,
201 * OS X engineers apparently have a vacuum. Or maybe they were
202 * ordered to have a vacuum, or they do anything for money.
203 * This might help. Or not.
204 */
205#define _DARWIN_UNLIMITED_SELECT 1
178 206
179/* this block tries to deduce configuration from header-defined symbols and defaults */ 207/* this block tries to deduce configuration from header-defined symbols and defaults */
208
209/* try to deduce the maximum number of signals on this platform */
210#if defined (EV_NSIG)
211/* use what's provided */
212#elif defined (NSIG)
213# define EV_NSIG (NSIG)
214#elif defined(_NSIG)
215# define EV_NSIG (_NSIG)
216#elif defined (SIGMAX)
217# define EV_NSIG (SIGMAX+1)
218#elif defined (SIG_MAX)
219# define EV_NSIG (SIG_MAX+1)
220#elif defined (_SIG_MAX)
221# define EV_NSIG (_SIG_MAX+1)
222#elif defined (MAXSIG)
223# define EV_NSIG (MAXSIG+1)
224#elif defined (MAX_SIG)
225# define EV_NSIG (MAX_SIG+1)
226#elif defined (SIGARRAYSIZE)
227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
228#elif defined (_sys_nsig)
229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
230#else
231# error "unable to find value for NSIG, please report"
232/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */
234# define EV_NSIG 65
235#endif
180 236
181#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
184# else 240# else
185# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
186# endif 242# endif
187#endif 243#endif
188 244
189#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
191# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
192# else 248# else
193# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
194# endif 250# endif
195#endif 251#endif
196 252
… …
198# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
199#endif 255#endif
200 256
201#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
202# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
203# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
204# else 260# else
205# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
206# endif 262# endif
207#endif 263#endif
208 264
209#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
210# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
211#endif 267#endif
212 268
213#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
214# ifdef _WIN32 270# ifdef _WIN32
215# define EV_USE_POLL 0 271# define EV_USE_POLL 0
216# else 272# else
217# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
218# endif 274# endif
219#endif 275#endif
220 276
221#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
222# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
223# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
224# else 280# else
225# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
226# endif 282# endif
227#endif 283#endif
228 284
… …
234# define EV_USE_PORT 0 290# define EV_USE_PORT 0
235#endif 291#endif
236 292
237#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
238# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
239# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
240# else 296# else
241# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
242# endif 298# endif
243#endif 299#endif
244 300
245#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
246# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
247# define EV_PID_HASHSIZE 1
248# else
249# define EV_PID_HASHSIZE 16
250# endif
251#endif 303#endif
252 304
253#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
254# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
255# define EV_INOTIFY_HASHSIZE 1
256# else
257# define EV_INOTIFY_HASHSIZE 16
258# endif
259#endif 307#endif
260 308
261#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
262# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
263# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
264# else 312# else
265# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
314# endif
315#endif
316
317#ifndef EV_USE_SIGNALFD
318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
319# define EV_USE_SIGNALFD EV_FEATURE_OS
320# else
321# define EV_USE_SIGNALFD 0
266# endif 322# endif
267#endif 323#endif
268 324
269#if 0 /* debugging */ 325#if 0 /* debugging */
270# define EV_VERIFY 3 326# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
273#endif 329#endif
274 330
275#ifndef EV_VERIFY 331#ifndef EV_VERIFY
276# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
277#endif 333#endif
278 334
279#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
280# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
281#endif 337#endif
282 338
283#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
341#endif
342
343/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
344/* which makes programs even slower. might work on other unices, too. */
345#if EV_USE_CLOCK_SYSCALL
346# include <syscall.h>
347# ifdef SYS_clock_gettime
348# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
349# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 1
351# else
352# undef EV_USE_CLOCK_SYSCALL
353# define EV_USE_CLOCK_SYSCALL 0
354# endif
285#endif 355#endif
286 356
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 357/* this block fixes any misconfiguration where we know we run into trouble otherwise */
358
359#ifdef _AIX
360/* AIX has a completely broken poll.h header */
361# undef EV_USE_POLL
362# define EV_USE_POLL 0
363#endif
288 364
289#ifndef CLOCK_MONOTONIC 365#ifndef CLOCK_MONOTONIC
290# undef EV_USE_MONOTONIC 366# undef EV_USE_MONOTONIC
291# define EV_USE_MONOTONIC 0 367# define EV_USE_MONOTONIC 0
292#endif 368#endif
… …
306# include <sys/select.h> 382# include <sys/select.h>
307# endif 383# endif
308#endif 384#endif
309 385
310#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h> 387# include <sys/statfs.h>
313# include <sys/inotify.h> 388# include <sys/inotify.h>
314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
315# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
316# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
320 395
321#if EV_SELECT_IS_WINSOCKET 396#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 397# include <winsock.h>
323#endif 398#endif
324 399
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 400#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 401/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 402# include <stdint.h>
337# ifdef __cplusplus 403# ifndef EFD_NONBLOCK
338extern "C" { 404# define EFD_NONBLOCK O_NONBLOCK
339# endif 405# endif
340int eventfd (unsigned int initval, int flags); 406# ifndef EFD_CLOEXEC
341# ifdef __cplusplus 407# ifdef O_CLOEXEC
342} 408# define EFD_CLOEXEC O_CLOEXEC
409# else
410# define EFD_CLOEXEC 02000000
411# endif
343# endif 412# endif
413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
414#endif
415
416#if EV_USE_SIGNALFD
417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
418# include <stdint.h>
419# ifndef SFD_NONBLOCK
420# define SFD_NONBLOCK O_NONBLOCK
421# endif
422# ifndef SFD_CLOEXEC
423# ifdef O_CLOEXEC
424# define SFD_CLOEXEC O_CLOEXEC
425# else
426# define SFD_CLOEXEC 02000000
427# endif
428# endif
429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
430
431struct signalfd_siginfo
432{
433 uint32_t ssi_signo;
434 char pad[128 - sizeof (uint32_t)];
435};
344#endif 436#endif
345 437
346/**/ 438/**/
347 439
348#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
350#else 442#else
351# define EV_FREQUENT_CHECK do { } while (0) 443# define EV_FREQUENT_CHECK do { } while (0)
352#endif 444#endif
353 445
354/* 446/*
… …
361 */ 453 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 455
364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 456#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
365#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 457#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
366/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 458
459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
460#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
367 461
368#if __GNUC__ >= 4 462#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
371#else 465#else
… …
378 472
379#define expect_false(expr) expect ((expr) != 0, 0) 473#define expect_false(expr) expect ((expr) != 0, 0)
380#define expect_true(expr) expect ((expr) != 0, 1) 474#define expect_true(expr) expect ((expr) != 0, 1)
381#define inline_size static inline 475#define inline_size static inline
382 476
383#if EV_MINIMAL 477#if EV_FEATURE_CODE
478# define inline_speed static inline
479#else
384# define inline_speed static noinline 480# define inline_speed static noinline
481#endif
482
483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
484
485#if EV_MINPRI == EV_MAXPRI
486# define ABSPRI(w) (((W)w), 0)
385#else 487#else
386# define inline_speed static inline
387#endif
388
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 488# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
489#endif
391 490
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 491#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 492#define EMPTY2(a,b) /* used to suppress some warnings */
394 493
395typedef ev_watcher *W; 494typedef ev_watcher *W;
… …
399#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
400#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
401 500
402#if EV_USE_REALTIME 501#if EV_USE_REALTIME
403/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 502/* sig_atomic_t is used to avoid per-thread variables or locking but still */
404/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
405static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
406#endif 505#endif
407 506
408#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 509#endif
411 510
511#ifndef EV_FD_TO_WIN32_HANDLE
512# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
513#endif
514#ifndef EV_WIN32_HANDLE_TO_FD
515# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
516#endif
517#ifndef EV_WIN32_CLOSE_FD
518# define EV_WIN32_CLOSE_FD(fd) close (fd)
519#endif
520
412#ifdef _WIN32 521#ifdef _WIN32
413# include "ev_win32.c" 522# include "ev_win32.c"
414#endif 523#endif
415 524
416/*****************************************************************************/ 525/*****************************************************************************/
526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
531static unsigned int noinline
532ev_linux_version (void)
533{
534#ifdef __linux
535 unsigned int v = 0;
536 struct utsname buf;
537 int i;
538 char *p = buf.release;
539
540 if (uname (&buf))
541 return 0;
542
543 for (i = 3+1; --i; )
544 {
545 unsigned int c = 0;
546
547 for (;;)
548 {
549 if (*p >= '0' && *p <= '9')
550 c = c * 10 + *p++ - '0';
551 else
552 {
553 p += *p == '.';
554 break;
555 }
556 }
557
558 v = (v << 8) | c;
559 }
560
561 return v;
562#else
563 return 0;
564#endif
565}
566
567/*****************************************************************************/
568
569#if EV_AVOID_STDIO
570static void noinline
571ev_printerr (const char *msg)
572{
573 write (STDERR_FILENO, msg, strlen (msg));
574}
575#endif
417 576
418static void (*syserr_cb)(const char *msg); 577static void (*syserr_cb)(const char *msg);
419 578
420void 579void
421ev_set_syserr_cb (void (*cb)(const char *msg)) 580ev_set_syserr_cb (void (*cb)(const char *msg))
… …
431 590
432 if (syserr_cb) 591 if (syserr_cb)
433 syserr_cb (msg); 592 syserr_cb (msg);
434 else 593 else
435 { 594 {
595#if EV_AVOID_STDIO
596 const char *err = strerror (errno);
597
598 ev_printerr (msg);
599 ev_printerr (": ");
600 ev_printerr (err);
601 ev_printerr ("\n");
602#else
436 perror (msg); 603 perror (msg);
604#endif
437 abort (); 605 abort ();
438 } 606 }
439} 607}
440 608
441static void * 609static void *
442ev_realloc_emul (void *ptr, long size) 610ev_realloc_emul (void *ptr, long size)
443{ 611{
612#if __GLIBC__
613 return realloc (ptr, size);
614#else
444 /* some systems, notably openbsd and darwin, fail to properly 615 /* some systems, notably openbsd and darwin, fail to properly
445 * implement realloc (x, 0) (as required by both ansi c-98 and 616 * implement realloc (x, 0) (as required by both ansi c-89 and
446 * the single unix specification, so work around them here. 617 * the single unix specification, so work around them here.
447 */ 618 */
448 619
449 if (size) 620 if (size)
450 return realloc (ptr, size); 621 return realloc (ptr, size);
451 622
452 free (ptr); 623 free (ptr);
453 return 0; 624 return 0;
625#endif
454} 626}
455 627
456static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 628static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
457 629
458void 630void
… …
466{ 638{
467 ptr = alloc (ptr, size); 639 ptr = alloc (ptr, size);
468 640
469 if (!ptr && size) 641 if (!ptr && size)
470 { 642 {
643#if EV_AVOID_STDIO
644 ev_printerr ("libev: memory allocation failed, aborting.\n");
645#else
471 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 646 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
647#endif
472 abort (); 648 abort ();
473 } 649 }
474 650
475 return ptr; 651 return ptr;
476} 652}
… …
478#define ev_malloc(size) ev_realloc (0, (size)) 654#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 655#define ev_free(ptr) ev_realloc ((ptr), 0)
480 656
481/*****************************************************************************/ 657/*****************************************************************************/
482 658
659/* set in reify when reification needed */
660#define EV_ANFD_REIFY 1
661
662/* file descriptor info structure */
483typedef struct 663typedef struct
484{ 664{
485 WL head; 665 WL head;
486 unsigned char events; 666 unsigned char events; /* the events watched for */
487 unsigned char reify; 667 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
488 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 668 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 669 unsigned char unused;
490#if EV_USE_EPOLL 670#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 672#endif
493#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
494 SOCKET handle; 674 SOCKET handle;
495#endif 675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
678#endif
496} ANFD; 679} ANFD;
497 680
681/* stores the pending event set for a given watcher */
498typedef struct 682typedef struct
499{ 683{
500 W w; 684 W w;
501 int events; 685 int events; /* the pending event set for the given watcher */
502} ANPENDING; 686} ANPENDING;
503 687
504#if EV_USE_INOTIFY 688#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 689/* hash table entry per inotify-id */
506typedef struct 690typedef struct
… …
509} ANFS; 693} ANFS;
510#endif 694#endif
511 695
512/* Heap Entry */ 696/* Heap Entry */
513#if EV_HEAP_CACHE_AT 697#if EV_HEAP_CACHE_AT
698 /* a heap element */
514 typedef struct { 699 typedef struct {
515 ev_tstamp at; 700 ev_tstamp at;
516 WT w; 701 WT w;
517 } ANHE; 702 } ANHE;
518 703
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 704 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 705 #define ANHE_at(he) (he).at /* access cached at, read-only */
521 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 706 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 707#else
708 /* a heap element */
523 typedef WT ANHE; 709 typedef WT ANHE;
524 710
525 #define ANHE_w(he) (he) 711 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 712 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 713 #define ANHE_at_cache(he)
… …
551 737
552 static int ev_default_loop_ptr; 738 static int ev_default_loop_ptr;
553 739
554#endif 740#endif
555 741
742#if EV_FEATURE_API
743# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
744# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
745# define EV_INVOKE_PENDING invoke_cb (EV_A)
746#else
747# define EV_RELEASE_CB (void)0
748# define EV_ACQUIRE_CB (void)0
749# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
750#endif
751
752#define EVBREAK_RECURSE 0x80
753
556/*****************************************************************************/ 754/*****************************************************************************/
557 755
756#ifndef EV_HAVE_EV_TIME
558ev_tstamp 757ev_tstamp
559ev_time (void) 758ev_time (void)
560{ 759{
561#if EV_USE_REALTIME 760#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 761 if (expect_true (have_realtime))
… …
569 768
570 struct timeval tv; 769 struct timeval tv;
571 gettimeofday (&tv, 0); 770 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 771 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 772}
773#endif
574 774
575ev_tstamp inline_size 775inline_size ev_tstamp
576get_clock (void) 776get_clock (void)
577{ 777{
578#if EV_USE_MONOTONIC 778#if EV_USE_MONOTONIC
579 if (expect_true (have_monotonic)) 779 if (expect_true (have_monotonic))
580 { 780 {
… …
601 if (delay > 0.) 801 if (delay > 0.)
602 { 802 {
603#if EV_USE_NANOSLEEP 803#if EV_USE_NANOSLEEP
604 struct timespec ts; 804 struct timespec ts;
605 805
606 ts.tv_sec = (time_t)delay; 806 EV_TS_SET (ts, delay);
607 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
608
609 nanosleep (&ts, 0); 807 nanosleep (&ts, 0);
610#elif defined(_WIN32) 808#elif defined(_WIN32)
611 Sleep ((unsigned long)(delay * 1e3)); 809 Sleep ((unsigned long)(delay * 1e3));
612#else 810#else
613 struct timeval tv; 811 struct timeval tv;
614 812
615 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 813 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 814 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 815 /* by older ones */
816 EV_TV_SET (tv, delay);
621 select (0, 0, 0, 0, &tv); 817 select (0, 0, 0, 0, &tv);
622#endif 818#endif
623 } 819 }
624} 820}
625 821
626/*****************************************************************************/ 822/*****************************************************************************/
627 823
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 824#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 825
630int inline_size 826/* find a suitable new size for the given array, */
827/* hopefully by rounding to a nice-to-malloc size */
828inline_size int
631array_nextsize (int elem, int cur, int cnt) 829array_nextsize (int elem, int cur, int cnt)
632{ 830{
633 int ncur = cur + 1; 831 int ncur = cur + 1;
634 832
635 do 833 do
… …
680#define array_free(stem, idx) \ 878#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 879 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 880
683/*****************************************************************************/ 881/*****************************************************************************/
684 882
883/* dummy callback for pending events */
884static void noinline
885pendingcb (EV_P_ ev_prepare *w, int revents)
886{
887}
888
685void noinline 889void noinline
686ev_feed_event (EV_P_ void *w, int revents) 890ev_feed_event (EV_P_ void *w, int revents)
687{ 891{
688 W w_ = (W)w; 892 W w_ = (W)w;
689 int pri = ABSPRI (w_); 893 int pri = ABSPRI (w_);
… …
697 pendings [pri][w_->pending - 1].w = w_; 901 pendings [pri][w_->pending - 1].w = w_;
698 pendings [pri][w_->pending - 1].events = revents; 902 pendings [pri][w_->pending - 1].events = revents;
699 } 903 }
700} 904}
701 905
702void inline_speed 906inline_speed void
907feed_reverse (EV_P_ W w)
908{
909 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
910 rfeeds [rfeedcnt++] = w;
911}
912
913inline_size void
914feed_reverse_done (EV_P_ int revents)
915{
916 do
917 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
918 while (rfeedcnt);
919}
920
921inline_speed void
703queue_events (EV_P_ W *events, int eventcnt, int type) 922queue_events (EV_P_ W *events, int eventcnt, int type)
704{ 923{
705 int i; 924 int i;
706 925
707 for (i = 0; i < eventcnt; ++i) 926 for (i = 0; i < eventcnt; ++i)
708 ev_feed_event (EV_A_ events [i], type); 927 ev_feed_event (EV_A_ events [i], type);
709} 928}
710 929
711/*****************************************************************************/ 930/*****************************************************************************/
712 931
713void inline_speed 932inline_speed void
714fd_event (EV_P_ int fd, int revents) 933fd_event_nocheck (EV_P_ int fd, int revents)
715{ 934{
716 ANFD *anfd = anfds + fd; 935 ANFD *anfd = anfds + fd;
717 ev_io *w; 936 ev_io *w;
718 937
719 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 938 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
723 if (ev) 942 if (ev)
724 ev_feed_event (EV_A_ (W)w, ev); 943 ev_feed_event (EV_A_ (W)w, ev);
725 } 944 }
726} 945}
727 946
947/* do not submit kernel events for fds that have reify set */
948/* because that means they changed while we were polling for new events */
949inline_speed void
950fd_event (EV_P_ int fd, int revents)
951{
952 ANFD *anfd = anfds + fd;
953
954 if (expect_true (!anfd->reify))
955 fd_event_nocheck (EV_A_ fd, revents);
956}
957
728void 958void
729ev_feed_fd_event (EV_P_ int fd, int revents) 959ev_feed_fd_event (EV_P_ int fd, int revents)
730{ 960{
731 if (fd >= 0 && fd < anfdmax) 961 if (fd >= 0 && fd < anfdmax)
732 fd_event (EV_A_ fd, revents); 962 fd_event_nocheck (EV_A_ fd, revents);
733} 963}
734 964
735void inline_size 965/* make sure the external fd watch events are in-sync */
966/* with the kernel/libev internal state */
967inline_size void
736fd_reify (EV_P) 968fd_reify (EV_P)
737{ 969{
738 int i; 970 int i;
739 971
740 for (i = 0; i < fdchangecnt; ++i) 972 for (i = 0; i < fdchangecnt; ++i)
741 { 973 {
742 int fd = fdchanges [i]; 974 int fd = fdchanges [i];
743 ANFD *anfd = anfds + fd; 975 ANFD *anfd = anfds + fd;
744 ev_io *w; 976 ev_io *w;
745 977
746 unsigned char events = 0; 978 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify;
747 980
748 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 981 anfd->reify = 0;
749 events |= (unsigned char)w->events;
750 982
751#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
752 if (events) 984 if (o_reify & EV__IOFDSET)
753 { 985 {
754 unsigned long arg; 986 unsigned long arg;
755 #ifdef EV_FD_TO_WIN32_HANDLE
756 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
757 #else
758 anfd->handle = _get_osfhandle (fd);
759 #endif
760 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 988 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
989 printf ("oi %d %x\n", fd, anfd->handle);//D
761 } 990 }
762#endif 991#endif
763 992
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
764 { 994 {
765 unsigned char o_events = anfd->events;
766 unsigned char o_reify = anfd->reify;
767
768 anfd->reify = 0;
769 anfd->events = events; 995 anfd->events = 0;
770 996
771 if (o_events != events || o_reify & EV__IOFDSET) 997 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
998 anfd->events |= (unsigned char)w->events;
999
1000 if (o_events != anfd->events)
1001 o_reify = EV__IOFDSET; /* actually |= */
1002 }
1003
1004 if (o_reify & EV__IOFDSET)
772 backend_modify (EV_A_ fd, o_events, events); 1005 backend_modify (EV_A_ fd, o_events, anfd->events);
773 }
774 } 1006 }
775 1007
776 fdchangecnt = 0; 1008 fdchangecnt = 0;
777} 1009}
778 1010
779void inline_size 1011/* something about the given fd changed */
1012inline_size void
780fd_change (EV_P_ int fd, int flags) 1013fd_change (EV_P_ int fd, int flags)
781{ 1014{
782 unsigned char reify = anfds [fd].reify; 1015 unsigned char reify = anfds [fd].reify;
783 anfds [fd].reify |= flags; 1016 anfds [fd].reify |= flags;
784 1017
… …
788 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 1021 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
789 fdchanges [fdchangecnt - 1] = fd; 1022 fdchanges [fdchangecnt - 1] = fd;
790 } 1023 }
791} 1024}
792 1025
793void inline_speed 1026/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
1027inline_speed void
794fd_kill (EV_P_ int fd) 1028fd_kill (EV_P_ int fd)
795{ 1029{
796 ev_io *w; 1030 ev_io *w;
797 1031
798 while ((w = (ev_io *)anfds [fd].head)) 1032 while ((w = (ev_io *)anfds [fd].head))
… …
800 ev_io_stop (EV_A_ w); 1034 ev_io_stop (EV_A_ w);
801 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1035 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
802 } 1036 }
803} 1037}
804 1038
805int inline_size 1039/* check whether the given fd is actually valid, for error recovery */
1040inline_size int
806fd_valid (int fd) 1041fd_valid (int fd)
807{ 1042{
808#ifdef _WIN32 1043#ifdef _WIN32
809 return _get_osfhandle (fd) != -1; 1044 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
810#else 1045#else
811 return fcntl (fd, F_GETFD) != -1; 1046 return fcntl (fd, F_GETFD) != -1;
812#endif 1047#endif
813} 1048}
814 1049
… …
832 1067
833 for (fd = anfdmax; fd--; ) 1068 for (fd = anfdmax; fd--; )
834 if (anfds [fd].events) 1069 if (anfds [fd].events)
835 { 1070 {
836 fd_kill (EV_A_ fd); 1071 fd_kill (EV_A_ fd);
837 return; 1072 break;
838 } 1073 }
839} 1074}
840 1075
841/* usually called after fork if backend needs to re-arm all fds from scratch */ 1076/* usually called after fork if backend needs to re-arm all fds from scratch */
842static void noinline 1077static void noinline
… …
847 for (fd = 0; fd < anfdmax; ++fd) 1082 for (fd = 0; fd < anfdmax; ++fd)
848 if (anfds [fd].events) 1083 if (anfds [fd].events)
849 { 1084 {
850 anfds [fd].events = 0; 1085 anfds [fd].events = 0;
851 anfds [fd].emask = 0; 1086 anfds [fd].emask = 0;
852 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1087 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
853 } 1088 }
854} 1089}
855 1090
1091/* used to prepare libev internal fd's */
1092/* this is not fork-safe */
1093inline_speed void
1094fd_intern (int fd)
1095{
1096#ifdef _WIN32
1097 unsigned long arg = 1;
1098 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1099#else
1100 fcntl (fd, F_SETFD, FD_CLOEXEC);
1101 fcntl (fd, F_SETFL, O_NONBLOCK);
1102#endif
1103}
1104
856/*****************************************************************************/ 1105/*****************************************************************************/
857 1106
858/* 1107/*
859 * the heap functions want a real array index. array index 0 uis guaranteed to not 1108 * the heap functions want a real array index. array index 0 is guaranteed to not
860 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1109 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
861 * the branching factor of the d-tree. 1110 * the branching factor of the d-tree.
862 */ 1111 */
863 1112
864/* 1113/*
… …
873#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1122#define HEAP0 (DHEAP - 1) /* index of first element in heap */
874#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1123#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
875#define UPHEAP_DONE(p,k) ((p) == (k)) 1124#define UPHEAP_DONE(p,k) ((p) == (k))
876 1125
877/* away from the root */ 1126/* away from the root */
878void inline_speed 1127inline_speed void
879downheap (ANHE *heap, int N, int k) 1128downheap (ANHE *heap, int N, int k)
880{ 1129{
881 ANHE he = heap [k]; 1130 ANHE he = heap [k];
882 ANHE *E = heap + N + HEAP0; 1131 ANHE *E = heap + N + HEAP0;
883 1132
… …
923#define HEAP0 1 1172#define HEAP0 1
924#define HPARENT(k) ((k) >> 1) 1173#define HPARENT(k) ((k) >> 1)
925#define UPHEAP_DONE(p,k) (!(p)) 1174#define UPHEAP_DONE(p,k) (!(p))
926 1175
927/* away from the root */ 1176/* away from the root */
928void inline_speed 1177inline_speed void
929downheap (ANHE *heap, int N, int k) 1178downheap (ANHE *heap, int N, int k)
930{ 1179{
931 ANHE he = heap [k]; 1180 ANHE he = heap [k];
932 1181
933 for (;;) 1182 for (;;)
934 { 1183 {
935 int c = k << 1; 1184 int c = k << 1;
936 1185
937 if (c > N + HEAP0 - 1) 1186 if (c >= N + HEAP0)
938 break; 1187 break;
939 1188
940 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1189 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
941 ? 1 : 0; 1190 ? 1 : 0;
942 1191
… …
953 ev_active (ANHE_w (he)) = k; 1202 ev_active (ANHE_w (he)) = k;
954} 1203}
955#endif 1204#endif
956 1205
957/* towards the root */ 1206/* towards the root */
958void inline_speed 1207inline_speed void
959upheap (ANHE *heap, int k) 1208upheap (ANHE *heap, int k)
960{ 1209{
961 ANHE he = heap [k]; 1210 ANHE he = heap [k];
962 1211
963 for (;;) 1212 for (;;)
… …
974 1223
975 heap [k] = he; 1224 heap [k] = he;
976 ev_active (ANHE_w (he)) = k; 1225 ev_active (ANHE_w (he)) = k;
977} 1226}
978 1227
979void inline_size 1228/* move an element suitably so it is in a correct place */
1229inline_size void
980adjustheap (ANHE *heap, int N, int k) 1230adjustheap (ANHE *heap, int N, int k)
981{ 1231{
982 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1232 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
983 upheap (heap, k); 1233 upheap (heap, k);
984 else 1234 else
985 downheap (heap, N, k); 1235 downheap (heap, N, k);
986} 1236}
987 1237
988/* rebuild the heap: this function is used only once and executed rarely */ 1238/* rebuild the heap: this function is used only once and executed rarely */
989void inline_size 1239inline_size void
990reheap (ANHE *heap, int N) 1240reheap (ANHE *heap, int N)
991{ 1241{
992 int i; 1242 int i;
993 1243
994 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1244 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
997 upheap (heap, i + HEAP0); 1247 upheap (heap, i + HEAP0);
998} 1248}
999 1249
1000/*****************************************************************************/ 1250/*****************************************************************************/
1001 1251
1252/* associate signal watchers to a signal signal */
1002typedef struct 1253typedef struct
1003{ 1254{
1255 EV_ATOMIC_T pending;
1256#if EV_MULTIPLICITY
1257 EV_P;
1258#endif
1004 WL head; 1259 WL head;
1005 EV_ATOMIC_T gotsig;
1006} ANSIG; 1260} ANSIG;
1007 1261
1008static ANSIG *signals; 1262static ANSIG signals [EV_NSIG - 1];
1009static int signalmax;
1010
1011static EV_ATOMIC_T gotsig;
1012 1263
1013/*****************************************************************************/ 1264/*****************************************************************************/
1014 1265
1015void inline_speed 1266#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1016fd_intern (int fd)
1017{
1018#ifdef _WIN32
1019 unsigned long arg = 1;
1020 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1021#else
1022 fcntl (fd, F_SETFD, FD_CLOEXEC);
1023 fcntl (fd, F_SETFL, O_NONBLOCK);
1024#endif
1025}
1026 1267
1027static void noinline 1268static void noinline
1028evpipe_init (EV_P) 1269evpipe_init (EV_P)
1029{ 1270{
1030 if (!ev_is_active (&pipeev)) 1271 if (!ev_is_active (&pipe_w))
1031 { 1272 {
1032#if EV_USE_EVENTFD 1273# if EV_USE_EVENTFD
1274 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1275 if (evfd < 0 && errno == EINVAL)
1033 if ((evfd = eventfd (0, 0)) >= 0) 1276 evfd = eventfd (0, 0);
1277
1278 if (evfd >= 0)
1034 { 1279 {
1035 evpipe [0] = -1; 1280 evpipe [0] = -1;
1036 fd_intern (evfd); 1281 fd_intern (evfd); /* doing it twice doesn't hurt */
1037 ev_io_set (&pipeev, evfd, EV_READ); 1282 ev_io_set (&pipe_w, evfd, EV_READ);
1038 } 1283 }
1039 else 1284 else
1040#endif 1285# endif
1041 { 1286 {
1042 while (pipe (evpipe)) 1287 while (pipe (evpipe))
1043 ev_syserr ("(libev) error creating signal/async pipe"); 1288 ev_syserr ("(libev) error creating signal/async pipe");
1044 1289
1045 fd_intern (evpipe [0]); 1290 fd_intern (evpipe [0]);
1046 fd_intern (evpipe [1]); 1291 fd_intern (evpipe [1]);
1047 ev_io_set (&pipeev, evpipe [0], EV_READ); 1292 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1048 } 1293 }
1049 1294
1050 ev_io_start (EV_A_ &pipeev); 1295 ev_io_start (EV_A_ &pipe_w);
1051 ev_unref (EV_A); /* watcher should not keep loop alive */ 1296 ev_unref (EV_A); /* watcher should not keep loop alive */
1052 } 1297 }
1053} 1298}
1054 1299
1055void inline_size 1300inline_size void
1056evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1301evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1057{ 1302{
1058 if (!*flag) 1303 if (!*flag)
1059 { 1304 {
1060 int old_errno = errno; /* save errno because write might clobber it */ 1305 int old_errno = errno; /* save errno because write might clobber it */
1306 char dummy;
1061 1307
1062 *flag = 1; 1308 *flag = 1;
1063 1309
1064#if EV_USE_EVENTFD 1310#if EV_USE_EVENTFD
1065 if (evfd >= 0) 1311 if (evfd >= 0)
… …
1067 uint64_t counter = 1; 1313 uint64_t counter = 1;
1068 write (evfd, &counter, sizeof (uint64_t)); 1314 write (evfd, &counter, sizeof (uint64_t));
1069 } 1315 }
1070 else 1316 else
1071#endif 1317#endif
1318 /* win32 people keep sending patches that change this write() to send() */
1319 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1320 /* so when you think this write should be a send instead, please find out */
1321 /* where your send() is from - it's definitely not the microsoft send, and */
1322 /* tell me. thank you. */
1072 write (evpipe [1], &old_errno, 1); 1323 write (evpipe [1], &dummy, 1);
1073 1324
1074 errno = old_errno; 1325 errno = old_errno;
1075 } 1326 }
1076} 1327}
1077 1328
1329/* called whenever the libev signal pipe */
1330/* got some events (signal, async) */
1078static void 1331static void
1079pipecb (EV_P_ ev_io *iow, int revents) 1332pipecb (EV_P_ ev_io *iow, int revents)
1080{ 1333{
1334 int i;
1335
1081#if EV_USE_EVENTFD 1336#if EV_USE_EVENTFD
1082 if (evfd >= 0) 1337 if (evfd >= 0)
1083 { 1338 {
1084 uint64_t counter; 1339 uint64_t counter;
1085 read (evfd, &counter, sizeof (uint64_t)); 1340 read (evfd, &counter, sizeof (uint64_t));
1086 } 1341 }
1087 else 1342 else
1088#endif 1343#endif
1089 { 1344 {
1090 char dummy; 1345 char dummy;
1346 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1091 read (evpipe [0], &dummy, 1); 1347 read (evpipe [0], &dummy, 1);
1092 } 1348 }
1093 1349
1094 if (gotsig && ev_is_default_loop (EV_A)) 1350 if (sig_pending)
1095 { 1351 {
1096 int signum; 1352 sig_pending = 0;
1097 gotsig = 0;
1098 1353
1099 for (signum = signalmax; signum--; ) 1354 for (i = EV_NSIG - 1; i--; )
1100 if (signals [signum].gotsig) 1355 if (expect_false (signals [i].pending))
1101 ev_feed_signal_event (EV_A_ signum + 1); 1356 ev_feed_signal_event (EV_A_ i + 1);
1102 } 1357 }
1103 1358
1104#if EV_ASYNC_ENABLE 1359#if EV_ASYNC_ENABLE
1105 if (gotasync) 1360 if (async_pending)
1106 { 1361 {
1107 int i; 1362 async_pending = 0;
1108 gotasync = 0;
1109 1363
1110 for (i = asynccnt; i--; ) 1364 for (i = asynccnt; i--; )
1111 if (asyncs [i]->sent) 1365 if (asyncs [i]->sent)
1112 { 1366 {
1113 asyncs [i]->sent = 0; 1367 asyncs [i]->sent = 0;
… …
1121 1375
1122static void 1376static void
1123ev_sighandler (int signum) 1377ev_sighandler (int signum)
1124{ 1378{
1125#if EV_MULTIPLICITY 1379#if EV_MULTIPLICITY
1126 struct ev_loop *loop = &default_loop_struct; 1380 EV_P = signals [signum - 1].loop;
1127#endif 1381#endif
1128 1382
1129#if _WIN32 1383#ifdef _WIN32
1130 signal (signum, ev_sighandler); 1384 signal (signum, ev_sighandler);
1131#endif 1385#endif
1132 1386
1133 signals [signum - 1].gotsig = 1; 1387 signals [signum - 1].pending = 1;
1134 evpipe_write (EV_A_ &gotsig); 1388 evpipe_write (EV_A_ &sig_pending);
1135} 1389}
1136 1390
1137void noinline 1391void noinline
1138ev_feed_signal_event (EV_P_ int signum) 1392ev_feed_signal_event (EV_P_ int signum)
1139{ 1393{
1140 WL w; 1394 WL w;
1141 1395
1396 if (expect_false (signum <= 0 || signum > EV_NSIG))
1397 return;
1398
1399 --signum;
1400
1142#if EV_MULTIPLICITY 1401#if EV_MULTIPLICITY
1143 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1402 /* it is permissible to try to feed a signal to the wrong loop */
1144#endif 1403 /* or, likely more useful, feeding a signal nobody is waiting for */
1145 1404
1146 --signum; 1405 if (expect_false (signals [signum].loop != EV_A))
1147
1148 if (signum < 0 || signum >= signalmax)
1149 return; 1406 return;
1407#endif
1150 1408
1151 signals [signum].gotsig = 0; 1409 signals [signum].pending = 0;
1152 1410
1153 for (w = signals [signum].head; w; w = w->next) 1411 for (w = signals [signum].head; w; w = w->next)
1154 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1412 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1155} 1413}
1156 1414
1415#if EV_USE_SIGNALFD
1416static void
1417sigfdcb (EV_P_ ev_io *iow, int revents)
1418{
1419 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1420
1421 for (;;)
1422 {
1423 ssize_t res = read (sigfd, si, sizeof (si));
1424
1425 /* not ISO-C, as res might be -1, but works with SuS */
1426 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1427 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1428
1429 if (res < (ssize_t)sizeof (si))
1430 break;
1431 }
1432}
1433#endif
1434
1435#endif
1436
1157/*****************************************************************************/ 1437/*****************************************************************************/
1158 1438
1439#if EV_CHILD_ENABLE
1159static WL childs [EV_PID_HASHSIZE]; 1440static WL childs [EV_PID_HASHSIZE];
1160
1161#ifndef _WIN32
1162 1441
1163static ev_signal childev; 1442static ev_signal childev;
1164 1443
1165#ifndef WIFCONTINUED 1444#ifndef WIFCONTINUED
1166# define WIFCONTINUED(status) 0 1445# define WIFCONTINUED(status) 0
1167#endif 1446#endif
1168 1447
1169void inline_speed 1448/* handle a single child status event */
1449inline_speed void
1170child_reap (EV_P_ int chain, int pid, int status) 1450child_reap (EV_P_ int chain, int pid, int status)
1171{ 1451{
1172 ev_child *w; 1452 ev_child *w;
1173 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1453 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1174 1454
1175 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1455 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1176 { 1456 {
1177 if ((w->pid == pid || !w->pid) 1457 if ((w->pid == pid || !w->pid)
1178 && (!traced || (w->flags & 1))) 1458 && (!traced || (w->flags & 1)))
1179 { 1459 {
1180 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1460 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1187 1467
1188#ifndef WCONTINUED 1468#ifndef WCONTINUED
1189# define WCONTINUED 0 1469# define WCONTINUED 0
1190#endif 1470#endif
1191 1471
1472/* called on sigchld etc., calls waitpid */
1192static void 1473static void
1193childcb (EV_P_ ev_signal *sw, int revents) 1474childcb (EV_P_ ev_signal *sw, int revents)
1194{ 1475{
1195 int pid, status; 1476 int pid, status;
1196 1477
… …
1204 /* make sure we are called again until all children have been reaped */ 1485 /* make sure we are called again until all children have been reaped */
1205 /* we need to do it this way so that the callback gets called before we continue */ 1486 /* we need to do it this way so that the callback gets called before we continue */
1206 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1487 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1207 1488
1208 child_reap (EV_A_ pid, pid, status); 1489 child_reap (EV_A_ pid, pid, status);
1209 if (EV_PID_HASHSIZE > 1) 1490 if ((EV_PID_HASHSIZE) > 1)
1210 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1491 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1211} 1492}
1212 1493
1213#endif 1494#endif
1214 1495
1215/*****************************************************************************/ 1496/*****************************************************************************/
1216 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1217#if EV_USE_PORT 1501#if EV_USE_PORT
1218# include "ev_port.c" 1502# include "ev_port.c"
1219#endif 1503#endif
1220#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1221# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1281#ifdef __APPLE__ 1565#ifdef __APPLE__
1282 /* only select works correctly on that "unix-certified" platform */ 1566 /* only select works correctly on that "unix-certified" platform */
1283 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1567 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1284 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1568 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1285#endif 1569#endif
1570#ifdef __FreeBSD__
1571 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1572#endif
1286 1573
1287 return flags; 1574 return flags;
1288} 1575}
1289 1576
1290unsigned int 1577unsigned int
1291ev_embeddable_backends (void) 1578ev_embeddable_backends (void)
1292{ 1579{
1293 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1580 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1294 1581
1295 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1582 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1296 /* please fix it and tell me how to detect the fix */ 1583 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1297 flags &= ~EVBACKEND_EPOLL; 1584 flags &= ~EVBACKEND_EPOLL;
1298 1585
1299 return flags; 1586 return flags;
1300} 1587}
1301 1588
1302unsigned int 1589unsigned int
1303ev_backend (EV_P) 1590ev_backend (EV_P)
1304{ 1591{
1305 return backend; 1592 return backend;
1306} 1593}
1307 1594
1595#if EV_FEATURE_API
1308unsigned int 1596unsigned int
1309ev_loop_count (EV_P) 1597ev_iteration (EV_P)
1310{ 1598{
1311 return loop_count; 1599 return loop_count;
1312} 1600}
1313 1601
1602unsigned int
1603ev_depth (EV_P)
1604{
1605 return loop_depth;
1606}
1607
1314void 1608void
1315ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1609ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1316{ 1610{
1317 io_blocktime = interval; 1611 io_blocktime = interval;
1318} 1612}
… …
1321ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1615ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1322{ 1616{
1323 timeout_blocktime = interval; 1617 timeout_blocktime = interval;
1324} 1618}
1325 1619
1620void
1621ev_set_userdata (EV_P_ void *data)
1622{
1623 userdata = data;
1624}
1625
1626void *
1627ev_userdata (EV_P)
1628{
1629 return userdata;
1630}
1631
1632void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1633{
1634 invoke_cb = invoke_pending_cb;
1635}
1636
1637void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1638{
1639 release_cb = release;
1640 acquire_cb = acquire;
1641}
1642#endif
1643
1644/* initialise a loop structure, must be zero-initialised */
1326static void noinline 1645static void noinline
1327loop_init (EV_P_ unsigned int flags) 1646loop_init (EV_P_ unsigned int flags)
1328{ 1647{
1329 if (!backend) 1648 if (!backend)
1330 { 1649 {
… …
1346 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1665 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1347 have_monotonic = 1; 1666 have_monotonic = 1;
1348 } 1667 }
1349#endif 1668#endif
1350 1669
1670 /* pid check not overridable via env */
1671#ifndef _WIN32
1672 if (flags & EVFLAG_FORKCHECK)
1673 curpid = getpid ();
1674#endif
1675
1676 if (!(flags & EVFLAG_NOENV)
1677 && !enable_secure ()
1678 && getenv ("LIBEV_FLAGS"))
1679 flags = atoi (getenv ("LIBEV_FLAGS"));
1680
1351 ev_rt_now = ev_time (); 1681 ev_rt_now = ev_time ();
1352 mn_now = get_clock (); 1682 mn_now = get_clock ();
1353 now_floor = mn_now; 1683 now_floor = mn_now;
1354 rtmn_diff = ev_rt_now - mn_now; 1684 rtmn_diff = ev_rt_now - mn_now;
1685#if EV_FEATURE_API
1686 invoke_cb = ev_invoke_pending;
1687#endif
1355 1688
1356 io_blocktime = 0.; 1689 io_blocktime = 0.;
1357 timeout_blocktime = 0.; 1690 timeout_blocktime = 0.;
1358 backend = 0; 1691 backend = 0;
1359 backend_fd = -1; 1692 backend_fd = -1;
1360 gotasync = 0; 1693 sig_pending = 0;
1694#if EV_ASYNC_ENABLE
1695 async_pending = 0;
1696#endif
1361#if EV_USE_INOTIFY 1697#if EV_USE_INOTIFY
1362 fs_fd = -2; 1698 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1363#endif 1699#endif
1364 1700#if EV_USE_SIGNALFD
1365 /* pid check not overridable via env */ 1701 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1366#ifndef _WIN32
1367 if (flags & EVFLAG_FORKCHECK)
1368 curpid = getpid ();
1369#endif 1702#endif
1370
1371 if (!(flags & EVFLAG_NOENV)
1372 && !enable_secure ()
1373 && getenv ("LIBEV_FLAGS"))
1374 flags = atoi (getenv ("LIBEV_FLAGS"));
1375 1703
1376 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1377 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1378 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1379#if EV_USE_PORT 1710#if EV_USE_PORT
1380 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1381#endif 1712#endif
1382#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1383 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1390#endif 1721#endif
1391#if EV_USE_SELECT 1722#if EV_USE_SELECT
1392 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1723 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1393#endif 1724#endif
1394 1725
1726 ev_prepare_init (&pending_w, pendingcb);
1727
1728#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1395 ev_init (&pipeev, pipecb); 1729 ev_init (&pipe_w, pipecb);
1396 ev_set_priority (&pipeev, EV_MAXPRI); 1730 ev_set_priority (&pipe_w, EV_MAXPRI);
1731#endif
1397 } 1732 }
1398} 1733}
1399 1734
1400static void noinline 1735/* free up a loop structure */
1736void
1401loop_destroy (EV_P) 1737ev_loop_destroy (EV_P)
1402{ 1738{
1403 int i; 1739 int i;
1404 1740
1741#if EV_CHILD_ENABLE
1742 if (ev_is_active (&childev))
1743 {
1744 ev_ref (EV_A); /* child watcher */
1745 ev_signal_stop (EV_A_ &childev);
1746 }
1747#endif
1748
1405 if (ev_is_active (&pipeev)) 1749 if (ev_is_active (&pipe_w))
1406 { 1750 {
1407 ev_ref (EV_A); /* signal watcher */ 1751 /*ev_ref (EV_A);*/
1408 ev_io_stop (EV_A_ &pipeev); 1752 /*ev_io_stop (EV_A_ &pipe_w);*/
1409 1753
1410#if EV_USE_EVENTFD 1754#if EV_USE_EVENTFD
1411 if (evfd >= 0) 1755 if (evfd >= 0)
1412 close (evfd); 1756 close (evfd);
1413#endif 1757#endif
1414 1758
1415 if (evpipe [0] >= 0) 1759 if (evpipe [0] >= 0)
1416 { 1760 {
1417 close (evpipe [0]); 1761 EV_WIN32_CLOSE_FD (evpipe [0]);
1418 close (evpipe [1]); 1762 EV_WIN32_CLOSE_FD (evpipe [1]);
1419 } 1763 }
1420 } 1764 }
1765
1766#if EV_USE_SIGNALFD
1767 if (ev_is_active (&sigfd_w))
1768 close (sigfd);
1769#endif
1421 1770
1422#if EV_USE_INOTIFY 1771#if EV_USE_INOTIFY
1423 if (fs_fd >= 0) 1772 if (fs_fd >= 0)
1424 close (fs_fd); 1773 close (fs_fd);
1425#endif 1774#endif
1426 1775
1427 if (backend_fd >= 0) 1776 if (backend_fd >= 0)
1428 close (backend_fd); 1777 close (backend_fd);
1429 1778
1779#if EV_USE_IOCP
1780 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1781#endif
1430#if EV_USE_PORT 1782#if EV_USE_PORT
1431 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1783 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1432#endif 1784#endif
1433#if EV_USE_KQUEUE 1785#if EV_USE_KQUEUE
1434 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1786 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1449#if EV_IDLE_ENABLE 1801#if EV_IDLE_ENABLE
1450 array_free (idle, [i]); 1802 array_free (idle, [i]);
1451#endif 1803#endif
1452 } 1804 }
1453 1805
1454 ev_free (anfds); anfdmax = 0; 1806 ev_free (anfds); anfds = 0; anfdmax = 0;
1455 1807
1456 /* have to use the microsoft-never-gets-it-right macro */ 1808 /* have to use the microsoft-never-gets-it-right macro */
1809 array_free (rfeed, EMPTY);
1457 array_free (fdchange, EMPTY); 1810 array_free (fdchange, EMPTY);
1458 array_free (timer, EMPTY); 1811 array_free (timer, EMPTY);
1459#if EV_PERIODIC_ENABLE 1812#if EV_PERIODIC_ENABLE
1460 array_free (periodic, EMPTY); 1813 array_free (periodic, EMPTY);
1461#endif 1814#endif
1462#if EV_FORK_ENABLE 1815#if EV_FORK_ENABLE
1463 array_free (fork, EMPTY); 1816 array_free (fork, EMPTY);
1464#endif 1817#endif
1818#if EV_CLEANUP_ENABLE
1819 array_free (cleanup, EMPTY);
1820#endif
1465 array_free (prepare, EMPTY); 1821 array_free (prepare, EMPTY);
1466 array_free (check, EMPTY); 1822 array_free (check, EMPTY);
1467#if EV_ASYNC_ENABLE 1823#if EV_ASYNC_ENABLE
1468 array_free (async, EMPTY); 1824 array_free (async, EMPTY);
1469#endif 1825#endif
1470 1826
1471 backend = 0; 1827 backend = 0;
1828
1829#if EV_MULTIPLICITY
1830 if (ev_is_default_loop (EV_A))
1831#endif
1832 ev_default_loop_ptr = 0;
1833#if EV_MULTIPLICITY
1834 else
1835 ev_free (EV_A);
1836#endif
1472} 1837}
1473 1838
1474#if EV_USE_INOTIFY 1839#if EV_USE_INOTIFY
1475void inline_size infy_fork (EV_P); 1840inline_size void infy_fork (EV_P);
1476#endif 1841#endif
1477 1842
1478void inline_size 1843inline_size void
1479loop_fork (EV_P) 1844loop_fork (EV_P)
1480{ 1845{
1481#if EV_USE_PORT 1846#if EV_USE_PORT
1482 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1847 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1483#endif 1848#endif
… …
1489#endif 1854#endif
1490#if EV_USE_INOTIFY 1855#if EV_USE_INOTIFY
1491 infy_fork (EV_A); 1856 infy_fork (EV_A);
1492#endif 1857#endif
1493 1858
1494 if (ev_is_active (&pipeev)) 1859 if (ev_is_active (&pipe_w))
1495 { 1860 {
1496 /* this "locks" the handlers against writing to the pipe */ 1861 /* this "locks" the handlers against writing to the pipe */
1497 /* while we modify the fd vars */ 1862 /* while we modify the fd vars */
1498 gotsig = 1; 1863 sig_pending = 1;
1499#if EV_ASYNC_ENABLE 1864#if EV_ASYNC_ENABLE
1500 gotasync = 1; 1865 async_pending = 1;
1501#endif 1866#endif
1502 1867
1503 ev_ref (EV_A); 1868 ev_ref (EV_A);
1504 ev_io_stop (EV_A_ &pipeev); 1869 ev_io_stop (EV_A_ &pipe_w);
1505 1870
1506#if EV_USE_EVENTFD 1871#if EV_USE_EVENTFD
1507 if (evfd >= 0) 1872 if (evfd >= 0)
1508 close (evfd); 1873 close (evfd);
1509#endif 1874#endif
1510 1875
1511 if (evpipe [0] >= 0) 1876 if (evpipe [0] >= 0)
1512 { 1877 {
1513 close (evpipe [0]); 1878 EV_WIN32_CLOSE_FD (evpipe [0]);
1514 close (evpipe [1]); 1879 EV_WIN32_CLOSE_FD (evpipe [1]);
1515 } 1880 }
1516 1881
1882#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1517 evpipe_init (EV_A); 1883 evpipe_init (EV_A);
1518 /* now iterate over everything, in case we missed something */ 1884 /* now iterate over everything, in case we missed something */
1519 pipecb (EV_A_ &pipeev, EV_READ); 1885 pipecb (EV_A_ &pipe_w, EV_READ);
1886#endif
1520 } 1887 }
1521 1888
1522 postfork = 0; 1889 postfork = 0;
1523} 1890}
1524 1891
1525#if EV_MULTIPLICITY 1892#if EV_MULTIPLICITY
1526 1893
1527struct ev_loop * 1894struct ev_loop *
1528ev_loop_new (unsigned int flags) 1895ev_loop_new (unsigned int flags)
1529{ 1896{
1530 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1897 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1531 1898
1532 memset (loop, 0, sizeof (struct ev_loop)); 1899 memset (EV_A, 0, sizeof (struct ev_loop));
1533
1534 loop_init (EV_A_ flags); 1900 loop_init (EV_A_ flags);
1535 1901
1536 if (ev_backend (EV_A)) 1902 if (ev_backend (EV_A))
1537 return loop; 1903 return EV_A;
1538 1904
1905 ev_free (EV_A);
1539 return 0; 1906 return 0;
1540} 1907}
1541 1908
1542void 1909#endif /* multiplicity */
1543ev_loop_destroy (EV_P)
1544{
1545 loop_destroy (EV_A);
1546 ev_free (loop);
1547}
1548
1549void
1550ev_loop_fork (EV_P)
1551{
1552 postfork = 1; /* must be in line with ev_default_fork */
1553}
1554 1910
1555#if EV_VERIFY 1911#if EV_VERIFY
1556static void noinline 1912static void noinline
1557verify_watcher (EV_P_ W w) 1913verify_watcher (EV_P_ W w)
1558{ 1914{
… …
1586 verify_watcher (EV_A_ ws [cnt]); 1942 verify_watcher (EV_A_ ws [cnt]);
1587 } 1943 }
1588} 1944}
1589#endif 1945#endif
1590 1946
1947#if EV_FEATURE_API
1591void 1948void
1592ev_loop_verify (EV_P) 1949ev_verify (EV_P)
1593{ 1950{
1594#if EV_VERIFY 1951#if EV_VERIFY
1595 int i; 1952 int i;
1596 WL w; 1953 WL w;
1597 1954
… …
1631#if EV_FORK_ENABLE 1988#if EV_FORK_ENABLE
1632 assert (forkmax >= forkcnt); 1989 assert (forkmax >= forkcnt);
1633 array_verify (EV_A_ (W *)forks, forkcnt); 1990 array_verify (EV_A_ (W *)forks, forkcnt);
1634#endif 1991#endif
1635 1992
1993#if EV_CLEANUP_ENABLE
1994 assert (cleanupmax >= cleanupcnt);
1995 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
1996#endif
1997
1636#if EV_ASYNC_ENABLE 1998#if EV_ASYNC_ENABLE
1637 assert (asyncmax >= asynccnt); 1999 assert (asyncmax >= asynccnt);
1638 array_verify (EV_A_ (W *)asyncs, asynccnt); 2000 array_verify (EV_A_ (W *)asyncs, asynccnt);
1639#endif 2001#endif
1640 2002
2003#if EV_PREPARE_ENABLE
1641 assert (preparemax >= preparecnt); 2004 assert (preparemax >= preparecnt);
1642 array_verify (EV_A_ (W *)prepares, preparecnt); 2005 array_verify (EV_A_ (W *)prepares, preparecnt);
2006#endif
1643 2007
2008#if EV_CHECK_ENABLE
1644 assert (checkmax >= checkcnt); 2009 assert (checkmax >= checkcnt);
1645 array_verify (EV_A_ (W *)checks, checkcnt); 2010 array_verify (EV_A_ (W *)checks, checkcnt);
2011#endif
1646 2012
1647# if 0 2013# if 0
2014#if EV_CHILD_ENABLE
1648 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2015 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1649 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 2016 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2017#endif
1650# endif 2018# endif
1651#endif 2019#endif
1652} 2020}
1653 2021#endif
1654#endif /* multiplicity */
1655 2022
1656#if EV_MULTIPLICITY 2023#if EV_MULTIPLICITY
1657struct ev_loop * 2024struct ev_loop *
1658ev_default_loop_init (unsigned int flags)
1659#else 2025#else
1660int 2026int
2027#endif
1661ev_default_loop (unsigned int flags) 2028ev_default_loop (unsigned int flags)
1662#endif
1663{ 2029{
1664 if (!ev_default_loop_ptr) 2030 if (!ev_default_loop_ptr)
1665 { 2031 {
1666#if EV_MULTIPLICITY 2032#if EV_MULTIPLICITY
1667 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2033 EV_P = ev_default_loop_ptr = &default_loop_struct;
1668#else 2034#else
1669 ev_default_loop_ptr = 1; 2035 ev_default_loop_ptr = 1;
1670#endif 2036#endif
1671 2037
1672 loop_init (EV_A_ flags); 2038 loop_init (EV_A_ flags);
1673 2039
1674 if (ev_backend (EV_A)) 2040 if (ev_backend (EV_A))
1675 { 2041 {
1676#ifndef _WIN32 2042#if EV_CHILD_ENABLE
1677 ev_signal_init (&childev, childcb, SIGCHLD); 2043 ev_signal_init (&childev, childcb, SIGCHLD);
1678 ev_set_priority (&childev, EV_MAXPRI); 2044 ev_set_priority (&childev, EV_MAXPRI);
1679 ev_signal_start (EV_A_ &childev); 2045 ev_signal_start (EV_A_ &childev);
1680 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2046 ev_unref (EV_A); /* child watcher should not keep loop alive */
1681#endif 2047#endif
… …
1686 2052
1687 return ev_default_loop_ptr; 2053 return ev_default_loop_ptr;
1688} 2054}
1689 2055
1690void 2056void
1691ev_default_destroy (void) 2057ev_loop_fork (EV_P)
1692{ 2058{
1693#if EV_MULTIPLICITY
1694 struct ev_loop *loop = ev_default_loop_ptr;
1695#endif
1696
1697 ev_default_loop_ptr = 0;
1698
1699#ifndef _WIN32
1700 ev_ref (EV_A); /* child watcher */
1701 ev_signal_stop (EV_A_ &childev);
1702#endif
1703
1704 loop_destroy (EV_A);
1705}
1706
1707void
1708ev_default_fork (void)
1709{
1710#if EV_MULTIPLICITY
1711 struct ev_loop *loop = ev_default_loop_ptr;
1712#endif
1713
1714 postfork = 1; /* must be in line with ev_loop_fork */ 2059 postfork = 1; /* must be in line with ev_default_fork */
1715} 2060}
1716 2061
1717/*****************************************************************************/ 2062/*****************************************************************************/
1718 2063
1719void 2064void
1720ev_invoke (EV_P_ void *w, int revents) 2065ev_invoke (EV_P_ void *w, int revents)
1721{ 2066{
1722 EV_CB_INVOKE ((W)w, revents); 2067 EV_CB_INVOKE ((W)w, revents);
1723} 2068}
1724 2069
1725void inline_speed 2070unsigned int
1726call_pending (EV_P) 2071ev_pending_count (EV_P)
2072{
2073 int pri;
2074 unsigned int count = 0;
2075
2076 for (pri = NUMPRI; pri--; )
2077 count += pendingcnt [pri];
2078
2079 return count;
2080}
2081
2082void noinline
2083ev_invoke_pending (EV_P)
1727{ 2084{
1728 int pri; 2085 int pri;
1729 2086
1730 for (pri = NUMPRI; pri--; ) 2087 for (pri = NUMPRI; pri--; )
1731 while (pendingcnt [pri]) 2088 while (pendingcnt [pri])
1732 { 2089 {
1733 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2090 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1734 2091
1735 if (expect_true (p->w))
1736 {
1737 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 2092 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2093 /* ^ this is no longer true, as pending_w could be here */
1738 2094
1739 p->w->pending = 0; 2095 p->w->pending = 0;
1740 EV_CB_INVOKE (p->w, p->events); 2096 EV_CB_INVOKE (p->w, p->events);
1741 EV_FREQUENT_CHECK; 2097 EV_FREQUENT_CHECK;
1742 }
1743 } 2098 }
1744} 2099}
1745 2100
1746#if EV_IDLE_ENABLE 2101#if EV_IDLE_ENABLE
1747void inline_size 2102/* make idle watchers pending. this handles the "call-idle */
2103/* only when higher priorities are idle" logic */
2104inline_size void
1748idle_reify (EV_P) 2105idle_reify (EV_P)
1749{ 2106{
1750 if (expect_false (idleall)) 2107 if (expect_false (idleall))
1751 { 2108 {
1752 int pri; 2109 int pri;
… …
1764 } 2121 }
1765 } 2122 }
1766} 2123}
1767#endif 2124#endif
1768 2125
1769void inline_size 2126/* make timers pending */
2127inline_size void
1770timers_reify (EV_P) 2128timers_reify (EV_P)
1771{ 2129{
1772 EV_FREQUENT_CHECK; 2130 EV_FREQUENT_CHECK;
1773 2131
1774 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2132 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1775 { 2133 {
1776 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2134 do
1777
1778 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1779
1780 /* first reschedule or stop timer */
1781 if (w->repeat)
1782 { 2135 {
2136 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2137
2138 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2139
2140 /* first reschedule or stop timer */
2141 if (w->repeat)
2142 {
1783 ev_at (w) += w->repeat; 2143 ev_at (w) += w->repeat;
1784 if (ev_at (w) < mn_now) 2144 if (ev_at (w) < mn_now)
1785 ev_at (w) = mn_now; 2145 ev_at (w) = mn_now;
1786 2146
1787 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2147 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1788 2148
1789 ANHE_at_cache (timers [HEAP0]); 2149 ANHE_at_cache (timers [HEAP0]);
1790 downheap (timers, timercnt, HEAP0); 2150 downheap (timers, timercnt, HEAP0);
2151 }
2152 else
2153 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2154
2155 EV_FREQUENT_CHECK;
2156 feed_reverse (EV_A_ (W)w);
1791 } 2157 }
1792 else 2158 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1793 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1794 2159
1795 EV_FREQUENT_CHECK; 2160 feed_reverse_done (EV_A_ EV_TIMER);
1796 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1797 } 2161 }
1798} 2162}
1799 2163
1800#if EV_PERIODIC_ENABLE 2164#if EV_PERIODIC_ENABLE
1801void inline_size 2165/* make periodics pending */
2166inline_size void
1802periodics_reify (EV_P) 2167periodics_reify (EV_P)
1803{ 2168{
1804 EV_FREQUENT_CHECK; 2169 EV_FREQUENT_CHECK;
1805 2170
1806 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2171 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1807 { 2172 {
1808 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2173 int feed_count = 0;
1809 2174
1810 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/ 2175 do
1811
1812 /* first reschedule or stop timer */
1813 if (w->reschedule_cb)
1814 { 2176 {
2177 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2178
2179 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2180
2181 /* first reschedule or stop timer */
2182 if (w->reschedule_cb)
2183 {
1815 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2184 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1816 2185
1817 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2186 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1818 2187
1819 ANHE_at_cache (periodics [HEAP0]); 2188 ANHE_at_cache (periodics [HEAP0]);
1820 downheap (periodics, periodiccnt, HEAP0); 2189 downheap (periodics, periodiccnt, HEAP0);
2190 }
2191 else if (w->interval)
2192 {
2193 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2194 /* if next trigger time is not sufficiently in the future, put it there */
2195 /* this might happen because of floating point inexactness */
2196 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2197 {
2198 ev_at (w) += w->interval;
2199
2200 /* if interval is unreasonably low we might still have a time in the past */
2201 /* so correct this. this will make the periodic very inexact, but the user */
2202 /* has effectively asked to get triggered more often than possible */
2203 if (ev_at (w) < ev_rt_now)
2204 ev_at (w) = ev_rt_now;
2205 }
2206
2207 ANHE_at_cache (periodics [HEAP0]);
2208 downheap (periodics, periodiccnt, HEAP0);
2209 }
2210 else
2211 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2212
2213 EV_FREQUENT_CHECK;
2214 feed_reverse (EV_A_ (W)w);
1821 } 2215 }
1822 else if (w->interval) 2216 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1823 {
1824 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1825 /* if next trigger time is not sufficiently in the future, put it there */
1826 /* this might happen because of floating point inexactness */
1827 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1828 {
1829 ev_at (w) += w->interval;
1830 2217
1831 /* if interval is unreasonably low we might still have a time in the past */
1832 /* so correct this. this will make the periodic very inexact, but the user */
1833 /* has effectively asked to get triggered more often than possible */
1834 if (ev_at (w) < ev_rt_now)
1835 ev_at (w) = ev_rt_now;
1836 }
1837
1838 ANHE_at_cache (periodics [HEAP0]);
1839 downheap (periodics, periodiccnt, HEAP0);
1840 }
1841 else
1842 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1843
1844 EV_FREQUENT_CHECK;
1845 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2218 feed_reverse_done (EV_A_ EV_PERIODIC);
1846 } 2219 }
1847} 2220}
1848 2221
2222/* simply recalculate all periodics */
2223/* TODO: maybe ensure that at least one event happens when jumping forward? */
1849static void noinline 2224static void noinline
1850periodics_reschedule (EV_P) 2225periodics_reschedule (EV_P)
1851{ 2226{
1852 int i; 2227 int i;
1853 2228
… …
1866 2241
1867 reheap (periodics, periodiccnt); 2242 reheap (periodics, periodiccnt);
1868} 2243}
1869#endif 2244#endif
1870 2245
1871void inline_speed 2246/* adjust all timers by a given offset */
2247static void noinline
2248timers_reschedule (EV_P_ ev_tstamp adjust)
2249{
2250 int i;
2251
2252 for (i = 0; i < timercnt; ++i)
2253 {
2254 ANHE *he = timers + i + HEAP0;
2255 ANHE_w (*he)->at += adjust;
2256 ANHE_at_cache (*he);
2257 }
2258}
2259
2260/* fetch new monotonic and realtime times from the kernel */
2261/* also detect if there was a timejump, and act accordingly */
2262inline_speed void
1872time_update (EV_P_ ev_tstamp max_block) 2263time_update (EV_P_ ev_tstamp max_block)
1873{ 2264{
1874 int i;
1875
1876#if EV_USE_MONOTONIC 2265#if EV_USE_MONOTONIC
1877 if (expect_true (have_monotonic)) 2266 if (expect_true (have_monotonic))
1878 { 2267 {
2268 int i;
1879 ev_tstamp odiff = rtmn_diff; 2269 ev_tstamp odiff = rtmn_diff;
1880 2270
1881 mn_now = get_clock (); 2271 mn_now = get_clock ();
1882 2272
1883 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2273 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1909 ev_rt_now = ev_time (); 2299 ev_rt_now = ev_time ();
1910 mn_now = get_clock (); 2300 mn_now = get_clock ();
1911 now_floor = mn_now; 2301 now_floor = mn_now;
1912 } 2302 }
1913 2303
2304 /* no timer adjustment, as the monotonic clock doesn't jump */
2305 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1914# if EV_PERIODIC_ENABLE 2306# if EV_PERIODIC_ENABLE
1915 periodics_reschedule (EV_A); 2307 periodics_reschedule (EV_A);
1916# endif 2308# endif
1917 /* no timer adjustment, as the monotonic clock doesn't jump */
1918 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1919 } 2309 }
1920 else 2310 else
1921#endif 2311#endif
1922 { 2312 {
1923 ev_rt_now = ev_time (); 2313 ev_rt_now = ev_time ();
1924 2314
1925 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2315 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1926 { 2316 {
2317 /* adjust timers. this is easy, as the offset is the same for all of them */
2318 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1927#if EV_PERIODIC_ENABLE 2319#if EV_PERIODIC_ENABLE
1928 periodics_reschedule (EV_A); 2320 periodics_reschedule (EV_A);
1929#endif 2321#endif
1930 /* adjust timers. this is easy, as the offset is the same for all of them */
1931 for (i = 0; i < timercnt; ++i)
1932 {
1933 ANHE *he = timers + i + HEAP0;
1934 ANHE_w (*he)->at += ev_rt_now - mn_now;
1935 ANHE_at_cache (*he);
1936 }
1937 } 2322 }
1938 2323
1939 mn_now = ev_rt_now; 2324 mn_now = ev_rt_now;
1940 } 2325 }
1941} 2326}
1942 2327
1943void 2328void
1944ev_ref (EV_P)
1945{
1946 ++activecnt;
1947}
1948
1949void
1950ev_unref (EV_P)
1951{
1952 --activecnt;
1953}
1954
1955void
1956ev_now_update (EV_P)
1957{
1958 time_update (EV_A_ 1e100);
1959}
1960
1961static int loop_done;
1962
1963void
1964ev_loop (EV_P_ int flags) 2329ev_run (EV_P_ int flags)
1965{ 2330{
2331#if EV_FEATURE_API
2332 ++loop_depth;
2333#endif
2334
2335 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2336
1966 loop_done = EVUNLOOP_CANCEL; 2337 loop_done = EVBREAK_CANCEL;
1967 2338
1968 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2339 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1969 2340
1970 do 2341 do
1971 { 2342 {
1972#if EV_VERIFY >= 2 2343#if EV_VERIFY >= 2
1973 ev_loop_verify (EV_A); 2344 ev_verify (EV_A);
1974#endif 2345#endif
1975 2346
1976#ifndef _WIN32 2347#ifndef _WIN32
1977 if (expect_false (curpid)) /* penalise the forking check even more */ 2348 if (expect_false (curpid)) /* penalise the forking check even more */
1978 if (expect_false (getpid () != curpid)) 2349 if (expect_false (getpid () != curpid))
… …
1986 /* we might have forked, so queue fork handlers */ 2357 /* we might have forked, so queue fork handlers */
1987 if (expect_false (postfork)) 2358 if (expect_false (postfork))
1988 if (forkcnt) 2359 if (forkcnt)
1989 { 2360 {
1990 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2361 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1991 call_pending (EV_A); 2362 EV_INVOKE_PENDING;
1992 } 2363 }
1993#endif 2364#endif
1994 2365
2366#if EV_PREPARE_ENABLE
1995 /* queue prepare watchers (and execute them) */ 2367 /* queue prepare watchers (and execute them) */
1996 if (expect_false (preparecnt)) 2368 if (expect_false (preparecnt))
1997 { 2369 {
1998 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2370 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1999 call_pending (EV_A); 2371 EV_INVOKE_PENDING;
2000 } 2372 }
2373#endif
2374
2375 if (expect_false (loop_done))
2376 break;
2001 2377
2002 /* we might have forked, so reify kernel state if necessary */ 2378 /* we might have forked, so reify kernel state if necessary */
2003 if (expect_false (postfork)) 2379 if (expect_false (postfork))
2004 loop_fork (EV_A); 2380 loop_fork (EV_A);
2005 2381
… …
2009 /* calculate blocking time */ 2385 /* calculate blocking time */
2010 { 2386 {
2011 ev_tstamp waittime = 0.; 2387 ev_tstamp waittime = 0.;
2012 ev_tstamp sleeptime = 0.; 2388 ev_tstamp sleeptime = 0.;
2013 2389
2390 /* remember old timestamp for io_blocktime calculation */
2391 ev_tstamp prev_mn_now = mn_now;
2392
2393 /* update time to cancel out callback processing overhead */
2394 time_update (EV_A_ 1e100);
2395
2014 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2396 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2015 { 2397 {
2016 /* update time to cancel out callback processing overhead */
2017 time_update (EV_A_ 1e100);
2018
2019 waittime = MAX_BLOCKTIME; 2398 waittime = MAX_BLOCKTIME;
2020 2399
2021 if (timercnt) 2400 if (timercnt)
2022 { 2401 {
2023 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2402 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2030 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2409 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2031 if (waittime > to) waittime = to; 2410 if (waittime > to) waittime = to;
2032 } 2411 }
2033#endif 2412#endif
2034 2413
2414 /* don't let timeouts decrease the waittime below timeout_blocktime */
2035 if (expect_false (waittime < timeout_blocktime)) 2415 if (expect_false (waittime < timeout_blocktime))
2036 waittime = timeout_blocktime; 2416 waittime = timeout_blocktime;
2037 2417
2038 sleeptime = waittime - backend_fudge; 2418 /* extra check because io_blocktime is commonly 0 */
2039
2040 if (expect_true (sleeptime > io_blocktime)) 2419 if (expect_false (io_blocktime))
2041 sleeptime = io_blocktime;
2042
2043 if (sleeptime)
2044 { 2420 {
2421 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2422
2423 if (sleeptime > waittime - backend_fudge)
2424 sleeptime = waittime - backend_fudge;
2425
2426 if (expect_true (sleeptime > 0.))
2427 {
2045 ev_sleep (sleeptime); 2428 ev_sleep (sleeptime);
2046 waittime -= sleeptime; 2429 waittime -= sleeptime;
2430 }
2047 } 2431 }
2048 } 2432 }
2049 2433
2434#if EV_FEATURE_API
2050 ++loop_count; 2435 ++loop_count;
2436#endif
2437 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2051 backend_poll (EV_A_ waittime); 2438 backend_poll (EV_A_ waittime);
2439 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2052 2440
2053 /* update ev_rt_now, do magic */ 2441 /* update ev_rt_now, do magic */
2054 time_update (EV_A_ waittime + sleeptime); 2442 time_update (EV_A_ waittime + sleeptime);
2055 } 2443 }
2056 2444
… …
2063#if EV_IDLE_ENABLE 2451#if EV_IDLE_ENABLE
2064 /* queue idle watchers unless other events are pending */ 2452 /* queue idle watchers unless other events are pending */
2065 idle_reify (EV_A); 2453 idle_reify (EV_A);
2066#endif 2454#endif
2067 2455
2456#if EV_CHECK_ENABLE
2068 /* queue check watchers, to be executed first */ 2457 /* queue check watchers, to be executed first */
2069 if (expect_false (checkcnt)) 2458 if (expect_false (checkcnt))
2070 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2459 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2460#endif
2071 2461
2072 call_pending (EV_A); 2462 EV_INVOKE_PENDING;
2073 } 2463 }
2074 while (expect_true ( 2464 while (expect_true (
2075 activecnt 2465 activecnt
2076 && !loop_done 2466 && !loop_done
2077 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2467 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2078 )); 2468 ));
2079 2469
2080 if (loop_done == EVUNLOOP_ONE) 2470 if (loop_done == EVBREAK_ONE)
2081 loop_done = EVUNLOOP_CANCEL; 2471 loop_done = EVBREAK_CANCEL;
2082}
2083 2472
2473#if EV_FEATURE_API
2474 --loop_depth;
2475#endif
2476}
2477
2084void 2478void
2085ev_unloop (EV_P_ int how) 2479ev_break (EV_P_ int how)
2086{ 2480{
2087 loop_done = how; 2481 loop_done = how;
2088} 2482}
2089 2483
2484void
2485ev_ref (EV_P)
2486{
2487 ++activecnt;
2488}
2489
2490void
2491ev_unref (EV_P)
2492{
2493 --activecnt;
2494}
2495
2496void
2497ev_now_update (EV_P)
2498{
2499 time_update (EV_A_ 1e100);
2500}
2501
2502void
2503ev_suspend (EV_P)
2504{
2505 ev_now_update (EV_A);
2506}
2507
2508void
2509ev_resume (EV_P)
2510{
2511 ev_tstamp mn_prev = mn_now;
2512
2513 ev_now_update (EV_A);
2514 timers_reschedule (EV_A_ mn_now - mn_prev);
2515#if EV_PERIODIC_ENABLE
2516 /* TODO: really do this? */
2517 periodics_reschedule (EV_A);
2518#endif
2519}
2520
2090/*****************************************************************************/ 2521/*****************************************************************************/
2522/* singly-linked list management, used when the expected list length is short */
2091 2523
2092void inline_size 2524inline_size void
2093wlist_add (WL *head, WL elem) 2525wlist_add (WL *head, WL elem)
2094{ 2526{
2095 elem->next = *head; 2527 elem->next = *head;
2096 *head = elem; 2528 *head = elem;
2097} 2529}
2098 2530
2099void inline_size 2531inline_size void
2100wlist_del (WL *head, WL elem) 2532wlist_del (WL *head, WL elem)
2101{ 2533{
2102 while (*head) 2534 while (*head)
2103 { 2535 {
2104 if (*head == elem) 2536 if (expect_true (*head == elem))
2105 { 2537 {
2106 *head = elem->next; 2538 *head = elem->next;
2107 return; 2539 break;
2108 } 2540 }
2109 2541
2110 head = &(*head)->next; 2542 head = &(*head)->next;
2111 } 2543 }
2112} 2544}
2113 2545
2114void inline_speed 2546/* internal, faster, version of ev_clear_pending */
2547inline_speed void
2115clear_pending (EV_P_ W w) 2548clear_pending (EV_P_ W w)
2116{ 2549{
2117 if (w->pending) 2550 if (w->pending)
2118 { 2551 {
2119 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2552 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2120 w->pending = 0; 2553 w->pending = 0;
2121 } 2554 }
2122} 2555}
2123 2556
2124int 2557int
… …
2128 int pending = w_->pending; 2561 int pending = w_->pending;
2129 2562
2130 if (expect_true (pending)) 2563 if (expect_true (pending))
2131 { 2564 {
2132 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2565 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2566 p->w = (W)&pending_w;
2133 w_->pending = 0; 2567 w_->pending = 0;
2134 p->w = 0;
2135 return p->events; 2568 return p->events;
2136 } 2569 }
2137 else 2570 else
2138 return 0; 2571 return 0;
2139} 2572}
2140 2573
2141void inline_size 2574inline_size void
2142pri_adjust (EV_P_ W w) 2575pri_adjust (EV_P_ W w)
2143{ 2576{
2144 int pri = w->priority; 2577 int pri = ev_priority (w);
2145 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2578 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2146 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2579 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2147 w->priority = pri; 2580 ev_set_priority (w, pri);
2148} 2581}
2149 2582
2150void inline_speed 2583inline_speed void
2151ev_start (EV_P_ W w, int active) 2584ev_start (EV_P_ W w, int active)
2152{ 2585{
2153 pri_adjust (EV_A_ w); 2586 pri_adjust (EV_A_ w);
2154 w->active = active; 2587 w->active = active;
2155 ev_ref (EV_A); 2588 ev_ref (EV_A);
2156} 2589}
2157 2590
2158void inline_size 2591inline_size void
2159ev_stop (EV_P_ W w) 2592ev_stop (EV_P_ W w)
2160{ 2593{
2161 ev_unref (EV_A); 2594 ev_unref (EV_A);
2162 w->active = 0; 2595 w->active = 0;
2163} 2596}
… …
2171 2604
2172 if (expect_false (ev_is_active (w))) 2605 if (expect_false (ev_is_active (w)))
2173 return; 2606 return;
2174 2607
2175 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2608 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2176 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2609 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2177 2610
2178 EV_FREQUENT_CHECK; 2611 EV_FREQUENT_CHECK;
2179 2612
2180 ev_start (EV_A_ (W)w, 1); 2613 ev_start (EV_A_ (W)w, 1);
2181 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2614 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2182 wlist_add (&anfds[fd].head, (WL)w); 2615 wlist_add (&anfds[fd].head, (WL)w);
2183 2616
2184 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2617 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2185 w->events &= ~EV__IOFDSET; 2618 w->events &= ~EV__IOFDSET;
2186 2619
2187 EV_FREQUENT_CHECK; 2620 EV_FREQUENT_CHECK;
2188} 2621}
2189 2622
… …
2199 EV_FREQUENT_CHECK; 2632 EV_FREQUENT_CHECK;
2200 2633
2201 wlist_del (&anfds[w->fd].head, (WL)w); 2634 wlist_del (&anfds[w->fd].head, (WL)w);
2202 ev_stop (EV_A_ (W)w); 2635 ev_stop (EV_A_ (W)w);
2203 2636
2204 fd_change (EV_A_ w->fd, 1); 2637 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2205 2638
2206 EV_FREQUENT_CHECK; 2639 EV_FREQUENT_CHECK;
2207} 2640}
2208 2641
2209void noinline 2642void noinline
… …
2251 timers [active] = timers [timercnt + HEAP0]; 2684 timers [active] = timers [timercnt + HEAP0];
2252 adjustheap (timers, timercnt, active); 2685 adjustheap (timers, timercnt, active);
2253 } 2686 }
2254 } 2687 }
2255 2688
2256 EV_FREQUENT_CHECK;
2257
2258 ev_at (w) -= mn_now; 2689 ev_at (w) -= mn_now;
2259 2690
2260 ev_stop (EV_A_ (W)w); 2691 ev_stop (EV_A_ (W)w);
2692
2693 EV_FREQUENT_CHECK;
2261} 2694}
2262 2695
2263void noinline 2696void noinline
2264ev_timer_again (EV_P_ ev_timer *w) 2697ev_timer_again (EV_P_ ev_timer *w)
2265{ 2698{
… …
2283 } 2716 }
2284 2717
2285 EV_FREQUENT_CHECK; 2718 EV_FREQUENT_CHECK;
2286} 2719}
2287 2720
2721ev_tstamp
2722ev_timer_remaining (EV_P_ ev_timer *w)
2723{
2724 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2725}
2726
2288#if EV_PERIODIC_ENABLE 2727#if EV_PERIODIC_ENABLE
2289void noinline 2728void noinline
2290ev_periodic_start (EV_P_ ev_periodic *w) 2729ev_periodic_start (EV_P_ ev_periodic *w)
2291{ 2730{
2292 if (expect_false (ev_is_active (w))) 2731 if (expect_false (ev_is_active (w)))
… …
2338 periodics [active] = periodics [periodiccnt + HEAP0]; 2777 periodics [active] = periodics [periodiccnt + HEAP0];
2339 adjustheap (periodics, periodiccnt, active); 2778 adjustheap (periodics, periodiccnt, active);
2340 } 2779 }
2341 } 2780 }
2342 2781
2343 EV_FREQUENT_CHECK;
2344
2345 ev_stop (EV_A_ (W)w); 2782 ev_stop (EV_A_ (W)w);
2783
2784 EV_FREQUENT_CHECK;
2346} 2785}
2347 2786
2348void noinline 2787void noinline
2349ev_periodic_again (EV_P_ ev_periodic *w) 2788ev_periodic_again (EV_P_ ev_periodic *w)
2350{ 2789{
… …
2356 2795
2357#ifndef SA_RESTART 2796#ifndef SA_RESTART
2358# define SA_RESTART 0 2797# define SA_RESTART 0
2359#endif 2798#endif
2360 2799
2800#if EV_SIGNAL_ENABLE
2801
2361void noinline 2802void noinline
2362ev_signal_start (EV_P_ ev_signal *w) 2803ev_signal_start (EV_P_ ev_signal *w)
2363{ 2804{
2364#if EV_MULTIPLICITY
2365 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2366#endif
2367 if (expect_false (ev_is_active (w))) 2805 if (expect_false (ev_is_active (w)))
2368 return; 2806 return;
2369 2807
2370 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2808 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2371 2809
2372 evpipe_init (EV_A); 2810#if EV_MULTIPLICITY
2811 assert (("libev: a signal must not be attached to two different loops",
2812 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2373 2813
2374 EV_FREQUENT_CHECK; 2814 signals [w->signum - 1].loop = EV_A;
2815#endif
2375 2816
2817 EV_FREQUENT_CHECK;
2818
2819#if EV_USE_SIGNALFD
2820 if (sigfd == -2)
2376 { 2821 {
2377#ifndef _WIN32 2822 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2378 sigset_t full, prev; 2823 if (sigfd < 0 && errno == EINVAL)
2379 sigfillset (&full); 2824 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2380 sigprocmask (SIG_SETMASK, &full, &prev);
2381#endif
2382 2825
2383 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2826 if (sigfd >= 0)
2827 {
2828 fd_intern (sigfd); /* doing it twice will not hurt */
2384 2829
2385#ifndef _WIN32 2830 sigemptyset (&sigfd_set);
2386 sigprocmask (SIG_SETMASK, &prev, 0); 2831
2387#endif 2832 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2833 ev_set_priority (&sigfd_w, EV_MAXPRI);
2834 ev_io_start (EV_A_ &sigfd_w);
2835 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2836 }
2388 } 2837 }
2838
2839 if (sigfd >= 0)
2840 {
2841 /* TODO: check .head */
2842 sigaddset (&sigfd_set, w->signum);
2843 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2844
2845 signalfd (sigfd, &sigfd_set, 0);
2846 }
2847#endif
2389 2848
2390 ev_start (EV_A_ (W)w, 1); 2849 ev_start (EV_A_ (W)w, 1);
2391 wlist_add (&signals [w->signum - 1].head, (WL)w); 2850 wlist_add (&signals [w->signum - 1].head, (WL)w);
2392 2851
2393 if (!((WL)w)->next) 2852 if (!((WL)w)->next)
2853# if EV_USE_SIGNALFD
2854 if (sigfd < 0) /*TODO*/
2855# endif
2394 { 2856 {
2395#if _WIN32 2857# ifdef _WIN32
2858 evpipe_init (EV_A);
2859
2396 signal (w->signum, ev_sighandler); 2860 signal (w->signum, ev_sighandler);
2397#else 2861# else
2398 struct sigaction sa; 2862 struct sigaction sa;
2863
2864 evpipe_init (EV_A);
2865
2399 sa.sa_handler = ev_sighandler; 2866 sa.sa_handler = ev_sighandler;
2400 sigfillset (&sa.sa_mask); 2867 sigfillset (&sa.sa_mask);
2401 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2868 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2402 sigaction (w->signum, &sa, 0); 2869 sigaction (w->signum, &sa, 0);
2870
2871 sigemptyset (&sa.sa_mask);
2872 sigaddset (&sa.sa_mask, w->signum);
2873 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2403#endif 2874#endif
2404 } 2875 }
2405 2876
2406 EV_FREQUENT_CHECK; 2877 EV_FREQUENT_CHECK;
2407} 2878}
2408 2879
2409void noinline 2880void noinline
… …
2417 2888
2418 wlist_del (&signals [w->signum - 1].head, (WL)w); 2889 wlist_del (&signals [w->signum - 1].head, (WL)w);
2419 ev_stop (EV_A_ (W)w); 2890 ev_stop (EV_A_ (W)w);
2420 2891
2421 if (!signals [w->signum - 1].head) 2892 if (!signals [w->signum - 1].head)
2893 {
2894#if EV_MULTIPLICITY
2895 signals [w->signum - 1].loop = 0; /* unattach from signal */
2896#endif
2897#if EV_USE_SIGNALFD
2898 if (sigfd >= 0)
2899 {
2900 sigset_t ss;
2901
2902 sigemptyset (&ss);
2903 sigaddset (&ss, w->signum);
2904 sigdelset (&sigfd_set, w->signum);
2905
2906 signalfd (sigfd, &sigfd_set, 0);
2907 sigprocmask (SIG_UNBLOCK, &ss, 0);
2908 }
2909 else
2910#endif
2422 signal (w->signum, SIG_DFL); 2911 signal (w->signum, SIG_DFL);
2912 }
2423 2913
2424 EV_FREQUENT_CHECK; 2914 EV_FREQUENT_CHECK;
2425} 2915}
2916
2917#endif
2918
2919#if EV_CHILD_ENABLE
2426 2920
2427void 2921void
2428ev_child_start (EV_P_ ev_child *w) 2922ev_child_start (EV_P_ ev_child *w)
2429{ 2923{
2430#if EV_MULTIPLICITY 2924#if EV_MULTIPLICITY
… …
2434 return; 2928 return;
2435 2929
2436 EV_FREQUENT_CHECK; 2930 EV_FREQUENT_CHECK;
2437 2931
2438 ev_start (EV_A_ (W)w, 1); 2932 ev_start (EV_A_ (W)w, 1);
2439 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2933 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2440 2934
2441 EV_FREQUENT_CHECK; 2935 EV_FREQUENT_CHECK;
2442} 2936}
2443 2937
2444void 2938void
… …
2448 if (expect_false (!ev_is_active (w))) 2942 if (expect_false (!ev_is_active (w)))
2449 return; 2943 return;
2450 2944
2451 EV_FREQUENT_CHECK; 2945 EV_FREQUENT_CHECK;
2452 2946
2453 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2947 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2454 ev_stop (EV_A_ (W)w); 2948 ev_stop (EV_A_ (W)w);
2455 2949
2456 EV_FREQUENT_CHECK; 2950 EV_FREQUENT_CHECK;
2457} 2951}
2952
2953#endif
2458 2954
2459#if EV_STAT_ENABLE 2955#if EV_STAT_ENABLE
2460 2956
2461# ifdef _WIN32 2957# ifdef _WIN32
2462# undef lstat 2958# undef lstat
… …
2468#define MIN_STAT_INTERVAL 0.1074891 2964#define MIN_STAT_INTERVAL 0.1074891
2469 2965
2470static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2966static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2471 2967
2472#if EV_USE_INOTIFY 2968#if EV_USE_INOTIFY
2473# define EV_INOTIFY_BUFSIZE 8192 2969
2970/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2971# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2474 2972
2475static void noinline 2973static void noinline
2476infy_add (EV_P_ ev_stat *w) 2974infy_add (EV_P_ ev_stat *w)
2477{ 2975{
2478 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2976 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2479 2977
2480 if (w->wd < 0) 2978 if (w->wd >= 0)
2979 {
2980 struct statfs sfs;
2981
2982 /* now local changes will be tracked by inotify, but remote changes won't */
2983 /* unless the filesystem is known to be local, we therefore still poll */
2984 /* also do poll on <2.6.25, but with normal frequency */
2985
2986 if (!fs_2625)
2987 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2988 else if (!statfs (w->path, &sfs)
2989 && (sfs.f_type == 0x1373 /* devfs */
2990 || sfs.f_type == 0xEF53 /* ext2/3 */
2991 || sfs.f_type == 0x3153464a /* jfs */
2992 || sfs.f_type == 0x52654973 /* reiser3 */
2993 || sfs.f_type == 0x01021994 /* tempfs */
2994 || sfs.f_type == 0x58465342 /* xfs */))
2995 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2996 else
2997 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2481 { 2998 }
2999 else
3000 {
3001 /* can't use inotify, continue to stat */
2482 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3002 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2483 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2484 3003
2485 /* monitor some parent directory for speedup hints */ 3004 /* if path is not there, monitor some parent directory for speedup hints */
2486 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3005 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2487 /* but an efficiency issue only */ 3006 /* but an efficiency issue only */
2488 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3007 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2489 { 3008 {
2490 char path [4096]; 3009 char path [4096];
… …
2506 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3025 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2507 } 3026 }
2508 } 3027 }
2509 3028
2510 if (w->wd >= 0) 3029 if (w->wd >= 0)
2511 {
2512 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3030 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2513 3031
2514 /* now local changes will be tracked by inotify, but remote changes won't */ 3032 /* now re-arm timer, if required */
2515 /* unless the filesystem it known to be local, we therefore still poll */ 3033 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2516 /* also do poll on <2.6.25, but with normal frequency */
2517 struct statfs sfs;
2518
2519 if (fs_2625 && !statfs (w->path, &sfs))
2520 if (sfs.f_type == 0x1373 /* devfs */
2521 || sfs.f_type == 0xEF53 /* ext2/3 */
2522 || sfs.f_type == 0x3153464a /* jfs */
2523 || sfs.f_type == 0x52654973 /* reiser3 */
2524 || sfs.f_type == 0x01021994 /* tempfs */
2525 || sfs.f_type == 0x58465342 /* xfs */)
2526 return;
2527
2528 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2529 ev_timer_again (EV_A_ &w->timer); 3034 ev_timer_again (EV_A_ &w->timer);
2530 } 3035 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2531} 3036}
2532 3037
2533static void noinline 3038static void noinline
2534infy_del (EV_P_ ev_stat *w) 3039infy_del (EV_P_ ev_stat *w)
2535{ 3040{
… …
2538 3043
2539 if (wd < 0) 3044 if (wd < 0)
2540 return; 3045 return;
2541 3046
2542 w->wd = -2; 3047 w->wd = -2;
2543 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3048 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2544 wlist_del (&fs_hash [slot].head, (WL)w); 3049 wlist_del (&fs_hash [slot].head, (WL)w);
2545 3050
2546 /* remove this watcher, if others are watching it, they will rearm */ 3051 /* remove this watcher, if others are watching it, they will rearm */
2547 inotify_rm_watch (fs_fd, wd); 3052 inotify_rm_watch (fs_fd, wd);
2548} 3053}
… …
2550static void noinline 3055static void noinline
2551infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3056infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2552{ 3057{
2553 if (slot < 0) 3058 if (slot < 0)
2554 /* overflow, need to check for all hash slots */ 3059 /* overflow, need to check for all hash slots */
2555 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3060 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2556 infy_wd (EV_A_ slot, wd, ev); 3061 infy_wd (EV_A_ slot, wd, ev);
2557 else 3062 else
2558 { 3063 {
2559 WL w_; 3064 WL w_;
2560 3065
2561 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3066 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2562 { 3067 {
2563 ev_stat *w = (ev_stat *)w_; 3068 ev_stat *w = (ev_stat *)w_;
2564 w_ = w_->next; /* lets us remove this watcher and all before it */ 3069 w_ = w_->next; /* lets us remove this watcher and all before it */
2565 3070
2566 if (w->wd == wd || wd == -1) 3071 if (w->wd == wd || wd == -1)
2567 { 3072 {
2568 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3073 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2569 { 3074 {
2570 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3075 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2571 w->wd = -1; 3076 w->wd = -1;
2572 infy_add (EV_A_ w); /* re-add, no matter what */ 3077 infy_add (EV_A_ w); /* re-add, no matter what */
2573 } 3078 }
2574 3079
2575 stat_timer_cb (EV_A_ &w->timer, 0); 3080 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2580 3085
2581static void 3086static void
2582infy_cb (EV_P_ ev_io *w, int revents) 3087infy_cb (EV_P_ ev_io *w, int revents)
2583{ 3088{
2584 char buf [EV_INOTIFY_BUFSIZE]; 3089 char buf [EV_INOTIFY_BUFSIZE];
2585 struct inotify_event *ev = (struct inotify_event *)buf;
2586 int ofs; 3090 int ofs;
2587 int len = read (fs_fd, buf, sizeof (buf)); 3091 int len = read (fs_fd, buf, sizeof (buf));
2588 3092
2589 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3093 for (ofs = 0; ofs < len; )
3094 {
3095 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2590 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3096 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3097 ofs += sizeof (struct inotify_event) + ev->len;
3098 }
2591} 3099}
2592 3100
2593void inline_size 3101inline_size void
2594check_2625 (EV_P) 3102ev_check_2625 (EV_P)
2595{ 3103{
2596 /* kernels < 2.6.25 are borked 3104 /* kernels < 2.6.25 are borked
2597 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3105 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2598 */ 3106 */
2599 struct utsname buf; 3107 if (ev_linux_version () < 0x020619)
2600 int major, minor, micro;
2601
2602 if (uname (&buf))
2603 return; 3108 return;
2604 3109
2605 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2606 return;
2607
2608 if (major < 2
2609 || (major == 2 && minor < 6)
2610 || (major == 2 && minor == 6 && micro < 25))
2611 return;
2612
2613 fs_2625 = 1; 3110 fs_2625 = 1;
2614} 3111}
2615 3112
2616void inline_size 3113inline_size int
3114infy_newfd (void)
3115{
3116#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3117 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3118 if (fd >= 0)
3119 return fd;
3120#endif
3121 return inotify_init ();
3122}
3123
3124inline_size void
2617infy_init (EV_P) 3125infy_init (EV_P)
2618{ 3126{
2619 if (fs_fd != -2) 3127 if (fs_fd != -2)
2620 return; 3128 return;
2621 3129
2622 fs_fd = -1; 3130 fs_fd = -1;
2623 3131
2624 check_2625 (EV_A); 3132 ev_check_2625 (EV_A);
2625 3133
2626 fs_fd = inotify_init (); 3134 fs_fd = infy_newfd ();
2627 3135
2628 if (fs_fd >= 0) 3136 if (fs_fd >= 0)
2629 { 3137 {
3138 fd_intern (fs_fd);
2630 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3139 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2631 ev_set_priority (&fs_w, EV_MAXPRI); 3140 ev_set_priority (&fs_w, EV_MAXPRI);
2632 ev_io_start (EV_A_ &fs_w); 3141 ev_io_start (EV_A_ &fs_w);
3142 ev_unref (EV_A);
2633 } 3143 }
2634} 3144}
2635 3145
2636void inline_size 3146inline_size void
2637infy_fork (EV_P) 3147infy_fork (EV_P)
2638{ 3148{
2639 int slot; 3149 int slot;
2640 3150
2641 if (fs_fd < 0) 3151 if (fs_fd < 0)
2642 return; 3152 return;
2643 3153
3154 ev_ref (EV_A);
3155 ev_io_stop (EV_A_ &fs_w);
2644 close (fs_fd); 3156 close (fs_fd);
2645 fs_fd = inotify_init (); 3157 fs_fd = infy_newfd ();
2646 3158
3159 if (fs_fd >= 0)
3160 {
3161 fd_intern (fs_fd);
3162 ev_io_set (&fs_w, fs_fd, EV_READ);
3163 ev_io_start (EV_A_ &fs_w);
3164 ev_unref (EV_A);
3165 }
3166
2647 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3167 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2648 { 3168 {
2649 WL w_ = fs_hash [slot].head; 3169 WL w_ = fs_hash [slot].head;
2650 fs_hash [slot].head = 0; 3170 fs_hash [slot].head = 0;
2651 3171
2652 while (w_) 3172 while (w_)
… …
2657 w->wd = -1; 3177 w->wd = -1;
2658 3178
2659 if (fs_fd >= 0) 3179 if (fs_fd >= 0)
2660 infy_add (EV_A_ w); /* re-add, no matter what */ 3180 infy_add (EV_A_ w); /* re-add, no matter what */
2661 else 3181 else
3182 {
3183 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3184 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2662 ev_timer_again (EV_A_ &w->timer); 3185 ev_timer_again (EV_A_ &w->timer);
3186 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3187 }
2663 } 3188 }
2664 } 3189 }
2665} 3190}
2666 3191
2667#endif 3192#endif
… …
2684static void noinline 3209static void noinline
2685stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3210stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2686{ 3211{
2687 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3212 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2688 3213
2689 /* we copy this here each the time so that */ 3214 ev_statdata prev = w->attr;
2690 /* prev has the old value when the callback gets invoked */
2691 w->prev = w->attr;
2692 ev_stat_stat (EV_A_ w); 3215 ev_stat_stat (EV_A_ w);
2693 3216
2694 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3217 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2695 if ( 3218 if (
2696 w->prev.st_dev != w->attr.st_dev 3219 prev.st_dev != w->attr.st_dev
2697 || w->prev.st_ino != w->attr.st_ino 3220 || prev.st_ino != w->attr.st_ino
2698 || w->prev.st_mode != w->attr.st_mode 3221 || prev.st_mode != w->attr.st_mode
2699 || w->prev.st_nlink != w->attr.st_nlink 3222 || prev.st_nlink != w->attr.st_nlink
2700 || w->prev.st_uid != w->attr.st_uid 3223 || prev.st_uid != w->attr.st_uid
2701 || w->prev.st_gid != w->attr.st_gid 3224 || prev.st_gid != w->attr.st_gid
2702 || w->prev.st_rdev != w->attr.st_rdev 3225 || prev.st_rdev != w->attr.st_rdev
2703 || w->prev.st_size != w->attr.st_size 3226 || prev.st_size != w->attr.st_size
2704 || w->prev.st_atime != w->attr.st_atime 3227 || prev.st_atime != w->attr.st_atime
2705 || w->prev.st_mtime != w->attr.st_mtime 3228 || prev.st_mtime != w->attr.st_mtime
2706 || w->prev.st_ctime != w->attr.st_ctime 3229 || prev.st_ctime != w->attr.st_ctime
2707 ) { 3230 ) {
3231 /* we only update w->prev on actual differences */
3232 /* in case we test more often than invoke the callback, */
3233 /* to ensure that prev is always different to attr */
3234 w->prev = prev;
3235
2708 #if EV_USE_INOTIFY 3236 #if EV_USE_INOTIFY
2709 if (fs_fd >= 0) 3237 if (fs_fd >= 0)
2710 { 3238 {
2711 infy_del (EV_A_ w); 3239 infy_del (EV_A_ w);
2712 infy_add (EV_A_ w); 3240 infy_add (EV_A_ w);
… …
2737 3265
2738 if (fs_fd >= 0) 3266 if (fs_fd >= 0)
2739 infy_add (EV_A_ w); 3267 infy_add (EV_A_ w);
2740 else 3268 else
2741#endif 3269#endif
3270 {
2742 ev_timer_again (EV_A_ &w->timer); 3271 ev_timer_again (EV_A_ &w->timer);
3272 ev_unref (EV_A);
3273 }
2743 3274
2744 ev_start (EV_A_ (W)w, 1); 3275 ev_start (EV_A_ (W)w, 1);
2745 3276
2746 EV_FREQUENT_CHECK; 3277 EV_FREQUENT_CHECK;
2747} 3278}
… …
2756 EV_FREQUENT_CHECK; 3287 EV_FREQUENT_CHECK;
2757 3288
2758#if EV_USE_INOTIFY 3289#if EV_USE_INOTIFY
2759 infy_del (EV_A_ w); 3290 infy_del (EV_A_ w);
2760#endif 3291#endif
3292
3293 if (ev_is_active (&w->timer))
3294 {
3295 ev_ref (EV_A);
2761 ev_timer_stop (EV_A_ &w->timer); 3296 ev_timer_stop (EV_A_ &w->timer);
3297 }
2762 3298
2763 ev_stop (EV_A_ (W)w); 3299 ev_stop (EV_A_ (W)w);
2764 3300
2765 EV_FREQUENT_CHECK; 3301 EV_FREQUENT_CHECK;
2766} 3302}
… …
2811 3347
2812 EV_FREQUENT_CHECK; 3348 EV_FREQUENT_CHECK;
2813} 3349}
2814#endif 3350#endif
2815 3351
3352#if EV_PREPARE_ENABLE
2816void 3353void
2817ev_prepare_start (EV_P_ ev_prepare *w) 3354ev_prepare_start (EV_P_ ev_prepare *w)
2818{ 3355{
2819 if (expect_false (ev_is_active (w))) 3356 if (expect_false (ev_is_active (w)))
2820 return; 3357 return;
… …
2846 3383
2847 ev_stop (EV_A_ (W)w); 3384 ev_stop (EV_A_ (W)w);
2848 3385
2849 EV_FREQUENT_CHECK; 3386 EV_FREQUENT_CHECK;
2850} 3387}
3388#endif
2851 3389
3390#if EV_CHECK_ENABLE
2852void 3391void
2853ev_check_start (EV_P_ ev_check *w) 3392ev_check_start (EV_P_ ev_check *w)
2854{ 3393{
2855 if (expect_false (ev_is_active (w))) 3394 if (expect_false (ev_is_active (w)))
2856 return; 3395 return;
… …
2882 3421
2883 ev_stop (EV_A_ (W)w); 3422 ev_stop (EV_A_ (W)w);
2884 3423
2885 EV_FREQUENT_CHECK; 3424 EV_FREQUENT_CHECK;
2886} 3425}
3426#endif
2887 3427
2888#if EV_EMBED_ENABLE 3428#if EV_EMBED_ENABLE
2889void noinline 3429void noinline
2890ev_embed_sweep (EV_P_ ev_embed *w) 3430ev_embed_sweep (EV_P_ ev_embed *w)
2891{ 3431{
2892 ev_loop (w->other, EVLOOP_NONBLOCK); 3432 ev_run (w->other, EVRUN_NOWAIT);
2893} 3433}
2894 3434
2895static void 3435static void
2896embed_io_cb (EV_P_ ev_io *io, int revents) 3436embed_io_cb (EV_P_ ev_io *io, int revents)
2897{ 3437{
2898 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3438 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2899 3439
2900 if (ev_cb (w)) 3440 if (ev_cb (w))
2901 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3441 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2902 else 3442 else
2903 ev_loop (w->other, EVLOOP_NONBLOCK); 3443 ev_run (w->other, EVRUN_NOWAIT);
2904} 3444}
2905 3445
2906static void 3446static void
2907embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3447embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2908{ 3448{
2909 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3449 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2910 3450
2911 { 3451 {
2912 struct ev_loop *loop = w->other; 3452 EV_P = w->other;
2913 3453
2914 while (fdchangecnt) 3454 while (fdchangecnt)
2915 { 3455 {
2916 fd_reify (EV_A); 3456 fd_reify (EV_A);
2917 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3457 ev_run (EV_A_ EVRUN_NOWAIT);
2918 } 3458 }
2919 } 3459 }
2920} 3460}
2921 3461
2922static void 3462static void
… …
2925 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3465 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2926 3466
2927 ev_embed_stop (EV_A_ w); 3467 ev_embed_stop (EV_A_ w);
2928 3468
2929 { 3469 {
2930 struct ev_loop *loop = w->other; 3470 EV_P = w->other;
2931 3471
2932 ev_loop_fork (EV_A); 3472 ev_loop_fork (EV_A);
2933 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3473 ev_run (EV_A_ EVRUN_NOWAIT);
2934 } 3474 }
2935 3475
2936 ev_embed_start (EV_A_ w); 3476 ev_embed_start (EV_A_ w);
2937} 3477}
2938 3478
… …
2949{ 3489{
2950 if (expect_false (ev_is_active (w))) 3490 if (expect_false (ev_is_active (w)))
2951 return; 3491 return;
2952 3492
2953 { 3493 {
2954 struct ev_loop *loop = w->other; 3494 EV_P = w->other;
2955 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3495 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2956 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3496 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2957 } 3497 }
2958 3498
2959 EV_FREQUENT_CHECK; 3499 EV_FREQUENT_CHECK;
… …
2986 3526
2987 ev_io_stop (EV_A_ &w->io); 3527 ev_io_stop (EV_A_ &w->io);
2988 ev_prepare_stop (EV_A_ &w->prepare); 3528 ev_prepare_stop (EV_A_ &w->prepare);
2989 ev_fork_stop (EV_A_ &w->fork); 3529 ev_fork_stop (EV_A_ &w->fork);
2990 3530
3531 ev_stop (EV_A_ (W)w);
3532
2991 EV_FREQUENT_CHECK; 3533 EV_FREQUENT_CHECK;
2992} 3534}
2993#endif 3535#endif
2994 3536
2995#if EV_FORK_ENABLE 3537#if EV_FORK_ENABLE
… …
3028 3570
3029 EV_FREQUENT_CHECK; 3571 EV_FREQUENT_CHECK;
3030} 3572}
3031#endif 3573#endif
3032 3574
3033#if EV_ASYNC_ENABLE 3575#if EV_CLEANUP_ENABLE
3034void 3576void
3035ev_async_start (EV_P_ ev_async *w) 3577ev_cleanup_start (EV_P_ ev_cleanup *w)
3036{ 3578{
3037 if (expect_false (ev_is_active (w))) 3579 if (expect_false (ev_is_active (w)))
3038 return; 3580 return;
3581
3582 EV_FREQUENT_CHECK;
3583
3584 ev_start (EV_A_ (W)w, ++cleanupcnt);
3585 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3586 cleanups [cleanupcnt - 1] = w;
3587
3588 EV_FREQUENT_CHECK;
3589}
3590
3591void
3592ev_cleanup_stop (EV_P_ ev_cleanup *w)
3593{
3594 clear_pending (EV_A_ (W)w);
3595 if (expect_false (!ev_is_active (w)))
3596 return;
3597
3598 EV_FREQUENT_CHECK;
3599
3600 {
3601 int active = ev_active (w);
3602
3603 cleanups [active - 1] = cleanups [--cleanupcnt];
3604 ev_active (cleanups [active - 1]) = active;
3605 }
3606
3607 ev_stop (EV_A_ (W)w);
3608
3609 EV_FREQUENT_CHECK;
3610}
3611#endif
3612
3613#if EV_ASYNC_ENABLE
3614void
3615ev_async_start (EV_P_ ev_async *w)
3616{
3617 if (expect_false (ev_is_active (w)))
3618 return;
3619
3620 w->sent = 0;
3039 3621
3040 evpipe_init (EV_A); 3622 evpipe_init (EV_A);
3041 3623
3042 EV_FREQUENT_CHECK; 3624 EV_FREQUENT_CHECK;
3043 3625
… …
3071 3653
3072void 3654void
3073ev_async_send (EV_P_ ev_async *w) 3655ev_async_send (EV_P_ ev_async *w)
3074{ 3656{
3075 w->sent = 1; 3657 w->sent = 1;
3076 evpipe_write (EV_A_ &gotasync); 3658 evpipe_write (EV_A_ &async_pending);
3077} 3659}
3078#endif 3660#endif
3079 3661
3080/*****************************************************************************/ 3662/*****************************************************************************/
3081 3663
… …
3121{ 3703{
3122 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3704 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3123 3705
3124 if (expect_false (!once)) 3706 if (expect_false (!once))
3125 { 3707 {
3126 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3708 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3127 return; 3709 return;
3128 } 3710 }
3129 3711
3130 once->cb = cb; 3712 once->cb = cb;
3131 once->arg = arg; 3713 once->arg = arg;
… …
3145 } 3727 }
3146} 3728}
3147 3729
3148/*****************************************************************************/ 3730/*****************************************************************************/
3149 3731
3150#if 0 3732#if EV_WALK_ENABLE
3151void 3733void
3152ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3734ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3153{ 3735{
3154 int i, j; 3736 int i, j;
3155 ev_watcher_list *wl, *wn; 3737 ev_watcher_list *wl, *wn;
… …
3171#if EV_USE_INOTIFY 3753#if EV_USE_INOTIFY
3172 if (ev_cb ((ev_io *)wl) == infy_cb) 3754 if (ev_cb ((ev_io *)wl) == infy_cb)
3173 ; 3755 ;
3174 else 3756 else
3175#endif 3757#endif
3176 if ((ev_io *)wl != &pipeev) 3758 if ((ev_io *)wl != &pipe_w)
3177 if (types & EV_IO) 3759 if (types & EV_IO)
3178 cb (EV_A_ EV_IO, wl); 3760 cb (EV_A_ EV_IO, wl);
3179 3761
3180 wl = wn; 3762 wl = wn;
3181 } 3763 }
… …
3218 if (types & EV_ASYNC) 3800 if (types & EV_ASYNC)
3219 for (i = asynccnt; i--; ) 3801 for (i = asynccnt; i--; )
3220 cb (EV_A_ EV_ASYNC, asyncs [i]); 3802 cb (EV_A_ EV_ASYNC, asyncs [i]);
3221#endif 3803#endif
3222 3804
3805#if EV_PREPARE_ENABLE
3223 if (types & EV_PREPARE) 3806 if (types & EV_PREPARE)
3224 for (i = preparecnt; i--; ) 3807 for (i = preparecnt; i--; )
3225#if EV_EMBED_ENABLE 3808# if EV_EMBED_ENABLE
3226 if (ev_cb (prepares [i]) != embed_prepare_cb) 3809 if (ev_cb (prepares [i]) != embed_prepare_cb)
3227#endif 3810# endif
3228 cb (EV_A_ EV_PREPARE, prepares [i]); 3811 cb (EV_A_ EV_PREPARE, prepares [i]);
3812#endif
3229 3813
3814#if EV_CHECK_ENABLE
3230 if (types & EV_CHECK) 3815 if (types & EV_CHECK)
3231 for (i = checkcnt; i--; ) 3816 for (i = checkcnt; i--; )
3232 cb (EV_A_ EV_CHECK, checks [i]); 3817 cb (EV_A_ EV_CHECK, checks [i]);
3818#endif
3233 3819
3820#if EV_SIGNAL_ENABLE
3234 if (types & EV_SIGNAL) 3821 if (types & EV_SIGNAL)
3235 for (i = 0; i < signalmax; ++i) 3822 for (i = 0; i < EV_NSIG - 1; ++i)
3236 for (wl = signals [i].head; wl; ) 3823 for (wl = signals [i].head; wl; )
3237 { 3824 {
3238 wn = wl->next; 3825 wn = wl->next;
3239 cb (EV_A_ EV_SIGNAL, wl); 3826 cb (EV_A_ EV_SIGNAL, wl);
3240 wl = wn; 3827 wl = wn;
3241 } 3828 }
3829#endif
3242 3830
3831#if EV_CHILD_ENABLE
3243 if (types & EV_CHILD) 3832 if (types & EV_CHILD)
3244 for (i = EV_PID_HASHSIZE; i--; ) 3833 for (i = (EV_PID_HASHSIZE); i--; )
3245 for (wl = childs [i]; wl; ) 3834 for (wl = childs [i]; wl; )
3246 { 3835 {
3247 wn = wl->next; 3836 wn = wl->next;
3248 cb (EV_A_ EV_CHILD, wl); 3837 cb (EV_A_ EV_CHILD, wl);
3249 wl = wn; 3838 wl = wn;
3250 } 3839 }
3840#endif
3251/* EV_STAT 0x00001000 /* stat data changed */ 3841/* EV_STAT 0x00001000 /* stat data changed */
3252/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3842/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3253} 3843}
3254#endif 3844#endif
3255 3845
3256#if EV_MULTIPLICITY 3846#if EV_MULTIPLICITY
3257 #include "ev_wrap.h" 3847 #include "ev_wrap.h"
3258#endif 3848#endif
3259 3849
3260#ifdef __cplusplus 3850EV_CPP(})
3261}
3262#endif
3263 3851

Diff Legend

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