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

Comparing libev/ev.c (file contents):
Revision 1.294 by root, Wed Jul 8 02:46:05 2009 UTC vs.
Revision 1.357 by root, Sat Oct 23 22:25:44 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
… …
77# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
79# endif 75# endif
80# endif 76# endif
81 77
78# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
85# else 82# else
83# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 84# define EV_USE_NANOSLEEP 0
85# endif
86
87# if HAVE_SELECT && HAVE_SYS_SELECT_H
88# ifndef EV_USE_SELECT
89# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
88# endif 94# endif
89 95
96# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 98# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 99# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 100# else
101# undef EV_USE_POLL
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif
104# endif 103# endif
105 104
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 106# ifndef EV_USE_EPOLL
109# else 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
112# endif 112# endif
113 113
114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# ifndef EV_USE_KQUEUE 115# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
116# define EV_USE_KQUEUE 1
117# else
118# define EV_USE_KQUEUE 0
119# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
120# endif 121# endif
121 122
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 124# ifndef EV_USE_PORT
125# else 125# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
128# endif 130# endif
129 131
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 133# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
136# endif 139# endif
137 140
141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
138# ifndef EV_USE_EVENTFD 142# ifndef EV_USE_SIGNALFD
139# if HAVE_EVENTFD 143# define EV_USE_SIGNALFD EV_FEATURE_OS
140# define EV_USE_EVENTFD 1
141# else
142# define EV_USE_EVENTFD 0
143# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
148# endif
149
150# if HAVE_EVENTFD
151# ifndef EV_USE_EVENTFD
152# define EV_USE_EVENTFD EV_FEATURE_OS
153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
144# endif 157# endif
145 158
146#endif 159#endif
147 160
148#include <math.h> 161#include <math.h>
149#include <stdlib.h> 162#include <stdlib.h>
163#include <string.h>
150#include <fcntl.h> 164#include <fcntl.h>
151#include <stddef.h> 165#include <stddef.h>
152 166
153#include <stdio.h> 167#include <stdio.h>
154 168
155#include <assert.h> 169#include <assert.h>
156#include <errno.h> 170#include <errno.h>
157#include <sys/types.h> 171#include <sys/types.h>
158#include <time.h> 172#include <time.h>
173#include <limits.h>
159 174
160#include <signal.h> 175#include <signal.h>
161 176
162#ifdef EV_H 177#ifdef EV_H
163# include EV_H 178# include EV_H
164#else 179#else
165# include "ev.h" 180# include "ev.h"
166#endif 181#endif
182
183EV_CPP(extern "C" {)
167 184
168#ifndef _WIN32 185#ifndef _WIN32
169# include <sys/time.h> 186# include <sys/time.h>
170# include <sys/wait.h> 187# include <sys/wait.h>
171# include <unistd.h> 188# include <unistd.h>
… …
174# define WIN32_LEAN_AND_MEAN 191# define WIN32_LEAN_AND_MEAN
175# include <windows.h> 192# include <windows.h>
176# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
177# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
178# endif 195# endif
196# undef EV_AVOID_STDIO
179#endif 197#endif
198
199/* OS X, in its infinite idiocy, actually HARDCODES
200 * a limit of 1024 into their select. Where people have brains,
201 * OS X engineers apparently have a vacuum. Or maybe they were
202 * ordered to have a vacuum, or they do anything for money.
203 * This might help. Or not.
204 */
205#define _DARWIN_UNLIMITED_SELECT 1
180 206
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 207/* this block tries to deduce configuration from header-defined symbols and defaults */
208
209/* try to deduce the maximum number of signals on this platform */
210#if defined (EV_NSIG)
211/* use what's provided */
212#elif defined (NSIG)
213# define EV_NSIG (NSIG)
214#elif defined(_NSIG)
215# define EV_NSIG (_NSIG)
216#elif defined (SIGMAX)
217# define EV_NSIG (SIGMAX+1)
218#elif defined (SIG_MAX)
219# define EV_NSIG (SIG_MAX+1)
220#elif defined (_SIG_MAX)
221# define EV_NSIG (_SIG_MAX+1)
222#elif defined (MAXSIG)
223# define EV_NSIG (MAXSIG+1)
224#elif defined (MAX_SIG)
225# define EV_NSIG (MAX_SIG+1)
226#elif defined (SIGARRAYSIZE)
227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
228#elif defined (_sys_nsig)
229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
230#else
231# error "unable to find value for NSIG, please report"
232/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */
234# define EV_NSIG 65
235#endif
182 236
183#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
186# else 240# else
187# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
188# endif 242# endif
189#endif 243#endif
190 244
191#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
192# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
193# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
194# else 248# else
195# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
196# endif 250# endif
197#endif 251#endif
198 252
… …
200# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
201#endif 255#endif
202 256
203#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
204# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
205# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
206# else 260# else
207# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
208# endif 262# endif
209#endif 263#endif
210 264
211#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
212# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
213#endif 267#endif
214 268
215#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
216# ifdef _WIN32 270# ifdef _WIN32
217# define EV_USE_POLL 0 271# define EV_USE_POLL 0
218# else 272# else
219# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
220# endif 274# endif
221#endif 275#endif
222 276
223#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
224# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
225# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
226# else 280# else
227# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
228# endif 282# endif
229#endif 283#endif
230 284
… …
236# define EV_USE_PORT 0 290# define EV_USE_PORT 0
237#endif 291#endif
238 292
239#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
240# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
241# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
242# else 296# else
243# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
244# endif 298# endif
245#endif 299#endif
246 300
247#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
248# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
249# define EV_PID_HASHSIZE 1
250# else
251# define EV_PID_HASHSIZE 16
252# endif
253#endif 303#endif
254 304
255#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
256# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
257# define EV_INOTIFY_HASHSIZE 1
258# else
259# define EV_INOTIFY_HASHSIZE 16
260# endif
261#endif 307#endif
262 308
263#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
266# else 312# else
267# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
314# endif
315#endif
316
317#ifndef EV_USE_SIGNALFD
318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
319# define EV_USE_SIGNALFD EV_FEATURE_OS
320# else
321# define EV_USE_SIGNALFD 0
268# endif 322# endif
269#endif 323#endif
270 324
271#if 0 /* debugging */ 325#if 0 /* debugging */
272# define EV_VERIFY 3 326# define EV_VERIFY 3
273# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
274# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
275#endif 329#endif
276 330
277#ifndef EV_VERIFY 331#ifndef EV_VERIFY
278# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
279#endif 333#endif
280 334
281#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
282# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
283#endif 337#endif
284 338
285#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
286# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
287#endif 341#endif
288 342
289/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 343/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
290/* which makes programs even slower. might work on other unices, too. */ 344/* which makes programs even slower. might work on other unices, too. */
291#if EV_USE_CLOCK_SYSCALL 345#if EV_USE_CLOCK_SYSCALL
… …
300# endif 354# endif
301#endif 355#endif
302 356
303/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 357/* this block fixes any misconfiguration where we know we run into trouble otherwise */
304 358
359#ifdef _AIX
360/* AIX has a completely broken poll.h header */
361# undef EV_USE_POLL
362# define EV_USE_POLL 0
363#endif
364
305#ifndef CLOCK_MONOTONIC 365#ifndef CLOCK_MONOTONIC
306# undef EV_USE_MONOTONIC 366# undef EV_USE_MONOTONIC
307# define EV_USE_MONOTONIC 0 367# define EV_USE_MONOTONIC 0
308#endif 368#endif
309 369
… …
322# include <sys/select.h> 382# include <sys/select.h>
323# endif 383# endif
324#endif 384#endif
325 385
326#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
327# include <sys/utsname.h>
328# include <sys/statfs.h> 387# include <sys/statfs.h>
329# include <sys/inotify.h> 388# include <sys/inotify.h>
330/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
331# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
332# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
339#endif 398#endif
340 399
341#if EV_USE_EVENTFD 400#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 401/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 402# include <stdint.h>
344# ifdef __cplusplus 403# ifndef EFD_NONBLOCK
345extern "C" { 404# define EFD_NONBLOCK O_NONBLOCK
346# endif 405# endif
347int eventfd (unsigned int initval, int flags); 406# ifndef EFD_CLOEXEC
348# ifdef __cplusplus 407# ifdef O_CLOEXEC
349} 408# define EFD_CLOEXEC O_CLOEXEC
409# else
410# define EFD_CLOEXEC 02000000
411# endif
350# endif 412# endif
413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
414#endif
415
416#if EV_USE_SIGNALFD
417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
418# include <stdint.h>
419# ifndef SFD_NONBLOCK
420# define SFD_NONBLOCK O_NONBLOCK
421# endif
422# ifndef SFD_CLOEXEC
423# ifdef O_CLOEXEC
424# define SFD_CLOEXEC O_CLOEXEC
425# else
426# define SFD_CLOEXEC 02000000
427# endif
428# endif
429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
430
431struct signalfd_siginfo
432{
433 uint32_t ssi_signo;
434 char pad[128 - sizeof (uint32_t)];
435};
351#endif 436#endif
352 437
353/**/ 438/**/
354 439
355#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
357#else 442#else
358# define EV_FREQUENT_CHECK do { } while (0) 443# define EV_FREQUENT_CHECK do { } while (0)
359#endif 444#endif
360 445
361/* 446/*
… …
368 */ 453 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 455
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 456#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
372#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 457#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
373/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 458
459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
460#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
374 461
375#if __GNUC__ >= 4 462#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
378#else 465#else
… …
385 472
386#define expect_false(expr) expect ((expr) != 0, 0) 473#define expect_false(expr) expect ((expr) != 0, 0)
387#define expect_true(expr) expect ((expr) != 0, 1) 474#define expect_true(expr) expect ((expr) != 0, 1)
388#define inline_size static inline 475#define inline_size static inline
389 476
390#if EV_MINIMAL 477#if EV_FEATURE_CODE
478# define inline_speed static inline
479#else
391# define inline_speed static noinline 480# define inline_speed static noinline
481#endif
482
483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
484
485#if EV_MINPRI == EV_MAXPRI
486# define ABSPRI(w) (((W)w), 0)
392#else 487#else
393# define inline_speed static inline
394#endif
395
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 488# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
489#endif
398 490
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 491#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 492#define EMPTY2(a,b) /* used to suppress some warnings */
401 493
402typedef ev_watcher *W; 494typedef ev_watcher *W;
… …
406#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
407#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
408 500
409#if EV_USE_REALTIME 501#if EV_USE_REALTIME
410/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 502/* sig_atomic_t is used to avoid per-thread variables or locking but still */
411/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
412static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
413#endif 505#endif
414 506
415#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
416static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
417#endif 509#endif
418 510
511#ifndef EV_FD_TO_WIN32_HANDLE
512# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
513#endif
514#ifndef EV_WIN32_HANDLE_TO_FD
515# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
516#endif
517#ifndef EV_WIN32_CLOSE_FD
518# define EV_WIN32_CLOSE_FD(fd) close (fd)
519#endif
520
419#ifdef _WIN32 521#ifdef _WIN32
420# include "ev_win32.c" 522# include "ev_win32.c"
421#endif 523#endif
422 524
423/*****************************************************************************/ 525/*****************************************************************************/
526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
531static unsigned int noinline
532ev_linux_version (void)
533{
534#ifdef __linux
535 struct utsname buf;
536 unsigned int v;
537 int i;
538 char *p = buf.release;
539
540 if (uname (&buf))
541 return 0;
542
543 for (i = 3+1; --i; )
544 {
545 unsigned int c = 0;
546
547 for (;;)
548 {
549 if (*p >= '0' && *p <= '9')
550 c = c * 10 + *p++ - '0';
551 else
552 {
553 p += *p == '.';
554 break;
555 }
556 }
557
558 v = (v << 8) | c;
559 }
560
561 return v;
562#else
563 return 0;
564#endif
565}
566
567/*****************************************************************************/
568
569#if EV_AVOID_STDIO
570static void noinline
571ev_printerr (const char *msg)
572{
573 write (STDERR_FILENO, msg, strlen (msg));
574}
575#endif
424 576
425static void (*syserr_cb)(const char *msg); 577static void (*syserr_cb)(const char *msg);
426 578
427void 579void
428ev_set_syserr_cb (void (*cb)(const char *msg)) 580ev_set_syserr_cb (void (*cb)(const char *msg))
… …
438 590
439 if (syserr_cb) 591 if (syserr_cb)
440 syserr_cb (msg); 592 syserr_cb (msg);
441 else 593 else
442 { 594 {
595#if EV_AVOID_STDIO
596 const char *err = strerror (errno);
597
598 ev_printerr (msg);
599 ev_printerr (": ");
600 ev_printerr (err);
601 ev_printerr ("\n");
602#else
443 perror (msg); 603 perror (msg);
604#endif
444 abort (); 605 abort ();
445 } 606 }
446} 607}
447 608
448static void * 609static void *
449ev_realloc_emul (void *ptr, long size) 610ev_realloc_emul (void *ptr, long size)
450{ 611{
612#if __GLIBC__
613 return realloc (ptr, size);
614#else
451 /* some systems, notably openbsd and darwin, fail to properly 615 /* some systems, notably openbsd and darwin, fail to properly
452 * implement realloc (x, 0) (as required by both ansi c-98 and 616 * implement realloc (x, 0) (as required by both ansi c-89 and
453 * the single unix specification, so work around them here. 617 * the single unix specification, so work around them here.
454 */ 618 */
455 619
456 if (size) 620 if (size)
457 return realloc (ptr, size); 621 return realloc (ptr, size);
458 622
459 free (ptr); 623 free (ptr);
460 return 0; 624 return 0;
625#endif
461} 626}
462 627
463static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 628static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
464 629
465void 630void
… …
473{ 638{
474 ptr = alloc (ptr, size); 639 ptr = alloc (ptr, size);
475 640
476 if (!ptr && size) 641 if (!ptr && size)
477 { 642 {
643#if EV_AVOID_STDIO
644 ev_printerr ("libev: memory allocation failed, aborting.\n");
645#else
478 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 646 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
647#endif
479 abort (); 648 abort ();
480 } 649 }
481 650
482 return ptr; 651 return ptr;
483} 652}
… …
485#define ev_malloc(size) ev_realloc (0, (size)) 654#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 655#define ev_free(ptr) ev_realloc ((ptr), 0)
487 656
488/*****************************************************************************/ 657/*****************************************************************************/
489 658
659/* set in reify when reification needed */
660#define EV_ANFD_REIFY 1
661
490/* file descriptor info structure */ 662/* file descriptor info structure */
491typedef struct 663typedef struct
492{ 664{
493 WL head; 665 WL head;
494 unsigned char events; /* the events watched for */ 666 unsigned char events; /* the events watched for */
495 unsigned char reify; /* flag set when this ANFD needs reification */ 667 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
496 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 668 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
497 unsigned char unused; 669 unsigned char unused;
498#if EV_USE_EPOLL 670#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 672#endif
501#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
502 SOCKET handle; 674 SOCKET handle;
675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
503#endif 678#endif
504} ANFD; 679} ANFD;
505 680
506/* stores the pending event set for a given watcher */ 681/* stores the pending event set for a given watcher */
507typedef struct 682typedef struct
… …
562 737
563 static int ev_default_loop_ptr; 738 static int ev_default_loop_ptr;
564 739
565#endif 740#endif
566 741
742#if EV_FEATURE_API
743# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
744# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
745# define EV_INVOKE_PENDING invoke_cb (EV_A)
746#else
747# define EV_RELEASE_CB (void)0
748# define EV_ACQUIRE_CB (void)0
749# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
750#endif
751
752#define EVBREAK_RECURSE 0x80
753
567/*****************************************************************************/ 754/*****************************************************************************/
568 755
569#ifndef EV_HAVE_EV_TIME 756#ifndef EV_HAVE_EV_TIME
570ev_tstamp 757ev_tstamp
571ev_time (void) 758ev_time (void)
… …
614 if (delay > 0.) 801 if (delay > 0.)
615 { 802 {
616#if EV_USE_NANOSLEEP 803#if EV_USE_NANOSLEEP
617 struct timespec ts; 804 struct timespec ts;
618 805
619 ts.tv_sec = (time_t)delay; 806 EV_TS_SET (ts, delay);
620 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
621
622 nanosleep (&ts, 0); 807 nanosleep (&ts, 0);
623#elif defined(_WIN32) 808#elif defined(_WIN32)
624 Sleep ((unsigned long)(delay * 1e3)); 809 Sleep ((unsigned long)(delay * 1e3));
625#else 810#else
626 struct timeval tv; 811 struct timeval tv;
627 812
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 */ 813 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
632 /* somehting not guaranteed by newer posix versions, but guaranteed */ 814 /* something not guaranteed by newer posix versions, but guaranteed */
633 /* by older ones */ 815 /* by older ones */
816 EV_TV_SET (tv, delay);
634 select (0, 0, 0, 0, &tv); 817 select (0, 0, 0, 0, &tv);
635#endif 818#endif
636 } 819 }
637} 820}
638 821
639/*****************************************************************************/ 822/*****************************************************************************/
640 823
641#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 824#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
642 825
643/* find a suitable new size for the given array, */ 826/* find a suitable new size for the given array, */
644/* hopefully by rounding to a ncie-to-malloc size */ 827/* hopefully by rounding to a nice-to-malloc size */
645inline_size int 828inline_size int
646array_nextsize (int elem, int cur, int cnt) 829array_nextsize (int elem, int cur, int cnt)
647{ 830{
648 int ncur = cur + 1; 831 int ncur = cur + 1;
649 832
… …
745} 928}
746 929
747/*****************************************************************************/ 930/*****************************************************************************/
748 931
749inline_speed void 932inline_speed void
750fd_event (EV_P_ int fd, int revents) 933fd_event_nocheck (EV_P_ int fd, int revents)
751{ 934{
752 ANFD *anfd = anfds + fd; 935 ANFD *anfd = anfds + fd;
753 ev_io *w; 936 ev_io *w;
754 937
755 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 938 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
759 if (ev) 942 if (ev)
760 ev_feed_event (EV_A_ (W)w, ev); 943 ev_feed_event (EV_A_ (W)w, ev);
761 } 944 }
762} 945}
763 946
947/* do not submit kernel events for fds that have reify set */
948/* because that means they changed while we were polling for new events */
949inline_speed void
950fd_event (EV_P_ int fd, int revents)
951{
952 ANFD *anfd = anfds + fd;
953
954 if (expect_true (!anfd->reify))
955 fd_event_nocheck (EV_A_ fd, revents);
956}
957
764void 958void
765ev_feed_fd_event (EV_P_ int fd, int revents) 959ev_feed_fd_event (EV_P_ int fd, int revents)
766{ 960{
767 if (fd >= 0 && fd < anfdmax) 961 if (fd >= 0 && fd < anfdmax)
768 fd_event (EV_A_ fd, revents); 962 fd_event_nocheck (EV_A_ fd, revents);
769} 963}
770 964
771/* make sure the external fd watch events are in-sync */ 965/* make sure the external fd watch events are in-sync */
772/* with the kernel/libev internal state */ 966/* with the kernel/libev internal state */
773inline_size void 967inline_size void
… …
779 { 973 {
780 int fd = fdchanges [i]; 974 int fd = fdchanges [i];
781 ANFD *anfd = anfds + fd; 975 ANFD *anfd = anfds + fd;
782 ev_io *w; 976 ev_io *w;
783 977
784 unsigned char events = 0; 978 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify;
785 980
786 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 981 anfd->reify = 0;
787 events |= (unsigned char)w->events;
788 982
789#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
790 if (events) 984 if (o_reify & EV__IOFDSET)
791 { 985 {
792 unsigned long arg; 986 unsigned long arg;
793 #ifdef EV_FD_TO_WIN32_HANDLE
794 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 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)); 988 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
989 printf ("oi %d %x\n", fd, anfd->handle);//D
799 } 990 }
800#endif 991#endif
801 992
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
802 { 994 {
803 unsigned char o_events = anfd->events;
804 unsigned char o_reify = anfd->reify;
805
806 anfd->reify = 0;
807 anfd->events = events; 995 anfd->events = 0;
808 996
809 if (o_events != events || o_reify & EV__IOFDSET) 997 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
998 anfd->events |= (unsigned char)w->events;
999
1000 if (o_events != anfd->events)
1001 o_reify = EV__IOFDSET; /* actually |= */
1002 }
1003
1004 if (o_reify & EV__IOFDSET)
810 backend_modify (EV_A_ fd, o_events, events); 1005 backend_modify (EV_A_ fd, o_events, anfd->events);
811 }
812 } 1006 }
813 1007
814 fdchangecnt = 0; 1008 fdchangecnt = 0;
815} 1009}
816 1010
… …
840 ev_io_stop (EV_A_ w); 1034 ev_io_stop (EV_A_ w);
841 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1035 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
842 } 1036 }
843} 1037}
844 1038
845/* check whether the given fd is atcually valid, for error recovery */ 1039/* check whether the given fd is actually valid, for error recovery */
846inline_size int 1040inline_size int
847fd_valid (int fd) 1041fd_valid (int fd)
848{ 1042{
849#ifdef _WIN32 1043#ifdef _WIN32
850 return _get_osfhandle (fd) != -1; 1044 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
851#else 1045#else
852 return fcntl (fd, F_GETFD) != -1; 1046 return fcntl (fd, F_GETFD) != -1;
853#endif 1047#endif
854} 1048}
855 1049
… …
873 1067
874 for (fd = anfdmax; fd--; ) 1068 for (fd = anfdmax; fd--; )
875 if (anfds [fd].events) 1069 if (anfds [fd].events)
876 { 1070 {
877 fd_kill (EV_A_ fd); 1071 fd_kill (EV_A_ fd);
878 return; 1072 break;
879 } 1073 }
880} 1074}
881 1075
882/* usually called after fork if backend needs to re-arm all fds from scratch */ 1076/* usually called after fork if backend needs to re-arm all fds from scratch */
883static void noinline 1077static void noinline
… …
888 for (fd = 0; fd < anfdmax; ++fd) 1082 for (fd = 0; fd < anfdmax; ++fd)
889 if (anfds [fd].events) 1083 if (anfds [fd].events)
890 { 1084 {
891 anfds [fd].events = 0; 1085 anfds [fd].events = 0;
892 anfds [fd].emask = 0; 1086 anfds [fd].emask = 0;
893 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1087 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
894 } 1088 }
895} 1089}
896 1090
1091/* used to prepare libev internal fd's */
1092/* this is not fork-safe */
1093inline_speed void
1094fd_intern (int fd)
1095{
1096#ifdef _WIN32
1097 unsigned long arg = 1;
1098 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1099#else
1100 fcntl (fd, F_SETFD, FD_CLOEXEC);
1101 fcntl (fd, F_SETFL, O_NONBLOCK);
1102#endif
1103}
1104
897/*****************************************************************************/ 1105/*****************************************************************************/
898 1106
899/* 1107/*
900 * the heap functions want a real array index. array index 0 uis guaranteed to not 1108 * the heap functions want a real array index. array index 0 is guaranteed to not
901 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1109 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
902 * the branching factor of the d-tree. 1110 * the branching factor of the d-tree.
903 */ 1111 */
904 1112
905/* 1113/*
… …
973 1181
974 for (;;) 1182 for (;;)
975 { 1183 {
976 int c = k << 1; 1184 int c = k << 1;
977 1185
978 if (c > N + HEAP0 - 1) 1186 if (c >= N + HEAP0)
979 break; 1187 break;
980 1188
981 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1189 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
982 ? 1 : 0; 1190 ? 1 : 0;
983 1191
… …
1019 1227
1020/* move an element suitably so it is in a correct place */ 1228/* move an element suitably so it is in a correct place */
1021inline_size void 1229inline_size void
1022adjustheap (ANHE *heap, int N, int k) 1230adjustheap (ANHE *heap, int N, int k)
1023{ 1231{
1024 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1232 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1025 upheap (heap, k); 1233 upheap (heap, k);
1026 else 1234 else
1027 downheap (heap, N, k); 1235 downheap (heap, N, k);
1028} 1236}
1029 1237
… …
1042/*****************************************************************************/ 1250/*****************************************************************************/
1043 1251
1044/* associate signal watchers to a signal signal */ 1252/* associate signal watchers to a signal signal */
1045typedef struct 1253typedef struct
1046{ 1254{
1255 EV_ATOMIC_T pending;
1256#if EV_MULTIPLICITY
1257 EV_P;
1258#endif
1047 WL head; 1259 WL head;
1048 EV_ATOMIC_T gotsig;
1049} ANSIG; 1260} ANSIG;
1050 1261
1051static ANSIG *signals; 1262static ANSIG signals [EV_NSIG - 1];
1052static int signalmax;
1053
1054static EV_ATOMIC_T gotsig;
1055 1263
1056/*****************************************************************************/ 1264/*****************************************************************************/
1057 1265
1058/* used to prepare libev internal fd's */ 1266#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 1267
1072static void noinline 1268static void noinline
1073evpipe_init (EV_P) 1269evpipe_init (EV_P)
1074{ 1270{
1075 if (!ev_is_active (&pipe_w)) 1271 if (!ev_is_active (&pipe_w))
1076 { 1272 {
1077#if EV_USE_EVENTFD 1273# if EV_USE_EVENTFD
1274 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1275 if (evfd < 0 && errno == EINVAL)
1078 if ((evfd = eventfd (0, 0)) >= 0) 1276 evfd = eventfd (0, 0);
1277
1278 if (evfd >= 0)
1079 { 1279 {
1080 evpipe [0] = -1; 1280 evpipe [0] = -1;
1081 fd_intern (evfd); 1281 fd_intern (evfd); /* doing it twice doesn't hurt */
1082 ev_io_set (&pipe_w, evfd, EV_READ); 1282 ev_io_set (&pipe_w, evfd, EV_READ);
1083 } 1283 }
1084 else 1284 else
1085#endif 1285# endif
1086 { 1286 {
1087 while (pipe (evpipe)) 1287 while (pipe (evpipe))
1088 ev_syserr ("(libev) error creating signal/async pipe"); 1288 ev_syserr ("(libev) error creating signal/async pipe");
1089 1289
1090 fd_intern (evpipe [0]); 1290 fd_intern (evpipe [0]);
… …
1101evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1301evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1102{ 1302{
1103 if (!*flag) 1303 if (!*flag)
1104 { 1304 {
1105 int old_errno = errno; /* save errno because write might clobber it */ 1305 int old_errno = errno; /* save errno because write might clobber it */
1306 char dummy;
1106 1307
1107 *flag = 1; 1308 *flag = 1;
1108 1309
1109#if EV_USE_EVENTFD 1310#if EV_USE_EVENTFD
1110 if (evfd >= 0) 1311 if (evfd >= 0)
… …
1112 uint64_t counter = 1; 1313 uint64_t counter = 1;
1113 write (evfd, &counter, sizeof (uint64_t)); 1314 write (evfd, &counter, sizeof (uint64_t));
1114 } 1315 }
1115 else 1316 else
1116#endif 1317#endif
1318 /* win32 people keep sending patches that change this write() to send() */
1319 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1320 /* so when you think this write should be a send instead, please find out */
1321 /* where your send() is from - it's definitely not the microsoft send, and */
1322 /* tell me. thank you. */
1117 write (evpipe [1], &old_errno, 1); 1323 write (evpipe [1], &dummy, 1);
1118 1324
1119 errno = old_errno; 1325 errno = old_errno;
1120 } 1326 }
1121} 1327}
1122 1328
1123/* called whenever the libev signal pipe */ 1329/* called whenever the libev signal pipe */
1124/* got some events (signal, async) */ 1330/* got some events (signal, async) */
1125static void 1331static void
1126pipecb (EV_P_ ev_io *iow, int revents) 1332pipecb (EV_P_ ev_io *iow, int revents)
1127{ 1333{
1334 int i;
1335
1128#if EV_USE_EVENTFD 1336#if EV_USE_EVENTFD
1129 if (evfd >= 0) 1337 if (evfd >= 0)
1130 { 1338 {
1131 uint64_t counter; 1339 uint64_t counter;
1132 read (evfd, &counter, sizeof (uint64_t)); 1340 read (evfd, &counter, sizeof (uint64_t));
1133 } 1341 }
1134 else 1342 else
1135#endif 1343#endif
1136 { 1344 {
1137 char dummy; 1345 char dummy;
1346 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1138 read (evpipe [0], &dummy, 1); 1347 read (evpipe [0], &dummy, 1);
1139 } 1348 }
1140 1349
1141 if (gotsig && ev_is_default_loop (EV_A)) 1350 if (sig_pending)
1142 { 1351 {
1143 int signum; 1352 sig_pending = 0;
1144 gotsig = 0;
1145 1353
1146 for (signum = signalmax; signum--; ) 1354 for (i = EV_NSIG - 1; i--; )
1147 if (signals [signum].gotsig) 1355 if (expect_false (signals [i].pending))
1148 ev_feed_signal_event (EV_A_ signum + 1); 1356 ev_feed_signal_event (EV_A_ i + 1);
1149 } 1357 }
1150 1358
1151#if EV_ASYNC_ENABLE 1359#if EV_ASYNC_ENABLE
1152 if (gotasync) 1360 if (async_pending)
1153 { 1361 {
1154 int i; 1362 async_pending = 0;
1155 gotasync = 0;
1156 1363
1157 for (i = asynccnt; i--; ) 1364 for (i = asynccnt; i--; )
1158 if (asyncs [i]->sent) 1365 if (asyncs [i]->sent)
1159 { 1366 {
1160 asyncs [i]->sent = 0; 1367 asyncs [i]->sent = 0;
… …
1168 1375
1169static void 1376static void
1170ev_sighandler (int signum) 1377ev_sighandler (int signum)
1171{ 1378{
1172#if EV_MULTIPLICITY 1379#if EV_MULTIPLICITY
1173 struct ev_loop *loop = &default_loop_struct; 1380 EV_P = signals [signum - 1].loop;
1174#endif 1381#endif
1175 1382
1176#if _WIN32 1383#ifdef _WIN32
1177 signal (signum, ev_sighandler); 1384 signal (signum, ev_sighandler);
1178#endif 1385#endif
1179 1386
1180 signals [signum - 1].gotsig = 1; 1387 signals [signum - 1].pending = 1;
1181 evpipe_write (EV_A_ &gotsig); 1388 evpipe_write (EV_A_ &sig_pending);
1182} 1389}
1183 1390
1184void noinline 1391void noinline
1185ev_feed_signal_event (EV_P_ int signum) 1392ev_feed_signal_event (EV_P_ int signum)
1186{ 1393{
1187 WL w; 1394 WL w;
1188 1395
1396 if (expect_false (signum <= 0 || signum > EV_NSIG))
1397 return;
1398
1399 --signum;
1400
1189#if EV_MULTIPLICITY 1401#if EV_MULTIPLICITY
1190 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1402 /* it is permissible to try to feed a signal to the wrong loop */
1191#endif 1403 /* or, likely more useful, feeding a signal nobody is waiting for */
1192 1404
1193 --signum; 1405 if (expect_false (signals [signum].loop != EV_A))
1194
1195 if (signum < 0 || signum >= signalmax)
1196 return; 1406 return;
1407#endif
1197 1408
1198 signals [signum].gotsig = 0; 1409 signals [signum].pending = 0;
1199 1410
1200 for (w = signals [signum].head; w; w = w->next) 1411 for (w = signals [signum].head; w; w = w->next)
1201 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1412 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1202} 1413}
1203 1414
1415#if EV_USE_SIGNALFD
1416static void
1417sigfdcb (EV_P_ ev_io *iow, int revents)
1418{
1419 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1420
1421 for (;;)
1422 {
1423 ssize_t res = read (sigfd, si, sizeof (si));
1424
1425 /* not ISO-C, as res might be -1, but works with SuS */
1426 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1427 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1428
1429 if (res < (ssize_t)sizeof (si))
1430 break;
1431 }
1432}
1433#endif
1434
1435#endif
1436
1204/*****************************************************************************/ 1437/*****************************************************************************/
1205 1438
1439#if EV_CHILD_ENABLE
1206static WL childs [EV_PID_HASHSIZE]; 1440static WL childs [EV_PID_HASHSIZE];
1207
1208#ifndef _WIN32
1209 1441
1210static ev_signal childev; 1442static ev_signal childev;
1211 1443
1212#ifndef WIFCONTINUED 1444#ifndef WIFCONTINUED
1213# define WIFCONTINUED(status) 0 1445# define WIFCONTINUED(status) 0
… …
1218child_reap (EV_P_ int chain, int pid, int status) 1450child_reap (EV_P_ int chain, int pid, int status)
1219{ 1451{
1220 ev_child *w; 1452 ev_child *w;
1221 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1453 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1222 1454
1223 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1455 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1224 { 1456 {
1225 if ((w->pid == pid || !w->pid) 1457 if ((w->pid == pid || !w->pid)
1226 && (!traced || (w->flags & 1))) 1458 && (!traced || (w->flags & 1)))
1227 { 1459 {
1228 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1460 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1253 /* make sure we are called again until all children have been reaped */ 1485 /* make sure we are called again until all children have been reaped */
1254 /* we need to do it this way so that the callback gets called before we continue */ 1486 /* we need to do it this way so that the callback gets called before we continue */
1255 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1487 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1256 1488
1257 child_reap (EV_A_ pid, pid, status); 1489 child_reap (EV_A_ pid, pid, status);
1258 if (EV_PID_HASHSIZE > 1) 1490 if ((EV_PID_HASHSIZE) > 1)
1259 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1491 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1260} 1492}
1261 1493
1262#endif 1494#endif
1263 1495
1264/*****************************************************************************/ 1496/*****************************************************************************/
1265 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1266#if EV_USE_PORT 1501#if EV_USE_PORT
1267# include "ev_port.c" 1502# include "ev_port.c"
1268#endif 1503#endif
1269#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1270# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1330#ifdef __APPLE__ 1565#ifdef __APPLE__
1331 /* only select works correctly on that "unix-certified" platform */ 1566 /* only select works correctly on that "unix-certified" platform */
1332 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1567 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1333 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1568 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1334#endif 1569#endif
1570#ifdef __FreeBSD__
1571 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1572#endif
1335 1573
1336 return flags; 1574 return flags;
1337} 1575}
1338 1576
1339unsigned int 1577unsigned int
1340ev_embeddable_backends (void) 1578ev_embeddable_backends (void)
1341{ 1579{
1342 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1580 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1343 1581
1344 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1582 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1345 /* please fix it and tell me how to detect the fix */ 1583 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1346 flags &= ~EVBACKEND_EPOLL; 1584 flags &= ~EVBACKEND_EPOLL;
1347 1585
1348 return flags; 1586 return flags;
1349} 1587}
1350 1588
1351unsigned int 1589unsigned int
1352ev_backend (EV_P) 1590ev_backend (EV_P)
1353{ 1591{
1354 return backend; 1592 return backend;
1355} 1593}
1356 1594
1595#if EV_FEATURE_API
1357unsigned int 1596unsigned int
1358ev_loop_count (EV_P) 1597ev_iteration (EV_P)
1359{ 1598{
1360 return loop_count; 1599 return loop_count;
1361} 1600}
1362 1601
1363unsigned int 1602unsigned int
1364ev_loop_depth (EV_P) 1603ev_depth (EV_P)
1365{ 1604{
1366 return loop_depth; 1605 return loop_depth;
1367} 1606}
1368 1607
1369void 1608void
… …
1375void 1614void
1376ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1615ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1377{ 1616{
1378 timeout_blocktime = interval; 1617 timeout_blocktime = interval;
1379} 1618}
1619
1620void
1621ev_set_userdata (EV_P_ void *data)
1622{
1623 userdata = data;
1624}
1625
1626void *
1627ev_userdata (EV_P)
1628{
1629 return userdata;
1630}
1631
1632void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1633{
1634 invoke_cb = invoke_pending_cb;
1635}
1636
1637void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1638{
1639 release_cb = release;
1640 acquire_cb = acquire;
1641}
1642#endif
1380 1643
1381/* initialise a loop structure, must be zero-initialised */ 1644/* initialise a loop structure, must be zero-initialised */
1382static void noinline 1645static void noinline
1383loop_init (EV_P_ unsigned int flags) 1646loop_init (EV_P_ unsigned int flags)
1384{ 1647{
… …
1402 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1665 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1403 have_monotonic = 1; 1666 have_monotonic = 1;
1404 } 1667 }
1405#endif 1668#endif
1406 1669
1670 /* pid check not overridable via env */
1671#ifndef _WIN32
1672 if (flags & EVFLAG_FORKCHECK)
1673 curpid = getpid ();
1674#endif
1675
1676 if (!(flags & EVFLAG_NOENV)
1677 && !enable_secure ()
1678 && getenv ("LIBEV_FLAGS"))
1679 flags = atoi (getenv ("LIBEV_FLAGS"));
1680
1407 ev_rt_now = ev_time (); 1681 ev_rt_now = ev_time ();
1408 mn_now = get_clock (); 1682 mn_now = get_clock ();
1409 now_floor = mn_now; 1683 now_floor = mn_now;
1410 rtmn_diff = ev_rt_now - mn_now; 1684 rtmn_diff = ev_rt_now - mn_now;
1685#if EV_FEATURE_API
1686 invoke_cb = ev_invoke_pending;
1687#endif
1411 1688
1412 io_blocktime = 0.; 1689 io_blocktime = 0.;
1413 timeout_blocktime = 0.; 1690 timeout_blocktime = 0.;
1414 backend = 0; 1691 backend = 0;
1415 backend_fd = -1; 1692 backend_fd = -1;
1416 gotasync = 0; 1693 sig_pending = 0;
1694#if EV_ASYNC_ENABLE
1695 async_pending = 0;
1696#endif
1417#if EV_USE_INOTIFY 1697#if EV_USE_INOTIFY
1418 fs_fd = -2; 1698 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1419#endif 1699#endif
1420 1700#if EV_USE_SIGNALFD
1421 /* pid check not overridable via env */ 1701 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1422#ifndef _WIN32
1423 if (flags & EVFLAG_FORKCHECK)
1424 curpid = getpid ();
1425#endif 1702#endif
1426
1427 if (!(flags & EVFLAG_NOENV)
1428 && !enable_secure ()
1429 && getenv ("LIBEV_FLAGS"))
1430 flags = atoi (getenv ("LIBEV_FLAGS"));
1431 1703
1432 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1433 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1434 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1435#if EV_USE_PORT 1710#if EV_USE_PORT
1436 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1437#endif 1712#endif
1438#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1439 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1448 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1723 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1449#endif 1724#endif
1450 1725
1451 ev_prepare_init (&pending_w, pendingcb); 1726 ev_prepare_init (&pending_w, pendingcb);
1452 1727
1728#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1453 ev_init (&pipe_w, pipecb); 1729 ev_init (&pipe_w, pipecb);
1454 ev_set_priority (&pipe_w, EV_MAXPRI); 1730 ev_set_priority (&pipe_w, EV_MAXPRI);
1731#endif
1455 } 1732 }
1456} 1733}
1457 1734
1458/* free up a loop structure */ 1735/* free up a loop structure */
1459static void noinline 1736static void noinline
… …
1461{ 1738{
1462 int i; 1739 int i;
1463 1740
1464 if (ev_is_active (&pipe_w)) 1741 if (ev_is_active (&pipe_w))
1465 { 1742 {
1466 ev_ref (EV_A); /* signal watcher */ 1743 /*ev_ref (EV_A);*/
1467 ev_io_stop (EV_A_ &pipe_w); 1744 /*ev_io_stop (EV_A_ &pipe_w);*/
1468 1745
1469#if EV_USE_EVENTFD 1746#if EV_USE_EVENTFD
1470 if (evfd >= 0) 1747 if (evfd >= 0)
1471 close (evfd); 1748 close (evfd);
1472#endif 1749#endif
1473 1750
1474 if (evpipe [0] >= 0) 1751 if (evpipe [0] >= 0)
1475 { 1752 {
1476 close (evpipe [0]); 1753 EV_WIN32_CLOSE_FD (evpipe [0]);
1477 close (evpipe [1]); 1754 EV_WIN32_CLOSE_FD (evpipe [1]);
1478 } 1755 }
1479 } 1756 }
1757
1758#if EV_USE_SIGNALFD
1759 if (ev_is_active (&sigfd_w))
1760 close (sigfd);
1761#endif
1480 1762
1481#if EV_USE_INOTIFY 1763#if EV_USE_INOTIFY
1482 if (fs_fd >= 0) 1764 if (fs_fd >= 0)
1483 close (fs_fd); 1765 close (fs_fd);
1484#endif 1766#endif
1485 1767
1486 if (backend_fd >= 0) 1768 if (backend_fd >= 0)
1487 close (backend_fd); 1769 close (backend_fd);
1488 1770
1771#if EV_USE_IOCP
1772 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1773#endif
1489#if EV_USE_PORT 1774#if EV_USE_PORT
1490 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1775 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1491#endif 1776#endif
1492#if EV_USE_KQUEUE 1777#if EV_USE_KQUEUE
1493 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1778 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1508#if EV_IDLE_ENABLE 1793#if EV_IDLE_ENABLE
1509 array_free (idle, [i]); 1794 array_free (idle, [i]);
1510#endif 1795#endif
1511 } 1796 }
1512 1797
1513 ev_free (anfds); anfdmax = 0; 1798 ev_free (anfds); anfds = 0; anfdmax = 0;
1514 1799
1515 /* have to use the microsoft-never-gets-it-right macro */ 1800 /* have to use the microsoft-never-gets-it-right macro */
1516 array_free (rfeed, EMPTY); 1801 array_free (rfeed, EMPTY);
1517 array_free (fdchange, EMPTY); 1802 array_free (fdchange, EMPTY);
1518 array_free (timer, EMPTY); 1803 array_free (timer, EMPTY);
… …
1553 1838
1554 if (ev_is_active (&pipe_w)) 1839 if (ev_is_active (&pipe_w))
1555 { 1840 {
1556 /* this "locks" the handlers against writing to the pipe */ 1841 /* this "locks" the handlers against writing to the pipe */
1557 /* while we modify the fd vars */ 1842 /* while we modify the fd vars */
1558 gotsig = 1; 1843 sig_pending = 1;
1559#if EV_ASYNC_ENABLE 1844#if EV_ASYNC_ENABLE
1560 gotasync = 1; 1845 async_pending = 1;
1561#endif 1846#endif
1562 1847
1563 ev_ref (EV_A); 1848 ev_ref (EV_A);
1564 ev_io_stop (EV_A_ &pipe_w); 1849 ev_io_stop (EV_A_ &pipe_w);
1565 1850
… …
1568 close (evfd); 1853 close (evfd);
1569#endif 1854#endif
1570 1855
1571 if (evpipe [0] >= 0) 1856 if (evpipe [0] >= 0)
1572 { 1857 {
1573 close (evpipe [0]); 1858 EV_WIN32_CLOSE_FD (evpipe [0]);
1574 close (evpipe [1]); 1859 EV_WIN32_CLOSE_FD (evpipe [1]);
1575 } 1860 }
1576 1861
1862#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1577 evpipe_init (EV_A); 1863 evpipe_init (EV_A);
1578 /* now iterate over everything, in case we missed something */ 1864 /* now iterate over everything, in case we missed something */
1579 pipecb (EV_A_ &pipe_w, EV_READ); 1865 pipecb (EV_A_ &pipe_w, EV_READ);
1866#endif
1580 } 1867 }
1581 1868
1582 postfork = 0; 1869 postfork = 0;
1583} 1870}
1584 1871
1585#if EV_MULTIPLICITY 1872#if EV_MULTIPLICITY
1586 1873
1587struct ev_loop * 1874struct ev_loop *
1588ev_loop_new (unsigned int flags) 1875ev_loop_new (unsigned int flags)
1589{ 1876{
1590 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1877 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1591 1878
1592 memset (loop, 0, sizeof (struct ev_loop)); 1879 memset (EV_A, 0, sizeof (struct ev_loop));
1593
1594 loop_init (EV_A_ flags); 1880 loop_init (EV_A_ flags);
1595 1881
1596 if (ev_backend (EV_A)) 1882 if (ev_backend (EV_A))
1597 return loop; 1883 return EV_A;
1598 1884
1599 return 0; 1885 return 0;
1600} 1886}
1601 1887
1602void 1888void
… …
1609void 1895void
1610ev_loop_fork (EV_P) 1896ev_loop_fork (EV_P)
1611{ 1897{
1612 postfork = 1; /* must be in line with ev_default_fork */ 1898 postfork = 1; /* must be in line with ev_default_fork */
1613} 1899}
1900#endif /* multiplicity */
1614 1901
1615#if EV_VERIFY 1902#if EV_VERIFY
1616static void noinline 1903static void noinline
1617verify_watcher (EV_P_ W w) 1904verify_watcher (EV_P_ W w)
1618{ 1905{
… …
1646 verify_watcher (EV_A_ ws [cnt]); 1933 verify_watcher (EV_A_ ws [cnt]);
1647 } 1934 }
1648} 1935}
1649#endif 1936#endif
1650 1937
1938#if EV_FEATURE_API
1651void 1939void
1652ev_loop_verify (EV_P) 1940ev_verify (EV_P)
1653{ 1941{
1654#if EV_VERIFY 1942#if EV_VERIFY
1655 int i; 1943 int i;
1656 WL w; 1944 WL w;
1657 1945
… …
1696#if EV_ASYNC_ENABLE 1984#if EV_ASYNC_ENABLE
1697 assert (asyncmax >= asynccnt); 1985 assert (asyncmax >= asynccnt);
1698 array_verify (EV_A_ (W *)asyncs, asynccnt); 1986 array_verify (EV_A_ (W *)asyncs, asynccnt);
1699#endif 1987#endif
1700 1988
1989#if EV_PREPARE_ENABLE
1701 assert (preparemax >= preparecnt); 1990 assert (preparemax >= preparecnt);
1702 array_verify (EV_A_ (W *)prepares, preparecnt); 1991 array_verify (EV_A_ (W *)prepares, preparecnt);
1992#endif
1703 1993
1994#if EV_CHECK_ENABLE
1704 assert (checkmax >= checkcnt); 1995 assert (checkmax >= checkcnt);
1705 array_verify (EV_A_ (W *)checks, checkcnt); 1996 array_verify (EV_A_ (W *)checks, checkcnt);
1997#endif
1706 1998
1707# if 0 1999# if 0
2000#if EV_CHILD_ENABLE
1708 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2001 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1709 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 2002 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2003#endif
1710# endif 2004# endif
1711#endif 2005#endif
1712} 2006}
1713 2007#endif
1714#endif /* multiplicity */
1715 2008
1716#if EV_MULTIPLICITY 2009#if EV_MULTIPLICITY
1717struct ev_loop * 2010struct ev_loop *
1718ev_default_loop_init (unsigned int flags) 2011ev_default_loop_init (unsigned int flags)
1719#else 2012#else
… …
1722#endif 2015#endif
1723{ 2016{
1724 if (!ev_default_loop_ptr) 2017 if (!ev_default_loop_ptr)
1725 { 2018 {
1726#if EV_MULTIPLICITY 2019#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2020 EV_P = ev_default_loop_ptr = &default_loop_struct;
1728#else 2021#else
1729 ev_default_loop_ptr = 1; 2022 ev_default_loop_ptr = 1;
1730#endif 2023#endif
1731 2024
1732 loop_init (EV_A_ flags); 2025 loop_init (EV_A_ flags);
1733 2026
1734 if (ev_backend (EV_A)) 2027 if (ev_backend (EV_A))
1735 { 2028 {
1736#ifndef _WIN32 2029#if EV_CHILD_ENABLE
1737 ev_signal_init (&childev, childcb, SIGCHLD); 2030 ev_signal_init (&childev, childcb, SIGCHLD);
1738 ev_set_priority (&childev, EV_MAXPRI); 2031 ev_set_priority (&childev, EV_MAXPRI);
1739 ev_signal_start (EV_A_ &childev); 2032 ev_signal_start (EV_A_ &childev);
1740 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2033 ev_unref (EV_A); /* child watcher should not keep loop alive */
1741#endif 2034#endif
… …
1749 2042
1750void 2043void
1751ev_default_destroy (void) 2044ev_default_destroy (void)
1752{ 2045{
1753#if EV_MULTIPLICITY 2046#if EV_MULTIPLICITY
1754 struct ev_loop *loop = ev_default_loop_ptr; 2047 EV_P = ev_default_loop_ptr;
1755#endif 2048#endif
1756 2049
1757 ev_default_loop_ptr = 0; 2050 ev_default_loop_ptr = 0;
1758 2051
1759#ifndef _WIN32 2052#if EV_CHILD_ENABLE
1760 ev_ref (EV_A); /* child watcher */ 2053 ev_ref (EV_A); /* child watcher */
1761 ev_signal_stop (EV_A_ &childev); 2054 ev_signal_stop (EV_A_ &childev);
1762#endif 2055#endif
1763 2056
1764 loop_destroy (EV_A); 2057 loop_destroy (EV_A);
… …
1766 2059
1767void 2060void
1768ev_default_fork (void) 2061ev_default_fork (void)
1769{ 2062{
1770#if EV_MULTIPLICITY 2063#if EV_MULTIPLICITY
1771 struct ev_loop *loop = ev_default_loop_ptr; 2064 EV_P = ev_default_loop_ptr;
1772#endif 2065#endif
1773 2066
1774 postfork = 1; /* must be in line with ev_loop_fork */ 2067 postfork = 1; /* must be in line with ev_loop_fork */
1775} 2068}
1776 2069
… …
1780ev_invoke (EV_P_ void *w, int revents) 2073ev_invoke (EV_P_ void *w, int revents)
1781{ 2074{
1782 EV_CB_INVOKE ((W)w, revents); 2075 EV_CB_INVOKE ((W)w, revents);
1783} 2076}
1784 2077
1785inline_speed void 2078unsigned int
1786call_pending (EV_P) 2079ev_pending_count (EV_P)
2080{
2081 int pri;
2082 unsigned int count = 0;
2083
2084 for (pri = NUMPRI; pri--; )
2085 count += pendingcnt [pri];
2086
2087 return count;
2088}
2089
2090void noinline
2091ev_invoke_pending (EV_P)
1787{ 2092{
1788 int pri; 2093 int pri;
1789 2094
1790 for (pri = NUMPRI; pri--; ) 2095 for (pri = NUMPRI; pri--; )
1791 while (pendingcnt [pri]) 2096 while (pendingcnt [pri])
… …
1858 EV_FREQUENT_CHECK; 2163 EV_FREQUENT_CHECK;
1859 feed_reverse (EV_A_ (W)w); 2164 feed_reverse (EV_A_ (W)w);
1860 } 2165 }
1861 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2166 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1862 2167
1863 feed_reverse_done (EV_A_ EV_TIMEOUT); 2168 feed_reverse_done (EV_A_ EV_TIMER);
1864 } 2169 }
1865} 2170}
1866 2171
1867#if EV_PERIODIC_ENABLE 2172#if EV_PERIODIC_ENABLE
1868/* make periodics pending */ 2173/* make periodics pending */
… …
1921 feed_reverse_done (EV_A_ EV_PERIODIC); 2226 feed_reverse_done (EV_A_ EV_PERIODIC);
1922 } 2227 }
1923} 2228}
1924 2229
1925/* simply recalculate all periodics */ 2230/* simply recalculate all periodics */
1926/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2231/* TODO: maybe ensure that at least one event happens when jumping forward? */
1927static void noinline 2232static void noinline
1928periodics_reschedule (EV_P) 2233periodics_reschedule (EV_P)
1929{ 2234{
1930 int i; 2235 int i;
1931 2236
… …
1959 ANHE_at_cache (*he); 2264 ANHE_at_cache (*he);
1960 } 2265 }
1961} 2266}
1962 2267
1963/* fetch new monotonic and realtime times from the kernel */ 2268/* fetch new monotonic and realtime times from the kernel */
1964/* also detetc if there was a timejump, and act accordingly */ 2269/* also detect if there was a timejump, and act accordingly */
1965inline_speed void 2270inline_speed void
1966time_update (EV_P_ ev_tstamp max_block) 2271time_update (EV_P_ ev_tstamp max_block)
1967{ 2272{
1968#if EV_USE_MONOTONIC 2273#if EV_USE_MONOTONIC
1969 if (expect_true (have_monotonic)) 2274 if (expect_true (have_monotonic))
… …
2027 mn_now = ev_rt_now; 2332 mn_now = ev_rt_now;
2028 } 2333 }
2029} 2334}
2030 2335
2031void 2336void
2032ev_loop (EV_P_ int flags) 2337ev_run (EV_P_ int flags)
2033{ 2338{
2339#if EV_FEATURE_API
2034 ++loop_depth; 2340 ++loop_depth;
2341#endif
2035 2342
2343 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2344
2036 loop_done = EVUNLOOP_CANCEL; 2345 loop_done = EVBREAK_CANCEL;
2037 2346
2038 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2347 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2039 2348
2040 do 2349 do
2041 { 2350 {
2042#if EV_VERIFY >= 2 2351#if EV_VERIFY >= 2
2043 ev_loop_verify (EV_A); 2352 ev_verify (EV_A);
2044#endif 2353#endif
2045 2354
2046#ifndef _WIN32 2355#ifndef _WIN32
2047 if (expect_false (curpid)) /* penalise the forking check even more */ 2356 if (expect_false (curpid)) /* penalise the forking check even more */
2048 if (expect_false (getpid () != curpid)) 2357 if (expect_false (getpid () != curpid))
… …
2056 /* we might have forked, so queue fork handlers */ 2365 /* we might have forked, so queue fork handlers */
2057 if (expect_false (postfork)) 2366 if (expect_false (postfork))
2058 if (forkcnt) 2367 if (forkcnt)
2059 { 2368 {
2060 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2369 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2061 call_pending (EV_A); 2370 EV_INVOKE_PENDING;
2062 } 2371 }
2063#endif 2372#endif
2064 2373
2374#if EV_PREPARE_ENABLE
2065 /* queue prepare watchers (and execute them) */ 2375 /* queue prepare watchers (and execute them) */
2066 if (expect_false (preparecnt)) 2376 if (expect_false (preparecnt))
2067 { 2377 {
2068 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2378 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2069 call_pending (EV_A); 2379 EV_INVOKE_PENDING;
2070 } 2380 }
2381#endif
2382
2383 if (expect_false (loop_done))
2384 break;
2071 2385
2072 /* we might have forked, so reify kernel state if necessary */ 2386 /* we might have forked, so reify kernel state if necessary */
2073 if (expect_false (postfork)) 2387 if (expect_false (postfork))
2074 loop_fork (EV_A); 2388 loop_fork (EV_A);
2075 2389
… …
2079 /* calculate blocking time */ 2393 /* calculate blocking time */
2080 { 2394 {
2081 ev_tstamp waittime = 0.; 2395 ev_tstamp waittime = 0.;
2082 ev_tstamp sleeptime = 0.; 2396 ev_tstamp sleeptime = 0.;
2083 2397
2398 /* remember old timestamp for io_blocktime calculation */
2399 ev_tstamp prev_mn_now = mn_now;
2400
2401 /* update time to cancel out callback processing overhead */
2402 time_update (EV_A_ 1e100);
2403
2084 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2404 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2085 { 2405 {
2086 /* remember old timestamp for io_blocktime calculation */
2087 ev_tstamp prev_mn_now = mn_now;
2088
2089 /* update time to cancel out callback processing overhead */
2090 time_update (EV_A_ 1e100);
2091
2092 waittime = MAX_BLOCKTIME; 2406 waittime = MAX_BLOCKTIME;
2093 2407
2094 if (timercnt) 2408 if (timercnt)
2095 { 2409 {
2096 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2410 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2123 waittime -= sleeptime; 2437 waittime -= sleeptime;
2124 } 2438 }
2125 } 2439 }
2126 } 2440 }
2127 2441
2442#if EV_FEATURE_API
2128 ++loop_count; 2443 ++loop_count;
2444#endif
2445 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2129 backend_poll (EV_A_ waittime); 2446 backend_poll (EV_A_ waittime);
2447 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2130 2448
2131 /* update ev_rt_now, do magic */ 2449 /* update ev_rt_now, do magic */
2132 time_update (EV_A_ waittime + sleeptime); 2450 time_update (EV_A_ waittime + sleeptime);
2133 } 2451 }
2134 2452
… …
2141#if EV_IDLE_ENABLE 2459#if EV_IDLE_ENABLE
2142 /* queue idle watchers unless other events are pending */ 2460 /* queue idle watchers unless other events are pending */
2143 idle_reify (EV_A); 2461 idle_reify (EV_A);
2144#endif 2462#endif
2145 2463
2464#if EV_CHECK_ENABLE
2146 /* queue check watchers, to be executed first */ 2465 /* queue check watchers, to be executed first */
2147 if (expect_false (checkcnt)) 2466 if (expect_false (checkcnt))
2148 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2467 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2468#endif
2149 2469
2150 call_pending (EV_A); 2470 EV_INVOKE_PENDING;
2151 } 2471 }
2152 while (expect_true ( 2472 while (expect_true (
2153 activecnt 2473 activecnt
2154 && !loop_done 2474 && !loop_done
2155 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2475 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2156 )); 2476 ));
2157 2477
2158 if (loop_done == EVUNLOOP_ONE) 2478 if (loop_done == EVBREAK_ONE)
2159 loop_done = EVUNLOOP_CANCEL; 2479 loop_done = EVBREAK_CANCEL;
2160 2480
2481#if EV_FEATURE_API
2161 --loop_depth; 2482 --loop_depth;
2483#endif
2162} 2484}
2163 2485
2164void 2486void
2165ev_unloop (EV_P_ int how) 2487ev_break (EV_P_ int how)
2166{ 2488{
2167 loop_done = how; 2489 loop_done = how;
2168} 2490}
2169 2491
2170void 2492void
… …
2217inline_size void 2539inline_size void
2218wlist_del (WL *head, WL elem) 2540wlist_del (WL *head, WL elem)
2219{ 2541{
2220 while (*head) 2542 while (*head)
2221 { 2543 {
2222 if (*head == elem) 2544 if (expect_true (*head == elem))
2223 { 2545 {
2224 *head = elem->next; 2546 *head = elem->next;
2225 return; 2547 break;
2226 } 2548 }
2227 2549
2228 head = &(*head)->next; 2550 head = &(*head)->next;
2229 } 2551 }
2230} 2552}
… …
2258} 2580}
2259 2581
2260inline_size void 2582inline_size void
2261pri_adjust (EV_P_ W w) 2583pri_adjust (EV_P_ W w)
2262{ 2584{
2263 int pri = w->priority; 2585 int pri = ev_priority (w);
2264 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2586 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2265 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2587 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2266 w->priority = pri; 2588 ev_set_priority (w, pri);
2267} 2589}
2268 2590
2269inline_speed void 2591inline_speed void
2270ev_start (EV_P_ W w, int active) 2592ev_start (EV_P_ W w, int active)
2271{ 2593{
… …
2290 2612
2291 if (expect_false (ev_is_active (w))) 2613 if (expect_false (ev_is_active (w)))
2292 return; 2614 return;
2293 2615
2294 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2616 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2295 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2617 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2296 2618
2297 EV_FREQUENT_CHECK; 2619 EV_FREQUENT_CHECK;
2298 2620
2299 ev_start (EV_A_ (W)w, 1); 2621 ev_start (EV_A_ (W)w, 1);
2300 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2622 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2301 wlist_add (&anfds[fd].head, (WL)w); 2623 wlist_add (&anfds[fd].head, (WL)w);
2302 2624
2303 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2625 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2304 w->events &= ~EV__IOFDSET; 2626 w->events &= ~EV__IOFDSET;
2305 2627
2306 EV_FREQUENT_CHECK; 2628 EV_FREQUENT_CHECK;
2307} 2629}
2308 2630
… …
2318 EV_FREQUENT_CHECK; 2640 EV_FREQUENT_CHECK;
2319 2641
2320 wlist_del (&anfds[w->fd].head, (WL)w); 2642 wlist_del (&anfds[w->fd].head, (WL)w);
2321 ev_stop (EV_A_ (W)w); 2643 ev_stop (EV_A_ (W)w);
2322 2644
2323 fd_change (EV_A_ w->fd, 1); 2645 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2324 2646
2325 EV_FREQUENT_CHECK; 2647 EV_FREQUENT_CHECK;
2326} 2648}
2327 2649
2328void noinline 2650void noinline
… …
2370 timers [active] = timers [timercnt + HEAP0]; 2692 timers [active] = timers [timercnt + HEAP0];
2371 adjustheap (timers, timercnt, active); 2693 adjustheap (timers, timercnt, active);
2372 } 2694 }
2373 } 2695 }
2374 2696
2375 EV_FREQUENT_CHECK;
2376
2377 ev_at (w) -= mn_now; 2697 ev_at (w) -= mn_now;
2378 2698
2379 ev_stop (EV_A_ (W)w); 2699 ev_stop (EV_A_ (W)w);
2700
2701 EV_FREQUENT_CHECK;
2380} 2702}
2381 2703
2382void noinline 2704void noinline
2383ev_timer_again (EV_P_ ev_timer *w) 2705ev_timer_again (EV_P_ ev_timer *w)
2384{ 2706{
… …
2402 } 2724 }
2403 2725
2404 EV_FREQUENT_CHECK; 2726 EV_FREQUENT_CHECK;
2405} 2727}
2406 2728
2729ev_tstamp
2730ev_timer_remaining (EV_P_ ev_timer *w)
2731{
2732 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2733}
2734
2407#if EV_PERIODIC_ENABLE 2735#if EV_PERIODIC_ENABLE
2408void noinline 2736void noinline
2409ev_periodic_start (EV_P_ ev_periodic *w) 2737ev_periodic_start (EV_P_ ev_periodic *w)
2410{ 2738{
2411 if (expect_false (ev_is_active (w))) 2739 if (expect_false (ev_is_active (w)))
… …
2457 periodics [active] = periodics [periodiccnt + HEAP0]; 2785 periodics [active] = periodics [periodiccnt + HEAP0];
2458 adjustheap (periodics, periodiccnt, active); 2786 adjustheap (periodics, periodiccnt, active);
2459 } 2787 }
2460 } 2788 }
2461 2789
2462 EV_FREQUENT_CHECK;
2463
2464 ev_stop (EV_A_ (W)w); 2790 ev_stop (EV_A_ (W)w);
2791
2792 EV_FREQUENT_CHECK;
2465} 2793}
2466 2794
2467void noinline 2795void noinline
2468ev_periodic_again (EV_P_ ev_periodic *w) 2796ev_periodic_again (EV_P_ ev_periodic *w)
2469{ 2797{
… …
2475 2803
2476#ifndef SA_RESTART 2804#ifndef SA_RESTART
2477# define SA_RESTART 0 2805# define SA_RESTART 0
2478#endif 2806#endif
2479 2807
2808#if EV_SIGNAL_ENABLE
2809
2480void noinline 2810void noinline
2481ev_signal_start (EV_P_ ev_signal *w) 2811ev_signal_start (EV_P_ ev_signal *w)
2482{ 2812{
2483#if EV_MULTIPLICITY
2484 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2485#endif
2486 if (expect_false (ev_is_active (w))) 2813 if (expect_false (ev_is_active (w)))
2487 return; 2814 return;
2488 2815
2489 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2816 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2490 2817
2491 evpipe_init (EV_A); 2818#if EV_MULTIPLICITY
2819 assert (("libev: a signal must not be attached to two different loops",
2820 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2492 2821
2493 EV_FREQUENT_CHECK; 2822 signals [w->signum - 1].loop = EV_A;
2823#endif
2494 2824
2825 EV_FREQUENT_CHECK;
2826
2827#if EV_USE_SIGNALFD
2828 if (sigfd == -2)
2495 { 2829 {
2496#ifndef _WIN32 2830 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2497 sigset_t full, prev; 2831 if (sigfd < 0 && errno == EINVAL)
2498 sigfillset (&full); 2832 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2499 sigprocmask (SIG_SETMASK, &full, &prev);
2500#endif
2501 2833
2502 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2834 if (sigfd >= 0)
2835 {
2836 fd_intern (sigfd); /* doing it twice will not hurt */
2503 2837
2504#ifndef _WIN32 2838 sigemptyset (&sigfd_set);
2505 sigprocmask (SIG_SETMASK, &prev, 0); 2839
2506#endif 2840 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2841 ev_set_priority (&sigfd_w, EV_MAXPRI);
2842 ev_io_start (EV_A_ &sigfd_w);
2843 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2844 }
2507 } 2845 }
2846
2847 if (sigfd >= 0)
2848 {
2849 /* TODO: check .head */
2850 sigaddset (&sigfd_set, w->signum);
2851 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2852
2853 signalfd (sigfd, &sigfd_set, 0);
2854 }
2855#endif
2508 2856
2509 ev_start (EV_A_ (W)w, 1); 2857 ev_start (EV_A_ (W)w, 1);
2510 wlist_add (&signals [w->signum - 1].head, (WL)w); 2858 wlist_add (&signals [w->signum - 1].head, (WL)w);
2511 2859
2512 if (!((WL)w)->next) 2860 if (!((WL)w)->next)
2861# if EV_USE_SIGNALFD
2862 if (sigfd < 0) /*TODO*/
2863# endif
2513 { 2864 {
2514#if _WIN32 2865# ifdef _WIN32
2866 evpipe_init (EV_A);
2867
2515 signal (w->signum, ev_sighandler); 2868 signal (w->signum, ev_sighandler);
2516#else 2869# else
2517 struct sigaction sa; 2870 struct sigaction sa;
2871
2872 evpipe_init (EV_A);
2873
2518 sa.sa_handler = ev_sighandler; 2874 sa.sa_handler = ev_sighandler;
2519 sigfillset (&sa.sa_mask); 2875 sigfillset (&sa.sa_mask);
2520 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2876 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2521 sigaction (w->signum, &sa, 0); 2877 sigaction (w->signum, &sa, 0);
2878
2879 sigemptyset (&sa.sa_mask);
2880 sigaddset (&sa.sa_mask, w->signum);
2881 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2522#endif 2882#endif
2523 } 2883 }
2524 2884
2525 EV_FREQUENT_CHECK; 2885 EV_FREQUENT_CHECK;
2526} 2886}
2527 2887
2528void noinline 2888void noinline
… …
2536 2896
2537 wlist_del (&signals [w->signum - 1].head, (WL)w); 2897 wlist_del (&signals [w->signum - 1].head, (WL)w);
2538 ev_stop (EV_A_ (W)w); 2898 ev_stop (EV_A_ (W)w);
2539 2899
2540 if (!signals [w->signum - 1].head) 2900 if (!signals [w->signum - 1].head)
2901 {
2902#if EV_MULTIPLICITY
2903 signals [w->signum - 1].loop = 0; /* unattach from signal */
2904#endif
2905#if EV_USE_SIGNALFD
2906 if (sigfd >= 0)
2907 {
2908 sigset_t ss;
2909
2910 sigemptyset (&ss);
2911 sigaddset (&ss, w->signum);
2912 sigdelset (&sigfd_set, w->signum);
2913
2914 signalfd (sigfd, &sigfd_set, 0);
2915 sigprocmask (SIG_UNBLOCK, &ss, 0);
2916 }
2917 else
2918#endif
2541 signal (w->signum, SIG_DFL); 2919 signal (w->signum, SIG_DFL);
2920 }
2542 2921
2543 EV_FREQUENT_CHECK; 2922 EV_FREQUENT_CHECK;
2544} 2923}
2924
2925#endif
2926
2927#if EV_CHILD_ENABLE
2545 2928
2546void 2929void
2547ev_child_start (EV_P_ ev_child *w) 2930ev_child_start (EV_P_ ev_child *w)
2548{ 2931{
2549#if EV_MULTIPLICITY 2932#if EV_MULTIPLICITY
… …
2553 return; 2936 return;
2554 2937
2555 EV_FREQUENT_CHECK; 2938 EV_FREQUENT_CHECK;
2556 2939
2557 ev_start (EV_A_ (W)w, 1); 2940 ev_start (EV_A_ (W)w, 1);
2558 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2941 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2559 2942
2560 EV_FREQUENT_CHECK; 2943 EV_FREQUENT_CHECK;
2561} 2944}
2562 2945
2563void 2946void
… …
2567 if (expect_false (!ev_is_active (w))) 2950 if (expect_false (!ev_is_active (w)))
2568 return; 2951 return;
2569 2952
2570 EV_FREQUENT_CHECK; 2953 EV_FREQUENT_CHECK;
2571 2954
2572 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2955 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2573 ev_stop (EV_A_ (W)w); 2956 ev_stop (EV_A_ (W)w);
2574 2957
2575 EV_FREQUENT_CHECK; 2958 EV_FREQUENT_CHECK;
2576} 2959}
2960
2961#endif
2577 2962
2578#if EV_STAT_ENABLE 2963#if EV_STAT_ENABLE
2579 2964
2580# ifdef _WIN32 2965# ifdef _WIN32
2581# undef lstat 2966# undef lstat
… …
2587#define MIN_STAT_INTERVAL 0.1074891 2972#define MIN_STAT_INTERVAL 0.1074891
2588 2973
2589static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2974static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2590 2975
2591#if EV_USE_INOTIFY 2976#if EV_USE_INOTIFY
2592# define EV_INOTIFY_BUFSIZE 8192 2977
2978/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2979# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2593 2980
2594static void noinline 2981static void noinline
2595infy_add (EV_P_ ev_stat *w) 2982infy_add (EV_P_ ev_stat *w)
2596{ 2983{
2597 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2984 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2598 2985
2599 if (w->wd < 0) 2986 if (w->wd >= 0)
2987 {
2988 struct statfs sfs;
2989
2990 /* now local changes will be tracked by inotify, but remote changes won't */
2991 /* unless the filesystem is known to be local, we therefore still poll */
2992 /* also do poll on <2.6.25, but with normal frequency */
2993
2994 if (!fs_2625)
2995 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2996 else if (!statfs (w->path, &sfs)
2997 && (sfs.f_type == 0x1373 /* devfs */
2998 || sfs.f_type == 0xEF53 /* ext2/3 */
2999 || sfs.f_type == 0x3153464a /* jfs */
3000 || sfs.f_type == 0x52654973 /* reiser3 */
3001 || sfs.f_type == 0x01021994 /* tempfs */
3002 || sfs.f_type == 0x58465342 /* xfs */))
3003 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3004 else
3005 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2600 { 3006 }
3007 else
3008 {
3009 /* can't use inotify, continue to stat */
2601 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3010 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2602 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2603 3011
2604 /* monitor some parent directory for speedup hints */ 3012 /* if path is not there, monitor some parent directory for speedup hints */
2605 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3013 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2606 /* but an efficiency issue only */ 3014 /* but an efficiency issue only */
2607 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3015 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2608 { 3016 {
2609 char path [4096]; 3017 char path [4096];
… …
2625 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3033 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2626 } 3034 }
2627 } 3035 }
2628 3036
2629 if (w->wd >= 0) 3037 if (w->wd >= 0)
2630 {
2631 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3038 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2632 3039
2633 /* now local changes will be tracked by inotify, but remote changes won't */ 3040 /* now re-arm timer, if required */
2634 /* unless the filesystem it known to be local, we therefore still poll */ 3041 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2635 /* also do poll on <2.6.25, but with normal frequency */
2636 struct statfs sfs;
2637
2638 if (fs_2625 && !statfs (w->path, &sfs))
2639 if (sfs.f_type == 0x1373 /* devfs */
2640 || sfs.f_type == 0xEF53 /* ext2/3 */
2641 || sfs.f_type == 0x3153464a /* jfs */
2642 || sfs.f_type == 0x52654973 /* reiser3 */
2643 || sfs.f_type == 0x01021994 /* tempfs */
2644 || sfs.f_type == 0x58465342 /* xfs */)
2645 return;
2646
2647 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2648 ev_timer_again (EV_A_ &w->timer); 3042 ev_timer_again (EV_A_ &w->timer);
2649 } 3043 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2650} 3044}
2651 3045
2652static void noinline 3046static void noinline
2653infy_del (EV_P_ ev_stat *w) 3047infy_del (EV_P_ ev_stat *w)
2654{ 3048{
… …
2657 3051
2658 if (wd < 0) 3052 if (wd < 0)
2659 return; 3053 return;
2660 3054
2661 w->wd = -2; 3055 w->wd = -2;
2662 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3056 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2663 wlist_del (&fs_hash [slot].head, (WL)w); 3057 wlist_del (&fs_hash [slot].head, (WL)w);
2664 3058
2665 /* remove this watcher, if others are watching it, they will rearm */ 3059 /* remove this watcher, if others are watching it, they will rearm */
2666 inotify_rm_watch (fs_fd, wd); 3060 inotify_rm_watch (fs_fd, wd);
2667} 3061}
… …
2669static void noinline 3063static void noinline
2670infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3064infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2671{ 3065{
2672 if (slot < 0) 3066 if (slot < 0)
2673 /* overflow, need to check for all hash slots */ 3067 /* overflow, need to check for all hash slots */
2674 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3068 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2675 infy_wd (EV_A_ slot, wd, ev); 3069 infy_wd (EV_A_ slot, wd, ev);
2676 else 3070 else
2677 { 3071 {
2678 WL w_; 3072 WL w_;
2679 3073
2680 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3074 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2681 { 3075 {
2682 ev_stat *w = (ev_stat *)w_; 3076 ev_stat *w = (ev_stat *)w_;
2683 w_ = w_->next; /* lets us remove this watcher and all before it */ 3077 w_ = w_->next; /* lets us remove this watcher and all before it */
2684 3078
2685 if (w->wd == wd || wd == -1) 3079 if (w->wd == wd || wd == -1)
2686 { 3080 {
2687 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3081 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2688 { 3082 {
2689 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3083 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2690 w->wd = -1; 3084 w->wd = -1;
2691 infy_add (EV_A_ w); /* re-add, no matter what */ 3085 infy_add (EV_A_ w); /* re-add, no matter what */
2692 } 3086 }
2693 3087
2694 stat_timer_cb (EV_A_ &w->timer, 0); 3088 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2699 3093
2700static void 3094static void
2701infy_cb (EV_P_ ev_io *w, int revents) 3095infy_cb (EV_P_ ev_io *w, int revents)
2702{ 3096{
2703 char buf [EV_INOTIFY_BUFSIZE]; 3097 char buf [EV_INOTIFY_BUFSIZE];
2704 struct inotify_event *ev = (struct inotify_event *)buf;
2705 int ofs; 3098 int ofs;
2706 int len = read (fs_fd, buf, sizeof (buf)); 3099 int len = read (fs_fd, buf, sizeof (buf));
2707 3100
2708 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3101 for (ofs = 0; ofs < len; )
3102 {
3103 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2709 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3104 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3105 ofs += sizeof (struct inotify_event) + ev->len;
3106 }
2710} 3107}
2711 3108
2712inline_size void 3109inline_size void
2713check_2625 (EV_P) 3110ev_check_2625 (EV_P)
2714{ 3111{
2715 /* kernels < 2.6.25 are borked 3112 /* kernels < 2.6.25 are borked
2716 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3113 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2717 */ 3114 */
2718 struct utsname buf; 3115 if (ev_linux_version () < 0x020619)
2719 int major, minor, micro;
2720
2721 if (uname (&buf))
2722 return; 3116 return;
2723 3117
2724 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2725 return;
2726
2727 if (major < 2
2728 || (major == 2 && minor < 6)
2729 || (major == 2 && minor == 6 && micro < 25))
2730 return;
2731
2732 fs_2625 = 1; 3118 fs_2625 = 1;
3119}
3120
3121inline_size int
3122infy_newfd (void)
3123{
3124#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3125 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3126 if (fd >= 0)
3127 return fd;
3128#endif
3129 return inotify_init ();
2733} 3130}
2734 3131
2735inline_size void 3132inline_size void
2736infy_init (EV_P) 3133infy_init (EV_P)
2737{ 3134{
2738 if (fs_fd != -2) 3135 if (fs_fd != -2)
2739 return; 3136 return;
2740 3137
2741 fs_fd = -1; 3138 fs_fd = -1;
2742 3139
2743 check_2625 (EV_A); 3140 ev_check_2625 (EV_A);
2744 3141
2745 fs_fd = inotify_init (); 3142 fs_fd = infy_newfd ();
2746 3143
2747 if (fs_fd >= 0) 3144 if (fs_fd >= 0)
2748 { 3145 {
3146 fd_intern (fs_fd);
2749 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3147 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2750 ev_set_priority (&fs_w, EV_MAXPRI); 3148 ev_set_priority (&fs_w, EV_MAXPRI);
2751 ev_io_start (EV_A_ &fs_w); 3149 ev_io_start (EV_A_ &fs_w);
3150 ev_unref (EV_A);
2752 } 3151 }
2753} 3152}
2754 3153
2755inline_size void 3154inline_size void
2756infy_fork (EV_P) 3155infy_fork (EV_P)
… …
2758 int slot; 3157 int slot;
2759 3158
2760 if (fs_fd < 0) 3159 if (fs_fd < 0)
2761 return; 3160 return;
2762 3161
3162 ev_ref (EV_A);
3163 ev_io_stop (EV_A_ &fs_w);
2763 close (fs_fd); 3164 close (fs_fd);
2764 fs_fd = inotify_init (); 3165 fs_fd = infy_newfd ();
2765 3166
3167 if (fs_fd >= 0)
3168 {
3169 fd_intern (fs_fd);
3170 ev_io_set (&fs_w, fs_fd, EV_READ);
3171 ev_io_start (EV_A_ &fs_w);
3172 ev_unref (EV_A);
3173 }
3174
2766 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3175 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2767 { 3176 {
2768 WL w_ = fs_hash [slot].head; 3177 WL w_ = fs_hash [slot].head;
2769 fs_hash [slot].head = 0; 3178 fs_hash [slot].head = 0;
2770 3179
2771 while (w_) 3180 while (w_)
… …
2776 w->wd = -1; 3185 w->wd = -1;
2777 3186
2778 if (fs_fd >= 0) 3187 if (fs_fd >= 0)
2779 infy_add (EV_A_ w); /* re-add, no matter what */ 3188 infy_add (EV_A_ w); /* re-add, no matter what */
2780 else 3189 else
3190 {
3191 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3192 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2781 ev_timer_again (EV_A_ &w->timer); 3193 ev_timer_again (EV_A_ &w->timer);
3194 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3195 }
2782 } 3196 }
2783 } 3197 }
2784} 3198}
2785 3199
2786#endif 3200#endif
… …
2803static void noinline 3217static void noinline
2804stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3218stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2805{ 3219{
2806 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3220 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2807 3221
2808 /* we copy this here each the time so that */ 3222 ev_statdata prev = w->attr;
2809 /* prev has the old value when the callback gets invoked */
2810 w->prev = w->attr;
2811 ev_stat_stat (EV_A_ w); 3223 ev_stat_stat (EV_A_ w);
2812 3224
2813 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3225 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2814 if ( 3226 if (
2815 w->prev.st_dev != w->attr.st_dev 3227 prev.st_dev != w->attr.st_dev
2816 || w->prev.st_ino != w->attr.st_ino 3228 || prev.st_ino != w->attr.st_ino
2817 || w->prev.st_mode != w->attr.st_mode 3229 || prev.st_mode != w->attr.st_mode
2818 || w->prev.st_nlink != w->attr.st_nlink 3230 || prev.st_nlink != w->attr.st_nlink
2819 || w->prev.st_uid != w->attr.st_uid 3231 || prev.st_uid != w->attr.st_uid
2820 || w->prev.st_gid != w->attr.st_gid 3232 || prev.st_gid != w->attr.st_gid
2821 || w->prev.st_rdev != w->attr.st_rdev 3233 || prev.st_rdev != w->attr.st_rdev
2822 || w->prev.st_size != w->attr.st_size 3234 || prev.st_size != w->attr.st_size
2823 || w->prev.st_atime != w->attr.st_atime 3235 || prev.st_atime != w->attr.st_atime
2824 || w->prev.st_mtime != w->attr.st_mtime 3236 || prev.st_mtime != w->attr.st_mtime
2825 || w->prev.st_ctime != w->attr.st_ctime 3237 || prev.st_ctime != w->attr.st_ctime
2826 ) { 3238 ) {
3239 /* we only update w->prev on actual differences */
3240 /* in case we test more often than invoke the callback, */
3241 /* to ensure that prev is always different to attr */
3242 w->prev = prev;
3243
2827 #if EV_USE_INOTIFY 3244 #if EV_USE_INOTIFY
2828 if (fs_fd >= 0) 3245 if (fs_fd >= 0)
2829 { 3246 {
2830 infy_del (EV_A_ w); 3247 infy_del (EV_A_ w);
2831 infy_add (EV_A_ w); 3248 infy_add (EV_A_ w);
… …
2856 3273
2857 if (fs_fd >= 0) 3274 if (fs_fd >= 0)
2858 infy_add (EV_A_ w); 3275 infy_add (EV_A_ w);
2859 else 3276 else
2860#endif 3277#endif
3278 {
2861 ev_timer_again (EV_A_ &w->timer); 3279 ev_timer_again (EV_A_ &w->timer);
3280 ev_unref (EV_A);
3281 }
2862 3282
2863 ev_start (EV_A_ (W)w, 1); 3283 ev_start (EV_A_ (W)w, 1);
2864 3284
2865 EV_FREQUENT_CHECK; 3285 EV_FREQUENT_CHECK;
2866} 3286}
… …
2875 EV_FREQUENT_CHECK; 3295 EV_FREQUENT_CHECK;
2876 3296
2877#if EV_USE_INOTIFY 3297#if EV_USE_INOTIFY
2878 infy_del (EV_A_ w); 3298 infy_del (EV_A_ w);
2879#endif 3299#endif
3300
3301 if (ev_is_active (&w->timer))
3302 {
3303 ev_ref (EV_A);
2880 ev_timer_stop (EV_A_ &w->timer); 3304 ev_timer_stop (EV_A_ &w->timer);
3305 }
2881 3306
2882 ev_stop (EV_A_ (W)w); 3307 ev_stop (EV_A_ (W)w);
2883 3308
2884 EV_FREQUENT_CHECK; 3309 EV_FREQUENT_CHECK;
2885} 3310}
… …
2930 3355
2931 EV_FREQUENT_CHECK; 3356 EV_FREQUENT_CHECK;
2932} 3357}
2933#endif 3358#endif
2934 3359
3360#if EV_PREPARE_ENABLE
2935void 3361void
2936ev_prepare_start (EV_P_ ev_prepare *w) 3362ev_prepare_start (EV_P_ ev_prepare *w)
2937{ 3363{
2938 if (expect_false (ev_is_active (w))) 3364 if (expect_false (ev_is_active (w)))
2939 return; 3365 return;
… …
2965 3391
2966 ev_stop (EV_A_ (W)w); 3392 ev_stop (EV_A_ (W)w);
2967 3393
2968 EV_FREQUENT_CHECK; 3394 EV_FREQUENT_CHECK;
2969} 3395}
3396#endif
2970 3397
3398#if EV_CHECK_ENABLE
2971void 3399void
2972ev_check_start (EV_P_ ev_check *w) 3400ev_check_start (EV_P_ ev_check *w)
2973{ 3401{
2974 if (expect_false (ev_is_active (w))) 3402 if (expect_false (ev_is_active (w)))
2975 return; 3403 return;
… …
3001 3429
3002 ev_stop (EV_A_ (W)w); 3430 ev_stop (EV_A_ (W)w);
3003 3431
3004 EV_FREQUENT_CHECK; 3432 EV_FREQUENT_CHECK;
3005} 3433}
3434#endif
3006 3435
3007#if EV_EMBED_ENABLE 3436#if EV_EMBED_ENABLE
3008void noinline 3437void noinline
3009ev_embed_sweep (EV_P_ ev_embed *w) 3438ev_embed_sweep (EV_P_ ev_embed *w)
3010{ 3439{
3011 ev_loop (w->other, EVLOOP_NONBLOCK); 3440 ev_run (w->other, EVRUN_NOWAIT);
3012} 3441}
3013 3442
3014static void 3443static void
3015embed_io_cb (EV_P_ ev_io *io, int revents) 3444embed_io_cb (EV_P_ ev_io *io, int revents)
3016{ 3445{
3017 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3446 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3018 3447
3019 if (ev_cb (w)) 3448 if (ev_cb (w))
3020 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3449 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3021 else 3450 else
3022 ev_loop (w->other, EVLOOP_NONBLOCK); 3451 ev_run (w->other, EVRUN_NOWAIT);
3023} 3452}
3024 3453
3025static void 3454static void
3026embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3455embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3027{ 3456{
3028 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3457 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3029 3458
3030 { 3459 {
3031 struct ev_loop *loop = w->other; 3460 EV_P = w->other;
3032 3461
3033 while (fdchangecnt) 3462 while (fdchangecnt)
3034 { 3463 {
3035 fd_reify (EV_A); 3464 fd_reify (EV_A);
3036 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3465 ev_run (EV_A_ EVRUN_NOWAIT);
3037 } 3466 }
3038 } 3467 }
3039} 3468}
3040 3469
3041static void 3470static void
… …
3044 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3473 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3045 3474
3046 ev_embed_stop (EV_A_ w); 3475 ev_embed_stop (EV_A_ w);
3047 3476
3048 { 3477 {
3049 struct ev_loop *loop = w->other; 3478 EV_P = w->other;
3050 3479
3051 ev_loop_fork (EV_A); 3480 ev_loop_fork (EV_A);
3052 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3481 ev_run (EV_A_ EVRUN_NOWAIT);
3053 } 3482 }
3054 3483
3055 ev_embed_start (EV_A_ w); 3484 ev_embed_start (EV_A_ w);
3056} 3485}
3057 3486
… …
3068{ 3497{
3069 if (expect_false (ev_is_active (w))) 3498 if (expect_false (ev_is_active (w)))
3070 return; 3499 return;
3071 3500
3072 { 3501 {
3073 struct ev_loop *loop = w->other; 3502 EV_P = w->other;
3074 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3503 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3075 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3504 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3076 } 3505 }
3077 3506
3078 EV_FREQUENT_CHECK; 3507 EV_FREQUENT_CHECK;
… …
3105 3534
3106 ev_io_stop (EV_A_ &w->io); 3535 ev_io_stop (EV_A_ &w->io);
3107 ev_prepare_stop (EV_A_ &w->prepare); 3536 ev_prepare_stop (EV_A_ &w->prepare);
3108 ev_fork_stop (EV_A_ &w->fork); 3537 ev_fork_stop (EV_A_ &w->fork);
3109 3538
3539 ev_stop (EV_A_ (W)w);
3540
3110 EV_FREQUENT_CHECK; 3541 EV_FREQUENT_CHECK;
3111} 3542}
3112#endif 3543#endif
3113 3544
3114#if EV_FORK_ENABLE 3545#if EV_FORK_ENABLE
… …
3154ev_async_start (EV_P_ ev_async *w) 3585ev_async_start (EV_P_ ev_async *w)
3155{ 3586{
3156 if (expect_false (ev_is_active (w))) 3587 if (expect_false (ev_is_active (w)))
3157 return; 3588 return;
3158 3589
3590 w->sent = 0;
3591
3159 evpipe_init (EV_A); 3592 evpipe_init (EV_A);
3160 3593
3161 EV_FREQUENT_CHECK; 3594 EV_FREQUENT_CHECK;
3162 3595
3163 ev_start (EV_A_ (W)w, ++asynccnt); 3596 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3190 3623
3191void 3624void
3192ev_async_send (EV_P_ ev_async *w) 3625ev_async_send (EV_P_ ev_async *w)
3193{ 3626{
3194 w->sent = 1; 3627 w->sent = 1;
3195 evpipe_write (EV_A_ &gotasync); 3628 evpipe_write (EV_A_ &async_pending);
3196} 3629}
3197#endif 3630#endif
3198 3631
3199/*****************************************************************************/ 3632/*****************************************************************************/
3200 3633
… …
3240{ 3673{
3241 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3674 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3242 3675
3243 if (expect_false (!once)) 3676 if (expect_false (!once))
3244 { 3677 {
3245 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3678 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3246 return; 3679 return;
3247 } 3680 }
3248 3681
3249 once->cb = cb; 3682 once->cb = cb;
3250 once->arg = arg; 3683 once->arg = arg;
… …
3337 if (types & EV_ASYNC) 3770 if (types & EV_ASYNC)
3338 for (i = asynccnt; i--; ) 3771 for (i = asynccnt; i--; )
3339 cb (EV_A_ EV_ASYNC, asyncs [i]); 3772 cb (EV_A_ EV_ASYNC, asyncs [i]);
3340#endif 3773#endif
3341 3774
3775#if EV_PREPARE_ENABLE
3342 if (types & EV_PREPARE) 3776 if (types & EV_PREPARE)
3343 for (i = preparecnt; i--; ) 3777 for (i = preparecnt; i--; )
3344#if EV_EMBED_ENABLE 3778# if EV_EMBED_ENABLE
3345 if (ev_cb (prepares [i]) != embed_prepare_cb) 3779 if (ev_cb (prepares [i]) != embed_prepare_cb)
3346#endif 3780# endif
3347 cb (EV_A_ EV_PREPARE, prepares [i]); 3781 cb (EV_A_ EV_PREPARE, prepares [i]);
3782#endif
3348 3783
3784#if EV_CHECK_ENABLE
3349 if (types & EV_CHECK) 3785 if (types & EV_CHECK)
3350 for (i = checkcnt; i--; ) 3786 for (i = checkcnt; i--; )
3351 cb (EV_A_ EV_CHECK, checks [i]); 3787 cb (EV_A_ EV_CHECK, checks [i]);
3788#endif
3352 3789
3790#if EV_SIGNAL_ENABLE
3353 if (types & EV_SIGNAL) 3791 if (types & EV_SIGNAL)
3354 for (i = 0; i < signalmax; ++i) 3792 for (i = 0; i < EV_NSIG - 1; ++i)
3355 for (wl = signals [i].head; wl; ) 3793 for (wl = signals [i].head; wl; )
3356 { 3794 {
3357 wn = wl->next; 3795 wn = wl->next;
3358 cb (EV_A_ EV_SIGNAL, wl); 3796 cb (EV_A_ EV_SIGNAL, wl);
3359 wl = wn; 3797 wl = wn;
3360 } 3798 }
3799#endif
3361 3800
3801#if EV_CHILD_ENABLE
3362 if (types & EV_CHILD) 3802 if (types & EV_CHILD)
3363 for (i = EV_PID_HASHSIZE; i--; ) 3803 for (i = (EV_PID_HASHSIZE); i--; )
3364 for (wl = childs [i]; wl; ) 3804 for (wl = childs [i]; wl; )
3365 { 3805 {
3366 wn = wl->next; 3806 wn = wl->next;
3367 cb (EV_A_ EV_CHILD, wl); 3807 cb (EV_A_ EV_CHILD, wl);
3368 wl = wn; 3808 wl = wn;
3369 } 3809 }
3810#endif
3370/* EV_STAT 0x00001000 /* stat data changed */ 3811/* EV_STAT 0x00001000 /* stat data changed */
3371/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3812/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3372} 3813}
3373#endif 3814#endif
3374 3815
3375#if EV_MULTIPLICITY 3816#if EV_MULTIPLICITY
3376 #include "ev_wrap.h" 3817 #include "ev_wrap.h"
3377#endif 3818#endif
3378 3819
3379#ifdef __cplusplus 3820EV_CPP(})
3380}
3381#endif
3382 3821

Diff Legend

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