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

Comparing libev/ev.c (file contents):
Revision 1.287 by root, Mon Apr 20 19:45:58 2009 UTC vs.
Revision 1.363 by root, Sun Oct 24 19:38:20 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
… …
57# endif 53# endif
58# ifndef EV_USE_MONOTONIC 54# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 55# define EV_USE_MONOTONIC 1
60# endif 56# endif
61# endif 57# endif
58# elif !defined(EV_USE_CLOCK_SYSCALL)
59# define EV_USE_CLOCK_SYSCALL 0
62# endif 60# endif
63 61
64# if HAVE_CLOCK_GETTIME 62# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 63# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 64# define EV_USE_MONOTONIC 1
… …
75# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
76# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
77# endif 75# endif
78# endif 76# endif
79 77
78# if HAVE_NANOSLEEP
80# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
81# if HAVE_NANOSLEEP
82# define EV_USE_NANOSLEEP 1 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
83# else 82# else
83# undef EV_USE_NANOSLEEP
84# define EV_USE_NANOSLEEP 0 84# define EV_USE_NANOSLEEP 0
85# endif
86
87# if HAVE_SELECT && HAVE_SYS_SELECT_H
88# ifndef EV_USE_SELECT
89# define EV_USE_SELECT EV_FEATURE_BACKENDS
85# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
86# endif 94# endif
87 95
96# if HAVE_POLL && HAVE_POLL_H
88# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
89# if HAVE_SELECT && HAVE_SYS_SELECT_H 98# define EV_USE_POLL EV_FEATURE_BACKENDS
90# define EV_USE_SELECT 1
91# else
92# define EV_USE_SELECT 0
93# endif 99# endif
94# endif
95
96# ifndef EV_USE_POLL
97# if HAVE_POLL && HAVE_POLL_H
98# define EV_USE_POLL 1
99# else 100# else
101# undef EV_USE_POLL
100# define EV_USE_POLL 0 102# define EV_USE_POLL 0
101# endif
102# endif 103# endif
103 104
104# ifndef EV_USE_EPOLL
105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
106# define EV_USE_EPOLL 1 106# ifndef EV_USE_EPOLL
107# else 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
108# define EV_USE_EPOLL 0
109# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
110# endif 112# endif
111 113
114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
112# ifndef EV_USE_KQUEUE 115# ifndef EV_USE_KQUEUE
113# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
114# define EV_USE_KQUEUE 1
115# else
116# define EV_USE_KQUEUE 0
117# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
118# endif 121# endif
119 122
120# ifndef EV_USE_PORT
121# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
122# define EV_USE_PORT 1 124# ifndef EV_USE_PORT
123# else 125# define EV_USE_PORT EV_FEATURE_BACKENDS
124# define EV_USE_PORT 0
125# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
126# endif 130# endif
127 131
128# ifndef EV_USE_INOTIFY
129# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
130# define EV_USE_INOTIFY 1 133# ifndef EV_USE_INOTIFY
131# else
132# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY EV_FEATURE_OS
133# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
134# endif 139# endif
135 140
141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
136# ifndef EV_USE_EVENTFD 142# ifndef EV_USE_SIGNALFD
137# if HAVE_EVENTFD 143# define EV_USE_SIGNALFD EV_FEATURE_OS
138# define EV_USE_EVENTFD 1
139# else
140# define EV_USE_EVENTFD 0
141# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
148# endif
149
150# if HAVE_EVENTFD
151# ifndef EV_USE_EVENTFD
152# define EV_USE_EVENTFD EV_FEATURE_OS
153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
142# endif 157# endif
143 158
144#endif 159#endif
145 160
146#include <math.h> 161#include <math.h>
147#include <stdlib.h> 162#include <stdlib.h>
163#include <string.h>
148#include <fcntl.h> 164#include <fcntl.h>
149#include <stddef.h> 165#include <stddef.h>
150 166
151#include <stdio.h> 167#include <stdio.h>
152 168
153#include <assert.h> 169#include <assert.h>
154#include <errno.h> 170#include <errno.h>
155#include <sys/types.h> 171#include <sys/types.h>
156#include <time.h> 172#include <time.h>
173#include <limits.h>
157 174
158#include <signal.h> 175#include <signal.h>
159 176
160#ifdef EV_H 177#ifdef EV_H
161# include EV_H 178# include EV_H
162#else 179#else
163# include "ev.h" 180# include "ev.h"
164#endif 181#endif
182
183EV_CPP(extern "C" {)
165 184
166#ifndef _WIN32 185#ifndef _WIN32
167# include <sys/time.h> 186# include <sys/time.h>
168# include <sys/wait.h> 187# include <sys/wait.h>
169# include <unistd.h> 188# include <unistd.h>
… …
172# define WIN32_LEAN_AND_MEAN 191# define WIN32_LEAN_AND_MEAN
173# include <windows.h> 192# include <windows.h>
174# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
175# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
176# endif 195# endif
196# undef EV_AVOID_STDIO
177#endif 197#endif
198
199/* OS X, in its infinite idiocy, actually HARDCODES
200 * a limit of 1024 into their select. Where people have brains,
201 * OS X engineers apparently have a vacuum. Or maybe they were
202 * ordered to have a vacuum, or they do anything for money.
203 * This might help. Or not.
204 */
205#define _DARWIN_UNLIMITED_SELECT 1
178 206
179/* this block tries to deduce configuration from header-defined symbols and defaults */ 207/* this block tries to deduce configuration from header-defined symbols and defaults */
208
209/* try to deduce the maximum number of signals on this platform */
210#if defined (EV_NSIG)
211/* use what's provided */
212#elif defined (NSIG)
213# define EV_NSIG (NSIG)
214#elif defined(_NSIG)
215# define EV_NSIG (_NSIG)
216#elif defined (SIGMAX)
217# define EV_NSIG (SIGMAX+1)
218#elif defined (SIG_MAX)
219# define EV_NSIG (SIG_MAX+1)
220#elif defined (_SIG_MAX)
221# define EV_NSIG (_SIG_MAX+1)
222#elif defined (MAXSIG)
223# define EV_NSIG (MAXSIG+1)
224#elif defined (MAX_SIG)
225# define EV_NSIG (MAX_SIG+1)
226#elif defined (SIGARRAYSIZE)
227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
228#elif defined (_sys_nsig)
229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
230#else
231# error "unable to find value for NSIG, please report"
232/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */
234# define EV_NSIG 65
235#endif
180 236
181#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
184# else 240# else
185# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
186# endif 242# endif
187#endif 243#endif
188 244
189#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
191# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
192# else 248# else
193# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
194# endif 250# endif
195#endif 251#endif
196 252
… …
198# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
199#endif 255#endif
200 256
201#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
202# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
203# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
204# else 260# else
205# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
206# endif 262# endif
207#endif 263#endif
208 264
209#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
210# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
211#endif 267#endif
212 268
213#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
214# ifdef _WIN32 270# ifdef _WIN32
215# define EV_USE_POLL 0 271# define EV_USE_POLL 0
216# else 272# else
217# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
218# endif 274# endif
219#endif 275#endif
220 276
221#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
222# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
223# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
224# else 280# else
225# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
226# endif 282# endif
227#endif 283#endif
228 284
… …
234# define EV_USE_PORT 0 290# define EV_USE_PORT 0
235#endif 291#endif
236 292
237#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
238# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
239# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
240# else 296# else
241# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
242# endif 298# endif
243#endif 299#endif
244 300
245#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
246# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
247# define EV_PID_HASHSIZE 1
248# else
249# define EV_PID_HASHSIZE 16
250# endif
251#endif 303#endif
252 304
253#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
254# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
255# define EV_INOTIFY_HASHSIZE 1
256# else
257# define EV_INOTIFY_HASHSIZE 16
258# endif
259#endif 307#endif
260 308
261#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
262# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
263# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
264# else 312# else
265# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
314# endif
315#endif
316
317#ifndef EV_USE_SIGNALFD
318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
319# define EV_USE_SIGNALFD EV_FEATURE_OS
320# else
321# define EV_USE_SIGNALFD 0
266# endif 322# endif
267#endif 323#endif
268 324
269#if 0 /* debugging */ 325#if 0 /* debugging */
270# define EV_VERIFY 3 326# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
273#endif 329#endif
274 330
275#ifndef EV_VERIFY 331#ifndef EV_VERIFY
276# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
277#endif 333#endif
278 334
279#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
280# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
281#endif 337#endif
282 338
283#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
341#endif
342
343/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
344/* which makes programs even slower. might work on other unices, too. */
345#if EV_USE_CLOCK_SYSCALL
346# include <syscall.h>
347# ifdef SYS_clock_gettime
348# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
349# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 1
351# else
352# undef EV_USE_CLOCK_SYSCALL
353# define EV_USE_CLOCK_SYSCALL 0
354# endif
285#endif 355#endif
286 356
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 357/* this block fixes any misconfiguration where we know we run into trouble otherwise */
358
359#ifdef _AIX
360/* AIX has a completely broken poll.h header */
361# undef EV_USE_POLL
362# define EV_USE_POLL 0
363#endif
288 364
289#ifndef CLOCK_MONOTONIC 365#ifndef CLOCK_MONOTONIC
290# undef EV_USE_MONOTONIC 366# undef EV_USE_MONOTONIC
291# define EV_USE_MONOTONIC 0 367# define EV_USE_MONOTONIC 0
292#endif 368#endif
… …
306# include <sys/select.h> 382# include <sys/select.h>
307# endif 383# endif
308#endif 384#endif
309 385
310#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h> 387# include <sys/statfs.h>
313# include <sys/inotify.h> 388# include <sys/inotify.h>
314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
315# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
316# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
320 395
321#if EV_SELECT_IS_WINSOCKET 396#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 397# include <winsock.h>
323#endif 398#endif
324 399
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 400#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 401/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 402# include <stdint.h>
337# ifdef __cplusplus 403# ifndef EFD_NONBLOCK
338extern "C" { 404# define EFD_NONBLOCK O_NONBLOCK
339# endif 405# endif
340int eventfd (unsigned int initval, int flags); 406# ifndef EFD_CLOEXEC
341# ifdef __cplusplus 407# ifdef O_CLOEXEC
342} 408# define EFD_CLOEXEC O_CLOEXEC
409# else
410# define EFD_CLOEXEC 02000000
411# endif
343# endif 412# endif
413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
414#endif
415
416#if EV_USE_SIGNALFD
417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
418# include <stdint.h>
419# ifndef SFD_NONBLOCK
420# define SFD_NONBLOCK O_NONBLOCK
421# endif
422# ifndef SFD_CLOEXEC
423# ifdef O_CLOEXEC
424# define SFD_CLOEXEC O_CLOEXEC
425# else
426# define SFD_CLOEXEC 02000000
427# endif
428# endif
429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
430
431struct signalfd_siginfo
432{
433 uint32_t ssi_signo;
434 char pad[128 - sizeof (uint32_t)];
435};
344#endif 436#endif
345 437
346/**/ 438/**/
347 439
348#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
350#else 442#else
351# define EV_FREQUENT_CHECK do { } while (0) 443# define EV_FREQUENT_CHECK do { } while (0)
352#endif 444#endif
353 445
354/* 446/*
… …
361 */ 453 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 455
364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 456#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
365#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 457#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
366/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 458
459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
460#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
367 461
368#if __GNUC__ >= 4 462#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
371#else 465#else
… …
378 472
379#define expect_false(expr) expect ((expr) != 0, 0) 473#define expect_false(expr) expect ((expr) != 0, 0)
380#define expect_true(expr) expect ((expr) != 0, 1) 474#define expect_true(expr) expect ((expr) != 0, 1)
381#define inline_size static inline 475#define inline_size static inline
382 476
383#if EV_MINIMAL 477#if EV_FEATURE_CODE
478# define inline_speed static inline
479#else
384# define inline_speed static noinline 480# define inline_speed static noinline
481#endif
482
483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
484
485#if EV_MINPRI == EV_MAXPRI
486# define ABSPRI(w) (((W)w), 0)
385#else 487#else
386# define inline_speed static inline
387#endif
388
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 488# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
489#endif
391 490
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 491#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 492#define EMPTY2(a,b) /* used to suppress some warnings */
394 493
395typedef ev_watcher *W; 494typedef ev_watcher *W;
… …
399#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
400#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
401 500
402#if EV_USE_REALTIME 501#if EV_USE_REALTIME
403/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 502/* sig_atomic_t is used to avoid per-thread variables or locking but still */
404/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
405static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
406#endif 505#endif
407 506
408#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 509#endif
411 510
511#ifndef EV_FD_TO_WIN32_HANDLE
512# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
513#endif
514#ifndef EV_WIN32_HANDLE_TO_FD
515# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
516#endif
517#ifndef EV_WIN32_CLOSE_FD
518# define EV_WIN32_CLOSE_FD(fd) close (fd)
519#endif
520
412#ifdef _WIN32 521#ifdef _WIN32
413# include "ev_win32.c" 522# include "ev_win32.c"
414#endif 523#endif
415 524
416/*****************************************************************************/ 525/*****************************************************************************/
526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
531static unsigned int noinline
532ev_linux_version (void)
533{
534#ifdef __linux
535 unsigned int v = 0;
536 struct utsname buf;
537 int i;
538 char *p = buf.release;
539
540 if (uname (&buf))
541 return 0;
542
543 for (i = 3+1; --i; )
544 {
545 unsigned int c = 0;
546
547 for (;;)
548 {
549 if (*p >= '0' && *p <= '9')
550 c = c * 10 + *p++ - '0';
551 else
552 {
553 p += *p == '.';
554 break;
555 }
556 }
557
558 v = (v << 8) | c;
559 }
560
561 return v;
562#else
563 return 0;
564#endif
565}
566
567/*****************************************************************************/
568
569#if EV_AVOID_STDIO
570static void noinline
571ev_printerr (const char *msg)
572{
573 write (STDERR_FILENO, msg, strlen (msg));
574}
575#endif
417 576
418static void (*syserr_cb)(const char *msg); 577static void (*syserr_cb)(const char *msg);
419 578
420void 579void
421ev_set_syserr_cb (void (*cb)(const char *msg)) 580ev_set_syserr_cb (void (*cb)(const char *msg))
… …
431 590
432 if (syserr_cb) 591 if (syserr_cb)
433 syserr_cb (msg); 592 syserr_cb (msg);
434 else 593 else
435 { 594 {
595#if EV_AVOID_STDIO
596 const char *err = strerror (errno);
597
598 ev_printerr (msg);
599 ev_printerr (": ");
600 ev_printerr (err);
601 ev_printerr ("\n");
602#else
436 perror (msg); 603 perror (msg);
604#endif
437 abort (); 605 abort ();
438 } 606 }
439} 607}
440 608
441static void * 609static void *
442ev_realloc_emul (void *ptr, long size) 610ev_realloc_emul (void *ptr, long size)
443{ 611{
612#if __GLIBC__
613 return realloc (ptr, size);
614#else
444 /* some systems, notably openbsd and darwin, fail to properly 615 /* some systems, notably openbsd and darwin, fail to properly
445 * implement realloc (x, 0) (as required by both ansi c-98 and 616 * implement realloc (x, 0) (as required by both ansi c-89 and
446 * the single unix specification, so work around them here. 617 * the single unix specification, so work around them here.
447 */ 618 */
448 619
449 if (size) 620 if (size)
450 return realloc (ptr, size); 621 return realloc (ptr, size);
451 622
452 free (ptr); 623 free (ptr);
453 return 0; 624 return 0;
625#endif
454} 626}
455 627
456static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 628static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
457 629
458void 630void
… …
466{ 638{
467 ptr = alloc (ptr, size); 639 ptr = alloc (ptr, size);
468 640
469 if (!ptr && size) 641 if (!ptr && size)
470 { 642 {
643#if EV_AVOID_STDIO
644 ev_printerr ("libev: memory allocation failed, aborting.\n");
645#else
471 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 646 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
647#endif
472 abort (); 648 abort ();
473 } 649 }
474 650
475 return ptr; 651 return ptr;
476} 652}
… …
478#define ev_malloc(size) ev_realloc (0, (size)) 654#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 655#define ev_free(ptr) ev_realloc ((ptr), 0)
480 656
481/*****************************************************************************/ 657/*****************************************************************************/
482 658
659/* set in reify when reification needed */
660#define EV_ANFD_REIFY 1
661
662/* file descriptor info structure */
483typedef struct 663typedef struct
484{ 664{
485 WL head; 665 WL head;
486 unsigned char events; 666 unsigned char events; /* the events watched for */
487 unsigned char reify; 667 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
488 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 668 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 669 unsigned char unused;
490#if EV_USE_EPOLL 670#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 672#endif
493#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
494 SOCKET handle; 674 SOCKET handle;
495#endif 675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
678#endif
496} ANFD; 679} ANFD;
497 680
681/* stores the pending event set for a given watcher */
498typedef struct 682typedef struct
499{ 683{
500 W w; 684 W w;
501 int events; 685 int events; /* the pending event set for the given watcher */
502} ANPENDING; 686} ANPENDING;
503 687
504#if EV_USE_INOTIFY 688#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 689/* hash table entry per inotify-id */
506typedef struct 690typedef struct
… …
509} ANFS; 693} ANFS;
510#endif 694#endif
511 695
512/* Heap Entry */ 696/* Heap Entry */
513#if EV_HEAP_CACHE_AT 697#if EV_HEAP_CACHE_AT
698 /* a heap element */
514 typedef struct { 699 typedef struct {
515 ev_tstamp at; 700 ev_tstamp at;
516 WT w; 701 WT w;
517 } ANHE; 702 } ANHE;
518 703
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 704 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 705 #define ANHE_at(he) (he).at /* access cached at, read-only */
521 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 706 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 707#else
708 /* a heap element */
523 typedef WT ANHE; 709 typedef WT ANHE;
524 710
525 #define ANHE_w(he) (he) 711 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 712 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 713 #define ANHE_at_cache(he)
… …
551 737
552 static int ev_default_loop_ptr; 738 static int ev_default_loop_ptr;
553 739
554#endif 740#endif
555 741
742#if EV_FEATURE_API
743# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
744# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
745# define EV_INVOKE_PENDING invoke_cb (EV_A)
746#else
747# define EV_RELEASE_CB (void)0
748# define EV_ACQUIRE_CB (void)0
749# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
750#endif
751
752#define EVBREAK_RECURSE 0x80
753
556/*****************************************************************************/ 754/*****************************************************************************/
557 755
756#ifndef EV_HAVE_EV_TIME
558ev_tstamp 757ev_tstamp
559ev_time (void) 758ev_time (void)
560{ 759{
561#if EV_USE_REALTIME 760#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 761 if (expect_true (have_realtime))
… …
569 768
570 struct timeval tv; 769 struct timeval tv;
571 gettimeofday (&tv, 0); 770 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 771 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 772}
773#endif
574 774
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
1415static void noinline 1735/* free up a loop structure */
1736void
1416loop_destroy (EV_P) 1737ev_loop_destroy (EV_P)
1417{ 1738{
1418 int i; 1739 int i;
1419 1740
1741 /* mimic free (0) */
1742 if (!EV_A)
1743 return;
1744
1745#if EV_CLEANUP_ENABLE
1746 /* queue cleanup watchers (and execute them) */
1747 if (expect_false (cleanupcnt))
1748 {
1749 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1750 EV_INVOKE_PENDING;
1751 }
1752#endif
1753
1754#if EV_CHILD_ENABLE
1755 if (ev_is_active (&childev))
1756 {
1757 ev_ref (EV_A); /* child watcher */
1758 ev_signal_stop (EV_A_ &childev);
1759 }
1760#endif
1761
1420 if (ev_is_active (&pipeev)) 1762 if (ev_is_active (&pipe_w))
1421 { 1763 {
1422 ev_ref (EV_A); /* signal watcher */ 1764 /*ev_ref (EV_A);*/
1423 ev_io_stop (EV_A_ &pipeev); 1765 /*ev_io_stop (EV_A_ &pipe_w);*/
1424 1766
1425#if EV_USE_EVENTFD 1767#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1768 if (evfd >= 0)
1427 close (evfd); 1769 close (evfd);
1428#endif 1770#endif
1429 1771
1430 if (evpipe [0] >= 0) 1772 if (evpipe [0] >= 0)
1431 { 1773 {
1432 close (evpipe [0]); 1774 EV_WIN32_CLOSE_FD (evpipe [0]);
1433 close (evpipe [1]); 1775 EV_WIN32_CLOSE_FD (evpipe [1]);
1434 } 1776 }
1435 } 1777 }
1778
1779#if EV_USE_SIGNALFD
1780 if (ev_is_active (&sigfd_w))
1781 close (sigfd);
1782#endif
1436 1783
1437#if EV_USE_INOTIFY 1784#if EV_USE_INOTIFY
1438 if (fs_fd >= 0) 1785 if (fs_fd >= 0)
1439 close (fs_fd); 1786 close (fs_fd);
1440#endif 1787#endif
1441 1788
1442 if (backend_fd >= 0) 1789 if (backend_fd >= 0)
1443 close (backend_fd); 1790 close (backend_fd);
1444 1791
1792#if EV_USE_IOCP
1793 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1794#endif
1445#if EV_USE_PORT 1795#if EV_USE_PORT
1446 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1796 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1447#endif 1797#endif
1448#if EV_USE_KQUEUE 1798#if EV_USE_KQUEUE
1449 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1799 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1464#if EV_IDLE_ENABLE 1814#if EV_IDLE_ENABLE
1465 array_free (idle, [i]); 1815 array_free (idle, [i]);
1466#endif 1816#endif
1467 } 1817 }
1468 1818
1469 ev_free (anfds); anfdmax = 0; 1819 ev_free (anfds); anfds = 0; anfdmax = 0;
1470 1820
1471 /* have to use the microsoft-never-gets-it-right macro */ 1821 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY); 1822 array_free (rfeed, EMPTY);
1473 array_free (fdchange, EMPTY); 1823 array_free (fdchange, EMPTY);
1474 array_free (timer, EMPTY); 1824 array_free (timer, EMPTY);
… …
1476 array_free (periodic, EMPTY); 1826 array_free (periodic, EMPTY);
1477#endif 1827#endif
1478#if EV_FORK_ENABLE 1828#if EV_FORK_ENABLE
1479 array_free (fork, EMPTY); 1829 array_free (fork, EMPTY);
1480#endif 1830#endif
1831#if EV_CLEANUP_ENABLE
1832 array_free (cleanup, EMPTY);
1833#endif
1481 array_free (prepare, EMPTY); 1834 array_free (prepare, EMPTY);
1482 array_free (check, EMPTY); 1835 array_free (check, EMPTY);
1483#if EV_ASYNC_ENABLE 1836#if EV_ASYNC_ENABLE
1484 array_free (async, EMPTY); 1837 array_free (async, EMPTY);
1485#endif 1838#endif
1486 1839
1487 backend = 0; 1840 backend = 0;
1841
1842#if EV_MULTIPLICITY
1843 if (ev_is_default_loop (EV_A))
1844#endif
1845 ev_default_loop_ptr = 0;
1846#if EV_MULTIPLICITY
1847 else
1848 ev_free (EV_A);
1849#endif
1488} 1850}
1489 1851
1490#if EV_USE_INOTIFY 1852#if EV_USE_INOTIFY
1491inline_size void infy_fork (EV_P); 1853inline_size void infy_fork (EV_P);
1492#endif 1854#endif
… …
1505#endif 1867#endif
1506#if EV_USE_INOTIFY 1868#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1869 infy_fork (EV_A);
1508#endif 1870#endif
1509 1871
1510 if (ev_is_active (&pipeev)) 1872 if (ev_is_active (&pipe_w))
1511 { 1873 {
1512 /* this "locks" the handlers against writing to the pipe */ 1874 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1875 /* while we modify the fd vars */
1514 gotsig = 1; 1876 sig_pending = 1;
1515#if EV_ASYNC_ENABLE 1877#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1878 async_pending = 1;
1517#endif 1879#endif
1518 1880
1519 ev_ref (EV_A); 1881 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1882 ev_io_stop (EV_A_ &pipe_w);
1521 1883
1522#if EV_USE_EVENTFD 1884#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1885 if (evfd >= 0)
1524 close (evfd); 1886 close (evfd);
1525#endif 1887#endif
1526 1888
1527 if (evpipe [0] >= 0) 1889 if (evpipe [0] >= 0)
1528 { 1890 {
1529 close (evpipe [0]); 1891 EV_WIN32_CLOSE_FD (evpipe [0]);
1530 close (evpipe [1]); 1892 EV_WIN32_CLOSE_FD (evpipe [1]);
1531 } 1893 }
1532 1894
1895#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1533 evpipe_init (EV_A); 1896 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1897 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1898 pipecb (EV_A_ &pipe_w, EV_READ);
1899#endif
1536 } 1900 }
1537 1901
1538 postfork = 0; 1902 postfork = 0;
1539} 1903}
1540 1904
1541#if EV_MULTIPLICITY 1905#if EV_MULTIPLICITY
1542 1906
1543struct ev_loop * 1907struct ev_loop *
1544ev_loop_new (unsigned int flags) 1908ev_loop_new (unsigned int flags)
1545{ 1909{
1546 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1910 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1547 1911
1548 memset (loop, 0, sizeof (struct ev_loop)); 1912 memset (EV_A, 0, sizeof (struct ev_loop));
1549
1550 loop_init (EV_A_ flags); 1913 loop_init (EV_A_ flags);
1551 1914
1552 if (ev_backend (EV_A)) 1915 if (ev_backend (EV_A))
1553 return loop; 1916 return EV_A;
1554 1917
1918 ev_free (EV_A);
1555 return 0; 1919 return 0;
1556} 1920}
1557 1921
1558void 1922#endif /* multiplicity */
1559ev_loop_destroy (EV_P)
1560{
1561 loop_destroy (EV_A);
1562 ev_free (loop);
1563}
1564
1565void
1566ev_loop_fork (EV_P)
1567{
1568 postfork = 1; /* must be in line with ev_default_fork */
1569}
1570 1923
1571#if EV_VERIFY 1924#if EV_VERIFY
1572static void noinline 1925static void noinline
1573verify_watcher (EV_P_ W w) 1926verify_watcher (EV_P_ W w)
1574{ 1927{
… …
1602 verify_watcher (EV_A_ ws [cnt]); 1955 verify_watcher (EV_A_ ws [cnt]);
1603 } 1956 }
1604} 1957}
1605#endif 1958#endif
1606 1959
1960#if EV_FEATURE_API
1607void 1961void
1608ev_loop_verify (EV_P) 1962ev_verify (EV_P)
1609{ 1963{
1610#if EV_VERIFY 1964#if EV_VERIFY
1611 int i; 1965 int i;
1612 WL w; 1966 WL w;
1613 1967
… …
1647#if EV_FORK_ENABLE 2001#if EV_FORK_ENABLE
1648 assert (forkmax >= forkcnt); 2002 assert (forkmax >= forkcnt);
1649 array_verify (EV_A_ (W *)forks, forkcnt); 2003 array_verify (EV_A_ (W *)forks, forkcnt);
1650#endif 2004#endif
1651 2005
2006#if EV_CLEANUP_ENABLE
2007 assert (cleanupmax >= cleanupcnt);
2008 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2009#endif
2010
1652#if EV_ASYNC_ENABLE 2011#if EV_ASYNC_ENABLE
1653 assert (asyncmax >= asynccnt); 2012 assert (asyncmax >= asynccnt);
1654 array_verify (EV_A_ (W *)asyncs, asynccnt); 2013 array_verify (EV_A_ (W *)asyncs, asynccnt);
1655#endif 2014#endif
1656 2015
2016#if EV_PREPARE_ENABLE
1657 assert (preparemax >= preparecnt); 2017 assert (preparemax >= preparecnt);
1658 array_verify (EV_A_ (W *)prepares, preparecnt); 2018 array_verify (EV_A_ (W *)prepares, preparecnt);
2019#endif
1659 2020
2021#if EV_CHECK_ENABLE
1660 assert (checkmax >= checkcnt); 2022 assert (checkmax >= checkcnt);
1661 array_verify (EV_A_ (W *)checks, checkcnt); 2023 array_verify (EV_A_ (W *)checks, checkcnt);
2024#endif
1662 2025
1663# if 0 2026# if 0
2027#if EV_CHILD_ENABLE
1664 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2028 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) 2029 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2030#endif
1666# endif 2031# endif
1667#endif 2032#endif
1668} 2033}
1669 2034#endif
1670#endif /* multiplicity */
1671 2035
1672#if EV_MULTIPLICITY 2036#if EV_MULTIPLICITY
1673struct ev_loop * 2037struct ev_loop *
1674ev_default_loop_init (unsigned int flags)
1675#else 2038#else
1676int 2039int
2040#endif
1677ev_default_loop (unsigned int flags) 2041ev_default_loop (unsigned int flags)
1678#endif
1679{ 2042{
1680 if (!ev_default_loop_ptr) 2043 if (!ev_default_loop_ptr)
1681 { 2044 {
1682#if EV_MULTIPLICITY 2045#if EV_MULTIPLICITY
1683 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2046 EV_P = ev_default_loop_ptr = &default_loop_struct;
1684#else 2047#else
1685 ev_default_loop_ptr = 1; 2048 ev_default_loop_ptr = 1;
1686#endif 2049#endif
1687 2050
1688 loop_init (EV_A_ flags); 2051 loop_init (EV_A_ flags);
1689 2052
1690 if (ev_backend (EV_A)) 2053 if (ev_backend (EV_A))
1691 { 2054 {
1692#ifndef _WIN32 2055#if EV_CHILD_ENABLE
1693 ev_signal_init (&childev, childcb, SIGCHLD); 2056 ev_signal_init (&childev, childcb, SIGCHLD);
1694 ev_set_priority (&childev, EV_MAXPRI); 2057 ev_set_priority (&childev, EV_MAXPRI);
1695 ev_signal_start (EV_A_ &childev); 2058 ev_signal_start (EV_A_ &childev);
1696 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2059 ev_unref (EV_A); /* child watcher should not keep loop alive */
1697#endif 2060#endif
… …
1702 2065
1703 return ev_default_loop_ptr; 2066 return ev_default_loop_ptr;
1704} 2067}
1705 2068
1706void 2069void
1707ev_default_destroy (void) 2070ev_loop_fork (EV_P)
1708{ 2071{
1709#if EV_MULTIPLICITY
1710 struct ev_loop *loop = ev_default_loop_ptr;
1711#endif
1712
1713 ev_default_loop_ptr = 0;
1714
1715#ifndef _WIN32
1716 ev_ref (EV_A); /* child watcher */
1717 ev_signal_stop (EV_A_ &childev);
1718#endif
1719
1720 loop_destroy (EV_A);
1721}
1722
1723void
1724ev_default_fork (void)
1725{
1726#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr;
1728#endif
1729
1730 postfork = 1; /* must be in line with ev_loop_fork */ 2072 postfork = 1; /* must be in line with ev_default_fork */
1731} 2073}
1732 2074
1733/*****************************************************************************/ 2075/*****************************************************************************/
1734 2076
1735void 2077void
1736ev_invoke (EV_P_ void *w, int revents) 2078ev_invoke (EV_P_ void *w, int revents)
1737{ 2079{
1738 EV_CB_INVOKE ((W)w, revents); 2080 EV_CB_INVOKE ((W)w, revents);
1739} 2081}
1740 2082
1741inline_speed void 2083unsigned int
1742call_pending (EV_P) 2084ev_pending_count (EV_P)
2085{
2086 int pri;
2087 unsigned int count = 0;
2088
2089 for (pri = NUMPRI; pri--; )
2090 count += pendingcnt [pri];
2091
2092 return count;
2093}
2094
2095void noinline
2096ev_invoke_pending (EV_P)
1743{ 2097{
1744 int pri; 2098 int pri;
1745 2099
1746 for (pri = NUMPRI; pri--; ) 2100 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 2101 while (pendingcnt [pri])
1748 { 2102 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2103 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 2104
1751 if (expect_true (p->w))
1752 {
1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 2105 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2106 /* ^ this is no longer true, as pending_w could be here */
1754 2107
1755 p->w->pending = 0; 2108 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 2109 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 2110 EV_FREQUENT_CHECK;
1758 }
1759 } 2111 }
1760} 2112}
1761 2113
1762#if EV_IDLE_ENABLE 2114#if EV_IDLE_ENABLE
2115/* make idle watchers pending. this handles the "call-idle */
2116/* only when higher priorities are idle" logic */
1763inline_size void 2117inline_size void
1764idle_reify (EV_P) 2118idle_reify (EV_P)
1765{ 2119{
1766 if (expect_false (idleall)) 2120 if (expect_false (idleall))
1767 { 2121 {
… …
1780 } 2134 }
1781 } 2135 }
1782} 2136}
1783#endif 2137#endif
1784 2138
2139/* make timers pending */
1785inline_size void 2140inline_size void
1786timers_reify (EV_P) 2141timers_reify (EV_P)
1787{ 2142{
1788 EV_FREQUENT_CHECK; 2143 EV_FREQUENT_CHECK;
1789 2144
… …
1813 EV_FREQUENT_CHECK; 2168 EV_FREQUENT_CHECK;
1814 feed_reverse (EV_A_ (W)w); 2169 feed_reverse (EV_A_ (W)w);
1815 } 2170 }
1816 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2171 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1817 2172
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 2173 feed_reverse_done (EV_A_ EV_TIMER);
1819 } 2174 }
1820} 2175}
1821 2176
1822#if EV_PERIODIC_ENABLE 2177#if EV_PERIODIC_ENABLE
2178/* make periodics pending */
1823inline_size void 2179inline_size void
1824periodics_reify (EV_P) 2180periodics_reify (EV_P)
1825{ 2181{
1826 EV_FREQUENT_CHECK; 2182 EV_FREQUENT_CHECK;
1827 2183
… …
1874 2230
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 2231 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 2232 }
1877} 2233}
1878 2234
2235/* simply recalculate all periodics */
2236/* TODO: maybe ensure that at least one event happens when jumping forward? */
1879static void noinline 2237static void noinline
1880periodics_reschedule (EV_P) 2238periodics_reschedule (EV_P)
1881{ 2239{
1882 int i; 2240 int i;
1883 2241
… …
1896 2254
1897 reheap (periodics, periodiccnt); 2255 reheap (periodics, periodiccnt);
1898} 2256}
1899#endif 2257#endif
1900 2258
2259/* adjust all timers by a given offset */
1901static void noinline 2260static void noinline
1902timers_reschedule (EV_P_ ev_tstamp adjust) 2261timers_reschedule (EV_P_ ev_tstamp adjust)
1903{ 2262{
1904 int i; 2263 int i;
1905 2264
… …
1909 ANHE_w (*he)->at += adjust; 2268 ANHE_w (*he)->at += adjust;
1910 ANHE_at_cache (*he); 2269 ANHE_at_cache (*he);
1911 } 2270 }
1912} 2271}
1913 2272
2273/* fetch new monotonic and realtime times from the kernel */
2274/* also detect if there was a timejump, and act accordingly */
1914inline_speed void 2275inline_speed void
1915time_update (EV_P_ ev_tstamp max_block) 2276time_update (EV_P_ ev_tstamp max_block)
1916{ 2277{
1917 int i;
1918
1919#if EV_USE_MONOTONIC 2278#if EV_USE_MONOTONIC
1920 if (expect_true (have_monotonic)) 2279 if (expect_true (have_monotonic))
1921 { 2280 {
2281 int i;
1922 ev_tstamp odiff = rtmn_diff; 2282 ev_tstamp odiff = rtmn_diff;
1923 2283
1924 mn_now = get_clock (); 2284 mn_now = get_clock ();
1925 2285
1926 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2286 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1976 2336
1977 mn_now = ev_rt_now; 2337 mn_now = ev_rt_now;
1978 } 2338 }
1979} 2339}
1980 2340
1981static int loop_done;
1982
1983void 2341void
1984ev_loop (EV_P_ int flags) 2342ev_run (EV_P_ int flags)
1985{ 2343{
2344#if EV_FEATURE_API
2345 ++loop_depth;
2346#endif
2347
2348 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2349
1986 loop_done = EVUNLOOP_CANCEL; 2350 loop_done = EVBREAK_CANCEL;
1987 2351
1988 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2352 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1989 2353
1990 do 2354 do
1991 { 2355 {
1992#if EV_VERIFY >= 2 2356#if EV_VERIFY >= 2
1993 ev_loop_verify (EV_A); 2357 ev_verify (EV_A);
1994#endif 2358#endif
1995 2359
1996#ifndef _WIN32 2360#ifndef _WIN32
1997 if (expect_false (curpid)) /* penalise the forking check even more */ 2361 if (expect_false (curpid)) /* penalise the forking check even more */
1998 if (expect_false (getpid () != curpid)) 2362 if (expect_false (getpid () != curpid))
… …
2006 /* we might have forked, so queue fork handlers */ 2370 /* we might have forked, so queue fork handlers */
2007 if (expect_false (postfork)) 2371 if (expect_false (postfork))
2008 if (forkcnt) 2372 if (forkcnt)
2009 { 2373 {
2010 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2374 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2011 call_pending (EV_A); 2375 EV_INVOKE_PENDING;
2012 } 2376 }
2013#endif 2377#endif
2014 2378
2379#if EV_PREPARE_ENABLE
2015 /* queue prepare watchers (and execute them) */ 2380 /* queue prepare watchers (and execute them) */
2016 if (expect_false (preparecnt)) 2381 if (expect_false (preparecnt))
2017 { 2382 {
2018 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2383 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2019 call_pending (EV_A); 2384 EV_INVOKE_PENDING;
2020 } 2385 }
2386#endif
2387
2388 if (expect_false (loop_done))
2389 break;
2021 2390
2022 /* we might have forked, so reify kernel state if necessary */ 2391 /* we might have forked, so reify kernel state if necessary */
2023 if (expect_false (postfork)) 2392 if (expect_false (postfork))
2024 loop_fork (EV_A); 2393 loop_fork (EV_A);
2025 2394
… …
2029 /* calculate blocking time */ 2398 /* calculate blocking time */
2030 { 2399 {
2031 ev_tstamp waittime = 0.; 2400 ev_tstamp waittime = 0.;
2032 ev_tstamp sleeptime = 0.; 2401 ev_tstamp sleeptime = 0.;
2033 2402
2403 /* remember old timestamp for io_blocktime calculation */
2404 ev_tstamp prev_mn_now = mn_now;
2405
2406 /* update time to cancel out callback processing overhead */
2407 time_update (EV_A_ 1e100);
2408
2034 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2409 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2035 { 2410 {
2036 /* update time to cancel out callback processing overhead */
2037 time_update (EV_A_ 1e100);
2038
2039 waittime = MAX_BLOCKTIME; 2411 waittime = MAX_BLOCKTIME;
2040 2412
2041 if (timercnt) 2413 if (timercnt)
2042 { 2414 {
2043 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2415 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2050 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2422 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2051 if (waittime > to) waittime = to; 2423 if (waittime > to) waittime = to;
2052 } 2424 }
2053#endif 2425#endif
2054 2426
2427 /* don't let timeouts decrease the waittime below timeout_blocktime */
2055 if (expect_false (waittime < timeout_blocktime)) 2428 if (expect_false (waittime < timeout_blocktime))
2056 waittime = timeout_blocktime; 2429 waittime = timeout_blocktime;
2057 2430
2058 sleeptime = waittime - backend_fudge; 2431 /* extra check because io_blocktime is commonly 0 */
2059
2060 if (expect_true (sleeptime > io_blocktime)) 2432 if (expect_false (io_blocktime))
2061 sleeptime = io_blocktime;
2062
2063 if (sleeptime)
2064 { 2433 {
2434 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2435
2436 if (sleeptime > waittime - backend_fudge)
2437 sleeptime = waittime - backend_fudge;
2438
2439 if (expect_true (sleeptime > 0.))
2440 {
2065 ev_sleep (sleeptime); 2441 ev_sleep (sleeptime);
2066 waittime -= sleeptime; 2442 waittime -= sleeptime;
2443 }
2067 } 2444 }
2068 } 2445 }
2069 2446
2447#if EV_FEATURE_API
2070 ++loop_count; 2448 ++loop_count;
2449#endif
2450 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2071 backend_poll (EV_A_ waittime); 2451 backend_poll (EV_A_ waittime);
2452 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2072 2453
2073 /* update ev_rt_now, do magic */ 2454 /* update ev_rt_now, do magic */
2074 time_update (EV_A_ waittime + sleeptime); 2455 time_update (EV_A_ waittime + sleeptime);
2075 } 2456 }
2076 2457
… …
2083#if EV_IDLE_ENABLE 2464#if EV_IDLE_ENABLE
2084 /* queue idle watchers unless other events are pending */ 2465 /* queue idle watchers unless other events are pending */
2085 idle_reify (EV_A); 2466 idle_reify (EV_A);
2086#endif 2467#endif
2087 2468
2469#if EV_CHECK_ENABLE
2088 /* queue check watchers, to be executed first */ 2470 /* queue check watchers, to be executed first */
2089 if (expect_false (checkcnt)) 2471 if (expect_false (checkcnt))
2090 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2472 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2473#endif
2091 2474
2092 call_pending (EV_A); 2475 EV_INVOKE_PENDING;
2093 } 2476 }
2094 while (expect_true ( 2477 while (expect_true (
2095 activecnt 2478 activecnt
2096 && !loop_done 2479 && !loop_done
2097 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2480 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2098 )); 2481 ));
2099 2482
2100 if (loop_done == EVUNLOOP_ONE) 2483 if (loop_done == EVBREAK_ONE)
2101 loop_done = EVUNLOOP_CANCEL; 2484 loop_done = EVBREAK_CANCEL;
2102}
2103 2485
2486#if EV_FEATURE_API
2487 --loop_depth;
2488#endif
2489}
2490
2104void 2491void
2105ev_unloop (EV_P_ int how) 2492ev_break (EV_P_ int how)
2106{ 2493{
2107 loop_done = how; 2494 loop_done = how;
2108} 2495}
2109 2496
2110void 2497void
… …
2137 ev_tstamp mn_prev = mn_now; 2524 ev_tstamp mn_prev = mn_now;
2138 2525
2139 ev_now_update (EV_A); 2526 ev_now_update (EV_A);
2140 timers_reschedule (EV_A_ mn_now - mn_prev); 2527 timers_reschedule (EV_A_ mn_now - mn_prev);
2141#if EV_PERIODIC_ENABLE 2528#if EV_PERIODIC_ENABLE
2529 /* TODO: really do this? */
2142 periodics_reschedule (EV_A); 2530 periodics_reschedule (EV_A);
2143#endif 2531#endif
2144} 2532}
2145 2533
2146/*****************************************************************************/ 2534/*****************************************************************************/
2535/* singly-linked list management, used when the expected list length is short */
2147 2536
2148inline_size void 2537inline_size void
2149wlist_add (WL *head, WL elem) 2538wlist_add (WL *head, WL elem)
2150{ 2539{
2151 elem->next = *head; 2540 elem->next = *head;
… …
2155inline_size void 2544inline_size void
2156wlist_del (WL *head, WL elem) 2545wlist_del (WL *head, WL elem)
2157{ 2546{
2158 while (*head) 2547 while (*head)
2159 { 2548 {
2160 if (*head == elem) 2549 if (expect_true (*head == elem))
2161 { 2550 {
2162 *head = elem->next; 2551 *head = elem->next;
2163 return; 2552 break;
2164 } 2553 }
2165 2554
2166 head = &(*head)->next; 2555 head = &(*head)->next;
2167 } 2556 }
2168} 2557}
2169 2558
2559/* internal, faster, version of ev_clear_pending */
2170inline_speed void 2560inline_speed void
2171clear_pending (EV_P_ W w) 2561clear_pending (EV_P_ W w)
2172{ 2562{
2173 if (w->pending) 2563 if (w->pending)
2174 { 2564 {
2175 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2565 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2176 w->pending = 0; 2566 w->pending = 0;
2177 } 2567 }
2178} 2568}
2179 2569
2180int 2570int
… …
2184 int pending = w_->pending; 2574 int pending = w_->pending;
2185 2575
2186 if (expect_true (pending)) 2576 if (expect_true (pending))
2187 { 2577 {
2188 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2578 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2579 p->w = (W)&pending_w;
2189 w_->pending = 0; 2580 w_->pending = 0;
2190 p->w = 0;
2191 return p->events; 2581 return p->events;
2192 } 2582 }
2193 else 2583 else
2194 return 0; 2584 return 0;
2195} 2585}
2196 2586
2197inline_size void 2587inline_size void
2198pri_adjust (EV_P_ W w) 2588pri_adjust (EV_P_ W w)
2199{ 2589{
2200 int pri = w->priority; 2590 int pri = ev_priority (w);
2201 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2591 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2202 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2592 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2203 w->priority = pri; 2593 ev_set_priority (w, pri);
2204} 2594}
2205 2595
2206inline_speed void 2596inline_speed void
2207ev_start (EV_P_ W w, int active) 2597ev_start (EV_P_ W w, int active)
2208{ 2598{
… …
2227 2617
2228 if (expect_false (ev_is_active (w))) 2618 if (expect_false (ev_is_active (w)))
2229 return; 2619 return;
2230 2620
2231 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2621 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2232 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2622 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2233 2623
2234 EV_FREQUENT_CHECK; 2624 EV_FREQUENT_CHECK;
2235 2625
2236 ev_start (EV_A_ (W)w, 1); 2626 ev_start (EV_A_ (W)w, 1);
2237 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2627 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2238 wlist_add (&anfds[fd].head, (WL)w); 2628 wlist_add (&anfds[fd].head, (WL)w);
2239 2629
2240 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2630 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2241 w->events &= ~EV__IOFDSET; 2631 w->events &= ~EV__IOFDSET;
2242 2632
2243 EV_FREQUENT_CHECK; 2633 EV_FREQUENT_CHECK;
2244} 2634}
2245 2635
… …
2255 EV_FREQUENT_CHECK; 2645 EV_FREQUENT_CHECK;
2256 2646
2257 wlist_del (&anfds[w->fd].head, (WL)w); 2647 wlist_del (&anfds[w->fd].head, (WL)w);
2258 ev_stop (EV_A_ (W)w); 2648 ev_stop (EV_A_ (W)w);
2259 2649
2260 fd_change (EV_A_ w->fd, 1); 2650 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2261 2651
2262 EV_FREQUENT_CHECK; 2652 EV_FREQUENT_CHECK;
2263} 2653}
2264 2654
2265void noinline 2655void noinline
… …
2307 timers [active] = timers [timercnt + HEAP0]; 2697 timers [active] = timers [timercnt + HEAP0];
2308 adjustheap (timers, timercnt, active); 2698 adjustheap (timers, timercnt, active);
2309 } 2699 }
2310 } 2700 }
2311 2701
2312 EV_FREQUENT_CHECK;
2313
2314 ev_at (w) -= mn_now; 2702 ev_at (w) -= mn_now;
2315 2703
2316 ev_stop (EV_A_ (W)w); 2704 ev_stop (EV_A_ (W)w);
2705
2706 EV_FREQUENT_CHECK;
2317} 2707}
2318 2708
2319void noinline 2709void noinline
2320ev_timer_again (EV_P_ ev_timer *w) 2710ev_timer_again (EV_P_ ev_timer *w)
2321{ 2711{
… …
2339 } 2729 }
2340 2730
2341 EV_FREQUENT_CHECK; 2731 EV_FREQUENT_CHECK;
2342} 2732}
2343 2733
2734ev_tstamp
2735ev_timer_remaining (EV_P_ ev_timer *w)
2736{
2737 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2738}
2739
2344#if EV_PERIODIC_ENABLE 2740#if EV_PERIODIC_ENABLE
2345void noinline 2741void noinline
2346ev_periodic_start (EV_P_ ev_periodic *w) 2742ev_periodic_start (EV_P_ ev_periodic *w)
2347{ 2743{
2348 if (expect_false (ev_is_active (w))) 2744 if (expect_false (ev_is_active (w)))
… …
2394 periodics [active] = periodics [periodiccnt + HEAP0]; 2790 periodics [active] = periodics [periodiccnt + HEAP0];
2395 adjustheap (periodics, periodiccnt, active); 2791 adjustheap (periodics, periodiccnt, active);
2396 } 2792 }
2397 } 2793 }
2398 2794
2399 EV_FREQUENT_CHECK;
2400
2401 ev_stop (EV_A_ (W)w); 2795 ev_stop (EV_A_ (W)w);
2796
2797 EV_FREQUENT_CHECK;
2402} 2798}
2403 2799
2404void noinline 2800void noinline
2405ev_periodic_again (EV_P_ ev_periodic *w) 2801ev_periodic_again (EV_P_ ev_periodic *w)
2406{ 2802{
… …
2412 2808
2413#ifndef SA_RESTART 2809#ifndef SA_RESTART
2414# define SA_RESTART 0 2810# define SA_RESTART 0
2415#endif 2811#endif
2416 2812
2813#if EV_SIGNAL_ENABLE
2814
2417void noinline 2815void noinline
2418ev_signal_start (EV_P_ ev_signal *w) 2816ev_signal_start (EV_P_ ev_signal *w)
2419{ 2817{
2420#if EV_MULTIPLICITY
2421 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2422#endif
2423 if (expect_false (ev_is_active (w))) 2818 if (expect_false (ev_is_active (w)))
2424 return; 2819 return;
2425 2820
2426 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2821 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2427 2822
2428 evpipe_init (EV_A); 2823#if EV_MULTIPLICITY
2824 assert (("libev: a signal must not be attached to two different loops",
2825 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2429 2826
2430 EV_FREQUENT_CHECK; 2827 signals [w->signum - 1].loop = EV_A;
2828#endif
2431 2829
2830 EV_FREQUENT_CHECK;
2831
2832#if EV_USE_SIGNALFD
2833 if (sigfd == -2)
2432 { 2834 {
2433#ifndef _WIN32 2835 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2434 sigset_t full, prev; 2836 if (sigfd < 0 && errno == EINVAL)
2435 sigfillset (&full); 2837 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2436 sigprocmask (SIG_SETMASK, &full, &prev);
2437#endif
2438 2838
2439 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2839 if (sigfd >= 0)
2840 {
2841 fd_intern (sigfd); /* doing it twice will not hurt */
2440 2842
2441#ifndef _WIN32 2843 sigemptyset (&sigfd_set);
2442 sigprocmask (SIG_SETMASK, &prev, 0); 2844
2443#endif 2845 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2846 ev_set_priority (&sigfd_w, EV_MAXPRI);
2847 ev_io_start (EV_A_ &sigfd_w);
2848 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2849 }
2444 } 2850 }
2851
2852 if (sigfd >= 0)
2853 {
2854 /* TODO: check .head */
2855 sigaddset (&sigfd_set, w->signum);
2856 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2857
2858 signalfd (sigfd, &sigfd_set, 0);
2859 }
2860#endif
2445 2861
2446 ev_start (EV_A_ (W)w, 1); 2862 ev_start (EV_A_ (W)w, 1);
2447 wlist_add (&signals [w->signum - 1].head, (WL)w); 2863 wlist_add (&signals [w->signum - 1].head, (WL)w);
2448 2864
2449 if (!((WL)w)->next) 2865 if (!((WL)w)->next)
2866# if EV_USE_SIGNALFD
2867 if (sigfd < 0) /*TODO*/
2868# endif
2450 { 2869 {
2451#if _WIN32 2870# ifdef _WIN32
2871 evpipe_init (EV_A);
2872
2452 signal (w->signum, ev_sighandler); 2873 signal (w->signum, ev_sighandler);
2453#else 2874# else
2454 struct sigaction sa; 2875 struct sigaction sa;
2876
2877 evpipe_init (EV_A);
2878
2455 sa.sa_handler = ev_sighandler; 2879 sa.sa_handler = ev_sighandler;
2456 sigfillset (&sa.sa_mask); 2880 sigfillset (&sa.sa_mask);
2457 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2881 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2458 sigaction (w->signum, &sa, 0); 2882 sigaction (w->signum, &sa, 0);
2883
2884 sigemptyset (&sa.sa_mask);
2885 sigaddset (&sa.sa_mask, w->signum);
2886 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2459#endif 2887#endif
2460 } 2888 }
2461 2889
2462 EV_FREQUENT_CHECK; 2890 EV_FREQUENT_CHECK;
2463} 2891}
2464 2892
2465void noinline 2893void noinline
… …
2473 2901
2474 wlist_del (&signals [w->signum - 1].head, (WL)w); 2902 wlist_del (&signals [w->signum - 1].head, (WL)w);
2475 ev_stop (EV_A_ (W)w); 2903 ev_stop (EV_A_ (W)w);
2476 2904
2477 if (!signals [w->signum - 1].head) 2905 if (!signals [w->signum - 1].head)
2906 {
2907#if EV_MULTIPLICITY
2908 signals [w->signum - 1].loop = 0; /* unattach from signal */
2909#endif
2910#if EV_USE_SIGNALFD
2911 if (sigfd >= 0)
2912 {
2913 sigset_t ss;
2914
2915 sigemptyset (&ss);
2916 sigaddset (&ss, w->signum);
2917 sigdelset (&sigfd_set, w->signum);
2918
2919 signalfd (sigfd, &sigfd_set, 0);
2920 sigprocmask (SIG_UNBLOCK, &ss, 0);
2921 }
2922 else
2923#endif
2478 signal (w->signum, SIG_DFL); 2924 signal (w->signum, SIG_DFL);
2925 }
2479 2926
2480 EV_FREQUENT_CHECK; 2927 EV_FREQUENT_CHECK;
2481} 2928}
2929
2930#endif
2931
2932#if EV_CHILD_ENABLE
2482 2933
2483void 2934void
2484ev_child_start (EV_P_ ev_child *w) 2935ev_child_start (EV_P_ ev_child *w)
2485{ 2936{
2486#if EV_MULTIPLICITY 2937#if EV_MULTIPLICITY
… …
2490 return; 2941 return;
2491 2942
2492 EV_FREQUENT_CHECK; 2943 EV_FREQUENT_CHECK;
2493 2944
2494 ev_start (EV_A_ (W)w, 1); 2945 ev_start (EV_A_ (W)w, 1);
2495 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2946 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2496 2947
2497 EV_FREQUENT_CHECK; 2948 EV_FREQUENT_CHECK;
2498} 2949}
2499 2950
2500void 2951void
… …
2504 if (expect_false (!ev_is_active (w))) 2955 if (expect_false (!ev_is_active (w)))
2505 return; 2956 return;
2506 2957
2507 EV_FREQUENT_CHECK; 2958 EV_FREQUENT_CHECK;
2508 2959
2509 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2960 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2510 ev_stop (EV_A_ (W)w); 2961 ev_stop (EV_A_ (W)w);
2511 2962
2512 EV_FREQUENT_CHECK; 2963 EV_FREQUENT_CHECK;
2513} 2964}
2965
2966#endif
2514 2967
2515#if EV_STAT_ENABLE 2968#if EV_STAT_ENABLE
2516 2969
2517# ifdef _WIN32 2970# ifdef _WIN32
2518# undef lstat 2971# undef lstat
… …
2524#define MIN_STAT_INTERVAL 0.1074891 2977#define MIN_STAT_INTERVAL 0.1074891
2525 2978
2526static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2979static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2527 2980
2528#if EV_USE_INOTIFY 2981#if EV_USE_INOTIFY
2529# define EV_INOTIFY_BUFSIZE 8192 2982
2983/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2984# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2530 2985
2531static void noinline 2986static void noinline
2532infy_add (EV_P_ ev_stat *w) 2987infy_add (EV_P_ ev_stat *w)
2533{ 2988{
2534 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); 2989 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);
2535 2990
2536 if (w->wd < 0) 2991 if (w->wd >= 0)
2992 {
2993 struct statfs sfs;
2994
2995 /* now local changes will be tracked by inotify, but remote changes won't */
2996 /* unless the filesystem is known to be local, we therefore still poll */
2997 /* also do poll on <2.6.25, but with normal frequency */
2998
2999 if (!fs_2625)
3000 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3001 else if (!statfs (w->path, &sfs)
3002 && (sfs.f_type == 0x1373 /* devfs */
3003 || sfs.f_type == 0xEF53 /* ext2/3 */
3004 || sfs.f_type == 0x3153464a /* jfs */
3005 || sfs.f_type == 0x52654973 /* reiser3 */
3006 || sfs.f_type == 0x01021994 /* tempfs */
3007 || sfs.f_type == 0x58465342 /* xfs */))
3008 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3009 else
3010 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2537 { 3011 }
3012 else
3013 {
3014 /* can't use inotify, continue to stat */
2538 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3015 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2539 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2540 3016
2541 /* monitor some parent directory for speedup hints */ 3017 /* if path is not there, monitor some parent directory for speedup hints */
2542 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3018 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2543 /* but an efficiency issue only */ 3019 /* but an efficiency issue only */
2544 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3020 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2545 { 3021 {
2546 char path [4096]; 3022 char path [4096];
… …
2562 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3038 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2563 } 3039 }
2564 } 3040 }
2565 3041
2566 if (w->wd >= 0) 3042 if (w->wd >= 0)
2567 {
2568 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3043 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2569 3044
2570 /* now local changes will be tracked by inotify, but remote changes won't */ 3045 /* now re-arm timer, if required */
2571 /* unless the filesystem it known to be local, we therefore still poll */ 3046 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2572 /* also do poll on <2.6.25, but with normal frequency */
2573 struct statfs sfs;
2574
2575 if (fs_2625 && !statfs (w->path, &sfs))
2576 if (sfs.f_type == 0x1373 /* devfs */
2577 || sfs.f_type == 0xEF53 /* ext2/3 */
2578 || sfs.f_type == 0x3153464a /* jfs */
2579 || sfs.f_type == 0x52654973 /* reiser3 */
2580 || sfs.f_type == 0x01021994 /* tempfs */
2581 || sfs.f_type == 0x58465342 /* xfs */)
2582 return;
2583
2584 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2585 ev_timer_again (EV_A_ &w->timer); 3047 ev_timer_again (EV_A_ &w->timer);
2586 } 3048 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2587} 3049}
2588 3050
2589static void noinline 3051static void noinline
2590infy_del (EV_P_ ev_stat *w) 3052infy_del (EV_P_ ev_stat *w)
2591{ 3053{
… …
2594 3056
2595 if (wd < 0) 3057 if (wd < 0)
2596 return; 3058 return;
2597 3059
2598 w->wd = -2; 3060 w->wd = -2;
2599 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3061 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2600 wlist_del (&fs_hash [slot].head, (WL)w); 3062 wlist_del (&fs_hash [slot].head, (WL)w);
2601 3063
2602 /* remove this watcher, if others are watching it, they will rearm */ 3064 /* remove this watcher, if others are watching it, they will rearm */
2603 inotify_rm_watch (fs_fd, wd); 3065 inotify_rm_watch (fs_fd, wd);
2604} 3066}
… …
2606static void noinline 3068static void noinline
2607infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3069infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2608{ 3070{
2609 if (slot < 0) 3071 if (slot < 0)
2610 /* overflow, need to check for all hash slots */ 3072 /* overflow, need to check for all hash slots */
2611 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3073 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2612 infy_wd (EV_A_ slot, wd, ev); 3074 infy_wd (EV_A_ slot, wd, ev);
2613 else 3075 else
2614 { 3076 {
2615 WL w_; 3077 WL w_;
2616 3078
2617 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3079 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2618 { 3080 {
2619 ev_stat *w = (ev_stat *)w_; 3081 ev_stat *w = (ev_stat *)w_;
2620 w_ = w_->next; /* lets us remove this watcher and all before it */ 3082 w_ = w_->next; /* lets us remove this watcher and all before it */
2621 3083
2622 if (w->wd == wd || wd == -1) 3084 if (w->wd == wd || wd == -1)
2623 { 3085 {
2624 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3086 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2625 { 3087 {
2626 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3088 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2627 w->wd = -1; 3089 w->wd = -1;
2628 infy_add (EV_A_ w); /* re-add, no matter what */ 3090 infy_add (EV_A_ w); /* re-add, no matter what */
2629 } 3091 }
2630 3092
2631 stat_timer_cb (EV_A_ &w->timer, 0); 3093 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2636 3098
2637static void 3099static void
2638infy_cb (EV_P_ ev_io *w, int revents) 3100infy_cb (EV_P_ ev_io *w, int revents)
2639{ 3101{
2640 char buf [EV_INOTIFY_BUFSIZE]; 3102 char buf [EV_INOTIFY_BUFSIZE];
2641 struct inotify_event *ev = (struct inotify_event *)buf;
2642 int ofs; 3103 int ofs;
2643 int len = read (fs_fd, buf, sizeof (buf)); 3104 int len = read (fs_fd, buf, sizeof (buf));
2644 3105
2645 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3106 for (ofs = 0; ofs < len; )
3107 {
3108 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2646 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3109 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3110 ofs += sizeof (struct inotify_event) + ev->len;
3111 }
2647} 3112}
2648 3113
2649inline_size void 3114inline_size void
2650check_2625 (EV_P) 3115ev_check_2625 (EV_P)
2651{ 3116{
2652 /* kernels < 2.6.25 are borked 3117 /* kernels < 2.6.25 are borked
2653 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3118 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2654 */ 3119 */
2655 struct utsname buf; 3120 if (ev_linux_version () < 0x020619)
2656 int major, minor, micro;
2657
2658 if (uname (&buf))
2659 return; 3121 return;
2660 3122
2661 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2662 return;
2663
2664 if (major < 2
2665 || (major == 2 && minor < 6)
2666 || (major == 2 && minor == 6 && micro < 25))
2667 return;
2668
2669 fs_2625 = 1; 3123 fs_2625 = 1;
3124}
3125
3126inline_size int
3127infy_newfd (void)
3128{
3129#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3130 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3131 if (fd >= 0)
3132 return fd;
3133#endif
3134 return inotify_init ();
2670} 3135}
2671 3136
2672inline_size void 3137inline_size void
2673infy_init (EV_P) 3138infy_init (EV_P)
2674{ 3139{
2675 if (fs_fd != -2) 3140 if (fs_fd != -2)
2676 return; 3141 return;
2677 3142
2678 fs_fd = -1; 3143 fs_fd = -1;
2679 3144
2680 check_2625 (EV_A); 3145 ev_check_2625 (EV_A);
2681 3146
2682 fs_fd = inotify_init (); 3147 fs_fd = infy_newfd ();
2683 3148
2684 if (fs_fd >= 0) 3149 if (fs_fd >= 0)
2685 { 3150 {
3151 fd_intern (fs_fd);
2686 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3152 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2687 ev_set_priority (&fs_w, EV_MAXPRI); 3153 ev_set_priority (&fs_w, EV_MAXPRI);
2688 ev_io_start (EV_A_ &fs_w); 3154 ev_io_start (EV_A_ &fs_w);
3155 ev_unref (EV_A);
2689 } 3156 }
2690} 3157}
2691 3158
2692inline_size void 3159inline_size void
2693infy_fork (EV_P) 3160infy_fork (EV_P)
… …
2695 int slot; 3162 int slot;
2696 3163
2697 if (fs_fd < 0) 3164 if (fs_fd < 0)
2698 return; 3165 return;
2699 3166
3167 ev_ref (EV_A);
3168 ev_io_stop (EV_A_ &fs_w);
2700 close (fs_fd); 3169 close (fs_fd);
2701 fs_fd = inotify_init (); 3170 fs_fd = infy_newfd ();
2702 3171
3172 if (fs_fd >= 0)
3173 {
3174 fd_intern (fs_fd);
3175 ev_io_set (&fs_w, fs_fd, EV_READ);
3176 ev_io_start (EV_A_ &fs_w);
3177 ev_unref (EV_A);
3178 }
3179
2703 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3180 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2704 { 3181 {
2705 WL w_ = fs_hash [slot].head; 3182 WL w_ = fs_hash [slot].head;
2706 fs_hash [slot].head = 0; 3183 fs_hash [slot].head = 0;
2707 3184
2708 while (w_) 3185 while (w_)
… …
2713 w->wd = -1; 3190 w->wd = -1;
2714 3191
2715 if (fs_fd >= 0) 3192 if (fs_fd >= 0)
2716 infy_add (EV_A_ w); /* re-add, no matter what */ 3193 infy_add (EV_A_ w); /* re-add, no matter what */
2717 else 3194 else
3195 {
3196 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3197 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2718 ev_timer_again (EV_A_ &w->timer); 3198 ev_timer_again (EV_A_ &w->timer);
3199 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3200 }
2719 } 3201 }
2720 } 3202 }
2721} 3203}
2722 3204
2723#endif 3205#endif
… …
2740static void noinline 3222static void noinline
2741stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3223stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2742{ 3224{
2743 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3225 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2744 3226
2745 /* we copy this here each the time so that */ 3227 ev_statdata prev = w->attr;
2746 /* prev has the old value when the callback gets invoked */
2747 w->prev = w->attr;
2748 ev_stat_stat (EV_A_ w); 3228 ev_stat_stat (EV_A_ w);
2749 3229
2750 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3230 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2751 if ( 3231 if (
2752 w->prev.st_dev != w->attr.st_dev 3232 prev.st_dev != w->attr.st_dev
2753 || w->prev.st_ino != w->attr.st_ino 3233 || prev.st_ino != w->attr.st_ino
2754 || w->prev.st_mode != w->attr.st_mode 3234 || prev.st_mode != w->attr.st_mode
2755 || w->prev.st_nlink != w->attr.st_nlink 3235 || prev.st_nlink != w->attr.st_nlink
2756 || w->prev.st_uid != w->attr.st_uid 3236 || prev.st_uid != w->attr.st_uid
2757 || w->prev.st_gid != w->attr.st_gid 3237 || prev.st_gid != w->attr.st_gid
2758 || w->prev.st_rdev != w->attr.st_rdev 3238 || prev.st_rdev != w->attr.st_rdev
2759 || w->prev.st_size != w->attr.st_size 3239 || prev.st_size != w->attr.st_size
2760 || w->prev.st_atime != w->attr.st_atime 3240 || prev.st_atime != w->attr.st_atime
2761 || w->prev.st_mtime != w->attr.st_mtime 3241 || prev.st_mtime != w->attr.st_mtime
2762 || w->prev.st_ctime != w->attr.st_ctime 3242 || prev.st_ctime != w->attr.st_ctime
2763 ) { 3243 ) {
3244 /* we only update w->prev on actual differences */
3245 /* in case we test more often than invoke the callback, */
3246 /* to ensure that prev is always different to attr */
3247 w->prev = prev;
3248
2764 #if EV_USE_INOTIFY 3249 #if EV_USE_INOTIFY
2765 if (fs_fd >= 0) 3250 if (fs_fd >= 0)
2766 { 3251 {
2767 infy_del (EV_A_ w); 3252 infy_del (EV_A_ w);
2768 infy_add (EV_A_ w); 3253 infy_add (EV_A_ w);
… …
2793 3278
2794 if (fs_fd >= 0) 3279 if (fs_fd >= 0)
2795 infy_add (EV_A_ w); 3280 infy_add (EV_A_ w);
2796 else 3281 else
2797#endif 3282#endif
3283 {
2798 ev_timer_again (EV_A_ &w->timer); 3284 ev_timer_again (EV_A_ &w->timer);
3285 ev_unref (EV_A);
3286 }
2799 3287
2800 ev_start (EV_A_ (W)w, 1); 3288 ev_start (EV_A_ (W)w, 1);
2801 3289
2802 EV_FREQUENT_CHECK; 3290 EV_FREQUENT_CHECK;
2803} 3291}
… …
2812 EV_FREQUENT_CHECK; 3300 EV_FREQUENT_CHECK;
2813 3301
2814#if EV_USE_INOTIFY 3302#if EV_USE_INOTIFY
2815 infy_del (EV_A_ w); 3303 infy_del (EV_A_ w);
2816#endif 3304#endif
3305
3306 if (ev_is_active (&w->timer))
3307 {
3308 ev_ref (EV_A);
2817 ev_timer_stop (EV_A_ &w->timer); 3309 ev_timer_stop (EV_A_ &w->timer);
3310 }
2818 3311
2819 ev_stop (EV_A_ (W)w); 3312 ev_stop (EV_A_ (W)w);
2820 3313
2821 EV_FREQUENT_CHECK; 3314 EV_FREQUENT_CHECK;
2822} 3315}
… …
2867 3360
2868 EV_FREQUENT_CHECK; 3361 EV_FREQUENT_CHECK;
2869} 3362}
2870#endif 3363#endif
2871 3364
3365#if EV_PREPARE_ENABLE
2872void 3366void
2873ev_prepare_start (EV_P_ ev_prepare *w) 3367ev_prepare_start (EV_P_ ev_prepare *w)
2874{ 3368{
2875 if (expect_false (ev_is_active (w))) 3369 if (expect_false (ev_is_active (w)))
2876 return; 3370 return;
… …
2902 3396
2903 ev_stop (EV_A_ (W)w); 3397 ev_stop (EV_A_ (W)w);
2904 3398
2905 EV_FREQUENT_CHECK; 3399 EV_FREQUENT_CHECK;
2906} 3400}
3401#endif
2907 3402
3403#if EV_CHECK_ENABLE
2908void 3404void
2909ev_check_start (EV_P_ ev_check *w) 3405ev_check_start (EV_P_ ev_check *w)
2910{ 3406{
2911 if (expect_false (ev_is_active (w))) 3407 if (expect_false (ev_is_active (w)))
2912 return; 3408 return;
… …
2938 3434
2939 ev_stop (EV_A_ (W)w); 3435 ev_stop (EV_A_ (W)w);
2940 3436
2941 EV_FREQUENT_CHECK; 3437 EV_FREQUENT_CHECK;
2942} 3438}
3439#endif
2943 3440
2944#if EV_EMBED_ENABLE 3441#if EV_EMBED_ENABLE
2945void noinline 3442void noinline
2946ev_embed_sweep (EV_P_ ev_embed *w) 3443ev_embed_sweep (EV_P_ ev_embed *w)
2947{ 3444{
2948 ev_loop (w->other, EVLOOP_NONBLOCK); 3445 ev_run (w->other, EVRUN_NOWAIT);
2949} 3446}
2950 3447
2951static void 3448static void
2952embed_io_cb (EV_P_ ev_io *io, int revents) 3449embed_io_cb (EV_P_ ev_io *io, int revents)
2953{ 3450{
2954 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3451 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2955 3452
2956 if (ev_cb (w)) 3453 if (ev_cb (w))
2957 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3454 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2958 else 3455 else
2959 ev_loop (w->other, EVLOOP_NONBLOCK); 3456 ev_run (w->other, EVRUN_NOWAIT);
2960} 3457}
2961 3458
2962static void 3459static void
2963embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3460embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2964{ 3461{
2965 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3462 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2966 3463
2967 { 3464 {
2968 struct ev_loop *loop = w->other; 3465 EV_P = w->other;
2969 3466
2970 while (fdchangecnt) 3467 while (fdchangecnt)
2971 { 3468 {
2972 fd_reify (EV_A); 3469 fd_reify (EV_A);
2973 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3470 ev_run (EV_A_ EVRUN_NOWAIT);
2974 } 3471 }
2975 } 3472 }
2976} 3473}
2977 3474
2978static void 3475static void
… …
2981 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3478 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2982 3479
2983 ev_embed_stop (EV_A_ w); 3480 ev_embed_stop (EV_A_ w);
2984 3481
2985 { 3482 {
2986 struct ev_loop *loop = w->other; 3483 EV_P = w->other;
2987 3484
2988 ev_loop_fork (EV_A); 3485 ev_loop_fork (EV_A);
2989 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3486 ev_run (EV_A_ EVRUN_NOWAIT);
2990 } 3487 }
2991 3488
2992 ev_embed_start (EV_A_ w); 3489 ev_embed_start (EV_A_ w);
2993} 3490}
2994 3491
… …
3005{ 3502{
3006 if (expect_false (ev_is_active (w))) 3503 if (expect_false (ev_is_active (w)))
3007 return; 3504 return;
3008 3505
3009 { 3506 {
3010 struct ev_loop *loop = w->other; 3507 EV_P = w->other;
3011 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3508 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3012 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3509 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3013 } 3510 }
3014 3511
3015 EV_FREQUENT_CHECK; 3512 EV_FREQUENT_CHECK;
… …
3042 3539
3043 ev_io_stop (EV_A_ &w->io); 3540 ev_io_stop (EV_A_ &w->io);
3044 ev_prepare_stop (EV_A_ &w->prepare); 3541 ev_prepare_stop (EV_A_ &w->prepare);
3045 ev_fork_stop (EV_A_ &w->fork); 3542 ev_fork_stop (EV_A_ &w->fork);
3046 3543
3544 ev_stop (EV_A_ (W)w);
3545
3047 EV_FREQUENT_CHECK; 3546 EV_FREQUENT_CHECK;
3048} 3547}
3049#endif 3548#endif
3050 3549
3051#if EV_FORK_ENABLE 3550#if EV_FORK_ENABLE
… …
3084 3583
3085 EV_FREQUENT_CHECK; 3584 EV_FREQUENT_CHECK;
3086} 3585}
3087#endif 3586#endif
3088 3587
3089#if EV_ASYNC_ENABLE 3588#if EV_CLEANUP_ENABLE
3090void 3589void
3091ev_async_start (EV_P_ ev_async *w) 3590ev_cleanup_start (EV_P_ ev_cleanup *w)
3092{ 3591{
3093 if (expect_false (ev_is_active (w))) 3592 if (expect_false (ev_is_active (w)))
3094 return; 3593 return;
3594
3595 EV_FREQUENT_CHECK;
3596
3597 ev_start (EV_A_ (W)w, ++cleanupcnt);
3598 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3599 cleanups [cleanupcnt - 1] = w;
3600
3601 /* cleanup watchers should never keep a refcount on the loop */
3602 ev_unref (EV_A);
3603 EV_FREQUENT_CHECK;
3604}
3605
3606void
3607ev_cleanup_stop (EV_P_ ev_cleanup *w)
3608{
3609 clear_pending (EV_A_ (W)w);
3610 if (expect_false (!ev_is_active (w)))
3611 return;
3612
3613 EV_FREQUENT_CHECK;
3614 ev_ref (EV_A);
3615
3616 {
3617 int active = ev_active (w);
3618
3619 cleanups [active - 1] = cleanups [--cleanupcnt];
3620 ev_active (cleanups [active - 1]) = active;
3621 }
3622
3623 ev_stop (EV_A_ (W)w);
3624
3625 EV_FREQUENT_CHECK;
3626}
3627#endif
3628
3629#if EV_ASYNC_ENABLE
3630void
3631ev_async_start (EV_P_ ev_async *w)
3632{
3633 if (expect_false (ev_is_active (w)))
3634 return;
3635
3636 w->sent = 0;
3095 3637
3096 evpipe_init (EV_A); 3638 evpipe_init (EV_A);
3097 3639
3098 EV_FREQUENT_CHECK; 3640 EV_FREQUENT_CHECK;
3099 3641
… …
3127 3669
3128void 3670void
3129ev_async_send (EV_P_ ev_async *w) 3671ev_async_send (EV_P_ ev_async *w)
3130{ 3672{
3131 w->sent = 1; 3673 w->sent = 1;
3132 evpipe_write (EV_A_ &gotasync); 3674 evpipe_write (EV_A_ &async_pending);
3133} 3675}
3134#endif 3676#endif
3135 3677
3136/*****************************************************************************/ 3678/*****************************************************************************/
3137 3679
… …
3177{ 3719{
3178 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3720 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3179 3721
3180 if (expect_false (!once)) 3722 if (expect_false (!once))
3181 { 3723 {
3182 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3724 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3183 return; 3725 return;
3184 } 3726 }
3185 3727
3186 once->cb = cb; 3728 once->cb = cb;
3187 once->arg = arg; 3729 once->arg = arg;
… …
3201 } 3743 }
3202} 3744}
3203 3745
3204/*****************************************************************************/ 3746/*****************************************************************************/
3205 3747
3206#if 0 3748#if EV_WALK_ENABLE
3207void 3749void
3208ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3750ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3209{ 3751{
3210 int i, j; 3752 int i, j;
3211 ev_watcher_list *wl, *wn; 3753 ev_watcher_list *wl, *wn;
… …
3227#if EV_USE_INOTIFY 3769#if EV_USE_INOTIFY
3228 if (ev_cb ((ev_io *)wl) == infy_cb) 3770 if (ev_cb ((ev_io *)wl) == infy_cb)
3229 ; 3771 ;
3230 else 3772 else
3231#endif 3773#endif
3232 if ((ev_io *)wl != &pipeev) 3774 if ((ev_io *)wl != &pipe_w)
3233 if (types & EV_IO) 3775 if (types & EV_IO)
3234 cb (EV_A_ EV_IO, wl); 3776 cb (EV_A_ EV_IO, wl);
3235 3777
3236 wl = wn; 3778 wl = wn;
3237 } 3779 }
… …
3274 if (types & EV_ASYNC) 3816 if (types & EV_ASYNC)
3275 for (i = asynccnt; i--; ) 3817 for (i = asynccnt; i--; )
3276 cb (EV_A_ EV_ASYNC, asyncs [i]); 3818 cb (EV_A_ EV_ASYNC, asyncs [i]);
3277#endif 3819#endif
3278 3820
3821#if EV_PREPARE_ENABLE
3279 if (types & EV_PREPARE) 3822 if (types & EV_PREPARE)
3280 for (i = preparecnt; i--; ) 3823 for (i = preparecnt; i--; )
3281#if EV_EMBED_ENABLE 3824# if EV_EMBED_ENABLE
3282 if (ev_cb (prepares [i]) != embed_prepare_cb) 3825 if (ev_cb (prepares [i]) != embed_prepare_cb)
3283#endif 3826# endif
3284 cb (EV_A_ EV_PREPARE, prepares [i]); 3827 cb (EV_A_ EV_PREPARE, prepares [i]);
3828#endif
3285 3829
3830#if EV_CHECK_ENABLE
3286 if (types & EV_CHECK) 3831 if (types & EV_CHECK)
3287 for (i = checkcnt; i--; ) 3832 for (i = checkcnt; i--; )
3288 cb (EV_A_ EV_CHECK, checks [i]); 3833 cb (EV_A_ EV_CHECK, checks [i]);
3834#endif
3289 3835
3836#if EV_SIGNAL_ENABLE
3290 if (types & EV_SIGNAL) 3837 if (types & EV_SIGNAL)
3291 for (i = 0; i < signalmax; ++i) 3838 for (i = 0; i < EV_NSIG - 1; ++i)
3292 for (wl = signals [i].head; wl; ) 3839 for (wl = signals [i].head; wl; )
3293 { 3840 {
3294 wn = wl->next; 3841 wn = wl->next;
3295 cb (EV_A_ EV_SIGNAL, wl); 3842 cb (EV_A_ EV_SIGNAL, wl);
3296 wl = wn; 3843 wl = wn;
3297 } 3844 }
3845#endif
3298 3846
3847#if EV_CHILD_ENABLE
3299 if (types & EV_CHILD) 3848 if (types & EV_CHILD)
3300 for (i = EV_PID_HASHSIZE; i--; ) 3849 for (i = (EV_PID_HASHSIZE); i--; )
3301 for (wl = childs [i]; wl; ) 3850 for (wl = childs [i]; wl; )
3302 { 3851 {
3303 wn = wl->next; 3852 wn = wl->next;
3304 cb (EV_A_ EV_CHILD, wl); 3853 cb (EV_A_ EV_CHILD, wl);
3305 wl = wn; 3854 wl = wn;
3306 } 3855 }
3856#endif
3307/* EV_STAT 0x00001000 /* stat data changed */ 3857/* EV_STAT 0x00001000 /* stat data changed */
3308/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3858/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3309} 3859}
3310#endif 3860#endif
3311 3861
3312#if EV_MULTIPLICITY 3862#if EV_MULTIPLICITY
3313 #include "ev_wrap.h" 3863 #include "ev_wrap.h"
3314#endif 3864#endif
3315 3865
3316#ifdef __cplusplus 3866EV_CPP(})
3317}
3318#endif
3319 3867

Diff Legend

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