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

Comparing libev/ev.c (file contents):
Revision 1.293 by root, Mon Jun 29 18:46:52 2009 UTC vs.
Revision 1.355 by root, Fri Oct 22 10:09:12 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
… …
77# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
79# endif 75# endif
80# endif 76# endif
81 77
78# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
85# else 82# else
83# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 84# define EV_USE_NANOSLEEP 0
85# endif
86
87# if HAVE_SELECT && HAVE_SYS_SELECT_H
88# ifndef EV_USE_SELECT
89# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
88# endif 94# endif
89 95
96# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 98# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 99# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 100# else
101# undef EV_USE_POLL
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif
104# endif 103# endif
105 104
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 106# ifndef EV_USE_EPOLL
109# else 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
112# endif 112# endif
113 113
114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# ifndef EV_USE_KQUEUE 115# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
116# define EV_USE_KQUEUE 1
117# else
118# define EV_USE_KQUEUE 0
119# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
120# endif 121# endif
121 122
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 124# ifndef EV_USE_PORT
125# else 125# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
128# endif 130# endif
129 131
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 133# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
136# endif 139# endif
137 140
141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
138# ifndef EV_USE_EVENTFD 142# ifndef EV_USE_SIGNALFD
139# if HAVE_EVENTFD 143# define EV_USE_SIGNALFD EV_FEATURE_OS
140# define EV_USE_EVENTFD 1
141# else
142# define EV_USE_EVENTFD 0
143# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
148# endif
149
150# if HAVE_EVENTFD
151# ifndef EV_USE_EVENTFD
152# define EV_USE_EVENTFD EV_FEATURE_OS
153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
144# endif 157# endif
145 158
146#endif 159#endif
147 160
148#include <math.h> 161#include <math.h>
149#include <stdlib.h> 162#include <stdlib.h>
163#include <string.h>
150#include <fcntl.h> 164#include <fcntl.h>
151#include <stddef.h> 165#include <stddef.h>
152 166
153#include <stdio.h> 167#include <stdio.h>
154 168
155#include <assert.h> 169#include <assert.h>
156#include <errno.h> 170#include <errno.h>
157#include <sys/types.h> 171#include <sys/types.h>
158#include <time.h> 172#include <time.h>
173#include <limits.h>
159 174
160#include <signal.h> 175#include <signal.h>
161 176
162#ifdef EV_H 177#ifdef EV_H
163# include EV_H 178# include EV_H
164#else 179#else
165# include "ev.h" 180# include "ev.h"
166#endif 181#endif
182
183EV_CPP(extern "C" {)
167 184
168#ifndef _WIN32 185#ifndef _WIN32
169# include <sys/time.h> 186# include <sys/time.h>
170# include <sys/wait.h> 187# include <sys/wait.h>
171# include <unistd.h> 188# include <unistd.h>
… …
174# define WIN32_LEAN_AND_MEAN 191# define WIN32_LEAN_AND_MEAN
175# include <windows.h> 192# include <windows.h>
176# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
177# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
178# endif 195# endif
196# undef EV_AVOID_STDIO
179#endif 197#endif
198
199/* OS X, in its infinite idiocy, actually HARDCODES
200 * a limit of 1024 into their select. Where people have brains,
201 * OS X engineers apparently have a vacuum. Or maybe they were
202 * ordered to have a vacuum, or they do anything for money.
203 * This might help. Or not.
204 */
205#define _DARWIN_UNLIMITED_SELECT 1
180 206
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 207/* this block tries to deduce configuration from header-defined symbols and defaults */
208
209/* try to deduce the maximum number of signals on this platform */
210#if defined (EV_NSIG)
211/* use what's provided */
212#elif defined (NSIG)
213# define EV_NSIG (NSIG)
214#elif defined(_NSIG)
215# define EV_NSIG (_NSIG)
216#elif defined (SIGMAX)
217# define EV_NSIG (SIGMAX+1)
218#elif defined (SIG_MAX)
219# define EV_NSIG (SIG_MAX+1)
220#elif defined (_SIG_MAX)
221# define EV_NSIG (_SIG_MAX+1)
222#elif defined (MAXSIG)
223# define EV_NSIG (MAXSIG+1)
224#elif defined (MAX_SIG)
225# define EV_NSIG (MAX_SIG+1)
226#elif defined (SIGARRAYSIZE)
227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
228#elif defined (_sys_nsig)
229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
230#else
231# error "unable to find value for NSIG, please report"
232/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */
234# define EV_NSIG 65
235#endif
182 236
183#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
186# else 240# else
187# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
188# endif 242# endif
189#endif 243#endif
190 244
191#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
192# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
193# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
194# else 248# else
195# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
196# endif 250# endif
197#endif 251#endif
198 252
… …
200# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
201#endif 255#endif
202 256
203#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
204# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
205# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
206# else 260# else
207# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
208# endif 262# endif
209#endif 263#endif
210 264
211#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
212# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
213#endif 267#endif
214 268
215#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
216# ifdef _WIN32 270# ifdef _WIN32
217# define EV_USE_POLL 0 271# define EV_USE_POLL 0
218# else 272# else
219# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
220# endif 274# endif
221#endif 275#endif
222 276
223#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
224# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
225# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
226# else 280# else
227# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
228# endif 282# endif
229#endif 283#endif
230 284
… …
236# define EV_USE_PORT 0 290# define EV_USE_PORT 0
237#endif 291#endif
238 292
239#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
240# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
241# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
242# else 296# else
243# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
244# endif 298# endif
245#endif 299#endif
246 300
247#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
248# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
249# define EV_PID_HASHSIZE 1
250# else
251# define EV_PID_HASHSIZE 16
252# endif
253#endif 303#endif
254 304
255#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
256# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
257# define EV_INOTIFY_HASHSIZE 1
258# else
259# define EV_INOTIFY_HASHSIZE 16
260# endif
261#endif 307#endif
262 308
263#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
266# else 312# else
267# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
314# endif
315#endif
316
317#ifndef EV_USE_SIGNALFD
318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
319# define EV_USE_SIGNALFD EV_FEATURE_OS
320# else
321# define EV_USE_SIGNALFD 0
268# endif 322# endif
269#endif 323#endif
270 324
271#if 0 /* debugging */ 325#if 0 /* debugging */
272# define EV_VERIFY 3 326# define EV_VERIFY 3
273# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
274# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
275#endif 329#endif
276 330
277#ifndef EV_VERIFY 331#ifndef EV_VERIFY
278# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
279#endif 333#endif
280 334
281#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
282# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
283#endif 337#endif
284 338
285#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
286# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
287#endif 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
… …
339#endif 399#endif
340 400
341#if EV_USE_EVENTFD 401#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 402/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 403# include <stdint.h>
344# ifdef __cplusplus 404# ifndef EFD_NONBLOCK
345extern "C" { 405# define EFD_NONBLOCK O_NONBLOCK
346# endif 406# endif
347int eventfd (unsigned int initval, int flags); 407# ifndef EFD_CLOEXEC
348# ifdef __cplusplus 408# ifdef O_CLOEXEC
349} 409# define EFD_CLOEXEC O_CLOEXEC
410# else
411# define EFD_CLOEXEC 02000000
412# endif
350# endif 413# endif
414EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
415#endif
416
417#if EV_USE_SIGNALFD
418/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
419# include <stdint.h>
420# ifndef SFD_NONBLOCK
421# define SFD_NONBLOCK O_NONBLOCK
422# endif
423# ifndef SFD_CLOEXEC
424# ifdef O_CLOEXEC
425# define SFD_CLOEXEC O_CLOEXEC
426# else
427# define SFD_CLOEXEC 02000000
428# endif
429# endif
430EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
431
432struct signalfd_siginfo
433{
434 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)];
436};
351#endif 437#endif
352 438
353/**/ 439/**/
354 440
355#if EV_VERIFY >= 3 441#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 442# define EV_FREQUENT_CHECK ev_verify (EV_A)
357#else 443#else
358# define EV_FREQUENT_CHECK do { } while (0) 444# define EV_FREQUENT_CHECK do { } while (0)
359#endif 445#endif
360 446
361/* 447/*
… …
368 */ 454 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 455#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 456
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 457#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
372#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 458#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
373/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 459
460#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
461#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
374 462
375#if __GNUC__ >= 4 463#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
378#else 466#else
… …
385 473
386#define expect_false(expr) expect ((expr) != 0, 0) 474#define expect_false(expr) expect ((expr) != 0, 0)
387#define expect_true(expr) expect ((expr) != 0, 1) 475#define expect_true(expr) expect ((expr) != 0, 1)
388#define inline_size static inline 476#define inline_size static inline
389 477
390#if EV_MINIMAL 478#if EV_FEATURE_CODE
479# define inline_speed static inline
480#else
391# define inline_speed static noinline 481# define inline_speed static noinline
482#endif
483
484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
485
486#if EV_MINPRI == EV_MAXPRI
487# define ABSPRI(w) (((W)w), 0)
392#else 488#else
393# define inline_speed static inline
394#endif
395
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 489# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
490#endif
398 491
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 492#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 493#define EMPTY2(a,b) /* used to suppress some warnings */
401 494
402typedef ev_watcher *W; 495typedef ev_watcher *W;
… …
406#define ev_active(w) ((W)(w))->active 499#define ev_active(w) ((W)(w))->active
407#define ev_at(w) ((WT)(w))->at 500#define ev_at(w) ((WT)(w))->at
408 501
409#if EV_USE_REALTIME 502#if EV_USE_REALTIME
410/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 503/* sig_atomic_t is used to avoid per-thread variables or locking but still */
411/* giving it a reasonably high chance of working on typical architetcures */ 504/* giving it a reasonably high chance of working on typical architectures */
412static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
413#endif 506#endif
414 507
415#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
416static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
417#endif 510#endif
418 511
512#ifndef EV_FD_TO_WIN32_HANDLE
513# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
514#endif
515#ifndef EV_WIN32_HANDLE_TO_FD
516# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
517#endif
518#ifndef EV_WIN32_CLOSE_FD
519# define EV_WIN32_CLOSE_FD(fd) close (fd)
520#endif
521
419#ifdef _WIN32 522#ifdef _WIN32
420# include "ev_win32.c" 523# include "ev_win32.c"
421#endif 524#endif
422 525
423/*****************************************************************************/ 526/*****************************************************************************/
527
528static unsigned int noinline
529ev_linux_version (void)
530{
531#ifdef __linux
532 struct utsname buf;
533 unsigned int v;
534 int i;
535 char *p = buf.release;
536
537 if (uname (&buf))
538 return 0;
539
540 for (i = 3+1; --i; )
541 {
542 unsigned int c = 0;
543
544 for (;;)
545 {
546 if (*p >= '0' && *p <= '9')
547 c = c * 10 + *p++ - '0';
548 else
549 {
550 p += *p == '.';
551 break;
552 }
553 }
554
555 v = (v << 8) | c;
556 }
557
558 return v;
559#else
560 return 0;
561#endif
562}
563
564/*****************************************************************************/
565
566#if EV_AVOID_STDIO
567static void noinline
568ev_printerr (const char *msg)
569{
570 write (STDERR_FILENO, msg, strlen (msg));
571}
572#endif
424 573
425static void (*syserr_cb)(const char *msg); 574static void (*syserr_cb)(const char *msg);
426 575
427void 576void
428ev_set_syserr_cb (void (*cb)(const char *msg)) 577ev_set_syserr_cb (void (*cb)(const char *msg))
… …
438 587
439 if (syserr_cb) 588 if (syserr_cb)
440 syserr_cb (msg); 589 syserr_cb (msg);
441 else 590 else
442 { 591 {
592#if EV_AVOID_STDIO
593 const char *err = strerror (errno);
594
595 ev_printerr (msg);
596 ev_printerr (": ");
597 ev_printerr (err);
598 ev_printerr ("\n");
599#else
443 perror (msg); 600 perror (msg);
601#endif
444 abort (); 602 abort ();
445 } 603 }
446} 604}
447 605
448static void * 606static void *
449ev_realloc_emul (void *ptr, long size) 607ev_realloc_emul (void *ptr, long size)
450{ 608{
609#if __GLIBC__
610 return realloc (ptr, size);
611#else
451 /* some systems, notably openbsd and darwin, fail to properly 612 /* some systems, notably openbsd and darwin, fail to properly
452 * implement realloc (x, 0) (as required by both ansi c-98 and 613 * implement realloc (x, 0) (as required by both ansi c-89 and
453 * the single unix specification, so work around them here. 614 * the single unix specification, so work around them here.
454 */ 615 */
455 616
456 if (size) 617 if (size)
457 return realloc (ptr, size); 618 return realloc (ptr, size);
458 619
459 free (ptr); 620 free (ptr);
460 return 0; 621 return 0;
622#endif
461} 623}
462 624
463static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 625static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
464 626
465void 627void
… …
473{ 635{
474 ptr = alloc (ptr, size); 636 ptr = alloc (ptr, size);
475 637
476 if (!ptr && size) 638 if (!ptr && size)
477 { 639 {
640#if EV_AVOID_STDIO
641 ev_printerr ("libev: memory allocation failed, aborting.\n");
642#else
478 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 643 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
644#endif
479 abort (); 645 abort ();
480 } 646 }
481 647
482 return ptr; 648 return ptr;
483} 649}
… …
485#define ev_malloc(size) ev_realloc (0, (size)) 651#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 652#define ev_free(ptr) ev_realloc ((ptr), 0)
487 653
488/*****************************************************************************/ 654/*****************************************************************************/
489 655
656/* set in reify when reification needed */
657#define EV_ANFD_REIFY 1
658
490/* file descriptor info structure */ 659/* file descriptor info structure */
491typedef struct 660typedef struct
492{ 661{
493 WL head; 662 WL head;
494 unsigned char events; /* the events watched for */ 663 unsigned char events; /* the events watched for */
495 unsigned char reify; /* flag set when this ANFD needs reification */ 664 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
496 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 665 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
497 unsigned char unused; 666 unsigned char unused;
498#if EV_USE_EPOLL 667#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 668 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 669#endif
… …
562 731
563 static int ev_default_loop_ptr; 732 static int ev_default_loop_ptr;
564 733
565#endif 734#endif
566 735
736#if EV_FEATURE_API
737# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
738# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
739# define EV_INVOKE_PENDING invoke_cb (EV_A)
740#else
741# define EV_RELEASE_CB (void)0
742# define EV_ACQUIRE_CB (void)0
743# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
744#endif
745
746#define EVBREAK_RECURSE 0x80
747
567/*****************************************************************************/ 748/*****************************************************************************/
568 749
569#ifndef EV_HAVE_EV_TIME 750#ifndef EV_HAVE_EV_TIME
570ev_tstamp 751ev_tstamp
571ev_time (void) 752ev_time (void)
… …
614 if (delay > 0.) 795 if (delay > 0.)
615 { 796 {
616#if EV_USE_NANOSLEEP 797#if EV_USE_NANOSLEEP
617 struct timespec ts; 798 struct timespec ts;
618 799
619 ts.tv_sec = (time_t)delay; 800 EV_TS_SET (ts, delay);
620 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
621
622 nanosleep (&ts, 0); 801 nanosleep (&ts, 0);
623#elif defined(_WIN32) 802#elif defined(_WIN32)
624 Sleep ((unsigned long)(delay * 1e3)); 803 Sleep ((unsigned long)(delay * 1e3));
625#else 804#else
626 struct timeval tv; 805 struct timeval tv;
627 806
628 tv.tv_sec = (time_t)delay;
629 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
630
631 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 807 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
632 /* somehting not guaranteed by newer posix versions, but guaranteed */ 808 /* something not guaranteed by newer posix versions, but guaranteed */
633 /* by older ones */ 809 /* by older ones */
810 EV_TV_SET (tv, delay);
634 select (0, 0, 0, 0, &tv); 811 select (0, 0, 0, 0, &tv);
635#endif 812#endif
636 } 813 }
637} 814}
638 815
639/*****************************************************************************/ 816/*****************************************************************************/
640 817
641#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 818#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
642 819
643/* find a suitable new size for the given array, */ 820/* find a suitable new size for the given array, */
644/* hopefully by rounding to a ncie-to-malloc size */ 821/* hopefully by rounding to a nice-to-malloc size */
645inline_size int 822inline_size int
646array_nextsize (int elem, int cur, int cnt) 823array_nextsize (int elem, int cur, int cnt)
647{ 824{
648 int ncur = cur + 1; 825 int ncur = cur + 1;
649 826
… …
745} 922}
746 923
747/*****************************************************************************/ 924/*****************************************************************************/
748 925
749inline_speed void 926inline_speed void
750fd_event (EV_P_ int fd, int revents) 927fd_event_nocheck (EV_P_ int fd, int revents)
751{ 928{
752 ANFD *anfd = anfds + fd; 929 ANFD *anfd = anfds + fd;
753 ev_io *w; 930 ev_io *w;
754 931
755 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 932 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
759 if (ev) 936 if (ev)
760 ev_feed_event (EV_A_ (W)w, ev); 937 ev_feed_event (EV_A_ (W)w, ev);
761 } 938 }
762} 939}
763 940
941/* do not submit kernel events for fds that have reify set */
942/* because that means they changed while we were polling for new events */
943inline_speed void
944fd_event (EV_P_ int fd, int revents)
945{
946 ANFD *anfd = anfds + fd;
947
948 if (expect_true (!anfd->reify))
949 fd_event_nocheck (EV_A_ fd, revents);
950}
951
764void 952void
765ev_feed_fd_event (EV_P_ int fd, int revents) 953ev_feed_fd_event (EV_P_ int fd, int revents)
766{ 954{
767 if (fd >= 0 && fd < anfdmax) 955 if (fd >= 0 && fd < anfdmax)
768 fd_event (EV_A_ fd, revents); 956 fd_event_nocheck (EV_A_ fd, revents);
769} 957}
770 958
771/* make sure the external fd watch events are in-sync */ 959/* make sure the external fd watch events are in-sync */
772/* with the kernel/libev internal state */ 960/* with the kernel/libev internal state */
773inline_size void 961inline_size void
… …
779 { 967 {
780 int fd = fdchanges [i]; 968 int fd = fdchanges [i];
781 ANFD *anfd = anfds + fd; 969 ANFD *anfd = anfds + fd;
782 ev_io *w; 970 ev_io *w;
783 971
784 unsigned char events = 0; 972 unsigned char o_events = anfd->events;
973 unsigned char o_reify = anfd->reify;
785 974
786 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 975 anfd->reify = 0;
787 events |= (unsigned char)w->events;
788 976
789#if EV_SELECT_IS_WINSOCKET 977#if EV_SELECT_IS_WINSOCKET
790 if (events) 978 if (o_reify & EV__IOFDSET)
791 { 979 {
792 unsigned long arg; 980 unsigned long arg;
793 #ifdef EV_FD_TO_WIN32_HANDLE
794 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 981 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
795 #else
796 anfd->handle = _get_osfhandle (fd);
797 #endif
798 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 982 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
799 } 983 }
800#endif 984#endif
801 985
986 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
802 { 987 {
803 unsigned char o_events = anfd->events;
804 unsigned char o_reify = anfd->reify;
805
806 anfd->reify = 0;
807 anfd->events = events; 988 anfd->events = 0;
808 989
809 if (o_events != events || o_reify & EV__IOFDSET) 990 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
991 anfd->events |= (unsigned char)w->events;
992
993 if (o_events != anfd->events)
994 o_reify = EV__IOFDSET; /* actually |= */
995 }
996
997 if (o_reify & EV__IOFDSET)
810 backend_modify (EV_A_ fd, o_events, events); 998 backend_modify (EV_A_ fd, o_events, anfd->events);
811 }
812 } 999 }
813 1000
814 fdchangecnt = 0; 1001 fdchangecnt = 0;
815} 1002}
816 1003
… …
840 ev_io_stop (EV_A_ w); 1027 ev_io_stop (EV_A_ w);
841 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1028 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
842 } 1029 }
843} 1030}
844 1031
845/* check whether the given fd is atcually valid, for error recovery */ 1032/* check whether the given fd is actually valid, for error recovery */
846inline_size int 1033inline_size int
847fd_valid (int fd) 1034fd_valid (int fd)
848{ 1035{
849#ifdef _WIN32 1036#ifdef _WIN32
850 return _get_osfhandle (fd) != -1; 1037 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
851#else 1038#else
852 return fcntl (fd, F_GETFD) != -1; 1039 return fcntl (fd, F_GETFD) != -1;
853#endif 1040#endif
854} 1041}
855 1042
… …
873 1060
874 for (fd = anfdmax; fd--; ) 1061 for (fd = anfdmax; fd--; )
875 if (anfds [fd].events) 1062 if (anfds [fd].events)
876 { 1063 {
877 fd_kill (EV_A_ fd); 1064 fd_kill (EV_A_ fd);
878 return; 1065 break;
879 } 1066 }
880} 1067}
881 1068
882/* usually called after fork if backend needs to re-arm all fds from scratch */ 1069/* usually called after fork if backend needs to re-arm all fds from scratch */
883static void noinline 1070static void noinline
… …
888 for (fd = 0; fd < anfdmax; ++fd) 1075 for (fd = 0; fd < anfdmax; ++fd)
889 if (anfds [fd].events) 1076 if (anfds [fd].events)
890 { 1077 {
891 anfds [fd].events = 0; 1078 anfds [fd].events = 0;
892 anfds [fd].emask = 0; 1079 anfds [fd].emask = 0;
893 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1080 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
894 } 1081 }
895} 1082}
896 1083
1084/* used to prepare libev internal fd's */
1085/* this is not fork-safe */
1086inline_speed void
1087fd_intern (int fd)
1088{
1089#ifdef _WIN32
1090 unsigned long arg = 1;
1091 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1092#else
1093 fcntl (fd, F_SETFD, FD_CLOEXEC);
1094 fcntl (fd, F_SETFL, O_NONBLOCK);
1095#endif
1096}
1097
897/*****************************************************************************/ 1098/*****************************************************************************/
898 1099
899/* 1100/*
900 * the heap functions want a real array index. array index 0 uis guaranteed to not 1101 * the heap functions want a real array index. array index 0 is guaranteed to not
901 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1102 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
902 * the branching factor of the d-tree. 1103 * the branching factor of the d-tree.
903 */ 1104 */
904 1105
905/* 1106/*
… …
973 1174
974 for (;;) 1175 for (;;)
975 { 1176 {
976 int c = k << 1; 1177 int c = k << 1;
977 1178
978 if (c > N + HEAP0 - 1) 1179 if (c >= N + HEAP0)
979 break; 1180 break;
980 1181
981 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1182 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
982 ? 1 : 0; 1183 ? 1 : 0;
983 1184
… …
1019 1220
1020/* move an element suitably so it is in a correct place */ 1221/* move an element suitably so it is in a correct place */
1021inline_size void 1222inline_size void
1022adjustheap (ANHE *heap, int N, int k) 1223adjustheap (ANHE *heap, int N, int k)
1023{ 1224{
1024 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1225 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1025 upheap (heap, k); 1226 upheap (heap, k);
1026 else 1227 else
1027 downheap (heap, N, k); 1228 downheap (heap, N, k);
1028} 1229}
1029 1230
… …
1042/*****************************************************************************/ 1243/*****************************************************************************/
1043 1244
1044/* associate signal watchers to a signal signal */ 1245/* associate signal watchers to a signal signal */
1045typedef struct 1246typedef struct
1046{ 1247{
1248 EV_ATOMIC_T pending;
1249#if EV_MULTIPLICITY
1250 EV_P;
1251#endif
1047 WL head; 1252 WL head;
1048 EV_ATOMIC_T gotsig;
1049} ANSIG; 1253} ANSIG;
1050 1254
1051static ANSIG *signals; 1255static ANSIG signals [EV_NSIG - 1];
1052static int signalmax;
1053
1054static EV_ATOMIC_T gotsig;
1055 1256
1056/*****************************************************************************/ 1257/*****************************************************************************/
1057 1258
1058/* used to prepare libev internal fd's */ 1259#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1059/* this is not fork-safe */
1060inline_speed void
1061fd_intern (int fd)
1062{
1063#ifdef _WIN32
1064 unsigned long arg = 1;
1065 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1066#else
1067 fcntl (fd, F_SETFD, FD_CLOEXEC);
1068 fcntl (fd, F_SETFL, O_NONBLOCK);
1069#endif
1070}
1071 1260
1072static void noinline 1261static void noinline
1073evpipe_init (EV_P) 1262evpipe_init (EV_P)
1074{ 1263{
1075 if (!ev_is_active (&pipe_w)) 1264 if (!ev_is_active (&pipe_w))
1076 { 1265 {
1077#if EV_USE_EVENTFD 1266# if EV_USE_EVENTFD
1267 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1268 if (evfd < 0 && errno == EINVAL)
1078 if ((evfd = eventfd (0, 0)) >= 0) 1269 evfd = eventfd (0, 0);
1270
1271 if (evfd >= 0)
1079 { 1272 {
1080 evpipe [0] = -1; 1273 evpipe [0] = -1;
1081 fd_intern (evfd); 1274 fd_intern (evfd); /* doing it twice doesn't hurt */
1082 ev_io_set (&pipe_w, evfd, EV_READ); 1275 ev_io_set (&pipe_w, evfd, EV_READ);
1083 } 1276 }
1084 else 1277 else
1085#endif 1278# endif
1086 { 1279 {
1087 while (pipe (evpipe)) 1280 while (pipe (evpipe))
1088 ev_syserr ("(libev) error creating signal/async pipe"); 1281 ev_syserr ("(libev) error creating signal/async pipe");
1089 1282
1090 fd_intern (evpipe [0]); 1283 fd_intern (evpipe [0]);
… …
1101evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1294evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1102{ 1295{
1103 if (!*flag) 1296 if (!*flag)
1104 { 1297 {
1105 int old_errno = errno; /* save errno because write might clobber it */ 1298 int old_errno = errno; /* save errno because write might clobber it */
1299 char dummy;
1106 1300
1107 *flag = 1; 1301 *flag = 1;
1108 1302
1109#if EV_USE_EVENTFD 1303#if EV_USE_EVENTFD
1110 if (evfd >= 0) 1304 if (evfd >= 0)
… …
1112 uint64_t counter = 1; 1306 uint64_t counter = 1;
1113 write (evfd, &counter, sizeof (uint64_t)); 1307 write (evfd, &counter, sizeof (uint64_t));
1114 } 1308 }
1115 else 1309 else
1116#endif 1310#endif
1311 /* win32 people keep sending patches that change this write() to send() */
1312 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1313 /* so when you think this write should be a send instead, please find out */
1314 /* where your send() is from - it's definitely not the microsoft send, and */
1315 /* tell me. thank you. */
1117 write (evpipe [1], &old_errno, 1); 1316 write (evpipe [1], &dummy, 1);
1118 1317
1119 errno = old_errno; 1318 errno = old_errno;
1120 } 1319 }
1121} 1320}
1122 1321
1123/* called whenever the libev signal pipe */ 1322/* called whenever the libev signal pipe */
1124/* got some events (signal, async) */ 1323/* got some events (signal, async) */
1125static void 1324static void
1126pipecb (EV_P_ ev_io *iow, int revents) 1325pipecb (EV_P_ ev_io *iow, int revents)
1127{ 1326{
1327 int i;
1328
1128#if EV_USE_EVENTFD 1329#if EV_USE_EVENTFD
1129 if (evfd >= 0) 1330 if (evfd >= 0)
1130 { 1331 {
1131 uint64_t counter; 1332 uint64_t counter;
1132 read (evfd, &counter, sizeof (uint64_t)); 1333 read (evfd, &counter, sizeof (uint64_t));
1133 } 1334 }
1134 else 1335 else
1135#endif 1336#endif
1136 { 1337 {
1137 char dummy; 1338 char dummy;
1339 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1138 read (evpipe [0], &dummy, 1); 1340 read (evpipe [0], &dummy, 1);
1139 } 1341 }
1140 1342
1141 if (gotsig && ev_is_default_loop (EV_A)) 1343 if (sig_pending)
1142 { 1344 {
1143 int signum; 1345 sig_pending = 0;
1144 gotsig = 0;
1145 1346
1146 for (signum = signalmax; signum--; ) 1347 for (i = EV_NSIG - 1; i--; )
1147 if (signals [signum].gotsig) 1348 if (expect_false (signals [i].pending))
1148 ev_feed_signal_event (EV_A_ signum + 1); 1349 ev_feed_signal_event (EV_A_ i + 1);
1149 } 1350 }
1150 1351
1151#if EV_ASYNC_ENABLE 1352#if EV_ASYNC_ENABLE
1152 if (gotasync) 1353 if (async_pending)
1153 { 1354 {
1154 int i; 1355 async_pending = 0;
1155 gotasync = 0;
1156 1356
1157 for (i = asynccnt; i--; ) 1357 for (i = asynccnt; i--; )
1158 if (asyncs [i]->sent) 1358 if (asyncs [i]->sent)
1159 { 1359 {
1160 asyncs [i]->sent = 0; 1360 asyncs [i]->sent = 0;
… …
1168 1368
1169static void 1369static void
1170ev_sighandler (int signum) 1370ev_sighandler (int signum)
1171{ 1371{
1172#if EV_MULTIPLICITY 1372#if EV_MULTIPLICITY
1173 struct ev_loop *loop = &default_loop_struct; 1373 EV_P = signals [signum - 1].loop;
1174#endif 1374#endif
1175 1375
1176#if _WIN32 1376#ifdef _WIN32
1177 signal (signum, ev_sighandler); 1377 signal (signum, ev_sighandler);
1178#endif 1378#endif
1179 1379
1180 signals [signum - 1].gotsig = 1; 1380 signals [signum - 1].pending = 1;
1181 evpipe_write (EV_A_ &gotsig); 1381 evpipe_write (EV_A_ &sig_pending);
1182} 1382}
1183 1383
1184void noinline 1384void noinline
1185ev_feed_signal_event (EV_P_ int signum) 1385ev_feed_signal_event (EV_P_ int signum)
1186{ 1386{
1187 WL w; 1387 WL w;
1188 1388
1389 if (expect_false (signum <= 0 || signum > EV_NSIG))
1390 return;
1391
1392 --signum;
1393
1189#if EV_MULTIPLICITY 1394#if EV_MULTIPLICITY
1190 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1395 /* it is permissible to try to feed a signal to the wrong loop */
1191#endif 1396 /* or, likely more useful, feeding a signal nobody is waiting for */
1192 1397
1193 --signum; 1398 if (expect_false (signals [signum].loop != EV_A))
1194
1195 if (signum < 0 || signum >= signalmax)
1196 return; 1399 return;
1400#endif
1197 1401
1198 signals [signum].gotsig = 0; 1402 signals [signum].pending = 0;
1199 1403
1200 for (w = signals [signum].head; w; w = w->next) 1404 for (w = signals [signum].head; w; w = w->next)
1201 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1405 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1202} 1406}
1203 1407
1408#if EV_USE_SIGNALFD
1409static void
1410sigfdcb (EV_P_ ev_io *iow, int revents)
1411{
1412 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1413
1414 for (;;)
1415 {
1416 ssize_t res = read (sigfd, si, sizeof (si));
1417
1418 /* not ISO-C, as res might be -1, but works with SuS */
1419 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1420 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1421
1422 if (res < (ssize_t)sizeof (si))
1423 break;
1424 }
1425}
1426#endif
1427
1428#endif
1429
1204/*****************************************************************************/ 1430/*****************************************************************************/
1205 1431
1432#if EV_CHILD_ENABLE
1206static WL childs [EV_PID_HASHSIZE]; 1433static WL childs [EV_PID_HASHSIZE];
1207
1208#ifndef _WIN32
1209 1434
1210static ev_signal childev; 1435static ev_signal childev;
1211 1436
1212#ifndef WIFCONTINUED 1437#ifndef WIFCONTINUED
1213# define WIFCONTINUED(status) 0 1438# define WIFCONTINUED(status) 0
… …
1218child_reap (EV_P_ int chain, int pid, int status) 1443child_reap (EV_P_ int chain, int pid, int status)
1219{ 1444{
1220 ev_child *w; 1445 ev_child *w;
1221 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1446 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1222 1447
1223 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1448 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1224 { 1449 {
1225 if ((w->pid == pid || !w->pid) 1450 if ((w->pid == pid || !w->pid)
1226 && (!traced || (w->flags & 1))) 1451 && (!traced || (w->flags & 1)))
1227 { 1452 {
1228 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1453 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1253 /* make sure we are called again until all children have been reaped */ 1478 /* make sure we are called again until all children have been reaped */
1254 /* we need to do it this way so that the callback gets called before we continue */ 1479 /* we need to do it this way so that the callback gets called before we continue */
1255 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1480 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1256 1481
1257 child_reap (EV_A_ pid, pid, status); 1482 child_reap (EV_A_ pid, pid, status);
1258 if (EV_PID_HASHSIZE > 1) 1483 if ((EV_PID_HASHSIZE) > 1)
1259 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1484 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1260} 1485}
1261 1486
1262#endif 1487#endif
1263 1488
… …
1330#ifdef __APPLE__ 1555#ifdef __APPLE__
1331 /* only select works correctly on that "unix-certified" platform */ 1556 /* only select works correctly on that "unix-certified" platform */
1332 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1557 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1333 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1558 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1334#endif 1559#endif
1560#ifdef __FreeBSD__
1561 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1562#endif
1335 1563
1336 return flags; 1564 return flags;
1337} 1565}
1338 1566
1339unsigned int 1567unsigned int
1340ev_embeddable_backends (void) 1568ev_embeddable_backends (void)
1341{ 1569{
1342 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1570 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1343 1571
1344 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1572 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1345 /* please fix it and tell me how to detect the fix */ 1573 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1346 flags &= ~EVBACKEND_EPOLL; 1574 flags &= ~EVBACKEND_EPOLL;
1347 1575
1348 return flags; 1576 return flags;
1349} 1577}
1350 1578
1351unsigned int 1579unsigned int
1352ev_backend (EV_P) 1580ev_backend (EV_P)
1353{ 1581{
1354 return backend; 1582 return backend;
1355} 1583}
1356 1584
1585#if EV_FEATURE_API
1357unsigned int 1586unsigned int
1358ev_loop_count (EV_P) 1587ev_iteration (EV_P)
1359{ 1588{
1360 return loop_count; 1589 return loop_count;
1361} 1590}
1362 1591
1592unsigned int
1593ev_depth (EV_P)
1594{
1595 return loop_depth;
1596}
1597
1363void 1598void
1364ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1599ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1365{ 1600{
1366 io_blocktime = interval; 1601 io_blocktime = interval;
1367} 1602}
… …
1369void 1604void
1370ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1605ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1371{ 1606{
1372 timeout_blocktime = interval; 1607 timeout_blocktime = interval;
1373} 1608}
1609
1610void
1611ev_set_userdata (EV_P_ void *data)
1612{
1613 userdata = data;
1614}
1615
1616void *
1617ev_userdata (EV_P)
1618{
1619 return userdata;
1620}
1621
1622void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1623{
1624 invoke_cb = invoke_pending_cb;
1625}
1626
1627void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1628{
1629 release_cb = release;
1630 acquire_cb = acquire;
1631}
1632#endif
1374 1633
1375/* initialise a loop structure, must be zero-initialised */ 1634/* initialise a loop structure, must be zero-initialised */
1376static void noinline 1635static void noinline
1377loop_init (EV_P_ unsigned int flags) 1636loop_init (EV_P_ unsigned int flags)
1378{ 1637{
… …
1396 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1655 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1397 have_monotonic = 1; 1656 have_monotonic = 1;
1398 } 1657 }
1399#endif 1658#endif
1400 1659
1660 /* pid check not overridable via env */
1661#ifndef _WIN32
1662 if (flags & EVFLAG_FORKCHECK)
1663 curpid = getpid ();
1664#endif
1665
1666 if (!(flags & EVFLAG_NOENV)
1667 && !enable_secure ()
1668 && getenv ("LIBEV_FLAGS"))
1669 flags = atoi (getenv ("LIBEV_FLAGS"));
1670
1401 ev_rt_now = ev_time (); 1671 ev_rt_now = ev_time ();
1402 mn_now = get_clock (); 1672 mn_now = get_clock ();
1403 now_floor = mn_now; 1673 now_floor = mn_now;
1404 rtmn_diff = ev_rt_now - mn_now; 1674 rtmn_diff = ev_rt_now - mn_now;
1675#if EV_FEATURE_API
1676 invoke_cb = ev_invoke_pending;
1677#endif
1405 1678
1406 io_blocktime = 0.; 1679 io_blocktime = 0.;
1407 timeout_blocktime = 0.; 1680 timeout_blocktime = 0.;
1408 backend = 0; 1681 backend = 0;
1409 backend_fd = -1; 1682 backend_fd = -1;
1410 gotasync = 0; 1683 sig_pending = 0;
1684#if EV_ASYNC_ENABLE
1685 async_pending = 0;
1686#endif
1411#if EV_USE_INOTIFY 1687#if EV_USE_INOTIFY
1412 fs_fd = -2; 1688 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1413#endif 1689#endif
1414 1690#if EV_USE_SIGNALFD
1415 /* pid check not overridable via env */ 1691 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1416#ifndef _WIN32
1417 if (flags & EVFLAG_FORKCHECK)
1418 curpid = getpid ();
1419#endif 1692#endif
1420
1421 if (!(flags & EVFLAG_NOENV)
1422 && !enable_secure ()
1423 && getenv ("LIBEV_FLAGS"))
1424 flags = atoi (getenv ("LIBEV_FLAGS"));
1425 1693
1426 if (!(flags & 0x0000ffffU)) 1694 if (!(flags & 0x0000ffffU))
1427 flags |= ev_recommended_backends (); 1695 flags |= ev_recommended_backends ();
1428 1696
1429#if EV_USE_PORT 1697#if EV_USE_PORT
… …
1442 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1710 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1443#endif 1711#endif
1444 1712
1445 ev_prepare_init (&pending_w, pendingcb); 1713 ev_prepare_init (&pending_w, pendingcb);
1446 1714
1715#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1447 ev_init (&pipe_w, pipecb); 1716 ev_init (&pipe_w, pipecb);
1448 ev_set_priority (&pipe_w, EV_MAXPRI); 1717 ev_set_priority (&pipe_w, EV_MAXPRI);
1718#endif
1449 } 1719 }
1450} 1720}
1451 1721
1452/* free up a loop structure */ 1722/* free up a loop structure */
1453static void noinline 1723static void noinline
… …
1455{ 1725{
1456 int i; 1726 int i;
1457 1727
1458 if (ev_is_active (&pipe_w)) 1728 if (ev_is_active (&pipe_w))
1459 { 1729 {
1460 ev_ref (EV_A); /* signal watcher */ 1730 /*ev_ref (EV_A);*/
1461 ev_io_stop (EV_A_ &pipe_w); 1731 /*ev_io_stop (EV_A_ &pipe_w);*/
1462 1732
1463#if EV_USE_EVENTFD 1733#if EV_USE_EVENTFD
1464 if (evfd >= 0) 1734 if (evfd >= 0)
1465 close (evfd); 1735 close (evfd);
1466#endif 1736#endif
1467 1737
1468 if (evpipe [0] >= 0) 1738 if (evpipe [0] >= 0)
1469 { 1739 {
1470 close (evpipe [0]); 1740 EV_WIN32_CLOSE_FD (evpipe [0]);
1471 close (evpipe [1]); 1741 EV_WIN32_CLOSE_FD (evpipe [1]);
1472 } 1742 }
1473 } 1743 }
1744
1745#if EV_USE_SIGNALFD
1746 if (ev_is_active (&sigfd_w))
1747 close (sigfd);
1748#endif
1474 1749
1475#if EV_USE_INOTIFY 1750#if EV_USE_INOTIFY
1476 if (fs_fd >= 0) 1751 if (fs_fd >= 0)
1477 close (fs_fd); 1752 close (fs_fd);
1478#endif 1753#endif
… …
1502#if EV_IDLE_ENABLE 1777#if EV_IDLE_ENABLE
1503 array_free (idle, [i]); 1778 array_free (idle, [i]);
1504#endif 1779#endif
1505 } 1780 }
1506 1781
1507 ev_free (anfds); anfdmax = 0; 1782 ev_free (anfds); anfds = 0; anfdmax = 0;
1508 1783
1509 /* have to use the microsoft-never-gets-it-right macro */ 1784 /* have to use the microsoft-never-gets-it-right macro */
1510 array_free (rfeed, EMPTY); 1785 array_free (rfeed, EMPTY);
1511 array_free (fdchange, EMPTY); 1786 array_free (fdchange, EMPTY);
1512 array_free (timer, EMPTY); 1787 array_free (timer, EMPTY);
… …
1547 1822
1548 if (ev_is_active (&pipe_w)) 1823 if (ev_is_active (&pipe_w))
1549 { 1824 {
1550 /* this "locks" the handlers against writing to the pipe */ 1825 /* this "locks" the handlers against writing to the pipe */
1551 /* while we modify the fd vars */ 1826 /* while we modify the fd vars */
1552 gotsig = 1; 1827 sig_pending = 1;
1553#if EV_ASYNC_ENABLE 1828#if EV_ASYNC_ENABLE
1554 gotasync = 1; 1829 async_pending = 1;
1555#endif 1830#endif
1556 1831
1557 ev_ref (EV_A); 1832 ev_ref (EV_A);
1558 ev_io_stop (EV_A_ &pipe_w); 1833 ev_io_stop (EV_A_ &pipe_w);
1559 1834
… …
1562 close (evfd); 1837 close (evfd);
1563#endif 1838#endif
1564 1839
1565 if (evpipe [0] >= 0) 1840 if (evpipe [0] >= 0)
1566 { 1841 {
1567 close (evpipe [0]); 1842 EV_WIN32_CLOSE_FD (evpipe [0]);
1568 close (evpipe [1]); 1843 EV_WIN32_CLOSE_FD (evpipe [1]);
1569 } 1844 }
1570 1845
1846#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1571 evpipe_init (EV_A); 1847 evpipe_init (EV_A);
1572 /* now iterate over everything, in case we missed something */ 1848 /* now iterate over everything, in case we missed something */
1573 pipecb (EV_A_ &pipe_w, EV_READ); 1849 pipecb (EV_A_ &pipe_w, EV_READ);
1850#endif
1574 } 1851 }
1575 1852
1576 postfork = 0; 1853 postfork = 0;
1577} 1854}
1578 1855
1579#if EV_MULTIPLICITY 1856#if EV_MULTIPLICITY
1580 1857
1581struct ev_loop * 1858struct ev_loop *
1582ev_loop_new (unsigned int flags) 1859ev_loop_new (unsigned int flags)
1583{ 1860{
1584 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1861 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1585 1862
1586 memset (loop, 0, sizeof (struct ev_loop)); 1863 memset (EV_A, 0, sizeof (struct ev_loop));
1587
1588 loop_init (EV_A_ flags); 1864 loop_init (EV_A_ flags);
1589 1865
1590 if (ev_backend (EV_A)) 1866 if (ev_backend (EV_A))
1591 return loop; 1867 return EV_A;
1592 1868
1593 return 0; 1869 return 0;
1594} 1870}
1595 1871
1596void 1872void
… …
1603void 1879void
1604ev_loop_fork (EV_P) 1880ev_loop_fork (EV_P)
1605{ 1881{
1606 postfork = 1; /* must be in line with ev_default_fork */ 1882 postfork = 1; /* must be in line with ev_default_fork */
1607} 1883}
1884#endif /* multiplicity */
1608 1885
1609#if EV_VERIFY 1886#if EV_VERIFY
1610static void noinline 1887static void noinline
1611verify_watcher (EV_P_ W w) 1888verify_watcher (EV_P_ W w)
1612{ 1889{
… …
1640 verify_watcher (EV_A_ ws [cnt]); 1917 verify_watcher (EV_A_ ws [cnt]);
1641 } 1918 }
1642} 1919}
1643#endif 1920#endif
1644 1921
1922#if EV_FEATURE_API
1645void 1923void
1646ev_loop_verify (EV_P) 1924ev_verify (EV_P)
1647{ 1925{
1648#if EV_VERIFY 1926#if EV_VERIFY
1649 int i; 1927 int i;
1650 WL w; 1928 WL w;
1651 1929
… …
1690#if EV_ASYNC_ENABLE 1968#if EV_ASYNC_ENABLE
1691 assert (asyncmax >= asynccnt); 1969 assert (asyncmax >= asynccnt);
1692 array_verify (EV_A_ (W *)asyncs, asynccnt); 1970 array_verify (EV_A_ (W *)asyncs, asynccnt);
1693#endif 1971#endif
1694 1972
1973#if EV_PREPARE_ENABLE
1695 assert (preparemax >= preparecnt); 1974 assert (preparemax >= preparecnt);
1696 array_verify (EV_A_ (W *)prepares, preparecnt); 1975 array_verify (EV_A_ (W *)prepares, preparecnt);
1976#endif
1697 1977
1978#if EV_CHECK_ENABLE
1698 assert (checkmax >= checkcnt); 1979 assert (checkmax >= checkcnt);
1699 array_verify (EV_A_ (W *)checks, checkcnt); 1980 array_verify (EV_A_ (W *)checks, checkcnt);
1981#endif
1700 1982
1701# if 0 1983# if 0
1984#if EV_CHILD_ENABLE
1702 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1985 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1703 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1986 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1987#endif
1704# endif 1988# endif
1705#endif 1989#endif
1706} 1990}
1707 1991#endif
1708#endif /* multiplicity */
1709 1992
1710#if EV_MULTIPLICITY 1993#if EV_MULTIPLICITY
1711struct ev_loop * 1994struct ev_loop *
1712ev_default_loop_init (unsigned int flags) 1995ev_default_loop_init (unsigned int flags)
1713#else 1996#else
… …
1716#endif 1999#endif
1717{ 2000{
1718 if (!ev_default_loop_ptr) 2001 if (!ev_default_loop_ptr)
1719 { 2002 {
1720#if EV_MULTIPLICITY 2003#if EV_MULTIPLICITY
1721 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2004 EV_P = ev_default_loop_ptr = &default_loop_struct;
1722#else 2005#else
1723 ev_default_loop_ptr = 1; 2006 ev_default_loop_ptr = 1;
1724#endif 2007#endif
1725 2008
1726 loop_init (EV_A_ flags); 2009 loop_init (EV_A_ flags);
1727 2010
1728 if (ev_backend (EV_A)) 2011 if (ev_backend (EV_A))
1729 { 2012 {
1730#ifndef _WIN32 2013#if EV_CHILD_ENABLE
1731 ev_signal_init (&childev, childcb, SIGCHLD); 2014 ev_signal_init (&childev, childcb, SIGCHLD);
1732 ev_set_priority (&childev, EV_MAXPRI); 2015 ev_set_priority (&childev, EV_MAXPRI);
1733 ev_signal_start (EV_A_ &childev); 2016 ev_signal_start (EV_A_ &childev);
1734 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2017 ev_unref (EV_A); /* child watcher should not keep loop alive */
1735#endif 2018#endif
… …
1743 2026
1744void 2027void
1745ev_default_destroy (void) 2028ev_default_destroy (void)
1746{ 2029{
1747#if EV_MULTIPLICITY 2030#if EV_MULTIPLICITY
1748 struct ev_loop *loop = ev_default_loop_ptr; 2031 EV_P = ev_default_loop_ptr;
1749#endif 2032#endif
1750 2033
1751 ev_default_loop_ptr = 0; 2034 ev_default_loop_ptr = 0;
1752 2035
1753#ifndef _WIN32 2036#if EV_CHILD_ENABLE
1754 ev_ref (EV_A); /* child watcher */ 2037 ev_ref (EV_A); /* child watcher */
1755 ev_signal_stop (EV_A_ &childev); 2038 ev_signal_stop (EV_A_ &childev);
1756#endif 2039#endif
1757 2040
1758 loop_destroy (EV_A); 2041 loop_destroy (EV_A);
… …
1760 2043
1761void 2044void
1762ev_default_fork (void) 2045ev_default_fork (void)
1763{ 2046{
1764#if EV_MULTIPLICITY 2047#if EV_MULTIPLICITY
1765 struct ev_loop *loop = ev_default_loop_ptr; 2048 EV_P = ev_default_loop_ptr;
1766#endif 2049#endif
1767 2050
1768 postfork = 1; /* must be in line with ev_loop_fork */ 2051 postfork = 1; /* must be in line with ev_loop_fork */
1769} 2052}
1770 2053
… …
1774ev_invoke (EV_P_ void *w, int revents) 2057ev_invoke (EV_P_ void *w, int revents)
1775{ 2058{
1776 EV_CB_INVOKE ((W)w, revents); 2059 EV_CB_INVOKE ((W)w, revents);
1777} 2060}
1778 2061
1779inline_speed void 2062unsigned int
1780call_pending (EV_P) 2063ev_pending_count (EV_P)
2064{
2065 int pri;
2066 unsigned int count = 0;
2067
2068 for (pri = NUMPRI; pri--; )
2069 count += pendingcnt [pri];
2070
2071 return count;
2072}
2073
2074void noinline
2075ev_invoke_pending (EV_P)
1781{ 2076{
1782 int pri; 2077 int pri;
1783 2078
1784 for (pri = NUMPRI; pri--; ) 2079 for (pri = NUMPRI; pri--; )
1785 while (pendingcnt [pri]) 2080 while (pendingcnt [pri])
… …
1852 EV_FREQUENT_CHECK; 2147 EV_FREQUENT_CHECK;
1853 feed_reverse (EV_A_ (W)w); 2148 feed_reverse (EV_A_ (W)w);
1854 } 2149 }
1855 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2150 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1856 2151
1857 feed_reverse_done (EV_A_ EV_TIMEOUT); 2152 feed_reverse_done (EV_A_ EV_TIMER);
1858 } 2153 }
1859} 2154}
1860 2155
1861#if EV_PERIODIC_ENABLE 2156#if EV_PERIODIC_ENABLE
1862/* make periodics pending */ 2157/* make periodics pending */
… …
1915 feed_reverse_done (EV_A_ EV_PERIODIC); 2210 feed_reverse_done (EV_A_ EV_PERIODIC);
1916 } 2211 }
1917} 2212}
1918 2213
1919/* simply recalculate all periodics */ 2214/* simply recalculate all periodics */
1920/* 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? */
1921static void noinline 2216static void noinline
1922periodics_reschedule (EV_P) 2217periodics_reschedule (EV_P)
1923{ 2218{
1924 int i; 2219 int i;
1925 2220
… …
1953 ANHE_at_cache (*he); 2248 ANHE_at_cache (*he);
1954 } 2249 }
1955} 2250}
1956 2251
1957/* fetch new monotonic and realtime times from the kernel */ 2252/* fetch new monotonic and realtime times from the kernel */
1958/* also detetc if there was a timejump, and act accordingly */ 2253/* also detect if there was a timejump, and act accordingly */
1959inline_speed void 2254inline_speed void
1960time_update (EV_P_ ev_tstamp max_block) 2255time_update (EV_P_ ev_tstamp max_block)
1961{ 2256{
1962#if EV_USE_MONOTONIC 2257#if EV_USE_MONOTONIC
1963 if (expect_true (have_monotonic)) 2258 if (expect_true (have_monotonic))
… …
2020 2315
2021 mn_now = ev_rt_now; 2316 mn_now = ev_rt_now;
2022 } 2317 }
2023} 2318}
2024 2319
2025static int loop_done;
2026
2027void 2320void
2028ev_loop (EV_P_ int flags) 2321ev_run (EV_P_ int flags)
2029{ 2322{
2323#if EV_FEATURE_API
2324 ++loop_depth;
2325#endif
2326
2327 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2328
2030 loop_done = EVUNLOOP_CANCEL; 2329 loop_done = EVBREAK_CANCEL;
2031 2330
2032 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2331 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2033 2332
2034 do 2333 do
2035 { 2334 {
2036#if EV_VERIFY >= 2 2335#if EV_VERIFY >= 2
2037 ev_loop_verify (EV_A); 2336 ev_verify (EV_A);
2038#endif 2337#endif
2039 2338
2040#ifndef _WIN32 2339#ifndef _WIN32
2041 if (expect_false (curpid)) /* penalise the forking check even more */ 2340 if (expect_false (curpid)) /* penalise the forking check even more */
2042 if (expect_false (getpid () != curpid)) 2341 if (expect_false (getpid () != curpid))
… …
2050 /* we might have forked, so queue fork handlers */ 2349 /* we might have forked, so queue fork handlers */
2051 if (expect_false (postfork)) 2350 if (expect_false (postfork))
2052 if (forkcnt) 2351 if (forkcnt)
2053 { 2352 {
2054 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2353 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2055 call_pending (EV_A); 2354 EV_INVOKE_PENDING;
2056 } 2355 }
2057#endif 2356#endif
2058 2357
2358#if EV_PREPARE_ENABLE
2059 /* queue prepare watchers (and execute them) */ 2359 /* queue prepare watchers (and execute them) */
2060 if (expect_false (preparecnt)) 2360 if (expect_false (preparecnt))
2061 { 2361 {
2062 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2362 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2063 call_pending (EV_A); 2363 EV_INVOKE_PENDING;
2064 } 2364 }
2365#endif
2366
2367 if (expect_false (loop_done))
2368 break;
2065 2369
2066 /* we might have forked, so reify kernel state if necessary */ 2370 /* we might have forked, so reify kernel state if necessary */
2067 if (expect_false (postfork)) 2371 if (expect_false (postfork))
2068 loop_fork (EV_A); 2372 loop_fork (EV_A);
2069 2373
… …
2073 /* calculate blocking time */ 2377 /* calculate blocking time */
2074 { 2378 {
2075 ev_tstamp waittime = 0.; 2379 ev_tstamp waittime = 0.;
2076 ev_tstamp sleeptime = 0.; 2380 ev_tstamp sleeptime = 0.;
2077 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
2078 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2388 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2079 { 2389 {
2080 /* remember old timestamp for io_blocktime calculation */
2081 ev_tstamp prev_mn_now = mn_now;
2082
2083 /* update time to cancel out callback processing overhead */
2084 time_update (EV_A_ 1e100);
2085
2086 waittime = MAX_BLOCKTIME; 2390 waittime = MAX_BLOCKTIME;
2087 2391
2088 if (timercnt) 2392 if (timercnt)
2089 { 2393 {
2090 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2394 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2117 waittime -= sleeptime; 2421 waittime -= sleeptime;
2118 } 2422 }
2119 } 2423 }
2120 } 2424 }
2121 2425
2426#if EV_FEATURE_API
2122 ++loop_count; 2427 ++loop_count;
2428#endif
2429 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2123 backend_poll (EV_A_ waittime); 2430 backend_poll (EV_A_ waittime);
2431 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2124 2432
2125 /* update ev_rt_now, do magic */ 2433 /* update ev_rt_now, do magic */
2126 time_update (EV_A_ waittime + sleeptime); 2434 time_update (EV_A_ waittime + sleeptime);
2127 } 2435 }
2128 2436
… …
2135#if EV_IDLE_ENABLE 2443#if EV_IDLE_ENABLE
2136 /* queue idle watchers unless other events are pending */ 2444 /* queue idle watchers unless other events are pending */
2137 idle_reify (EV_A); 2445 idle_reify (EV_A);
2138#endif 2446#endif
2139 2447
2448#if EV_CHECK_ENABLE
2140 /* queue check watchers, to be executed first */ 2449 /* queue check watchers, to be executed first */
2141 if (expect_false (checkcnt)) 2450 if (expect_false (checkcnt))
2142 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2451 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2452#endif
2143 2453
2144 call_pending (EV_A); 2454 EV_INVOKE_PENDING;
2145 } 2455 }
2146 while (expect_true ( 2456 while (expect_true (
2147 activecnt 2457 activecnt
2148 && !loop_done 2458 && !loop_done
2149 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2459 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2150 )); 2460 ));
2151 2461
2152 if (loop_done == EVUNLOOP_ONE) 2462 if (loop_done == EVBREAK_ONE)
2153 loop_done = EVUNLOOP_CANCEL; 2463 loop_done = EVBREAK_CANCEL;
2154}
2155 2464
2465#if EV_FEATURE_API
2466 --loop_depth;
2467#endif
2468}
2469
2156void 2470void
2157ev_unloop (EV_P_ int how) 2471ev_break (EV_P_ int how)
2158{ 2472{
2159 loop_done = how; 2473 loop_done = how;
2160} 2474}
2161 2475
2162void 2476void
… …
2209inline_size void 2523inline_size void
2210wlist_del (WL *head, WL elem) 2524wlist_del (WL *head, WL elem)
2211{ 2525{
2212 while (*head) 2526 while (*head)
2213 { 2527 {
2214 if (*head == elem) 2528 if (expect_true (*head == elem))
2215 { 2529 {
2216 *head = elem->next; 2530 *head = elem->next;
2217 return; 2531 break;
2218 } 2532 }
2219 2533
2220 head = &(*head)->next; 2534 head = &(*head)->next;
2221 } 2535 }
2222} 2536}
… …
2250} 2564}
2251 2565
2252inline_size void 2566inline_size void
2253pri_adjust (EV_P_ W w) 2567pri_adjust (EV_P_ W w)
2254{ 2568{
2255 int pri = w->priority; 2569 int pri = ev_priority (w);
2256 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2570 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2257 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2571 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2258 w->priority = pri; 2572 ev_set_priority (w, pri);
2259} 2573}
2260 2574
2261inline_speed void 2575inline_speed void
2262ev_start (EV_P_ W w, int active) 2576ev_start (EV_P_ W w, int active)
2263{ 2577{
… …
2282 2596
2283 if (expect_false (ev_is_active (w))) 2597 if (expect_false (ev_is_active (w)))
2284 return; 2598 return;
2285 2599
2286 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2600 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2287 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))));
2288 2602
2289 EV_FREQUENT_CHECK; 2603 EV_FREQUENT_CHECK;
2290 2604
2291 ev_start (EV_A_ (W)w, 1); 2605 ev_start (EV_A_ (W)w, 1);
2292 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2606 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2293 wlist_add (&anfds[fd].head, (WL)w); 2607 wlist_add (&anfds[fd].head, (WL)w);
2294 2608
2295 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2609 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2296 w->events &= ~EV__IOFDSET; 2610 w->events &= ~EV__IOFDSET;
2297 2611
2298 EV_FREQUENT_CHECK; 2612 EV_FREQUENT_CHECK;
2299} 2613}
2300 2614
… …
2310 EV_FREQUENT_CHECK; 2624 EV_FREQUENT_CHECK;
2311 2625
2312 wlist_del (&anfds[w->fd].head, (WL)w); 2626 wlist_del (&anfds[w->fd].head, (WL)w);
2313 ev_stop (EV_A_ (W)w); 2627 ev_stop (EV_A_ (W)w);
2314 2628
2315 fd_change (EV_A_ w->fd, 1); 2629 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2316 2630
2317 EV_FREQUENT_CHECK; 2631 EV_FREQUENT_CHECK;
2318} 2632}
2319 2633
2320void noinline 2634void noinline
… …
2362 timers [active] = timers [timercnt + HEAP0]; 2676 timers [active] = timers [timercnt + HEAP0];
2363 adjustheap (timers, timercnt, active); 2677 adjustheap (timers, timercnt, active);
2364 } 2678 }
2365 } 2679 }
2366 2680
2367 EV_FREQUENT_CHECK;
2368
2369 ev_at (w) -= mn_now; 2681 ev_at (w) -= mn_now;
2370 2682
2371 ev_stop (EV_A_ (W)w); 2683 ev_stop (EV_A_ (W)w);
2684
2685 EV_FREQUENT_CHECK;
2372} 2686}
2373 2687
2374void noinline 2688void noinline
2375ev_timer_again (EV_P_ ev_timer *w) 2689ev_timer_again (EV_P_ ev_timer *w)
2376{ 2690{
… …
2394 } 2708 }
2395 2709
2396 EV_FREQUENT_CHECK; 2710 EV_FREQUENT_CHECK;
2397} 2711}
2398 2712
2713ev_tstamp
2714ev_timer_remaining (EV_P_ ev_timer *w)
2715{
2716 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2717}
2718
2399#if EV_PERIODIC_ENABLE 2719#if EV_PERIODIC_ENABLE
2400void noinline 2720void noinline
2401ev_periodic_start (EV_P_ ev_periodic *w) 2721ev_periodic_start (EV_P_ ev_periodic *w)
2402{ 2722{
2403 if (expect_false (ev_is_active (w))) 2723 if (expect_false (ev_is_active (w)))
… …
2449 periodics [active] = periodics [periodiccnt + HEAP0]; 2769 periodics [active] = periodics [periodiccnt + HEAP0];
2450 adjustheap (periodics, periodiccnt, active); 2770 adjustheap (periodics, periodiccnt, active);
2451 } 2771 }
2452 } 2772 }
2453 2773
2454 EV_FREQUENT_CHECK;
2455
2456 ev_stop (EV_A_ (W)w); 2774 ev_stop (EV_A_ (W)w);
2775
2776 EV_FREQUENT_CHECK;
2457} 2777}
2458 2778
2459void noinline 2779void noinline
2460ev_periodic_again (EV_P_ ev_periodic *w) 2780ev_periodic_again (EV_P_ ev_periodic *w)
2461{ 2781{
… …
2467 2787
2468#ifndef SA_RESTART 2788#ifndef SA_RESTART
2469# define SA_RESTART 0 2789# define SA_RESTART 0
2470#endif 2790#endif
2471 2791
2792#if EV_SIGNAL_ENABLE
2793
2472void noinline 2794void noinline
2473ev_signal_start (EV_P_ ev_signal *w) 2795ev_signal_start (EV_P_ ev_signal *w)
2474{ 2796{
2475#if EV_MULTIPLICITY
2476 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2477#endif
2478 if (expect_false (ev_is_active (w))) 2797 if (expect_false (ev_is_active (w)))
2479 return; 2798 return;
2480 2799
2481 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));
2482 2801
2483 evpipe_init (EV_A); 2802#if EV_MULTIPLICITY
2803 assert (("libev: a signal must not be attached to two different loops",
2804 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2484 2805
2485 EV_FREQUENT_CHECK; 2806 signals [w->signum - 1].loop = EV_A;
2807#endif
2486 2808
2809 EV_FREQUENT_CHECK;
2810
2811#if EV_USE_SIGNALFD
2812 if (sigfd == -2)
2487 { 2813 {
2488#ifndef _WIN32 2814 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2489 sigset_t full, prev; 2815 if (sigfd < 0 && errno == EINVAL)
2490 sigfillset (&full); 2816 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2491 sigprocmask (SIG_SETMASK, &full, &prev);
2492#endif
2493 2817
2494 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2818 if (sigfd >= 0)
2819 {
2820 fd_intern (sigfd); /* doing it twice will not hurt */
2495 2821
2496#ifndef _WIN32 2822 sigemptyset (&sigfd_set);
2497 sigprocmask (SIG_SETMASK, &prev, 0); 2823
2498#endif 2824 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2825 ev_set_priority (&sigfd_w, EV_MAXPRI);
2826 ev_io_start (EV_A_ &sigfd_w);
2827 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2828 }
2499 } 2829 }
2830
2831 if (sigfd >= 0)
2832 {
2833 /* TODO: check .head */
2834 sigaddset (&sigfd_set, w->signum);
2835 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2836
2837 signalfd (sigfd, &sigfd_set, 0);
2838 }
2839#endif
2500 2840
2501 ev_start (EV_A_ (W)w, 1); 2841 ev_start (EV_A_ (W)w, 1);
2502 wlist_add (&signals [w->signum - 1].head, (WL)w); 2842 wlist_add (&signals [w->signum - 1].head, (WL)w);
2503 2843
2504 if (!((WL)w)->next) 2844 if (!((WL)w)->next)
2845# if EV_USE_SIGNALFD
2846 if (sigfd < 0) /*TODO*/
2847# endif
2505 { 2848 {
2506#if _WIN32 2849# ifdef _WIN32
2850 evpipe_init (EV_A);
2851
2507 signal (w->signum, ev_sighandler); 2852 signal (w->signum, ev_sighandler);
2508#else 2853# else
2509 struct sigaction sa; 2854 struct sigaction sa;
2855
2856 evpipe_init (EV_A);
2857
2510 sa.sa_handler = ev_sighandler; 2858 sa.sa_handler = ev_sighandler;
2511 sigfillset (&sa.sa_mask); 2859 sigfillset (&sa.sa_mask);
2512 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 */
2513 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);
2514#endif 2866#endif
2515 } 2867 }
2516 2868
2517 EV_FREQUENT_CHECK; 2869 EV_FREQUENT_CHECK;
2518} 2870}
2519 2871
2520void noinline 2872void noinline
… …
2528 2880
2529 wlist_del (&signals [w->signum - 1].head, (WL)w); 2881 wlist_del (&signals [w->signum - 1].head, (WL)w);
2530 ev_stop (EV_A_ (W)w); 2882 ev_stop (EV_A_ (W)w);
2531 2883
2532 if (!signals [w->signum - 1].head) 2884 if (!signals [w->signum - 1].head)
2885 {
2886#if EV_MULTIPLICITY
2887 signals [w->signum - 1].loop = 0; /* unattach from signal */
2888#endif
2889#if EV_USE_SIGNALFD
2890 if (sigfd >= 0)
2891 {
2892 sigset_t ss;
2893
2894 sigemptyset (&ss);
2895 sigaddset (&ss, w->signum);
2896 sigdelset (&sigfd_set, w->signum);
2897
2898 signalfd (sigfd, &sigfd_set, 0);
2899 sigprocmask (SIG_UNBLOCK, &ss, 0);
2900 }
2901 else
2902#endif
2533 signal (w->signum, SIG_DFL); 2903 signal (w->signum, SIG_DFL);
2904 }
2534 2905
2535 EV_FREQUENT_CHECK; 2906 EV_FREQUENT_CHECK;
2536} 2907}
2908
2909#endif
2910
2911#if EV_CHILD_ENABLE
2537 2912
2538void 2913void
2539ev_child_start (EV_P_ ev_child *w) 2914ev_child_start (EV_P_ ev_child *w)
2540{ 2915{
2541#if EV_MULTIPLICITY 2916#if EV_MULTIPLICITY
… …
2545 return; 2920 return;
2546 2921
2547 EV_FREQUENT_CHECK; 2922 EV_FREQUENT_CHECK;
2548 2923
2549 ev_start (EV_A_ (W)w, 1); 2924 ev_start (EV_A_ (W)w, 1);
2550 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2925 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2551 2926
2552 EV_FREQUENT_CHECK; 2927 EV_FREQUENT_CHECK;
2553} 2928}
2554 2929
2555void 2930void
… …
2559 if (expect_false (!ev_is_active (w))) 2934 if (expect_false (!ev_is_active (w)))
2560 return; 2935 return;
2561 2936
2562 EV_FREQUENT_CHECK; 2937 EV_FREQUENT_CHECK;
2563 2938
2564 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2939 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2565 ev_stop (EV_A_ (W)w); 2940 ev_stop (EV_A_ (W)w);
2566 2941
2567 EV_FREQUENT_CHECK; 2942 EV_FREQUENT_CHECK;
2568} 2943}
2944
2945#endif
2569 2946
2570#if EV_STAT_ENABLE 2947#if EV_STAT_ENABLE
2571 2948
2572# ifdef _WIN32 2949# ifdef _WIN32
2573# undef lstat 2950# undef lstat
… …
2579#define MIN_STAT_INTERVAL 0.1074891 2956#define MIN_STAT_INTERVAL 0.1074891
2580 2957
2581static 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);
2582 2959
2583#if EV_USE_INOTIFY 2960#if EV_USE_INOTIFY
2584# 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)
2585 2964
2586static void noinline 2965static void noinline
2587infy_add (EV_P_ ev_stat *w) 2966infy_add (EV_P_ ev_stat *w)
2588{ 2967{
2589 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);
2590 2969
2591 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 */
2592 { 2990 }
2991 else
2992 {
2993 /* can't use inotify, continue to stat */
2593 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2994 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2594 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2595 2995
2596 /* monitor some parent directory for speedup hints */ 2996 /* if path is not there, monitor some parent directory for speedup hints */
2597 /* 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, */
2598 /* but an efficiency issue only */ 2998 /* but an efficiency issue only */
2599 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2999 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2600 { 3000 {
2601 char path [4096]; 3001 char path [4096];
… …
2617 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3017 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2618 } 3018 }
2619 } 3019 }
2620 3020
2621 if (w->wd >= 0) 3021 if (w->wd >= 0)
2622 {
2623 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);
2624 3023
2625 /* now local changes will be tracked by inotify, but remote changes won't */ 3024 /* now re-arm timer, if required */
2626 /* unless the filesystem it known to be local, we therefore still poll */ 3025 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2627 /* also do poll on <2.6.25, but with normal frequency */
2628 struct statfs sfs;
2629
2630 if (fs_2625 && !statfs (w->path, &sfs))
2631 if (sfs.f_type == 0x1373 /* devfs */
2632 || sfs.f_type == 0xEF53 /* ext2/3 */
2633 || sfs.f_type == 0x3153464a /* jfs */
2634 || sfs.f_type == 0x52654973 /* reiser3 */
2635 || sfs.f_type == 0x01021994 /* tempfs */
2636 || sfs.f_type == 0x58465342 /* xfs */)
2637 return;
2638
2639 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2640 ev_timer_again (EV_A_ &w->timer); 3026 ev_timer_again (EV_A_ &w->timer);
2641 } 3027 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2642} 3028}
2643 3029
2644static void noinline 3030static void noinline
2645infy_del (EV_P_ ev_stat *w) 3031infy_del (EV_P_ ev_stat *w)
2646{ 3032{
… …
2649 3035
2650 if (wd < 0) 3036 if (wd < 0)
2651 return; 3037 return;
2652 3038
2653 w->wd = -2; 3039 w->wd = -2;
2654 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3040 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2655 wlist_del (&fs_hash [slot].head, (WL)w); 3041 wlist_del (&fs_hash [slot].head, (WL)w);
2656 3042
2657 /* remove this watcher, if others are watching it, they will rearm */ 3043 /* remove this watcher, if others are watching it, they will rearm */
2658 inotify_rm_watch (fs_fd, wd); 3044 inotify_rm_watch (fs_fd, wd);
2659} 3045}
… …
2661static void noinline 3047static void noinline
2662infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3048infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2663{ 3049{
2664 if (slot < 0) 3050 if (slot < 0)
2665 /* overflow, need to check for all hash slots */ 3051 /* overflow, need to check for all hash slots */
2666 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3052 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2667 infy_wd (EV_A_ slot, wd, ev); 3053 infy_wd (EV_A_ slot, wd, ev);
2668 else 3054 else
2669 { 3055 {
2670 WL w_; 3056 WL w_;
2671 3057
2672 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3058 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2673 { 3059 {
2674 ev_stat *w = (ev_stat *)w_; 3060 ev_stat *w = (ev_stat *)w_;
2675 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 */
2676 3062
2677 if (w->wd == wd || wd == -1) 3063 if (w->wd == wd || wd == -1)
2678 { 3064 {
2679 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3065 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2680 { 3066 {
2681 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);
2682 w->wd = -1; 3068 w->wd = -1;
2683 infy_add (EV_A_ w); /* re-add, no matter what */ 3069 infy_add (EV_A_ w); /* re-add, no matter what */
2684 } 3070 }
2685 3071
2686 stat_timer_cb (EV_A_ &w->timer, 0); 3072 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2691 3077
2692static void 3078static void
2693infy_cb (EV_P_ ev_io *w, int revents) 3079infy_cb (EV_P_ ev_io *w, int revents)
2694{ 3080{
2695 char buf [EV_INOTIFY_BUFSIZE]; 3081 char buf [EV_INOTIFY_BUFSIZE];
2696 struct inotify_event *ev = (struct inotify_event *)buf;
2697 int ofs; 3082 int ofs;
2698 int len = read (fs_fd, buf, sizeof (buf)); 3083 int len = read (fs_fd, buf, sizeof (buf));
2699 3084
2700 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);
2701 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 }
2702} 3091}
2703 3092
2704inline_size void 3093inline_size void
2705check_2625 (EV_P) 3094ev_check_2625 (EV_P)
2706{ 3095{
2707 /* kernels < 2.6.25 are borked 3096 /* kernels < 2.6.25 are borked
2708 * 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
2709 */ 3098 */
2710 struct utsname buf; 3099 if (ev_linux_version () < 0x020619)
2711 int major, minor, micro;
2712
2713 if (uname (&buf))
2714 return; 3100 return;
2715 3101
2716 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2717 return;
2718
2719 if (major < 2
2720 || (major == 2 && minor < 6)
2721 || (major == 2 && minor == 6 && micro < 25))
2722 return;
2723
2724 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 ();
2725} 3114}
2726 3115
2727inline_size void 3116inline_size void
2728infy_init (EV_P) 3117infy_init (EV_P)
2729{ 3118{
2730 if (fs_fd != -2) 3119 if (fs_fd != -2)
2731 return; 3120 return;
2732 3121
2733 fs_fd = -1; 3122 fs_fd = -1;
2734 3123
2735 check_2625 (EV_A); 3124 ev_check_2625 (EV_A);
2736 3125
2737 fs_fd = inotify_init (); 3126 fs_fd = infy_newfd ();
2738 3127
2739 if (fs_fd >= 0) 3128 if (fs_fd >= 0)
2740 { 3129 {
3130 fd_intern (fs_fd);
2741 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3131 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2742 ev_set_priority (&fs_w, EV_MAXPRI); 3132 ev_set_priority (&fs_w, EV_MAXPRI);
2743 ev_io_start (EV_A_ &fs_w); 3133 ev_io_start (EV_A_ &fs_w);
3134 ev_unref (EV_A);
2744 } 3135 }
2745} 3136}
2746 3137
2747inline_size void 3138inline_size void
2748infy_fork (EV_P) 3139infy_fork (EV_P)
… …
2750 int slot; 3141 int slot;
2751 3142
2752 if (fs_fd < 0) 3143 if (fs_fd < 0)
2753 return; 3144 return;
2754 3145
3146 ev_ref (EV_A);
3147 ev_io_stop (EV_A_ &fs_w);
2755 close (fs_fd); 3148 close (fs_fd);
2756 fs_fd = inotify_init (); 3149 fs_fd = infy_newfd ();
2757 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
2758 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3159 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2759 { 3160 {
2760 WL w_ = fs_hash [slot].head; 3161 WL w_ = fs_hash [slot].head;
2761 fs_hash [slot].head = 0; 3162 fs_hash [slot].head = 0;
2762 3163
2763 while (w_) 3164 while (w_)
… …
2768 w->wd = -1; 3169 w->wd = -1;
2769 3170
2770 if (fs_fd >= 0) 3171 if (fs_fd >= 0)
2771 infy_add (EV_A_ w); /* re-add, no matter what */ 3172 infy_add (EV_A_ w); /* re-add, no matter what */
2772 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);
2773 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 }
2774 } 3180 }
2775 } 3181 }
2776} 3182}
2777 3183
2778#endif 3184#endif
… …
2795static void noinline 3201static void noinline
2796stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3202stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2797{ 3203{
2798 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3204 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2799 3205
2800 /* we copy this here each the time so that */ 3206 ev_statdata prev = w->attr;
2801 /* prev has the old value when the callback gets invoked */
2802 w->prev = w->attr;
2803 ev_stat_stat (EV_A_ w); 3207 ev_stat_stat (EV_A_ w);
2804 3208
2805 /* 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 */
2806 if ( 3210 if (
2807 w->prev.st_dev != w->attr.st_dev 3211 prev.st_dev != w->attr.st_dev
2808 || w->prev.st_ino != w->attr.st_ino 3212 || prev.st_ino != w->attr.st_ino
2809 || w->prev.st_mode != w->attr.st_mode 3213 || prev.st_mode != w->attr.st_mode
2810 || w->prev.st_nlink != w->attr.st_nlink 3214 || prev.st_nlink != w->attr.st_nlink
2811 || w->prev.st_uid != w->attr.st_uid 3215 || prev.st_uid != w->attr.st_uid
2812 || w->prev.st_gid != w->attr.st_gid 3216 || prev.st_gid != w->attr.st_gid
2813 || w->prev.st_rdev != w->attr.st_rdev 3217 || prev.st_rdev != w->attr.st_rdev
2814 || w->prev.st_size != w->attr.st_size 3218 || prev.st_size != w->attr.st_size
2815 || w->prev.st_atime != w->attr.st_atime 3219 || prev.st_atime != w->attr.st_atime
2816 || w->prev.st_mtime != w->attr.st_mtime 3220 || prev.st_mtime != w->attr.st_mtime
2817 || w->prev.st_ctime != w->attr.st_ctime 3221 || prev.st_ctime != w->attr.st_ctime
2818 ) { 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
2819 #if EV_USE_INOTIFY 3228 #if EV_USE_INOTIFY
2820 if (fs_fd >= 0) 3229 if (fs_fd >= 0)
2821 { 3230 {
2822 infy_del (EV_A_ w); 3231 infy_del (EV_A_ w);
2823 infy_add (EV_A_ w); 3232 infy_add (EV_A_ w);
… …
2848 3257
2849 if (fs_fd >= 0) 3258 if (fs_fd >= 0)
2850 infy_add (EV_A_ w); 3259 infy_add (EV_A_ w);
2851 else 3260 else
2852#endif 3261#endif
3262 {
2853 ev_timer_again (EV_A_ &w->timer); 3263 ev_timer_again (EV_A_ &w->timer);
3264 ev_unref (EV_A);
3265 }
2854 3266
2855 ev_start (EV_A_ (W)w, 1); 3267 ev_start (EV_A_ (W)w, 1);
2856 3268
2857 EV_FREQUENT_CHECK; 3269 EV_FREQUENT_CHECK;
2858} 3270}
… …
2867 EV_FREQUENT_CHECK; 3279 EV_FREQUENT_CHECK;
2868 3280
2869#if EV_USE_INOTIFY 3281#if EV_USE_INOTIFY
2870 infy_del (EV_A_ w); 3282 infy_del (EV_A_ w);
2871#endif 3283#endif
3284
3285 if (ev_is_active (&w->timer))
3286 {
3287 ev_ref (EV_A);
2872 ev_timer_stop (EV_A_ &w->timer); 3288 ev_timer_stop (EV_A_ &w->timer);
3289 }
2873 3290
2874 ev_stop (EV_A_ (W)w); 3291 ev_stop (EV_A_ (W)w);
2875 3292
2876 EV_FREQUENT_CHECK; 3293 EV_FREQUENT_CHECK;
2877} 3294}
… …
2922 3339
2923 EV_FREQUENT_CHECK; 3340 EV_FREQUENT_CHECK;
2924} 3341}
2925#endif 3342#endif
2926 3343
3344#if EV_PREPARE_ENABLE
2927void 3345void
2928ev_prepare_start (EV_P_ ev_prepare *w) 3346ev_prepare_start (EV_P_ ev_prepare *w)
2929{ 3347{
2930 if (expect_false (ev_is_active (w))) 3348 if (expect_false (ev_is_active (w)))
2931 return; 3349 return;
… …
2957 3375
2958 ev_stop (EV_A_ (W)w); 3376 ev_stop (EV_A_ (W)w);
2959 3377
2960 EV_FREQUENT_CHECK; 3378 EV_FREQUENT_CHECK;
2961} 3379}
3380#endif
2962 3381
3382#if EV_CHECK_ENABLE
2963void 3383void
2964ev_check_start (EV_P_ ev_check *w) 3384ev_check_start (EV_P_ ev_check *w)
2965{ 3385{
2966 if (expect_false (ev_is_active (w))) 3386 if (expect_false (ev_is_active (w)))
2967 return; 3387 return;
… …
2993 3413
2994 ev_stop (EV_A_ (W)w); 3414 ev_stop (EV_A_ (W)w);
2995 3415
2996 EV_FREQUENT_CHECK; 3416 EV_FREQUENT_CHECK;
2997} 3417}
3418#endif
2998 3419
2999#if EV_EMBED_ENABLE 3420#if EV_EMBED_ENABLE
3000void noinline 3421void noinline
3001ev_embed_sweep (EV_P_ ev_embed *w) 3422ev_embed_sweep (EV_P_ ev_embed *w)
3002{ 3423{
3003 ev_loop (w->other, EVLOOP_NONBLOCK); 3424 ev_run (w->other, EVRUN_NOWAIT);
3004} 3425}
3005 3426
3006static void 3427static void
3007embed_io_cb (EV_P_ ev_io *io, int revents) 3428embed_io_cb (EV_P_ ev_io *io, int revents)
3008{ 3429{
3009 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3430 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3010 3431
3011 if (ev_cb (w)) 3432 if (ev_cb (w))
3012 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3433 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3013 else 3434 else
3014 ev_loop (w->other, EVLOOP_NONBLOCK); 3435 ev_run (w->other, EVRUN_NOWAIT);
3015} 3436}
3016 3437
3017static void 3438static void
3018embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3439embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3019{ 3440{
3020 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3441 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3021 3442
3022 { 3443 {
3023 struct ev_loop *loop = w->other; 3444 EV_P = w->other;
3024 3445
3025 while (fdchangecnt) 3446 while (fdchangecnt)
3026 { 3447 {
3027 fd_reify (EV_A); 3448 fd_reify (EV_A);
3028 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3449 ev_run (EV_A_ EVRUN_NOWAIT);
3029 } 3450 }
3030 } 3451 }
3031} 3452}
3032 3453
3033static void 3454static void
… …
3036 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));
3037 3458
3038 ev_embed_stop (EV_A_ w); 3459 ev_embed_stop (EV_A_ w);
3039 3460
3040 { 3461 {
3041 struct ev_loop *loop = w->other; 3462 EV_P = w->other;
3042 3463
3043 ev_loop_fork (EV_A); 3464 ev_loop_fork (EV_A);
3044 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3465 ev_run (EV_A_ EVRUN_NOWAIT);
3045 } 3466 }
3046 3467
3047 ev_embed_start (EV_A_ w); 3468 ev_embed_start (EV_A_ w);
3048} 3469}
3049 3470
… …
3060{ 3481{
3061 if (expect_false (ev_is_active (w))) 3482 if (expect_false (ev_is_active (w)))
3062 return; 3483 return;
3063 3484
3064 { 3485 {
3065 struct ev_loop *loop = w->other; 3486 EV_P = w->other;
3066 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 ()));
3067 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);
3068 } 3489 }
3069 3490
3070 EV_FREQUENT_CHECK; 3491 EV_FREQUENT_CHECK;
… …
3097 3518
3098 ev_io_stop (EV_A_ &w->io); 3519 ev_io_stop (EV_A_ &w->io);
3099 ev_prepare_stop (EV_A_ &w->prepare); 3520 ev_prepare_stop (EV_A_ &w->prepare);
3100 ev_fork_stop (EV_A_ &w->fork); 3521 ev_fork_stop (EV_A_ &w->fork);
3101 3522
3523 ev_stop (EV_A_ (W)w);
3524
3102 EV_FREQUENT_CHECK; 3525 EV_FREQUENT_CHECK;
3103} 3526}
3104#endif 3527#endif
3105 3528
3106#if EV_FORK_ENABLE 3529#if EV_FORK_ENABLE
… …
3146ev_async_start (EV_P_ ev_async *w) 3569ev_async_start (EV_P_ ev_async *w)
3147{ 3570{
3148 if (expect_false (ev_is_active (w))) 3571 if (expect_false (ev_is_active (w)))
3149 return; 3572 return;
3150 3573
3574 w->sent = 0;
3575
3151 evpipe_init (EV_A); 3576 evpipe_init (EV_A);
3152 3577
3153 EV_FREQUENT_CHECK; 3578 EV_FREQUENT_CHECK;
3154 3579
3155 ev_start (EV_A_ (W)w, ++asynccnt); 3580 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3182 3607
3183void 3608void
3184ev_async_send (EV_P_ ev_async *w) 3609ev_async_send (EV_P_ ev_async *w)
3185{ 3610{
3186 w->sent = 1; 3611 w->sent = 1;
3187 evpipe_write (EV_A_ &gotasync); 3612 evpipe_write (EV_A_ &async_pending);
3188} 3613}
3189#endif 3614#endif
3190 3615
3191/*****************************************************************************/ 3616/*****************************************************************************/
3192 3617
… …
3232{ 3657{
3233 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));
3234 3659
3235 if (expect_false (!once)) 3660 if (expect_false (!once))
3236 { 3661 {
3237 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3662 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3238 return; 3663 return;
3239 } 3664 }
3240 3665
3241 once->cb = cb; 3666 once->cb = cb;
3242 once->arg = arg; 3667 once->arg = arg;
… …
3329 if (types & EV_ASYNC) 3754 if (types & EV_ASYNC)
3330 for (i = asynccnt; i--; ) 3755 for (i = asynccnt; i--; )
3331 cb (EV_A_ EV_ASYNC, asyncs [i]); 3756 cb (EV_A_ EV_ASYNC, asyncs [i]);
3332#endif 3757#endif
3333 3758
3759#if EV_PREPARE_ENABLE
3334 if (types & EV_PREPARE) 3760 if (types & EV_PREPARE)
3335 for (i = preparecnt; i--; ) 3761 for (i = preparecnt; i--; )
3336#if EV_EMBED_ENABLE 3762# if EV_EMBED_ENABLE
3337 if (ev_cb (prepares [i]) != embed_prepare_cb) 3763 if (ev_cb (prepares [i]) != embed_prepare_cb)
3338#endif 3764# endif
3339 cb (EV_A_ EV_PREPARE, prepares [i]); 3765 cb (EV_A_ EV_PREPARE, prepares [i]);
3766#endif
3340 3767
3768#if EV_CHECK_ENABLE
3341 if (types & EV_CHECK) 3769 if (types & EV_CHECK)
3342 for (i = checkcnt; i--; ) 3770 for (i = checkcnt; i--; )
3343 cb (EV_A_ EV_CHECK, checks [i]); 3771 cb (EV_A_ EV_CHECK, checks [i]);
3772#endif
3344 3773
3774#if EV_SIGNAL_ENABLE
3345 if (types & EV_SIGNAL) 3775 if (types & EV_SIGNAL)
3346 for (i = 0; i < signalmax; ++i) 3776 for (i = 0; i < EV_NSIG - 1; ++i)
3347 for (wl = signals [i].head; wl; ) 3777 for (wl = signals [i].head; wl; )
3348 { 3778 {
3349 wn = wl->next; 3779 wn = wl->next;
3350 cb (EV_A_ EV_SIGNAL, wl); 3780 cb (EV_A_ EV_SIGNAL, wl);
3351 wl = wn; 3781 wl = wn;
3352 } 3782 }
3783#endif
3353 3784
3785#if EV_CHILD_ENABLE
3354 if (types & EV_CHILD) 3786 if (types & EV_CHILD)
3355 for (i = EV_PID_HASHSIZE; i--; ) 3787 for (i = (EV_PID_HASHSIZE); i--; )
3356 for (wl = childs [i]; wl; ) 3788 for (wl = childs [i]; wl; )
3357 { 3789 {
3358 wn = wl->next; 3790 wn = wl->next;
3359 cb (EV_A_ EV_CHILD, wl); 3791 cb (EV_A_ EV_CHILD, wl);
3360 wl = wn; 3792 wl = wn;
3361 } 3793 }
3794#endif
3362/* EV_STAT 0x00001000 /* stat data changed */ 3795/* EV_STAT 0x00001000 /* stat data changed */
3363/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3796/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3364} 3797}
3365#endif 3798#endif
3366 3799
3367#if EV_MULTIPLICITY 3800#if EV_MULTIPLICITY
3368 #include "ev_wrap.h" 3801 #include "ev_wrap.h"
3369#endif 3802#endif
3370 3803
3371#ifdef __cplusplus 3804EV_CPP(})
3372}
3373#endif
3374 3805

Diff Legend

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