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

Comparing libev/ev.c (file contents):
Revision 1.286 by root, Wed Apr 15 19:37:15 2009 UTC vs.
Revision 1.357 by root, Sat Oct 23 22:25:44 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 struct utsname buf;
536 unsigned int v;
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
575inline_size ev_tstamp 775inline_size ev_tstamp
576get_clock (void) 776get_clock (void)
577{ 777{
578#if EV_USE_MONOTONIC 778#if EV_USE_MONOTONIC
… …
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
826/* find a suitable new size for the given array, */
827/* hopefully by rounding to a nice-to-malloc size */
630inline_size int 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
… …
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_);
… …
724} 928}
725 929
726/*****************************************************************************/ 930/*****************************************************************************/
727 931
728inline_speed void 932inline_speed void
729fd_event (EV_P_ int fd, int revents) 933fd_event_nocheck (EV_P_ int fd, int revents)
730{ 934{
731 ANFD *anfd = anfds + fd; 935 ANFD *anfd = anfds + fd;
732 ev_io *w; 936 ev_io *w;
733 937
734 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)
… …
738 if (ev) 942 if (ev)
739 ev_feed_event (EV_A_ (W)w, ev); 943 ev_feed_event (EV_A_ (W)w, ev);
740 } 944 }
741} 945}
742 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
743void 958void
744ev_feed_fd_event (EV_P_ int fd, int revents) 959ev_feed_fd_event (EV_P_ int fd, int revents)
745{ 960{
746 if (fd >= 0 && fd < anfdmax) 961 if (fd >= 0 && fd < anfdmax)
747 fd_event (EV_A_ fd, revents); 962 fd_event_nocheck (EV_A_ fd, revents);
748} 963}
749 964
965/* make sure the external fd watch events are in-sync */
966/* with the kernel/libev internal state */
750inline_size void 967inline_size void
751fd_reify (EV_P) 968fd_reify (EV_P)
752{ 969{
753 int i; 970 int i;
754 971
… …
756 { 973 {
757 int fd = fdchanges [i]; 974 int fd = fdchanges [i];
758 ANFD *anfd = anfds + fd; 975 ANFD *anfd = anfds + fd;
759 ev_io *w; 976 ev_io *w;
760 977
761 unsigned char events = 0; 978 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify;
762 980
763 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 981 anfd->reify = 0;
764 events |= (unsigned char)w->events;
765 982
766#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
767 if (events) 984 if (o_reify & EV__IOFDSET)
768 { 985 {
769 unsigned long arg; 986 unsigned long arg;
770 #ifdef EV_FD_TO_WIN32_HANDLE
771 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
772 #else
773 anfd->handle = _get_osfhandle (fd);
774 #endif
775 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
776 } 990 }
777#endif 991#endif
778 992
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
779 { 994 {
780 unsigned char o_events = anfd->events;
781 unsigned char o_reify = anfd->reify;
782
783 anfd->reify = 0;
784 anfd->events = events; 995 anfd->events = 0;
785 996
786 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)
787 backend_modify (EV_A_ fd, o_events, events); 1005 backend_modify (EV_A_ fd, o_events, anfd->events);
788 }
789 } 1006 }
790 1007
791 fdchangecnt = 0; 1008 fdchangecnt = 0;
792} 1009}
793 1010
1011/* something about the given fd changed */
794inline_size void 1012inline_size void
795fd_change (EV_P_ int fd, int flags) 1013fd_change (EV_P_ int fd, int flags)
796{ 1014{
797 unsigned char reify = anfds [fd].reify; 1015 unsigned char reify = anfds [fd].reify;
798 anfds [fd].reify |= flags; 1016 anfds [fd].reify |= flags;
… …
803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 1021 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
804 fdchanges [fdchangecnt - 1] = fd; 1022 fdchanges [fdchangecnt - 1] = fd;
805 } 1023 }
806} 1024}
807 1025
1026/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
808inline_speed void 1027inline_speed void
809fd_kill (EV_P_ int fd) 1028fd_kill (EV_P_ int fd)
810{ 1029{
811 ev_io *w; 1030 ev_io *w;
812 1031
… …
815 ev_io_stop (EV_A_ w); 1034 ev_io_stop (EV_A_ w);
816 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);
817 } 1036 }
818} 1037}
819 1038
1039/* check whether the given fd is actually valid, for error recovery */
820inline_size int 1040inline_size int
821fd_valid (int fd) 1041fd_valid (int fd)
822{ 1042{
823#ifdef _WIN32 1043#ifdef _WIN32
824 return _get_osfhandle (fd) != -1; 1044 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
825#else 1045#else
826 return fcntl (fd, F_GETFD) != -1; 1046 return fcntl (fd, F_GETFD) != -1;
827#endif 1047#endif
828} 1048}
829 1049
… …
847 1067
848 for (fd = anfdmax; fd--; ) 1068 for (fd = anfdmax; fd--; )
849 if (anfds [fd].events) 1069 if (anfds [fd].events)
850 { 1070 {
851 fd_kill (EV_A_ fd); 1071 fd_kill (EV_A_ fd);
852 return; 1072 break;
853 } 1073 }
854} 1074}
855 1075
856/* 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 */
857static void noinline 1077static void noinline
… …
862 for (fd = 0; fd < anfdmax; ++fd) 1082 for (fd = 0; fd < anfdmax; ++fd)
863 if (anfds [fd].events) 1083 if (anfds [fd].events)
864 { 1084 {
865 anfds [fd].events = 0; 1085 anfds [fd].events = 0;
866 anfds [fd].emask = 0; 1086 anfds [fd].emask = 0;
867 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1087 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
868 } 1088 }
869} 1089}
870 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
871/*****************************************************************************/ 1105/*****************************************************************************/
872 1106
873/* 1107/*
874 * 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
875 * 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
876 * the branching factor of the d-tree. 1110 * the branching factor of the d-tree.
877 */ 1111 */
878 1112
879/* 1113/*
… …
947 1181
948 for (;;) 1182 for (;;)
949 { 1183 {
950 int c = k << 1; 1184 int c = k << 1;
951 1185
952 if (c > N + HEAP0 - 1) 1186 if (c >= N + HEAP0)
953 break; 1187 break;
954 1188
955 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])
956 ? 1 : 0; 1190 ? 1 : 0;
957 1191
… …
989 1223
990 heap [k] = he; 1224 heap [k] = he;
991 ev_active (ANHE_w (he)) = k; 1225 ev_active (ANHE_w (he)) = k;
992} 1226}
993 1227
1228/* move an element suitably so it is in a correct place */
994inline_size void 1229inline_size void
995adjustheap (ANHE *heap, int N, int k) 1230adjustheap (ANHE *heap, int N, int k)
996{ 1231{
997 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)]))
998 upheap (heap, k); 1233 upheap (heap, k);
999 else 1234 else
1000 downheap (heap, N, k); 1235 downheap (heap, N, k);
1001} 1236}
1002 1237
… …
1012 upheap (heap, i + HEAP0); 1247 upheap (heap, i + HEAP0);
1013} 1248}
1014 1249
1015/*****************************************************************************/ 1250/*****************************************************************************/
1016 1251
1252/* associate signal watchers to a signal signal */
1017typedef struct 1253typedef struct
1018{ 1254{
1255 EV_ATOMIC_T pending;
1256#if EV_MULTIPLICITY
1257 EV_P;
1258#endif
1019 WL head; 1259 WL head;
1020 EV_ATOMIC_T gotsig;
1021} ANSIG; 1260} ANSIG;
1022 1261
1023static ANSIG *signals; 1262static ANSIG signals [EV_NSIG - 1];
1024static int signalmax;
1025
1026static EV_ATOMIC_T gotsig;
1027 1263
1028/*****************************************************************************/ 1264/*****************************************************************************/
1029 1265
1030inline_speed void 1266#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1031fd_intern (int fd)
1032{
1033#ifdef _WIN32
1034 unsigned long arg = 1;
1035 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1036#else
1037 fcntl (fd, F_SETFD, FD_CLOEXEC);
1038 fcntl (fd, F_SETFL, O_NONBLOCK);
1039#endif
1040}
1041 1267
1042static void noinline 1268static void noinline
1043evpipe_init (EV_P) 1269evpipe_init (EV_P)
1044{ 1270{
1045 if (!ev_is_active (&pipeev)) 1271 if (!ev_is_active (&pipe_w))
1046 { 1272 {
1047#if EV_USE_EVENTFD 1273# if EV_USE_EVENTFD
1274 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1275 if (evfd < 0 && errno == EINVAL)
1048 if ((evfd = eventfd (0, 0)) >= 0) 1276 evfd = eventfd (0, 0);
1277
1278 if (evfd >= 0)
1049 { 1279 {
1050 evpipe [0] = -1; 1280 evpipe [0] = -1;
1051 fd_intern (evfd); 1281 fd_intern (evfd); /* doing it twice doesn't hurt */
1052 ev_io_set (&pipeev, evfd, EV_READ); 1282 ev_io_set (&pipe_w, evfd, EV_READ);
1053 } 1283 }
1054 else 1284 else
1055#endif 1285# endif
1056 { 1286 {
1057 while (pipe (evpipe)) 1287 while (pipe (evpipe))
1058 ev_syserr ("(libev) error creating signal/async pipe"); 1288 ev_syserr ("(libev) error creating signal/async pipe");
1059 1289
1060 fd_intern (evpipe [0]); 1290 fd_intern (evpipe [0]);
1061 fd_intern (evpipe [1]); 1291 fd_intern (evpipe [1]);
1062 ev_io_set (&pipeev, evpipe [0], EV_READ); 1292 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1063 } 1293 }
1064 1294
1065 ev_io_start (EV_A_ &pipeev); 1295 ev_io_start (EV_A_ &pipe_w);
1066 ev_unref (EV_A); /* watcher should not keep loop alive */ 1296 ev_unref (EV_A); /* watcher should not keep loop alive */
1067 } 1297 }
1068} 1298}
1069 1299
1070inline_size void 1300inline_size void
1071evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1301evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1072{ 1302{
1073 if (!*flag) 1303 if (!*flag)
1074 { 1304 {
1075 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;
1076 1307
1077 *flag = 1; 1308 *flag = 1;
1078 1309
1079#if EV_USE_EVENTFD 1310#if EV_USE_EVENTFD
1080 if (evfd >= 0) 1311 if (evfd >= 0)
… …
1082 uint64_t counter = 1; 1313 uint64_t counter = 1;
1083 write (evfd, &counter, sizeof (uint64_t)); 1314 write (evfd, &counter, sizeof (uint64_t));
1084 } 1315 }
1085 else 1316 else
1086#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. */
1087 write (evpipe [1], &old_errno, 1); 1323 write (evpipe [1], &dummy, 1);
1088 1324
1089 errno = old_errno; 1325 errno = old_errno;
1090 } 1326 }
1091} 1327}
1092 1328
1329/* called whenever the libev signal pipe */
1330/* got some events (signal, async) */
1093static void 1331static void
1094pipecb (EV_P_ ev_io *iow, int revents) 1332pipecb (EV_P_ ev_io *iow, int revents)
1095{ 1333{
1334 int i;
1335
1096#if EV_USE_EVENTFD 1336#if EV_USE_EVENTFD
1097 if (evfd >= 0) 1337 if (evfd >= 0)
1098 { 1338 {
1099 uint64_t counter; 1339 uint64_t counter;
1100 read (evfd, &counter, sizeof (uint64_t)); 1340 read (evfd, &counter, sizeof (uint64_t));
1101 } 1341 }
1102 else 1342 else
1103#endif 1343#endif
1104 { 1344 {
1105 char dummy; 1345 char dummy;
1346 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1106 read (evpipe [0], &dummy, 1); 1347 read (evpipe [0], &dummy, 1);
1107 } 1348 }
1108 1349
1109 if (gotsig && ev_is_default_loop (EV_A)) 1350 if (sig_pending)
1110 { 1351 {
1111 int signum; 1352 sig_pending = 0;
1112 gotsig = 0;
1113 1353
1114 for (signum = signalmax; signum--; ) 1354 for (i = EV_NSIG - 1; i--; )
1115 if (signals [signum].gotsig) 1355 if (expect_false (signals [i].pending))
1116 ev_feed_signal_event (EV_A_ signum + 1); 1356 ev_feed_signal_event (EV_A_ i + 1);
1117 } 1357 }
1118 1358
1119#if EV_ASYNC_ENABLE 1359#if EV_ASYNC_ENABLE
1120 if (gotasync) 1360 if (async_pending)
1121 { 1361 {
1122 int i; 1362 async_pending = 0;
1123 gotasync = 0;
1124 1363
1125 for (i = asynccnt; i--; ) 1364 for (i = asynccnt; i--; )
1126 if (asyncs [i]->sent) 1365 if (asyncs [i]->sent)
1127 { 1366 {
1128 asyncs [i]->sent = 0; 1367 asyncs [i]->sent = 0;
… …
1136 1375
1137static void 1376static void
1138ev_sighandler (int signum) 1377ev_sighandler (int signum)
1139{ 1378{
1140#if EV_MULTIPLICITY 1379#if EV_MULTIPLICITY
1141 struct ev_loop *loop = &default_loop_struct; 1380 EV_P = signals [signum - 1].loop;
1142#endif 1381#endif
1143 1382
1144#if _WIN32 1383#ifdef _WIN32
1145 signal (signum, ev_sighandler); 1384 signal (signum, ev_sighandler);
1146#endif 1385#endif
1147 1386
1148 signals [signum - 1].gotsig = 1; 1387 signals [signum - 1].pending = 1;
1149 evpipe_write (EV_A_ &gotsig); 1388 evpipe_write (EV_A_ &sig_pending);
1150} 1389}
1151 1390
1152void noinline 1391void noinline
1153ev_feed_signal_event (EV_P_ int signum) 1392ev_feed_signal_event (EV_P_ int signum)
1154{ 1393{
1155 WL w; 1394 WL w;
1156 1395
1396 if (expect_false (signum <= 0 || signum > EV_NSIG))
1397 return;
1398
1399 --signum;
1400
1157#if EV_MULTIPLICITY 1401#if EV_MULTIPLICITY
1158 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 */
1159#endif 1403 /* or, likely more useful, feeding a signal nobody is waiting for */
1160 1404
1161 --signum; 1405 if (expect_false (signals [signum].loop != EV_A))
1162
1163 if (signum < 0 || signum >= signalmax)
1164 return; 1406 return;
1407#endif
1165 1408
1166 signals [signum].gotsig = 0; 1409 signals [signum].pending = 0;
1167 1410
1168 for (w = signals [signum].head; w; w = w->next) 1411 for (w = signals [signum].head; w; w = w->next)
1169 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1412 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1170} 1413}
1171 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
1172/*****************************************************************************/ 1437/*****************************************************************************/
1173 1438
1439#if EV_CHILD_ENABLE
1174static WL childs [EV_PID_HASHSIZE]; 1440static WL childs [EV_PID_HASHSIZE];
1175
1176#ifndef _WIN32
1177 1441
1178static ev_signal childev; 1442static ev_signal childev;
1179 1443
1180#ifndef WIFCONTINUED 1444#ifndef WIFCONTINUED
1181# define WIFCONTINUED(status) 0 1445# define WIFCONTINUED(status) 0
1182#endif 1446#endif
1183 1447
1448/* handle a single child status event */
1184inline_speed void 1449inline_speed void
1185child_reap (EV_P_ int chain, int pid, int status) 1450child_reap (EV_P_ int chain, int pid, int status)
1186{ 1451{
1187 ev_child *w; 1452 ev_child *w;
1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1453 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1189 1454
1190 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)
1191 { 1456 {
1192 if ((w->pid == pid || !w->pid) 1457 if ((w->pid == pid || !w->pid)
1193 && (!traced || (w->flags & 1))) 1458 && (!traced || (w->flags & 1)))
1194 { 1459 {
1195 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 */
… …
1202 1467
1203#ifndef WCONTINUED 1468#ifndef WCONTINUED
1204# define WCONTINUED 0 1469# define WCONTINUED 0
1205#endif 1470#endif
1206 1471
1472/* called on sigchld etc., calls waitpid */
1207static void 1473static void
1208childcb (EV_P_ ev_signal *sw, int revents) 1474childcb (EV_P_ ev_signal *sw, int revents)
1209{ 1475{
1210 int pid, status; 1476 int pid, status;
1211 1477
… …
1219 /* 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 */
1220 /* 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 */
1221 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1487 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1222 1488
1223 child_reap (EV_A_ pid, pid, status); 1489 child_reap (EV_A_ pid, pid, status);
1224 if (EV_PID_HASHSIZE > 1) 1490 if ((EV_PID_HASHSIZE) > 1)
1225 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 */
1226} 1492}
1227 1493
1228#endif 1494#endif
1229 1495
1230/*****************************************************************************/ 1496/*****************************************************************************/
1231 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1232#if EV_USE_PORT 1501#if EV_USE_PORT
1233# include "ev_port.c" 1502# include "ev_port.c"
1234#endif 1503#endif
1235#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1236# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1296#ifdef __APPLE__ 1565#ifdef __APPLE__
1297 /* only select works correctly on that "unix-certified" platform */ 1566 /* only select works correctly on that "unix-certified" platform */
1298 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1567 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1299 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 */
1300#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
1301 1573
1302 return flags; 1574 return flags;
1303} 1575}
1304 1576
1305unsigned int 1577unsigned int
1306ev_embeddable_backends (void) 1578ev_embeddable_backends (void)
1307{ 1579{
1308 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1580 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1309 1581
1310 /* 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 */
1311 /* please fix it and tell me how to detect the fix */ 1583 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1312 flags &= ~EVBACKEND_EPOLL; 1584 flags &= ~EVBACKEND_EPOLL;
1313 1585
1314 return flags; 1586 return flags;
1315} 1587}
1316 1588
1317unsigned int 1589unsigned int
1318ev_backend (EV_P) 1590ev_backend (EV_P)
1319{ 1591{
1320 return backend; 1592 return backend;
1321} 1593}
1322 1594
1595#if EV_FEATURE_API
1323unsigned int 1596unsigned int
1324ev_loop_count (EV_P) 1597ev_iteration (EV_P)
1325{ 1598{
1326 return loop_count; 1599 return loop_count;
1327} 1600}
1328 1601
1602unsigned int
1603ev_depth (EV_P)
1604{
1605 return loop_depth;
1606}
1607
1329void 1608void
1330ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1609ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1331{ 1610{
1332 io_blocktime = interval; 1611 io_blocktime = interval;
1333} 1612}
… …
1336ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1615ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1337{ 1616{
1338 timeout_blocktime = interval; 1617 timeout_blocktime = interval;
1339} 1618}
1340 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 */
1341static void noinline 1645static void noinline
1342loop_init (EV_P_ unsigned int flags) 1646loop_init (EV_P_ unsigned int flags)
1343{ 1647{
1344 if (!backend) 1648 if (!backend)
1345 { 1649 {
… …
1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1665 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1362 have_monotonic = 1; 1666 have_monotonic = 1;
1363 } 1667 }
1364#endif 1668#endif
1365 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
1366 ev_rt_now = ev_time (); 1681 ev_rt_now = ev_time ();
1367 mn_now = get_clock (); 1682 mn_now = get_clock ();
1368 now_floor = mn_now; 1683 now_floor = mn_now;
1369 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
1370 1688
1371 io_blocktime = 0.; 1689 io_blocktime = 0.;
1372 timeout_blocktime = 0.; 1690 timeout_blocktime = 0.;
1373 backend = 0; 1691 backend = 0;
1374 backend_fd = -1; 1692 backend_fd = -1;
1375 gotasync = 0; 1693 sig_pending = 0;
1694#if EV_ASYNC_ENABLE
1695 async_pending = 0;
1696#endif
1376#if EV_USE_INOTIFY 1697#if EV_USE_INOTIFY
1377 fs_fd = -2; 1698 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1378#endif 1699#endif
1379 1700#if EV_USE_SIGNALFD
1380 /* pid check not overridable via env */ 1701 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1381#ifndef _WIN32
1382 if (flags & EVFLAG_FORKCHECK)
1383 curpid = getpid ();
1384#endif 1702#endif
1385
1386 if (!(flags & EVFLAG_NOENV)
1387 && !enable_secure ()
1388 && getenv ("LIBEV_FLAGS"))
1389 flags = atoi (getenv ("LIBEV_FLAGS"));
1390 1703
1391 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1392 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1393 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1394#if EV_USE_PORT 1710#if EV_USE_PORT
1395 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1396#endif 1712#endif
1397#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1398 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1405#endif 1721#endif
1406#if EV_USE_SELECT 1722#if EV_USE_SELECT
1407 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1723 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1408#endif 1724#endif
1409 1725
1726 ev_prepare_init (&pending_w, pendingcb);
1727
1728#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1410 ev_init (&pipeev, pipecb); 1729 ev_init (&pipe_w, pipecb);
1411 ev_set_priority (&pipeev, EV_MAXPRI); 1730 ev_set_priority (&pipe_w, EV_MAXPRI);
1731#endif
1412 } 1732 }
1413} 1733}
1414 1734
1735/* free up a loop structure */
1415static void noinline 1736static void noinline
1416loop_destroy (EV_P) 1737loop_destroy (EV_P)
1417{ 1738{
1418 int i; 1739 int i;
1419 1740
1420 if (ev_is_active (&pipeev)) 1741 if (ev_is_active (&pipe_w))
1421 { 1742 {
1422 ev_ref (EV_A); /* signal watcher */ 1743 /*ev_ref (EV_A);*/
1423 ev_io_stop (EV_A_ &pipeev); 1744 /*ev_io_stop (EV_A_ &pipe_w);*/
1424 1745
1425#if EV_USE_EVENTFD 1746#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1747 if (evfd >= 0)
1427 close (evfd); 1748 close (evfd);
1428#endif 1749#endif
1429 1750
1430 if (evpipe [0] >= 0) 1751 if (evpipe [0] >= 0)
1431 { 1752 {
1432 close (evpipe [0]); 1753 EV_WIN32_CLOSE_FD (evpipe [0]);
1433 close (evpipe [1]); 1754 EV_WIN32_CLOSE_FD (evpipe [1]);
1434 } 1755 }
1435 } 1756 }
1757
1758#if EV_USE_SIGNALFD
1759 if (ev_is_active (&sigfd_w))
1760 close (sigfd);
1761#endif
1436 1762
1437#if EV_USE_INOTIFY 1763#if EV_USE_INOTIFY
1438 if (fs_fd >= 0) 1764 if (fs_fd >= 0)
1439 close (fs_fd); 1765 close (fs_fd);
1440#endif 1766#endif
1441 1767
1442 if (backend_fd >= 0) 1768 if (backend_fd >= 0)
1443 close (backend_fd); 1769 close (backend_fd);
1444 1770
1771#if EV_USE_IOCP
1772 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1773#endif
1445#if EV_USE_PORT 1774#if EV_USE_PORT
1446 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1775 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1447#endif 1776#endif
1448#if EV_USE_KQUEUE 1777#if EV_USE_KQUEUE
1449 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1778 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1464#if EV_IDLE_ENABLE 1793#if EV_IDLE_ENABLE
1465 array_free (idle, [i]); 1794 array_free (idle, [i]);
1466#endif 1795#endif
1467 } 1796 }
1468 1797
1469 ev_free (anfds); anfdmax = 0; 1798 ev_free (anfds); anfds = 0; anfdmax = 0;
1470 1799
1471 /* have to use the microsoft-never-gets-it-right macro */ 1800 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY); 1801 array_free (rfeed, EMPTY);
1473 array_free (fdchange, EMPTY); 1802 array_free (fdchange, EMPTY);
1474 array_free (timer, EMPTY); 1803 array_free (timer, EMPTY);
… …
1505#endif 1834#endif
1506#if EV_USE_INOTIFY 1835#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1836 infy_fork (EV_A);
1508#endif 1837#endif
1509 1838
1510 if (ev_is_active (&pipeev)) 1839 if (ev_is_active (&pipe_w))
1511 { 1840 {
1512 /* this "locks" the handlers against writing to the pipe */ 1841 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1842 /* while we modify the fd vars */
1514 gotsig = 1; 1843 sig_pending = 1;
1515#if EV_ASYNC_ENABLE 1844#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1845 async_pending = 1;
1517#endif 1846#endif
1518 1847
1519 ev_ref (EV_A); 1848 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1849 ev_io_stop (EV_A_ &pipe_w);
1521 1850
1522#if EV_USE_EVENTFD 1851#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1852 if (evfd >= 0)
1524 close (evfd); 1853 close (evfd);
1525#endif 1854#endif
1526 1855
1527 if (evpipe [0] >= 0) 1856 if (evpipe [0] >= 0)
1528 { 1857 {
1529 close (evpipe [0]); 1858 EV_WIN32_CLOSE_FD (evpipe [0]);
1530 close (evpipe [1]); 1859 EV_WIN32_CLOSE_FD (evpipe [1]);
1531 } 1860 }
1532 1861
1862#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1533 evpipe_init (EV_A); 1863 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1864 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1865 pipecb (EV_A_ &pipe_w, EV_READ);
1866#endif
1536 } 1867 }
1537 1868
1538 postfork = 0; 1869 postfork = 0;
1539} 1870}
1540 1871
1541#if EV_MULTIPLICITY 1872#if EV_MULTIPLICITY
1542 1873
1543struct ev_loop * 1874struct ev_loop *
1544ev_loop_new (unsigned int flags) 1875ev_loop_new (unsigned int flags)
1545{ 1876{
1546 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1877 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1547 1878
1548 memset (loop, 0, sizeof (struct ev_loop)); 1879 memset (EV_A, 0, sizeof (struct ev_loop));
1549
1550 loop_init (EV_A_ flags); 1880 loop_init (EV_A_ flags);
1551 1881
1552 if (ev_backend (EV_A)) 1882 if (ev_backend (EV_A))
1553 return loop; 1883 return EV_A;
1554 1884
1555 return 0; 1885 return 0;
1556} 1886}
1557 1887
1558void 1888void
… …
1565void 1895void
1566ev_loop_fork (EV_P) 1896ev_loop_fork (EV_P)
1567{ 1897{
1568 postfork = 1; /* must be in line with ev_default_fork */ 1898 postfork = 1; /* must be in line with ev_default_fork */
1569} 1899}
1900#endif /* multiplicity */
1570 1901
1571#if EV_VERIFY 1902#if EV_VERIFY
1572static void noinline 1903static void noinline
1573verify_watcher (EV_P_ W w) 1904verify_watcher (EV_P_ W w)
1574{ 1905{
… …
1602 verify_watcher (EV_A_ ws [cnt]); 1933 verify_watcher (EV_A_ ws [cnt]);
1603 } 1934 }
1604} 1935}
1605#endif 1936#endif
1606 1937
1938#if EV_FEATURE_API
1607void 1939void
1608ev_loop_verify (EV_P) 1940ev_verify (EV_P)
1609{ 1941{
1610#if EV_VERIFY 1942#if EV_VERIFY
1611 int i; 1943 int i;
1612 WL w; 1944 WL w;
1613 1945
… …
1652#if EV_ASYNC_ENABLE 1984#if EV_ASYNC_ENABLE
1653 assert (asyncmax >= asynccnt); 1985 assert (asyncmax >= asynccnt);
1654 array_verify (EV_A_ (W *)asyncs, asynccnt); 1986 array_verify (EV_A_ (W *)asyncs, asynccnt);
1655#endif 1987#endif
1656 1988
1989#if EV_PREPARE_ENABLE
1657 assert (preparemax >= preparecnt); 1990 assert (preparemax >= preparecnt);
1658 array_verify (EV_A_ (W *)prepares, preparecnt); 1991 array_verify (EV_A_ (W *)prepares, preparecnt);
1992#endif
1659 1993
1994#if EV_CHECK_ENABLE
1660 assert (checkmax >= checkcnt); 1995 assert (checkmax >= checkcnt);
1661 array_verify (EV_A_ (W *)checks, checkcnt); 1996 array_verify (EV_A_ (W *)checks, checkcnt);
1997#endif
1662 1998
1663# if 0 1999# if 0
2000#if EV_CHILD_ENABLE
1664 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2001 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1665 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 2002 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2003#endif
1666# endif 2004# endif
1667#endif 2005#endif
1668} 2006}
1669 2007#endif
1670#endif /* multiplicity */
1671 2008
1672#if EV_MULTIPLICITY 2009#if EV_MULTIPLICITY
1673struct ev_loop * 2010struct ev_loop *
1674ev_default_loop_init (unsigned int flags) 2011ev_default_loop_init (unsigned int flags)
1675#else 2012#else
… …
1678#endif 2015#endif
1679{ 2016{
1680 if (!ev_default_loop_ptr) 2017 if (!ev_default_loop_ptr)
1681 { 2018 {
1682#if EV_MULTIPLICITY 2019#if EV_MULTIPLICITY
1683 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2020 EV_P = ev_default_loop_ptr = &default_loop_struct;
1684#else 2021#else
1685 ev_default_loop_ptr = 1; 2022 ev_default_loop_ptr = 1;
1686#endif 2023#endif
1687 2024
1688 loop_init (EV_A_ flags); 2025 loop_init (EV_A_ flags);
1689 2026
1690 if (ev_backend (EV_A)) 2027 if (ev_backend (EV_A))
1691 { 2028 {
1692#ifndef _WIN32 2029#if EV_CHILD_ENABLE
1693 ev_signal_init (&childev, childcb, SIGCHLD); 2030 ev_signal_init (&childev, childcb, SIGCHLD);
1694 ev_set_priority (&childev, EV_MAXPRI); 2031 ev_set_priority (&childev, EV_MAXPRI);
1695 ev_signal_start (EV_A_ &childev); 2032 ev_signal_start (EV_A_ &childev);
1696 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2033 ev_unref (EV_A); /* child watcher should not keep loop alive */
1697#endif 2034#endif
… …
1705 2042
1706void 2043void
1707ev_default_destroy (void) 2044ev_default_destroy (void)
1708{ 2045{
1709#if EV_MULTIPLICITY 2046#if EV_MULTIPLICITY
1710 struct ev_loop *loop = ev_default_loop_ptr; 2047 EV_P = ev_default_loop_ptr;
1711#endif 2048#endif
1712 2049
1713 ev_default_loop_ptr = 0; 2050 ev_default_loop_ptr = 0;
1714 2051
1715#ifndef _WIN32 2052#if EV_CHILD_ENABLE
1716 ev_ref (EV_A); /* child watcher */ 2053 ev_ref (EV_A); /* child watcher */
1717 ev_signal_stop (EV_A_ &childev); 2054 ev_signal_stop (EV_A_ &childev);
1718#endif 2055#endif
1719 2056
1720 loop_destroy (EV_A); 2057 loop_destroy (EV_A);
… …
1722 2059
1723void 2060void
1724ev_default_fork (void) 2061ev_default_fork (void)
1725{ 2062{
1726#if EV_MULTIPLICITY 2063#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr; 2064 EV_P = ev_default_loop_ptr;
1728#endif 2065#endif
1729 2066
1730 postfork = 1; /* must be in line with ev_loop_fork */ 2067 postfork = 1; /* must be in line with ev_loop_fork */
1731} 2068}
1732 2069
… …
1736ev_invoke (EV_P_ void *w, int revents) 2073ev_invoke (EV_P_ void *w, int revents)
1737{ 2074{
1738 EV_CB_INVOKE ((W)w, revents); 2075 EV_CB_INVOKE ((W)w, revents);
1739} 2076}
1740 2077
1741inline_speed void 2078unsigned int
1742call_pending (EV_P) 2079ev_pending_count (EV_P)
2080{
2081 int pri;
2082 unsigned int count = 0;
2083
2084 for (pri = NUMPRI; pri--; )
2085 count += pendingcnt [pri];
2086
2087 return count;
2088}
2089
2090void noinline
2091ev_invoke_pending (EV_P)
1743{ 2092{
1744 int pri; 2093 int pri;
1745 2094
1746 for (pri = NUMPRI; pri--; ) 2095 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 2096 while (pendingcnt [pri])
1748 { 2097 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2098 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 2099
1751 if (expect_true (p->w))
1752 {
1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 2100 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2101 /* ^ this is no longer true, as pending_w could be here */
1754 2102
1755 p->w->pending = 0; 2103 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 2104 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 2105 EV_FREQUENT_CHECK;
1758 }
1759 } 2106 }
1760} 2107}
1761 2108
1762#if EV_IDLE_ENABLE 2109#if EV_IDLE_ENABLE
2110/* make idle watchers pending. this handles the "call-idle */
2111/* only when higher priorities are idle" logic */
1763inline_size void 2112inline_size void
1764idle_reify (EV_P) 2113idle_reify (EV_P)
1765{ 2114{
1766 if (expect_false (idleall)) 2115 if (expect_false (idleall))
1767 { 2116 {
… …
1780 } 2129 }
1781 } 2130 }
1782} 2131}
1783#endif 2132#endif
1784 2133
2134/* make timers pending */
1785inline_size void 2135inline_size void
1786timers_reify (EV_P) 2136timers_reify (EV_P)
1787{ 2137{
1788 EV_FREQUENT_CHECK; 2138 EV_FREQUENT_CHECK;
1789 2139
… …
1813 EV_FREQUENT_CHECK; 2163 EV_FREQUENT_CHECK;
1814 feed_reverse (EV_A_ (W)w); 2164 feed_reverse (EV_A_ (W)w);
1815 } 2165 }
1816 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2166 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1817 2167
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 2168 feed_reverse_done (EV_A_ EV_TIMER);
1819 } 2169 }
1820} 2170}
1821 2171
1822#if EV_PERIODIC_ENABLE 2172#if EV_PERIODIC_ENABLE
2173/* make periodics pending */
1823inline_size void 2174inline_size void
1824periodics_reify (EV_P) 2175periodics_reify (EV_P)
1825{ 2176{
1826 EV_FREQUENT_CHECK; 2177 EV_FREQUENT_CHECK;
1827 2178
… …
1874 2225
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 2226 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 2227 }
1877} 2228}
1878 2229
2230/* simply recalculate all periodics */
2231/* TODO: maybe ensure that at least one event happens when jumping forward? */
1879static void noinline 2232static void noinline
1880periodics_reschedule (EV_P) 2233periodics_reschedule (EV_P)
1881{ 2234{
1882 int i; 2235 int i;
1883 2236
… …
1896 2249
1897 reheap (periodics, periodiccnt); 2250 reheap (periodics, periodiccnt);
1898} 2251}
1899#endif 2252#endif
1900 2253
2254/* adjust all timers by a given offset */
1901static void noinline 2255static void noinline
1902timers_reschedule (EV_P_ ev_tstamp adjust) 2256timers_reschedule (EV_P_ ev_tstamp adjust)
1903{ 2257{
1904 int i; 2258 int i;
1905 2259
… …
1909 ANHE_w (*he)->at += adjust; 2263 ANHE_w (*he)->at += adjust;
1910 ANHE_at_cache (*he); 2264 ANHE_at_cache (*he);
1911 } 2265 }
1912} 2266}
1913 2267
2268/* fetch new monotonic and realtime times from the kernel */
2269/* also detect if there was a timejump, and act accordingly */
1914inline_speed void 2270inline_speed void
1915time_update (EV_P_ ev_tstamp max_block) 2271time_update (EV_P_ ev_tstamp max_block)
1916{ 2272{
1917 int i;
1918
1919#if EV_USE_MONOTONIC 2273#if EV_USE_MONOTONIC
1920 if (expect_true (have_monotonic)) 2274 if (expect_true (have_monotonic))
1921 { 2275 {
2276 int i;
1922 ev_tstamp odiff = rtmn_diff; 2277 ev_tstamp odiff = rtmn_diff;
1923 2278
1924 mn_now = get_clock (); 2279 mn_now = get_clock ();
1925 2280
1926 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2281 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1976 2331
1977 mn_now = ev_rt_now; 2332 mn_now = ev_rt_now;
1978 } 2333 }
1979} 2334}
1980 2335
1981static int loop_done;
1982
1983void 2336void
1984ev_loop (EV_P_ int flags) 2337ev_run (EV_P_ int flags)
1985{ 2338{
2339#if EV_FEATURE_API
2340 ++loop_depth;
2341#endif
2342
2343 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2344
1986 loop_done = EVUNLOOP_CANCEL; 2345 loop_done = EVBREAK_CANCEL;
1987 2346
1988 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2347 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1989 2348
1990 do 2349 do
1991 { 2350 {
1992#if EV_VERIFY >= 2 2351#if EV_VERIFY >= 2
1993 ev_loop_verify (EV_A); 2352 ev_verify (EV_A);
1994#endif 2353#endif
1995 2354
1996#ifndef _WIN32 2355#ifndef _WIN32
1997 if (expect_false (curpid)) /* penalise the forking check even more */ 2356 if (expect_false (curpid)) /* penalise the forking check even more */
1998 if (expect_false (getpid () != curpid)) 2357 if (expect_false (getpid () != curpid))
… …
2006 /* we might have forked, so queue fork handlers */ 2365 /* we might have forked, so queue fork handlers */
2007 if (expect_false (postfork)) 2366 if (expect_false (postfork))
2008 if (forkcnt) 2367 if (forkcnt)
2009 { 2368 {
2010 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2369 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2011 call_pending (EV_A); 2370 EV_INVOKE_PENDING;
2012 } 2371 }
2013#endif 2372#endif
2014 2373
2374#if EV_PREPARE_ENABLE
2015 /* queue prepare watchers (and execute them) */ 2375 /* queue prepare watchers (and execute them) */
2016 if (expect_false (preparecnt)) 2376 if (expect_false (preparecnt))
2017 { 2377 {
2018 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2378 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2019 call_pending (EV_A); 2379 EV_INVOKE_PENDING;
2020 } 2380 }
2381#endif
2382
2383 if (expect_false (loop_done))
2384 break;
2021 2385
2022 /* we might have forked, so reify kernel state if necessary */ 2386 /* we might have forked, so reify kernel state if necessary */
2023 if (expect_false (postfork)) 2387 if (expect_false (postfork))
2024 loop_fork (EV_A); 2388 loop_fork (EV_A);
2025 2389
… …
2029 /* calculate blocking time */ 2393 /* calculate blocking time */
2030 { 2394 {
2031 ev_tstamp waittime = 0.; 2395 ev_tstamp waittime = 0.;
2032 ev_tstamp sleeptime = 0.; 2396 ev_tstamp sleeptime = 0.;
2033 2397
2398 /* remember old timestamp for io_blocktime calculation */
2399 ev_tstamp prev_mn_now = mn_now;
2400
2401 /* update time to cancel out callback processing overhead */
2402 time_update (EV_A_ 1e100);
2403
2034 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2404 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2035 { 2405 {
2036 /* update time to cancel out callback processing overhead */ 2406 waittime = MAX_BLOCKTIME;
2037 time_update (EV_A_ 1e100);
2038 2407
2039 if (timercnt) 2408 if (timercnt)
2040 { 2409 {
2041 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2410 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2042 if (waittime > to) waittime = to; 2411 if (waittime > to) waittime = to;
… …
2048 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2417 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2049 if (waittime > to) waittime = to; 2418 if (waittime > to) waittime = to;
2050 } 2419 }
2051#endif 2420#endif
2052 2421
2422 /* don't let timeouts decrease the waittime below timeout_blocktime */
2053 if (expect_false (waittime < timeout_blocktime)) 2423 if (expect_false (waittime < timeout_blocktime))
2054 waittime = timeout_blocktime; 2424 waittime = timeout_blocktime;
2055 2425
2056 sleeptime = waittime - backend_fudge; 2426 /* extra check because io_blocktime is commonly 0 */
2057
2058 if (expect_true (sleeptime > io_blocktime)) 2427 if (expect_false (io_blocktime))
2059 sleeptime = io_blocktime;
2060
2061 if (sleeptime)
2062 { 2428 {
2429 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2430
2431 if (sleeptime > waittime - backend_fudge)
2432 sleeptime = waittime - backend_fudge;
2433
2434 if (expect_true (sleeptime > 0.))
2435 {
2063 ev_sleep (sleeptime); 2436 ev_sleep (sleeptime);
2064 waittime -= sleeptime; 2437 waittime -= sleeptime;
2438 }
2065 } 2439 }
2066 } 2440 }
2067 2441
2442#if EV_FEATURE_API
2068 ++loop_count; 2443 ++loop_count;
2444#endif
2445 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2069 backend_poll (EV_A_ waittime); 2446 backend_poll (EV_A_ waittime);
2447 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2070 2448
2071 /* update ev_rt_now, do magic */ 2449 /* update ev_rt_now, do magic */
2072 time_update (EV_A_ waittime + sleeptime); 2450 time_update (EV_A_ waittime + sleeptime);
2073 } 2451 }
2074 2452
… …
2081#if EV_IDLE_ENABLE 2459#if EV_IDLE_ENABLE
2082 /* queue idle watchers unless other events are pending */ 2460 /* queue idle watchers unless other events are pending */
2083 idle_reify (EV_A); 2461 idle_reify (EV_A);
2084#endif 2462#endif
2085 2463
2464#if EV_CHECK_ENABLE
2086 /* queue check watchers, to be executed first */ 2465 /* queue check watchers, to be executed first */
2087 if (expect_false (checkcnt)) 2466 if (expect_false (checkcnt))
2088 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2467 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2468#endif
2089 2469
2090 call_pending (EV_A); 2470 EV_INVOKE_PENDING;
2091 } 2471 }
2092 while (expect_true ( 2472 while (expect_true (
2093 activecnt 2473 activecnt
2094 && !loop_done 2474 && !loop_done
2095 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2475 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2096 )); 2476 ));
2097 2477
2098 if (loop_done == EVUNLOOP_ONE) 2478 if (loop_done == EVBREAK_ONE)
2099 loop_done = EVUNLOOP_CANCEL; 2479 loop_done = EVBREAK_CANCEL;
2100}
2101 2480
2481#if EV_FEATURE_API
2482 --loop_depth;
2483#endif
2484}
2485
2102void 2486void
2103ev_unloop (EV_P_ int how) 2487ev_break (EV_P_ int how)
2104{ 2488{
2105 loop_done = how; 2489 loop_done = how;
2106} 2490}
2107 2491
2108void 2492void
… …
2135 ev_tstamp mn_prev = mn_now; 2519 ev_tstamp mn_prev = mn_now;
2136 2520
2137 ev_now_update (EV_A); 2521 ev_now_update (EV_A);
2138 timers_reschedule (EV_A_ mn_now - mn_prev); 2522 timers_reschedule (EV_A_ mn_now - mn_prev);
2139#if EV_PERIODIC_ENABLE 2523#if EV_PERIODIC_ENABLE
2524 /* TODO: really do this? */
2140 periodics_reschedule (EV_A); 2525 periodics_reschedule (EV_A);
2141#endif 2526#endif
2142} 2527}
2143 2528
2144/*****************************************************************************/ 2529/*****************************************************************************/
2530/* singly-linked list management, used when the expected list length is short */
2145 2531
2146inline_size void 2532inline_size void
2147wlist_add (WL *head, WL elem) 2533wlist_add (WL *head, WL elem)
2148{ 2534{
2149 elem->next = *head; 2535 elem->next = *head;
… …
2153inline_size void 2539inline_size void
2154wlist_del (WL *head, WL elem) 2540wlist_del (WL *head, WL elem)
2155{ 2541{
2156 while (*head) 2542 while (*head)
2157 { 2543 {
2158 if (*head == elem) 2544 if (expect_true (*head == elem))
2159 { 2545 {
2160 *head = elem->next; 2546 *head = elem->next;
2161 return; 2547 break;
2162 } 2548 }
2163 2549
2164 head = &(*head)->next; 2550 head = &(*head)->next;
2165 } 2551 }
2166} 2552}
2167 2553
2554/* internal, faster, version of ev_clear_pending */
2168inline_speed void 2555inline_speed void
2169clear_pending (EV_P_ W w) 2556clear_pending (EV_P_ W w)
2170{ 2557{
2171 if (w->pending) 2558 if (w->pending)
2172 { 2559 {
2173 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2560 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2174 w->pending = 0; 2561 w->pending = 0;
2175 } 2562 }
2176} 2563}
2177 2564
2178int 2565int
… …
2182 int pending = w_->pending; 2569 int pending = w_->pending;
2183 2570
2184 if (expect_true (pending)) 2571 if (expect_true (pending))
2185 { 2572 {
2186 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2573 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2574 p->w = (W)&pending_w;
2187 w_->pending = 0; 2575 w_->pending = 0;
2188 p->w = 0;
2189 return p->events; 2576 return p->events;
2190 } 2577 }
2191 else 2578 else
2192 return 0; 2579 return 0;
2193} 2580}
2194 2581
2195inline_size void 2582inline_size void
2196pri_adjust (EV_P_ W w) 2583pri_adjust (EV_P_ W w)
2197{ 2584{
2198 int pri = w->priority; 2585 int pri = ev_priority (w);
2199 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2586 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2200 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2587 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2201 w->priority = pri; 2588 ev_set_priority (w, pri);
2202} 2589}
2203 2590
2204inline_speed void 2591inline_speed void
2205ev_start (EV_P_ W w, int active) 2592ev_start (EV_P_ W w, int active)
2206{ 2593{
… …
2225 2612
2226 if (expect_false (ev_is_active (w))) 2613 if (expect_false (ev_is_active (w)))
2227 return; 2614 return;
2228 2615
2229 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2616 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2230 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2617 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2231 2618
2232 EV_FREQUENT_CHECK; 2619 EV_FREQUENT_CHECK;
2233 2620
2234 ev_start (EV_A_ (W)w, 1); 2621 ev_start (EV_A_ (W)w, 1);
2235 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2622 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2236 wlist_add (&anfds[fd].head, (WL)w); 2623 wlist_add (&anfds[fd].head, (WL)w);
2237 2624
2238 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2625 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2239 w->events &= ~EV__IOFDSET; 2626 w->events &= ~EV__IOFDSET;
2240 2627
2241 EV_FREQUENT_CHECK; 2628 EV_FREQUENT_CHECK;
2242} 2629}
2243 2630
… …
2253 EV_FREQUENT_CHECK; 2640 EV_FREQUENT_CHECK;
2254 2641
2255 wlist_del (&anfds[w->fd].head, (WL)w); 2642 wlist_del (&anfds[w->fd].head, (WL)w);
2256 ev_stop (EV_A_ (W)w); 2643 ev_stop (EV_A_ (W)w);
2257 2644
2258 fd_change (EV_A_ w->fd, 1); 2645 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2259 2646
2260 EV_FREQUENT_CHECK; 2647 EV_FREQUENT_CHECK;
2261} 2648}
2262 2649
2263void noinline 2650void noinline
… …
2305 timers [active] = timers [timercnt + HEAP0]; 2692 timers [active] = timers [timercnt + HEAP0];
2306 adjustheap (timers, timercnt, active); 2693 adjustheap (timers, timercnt, active);
2307 } 2694 }
2308 } 2695 }
2309 2696
2310 EV_FREQUENT_CHECK;
2311
2312 ev_at (w) -= mn_now; 2697 ev_at (w) -= mn_now;
2313 2698
2314 ev_stop (EV_A_ (W)w); 2699 ev_stop (EV_A_ (W)w);
2700
2701 EV_FREQUENT_CHECK;
2315} 2702}
2316 2703
2317void noinline 2704void noinline
2318ev_timer_again (EV_P_ ev_timer *w) 2705ev_timer_again (EV_P_ ev_timer *w)
2319{ 2706{
… …
2337 } 2724 }
2338 2725
2339 EV_FREQUENT_CHECK; 2726 EV_FREQUENT_CHECK;
2340} 2727}
2341 2728
2729ev_tstamp
2730ev_timer_remaining (EV_P_ ev_timer *w)
2731{
2732 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2733}
2734
2342#if EV_PERIODIC_ENABLE 2735#if EV_PERIODIC_ENABLE
2343void noinline 2736void noinline
2344ev_periodic_start (EV_P_ ev_periodic *w) 2737ev_periodic_start (EV_P_ ev_periodic *w)
2345{ 2738{
2346 if (expect_false (ev_is_active (w))) 2739 if (expect_false (ev_is_active (w)))
… …
2392 periodics [active] = periodics [periodiccnt + HEAP0]; 2785 periodics [active] = periodics [periodiccnt + HEAP0];
2393 adjustheap (periodics, periodiccnt, active); 2786 adjustheap (periodics, periodiccnt, active);
2394 } 2787 }
2395 } 2788 }
2396 2789
2397 EV_FREQUENT_CHECK;
2398
2399 ev_stop (EV_A_ (W)w); 2790 ev_stop (EV_A_ (W)w);
2791
2792 EV_FREQUENT_CHECK;
2400} 2793}
2401 2794
2402void noinline 2795void noinline
2403ev_periodic_again (EV_P_ ev_periodic *w) 2796ev_periodic_again (EV_P_ ev_periodic *w)
2404{ 2797{
… …
2410 2803
2411#ifndef SA_RESTART 2804#ifndef SA_RESTART
2412# define SA_RESTART 0 2805# define SA_RESTART 0
2413#endif 2806#endif
2414 2807
2808#if EV_SIGNAL_ENABLE
2809
2415void noinline 2810void noinline
2416ev_signal_start (EV_P_ ev_signal *w) 2811ev_signal_start (EV_P_ ev_signal *w)
2417{ 2812{
2418#if EV_MULTIPLICITY
2419 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2420#endif
2421 if (expect_false (ev_is_active (w))) 2813 if (expect_false (ev_is_active (w)))
2422 return; 2814 return;
2423 2815
2424 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2816 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2425 2817
2426 evpipe_init (EV_A); 2818#if EV_MULTIPLICITY
2819 assert (("libev: a signal must not be attached to two different loops",
2820 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2427 2821
2428 EV_FREQUENT_CHECK; 2822 signals [w->signum - 1].loop = EV_A;
2823#endif
2429 2824
2825 EV_FREQUENT_CHECK;
2826
2827#if EV_USE_SIGNALFD
2828 if (sigfd == -2)
2430 { 2829 {
2431#ifndef _WIN32 2830 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2432 sigset_t full, prev; 2831 if (sigfd < 0 && errno == EINVAL)
2433 sigfillset (&full); 2832 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2434 sigprocmask (SIG_SETMASK, &full, &prev);
2435#endif
2436 2833
2437 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2834 if (sigfd >= 0)
2835 {
2836 fd_intern (sigfd); /* doing it twice will not hurt */
2438 2837
2439#ifndef _WIN32 2838 sigemptyset (&sigfd_set);
2440 sigprocmask (SIG_SETMASK, &prev, 0); 2839
2441#endif 2840 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2841 ev_set_priority (&sigfd_w, EV_MAXPRI);
2842 ev_io_start (EV_A_ &sigfd_w);
2843 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2844 }
2442 } 2845 }
2846
2847 if (sigfd >= 0)
2848 {
2849 /* TODO: check .head */
2850 sigaddset (&sigfd_set, w->signum);
2851 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2852
2853 signalfd (sigfd, &sigfd_set, 0);
2854 }
2855#endif
2443 2856
2444 ev_start (EV_A_ (W)w, 1); 2857 ev_start (EV_A_ (W)w, 1);
2445 wlist_add (&signals [w->signum - 1].head, (WL)w); 2858 wlist_add (&signals [w->signum - 1].head, (WL)w);
2446 2859
2447 if (!((WL)w)->next) 2860 if (!((WL)w)->next)
2861# if EV_USE_SIGNALFD
2862 if (sigfd < 0) /*TODO*/
2863# endif
2448 { 2864 {
2449#if _WIN32 2865# ifdef _WIN32
2866 evpipe_init (EV_A);
2867
2450 signal (w->signum, ev_sighandler); 2868 signal (w->signum, ev_sighandler);
2451#else 2869# else
2452 struct sigaction sa; 2870 struct sigaction sa;
2871
2872 evpipe_init (EV_A);
2873
2453 sa.sa_handler = ev_sighandler; 2874 sa.sa_handler = ev_sighandler;
2454 sigfillset (&sa.sa_mask); 2875 sigfillset (&sa.sa_mask);
2455 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2876 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2456 sigaction (w->signum, &sa, 0); 2877 sigaction (w->signum, &sa, 0);
2878
2879 sigemptyset (&sa.sa_mask);
2880 sigaddset (&sa.sa_mask, w->signum);
2881 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2457#endif 2882#endif
2458 } 2883 }
2459 2884
2460 EV_FREQUENT_CHECK; 2885 EV_FREQUENT_CHECK;
2461} 2886}
2462 2887
2463void noinline 2888void noinline
… …
2471 2896
2472 wlist_del (&signals [w->signum - 1].head, (WL)w); 2897 wlist_del (&signals [w->signum - 1].head, (WL)w);
2473 ev_stop (EV_A_ (W)w); 2898 ev_stop (EV_A_ (W)w);
2474 2899
2475 if (!signals [w->signum - 1].head) 2900 if (!signals [w->signum - 1].head)
2901 {
2902#if EV_MULTIPLICITY
2903 signals [w->signum - 1].loop = 0; /* unattach from signal */
2904#endif
2905#if EV_USE_SIGNALFD
2906 if (sigfd >= 0)
2907 {
2908 sigset_t ss;
2909
2910 sigemptyset (&ss);
2911 sigaddset (&ss, w->signum);
2912 sigdelset (&sigfd_set, w->signum);
2913
2914 signalfd (sigfd, &sigfd_set, 0);
2915 sigprocmask (SIG_UNBLOCK, &ss, 0);
2916 }
2917 else
2918#endif
2476 signal (w->signum, SIG_DFL); 2919 signal (w->signum, SIG_DFL);
2920 }
2477 2921
2478 EV_FREQUENT_CHECK; 2922 EV_FREQUENT_CHECK;
2479} 2923}
2924
2925#endif
2926
2927#if EV_CHILD_ENABLE
2480 2928
2481void 2929void
2482ev_child_start (EV_P_ ev_child *w) 2930ev_child_start (EV_P_ ev_child *w)
2483{ 2931{
2484#if EV_MULTIPLICITY 2932#if EV_MULTIPLICITY
… …
2488 return; 2936 return;
2489 2937
2490 EV_FREQUENT_CHECK; 2938 EV_FREQUENT_CHECK;
2491 2939
2492 ev_start (EV_A_ (W)w, 1); 2940 ev_start (EV_A_ (W)w, 1);
2493 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2941 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2494 2942
2495 EV_FREQUENT_CHECK; 2943 EV_FREQUENT_CHECK;
2496} 2944}
2497 2945
2498void 2946void
… …
2502 if (expect_false (!ev_is_active (w))) 2950 if (expect_false (!ev_is_active (w)))
2503 return; 2951 return;
2504 2952
2505 EV_FREQUENT_CHECK; 2953 EV_FREQUENT_CHECK;
2506 2954
2507 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2955 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2508 ev_stop (EV_A_ (W)w); 2956 ev_stop (EV_A_ (W)w);
2509 2957
2510 EV_FREQUENT_CHECK; 2958 EV_FREQUENT_CHECK;
2511} 2959}
2960
2961#endif
2512 2962
2513#if EV_STAT_ENABLE 2963#if EV_STAT_ENABLE
2514 2964
2515# ifdef _WIN32 2965# ifdef _WIN32
2516# undef lstat 2966# undef lstat
… …
2522#define MIN_STAT_INTERVAL 0.1074891 2972#define MIN_STAT_INTERVAL 0.1074891
2523 2973
2524static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2974static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2525 2975
2526#if EV_USE_INOTIFY 2976#if EV_USE_INOTIFY
2527# define EV_INOTIFY_BUFSIZE 8192 2977
2978/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2979# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2528 2980
2529static void noinline 2981static void noinline
2530infy_add (EV_P_ ev_stat *w) 2982infy_add (EV_P_ ev_stat *w)
2531{ 2983{
2532 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); 2984 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);
2533 2985
2534 if (w->wd < 0) 2986 if (w->wd >= 0)
2987 {
2988 struct statfs sfs;
2989
2990 /* now local changes will be tracked by inotify, but remote changes won't */
2991 /* unless the filesystem is known to be local, we therefore still poll */
2992 /* also do poll on <2.6.25, but with normal frequency */
2993
2994 if (!fs_2625)
2995 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2996 else if (!statfs (w->path, &sfs)
2997 && (sfs.f_type == 0x1373 /* devfs */
2998 || sfs.f_type == 0xEF53 /* ext2/3 */
2999 || sfs.f_type == 0x3153464a /* jfs */
3000 || sfs.f_type == 0x52654973 /* reiser3 */
3001 || sfs.f_type == 0x01021994 /* tempfs */
3002 || sfs.f_type == 0x58465342 /* xfs */))
3003 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3004 else
3005 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2535 { 3006 }
3007 else
3008 {
3009 /* can't use inotify, continue to stat */
2536 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3010 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2537 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2538 3011
2539 /* monitor some parent directory for speedup hints */ 3012 /* if path is not there, monitor some parent directory for speedup hints */
2540 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3013 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2541 /* but an efficiency issue only */ 3014 /* but an efficiency issue only */
2542 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3015 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2543 { 3016 {
2544 char path [4096]; 3017 char path [4096];
… …
2560 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3033 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2561 } 3034 }
2562 } 3035 }
2563 3036
2564 if (w->wd >= 0) 3037 if (w->wd >= 0)
2565 {
2566 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3038 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2567 3039
2568 /* now local changes will be tracked by inotify, but remote changes won't */ 3040 /* now re-arm timer, if required */
2569 /* unless the filesystem it known to be local, we therefore still poll */ 3041 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2570 /* also do poll on <2.6.25, but with normal frequency */
2571 struct statfs sfs;
2572
2573 if (fs_2625 && !statfs (w->path, &sfs))
2574 if (sfs.f_type == 0x1373 /* devfs */
2575 || sfs.f_type == 0xEF53 /* ext2/3 */
2576 || sfs.f_type == 0x3153464a /* jfs */
2577 || sfs.f_type == 0x52654973 /* reiser3 */
2578 || sfs.f_type == 0x01021994 /* tempfs */
2579 || sfs.f_type == 0x58465342 /* xfs */)
2580 return;
2581
2582 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2583 ev_timer_again (EV_A_ &w->timer); 3042 ev_timer_again (EV_A_ &w->timer);
2584 } 3043 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2585} 3044}
2586 3045
2587static void noinline 3046static void noinline
2588infy_del (EV_P_ ev_stat *w) 3047infy_del (EV_P_ ev_stat *w)
2589{ 3048{
… …
2592 3051
2593 if (wd < 0) 3052 if (wd < 0)
2594 return; 3053 return;
2595 3054
2596 w->wd = -2; 3055 w->wd = -2;
2597 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3056 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2598 wlist_del (&fs_hash [slot].head, (WL)w); 3057 wlist_del (&fs_hash [slot].head, (WL)w);
2599 3058
2600 /* remove this watcher, if others are watching it, they will rearm */ 3059 /* remove this watcher, if others are watching it, they will rearm */
2601 inotify_rm_watch (fs_fd, wd); 3060 inotify_rm_watch (fs_fd, wd);
2602} 3061}
… …
2604static void noinline 3063static void noinline
2605infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3064infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2606{ 3065{
2607 if (slot < 0) 3066 if (slot < 0)
2608 /* overflow, need to check for all hash slots */ 3067 /* overflow, need to check for all hash slots */
2609 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3068 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2610 infy_wd (EV_A_ slot, wd, ev); 3069 infy_wd (EV_A_ slot, wd, ev);
2611 else 3070 else
2612 { 3071 {
2613 WL w_; 3072 WL w_;
2614 3073
2615 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3074 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2616 { 3075 {
2617 ev_stat *w = (ev_stat *)w_; 3076 ev_stat *w = (ev_stat *)w_;
2618 w_ = w_->next; /* lets us remove this watcher and all before it */ 3077 w_ = w_->next; /* lets us remove this watcher and all before it */
2619 3078
2620 if (w->wd == wd || wd == -1) 3079 if (w->wd == wd || wd == -1)
2621 { 3080 {
2622 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3081 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2623 { 3082 {
2624 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3083 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2625 w->wd = -1; 3084 w->wd = -1;
2626 infy_add (EV_A_ w); /* re-add, no matter what */ 3085 infy_add (EV_A_ w); /* re-add, no matter what */
2627 } 3086 }
2628 3087
2629 stat_timer_cb (EV_A_ &w->timer, 0); 3088 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2634 3093
2635static void 3094static void
2636infy_cb (EV_P_ ev_io *w, int revents) 3095infy_cb (EV_P_ ev_io *w, int revents)
2637{ 3096{
2638 char buf [EV_INOTIFY_BUFSIZE]; 3097 char buf [EV_INOTIFY_BUFSIZE];
2639 struct inotify_event *ev = (struct inotify_event *)buf;
2640 int ofs; 3098 int ofs;
2641 int len = read (fs_fd, buf, sizeof (buf)); 3099 int len = read (fs_fd, buf, sizeof (buf));
2642 3100
2643 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3101 for (ofs = 0; ofs < len; )
3102 {
3103 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2644 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3104 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3105 ofs += sizeof (struct inotify_event) + ev->len;
3106 }
2645} 3107}
2646 3108
2647inline_size void 3109inline_size void
2648check_2625 (EV_P) 3110ev_check_2625 (EV_P)
2649{ 3111{
2650 /* kernels < 2.6.25 are borked 3112 /* kernels < 2.6.25 are borked
2651 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3113 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2652 */ 3114 */
2653 struct utsname buf; 3115 if (ev_linux_version () < 0x020619)
2654 int major, minor, micro;
2655
2656 if (uname (&buf))
2657 return; 3116 return;
2658 3117
2659 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2660 return;
2661
2662 if (major < 2
2663 || (major == 2 && minor < 6)
2664 || (major == 2 && minor == 6 && micro < 25))
2665 return;
2666
2667 fs_2625 = 1; 3118 fs_2625 = 1;
3119}
3120
3121inline_size int
3122infy_newfd (void)
3123{
3124#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3125 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3126 if (fd >= 0)
3127 return fd;
3128#endif
3129 return inotify_init ();
2668} 3130}
2669 3131
2670inline_size void 3132inline_size void
2671infy_init (EV_P) 3133infy_init (EV_P)
2672{ 3134{
2673 if (fs_fd != -2) 3135 if (fs_fd != -2)
2674 return; 3136 return;
2675 3137
2676 fs_fd = -1; 3138 fs_fd = -1;
2677 3139
2678 check_2625 (EV_A); 3140 ev_check_2625 (EV_A);
2679 3141
2680 fs_fd = inotify_init (); 3142 fs_fd = infy_newfd ();
2681 3143
2682 if (fs_fd >= 0) 3144 if (fs_fd >= 0)
2683 { 3145 {
3146 fd_intern (fs_fd);
2684 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3147 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2685 ev_set_priority (&fs_w, EV_MAXPRI); 3148 ev_set_priority (&fs_w, EV_MAXPRI);
2686 ev_io_start (EV_A_ &fs_w); 3149 ev_io_start (EV_A_ &fs_w);
3150 ev_unref (EV_A);
2687 } 3151 }
2688} 3152}
2689 3153
2690inline_size void 3154inline_size void
2691infy_fork (EV_P) 3155infy_fork (EV_P)
… …
2693 int slot; 3157 int slot;
2694 3158
2695 if (fs_fd < 0) 3159 if (fs_fd < 0)
2696 return; 3160 return;
2697 3161
3162 ev_ref (EV_A);
3163 ev_io_stop (EV_A_ &fs_w);
2698 close (fs_fd); 3164 close (fs_fd);
2699 fs_fd = inotify_init (); 3165 fs_fd = infy_newfd ();
2700 3166
3167 if (fs_fd >= 0)
3168 {
3169 fd_intern (fs_fd);
3170 ev_io_set (&fs_w, fs_fd, EV_READ);
3171 ev_io_start (EV_A_ &fs_w);
3172 ev_unref (EV_A);
3173 }
3174
2701 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3175 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2702 { 3176 {
2703 WL w_ = fs_hash [slot].head; 3177 WL w_ = fs_hash [slot].head;
2704 fs_hash [slot].head = 0; 3178 fs_hash [slot].head = 0;
2705 3179
2706 while (w_) 3180 while (w_)
… …
2711 w->wd = -1; 3185 w->wd = -1;
2712 3186
2713 if (fs_fd >= 0) 3187 if (fs_fd >= 0)
2714 infy_add (EV_A_ w); /* re-add, no matter what */ 3188 infy_add (EV_A_ w); /* re-add, no matter what */
2715 else 3189 else
3190 {
3191 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3192 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2716 ev_timer_again (EV_A_ &w->timer); 3193 ev_timer_again (EV_A_ &w->timer);
3194 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3195 }
2717 } 3196 }
2718 } 3197 }
2719} 3198}
2720 3199
2721#endif 3200#endif
… …
2738static void noinline 3217static void noinline
2739stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3218stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2740{ 3219{
2741 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3220 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2742 3221
2743 /* we copy this here each the time so that */ 3222 ev_statdata prev = w->attr;
2744 /* prev has the old value when the callback gets invoked */
2745 w->prev = w->attr;
2746 ev_stat_stat (EV_A_ w); 3223 ev_stat_stat (EV_A_ w);
2747 3224
2748 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3225 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2749 if ( 3226 if (
2750 w->prev.st_dev != w->attr.st_dev 3227 prev.st_dev != w->attr.st_dev
2751 || w->prev.st_ino != w->attr.st_ino 3228 || prev.st_ino != w->attr.st_ino
2752 || w->prev.st_mode != w->attr.st_mode 3229 || prev.st_mode != w->attr.st_mode
2753 || w->prev.st_nlink != w->attr.st_nlink 3230 || prev.st_nlink != w->attr.st_nlink
2754 || w->prev.st_uid != w->attr.st_uid 3231 || prev.st_uid != w->attr.st_uid
2755 || w->prev.st_gid != w->attr.st_gid 3232 || prev.st_gid != w->attr.st_gid
2756 || w->prev.st_rdev != w->attr.st_rdev 3233 || prev.st_rdev != w->attr.st_rdev
2757 || w->prev.st_size != w->attr.st_size 3234 || prev.st_size != w->attr.st_size
2758 || w->prev.st_atime != w->attr.st_atime 3235 || prev.st_atime != w->attr.st_atime
2759 || w->prev.st_mtime != w->attr.st_mtime 3236 || prev.st_mtime != w->attr.st_mtime
2760 || w->prev.st_ctime != w->attr.st_ctime 3237 || prev.st_ctime != w->attr.st_ctime
2761 ) { 3238 ) {
3239 /* we only update w->prev on actual differences */
3240 /* in case we test more often than invoke the callback, */
3241 /* to ensure that prev is always different to attr */
3242 w->prev = prev;
3243
2762 #if EV_USE_INOTIFY 3244 #if EV_USE_INOTIFY
2763 if (fs_fd >= 0) 3245 if (fs_fd >= 0)
2764 { 3246 {
2765 infy_del (EV_A_ w); 3247 infy_del (EV_A_ w);
2766 infy_add (EV_A_ w); 3248 infy_add (EV_A_ w);
… …
2791 3273
2792 if (fs_fd >= 0) 3274 if (fs_fd >= 0)
2793 infy_add (EV_A_ w); 3275 infy_add (EV_A_ w);
2794 else 3276 else
2795#endif 3277#endif
3278 {
2796 ev_timer_again (EV_A_ &w->timer); 3279 ev_timer_again (EV_A_ &w->timer);
3280 ev_unref (EV_A);
3281 }
2797 3282
2798 ev_start (EV_A_ (W)w, 1); 3283 ev_start (EV_A_ (W)w, 1);
2799 3284
2800 EV_FREQUENT_CHECK; 3285 EV_FREQUENT_CHECK;
2801} 3286}
… …
2810 EV_FREQUENT_CHECK; 3295 EV_FREQUENT_CHECK;
2811 3296
2812#if EV_USE_INOTIFY 3297#if EV_USE_INOTIFY
2813 infy_del (EV_A_ w); 3298 infy_del (EV_A_ w);
2814#endif 3299#endif
3300
3301 if (ev_is_active (&w->timer))
3302 {
3303 ev_ref (EV_A);
2815 ev_timer_stop (EV_A_ &w->timer); 3304 ev_timer_stop (EV_A_ &w->timer);
3305 }
2816 3306
2817 ev_stop (EV_A_ (W)w); 3307 ev_stop (EV_A_ (W)w);
2818 3308
2819 EV_FREQUENT_CHECK; 3309 EV_FREQUENT_CHECK;
2820} 3310}
… …
2865 3355
2866 EV_FREQUENT_CHECK; 3356 EV_FREQUENT_CHECK;
2867} 3357}
2868#endif 3358#endif
2869 3359
3360#if EV_PREPARE_ENABLE
2870void 3361void
2871ev_prepare_start (EV_P_ ev_prepare *w) 3362ev_prepare_start (EV_P_ ev_prepare *w)
2872{ 3363{
2873 if (expect_false (ev_is_active (w))) 3364 if (expect_false (ev_is_active (w)))
2874 return; 3365 return;
… …
2900 3391
2901 ev_stop (EV_A_ (W)w); 3392 ev_stop (EV_A_ (W)w);
2902 3393
2903 EV_FREQUENT_CHECK; 3394 EV_FREQUENT_CHECK;
2904} 3395}
3396#endif
2905 3397
3398#if EV_CHECK_ENABLE
2906void 3399void
2907ev_check_start (EV_P_ ev_check *w) 3400ev_check_start (EV_P_ ev_check *w)
2908{ 3401{
2909 if (expect_false (ev_is_active (w))) 3402 if (expect_false (ev_is_active (w)))
2910 return; 3403 return;
… …
2936 3429
2937 ev_stop (EV_A_ (W)w); 3430 ev_stop (EV_A_ (W)w);
2938 3431
2939 EV_FREQUENT_CHECK; 3432 EV_FREQUENT_CHECK;
2940} 3433}
3434#endif
2941 3435
2942#if EV_EMBED_ENABLE 3436#if EV_EMBED_ENABLE
2943void noinline 3437void noinline
2944ev_embed_sweep (EV_P_ ev_embed *w) 3438ev_embed_sweep (EV_P_ ev_embed *w)
2945{ 3439{
2946 ev_loop (w->other, EVLOOP_NONBLOCK); 3440 ev_run (w->other, EVRUN_NOWAIT);
2947} 3441}
2948 3442
2949static void 3443static void
2950embed_io_cb (EV_P_ ev_io *io, int revents) 3444embed_io_cb (EV_P_ ev_io *io, int revents)
2951{ 3445{
2952 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3446 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2953 3447
2954 if (ev_cb (w)) 3448 if (ev_cb (w))
2955 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3449 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2956 else 3450 else
2957 ev_loop (w->other, EVLOOP_NONBLOCK); 3451 ev_run (w->other, EVRUN_NOWAIT);
2958} 3452}
2959 3453
2960static void 3454static void
2961embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3455embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2962{ 3456{
2963 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3457 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2964 3458
2965 { 3459 {
2966 struct ev_loop *loop = w->other; 3460 EV_P = w->other;
2967 3461
2968 while (fdchangecnt) 3462 while (fdchangecnt)
2969 { 3463 {
2970 fd_reify (EV_A); 3464 fd_reify (EV_A);
2971 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3465 ev_run (EV_A_ EVRUN_NOWAIT);
2972 } 3466 }
2973 } 3467 }
2974} 3468}
2975 3469
2976static void 3470static void
… …
2979 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3473 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2980 3474
2981 ev_embed_stop (EV_A_ w); 3475 ev_embed_stop (EV_A_ w);
2982 3476
2983 { 3477 {
2984 struct ev_loop *loop = w->other; 3478 EV_P = w->other;
2985 3479
2986 ev_loop_fork (EV_A); 3480 ev_loop_fork (EV_A);
2987 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3481 ev_run (EV_A_ EVRUN_NOWAIT);
2988 } 3482 }
2989 3483
2990 ev_embed_start (EV_A_ w); 3484 ev_embed_start (EV_A_ w);
2991} 3485}
2992 3486
… …
3003{ 3497{
3004 if (expect_false (ev_is_active (w))) 3498 if (expect_false (ev_is_active (w)))
3005 return; 3499 return;
3006 3500
3007 { 3501 {
3008 struct ev_loop *loop = w->other; 3502 EV_P = w->other;
3009 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3503 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3010 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3504 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3011 } 3505 }
3012 3506
3013 EV_FREQUENT_CHECK; 3507 EV_FREQUENT_CHECK;
… …
3040 3534
3041 ev_io_stop (EV_A_ &w->io); 3535 ev_io_stop (EV_A_ &w->io);
3042 ev_prepare_stop (EV_A_ &w->prepare); 3536 ev_prepare_stop (EV_A_ &w->prepare);
3043 ev_fork_stop (EV_A_ &w->fork); 3537 ev_fork_stop (EV_A_ &w->fork);
3044 3538
3539 ev_stop (EV_A_ (W)w);
3540
3045 EV_FREQUENT_CHECK; 3541 EV_FREQUENT_CHECK;
3046} 3542}
3047#endif 3543#endif
3048 3544
3049#if EV_FORK_ENABLE 3545#if EV_FORK_ENABLE
… …
3089ev_async_start (EV_P_ ev_async *w) 3585ev_async_start (EV_P_ ev_async *w)
3090{ 3586{
3091 if (expect_false (ev_is_active (w))) 3587 if (expect_false (ev_is_active (w)))
3092 return; 3588 return;
3093 3589
3590 w->sent = 0;
3591
3094 evpipe_init (EV_A); 3592 evpipe_init (EV_A);
3095 3593
3096 EV_FREQUENT_CHECK; 3594 EV_FREQUENT_CHECK;
3097 3595
3098 ev_start (EV_A_ (W)w, ++asynccnt); 3596 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3125 3623
3126void 3624void
3127ev_async_send (EV_P_ ev_async *w) 3625ev_async_send (EV_P_ ev_async *w)
3128{ 3626{
3129 w->sent = 1; 3627 w->sent = 1;
3130 evpipe_write (EV_A_ &gotasync); 3628 evpipe_write (EV_A_ &async_pending);
3131} 3629}
3132#endif 3630#endif
3133 3631
3134/*****************************************************************************/ 3632/*****************************************************************************/
3135 3633
… …
3175{ 3673{
3176 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3674 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3177 3675
3178 if (expect_false (!once)) 3676 if (expect_false (!once))
3179 { 3677 {
3180 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3678 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3181 return; 3679 return;
3182 } 3680 }
3183 3681
3184 once->cb = cb; 3682 once->cb = cb;
3185 once->arg = arg; 3683 once->arg = arg;
… …
3199 } 3697 }
3200} 3698}
3201 3699
3202/*****************************************************************************/ 3700/*****************************************************************************/
3203 3701
3204#if 0 3702#if EV_WALK_ENABLE
3205void 3703void
3206ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3704ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3207{ 3705{
3208 int i, j; 3706 int i, j;
3209 ev_watcher_list *wl, *wn; 3707 ev_watcher_list *wl, *wn;
… …
3225#if EV_USE_INOTIFY 3723#if EV_USE_INOTIFY
3226 if (ev_cb ((ev_io *)wl) == infy_cb) 3724 if (ev_cb ((ev_io *)wl) == infy_cb)
3227 ; 3725 ;
3228 else 3726 else
3229#endif 3727#endif
3230 if ((ev_io *)wl != &pipeev) 3728 if ((ev_io *)wl != &pipe_w)
3231 if (types & EV_IO) 3729 if (types & EV_IO)
3232 cb (EV_A_ EV_IO, wl); 3730 cb (EV_A_ EV_IO, wl);
3233 3731
3234 wl = wn; 3732 wl = wn;
3235 } 3733 }
… …
3272 if (types & EV_ASYNC) 3770 if (types & EV_ASYNC)
3273 for (i = asynccnt; i--; ) 3771 for (i = asynccnt; i--; )
3274 cb (EV_A_ EV_ASYNC, asyncs [i]); 3772 cb (EV_A_ EV_ASYNC, asyncs [i]);
3275#endif 3773#endif
3276 3774
3775#if EV_PREPARE_ENABLE
3277 if (types & EV_PREPARE) 3776 if (types & EV_PREPARE)
3278 for (i = preparecnt; i--; ) 3777 for (i = preparecnt; i--; )
3279#if EV_EMBED_ENABLE 3778# if EV_EMBED_ENABLE
3280 if (ev_cb (prepares [i]) != embed_prepare_cb) 3779 if (ev_cb (prepares [i]) != embed_prepare_cb)
3281#endif 3780# endif
3282 cb (EV_A_ EV_PREPARE, prepares [i]); 3781 cb (EV_A_ EV_PREPARE, prepares [i]);
3782#endif
3283 3783
3784#if EV_CHECK_ENABLE
3284 if (types & EV_CHECK) 3785 if (types & EV_CHECK)
3285 for (i = checkcnt; i--; ) 3786 for (i = checkcnt; i--; )
3286 cb (EV_A_ EV_CHECK, checks [i]); 3787 cb (EV_A_ EV_CHECK, checks [i]);
3788#endif
3287 3789
3790#if EV_SIGNAL_ENABLE
3288 if (types & EV_SIGNAL) 3791 if (types & EV_SIGNAL)
3289 for (i = 0; i < signalmax; ++i) 3792 for (i = 0; i < EV_NSIG - 1; ++i)
3290 for (wl = signals [i].head; wl; ) 3793 for (wl = signals [i].head; wl; )
3291 { 3794 {
3292 wn = wl->next; 3795 wn = wl->next;
3293 cb (EV_A_ EV_SIGNAL, wl); 3796 cb (EV_A_ EV_SIGNAL, wl);
3294 wl = wn; 3797 wl = wn;
3295 } 3798 }
3799#endif
3296 3800
3801#if EV_CHILD_ENABLE
3297 if (types & EV_CHILD) 3802 if (types & EV_CHILD)
3298 for (i = EV_PID_HASHSIZE; i--; ) 3803 for (i = (EV_PID_HASHSIZE); i--; )
3299 for (wl = childs [i]; wl; ) 3804 for (wl = childs [i]; wl; )
3300 { 3805 {
3301 wn = wl->next; 3806 wn = wl->next;
3302 cb (EV_A_ EV_CHILD, wl); 3807 cb (EV_A_ EV_CHILD, wl);
3303 wl = wn; 3808 wl = wn;
3304 } 3809 }
3810#endif
3305/* EV_STAT 0x00001000 /* stat data changed */ 3811/* EV_STAT 0x00001000 /* stat data changed */
3306/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3812/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3307} 3813}
3308#endif 3814#endif
3309 3815
3310#if EV_MULTIPLICITY 3816#if EV_MULTIPLICITY
3311 #include "ev_wrap.h" 3817 #include "ev_wrap.h"
3312#endif 3818#endif
3313 3819
3314#ifdef __cplusplus 3820EV_CPP(})
3315}
3316#endif
3317 3821

Diff Legend

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