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

Comparing libev/ev.c (file contents):
Revision 1.297 by root, Fri Jul 10 00:36:21 2009 UTC vs.
Revision 1.357 by root, Sat Oct 23 22:25:44 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
392#else
393# define inline_speed static inline
394#endif 481#endif
395 482
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
397 484
398#if EV_MINPRI == EV_MAXPRI 485#if EV_MINPRI == EV_MAXPRI
… …
411#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
412#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
413 500
414#if EV_USE_REALTIME 501#if EV_USE_REALTIME
415/* 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 */
416/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
417static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
418#endif 505#endif
419 506
420#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
422#endif 509#endif
423 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
424#ifdef _WIN32 521#ifdef _WIN32
425# include "ev_win32.c" 522# include "ev_win32.c"
426#endif 523#endif
427 524
428/*****************************************************************************/ 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
429 576
430static void (*syserr_cb)(const char *msg); 577static void (*syserr_cb)(const char *msg);
431 578
432void 579void
433ev_set_syserr_cb (void (*cb)(const char *msg)) 580ev_set_syserr_cb (void (*cb)(const char *msg))
… …
443 590
444 if (syserr_cb) 591 if (syserr_cb)
445 syserr_cb (msg); 592 syserr_cb (msg);
446 else 593 else
447 { 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
448 perror (msg); 603 perror (msg);
604#endif
449 abort (); 605 abort ();
450 } 606 }
451} 607}
452 608
453static void * 609static void *
454ev_realloc_emul (void *ptr, long size) 610ev_realloc_emul (void *ptr, long size)
455{ 611{
612#if __GLIBC__
613 return realloc (ptr, size);
614#else
456 /* some systems, notably openbsd and darwin, fail to properly 615 /* some systems, notably openbsd and darwin, fail to properly
457 * 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
458 * the single unix specification, so work around them here. 617 * the single unix specification, so work around them here.
459 */ 618 */
460 619
461 if (size) 620 if (size)
462 return realloc (ptr, size); 621 return realloc (ptr, size);
463 622
464 free (ptr); 623 free (ptr);
465 return 0; 624 return 0;
625#endif
466} 626}
467 627
468static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 628static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
469 629
470void 630void
… …
478{ 638{
479 ptr = alloc (ptr, size); 639 ptr = alloc (ptr, size);
480 640
481 if (!ptr && size) 641 if (!ptr && size)
482 { 642 {
643#if EV_AVOID_STDIO
644 ev_printerr ("libev: memory allocation failed, aborting.\n");
645#else
483 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 646 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
647#endif
484 abort (); 648 abort ();
485 } 649 }
486 650
487 return ptr; 651 return ptr;
488} 652}
… …
490#define ev_malloc(size) ev_realloc (0, (size)) 654#define ev_malloc(size) ev_realloc (0, (size))
491#define ev_free(ptr) ev_realloc ((ptr), 0) 655#define ev_free(ptr) ev_realloc ((ptr), 0)
492 656
493/*****************************************************************************/ 657/*****************************************************************************/
494 658
659/* set in reify when reification needed */
660#define EV_ANFD_REIFY 1
661
495/* file descriptor info structure */ 662/* file descriptor info structure */
496typedef struct 663typedef struct
497{ 664{
498 WL head; 665 WL head;
499 unsigned char events; /* the events watched for */ 666 unsigned char events; /* the events watched for */
500 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) */
501 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 */
502 unsigned char unused; 669 unsigned char unused;
503#if EV_USE_EPOLL 670#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif 672#endif
506#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
507 SOCKET handle; 674 SOCKET handle;
675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
508#endif 678#endif
509} ANFD; 679} ANFD;
510 680
511/* stores the pending event set for a given watcher */ 681/* stores the pending event set for a given watcher */
512typedef struct 682typedef struct
… …
567 737
568 static int ev_default_loop_ptr; 738 static int ev_default_loop_ptr;
569 739
570#endif 740#endif
571 741
572#if EV_MINIMAL < 2 742#if EV_FEATURE_API
573# define EV_SUSPEND_CB if (expect_false (suspend_cb)) suspend_cb (EV_A)
574# define EV_RESUME_CB if (expect_false (resume_cb )) resume_cb (EV_A) 743# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
744# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
575# define EV_INVOKE_PENDING invoke_cb (EV_A) 745# define EV_INVOKE_PENDING invoke_cb (EV_A)
576#else 746#else
577# define EV_SUSPEND_CB (void)0
578# define EV_RESUME_CB (void)0 747# define EV_RELEASE_CB (void)0
748# define EV_ACQUIRE_CB (void)0
579# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 749# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
580#endif 750#endif
751
752#define EVBREAK_RECURSE 0x80
581 753
582/*****************************************************************************/ 754/*****************************************************************************/
583 755
584#ifndef EV_HAVE_EV_TIME 756#ifndef EV_HAVE_EV_TIME
585ev_tstamp 757ev_tstamp
… …
629 if (delay > 0.) 801 if (delay > 0.)
630 { 802 {
631#if EV_USE_NANOSLEEP 803#if EV_USE_NANOSLEEP
632 struct timespec ts; 804 struct timespec ts;
633 805
634 ts.tv_sec = (time_t)delay; 806 EV_TS_SET (ts, delay);
635 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
636
637 nanosleep (&ts, 0); 807 nanosleep (&ts, 0);
638#elif defined(_WIN32) 808#elif defined(_WIN32)
639 Sleep ((unsigned long)(delay * 1e3)); 809 Sleep ((unsigned long)(delay * 1e3));
640#else 810#else
641 struct timeval tv; 811 struct timeval tv;
642 812
643 tv.tv_sec = (time_t)delay;
644 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
645
646 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 813 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
647 /* somehting not guaranteed by newer posix versions, but guaranteed */ 814 /* something not guaranteed by newer posix versions, but guaranteed */
648 /* by older ones */ 815 /* by older ones */
816 EV_TV_SET (tv, delay);
649 select (0, 0, 0, 0, &tv); 817 select (0, 0, 0, 0, &tv);
650#endif 818#endif
651 } 819 }
652} 820}
653 821
654/*****************************************************************************/ 822/*****************************************************************************/
655 823
656#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 824#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
657 825
658/* find a suitable new size for the given array, */ 826/* find a suitable new size for the given array, */
659/* hopefully by rounding to a ncie-to-malloc size */ 827/* hopefully by rounding to a nice-to-malloc size */
660inline_size int 828inline_size int
661array_nextsize (int elem, int cur, int cnt) 829array_nextsize (int elem, int cur, int cnt)
662{ 830{
663 int ncur = cur + 1; 831 int ncur = cur + 1;
664 832
… …
760} 928}
761 929
762/*****************************************************************************/ 930/*****************************************************************************/
763 931
764inline_speed void 932inline_speed void
765fd_event (EV_P_ int fd, int revents) 933fd_event_nocheck (EV_P_ int fd, int revents)
766{ 934{
767 ANFD *anfd = anfds + fd; 935 ANFD *anfd = anfds + fd;
768 ev_io *w; 936 ev_io *w;
769 937
770 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 938 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
774 if (ev) 942 if (ev)
775 ev_feed_event (EV_A_ (W)w, ev); 943 ev_feed_event (EV_A_ (W)w, ev);
776 } 944 }
777} 945}
778 946
947/* do not submit kernel events for fds that have reify set */
948/* because that means they changed while we were polling for new events */
949inline_speed void
950fd_event (EV_P_ int fd, int revents)
951{
952 ANFD *anfd = anfds + fd;
953
954 if (expect_true (!anfd->reify))
955 fd_event_nocheck (EV_A_ fd, revents);
956}
957
779void 958void
780ev_feed_fd_event (EV_P_ int fd, int revents) 959ev_feed_fd_event (EV_P_ int fd, int revents)
781{ 960{
782 if (fd >= 0 && fd < anfdmax) 961 if (fd >= 0 && fd < anfdmax)
783 fd_event (EV_A_ fd, revents); 962 fd_event_nocheck (EV_A_ fd, revents);
784} 963}
785 964
786/* make sure the external fd watch events are in-sync */ 965/* make sure the external fd watch events are in-sync */
787/* with the kernel/libev internal state */ 966/* with the kernel/libev internal state */
788inline_size void 967inline_size void
… …
794 { 973 {
795 int fd = fdchanges [i]; 974 int fd = fdchanges [i];
796 ANFD *anfd = anfds + fd; 975 ANFD *anfd = anfds + fd;
797 ev_io *w; 976 ev_io *w;
798 977
799 unsigned char events = 0; 978 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify;
800 980
801 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 981 anfd->reify = 0;
802 events |= (unsigned char)w->events;
803 982
804#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
805 if (events) 984 if (o_reify & EV__IOFDSET)
806 { 985 {
807 unsigned long arg; 986 unsigned long arg;
808 #ifdef EV_FD_TO_WIN32_HANDLE
809 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
810 #else
811 anfd->handle = _get_osfhandle (fd);
812 #endif
813 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 988 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
989 printf ("oi %d %x\n", fd, anfd->handle);//D
814 } 990 }
815#endif 991#endif
816 992
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
817 { 994 {
818 unsigned char o_events = anfd->events;
819 unsigned char o_reify = anfd->reify;
820
821 anfd->reify = 0;
822 anfd->events = events; 995 anfd->events = 0;
823 996
824 if (o_events != events || o_reify & EV__IOFDSET) 997 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
998 anfd->events |= (unsigned char)w->events;
999
1000 if (o_events != anfd->events)
1001 o_reify = EV__IOFDSET; /* actually |= */
1002 }
1003
1004 if (o_reify & EV__IOFDSET)
825 backend_modify (EV_A_ fd, o_events, events); 1005 backend_modify (EV_A_ fd, o_events, anfd->events);
826 }
827 } 1006 }
828 1007
829 fdchangecnt = 0; 1008 fdchangecnt = 0;
830} 1009}
831 1010
… …
855 ev_io_stop (EV_A_ w); 1034 ev_io_stop (EV_A_ w);
856 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1035 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
857 } 1036 }
858} 1037}
859 1038
860/* check whether the given fd is atcually valid, for error recovery */ 1039/* check whether the given fd is actually valid, for error recovery */
861inline_size int 1040inline_size int
862fd_valid (int fd) 1041fd_valid (int fd)
863{ 1042{
864#ifdef _WIN32 1043#ifdef _WIN32
865 return _get_osfhandle (fd) != -1; 1044 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
866#else 1045#else
867 return fcntl (fd, F_GETFD) != -1; 1046 return fcntl (fd, F_GETFD) != -1;
868#endif 1047#endif
869} 1048}
870 1049
… …
888 1067
889 for (fd = anfdmax; fd--; ) 1068 for (fd = anfdmax; fd--; )
890 if (anfds [fd].events) 1069 if (anfds [fd].events)
891 { 1070 {
892 fd_kill (EV_A_ fd); 1071 fd_kill (EV_A_ fd);
893 return; 1072 break;
894 } 1073 }
895} 1074}
896 1075
897/* usually called after fork if backend needs to re-arm all fds from scratch */ 1076/* usually called after fork if backend needs to re-arm all fds from scratch */
898static void noinline 1077static void noinline
… …
903 for (fd = 0; fd < anfdmax; ++fd) 1082 for (fd = 0; fd < anfdmax; ++fd)
904 if (anfds [fd].events) 1083 if (anfds [fd].events)
905 { 1084 {
906 anfds [fd].events = 0; 1085 anfds [fd].events = 0;
907 anfds [fd].emask = 0; 1086 anfds [fd].emask = 0;
908 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1087 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
909 } 1088 }
910} 1089}
911 1090
1091/* used to prepare libev internal fd's */
1092/* this is not fork-safe */
1093inline_speed void
1094fd_intern (int fd)
1095{
1096#ifdef _WIN32
1097 unsigned long arg = 1;
1098 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1099#else
1100 fcntl (fd, F_SETFD, FD_CLOEXEC);
1101 fcntl (fd, F_SETFL, O_NONBLOCK);
1102#endif
1103}
1104
912/*****************************************************************************/ 1105/*****************************************************************************/
913 1106
914/* 1107/*
915 * the heap functions want a real array index. array index 0 uis guaranteed to not 1108 * the heap functions want a real array index. array index 0 is guaranteed to not
916 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1109 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
917 * the branching factor of the d-tree. 1110 * the branching factor of the d-tree.
918 */ 1111 */
919 1112
920/* 1113/*
… …
988 1181
989 for (;;) 1182 for (;;)
990 { 1183 {
991 int c = k << 1; 1184 int c = k << 1;
992 1185
993 if (c > N + HEAP0 - 1) 1186 if (c >= N + HEAP0)
994 break; 1187 break;
995 1188
996 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1189 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
997 ? 1 : 0; 1190 ? 1 : 0;
998 1191
… …
1034 1227
1035/* move an element suitably so it is in a correct place */ 1228/* move an element suitably so it is in a correct place */
1036inline_size void 1229inline_size void
1037adjustheap (ANHE *heap, int N, int k) 1230adjustheap (ANHE *heap, int N, int k)
1038{ 1231{
1039 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1232 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1040 upheap (heap, k); 1233 upheap (heap, k);
1041 else 1234 else
1042 downheap (heap, N, k); 1235 downheap (heap, N, k);
1043} 1236}
1044 1237
… …
1057/*****************************************************************************/ 1250/*****************************************************************************/
1058 1251
1059/* associate signal watchers to a signal signal */ 1252/* associate signal watchers to a signal signal */
1060typedef struct 1253typedef struct
1061{ 1254{
1255 EV_ATOMIC_T pending;
1256#if EV_MULTIPLICITY
1257 EV_P;
1258#endif
1062 WL head; 1259 WL head;
1063 EV_ATOMIC_T gotsig;
1064} ANSIG; 1260} ANSIG;
1065 1261
1066static ANSIG *signals; 1262static ANSIG signals [EV_NSIG - 1];
1067static int signalmax;
1068
1069static EV_ATOMIC_T gotsig;
1070 1263
1071/*****************************************************************************/ 1264/*****************************************************************************/
1072 1265
1073/* used to prepare libev internal fd's */ 1266#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1074/* this is not fork-safe */
1075inline_speed void
1076fd_intern (int fd)
1077{
1078#ifdef _WIN32
1079 unsigned long arg = 1;
1080 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1081#else
1082 fcntl (fd, F_SETFD, FD_CLOEXEC);
1083 fcntl (fd, F_SETFL, O_NONBLOCK);
1084#endif
1085}
1086 1267
1087static void noinline 1268static void noinline
1088evpipe_init (EV_P) 1269evpipe_init (EV_P)
1089{ 1270{
1090 if (!ev_is_active (&pipe_w)) 1271 if (!ev_is_active (&pipe_w))
1091 { 1272 {
1092#if EV_USE_EVENTFD 1273# if EV_USE_EVENTFD
1274 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1275 if (evfd < 0 && errno == EINVAL)
1093 if ((evfd = eventfd (0, 0)) >= 0) 1276 evfd = eventfd (0, 0);
1277
1278 if (evfd >= 0)
1094 { 1279 {
1095 evpipe [0] = -1; 1280 evpipe [0] = -1;
1096 fd_intern (evfd); 1281 fd_intern (evfd); /* doing it twice doesn't hurt */
1097 ev_io_set (&pipe_w, evfd, EV_READ); 1282 ev_io_set (&pipe_w, evfd, EV_READ);
1098 } 1283 }
1099 else 1284 else
1100#endif 1285# endif
1101 { 1286 {
1102 while (pipe (evpipe)) 1287 while (pipe (evpipe))
1103 ev_syserr ("(libev) error creating signal/async pipe"); 1288 ev_syserr ("(libev) error creating signal/async pipe");
1104 1289
1105 fd_intern (evpipe [0]); 1290 fd_intern (evpipe [0]);
… …
1116evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1301evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1117{ 1302{
1118 if (!*flag) 1303 if (!*flag)
1119 { 1304 {
1120 int old_errno = errno; /* save errno because write might clobber it */ 1305 int old_errno = errno; /* save errno because write might clobber it */
1306 char dummy;
1121 1307
1122 *flag = 1; 1308 *flag = 1;
1123 1309
1124#if EV_USE_EVENTFD 1310#if EV_USE_EVENTFD
1125 if (evfd >= 0) 1311 if (evfd >= 0)
… …
1127 uint64_t counter = 1; 1313 uint64_t counter = 1;
1128 write (evfd, &counter, sizeof (uint64_t)); 1314 write (evfd, &counter, sizeof (uint64_t));
1129 } 1315 }
1130 else 1316 else
1131#endif 1317#endif
1318 /* win32 people keep sending patches that change this write() to send() */
1319 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1320 /* so when you think this write should be a send instead, please find out */
1321 /* where your send() is from - it's definitely not the microsoft send, and */
1322 /* tell me. thank you. */
1132 write (evpipe [1], &old_errno, 1); 1323 write (evpipe [1], &dummy, 1);
1133 1324
1134 errno = old_errno; 1325 errno = old_errno;
1135 } 1326 }
1136} 1327}
1137 1328
1138/* called whenever the libev signal pipe */ 1329/* called whenever the libev signal pipe */
1139/* got some events (signal, async) */ 1330/* got some events (signal, async) */
1140static void 1331static void
1141pipecb (EV_P_ ev_io *iow, int revents) 1332pipecb (EV_P_ ev_io *iow, int revents)
1142{ 1333{
1334 int i;
1335
1143#if EV_USE_EVENTFD 1336#if EV_USE_EVENTFD
1144 if (evfd >= 0) 1337 if (evfd >= 0)
1145 { 1338 {
1146 uint64_t counter; 1339 uint64_t counter;
1147 read (evfd, &counter, sizeof (uint64_t)); 1340 read (evfd, &counter, sizeof (uint64_t));
1148 } 1341 }
1149 else 1342 else
1150#endif 1343#endif
1151 { 1344 {
1152 char dummy; 1345 char dummy;
1346 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1153 read (evpipe [0], &dummy, 1); 1347 read (evpipe [0], &dummy, 1);
1154 } 1348 }
1155 1349
1156 if (gotsig && ev_is_default_loop (EV_A)) 1350 if (sig_pending)
1157 { 1351 {
1158 int signum; 1352 sig_pending = 0;
1159 gotsig = 0;
1160 1353
1161 for (signum = signalmax; signum--; ) 1354 for (i = EV_NSIG - 1; i--; )
1162 if (signals [signum].gotsig) 1355 if (expect_false (signals [i].pending))
1163 ev_feed_signal_event (EV_A_ signum + 1); 1356 ev_feed_signal_event (EV_A_ i + 1);
1164 } 1357 }
1165 1358
1166#if EV_ASYNC_ENABLE 1359#if EV_ASYNC_ENABLE
1167 if (gotasync) 1360 if (async_pending)
1168 { 1361 {
1169 int i; 1362 async_pending = 0;
1170 gotasync = 0;
1171 1363
1172 for (i = asynccnt; i--; ) 1364 for (i = asynccnt; i--; )
1173 if (asyncs [i]->sent) 1365 if (asyncs [i]->sent)
1174 { 1366 {
1175 asyncs [i]->sent = 0; 1367 asyncs [i]->sent = 0;
… …
1183 1375
1184static void 1376static void
1185ev_sighandler (int signum) 1377ev_sighandler (int signum)
1186{ 1378{
1187#if EV_MULTIPLICITY 1379#if EV_MULTIPLICITY
1188 struct ev_loop *loop = &default_loop_struct; 1380 EV_P = signals [signum - 1].loop;
1189#endif 1381#endif
1190 1382
1191#if _WIN32 1383#ifdef _WIN32
1192 signal (signum, ev_sighandler); 1384 signal (signum, ev_sighandler);
1193#endif 1385#endif
1194 1386
1195 signals [signum - 1].gotsig = 1; 1387 signals [signum - 1].pending = 1;
1196 evpipe_write (EV_A_ &gotsig); 1388 evpipe_write (EV_A_ &sig_pending);
1197} 1389}
1198 1390
1199void noinline 1391void noinline
1200ev_feed_signal_event (EV_P_ int signum) 1392ev_feed_signal_event (EV_P_ int signum)
1201{ 1393{
1202 WL w; 1394 WL w;
1203 1395
1396 if (expect_false (signum <= 0 || signum > EV_NSIG))
1397 return;
1398
1399 --signum;
1400
1204#if EV_MULTIPLICITY 1401#if EV_MULTIPLICITY
1205 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1402 /* it is permissible to try to feed a signal to the wrong loop */
1206#endif 1403 /* or, likely more useful, feeding a signal nobody is waiting for */
1207 1404
1208 --signum; 1405 if (expect_false (signals [signum].loop != EV_A))
1209
1210 if (signum < 0 || signum >= signalmax)
1211 return; 1406 return;
1407#endif
1212 1408
1213 signals [signum].gotsig = 0; 1409 signals [signum].pending = 0;
1214 1410
1215 for (w = signals [signum].head; w; w = w->next) 1411 for (w = signals [signum].head; w; w = w->next)
1216 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1412 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1217} 1413}
1218 1414
1415#if EV_USE_SIGNALFD
1416static void
1417sigfdcb (EV_P_ ev_io *iow, int revents)
1418{
1419 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1420
1421 for (;;)
1422 {
1423 ssize_t res = read (sigfd, si, sizeof (si));
1424
1425 /* not ISO-C, as res might be -1, but works with SuS */
1426 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1427 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1428
1429 if (res < (ssize_t)sizeof (si))
1430 break;
1431 }
1432}
1433#endif
1434
1435#endif
1436
1219/*****************************************************************************/ 1437/*****************************************************************************/
1220 1438
1439#if EV_CHILD_ENABLE
1221static WL childs [EV_PID_HASHSIZE]; 1440static WL childs [EV_PID_HASHSIZE];
1222
1223#ifndef _WIN32
1224 1441
1225static ev_signal childev; 1442static ev_signal childev;
1226 1443
1227#ifndef WIFCONTINUED 1444#ifndef WIFCONTINUED
1228# define WIFCONTINUED(status) 0 1445# define WIFCONTINUED(status) 0
… …
1233child_reap (EV_P_ int chain, int pid, int status) 1450child_reap (EV_P_ int chain, int pid, int status)
1234{ 1451{
1235 ev_child *w; 1452 ev_child *w;
1236 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1453 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1237 1454
1238 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1455 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1239 { 1456 {
1240 if ((w->pid == pid || !w->pid) 1457 if ((w->pid == pid || !w->pid)
1241 && (!traced || (w->flags & 1))) 1458 && (!traced || (w->flags & 1)))
1242 { 1459 {
1243 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1460 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1268 /* make sure we are called again until all children have been reaped */ 1485 /* make sure we are called again until all children have been reaped */
1269 /* we need to do it this way so that the callback gets called before we continue */ 1486 /* we need to do it this way so that the callback gets called before we continue */
1270 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1487 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1271 1488
1272 child_reap (EV_A_ pid, pid, status); 1489 child_reap (EV_A_ pid, pid, status);
1273 if (EV_PID_HASHSIZE > 1) 1490 if ((EV_PID_HASHSIZE) > 1)
1274 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1491 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1275} 1492}
1276 1493
1277#endif 1494#endif
1278 1495
1279/*****************************************************************************/ 1496/*****************************************************************************/
1280 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1281#if EV_USE_PORT 1501#if EV_USE_PORT
1282# include "ev_port.c" 1502# include "ev_port.c"
1283#endif 1503#endif
1284#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1285# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1345#ifdef __APPLE__ 1565#ifdef __APPLE__
1346 /* only select works correctly on that "unix-certified" platform */ 1566 /* only select works correctly on that "unix-certified" platform */
1347 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1567 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1348 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1568 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1349#endif 1569#endif
1570#ifdef __FreeBSD__
1571 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1572#endif
1350 1573
1351 return flags; 1574 return flags;
1352} 1575}
1353 1576
1354unsigned int 1577unsigned int
1355ev_embeddable_backends (void) 1578ev_embeddable_backends (void)
1356{ 1579{
1357 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1580 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1358 1581
1359 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1582 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1360 /* please fix it and tell me how to detect the fix */ 1583 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1361 flags &= ~EVBACKEND_EPOLL; 1584 flags &= ~EVBACKEND_EPOLL;
1362 1585
1363 return flags; 1586 return flags;
1364} 1587}
1365 1588
1366unsigned int 1589unsigned int
1367ev_backend (EV_P) 1590ev_backend (EV_P)
1368{ 1591{
1369 return backend; 1592 return backend;
1370} 1593}
1371 1594
1372#if EV_MINIMAL < 2 1595#if EV_FEATURE_API
1373unsigned int 1596unsigned int
1374ev_loop_count (EV_P) 1597ev_iteration (EV_P)
1375{ 1598{
1376 return loop_count; 1599 return loop_count;
1377} 1600}
1378 1601
1379unsigned int 1602unsigned int
1380ev_loop_depth (EV_P) 1603ev_depth (EV_P)
1381{ 1604{
1382 return loop_depth; 1605 return loop_depth;
1383} 1606}
1384 1607
1385void 1608void
… …
1409void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1632void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1410{ 1633{
1411 invoke_cb = invoke_pending_cb; 1634 invoke_cb = invoke_pending_cb;
1412} 1635}
1413 1636
1414void ev_set_blocking_cb (EV_P_ void (*suspend_cb_)(EV_P), void (*resume_cb_)(EV_P)) 1637void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1415{ 1638{
1416 suspend_cb = suspend_cb_; 1639 release_cb = release;
1417 resume_cb = resume_cb_; 1640 acquire_cb = acquire;
1418} 1641}
1419#endif 1642#endif
1420 1643
1421/* initialise a loop structure, must be zero-initialised */ 1644/* initialise a loop structure, must be zero-initialised */
1422static void noinline 1645static void noinline
… …
1442 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1665 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1443 have_monotonic = 1; 1666 have_monotonic = 1;
1444 } 1667 }
1445#endif 1668#endif
1446 1669
1670 /* pid check not overridable via env */
1671#ifndef _WIN32
1672 if (flags & EVFLAG_FORKCHECK)
1673 curpid = getpid ();
1674#endif
1675
1676 if (!(flags & EVFLAG_NOENV)
1677 && !enable_secure ()
1678 && getenv ("LIBEV_FLAGS"))
1679 flags = atoi (getenv ("LIBEV_FLAGS"));
1680
1447 ev_rt_now = ev_time (); 1681 ev_rt_now = ev_time ();
1448 mn_now = get_clock (); 1682 mn_now = get_clock ();
1449 now_floor = mn_now; 1683 now_floor = mn_now;
1450 rtmn_diff = ev_rt_now - mn_now; 1684 rtmn_diff = ev_rt_now - mn_now;
1451#if EV_MINIMAL < 2 1685#if EV_FEATURE_API
1452 invoke_cb = ev_invoke_pending; 1686 invoke_cb = ev_invoke_pending;
1453#endif 1687#endif
1454 1688
1455 io_blocktime = 0.; 1689 io_blocktime = 0.;
1456 timeout_blocktime = 0.; 1690 timeout_blocktime = 0.;
1457 backend = 0; 1691 backend = 0;
1458 backend_fd = -1; 1692 backend_fd = -1;
1459 gotasync = 0; 1693 sig_pending = 0;
1694#if EV_ASYNC_ENABLE
1695 async_pending = 0;
1696#endif
1460#if EV_USE_INOTIFY 1697#if EV_USE_INOTIFY
1461 fs_fd = -2; 1698 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1462#endif 1699#endif
1463 1700#if EV_USE_SIGNALFD
1464 /* pid check not overridable via env */ 1701 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1465#ifndef _WIN32
1466 if (flags & EVFLAG_FORKCHECK)
1467 curpid = getpid ();
1468#endif 1702#endif
1469
1470 if (!(flags & EVFLAG_NOENV)
1471 && !enable_secure ()
1472 && getenv ("LIBEV_FLAGS"))
1473 flags = atoi (getenv ("LIBEV_FLAGS"));
1474 1703
1475 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1476 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1477 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1478#if EV_USE_PORT 1710#if EV_USE_PORT
1479 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1480#endif 1712#endif
1481#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1482 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1491 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1723 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1492#endif 1724#endif
1493 1725
1494 ev_prepare_init (&pending_w, pendingcb); 1726 ev_prepare_init (&pending_w, pendingcb);
1495 1727
1728#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1496 ev_init (&pipe_w, pipecb); 1729 ev_init (&pipe_w, pipecb);
1497 ev_set_priority (&pipe_w, EV_MAXPRI); 1730 ev_set_priority (&pipe_w, EV_MAXPRI);
1731#endif
1498 } 1732 }
1499} 1733}
1500 1734
1501/* free up a loop structure */ 1735/* free up a loop structure */
1502static void noinline 1736static void noinline
… …
1504{ 1738{
1505 int i; 1739 int i;
1506 1740
1507 if (ev_is_active (&pipe_w)) 1741 if (ev_is_active (&pipe_w))
1508 { 1742 {
1509 ev_ref (EV_A); /* signal watcher */ 1743 /*ev_ref (EV_A);*/
1510 ev_io_stop (EV_A_ &pipe_w); 1744 /*ev_io_stop (EV_A_ &pipe_w);*/
1511 1745
1512#if EV_USE_EVENTFD 1746#if EV_USE_EVENTFD
1513 if (evfd >= 0) 1747 if (evfd >= 0)
1514 close (evfd); 1748 close (evfd);
1515#endif 1749#endif
1516 1750
1517 if (evpipe [0] >= 0) 1751 if (evpipe [0] >= 0)
1518 { 1752 {
1519 close (evpipe [0]); 1753 EV_WIN32_CLOSE_FD (evpipe [0]);
1520 close (evpipe [1]); 1754 EV_WIN32_CLOSE_FD (evpipe [1]);
1521 } 1755 }
1522 } 1756 }
1757
1758#if EV_USE_SIGNALFD
1759 if (ev_is_active (&sigfd_w))
1760 close (sigfd);
1761#endif
1523 1762
1524#if EV_USE_INOTIFY 1763#if EV_USE_INOTIFY
1525 if (fs_fd >= 0) 1764 if (fs_fd >= 0)
1526 close (fs_fd); 1765 close (fs_fd);
1527#endif 1766#endif
1528 1767
1529 if (backend_fd >= 0) 1768 if (backend_fd >= 0)
1530 close (backend_fd); 1769 close (backend_fd);
1531 1770
1771#if EV_USE_IOCP
1772 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1773#endif
1532#if EV_USE_PORT 1774#if EV_USE_PORT
1533 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1775 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1534#endif 1776#endif
1535#if EV_USE_KQUEUE 1777#if EV_USE_KQUEUE
1536 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1778 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1551#if EV_IDLE_ENABLE 1793#if EV_IDLE_ENABLE
1552 array_free (idle, [i]); 1794 array_free (idle, [i]);
1553#endif 1795#endif
1554 } 1796 }
1555 1797
1556 ev_free (anfds); anfdmax = 0; 1798 ev_free (anfds); anfds = 0; anfdmax = 0;
1557 1799
1558 /* have to use the microsoft-never-gets-it-right macro */ 1800 /* have to use the microsoft-never-gets-it-right macro */
1559 array_free (rfeed, EMPTY); 1801 array_free (rfeed, EMPTY);
1560 array_free (fdchange, EMPTY); 1802 array_free (fdchange, EMPTY);
1561 array_free (timer, EMPTY); 1803 array_free (timer, EMPTY);
… …
1596 1838
1597 if (ev_is_active (&pipe_w)) 1839 if (ev_is_active (&pipe_w))
1598 { 1840 {
1599 /* this "locks" the handlers against writing to the pipe */ 1841 /* this "locks" the handlers against writing to the pipe */
1600 /* while we modify the fd vars */ 1842 /* while we modify the fd vars */
1601 gotsig = 1; 1843 sig_pending = 1;
1602#if EV_ASYNC_ENABLE 1844#if EV_ASYNC_ENABLE
1603 gotasync = 1; 1845 async_pending = 1;
1604#endif 1846#endif
1605 1847
1606 ev_ref (EV_A); 1848 ev_ref (EV_A);
1607 ev_io_stop (EV_A_ &pipe_w); 1849 ev_io_stop (EV_A_ &pipe_w);
1608 1850
… …
1611 close (evfd); 1853 close (evfd);
1612#endif 1854#endif
1613 1855
1614 if (evpipe [0] >= 0) 1856 if (evpipe [0] >= 0)
1615 { 1857 {
1616 close (evpipe [0]); 1858 EV_WIN32_CLOSE_FD (evpipe [0]);
1617 close (evpipe [1]); 1859 EV_WIN32_CLOSE_FD (evpipe [1]);
1618 } 1860 }
1619 1861
1862#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1620 evpipe_init (EV_A); 1863 evpipe_init (EV_A);
1621 /* now iterate over everything, in case we missed something */ 1864 /* now iterate over everything, in case we missed something */
1622 pipecb (EV_A_ &pipe_w, EV_READ); 1865 pipecb (EV_A_ &pipe_w, EV_READ);
1866#endif
1623 } 1867 }
1624 1868
1625 postfork = 0; 1869 postfork = 0;
1626} 1870}
1627 1871
1628#if EV_MULTIPLICITY 1872#if EV_MULTIPLICITY
1629 1873
1630struct ev_loop * 1874struct ev_loop *
1631ev_loop_new (unsigned int flags) 1875ev_loop_new (unsigned int flags)
1632{ 1876{
1633 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1877 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1634 1878
1635 memset (loop, 0, sizeof (struct ev_loop)); 1879 memset (EV_A, 0, sizeof (struct ev_loop));
1636
1637 loop_init (EV_A_ flags); 1880 loop_init (EV_A_ flags);
1638 1881
1639 if (ev_backend (EV_A)) 1882 if (ev_backend (EV_A))
1640 return loop; 1883 return EV_A;
1641 1884
1642 return 0; 1885 return 0;
1643} 1886}
1644 1887
1645void 1888void
… …
1690 verify_watcher (EV_A_ ws [cnt]); 1933 verify_watcher (EV_A_ ws [cnt]);
1691 } 1934 }
1692} 1935}
1693#endif 1936#endif
1694 1937
1695#if EV_MINIMAL < 2 1938#if EV_FEATURE_API
1696void 1939void
1697ev_loop_verify (EV_P) 1940ev_verify (EV_P)
1698{ 1941{
1699#if EV_VERIFY 1942#if EV_VERIFY
1700 int i; 1943 int i;
1701 WL w; 1944 WL w;
1702 1945
… …
1741#if EV_ASYNC_ENABLE 1984#if EV_ASYNC_ENABLE
1742 assert (asyncmax >= asynccnt); 1985 assert (asyncmax >= asynccnt);
1743 array_verify (EV_A_ (W *)asyncs, asynccnt); 1986 array_verify (EV_A_ (W *)asyncs, asynccnt);
1744#endif 1987#endif
1745 1988
1989#if EV_PREPARE_ENABLE
1746 assert (preparemax >= preparecnt); 1990 assert (preparemax >= preparecnt);
1747 array_verify (EV_A_ (W *)prepares, preparecnt); 1991 array_verify (EV_A_ (W *)prepares, preparecnt);
1992#endif
1748 1993
1994#if EV_CHECK_ENABLE
1749 assert (checkmax >= checkcnt); 1995 assert (checkmax >= checkcnt);
1750 array_verify (EV_A_ (W *)checks, checkcnt); 1996 array_verify (EV_A_ (W *)checks, checkcnt);
1997#endif
1751 1998
1752# if 0 1999# if 0
2000#if EV_CHILD_ENABLE
1753 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2001 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1754 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 2002 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2003#endif
1755# endif 2004# endif
1756#endif 2005#endif
1757} 2006}
1758#endif 2007#endif
1759 2008
… …
1766#endif 2015#endif
1767{ 2016{
1768 if (!ev_default_loop_ptr) 2017 if (!ev_default_loop_ptr)
1769 { 2018 {
1770#if EV_MULTIPLICITY 2019#if EV_MULTIPLICITY
1771 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2020 EV_P = ev_default_loop_ptr = &default_loop_struct;
1772#else 2021#else
1773 ev_default_loop_ptr = 1; 2022 ev_default_loop_ptr = 1;
1774#endif 2023#endif
1775 2024
1776 loop_init (EV_A_ flags); 2025 loop_init (EV_A_ flags);
1777 2026
1778 if (ev_backend (EV_A)) 2027 if (ev_backend (EV_A))
1779 { 2028 {
1780#ifndef _WIN32 2029#if EV_CHILD_ENABLE
1781 ev_signal_init (&childev, childcb, SIGCHLD); 2030 ev_signal_init (&childev, childcb, SIGCHLD);
1782 ev_set_priority (&childev, EV_MAXPRI); 2031 ev_set_priority (&childev, EV_MAXPRI);
1783 ev_signal_start (EV_A_ &childev); 2032 ev_signal_start (EV_A_ &childev);
1784 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2033 ev_unref (EV_A); /* child watcher should not keep loop alive */
1785#endif 2034#endif
… …
1793 2042
1794void 2043void
1795ev_default_destroy (void) 2044ev_default_destroy (void)
1796{ 2045{
1797#if EV_MULTIPLICITY 2046#if EV_MULTIPLICITY
1798 struct ev_loop *loop = ev_default_loop_ptr; 2047 EV_P = ev_default_loop_ptr;
1799#endif 2048#endif
1800 2049
1801 ev_default_loop_ptr = 0; 2050 ev_default_loop_ptr = 0;
1802 2051
1803#ifndef _WIN32 2052#if EV_CHILD_ENABLE
1804 ev_ref (EV_A); /* child watcher */ 2053 ev_ref (EV_A); /* child watcher */
1805 ev_signal_stop (EV_A_ &childev); 2054 ev_signal_stop (EV_A_ &childev);
1806#endif 2055#endif
1807 2056
1808 loop_destroy (EV_A); 2057 loop_destroy (EV_A);
… …
1810 2059
1811void 2060void
1812ev_default_fork (void) 2061ev_default_fork (void)
1813{ 2062{
1814#if EV_MULTIPLICITY 2063#if EV_MULTIPLICITY
1815 struct ev_loop *loop = ev_default_loop_ptr; 2064 EV_P = ev_default_loop_ptr;
1816#endif 2065#endif
1817 2066
1818 postfork = 1; /* must be in line with ev_loop_fork */ 2067 postfork = 1; /* must be in line with ev_loop_fork */
1819} 2068}
1820 2069
… …
1822 2071
1823void 2072void
1824ev_invoke (EV_P_ void *w, int revents) 2073ev_invoke (EV_P_ void *w, int revents)
1825{ 2074{
1826 EV_CB_INVOKE ((W)w, revents); 2075 EV_CB_INVOKE ((W)w, revents);
2076}
2077
2078unsigned int
2079ev_pending_count (EV_P)
2080{
2081 int pri;
2082 unsigned int count = 0;
2083
2084 for (pri = NUMPRI; pri--; )
2085 count += pendingcnt [pri];
2086
2087 return count;
1827} 2088}
1828 2089
1829void noinline 2090void noinline
1830ev_invoke_pending (EV_P) 2091ev_invoke_pending (EV_P)
1831{ 2092{
… …
1902 EV_FREQUENT_CHECK; 2163 EV_FREQUENT_CHECK;
1903 feed_reverse (EV_A_ (W)w); 2164 feed_reverse (EV_A_ (W)w);
1904 } 2165 }
1905 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2166 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1906 2167
1907 feed_reverse_done (EV_A_ EV_TIMEOUT); 2168 feed_reverse_done (EV_A_ EV_TIMER);
1908 } 2169 }
1909} 2170}
1910 2171
1911#if EV_PERIODIC_ENABLE 2172#if EV_PERIODIC_ENABLE
1912/* make periodics pending */ 2173/* make periodics pending */
… …
1965 feed_reverse_done (EV_A_ EV_PERIODIC); 2226 feed_reverse_done (EV_A_ EV_PERIODIC);
1966 } 2227 }
1967} 2228}
1968 2229
1969/* simply recalculate all periodics */ 2230/* simply recalculate all periodics */
1970/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2231/* TODO: maybe ensure that at least one event happens when jumping forward? */
1971static void noinline 2232static void noinline
1972periodics_reschedule (EV_P) 2233periodics_reschedule (EV_P)
1973{ 2234{
1974 int i; 2235 int i;
1975 2236
… …
2003 ANHE_at_cache (*he); 2264 ANHE_at_cache (*he);
2004 } 2265 }
2005} 2266}
2006 2267
2007/* fetch new monotonic and realtime times from the kernel */ 2268/* fetch new monotonic and realtime times from the kernel */
2008/* also detetc if there was a timejump, and act accordingly */ 2269/* also detect if there was a timejump, and act accordingly */
2009inline_speed void 2270inline_speed void
2010time_update (EV_P_ ev_tstamp max_block) 2271time_update (EV_P_ ev_tstamp max_block)
2011{ 2272{
2012#if EV_USE_MONOTONIC 2273#if EV_USE_MONOTONIC
2013 if (expect_true (have_monotonic)) 2274 if (expect_true (have_monotonic))
… …
2071 mn_now = ev_rt_now; 2332 mn_now = ev_rt_now;
2072 } 2333 }
2073} 2334}
2074 2335
2075void 2336void
2076ev_loop (EV_P_ int flags) 2337ev_run (EV_P_ int flags)
2077{ 2338{
2078#if EV_MINIMAL < 2 2339#if EV_FEATURE_API
2079 ++loop_depth; 2340 ++loop_depth;
2080#endif 2341#endif
2081 2342
2343 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2344
2082 loop_done = EVUNLOOP_CANCEL; 2345 loop_done = EVBREAK_CANCEL;
2083 2346
2084 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2347 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2085 2348
2086 do 2349 do
2087 { 2350 {
2088#if EV_VERIFY >= 2 2351#if EV_VERIFY >= 2
2089 ev_loop_verify (EV_A); 2352 ev_verify (EV_A);
2090#endif 2353#endif
2091 2354
2092#ifndef _WIN32 2355#ifndef _WIN32
2093 if (expect_false (curpid)) /* penalise the forking check even more */ 2356 if (expect_false (curpid)) /* penalise the forking check even more */
2094 if (expect_false (getpid () != curpid)) 2357 if (expect_false (getpid () != curpid))
… …
2106 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2369 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2107 EV_INVOKE_PENDING; 2370 EV_INVOKE_PENDING;
2108 } 2371 }
2109#endif 2372#endif
2110 2373
2374#if EV_PREPARE_ENABLE
2111 /* queue prepare watchers (and execute them) */ 2375 /* queue prepare watchers (and execute them) */
2112 if (expect_false (preparecnt)) 2376 if (expect_false (preparecnt))
2113 { 2377 {
2114 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2378 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2115 EV_INVOKE_PENDING; 2379 EV_INVOKE_PENDING;
2116 } 2380 }
2381#endif
2382
2383 if (expect_false (loop_done))
2384 break;
2117 2385
2118 /* we might have forked, so reify kernel state if necessary */ 2386 /* we might have forked, so reify kernel state if necessary */
2119 if (expect_false (postfork)) 2387 if (expect_false (postfork))
2120 loop_fork (EV_A); 2388 loop_fork (EV_A);
2121 2389
… …
2125 /* calculate blocking time */ 2393 /* calculate blocking time */
2126 { 2394 {
2127 ev_tstamp waittime = 0.; 2395 ev_tstamp waittime = 0.;
2128 ev_tstamp sleeptime = 0.; 2396 ev_tstamp sleeptime = 0.;
2129 2397
2398 /* remember old timestamp for io_blocktime calculation */
2399 ev_tstamp prev_mn_now = mn_now;
2400
2401 /* update time to cancel out callback processing overhead */
2402 time_update (EV_A_ 1e100);
2403
2130 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2404 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2131 { 2405 {
2132 /* remember old timestamp for io_blocktime calculation */
2133 ev_tstamp prev_mn_now = mn_now;
2134
2135 /* update time to cancel out callback processing overhead */
2136 time_update (EV_A_ 1e100);
2137
2138 waittime = MAX_BLOCKTIME; 2406 waittime = MAX_BLOCKTIME;
2139 2407
2140 if (timercnt) 2408 if (timercnt)
2141 { 2409 {
2142 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2410 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2169 waittime -= sleeptime; 2437 waittime -= sleeptime;
2170 } 2438 }
2171 } 2439 }
2172 } 2440 }
2173 2441
2174#if EV_MINIMAL < 2 2442#if EV_FEATURE_API
2175 ++loop_count; 2443 ++loop_count;
2176#endif 2444#endif
2445 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2177 backend_poll (EV_A_ waittime); 2446 backend_poll (EV_A_ waittime);
2447 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2178 2448
2179 /* update ev_rt_now, do magic */ 2449 /* update ev_rt_now, do magic */
2180 time_update (EV_A_ waittime + sleeptime); 2450 time_update (EV_A_ waittime + sleeptime);
2181 } 2451 }
2182 2452
… …
2189#if EV_IDLE_ENABLE 2459#if EV_IDLE_ENABLE
2190 /* queue idle watchers unless other events are pending */ 2460 /* queue idle watchers unless other events are pending */
2191 idle_reify (EV_A); 2461 idle_reify (EV_A);
2192#endif 2462#endif
2193 2463
2464#if EV_CHECK_ENABLE
2194 /* queue check watchers, to be executed first */ 2465 /* queue check watchers, to be executed first */
2195 if (expect_false (checkcnt)) 2466 if (expect_false (checkcnt))
2196 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2467 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2468#endif
2197 2469
2198 EV_INVOKE_PENDING; 2470 EV_INVOKE_PENDING;
2199 } 2471 }
2200 while (expect_true ( 2472 while (expect_true (
2201 activecnt 2473 activecnt
2202 && !loop_done 2474 && !loop_done
2203 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2475 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2204 )); 2476 ));
2205 2477
2206 if (loop_done == EVUNLOOP_ONE) 2478 if (loop_done == EVBREAK_ONE)
2207 loop_done = EVUNLOOP_CANCEL; 2479 loop_done = EVBREAK_CANCEL;
2208 2480
2209#if EV_MINIMAL < 2 2481#if EV_FEATURE_API
2210 --loop_depth; 2482 --loop_depth;
2211#endif 2483#endif
2212} 2484}
2213 2485
2214void 2486void
2215ev_unloop (EV_P_ int how) 2487ev_break (EV_P_ int how)
2216{ 2488{
2217 loop_done = how; 2489 loop_done = how;
2218} 2490}
2219 2491
2220void 2492void
… …
2267inline_size void 2539inline_size void
2268wlist_del (WL *head, WL elem) 2540wlist_del (WL *head, WL elem)
2269{ 2541{
2270 while (*head) 2542 while (*head)
2271 { 2543 {
2272 if (*head == elem) 2544 if (expect_true (*head == elem))
2273 { 2545 {
2274 *head = elem->next; 2546 *head = elem->next;
2275 return; 2547 break;
2276 } 2548 }
2277 2549
2278 head = &(*head)->next; 2550 head = &(*head)->next;
2279 } 2551 }
2280} 2552}
… …
2340 2612
2341 if (expect_false (ev_is_active (w))) 2613 if (expect_false (ev_is_active (w)))
2342 return; 2614 return;
2343 2615
2344 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2616 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2345 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2617 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2346 2618
2347 EV_FREQUENT_CHECK; 2619 EV_FREQUENT_CHECK;
2348 2620
2349 ev_start (EV_A_ (W)w, 1); 2621 ev_start (EV_A_ (W)w, 1);
2350 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2622 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2351 wlist_add (&anfds[fd].head, (WL)w); 2623 wlist_add (&anfds[fd].head, (WL)w);
2352 2624
2353 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2625 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2354 w->events &= ~EV__IOFDSET; 2626 w->events &= ~EV__IOFDSET;
2355 2627
2356 EV_FREQUENT_CHECK; 2628 EV_FREQUENT_CHECK;
2357} 2629}
2358 2630
… …
2368 EV_FREQUENT_CHECK; 2640 EV_FREQUENT_CHECK;
2369 2641
2370 wlist_del (&anfds[w->fd].head, (WL)w); 2642 wlist_del (&anfds[w->fd].head, (WL)w);
2371 ev_stop (EV_A_ (W)w); 2643 ev_stop (EV_A_ (W)w);
2372 2644
2373 fd_change (EV_A_ w->fd, 1); 2645 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2374 2646
2375 EV_FREQUENT_CHECK; 2647 EV_FREQUENT_CHECK;
2376} 2648}
2377 2649
2378void noinline 2650void noinline
… …
2420 timers [active] = timers [timercnt + HEAP0]; 2692 timers [active] = timers [timercnt + HEAP0];
2421 adjustheap (timers, timercnt, active); 2693 adjustheap (timers, timercnt, active);
2422 } 2694 }
2423 } 2695 }
2424 2696
2425 EV_FREQUENT_CHECK;
2426
2427 ev_at (w) -= mn_now; 2697 ev_at (w) -= mn_now;
2428 2698
2429 ev_stop (EV_A_ (W)w); 2699 ev_stop (EV_A_ (W)w);
2700
2701 EV_FREQUENT_CHECK;
2430} 2702}
2431 2703
2432void noinline 2704void noinline
2433ev_timer_again (EV_P_ ev_timer *w) 2705ev_timer_again (EV_P_ ev_timer *w)
2434{ 2706{
… …
2452 } 2724 }
2453 2725
2454 EV_FREQUENT_CHECK; 2726 EV_FREQUENT_CHECK;
2455} 2727}
2456 2728
2729ev_tstamp
2730ev_timer_remaining (EV_P_ ev_timer *w)
2731{
2732 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2733}
2734
2457#if EV_PERIODIC_ENABLE 2735#if EV_PERIODIC_ENABLE
2458void noinline 2736void noinline
2459ev_periodic_start (EV_P_ ev_periodic *w) 2737ev_periodic_start (EV_P_ ev_periodic *w)
2460{ 2738{
2461 if (expect_false (ev_is_active (w))) 2739 if (expect_false (ev_is_active (w)))
… …
2507 periodics [active] = periodics [periodiccnt + HEAP0]; 2785 periodics [active] = periodics [periodiccnt + HEAP0];
2508 adjustheap (periodics, periodiccnt, active); 2786 adjustheap (periodics, periodiccnt, active);
2509 } 2787 }
2510 } 2788 }
2511 2789
2512 EV_FREQUENT_CHECK;
2513
2514 ev_stop (EV_A_ (W)w); 2790 ev_stop (EV_A_ (W)w);
2791
2792 EV_FREQUENT_CHECK;
2515} 2793}
2516 2794
2517void noinline 2795void noinline
2518ev_periodic_again (EV_P_ ev_periodic *w) 2796ev_periodic_again (EV_P_ ev_periodic *w)
2519{ 2797{
… …
2525 2803
2526#ifndef SA_RESTART 2804#ifndef SA_RESTART
2527# define SA_RESTART 0 2805# define SA_RESTART 0
2528#endif 2806#endif
2529 2807
2808#if EV_SIGNAL_ENABLE
2809
2530void noinline 2810void noinline
2531ev_signal_start (EV_P_ ev_signal *w) 2811ev_signal_start (EV_P_ ev_signal *w)
2532{ 2812{
2533#if EV_MULTIPLICITY
2534 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2535#endif
2536 if (expect_false (ev_is_active (w))) 2813 if (expect_false (ev_is_active (w)))
2537 return; 2814 return;
2538 2815
2539 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2816 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2540 2817
2541 evpipe_init (EV_A); 2818#if EV_MULTIPLICITY
2819 assert (("libev: a signal must not be attached to two different loops",
2820 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2542 2821
2543 EV_FREQUENT_CHECK; 2822 signals [w->signum - 1].loop = EV_A;
2823#endif
2544 2824
2825 EV_FREQUENT_CHECK;
2826
2827#if EV_USE_SIGNALFD
2828 if (sigfd == -2)
2545 { 2829 {
2546#ifndef _WIN32 2830 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2547 sigset_t full, prev; 2831 if (sigfd < 0 && errno == EINVAL)
2548 sigfillset (&full); 2832 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2549 sigprocmask (SIG_SETMASK, &full, &prev);
2550#endif
2551 2833
2552 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2834 if (sigfd >= 0)
2835 {
2836 fd_intern (sigfd); /* doing it twice will not hurt */
2553 2837
2554#ifndef _WIN32 2838 sigemptyset (&sigfd_set);
2555 sigprocmask (SIG_SETMASK, &prev, 0); 2839
2556#endif 2840 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2841 ev_set_priority (&sigfd_w, EV_MAXPRI);
2842 ev_io_start (EV_A_ &sigfd_w);
2843 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2844 }
2557 } 2845 }
2846
2847 if (sigfd >= 0)
2848 {
2849 /* TODO: check .head */
2850 sigaddset (&sigfd_set, w->signum);
2851 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2852
2853 signalfd (sigfd, &sigfd_set, 0);
2854 }
2855#endif
2558 2856
2559 ev_start (EV_A_ (W)w, 1); 2857 ev_start (EV_A_ (W)w, 1);
2560 wlist_add (&signals [w->signum - 1].head, (WL)w); 2858 wlist_add (&signals [w->signum - 1].head, (WL)w);
2561 2859
2562 if (!((WL)w)->next) 2860 if (!((WL)w)->next)
2861# if EV_USE_SIGNALFD
2862 if (sigfd < 0) /*TODO*/
2863# endif
2563 { 2864 {
2564#if _WIN32 2865# ifdef _WIN32
2866 evpipe_init (EV_A);
2867
2565 signal (w->signum, ev_sighandler); 2868 signal (w->signum, ev_sighandler);
2566#else 2869# else
2567 struct sigaction sa; 2870 struct sigaction sa;
2871
2872 evpipe_init (EV_A);
2873
2568 sa.sa_handler = ev_sighandler; 2874 sa.sa_handler = ev_sighandler;
2569 sigfillset (&sa.sa_mask); 2875 sigfillset (&sa.sa_mask);
2570 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2876 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2571 sigaction (w->signum, &sa, 0); 2877 sigaction (w->signum, &sa, 0);
2878
2879 sigemptyset (&sa.sa_mask);
2880 sigaddset (&sa.sa_mask, w->signum);
2881 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2572#endif 2882#endif
2573 } 2883 }
2574 2884
2575 EV_FREQUENT_CHECK; 2885 EV_FREQUENT_CHECK;
2576} 2886}
2577 2887
2578void noinline 2888void noinline
… …
2586 2896
2587 wlist_del (&signals [w->signum - 1].head, (WL)w); 2897 wlist_del (&signals [w->signum - 1].head, (WL)w);
2588 ev_stop (EV_A_ (W)w); 2898 ev_stop (EV_A_ (W)w);
2589 2899
2590 if (!signals [w->signum - 1].head) 2900 if (!signals [w->signum - 1].head)
2901 {
2902#if EV_MULTIPLICITY
2903 signals [w->signum - 1].loop = 0; /* unattach from signal */
2904#endif
2905#if EV_USE_SIGNALFD
2906 if (sigfd >= 0)
2907 {
2908 sigset_t ss;
2909
2910 sigemptyset (&ss);
2911 sigaddset (&ss, w->signum);
2912 sigdelset (&sigfd_set, w->signum);
2913
2914 signalfd (sigfd, &sigfd_set, 0);
2915 sigprocmask (SIG_UNBLOCK, &ss, 0);
2916 }
2917 else
2918#endif
2591 signal (w->signum, SIG_DFL); 2919 signal (w->signum, SIG_DFL);
2920 }
2592 2921
2593 EV_FREQUENT_CHECK; 2922 EV_FREQUENT_CHECK;
2594} 2923}
2924
2925#endif
2926
2927#if EV_CHILD_ENABLE
2595 2928
2596void 2929void
2597ev_child_start (EV_P_ ev_child *w) 2930ev_child_start (EV_P_ ev_child *w)
2598{ 2931{
2599#if EV_MULTIPLICITY 2932#if EV_MULTIPLICITY
… …
2603 return; 2936 return;
2604 2937
2605 EV_FREQUENT_CHECK; 2938 EV_FREQUENT_CHECK;
2606 2939
2607 ev_start (EV_A_ (W)w, 1); 2940 ev_start (EV_A_ (W)w, 1);
2608 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2941 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2609 2942
2610 EV_FREQUENT_CHECK; 2943 EV_FREQUENT_CHECK;
2611} 2944}
2612 2945
2613void 2946void
… …
2617 if (expect_false (!ev_is_active (w))) 2950 if (expect_false (!ev_is_active (w)))
2618 return; 2951 return;
2619 2952
2620 EV_FREQUENT_CHECK; 2953 EV_FREQUENT_CHECK;
2621 2954
2622 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2955 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2623 ev_stop (EV_A_ (W)w); 2956 ev_stop (EV_A_ (W)w);
2624 2957
2625 EV_FREQUENT_CHECK; 2958 EV_FREQUENT_CHECK;
2626} 2959}
2960
2961#endif
2627 2962
2628#if EV_STAT_ENABLE 2963#if EV_STAT_ENABLE
2629 2964
2630# ifdef _WIN32 2965# ifdef _WIN32
2631# undef lstat 2966# undef lstat
… …
2637#define MIN_STAT_INTERVAL 0.1074891 2972#define MIN_STAT_INTERVAL 0.1074891
2638 2973
2639static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2974static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2640 2975
2641#if EV_USE_INOTIFY 2976#if EV_USE_INOTIFY
2642# define EV_INOTIFY_BUFSIZE 8192 2977
2978/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2979# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2643 2980
2644static void noinline 2981static void noinline
2645infy_add (EV_P_ ev_stat *w) 2982infy_add (EV_P_ ev_stat *w)
2646{ 2983{
2647 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); 2984 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);
2648 2985
2649 if (w->wd < 0) 2986 if (w->wd >= 0)
2987 {
2988 struct statfs sfs;
2989
2990 /* now local changes will be tracked by inotify, but remote changes won't */
2991 /* unless the filesystem is known to be local, we therefore still poll */
2992 /* also do poll on <2.6.25, but with normal frequency */
2993
2994 if (!fs_2625)
2995 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2996 else if (!statfs (w->path, &sfs)
2997 && (sfs.f_type == 0x1373 /* devfs */
2998 || sfs.f_type == 0xEF53 /* ext2/3 */
2999 || sfs.f_type == 0x3153464a /* jfs */
3000 || sfs.f_type == 0x52654973 /* reiser3 */
3001 || sfs.f_type == 0x01021994 /* tempfs */
3002 || sfs.f_type == 0x58465342 /* xfs */))
3003 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3004 else
3005 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2650 { 3006 }
3007 else
3008 {
3009 /* can't use inotify, continue to stat */
2651 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3010 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2652 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2653 3011
2654 /* monitor some parent directory for speedup hints */ 3012 /* if path is not there, monitor some parent directory for speedup hints */
2655 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3013 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2656 /* but an efficiency issue only */ 3014 /* but an efficiency issue only */
2657 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3015 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2658 { 3016 {
2659 char path [4096]; 3017 char path [4096];
… …
2675 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3033 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2676 } 3034 }
2677 } 3035 }
2678 3036
2679 if (w->wd >= 0) 3037 if (w->wd >= 0)
2680 {
2681 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3038 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2682 3039
2683 /* now local changes will be tracked by inotify, but remote changes won't */ 3040 /* now re-arm timer, if required */
2684 /* unless the filesystem it known to be local, we therefore still poll */ 3041 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2685 /* also do poll on <2.6.25, but with normal frequency */
2686 struct statfs sfs;
2687
2688 if (fs_2625 && !statfs (w->path, &sfs))
2689 if (sfs.f_type == 0x1373 /* devfs */
2690 || sfs.f_type == 0xEF53 /* ext2/3 */
2691 || sfs.f_type == 0x3153464a /* jfs */
2692 || sfs.f_type == 0x52654973 /* reiser3 */
2693 || sfs.f_type == 0x01021994 /* tempfs */
2694 || sfs.f_type == 0x58465342 /* xfs */)
2695 return;
2696
2697 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2698 ev_timer_again (EV_A_ &w->timer); 3042 ev_timer_again (EV_A_ &w->timer);
2699 } 3043 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2700} 3044}
2701 3045
2702static void noinline 3046static void noinline
2703infy_del (EV_P_ ev_stat *w) 3047infy_del (EV_P_ ev_stat *w)
2704{ 3048{
… …
2707 3051
2708 if (wd < 0) 3052 if (wd < 0)
2709 return; 3053 return;
2710 3054
2711 w->wd = -2; 3055 w->wd = -2;
2712 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3056 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2713 wlist_del (&fs_hash [slot].head, (WL)w); 3057 wlist_del (&fs_hash [slot].head, (WL)w);
2714 3058
2715 /* remove this watcher, if others are watching it, they will rearm */ 3059 /* remove this watcher, if others are watching it, they will rearm */
2716 inotify_rm_watch (fs_fd, wd); 3060 inotify_rm_watch (fs_fd, wd);
2717} 3061}
… …
2719static void noinline 3063static void noinline
2720infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3064infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2721{ 3065{
2722 if (slot < 0) 3066 if (slot < 0)
2723 /* overflow, need to check for all hash slots */ 3067 /* overflow, need to check for all hash slots */
2724 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3068 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2725 infy_wd (EV_A_ slot, wd, ev); 3069 infy_wd (EV_A_ slot, wd, ev);
2726 else 3070 else
2727 { 3071 {
2728 WL w_; 3072 WL w_;
2729 3073
2730 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3074 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2731 { 3075 {
2732 ev_stat *w = (ev_stat *)w_; 3076 ev_stat *w = (ev_stat *)w_;
2733 w_ = w_->next; /* lets us remove this watcher and all before it */ 3077 w_ = w_->next; /* lets us remove this watcher and all before it */
2734 3078
2735 if (w->wd == wd || wd == -1) 3079 if (w->wd == wd || wd == -1)
2736 { 3080 {
2737 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3081 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2738 { 3082 {
2739 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3083 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2740 w->wd = -1; 3084 w->wd = -1;
2741 infy_add (EV_A_ w); /* re-add, no matter what */ 3085 infy_add (EV_A_ w); /* re-add, no matter what */
2742 } 3086 }
2743 3087
2744 stat_timer_cb (EV_A_ &w->timer, 0); 3088 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2749 3093
2750static void 3094static void
2751infy_cb (EV_P_ ev_io *w, int revents) 3095infy_cb (EV_P_ ev_io *w, int revents)
2752{ 3096{
2753 char buf [EV_INOTIFY_BUFSIZE]; 3097 char buf [EV_INOTIFY_BUFSIZE];
2754 struct inotify_event *ev = (struct inotify_event *)buf;
2755 int ofs; 3098 int ofs;
2756 int len = read (fs_fd, buf, sizeof (buf)); 3099 int len = read (fs_fd, buf, sizeof (buf));
2757 3100
2758 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3101 for (ofs = 0; ofs < len; )
3102 {
3103 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2759 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3104 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3105 ofs += sizeof (struct inotify_event) + ev->len;
3106 }
2760} 3107}
2761 3108
2762inline_size void 3109inline_size void
2763check_2625 (EV_P) 3110ev_check_2625 (EV_P)
2764{ 3111{
2765 /* kernels < 2.6.25 are borked 3112 /* kernels < 2.6.25 are borked
2766 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3113 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2767 */ 3114 */
2768 struct utsname buf; 3115 if (ev_linux_version () < 0x020619)
2769 int major, minor, micro;
2770
2771 if (uname (&buf))
2772 return; 3116 return;
2773 3117
2774 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2775 return;
2776
2777 if (major < 2
2778 || (major == 2 && minor < 6)
2779 || (major == 2 && minor == 6 && micro < 25))
2780 return;
2781
2782 fs_2625 = 1; 3118 fs_2625 = 1;
3119}
3120
3121inline_size int
3122infy_newfd (void)
3123{
3124#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3125 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3126 if (fd >= 0)
3127 return fd;
3128#endif
3129 return inotify_init ();
2783} 3130}
2784 3131
2785inline_size void 3132inline_size void
2786infy_init (EV_P) 3133infy_init (EV_P)
2787{ 3134{
2788 if (fs_fd != -2) 3135 if (fs_fd != -2)
2789 return; 3136 return;
2790 3137
2791 fs_fd = -1; 3138 fs_fd = -1;
2792 3139
2793 check_2625 (EV_A); 3140 ev_check_2625 (EV_A);
2794 3141
2795 fs_fd = inotify_init (); 3142 fs_fd = infy_newfd ();
2796 3143
2797 if (fs_fd >= 0) 3144 if (fs_fd >= 0)
2798 { 3145 {
3146 fd_intern (fs_fd);
2799 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3147 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2800 ev_set_priority (&fs_w, EV_MAXPRI); 3148 ev_set_priority (&fs_w, EV_MAXPRI);
2801 ev_io_start (EV_A_ &fs_w); 3149 ev_io_start (EV_A_ &fs_w);
3150 ev_unref (EV_A);
2802 } 3151 }
2803} 3152}
2804 3153
2805inline_size void 3154inline_size void
2806infy_fork (EV_P) 3155infy_fork (EV_P)
… …
2808 int slot; 3157 int slot;
2809 3158
2810 if (fs_fd < 0) 3159 if (fs_fd < 0)
2811 return; 3160 return;
2812 3161
3162 ev_ref (EV_A);
3163 ev_io_stop (EV_A_ &fs_w);
2813 close (fs_fd); 3164 close (fs_fd);
2814 fs_fd = inotify_init (); 3165 fs_fd = infy_newfd ();
2815 3166
3167 if (fs_fd >= 0)
3168 {
3169 fd_intern (fs_fd);
3170 ev_io_set (&fs_w, fs_fd, EV_READ);
3171 ev_io_start (EV_A_ &fs_w);
3172 ev_unref (EV_A);
3173 }
3174
2816 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3175 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2817 { 3176 {
2818 WL w_ = fs_hash [slot].head; 3177 WL w_ = fs_hash [slot].head;
2819 fs_hash [slot].head = 0; 3178 fs_hash [slot].head = 0;
2820 3179
2821 while (w_) 3180 while (w_)
… …
2826 w->wd = -1; 3185 w->wd = -1;
2827 3186
2828 if (fs_fd >= 0) 3187 if (fs_fd >= 0)
2829 infy_add (EV_A_ w); /* re-add, no matter what */ 3188 infy_add (EV_A_ w); /* re-add, no matter what */
2830 else 3189 else
3190 {
3191 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3192 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2831 ev_timer_again (EV_A_ &w->timer); 3193 ev_timer_again (EV_A_ &w->timer);
3194 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3195 }
2832 } 3196 }
2833 } 3197 }
2834} 3198}
2835 3199
2836#endif 3200#endif
… …
2853static void noinline 3217static void noinline
2854stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3218stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2855{ 3219{
2856 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3220 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2857 3221
2858 /* we copy this here each the time so that */ 3222 ev_statdata prev = w->attr;
2859 /* prev has the old value when the callback gets invoked */
2860 w->prev = w->attr;
2861 ev_stat_stat (EV_A_ w); 3223 ev_stat_stat (EV_A_ w);
2862 3224
2863 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3225 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2864 if ( 3226 if (
2865 w->prev.st_dev != w->attr.st_dev 3227 prev.st_dev != w->attr.st_dev
2866 || w->prev.st_ino != w->attr.st_ino 3228 || prev.st_ino != w->attr.st_ino
2867 || w->prev.st_mode != w->attr.st_mode 3229 || prev.st_mode != w->attr.st_mode
2868 || w->prev.st_nlink != w->attr.st_nlink 3230 || prev.st_nlink != w->attr.st_nlink
2869 || w->prev.st_uid != w->attr.st_uid 3231 || prev.st_uid != w->attr.st_uid
2870 || w->prev.st_gid != w->attr.st_gid 3232 || prev.st_gid != w->attr.st_gid
2871 || w->prev.st_rdev != w->attr.st_rdev 3233 || prev.st_rdev != w->attr.st_rdev
2872 || w->prev.st_size != w->attr.st_size 3234 || prev.st_size != w->attr.st_size
2873 || w->prev.st_atime != w->attr.st_atime 3235 || prev.st_atime != w->attr.st_atime
2874 || w->prev.st_mtime != w->attr.st_mtime 3236 || prev.st_mtime != w->attr.st_mtime
2875 || w->prev.st_ctime != w->attr.st_ctime 3237 || prev.st_ctime != w->attr.st_ctime
2876 ) { 3238 ) {
3239 /* we only update w->prev on actual differences */
3240 /* in case we test more often than invoke the callback, */
3241 /* to ensure that prev is always different to attr */
3242 w->prev = prev;
3243
2877 #if EV_USE_INOTIFY 3244 #if EV_USE_INOTIFY
2878 if (fs_fd >= 0) 3245 if (fs_fd >= 0)
2879 { 3246 {
2880 infy_del (EV_A_ w); 3247 infy_del (EV_A_ w);
2881 infy_add (EV_A_ w); 3248 infy_add (EV_A_ w);
… …
2906 3273
2907 if (fs_fd >= 0) 3274 if (fs_fd >= 0)
2908 infy_add (EV_A_ w); 3275 infy_add (EV_A_ w);
2909 else 3276 else
2910#endif 3277#endif
3278 {
2911 ev_timer_again (EV_A_ &w->timer); 3279 ev_timer_again (EV_A_ &w->timer);
3280 ev_unref (EV_A);
3281 }
2912 3282
2913 ev_start (EV_A_ (W)w, 1); 3283 ev_start (EV_A_ (W)w, 1);
2914 3284
2915 EV_FREQUENT_CHECK; 3285 EV_FREQUENT_CHECK;
2916} 3286}
… …
2925 EV_FREQUENT_CHECK; 3295 EV_FREQUENT_CHECK;
2926 3296
2927#if EV_USE_INOTIFY 3297#if EV_USE_INOTIFY
2928 infy_del (EV_A_ w); 3298 infy_del (EV_A_ w);
2929#endif 3299#endif
3300
3301 if (ev_is_active (&w->timer))
3302 {
3303 ev_ref (EV_A);
2930 ev_timer_stop (EV_A_ &w->timer); 3304 ev_timer_stop (EV_A_ &w->timer);
3305 }
2931 3306
2932 ev_stop (EV_A_ (W)w); 3307 ev_stop (EV_A_ (W)w);
2933 3308
2934 EV_FREQUENT_CHECK; 3309 EV_FREQUENT_CHECK;
2935} 3310}
… …
2980 3355
2981 EV_FREQUENT_CHECK; 3356 EV_FREQUENT_CHECK;
2982} 3357}
2983#endif 3358#endif
2984 3359
3360#if EV_PREPARE_ENABLE
2985void 3361void
2986ev_prepare_start (EV_P_ ev_prepare *w) 3362ev_prepare_start (EV_P_ ev_prepare *w)
2987{ 3363{
2988 if (expect_false (ev_is_active (w))) 3364 if (expect_false (ev_is_active (w)))
2989 return; 3365 return;
… …
3015 3391
3016 ev_stop (EV_A_ (W)w); 3392 ev_stop (EV_A_ (W)w);
3017 3393
3018 EV_FREQUENT_CHECK; 3394 EV_FREQUENT_CHECK;
3019} 3395}
3396#endif
3020 3397
3398#if EV_CHECK_ENABLE
3021void 3399void
3022ev_check_start (EV_P_ ev_check *w) 3400ev_check_start (EV_P_ ev_check *w)
3023{ 3401{
3024 if (expect_false (ev_is_active (w))) 3402 if (expect_false (ev_is_active (w)))
3025 return; 3403 return;
… …
3051 3429
3052 ev_stop (EV_A_ (W)w); 3430 ev_stop (EV_A_ (W)w);
3053 3431
3054 EV_FREQUENT_CHECK; 3432 EV_FREQUENT_CHECK;
3055} 3433}
3434#endif
3056 3435
3057#if EV_EMBED_ENABLE 3436#if EV_EMBED_ENABLE
3058void noinline 3437void noinline
3059ev_embed_sweep (EV_P_ ev_embed *w) 3438ev_embed_sweep (EV_P_ ev_embed *w)
3060{ 3439{
3061 ev_loop (w->other, EVLOOP_NONBLOCK); 3440 ev_run (w->other, EVRUN_NOWAIT);
3062} 3441}
3063 3442
3064static void 3443static void
3065embed_io_cb (EV_P_ ev_io *io, int revents) 3444embed_io_cb (EV_P_ ev_io *io, int revents)
3066{ 3445{
3067 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3446 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3068 3447
3069 if (ev_cb (w)) 3448 if (ev_cb (w))
3070 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3449 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3071 else 3450 else
3072 ev_loop (w->other, EVLOOP_NONBLOCK); 3451 ev_run (w->other, EVRUN_NOWAIT);
3073} 3452}
3074 3453
3075static void 3454static void
3076embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3455embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3077{ 3456{
3078 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3457 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3079 3458
3080 { 3459 {
3081 struct ev_loop *loop = w->other; 3460 EV_P = w->other;
3082 3461
3083 while (fdchangecnt) 3462 while (fdchangecnt)
3084 { 3463 {
3085 fd_reify (EV_A); 3464 fd_reify (EV_A);
3086 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3465 ev_run (EV_A_ EVRUN_NOWAIT);
3087 } 3466 }
3088 } 3467 }
3089} 3468}
3090 3469
3091static void 3470static void
… …
3094 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3473 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3095 3474
3096 ev_embed_stop (EV_A_ w); 3475 ev_embed_stop (EV_A_ w);
3097 3476
3098 { 3477 {
3099 struct ev_loop *loop = w->other; 3478 EV_P = w->other;
3100 3479
3101 ev_loop_fork (EV_A); 3480 ev_loop_fork (EV_A);
3102 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3481 ev_run (EV_A_ EVRUN_NOWAIT);
3103 } 3482 }
3104 3483
3105 ev_embed_start (EV_A_ w); 3484 ev_embed_start (EV_A_ w);
3106} 3485}
3107 3486
… …
3118{ 3497{
3119 if (expect_false (ev_is_active (w))) 3498 if (expect_false (ev_is_active (w)))
3120 return; 3499 return;
3121 3500
3122 { 3501 {
3123 struct ev_loop *loop = w->other; 3502 EV_P = w->other;
3124 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3503 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3125 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3504 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3126 } 3505 }
3127 3506
3128 EV_FREQUENT_CHECK; 3507 EV_FREQUENT_CHECK;
… …
3155 3534
3156 ev_io_stop (EV_A_ &w->io); 3535 ev_io_stop (EV_A_ &w->io);
3157 ev_prepare_stop (EV_A_ &w->prepare); 3536 ev_prepare_stop (EV_A_ &w->prepare);
3158 ev_fork_stop (EV_A_ &w->fork); 3537 ev_fork_stop (EV_A_ &w->fork);
3159 3538
3539 ev_stop (EV_A_ (W)w);
3540
3160 EV_FREQUENT_CHECK; 3541 EV_FREQUENT_CHECK;
3161} 3542}
3162#endif 3543#endif
3163 3544
3164#if EV_FORK_ENABLE 3545#if EV_FORK_ENABLE
… …
3204ev_async_start (EV_P_ ev_async *w) 3585ev_async_start (EV_P_ ev_async *w)
3205{ 3586{
3206 if (expect_false (ev_is_active (w))) 3587 if (expect_false (ev_is_active (w)))
3207 return; 3588 return;
3208 3589
3590 w->sent = 0;
3591
3209 evpipe_init (EV_A); 3592 evpipe_init (EV_A);
3210 3593
3211 EV_FREQUENT_CHECK; 3594 EV_FREQUENT_CHECK;
3212 3595
3213 ev_start (EV_A_ (W)w, ++asynccnt); 3596 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3240 3623
3241void 3624void
3242ev_async_send (EV_P_ ev_async *w) 3625ev_async_send (EV_P_ ev_async *w)
3243{ 3626{
3244 w->sent = 1; 3627 w->sent = 1;
3245 evpipe_write (EV_A_ &gotasync); 3628 evpipe_write (EV_A_ &async_pending);
3246} 3629}
3247#endif 3630#endif
3248 3631
3249/*****************************************************************************/ 3632/*****************************************************************************/
3250 3633
… …
3290{ 3673{
3291 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3674 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3292 3675
3293 if (expect_false (!once)) 3676 if (expect_false (!once))
3294 { 3677 {
3295 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3678 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3296 return; 3679 return;
3297 } 3680 }
3298 3681
3299 once->cb = cb; 3682 once->cb = cb;
3300 once->arg = arg; 3683 once->arg = arg;
… …
3387 if (types & EV_ASYNC) 3770 if (types & EV_ASYNC)
3388 for (i = asynccnt; i--; ) 3771 for (i = asynccnt; i--; )
3389 cb (EV_A_ EV_ASYNC, asyncs [i]); 3772 cb (EV_A_ EV_ASYNC, asyncs [i]);
3390#endif 3773#endif
3391 3774
3775#if EV_PREPARE_ENABLE
3392 if (types & EV_PREPARE) 3776 if (types & EV_PREPARE)
3393 for (i = preparecnt; i--; ) 3777 for (i = preparecnt; i--; )
3394#if EV_EMBED_ENABLE 3778# if EV_EMBED_ENABLE
3395 if (ev_cb (prepares [i]) != embed_prepare_cb) 3779 if (ev_cb (prepares [i]) != embed_prepare_cb)
3396#endif 3780# endif
3397 cb (EV_A_ EV_PREPARE, prepares [i]); 3781 cb (EV_A_ EV_PREPARE, prepares [i]);
3782#endif
3398 3783
3784#if EV_CHECK_ENABLE
3399 if (types & EV_CHECK) 3785 if (types & EV_CHECK)
3400 for (i = checkcnt; i--; ) 3786 for (i = checkcnt; i--; )
3401 cb (EV_A_ EV_CHECK, checks [i]); 3787 cb (EV_A_ EV_CHECK, checks [i]);
3788#endif
3402 3789
3790#if EV_SIGNAL_ENABLE
3403 if (types & EV_SIGNAL) 3791 if (types & EV_SIGNAL)
3404 for (i = 0; i < signalmax; ++i) 3792 for (i = 0; i < EV_NSIG - 1; ++i)
3405 for (wl = signals [i].head; wl; ) 3793 for (wl = signals [i].head; wl; )
3406 { 3794 {
3407 wn = wl->next; 3795 wn = wl->next;
3408 cb (EV_A_ EV_SIGNAL, wl); 3796 cb (EV_A_ EV_SIGNAL, wl);
3409 wl = wn; 3797 wl = wn;
3410 } 3798 }
3799#endif
3411 3800
3801#if EV_CHILD_ENABLE
3412 if (types & EV_CHILD) 3802 if (types & EV_CHILD)
3413 for (i = EV_PID_HASHSIZE; i--; ) 3803 for (i = (EV_PID_HASHSIZE); i--; )
3414 for (wl = childs [i]; wl; ) 3804 for (wl = childs [i]; wl; )
3415 { 3805 {
3416 wn = wl->next; 3806 wn = wl->next;
3417 cb (EV_A_ EV_CHILD, wl); 3807 cb (EV_A_ EV_CHILD, wl);
3418 wl = wn; 3808 wl = wn;
3419 } 3809 }
3810#endif
3420/* EV_STAT 0x00001000 /* stat data changed */ 3811/* EV_STAT 0x00001000 /* stat data changed */
3421/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3812/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3422} 3813}
3423#endif 3814#endif
3424 3815
3425#if EV_MULTIPLICITY 3816#if EV_MULTIPLICITY
3426 #include "ev_wrap.h" 3817 #include "ev_wrap.h"
3427#endif 3818#endif
3428 3819
3429#ifdef __cplusplus 3820EV_CPP(})
3430}
3431#endif
3432 3821

Diff Legend

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