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

Comparing libev/ev.c (file contents):
Revision 1.304 by root, Sun Jul 19 03:12:28 2009 UTC vs.
Revision 1.359 by root, Sun Oct 24 17:58:41 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
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 142# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 143# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
144# endif 148# endif
145 149
150# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 151# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 152# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
152# endif 157# endif
153 158
154#endif 159#endif
155 160
156#include <math.h> 161#include <math.h>
157#include <stdlib.h> 162#include <stdlib.h>
163#include <string.h>
158#include <fcntl.h> 164#include <fcntl.h>
159#include <stddef.h> 165#include <stddef.h>
160 166
161#include <stdio.h> 167#include <stdio.h>
162 168
163#include <assert.h> 169#include <assert.h>
164#include <errno.h> 170#include <errno.h>
165#include <sys/types.h> 171#include <sys/types.h>
166#include <time.h> 172#include <time.h>
173#include <limits.h>
167 174
168#include <signal.h> 175#include <signal.h>
169 176
170#ifdef EV_H 177#ifdef EV_H
171# include EV_H 178# include EV_H
172#else 179#else
173# include "ev.h" 180# include "ev.h"
174#endif 181#endif
182
183EV_CPP(extern "C" {)
175 184
176#ifndef _WIN32 185#ifndef _WIN32
177# include <sys/time.h> 186# include <sys/time.h>
178# include <sys/wait.h> 187# include <sys/wait.h>
179# include <unistd.h> 188# include <unistd.h>
… …
182# define WIN32_LEAN_AND_MEAN 191# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 192# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
186# endif 195# endif
196# undef EV_AVOID_STDIO
187#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
188 206
189/* 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
190 236
191#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
192# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
193# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
194# else 240# else
195# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
196# endif 242# endif
197#endif 243#endif
198 244
199#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
200# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
201# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
202# else 248# else
203# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
204# endif 250# endif
205#endif 251#endif
206 252
… …
208# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
209#endif 255#endif
210 256
211#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
212# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
213# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
214# else 260# else
215# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
216# endif 262# endif
217#endif 263#endif
218 264
219#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
220# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
221#endif 267#endif
222 268
223#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
224# ifdef _WIN32 270# ifdef _WIN32
225# define EV_USE_POLL 0 271# define EV_USE_POLL 0
226# else 272# else
227# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
228# endif 274# endif
229#endif 275#endif
230 276
231#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
232# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
233# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
234# else 280# else
235# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
236# endif 282# endif
237#endif 283#endif
238 284
… …
244# define EV_USE_PORT 0 290# define EV_USE_PORT 0
245#endif 291#endif
246 292
247#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
248# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
249# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
250# else 296# else
251# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
252# endif 298# endif
253#endif 299#endif
254 300
255#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
256# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
257# define EV_PID_HASHSIZE 1
258# else
259# define EV_PID_HASHSIZE 16
260# endif
261#endif 303#endif
262 304
263#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
264# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
265# define EV_INOTIFY_HASHSIZE 1
266# else
267# define EV_INOTIFY_HASHSIZE 16
268# endif
269#endif 307#endif
270 308
271#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
272# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
273# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
274# else 312# else
275# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
276# endif 314# endif
277#endif 315#endif
278 316
279#ifndef EV_USE_SIGNALFD 317#ifndef EV_USE_SIGNALFD
280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
281# define EV_USE_SIGNALFD 1 319# define EV_USE_SIGNALFD EV_FEATURE_OS
282# else 320# else
283# define EV_USE_SIGNALFD 0 321# define EV_USE_SIGNALFD 0
284# endif 322# endif
285#endif 323#endif
286 324
… …
289# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
290# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
291#endif 329#endif
292 330
293#ifndef EV_VERIFY 331#ifndef EV_VERIFY
294# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
295#endif 333#endif
296 334
297#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
298# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
299#endif 337#endif
300 338
301#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
302# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
303#endif 341#endif
304 342
305/* 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, */
306/* which makes programs even slower. might work on other unices, too. */ 344/* which makes programs even slower. might work on other unices, too. */
307#if EV_USE_CLOCK_SYSCALL 345#if EV_USE_CLOCK_SYSCALL
… …
316# endif 354# endif
317#endif 355#endif
318 356
319/* 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 */
320 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
321#ifndef CLOCK_MONOTONIC 365#ifndef CLOCK_MONOTONIC
322# undef EV_USE_MONOTONIC 366# undef EV_USE_MONOTONIC
323# define EV_USE_MONOTONIC 0 367# define EV_USE_MONOTONIC 0
324#endif 368#endif
325 369
… …
338# include <sys/select.h> 382# include <sys/select.h>
339# endif 383# endif
340#endif 384#endif
341 385
342#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
343# include <sys/utsname.h>
344# include <sys/statfs.h> 387# include <sys/statfs.h>
345# include <sys/inotify.h> 388# include <sys/inotify.h>
346/* 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 */
347# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
348# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
359# include <stdint.h> 402# include <stdint.h>
360# ifndef EFD_NONBLOCK 403# ifndef EFD_NONBLOCK
361# define EFD_NONBLOCK O_NONBLOCK 404# define EFD_NONBLOCK O_NONBLOCK
362# endif 405# endif
363# ifndef EFD_CLOEXEC 406# ifndef EFD_CLOEXEC
407# ifdef O_CLOEXEC
364# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
409# else
410# define EFD_CLOEXEC 02000000
411# endif
365# endif 412# endif
366# ifdef __cplusplus 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
367extern "C" { 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
368# endif 421# endif
369int eventfd (unsigned int initval, int flags); 422# ifndef SFD_CLOEXEC
370# ifdef __cplusplus 423# ifdef O_CLOEXEC
371} 424# define SFD_CLOEXEC O_CLOEXEC
425# else
426# define SFD_CLOEXEC 02000000
427# endif
372# endif 428# endif
373#endif 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
374 430
375#if EV_USE_SIGNALFD 431struct signalfd_siginfo
376# include <sys/signalfd.h> 432{
433 uint32_t ssi_signo;
434 char pad[128 - sizeof (uint32_t)];
435};
377#endif 436#endif
378 437
379/**/ 438/**/
380 439
381#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
382# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
383#else 442#else
384# define EV_FREQUENT_CHECK do { } while (0) 443# define EV_FREQUENT_CHECK do { } while (0)
385#endif 444#endif
386 445
387/* 446/*
… …
394 */ 453 */
395#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
396 455
397#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) */
398#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) */
399/*#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)
400 461
401#if __GNUC__ >= 4 462#if __GNUC__ >= 4
402# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
403# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
404#else 465#else
… …
411 472
412#define expect_false(expr) expect ((expr) != 0, 0) 473#define expect_false(expr) expect ((expr) != 0, 0)
413#define expect_true(expr) expect ((expr) != 0, 1) 474#define expect_true(expr) expect ((expr) != 0, 1)
414#define inline_size static inline 475#define inline_size static inline
415 476
416#if EV_MINIMAL 477#if EV_FEATURE_CODE
478# define inline_speed static inline
479#else
417# define inline_speed static noinline 480# define inline_speed static noinline
418#else
419# define inline_speed static inline
420#endif 481#endif
421 482
422#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
423 484
424#if EV_MINPRI == EV_MAXPRI 485#if EV_MINPRI == EV_MAXPRI
… …
437#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
438#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
439 500
440#if EV_USE_REALTIME 501#if EV_USE_REALTIME
441/* 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 */
442/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
443static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
444#endif 505#endif
445 506
446#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
447static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
448#endif 509#endif
449 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
450#ifdef _WIN32 521#ifdef _WIN32
451# include "ev_win32.c" 522# include "ev_win32.c"
452#endif 523#endif
453 524
454/*****************************************************************************/ 525/*****************************************************************************/
526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
531static unsigned int noinline
532ev_linux_version (void)
533{
534#ifdef __linux
535 unsigned int v = 0;
536 struct utsname buf;
537 int i;
538 char *p = buf.release;
539
540 if (uname (&buf))
541 return 0;
542
543 for (i = 3+1; --i; )
544 {
545 unsigned int c = 0;
546
547 for (;;)
548 {
549 if (*p >= '0' && *p <= '9')
550 c = c * 10 + *p++ - '0';
551 else
552 {
553 p += *p == '.';
554 break;
555 }
556 }
557
558 v = (v << 8) | c;
559 }
560
561 return v;
562#else
563 return 0;
564#endif
565}
566
567/*****************************************************************************/
568
569#if EV_AVOID_STDIO
570static void noinline
571ev_printerr (const char *msg)
572{
573 write (STDERR_FILENO, msg, strlen (msg));
574}
575#endif
455 576
456static void (*syserr_cb)(const char *msg); 577static void (*syserr_cb)(const char *msg);
457 578
458void 579void
459ev_set_syserr_cb (void (*cb)(const char *msg)) 580ev_set_syserr_cb (void (*cb)(const char *msg))
… …
469 590
470 if (syserr_cb) 591 if (syserr_cb)
471 syserr_cb (msg); 592 syserr_cb (msg);
472 else 593 else
473 { 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
474 perror (msg); 603 perror (msg);
604#endif
475 abort (); 605 abort ();
476 } 606 }
477} 607}
478 608
479static void * 609static void *
480ev_realloc_emul (void *ptr, long size) 610ev_realloc_emul (void *ptr, long size)
481{ 611{
612#if __GLIBC__
613 return realloc (ptr, size);
614#else
482 /* some systems, notably openbsd and darwin, fail to properly 615 /* some systems, notably openbsd and darwin, fail to properly
483 * 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
484 * the single unix specification, so work around them here. 617 * the single unix specification, so work around them here.
485 */ 618 */
486 619
487 if (size) 620 if (size)
488 return realloc (ptr, size); 621 return realloc (ptr, size);
489 622
490 free (ptr); 623 free (ptr);
491 return 0; 624 return 0;
625#endif
492} 626}
493 627
494static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 628static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
495 629
496void 630void
… …
504{ 638{
505 ptr = alloc (ptr, size); 639 ptr = alloc (ptr, size);
506 640
507 if (!ptr && size) 641 if (!ptr && size)
508 { 642 {
643#if EV_AVOID_STDIO
644 ev_printerr ("libev: memory allocation failed, aborting.\n");
645#else
509 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 646 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
647#endif
510 abort (); 648 abort ();
511 } 649 }
512 650
513 return ptr; 651 return ptr;
514} 652}
… …
530 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 */
531 unsigned char unused; 669 unsigned char unused;
532#if EV_USE_EPOLL 670#if EV_USE_EPOLL
533 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
534#endif 672#endif
535#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
536 SOCKET handle; 674 SOCKET handle;
675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
537#endif 678#endif
538} ANFD; 679} ANFD;
539 680
540/* stores the pending event set for a given watcher */ 681/* stores the pending event set for a given watcher */
541typedef struct 682typedef struct
… …
596 737
597 static int ev_default_loop_ptr; 738 static int ev_default_loop_ptr;
598 739
599#endif 740#endif
600 741
601#if EV_MINIMAL < 2 742#if EV_FEATURE_API
602# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 743# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
603# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 744# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
604# define EV_INVOKE_PENDING invoke_cb (EV_A) 745# define EV_INVOKE_PENDING invoke_cb (EV_A)
605#else 746#else
606# define EV_RELEASE_CB (void)0 747# define EV_RELEASE_CB (void)0
607# define EV_ACQUIRE_CB (void)0 748# define EV_ACQUIRE_CB (void)0
608# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 749# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
609#endif 750#endif
610 751
611#define EVUNLOOP_RECURSE 0x80 752#define EVBREAK_RECURSE 0x80
612 753
613/*****************************************************************************/ 754/*****************************************************************************/
614 755
615#ifndef EV_HAVE_EV_TIME 756#ifndef EV_HAVE_EV_TIME
616ev_tstamp 757ev_tstamp
… …
660 if (delay > 0.) 801 if (delay > 0.)
661 { 802 {
662#if EV_USE_NANOSLEEP 803#if EV_USE_NANOSLEEP
663 struct timespec ts; 804 struct timespec ts;
664 805
665 ts.tv_sec = (time_t)delay; 806 EV_TS_SET (ts, delay);
666 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
667
668 nanosleep (&ts, 0); 807 nanosleep (&ts, 0);
669#elif defined(_WIN32) 808#elif defined(_WIN32)
670 Sleep ((unsigned long)(delay * 1e3)); 809 Sleep ((unsigned long)(delay * 1e3));
671#else 810#else
672 struct timeval tv; 811 struct timeval tv;
673 812
674 tv.tv_sec = (time_t)delay;
675 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
676
677 /* 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 */
678 /* something not guaranteed by newer posix versions, but guaranteed */ 814 /* something not guaranteed by newer posix versions, but guaranteed */
679 /* by older ones */ 815 /* by older ones */
816 EV_TV_SET (tv, delay);
680 select (0, 0, 0, 0, &tv); 817 select (0, 0, 0, 0, &tv);
681#endif 818#endif
682 } 819 }
683} 820}
684 821
685/*****************************************************************************/ 822/*****************************************************************************/
686 823
687#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 */
688 825
689/* find a suitable new size for the given array, */ 826/* find a suitable new size for the given array, */
690/* hopefully by rounding to a ncie-to-malloc size */ 827/* hopefully by rounding to a nice-to-malloc size */
691inline_size int 828inline_size int
692array_nextsize (int elem, int cur, int cnt) 829array_nextsize (int elem, int cur, int cnt)
693{ 830{
694 int ncur = cur + 1; 831 int ncur = cur + 1;
695 832
… …
791} 928}
792 929
793/*****************************************************************************/ 930/*****************************************************************************/
794 931
795inline_speed void 932inline_speed void
796fd_event_nc (EV_P_ int fd, int revents) 933fd_event_nocheck (EV_P_ int fd, int revents)
797{ 934{
798 ANFD *anfd = anfds + fd; 935 ANFD *anfd = anfds + fd;
799 ev_io *w; 936 ev_io *w;
800 937
801 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)
… …
813fd_event (EV_P_ int fd, int revents) 950fd_event (EV_P_ int fd, int revents)
814{ 951{
815 ANFD *anfd = anfds + fd; 952 ANFD *anfd = anfds + fd;
816 953
817 if (expect_true (!anfd->reify)) 954 if (expect_true (!anfd->reify))
818 fd_event_nc (EV_A_ fd, revents); 955 fd_event_nocheck (EV_A_ fd, revents);
819} 956}
820 957
821void 958void
822ev_feed_fd_event (EV_P_ int fd, int revents) 959ev_feed_fd_event (EV_P_ int fd, int revents)
823{ 960{
824 if (fd >= 0 && fd < anfdmax) 961 if (fd >= 0 && fd < anfdmax)
825 fd_event_nc (EV_A_ fd, revents); 962 fd_event_nocheck (EV_A_ fd, revents);
826} 963}
827 964
828/* make sure the external fd watch events are in-sync */ 965/* make sure the external fd watch events are in-sync */
829/* with the kernel/libev internal state */ 966/* with the kernel/libev internal state */
830inline_size void 967inline_size void
… …
836 { 973 {
837 int fd = fdchanges [i]; 974 int fd = fdchanges [i];
838 ANFD *anfd = anfds + fd; 975 ANFD *anfd = anfds + fd;
839 ev_io *w; 976 ev_io *w;
840 977
841 unsigned char events = 0; 978 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify;
842 980
843 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 981 anfd->reify = 0;
844 events |= (unsigned char)w->events;
845 982
846#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
847 if (events) 984 if (o_reify & EV__IOFDSET)
848 { 985 {
849 unsigned long arg; 986 unsigned long arg;
850 #ifdef EV_FD_TO_WIN32_HANDLE
851 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
852 #else
853 anfd->handle = _get_osfhandle (fd);
854 #endif
855 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
856 } 990 }
857#endif 991#endif
858 992
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
859 { 994 {
860 unsigned char o_events = anfd->events;
861 unsigned char o_reify = anfd->reify;
862
863 anfd->reify = 0;
864 anfd->events = events; 995 anfd->events = 0;
865 996
866 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)
867 backend_modify (EV_A_ fd, o_events, events); 1005 backend_modify (EV_A_ fd, o_events, anfd->events);
868 }
869 } 1006 }
870 1007
871 fdchangecnt = 0; 1008 fdchangecnt = 0;
872} 1009}
873 1010
… …
897 ev_io_stop (EV_A_ w); 1034 ev_io_stop (EV_A_ w);
898 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);
899 } 1036 }
900} 1037}
901 1038
902/* check whether the given fd is atcually valid, for error recovery */ 1039/* check whether the given fd is actually valid, for error recovery */
903inline_size int 1040inline_size int
904fd_valid (int fd) 1041fd_valid (int fd)
905{ 1042{
906#ifdef _WIN32 1043#ifdef _WIN32
907 return _get_osfhandle (fd) != -1; 1044 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
908#else 1045#else
909 return fcntl (fd, F_GETFD) != -1; 1046 return fcntl (fd, F_GETFD) != -1;
910#endif 1047#endif
911} 1048}
912 1049
… …
930 1067
931 for (fd = anfdmax; fd--; ) 1068 for (fd = anfdmax; fd--; )
932 if (anfds [fd].events) 1069 if (anfds [fd].events)
933 { 1070 {
934 fd_kill (EV_A_ fd); 1071 fd_kill (EV_A_ fd);
935 return; 1072 break;
936 } 1073 }
937} 1074}
938 1075
939/* 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 */
940static void noinline 1077static void noinline
… …
949 anfds [fd].emask = 0; 1086 anfds [fd].emask = 0;
950 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1087 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
951 } 1088 }
952} 1089}
953 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
954/*****************************************************************************/ 1105/*****************************************************************************/
955 1106
956/* 1107/*
957 * 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
958 * 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
959 * the branching factor of the d-tree. 1110 * the branching factor of the d-tree.
960 */ 1111 */
961 1112
962/* 1113/*
… …
1030 1181
1031 for (;;) 1182 for (;;)
1032 { 1183 {
1033 int c = k << 1; 1184 int c = k << 1;
1034 1185
1035 if (c > N + HEAP0 - 1) 1186 if (c >= N + HEAP0)
1036 break; 1187 break;
1037 1188
1038 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])
1039 ? 1 : 0; 1190 ? 1 : 0;
1040 1191
… …
1076 1227
1077/* move an element suitably so it is in a correct place */ 1228/* move an element suitably so it is in a correct place */
1078inline_size void 1229inline_size void
1079adjustheap (ANHE *heap, int N, int k) 1230adjustheap (ANHE *heap, int N, int k)
1080{ 1231{
1081 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)]))
1082 upheap (heap, k); 1233 upheap (heap, k);
1083 else 1234 else
1084 downheap (heap, N, k); 1235 downheap (heap, N, k);
1085} 1236}
1086 1237
… …
1099/*****************************************************************************/ 1250/*****************************************************************************/
1100 1251
1101/* associate signal watchers to a signal signal */ 1252/* associate signal watchers to a signal signal */
1102typedef struct 1253typedef struct
1103{ 1254{
1255 EV_ATOMIC_T pending;
1256#if EV_MULTIPLICITY
1257 EV_P;
1258#endif
1104 WL head; 1259 WL head;
1105 EV_ATOMIC_T gotsig;
1106} ANSIG; 1260} ANSIG;
1107 1261
1108static ANSIG *signals; 1262static ANSIG signals [EV_NSIG - 1];
1109static int signalmax;
1110
1111static EV_ATOMIC_T gotsig;
1112 1263
1113/*****************************************************************************/ 1264/*****************************************************************************/
1114 1265
1115/* used to prepare libev internal fd's */ 1266#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1116/* this is not fork-safe */
1117inline_speed void
1118fd_intern (int fd)
1119{
1120#ifdef _WIN32
1121 unsigned long arg = 1;
1122 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1123#else
1124 fcntl (fd, F_SETFD, FD_CLOEXEC);
1125 fcntl (fd, F_SETFL, O_NONBLOCK);
1126#endif
1127}
1128 1267
1129static void noinline 1268static void noinline
1130evpipe_init (EV_P) 1269evpipe_init (EV_P)
1131{ 1270{
1132 if (!ev_is_active (&pipe_w)) 1271 if (!ev_is_active (&pipe_w))
1133 { 1272 {
1134#if EV_USE_EVENTFD 1273# if EV_USE_EVENTFD
1135 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1274 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1136 if (evfd < 0 && errno == EINVAL) 1275 if (evfd < 0 && errno == EINVAL)
1137 evfd = eventfd (0, 0); 1276 evfd = eventfd (0, 0);
1138 1277
1139 if (evfd >= 0) 1278 if (evfd >= 0)
… …
1141 evpipe [0] = -1; 1280 evpipe [0] = -1;
1142 fd_intern (evfd); /* doing it twice doesn't hurt */ 1281 fd_intern (evfd); /* doing it twice doesn't hurt */
1143 ev_io_set (&pipe_w, evfd, EV_READ); 1282 ev_io_set (&pipe_w, evfd, EV_READ);
1144 } 1283 }
1145 else 1284 else
1146#endif 1285# endif
1147 { 1286 {
1148 while (pipe (evpipe)) 1287 while (pipe (evpipe))
1149 ev_syserr ("(libev) error creating signal/async pipe"); 1288 ev_syserr ("(libev) error creating signal/async pipe");
1150 1289
1151 fd_intern (evpipe [0]); 1290 fd_intern (evpipe [0]);
… …
1162evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1301evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1163{ 1302{
1164 if (!*flag) 1303 if (!*flag)
1165 { 1304 {
1166 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;
1167 1307
1168 *flag = 1; 1308 *flag = 1;
1169 1309
1170#if EV_USE_EVENTFD 1310#if EV_USE_EVENTFD
1171 if (evfd >= 0) 1311 if (evfd >= 0)
… …
1173 uint64_t counter = 1; 1313 uint64_t counter = 1;
1174 write (evfd, &counter, sizeof (uint64_t)); 1314 write (evfd, &counter, sizeof (uint64_t));
1175 } 1315 }
1176 else 1316 else
1177#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. */
1178 write (evpipe [1], &old_errno, 1); 1323 write (evpipe [1], &dummy, 1);
1179 1324
1180 errno = old_errno; 1325 errno = old_errno;
1181 } 1326 }
1182} 1327}
1183 1328
1184/* called whenever the libev signal pipe */ 1329/* called whenever the libev signal pipe */
1185/* got some events (signal, async) */ 1330/* got some events (signal, async) */
1186static void 1331static void
1187pipecb (EV_P_ ev_io *iow, int revents) 1332pipecb (EV_P_ ev_io *iow, int revents)
1188{ 1333{
1334 int i;
1335
1189#if EV_USE_EVENTFD 1336#if EV_USE_EVENTFD
1190 if (evfd >= 0) 1337 if (evfd >= 0)
1191 { 1338 {
1192 uint64_t counter; 1339 uint64_t counter;
1193 read (evfd, &counter, sizeof (uint64_t)); 1340 read (evfd, &counter, sizeof (uint64_t));
1194 } 1341 }
1195 else 1342 else
1196#endif 1343#endif
1197 { 1344 {
1198 char dummy; 1345 char dummy;
1346 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1199 read (evpipe [0], &dummy, 1); 1347 read (evpipe [0], &dummy, 1);
1200 } 1348 }
1201 1349
1202 if (gotsig && ev_is_default_loop (EV_A)) 1350 if (sig_pending)
1203 { 1351 {
1204 int signum; 1352 sig_pending = 0;
1205 gotsig = 0;
1206 1353
1207 for (signum = signalmax; signum--; ) 1354 for (i = EV_NSIG - 1; i--; )
1208 if (signals [signum].gotsig) 1355 if (expect_false (signals [i].pending))
1209 ev_feed_signal_event (EV_A_ signum + 1); 1356 ev_feed_signal_event (EV_A_ i + 1);
1210 } 1357 }
1211 1358
1212#if EV_ASYNC_ENABLE 1359#if EV_ASYNC_ENABLE
1213 if (gotasync) 1360 if (async_pending)
1214 { 1361 {
1215 int i; 1362 async_pending = 0;
1216 gotasync = 0;
1217 1363
1218 for (i = asynccnt; i--; ) 1364 for (i = asynccnt; i--; )
1219 if (asyncs [i]->sent) 1365 if (asyncs [i]->sent)
1220 { 1366 {
1221 asyncs [i]->sent = 0; 1367 asyncs [i]->sent = 0;
… …
1229 1375
1230static void 1376static void
1231ev_sighandler (int signum) 1377ev_sighandler (int signum)
1232{ 1378{
1233#if EV_MULTIPLICITY 1379#if EV_MULTIPLICITY
1234 struct ev_loop *loop = &default_loop_struct; 1380 EV_P = signals [signum - 1].loop;
1235#endif 1381#endif
1236 1382
1237#if _WIN32 1383#ifdef _WIN32
1238 signal (signum, ev_sighandler); 1384 signal (signum, ev_sighandler);
1239#endif 1385#endif
1240 1386
1241 signals [signum - 1].gotsig = 1; 1387 signals [signum - 1].pending = 1;
1242 evpipe_write (EV_A_ &gotsig); 1388 evpipe_write (EV_A_ &sig_pending);
1243} 1389}
1244 1390
1245void noinline 1391void noinline
1246ev_feed_signal_event (EV_P_ int signum) 1392ev_feed_signal_event (EV_P_ int signum)
1247{ 1393{
1248 WL w; 1394 WL w;
1249 1395
1396 if (expect_false (signum <= 0 || signum > EV_NSIG))
1397 return;
1398
1399 --signum;
1400
1250#if EV_MULTIPLICITY 1401#if EV_MULTIPLICITY
1251 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 */
1252#endif 1403 /* or, likely more useful, feeding a signal nobody is waiting for */
1253 1404
1254 --signum; 1405 if (expect_false (signals [signum].loop != EV_A))
1255
1256 if (signum < 0 || signum >= signalmax)
1257 return; 1406 return;
1407#endif
1258 1408
1259 signals [signum].gotsig = 0; 1409 signals [signum].pending = 0;
1260 1410
1261 for (w = signals [signum].head; w; w = w->next) 1411 for (w = signals [signum].head; w; w = w->next)
1262 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1412 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1263} 1413}
1264 1414
1265#if EV_USE_SIGNALFD 1415#if EV_USE_SIGNALFD
1266static void 1416static void
1267sigfdcb (EV_P_ ev_io *iow, int revents) 1417sigfdcb (EV_P_ ev_io *iow, int revents)
1268{ 1418{
1269 struct signalfd_siginfo si[4], *sip; 1419 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1270 1420
1271 for (;;) 1421 for (;;)
1272 { 1422 {
1273 ssize_t res = read (sigfd, si, sizeof (si)); 1423 ssize_t res = read (sigfd, si, sizeof (si));
1274 1424
… …
1280 break; 1430 break;
1281 } 1431 }
1282} 1432}
1283#endif 1433#endif
1284 1434
1435#endif
1436
1285/*****************************************************************************/ 1437/*****************************************************************************/
1286 1438
1439#if EV_CHILD_ENABLE
1287static WL childs [EV_PID_HASHSIZE]; 1440static WL childs [EV_PID_HASHSIZE];
1288
1289#ifndef _WIN32
1290 1441
1291static ev_signal childev; 1442static ev_signal childev;
1292 1443
1293#ifndef WIFCONTINUED 1444#ifndef WIFCONTINUED
1294# define WIFCONTINUED(status) 0 1445# define WIFCONTINUED(status) 0
… …
1299child_reap (EV_P_ int chain, int pid, int status) 1450child_reap (EV_P_ int chain, int pid, int status)
1300{ 1451{
1301 ev_child *w; 1452 ev_child *w;
1302 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1453 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1303 1454
1304 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)
1305 { 1456 {
1306 if ((w->pid == pid || !w->pid) 1457 if ((w->pid == pid || !w->pid)
1307 && (!traced || (w->flags & 1))) 1458 && (!traced || (w->flags & 1)))
1308 { 1459 {
1309 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 */
… …
1334 /* 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 */
1335 /* 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 */
1336 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1487 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1337 1488
1338 child_reap (EV_A_ pid, pid, status); 1489 child_reap (EV_A_ pid, pid, status);
1339 if (EV_PID_HASHSIZE > 1) 1490 if ((EV_PID_HASHSIZE) > 1)
1340 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 */
1341} 1492}
1342 1493
1343#endif 1494#endif
1344 1495
1345/*****************************************************************************/ 1496/*****************************************************************************/
1346 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1347#if EV_USE_PORT 1501#if EV_USE_PORT
1348# include "ev_port.c" 1502# include "ev_port.c"
1349#endif 1503#endif
1350#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1351# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1411#ifdef __APPLE__ 1565#ifdef __APPLE__
1412 /* only select works correctly on that "unix-certified" platform */ 1566 /* only select works correctly on that "unix-certified" platform */
1413 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1567 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1414 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 */
1415#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
1416 1573
1417 return flags; 1574 return flags;
1418} 1575}
1419 1576
1420unsigned int 1577unsigned int
1421ev_embeddable_backends (void) 1578ev_embeddable_backends (void)
1422{ 1579{
1423 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1580 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1424 1581
1425 /* 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 */
1426 /* please fix it and tell me how to detect the fix */ 1583 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1427 flags &= ~EVBACKEND_EPOLL; 1584 flags &= ~EVBACKEND_EPOLL;
1428 1585
1429 return flags; 1586 return flags;
1430} 1587}
1431 1588
1432unsigned int 1589unsigned int
1433ev_backend (EV_P) 1590ev_backend (EV_P)
1434{ 1591{
1435 return backend; 1592 return backend;
1436} 1593}
1437 1594
1438#if EV_MINIMAL < 2 1595#if EV_FEATURE_API
1439unsigned int 1596unsigned int
1440ev_loop_count (EV_P) 1597ev_iteration (EV_P)
1441{ 1598{
1442 return loop_count; 1599 return loop_count;
1443} 1600}
1444 1601
1445unsigned int 1602unsigned int
1446ev_loop_depth (EV_P) 1603ev_depth (EV_P)
1447{ 1604{
1448 return loop_depth; 1605 return loop_depth;
1449} 1606}
1450 1607
1451void 1608void
… …
1508 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1665 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1509 have_monotonic = 1; 1666 have_monotonic = 1;
1510 } 1667 }
1511#endif 1668#endif
1512 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
1513 ev_rt_now = ev_time (); 1681 ev_rt_now = ev_time ();
1514 mn_now = get_clock (); 1682 mn_now = get_clock ();
1515 now_floor = mn_now; 1683 now_floor = mn_now;
1516 rtmn_diff = ev_rt_now - mn_now; 1684 rtmn_diff = ev_rt_now - mn_now;
1517#if EV_MINIMAL < 2 1685#if EV_FEATURE_API
1518 invoke_cb = ev_invoke_pending; 1686 invoke_cb = ev_invoke_pending;
1519#endif 1687#endif
1520 1688
1521 io_blocktime = 0.; 1689 io_blocktime = 0.;
1522 timeout_blocktime = 0.; 1690 timeout_blocktime = 0.;
1523 backend = 0; 1691 backend = 0;
1524 backend_fd = -1; 1692 backend_fd = -1;
1525 gotasync = 0; 1693 sig_pending = 0;
1694#if EV_ASYNC_ENABLE
1695 async_pending = 0;
1696#endif
1526#if EV_USE_INOTIFY 1697#if EV_USE_INOTIFY
1527 fs_fd = -2; 1698 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1528#endif 1699#endif
1529#if EV_USE_SIGNALFD 1700#if EV_USE_SIGNALFD
1530 sigfd = -2; 1701 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1531#endif 1702#endif
1532
1533 /* pid check not overridable via env */
1534#ifndef _WIN32
1535 if (flags & EVFLAG_FORKCHECK)
1536 curpid = getpid ();
1537#endif
1538
1539 if (!(flags & EVFLAG_NOENV)
1540 && !enable_secure ()
1541 && getenv ("LIBEV_FLAGS"))
1542 flags = atoi (getenv ("LIBEV_FLAGS"));
1543 1703
1544 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1545 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1546 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1547#if EV_USE_PORT 1710#if EV_USE_PORT
1548 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1549#endif 1712#endif
1550#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1551 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1560 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1723 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1561#endif 1724#endif
1562 1725
1563 ev_prepare_init (&pending_w, pendingcb); 1726 ev_prepare_init (&pending_w, pendingcb);
1564 1727
1728#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1565 ev_init (&pipe_w, pipecb); 1729 ev_init (&pipe_w, pipecb);
1566 ev_set_priority (&pipe_w, EV_MAXPRI); 1730 ev_set_priority (&pipe_w, EV_MAXPRI);
1731#endif
1567 } 1732 }
1568} 1733}
1569 1734
1570/* free up a loop structure */ 1735/* free up a loop structure */
1571static void noinline 1736void
1572loop_destroy (EV_P) 1737ev_loop_destroy (EV_P)
1573{ 1738{
1574 int i; 1739 int i;
1740
1741#if EV_CHILD_ENABLE
1742 if (ev_is_active (&childev))
1743 {
1744 ev_ref (EV_A); /* child watcher */
1745 ev_signal_stop (EV_A_ &childev);
1746 }
1747#endif
1575 1748
1576 if (ev_is_active (&pipe_w)) 1749 if (ev_is_active (&pipe_w))
1577 { 1750 {
1578 /*ev_ref (EV_A);*/ 1751 /*ev_ref (EV_A);*/
1579 /*ev_io_stop (EV_A_ &pipe_w);*/ 1752 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1583 close (evfd); 1756 close (evfd);
1584#endif 1757#endif
1585 1758
1586 if (evpipe [0] >= 0) 1759 if (evpipe [0] >= 0)
1587 { 1760 {
1588 close (evpipe [0]); 1761 EV_WIN32_CLOSE_FD (evpipe [0]);
1589 close (evpipe [1]); 1762 EV_WIN32_CLOSE_FD (evpipe [1]);
1590 } 1763 }
1591 } 1764 }
1592 1765
1593#if EV_USE_SIGNALFD 1766#if EV_USE_SIGNALFD
1594 if (ev_is_active (&sigfd_w)) 1767 if (ev_is_active (&sigfd_w))
1595 {
1596 /*ev_ref (EV_A);*/
1597 /*ev_io_stop (EV_A_ &sigfd_w);*/
1598
1599 close (sigfd); 1768 close (sigfd);
1600 }
1601#endif 1769#endif
1602 1770
1603#if EV_USE_INOTIFY 1771#if EV_USE_INOTIFY
1604 if (fs_fd >= 0) 1772 if (fs_fd >= 0)
1605 close (fs_fd); 1773 close (fs_fd);
1606#endif 1774#endif
1607 1775
1608 if (backend_fd >= 0) 1776 if (backend_fd >= 0)
1609 close (backend_fd); 1777 close (backend_fd);
1610 1778
1779#if EV_USE_IOCP
1780 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1781#endif
1611#if EV_USE_PORT 1782#if EV_USE_PORT
1612 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1783 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1613#endif 1784#endif
1614#if EV_USE_KQUEUE 1785#if EV_USE_KQUEUE
1615 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1786 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1630#if EV_IDLE_ENABLE 1801#if EV_IDLE_ENABLE
1631 array_free (idle, [i]); 1802 array_free (idle, [i]);
1632#endif 1803#endif
1633 } 1804 }
1634 1805
1635 ev_free (anfds); anfdmax = 0; 1806 ev_free (anfds); anfds = 0; anfdmax = 0;
1636 1807
1637 /* have to use the microsoft-never-gets-it-right macro */ 1808 /* have to use the microsoft-never-gets-it-right macro */
1638 array_free (rfeed, EMPTY); 1809 array_free (rfeed, EMPTY);
1639 array_free (fdchange, EMPTY); 1810 array_free (fdchange, EMPTY);
1640 array_free (timer, EMPTY); 1811 array_free (timer, EMPTY);
… …
1649#if EV_ASYNC_ENABLE 1820#if EV_ASYNC_ENABLE
1650 array_free (async, EMPTY); 1821 array_free (async, EMPTY);
1651#endif 1822#endif
1652 1823
1653 backend = 0; 1824 backend = 0;
1825
1826#if EV_MULTIPLICITY
1827 if (ev_is_default_loop (EV_A))
1828#endif
1829 ev_default_loop_ptr = 0;
1830#if EV_MULTIPLICITY
1831 else
1832 ev_free (EV_A);
1833#endif
1654} 1834}
1655 1835
1656#if EV_USE_INOTIFY 1836#if EV_USE_INOTIFY
1657inline_size void infy_fork (EV_P); 1837inline_size void infy_fork (EV_P);
1658#endif 1838#endif
… …
1675 1855
1676 if (ev_is_active (&pipe_w)) 1856 if (ev_is_active (&pipe_w))
1677 { 1857 {
1678 /* this "locks" the handlers against writing to the pipe */ 1858 /* this "locks" the handlers against writing to the pipe */
1679 /* while we modify the fd vars */ 1859 /* while we modify the fd vars */
1680 gotsig = 1; 1860 sig_pending = 1;
1681#if EV_ASYNC_ENABLE 1861#if EV_ASYNC_ENABLE
1682 gotasync = 1; 1862 async_pending = 1;
1683#endif 1863#endif
1684 1864
1685 ev_ref (EV_A); 1865 ev_ref (EV_A);
1686 ev_io_stop (EV_A_ &pipe_w); 1866 ev_io_stop (EV_A_ &pipe_w);
1687 1867
… …
1690 close (evfd); 1870 close (evfd);
1691#endif 1871#endif
1692 1872
1693 if (evpipe [0] >= 0) 1873 if (evpipe [0] >= 0)
1694 { 1874 {
1695 close (evpipe [0]); 1875 EV_WIN32_CLOSE_FD (evpipe [0]);
1696 close (evpipe [1]); 1876 EV_WIN32_CLOSE_FD (evpipe [1]);
1697 } 1877 }
1698 1878
1879#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1699 evpipe_init (EV_A); 1880 evpipe_init (EV_A);
1700 /* now iterate over everything, in case we missed something */ 1881 /* now iterate over everything, in case we missed something */
1701 pipecb (EV_A_ &pipe_w, EV_READ); 1882 pipecb (EV_A_ &pipe_w, EV_READ);
1883#endif
1702 } 1884 }
1703 1885
1704 postfork = 0; 1886 postfork = 0;
1705} 1887}
1706 1888
1707#if EV_MULTIPLICITY 1889#if EV_MULTIPLICITY
1708 1890
1709struct ev_loop * 1891struct ev_loop *
1710ev_loop_new (unsigned int flags) 1892ev_loop_new (unsigned int flags)
1711{ 1893{
1712 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1894 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1713 1895
1714 memset (loop, 0, sizeof (struct ev_loop)); 1896 memset (EV_A, 0, sizeof (struct ev_loop));
1715 loop_init (EV_A_ flags); 1897 loop_init (EV_A_ flags);
1716 1898
1717 if (ev_backend (EV_A)) 1899 if (ev_backend (EV_A))
1718 return loop; 1900 return EV_A;
1719 1901
1902 ev_free (EV_A);
1720 return 0; 1903 return 0;
1721} 1904}
1722 1905
1723void
1724ev_loop_destroy (EV_P)
1725{
1726 loop_destroy (EV_A);
1727 ev_free (loop);
1728}
1729
1730void
1731ev_loop_fork (EV_P)
1732{
1733 postfork = 1; /* must be in line with ev_default_fork */
1734}
1735#endif /* multiplicity */ 1906#endif /* multiplicity */
1736 1907
1737#if EV_VERIFY 1908#if EV_VERIFY
1738static void noinline 1909static void noinline
1739verify_watcher (EV_P_ W w) 1910verify_watcher (EV_P_ W w)
… …
1768 verify_watcher (EV_A_ ws [cnt]); 1939 verify_watcher (EV_A_ ws [cnt]);
1769 } 1940 }
1770} 1941}
1771#endif 1942#endif
1772 1943
1773#if EV_MINIMAL < 2 1944#if EV_FEATURE_API
1774void 1945void
1775ev_loop_verify (EV_P) 1946ev_verify (EV_P)
1776{ 1947{
1777#if EV_VERIFY 1948#if EV_VERIFY
1778 int i; 1949 int i;
1779 WL w; 1950 WL w;
1780 1951
… …
1819#if EV_ASYNC_ENABLE 1990#if EV_ASYNC_ENABLE
1820 assert (asyncmax >= asynccnt); 1991 assert (asyncmax >= asynccnt);
1821 array_verify (EV_A_ (W *)asyncs, asynccnt); 1992 array_verify (EV_A_ (W *)asyncs, asynccnt);
1822#endif 1993#endif
1823 1994
1995#if EV_PREPARE_ENABLE
1824 assert (preparemax >= preparecnt); 1996 assert (preparemax >= preparecnt);
1825 array_verify (EV_A_ (W *)prepares, preparecnt); 1997 array_verify (EV_A_ (W *)prepares, preparecnt);
1998#endif
1826 1999
2000#if EV_CHECK_ENABLE
1827 assert (checkmax >= checkcnt); 2001 assert (checkmax >= checkcnt);
1828 array_verify (EV_A_ (W *)checks, checkcnt); 2002 array_verify (EV_A_ (W *)checks, checkcnt);
2003#endif
1829 2004
1830# if 0 2005# if 0
2006#if EV_CHILD_ENABLE
1831 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2007 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1832 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 2008 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2009#endif
1833# endif 2010# endif
1834#endif 2011#endif
1835} 2012}
1836#endif 2013#endif
1837 2014
1838#if EV_MULTIPLICITY 2015#if EV_MULTIPLICITY
1839struct ev_loop * 2016struct ev_loop *
1840ev_default_loop_init (unsigned int flags)
1841#else 2017#else
1842int 2018int
2019#endif
1843ev_default_loop (unsigned int flags) 2020ev_default_loop (unsigned int flags)
1844#endif
1845{ 2021{
1846 if (!ev_default_loop_ptr) 2022 if (!ev_default_loop_ptr)
1847 { 2023 {
1848#if EV_MULTIPLICITY 2024#if EV_MULTIPLICITY
1849 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2025 EV_P = ev_default_loop_ptr = &default_loop_struct;
1850#else 2026#else
1851 ev_default_loop_ptr = 1; 2027 ev_default_loop_ptr = 1;
1852#endif 2028#endif
1853 2029
1854 loop_init (EV_A_ flags); 2030 loop_init (EV_A_ flags);
1855 2031
1856 if (ev_backend (EV_A)) 2032 if (ev_backend (EV_A))
1857 { 2033 {
1858#ifndef _WIN32 2034#if EV_CHILD_ENABLE
1859 ev_signal_init (&childev, childcb, SIGCHLD); 2035 ev_signal_init (&childev, childcb, SIGCHLD);
1860 ev_set_priority (&childev, EV_MAXPRI); 2036 ev_set_priority (&childev, EV_MAXPRI);
1861 ev_signal_start (EV_A_ &childev); 2037 ev_signal_start (EV_A_ &childev);
1862 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2038 ev_unref (EV_A); /* child watcher should not keep loop alive */
1863#endif 2039#endif
… …
1868 2044
1869 return ev_default_loop_ptr; 2045 return ev_default_loop_ptr;
1870} 2046}
1871 2047
1872void 2048void
1873ev_default_destroy (void) 2049ev_loop_fork (EV_P)
1874{ 2050{
1875#if EV_MULTIPLICITY
1876 struct ev_loop *loop = ev_default_loop_ptr;
1877#endif
1878
1879 ev_default_loop_ptr = 0;
1880
1881#ifndef _WIN32
1882 ev_ref (EV_A); /* child watcher */
1883 ev_signal_stop (EV_A_ &childev);
1884#endif
1885
1886 loop_destroy (EV_A);
1887}
1888
1889void
1890ev_default_fork (void)
1891{
1892#if EV_MULTIPLICITY
1893 struct ev_loop *loop = ev_default_loop_ptr;
1894#endif
1895
1896 postfork = 1; /* must be in line with ev_loop_fork */ 2051 postfork = 1; /* must be in line with ev_default_fork */
1897} 2052}
1898 2053
1899/*****************************************************************************/ 2054/*****************************************************************************/
1900 2055
1901void 2056void
… …
1992 EV_FREQUENT_CHECK; 2147 EV_FREQUENT_CHECK;
1993 feed_reverse (EV_A_ (W)w); 2148 feed_reverse (EV_A_ (W)w);
1994 } 2149 }
1995 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2150 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1996 2151
1997 feed_reverse_done (EV_A_ EV_TIMEOUT); 2152 feed_reverse_done (EV_A_ EV_TIMER);
1998 } 2153 }
1999} 2154}
2000 2155
2001#if EV_PERIODIC_ENABLE 2156#if EV_PERIODIC_ENABLE
2002/* make periodics pending */ 2157/* make periodics pending */
… …
2055 feed_reverse_done (EV_A_ EV_PERIODIC); 2210 feed_reverse_done (EV_A_ EV_PERIODIC);
2056 } 2211 }
2057} 2212}
2058 2213
2059/* simply recalculate all periodics */ 2214/* simply recalculate all periodics */
2060/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2215/* TODO: maybe ensure that at least one event happens when jumping forward? */
2061static void noinline 2216static void noinline
2062periodics_reschedule (EV_P) 2217periodics_reschedule (EV_P)
2063{ 2218{
2064 int i; 2219 int i;
2065 2220
… …
2093 ANHE_at_cache (*he); 2248 ANHE_at_cache (*he);
2094 } 2249 }
2095} 2250}
2096 2251
2097/* fetch new monotonic and realtime times from the kernel */ 2252/* fetch new monotonic and realtime times from the kernel */
2098/* also detetc if there was a timejump, and act accordingly */ 2253/* also detect if there was a timejump, and act accordingly */
2099inline_speed void 2254inline_speed void
2100time_update (EV_P_ ev_tstamp max_block) 2255time_update (EV_P_ ev_tstamp max_block)
2101{ 2256{
2102#if EV_USE_MONOTONIC 2257#if EV_USE_MONOTONIC
2103 if (expect_true (have_monotonic)) 2258 if (expect_true (have_monotonic))
… …
2161 mn_now = ev_rt_now; 2316 mn_now = ev_rt_now;
2162 } 2317 }
2163} 2318}
2164 2319
2165void 2320void
2166ev_loop (EV_P_ int flags) 2321ev_run (EV_P_ int flags)
2167{ 2322{
2168#if EV_MINIMAL < 2 2323#if EV_FEATURE_API
2169 ++loop_depth; 2324 ++loop_depth;
2170#endif 2325#endif
2171 2326
2172 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2327 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2173 2328
2174 loop_done = EVUNLOOP_CANCEL; 2329 loop_done = EVBREAK_CANCEL;
2175 2330
2176 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2331 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2177 2332
2178 do 2333 do
2179 { 2334 {
2180#if EV_VERIFY >= 2 2335#if EV_VERIFY >= 2
2181 ev_loop_verify (EV_A); 2336 ev_verify (EV_A);
2182#endif 2337#endif
2183 2338
2184#ifndef _WIN32 2339#ifndef _WIN32
2185 if (expect_false (curpid)) /* penalise the forking check even more */ 2340 if (expect_false (curpid)) /* penalise the forking check even more */
2186 if (expect_false (getpid () != curpid)) 2341 if (expect_false (getpid () != curpid))
… …
2198 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2353 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2199 EV_INVOKE_PENDING; 2354 EV_INVOKE_PENDING;
2200 } 2355 }
2201#endif 2356#endif
2202 2357
2358#if EV_PREPARE_ENABLE
2203 /* queue prepare watchers (and execute them) */ 2359 /* queue prepare watchers (and execute them) */
2204 if (expect_false (preparecnt)) 2360 if (expect_false (preparecnt))
2205 { 2361 {
2206 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2362 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2207 EV_INVOKE_PENDING; 2363 EV_INVOKE_PENDING;
2208 } 2364 }
2365#endif
2209 2366
2210 if (expect_false (loop_done)) 2367 if (expect_false (loop_done))
2211 break; 2368 break;
2212 2369
2213 /* we might have forked, so reify kernel state if necessary */ 2370 /* we might have forked, so reify kernel state if necessary */
… …
2220 /* calculate blocking time */ 2377 /* calculate blocking time */
2221 { 2378 {
2222 ev_tstamp waittime = 0.; 2379 ev_tstamp waittime = 0.;
2223 ev_tstamp sleeptime = 0.; 2380 ev_tstamp sleeptime = 0.;
2224 2381
2382 /* remember old timestamp for io_blocktime calculation */
2383 ev_tstamp prev_mn_now = mn_now;
2384
2385 /* update time to cancel out callback processing overhead */
2386 time_update (EV_A_ 1e100);
2387
2225 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2388 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2226 { 2389 {
2227 /* remember old timestamp for io_blocktime calculation */
2228 ev_tstamp prev_mn_now = mn_now;
2229
2230 /* update time to cancel out callback processing overhead */
2231 time_update (EV_A_ 1e100);
2232
2233 waittime = MAX_BLOCKTIME; 2390 waittime = MAX_BLOCKTIME;
2234 2391
2235 if (timercnt) 2392 if (timercnt)
2236 { 2393 {
2237 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2394 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2264 waittime -= sleeptime; 2421 waittime -= sleeptime;
2265 } 2422 }
2266 } 2423 }
2267 } 2424 }
2268 2425
2269#if EV_MINIMAL < 2 2426#if EV_FEATURE_API
2270 ++loop_count; 2427 ++loop_count;
2271#endif 2428#endif
2272 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2429 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2273 backend_poll (EV_A_ waittime); 2430 backend_poll (EV_A_ waittime);
2274 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2431 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2275 2432
2276 /* update ev_rt_now, do magic */ 2433 /* update ev_rt_now, do magic */
2277 time_update (EV_A_ waittime + sleeptime); 2434 time_update (EV_A_ waittime + sleeptime);
2278 } 2435 }
2279 2436
… …
2286#if EV_IDLE_ENABLE 2443#if EV_IDLE_ENABLE
2287 /* queue idle watchers unless other events are pending */ 2444 /* queue idle watchers unless other events are pending */
2288 idle_reify (EV_A); 2445 idle_reify (EV_A);
2289#endif 2446#endif
2290 2447
2448#if EV_CHECK_ENABLE
2291 /* queue check watchers, to be executed first */ 2449 /* queue check watchers, to be executed first */
2292 if (expect_false (checkcnt)) 2450 if (expect_false (checkcnt))
2293 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2451 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2452#endif
2294 2453
2295 EV_INVOKE_PENDING; 2454 EV_INVOKE_PENDING;
2296 } 2455 }
2297 while (expect_true ( 2456 while (expect_true (
2298 activecnt 2457 activecnt
2299 && !loop_done 2458 && !loop_done
2300 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2459 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2301 )); 2460 ));
2302 2461
2303 if (loop_done == EVUNLOOP_ONE) 2462 if (loop_done == EVBREAK_ONE)
2304 loop_done = EVUNLOOP_CANCEL; 2463 loop_done = EVBREAK_CANCEL;
2305 2464
2306#if EV_MINIMAL < 2 2465#if EV_FEATURE_API
2307 --loop_depth; 2466 --loop_depth;
2308#endif 2467#endif
2309} 2468}
2310 2469
2311void 2470void
2312ev_unloop (EV_P_ int how) 2471ev_break (EV_P_ int how)
2313{ 2472{
2314 loop_done = how; 2473 loop_done = how;
2315} 2474}
2316 2475
2317void 2476void
… …
2364inline_size void 2523inline_size void
2365wlist_del (WL *head, WL elem) 2524wlist_del (WL *head, WL elem)
2366{ 2525{
2367 while (*head) 2526 while (*head)
2368 { 2527 {
2369 if (*head == elem) 2528 if (expect_true (*head == elem))
2370 { 2529 {
2371 *head = elem->next; 2530 *head = elem->next;
2372 return; 2531 break;
2373 } 2532 }
2374 2533
2375 head = &(*head)->next; 2534 head = &(*head)->next;
2376 } 2535 }
2377} 2536}
… …
2437 2596
2438 if (expect_false (ev_is_active (w))) 2597 if (expect_false (ev_is_active (w)))
2439 return; 2598 return;
2440 2599
2441 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2600 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2442 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2601 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2443 2602
2444 EV_FREQUENT_CHECK; 2603 EV_FREQUENT_CHECK;
2445 2604
2446 ev_start (EV_A_ (W)w, 1); 2605 ev_start (EV_A_ (W)w, 1);
2447 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2606 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2465 EV_FREQUENT_CHECK; 2624 EV_FREQUENT_CHECK;
2466 2625
2467 wlist_del (&anfds[w->fd].head, (WL)w); 2626 wlist_del (&anfds[w->fd].head, (WL)w);
2468 ev_stop (EV_A_ (W)w); 2627 ev_stop (EV_A_ (W)w);
2469 2628
2470 fd_change (EV_A_ w->fd, 1); 2629 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2471 2630
2472 EV_FREQUENT_CHECK; 2631 EV_FREQUENT_CHECK;
2473} 2632}
2474 2633
2475void noinline 2634void noinline
… …
2517 timers [active] = timers [timercnt + HEAP0]; 2676 timers [active] = timers [timercnt + HEAP0];
2518 adjustheap (timers, timercnt, active); 2677 adjustheap (timers, timercnt, active);
2519 } 2678 }
2520 } 2679 }
2521 2680
2522 EV_FREQUENT_CHECK;
2523
2524 ev_at (w) -= mn_now; 2681 ev_at (w) -= mn_now;
2525 2682
2526 ev_stop (EV_A_ (W)w); 2683 ev_stop (EV_A_ (W)w);
2684
2685 EV_FREQUENT_CHECK;
2527} 2686}
2528 2687
2529void noinline 2688void noinline
2530ev_timer_again (EV_P_ ev_timer *w) 2689ev_timer_again (EV_P_ ev_timer *w)
2531{ 2690{
… …
2610 periodics [active] = periodics [periodiccnt + HEAP0]; 2769 periodics [active] = periodics [periodiccnt + HEAP0];
2611 adjustheap (periodics, periodiccnt, active); 2770 adjustheap (periodics, periodiccnt, active);
2612 } 2771 }
2613 } 2772 }
2614 2773
2615 EV_FREQUENT_CHECK;
2616
2617 ev_stop (EV_A_ (W)w); 2774 ev_stop (EV_A_ (W)w);
2775
2776 EV_FREQUENT_CHECK;
2618} 2777}
2619 2778
2620void noinline 2779void noinline
2621ev_periodic_again (EV_P_ ev_periodic *w) 2780ev_periodic_again (EV_P_ ev_periodic *w)
2622{ 2781{
… …
2628 2787
2629#ifndef SA_RESTART 2788#ifndef SA_RESTART
2630# define SA_RESTART 0 2789# define SA_RESTART 0
2631#endif 2790#endif
2632 2791
2792#if EV_SIGNAL_ENABLE
2793
2633void noinline 2794void noinline
2634ev_signal_start (EV_P_ ev_signal *w) 2795ev_signal_start (EV_P_ ev_signal *w)
2635{ 2796{
2636#if EV_MULTIPLICITY
2637 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2638#endif
2639 if (expect_false (ev_is_active (w))) 2797 if (expect_false (ev_is_active (w)))
2640 return; 2798 return;
2641 2799
2642 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2800 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2801
2802#if EV_MULTIPLICITY
2803 assert (("libev: a signal must not be attached to two different loops",
2804 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2805
2806 signals [w->signum - 1].loop = EV_A;
2807#endif
2643 2808
2644 EV_FREQUENT_CHECK; 2809 EV_FREQUENT_CHECK;
2645 2810
2646#if EV_USE_SIGNALFD 2811#if EV_USE_SIGNALFD
2647 if (sigfd == -2) 2812 if (sigfd == -2)
… …
2669 sigaddset (&sigfd_set, w->signum); 2834 sigaddset (&sigfd_set, w->signum);
2670 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2835 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2671 2836
2672 signalfd (sigfd, &sigfd_set, 0); 2837 signalfd (sigfd, &sigfd_set, 0);
2673 } 2838 }
2674 else
2675#endif
2676 evpipe_init (EV_A);
2677
2678 {
2679#ifndef _WIN32
2680 sigset_t full, prev;
2681 sigfillset (&full);
2682 sigprocmask (SIG_SETMASK, &full, &prev);
2683#endif
2684
2685 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2686
2687#ifndef _WIN32
2688# if EV_USE_SIGNALFD
2689 if (sigfd < 0)/*TODO*/
2690# endif 2839#endif
2691 sigdelset (&prev, w->signum);
2692 sigprocmask (SIG_SETMASK, &prev, 0);
2693#endif
2694 }
2695 2840
2696 ev_start (EV_A_ (W)w, 1); 2841 ev_start (EV_A_ (W)w, 1);
2697 wlist_add (&signals [w->signum - 1].head, (WL)w); 2842 wlist_add (&signals [w->signum - 1].head, (WL)w);
2698 2843
2699 if (!((WL)w)->next) 2844 if (!((WL)w)->next)
2700 {
2701#if _WIN32
2702 signal (w->signum, ev_sighandler);
2703#else
2704# if EV_USE_SIGNALFD 2845# if EV_USE_SIGNALFD
2705 if (sigfd < 0) /*TODO*/ 2846 if (sigfd < 0) /*TODO*/
2706# endif 2847# endif
2707 { 2848 {
2849# ifdef _WIN32
2850 evpipe_init (EV_A);
2851
2852 signal (w->signum, ev_sighandler);
2853# else
2708 struct sigaction sa = { }; 2854 struct sigaction sa;
2855
2856 evpipe_init (EV_A);
2857
2709 sa.sa_handler = ev_sighandler; 2858 sa.sa_handler = ev_sighandler;
2710 sigfillset (&sa.sa_mask); 2859 sigfillset (&sa.sa_mask);
2711 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2860 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2712 sigaction (w->signum, &sa, 0); 2861 sigaction (w->signum, &sa, 0);
2862
2863 sigemptyset (&sa.sa_mask);
2864 sigaddset (&sa.sa_mask, w->signum);
2865 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2866#endif
2713 } 2867 }
2714#endif
2715 }
2716 2868
2717 EV_FREQUENT_CHECK; 2869 EV_FREQUENT_CHECK;
2718} 2870}
2719 2871
2720void noinline 2872void noinline
… …
2728 2880
2729 wlist_del (&signals [w->signum - 1].head, (WL)w); 2881 wlist_del (&signals [w->signum - 1].head, (WL)w);
2730 ev_stop (EV_A_ (W)w); 2882 ev_stop (EV_A_ (W)w);
2731 2883
2732 if (!signals [w->signum - 1].head) 2884 if (!signals [w->signum - 1].head)
2885 {
2886#if EV_MULTIPLICITY
2887 signals [w->signum - 1].loop = 0; /* unattach from signal */
2888#endif
2733#if EV_USE_SIGNALFD 2889#if EV_USE_SIGNALFD
2734 if (sigfd >= 0) 2890 if (sigfd >= 0)
2735 { 2891 {
2736 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2892 sigset_t ss;
2893
2894 sigemptyset (&ss);
2895 sigaddset (&ss, w->signum);
2737 sigdelset (&sigfd_set, w->signum); 2896 sigdelset (&sigfd_set, w->signum);
2897
2738 signalfd (sigfd, &sigfd_set, 0); 2898 signalfd (sigfd, &sigfd_set, 0);
2739 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2899 sigprocmask (SIG_UNBLOCK, &ss, 0);
2740 /*TODO: maybe unblock signal? */
2741 } 2900 }
2742 else 2901 else
2743#endif 2902#endif
2744 signal (w->signum, SIG_DFL); 2903 signal (w->signum, SIG_DFL);
2904 }
2745 2905
2746 EV_FREQUENT_CHECK; 2906 EV_FREQUENT_CHECK;
2747} 2907}
2908
2909#endif
2910
2911#if EV_CHILD_ENABLE
2748 2912
2749void 2913void
2750ev_child_start (EV_P_ ev_child *w) 2914ev_child_start (EV_P_ ev_child *w)
2751{ 2915{
2752#if EV_MULTIPLICITY 2916#if EV_MULTIPLICITY
… …
2756 return; 2920 return;
2757 2921
2758 EV_FREQUENT_CHECK; 2922 EV_FREQUENT_CHECK;
2759 2923
2760 ev_start (EV_A_ (W)w, 1); 2924 ev_start (EV_A_ (W)w, 1);
2761 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2925 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2762 2926
2763 EV_FREQUENT_CHECK; 2927 EV_FREQUENT_CHECK;
2764} 2928}
2765 2929
2766void 2930void
… …
2770 if (expect_false (!ev_is_active (w))) 2934 if (expect_false (!ev_is_active (w)))
2771 return; 2935 return;
2772 2936
2773 EV_FREQUENT_CHECK; 2937 EV_FREQUENT_CHECK;
2774 2938
2775 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2939 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2776 ev_stop (EV_A_ (W)w); 2940 ev_stop (EV_A_ (W)w);
2777 2941
2778 EV_FREQUENT_CHECK; 2942 EV_FREQUENT_CHECK;
2779} 2943}
2944
2945#endif
2780 2946
2781#if EV_STAT_ENABLE 2947#if EV_STAT_ENABLE
2782 2948
2783# ifdef _WIN32 2949# ifdef _WIN32
2784# undef lstat 2950# undef lstat
… …
2790#define MIN_STAT_INTERVAL 0.1074891 2956#define MIN_STAT_INTERVAL 0.1074891
2791 2957
2792static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2958static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2793 2959
2794#if EV_USE_INOTIFY 2960#if EV_USE_INOTIFY
2795# define EV_INOTIFY_BUFSIZE 8192 2961
2962/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2963# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2796 2964
2797static void noinline 2965static void noinline
2798infy_add (EV_P_ ev_stat *w) 2966infy_add (EV_P_ ev_stat *w)
2799{ 2967{
2800 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2968 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2801 2969
2802 if (w->wd < 0) 2970 if (w->wd >= 0)
2971 {
2972 struct statfs sfs;
2973
2974 /* now local changes will be tracked by inotify, but remote changes won't */
2975 /* unless the filesystem is known to be local, we therefore still poll */
2976 /* also do poll on <2.6.25, but with normal frequency */
2977
2978 if (!fs_2625)
2979 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2980 else if (!statfs (w->path, &sfs)
2981 && (sfs.f_type == 0x1373 /* devfs */
2982 || sfs.f_type == 0xEF53 /* ext2/3 */
2983 || sfs.f_type == 0x3153464a /* jfs */
2984 || sfs.f_type == 0x52654973 /* reiser3 */
2985 || sfs.f_type == 0x01021994 /* tempfs */
2986 || sfs.f_type == 0x58465342 /* xfs */))
2987 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2988 else
2989 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2803 { 2990 }
2991 else
2992 {
2993 /* can't use inotify, continue to stat */
2804 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2994 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2805 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2806 2995
2807 /* monitor some parent directory for speedup hints */ 2996 /* if path is not there, monitor some parent directory for speedup hints */
2808 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2997 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2809 /* but an efficiency issue only */ 2998 /* but an efficiency issue only */
2810 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2999 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2811 { 3000 {
2812 char path [4096]; 3001 char path [4096];
… …
2828 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3017 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2829 } 3018 }
2830 } 3019 }
2831 3020
2832 if (w->wd >= 0) 3021 if (w->wd >= 0)
2833 {
2834 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3022 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2835 3023
2836 /* now local changes will be tracked by inotify, but remote changes won't */ 3024 /* now re-arm timer, if required */
2837 /* unless the filesystem it known to be local, we therefore still poll */ 3025 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2838 /* also do poll on <2.6.25, but with normal frequency */
2839 struct statfs sfs;
2840
2841 if (fs_2625 && !statfs (w->path, &sfs))
2842 if (sfs.f_type == 0x1373 /* devfs */
2843 || sfs.f_type == 0xEF53 /* ext2/3 */
2844 || sfs.f_type == 0x3153464a /* jfs */
2845 || sfs.f_type == 0x52654973 /* reiser3 */
2846 || sfs.f_type == 0x01021994 /* tempfs */
2847 || sfs.f_type == 0x58465342 /* xfs */)
2848 return;
2849
2850 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2851 ev_timer_again (EV_A_ &w->timer); 3026 ev_timer_again (EV_A_ &w->timer);
2852 } 3027 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2853} 3028}
2854 3029
2855static void noinline 3030static void noinline
2856infy_del (EV_P_ ev_stat *w) 3031infy_del (EV_P_ ev_stat *w)
2857{ 3032{
… …
2860 3035
2861 if (wd < 0) 3036 if (wd < 0)
2862 return; 3037 return;
2863 3038
2864 w->wd = -2; 3039 w->wd = -2;
2865 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3040 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2866 wlist_del (&fs_hash [slot].head, (WL)w); 3041 wlist_del (&fs_hash [slot].head, (WL)w);
2867 3042
2868 /* remove this watcher, if others are watching it, they will rearm */ 3043 /* remove this watcher, if others are watching it, they will rearm */
2869 inotify_rm_watch (fs_fd, wd); 3044 inotify_rm_watch (fs_fd, wd);
2870} 3045}
… …
2872static void noinline 3047static void noinline
2873infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3048infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2874{ 3049{
2875 if (slot < 0) 3050 if (slot < 0)
2876 /* overflow, need to check for all hash slots */ 3051 /* overflow, need to check for all hash slots */
2877 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3052 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2878 infy_wd (EV_A_ slot, wd, ev); 3053 infy_wd (EV_A_ slot, wd, ev);
2879 else 3054 else
2880 { 3055 {
2881 WL w_; 3056 WL w_;
2882 3057
2883 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3058 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2884 { 3059 {
2885 ev_stat *w = (ev_stat *)w_; 3060 ev_stat *w = (ev_stat *)w_;
2886 w_ = w_->next; /* lets us remove this watcher and all before it */ 3061 w_ = w_->next; /* lets us remove this watcher and all before it */
2887 3062
2888 if (w->wd == wd || wd == -1) 3063 if (w->wd == wd || wd == -1)
2889 { 3064 {
2890 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3065 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2891 { 3066 {
2892 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3067 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2893 w->wd = -1; 3068 w->wd = -1;
2894 infy_add (EV_A_ w); /* re-add, no matter what */ 3069 infy_add (EV_A_ w); /* re-add, no matter what */
2895 } 3070 }
2896 3071
2897 stat_timer_cb (EV_A_ &w->timer, 0); 3072 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2902 3077
2903static void 3078static void
2904infy_cb (EV_P_ ev_io *w, int revents) 3079infy_cb (EV_P_ ev_io *w, int revents)
2905{ 3080{
2906 char buf [EV_INOTIFY_BUFSIZE]; 3081 char buf [EV_INOTIFY_BUFSIZE];
2907 struct inotify_event *ev = (struct inotify_event *)buf;
2908 int ofs; 3082 int ofs;
2909 int len = read (fs_fd, buf, sizeof (buf)); 3083 int len = read (fs_fd, buf, sizeof (buf));
2910 3084
2911 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3085 for (ofs = 0; ofs < len; )
3086 {
3087 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2912 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3088 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3089 ofs += sizeof (struct inotify_event) + ev->len;
3090 }
2913} 3091}
2914 3092
2915inline_size void 3093inline_size void
2916check_2625 (EV_P) 3094ev_check_2625 (EV_P)
2917{ 3095{
2918 /* kernels < 2.6.25 are borked 3096 /* kernels < 2.6.25 are borked
2919 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3097 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2920 */ 3098 */
2921 struct utsname buf; 3099 if (ev_linux_version () < 0x020619)
2922 int major, minor, micro;
2923
2924 if (uname (&buf))
2925 return; 3100 return;
2926 3101
2927 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2928 return;
2929
2930 if (major < 2
2931 || (major == 2 && minor < 6)
2932 || (major == 2 && minor == 6 && micro < 25))
2933 return;
2934
2935 fs_2625 = 1; 3102 fs_2625 = 1;
3103}
3104
3105inline_size int
3106infy_newfd (void)
3107{
3108#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3109 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3110 if (fd >= 0)
3111 return fd;
3112#endif
3113 return inotify_init ();
2936} 3114}
2937 3115
2938inline_size void 3116inline_size void
2939infy_init (EV_P) 3117infy_init (EV_P)
2940{ 3118{
2941 if (fs_fd != -2) 3119 if (fs_fd != -2)
2942 return; 3120 return;
2943 3121
2944 fs_fd = -1; 3122 fs_fd = -1;
2945 3123
2946 check_2625 (EV_A); 3124 ev_check_2625 (EV_A);
2947 3125
2948 fs_fd = inotify_init (); 3126 fs_fd = infy_newfd ();
2949 3127
2950 if (fs_fd >= 0) 3128 if (fs_fd >= 0)
2951 { 3129 {
3130 fd_intern (fs_fd);
2952 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3131 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2953 ev_set_priority (&fs_w, EV_MAXPRI); 3132 ev_set_priority (&fs_w, EV_MAXPRI);
2954 ev_io_start (EV_A_ &fs_w); 3133 ev_io_start (EV_A_ &fs_w);
3134 ev_unref (EV_A);
2955 } 3135 }
2956} 3136}
2957 3137
2958inline_size void 3138inline_size void
2959infy_fork (EV_P) 3139infy_fork (EV_P)
… …
2961 int slot; 3141 int slot;
2962 3142
2963 if (fs_fd < 0) 3143 if (fs_fd < 0)
2964 return; 3144 return;
2965 3145
3146 ev_ref (EV_A);
3147 ev_io_stop (EV_A_ &fs_w);
2966 close (fs_fd); 3148 close (fs_fd);
2967 fs_fd = inotify_init (); 3149 fs_fd = infy_newfd ();
2968 3150
3151 if (fs_fd >= 0)
3152 {
3153 fd_intern (fs_fd);
3154 ev_io_set (&fs_w, fs_fd, EV_READ);
3155 ev_io_start (EV_A_ &fs_w);
3156 ev_unref (EV_A);
3157 }
3158
2969 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3159 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2970 { 3160 {
2971 WL w_ = fs_hash [slot].head; 3161 WL w_ = fs_hash [slot].head;
2972 fs_hash [slot].head = 0; 3162 fs_hash [slot].head = 0;
2973 3163
2974 while (w_) 3164 while (w_)
… …
2979 w->wd = -1; 3169 w->wd = -1;
2980 3170
2981 if (fs_fd >= 0) 3171 if (fs_fd >= 0)
2982 infy_add (EV_A_ w); /* re-add, no matter what */ 3172 infy_add (EV_A_ w); /* re-add, no matter what */
2983 else 3173 else
3174 {
3175 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3176 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2984 ev_timer_again (EV_A_ &w->timer); 3177 ev_timer_again (EV_A_ &w->timer);
3178 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3179 }
2985 } 3180 }
2986 } 3181 }
2987} 3182}
2988 3183
2989#endif 3184#endif
… …
3006static void noinline 3201static void noinline
3007stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3202stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3008{ 3203{
3009 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3204 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3010 3205
3011 /* we copy this here each the time so that */ 3206 ev_statdata prev = w->attr;
3012 /* prev has the old value when the callback gets invoked */
3013 w->prev = w->attr;
3014 ev_stat_stat (EV_A_ w); 3207 ev_stat_stat (EV_A_ w);
3015 3208
3016 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3209 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3017 if ( 3210 if (
3018 w->prev.st_dev != w->attr.st_dev 3211 prev.st_dev != w->attr.st_dev
3019 || w->prev.st_ino != w->attr.st_ino 3212 || prev.st_ino != w->attr.st_ino
3020 || w->prev.st_mode != w->attr.st_mode 3213 || prev.st_mode != w->attr.st_mode
3021 || w->prev.st_nlink != w->attr.st_nlink 3214 || prev.st_nlink != w->attr.st_nlink
3022 || w->prev.st_uid != w->attr.st_uid 3215 || prev.st_uid != w->attr.st_uid
3023 || w->prev.st_gid != w->attr.st_gid 3216 || prev.st_gid != w->attr.st_gid
3024 || w->prev.st_rdev != w->attr.st_rdev 3217 || prev.st_rdev != w->attr.st_rdev
3025 || w->prev.st_size != w->attr.st_size 3218 || prev.st_size != w->attr.st_size
3026 || w->prev.st_atime != w->attr.st_atime 3219 || prev.st_atime != w->attr.st_atime
3027 || w->prev.st_mtime != w->attr.st_mtime 3220 || prev.st_mtime != w->attr.st_mtime
3028 || w->prev.st_ctime != w->attr.st_ctime 3221 || prev.st_ctime != w->attr.st_ctime
3029 ) { 3222 ) {
3223 /* we only update w->prev on actual differences */
3224 /* in case we test more often than invoke the callback, */
3225 /* to ensure that prev is always different to attr */
3226 w->prev = prev;
3227
3030 #if EV_USE_INOTIFY 3228 #if EV_USE_INOTIFY
3031 if (fs_fd >= 0) 3229 if (fs_fd >= 0)
3032 { 3230 {
3033 infy_del (EV_A_ w); 3231 infy_del (EV_A_ w);
3034 infy_add (EV_A_ w); 3232 infy_add (EV_A_ w);
… …
3059 3257
3060 if (fs_fd >= 0) 3258 if (fs_fd >= 0)
3061 infy_add (EV_A_ w); 3259 infy_add (EV_A_ w);
3062 else 3260 else
3063#endif 3261#endif
3262 {
3064 ev_timer_again (EV_A_ &w->timer); 3263 ev_timer_again (EV_A_ &w->timer);
3264 ev_unref (EV_A);
3265 }
3065 3266
3066 ev_start (EV_A_ (W)w, 1); 3267 ev_start (EV_A_ (W)w, 1);
3067 3268
3068 EV_FREQUENT_CHECK; 3269 EV_FREQUENT_CHECK;
3069} 3270}
… …
3078 EV_FREQUENT_CHECK; 3279 EV_FREQUENT_CHECK;
3079 3280
3080#if EV_USE_INOTIFY 3281#if EV_USE_INOTIFY
3081 infy_del (EV_A_ w); 3282 infy_del (EV_A_ w);
3082#endif 3283#endif
3284
3285 if (ev_is_active (&w->timer))
3286 {
3287 ev_ref (EV_A);
3083 ev_timer_stop (EV_A_ &w->timer); 3288 ev_timer_stop (EV_A_ &w->timer);
3289 }
3084 3290
3085 ev_stop (EV_A_ (W)w); 3291 ev_stop (EV_A_ (W)w);
3086 3292
3087 EV_FREQUENT_CHECK; 3293 EV_FREQUENT_CHECK;
3088} 3294}
… …
3133 3339
3134 EV_FREQUENT_CHECK; 3340 EV_FREQUENT_CHECK;
3135} 3341}
3136#endif 3342#endif
3137 3343
3344#if EV_PREPARE_ENABLE
3138void 3345void
3139ev_prepare_start (EV_P_ ev_prepare *w) 3346ev_prepare_start (EV_P_ ev_prepare *w)
3140{ 3347{
3141 if (expect_false (ev_is_active (w))) 3348 if (expect_false (ev_is_active (w)))
3142 return; 3349 return;
… …
3168 3375
3169 ev_stop (EV_A_ (W)w); 3376 ev_stop (EV_A_ (W)w);
3170 3377
3171 EV_FREQUENT_CHECK; 3378 EV_FREQUENT_CHECK;
3172} 3379}
3380#endif
3173 3381
3382#if EV_CHECK_ENABLE
3174void 3383void
3175ev_check_start (EV_P_ ev_check *w) 3384ev_check_start (EV_P_ ev_check *w)
3176{ 3385{
3177 if (expect_false (ev_is_active (w))) 3386 if (expect_false (ev_is_active (w)))
3178 return; 3387 return;
… …
3204 3413
3205 ev_stop (EV_A_ (W)w); 3414 ev_stop (EV_A_ (W)w);
3206 3415
3207 EV_FREQUENT_CHECK; 3416 EV_FREQUENT_CHECK;
3208} 3417}
3418#endif
3209 3419
3210#if EV_EMBED_ENABLE 3420#if EV_EMBED_ENABLE
3211void noinline 3421void noinline
3212ev_embed_sweep (EV_P_ ev_embed *w) 3422ev_embed_sweep (EV_P_ ev_embed *w)
3213{ 3423{
3214 ev_loop (w->other, EVLOOP_NONBLOCK); 3424 ev_run (w->other, EVRUN_NOWAIT);
3215} 3425}
3216 3426
3217static void 3427static void
3218embed_io_cb (EV_P_ ev_io *io, int revents) 3428embed_io_cb (EV_P_ ev_io *io, int revents)
3219{ 3429{
3220 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3430 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3221 3431
3222 if (ev_cb (w)) 3432 if (ev_cb (w))
3223 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3433 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3224 else 3434 else
3225 ev_loop (w->other, EVLOOP_NONBLOCK); 3435 ev_run (w->other, EVRUN_NOWAIT);
3226} 3436}
3227 3437
3228static void 3438static void
3229embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3439embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3230{ 3440{
3231 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3441 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3232 3442
3233 { 3443 {
3234 struct ev_loop *loop = w->other; 3444 EV_P = w->other;
3235 3445
3236 while (fdchangecnt) 3446 while (fdchangecnt)
3237 { 3447 {
3238 fd_reify (EV_A); 3448 fd_reify (EV_A);
3239 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3449 ev_run (EV_A_ EVRUN_NOWAIT);
3240 } 3450 }
3241 } 3451 }
3242} 3452}
3243 3453
3244static void 3454static void
… …
3247 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3457 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3248 3458
3249 ev_embed_stop (EV_A_ w); 3459 ev_embed_stop (EV_A_ w);
3250 3460
3251 { 3461 {
3252 struct ev_loop *loop = w->other; 3462 EV_P = w->other;
3253 3463
3254 ev_loop_fork (EV_A); 3464 ev_loop_fork (EV_A);
3255 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3465 ev_run (EV_A_ EVRUN_NOWAIT);
3256 } 3466 }
3257 3467
3258 ev_embed_start (EV_A_ w); 3468 ev_embed_start (EV_A_ w);
3259} 3469}
3260 3470
… …
3271{ 3481{
3272 if (expect_false (ev_is_active (w))) 3482 if (expect_false (ev_is_active (w)))
3273 return; 3483 return;
3274 3484
3275 { 3485 {
3276 struct ev_loop *loop = w->other; 3486 EV_P = w->other;
3277 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3487 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3278 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3488 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3279 } 3489 }
3280 3490
3281 EV_FREQUENT_CHECK; 3491 EV_FREQUENT_CHECK;
… …
3308 3518
3309 ev_io_stop (EV_A_ &w->io); 3519 ev_io_stop (EV_A_ &w->io);
3310 ev_prepare_stop (EV_A_ &w->prepare); 3520 ev_prepare_stop (EV_A_ &w->prepare);
3311 ev_fork_stop (EV_A_ &w->fork); 3521 ev_fork_stop (EV_A_ &w->fork);
3312 3522
3523 ev_stop (EV_A_ (W)w);
3524
3313 EV_FREQUENT_CHECK; 3525 EV_FREQUENT_CHECK;
3314} 3526}
3315#endif 3527#endif
3316 3528
3317#if EV_FORK_ENABLE 3529#if EV_FORK_ENABLE
… …
3357ev_async_start (EV_P_ ev_async *w) 3569ev_async_start (EV_P_ ev_async *w)
3358{ 3570{
3359 if (expect_false (ev_is_active (w))) 3571 if (expect_false (ev_is_active (w)))
3360 return; 3572 return;
3361 3573
3574 w->sent = 0;
3575
3362 evpipe_init (EV_A); 3576 evpipe_init (EV_A);
3363 3577
3364 EV_FREQUENT_CHECK; 3578 EV_FREQUENT_CHECK;
3365 3579
3366 ev_start (EV_A_ (W)w, ++asynccnt); 3580 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3393 3607
3394void 3608void
3395ev_async_send (EV_P_ ev_async *w) 3609ev_async_send (EV_P_ ev_async *w)
3396{ 3610{
3397 w->sent = 1; 3611 w->sent = 1;
3398 evpipe_write (EV_A_ &gotasync); 3612 evpipe_write (EV_A_ &async_pending);
3399} 3613}
3400#endif 3614#endif
3401 3615
3402/*****************************************************************************/ 3616/*****************************************************************************/
3403 3617
… …
3443{ 3657{
3444 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3658 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3445 3659
3446 if (expect_false (!once)) 3660 if (expect_false (!once))
3447 { 3661 {
3448 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3662 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3449 return; 3663 return;
3450 } 3664 }
3451 3665
3452 once->cb = cb; 3666 once->cb = cb;
3453 once->arg = arg; 3667 once->arg = arg;
… …
3540 if (types & EV_ASYNC) 3754 if (types & EV_ASYNC)
3541 for (i = asynccnt; i--; ) 3755 for (i = asynccnt; i--; )
3542 cb (EV_A_ EV_ASYNC, asyncs [i]); 3756 cb (EV_A_ EV_ASYNC, asyncs [i]);
3543#endif 3757#endif
3544 3758
3759#if EV_PREPARE_ENABLE
3545 if (types & EV_PREPARE) 3760 if (types & EV_PREPARE)
3546 for (i = preparecnt; i--; ) 3761 for (i = preparecnt; i--; )
3547#if EV_EMBED_ENABLE 3762# if EV_EMBED_ENABLE
3548 if (ev_cb (prepares [i]) != embed_prepare_cb) 3763 if (ev_cb (prepares [i]) != embed_prepare_cb)
3549#endif 3764# endif
3550 cb (EV_A_ EV_PREPARE, prepares [i]); 3765 cb (EV_A_ EV_PREPARE, prepares [i]);
3766#endif
3551 3767
3768#if EV_CHECK_ENABLE
3552 if (types & EV_CHECK) 3769 if (types & EV_CHECK)
3553 for (i = checkcnt; i--; ) 3770 for (i = checkcnt; i--; )
3554 cb (EV_A_ EV_CHECK, checks [i]); 3771 cb (EV_A_ EV_CHECK, checks [i]);
3772#endif
3555 3773
3774#if EV_SIGNAL_ENABLE
3556 if (types & EV_SIGNAL) 3775 if (types & EV_SIGNAL)
3557 for (i = 0; i < signalmax; ++i) 3776 for (i = 0; i < EV_NSIG - 1; ++i)
3558 for (wl = signals [i].head; wl; ) 3777 for (wl = signals [i].head; wl; )
3559 { 3778 {
3560 wn = wl->next; 3779 wn = wl->next;
3561 cb (EV_A_ EV_SIGNAL, wl); 3780 cb (EV_A_ EV_SIGNAL, wl);
3562 wl = wn; 3781 wl = wn;
3563 } 3782 }
3783#endif
3564 3784
3785#if EV_CHILD_ENABLE
3565 if (types & EV_CHILD) 3786 if (types & EV_CHILD)
3566 for (i = EV_PID_HASHSIZE; i--; ) 3787 for (i = (EV_PID_HASHSIZE); i--; )
3567 for (wl = childs [i]; wl; ) 3788 for (wl = childs [i]; wl; )
3568 { 3789 {
3569 wn = wl->next; 3790 wn = wl->next;
3570 cb (EV_A_ EV_CHILD, wl); 3791 cb (EV_A_ EV_CHILD, wl);
3571 wl = wn; 3792 wl = wn;
3572 } 3793 }
3794#endif
3573/* EV_STAT 0x00001000 /* stat data changed */ 3795/* EV_STAT 0x00001000 /* stat data changed */
3574/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3796/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3575} 3797}
3576#endif 3798#endif
3577 3799
3578#if EV_MULTIPLICITY 3800#if EV_MULTIPLICITY
3579 #include "ev_wrap.h" 3801 #include "ev_wrap.h"
3580#endif 3802#endif
3581 3803
3582#ifdef __cplusplus 3804EV_CPP(})
3583}
3584#endif
3585 3805

Diff Legend

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