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

Comparing libev/ev.c (file contents):
Revision 1.290 by root, Mon Jun 29 04:41:34 2009 UTC vs.
Revision 1.358 by root, Sun Oct 24 14:44:40 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
… …
77# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
79# endif 75# endif
80# endif 76# endif
81 77
78# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
85# else 82# else
83# undef EV_USE_NANOSLEEP
86# 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
87# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
88# endif 94# endif
89 95
96# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 98# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 99# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 100# else
101# undef EV_USE_POLL
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif
104# endif 103# endif
105 104
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 106# ifndef EV_USE_EPOLL
109# else 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
112# endif 112# endif
113 113
114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# ifndef EV_USE_KQUEUE 115# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
116# define EV_USE_KQUEUE 1
117# else
118# define EV_USE_KQUEUE 0
119# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
120# endif 121# endif
121 122
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 124# ifndef EV_USE_PORT
125# else 125# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
128# endif 130# endif
129 131
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 133# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
136# endif 139# endif
137 140
141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
138# ifndef EV_USE_EVENTFD 142# ifndef EV_USE_SIGNALFD
139# if HAVE_EVENTFD 143# define EV_USE_SIGNALFD EV_FEATURE_OS
140# define EV_USE_EVENTFD 1
141# else
142# define EV_USE_EVENTFD 0
143# 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
144# endif 157# endif
145 158
146#endif 159#endif
147 160
148#include <math.h> 161#include <math.h>
149#include <stdlib.h> 162#include <stdlib.h>
163#include <string.h>
150#include <fcntl.h> 164#include <fcntl.h>
151#include <stddef.h> 165#include <stddef.h>
152 166
153#include <stdio.h> 167#include <stdio.h>
154 168
155#include <assert.h> 169#include <assert.h>
156#include <errno.h> 170#include <errno.h>
157#include <sys/types.h> 171#include <sys/types.h>
158#include <time.h> 172#include <time.h>
173#include <limits.h>
159 174
160#include <signal.h> 175#include <signal.h>
161 176
162#ifdef EV_H 177#ifdef EV_H
163# include EV_H 178# include EV_H
164#else 179#else
165# include "ev.h" 180# include "ev.h"
166#endif 181#endif
182
183EV_CPP(extern "C" {)
167 184
168#ifndef _WIN32 185#ifndef _WIN32
169# include <sys/time.h> 186# include <sys/time.h>
170# include <sys/wait.h> 187# include <sys/wait.h>
171# include <unistd.h> 188# include <unistd.h>
… …
174# define WIN32_LEAN_AND_MEAN 191# define WIN32_LEAN_AND_MEAN
175# include <windows.h> 192# include <windows.h>
176# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
177# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
178# endif 195# endif
196# undef EV_AVOID_STDIO
179#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
180 206
181/* 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
182 236
183#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
186# else 240# else
187# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
188# endif 242# endif
189#endif 243#endif
190 244
191#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
192# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
193# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
194# else 248# else
195# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
196# endif 250# endif
197#endif 251#endif
198 252
… …
200# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
201#endif 255#endif
202 256
203#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
204# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
205# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
206# else 260# else
207# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
208# endif 262# endif
209#endif 263#endif
210 264
211#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
212# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
213#endif 267#endif
214 268
215#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
216# ifdef _WIN32 270# ifdef _WIN32
217# define EV_USE_POLL 0 271# define EV_USE_POLL 0
218# else 272# else
219# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
220# endif 274# endif
221#endif 275#endif
222 276
223#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
224# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
225# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
226# else 280# else
227# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
228# endif 282# endif
229#endif 283#endif
230 284
… …
236# define EV_USE_PORT 0 290# define EV_USE_PORT 0
237#endif 291#endif
238 292
239#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
240# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
241# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
242# else 296# else
243# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
244# endif 298# endif
245#endif 299#endif
246 300
247#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
248# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
249# define EV_PID_HASHSIZE 1
250# else
251# define EV_PID_HASHSIZE 16
252# endif
253#endif 303#endif
254 304
255#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
256# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
257# define EV_INOTIFY_HASHSIZE 1
258# else
259# define EV_INOTIFY_HASHSIZE 16
260# endif
261#endif 307#endif
262 308
263#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
266# else 312# else
267# 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
268# endif 322# endif
269#endif 323#endif
270 324
271#if 0 /* debugging */ 325#if 0 /* debugging */
272# define EV_VERIFY 3 326# define EV_VERIFY 3
273# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
274# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
275#endif 329#endif
276 330
277#ifndef EV_VERIFY 331#ifndef EV_VERIFY
278# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
279#endif 333#endif
280 334
281#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
282# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
283#endif 337#endif
284 338
285#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
286# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
287#endif
288
289/* this block fixes any misconfiguration where we know we run into trouble otherwise */
290
291#ifndef CLOCK_MONOTONIC
292# undef EV_USE_MONOTONIC
293# define EV_USE_MONOTONIC 0
294#endif
295
296#ifndef CLOCK_REALTIME
297# undef EV_USE_REALTIME
298# define EV_USE_REALTIME 0
299#endif
300
301#if !EV_STAT_ENABLE
302# undef EV_USE_INOTIFY
303# define EV_USE_INOTIFY 0
304#endif
305
306#if !EV_USE_NANOSLEEP
307# ifndef _WIN32
308# include <sys/select.h>
309# endif
310#endif
311
312#if EV_USE_INOTIFY
313# include <sys/utsname.h>
314# include <sys/statfs.h>
315# include <sys/inotify.h>
316/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
317# ifndef IN_DONT_FOLLOW
318# undef EV_USE_INOTIFY
319# define EV_USE_INOTIFY 0
320# endif
321#endif
322
323#if EV_SELECT_IS_WINSOCKET
324# include <winsock.h>
325#endif 341#endif
326 342
327/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 343/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
328/* which makes programs even slower. might work on other unices, too. */ 344/* which makes programs even slower. might work on other unices, too. */
329#if EV_USE_CLOCK_SYSCALL 345#if EV_USE_CLOCK_SYSCALL
… …
336# undef EV_USE_CLOCK_SYSCALL 352# undef EV_USE_CLOCK_SYSCALL
337# define EV_USE_CLOCK_SYSCALL 0 353# define EV_USE_CLOCK_SYSCALL 0
338# endif 354# endif
339#endif 355#endif
340 356
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
364
365#ifndef CLOCK_MONOTONIC
366# undef EV_USE_MONOTONIC
367# define EV_USE_MONOTONIC 0
368#endif
369
370#ifndef CLOCK_REALTIME
371# undef EV_USE_REALTIME
372# define EV_USE_REALTIME 0
373#endif
374
375#if !EV_STAT_ENABLE
376# undef EV_USE_INOTIFY
377# define EV_USE_INOTIFY 0
378#endif
379
380#if !EV_USE_NANOSLEEP
381# ifndef _WIN32
382# include <sys/select.h>
383# endif
384#endif
385
386#if EV_USE_INOTIFY
387# include <sys/statfs.h>
388# include <sys/inotify.h>
389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
390# ifndef IN_DONT_FOLLOW
391# undef EV_USE_INOTIFY
392# define EV_USE_INOTIFY 0
393# endif
394#endif
395
396#if EV_SELECT_IS_WINSOCKET
397# include <winsock.h>
398#endif
399
341#if EV_USE_EVENTFD 400#if EV_USE_EVENTFD
342/* 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 */
343# include <stdint.h> 402# include <stdint.h>
344# ifdef __cplusplus 403# ifndef EFD_NONBLOCK
345extern "C" { 404# define EFD_NONBLOCK O_NONBLOCK
346# endif 405# endif
347int eventfd (unsigned int initval, int flags); 406# ifndef EFD_CLOEXEC
348# ifdef __cplusplus 407# ifdef O_CLOEXEC
349} 408# define EFD_CLOEXEC O_CLOEXEC
409# else
410# define EFD_CLOEXEC 02000000
411# endif
350# 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};
351#endif 436#endif
352 437
353/**/ 438/**/
354 439
355#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
357#else 442#else
358# define EV_FREQUENT_CHECK do { } while (0) 443# define EV_FREQUENT_CHECK do { } while (0)
359#endif 444#endif
360 445
361/* 446/*
… …
368 */ 453 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 455
371#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) */
372#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) */
373/*#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)
374 461
375#if __GNUC__ >= 4 462#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
378#else 465#else
… …
385 472
386#define expect_false(expr) expect ((expr) != 0, 0) 473#define expect_false(expr) expect ((expr) != 0, 0)
387#define expect_true(expr) expect ((expr) != 0, 1) 474#define expect_true(expr) expect ((expr) != 0, 1)
388#define inline_size static inline 475#define inline_size static inline
389 476
390#if EV_MINIMAL 477#if EV_FEATURE_CODE
478# define inline_speed static inline
479#else
391# 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)
392#else 487#else
393# define inline_speed static inline
394#endif
395
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 488# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
489#endif
398 490
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 491#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 492#define EMPTY2(a,b) /* used to suppress some warnings */
401 493
402typedef ev_watcher *W; 494typedef ev_watcher *W;
… …
406#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
407#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
408 500
409#if EV_USE_REALTIME 501#if EV_USE_REALTIME
410/* 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 */
411/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
412static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
413#endif 505#endif
414 506
415#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
416static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
417#endif 509#endif
418 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
419#ifdef _WIN32 521#ifdef _WIN32
420# include "ev_win32.c" 522# include "ev_win32.c"
421#endif 523#endif
422 524
423/*****************************************************************************/ 525/*****************************************************************************/
526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
531static unsigned int noinline
532ev_linux_version (void)
533{
534#ifdef __linux
535 struct utsname buf;
536 unsigned int v;
537 int i;
538 char *p = buf.release;
539
540 if (uname (&buf))
541 return 0;
542
543 for (i = 3+1; --i; )
544 {
545 unsigned int c = 0;
546
547 for (;;)
548 {
549 if (*p >= '0' && *p <= '9')
550 c = c * 10 + *p++ - '0';
551 else
552 {
553 p += *p == '.';
554 break;
555 }
556 }
557
558 v = (v << 8) | c;
559 }
560
561 return v;
562#else
563 return 0;
564#endif
565}
566
567/*****************************************************************************/
568
569#if EV_AVOID_STDIO
570static void noinline
571ev_printerr (const char *msg)
572{
573 write (STDERR_FILENO, msg, strlen (msg));
574}
575#endif
424 576
425static void (*syserr_cb)(const char *msg); 577static void (*syserr_cb)(const char *msg);
426 578
427void 579void
428ev_set_syserr_cb (void (*cb)(const char *msg)) 580ev_set_syserr_cb (void (*cb)(const char *msg))
… …
438 590
439 if (syserr_cb) 591 if (syserr_cb)
440 syserr_cb (msg); 592 syserr_cb (msg);
441 else 593 else
442 { 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
443 perror (msg); 603 perror (msg);
604#endif
444 abort (); 605 abort ();
445 } 606 }
446} 607}
447 608
448static void * 609static void *
449ev_realloc_emul (void *ptr, long size) 610ev_realloc_emul (void *ptr, long size)
450{ 611{
612#if __GLIBC__
613 return realloc (ptr, size);
614#else
451 /* some systems, notably openbsd and darwin, fail to properly 615 /* some systems, notably openbsd and darwin, fail to properly
452 * 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
453 * the single unix specification, so work around them here. 617 * the single unix specification, so work around them here.
454 */ 618 */
455 619
456 if (size) 620 if (size)
457 return realloc (ptr, size); 621 return realloc (ptr, size);
458 622
459 free (ptr); 623 free (ptr);
460 return 0; 624 return 0;
625#endif
461} 626}
462 627
463static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 628static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
464 629
465void 630void
… …
473{ 638{
474 ptr = alloc (ptr, size); 639 ptr = alloc (ptr, size);
475 640
476 if (!ptr && size) 641 if (!ptr && size)
477 { 642 {
643#if EV_AVOID_STDIO
644 ev_printerr ("libev: memory allocation failed, aborting.\n");
645#else
478 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 646 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
647#endif
479 abort (); 648 abort ();
480 } 649 }
481 650
482 return ptr; 651 return ptr;
483} 652}
… …
485#define ev_malloc(size) ev_realloc (0, (size)) 654#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 655#define ev_free(ptr) ev_realloc ((ptr), 0)
487 656
488/*****************************************************************************/ 657/*****************************************************************************/
489 658
659/* set in reify when reification needed */
660#define EV_ANFD_REIFY 1
661
490/* file descriptor info structure */ 662/* file descriptor info structure */
491typedef struct 663typedef struct
492{ 664{
493 WL head; 665 WL head;
494 unsigned char events; /* the events watched for */ 666 unsigned char events; /* the events watched for */
495 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) */
496 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 */
497 unsigned char unused; 669 unsigned char unused;
498#if EV_USE_EPOLL 670#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 672#endif
501#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
502 SOCKET handle; 674 SOCKET handle;
675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
503#endif 678#endif
504} ANFD; 679} ANFD;
505 680
506/* stores the pending event set for a given watcher */ 681/* stores the pending event set for a given watcher */
507typedef struct 682typedef struct
… …
562 737
563 static int ev_default_loop_ptr; 738 static int ev_default_loop_ptr;
564 739
565#endif 740#endif
566 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
567/*****************************************************************************/ 754/*****************************************************************************/
568 755
756#ifndef EV_HAVE_EV_TIME
569ev_tstamp 757ev_tstamp
570ev_time (void) 758ev_time (void)
571{ 759{
572#if EV_USE_REALTIME 760#if EV_USE_REALTIME
573 if (expect_true (have_realtime)) 761 if (expect_true (have_realtime))
… …
580 768
581 struct timeval tv; 769 struct timeval tv;
582 gettimeofday (&tv, 0); 770 gettimeofday (&tv, 0);
583 return tv.tv_sec + tv.tv_usec * 1e-6; 771 return tv.tv_sec + tv.tv_usec * 1e-6;
584} 772}
773#endif
585 774
586inline_size ev_tstamp 775inline_size ev_tstamp
587get_clock (void) 776get_clock (void)
588{ 777{
589#if EV_USE_MONOTONIC 778#if EV_USE_MONOTONIC
… …
612 if (delay > 0.) 801 if (delay > 0.)
613 { 802 {
614#if EV_USE_NANOSLEEP 803#if EV_USE_NANOSLEEP
615 struct timespec ts; 804 struct timespec ts;
616 805
617 ts.tv_sec = (time_t)delay; 806 EV_TS_SET (ts, delay);
618 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
619
620 nanosleep (&ts, 0); 807 nanosleep (&ts, 0);
621#elif defined(_WIN32) 808#elif defined(_WIN32)
622 Sleep ((unsigned long)(delay * 1e3)); 809 Sleep ((unsigned long)(delay * 1e3));
623#else 810#else
624 struct timeval tv; 811 struct timeval tv;
625 812
626 tv.tv_sec = (time_t)delay;
627 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
628
629 /* 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 */
630 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 814 /* something not guaranteed by newer posix versions, but guaranteed */
631 /* by older ones */ 815 /* by older ones */
816 EV_TV_SET (tv, delay);
632 select (0, 0, 0, 0, &tv); 817 select (0, 0, 0, 0, &tv);
633#endif 818#endif
634 } 819 }
635} 820}
636 821
637/*****************************************************************************/ 822/*****************************************************************************/
638 823
639#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 */
640 825
641/* find a suitable new size for the given array, */ 826/* find a suitable new size for the given array, */
642/* hopefully by rounding to a ncie-to-malloc size */ 827/* hopefully by rounding to a nice-to-malloc size */
643inline_size int 828inline_size int
644array_nextsize (int elem, int cur, int cnt) 829array_nextsize (int elem, int cur, int cnt)
645{ 830{
646 int ncur = cur + 1; 831 int ncur = cur + 1;
647 832
… …
743} 928}
744 929
745/*****************************************************************************/ 930/*****************************************************************************/
746 931
747inline_speed void 932inline_speed void
748fd_event (EV_P_ int fd, int revents) 933fd_event_nocheck (EV_P_ int fd, int revents)
749{ 934{
750 ANFD *anfd = anfds + fd; 935 ANFD *anfd = anfds + fd;
751 ev_io *w; 936 ev_io *w;
752 937
753 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)
… …
757 if (ev) 942 if (ev)
758 ev_feed_event (EV_A_ (W)w, ev); 943 ev_feed_event (EV_A_ (W)w, ev);
759 } 944 }
760} 945}
761 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
762void 958void
763ev_feed_fd_event (EV_P_ int fd, int revents) 959ev_feed_fd_event (EV_P_ int fd, int revents)
764{ 960{
765 if (fd >= 0 && fd < anfdmax) 961 if (fd >= 0 && fd < anfdmax)
766 fd_event (EV_A_ fd, revents); 962 fd_event_nocheck (EV_A_ fd, revents);
767} 963}
768 964
769/* make sure the external fd watch events are in-sync */ 965/* make sure the external fd watch events are in-sync */
770/* with the kernel/libev internal state */ 966/* with the kernel/libev internal state */
771inline_size void 967inline_size void
… …
777 { 973 {
778 int fd = fdchanges [i]; 974 int fd = fdchanges [i];
779 ANFD *anfd = anfds + fd; 975 ANFD *anfd = anfds + fd;
780 ev_io *w; 976 ev_io *w;
781 977
782 unsigned char events = 0; 978 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify;
783 980
784 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 981 anfd->reify = 0;
785 events |= (unsigned char)w->events;
786 982
787#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
788 if (events) 984 if (o_reify & EV__IOFDSET)
789 { 985 {
790 unsigned long arg; 986 unsigned long arg;
791 #ifdef EV_FD_TO_WIN32_HANDLE
792 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
793 #else
794 anfd->handle = _get_osfhandle (fd);
795 #endif
796 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
797 } 990 }
798#endif 991#endif
799 992
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
800 { 994 {
801 unsigned char o_events = anfd->events;
802 unsigned char o_reify = anfd->reify;
803
804 anfd->reify = 0;
805 anfd->events = events; 995 anfd->events = 0;
806 996
807 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)
808 backend_modify (EV_A_ fd, o_events, events); 1005 backend_modify (EV_A_ fd, o_events, anfd->events);
809 }
810 } 1006 }
811 1007
812 fdchangecnt = 0; 1008 fdchangecnt = 0;
813} 1009}
814 1010
… …
838 ev_io_stop (EV_A_ w); 1034 ev_io_stop (EV_A_ w);
839 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);
840 } 1036 }
841} 1037}
842 1038
843/* check whether the given fd is atcually valid, for error recovery */ 1039/* check whether the given fd is actually valid, for error recovery */
844inline_size int 1040inline_size int
845fd_valid (int fd) 1041fd_valid (int fd)
846{ 1042{
847#ifdef _WIN32 1043#ifdef _WIN32
848 return _get_osfhandle (fd) != -1; 1044 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
849#else 1045#else
850 return fcntl (fd, F_GETFD) != -1; 1046 return fcntl (fd, F_GETFD) != -1;
851#endif 1047#endif
852} 1048}
853 1049
… …
871 1067
872 for (fd = anfdmax; fd--; ) 1068 for (fd = anfdmax; fd--; )
873 if (anfds [fd].events) 1069 if (anfds [fd].events)
874 { 1070 {
875 fd_kill (EV_A_ fd); 1071 fd_kill (EV_A_ fd);
876 return; 1072 break;
877 } 1073 }
878} 1074}
879 1075
880/* 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 */
881static void noinline 1077static void noinline
… …
886 for (fd = 0; fd < anfdmax; ++fd) 1082 for (fd = 0; fd < anfdmax; ++fd)
887 if (anfds [fd].events) 1083 if (anfds [fd].events)
888 { 1084 {
889 anfds [fd].events = 0; 1085 anfds [fd].events = 0;
890 anfds [fd].emask = 0; 1086 anfds [fd].emask = 0;
891 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1087 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
892 } 1088 }
893} 1089}
894 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
895/*****************************************************************************/ 1105/*****************************************************************************/
896 1106
897/* 1107/*
898 * 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
899 * 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
900 * the branching factor of the d-tree. 1110 * the branching factor of the d-tree.
901 */ 1111 */
902 1112
903/* 1113/*
… …
971 1181
972 for (;;) 1182 for (;;)
973 { 1183 {
974 int c = k << 1; 1184 int c = k << 1;
975 1185
976 if (c > N + HEAP0 - 1) 1186 if (c >= N + HEAP0)
977 break; 1187 break;
978 1188
979 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])
980 ? 1 : 0; 1190 ? 1 : 0;
981 1191
… …
1017 1227
1018/* move an element suitably so it is in a correct place */ 1228/* move an element suitably so it is in a correct place */
1019inline_size void 1229inline_size void
1020adjustheap (ANHE *heap, int N, int k) 1230adjustheap (ANHE *heap, int N, int k)
1021{ 1231{
1022 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)]))
1023 upheap (heap, k); 1233 upheap (heap, k);
1024 else 1234 else
1025 downheap (heap, N, k); 1235 downheap (heap, N, k);
1026} 1236}
1027 1237
… …
1040/*****************************************************************************/ 1250/*****************************************************************************/
1041 1251
1042/* associate signal watchers to a signal signal */ 1252/* associate signal watchers to a signal signal */
1043typedef struct 1253typedef struct
1044{ 1254{
1255 EV_ATOMIC_T pending;
1256#if EV_MULTIPLICITY
1257 EV_P;
1258#endif
1045 WL head; 1259 WL head;
1046 EV_ATOMIC_T gotsig;
1047} ANSIG; 1260} ANSIG;
1048 1261
1049static ANSIG *signals; 1262static ANSIG signals [EV_NSIG - 1];
1050static int signalmax;
1051
1052static EV_ATOMIC_T gotsig;
1053 1263
1054/*****************************************************************************/ 1264/*****************************************************************************/
1055 1265
1056/* used to prepare libev internal fd's */ 1266#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1057/* this is not fork-safe */
1058inline_speed void
1059fd_intern (int fd)
1060{
1061#ifdef _WIN32
1062 unsigned long arg = 1;
1063 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1064#else
1065 fcntl (fd, F_SETFD, FD_CLOEXEC);
1066 fcntl (fd, F_SETFL, O_NONBLOCK);
1067#endif
1068}
1069 1267
1070static void noinline 1268static void noinline
1071evpipe_init (EV_P) 1269evpipe_init (EV_P)
1072{ 1270{
1073 if (!ev_is_active (&pipe_w)) 1271 if (!ev_is_active (&pipe_w))
1074 { 1272 {
1075#if EV_USE_EVENTFD 1273# if EV_USE_EVENTFD
1274 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1275 if (evfd < 0 && errno == EINVAL)
1076 if ((evfd = eventfd (0, 0)) >= 0) 1276 evfd = eventfd (0, 0);
1277
1278 if (evfd >= 0)
1077 { 1279 {
1078 evpipe [0] = -1; 1280 evpipe [0] = -1;
1079 fd_intern (evfd); 1281 fd_intern (evfd); /* doing it twice doesn't hurt */
1080 ev_io_set (&pipe_w, evfd, EV_READ); 1282 ev_io_set (&pipe_w, evfd, EV_READ);
1081 } 1283 }
1082 else 1284 else
1083#endif 1285# endif
1084 { 1286 {
1085 while (pipe (evpipe)) 1287 while (pipe (evpipe))
1086 ev_syserr ("(libev) error creating signal/async pipe"); 1288 ev_syserr ("(libev) error creating signal/async pipe");
1087 1289
1088 fd_intern (evpipe [0]); 1290 fd_intern (evpipe [0]);
… …
1099evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1301evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1100{ 1302{
1101 if (!*flag) 1303 if (!*flag)
1102 { 1304 {
1103 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;
1104 1307
1105 *flag = 1; 1308 *flag = 1;
1106 1309
1107#if EV_USE_EVENTFD 1310#if EV_USE_EVENTFD
1108 if (evfd >= 0) 1311 if (evfd >= 0)
… …
1110 uint64_t counter = 1; 1313 uint64_t counter = 1;
1111 write (evfd, &counter, sizeof (uint64_t)); 1314 write (evfd, &counter, sizeof (uint64_t));
1112 } 1315 }
1113 else 1316 else
1114#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. */
1115 write (evpipe [1], &old_errno, 1); 1323 write (evpipe [1], &dummy, 1);
1116 1324
1117 errno = old_errno; 1325 errno = old_errno;
1118 } 1326 }
1119} 1327}
1120 1328
1121/* called whenever the libev signal pipe */ 1329/* called whenever the libev signal pipe */
1122/* got some events (signal, async) */ 1330/* got some events (signal, async) */
1123static void 1331static void
1124pipecb (EV_P_ ev_io *iow, int revents) 1332pipecb (EV_P_ ev_io *iow, int revents)
1125{ 1333{
1334 int i;
1335
1126#if EV_USE_EVENTFD 1336#if EV_USE_EVENTFD
1127 if (evfd >= 0) 1337 if (evfd >= 0)
1128 { 1338 {
1129 uint64_t counter; 1339 uint64_t counter;
1130 read (evfd, &counter, sizeof (uint64_t)); 1340 read (evfd, &counter, sizeof (uint64_t));
1131 } 1341 }
1132 else 1342 else
1133#endif 1343#endif
1134 { 1344 {
1135 char dummy; 1345 char dummy;
1346 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1136 read (evpipe [0], &dummy, 1); 1347 read (evpipe [0], &dummy, 1);
1137 } 1348 }
1138 1349
1139 if (gotsig && ev_is_default_loop (EV_A)) 1350 if (sig_pending)
1140 { 1351 {
1141 int signum; 1352 sig_pending = 0;
1142 gotsig = 0;
1143 1353
1144 for (signum = signalmax; signum--; ) 1354 for (i = EV_NSIG - 1; i--; )
1145 if (signals [signum].gotsig) 1355 if (expect_false (signals [i].pending))
1146 ev_feed_signal_event (EV_A_ signum + 1); 1356 ev_feed_signal_event (EV_A_ i + 1);
1147 } 1357 }
1148 1358
1149#if EV_ASYNC_ENABLE 1359#if EV_ASYNC_ENABLE
1150 if (gotasync) 1360 if (async_pending)
1151 { 1361 {
1152 int i; 1362 async_pending = 0;
1153 gotasync = 0;
1154 1363
1155 for (i = asynccnt; i--; ) 1364 for (i = asynccnt; i--; )
1156 if (asyncs [i]->sent) 1365 if (asyncs [i]->sent)
1157 { 1366 {
1158 asyncs [i]->sent = 0; 1367 asyncs [i]->sent = 0;
… …
1166 1375
1167static void 1376static void
1168ev_sighandler (int signum) 1377ev_sighandler (int signum)
1169{ 1378{
1170#if EV_MULTIPLICITY 1379#if EV_MULTIPLICITY
1171 struct ev_loop *loop = &default_loop_struct; 1380 EV_P = signals [signum - 1].loop;
1172#endif 1381#endif
1173 1382
1174#if _WIN32 1383#ifdef _WIN32
1175 signal (signum, ev_sighandler); 1384 signal (signum, ev_sighandler);
1176#endif 1385#endif
1177 1386
1178 signals [signum - 1].gotsig = 1; 1387 signals [signum - 1].pending = 1;
1179 evpipe_write (EV_A_ &gotsig); 1388 evpipe_write (EV_A_ &sig_pending);
1180} 1389}
1181 1390
1182void noinline 1391void noinline
1183ev_feed_signal_event (EV_P_ int signum) 1392ev_feed_signal_event (EV_P_ int signum)
1184{ 1393{
1185 WL w; 1394 WL w;
1186 1395
1396 if (expect_false (signum <= 0 || signum > EV_NSIG))
1397 return;
1398
1399 --signum;
1400
1187#if EV_MULTIPLICITY 1401#if EV_MULTIPLICITY
1188 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 */
1189#endif 1403 /* or, likely more useful, feeding a signal nobody is waiting for */
1190 1404
1191 --signum; 1405 if (expect_false (signals [signum].loop != EV_A))
1192
1193 if (signum < 0 || signum >= signalmax)
1194 return; 1406 return;
1407#endif
1195 1408
1196 signals [signum].gotsig = 0; 1409 signals [signum].pending = 0;
1197 1410
1198 for (w = signals [signum].head; w; w = w->next) 1411 for (w = signals [signum].head; w; w = w->next)
1199 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1412 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1200} 1413}
1201 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
1202/*****************************************************************************/ 1437/*****************************************************************************/
1203 1438
1439#if EV_CHILD_ENABLE
1204static WL childs [EV_PID_HASHSIZE]; 1440static WL childs [EV_PID_HASHSIZE];
1205
1206#ifndef _WIN32
1207 1441
1208static ev_signal childev; 1442static ev_signal childev;
1209 1443
1210#ifndef WIFCONTINUED 1444#ifndef WIFCONTINUED
1211# define WIFCONTINUED(status) 0 1445# define WIFCONTINUED(status) 0
… …
1216child_reap (EV_P_ int chain, int pid, int status) 1450child_reap (EV_P_ int chain, int pid, int status)
1217{ 1451{
1218 ev_child *w; 1452 ev_child *w;
1219 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1453 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1220 1454
1221 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)
1222 { 1456 {
1223 if ((w->pid == pid || !w->pid) 1457 if ((w->pid == pid || !w->pid)
1224 && (!traced || (w->flags & 1))) 1458 && (!traced || (w->flags & 1)))
1225 { 1459 {
1226 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 */
… …
1251 /* 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 */
1252 /* 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 */
1253 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1487 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1254 1488
1255 child_reap (EV_A_ pid, pid, status); 1489 child_reap (EV_A_ pid, pid, status);
1256 if (EV_PID_HASHSIZE > 1) 1490 if ((EV_PID_HASHSIZE) > 1)
1257 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 */
1258} 1492}
1259 1493
1260#endif 1494#endif
1261 1495
1262/*****************************************************************************/ 1496/*****************************************************************************/
1263 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1264#if EV_USE_PORT 1501#if EV_USE_PORT
1265# include "ev_port.c" 1502# include "ev_port.c"
1266#endif 1503#endif
1267#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1268# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1328#ifdef __APPLE__ 1565#ifdef __APPLE__
1329 /* only select works correctly on that "unix-certified" platform */ 1566 /* only select works correctly on that "unix-certified" platform */
1330 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1567 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1331 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 */
1332#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
1333 1573
1334 return flags; 1574 return flags;
1335} 1575}
1336 1576
1337unsigned int 1577unsigned int
1338ev_embeddable_backends (void) 1578ev_embeddable_backends (void)
1339{ 1579{
1340 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1580 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1341 1581
1342 /* 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 */
1343 /* please fix it and tell me how to detect the fix */ 1583 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1344 flags &= ~EVBACKEND_EPOLL; 1584 flags &= ~EVBACKEND_EPOLL;
1345 1585
1346 return flags; 1586 return flags;
1347} 1587}
1348 1588
1349unsigned int 1589unsigned int
1350ev_backend (EV_P) 1590ev_backend (EV_P)
1351{ 1591{
1352 return backend; 1592 return backend;
1353} 1593}
1354 1594
1595#if EV_FEATURE_API
1355unsigned int 1596unsigned int
1356ev_loop_count (EV_P) 1597ev_iteration (EV_P)
1357{ 1598{
1358 return loop_count; 1599 return loop_count;
1359} 1600}
1360 1601
1602unsigned int
1603ev_depth (EV_P)
1604{
1605 return loop_depth;
1606}
1607
1361void 1608void
1362ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1609ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1363{ 1610{
1364 io_blocktime = interval; 1611 io_blocktime = interval;
1365} 1612}
… …
1367void 1614void
1368ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1615ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1369{ 1616{
1370 timeout_blocktime = interval; 1617 timeout_blocktime = interval;
1371} 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
1372 1643
1373/* initialise a loop structure, must be zero-initialised */ 1644/* initialise a loop structure, must be zero-initialised */
1374static void noinline 1645static void noinline
1375loop_init (EV_P_ unsigned int flags) 1646loop_init (EV_P_ unsigned int flags)
1376{ 1647{
… …
1394 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1665 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1395 have_monotonic = 1; 1666 have_monotonic = 1;
1396 } 1667 }
1397#endif 1668#endif
1398 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
1399 ev_rt_now = ev_time (); 1681 ev_rt_now = ev_time ();
1400 mn_now = get_clock (); 1682 mn_now = get_clock ();
1401 now_floor = mn_now; 1683 now_floor = mn_now;
1402 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
1403 1688
1404 io_blocktime = 0.; 1689 io_blocktime = 0.;
1405 timeout_blocktime = 0.; 1690 timeout_blocktime = 0.;
1406 backend = 0; 1691 backend = 0;
1407 backend_fd = -1; 1692 backend_fd = -1;
1408 gotasync = 0; 1693 sig_pending = 0;
1694#if EV_ASYNC_ENABLE
1695 async_pending = 0;
1696#endif
1409#if EV_USE_INOTIFY 1697#if EV_USE_INOTIFY
1410 fs_fd = -2; 1698 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1411#endif 1699#endif
1412 1700#if EV_USE_SIGNALFD
1413 /* pid check not overridable via env */ 1701 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1414#ifndef _WIN32
1415 if (flags & EVFLAG_FORKCHECK)
1416 curpid = getpid ();
1417#endif 1702#endif
1418
1419 if (!(flags & EVFLAG_NOENV)
1420 && !enable_secure ()
1421 && getenv ("LIBEV_FLAGS"))
1422 flags = atoi (getenv ("LIBEV_FLAGS"));
1423 1703
1424 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1425 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1426 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1427#if EV_USE_PORT 1710#if EV_USE_PORT
1428 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1429#endif 1712#endif
1430#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1431 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1440 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1723 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1441#endif 1724#endif
1442 1725
1443 ev_prepare_init (&pending_w, pendingcb); 1726 ev_prepare_init (&pending_w, pendingcb);
1444 1727
1728#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1445 ev_init (&pipe_w, pipecb); 1729 ev_init (&pipe_w, pipecb);
1446 ev_set_priority (&pipe_w, EV_MAXPRI); 1730 ev_set_priority (&pipe_w, EV_MAXPRI);
1731#endif
1447 } 1732 }
1448} 1733}
1449 1734
1450/* free up a loop structure */ 1735/* free up a loop structure */
1451static void noinline 1736static void noinline
… …
1453{ 1738{
1454 int i; 1739 int i;
1455 1740
1456 if (ev_is_active (&pipe_w)) 1741 if (ev_is_active (&pipe_w))
1457 { 1742 {
1458 ev_ref (EV_A); /* signal watcher */ 1743 /*ev_ref (EV_A);*/
1459 ev_io_stop (EV_A_ &pipe_w); 1744 /*ev_io_stop (EV_A_ &pipe_w);*/
1460 1745
1461#if EV_USE_EVENTFD 1746#if EV_USE_EVENTFD
1462 if (evfd >= 0) 1747 if (evfd >= 0)
1463 close (evfd); 1748 close (evfd);
1464#endif 1749#endif
1465 1750
1466 if (evpipe [0] >= 0) 1751 if (evpipe [0] >= 0)
1467 { 1752 {
1468 close (evpipe [0]); 1753 EV_WIN32_CLOSE_FD (evpipe [0]);
1469 close (evpipe [1]); 1754 EV_WIN32_CLOSE_FD (evpipe [1]);
1470 } 1755 }
1471 } 1756 }
1757
1758#if EV_USE_SIGNALFD
1759 if (ev_is_active (&sigfd_w))
1760 close (sigfd);
1761#endif
1472 1762
1473#if EV_USE_INOTIFY 1763#if EV_USE_INOTIFY
1474 if (fs_fd >= 0) 1764 if (fs_fd >= 0)
1475 close (fs_fd); 1765 close (fs_fd);
1476#endif 1766#endif
1477 1767
1478 if (backend_fd >= 0) 1768 if (backend_fd >= 0)
1479 close (backend_fd); 1769 close (backend_fd);
1480 1770
1771#if EV_USE_IOCP
1772 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1773#endif
1481#if EV_USE_PORT 1774#if EV_USE_PORT
1482 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1775 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1483#endif 1776#endif
1484#if EV_USE_KQUEUE 1777#if EV_USE_KQUEUE
1485 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1778 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1500#if EV_IDLE_ENABLE 1793#if EV_IDLE_ENABLE
1501 array_free (idle, [i]); 1794 array_free (idle, [i]);
1502#endif 1795#endif
1503 } 1796 }
1504 1797
1505 ev_free (anfds); anfdmax = 0; 1798 ev_free (anfds); anfds = 0; anfdmax = 0;
1506 1799
1507 /* have to use the microsoft-never-gets-it-right macro */ 1800 /* have to use the microsoft-never-gets-it-right macro */
1508 array_free (rfeed, EMPTY); 1801 array_free (rfeed, EMPTY);
1509 array_free (fdchange, EMPTY); 1802 array_free (fdchange, EMPTY);
1510 array_free (timer, EMPTY); 1803 array_free (timer, EMPTY);
… …
1545 1838
1546 if (ev_is_active (&pipe_w)) 1839 if (ev_is_active (&pipe_w))
1547 { 1840 {
1548 /* this "locks" the handlers against writing to the pipe */ 1841 /* this "locks" the handlers against writing to the pipe */
1549 /* while we modify the fd vars */ 1842 /* while we modify the fd vars */
1550 gotsig = 1; 1843 sig_pending = 1;
1551#if EV_ASYNC_ENABLE 1844#if EV_ASYNC_ENABLE
1552 gotasync = 1; 1845 async_pending = 1;
1553#endif 1846#endif
1554 1847
1555 ev_ref (EV_A); 1848 ev_ref (EV_A);
1556 ev_io_stop (EV_A_ &pipe_w); 1849 ev_io_stop (EV_A_ &pipe_w);
1557 1850
… …
1560 close (evfd); 1853 close (evfd);
1561#endif 1854#endif
1562 1855
1563 if (evpipe [0] >= 0) 1856 if (evpipe [0] >= 0)
1564 { 1857 {
1565 close (evpipe [0]); 1858 EV_WIN32_CLOSE_FD (evpipe [0]);
1566 close (evpipe [1]); 1859 EV_WIN32_CLOSE_FD (evpipe [1]);
1567 } 1860 }
1568 1861
1862#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1569 evpipe_init (EV_A); 1863 evpipe_init (EV_A);
1570 /* now iterate over everything, in case we missed something */ 1864 /* now iterate over everything, in case we missed something */
1571 pipecb (EV_A_ &pipe_w, EV_READ); 1865 pipecb (EV_A_ &pipe_w, EV_READ);
1866#endif
1572 } 1867 }
1573 1868
1574 postfork = 0; 1869 postfork = 0;
1575} 1870}
1576 1871
1577#if EV_MULTIPLICITY 1872#if EV_MULTIPLICITY
1578 1873
1579struct ev_loop * 1874struct ev_loop *
1580ev_loop_new (unsigned int flags) 1875ev_loop_new (unsigned int flags)
1581{ 1876{
1582 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1877 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1583 1878
1584 memset (loop, 0, sizeof (struct ev_loop)); 1879 memset (EV_A, 0, sizeof (struct ev_loop));
1585
1586 loop_init (EV_A_ flags); 1880 loop_init (EV_A_ flags);
1587 1881
1588 if (ev_backend (EV_A)) 1882 if (ev_backend (EV_A))
1589 return loop; 1883 return EV_A;
1590 1884
1591 return 0; 1885 return 0;
1592} 1886}
1593 1887
1594void 1888void
… …
1601void 1895void
1602ev_loop_fork (EV_P) 1896ev_loop_fork (EV_P)
1603{ 1897{
1604 postfork = 1; /* must be in line with ev_default_fork */ 1898 postfork = 1; /* must be in line with ev_default_fork */
1605} 1899}
1900#endif /* multiplicity */
1606 1901
1607#if EV_VERIFY 1902#if EV_VERIFY
1608static void noinline 1903static void noinline
1609verify_watcher (EV_P_ W w) 1904verify_watcher (EV_P_ W w)
1610{ 1905{
… …
1638 verify_watcher (EV_A_ ws [cnt]); 1933 verify_watcher (EV_A_ ws [cnt]);
1639 } 1934 }
1640} 1935}
1641#endif 1936#endif
1642 1937
1938#if EV_FEATURE_API
1643void 1939void
1644ev_loop_verify (EV_P) 1940ev_verify (EV_P)
1645{ 1941{
1646#if EV_VERIFY 1942#if EV_VERIFY
1647 int i; 1943 int i;
1648 WL w; 1944 WL w;
1649 1945
… …
1688#if EV_ASYNC_ENABLE 1984#if EV_ASYNC_ENABLE
1689 assert (asyncmax >= asynccnt); 1985 assert (asyncmax >= asynccnt);
1690 array_verify (EV_A_ (W *)asyncs, asynccnt); 1986 array_verify (EV_A_ (W *)asyncs, asynccnt);
1691#endif 1987#endif
1692 1988
1989#if EV_PREPARE_ENABLE
1693 assert (preparemax >= preparecnt); 1990 assert (preparemax >= preparecnt);
1694 array_verify (EV_A_ (W *)prepares, preparecnt); 1991 array_verify (EV_A_ (W *)prepares, preparecnt);
1992#endif
1695 1993
1994#if EV_CHECK_ENABLE
1696 assert (checkmax >= checkcnt); 1995 assert (checkmax >= checkcnt);
1697 array_verify (EV_A_ (W *)checks, checkcnt); 1996 array_verify (EV_A_ (W *)checks, checkcnt);
1997#endif
1698 1998
1699# if 0 1999# if 0
2000#if EV_CHILD_ENABLE
1700 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2001 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1701 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 2002 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2003#endif
1702# endif 2004# endif
1703#endif 2005#endif
1704} 2006}
1705 2007#endif
1706#endif /* multiplicity */
1707 2008
1708#if EV_MULTIPLICITY 2009#if EV_MULTIPLICITY
1709struct ev_loop * 2010struct ev_loop *
1710ev_default_loop_init (unsigned int flags)
1711#else 2011#else
1712int 2012int
2013#endif
1713ev_default_loop (unsigned int flags) 2014ev_default_loop (unsigned int flags)
1714#endif
1715{ 2015{
1716 if (!ev_default_loop_ptr) 2016 if (!ev_default_loop_ptr)
1717 { 2017 {
1718#if EV_MULTIPLICITY 2018#if EV_MULTIPLICITY
1719 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2019 EV_P = ev_default_loop_ptr = &default_loop_struct;
1720#else 2020#else
1721 ev_default_loop_ptr = 1; 2021 ev_default_loop_ptr = 1;
1722#endif 2022#endif
1723 2023
1724 loop_init (EV_A_ flags); 2024 loop_init (EV_A_ flags);
1725 2025
1726 if (ev_backend (EV_A)) 2026 if (ev_backend (EV_A))
1727 { 2027 {
1728#ifndef _WIN32 2028#if EV_CHILD_ENABLE
1729 ev_signal_init (&childev, childcb, SIGCHLD); 2029 ev_signal_init (&childev, childcb, SIGCHLD);
1730 ev_set_priority (&childev, EV_MAXPRI); 2030 ev_set_priority (&childev, EV_MAXPRI);
1731 ev_signal_start (EV_A_ &childev); 2031 ev_signal_start (EV_A_ &childev);
1732 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2032 ev_unref (EV_A); /* child watcher should not keep loop alive */
1733#endif 2033#endif
… …
1741 2041
1742void 2042void
1743ev_default_destroy (void) 2043ev_default_destroy (void)
1744{ 2044{
1745#if EV_MULTIPLICITY 2045#if EV_MULTIPLICITY
1746 struct ev_loop *loop = ev_default_loop_ptr; 2046 EV_P = ev_default_loop_ptr;
1747#endif 2047#endif
1748 2048
1749 ev_default_loop_ptr = 0; 2049 ev_default_loop_ptr = 0;
1750 2050
1751#ifndef _WIN32 2051#if EV_CHILD_ENABLE
1752 ev_ref (EV_A); /* child watcher */ 2052 ev_ref (EV_A); /* child watcher */
1753 ev_signal_stop (EV_A_ &childev); 2053 ev_signal_stop (EV_A_ &childev);
1754#endif 2054#endif
1755 2055
1756 loop_destroy (EV_A); 2056 loop_destroy (EV_A);
… …
1758 2058
1759void 2059void
1760ev_default_fork (void) 2060ev_default_fork (void)
1761{ 2061{
1762#if EV_MULTIPLICITY 2062#if EV_MULTIPLICITY
1763 struct ev_loop *loop = ev_default_loop_ptr; 2063 EV_P = ev_default_loop_ptr;
1764#endif 2064#endif
1765 2065
1766 postfork = 1; /* must be in line with ev_loop_fork */ 2066 postfork = 1; /* must be in line with ev_loop_fork */
1767} 2067}
1768 2068
… …
1772ev_invoke (EV_P_ void *w, int revents) 2072ev_invoke (EV_P_ void *w, int revents)
1773{ 2073{
1774 EV_CB_INVOKE ((W)w, revents); 2074 EV_CB_INVOKE ((W)w, revents);
1775} 2075}
1776 2076
1777inline_speed void 2077unsigned int
1778call_pending (EV_P) 2078ev_pending_count (EV_P)
2079{
2080 int pri;
2081 unsigned int count = 0;
2082
2083 for (pri = NUMPRI; pri--; )
2084 count += pendingcnt [pri];
2085
2086 return count;
2087}
2088
2089void noinline
2090ev_invoke_pending (EV_P)
1779{ 2091{
1780 int pri; 2092 int pri;
1781 2093
1782 for (pri = NUMPRI; pri--; ) 2094 for (pri = NUMPRI; pri--; )
1783 while (pendingcnt [pri]) 2095 while (pendingcnt [pri])
… …
1850 EV_FREQUENT_CHECK; 2162 EV_FREQUENT_CHECK;
1851 feed_reverse (EV_A_ (W)w); 2163 feed_reverse (EV_A_ (W)w);
1852 } 2164 }
1853 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2165 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1854 2166
1855 feed_reverse_done (EV_A_ EV_TIMEOUT); 2167 feed_reverse_done (EV_A_ EV_TIMER);
1856 } 2168 }
1857} 2169}
1858 2170
1859#if EV_PERIODIC_ENABLE 2171#if EV_PERIODIC_ENABLE
1860/* make periodics pending */ 2172/* make periodics pending */
… …
1913 feed_reverse_done (EV_A_ EV_PERIODIC); 2225 feed_reverse_done (EV_A_ EV_PERIODIC);
1914 } 2226 }
1915} 2227}
1916 2228
1917/* simply recalculate all periodics */ 2229/* simply recalculate all periodics */
1918/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2230/* TODO: maybe ensure that at least one event happens when jumping forward? */
1919static void noinline 2231static void noinline
1920periodics_reschedule (EV_P) 2232periodics_reschedule (EV_P)
1921{ 2233{
1922 int i; 2234 int i;
1923 2235
… …
1951 ANHE_at_cache (*he); 2263 ANHE_at_cache (*he);
1952 } 2264 }
1953} 2265}
1954 2266
1955/* fetch new monotonic and realtime times from the kernel */ 2267/* fetch new monotonic and realtime times from the kernel */
1956/* also detetc if there was a timejump, and act accordingly */ 2268/* also detect if there was a timejump, and act accordingly */
1957inline_speed void 2269inline_speed void
1958time_update (EV_P_ ev_tstamp max_block) 2270time_update (EV_P_ ev_tstamp max_block)
1959{ 2271{
1960#if EV_USE_MONOTONIC 2272#if EV_USE_MONOTONIC
1961 if (expect_true (have_monotonic)) 2273 if (expect_true (have_monotonic))
… …
2018 2330
2019 mn_now = ev_rt_now; 2331 mn_now = ev_rt_now;
2020 } 2332 }
2021} 2333}
2022 2334
2023static int loop_done;
2024
2025void 2335void
2026ev_loop (EV_P_ int flags) 2336ev_run (EV_P_ int flags)
2027{ 2337{
2338#if EV_FEATURE_API
2339 ++loop_depth;
2340#endif
2341
2342 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2343
2028 loop_done = EVUNLOOP_CANCEL; 2344 loop_done = EVBREAK_CANCEL;
2029 2345
2030 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2346 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2031 2347
2032 do 2348 do
2033 { 2349 {
2034#if EV_VERIFY >= 2 2350#if EV_VERIFY >= 2
2035 ev_loop_verify (EV_A); 2351 ev_verify (EV_A);
2036#endif 2352#endif
2037 2353
2038#ifndef _WIN32 2354#ifndef _WIN32
2039 if (expect_false (curpid)) /* penalise the forking check even more */ 2355 if (expect_false (curpid)) /* penalise the forking check even more */
2040 if (expect_false (getpid () != curpid)) 2356 if (expect_false (getpid () != curpid))
… …
2048 /* we might have forked, so queue fork handlers */ 2364 /* we might have forked, so queue fork handlers */
2049 if (expect_false (postfork)) 2365 if (expect_false (postfork))
2050 if (forkcnt) 2366 if (forkcnt)
2051 { 2367 {
2052 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2368 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2053 call_pending (EV_A); 2369 EV_INVOKE_PENDING;
2054 } 2370 }
2055#endif 2371#endif
2056 2372
2373#if EV_PREPARE_ENABLE
2057 /* queue prepare watchers (and execute them) */ 2374 /* queue prepare watchers (and execute them) */
2058 if (expect_false (preparecnt)) 2375 if (expect_false (preparecnt))
2059 { 2376 {
2060 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2377 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2061 call_pending (EV_A); 2378 EV_INVOKE_PENDING;
2062 } 2379 }
2380#endif
2381
2382 if (expect_false (loop_done))
2383 break;
2063 2384
2064 /* we might have forked, so reify kernel state if necessary */ 2385 /* we might have forked, so reify kernel state if necessary */
2065 if (expect_false (postfork)) 2386 if (expect_false (postfork))
2066 loop_fork (EV_A); 2387 loop_fork (EV_A);
2067 2388
… …
2071 /* calculate blocking time */ 2392 /* calculate blocking time */
2072 { 2393 {
2073 ev_tstamp waittime = 0.; 2394 ev_tstamp waittime = 0.;
2074 ev_tstamp sleeptime = 0.; 2395 ev_tstamp sleeptime = 0.;
2075 2396
2397 /* remember old timestamp for io_blocktime calculation */
2398 ev_tstamp prev_mn_now = mn_now;
2399
2400 /* update time to cancel out callback processing overhead */
2401 time_update (EV_A_ 1e100);
2402
2076 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2403 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2077 { 2404 {
2078 /* update time to cancel out callback processing overhead */
2079 time_update (EV_A_ 1e100);
2080
2081 waittime = MAX_BLOCKTIME; 2405 waittime = MAX_BLOCKTIME;
2082 2406
2083 if (timercnt) 2407 if (timercnt)
2084 { 2408 {
2085 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2409 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2092 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2416 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2093 if (waittime > to) waittime = to; 2417 if (waittime > to) waittime = to;
2094 } 2418 }
2095#endif 2419#endif
2096 2420
2421 /* don't let timeouts decrease the waittime below timeout_blocktime */
2097 if (expect_false (waittime < timeout_blocktime)) 2422 if (expect_false (waittime < timeout_blocktime))
2098 waittime = timeout_blocktime; 2423 waittime = timeout_blocktime;
2099 2424
2100 sleeptime = waittime - backend_fudge; 2425 /* extra check because io_blocktime is commonly 0 */
2101
2102 if (expect_true (sleeptime > io_blocktime)) 2426 if (expect_false (io_blocktime))
2103 sleeptime = io_blocktime;
2104
2105 if (sleeptime)
2106 { 2427 {
2428 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2429
2430 if (sleeptime > waittime - backend_fudge)
2431 sleeptime = waittime - backend_fudge;
2432
2433 if (expect_true (sleeptime > 0.))
2434 {
2107 ev_sleep (sleeptime); 2435 ev_sleep (sleeptime);
2108 waittime -= sleeptime; 2436 waittime -= sleeptime;
2437 }
2109 } 2438 }
2110 } 2439 }
2111 2440
2441#if EV_FEATURE_API
2112 ++loop_count; 2442 ++loop_count;
2443#endif
2444 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2113 backend_poll (EV_A_ waittime); 2445 backend_poll (EV_A_ waittime);
2446 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2114 2447
2115 /* update ev_rt_now, do magic */ 2448 /* update ev_rt_now, do magic */
2116 time_update (EV_A_ waittime + sleeptime); 2449 time_update (EV_A_ waittime + sleeptime);
2117 } 2450 }
2118 2451
… …
2125#if EV_IDLE_ENABLE 2458#if EV_IDLE_ENABLE
2126 /* queue idle watchers unless other events are pending */ 2459 /* queue idle watchers unless other events are pending */
2127 idle_reify (EV_A); 2460 idle_reify (EV_A);
2128#endif 2461#endif
2129 2462
2463#if EV_CHECK_ENABLE
2130 /* queue check watchers, to be executed first */ 2464 /* queue check watchers, to be executed first */
2131 if (expect_false (checkcnt)) 2465 if (expect_false (checkcnt))
2132 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2466 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2467#endif
2133 2468
2134 call_pending (EV_A); 2469 EV_INVOKE_PENDING;
2135 } 2470 }
2136 while (expect_true ( 2471 while (expect_true (
2137 activecnt 2472 activecnt
2138 && !loop_done 2473 && !loop_done
2139 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2474 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2140 )); 2475 ));
2141 2476
2142 if (loop_done == EVUNLOOP_ONE) 2477 if (loop_done == EVBREAK_ONE)
2143 loop_done = EVUNLOOP_CANCEL; 2478 loop_done = EVBREAK_CANCEL;
2144}
2145 2479
2480#if EV_FEATURE_API
2481 --loop_depth;
2482#endif
2483}
2484
2146void 2485void
2147ev_unloop (EV_P_ int how) 2486ev_break (EV_P_ int how)
2148{ 2487{
2149 loop_done = how; 2488 loop_done = how;
2150} 2489}
2151 2490
2152void 2491void
… …
2199inline_size void 2538inline_size void
2200wlist_del (WL *head, WL elem) 2539wlist_del (WL *head, WL elem)
2201{ 2540{
2202 while (*head) 2541 while (*head)
2203 { 2542 {
2204 if (*head == elem) 2543 if (expect_true (*head == elem))
2205 { 2544 {
2206 *head = elem->next; 2545 *head = elem->next;
2207 return; 2546 break;
2208 } 2547 }
2209 2548
2210 head = &(*head)->next; 2549 head = &(*head)->next;
2211 } 2550 }
2212} 2551}
… …
2240} 2579}
2241 2580
2242inline_size void 2581inline_size void
2243pri_adjust (EV_P_ W w) 2582pri_adjust (EV_P_ W w)
2244{ 2583{
2245 int pri = w->priority; 2584 int pri = ev_priority (w);
2246 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2585 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2247 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2586 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2248 w->priority = pri; 2587 ev_set_priority (w, pri);
2249} 2588}
2250 2589
2251inline_speed void 2590inline_speed void
2252ev_start (EV_P_ W w, int active) 2591ev_start (EV_P_ W w, int active)
2253{ 2592{
… …
2272 2611
2273 if (expect_false (ev_is_active (w))) 2612 if (expect_false (ev_is_active (w)))
2274 return; 2613 return;
2275 2614
2276 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2615 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2277 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2616 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2278 2617
2279 EV_FREQUENT_CHECK; 2618 EV_FREQUENT_CHECK;
2280 2619
2281 ev_start (EV_A_ (W)w, 1); 2620 ev_start (EV_A_ (W)w, 1);
2282 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2621 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2283 wlist_add (&anfds[fd].head, (WL)w); 2622 wlist_add (&anfds[fd].head, (WL)w);
2284 2623
2285 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2624 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2286 w->events &= ~EV__IOFDSET; 2625 w->events &= ~EV__IOFDSET;
2287 2626
2288 EV_FREQUENT_CHECK; 2627 EV_FREQUENT_CHECK;
2289} 2628}
2290 2629
… …
2300 EV_FREQUENT_CHECK; 2639 EV_FREQUENT_CHECK;
2301 2640
2302 wlist_del (&anfds[w->fd].head, (WL)w); 2641 wlist_del (&anfds[w->fd].head, (WL)w);
2303 ev_stop (EV_A_ (W)w); 2642 ev_stop (EV_A_ (W)w);
2304 2643
2305 fd_change (EV_A_ w->fd, 1); 2644 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2306 2645
2307 EV_FREQUENT_CHECK; 2646 EV_FREQUENT_CHECK;
2308} 2647}
2309 2648
2310void noinline 2649void noinline
… …
2352 timers [active] = timers [timercnt + HEAP0]; 2691 timers [active] = timers [timercnt + HEAP0];
2353 adjustheap (timers, timercnt, active); 2692 adjustheap (timers, timercnt, active);
2354 } 2693 }
2355 } 2694 }
2356 2695
2357 EV_FREQUENT_CHECK;
2358
2359 ev_at (w) -= mn_now; 2696 ev_at (w) -= mn_now;
2360 2697
2361 ev_stop (EV_A_ (W)w); 2698 ev_stop (EV_A_ (W)w);
2699
2700 EV_FREQUENT_CHECK;
2362} 2701}
2363 2702
2364void noinline 2703void noinline
2365ev_timer_again (EV_P_ ev_timer *w) 2704ev_timer_again (EV_P_ ev_timer *w)
2366{ 2705{
… …
2384 } 2723 }
2385 2724
2386 EV_FREQUENT_CHECK; 2725 EV_FREQUENT_CHECK;
2387} 2726}
2388 2727
2728ev_tstamp
2729ev_timer_remaining (EV_P_ ev_timer *w)
2730{
2731 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2732}
2733
2389#if EV_PERIODIC_ENABLE 2734#if EV_PERIODIC_ENABLE
2390void noinline 2735void noinline
2391ev_periodic_start (EV_P_ ev_periodic *w) 2736ev_periodic_start (EV_P_ ev_periodic *w)
2392{ 2737{
2393 if (expect_false (ev_is_active (w))) 2738 if (expect_false (ev_is_active (w)))
… …
2439 periodics [active] = periodics [periodiccnt + HEAP0]; 2784 periodics [active] = periodics [periodiccnt + HEAP0];
2440 adjustheap (periodics, periodiccnt, active); 2785 adjustheap (periodics, periodiccnt, active);
2441 } 2786 }
2442 } 2787 }
2443 2788
2444 EV_FREQUENT_CHECK;
2445
2446 ev_stop (EV_A_ (W)w); 2789 ev_stop (EV_A_ (W)w);
2790
2791 EV_FREQUENT_CHECK;
2447} 2792}
2448 2793
2449void noinline 2794void noinline
2450ev_periodic_again (EV_P_ ev_periodic *w) 2795ev_periodic_again (EV_P_ ev_periodic *w)
2451{ 2796{
… …
2457 2802
2458#ifndef SA_RESTART 2803#ifndef SA_RESTART
2459# define SA_RESTART 0 2804# define SA_RESTART 0
2460#endif 2805#endif
2461 2806
2807#if EV_SIGNAL_ENABLE
2808
2462void noinline 2809void noinline
2463ev_signal_start (EV_P_ ev_signal *w) 2810ev_signal_start (EV_P_ ev_signal *w)
2464{ 2811{
2465#if EV_MULTIPLICITY
2466 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2467#endif
2468 if (expect_false (ev_is_active (w))) 2812 if (expect_false (ev_is_active (w)))
2469 return; 2813 return;
2470 2814
2471 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2815 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2472 2816
2473 evpipe_init (EV_A); 2817#if EV_MULTIPLICITY
2818 assert (("libev: a signal must not be attached to two different loops",
2819 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2474 2820
2475 EV_FREQUENT_CHECK; 2821 signals [w->signum - 1].loop = EV_A;
2822#endif
2476 2823
2824 EV_FREQUENT_CHECK;
2825
2826#if EV_USE_SIGNALFD
2827 if (sigfd == -2)
2477 { 2828 {
2478#ifndef _WIN32 2829 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2479 sigset_t full, prev; 2830 if (sigfd < 0 && errno == EINVAL)
2480 sigfillset (&full); 2831 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2481 sigprocmask (SIG_SETMASK, &full, &prev);
2482#endif
2483 2832
2484 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2833 if (sigfd >= 0)
2834 {
2835 fd_intern (sigfd); /* doing it twice will not hurt */
2485 2836
2486#ifndef _WIN32 2837 sigemptyset (&sigfd_set);
2487 sigprocmask (SIG_SETMASK, &prev, 0); 2838
2488#endif 2839 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2840 ev_set_priority (&sigfd_w, EV_MAXPRI);
2841 ev_io_start (EV_A_ &sigfd_w);
2842 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2843 }
2489 } 2844 }
2845
2846 if (sigfd >= 0)
2847 {
2848 /* TODO: check .head */
2849 sigaddset (&sigfd_set, w->signum);
2850 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2851
2852 signalfd (sigfd, &sigfd_set, 0);
2853 }
2854#endif
2490 2855
2491 ev_start (EV_A_ (W)w, 1); 2856 ev_start (EV_A_ (W)w, 1);
2492 wlist_add (&signals [w->signum - 1].head, (WL)w); 2857 wlist_add (&signals [w->signum - 1].head, (WL)w);
2493 2858
2494 if (!((WL)w)->next) 2859 if (!((WL)w)->next)
2860# if EV_USE_SIGNALFD
2861 if (sigfd < 0) /*TODO*/
2862# endif
2495 { 2863 {
2496#if _WIN32 2864# ifdef _WIN32
2865 evpipe_init (EV_A);
2866
2497 signal (w->signum, ev_sighandler); 2867 signal (w->signum, ev_sighandler);
2498#else 2868# else
2499 struct sigaction sa; 2869 struct sigaction sa;
2870
2871 evpipe_init (EV_A);
2872
2500 sa.sa_handler = ev_sighandler; 2873 sa.sa_handler = ev_sighandler;
2501 sigfillset (&sa.sa_mask); 2874 sigfillset (&sa.sa_mask);
2502 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2875 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2503 sigaction (w->signum, &sa, 0); 2876 sigaction (w->signum, &sa, 0);
2877
2878 sigemptyset (&sa.sa_mask);
2879 sigaddset (&sa.sa_mask, w->signum);
2880 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2504#endif 2881#endif
2505 } 2882 }
2506 2883
2507 EV_FREQUENT_CHECK; 2884 EV_FREQUENT_CHECK;
2508} 2885}
2509 2886
2510void noinline 2887void noinline
… …
2518 2895
2519 wlist_del (&signals [w->signum - 1].head, (WL)w); 2896 wlist_del (&signals [w->signum - 1].head, (WL)w);
2520 ev_stop (EV_A_ (W)w); 2897 ev_stop (EV_A_ (W)w);
2521 2898
2522 if (!signals [w->signum - 1].head) 2899 if (!signals [w->signum - 1].head)
2900 {
2901#if EV_MULTIPLICITY
2902 signals [w->signum - 1].loop = 0; /* unattach from signal */
2903#endif
2904#if EV_USE_SIGNALFD
2905 if (sigfd >= 0)
2906 {
2907 sigset_t ss;
2908
2909 sigemptyset (&ss);
2910 sigaddset (&ss, w->signum);
2911 sigdelset (&sigfd_set, w->signum);
2912
2913 signalfd (sigfd, &sigfd_set, 0);
2914 sigprocmask (SIG_UNBLOCK, &ss, 0);
2915 }
2916 else
2917#endif
2523 signal (w->signum, SIG_DFL); 2918 signal (w->signum, SIG_DFL);
2919 }
2524 2920
2525 EV_FREQUENT_CHECK; 2921 EV_FREQUENT_CHECK;
2526} 2922}
2923
2924#endif
2925
2926#if EV_CHILD_ENABLE
2527 2927
2528void 2928void
2529ev_child_start (EV_P_ ev_child *w) 2929ev_child_start (EV_P_ ev_child *w)
2530{ 2930{
2531#if EV_MULTIPLICITY 2931#if EV_MULTIPLICITY
… …
2535 return; 2935 return;
2536 2936
2537 EV_FREQUENT_CHECK; 2937 EV_FREQUENT_CHECK;
2538 2938
2539 ev_start (EV_A_ (W)w, 1); 2939 ev_start (EV_A_ (W)w, 1);
2540 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2940 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2541 2941
2542 EV_FREQUENT_CHECK; 2942 EV_FREQUENT_CHECK;
2543} 2943}
2544 2944
2545void 2945void
… …
2549 if (expect_false (!ev_is_active (w))) 2949 if (expect_false (!ev_is_active (w)))
2550 return; 2950 return;
2551 2951
2552 EV_FREQUENT_CHECK; 2952 EV_FREQUENT_CHECK;
2553 2953
2554 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2954 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2555 ev_stop (EV_A_ (W)w); 2955 ev_stop (EV_A_ (W)w);
2556 2956
2557 EV_FREQUENT_CHECK; 2957 EV_FREQUENT_CHECK;
2558} 2958}
2959
2960#endif
2559 2961
2560#if EV_STAT_ENABLE 2962#if EV_STAT_ENABLE
2561 2963
2562# ifdef _WIN32 2964# ifdef _WIN32
2563# undef lstat 2965# undef lstat
… …
2569#define MIN_STAT_INTERVAL 0.1074891 2971#define MIN_STAT_INTERVAL 0.1074891
2570 2972
2571static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2973static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2572 2974
2573#if EV_USE_INOTIFY 2975#if EV_USE_INOTIFY
2574# define EV_INOTIFY_BUFSIZE 8192 2976
2977/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2978# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2575 2979
2576static void noinline 2980static void noinline
2577infy_add (EV_P_ ev_stat *w) 2981infy_add (EV_P_ ev_stat *w)
2578{ 2982{
2579 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); 2983 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);
2580 2984
2581 if (w->wd < 0) 2985 if (w->wd >= 0)
2986 {
2987 struct statfs sfs;
2988
2989 /* now local changes will be tracked by inotify, but remote changes won't */
2990 /* unless the filesystem is known to be local, we therefore still poll */
2991 /* also do poll on <2.6.25, but with normal frequency */
2992
2993 if (!fs_2625)
2994 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2995 else if (!statfs (w->path, &sfs)
2996 && (sfs.f_type == 0x1373 /* devfs */
2997 || sfs.f_type == 0xEF53 /* ext2/3 */
2998 || sfs.f_type == 0x3153464a /* jfs */
2999 || sfs.f_type == 0x52654973 /* reiser3 */
3000 || sfs.f_type == 0x01021994 /* tempfs */
3001 || sfs.f_type == 0x58465342 /* xfs */))
3002 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3003 else
3004 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2582 { 3005 }
3006 else
3007 {
3008 /* can't use inotify, continue to stat */
2583 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3009 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2584 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2585 3010
2586 /* monitor some parent directory for speedup hints */ 3011 /* if path is not there, monitor some parent directory for speedup hints */
2587 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3012 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2588 /* but an efficiency issue only */ 3013 /* but an efficiency issue only */
2589 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3014 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2590 { 3015 {
2591 char path [4096]; 3016 char path [4096];
… …
2607 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3032 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2608 } 3033 }
2609 } 3034 }
2610 3035
2611 if (w->wd >= 0) 3036 if (w->wd >= 0)
2612 {
2613 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3037 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2614 3038
2615 /* now local changes will be tracked by inotify, but remote changes won't */ 3039 /* now re-arm timer, if required */
2616 /* unless the filesystem it known to be local, we therefore still poll */ 3040 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2617 /* also do poll on <2.6.25, but with normal frequency */
2618 struct statfs sfs;
2619
2620 if (fs_2625 && !statfs (w->path, &sfs))
2621 if (sfs.f_type == 0x1373 /* devfs */
2622 || sfs.f_type == 0xEF53 /* ext2/3 */
2623 || sfs.f_type == 0x3153464a /* jfs */
2624 || sfs.f_type == 0x52654973 /* reiser3 */
2625 || sfs.f_type == 0x01021994 /* tempfs */
2626 || sfs.f_type == 0x58465342 /* xfs */)
2627 return;
2628
2629 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2630 ev_timer_again (EV_A_ &w->timer); 3041 ev_timer_again (EV_A_ &w->timer);
2631 } 3042 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2632} 3043}
2633 3044
2634static void noinline 3045static void noinline
2635infy_del (EV_P_ ev_stat *w) 3046infy_del (EV_P_ ev_stat *w)
2636{ 3047{
… …
2639 3050
2640 if (wd < 0) 3051 if (wd < 0)
2641 return; 3052 return;
2642 3053
2643 w->wd = -2; 3054 w->wd = -2;
2644 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3055 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2645 wlist_del (&fs_hash [slot].head, (WL)w); 3056 wlist_del (&fs_hash [slot].head, (WL)w);
2646 3057
2647 /* remove this watcher, if others are watching it, they will rearm */ 3058 /* remove this watcher, if others are watching it, they will rearm */
2648 inotify_rm_watch (fs_fd, wd); 3059 inotify_rm_watch (fs_fd, wd);
2649} 3060}
… …
2651static void noinline 3062static void noinline
2652infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3063infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2653{ 3064{
2654 if (slot < 0) 3065 if (slot < 0)
2655 /* overflow, need to check for all hash slots */ 3066 /* overflow, need to check for all hash slots */
2656 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3067 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2657 infy_wd (EV_A_ slot, wd, ev); 3068 infy_wd (EV_A_ slot, wd, ev);
2658 else 3069 else
2659 { 3070 {
2660 WL w_; 3071 WL w_;
2661 3072
2662 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3073 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2663 { 3074 {
2664 ev_stat *w = (ev_stat *)w_; 3075 ev_stat *w = (ev_stat *)w_;
2665 w_ = w_->next; /* lets us remove this watcher and all before it */ 3076 w_ = w_->next; /* lets us remove this watcher and all before it */
2666 3077
2667 if (w->wd == wd || wd == -1) 3078 if (w->wd == wd || wd == -1)
2668 { 3079 {
2669 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3080 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2670 { 3081 {
2671 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3082 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2672 w->wd = -1; 3083 w->wd = -1;
2673 infy_add (EV_A_ w); /* re-add, no matter what */ 3084 infy_add (EV_A_ w); /* re-add, no matter what */
2674 } 3085 }
2675 3086
2676 stat_timer_cb (EV_A_ &w->timer, 0); 3087 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2681 3092
2682static void 3093static void
2683infy_cb (EV_P_ ev_io *w, int revents) 3094infy_cb (EV_P_ ev_io *w, int revents)
2684{ 3095{
2685 char buf [EV_INOTIFY_BUFSIZE]; 3096 char buf [EV_INOTIFY_BUFSIZE];
2686 struct inotify_event *ev = (struct inotify_event *)buf;
2687 int ofs; 3097 int ofs;
2688 int len = read (fs_fd, buf, sizeof (buf)); 3098 int len = read (fs_fd, buf, sizeof (buf));
2689 3099
2690 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3100 for (ofs = 0; ofs < len; )
3101 {
3102 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2691 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3103 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3104 ofs += sizeof (struct inotify_event) + ev->len;
3105 }
2692} 3106}
2693 3107
2694inline_size void 3108inline_size void
2695check_2625 (EV_P) 3109ev_check_2625 (EV_P)
2696{ 3110{
2697 /* kernels < 2.6.25 are borked 3111 /* kernels < 2.6.25 are borked
2698 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3112 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2699 */ 3113 */
2700 struct utsname buf; 3114 if (ev_linux_version () < 0x020619)
2701 int major, minor, micro;
2702
2703 if (uname (&buf))
2704 return; 3115 return;
2705 3116
2706 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2707 return;
2708
2709 if (major < 2
2710 || (major == 2 && minor < 6)
2711 || (major == 2 && minor == 6 && micro < 25))
2712 return;
2713
2714 fs_2625 = 1; 3117 fs_2625 = 1;
3118}
3119
3120inline_size int
3121infy_newfd (void)
3122{
3123#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3124 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3125 if (fd >= 0)
3126 return fd;
3127#endif
3128 return inotify_init ();
2715} 3129}
2716 3130
2717inline_size void 3131inline_size void
2718infy_init (EV_P) 3132infy_init (EV_P)
2719{ 3133{
2720 if (fs_fd != -2) 3134 if (fs_fd != -2)
2721 return; 3135 return;
2722 3136
2723 fs_fd = -1; 3137 fs_fd = -1;
2724 3138
2725 check_2625 (EV_A); 3139 ev_check_2625 (EV_A);
2726 3140
2727 fs_fd = inotify_init (); 3141 fs_fd = infy_newfd ();
2728 3142
2729 if (fs_fd >= 0) 3143 if (fs_fd >= 0)
2730 { 3144 {
3145 fd_intern (fs_fd);
2731 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3146 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2732 ev_set_priority (&fs_w, EV_MAXPRI); 3147 ev_set_priority (&fs_w, EV_MAXPRI);
2733 ev_io_start (EV_A_ &fs_w); 3148 ev_io_start (EV_A_ &fs_w);
3149 ev_unref (EV_A);
2734 } 3150 }
2735} 3151}
2736 3152
2737inline_size void 3153inline_size void
2738infy_fork (EV_P) 3154infy_fork (EV_P)
… …
2740 int slot; 3156 int slot;
2741 3157
2742 if (fs_fd < 0) 3158 if (fs_fd < 0)
2743 return; 3159 return;
2744 3160
3161 ev_ref (EV_A);
3162 ev_io_stop (EV_A_ &fs_w);
2745 close (fs_fd); 3163 close (fs_fd);
2746 fs_fd = inotify_init (); 3164 fs_fd = infy_newfd ();
2747 3165
3166 if (fs_fd >= 0)
3167 {
3168 fd_intern (fs_fd);
3169 ev_io_set (&fs_w, fs_fd, EV_READ);
3170 ev_io_start (EV_A_ &fs_w);
3171 ev_unref (EV_A);
3172 }
3173
2748 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3174 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2749 { 3175 {
2750 WL w_ = fs_hash [slot].head; 3176 WL w_ = fs_hash [slot].head;
2751 fs_hash [slot].head = 0; 3177 fs_hash [slot].head = 0;
2752 3178
2753 while (w_) 3179 while (w_)
… …
2758 w->wd = -1; 3184 w->wd = -1;
2759 3185
2760 if (fs_fd >= 0) 3186 if (fs_fd >= 0)
2761 infy_add (EV_A_ w); /* re-add, no matter what */ 3187 infy_add (EV_A_ w); /* re-add, no matter what */
2762 else 3188 else
3189 {
3190 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3191 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2763 ev_timer_again (EV_A_ &w->timer); 3192 ev_timer_again (EV_A_ &w->timer);
3193 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3194 }
2764 } 3195 }
2765 } 3196 }
2766} 3197}
2767 3198
2768#endif 3199#endif
… …
2785static void noinline 3216static void noinline
2786stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3217stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2787{ 3218{
2788 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3219 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2789 3220
2790 /* we copy this here each the time so that */ 3221 ev_statdata prev = w->attr;
2791 /* prev has the old value when the callback gets invoked */
2792 w->prev = w->attr;
2793 ev_stat_stat (EV_A_ w); 3222 ev_stat_stat (EV_A_ w);
2794 3223
2795 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3224 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2796 if ( 3225 if (
2797 w->prev.st_dev != w->attr.st_dev 3226 prev.st_dev != w->attr.st_dev
2798 || w->prev.st_ino != w->attr.st_ino 3227 || prev.st_ino != w->attr.st_ino
2799 || w->prev.st_mode != w->attr.st_mode 3228 || prev.st_mode != w->attr.st_mode
2800 || w->prev.st_nlink != w->attr.st_nlink 3229 || prev.st_nlink != w->attr.st_nlink
2801 || w->prev.st_uid != w->attr.st_uid 3230 || prev.st_uid != w->attr.st_uid
2802 || w->prev.st_gid != w->attr.st_gid 3231 || prev.st_gid != w->attr.st_gid
2803 || w->prev.st_rdev != w->attr.st_rdev 3232 || prev.st_rdev != w->attr.st_rdev
2804 || w->prev.st_size != w->attr.st_size 3233 || prev.st_size != w->attr.st_size
2805 || w->prev.st_atime != w->attr.st_atime 3234 || prev.st_atime != w->attr.st_atime
2806 || w->prev.st_mtime != w->attr.st_mtime 3235 || prev.st_mtime != w->attr.st_mtime
2807 || w->prev.st_ctime != w->attr.st_ctime 3236 || prev.st_ctime != w->attr.st_ctime
2808 ) { 3237 ) {
3238 /* we only update w->prev on actual differences */
3239 /* in case we test more often than invoke the callback, */
3240 /* to ensure that prev is always different to attr */
3241 w->prev = prev;
3242
2809 #if EV_USE_INOTIFY 3243 #if EV_USE_INOTIFY
2810 if (fs_fd >= 0) 3244 if (fs_fd >= 0)
2811 { 3245 {
2812 infy_del (EV_A_ w); 3246 infy_del (EV_A_ w);
2813 infy_add (EV_A_ w); 3247 infy_add (EV_A_ w);
… …
2838 3272
2839 if (fs_fd >= 0) 3273 if (fs_fd >= 0)
2840 infy_add (EV_A_ w); 3274 infy_add (EV_A_ w);
2841 else 3275 else
2842#endif 3276#endif
3277 {
2843 ev_timer_again (EV_A_ &w->timer); 3278 ev_timer_again (EV_A_ &w->timer);
3279 ev_unref (EV_A);
3280 }
2844 3281
2845 ev_start (EV_A_ (W)w, 1); 3282 ev_start (EV_A_ (W)w, 1);
2846 3283
2847 EV_FREQUENT_CHECK; 3284 EV_FREQUENT_CHECK;
2848} 3285}
… …
2857 EV_FREQUENT_CHECK; 3294 EV_FREQUENT_CHECK;
2858 3295
2859#if EV_USE_INOTIFY 3296#if EV_USE_INOTIFY
2860 infy_del (EV_A_ w); 3297 infy_del (EV_A_ w);
2861#endif 3298#endif
3299
3300 if (ev_is_active (&w->timer))
3301 {
3302 ev_ref (EV_A);
2862 ev_timer_stop (EV_A_ &w->timer); 3303 ev_timer_stop (EV_A_ &w->timer);
3304 }
2863 3305
2864 ev_stop (EV_A_ (W)w); 3306 ev_stop (EV_A_ (W)w);
2865 3307
2866 EV_FREQUENT_CHECK; 3308 EV_FREQUENT_CHECK;
2867} 3309}
… …
2912 3354
2913 EV_FREQUENT_CHECK; 3355 EV_FREQUENT_CHECK;
2914} 3356}
2915#endif 3357#endif
2916 3358
3359#if EV_PREPARE_ENABLE
2917void 3360void
2918ev_prepare_start (EV_P_ ev_prepare *w) 3361ev_prepare_start (EV_P_ ev_prepare *w)
2919{ 3362{
2920 if (expect_false (ev_is_active (w))) 3363 if (expect_false (ev_is_active (w)))
2921 return; 3364 return;
… …
2947 3390
2948 ev_stop (EV_A_ (W)w); 3391 ev_stop (EV_A_ (W)w);
2949 3392
2950 EV_FREQUENT_CHECK; 3393 EV_FREQUENT_CHECK;
2951} 3394}
3395#endif
2952 3396
3397#if EV_CHECK_ENABLE
2953void 3398void
2954ev_check_start (EV_P_ ev_check *w) 3399ev_check_start (EV_P_ ev_check *w)
2955{ 3400{
2956 if (expect_false (ev_is_active (w))) 3401 if (expect_false (ev_is_active (w)))
2957 return; 3402 return;
… …
2983 3428
2984 ev_stop (EV_A_ (W)w); 3429 ev_stop (EV_A_ (W)w);
2985 3430
2986 EV_FREQUENT_CHECK; 3431 EV_FREQUENT_CHECK;
2987} 3432}
3433#endif
2988 3434
2989#if EV_EMBED_ENABLE 3435#if EV_EMBED_ENABLE
2990void noinline 3436void noinline
2991ev_embed_sweep (EV_P_ ev_embed *w) 3437ev_embed_sweep (EV_P_ ev_embed *w)
2992{ 3438{
2993 ev_loop (w->other, EVLOOP_NONBLOCK); 3439 ev_run (w->other, EVRUN_NOWAIT);
2994} 3440}
2995 3441
2996static void 3442static void
2997embed_io_cb (EV_P_ ev_io *io, int revents) 3443embed_io_cb (EV_P_ ev_io *io, int revents)
2998{ 3444{
2999 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3445 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3000 3446
3001 if (ev_cb (w)) 3447 if (ev_cb (w))
3002 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3448 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3003 else 3449 else
3004 ev_loop (w->other, EVLOOP_NONBLOCK); 3450 ev_run (w->other, EVRUN_NOWAIT);
3005} 3451}
3006 3452
3007static void 3453static void
3008embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3454embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3009{ 3455{
3010 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3456 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3011 3457
3012 { 3458 {
3013 struct ev_loop *loop = w->other; 3459 EV_P = w->other;
3014 3460
3015 while (fdchangecnt) 3461 while (fdchangecnt)
3016 { 3462 {
3017 fd_reify (EV_A); 3463 fd_reify (EV_A);
3018 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3464 ev_run (EV_A_ EVRUN_NOWAIT);
3019 } 3465 }
3020 } 3466 }
3021} 3467}
3022 3468
3023static void 3469static void
… …
3026 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3472 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3027 3473
3028 ev_embed_stop (EV_A_ w); 3474 ev_embed_stop (EV_A_ w);
3029 3475
3030 { 3476 {
3031 struct ev_loop *loop = w->other; 3477 EV_P = w->other;
3032 3478
3033 ev_loop_fork (EV_A); 3479 ev_loop_fork (EV_A);
3034 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3480 ev_run (EV_A_ EVRUN_NOWAIT);
3035 } 3481 }
3036 3482
3037 ev_embed_start (EV_A_ w); 3483 ev_embed_start (EV_A_ w);
3038} 3484}
3039 3485
… …
3050{ 3496{
3051 if (expect_false (ev_is_active (w))) 3497 if (expect_false (ev_is_active (w)))
3052 return; 3498 return;
3053 3499
3054 { 3500 {
3055 struct ev_loop *loop = w->other; 3501 EV_P = w->other;
3056 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3502 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3057 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3503 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3058 } 3504 }
3059 3505
3060 EV_FREQUENT_CHECK; 3506 EV_FREQUENT_CHECK;
… …
3087 3533
3088 ev_io_stop (EV_A_ &w->io); 3534 ev_io_stop (EV_A_ &w->io);
3089 ev_prepare_stop (EV_A_ &w->prepare); 3535 ev_prepare_stop (EV_A_ &w->prepare);
3090 ev_fork_stop (EV_A_ &w->fork); 3536 ev_fork_stop (EV_A_ &w->fork);
3091 3537
3538 ev_stop (EV_A_ (W)w);
3539
3092 EV_FREQUENT_CHECK; 3540 EV_FREQUENT_CHECK;
3093} 3541}
3094#endif 3542#endif
3095 3543
3096#if EV_FORK_ENABLE 3544#if EV_FORK_ENABLE
… …
3136ev_async_start (EV_P_ ev_async *w) 3584ev_async_start (EV_P_ ev_async *w)
3137{ 3585{
3138 if (expect_false (ev_is_active (w))) 3586 if (expect_false (ev_is_active (w)))
3139 return; 3587 return;
3140 3588
3589 w->sent = 0;
3590
3141 evpipe_init (EV_A); 3591 evpipe_init (EV_A);
3142 3592
3143 EV_FREQUENT_CHECK; 3593 EV_FREQUENT_CHECK;
3144 3594
3145 ev_start (EV_A_ (W)w, ++asynccnt); 3595 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3172 3622
3173void 3623void
3174ev_async_send (EV_P_ ev_async *w) 3624ev_async_send (EV_P_ ev_async *w)
3175{ 3625{
3176 w->sent = 1; 3626 w->sent = 1;
3177 evpipe_write (EV_A_ &gotasync); 3627 evpipe_write (EV_A_ &async_pending);
3178} 3628}
3179#endif 3629#endif
3180 3630
3181/*****************************************************************************/ 3631/*****************************************************************************/
3182 3632
… …
3222{ 3672{
3223 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3673 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3224 3674
3225 if (expect_false (!once)) 3675 if (expect_false (!once))
3226 { 3676 {
3227 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3677 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3228 return; 3678 return;
3229 } 3679 }
3230 3680
3231 once->cb = cb; 3681 once->cb = cb;
3232 once->arg = arg; 3682 once->arg = arg;
… …
3319 if (types & EV_ASYNC) 3769 if (types & EV_ASYNC)
3320 for (i = asynccnt; i--; ) 3770 for (i = asynccnt; i--; )
3321 cb (EV_A_ EV_ASYNC, asyncs [i]); 3771 cb (EV_A_ EV_ASYNC, asyncs [i]);
3322#endif 3772#endif
3323 3773
3774#if EV_PREPARE_ENABLE
3324 if (types & EV_PREPARE) 3775 if (types & EV_PREPARE)
3325 for (i = preparecnt; i--; ) 3776 for (i = preparecnt; i--; )
3326#if EV_EMBED_ENABLE 3777# if EV_EMBED_ENABLE
3327 if (ev_cb (prepares [i]) != embed_prepare_cb) 3778 if (ev_cb (prepares [i]) != embed_prepare_cb)
3328#endif 3779# endif
3329 cb (EV_A_ EV_PREPARE, prepares [i]); 3780 cb (EV_A_ EV_PREPARE, prepares [i]);
3781#endif
3330 3782
3783#if EV_CHECK_ENABLE
3331 if (types & EV_CHECK) 3784 if (types & EV_CHECK)
3332 for (i = checkcnt; i--; ) 3785 for (i = checkcnt; i--; )
3333 cb (EV_A_ EV_CHECK, checks [i]); 3786 cb (EV_A_ EV_CHECK, checks [i]);
3787#endif
3334 3788
3789#if EV_SIGNAL_ENABLE
3335 if (types & EV_SIGNAL) 3790 if (types & EV_SIGNAL)
3336 for (i = 0; i < signalmax; ++i) 3791 for (i = 0; i < EV_NSIG - 1; ++i)
3337 for (wl = signals [i].head; wl; ) 3792 for (wl = signals [i].head; wl; )
3338 { 3793 {
3339 wn = wl->next; 3794 wn = wl->next;
3340 cb (EV_A_ EV_SIGNAL, wl); 3795 cb (EV_A_ EV_SIGNAL, wl);
3341 wl = wn; 3796 wl = wn;
3342 } 3797 }
3798#endif
3343 3799
3800#if EV_CHILD_ENABLE
3344 if (types & EV_CHILD) 3801 if (types & EV_CHILD)
3345 for (i = EV_PID_HASHSIZE; i--; ) 3802 for (i = (EV_PID_HASHSIZE); i--; )
3346 for (wl = childs [i]; wl; ) 3803 for (wl = childs [i]; wl; )
3347 { 3804 {
3348 wn = wl->next; 3805 wn = wl->next;
3349 cb (EV_A_ EV_CHILD, wl); 3806 cb (EV_A_ EV_CHILD, wl);
3350 wl = wn; 3807 wl = wn;
3351 } 3808 }
3809#endif
3352/* EV_STAT 0x00001000 /* stat data changed */ 3810/* EV_STAT 0x00001000 /* stat data changed */
3353/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3811/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3354} 3812}
3355#endif 3813#endif
3356 3814
3357#if EV_MULTIPLICITY 3815#if EV_MULTIPLICITY
3358 #include "ev_wrap.h" 3816 #include "ev_wrap.h"
3359#endif 3817#endif
3360 3818
3361#ifdef __cplusplus 3819EV_CPP(})
3362}
3363#endif
3364 3820

Diff Legend

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