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

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

Diff Legend

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