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.355 by root, Fri Oct 22 10:09:12 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/utsname.h>
388# include <sys/statfs.h>
389# include <sys/inotify.h>
390/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
391# ifndef IN_DONT_FOLLOW
392# undef EV_USE_INOTIFY
393# define EV_USE_INOTIFY 0
394# endif
395#endif
396
397#if EV_SELECT_IS_WINSOCKET
398# include <winsock.h>
399#endif
400
341#if EV_USE_EVENTFD 401#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 402/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 403# include <stdint.h>
344# ifdef __cplusplus 404# ifndef EFD_NONBLOCK
345extern "C" { 405# define EFD_NONBLOCK O_NONBLOCK
346# endif 406# endif
347int eventfd (unsigned int initval, int flags); 407# ifndef EFD_CLOEXEC
348# ifdef __cplusplus 408# ifdef O_CLOEXEC
349} 409# define EFD_CLOEXEC O_CLOEXEC
410# else
411# define EFD_CLOEXEC 02000000
412# endif
350# endif 413# endif
414EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
415#endif
416
417#if EV_USE_SIGNALFD
418/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
419# include <stdint.h>
420# ifndef SFD_NONBLOCK
421# define SFD_NONBLOCK O_NONBLOCK
422# endif
423# ifndef SFD_CLOEXEC
424# ifdef O_CLOEXEC
425# define SFD_CLOEXEC O_CLOEXEC
426# else
427# define SFD_CLOEXEC 02000000
428# endif
429# endif
430EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
431
432struct signalfd_siginfo
433{
434 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)];
436};
351#endif 437#endif
352 438
353/**/ 439/**/
354 440
355#if EV_VERIFY >= 3 441#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 442# define EV_FREQUENT_CHECK ev_verify (EV_A)
357#else 443#else
358# define EV_FREQUENT_CHECK do { } while (0) 444# define EV_FREQUENT_CHECK do { } while (0)
359#endif 445#endif
360 446
361/* 447/*
… …
368 */ 454 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 455#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 456
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 457#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) */ 458#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 */ 459
460#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
461#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
374 462
375#if __GNUC__ >= 4 463#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
378#else 466#else
… …
385 473
386#define expect_false(expr) expect ((expr) != 0, 0) 474#define expect_false(expr) expect ((expr) != 0, 0)
387#define expect_true(expr) expect ((expr) != 0, 1) 475#define expect_true(expr) expect ((expr) != 0, 1)
388#define inline_size static inline 476#define inline_size static inline
389 477
390#if EV_MINIMAL 478#if EV_FEATURE_CODE
479# define inline_speed static inline
480#else
391# define inline_speed static noinline 481# define inline_speed static noinline
482#endif
483
484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
485
486#if EV_MINPRI == EV_MAXPRI
487# define ABSPRI(w) (((W)w), 0)
392#else 488#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) 489# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
490#endif
398 491
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 492#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 493#define EMPTY2(a,b) /* used to suppress some warnings */
401 494
402typedef ev_watcher *W; 495typedef ev_watcher *W;
… …
406#define ev_active(w) ((W)(w))->active 499#define ev_active(w) ((W)(w))->active
407#define ev_at(w) ((WT)(w))->at 500#define ev_at(w) ((WT)(w))->at
408 501
409#if EV_USE_REALTIME 502#if EV_USE_REALTIME
410/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 503/* 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 */ 504/* giving it a reasonably high chance of working on typical architectures */
412static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
413#endif 506#endif
414 507
415#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
416static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
417#endif 510#endif
418 511
512#ifndef EV_FD_TO_WIN32_HANDLE
513# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
514#endif
515#ifndef EV_WIN32_HANDLE_TO_FD
516# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
517#endif
518#ifndef EV_WIN32_CLOSE_FD
519# define EV_WIN32_CLOSE_FD(fd) close (fd)
520#endif
521
419#ifdef _WIN32 522#ifdef _WIN32
420# include "ev_win32.c" 523# include "ev_win32.c"
421#endif 524#endif
422 525
423/*****************************************************************************/ 526/*****************************************************************************/
527
528static unsigned int noinline
529ev_linux_version (void)
530{
531#ifdef __linux
532 struct utsname buf;
533 unsigned int v;
534 int i;
535 char *p = buf.release;
536
537 if (uname (&buf))
538 return 0;
539
540 for (i = 3+1; --i; )
541 {
542 unsigned int c = 0;
543
544 for (;;)
545 {
546 if (*p >= '0' && *p <= '9')
547 c = c * 10 + *p++ - '0';
548 else
549 {
550 p += *p == '.';
551 break;
552 }
553 }
554
555 v = (v << 8) | c;
556 }
557
558 return v;
559#else
560 return 0;
561#endif
562}
563
564/*****************************************************************************/
565
566#if EV_AVOID_STDIO
567static void noinline
568ev_printerr (const char *msg)
569{
570 write (STDERR_FILENO, msg, strlen (msg));
571}
572#endif
424 573
425static void (*syserr_cb)(const char *msg); 574static void (*syserr_cb)(const char *msg);
426 575
427void 576void
428ev_set_syserr_cb (void (*cb)(const char *msg)) 577ev_set_syserr_cb (void (*cb)(const char *msg))
… …
438 587
439 if (syserr_cb) 588 if (syserr_cb)
440 syserr_cb (msg); 589 syserr_cb (msg);
441 else 590 else
442 { 591 {
592#if EV_AVOID_STDIO
593 const char *err = strerror (errno);
594
595 ev_printerr (msg);
596 ev_printerr (": ");
597 ev_printerr (err);
598 ev_printerr ("\n");
599#else
443 perror (msg); 600 perror (msg);
601#endif
444 abort (); 602 abort ();
445 } 603 }
446} 604}
447 605
448static void * 606static void *
449ev_realloc_emul (void *ptr, long size) 607ev_realloc_emul (void *ptr, long size)
450{ 608{
609#if __GLIBC__
610 return realloc (ptr, size);
611#else
451 /* some systems, notably openbsd and darwin, fail to properly 612 /* some systems, notably openbsd and darwin, fail to properly
452 * implement realloc (x, 0) (as required by both ansi c-98 and 613 * implement realloc (x, 0) (as required by both ansi c-89 and
453 * the single unix specification, so work around them here. 614 * the single unix specification, so work around them here.
454 */ 615 */
455 616
456 if (size) 617 if (size)
457 return realloc (ptr, size); 618 return realloc (ptr, size);
458 619
459 free (ptr); 620 free (ptr);
460 return 0; 621 return 0;
622#endif
461} 623}
462 624
463static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 625static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
464 626
465void 627void
… …
473{ 635{
474 ptr = alloc (ptr, size); 636 ptr = alloc (ptr, size);
475 637
476 if (!ptr && size) 638 if (!ptr && size)
477 { 639 {
640#if EV_AVOID_STDIO
641 ev_printerr ("libev: memory allocation failed, aborting.\n");
642#else
478 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 643 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
644#endif
479 abort (); 645 abort ();
480 } 646 }
481 647
482 return ptr; 648 return ptr;
483} 649}
… …
485#define ev_malloc(size) ev_realloc (0, (size)) 651#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 652#define ev_free(ptr) ev_realloc ((ptr), 0)
487 653
488/*****************************************************************************/ 654/*****************************************************************************/
489 655
656/* set in reify when reification needed */
657#define EV_ANFD_REIFY 1
658
490/* file descriptor info structure */ 659/* file descriptor info structure */
491typedef struct 660typedef struct
492{ 661{
493 WL head; 662 WL head;
494 unsigned char events; /* the events watched for */ 663 unsigned char events; /* the events watched for */
495 unsigned char reify; /* flag set when this ANFD needs reification */ 664 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 */ 665 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
497 unsigned char unused; 666 unsigned char unused;
498#if EV_USE_EPOLL 667#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 668 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 669#endif
… …
562 731
563 static int ev_default_loop_ptr; 732 static int ev_default_loop_ptr;
564 733
565#endif 734#endif
566 735
736#if EV_FEATURE_API
737# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
738# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
739# define EV_INVOKE_PENDING invoke_cb (EV_A)
740#else
741# define EV_RELEASE_CB (void)0
742# define EV_ACQUIRE_CB (void)0
743# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
744#endif
745
746#define EVBREAK_RECURSE 0x80
747
567/*****************************************************************************/ 748/*****************************************************************************/
568 749
750#ifndef EV_HAVE_EV_TIME
569ev_tstamp 751ev_tstamp
570ev_time (void) 752ev_time (void)
571{ 753{
572#if EV_USE_REALTIME 754#if EV_USE_REALTIME
573 if (expect_true (have_realtime)) 755 if (expect_true (have_realtime))
… …
580 762
581 struct timeval tv; 763 struct timeval tv;
582 gettimeofday (&tv, 0); 764 gettimeofday (&tv, 0);
583 return tv.tv_sec + tv.tv_usec * 1e-6; 765 return tv.tv_sec + tv.tv_usec * 1e-6;
584} 766}
767#endif
585 768
586inline_size ev_tstamp 769inline_size ev_tstamp
587get_clock (void) 770get_clock (void)
588{ 771{
589#if EV_USE_MONOTONIC 772#if EV_USE_MONOTONIC
… …
612 if (delay > 0.) 795 if (delay > 0.)
613 { 796 {
614#if EV_USE_NANOSLEEP 797#if EV_USE_NANOSLEEP
615 struct timespec ts; 798 struct timespec ts;
616 799
617 ts.tv_sec = (time_t)delay; 800 EV_TS_SET (ts, delay);
618 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
619
620 nanosleep (&ts, 0); 801 nanosleep (&ts, 0);
621#elif defined(_WIN32) 802#elif defined(_WIN32)
622 Sleep ((unsigned long)(delay * 1e3)); 803 Sleep ((unsigned long)(delay * 1e3));
623#else 804#else
624 struct timeval tv; 805 struct timeval tv;
625 806
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 */ 807 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
630 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 808 /* something not guaranteed by newer posix versions, but guaranteed */
631 /* by older ones */ 809 /* by older ones */
810 EV_TV_SET (tv, delay);
632 select (0, 0, 0, 0, &tv); 811 select (0, 0, 0, 0, &tv);
633#endif 812#endif
634 } 813 }
635} 814}
636 815
637/*****************************************************************************/ 816/*****************************************************************************/
638 817
639#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 818#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
640 819
641/* find a suitable new size for the given array, */ 820/* find a suitable new size for the given array, */
642/* hopefully by rounding to a ncie-to-malloc size */ 821/* hopefully by rounding to a nice-to-malloc size */
643inline_size int 822inline_size int
644array_nextsize (int elem, int cur, int cnt) 823array_nextsize (int elem, int cur, int cnt)
645{ 824{
646 int ncur = cur + 1; 825 int ncur = cur + 1;
647 826
… …
743} 922}
744 923
745/*****************************************************************************/ 924/*****************************************************************************/
746 925
747inline_speed void 926inline_speed void
748fd_event (EV_P_ int fd, int revents) 927fd_event_nocheck (EV_P_ int fd, int revents)
749{ 928{
750 ANFD *anfd = anfds + fd; 929 ANFD *anfd = anfds + fd;
751 ev_io *w; 930 ev_io *w;
752 931
753 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 932 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
757 if (ev) 936 if (ev)
758 ev_feed_event (EV_A_ (W)w, ev); 937 ev_feed_event (EV_A_ (W)w, ev);
759 } 938 }
760} 939}
761 940
941/* do not submit kernel events for fds that have reify set */
942/* because that means they changed while we were polling for new events */
943inline_speed void
944fd_event (EV_P_ int fd, int revents)
945{
946 ANFD *anfd = anfds + fd;
947
948 if (expect_true (!anfd->reify))
949 fd_event_nocheck (EV_A_ fd, revents);
950}
951
762void 952void
763ev_feed_fd_event (EV_P_ int fd, int revents) 953ev_feed_fd_event (EV_P_ int fd, int revents)
764{ 954{
765 if (fd >= 0 && fd < anfdmax) 955 if (fd >= 0 && fd < anfdmax)
766 fd_event (EV_A_ fd, revents); 956 fd_event_nocheck (EV_A_ fd, revents);
767} 957}
768 958
769/* make sure the external fd watch events are in-sync */ 959/* make sure the external fd watch events are in-sync */
770/* with the kernel/libev internal state */ 960/* with the kernel/libev internal state */
771inline_size void 961inline_size void
… …
777 { 967 {
778 int fd = fdchanges [i]; 968 int fd = fdchanges [i];
779 ANFD *anfd = anfds + fd; 969 ANFD *anfd = anfds + fd;
780 ev_io *w; 970 ev_io *w;
781 971
782 unsigned char events = 0; 972 unsigned char o_events = anfd->events;
973 unsigned char o_reify = anfd->reify;
783 974
784 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 975 anfd->reify = 0;
785 events |= (unsigned char)w->events;
786 976
787#if EV_SELECT_IS_WINSOCKET 977#if EV_SELECT_IS_WINSOCKET
788 if (events) 978 if (o_reify & EV__IOFDSET)
789 { 979 {
790 unsigned long arg; 980 unsigned long arg;
791 #ifdef EV_FD_TO_WIN32_HANDLE
792 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 981 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)); 982 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
797 } 983 }
798#endif 984#endif
799 985
986 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
800 { 987 {
801 unsigned char o_events = anfd->events;
802 unsigned char o_reify = anfd->reify;
803
804 anfd->reify = 0;
805 anfd->events = events; 988 anfd->events = 0;
806 989
807 if (o_events != events || o_reify & EV__IOFDSET) 990 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
991 anfd->events |= (unsigned char)w->events;
992
993 if (o_events != anfd->events)
994 o_reify = EV__IOFDSET; /* actually |= */
995 }
996
997 if (o_reify & EV__IOFDSET)
808 backend_modify (EV_A_ fd, o_events, events); 998 backend_modify (EV_A_ fd, o_events, anfd->events);
809 }
810 } 999 }
811 1000
812 fdchangecnt = 0; 1001 fdchangecnt = 0;
813} 1002}
814 1003
… …
838 ev_io_stop (EV_A_ w); 1027 ev_io_stop (EV_A_ w);
839 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1028 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
840 } 1029 }
841} 1030}
842 1031
843/* check whether the given fd is atcually valid, for error recovery */ 1032/* check whether the given fd is actually valid, for error recovery */
844inline_size int 1033inline_size int
845fd_valid (int fd) 1034fd_valid (int fd)
846{ 1035{
847#ifdef _WIN32 1036#ifdef _WIN32
848 return _get_osfhandle (fd) != -1; 1037 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
849#else 1038#else
850 return fcntl (fd, F_GETFD) != -1; 1039 return fcntl (fd, F_GETFD) != -1;
851#endif 1040#endif
852} 1041}
853 1042
… …
871 1060
872 for (fd = anfdmax; fd--; ) 1061 for (fd = anfdmax; fd--; )
873 if (anfds [fd].events) 1062 if (anfds [fd].events)
874 { 1063 {
875 fd_kill (EV_A_ fd); 1064 fd_kill (EV_A_ fd);
876 return; 1065 break;
877 } 1066 }
878} 1067}
879 1068
880/* usually called after fork if backend needs to re-arm all fds from scratch */ 1069/* usually called after fork if backend needs to re-arm all fds from scratch */
881static void noinline 1070static void noinline
… …
886 for (fd = 0; fd < anfdmax; ++fd) 1075 for (fd = 0; fd < anfdmax; ++fd)
887 if (anfds [fd].events) 1076 if (anfds [fd].events)
888 { 1077 {
889 anfds [fd].events = 0; 1078 anfds [fd].events = 0;
890 anfds [fd].emask = 0; 1079 anfds [fd].emask = 0;
891 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1080 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
892 } 1081 }
893} 1082}
894 1083
1084/* used to prepare libev internal fd's */
1085/* this is not fork-safe */
1086inline_speed void
1087fd_intern (int fd)
1088{
1089#ifdef _WIN32
1090 unsigned long arg = 1;
1091 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1092#else
1093 fcntl (fd, F_SETFD, FD_CLOEXEC);
1094 fcntl (fd, F_SETFL, O_NONBLOCK);
1095#endif
1096}
1097
895/*****************************************************************************/ 1098/*****************************************************************************/
896 1099
897/* 1100/*
898 * the heap functions want a real array index. array index 0 uis guaranteed to not 1101 * 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 1102 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
900 * the branching factor of the d-tree. 1103 * the branching factor of the d-tree.
901 */ 1104 */
902 1105
903/* 1106/*
… …
971 1174
972 for (;;) 1175 for (;;)
973 { 1176 {
974 int c = k << 1; 1177 int c = k << 1;
975 1178
976 if (c > N + HEAP0 - 1) 1179 if (c >= N + HEAP0)
977 break; 1180 break;
978 1181
979 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1182 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
980 ? 1 : 0; 1183 ? 1 : 0;
981 1184
… …
1017 1220
1018/* move an element suitably so it is in a correct place */ 1221/* move an element suitably so it is in a correct place */
1019inline_size void 1222inline_size void
1020adjustheap (ANHE *heap, int N, int k) 1223adjustheap (ANHE *heap, int N, int k)
1021{ 1224{
1022 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1225 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1023 upheap (heap, k); 1226 upheap (heap, k);
1024 else 1227 else
1025 downheap (heap, N, k); 1228 downheap (heap, N, k);
1026} 1229}
1027 1230
… …
1040/*****************************************************************************/ 1243/*****************************************************************************/
1041 1244
1042/* associate signal watchers to a signal signal */ 1245/* associate signal watchers to a signal signal */
1043typedef struct 1246typedef struct
1044{ 1247{
1248 EV_ATOMIC_T pending;
1249#if EV_MULTIPLICITY
1250 EV_P;
1251#endif
1045 WL head; 1252 WL head;
1046 EV_ATOMIC_T gotsig;
1047} ANSIG; 1253} ANSIG;
1048 1254
1049static ANSIG *signals; 1255static ANSIG signals [EV_NSIG - 1];
1050static int signalmax;
1051
1052static EV_ATOMIC_T gotsig;
1053 1256
1054/*****************************************************************************/ 1257/*****************************************************************************/
1055 1258
1056/* used to prepare libev internal fd's */ 1259#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 1260
1070static void noinline 1261static void noinline
1071evpipe_init (EV_P) 1262evpipe_init (EV_P)
1072{ 1263{
1073 if (!ev_is_active (&pipe_w)) 1264 if (!ev_is_active (&pipe_w))
1074 { 1265 {
1075#if EV_USE_EVENTFD 1266# if EV_USE_EVENTFD
1267 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1268 if (evfd < 0 && errno == EINVAL)
1076 if ((evfd = eventfd (0, 0)) >= 0) 1269 evfd = eventfd (0, 0);
1270
1271 if (evfd >= 0)
1077 { 1272 {
1078 evpipe [0] = -1; 1273 evpipe [0] = -1;
1079 fd_intern (evfd); 1274 fd_intern (evfd); /* doing it twice doesn't hurt */
1080 ev_io_set (&pipe_w, evfd, EV_READ); 1275 ev_io_set (&pipe_w, evfd, EV_READ);
1081 } 1276 }
1082 else 1277 else
1083#endif 1278# endif
1084 { 1279 {
1085 while (pipe (evpipe)) 1280 while (pipe (evpipe))
1086 ev_syserr ("(libev) error creating signal/async pipe"); 1281 ev_syserr ("(libev) error creating signal/async pipe");
1087 1282
1088 fd_intern (evpipe [0]); 1283 fd_intern (evpipe [0]);
… …
1099evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1294evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1100{ 1295{
1101 if (!*flag) 1296 if (!*flag)
1102 { 1297 {
1103 int old_errno = errno; /* save errno because write might clobber it */ 1298 int old_errno = errno; /* save errno because write might clobber it */
1299 char dummy;
1104 1300
1105 *flag = 1; 1301 *flag = 1;
1106 1302
1107#if EV_USE_EVENTFD 1303#if EV_USE_EVENTFD
1108 if (evfd >= 0) 1304 if (evfd >= 0)
… …
1110 uint64_t counter = 1; 1306 uint64_t counter = 1;
1111 write (evfd, &counter, sizeof (uint64_t)); 1307 write (evfd, &counter, sizeof (uint64_t));
1112 } 1308 }
1113 else 1309 else
1114#endif 1310#endif
1311 /* win32 people keep sending patches that change this write() to send() */
1312 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1313 /* so when you think this write should be a send instead, please find out */
1314 /* where your send() is from - it's definitely not the microsoft send, and */
1315 /* tell me. thank you. */
1115 write (evpipe [1], &old_errno, 1); 1316 write (evpipe [1], &dummy, 1);
1116 1317
1117 errno = old_errno; 1318 errno = old_errno;
1118 } 1319 }
1119} 1320}
1120 1321
1121/* called whenever the libev signal pipe */ 1322/* called whenever the libev signal pipe */
1122/* got some events (signal, async) */ 1323/* got some events (signal, async) */
1123static void 1324static void
1124pipecb (EV_P_ ev_io *iow, int revents) 1325pipecb (EV_P_ ev_io *iow, int revents)
1125{ 1326{
1327 int i;
1328
1126#if EV_USE_EVENTFD 1329#if EV_USE_EVENTFD
1127 if (evfd >= 0) 1330 if (evfd >= 0)
1128 { 1331 {
1129 uint64_t counter; 1332 uint64_t counter;
1130 read (evfd, &counter, sizeof (uint64_t)); 1333 read (evfd, &counter, sizeof (uint64_t));
1131 } 1334 }
1132 else 1335 else
1133#endif 1336#endif
1134 { 1337 {
1135 char dummy; 1338 char dummy;
1339 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1136 read (evpipe [0], &dummy, 1); 1340 read (evpipe [0], &dummy, 1);
1137 } 1341 }
1138 1342
1139 if (gotsig && ev_is_default_loop (EV_A)) 1343 if (sig_pending)
1140 { 1344 {
1141 int signum; 1345 sig_pending = 0;
1142 gotsig = 0;
1143 1346
1144 for (signum = signalmax; signum--; ) 1347 for (i = EV_NSIG - 1; i--; )
1145 if (signals [signum].gotsig) 1348 if (expect_false (signals [i].pending))
1146 ev_feed_signal_event (EV_A_ signum + 1); 1349 ev_feed_signal_event (EV_A_ i + 1);
1147 } 1350 }
1148 1351
1149#if EV_ASYNC_ENABLE 1352#if EV_ASYNC_ENABLE
1150 if (gotasync) 1353 if (async_pending)
1151 { 1354 {
1152 int i; 1355 async_pending = 0;
1153 gotasync = 0;
1154 1356
1155 for (i = asynccnt; i--; ) 1357 for (i = asynccnt; i--; )
1156 if (asyncs [i]->sent) 1358 if (asyncs [i]->sent)
1157 { 1359 {
1158 asyncs [i]->sent = 0; 1360 asyncs [i]->sent = 0;
… …
1166 1368
1167static void 1369static void
1168ev_sighandler (int signum) 1370ev_sighandler (int signum)
1169{ 1371{
1170#if EV_MULTIPLICITY 1372#if EV_MULTIPLICITY
1171 struct ev_loop *loop = &default_loop_struct; 1373 EV_P = signals [signum - 1].loop;
1172#endif 1374#endif
1173 1375
1174#if _WIN32 1376#ifdef _WIN32
1175 signal (signum, ev_sighandler); 1377 signal (signum, ev_sighandler);
1176#endif 1378#endif
1177 1379
1178 signals [signum - 1].gotsig = 1; 1380 signals [signum - 1].pending = 1;
1179 evpipe_write (EV_A_ &gotsig); 1381 evpipe_write (EV_A_ &sig_pending);
1180} 1382}
1181 1383
1182void noinline 1384void noinline
1183ev_feed_signal_event (EV_P_ int signum) 1385ev_feed_signal_event (EV_P_ int signum)
1184{ 1386{
1185 WL w; 1387 WL w;
1186 1388
1389 if (expect_false (signum <= 0 || signum > EV_NSIG))
1390 return;
1391
1392 --signum;
1393
1187#if EV_MULTIPLICITY 1394#if EV_MULTIPLICITY
1188 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1395 /* it is permissible to try to feed a signal to the wrong loop */
1189#endif 1396 /* or, likely more useful, feeding a signal nobody is waiting for */
1190 1397
1191 --signum; 1398 if (expect_false (signals [signum].loop != EV_A))
1192
1193 if (signum < 0 || signum >= signalmax)
1194 return; 1399 return;
1400#endif
1195 1401
1196 signals [signum].gotsig = 0; 1402 signals [signum].pending = 0;
1197 1403
1198 for (w = signals [signum].head; w; w = w->next) 1404 for (w = signals [signum].head; w; w = w->next)
1199 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1405 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1200} 1406}
1201 1407
1408#if EV_USE_SIGNALFD
1409static void
1410sigfdcb (EV_P_ ev_io *iow, int revents)
1411{
1412 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1413
1414 for (;;)
1415 {
1416 ssize_t res = read (sigfd, si, sizeof (si));
1417
1418 /* not ISO-C, as res might be -1, but works with SuS */
1419 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1420 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1421
1422 if (res < (ssize_t)sizeof (si))
1423 break;
1424 }
1425}
1426#endif
1427
1428#endif
1429
1202/*****************************************************************************/ 1430/*****************************************************************************/
1203 1431
1432#if EV_CHILD_ENABLE
1204static WL childs [EV_PID_HASHSIZE]; 1433static WL childs [EV_PID_HASHSIZE];
1205
1206#ifndef _WIN32
1207 1434
1208static ev_signal childev; 1435static ev_signal childev;
1209 1436
1210#ifndef WIFCONTINUED 1437#ifndef WIFCONTINUED
1211# define WIFCONTINUED(status) 0 1438# define WIFCONTINUED(status) 0
… …
1216child_reap (EV_P_ int chain, int pid, int status) 1443child_reap (EV_P_ int chain, int pid, int status)
1217{ 1444{
1218 ev_child *w; 1445 ev_child *w;
1219 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1446 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1220 1447
1221 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1448 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1222 { 1449 {
1223 if ((w->pid == pid || !w->pid) 1450 if ((w->pid == pid || !w->pid)
1224 && (!traced || (w->flags & 1))) 1451 && (!traced || (w->flags & 1)))
1225 { 1452 {
1226 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1453 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 */ 1478 /* 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 */ 1479 /* 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); 1480 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1254 1481
1255 child_reap (EV_A_ pid, pid, status); 1482 child_reap (EV_A_ pid, pid, status);
1256 if (EV_PID_HASHSIZE > 1) 1483 if ((EV_PID_HASHSIZE) > 1)
1257 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1484 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1258} 1485}
1259 1486
1260#endif 1487#endif
1261 1488
… …
1328#ifdef __APPLE__ 1555#ifdef __APPLE__
1329 /* only select works correctly on that "unix-certified" platform */ 1556 /* only select works correctly on that "unix-certified" platform */
1330 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1557 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1331 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1558 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1332#endif 1559#endif
1560#ifdef __FreeBSD__
1561 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1562#endif
1333 1563
1334 return flags; 1564 return flags;
1335} 1565}
1336 1566
1337unsigned int 1567unsigned int
1338ev_embeddable_backends (void) 1568ev_embeddable_backends (void)
1339{ 1569{
1340 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1570 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1341 1571
1342 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1572 /* 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 */ 1573 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1344 flags &= ~EVBACKEND_EPOLL; 1574 flags &= ~EVBACKEND_EPOLL;
1345 1575
1346 return flags; 1576 return flags;
1347} 1577}
1348 1578
1349unsigned int 1579unsigned int
1350ev_backend (EV_P) 1580ev_backend (EV_P)
1351{ 1581{
1352 return backend; 1582 return backend;
1353} 1583}
1354 1584
1585#if EV_FEATURE_API
1355unsigned int 1586unsigned int
1356ev_loop_count (EV_P) 1587ev_iteration (EV_P)
1357{ 1588{
1358 return loop_count; 1589 return loop_count;
1359} 1590}
1360 1591
1592unsigned int
1593ev_depth (EV_P)
1594{
1595 return loop_depth;
1596}
1597
1361void 1598void
1362ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1599ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1363{ 1600{
1364 io_blocktime = interval; 1601 io_blocktime = interval;
1365} 1602}
… …
1367void 1604void
1368ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1605ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1369{ 1606{
1370 timeout_blocktime = interval; 1607 timeout_blocktime = interval;
1371} 1608}
1609
1610void
1611ev_set_userdata (EV_P_ void *data)
1612{
1613 userdata = data;
1614}
1615
1616void *
1617ev_userdata (EV_P)
1618{
1619 return userdata;
1620}
1621
1622void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1623{
1624 invoke_cb = invoke_pending_cb;
1625}
1626
1627void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1628{
1629 release_cb = release;
1630 acquire_cb = acquire;
1631}
1632#endif
1372 1633
1373/* initialise a loop structure, must be zero-initialised */ 1634/* initialise a loop structure, must be zero-initialised */
1374static void noinline 1635static void noinline
1375loop_init (EV_P_ unsigned int flags) 1636loop_init (EV_P_ unsigned int flags)
1376{ 1637{
… …
1394 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1655 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1395 have_monotonic = 1; 1656 have_monotonic = 1;
1396 } 1657 }
1397#endif 1658#endif
1398 1659
1660 /* pid check not overridable via env */
1661#ifndef _WIN32
1662 if (flags & EVFLAG_FORKCHECK)
1663 curpid = getpid ();
1664#endif
1665
1666 if (!(flags & EVFLAG_NOENV)
1667 && !enable_secure ()
1668 && getenv ("LIBEV_FLAGS"))
1669 flags = atoi (getenv ("LIBEV_FLAGS"));
1670
1399 ev_rt_now = ev_time (); 1671 ev_rt_now = ev_time ();
1400 mn_now = get_clock (); 1672 mn_now = get_clock ();
1401 now_floor = mn_now; 1673 now_floor = mn_now;
1402 rtmn_diff = ev_rt_now - mn_now; 1674 rtmn_diff = ev_rt_now - mn_now;
1675#if EV_FEATURE_API
1676 invoke_cb = ev_invoke_pending;
1677#endif
1403 1678
1404 io_blocktime = 0.; 1679 io_blocktime = 0.;
1405 timeout_blocktime = 0.; 1680 timeout_blocktime = 0.;
1406 backend = 0; 1681 backend = 0;
1407 backend_fd = -1; 1682 backend_fd = -1;
1408 gotasync = 0; 1683 sig_pending = 0;
1684#if EV_ASYNC_ENABLE
1685 async_pending = 0;
1686#endif
1409#if EV_USE_INOTIFY 1687#if EV_USE_INOTIFY
1410 fs_fd = -2; 1688 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1411#endif 1689#endif
1412 1690#if EV_USE_SIGNALFD
1413 /* pid check not overridable via env */ 1691 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1414#ifndef _WIN32
1415 if (flags & EVFLAG_FORKCHECK)
1416 curpid = getpid ();
1417#endif 1692#endif
1418
1419 if (!(flags & EVFLAG_NOENV)
1420 && !enable_secure ()
1421 && getenv ("LIBEV_FLAGS"))
1422 flags = atoi (getenv ("LIBEV_FLAGS"));
1423 1693
1424 if (!(flags & 0x0000ffffU)) 1694 if (!(flags & 0x0000ffffU))
1425 flags |= ev_recommended_backends (); 1695 flags |= ev_recommended_backends ();
1426 1696
1427#if EV_USE_PORT 1697#if EV_USE_PORT
… …
1440 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1710 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1441#endif 1711#endif
1442 1712
1443 ev_prepare_init (&pending_w, pendingcb); 1713 ev_prepare_init (&pending_w, pendingcb);
1444 1714
1715#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1445 ev_init (&pipe_w, pipecb); 1716 ev_init (&pipe_w, pipecb);
1446 ev_set_priority (&pipe_w, EV_MAXPRI); 1717 ev_set_priority (&pipe_w, EV_MAXPRI);
1718#endif
1447 } 1719 }
1448} 1720}
1449 1721
1450/* free up a loop structure */ 1722/* free up a loop structure */
1451static void noinline 1723static void noinline
… …
1453{ 1725{
1454 int i; 1726 int i;
1455 1727
1456 if (ev_is_active (&pipe_w)) 1728 if (ev_is_active (&pipe_w))
1457 { 1729 {
1458 ev_ref (EV_A); /* signal watcher */ 1730 /*ev_ref (EV_A);*/
1459 ev_io_stop (EV_A_ &pipe_w); 1731 /*ev_io_stop (EV_A_ &pipe_w);*/
1460 1732
1461#if EV_USE_EVENTFD 1733#if EV_USE_EVENTFD
1462 if (evfd >= 0) 1734 if (evfd >= 0)
1463 close (evfd); 1735 close (evfd);
1464#endif 1736#endif
1465 1737
1466 if (evpipe [0] >= 0) 1738 if (evpipe [0] >= 0)
1467 { 1739 {
1468 close (evpipe [0]); 1740 EV_WIN32_CLOSE_FD (evpipe [0]);
1469 close (evpipe [1]); 1741 EV_WIN32_CLOSE_FD (evpipe [1]);
1470 } 1742 }
1471 } 1743 }
1744
1745#if EV_USE_SIGNALFD
1746 if (ev_is_active (&sigfd_w))
1747 close (sigfd);
1748#endif
1472 1749
1473#if EV_USE_INOTIFY 1750#if EV_USE_INOTIFY
1474 if (fs_fd >= 0) 1751 if (fs_fd >= 0)
1475 close (fs_fd); 1752 close (fs_fd);
1476#endif 1753#endif
… …
1500#if EV_IDLE_ENABLE 1777#if EV_IDLE_ENABLE
1501 array_free (idle, [i]); 1778 array_free (idle, [i]);
1502#endif 1779#endif
1503 } 1780 }
1504 1781
1505 ev_free (anfds); anfdmax = 0; 1782 ev_free (anfds); anfds = 0; anfdmax = 0;
1506 1783
1507 /* have to use the microsoft-never-gets-it-right macro */ 1784 /* have to use the microsoft-never-gets-it-right macro */
1508 array_free (rfeed, EMPTY); 1785 array_free (rfeed, EMPTY);
1509 array_free (fdchange, EMPTY); 1786 array_free (fdchange, EMPTY);
1510 array_free (timer, EMPTY); 1787 array_free (timer, EMPTY);
… …
1545 1822
1546 if (ev_is_active (&pipe_w)) 1823 if (ev_is_active (&pipe_w))
1547 { 1824 {
1548 /* this "locks" the handlers against writing to the pipe */ 1825 /* this "locks" the handlers against writing to the pipe */
1549 /* while we modify the fd vars */ 1826 /* while we modify the fd vars */
1550 gotsig = 1; 1827 sig_pending = 1;
1551#if EV_ASYNC_ENABLE 1828#if EV_ASYNC_ENABLE
1552 gotasync = 1; 1829 async_pending = 1;
1553#endif 1830#endif
1554 1831
1555 ev_ref (EV_A); 1832 ev_ref (EV_A);
1556 ev_io_stop (EV_A_ &pipe_w); 1833 ev_io_stop (EV_A_ &pipe_w);
1557 1834
… …
1560 close (evfd); 1837 close (evfd);
1561#endif 1838#endif
1562 1839
1563 if (evpipe [0] >= 0) 1840 if (evpipe [0] >= 0)
1564 { 1841 {
1565 close (evpipe [0]); 1842 EV_WIN32_CLOSE_FD (evpipe [0]);
1566 close (evpipe [1]); 1843 EV_WIN32_CLOSE_FD (evpipe [1]);
1567 } 1844 }
1568 1845
1846#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1569 evpipe_init (EV_A); 1847 evpipe_init (EV_A);
1570 /* now iterate over everything, in case we missed something */ 1848 /* now iterate over everything, in case we missed something */
1571 pipecb (EV_A_ &pipe_w, EV_READ); 1849 pipecb (EV_A_ &pipe_w, EV_READ);
1850#endif
1572 } 1851 }
1573 1852
1574 postfork = 0; 1853 postfork = 0;
1575} 1854}
1576 1855
1577#if EV_MULTIPLICITY 1856#if EV_MULTIPLICITY
1578 1857
1579struct ev_loop * 1858struct ev_loop *
1580ev_loop_new (unsigned int flags) 1859ev_loop_new (unsigned int flags)
1581{ 1860{
1582 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1861 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1583 1862
1584 memset (loop, 0, sizeof (struct ev_loop)); 1863 memset (EV_A, 0, sizeof (struct ev_loop));
1585
1586 loop_init (EV_A_ flags); 1864 loop_init (EV_A_ flags);
1587 1865
1588 if (ev_backend (EV_A)) 1866 if (ev_backend (EV_A))
1589 return loop; 1867 return EV_A;
1590 1868
1591 return 0; 1869 return 0;
1592} 1870}
1593 1871
1594void 1872void
… …
1601void 1879void
1602ev_loop_fork (EV_P) 1880ev_loop_fork (EV_P)
1603{ 1881{
1604 postfork = 1; /* must be in line with ev_default_fork */ 1882 postfork = 1; /* must be in line with ev_default_fork */
1605} 1883}
1884#endif /* multiplicity */
1606 1885
1607#if EV_VERIFY 1886#if EV_VERIFY
1608static void noinline 1887static void noinline
1609verify_watcher (EV_P_ W w) 1888verify_watcher (EV_P_ W w)
1610{ 1889{
… …
1638 verify_watcher (EV_A_ ws [cnt]); 1917 verify_watcher (EV_A_ ws [cnt]);
1639 } 1918 }
1640} 1919}
1641#endif 1920#endif
1642 1921
1922#if EV_FEATURE_API
1643void 1923void
1644ev_loop_verify (EV_P) 1924ev_verify (EV_P)
1645{ 1925{
1646#if EV_VERIFY 1926#if EV_VERIFY
1647 int i; 1927 int i;
1648 WL w; 1928 WL w;
1649 1929
… …
1688#if EV_ASYNC_ENABLE 1968#if EV_ASYNC_ENABLE
1689 assert (asyncmax >= asynccnt); 1969 assert (asyncmax >= asynccnt);
1690 array_verify (EV_A_ (W *)asyncs, asynccnt); 1970 array_verify (EV_A_ (W *)asyncs, asynccnt);
1691#endif 1971#endif
1692 1972
1973#if EV_PREPARE_ENABLE
1693 assert (preparemax >= preparecnt); 1974 assert (preparemax >= preparecnt);
1694 array_verify (EV_A_ (W *)prepares, preparecnt); 1975 array_verify (EV_A_ (W *)prepares, preparecnt);
1976#endif
1695 1977
1978#if EV_CHECK_ENABLE
1696 assert (checkmax >= checkcnt); 1979 assert (checkmax >= checkcnt);
1697 array_verify (EV_A_ (W *)checks, checkcnt); 1980 array_verify (EV_A_ (W *)checks, checkcnt);
1981#endif
1698 1982
1699# if 0 1983# if 0
1984#if EV_CHILD_ENABLE
1700 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1985 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) 1986 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1987#endif
1702# endif 1988# endif
1703#endif 1989#endif
1704} 1990}
1705 1991#endif
1706#endif /* multiplicity */
1707 1992
1708#if EV_MULTIPLICITY 1993#if EV_MULTIPLICITY
1709struct ev_loop * 1994struct ev_loop *
1710ev_default_loop_init (unsigned int flags) 1995ev_default_loop_init (unsigned int flags)
1711#else 1996#else
… …
1714#endif 1999#endif
1715{ 2000{
1716 if (!ev_default_loop_ptr) 2001 if (!ev_default_loop_ptr)
1717 { 2002 {
1718#if EV_MULTIPLICITY 2003#if EV_MULTIPLICITY
1719 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2004 EV_P = ev_default_loop_ptr = &default_loop_struct;
1720#else 2005#else
1721 ev_default_loop_ptr = 1; 2006 ev_default_loop_ptr = 1;
1722#endif 2007#endif
1723 2008
1724 loop_init (EV_A_ flags); 2009 loop_init (EV_A_ flags);
1725 2010
1726 if (ev_backend (EV_A)) 2011 if (ev_backend (EV_A))
1727 { 2012 {
1728#ifndef _WIN32 2013#if EV_CHILD_ENABLE
1729 ev_signal_init (&childev, childcb, SIGCHLD); 2014 ev_signal_init (&childev, childcb, SIGCHLD);
1730 ev_set_priority (&childev, EV_MAXPRI); 2015 ev_set_priority (&childev, EV_MAXPRI);
1731 ev_signal_start (EV_A_ &childev); 2016 ev_signal_start (EV_A_ &childev);
1732 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2017 ev_unref (EV_A); /* child watcher should not keep loop alive */
1733#endif 2018#endif
… …
1741 2026
1742void 2027void
1743ev_default_destroy (void) 2028ev_default_destroy (void)
1744{ 2029{
1745#if EV_MULTIPLICITY 2030#if EV_MULTIPLICITY
1746 struct ev_loop *loop = ev_default_loop_ptr; 2031 EV_P = ev_default_loop_ptr;
1747#endif 2032#endif
1748 2033
1749 ev_default_loop_ptr = 0; 2034 ev_default_loop_ptr = 0;
1750 2035
1751#ifndef _WIN32 2036#if EV_CHILD_ENABLE
1752 ev_ref (EV_A); /* child watcher */ 2037 ev_ref (EV_A); /* child watcher */
1753 ev_signal_stop (EV_A_ &childev); 2038 ev_signal_stop (EV_A_ &childev);
1754#endif 2039#endif
1755 2040
1756 loop_destroy (EV_A); 2041 loop_destroy (EV_A);
… …
1758 2043
1759void 2044void
1760ev_default_fork (void) 2045ev_default_fork (void)
1761{ 2046{
1762#if EV_MULTIPLICITY 2047#if EV_MULTIPLICITY
1763 struct ev_loop *loop = ev_default_loop_ptr; 2048 EV_P = ev_default_loop_ptr;
1764#endif 2049#endif
1765 2050
1766 postfork = 1; /* must be in line with ev_loop_fork */ 2051 postfork = 1; /* must be in line with ev_loop_fork */
1767} 2052}
1768 2053
… …
1772ev_invoke (EV_P_ void *w, int revents) 2057ev_invoke (EV_P_ void *w, int revents)
1773{ 2058{
1774 EV_CB_INVOKE ((W)w, revents); 2059 EV_CB_INVOKE ((W)w, revents);
1775} 2060}
1776 2061
1777inline_speed void 2062unsigned int
1778call_pending (EV_P) 2063ev_pending_count (EV_P)
2064{
2065 int pri;
2066 unsigned int count = 0;
2067
2068 for (pri = NUMPRI; pri--; )
2069 count += pendingcnt [pri];
2070
2071 return count;
2072}
2073
2074void noinline
2075ev_invoke_pending (EV_P)
1779{ 2076{
1780 int pri; 2077 int pri;
1781 2078
1782 for (pri = NUMPRI; pri--; ) 2079 for (pri = NUMPRI; pri--; )
1783 while (pendingcnt [pri]) 2080 while (pendingcnt [pri])
… …
1850 EV_FREQUENT_CHECK; 2147 EV_FREQUENT_CHECK;
1851 feed_reverse (EV_A_ (W)w); 2148 feed_reverse (EV_A_ (W)w);
1852 } 2149 }
1853 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2150 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1854 2151
1855 feed_reverse_done (EV_A_ EV_TIMEOUT); 2152 feed_reverse_done (EV_A_ EV_TIMER);
1856 } 2153 }
1857} 2154}
1858 2155
1859#if EV_PERIODIC_ENABLE 2156#if EV_PERIODIC_ENABLE
1860/* make periodics pending */ 2157/* make periodics pending */
… …
1913 feed_reverse_done (EV_A_ EV_PERIODIC); 2210 feed_reverse_done (EV_A_ EV_PERIODIC);
1914 } 2211 }
1915} 2212}
1916 2213
1917/* simply recalculate all periodics */ 2214/* simply recalculate all periodics */
1918/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2215/* TODO: maybe ensure that at least one event happens when jumping forward? */
1919static void noinline 2216static void noinline
1920periodics_reschedule (EV_P) 2217periodics_reschedule (EV_P)
1921{ 2218{
1922 int i; 2219 int i;
1923 2220
… …
1951 ANHE_at_cache (*he); 2248 ANHE_at_cache (*he);
1952 } 2249 }
1953} 2250}
1954 2251
1955/* fetch new monotonic and realtime times from the kernel */ 2252/* fetch new monotonic and realtime times from the kernel */
1956/* also detetc if there was a timejump, and act accordingly */ 2253/* also detect if there was a timejump, and act accordingly */
1957inline_speed void 2254inline_speed void
1958time_update (EV_P_ ev_tstamp max_block) 2255time_update (EV_P_ ev_tstamp max_block)
1959{ 2256{
1960#if EV_USE_MONOTONIC 2257#if EV_USE_MONOTONIC
1961 if (expect_true (have_monotonic)) 2258 if (expect_true (have_monotonic))
… …
2018 2315
2019 mn_now = ev_rt_now; 2316 mn_now = ev_rt_now;
2020 } 2317 }
2021} 2318}
2022 2319
2023static int loop_done;
2024
2025void 2320void
2026ev_loop (EV_P_ int flags) 2321ev_run (EV_P_ int flags)
2027{ 2322{
2323#if EV_FEATURE_API
2324 ++loop_depth;
2325#endif
2326
2327 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2328
2028 loop_done = EVUNLOOP_CANCEL; 2329 loop_done = EVBREAK_CANCEL;
2029 2330
2030 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2331 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2031 2332
2032 do 2333 do
2033 { 2334 {
2034#if EV_VERIFY >= 2 2335#if EV_VERIFY >= 2
2035 ev_loop_verify (EV_A); 2336 ev_verify (EV_A);
2036#endif 2337#endif
2037 2338
2038#ifndef _WIN32 2339#ifndef _WIN32
2039 if (expect_false (curpid)) /* penalise the forking check even more */ 2340 if (expect_false (curpid)) /* penalise the forking check even more */
2040 if (expect_false (getpid () != curpid)) 2341 if (expect_false (getpid () != curpid))
… …
2048 /* we might have forked, so queue fork handlers */ 2349 /* we might have forked, so queue fork handlers */
2049 if (expect_false (postfork)) 2350 if (expect_false (postfork))
2050 if (forkcnt) 2351 if (forkcnt)
2051 { 2352 {
2052 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2353 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2053 call_pending (EV_A); 2354 EV_INVOKE_PENDING;
2054 } 2355 }
2055#endif 2356#endif
2056 2357
2358#if EV_PREPARE_ENABLE
2057 /* queue prepare watchers (and execute them) */ 2359 /* queue prepare watchers (and execute them) */
2058 if (expect_false (preparecnt)) 2360 if (expect_false (preparecnt))
2059 { 2361 {
2060 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2362 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2061 call_pending (EV_A); 2363 EV_INVOKE_PENDING;
2062 } 2364 }
2365#endif
2366
2367 if (expect_false (loop_done))
2368 break;
2063 2369
2064 /* we might have forked, so reify kernel state if necessary */ 2370 /* we might have forked, so reify kernel state if necessary */
2065 if (expect_false (postfork)) 2371 if (expect_false (postfork))
2066 loop_fork (EV_A); 2372 loop_fork (EV_A);
2067 2373
… …
2071 /* calculate blocking time */ 2377 /* calculate blocking time */
2072 { 2378 {
2073 ev_tstamp waittime = 0.; 2379 ev_tstamp waittime = 0.;
2074 ev_tstamp sleeptime = 0.; 2380 ev_tstamp sleeptime = 0.;
2075 2381
2382 /* remember old timestamp for io_blocktime calculation */
2383 ev_tstamp prev_mn_now = mn_now;
2384
2385 /* update time to cancel out callback processing overhead */
2386 time_update (EV_A_ 1e100);
2387
2076 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2388 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2077 { 2389 {
2078 /* update time to cancel out callback processing overhead */
2079 time_update (EV_A_ 1e100);
2080
2081 waittime = MAX_BLOCKTIME; 2390 waittime = MAX_BLOCKTIME;
2082 2391
2083 if (timercnt) 2392 if (timercnt)
2084 { 2393 {
2085 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2394 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2092 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2401 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2093 if (waittime > to) waittime = to; 2402 if (waittime > to) waittime = to;
2094 } 2403 }
2095#endif 2404#endif
2096 2405
2406 /* don't let timeouts decrease the waittime below timeout_blocktime */
2097 if (expect_false (waittime < timeout_blocktime)) 2407 if (expect_false (waittime < timeout_blocktime))
2098 waittime = timeout_blocktime; 2408 waittime = timeout_blocktime;
2099 2409
2100 sleeptime = waittime - backend_fudge; 2410 /* extra check because io_blocktime is commonly 0 */
2101
2102 if (expect_true (sleeptime > io_blocktime)) 2411 if (expect_false (io_blocktime))
2103 sleeptime = io_blocktime;
2104
2105 if (sleeptime)
2106 { 2412 {
2413 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2414
2415 if (sleeptime > waittime - backend_fudge)
2416 sleeptime = waittime - backend_fudge;
2417
2418 if (expect_true (sleeptime > 0.))
2419 {
2107 ev_sleep (sleeptime); 2420 ev_sleep (sleeptime);
2108 waittime -= sleeptime; 2421 waittime -= sleeptime;
2422 }
2109 } 2423 }
2110 } 2424 }
2111 2425
2426#if EV_FEATURE_API
2112 ++loop_count; 2427 ++loop_count;
2428#endif
2429 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2113 backend_poll (EV_A_ waittime); 2430 backend_poll (EV_A_ waittime);
2431 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2114 2432
2115 /* update ev_rt_now, do magic */ 2433 /* update ev_rt_now, do magic */
2116 time_update (EV_A_ waittime + sleeptime); 2434 time_update (EV_A_ waittime + sleeptime);
2117 } 2435 }
2118 2436
… …
2125#if EV_IDLE_ENABLE 2443#if EV_IDLE_ENABLE
2126 /* queue idle watchers unless other events are pending */ 2444 /* queue idle watchers unless other events are pending */
2127 idle_reify (EV_A); 2445 idle_reify (EV_A);
2128#endif 2446#endif
2129 2447
2448#if EV_CHECK_ENABLE
2130 /* queue check watchers, to be executed first */ 2449 /* queue check watchers, to be executed first */
2131 if (expect_false (checkcnt)) 2450 if (expect_false (checkcnt))
2132 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2451 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2452#endif
2133 2453
2134 call_pending (EV_A); 2454 EV_INVOKE_PENDING;
2135 } 2455 }
2136 while (expect_true ( 2456 while (expect_true (
2137 activecnt 2457 activecnt
2138 && !loop_done 2458 && !loop_done
2139 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2459 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2140 )); 2460 ));
2141 2461
2142 if (loop_done == EVUNLOOP_ONE) 2462 if (loop_done == EVBREAK_ONE)
2143 loop_done = EVUNLOOP_CANCEL; 2463 loop_done = EVBREAK_CANCEL;
2144}
2145 2464
2465#if EV_FEATURE_API
2466 --loop_depth;
2467#endif
2468}
2469
2146void 2470void
2147ev_unloop (EV_P_ int how) 2471ev_break (EV_P_ int how)
2148{ 2472{
2149 loop_done = how; 2473 loop_done = how;
2150} 2474}
2151 2475
2152void 2476void
… …
2199inline_size void 2523inline_size void
2200wlist_del (WL *head, WL elem) 2524wlist_del (WL *head, WL elem)
2201{ 2525{
2202 while (*head) 2526 while (*head)
2203 { 2527 {
2204 if (*head == elem) 2528 if (expect_true (*head == elem))
2205 { 2529 {
2206 *head = elem->next; 2530 *head = elem->next;
2207 return; 2531 break;
2208 } 2532 }
2209 2533
2210 head = &(*head)->next; 2534 head = &(*head)->next;
2211 } 2535 }
2212} 2536}
… …
2240} 2564}
2241 2565
2242inline_size void 2566inline_size void
2243pri_adjust (EV_P_ W w) 2567pri_adjust (EV_P_ W w)
2244{ 2568{
2245 int pri = w->priority; 2569 int pri = ev_priority (w);
2246 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2570 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2247 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2571 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2248 w->priority = pri; 2572 ev_set_priority (w, pri);
2249} 2573}
2250 2574
2251inline_speed void 2575inline_speed void
2252ev_start (EV_P_ W w, int active) 2576ev_start (EV_P_ W w, int active)
2253{ 2577{
… …
2272 2596
2273 if (expect_false (ev_is_active (w))) 2597 if (expect_false (ev_is_active (w)))
2274 return; 2598 return;
2275 2599
2276 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2600 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)))); 2601 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2278 2602
2279 EV_FREQUENT_CHECK; 2603 EV_FREQUENT_CHECK;
2280 2604
2281 ev_start (EV_A_ (W)w, 1); 2605 ev_start (EV_A_ (W)w, 1);
2282 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2606 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2283 wlist_add (&anfds[fd].head, (WL)w); 2607 wlist_add (&anfds[fd].head, (WL)w);
2284 2608
2285 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2609 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2286 w->events &= ~EV__IOFDSET; 2610 w->events &= ~EV__IOFDSET;
2287 2611
2288 EV_FREQUENT_CHECK; 2612 EV_FREQUENT_CHECK;
2289} 2613}
2290 2614
… …
2300 EV_FREQUENT_CHECK; 2624 EV_FREQUENT_CHECK;
2301 2625
2302 wlist_del (&anfds[w->fd].head, (WL)w); 2626 wlist_del (&anfds[w->fd].head, (WL)w);
2303 ev_stop (EV_A_ (W)w); 2627 ev_stop (EV_A_ (W)w);
2304 2628
2305 fd_change (EV_A_ w->fd, 1); 2629 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2306 2630
2307 EV_FREQUENT_CHECK; 2631 EV_FREQUENT_CHECK;
2308} 2632}
2309 2633
2310void noinline 2634void noinline
… …
2352 timers [active] = timers [timercnt + HEAP0]; 2676 timers [active] = timers [timercnt + HEAP0];
2353 adjustheap (timers, timercnt, active); 2677 adjustheap (timers, timercnt, active);
2354 } 2678 }
2355 } 2679 }
2356 2680
2357 EV_FREQUENT_CHECK;
2358
2359 ev_at (w) -= mn_now; 2681 ev_at (w) -= mn_now;
2360 2682
2361 ev_stop (EV_A_ (W)w); 2683 ev_stop (EV_A_ (W)w);
2684
2685 EV_FREQUENT_CHECK;
2362} 2686}
2363 2687
2364void noinline 2688void noinline
2365ev_timer_again (EV_P_ ev_timer *w) 2689ev_timer_again (EV_P_ ev_timer *w)
2366{ 2690{
… …
2384 } 2708 }
2385 2709
2386 EV_FREQUENT_CHECK; 2710 EV_FREQUENT_CHECK;
2387} 2711}
2388 2712
2713ev_tstamp
2714ev_timer_remaining (EV_P_ ev_timer *w)
2715{
2716 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2717}
2718
2389#if EV_PERIODIC_ENABLE 2719#if EV_PERIODIC_ENABLE
2390void noinline 2720void noinline
2391ev_periodic_start (EV_P_ ev_periodic *w) 2721ev_periodic_start (EV_P_ ev_periodic *w)
2392{ 2722{
2393 if (expect_false (ev_is_active (w))) 2723 if (expect_false (ev_is_active (w)))
… …
2439 periodics [active] = periodics [periodiccnt + HEAP0]; 2769 periodics [active] = periodics [periodiccnt + HEAP0];
2440 adjustheap (periodics, periodiccnt, active); 2770 adjustheap (periodics, periodiccnt, active);
2441 } 2771 }
2442 } 2772 }
2443 2773
2444 EV_FREQUENT_CHECK;
2445
2446 ev_stop (EV_A_ (W)w); 2774 ev_stop (EV_A_ (W)w);
2775
2776 EV_FREQUENT_CHECK;
2447} 2777}
2448 2778
2449void noinline 2779void noinline
2450ev_periodic_again (EV_P_ ev_periodic *w) 2780ev_periodic_again (EV_P_ ev_periodic *w)
2451{ 2781{
… …
2457 2787
2458#ifndef SA_RESTART 2788#ifndef SA_RESTART
2459# define SA_RESTART 0 2789# define SA_RESTART 0
2460#endif 2790#endif
2461 2791
2792#if EV_SIGNAL_ENABLE
2793
2462void noinline 2794void noinline
2463ev_signal_start (EV_P_ ev_signal *w) 2795ev_signal_start (EV_P_ ev_signal *w)
2464{ 2796{
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))) 2797 if (expect_false (ev_is_active (w)))
2469 return; 2798 return;
2470 2799
2471 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2800 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2472 2801
2473 evpipe_init (EV_A); 2802#if EV_MULTIPLICITY
2803 assert (("libev: a signal must not be attached to two different loops",
2804 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2474 2805
2475 EV_FREQUENT_CHECK; 2806 signals [w->signum - 1].loop = EV_A;
2807#endif
2476 2808
2809 EV_FREQUENT_CHECK;
2810
2811#if EV_USE_SIGNALFD
2812 if (sigfd == -2)
2477 { 2813 {
2478#ifndef _WIN32 2814 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2479 sigset_t full, prev; 2815 if (sigfd < 0 && errno == EINVAL)
2480 sigfillset (&full); 2816 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2481 sigprocmask (SIG_SETMASK, &full, &prev);
2482#endif
2483 2817
2484 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2818 if (sigfd >= 0)
2819 {
2820 fd_intern (sigfd); /* doing it twice will not hurt */
2485 2821
2486#ifndef _WIN32 2822 sigemptyset (&sigfd_set);
2487 sigprocmask (SIG_SETMASK, &prev, 0); 2823
2488#endif 2824 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2825 ev_set_priority (&sigfd_w, EV_MAXPRI);
2826 ev_io_start (EV_A_ &sigfd_w);
2827 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2828 }
2489 } 2829 }
2830
2831 if (sigfd >= 0)
2832 {
2833 /* TODO: check .head */
2834 sigaddset (&sigfd_set, w->signum);
2835 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2836
2837 signalfd (sigfd, &sigfd_set, 0);
2838 }
2839#endif
2490 2840
2491 ev_start (EV_A_ (W)w, 1); 2841 ev_start (EV_A_ (W)w, 1);
2492 wlist_add (&signals [w->signum - 1].head, (WL)w); 2842 wlist_add (&signals [w->signum - 1].head, (WL)w);
2493 2843
2494 if (!((WL)w)->next) 2844 if (!((WL)w)->next)
2845# if EV_USE_SIGNALFD
2846 if (sigfd < 0) /*TODO*/
2847# endif
2495 { 2848 {
2496#if _WIN32 2849# ifdef _WIN32
2850 evpipe_init (EV_A);
2851
2497 signal (w->signum, ev_sighandler); 2852 signal (w->signum, ev_sighandler);
2498#else 2853# else
2499 struct sigaction sa; 2854 struct sigaction sa;
2855
2856 evpipe_init (EV_A);
2857
2500 sa.sa_handler = ev_sighandler; 2858 sa.sa_handler = ev_sighandler;
2501 sigfillset (&sa.sa_mask); 2859 sigfillset (&sa.sa_mask);
2502 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2860 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2503 sigaction (w->signum, &sa, 0); 2861 sigaction (w->signum, &sa, 0);
2862
2863 sigemptyset (&sa.sa_mask);
2864 sigaddset (&sa.sa_mask, w->signum);
2865 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2504#endif 2866#endif
2505 } 2867 }
2506 2868
2507 EV_FREQUENT_CHECK; 2869 EV_FREQUENT_CHECK;
2508} 2870}
2509 2871
2510void noinline 2872void noinline
… …
2518 2880
2519 wlist_del (&signals [w->signum - 1].head, (WL)w); 2881 wlist_del (&signals [w->signum - 1].head, (WL)w);
2520 ev_stop (EV_A_ (W)w); 2882 ev_stop (EV_A_ (W)w);
2521 2883
2522 if (!signals [w->signum - 1].head) 2884 if (!signals [w->signum - 1].head)
2885 {
2886#if EV_MULTIPLICITY
2887 signals [w->signum - 1].loop = 0; /* unattach from signal */
2888#endif
2889#if EV_USE_SIGNALFD
2890 if (sigfd >= 0)
2891 {
2892 sigset_t ss;
2893
2894 sigemptyset (&ss);
2895 sigaddset (&ss, w->signum);
2896 sigdelset (&sigfd_set, w->signum);
2897
2898 signalfd (sigfd, &sigfd_set, 0);
2899 sigprocmask (SIG_UNBLOCK, &ss, 0);
2900 }
2901 else
2902#endif
2523 signal (w->signum, SIG_DFL); 2903 signal (w->signum, SIG_DFL);
2904 }
2524 2905
2525 EV_FREQUENT_CHECK; 2906 EV_FREQUENT_CHECK;
2526} 2907}
2908
2909#endif
2910
2911#if EV_CHILD_ENABLE
2527 2912
2528void 2913void
2529ev_child_start (EV_P_ ev_child *w) 2914ev_child_start (EV_P_ ev_child *w)
2530{ 2915{
2531#if EV_MULTIPLICITY 2916#if EV_MULTIPLICITY
… …
2535 return; 2920 return;
2536 2921
2537 EV_FREQUENT_CHECK; 2922 EV_FREQUENT_CHECK;
2538 2923
2539 ev_start (EV_A_ (W)w, 1); 2924 ev_start (EV_A_ (W)w, 1);
2540 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2925 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2541 2926
2542 EV_FREQUENT_CHECK; 2927 EV_FREQUENT_CHECK;
2543} 2928}
2544 2929
2545void 2930void
… …
2549 if (expect_false (!ev_is_active (w))) 2934 if (expect_false (!ev_is_active (w)))
2550 return; 2935 return;
2551 2936
2552 EV_FREQUENT_CHECK; 2937 EV_FREQUENT_CHECK;
2553 2938
2554 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2939 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2555 ev_stop (EV_A_ (W)w); 2940 ev_stop (EV_A_ (W)w);
2556 2941
2557 EV_FREQUENT_CHECK; 2942 EV_FREQUENT_CHECK;
2558} 2943}
2944
2945#endif
2559 2946
2560#if EV_STAT_ENABLE 2947#if EV_STAT_ENABLE
2561 2948
2562# ifdef _WIN32 2949# ifdef _WIN32
2563# undef lstat 2950# undef lstat
… …
2569#define MIN_STAT_INTERVAL 0.1074891 2956#define MIN_STAT_INTERVAL 0.1074891
2570 2957
2571static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2958static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2572 2959
2573#if EV_USE_INOTIFY 2960#if EV_USE_INOTIFY
2574# define EV_INOTIFY_BUFSIZE 8192 2961
2962/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2963# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2575 2964
2576static void noinline 2965static void noinline
2577infy_add (EV_P_ ev_stat *w) 2966infy_add (EV_P_ ev_stat *w)
2578{ 2967{
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); 2968 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 2969
2581 if (w->wd < 0) 2970 if (w->wd >= 0)
2971 {
2972 struct statfs sfs;
2973
2974 /* now local changes will be tracked by inotify, but remote changes won't */
2975 /* unless the filesystem is known to be local, we therefore still poll */
2976 /* also do poll on <2.6.25, but with normal frequency */
2977
2978 if (!fs_2625)
2979 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2980 else if (!statfs (w->path, &sfs)
2981 && (sfs.f_type == 0x1373 /* devfs */
2982 || sfs.f_type == 0xEF53 /* ext2/3 */
2983 || sfs.f_type == 0x3153464a /* jfs */
2984 || sfs.f_type == 0x52654973 /* reiser3 */
2985 || sfs.f_type == 0x01021994 /* tempfs */
2986 || sfs.f_type == 0x58465342 /* xfs */))
2987 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2988 else
2989 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2582 { 2990 }
2991 else
2992 {
2993 /* can't use inotify, continue to stat */
2583 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2994 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 2995
2586 /* monitor some parent directory for speedup hints */ 2996 /* 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, */ 2997 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2588 /* but an efficiency issue only */ 2998 /* but an efficiency issue only */
2589 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2999 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2590 { 3000 {
2591 char path [4096]; 3001 char path [4096];
… …
2607 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3017 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2608 } 3018 }
2609 } 3019 }
2610 3020
2611 if (w->wd >= 0) 3021 if (w->wd >= 0)
2612 {
2613 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3022 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2614 3023
2615 /* now local changes will be tracked by inotify, but remote changes won't */ 3024 /* now re-arm timer, if required */
2616 /* unless the filesystem it known to be local, we therefore still poll */ 3025 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); 3026 ev_timer_again (EV_A_ &w->timer);
2631 } 3027 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2632} 3028}
2633 3029
2634static void noinline 3030static void noinline
2635infy_del (EV_P_ ev_stat *w) 3031infy_del (EV_P_ ev_stat *w)
2636{ 3032{
… …
2639 3035
2640 if (wd < 0) 3036 if (wd < 0)
2641 return; 3037 return;
2642 3038
2643 w->wd = -2; 3039 w->wd = -2;
2644 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3040 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2645 wlist_del (&fs_hash [slot].head, (WL)w); 3041 wlist_del (&fs_hash [slot].head, (WL)w);
2646 3042
2647 /* remove this watcher, if others are watching it, they will rearm */ 3043 /* remove this watcher, if others are watching it, they will rearm */
2648 inotify_rm_watch (fs_fd, wd); 3044 inotify_rm_watch (fs_fd, wd);
2649} 3045}
… …
2651static void noinline 3047static void noinline
2652infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3048infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2653{ 3049{
2654 if (slot < 0) 3050 if (slot < 0)
2655 /* overflow, need to check for all hash slots */ 3051 /* overflow, need to check for all hash slots */
2656 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3052 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2657 infy_wd (EV_A_ slot, wd, ev); 3053 infy_wd (EV_A_ slot, wd, ev);
2658 else 3054 else
2659 { 3055 {
2660 WL w_; 3056 WL w_;
2661 3057
2662 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3058 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2663 { 3059 {
2664 ev_stat *w = (ev_stat *)w_; 3060 ev_stat *w = (ev_stat *)w_;
2665 w_ = w_->next; /* lets us remove this watcher and all before it */ 3061 w_ = w_->next; /* lets us remove this watcher and all before it */
2666 3062
2667 if (w->wd == wd || wd == -1) 3063 if (w->wd == wd || wd == -1)
2668 { 3064 {
2669 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3065 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2670 { 3066 {
2671 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3067 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2672 w->wd = -1; 3068 w->wd = -1;
2673 infy_add (EV_A_ w); /* re-add, no matter what */ 3069 infy_add (EV_A_ w); /* re-add, no matter what */
2674 } 3070 }
2675 3071
2676 stat_timer_cb (EV_A_ &w->timer, 0); 3072 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2681 3077
2682static void 3078static void
2683infy_cb (EV_P_ ev_io *w, int revents) 3079infy_cb (EV_P_ ev_io *w, int revents)
2684{ 3080{
2685 char buf [EV_INOTIFY_BUFSIZE]; 3081 char buf [EV_INOTIFY_BUFSIZE];
2686 struct inotify_event *ev = (struct inotify_event *)buf;
2687 int ofs; 3082 int ofs;
2688 int len = read (fs_fd, buf, sizeof (buf)); 3083 int len = read (fs_fd, buf, sizeof (buf));
2689 3084
2690 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3085 for (ofs = 0; ofs < len; )
3086 {
3087 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2691 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3088 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3089 ofs += sizeof (struct inotify_event) + ev->len;
3090 }
2692} 3091}
2693 3092
2694inline_size void 3093inline_size void
2695check_2625 (EV_P) 3094ev_check_2625 (EV_P)
2696{ 3095{
2697 /* kernels < 2.6.25 are borked 3096 /* kernels < 2.6.25 are borked
2698 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3097 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2699 */ 3098 */
2700 struct utsname buf; 3099 if (ev_linux_version () < 0x020619)
2701 int major, minor, micro;
2702
2703 if (uname (&buf))
2704 return; 3100 return;
2705 3101
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; 3102 fs_2625 = 1;
3103}
3104
3105inline_size int
3106infy_newfd (void)
3107{
3108#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3109 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3110 if (fd >= 0)
3111 return fd;
3112#endif
3113 return inotify_init ();
2715} 3114}
2716 3115
2717inline_size void 3116inline_size void
2718infy_init (EV_P) 3117infy_init (EV_P)
2719{ 3118{
2720 if (fs_fd != -2) 3119 if (fs_fd != -2)
2721 return; 3120 return;
2722 3121
2723 fs_fd = -1; 3122 fs_fd = -1;
2724 3123
2725 check_2625 (EV_A); 3124 ev_check_2625 (EV_A);
2726 3125
2727 fs_fd = inotify_init (); 3126 fs_fd = infy_newfd ();
2728 3127
2729 if (fs_fd >= 0) 3128 if (fs_fd >= 0)
2730 { 3129 {
3130 fd_intern (fs_fd);
2731 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3131 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2732 ev_set_priority (&fs_w, EV_MAXPRI); 3132 ev_set_priority (&fs_w, EV_MAXPRI);
2733 ev_io_start (EV_A_ &fs_w); 3133 ev_io_start (EV_A_ &fs_w);
3134 ev_unref (EV_A);
2734 } 3135 }
2735} 3136}
2736 3137
2737inline_size void 3138inline_size void
2738infy_fork (EV_P) 3139infy_fork (EV_P)
… …
2740 int slot; 3141 int slot;
2741 3142
2742 if (fs_fd < 0) 3143 if (fs_fd < 0)
2743 return; 3144 return;
2744 3145
3146 ev_ref (EV_A);
3147 ev_io_stop (EV_A_ &fs_w);
2745 close (fs_fd); 3148 close (fs_fd);
2746 fs_fd = inotify_init (); 3149 fs_fd = infy_newfd ();
2747 3150
3151 if (fs_fd >= 0)
3152 {
3153 fd_intern (fs_fd);
3154 ev_io_set (&fs_w, fs_fd, EV_READ);
3155 ev_io_start (EV_A_ &fs_w);
3156 ev_unref (EV_A);
3157 }
3158
2748 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3159 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2749 { 3160 {
2750 WL w_ = fs_hash [slot].head; 3161 WL w_ = fs_hash [slot].head;
2751 fs_hash [slot].head = 0; 3162 fs_hash [slot].head = 0;
2752 3163
2753 while (w_) 3164 while (w_)
… …
2758 w->wd = -1; 3169 w->wd = -1;
2759 3170
2760 if (fs_fd >= 0) 3171 if (fs_fd >= 0)
2761 infy_add (EV_A_ w); /* re-add, no matter what */ 3172 infy_add (EV_A_ w); /* re-add, no matter what */
2762 else 3173 else
3174 {
3175 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3176 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2763 ev_timer_again (EV_A_ &w->timer); 3177 ev_timer_again (EV_A_ &w->timer);
3178 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3179 }
2764 } 3180 }
2765 } 3181 }
2766} 3182}
2767 3183
2768#endif 3184#endif
… …
2785static void noinline 3201static void noinline
2786stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3202stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2787{ 3203{
2788 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3204 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2789 3205
2790 /* we copy this here each the time so that */ 3206 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); 3207 ev_stat_stat (EV_A_ w);
2794 3208
2795 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3209 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2796 if ( 3210 if (
2797 w->prev.st_dev != w->attr.st_dev 3211 prev.st_dev != w->attr.st_dev
2798 || w->prev.st_ino != w->attr.st_ino 3212 || prev.st_ino != w->attr.st_ino
2799 || w->prev.st_mode != w->attr.st_mode 3213 || prev.st_mode != w->attr.st_mode
2800 || w->prev.st_nlink != w->attr.st_nlink 3214 || prev.st_nlink != w->attr.st_nlink
2801 || w->prev.st_uid != w->attr.st_uid 3215 || prev.st_uid != w->attr.st_uid
2802 || w->prev.st_gid != w->attr.st_gid 3216 || prev.st_gid != w->attr.st_gid
2803 || w->prev.st_rdev != w->attr.st_rdev 3217 || prev.st_rdev != w->attr.st_rdev
2804 || w->prev.st_size != w->attr.st_size 3218 || prev.st_size != w->attr.st_size
2805 || w->prev.st_atime != w->attr.st_atime 3219 || prev.st_atime != w->attr.st_atime
2806 || w->prev.st_mtime != w->attr.st_mtime 3220 || prev.st_mtime != w->attr.st_mtime
2807 || w->prev.st_ctime != w->attr.st_ctime 3221 || prev.st_ctime != w->attr.st_ctime
2808 ) { 3222 ) {
3223 /* we only update w->prev on actual differences */
3224 /* in case we test more often than invoke the callback, */
3225 /* to ensure that prev is always different to attr */
3226 w->prev = prev;
3227
2809 #if EV_USE_INOTIFY 3228 #if EV_USE_INOTIFY
2810 if (fs_fd >= 0) 3229 if (fs_fd >= 0)
2811 { 3230 {
2812 infy_del (EV_A_ w); 3231 infy_del (EV_A_ w);
2813 infy_add (EV_A_ w); 3232 infy_add (EV_A_ w);
… …
2838 3257
2839 if (fs_fd >= 0) 3258 if (fs_fd >= 0)
2840 infy_add (EV_A_ w); 3259 infy_add (EV_A_ w);
2841 else 3260 else
2842#endif 3261#endif
3262 {
2843 ev_timer_again (EV_A_ &w->timer); 3263 ev_timer_again (EV_A_ &w->timer);
3264 ev_unref (EV_A);
3265 }
2844 3266
2845 ev_start (EV_A_ (W)w, 1); 3267 ev_start (EV_A_ (W)w, 1);
2846 3268
2847 EV_FREQUENT_CHECK; 3269 EV_FREQUENT_CHECK;
2848} 3270}
… …
2857 EV_FREQUENT_CHECK; 3279 EV_FREQUENT_CHECK;
2858 3280
2859#if EV_USE_INOTIFY 3281#if EV_USE_INOTIFY
2860 infy_del (EV_A_ w); 3282 infy_del (EV_A_ w);
2861#endif 3283#endif
3284
3285 if (ev_is_active (&w->timer))
3286 {
3287 ev_ref (EV_A);
2862 ev_timer_stop (EV_A_ &w->timer); 3288 ev_timer_stop (EV_A_ &w->timer);
3289 }
2863 3290
2864 ev_stop (EV_A_ (W)w); 3291 ev_stop (EV_A_ (W)w);
2865 3292
2866 EV_FREQUENT_CHECK; 3293 EV_FREQUENT_CHECK;
2867} 3294}
… …
2912 3339
2913 EV_FREQUENT_CHECK; 3340 EV_FREQUENT_CHECK;
2914} 3341}
2915#endif 3342#endif
2916 3343
3344#if EV_PREPARE_ENABLE
2917void 3345void
2918ev_prepare_start (EV_P_ ev_prepare *w) 3346ev_prepare_start (EV_P_ ev_prepare *w)
2919{ 3347{
2920 if (expect_false (ev_is_active (w))) 3348 if (expect_false (ev_is_active (w)))
2921 return; 3349 return;
… …
2947 3375
2948 ev_stop (EV_A_ (W)w); 3376 ev_stop (EV_A_ (W)w);
2949 3377
2950 EV_FREQUENT_CHECK; 3378 EV_FREQUENT_CHECK;
2951} 3379}
3380#endif
2952 3381
3382#if EV_CHECK_ENABLE
2953void 3383void
2954ev_check_start (EV_P_ ev_check *w) 3384ev_check_start (EV_P_ ev_check *w)
2955{ 3385{
2956 if (expect_false (ev_is_active (w))) 3386 if (expect_false (ev_is_active (w)))
2957 return; 3387 return;
… …
2983 3413
2984 ev_stop (EV_A_ (W)w); 3414 ev_stop (EV_A_ (W)w);
2985 3415
2986 EV_FREQUENT_CHECK; 3416 EV_FREQUENT_CHECK;
2987} 3417}
3418#endif
2988 3419
2989#if EV_EMBED_ENABLE 3420#if EV_EMBED_ENABLE
2990void noinline 3421void noinline
2991ev_embed_sweep (EV_P_ ev_embed *w) 3422ev_embed_sweep (EV_P_ ev_embed *w)
2992{ 3423{
2993 ev_loop (w->other, EVLOOP_NONBLOCK); 3424 ev_run (w->other, EVRUN_NOWAIT);
2994} 3425}
2995 3426
2996static void 3427static void
2997embed_io_cb (EV_P_ ev_io *io, int revents) 3428embed_io_cb (EV_P_ ev_io *io, int revents)
2998{ 3429{
2999 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3430 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3000 3431
3001 if (ev_cb (w)) 3432 if (ev_cb (w))
3002 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3433 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3003 else 3434 else
3004 ev_loop (w->other, EVLOOP_NONBLOCK); 3435 ev_run (w->other, EVRUN_NOWAIT);
3005} 3436}
3006 3437
3007static void 3438static void
3008embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3439embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3009{ 3440{
3010 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3441 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3011 3442
3012 { 3443 {
3013 struct ev_loop *loop = w->other; 3444 EV_P = w->other;
3014 3445
3015 while (fdchangecnt) 3446 while (fdchangecnt)
3016 { 3447 {
3017 fd_reify (EV_A); 3448 fd_reify (EV_A);
3018 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3449 ev_run (EV_A_ EVRUN_NOWAIT);
3019 } 3450 }
3020 } 3451 }
3021} 3452}
3022 3453
3023static void 3454static void
… …
3026 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3457 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3027 3458
3028 ev_embed_stop (EV_A_ w); 3459 ev_embed_stop (EV_A_ w);
3029 3460
3030 { 3461 {
3031 struct ev_loop *loop = w->other; 3462 EV_P = w->other;
3032 3463
3033 ev_loop_fork (EV_A); 3464 ev_loop_fork (EV_A);
3034 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3465 ev_run (EV_A_ EVRUN_NOWAIT);
3035 } 3466 }
3036 3467
3037 ev_embed_start (EV_A_ w); 3468 ev_embed_start (EV_A_ w);
3038} 3469}
3039 3470
… …
3050{ 3481{
3051 if (expect_false (ev_is_active (w))) 3482 if (expect_false (ev_is_active (w)))
3052 return; 3483 return;
3053 3484
3054 { 3485 {
3055 struct ev_loop *loop = w->other; 3486 EV_P = w->other;
3056 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3487 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); 3488 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3058 } 3489 }
3059 3490
3060 EV_FREQUENT_CHECK; 3491 EV_FREQUENT_CHECK;
… …
3087 3518
3088 ev_io_stop (EV_A_ &w->io); 3519 ev_io_stop (EV_A_ &w->io);
3089 ev_prepare_stop (EV_A_ &w->prepare); 3520 ev_prepare_stop (EV_A_ &w->prepare);
3090 ev_fork_stop (EV_A_ &w->fork); 3521 ev_fork_stop (EV_A_ &w->fork);
3091 3522
3523 ev_stop (EV_A_ (W)w);
3524
3092 EV_FREQUENT_CHECK; 3525 EV_FREQUENT_CHECK;
3093} 3526}
3094#endif 3527#endif
3095 3528
3096#if EV_FORK_ENABLE 3529#if EV_FORK_ENABLE
… …
3136ev_async_start (EV_P_ ev_async *w) 3569ev_async_start (EV_P_ ev_async *w)
3137{ 3570{
3138 if (expect_false (ev_is_active (w))) 3571 if (expect_false (ev_is_active (w)))
3139 return; 3572 return;
3140 3573
3574 w->sent = 0;
3575
3141 evpipe_init (EV_A); 3576 evpipe_init (EV_A);
3142 3577
3143 EV_FREQUENT_CHECK; 3578 EV_FREQUENT_CHECK;
3144 3579
3145 ev_start (EV_A_ (W)w, ++asynccnt); 3580 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3172 3607
3173void 3608void
3174ev_async_send (EV_P_ ev_async *w) 3609ev_async_send (EV_P_ ev_async *w)
3175{ 3610{
3176 w->sent = 1; 3611 w->sent = 1;
3177 evpipe_write (EV_A_ &gotasync); 3612 evpipe_write (EV_A_ &async_pending);
3178} 3613}
3179#endif 3614#endif
3180 3615
3181/*****************************************************************************/ 3616/*****************************************************************************/
3182 3617
… …
3222{ 3657{
3223 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3658 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3224 3659
3225 if (expect_false (!once)) 3660 if (expect_false (!once))
3226 { 3661 {
3227 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3662 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3228 return; 3663 return;
3229 } 3664 }
3230 3665
3231 once->cb = cb; 3666 once->cb = cb;
3232 once->arg = arg; 3667 once->arg = arg;
… …
3319 if (types & EV_ASYNC) 3754 if (types & EV_ASYNC)
3320 for (i = asynccnt; i--; ) 3755 for (i = asynccnt; i--; )
3321 cb (EV_A_ EV_ASYNC, asyncs [i]); 3756 cb (EV_A_ EV_ASYNC, asyncs [i]);
3322#endif 3757#endif
3323 3758
3759#if EV_PREPARE_ENABLE
3324 if (types & EV_PREPARE) 3760 if (types & EV_PREPARE)
3325 for (i = preparecnt; i--; ) 3761 for (i = preparecnt; i--; )
3326#if EV_EMBED_ENABLE 3762# if EV_EMBED_ENABLE
3327 if (ev_cb (prepares [i]) != embed_prepare_cb) 3763 if (ev_cb (prepares [i]) != embed_prepare_cb)
3328#endif 3764# endif
3329 cb (EV_A_ EV_PREPARE, prepares [i]); 3765 cb (EV_A_ EV_PREPARE, prepares [i]);
3766#endif
3330 3767
3768#if EV_CHECK_ENABLE
3331 if (types & EV_CHECK) 3769 if (types & EV_CHECK)
3332 for (i = checkcnt; i--; ) 3770 for (i = checkcnt; i--; )
3333 cb (EV_A_ EV_CHECK, checks [i]); 3771 cb (EV_A_ EV_CHECK, checks [i]);
3772#endif
3334 3773
3774#if EV_SIGNAL_ENABLE
3335 if (types & EV_SIGNAL) 3775 if (types & EV_SIGNAL)
3336 for (i = 0; i < signalmax; ++i) 3776 for (i = 0; i < EV_NSIG - 1; ++i)
3337 for (wl = signals [i].head; wl; ) 3777 for (wl = signals [i].head; wl; )
3338 { 3778 {
3339 wn = wl->next; 3779 wn = wl->next;
3340 cb (EV_A_ EV_SIGNAL, wl); 3780 cb (EV_A_ EV_SIGNAL, wl);
3341 wl = wn; 3781 wl = wn;
3342 } 3782 }
3783#endif
3343 3784
3785#if EV_CHILD_ENABLE
3344 if (types & EV_CHILD) 3786 if (types & EV_CHILD)
3345 for (i = EV_PID_HASHSIZE; i--; ) 3787 for (i = (EV_PID_HASHSIZE); i--; )
3346 for (wl = childs [i]; wl; ) 3788 for (wl = childs [i]; wl; )
3347 { 3789 {
3348 wn = wl->next; 3790 wn = wl->next;
3349 cb (EV_A_ EV_CHILD, wl); 3791 cb (EV_A_ EV_CHILD, wl);
3350 wl = wn; 3792 wl = wn;
3351 } 3793 }
3794#endif
3352/* EV_STAT 0x00001000 /* stat data changed */ 3795/* EV_STAT 0x00001000 /* stat data changed */
3353/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3796/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3354} 3797}
3355#endif 3798#endif
3356 3799
3357#if EV_MULTIPLICITY 3800#if EV_MULTIPLICITY
3358 #include "ev_wrap.h" 3801 #include "ev_wrap.h"
3359#endif 3802#endif
3360 3803
3361#ifdef __cplusplus 3804EV_CPP(})
3362}
3363#endif
3364 3805

Diff Legend

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