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

Comparing libev/ev.c (file contents):
Revision 1.289 by root, Sat Jun 6 11:13:16 2009 UTC vs.
Revision 1.361 by root, Sun Oct 24 19:01:01 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
483/* file descriptor info structure */ 662/* file descriptor info structure */
484typedef struct 663typedef struct
485{ 664{
486 WL head; 665 WL head;
487 unsigned char events; /* the events watched for */ 666 unsigned char events; /* the events watched for */
488 unsigned char reify; /* flag set when this ANFD needs reification */ 667 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
489 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 */
490 unsigned char unused; 669 unsigned char unused;
491#if EV_USE_EPOLL 670#if EV_USE_EPOLL
492 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
493#endif 672#endif
494#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
495 SOCKET handle; 674 SOCKET handle;
675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
496#endif 678#endif
497} ANFD; 679} ANFD;
498 680
499/* stores the pending event set for a given watcher */ 681/* stores the pending event set for a given watcher */
500typedef struct 682typedef struct
… …
555 737
556 static int ev_default_loop_ptr; 738 static int ev_default_loop_ptr;
557 739
558#endif 740#endif
559 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
560/*****************************************************************************/ 754/*****************************************************************************/
561 755
756#ifndef EV_HAVE_EV_TIME
562ev_tstamp 757ev_tstamp
563ev_time (void) 758ev_time (void)
564{ 759{
565#if EV_USE_REALTIME 760#if EV_USE_REALTIME
566 if (expect_true (have_realtime)) 761 if (expect_true (have_realtime))
… …
573 768
574 struct timeval tv; 769 struct timeval tv;
575 gettimeofday (&tv, 0); 770 gettimeofday (&tv, 0);
576 return tv.tv_sec + tv.tv_usec * 1e-6; 771 return tv.tv_sec + tv.tv_usec * 1e-6;
577} 772}
773#endif
578 774
579inline_size ev_tstamp 775inline_size ev_tstamp
580get_clock (void) 776get_clock (void)
581{ 777{
582#if EV_USE_MONOTONIC 778#if EV_USE_MONOTONIC
… …
605 if (delay > 0.) 801 if (delay > 0.)
606 { 802 {
607#if EV_USE_NANOSLEEP 803#if EV_USE_NANOSLEEP
608 struct timespec ts; 804 struct timespec ts;
609 805
610 ts.tv_sec = (time_t)delay; 806 EV_TS_SET (ts, delay);
611 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
612
613 nanosleep (&ts, 0); 807 nanosleep (&ts, 0);
614#elif defined(_WIN32) 808#elif defined(_WIN32)
615 Sleep ((unsigned long)(delay * 1e3)); 809 Sleep ((unsigned long)(delay * 1e3));
616#else 810#else
617 struct timeval tv; 811 struct timeval tv;
618 812
619 tv.tv_sec = (time_t)delay;
620 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
621
622 /* 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 */
623 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 814 /* something not guaranteed by newer posix versions, but guaranteed */
624 /* by older ones */ 815 /* by older ones */
816 EV_TV_SET (tv, delay);
625 select (0, 0, 0, 0, &tv); 817 select (0, 0, 0, 0, &tv);
626#endif 818#endif
627 } 819 }
628} 820}
629 821
630/*****************************************************************************/ 822/*****************************************************************************/
631 823
632#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 */
633 825
634/* find a suitable new size for the given array, */ 826/* find a suitable new size for the given array, */
635/* hopefully by rounding to a ncie-to-malloc size */ 827/* hopefully by rounding to a nice-to-malloc size */
636inline_size int 828inline_size int
637array_nextsize (int elem, int cur, int cnt) 829array_nextsize (int elem, int cur, int cnt)
638{ 830{
639 int ncur = cur + 1; 831 int ncur = cur + 1;
640 832
… …
736} 928}
737 929
738/*****************************************************************************/ 930/*****************************************************************************/
739 931
740inline_speed void 932inline_speed void
741fd_event (EV_P_ int fd, int revents) 933fd_event_nocheck (EV_P_ int fd, int revents)
742{ 934{
743 ANFD *anfd = anfds + fd; 935 ANFD *anfd = anfds + fd;
744 ev_io *w; 936 ev_io *w;
745 937
746 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)
… …
750 if (ev) 942 if (ev)
751 ev_feed_event (EV_A_ (W)w, ev); 943 ev_feed_event (EV_A_ (W)w, ev);
752 } 944 }
753} 945}
754 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
755void 958void
756ev_feed_fd_event (EV_P_ int fd, int revents) 959ev_feed_fd_event (EV_P_ int fd, int revents)
757{ 960{
758 if (fd >= 0 && fd < anfdmax) 961 if (fd >= 0 && fd < anfdmax)
759 fd_event (EV_A_ fd, revents); 962 fd_event_nocheck (EV_A_ fd, revents);
760} 963}
761 964
762/* make sure the external fd watch events are in-sync */ 965/* make sure the external fd watch events are in-sync */
763/* with the kernel/libev internal state */ 966/* with the kernel/libev internal state */
764inline_size void 967inline_size void
… …
770 { 973 {
771 int fd = fdchanges [i]; 974 int fd = fdchanges [i];
772 ANFD *anfd = anfds + fd; 975 ANFD *anfd = anfds + fd;
773 ev_io *w; 976 ev_io *w;
774 977
775 unsigned char events = 0; 978 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify;
776 980
777 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 981 anfd->reify = 0;
778 events |= (unsigned char)w->events;
779 982
780#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
781 if (events) 984 if (o_reify & EV__IOFDSET)
782 { 985 {
783 unsigned long arg; 986 unsigned long arg;
784 #ifdef EV_FD_TO_WIN32_HANDLE
785 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
786 #else
787 anfd->handle = _get_osfhandle (fd);
788 #endif
789 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
790 } 990 }
791#endif 991#endif
792 992
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
793 { 994 {
794 unsigned char o_events = anfd->events;
795 unsigned char o_reify = anfd->reify;
796
797 anfd->reify = 0;
798 anfd->events = events; 995 anfd->events = 0;
799 996
800 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)
801 backend_modify (EV_A_ fd, o_events, events); 1005 backend_modify (EV_A_ fd, o_events, anfd->events);
802 }
803 } 1006 }
804 1007
805 fdchangecnt = 0; 1008 fdchangecnt = 0;
806} 1009}
807 1010
… …
831 ev_io_stop (EV_A_ w); 1034 ev_io_stop (EV_A_ w);
832 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);
833 } 1036 }
834} 1037}
835 1038
836/* check whether the given fd is atcually valid, for error recovery */ 1039/* check whether the given fd is actually valid, for error recovery */
837inline_size int 1040inline_size int
838fd_valid (int fd) 1041fd_valid (int fd)
839{ 1042{
840#ifdef _WIN32 1043#ifdef _WIN32
841 return _get_osfhandle (fd) != -1; 1044 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
842#else 1045#else
843 return fcntl (fd, F_GETFD) != -1; 1046 return fcntl (fd, F_GETFD) != -1;
844#endif 1047#endif
845} 1048}
846 1049
… …
864 1067
865 for (fd = anfdmax; fd--; ) 1068 for (fd = anfdmax; fd--; )
866 if (anfds [fd].events) 1069 if (anfds [fd].events)
867 { 1070 {
868 fd_kill (EV_A_ fd); 1071 fd_kill (EV_A_ fd);
869 return; 1072 break;
870 } 1073 }
871} 1074}
872 1075
873/* 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 */
874static void noinline 1077static void noinline
… …
879 for (fd = 0; fd < anfdmax; ++fd) 1082 for (fd = 0; fd < anfdmax; ++fd)
880 if (anfds [fd].events) 1083 if (anfds [fd].events)
881 { 1084 {
882 anfds [fd].events = 0; 1085 anfds [fd].events = 0;
883 anfds [fd].emask = 0; 1086 anfds [fd].emask = 0;
884 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1087 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
885 } 1088 }
886} 1089}
887 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
888/*****************************************************************************/ 1105/*****************************************************************************/
889 1106
890/* 1107/*
891 * 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
892 * 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
893 * the branching factor of the d-tree. 1110 * the branching factor of the d-tree.
894 */ 1111 */
895 1112
896/* 1113/*
… …
964 1181
965 for (;;) 1182 for (;;)
966 { 1183 {
967 int c = k << 1; 1184 int c = k << 1;
968 1185
969 if (c > N + HEAP0 - 1) 1186 if (c >= N + HEAP0)
970 break; 1187 break;
971 1188
972 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])
973 ? 1 : 0; 1190 ? 1 : 0;
974 1191
… …
1010 1227
1011/* move an element suitably so it is in a correct place */ 1228/* move an element suitably so it is in a correct place */
1012inline_size void 1229inline_size void
1013adjustheap (ANHE *heap, int N, int k) 1230adjustheap (ANHE *heap, int N, int k)
1014{ 1231{
1015 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)]))
1016 upheap (heap, k); 1233 upheap (heap, k);
1017 else 1234 else
1018 downheap (heap, N, k); 1235 downheap (heap, N, k);
1019} 1236}
1020 1237
… …
1033/*****************************************************************************/ 1250/*****************************************************************************/
1034 1251
1035/* associate signal watchers to a signal signal */ 1252/* associate signal watchers to a signal signal */
1036typedef struct 1253typedef struct
1037{ 1254{
1255 EV_ATOMIC_T pending;
1256#if EV_MULTIPLICITY
1257 EV_P;
1258#endif
1038 WL head; 1259 WL head;
1039 EV_ATOMIC_T gotsig;
1040} ANSIG; 1260} ANSIG;
1041 1261
1042static ANSIG *signals; 1262static ANSIG signals [EV_NSIG - 1];
1043static int signalmax;
1044
1045static EV_ATOMIC_T gotsig;
1046 1263
1047/*****************************************************************************/ 1264/*****************************************************************************/
1048 1265
1049/* used to prepare libev internal fd's */ 1266#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1050/* this is not fork-safe */
1051inline_speed void
1052fd_intern (int fd)
1053{
1054#ifdef _WIN32
1055 unsigned long arg = 1;
1056 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1057#else
1058 fcntl (fd, F_SETFD, FD_CLOEXEC);
1059 fcntl (fd, F_SETFL, O_NONBLOCK);
1060#endif
1061}
1062 1267
1063static void noinline 1268static void noinline
1064evpipe_init (EV_P) 1269evpipe_init (EV_P)
1065{ 1270{
1066 if (!ev_is_active (&pipe_w)) 1271 if (!ev_is_active (&pipe_w))
1067 { 1272 {
1068#if EV_USE_EVENTFD 1273# if EV_USE_EVENTFD
1274 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1275 if (evfd < 0 && errno == EINVAL)
1069 if ((evfd = eventfd (0, 0)) >= 0) 1276 evfd = eventfd (0, 0);
1277
1278 if (evfd >= 0)
1070 { 1279 {
1071 evpipe [0] = -1; 1280 evpipe [0] = -1;
1072 fd_intern (evfd); 1281 fd_intern (evfd); /* doing it twice doesn't hurt */
1073 ev_io_set (&pipe_w, evfd, EV_READ); 1282 ev_io_set (&pipe_w, evfd, EV_READ);
1074 } 1283 }
1075 else 1284 else
1076#endif 1285# endif
1077 { 1286 {
1078 while (pipe (evpipe)) 1287 while (pipe (evpipe))
1079 ev_syserr ("(libev) error creating signal/async pipe"); 1288 ev_syserr ("(libev) error creating signal/async pipe");
1080 1289
1081 fd_intern (evpipe [0]); 1290 fd_intern (evpipe [0]);
… …
1092evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1301evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1093{ 1302{
1094 if (!*flag) 1303 if (!*flag)
1095 { 1304 {
1096 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;
1097 1307
1098 *flag = 1; 1308 *flag = 1;
1099 1309
1100#if EV_USE_EVENTFD 1310#if EV_USE_EVENTFD
1101 if (evfd >= 0) 1311 if (evfd >= 0)
… …
1103 uint64_t counter = 1; 1313 uint64_t counter = 1;
1104 write (evfd, &counter, sizeof (uint64_t)); 1314 write (evfd, &counter, sizeof (uint64_t));
1105 } 1315 }
1106 else 1316 else
1107#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. */
1108 write (evpipe [1], &old_errno, 1); 1323 write (evpipe [1], &dummy, 1);
1109 1324
1110 errno = old_errno; 1325 errno = old_errno;
1111 } 1326 }
1112} 1327}
1113 1328
1114/* called whenever the libev signal pipe */ 1329/* called whenever the libev signal pipe */
1115/* got some events (signal, async) */ 1330/* got some events (signal, async) */
1116static void 1331static void
1117pipecb (EV_P_ ev_io *iow, int revents) 1332pipecb (EV_P_ ev_io *iow, int revents)
1118{ 1333{
1334 int i;
1335
1119#if EV_USE_EVENTFD 1336#if EV_USE_EVENTFD
1120 if (evfd >= 0) 1337 if (evfd >= 0)
1121 { 1338 {
1122 uint64_t counter; 1339 uint64_t counter;
1123 read (evfd, &counter, sizeof (uint64_t)); 1340 read (evfd, &counter, sizeof (uint64_t));
1124 } 1341 }
1125 else 1342 else
1126#endif 1343#endif
1127 { 1344 {
1128 char dummy; 1345 char dummy;
1346 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1129 read (evpipe [0], &dummy, 1); 1347 read (evpipe [0], &dummy, 1);
1130 } 1348 }
1131 1349
1132 if (gotsig && ev_is_default_loop (EV_A)) 1350 if (sig_pending)
1133 { 1351 {
1134 int signum; 1352 sig_pending = 0;
1135 gotsig = 0;
1136 1353
1137 for (signum = signalmax; signum--; ) 1354 for (i = EV_NSIG - 1; i--; )
1138 if (signals [signum].gotsig) 1355 if (expect_false (signals [i].pending))
1139 ev_feed_signal_event (EV_A_ signum + 1); 1356 ev_feed_signal_event (EV_A_ i + 1);
1140 } 1357 }
1141 1358
1142#if EV_ASYNC_ENABLE 1359#if EV_ASYNC_ENABLE
1143 if (gotasync) 1360 if (async_pending)
1144 { 1361 {
1145 int i; 1362 async_pending = 0;
1146 gotasync = 0;
1147 1363
1148 for (i = asynccnt; i--; ) 1364 for (i = asynccnt; i--; )
1149 if (asyncs [i]->sent) 1365 if (asyncs [i]->sent)
1150 { 1366 {
1151 asyncs [i]->sent = 0; 1367 asyncs [i]->sent = 0;
… …
1159 1375
1160static void 1376static void
1161ev_sighandler (int signum) 1377ev_sighandler (int signum)
1162{ 1378{
1163#if EV_MULTIPLICITY 1379#if EV_MULTIPLICITY
1164 struct ev_loop *loop = &default_loop_struct; 1380 EV_P = signals [signum - 1].loop;
1165#endif 1381#endif
1166 1382
1167#if _WIN32 1383#ifdef _WIN32
1168 signal (signum, ev_sighandler); 1384 signal (signum, ev_sighandler);
1169#endif 1385#endif
1170 1386
1171 signals [signum - 1].gotsig = 1; 1387 signals [signum - 1].pending = 1;
1172 evpipe_write (EV_A_ &gotsig); 1388 evpipe_write (EV_A_ &sig_pending);
1173} 1389}
1174 1390
1175void noinline 1391void noinline
1176ev_feed_signal_event (EV_P_ int signum) 1392ev_feed_signal_event (EV_P_ int signum)
1177{ 1393{
1178 WL w; 1394 WL w;
1179 1395
1396 if (expect_false (signum <= 0 || signum > EV_NSIG))
1397 return;
1398
1399 --signum;
1400
1180#if EV_MULTIPLICITY 1401#if EV_MULTIPLICITY
1181 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 */
1182#endif 1403 /* or, likely more useful, feeding a signal nobody is waiting for */
1183 1404
1184 --signum; 1405 if (expect_false (signals [signum].loop != EV_A))
1185
1186 if (signum < 0 || signum >= signalmax)
1187 return; 1406 return;
1407#endif
1188 1408
1189 signals [signum].gotsig = 0; 1409 signals [signum].pending = 0;
1190 1410
1191 for (w = signals [signum].head; w; w = w->next) 1411 for (w = signals [signum].head; w; w = w->next)
1192 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1412 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1193} 1413}
1194 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
1195/*****************************************************************************/ 1437/*****************************************************************************/
1196 1438
1439#if EV_CHILD_ENABLE
1197static WL childs [EV_PID_HASHSIZE]; 1440static WL childs [EV_PID_HASHSIZE];
1198
1199#ifndef _WIN32
1200 1441
1201static ev_signal childev; 1442static ev_signal childev;
1202 1443
1203#ifndef WIFCONTINUED 1444#ifndef WIFCONTINUED
1204# define WIFCONTINUED(status) 0 1445# define WIFCONTINUED(status) 0
… …
1209child_reap (EV_P_ int chain, int pid, int status) 1450child_reap (EV_P_ int chain, int pid, int status)
1210{ 1451{
1211 ev_child *w; 1452 ev_child *w;
1212 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1453 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1213 1454
1214 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)
1215 { 1456 {
1216 if ((w->pid == pid || !w->pid) 1457 if ((w->pid == pid || !w->pid)
1217 && (!traced || (w->flags & 1))) 1458 && (!traced || (w->flags & 1)))
1218 { 1459 {
1219 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 */
… …
1244 /* 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 */
1245 /* 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 */
1246 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1487 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1247 1488
1248 child_reap (EV_A_ pid, pid, status); 1489 child_reap (EV_A_ pid, pid, status);
1249 if (EV_PID_HASHSIZE > 1) 1490 if ((EV_PID_HASHSIZE) > 1)
1250 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 */
1251} 1492}
1252 1493
1253#endif 1494#endif
1254 1495
1255/*****************************************************************************/ 1496/*****************************************************************************/
1256 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1257#if EV_USE_PORT 1501#if EV_USE_PORT
1258# include "ev_port.c" 1502# include "ev_port.c"
1259#endif 1503#endif
1260#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1261# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1321#ifdef __APPLE__ 1565#ifdef __APPLE__
1322 /* only select works correctly on that "unix-certified" platform */ 1566 /* only select works correctly on that "unix-certified" platform */
1323 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1567 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1324 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 */
1325#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
1326 1573
1327 return flags; 1574 return flags;
1328} 1575}
1329 1576
1330unsigned int 1577unsigned int
1331ev_embeddable_backends (void) 1578ev_embeddable_backends (void)
1332{ 1579{
1333 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1580 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1334 1581
1335 /* 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 */
1336 /* please fix it and tell me how to detect the fix */ 1583 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1337 flags &= ~EVBACKEND_EPOLL; 1584 flags &= ~EVBACKEND_EPOLL;
1338 1585
1339 return flags; 1586 return flags;
1340} 1587}
1341 1588
1342unsigned int 1589unsigned int
1343ev_backend (EV_P) 1590ev_backend (EV_P)
1344{ 1591{
1345 return backend; 1592 return backend;
1346} 1593}
1347 1594
1595#if EV_FEATURE_API
1348unsigned int 1596unsigned int
1349ev_loop_count (EV_P) 1597ev_iteration (EV_P)
1350{ 1598{
1351 return loop_count; 1599 return loop_count;
1352} 1600}
1353 1601
1602unsigned int
1603ev_depth (EV_P)
1604{
1605 return loop_depth;
1606}
1607
1354void 1608void
1355ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1609ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1356{ 1610{
1357 io_blocktime = interval; 1611 io_blocktime = interval;
1358} 1612}
… …
1360void 1614void
1361ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1615ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1362{ 1616{
1363 timeout_blocktime = interval; 1617 timeout_blocktime = interval;
1364} 1618}
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
1365 1643
1366/* initialise a loop structure, must be zero-initialised */ 1644/* initialise a loop structure, must be zero-initialised */
1367static void noinline 1645static void noinline
1368loop_init (EV_P_ unsigned int flags) 1646loop_init (EV_P_ unsigned int flags)
1369{ 1647{
… …
1387 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1665 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1388 have_monotonic = 1; 1666 have_monotonic = 1;
1389 } 1667 }
1390#endif 1668#endif
1391 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
1392 ev_rt_now = ev_time (); 1681 ev_rt_now = ev_time ();
1393 mn_now = get_clock (); 1682 mn_now = get_clock ();
1394 now_floor = mn_now; 1683 now_floor = mn_now;
1395 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
1396 1688
1397 io_blocktime = 0.; 1689 io_blocktime = 0.;
1398 timeout_blocktime = 0.; 1690 timeout_blocktime = 0.;
1399 backend = 0; 1691 backend = 0;
1400 backend_fd = -1; 1692 backend_fd = -1;
1401 gotasync = 0; 1693 sig_pending = 0;
1694#if EV_ASYNC_ENABLE
1695 async_pending = 0;
1696#endif
1402#if EV_USE_INOTIFY 1697#if EV_USE_INOTIFY
1403 fs_fd = -2; 1698 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1404#endif 1699#endif
1405 1700#if EV_USE_SIGNALFD
1406 /* pid check not overridable via env */ 1701 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1407#ifndef _WIN32
1408 if (flags & EVFLAG_FORKCHECK)
1409 curpid = getpid ();
1410#endif 1702#endif
1411
1412 if (!(flags & EVFLAG_NOENV)
1413 && !enable_secure ()
1414 && getenv ("LIBEV_FLAGS"))
1415 flags = atoi (getenv ("LIBEV_FLAGS"));
1416 1703
1417 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1418 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1419 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1420#if EV_USE_PORT 1710#if EV_USE_PORT
1421 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1422#endif 1712#endif
1423#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1424 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1433 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1723 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1434#endif 1724#endif
1435 1725
1436 ev_prepare_init (&pending_w, pendingcb); 1726 ev_prepare_init (&pending_w, pendingcb);
1437 1727
1728#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1438 ev_init (&pipe_w, pipecb); 1729 ev_init (&pipe_w, pipecb);
1439 ev_set_priority (&pipe_w, EV_MAXPRI); 1730 ev_set_priority (&pipe_w, EV_MAXPRI);
1731#endif
1440 } 1732 }
1441} 1733}
1442 1734
1443/* free up a loop structure */ 1735/* free up a loop structure */
1444static void noinline 1736void
1445loop_destroy (EV_P) 1737ev_loop_destroy (EV_P)
1446{ 1738{
1447 int i; 1739 int i;
1448 1740
1741#if EV_CLEANUP_ENABLE
1742 /* queue cleanup watchers (and execute them) */
1743 if (expect_false (cleanupcnt))
1744 {
1745 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1746 EV_INVOKE_PENDING;
1747 }
1748#endif
1749
1750#if EV_CHILD_ENABLE
1751 if (ev_is_active (&childev))
1752 {
1753 ev_ref (EV_A); /* child watcher */
1754 ev_signal_stop (EV_A_ &childev);
1755 }
1756#endif
1757
1449 if (ev_is_active (&pipe_w)) 1758 if (ev_is_active (&pipe_w))
1450 { 1759 {
1451 ev_ref (EV_A); /* signal watcher */ 1760 /*ev_ref (EV_A);*/
1452 ev_io_stop (EV_A_ &pipe_w); 1761 /*ev_io_stop (EV_A_ &pipe_w);*/
1453 1762
1454#if EV_USE_EVENTFD 1763#if EV_USE_EVENTFD
1455 if (evfd >= 0) 1764 if (evfd >= 0)
1456 close (evfd); 1765 close (evfd);
1457#endif 1766#endif
1458 1767
1459 if (evpipe [0] >= 0) 1768 if (evpipe [0] >= 0)
1460 { 1769 {
1461 close (evpipe [0]); 1770 EV_WIN32_CLOSE_FD (evpipe [0]);
1462 close (evpipe [1]); 1771 EV_WIN32_CLOSE_FD (evpipe [1]);
1463 } 1772 }
1464 } 1773 }
1774
1775#if EV_USE_SIGNALFD
1776 if (ev_is_active (&sigfd_w))
1777 close (sigfd);
1778#endif
1465 1779
1466#if EV_USE_INOTIFY 1780#if EV_USE_INOTIFY
1467 if (fs_fd >= 0) 1781 if (fs_fd >= 0)
1468 close (fs_fd); 1782 close (fs_fd);
1469#endif 1783#endif
1470 1784
1471 if (backend_fd >= 0) 1785 if (backend_fd >= 0)
1472 close (backend_fd); 1786 close (backend_fd);
1473 1787
1788#if EV_USE_IOCP
1789 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1790#endif
1474#if EV_USE_PORT 1791#if EV_USE_PORT
1475 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1792 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1476#endif 1793#endif
1477#if EV_USE_KQUEUE 1794#if EV_USE_KQUEUE
1478 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1795 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1493#if EV_IDLE_ENABLE 1810#if EV_IDLE_ENABLE
1494 array_free (idle, [i]); 1811 array_free (idle, [i]);
1495#endif 1812#endif
1496 } 1813 }
1497 1814
1498 ev_free (anfds); anfdmax = 0; 1815 ev_free (anfds); anfds = 0; anfdmax = 0;
1499 1816
1500 /* have to use the microsoft-never-gets-it-right macro */ 1817 /* have to use the microsoft-never-gets-it-right macro */
1501 array_free (rfeed, EMPTY); 1818 array_free (rfeed, EMPTY);
1502 array_free (fdchange, EMPTY); 1819 array_free (fdchange, EMPTY);
1503 array_free (timer, EMPTY); 1820 array_free (timer, EMPTY);
… …
1505 array_free (periodic, EMPTY); 1822 array_free (periodic, EMPTY);
1506#endif 1823#endif
1507#if EV_FORK_ENABLE 1824#if EV_FORK_ENABLE
1508 array_free (fork, EMPTY); 1825 array_free (fork, EMPTY);
1509#endif 1826#endif
1827#if EV_CLEANUP_ENABLE
1828 array_free (cleanup, EMPTY);
1829#endif
1510 array_free (prepare, EMPTY); 1830 array_free (prepare, EMPTY);
1511 array_free (check, EMPTY); 1831 array_free (check, EMPTY);
1512#if EV_ASYNC_ENABLE 1832#if EV_ASYNC_ENABLE
1513 array_free (async, EMPTY); 1833 array_free (async, EMPTY);
1514#endif 1834#endif
1515 1835
1516 backend = 0; 1836 backend = 0;
1837
1838#if EV_MULTIPLICITY
1839 if (ev_is_default_loop (EV_A))
1840#endif
1841 ev_default_loop_ptr = 0;
1842#if EV_MULTIPLICITY
1843 else
1844 ev_free (EV_A);
1845#endif
1517} 1846}
1518 1847
1519#if EV_USE_INOTIFY 1848#if EV_USE_INOTIFY
1520inline_size void infy_fork (EV_P); 1849inline_size void infy_fork (EV_P);
1521#endif 1850#endif
… …
1538 1867
1539 if (ev_is_active (&pipe_w)) 1868 if (ev_is_active (&pipe_w))
1540 { 1869 {
1541 /* this "locks" the handlers against writing to the pipe */ 1870 /* this "locks" the handlers against writing to the pipe */
1542 /* while we modify the fd vars */ 1871 /* while we modify the fd vars */
1543 gotsig = 1; 1872 sig_pending = 1;
1544#if EV_ASYNC_ENABLE 1873#if EV_ASYNC_ENABLE
1545 gotasync = 1; 1874 async_pending = 1;
1546#endif 1875#endif
1547 1876
1548 ev_ref (EV_A); 1877 ev_ref (EV_A);
1549 ev_io_stop (EV_A_ &pipe_w); 1878 ev_io_stop (EV_A_ &pipe_w);
1550 1879
… …
1553 close (evfd); 1882 close (evfd);
1554#endif 1883#endif
1555 1884
1556 if (evpipe [0] >= 0) 1885 if (evpipe [0] >= 0)
1557 { 1886 {
1558 close (evpipe [0]); 1887 EV_WIN32_CLOSE_FD (evpipe [0]);
1559 close (evpipe [1]); 1888 EV_WIN32_CLOSE_FD (evpipe [1]);
1560 } 1889 }
1561 1890
1891#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1562 evpipe_init (EV_A); 1892 evpipe_init (EV_A);
1563 /* now iterate over everything, in case we missed something */ 1893 /* now iterate over everything, in case we missed something */
1564 pipecb (EV_A_ &pipe_w, EV_READ); 1894 pipecb (EV_A_ &pipe_w, EV_READ);
1895#endif
1565 } 1896 }
1566 1897
1567 postfork = 0; 1898 postfork = 0;
1568} 1899}
1569 1900
1570#if EV_MULTIPLICITY 1901#if EV_MULTIPLICITY
1571 1902
1572struct ev_loop * 1903struct ev_loop *
1573ev_loop_new (unsigned int flags) 1904ev_loop_new (unsigned int flags)
1574{ 1905{
1575 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1906 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1576 1907
1577 memset (loop, 0, sizeof (struct ev_loop)); 1908 memset (EV_A, 0, sizeof (struct ev_loop));
1578
1579 loop_init (EV_A_ flags); 1909 loop_init (EV_A_ flags);
1580 1910
1581 if (ev_backend (EV_A)) 1911 if (ev_backend (EV_A))
1582 return loop; 1912 return EV_A;
1583 1913
1914 ev_free (EV_A);
1584 return 0; 1915 return 0;
1585} 1916}
1586 1917
1587void 1918#endif /* multiplicity */
1588ev_loop_destroy (EV_P)
1589{
1590 loop_destroy (EV_A);
1591 ev_free (loop);
1592}
1593
1594void
1595ev_loop_fork (EV_P)
1596{
1597 postfork = 1; /* must be in line with ev_default_fork */
1598}
1599 1919
1600#if EV_VERIFY 1920#if EV_VERIFY
1601static void noinline 1921static void noinline
1602verify_watcher (EV_P_ W w) 1922verify_watcher (EV_P_ W w)
1603{ 1923{
… …
1631 verify_watcher (EV_A_ ws [cnt]); 1951 verify_watcher (EV_A_ ws [cnt]);
1632 } 1952 }
1633} 1953}
1634#endif 1954#endif
1635 1955
1956#if EV_FEATURE_API
1636void 1957void
1637ev_loop_verify (EV_P) 1958ev_verify (EV_P)
1638{ 1959{
1639#if EV_VERIFY 1960#if EV_VERIFY
1640 int i; 1961 int i;
1641 WL w; 1962 WL w;
1642 1963
… …
1676#if EV_FORK_ENABLE 1997#if EV_FORK_ENABLE
1677 assert (forkmax >= forkcnt); 1998 assert (forkmax >= forkcnt);
1678 array_verify (EV_A_ (W *)forks, forkcnt); 1999 array_verify (EV_A_ (W *)forks, forkcnt);
1679#endif 2000#endif
1680 2001
2002#if EV_CLEANUP_ENABLE
2003 assert (cleanupmax >= cleanupcnt);
2004 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2005#endif
2006
1681#if EV_ASYNC_ENABLE 2007#if EV_ASYNC_ENABLE
1682 assert (asyncmax >= asynccnt); 2008 assert (asyncmax >= asynccnt);
1683 array_verify (EV_A_ (W *)asyncs, asynccnt); 2009 array_verify (EV_A_ (W *)asyncs, asynccnt);
1684#endif 2010#endif
1685 2011
2012#if EV_PREPARE_ENABLE
1686 assert (preparemax >= preparecnt); 2013 assert (preparemax >= preparecnt);
1687 array_verify (EV_A_ (W *)prepares, preparecnt); 2014 array_verify (EV_A_ (W *)prepares, preparecnt);
2015#endif
1688 2016
2017#if EV_CHECK_ENABLE
1689 assert (checkmax >= checkcnt); 2018 assert (checkmax >= checkcnt);
1690 array_verify (EV_A_ (W *)checks, checkcnt); 2019 array_verify (EV_A_ (W *)checks, checkcnt);
2020#endif
1691 2021
1692# if 0 2022# if 0
2023#if EV_CHILD_ENABLE
1693 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2024 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1694 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 2025 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2026#endif
1695# endif 2027# endif
1696#endif 2028#endif
1697} 2029}
1698 2030#endif
1699#endif /* multiplicity */
1700 2031
1701#if EV_MULTIPLICITY 2032#if EV_MULTIPLICITY
1702struct ev_loop * 2033struct ev_loop *
1703ev_default_loop_init (unsigned int flags)
1704#else 2034#else
1705int 2035int
2036#endif
1706ev_default_loop (unsigned int flags) 2037ev_default_loop (unsigned int flags)
1707#endif
1708{ 2038{
1709 if (!ev_default_loop_ptr) 2039 if (!ev_default_loop_ptr)
1710 { 2040 {
1711#if EV_MULTIPLICITY 2041#if EV_MULTIPLICITY
1712 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2042 EV_P = ev_default_loop_ptr = &default_loop_struct;
1713#else 2043#else
1714 ev_default_loop_ptr = 1; 2044 ev_default_loop_ptr = 1;
1715#endif 2045#endif
1716 2046
1717 loop_init (EV_A_ flags); 2047 loop_init (EV_A_ flags);
1718 2048
1719 if (ev_backend (EV_A)) 2049 if (ev_backend (EV_A))
1720 { 2050 {
1721#ifndef _WIN32 2051#if EV_CHILD_ENABLE
1722 ev_signal_init (&childev, childcb, SIGCHLD); 2052 ev_signal_init (&childev, childcb, SIGCHLD);
1723 ev_set_priority (&childev, EV_MAXPRI); 2053 ev_set_priority (&childev, EV_MAXPRI);
1724 ev_signal_start (EV_A_ &childev); 2054 ev_signal_start (EV_A_ &childev);
1725 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2055 ev_unref (EV_A); /* child watcher should not keep loop alive */
1726#endif 2056#endif
… …
1731 2061
1732 return ev_default_loop_ptr; 2062 return ev_default_loop_ptr;
1733} 2063}
1734 2064
1735void 2065void
1736ev_default_destroy (void) 2066ev_loop_fork (EV_P)
1737{ 2067{
1738#if EV_MULTIPLICITY
1739 struct ev_loop *loop = ev_default_loop_ptr;
1740#endif
1741
1742 ev_default_loop_ptr = 0;
1743
1744#ifndef _WIN32
1745 ev_ref (EV_A); /* child watcher */
1746 ev_signal_stop (EV_A_ &childev);
1747#endif
1748
1749 loop_destroy (EV_A);
1750}
1751
1752void
1753ev_default_fork (void)
1754{
1755#if EV_MULTIPLICITY
1756 struct ev_loop *loop = ev_default_loop_ptr;
1757#endif
1758
1759 postfork = 1; /* must be in line with ev_loop_fork */ 2068 postfork = 1; /* must be in line with ev_default_fork */
1760} 2069}
1761 2070
1762/*****************************************************************************/ 2071/*****************************************************************************/
1763 2072
1764void 2073void
1765ev_invoke (EV_P_ void *w, int revents) 2074ev_invoke (EV_P_ void *w, int revents)
1766{ 2075{
1767 EV_CB_INVOKE ((W)w, revents); 2076 EV_CB_INVOKE ((W)w, revents);
1768} 2077}
1769 2078
1770inline_speed void 2079unsigned int
1771call_pending (EV_P) 2080ev_pending_count (EV_P)
2081{
2082 int pri;
2083 unsigned int count = 0;
2084
2085 for (pri = NUMPRI; pri--; )
2086 count += pendingcnt [pri];
2087
2088 return count;
2089}
2090
2091void noinline
2092ev_invoke_pending (EV_P)
1772{ 2093{
1773 int pri; 2094 int pri;
1774 2095
1775 for (pri = NUMPRI; pri--; ) 2096 for (pri = NUMPRI; pri--; )
1776 while (pendingcnt [pri]) 2097 while (pendingcnt [pri])
… …
1843 EV_FREQUENT_CHECK; 2164 EV_FREQUENT_CHECK;
1844 feed_reverse (EV_A_ (W)w); 2165 feed_reverse (EV_A_ (W)w);
1845 } 2166 }
1846 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2167 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1847 2168
1848 feed_reverse_done (EV_A_ EV_TIMEOUT); 2169 feed_reverse_done (EV_A_ EV_TIMER);
1849 } 2170 }
1850} 2171}
1851 2172
1852#if EV_PERIODIC_ENABLE 2173#if EV_PERIODIC_ENABLE
1853/* make periodics pending */ 2174/* make periodics pending */
… …
1906 feed_reverse_done (EV_A_ EV_PERIODIC); 2227 feed_reverse_done (EV_A_ EV_PERIODIC);
1907 } 2228 }
1908} 2229}
1909 2230
1910/* simply recalculate all periodics */ 2231/* simply recalculate all periodics */
1911/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2232/* TODO: maybe ensure that at least one event happens when jumping forward? */
1912static void noinline 2233static void noinline
1913periodics_reschedule (EV_P) 2234periodics_reschedule (EV_P)
1914{ 2235{
1915 int i; 2236 int i;
1916 2237
… …
1944 ANHE_at_cache (*he); 2265 ANHE_at_cache (*he);
1945 } 2266 }
1946} 2267}
1947 2268
1948/* fetch new monotonic and realtime times from the kernel */ 2269/* fetch new monotonic and realtime times from the kernel */
1949/* also detetc if there was a timejump, and act accordingly */ 2270/* also detect if there was a timejump, and act accordingly */
1950inline_speed void 2271inline_speed void
1951time_update (EV_P_ ev_tstamp max_block) 2272time_update (EV_P_ ev_tstamp max_block)
1952{ 2273{
1953#if EV_USE_MONOTONIC 2274#if EV_USE_MONOTONIC
1954 if (expect_true (have_monotonic)) 2275 if (expect_true (have_monotonic))
… …
2011 2332
2012 mn_now = ev_rt_now; 2333 mn_now = ev_rt_now;
2013 } 2334 }
2014} 2335}
2015 2336
2016static int loop_done;
2017
2018void 2337void
2019ev_loop (EV_P_ int flags) 2338ev_run (EV_P_ int flags)
2020{ 2339{
2340#if EV_FEATURE_API
2341 ++loop_depth;
2342#endif
2343
2344 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2345
2021 loop_done = EVUNLOOP_CANCEL; 2346 loop_done = EVBREAK_CANCEL;
2022 2347
2023 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2348 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2024 2349
2025 do 2350 do
2026 { 2351 {
2027#if EV_VERIFY >= 2 2352#if EV_VERIFY >= 2
2028 ev_loop_verify (EV_A); 2353 ev_verify (EV_A);
2029#endif 2354#endif
2030 2355
2031#ifndef _WIN32 2356#ifndef _WIN32
2032 if (expect_false (curpid)) /* penalise the forking check even more */ 2357 if (expect_false (curpid)) /* penalise the forking check even more */
2033 if (expect_false (getpid () != curpid)) 2358 if (expect_false (getpid () != curpid))
… …
2041 /* we might have forked, so queue fork handlers */ 2366 /* we might have forked, so queue fork handlers */
2042 if (expect_false (postfork)) 2367 if (expect_false (postfork))
2043 if (forkcnt) 2368 if (forkcnt)
2044 { 2369 {
2045 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2370 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2046 call_pending (EV_A); 2371 EV_INVOKE_PENDING;
2047 } 2372 }
2048#endif 2373#endif
2049 2374
2375#if EV_PREPARE_ENABLE
2050 /* queue prepare watchers (and execute them) */ 2376 /* queue prepare watchers (and execute them) */
2051 if (expect_false (preparecnt)) 2377 if (expect_false (preparecnt))
2052 { 2378 {
2053 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2379 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2054 call_pending (EV_A); 2380 EV_INVOKE_PENDING;
2055 } 2381 }
2382#endif
2383
2384 if (expect_false (loop_done))
2385 break;
2056 2386
2057 /* we might have forked, so reify kernel state if necessary */ 2387 /* we might have forked, so reify kernel state if necessary */
2058 if (expect_false (postfork)) 2388 if (expect_false (postfork))
2059 loop_fork (EV_A); 2389 loop_fork (EV_A);
2060 2390
… …
2064 /* calculate blocking time */ 2394 /* calculate blocking time */
2065 { 2395 {
2066 ev_tstamp waittime = 0.; 2396 ev_tstamp waittime = 0.;
2067 ev_tstamp sleeptime = 0.; 2397 ev_tstamp sleeptime = 0.;
2068 2398
2399 /* remember old timestamp for io_blocktime calculation */
2400 ev_tstamp prev_mn_now = mn_now;
2401
2402 /* update time to cancel out callback processing overhead */
2403 time_update (EV_A_ 1e100);
2404
2069 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2405 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2070 { 2406 {
2071 /* update time to cancel out callback processing overhead */
2072 time_update (EV_A_ 1e100);
2073
2074 waittime = MAX_BLOCKTIME; 2407 waittime = MAX_BLOCKTIME;
2075 2408
2076 if (timercnt) 2409 if (timercnt)
2077 { 2410 {
2078 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2411 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2085 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2418 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2086 if (waittime > to) waittime = to; 2419 if (waittime > to) waittime = to;
2087 } 2420 }
2088#endif 2421#endif
2089 2422
2423 /* don't let timeouts decrease the waittime below timeout_blocktime */
2090 if (expect_false (waittime < timeout_blocktime)) 2424 if (expect_false (waittime < timeout_blocktime))
2091 waittime = timeout_blocktime; 2425 waittime = timeout_blocktime;
2092 2426
2093 sleeptime = waittime - backend_fudge; 2427 /* extra check because io_blocktime is commonly 0 */
2094
2095 if (expect_true (sleeptime > io_blocktime)) 2428 if (expect_false (io_blocktime))
2096 sleeptime = io_blocktime;
2097
2098 if (sleeptime)
2099 { 2429 {
2430 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2431
2432 if (sleeptime > waittime - backend_fudge)
2433 sleeptime = waittime - backend_fudge;
2434
2435 if (expect_true (sleeptime > 0.))
2436 {
2100 ev_sleep (sleeptime); 2437 ev_sleep (sleeptime);
2101 waittime -= sleeptime; 2438 waittime -= sleeptime;
2439 }
2102 } 2440 }
2103 } 2441 }
2104 2442
2443#if EV_FEATURE_API
2105 ++loop_count; 2444 ++loop_count;
2445#endif
2446 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2106 backend_poll (EV_A_ waittime); 2447 backend_poll (EV_A_ waittime);
2448 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2107 2449
2108 /* update ev_rt_now, do magic */ 2450 /* update ev_rt_now, do magic */
2109 time_update (EV_A_ waittime + sleeptime); 2451 time_update (EV_A_ waittime + sleeptime);
2110 } 2452 }
2111 2453
… …
2118#if EV_IDLE_ENABLE 2460#if EV_IDLE_ENABLE
2119 /* queue idle watchers unless other events are pending */ 2461 /* queue idle watchers unless other events are pending */
2120 idle_reify (EV_A); 2462 idle_reify (EV_A);
2121#endif 2463#endif
2122 2464
2465#if EV_CHECK_ENABLE
2123 /* queue check watchers, to be executed first */ 2466 /* queue check watchers, to be executed first */
2124 if (expect_false (checkcnt)) 2467 if (expect_false (checkcnt))
2125 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2468 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2469#endif
2126 2470
2127 call_pending (EV_A); 2471 EV_INVOKE_PENDING;
2128 } 2472 }
2129 while (expect_true ( 2473 while (expect_true (
2130 activecnt 2474 activecnt
2131 && !loop_done 2475 && !loop_done
2132 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2476 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2133 )); 2477 ));
2134 2478
2135 if (loop_done == EVUNLOOP_ONE) 2479 if (loop_done == EVBREAK_ONE)
2136 loop_done = EVUNLOOP_CANCEL; 2480 loop_done = EVBREAK_CANCEL;
2137}
2138 2481
2482#if EV_FEATURE_API
2483 --loop_depth;
2484#endif
2485}
2486
2139void 2487void
2140ev_unloop (EV_P_ int how) 2488ev_break (EV_P_ int how)
2141{ 2489{
2142 loop_done = how; 2490 loop_done = how;
2143} 2491}
2144 2492
2145void 2493void
… …
2192inline_size void 2540inline_size void
2193wlist_del (WL *head, WL elem) 2541wlist_del (WL *head, WL elem)
2194{ 2542{
2195 while (*head) 2543 while (*head)
2196 { 2544 {
2197 if (*head == elem) 2545 if (expect_true (*head == elem))
2198 { 2546 {
2199 *head = elem->next; 2547 *head = elem->next;
2200 return; 2548 break;
2201 } 2549 }
2202 2550
2203 head = &(*head)->next; 2551 head = &(*head)->next;
2204 } 2552 }
2205} 2553}
… …
2233} 2581}
2234 2582
2235inline_size void 2583inline_size void
2236pri_adjust (EV_P_ W w) 2584pri_adjust (EV_P_ W w)
2237{ 2585{
2238 int pri = w->priority; 2586 int pri = ev_priority (w);
2239 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2587 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2240 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2588 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2241 w->priority = pri; 2589 ev_set_priority (w, pri);
2242} 2590}
2243 2591
2244inline_speed void 2592inline_speed void
2245ev_start (EV_P_ W w, int active) 2593ev_start (EV_P_ W w, int active)
2246{ 2594{
… …
2265 2613
2266 if (expect_false (ev_is_active (w))) 2614 if (expect_false (ev_is_active (w)))
2267 return; 2615 return;
2268 2616
2269 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2617 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2270 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2618 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2271 2619
2272 EV_FREQUENT_CHECK; 2620 EV_FREQUENT_CHECK;
2273 2621
2274 ev_start (EV_A_ (W)w, 1); 2622 ev_start (EV_A_ (W)w, 1);
2275 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2623 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2276 wlist_add (&anfds[fd].head, (WL)w); 2624 wlist_add (&anfds[fd].head, (WL)w);
2277 2625
2278 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2626 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2279 w->events &= ~EV__IOFDSET; 2627 w->events &= ~EV__IOFDSET;
2280 2628
2281 EV_FREQUENT_CHECK; 2629 EV_FREQUENT_CHECK;
2282} 2630}
2283 2631
… …
2293 EV_FREQUENT_CHECK; 2641 EV_FREQUENT_CHECK;
2294 2642
2295 wlist_del (&anfds[w->fd].head, (WL)w); 2643 wlist_del (&anfds[w->fd].head, (WL)w);
2296 ev_stop (EV_A_ (W)w); 2644 ev_stop (EV_A_ (W)w);
2297 2645
2298 fd_change (EV_A_ w->fd, 1); 2646 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2299 2647
2300 EV_FREQUENT_CHECK; 2648 EV_FREQUENT_CHECK;
2301} 2649}
2302 2650
2303void noinline 2651void noinline
… …
2345 timers [active] = timers [timercnt + HEAP0]; 2693 timers [active] = timers [timercnt + HEAP0];
2346 adjustheap (timers, timercnt, active); 2694 adjustheap (timers, timercnt, active);
2347 } 2695 }
2348 } 2696 }
2349 2697
2350 EV_FREQUENT_CHECK;
2351
2352 ev_at (w) -= mn_now; 2698 ev_at (w) -= mn_now;
2353 2699
2354 ev_stop (EV_A_ (W)w); 2700 ev_stop (EV_A_ (W)w);
2701
2702 EV_FREQUENT_CHECK;
2355} 2703}
2356 2704
2357void noinline 2705void noinline
2358ev_timer_again (EV_P_ ev_timer *w) 2706ev_timer_again (EV_P_ ev_timer *w)
2359{ 2707{
… …
2377 } 2725 }
2378 2726
2379 EV_FREQUENT_CHECK; 2727 EV_FREQUENT_CHECK;
2380} 2728}
2381 2729
2730ev_tstamp
2731ev_timer_remaining (EV_P_ ev_timer *w)
2732{
2733 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2734}
2735
2382#if EV_PERIODIC_ENABLE 2736#if EV_PERIODIC_ENABLE
2383void noinline 2737void noinline
2384ev_periodic_start (EV_P_ ev_periodic *w) 2738ev_periodic_start (EV_P_ ev_periodic *w)
2385{ 2739{
2386 if (expect_false (ev_is_active (w))) 2740 if (expect_false (ev_is_active (w)))
… …
2432 periodics [active] = periodics [periodiccnt + HEAP0]; 2786 periodics [active] = periodics [periodiccnt + HEAP0];
2433 adjustheap (periodics, periodiccnt, active); 2787 adjustheap (periodics, periodiccnt, active);
2434 } 2788 }
2435 } 2789 }
2436 2790
2437 EV_FREQUENT_CHECK;
2438
2439 ev_stop (EV_A_ (W)w); 2791 ev_stop (EV_A_ (W)w);
2792
2793 EV_FREQUENT_CHECK;
2440} 2794}
2441 2795
2442void noinline 2796void noinline
2443ev_periodic_again (EV_P_ ev_periodic *w) 2797ev_periodic_again (EV_P_ ev_periodic *w)
2444{ 2798{
… …
2450 2804
2451#ifndef SA_RESTART 2805#ifndef SA_RESTART
2452# define SA_RESTART 0 2806# define SA_RESTART 0
2453#endif 2807#endif
2454 2808
2809#if EV_SIGNAL_ENABLE
2810
2455void noinline 2811void noinline
2456ev_signal_start (EV_P_ ev_signal *w) 2812ev_signal_start (EV_P_ ev_signal *w)
2457{ 2813{
2458#if EV_MULTIPLICITY
2459 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2460#endif
2461 if (expect_false (ev_is_active (w))) 2814 if (expect_false (ev_is_active (w)))
2462 return; 2815 return;
2463 2816
2464 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2817 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2465 2818
2466 evpipe_init (EV_A); 2819#if EV_MULTIPLICITY
2820 assert (("libev: a signal must not be attached to two different loops",
2821 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2467 2822
2468 EV_FREQUENT_CHECK; 2823 signals [w->signum - 1].loop = EV_A;
2824#endif
2469 2825
2826 EV_FREQUENT_CHECK;
2827
2828#if EV_USE_SIGNALFD
2829 if (sigfd == -2)
2470 { 2830 {
2471#ifndef _WIN32 2831 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2472 sigset_t full, prev; 2832 if (sigfd < 0 && errno == EINVAL)
2473 sigfillset (&full); 2833 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2474 sigprocmask (SIG_SETMASK, &full, &prev);
2475#endif
2476 2834
2477 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2835 if (sigfd >= 0)
2836 {
2837 fd_intern (sigfd); /* doing it twice will not hurt */
2478 2838
2479#ifndef _WIN32 2839 sigemptyset (&sigfd_set);
2480 sigprocmask (SIG_SETMASK, &prev, 0); 2840
2481#endif 2841 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2842 ev_set_priority (&sigfd_w, EV_MAXPRI);
2843 ev_io_start (EV_A_ &sigfd_w);
2844 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2845 }
2482 } 2846 }
2847
2848 if (sigfd >= 0)
2849 {
2850 /* TODO: check .head */
2851 sigaddset (&sigfd_set, w->signum);
2852 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2853
2854 signalfd (sigfd, &sigfd_set, 0);
2855 }
2856#endif
2483 2857
2484 ev_start (EV_A_ (W)w, 1); 2858 ev_start (EV_A_ (W)w, 1);
2485 wlist_add (&signals [w->signum - 1].head, (WL)w); 2859 wlist_add (&signals [w->signum - 1].head, (WL)w);
2486 2860
2487 if (!((WL)w)->next) 2861 if (!((WL)w)->next)
2862# if EV_USE_SIGNALFD
2863 if (sigfd < 0) /*TODO*/
2864# endif
2488 { 2865 {
2489#if _WIN32 2866# ifdef _WIN32
2867 evpipe_init (EV_A);
2868
2490 signal (w->signum, ev_sighandler); 2869 signal (w->signum, ev_sighandler);
2491#else 2870# else
2492 struct sigaction sa; 2871 struct sigaction sa;
2872
2873 evpipe_init (EV_A);
2874
2493 sa.sa_handler = ev_sighandler; 2875 sa.sa_handler = ev_sighandler;
2494 sigfillset (&sa.sa_mask); 2876 sigfillset (&sa.sa_mask);
2495 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2877 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2496 sigaction (w->signum, &sa, 0); 2878 sigaction (w->signum, &sa, 0);
2879
2880 sigemptyset (&sa.sa_mask);
2881 sigaddset (&sa.sa_mask, w->signum);
2882 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2497#endif 2883#endif
2498 } 2884 }
2499 2885
2500 EV_FREQUENT_CHECK; 2886 EV_FREQUENT_CHECK;
2501} 2887}
2502 2888
2503void noinline 2889void noinline
… …
2511 2897
2512 wlist_del (&signals [w->signum - 1].head, (WL)w); 2898 wlist_del (&signals [w->signum - 1].head, (WL)w);
2513 ev_stop (EV_A_ (W)w); 2899 ev_stop (EV_A_ (W)w);
2514 2900
2515 if (!signals [w->signum - 1].head) 2901 if (!signals [w->signum - 1].head)
2902 {
2903#if EV_MULTIPLICITY
2904 signals [w->signum - 1].loop = 0; /* unattach from signal */
2905#endif
2906#if EV_USE_SIGNALFD
2907 if (sigfd >= 0)
2908 {
2909 sigset_t ss;
2910
2911 sigemptyset (&ss);
2912 sigaddset (&ss, w->signum);
2913 sigdelset (&sigfd_set, w->signum);
2914
2915 signalfd (sigfd, &sigfd_set, 0);
2916 sigprocmask (SIG_UNBLOCK, &ss, 0);
2917 }
2918 else
2919#endif
2516 signal (w->signum, SIG_DFL); 2920 signal (w->signum, SIG_DFL);
2921 }
2517 2922
2518 EV_FREQUENT_CHECK; 2923 EV_FREQUENT_CHECK;
2519} 2924}
2925
2926#endif
2927
2928#if EV_CHILD_ENABLE
2520 2929
2521void 2930void
2522ev_child_start (EV_P_ ev_child *w) 2931ev_child_start (EV_P_ ev_child *w)
2523{ 2932{
2524#if EV_MULTIPLICITY 2933#if EV_MULTIPLICITY
… …
2528 return; 2937 return;
2529 2938
2530 EV_FREQUENT_CHECK; 2939 EV_FREQUENT_CHECK;
2531 2940
2532 ev_start (EV_A_ (W)w, 1); 2941 ev_start (EV_A_ (W)w, 1);
2533 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2942 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2534 2943
2535 EV_FREQUENT_CHECK; 2944 EV_FREQUENT_CHECK;
2536} 2945}
2537 2946
2538void 2947void
… …
2542 if (expect_false (!ev_is_active (w))) 2951 if (expect_false (!ev_is_active (w)))
2543 return; 2952 return;
2544 2953
2545 EV_FREQUENT_CHECK; 2954 EV_FREQUENT_CHECK;
2546 2955
2547 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2956 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2548 ev_stop (EV_A_ (W)w); 2957 ev_stop (EV_A_ (W)w);
2549 2958
2550 EV_FREQUENT_CHECK; 2959 EV_FREQUENT_CHECK;
2551} 2960}
2961
2962#endif
2552 2963
2553#if EV_STAT_ENABLE 2964#if EV_STAT_ENABLE
2554 2965
2555# ifdef _WIN32 2966# ifdef _WIN32
2556# undef lstat 2967# undef lstat
… …
2562#define MIN_STAT_INTERVAL 0.1074891 2973#define MIN_STAT_INTERVAL 0.1074891
2563 2974
2564static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2975static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2565 2976
2566#if EV_USE_INOTIFY 2977#if EV_USE_INOTIFY
2567# define EV_INOTIFY_BUFSIZE 8192 2978
2979/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2980# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2568 2981
2569static void noinline 2982static void noinline
2570infy_add (EV_P_ ev_stat *w) 2983infy_add (EV_P_ ev_stat *w)
2571{ 2984{
2572 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); 2985 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);
2573 2986
2574 if (w->wd < 0) 2987 if (w->wd >= 0)
2988 {
2989 struct statfs sfs;
2990
2991 /* now local changes will be tracked by inotify, but remote changes won't */
2992 /* unless the filesystem is known to be local, we therefore still poll */
2993 /* also do poll on <2.6.25, but with normal frequency */
2994
2995 if (!fs_2625)
2996 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2997 else if (!statfs (w->path, &sfs)
2998 && (sfs.f_type == 0x1373 /* devfs */
2999 || sfs.f_type == 0xEF53 /* ext2/3 */
3000 || sfs.f_type == 0x3153464a /* jfs */
3001 || sfs.f_type == 0x52654973 /* reiser3 */
3002 || sfs.f_type == 0x01021994 /* tempfs */
3003 || sfs.f_type == 0x58465342 /* xfs */))
3004 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3005 else
3006 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2575 { 3007 }
3008 else
3009 {
3010 /* can't use inotify, continue to stat */
2576 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3011 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2577 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2578 3012
2579 /* monitor some parent directory for speedup hints */ 3013 /* if path is not there, monitor some parent directory for speedup hints */
2580 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3014 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2581 /* but an efficiency issue only */ 3015 /* but an efficiency issue only */
2582 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3016 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2583 { 3017 {
2584 char path [4096]; 3018 char path [4096];
… …
2600 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3034 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2601 } 3035 }
2602 } 3036 }
2603 3037
2604 if (w->wd >= 0) 3038 if (w->wd >= 0)
2605 {
2606 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3039 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2607 3040
2608 /* now local changes will be tracked by inotify, but remote changes won't */ 3041 /* now re-arm timer, if required */
2609 /* unless the filesystem it known to be local, we therefore still poll */ 3042 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2610 /* also do poll on <2.6.25, but with normal frequency */
2611 struct statfs sfs;
2612
2613 if (fs_2625 && !statfs (w->path, &sfs))
2614 if (sfs.f_type == 0x1373 /* devfs */
2615 || sfs.f_type == 0xEF53 /* ext2/3 */
2616 || sfs.f_type == 0x3153464a /* jfs */
2617 || sfs.f_type == 0x52654973 /* reiser3 */
2618 || sfs.f_type == 0x01021994 /* tempfs */
2619 || sfs.f_type == 0x58465342 /* xfs */)
2620 return;
2621
2622 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2623 ev_timer_again (EV_A_ &w->timer); 3043 ev_timer_again (EV_A_ &w->timer);
2624 } 3044 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2625} 3045}
2626 3046
2627static void noinline 3047static void noinline
2628infy_del (EV_P_ ev_stat *w) 3048infy_del (EV_P_ ev_stat *w)
2629{ 3049{
… …
2632 3052
2633 if (wd < 0) 3053 if (wd < 0)
2634 return; 3054 return;
2635 3055
2636 w->wd = -2; 3056 w->wd = -2;
2637 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3057 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2638 wlist_del (&fs_hash [slot].head, (WL)w); 3058 wlist_del (&fs_hash [slot].head, (WL)w);
2639 3059
2640 /* remove this watcher, if others are watching it, they will rearm */ 3060 /* remove this watcher, if others are watching it, they will rearm */
2641 inotify_rm_watch (fs_fd, wd); 3061 inotify_rm_watch (fs_fd, wd);
2642} 3062}
… …
2644static void noinline 3064static void noinline
2645infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3065infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2646{ 3066{
2647 if (slot < 0) 3067 if (slot < 0)
2648 /* overflow, need to check for all hash slots */ 3068 /* overflow, need to check for all hash slots */
2649 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3069 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2650 infy_wd (EV_A_ slot, wd, ev); 3070 infy_wd (EV_A_ slot, wd, ev);
2651 else 3071 else
2652 { 3072 {
2653 WL w_; 3073 WL w_;
2654 3074
2655 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3075 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2656 { 3076 {
2657 ev_stat *w = (ev_stat *)w_; 3077 ev_stat *w = (ev_stat *)w_;
2658 w_ = w_->next; /* lets us remove this watcher and all before it */ 3078 w_ = w_->next; /* lets us remove this watcher and all before it */
2659 3079
2660 if (w->wd == wd || wd == -1) 3080 if (w->wd == wd || wd == -1)
2661 { 3081 {
2662 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3082 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2663 { 3083 {
2664 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3084 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2665 w->wd = -1; 3085 w->wd = -1;
2666 infy_add (EV_A_ w); /* re-add, no matter what */ 3086 infy_add (EV_A_ w); /* re-add, no matter what */
2667 } 3087 }
2668 3088
2669 stat_timer_cb (EV_A_ &w->timer, 0); 3089 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2674 3094
2675static void 3095static void
2676infy_cb (EV_P_ ev_io *w, int revents) 3096infy_cb (EV_P_ ev_io *w, int revents)
2677{ 3097{
2678 char buf [EV_INOTIFY_BUFSIZE]; 3098 char buf [EV_INOTIFY_BUFSIZE];
2679 struct inotify_event *ev = (struct inotify_event *)buf;
2680 int ofs; 3099 int ofs;
2681 int len = read (fs_fd, buf, sizeof (buf)); 3100 int len = read (fs_fd, buf, sizeof (buf));
2682 3101
2683 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3102 for (ofs = 0; ofs < len; )
3103 {
3104 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2684 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3105 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3106 ofs += sizeof (struct inotify_event) + ev->len;
3107 }
2685} 3108}
2686 3109
2687inline_size void 3110inline_size void
2688check_2625 (EV_P) 3111ev_check_2625 (EV_P)
2689{ 3112{
2690 /* kernels < 2.6.25 are borked 3113 /* kernels < 2.6.25 are borked
2691 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3114 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2692 */ 3115 */
2693 struct utsname buf; 3116 if (ev_linux_version () < 0x020619)
2694 int major, minor, micro;
2695
2696 if (uname (&buf))
2697 return; 3117 return;
2698 3118
2699 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2700 return;
2701
2702 if (major < 2
2703 || (major == 2 && minor < 6)
2704 || (major == 2 && minor == 6 && micro < 25))
2705 return;
2706
2707 fs_2625 = 1; 3119 fs_2625 = 1;
3120}
3121
3122inline_size int
3123infy_newfd (void)
3124{
3125#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3126 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3127 if (fd >= 0)
3128 return fd;
3129#endif
3130 return inotify_init ();
2708} 3131}
2709 3132
2710inline_size void 3133inline_size void
2711infy_init (EV_P) 3134infy_init (EV_P)
2712{ 3135{
2713 if (fs_fd != -2) 3136 if (fs_fd != -2)
2714 return; 3137 return;
2715 3138
2716 fs_fd = -1; 3139 fs_fd = -1;
2717 3140
2718 check_2625 (EV_A); 3141 ev_check_2625 (EV_A);
2719 3142
2720 fs_fd = inotify_init (); 3143 fs_fd = infy_newfd ();
2721 3144
2722 if (fs_fd >= 0) 3145 if (fs_fd >= 0)
2723 { 3146 {
3147 fd_intern (fs_fd);
2724 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3148 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2725 ev_set_priority (&fs_w, EV_MAXPRI); 3149 ev_set_priority (&fs_w, EV_MAXPRI);
2726 ev_io_start (EV_A_ &fs_w); 3150 ev_io_start (EV_A_ &fs_w);
3151 ev_unref (EV_A);
2727 } 3152 }
2728} 3153}
2729 3154
2730inline_size void 3155inline_size void
2731infy_fork (EV_P) 3156infy_fork (EV_P)
… …
2733 int slot; 3158 int slot;
2734 3159
2735 if (fs_fd < 0) 3160 if (fs_fd < 0)
2736 return; 3161 return;
2737 3162
3163 ev_ref (EV_A);
3164 ev_io_stop (EV_A_ &fs_w);
2738 close (fs_fd); 3165 close (fs_fd);
2739 fs_fd = inotify_init (); 3166 fs_fd = infy_newfd ();
2740 3167
3168 if (fs_fd >= 0)
3169 {
3170 fd_intern (fs_fd);
3171 ev_io_set (&fs_w, fs_fd, EV_READ);
3172 ev_io_start (EV_A_ &fs_w);
3173 ev_unref (EV_A);
3174 }
3175
2741 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3176 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2742 { 3177 {
2743 WL w_ = fs_hash [slot].head; 3178 WL w_ = fs_hash [slot].head;
2744 fs_hash [slot].head = 0; 3179 fs_hash [slot].head = 0;
2745 3180
2746 while (w_) 3181 while (w_)
… …
2751 w->wd = -1; 3186 w->wd = -1;
2752 3187
2753 if (fs_fd >= 0) 3188 if (fs_fd >= 0)
2754 infy_add (EV_A_ w); /* re-add, no matter what */ 3189 infy_add (EV_A_ w); /* re-add, no matter what */
2755 else 3190 else
3191 {
3192 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3193 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2756 ev_timer_again (EV_A_ &w->timer); 3194 ev_timer_again (EV_A_ &w->timer);
3195 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3196 }
2757 } 3197 }
2758 } 3198 }
2759} 3199}
2760 3200
2761#endif 3201#endif
… …
2778static void noinline 3218static void noinline
2779stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3219stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2780{ 3220{
2781 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3221 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2782 3222
2783 /* we copy this here each the time so that */ 3223 ev_statdata prev = w->attr;
2784 /* prev has the old value when the callback gets invoked */
2785 w->prev = w->attr;
2786 ev_stat_stat (EV_A_ w); 3224 ev_stat_stat (EV_A_ w);
2787 3225
2788 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3226 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2789 if ( 3227 if (
2790 w->prev.st_dev != w->attr.st_dev 3228 prev.st_dev != w->attr.st_dev
2791 || w->prev.st_ino != w->attr.st_ino 3229 || prev.st_ino != w->attr.st_ino
2792 || w->prev.st_mode != w->attr.st_mode 3230 || prev.st_mode != w->attr.st_mode
2793 || w->prev.st_nlink != w->attr.st_nlink 3231 || prev.st_nlink != w->attr.st_nlink
2794 || w->prev.st_uid != w->attr.st_uid 3232 || prev.st_uid != w->attr.st_uid
2795 || w->prev.st_gid != w->attr.st_gid 3233 || prev.st_gid != w->attr.st_gid
2796 || w->prev.st_rdev != w->attr.st_rdev 3234 || prev.st_rdev != w->attr.st_rdev
2797 || w->prev.st_size != w->attr.st_size 3235 || prev.st_size != w->attr.st_size
2798 || w->prev.st_atime != w->attr.st_atime 3236 || prev.st_atime != w->attr.st_atime
2799 || w->prev.st_mtime != w->attr.st_mtime 3237 || prev.st_mtime != w->attr.st_mtime
2800 || w->prev.st_ctime != w->attr.st_ctime 3238 || prev.st_ctime != w->attr.st_ctime
2801 ) { 3239 ) {
3240 /* we only update w->prev on actual differences */
3241 /* in case we test more often than invoke the callback, */
3242 /* to ensure that prev is always different to attr */
3243 w->prev = prev;
3244
2802 #if EV_USE_INOTIFY 3245 #if EV_USE_INOTIFY
2803 if (fs_fd >= 0) 3246 if (fs_fd >= 0)
2804 { 3247 {
2805 infy_del (EV_A_ w); 3248 infy_del (EV_A_ w);
2806 infy_add (EV_A_ w); 3249 infy_add (EV_A_ w);
… …
2831 3274
2832 if (fs_fd >= 0) 3275 if (fs_fd >= 0)
2833 infy_add (EV_A_ w); 3276 infy_add (EV_A_ w);
2834 else 3277 else
2835#endif 3278#endif
3279 {
2836 ev_timer_again (EV_A_ &w->timer); 3280 ev_timer_again (EV_A_ &w->timer);
3281 ev_unref (EV_A);
3282 }
2837 3283
2838 ev_start (EV_A_ (W)w, 1); 3284 ev_start (EV_A_ (W)w, 1);
2839 3285
2840 EV_FREQUENT_CHECK; 3286 EV_FREQUENT_CHECK;
2841} 3287}
… …
2850 EV_FREQUENT_CHECK; 3296 EV_FREQUENT_CHECK;
2851 3297
2852#if EV_USE_INOTIFY 3298#if EV_USE_INOTIFY
2853 infy_del (EV_A_ w); 3299 infy_del (EV_A_ w);
2854#endif 3300#endif
3301
3302 if (ev_is_active (&w->timer))
3303 {
3304 ev_ref (EV_A);
2855 ev_timer_stop (EV_A_ &w->timer); 3305 ev_timer_stop (EV_A_ &w->timer);
3306 }
2856 3307
2857 ev_stop (EV_A_ (W)w); 3308 ev_stop (EV_A_ (W)w);
2858 3309
2859 EV_FREQUENT_CHECK; 3310 EV_FREQUENT_CHECK;
2860} 3311}
… …
2905 3356
2906 EV_FREQUENT_CHECK; 3357 EV_FREQUENT_CHECK;
2907} 3358}
2908#endif 3359#endif
2909 3360
3361#if EV_PREPARE_ENABLE
2910void 3362void
2911ev_prepare_start (EV_P_ ev_prepare *w) 3363ev_prepare_start (EV_P_ ev_prepare *w)
2912{ 3364{
2913 if (expect_false (ev_is_active (w))) 3365 if (expect_false (ev_is_active (w)))
2914 return; 3366 return;
… …
2940 3392
2941 ev_stop (EV_A_ (W)w); 3393 ev_stop (EV_A_ (W)w);
2942 3394
2943 EV_FREQUENT_CHECK; 3395 EV_FREQUENT_CHECK;
2944} 3396}
3397#endif
2945 3398
3399#if EV_CHECK_ENABLE
2946void 3400void
2947ev_check_start (EV_P_ ev_check *w) 3401ev_check_start (EV_P_ ev_check *w)
2948{ 3402{
2949 if (expect_false (ev_is_active (w))) 3403 if (expect_false (ev_is_active (w)))
2950 return; 3404 return;
… …
2976 3430
2977 ev_stop (EV_A_ (W)w); 3431 ev_stop (EV_A_ (W)w);
2978 3432
2979 EV_FREQUENT_CHECK; 3433 EV_FREQUENT_CHECK;
2980} 3434}
3435#endif
2981 3436
2982#if EV_EMBED_ENABLE 3437#if EV_EMBED_ENABLE
2983void noinline 3438void noinline
2984ev_embed_sweep (EV_P_ ev_embed *w) 3439ev_embed_sweep (EV_P_ ev_embed *w)
2985{ 3440{
2986 ev_loop (w->other, EVLOOP_NONBLOCK); 3441 ev_run (w->other, EVRUN_NOWAIT);
2987} 3442}
2988 3443
2989static void 3444static void
2990embed_io_cb (EV_P_ ev_io *io, int revents) 3445embed_io_cb (EV_P_ ev_io *io, int revents)
2991{ 3446{
2992 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3447 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2993 3448
2994 if (ev_cb (w)) 3449 if (ev_cb (w))
2995 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3450 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2996 else 3451 else
2997 ev_loop (w->other, EVLOOP_NONBLOCK); 3452 ev_run (w->other, EVRUN_NOWAIT);
2998} 3453}
2999 3454
3000static void 3455static void
3001embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3456embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3002{ 3457{
3003 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3458 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3004 3459
3005 { 3460 {
3006 struct ev_loop *loop = w->other; 3461 EV_P = w->other;
3007 3462
3008 while (fdchangecnt) 3463 while (fdchangecnt)
3009 { 3464 {
3010 fd_reify (EV_A); 3465 fd_reify (EV_A);
3011 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3466 ev_run (EV_A_ EVRUN_NOWAIT);
3012 } 3467 }
3013 } 3468 }
3014} 3469}
3015 3470
3016static void 3471static void
… …
3019 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3474 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3020 3475
3021 ev_embed_stop (EV_A_ w); 3476 ev_embed_stop (EV_A_ w);
3022 3477
3023 { 3478 {
3024 struct ev_loop *loop = w->other; 3479 EV_P = w->other;
3025 3480
3026 ev_loop_fork (EV_A); 3481 ev_loop_fork (EV_A);
3027 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3482 ev_run (EV_A_ EVRUN_NOWAIT);
3028 } 3483 }
3029 3484
3030 ev_embed_start (EV_A_ w); 3485 ev_embed_start (EV_A_ w);
3031} 3486}
3032 3487
… …
3043{ 3498{
3044 if (expect_false (ev_is_active (w))) 3499 if (expect_false (ev_is_active (w)))
3045 return; 3500 return;
3046 3501
3047 { 3502 {
3048 struct ev_loop *loop = w->other; 3503 EV_P = w->other;
3049 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3504 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3050 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3505 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3051 } 3506 }
3052 3507
3053 EV_FREQUENT_CHECK; 3508 EV_FREQUENT_CHECK;
… …
3080 3535
3081 ev_io_stop (EV_A_ &w->io); 3536 ev_io_stop (EV_A_ &w->io);
3082 ev_prepare_stop (EV_A_ &w->prepare); 3537 ev_prepare_stop (EV_A_ &w->prepare);
3083 ev_fork_stop (EV_A_ &w->fork); 3538 ev_fork_stop (EV_A_ &w->fork);
3084 3539
3540 ev_stop (EV_A_ (W)w);
3541
3085 EV_FREQUENT_CHECK; 3542 EV_FREQUENT_CHECK;
3086} 3543}
3087#endif 3544#endif
3088 3545
3089#if EV_FORK_ENABLE 3546#if EV_FORK_ENABLE
… …
3122 3579
3123 EV_FREQUENT_CHECK; 3580 EV_FREQUENT_CHECK;
3124} 3581}
3125#endif 3582#endif
3126 3583
3127#if EV_ASYNC_ENABLE 3584#if EV_CLEANUP_ENABLE
3128void 3585void
3129ev_async_start (EV_P_ ev_async *w) 3586ev_cleanup_start (EV_P_ ev_cleanup *w)
3130{ 3587{
3131 if (expect_false (ev_is_active (w))) 3588 if (expect_false (ev_is_active (w)))
3132 return; 3589 return;
3590
3591 EV_FREQUENT_CHECK;
3592
3593 ev_start (EV_A_ (W)w, ++cleanupcnt);
3594 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3595 cleanups [cleanupcnt - 1] = w;
3596
3597 EV_FREQUENT_CHECK;
3598}
3599
3600void
3601ev_cleanup_stop (EV_P_ ev_cleanup *w)
3602{
3603 clear_pending (EV_A_ (W)w);
3604 if (expect_false (!ev_is_active (w)))
3605 return;
3606
3607 EV_FREQUENT_CHECK;
3608
3609 {
3610 int active = ev_active (w);
3611
3612 cleanups [active - 1] = cleanups [--cleanupcnt];
3613 ev_active (cleanups [active - 1]) = active;
3614 }
3615
3616 ev_stop (EV_A_ (W)w);
3617
3618 EV_FREQUENT_CHECK;
3619}
3620#endif
3621
3622#if EV_ASYNC_ENABLE
3623void
3624ev_async_start (EV_P_ ev_async *w)
3625{
3626 if (expect_false (ev_is_active (w)))
3627 return;
3628
3629 w->sent = 0;
3133 3630
3134 evpipe_init (EV_A); 3631 evpipe_init (EV_A);
3135 3632
3136 EV_FREQUENT_CHECK; 3633 EV_FREQUENT_CHECK;
3137 3634
… …
3165 3662
3166void 3663void
3167ev_async_send (EV_P_ ev_async *w) 3664ev_async_send (EV_P_ ev_async *w)
3168{ 3665{
3169 w->sent = 1; 3666 w->sent = 1;
3170 evpipe_write (EV_A_ &gotasync); 3667 evpipe_write (EV_A_ &async_pending);
3171} 3668}
3172#endif 3669#endif
3173 3670
3174/*****************************************************************************/ 3671/*****************************************************************************/
3175 3672
… …
3215{ 3712{
3216 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3713 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3217 3714
3218 if (expect_false (!once)) 3715 if (expect_false (!once))
3219 { 3716 {
3220 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3717 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3221 return; 3718 return;
3222 } 3719 }
3223 3720
3224 once->cb = cb; 3721 once->cb = cb;
3225 once->arg = arg; 3722 once->arg = arg;
… …
3312 if (types & EV_ASYNC) 3809 if (types & EV_ASYNC)
3313 for (i = asynccnt; i--; ) 3810 for (i = asynccnt; i--; )
3314 cb (EV_A_ EV_ASYNC, asyncs [i]); 3811 cb (EV_A_ EV_ASYNC, asyncs [i]);
3315#endif 3812#endif
3316 3813
3814#if EV_PREPARE_ENABLE
3317 if (types & EV_PREPARE) 3815 if (types & EV_PREPARE)
3318 for (i = preparecnt; i--; ) 3816 for (i = preparecnt; i--; )
3319#if EV_EMBED_ENABLE 3817# if EV_EMBED_ENABLE
3320 if (ev_cb (prepares [i]) != embed_prepare_cb) 3818 if (ev_cb (prepares [i]) != embed_prepare_cb)
3321#endif 3819# endif
3322 cb (EV_A_ EV_PREPARE, prepares [i]); 3820 cb (EV_A_ EV_PREPARE, prepares [i]);
3821#endif
3323 3822
3823#if EV_CHECK_ENABLE
3324 if (types & EV_CHECK) 3824 if (types & EV_CHECK)
3325 for (i = checkcnt; i--; ) 3825 for (i = checkcnt; i--; )
3326 cb (EV_A_ EV_CHECK, checks [i]); 3826 cb (EV_A_ EV_CHECK, checks [i]);
3827#endif
3327 3828
3829#if EV_SIGNAL_ENABLE
3328 if (types & EV_SIGNAL) 3830 if (types & EV_SIGNAL)
3329 for (i = 0; i < signalmax; ++i) 3831 for (i = 0; i < EV_NSIG - 1; ++i)
3330 for (wl = signals [i].head; wl; ) 3832 for (wl = signals [i].head; wl; )
3331 { 3833 {
3332 wn = wl->next; 3834 wn = wl->next;
3333 cb (EV_A_ EV_SIGNAL, wl); 3835 cb (EV_A_ EV_SIGNAL, wl);
3334 wl = wn; 3836 wl = wn;
3335 } 3837 }
3838#endif
3336 3839
3840#if EV_CHILD_ENABLE
3337 if (types & EV_CHILD) 3841 if (types & EV_CHILD)
3338 for (i = EV_PID_HASHSIZE; i--; ) 3842 for (i = (EV_PID_HASHSIZE); i--; )
3339 for (wl = childs [i]; wl; ) 3843 for (wl = childs [i]; wl; )
3340 { 3844 {
3341 wn = wl->next; 3845 wn = wl->next;
3342 cb (EV_A_ EV_CHILD, wl); 3846 cb (EV_A_ EV_CHILD, wl);
3343 wl = wn; 3847 wl = wn;
3344 } 3848 }
3849#endif
3345/* EV_STAT 0x00001000 /* stat data changed */ 3850/* EV_STAT 0x00001000 /* stat data changed */
3346/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3851/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3347} 3852}
3348#endif 3853#endif
3349 3854
3350#if EV_MULTIPLICITY 3855#if EV_MULTIPLICITY
3351 #include "ev_wrap.h" 3856 #include "ev_wrap.h"
3352#endif 3857#endif
3353 3858
3354#ifdef __cplusplus 3859EV_CPP(})
3355}
3356#endif
3357 3860

Diff Legend

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