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

Comparing libev/ev.c (file contents):
Revision 1.306 by root, Sun Jul 19 06:35:25 2009 UTC vs.
Revision 1.370 by root, Sun Jan 30 19:05:41 2011 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,2011 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
… …
77# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
79# endif 75# endif
80# endif 76# endif
81 77
78# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
85# else 82# else
83# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 84# define EV_USE_NANOSLEEP 0
85# endif
86
87# if HAVE_SELECT && HAVE_SYS_SELECT_H
88# ifndef EV_USE_SELECT
89# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
88# endif 94# endif
89 95
96# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 98# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 99# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 100# else
101# undef EV_USE_POLL
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif
104# endif 103# endif
105 104
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 106# ifndef EV_USE_EPOLL
109# else 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
112# endif 112# endif
113 113
114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# ifndef EV_USE_KQUEUE 115# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
116# define EV_USE_KQUEUE 1
117# else
118# define EV_USE_KQUEUE 0
119# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
120# endif 121# endif
121 122
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 124# ifndef EV_USE_PORT
125# else 125# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
128# endif 130# endif
129 131
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 133# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
136# endif 139# endif
137 140
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 142# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 143# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
144# endif 148# endif
145 149
150# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 151# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 152# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
152# endif 157# endif
153 158
154#endif 159#endif
155 160
156#include <math.h> 161#include <math.h>
157#include <stdlib.h> 162#include <stdlib.h>
163#include <string.h>
158#include <fcntl.h> 164#include <fcntl.h>
159#include <stddef.h> 165#include <stddef.h>
160 166
161#include <stdio.h> 167#include <stdio.h>
162 168
163#include <assert.h> 169#include <assert.h>
164#include <errno.h> 170#include <errno.h>
165#include <sys/types.h> 171#include <sys/types.h>
166#include <time.h> 172#include <time.h>
173#include <limits.h>
167 174
168#include <signal.h> 175#include <signal.h>
169 176
170#ifdef EV_H 177#ifdef EV_H
171# include EV_H 178# include EV_H
172#else 179#else
173# include "ev.h" 180# include "ev.h"
174#endif 181#endif
182
183EV_CPP(extern "C" {)
175 184
176#ifndef _WIN32 185#ifndef _WIN32
177# include <sys/time.h> 186# include <sys/time.h>
178# include <sys/wait.h> 187# include <sys/wait.h>
179# include <unistd.h> 188# include <unistd.h>
… …
182# define WIN32_LEAN_AND_MEAN 191# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 192# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
186# endif 195# endif
196# undef EV_AVOID_STDIO
187#endif 197#endif
198
199/* OS X, in its infinite idiocy, actually HARDCODES
200 * a limit of 1024 into their select. Where people have brains,
201 * OS X engineers apparently have a vacuum. Or maybe they were
202 * ordered to have a vacuum, or they do anything for money.
203 * This might help. Or not.
204 */
205#define _DARWIN_UNLIMITED_SELECT 1
188 206
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 207/* this block tries to deduce configuration from header-defined symbols and defaults */
190 208
191/* try to deduce the maximum number of signals on this platform */ 209/* try to deduce the maximum number of signals on this platform */
192/* one some platforms, NSIG is one too large. we do not bother */
193#if defined (EV_NSIG) 210#if defined (EV_NSIG)
194/* use what's provided */ 211/* use what's provided */
195#elif defined (NSIG) 212#elif defined (NSIG)
196# define EV_NSIG (NSIG) 213# define EV_NSIG (NSIG)
197#elif defined(_NSIG) 214#elif defined(_NSIG)
… …
205#elif defined (MAXSIG) 222#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1) 223# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG) 224#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1) 225# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE) 226#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig) 228#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else 230#else
214# error "unable to find value for NSIG, please report" 231# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */ 232/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */
216# define EV_NSIG 65 234# define EV_NSIG 65
217#endif 235#endif
218 236
219#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
220# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
221# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
222# else 240# else
223# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
224# endif 242# endif
225#endif 243#endif
226 244
227#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
228# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
229# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
230# else 248# else
231# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
232# endif 250# endif
233#endif 251#endif
234 252
… …
236# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
237#endif 255#endif
238 256
239#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
240# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
241# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
242# else 260# else
243# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
244# endif 262# endif
245#endif 263#endif
246 264
247#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
248# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
249#endif 267#endif
250 268
251#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
252# ifdef _WIN32 270# ifdef _WIN32
253# define EV_USE_POLL 0 271# define EV_USE_POLL 0
254# else 272# else
255# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
256# endif 274# endif
257#endif 275#endif
258 276
259#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
260# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
261# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
262# else 280# else
263# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
264# endif 282# endif
265#endif 283#endif
266 284
… …
272# define EV_USE_PORT 0 290# define EV_USE_PORT 0
273#endif 291#endif
274 292
275#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
276# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
277# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
278# else 296# else
279# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
280# endif 298# endif
281#endif 299#endif
282 300
283#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
284# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
285# define EV_PID_HASHSIZE 1
286# else
287# define EV_PID_HASHSIZE 16
288# endif
289#endif 303#endif
290 304
291#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
292# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
293# define EV_INOTIFY_HASHSIZE 1
294# else
295# define EV_INOTIFY_HASHSIZE 16
296# endif
297#endif 307#endif
298 308
299#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
300# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
301# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
302# else 312# else
303# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
304# endif 314# endif
305#endif 315#endif
306 316
307#ifndef EV_USE_SIGNALFD 317#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1 319# define EV_USE_SIGNALFD EV_FEATURE_OS
310# else 320# else
311# define EV_USE_SIGNALFD 0 321# define EV_USE_SIGNALFD 0
312# endif 322# endif
313#endif 323#endif
314 324
… …
317# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
318# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
319#endif 329#endif
320 330
321#ifndef EV_VERIFY 331#ifndef EV_VERIFY
322# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
323#endif 333#endif
324 334
325#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
326# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
327#endif 337#endif
328 338
329#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
330# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
331#endif 341#endif
332 342
333/* 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, */
334/* which makes programs even slower. might work on other unices, too. */ 344/* which makes programs even slower. might work on other unices, too. */
335#if EV_USE_CLOCK_SYSCALL 345#if EV_USE_CLOCK_SYSCALL
… …
344# endif 354# endif
345#endif 355#endif
346 356
347/* 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 */
348 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
349#ifndef CLOCK_MONOTONIC 365#ifndef CLOCK_MONOTONIC
350# undef EV_USE_MONOTONIC 366# undef EV_USE_MONOTONIC
351# define EV_USE_MONOTONIC 0 367# define EV_USE_MONOTONIC 0
352#endif 368#endif
353 369
… …
360# undef EV_USE_INOTIFY 376# undef EV_USE_INOTIFY
361# define EV_USE_INOTIFY 0 377# define EV_USE_INOTIFY 0
362#endif 378#endif
363 379
364#if !EV_USE_NANOSLEEP 380#if !EV_USE_NANOSLEEP
365# ifndef _WIN32 381/* hp-ux has it in sys/time.h, which we unconditionally include above */
382# if !defined(_WIN32) && !defined(__hpux)
366# include <sys/select.h> 383# include <sys/select.h>
367# endif 384# endif
368#endif 385#endif
369 386
370#if EV_USE_INOTIFY 387#if EV_USE_INOTIFY
371# include <sys/utsname.h>
372# include <sys/statfs.h> 388# include <sys/statfs.h>
373# include <sys/inotify.h> 389# include <sys/inotify.h>
374/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 390/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
375# ifndef IN_DONT_FOLLOW 391# ifndef IN_DONT_FOLLOW
376# undef EV_USE_INOTIFY 392# undef EV_USE_INOTIFY
… …
387# include <stdint.h> 403# include <stdint.h>
388# ifndef EFD_NONBLOCK 404# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK 405# define EFD_NONBLOCK O_NONBLOCK
390# endif 406# endif
391# ifndef EFD_CLOEXEC 407# ifndef EFD_CLOEXEC
408# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC 409# define EFD_CLOEXEC O_CLOEXEC
410# else
411# define EFD_CLOEXEC 02000000
412# endif
393# endif 413# endif
394# ifdef __cplusplus 414EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
395extern "C" { 415#endif
416
417#if EV_USE_SIGNALFD
418/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
419# include <stdint.h>
420# ifndef SFD_NONBLOCK
421# define SFD_NONBLOCK O_NONBLOCK
396# endif 422# endif
397int eventfd (unsigned int initval, int flags); 423# ifndef SFD_CLOEXEC
398# ifdef __cplusplus 424# ifdef O_CLOEXEC
399} 425# define SFD_CLOEXEC O_CLOEXEC
426# else
427# define SFD_CLOEXEC 02000000
428# endif
400# endif 429# endif
401#endif 430EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
402 431
403#if EV_USE_SIGNALFD 432struct signalfd_siginfo
404# include <sys/signalfd.h> 433{
434 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)];
436};
405#endif 437#endif
406 438
407/**/ 439/**/
408 440
409#if EV_VERIFY >= 3 441#if EV_VERIFY >= 3
410# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 442# define EV_FREQUENT_CHECK ev_verify (EV_A)
411#else 443#else
412# define EV_FREQUENT_CHECK do { } while (0) 444# define EV_FREQUENT_CHECK do { } while (0)
413#endif 445#endif
414 446
415/* 447/*
… …
422 */ 454 */
423#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 455#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
424 456
425#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 457#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
426#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 458#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
427/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 459
460#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
461#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
428 462
429#if __GNUC__ >= 4 463#if __GNUC__ >= 4
430# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
431# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
432#else 466#else
… …
439 473
440#define expect_false(expr) expect ((expr) != 0, 0) 474#define expect_false(expr) expect ((expr) != 0, 0)
441#define expect_true(expr) expect ((expr) != 0, 1) 475#define expect_true(expr) expect ((expr) != 0, 1)
442#define inline_size static inline 476#define inline_size static inline
443 477
444#if EV_MINIMAL 478#if EV_FEATURE_CODE
479# define inline_speed static inline
480#else
445# define inline_speed static noinline 481# define inline_speed static noinline
446#else
447# define inline_speed static inline
448#endif 482#endif
449 483
450#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
451 485
452#if EV_MINPRI == EV_MAXPRI 486#if EV_MINPRI == EV_MAXPRI
… …
465#define ev_active(w) ((W)(w))->active 499#define ev_active(w) ((W)(w))->active
466#define ev_at(w) ((WT)(w))->at 500#define ev_at(w) ((WT)(w))->at
467 501
468#if EV_USE_REALTIME 502#if EV_USE_REALTIME
469/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 503/* sig_atomic_t is used to avoid per-thread variables or locking but still */
470/* giving it a reasonably high chance of working on typical architetcures */ 504/* giving it a reasonably high chance of working on typical architectures */
471static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
472#endif 506#endif
473 507
474#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
475static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
476#endif 510#endif
477 511
512#ifndef EV_FD_TO_WIN32_HANDLE
513# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
514#endif
515#ifndef EV_WIN32_HANDLE_TO_FD
516# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
517#endif
518#ifndef EV_WIN32_CLOSE_FD
519# define EV_WIN32_CLOSE_FD(fd) close (fd)
520#endif
521
478#ifdef _WIN32 522#ifdef _WIN32
479# include "ev_win32.c" 523# include "ev_win32.c"
480#endif 524#endif
481 525
482/*****************************************************************************/ 526/*****************************************************************************/
527
528#ifdef __linux
529# include <sys/utsname.h>
530#endif
531
532static unsigned int noinline
533ev_linux_version (void)
534{
535#ifdef __linux
536 unsigned int v = 0;
537 struct utsname buf;
538 int i;
539 char *p = buf.release;
540
541 if (uname (&buf))
542 return 0;
543
544 for (i = 3+1; --i; )
545 {
546 unsigned int c = 0;
547
548 for (;;)
549 {
550 if (*p >= '0' && *p <= '9')
551 c = c * 10 + *p++ - '0';
552 else
553 {
554 p += *p == '.';
555 break;
556 }
557 }
558
559 v = (v << 8) | c;
560 }
561
562 return v;
563#else
564 return 0;
565#endif
566}
567
568/*****************************************************************************/
569
570#if EV_AVOID_STDIO
571static void noinline
572ev_printerr (const char *msg)
573{
574 write (STDERR_FILENO, msg, strlen (msg));
575}
576#endif
483 577
484static void (*syserr_cb)(const char *msg); 578static void (*syserr_cb)(const char *msg);
485 579
486void 580void
487ev_set_syserr_cb (void (*cb)(const char *msg)) 581ev_set_syserr_cb (void (*cb)(const char *msg))
… …
497 591
498 if (syserr_cb) 592 if (syserr_cb)
499 syserr_cb (msg); 593 syserr_cb (msg);
500 else 594 else
501 { 595 {
596#if EV_AVOID_STDIO
597 ev_printerr (msg);
598 ev_printerr (": ");
599 ev_printerr (strerror (errno));
600 ev_printerr ("\n");
601#else
502 perror (msg); 602 perror (msg);
603#endif
503 abort (); 604 abort ();
504 } 605 }
505} 606}
506 607
507static void * 608static void *
508ev_realloc_emul (void *ptr, long size) 609ev_realloc_emul (void *ptr, long size)
509{ 610{
611#if __GLIBC__
612 return realloc (ptr, size);
613#else
510 /* some systems, notably openbsd and darwin, fail to properly 614 /* some systems, notably openbsd and darwin, fail to properly
511 * implement realloc (x, 0) (as required by both ansi c-98 and 615 * implement realloc (x, 0) (as required by both ansi c-89 and
512 * the single unix specification, so work around them here. 616 * the single unix specification, so work around them here.
513 */ 617 */
514 618
515 if (size) 619 if (size)
516 return realloc (ptr, size); 620 return realloc (ptr, size);
517 621
518 free (ptr); 622 free (ptr);
519 return 0; 623 return 0;
624#endif
520} 625}
521 626
522static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 627static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
523 628
524void 629void
… …
532{ 637{
533 ptr = alloc (ptr, size); 638 ptr = alloc (ptr, size);
534 639
535 if (!ptr && size) 640 if (!ptr && size)
536 { 641 {
642#if EV_AVOID_STDIO
643 ev_printerr ("(libev) memory allocation failed, aborting.\n");
644#else
537 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 645 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
646#endif
538 abort (); 647 abort ();
539 } 648 }
540 649
541 return ptr; 650 return ptr;
542} 651}
… …
558 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 667 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
559 unsigned char unused; 668 unsigned char unused;
560#if EV_USE_EPOLL 669#if EV_USE_EPOLL
561 unsigned int egen; /* generation counter to counter epoll bugs */ 670 unsigned int egen; /* generation counter to counter epoll bugs */
562#endif 671#endif
563#if EV_SELECT_IS_WINSOCKET 672#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
564 SOCKET handle; 673 SOCKET handle;
674#endif
675#if EV_USE_IOCP
676 OVERLAPPED or, ow;
565#endif 677#endif
566} ANFD; 678} ANFD;
567 679
568/* stores the pending event set for a given watcher */ 680/* stores the pending event set for a given watcher */
569typedef struct 681typedef struct
… …
624 736
625 static int ev_default_loop_ptr; 737 static int ev_default_loop_ptr;
626 738
627#endif 739#endif
628 740
629#if EV_MINIMAL < 2 741#if EV_FEATURE_API
630# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 742# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
631# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 743# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
632# define EV_INVOKE_PENDING invoke_cb (EV_A) 744# define EV_INVOKE_PENDING invoke_cb (EV_A)
633#else 745#else
634# define EV_RELEASE_CB (void)0 746# define EV_RELEASE_CB (void)0
635# define EV_ACQUIRE_CB (void)0 747# define EV_ACQUIRE_CB (void)0
636# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 748# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
637#endif 749#endif
638 750
639#define EVUNLOOP_RECURSE 0x80 751#define EVBREAK_RECURSE 0x80
640 752
641/*****************************************************************************/ 753/*****************************************************************************/
642 754
643#ifndef EV_HAVE_EV_TIME 755#ifndef EV_HAVE_EV_TIME
644ev_tstamp 756ev_tstamp
… …
688 if (delay > 0.) 800 if (delay > 0.)
689 { 801 {
690#if EV_USE_NANOSLEEP 802#if EV_USE_NANOSLEEP
691 struct timespec ts; 803 struct timespec ts;
692 804
693 ts.tv_sec = (time_t)delay; 805 EV_TS_SET (ts, delay);
694 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
695
696 nanosleep (&ts, 0); 806 nanosleep (&ts, 0);
697#elif defined(_WIN32) 807#elif defined(_WIN32)
698 Sleep ((unsigned long)(delay * 1e3)); 808 Sleep ((unsigned long)(delay * 1e3));
699#else 809#else
700 struct timeval tv; 810 struct timeval tv;
701 811
702 tv.tv_sec = (time_t)delay;
703 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
704
705 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 812 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
706 /* something not guaranteed by newer posix versions, but guaranteed */ 813 /* something not guaranteed by newer posix versions, but guaranteed */
707 /* by older ones */ 814 /* by older ones */
815 EV_TV_SET (tv, delay);
708 select (0, 0, 0, 0, &tv); 816 select (0, 0, 0, 0, &tv);
709#endif 817#endif
710 } 818 }
711} 819}
712 820
821inline_speed int
822ev_timeout_to_ms (ev_tstamp timeout)
823{
824 int ms = timeout * 1000. + .999999;
825
826 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
827}
828
713/*****************************************************************************/ 829/*****************************************************************************/
714 830
715#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 831#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
716 832
717/* find a suitable new size for the given array, */ 833/* find a suitable new size for the given array, */
718/* hopefully by rounding to a ncie-to-malloc size */ 834/* hopefully by rounding to a nice-to-malloc size */
719inline_size int 835inline_size int
720array_nextsize (int elem, int cur, int cnt) 836array_nextsize (int elem, int cur, int cnt)
721{ 837{
722 int ncur = cur + 1; 838 int ncur = cur + 1;
723 839
… …
819} 935}
820 936
821/*****************************************************************************/ 937/*****************************************************************************/
822 938
823inline_speed void 939inline_speed void
824fd_event_nc (EV_P_ int fd, int revents) 940fd_event_nocheck (EV_P_ int fd, int revents)
825{ 941{
826 ANFD *anfd = anfds + fd; 942 ANFD *anfd = anfds + fd;
827 ev_io *w; 943 ev_io *w;
828 944
829 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 945 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
841fd_event (EV_P_ int fd, int revents) 957fd_event (EV_P_ int fd, int revents)
842{ 958{
843 ANFD *anfd = anfds + fd; 959 ANFD *anfd = anfds + fd;
844 960
845 if (expect_true (!anfd->reify)) 961 if (expect_true (!anfd->reify))
846 fd_event_nc (EV_A_ fd, revents); 962 fd_event_nocheck (EV_A_ fd, revents);
847} 963}
848 964
849void 965void
850ev_feed_fd_event (EV_P_ int fd, int revents) 966ev_feed_fd_event (EV_P_ int fd, int revents)
851{ 967{
852 if (fd >= 0 && fd < anfdmax) 968 if (fd >= 0 && fd < anfdmax)
853 fd_event_nc (EV_A_ fd, revents); 969 fd_event_nocheck (EV_A_ fd, revents);
854} 970}
855 971
856/* make sure the external fd watch events are in-sync */ 972/* make sure the external fd watch events are in-sync */
857/* with the kernel/libev internal state */ 973/* with the kernel/libev internal state */
858inline_size void 974inline_size void
… …
864 { 980 {
865 int fd = fdchanges [i]; 981 int fd = fdchanges [i];
866 ANFD *anfd = anfds + fd; 982 ANFD *anfd = anfds + fd;
867 ev_io *w; 983 ev_io *w;
868 984
869 unsigned char events = 0; 985 unsigned char o_events = anfd->events;
986 unsigned char o_reify = anfd->reify;
870 987
871 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 988 anfd->reify = 0;
872 events |= (unsigned char)w->events;
873 989
874#if EV_SELECT_IS_WINSOCKET 990#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
875 if (events) 991 if (o_reify & EV__IOFDSET)
876 { 992 {
877 unsigned long arg; 993 unsigned long arg;
878 #ifdef EV_FD_TO_WIN32_HANDLE
879 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 994 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
880 #else
881 anfd->handle = _get_osfhandle (fd);
882 #endif
883 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 995 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
996 printf ("oi %d %x\n", fd, anfd->handle);//D
884 } 997 }
885#endif 998#endif
886 999
1000 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
887 { 1001 {
888 unsigned char o_events = anfd->events;
889 unsigned char o_reify = anfd->reify;
890
891 anfd->reify = 0;
892 anfd->events = events; 1002 anfd->events = 0;
893 1003
894 if (o_events != events || o_reify & EV__IOFDSET) 1004 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1005 anfd->events |= (unsigned char)w->events;
1006
1007 if (o_events != anfd->events)
1008 o_reify = EV__IOFDSET; /* actually |= */
1009 }
1010
1011 if (o_reify & EV__IOFDSET)
895 backend_modify (EV_A_ fd, o_events, events); 1012 backend_modify (EV_A_ fd, o_events, anfd->events);
896 }
897 } 1013 }
898 1014
899 fdchangecnt = 0; 1015 fdchangecnt = 0;
900} 1016}
901 1017
… …
925 ev_io_stop (EV_A_ w); 1041 ev_io_stop (EV_A_ w);
926 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1042 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
927 } 1043 }
928} 1044}
929 1045
930/* check whether the given fd is atcually valid, for error recovery */ 1046/* check whether the given fd is actually valid, for error recovery */
931inline_size int 1047inline_size int
932fd_valid (int fd) 1048fd_valid (int fd)
933{ 1049{
934#ifdef _WIN32 1050#ifdef _WIN32
935 return _get_osfhandle (fd) != -1; 1051 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
936#else 1052#else
937 return fcntl (fd, F_GETFD) != -1; 1053 return fcntl (fd, F_GETFD) != -1;
938#endif 1054#endif
939} 1055}
940 1056
… …
958 1074
959 for (fd = anfdmax; fd--; ) 1075 for (fd = anfdmax; fd--; )
960 if (anfds [fd].events) 1076 if (anfds [fd].events)
961 { 1077 {
962 fd_kill (EV_A_ fd); 1078 fd_kill (EV_A_ fd);
963 return; 1079 break;
964 } 1080 }
965} 1081}
966 1082
967/* usually called after fork if backend needs to re-arm all fds from scratch */ 1083/* usually called after fork if backend needs to re-arm all fds from scratch */
968static void noinline 1084static void noinline
… …
977 anfds [fd].emask = 0; 1093 anfds [fd].emask = 0;
978 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1094 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
979 } 1095 }
980} 1096}
981 1097
1098/* used to prepare libev internal fd's */
1099/* this is not fork-safe */
1100inline_speed void
1101fd_intern (int fd)
1102{
1103#ifdef _WIN32
1104 unsigned long arg = 1;
1105 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1106#else
1107 fcntl (fd, F_SETFD, FD_CLOEXEC);
1108 fcntl (fd, F_SETFL, O_NONBLOCK);
1109#endif
1110}
1111
982/*****************************************************************************/ 1112/*****************************************************************************/
983 1113
984/* 1114/*
985 * the heap functions want a real array index. array index 0 uis guaranteed to not 1115 * the heap functions want a real array index. array index 0 is guaranteed to not
986 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1116 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
987 * the branching factor of the d-tree. 1117 * the branching factor of the d-tree.
988 */ 1118 */
989 1119
990/* 1120/*
… …
1058 1188
1059 for (;;) 1189 for (;;)
1060 { 1190 {
1061 int c = k << 1; 1191 int c = k << 1;
1062 1192
1063 if (c > N + HEAP0 - 1) 1193 if (c >= N + HEAP0)
1064 break; 1194 break;
1065 1195
1066 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1196 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1067 ? 1 : 0; 1197 ? 1 : 0;
1068 1198
… …
1104 1234
1105/* move an element suitably so it is in a correct place */ 1235/* move an element suitably so it is in a correct place */
1106inline_size void 1236inline_size void
1107adjustheap (ANHE *heap, int N, int k) 1237adjustheap (ANHE *heap, int N, int k)
1108{ 1238{
1109 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1239 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1110 upheap (heap, k); 1240 upheap (heap, k);
1111 else 1241 else
1112 downheap (heap, N, k); 1242 downheap (heap, N, k);
1113} 1243}
1114 1244
… …
1127/*****************************************************************************/ 1257/*****************************************************************************/
1128 1258
1129/* associate signal watchers to a signal signal */ 1259/* associate signal watchers to a signal signal */
1130typedef struct 1260typedef struct
1131{ 1261{
1262 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY 1263#if EV_MULTIPLICITY
1133 EV_P; 1264 EV_P;
1134#endif 1265#endif
1135 WL head; 1266 WL head;
1136 EV_ATOMIC_T gotsig;
1137} ANSIG; 1267} ANSIG;
1138 1268
1139static ANSIG signals [EV_NSIG - 1]; 1269static ANSIG signals [EV_NSIG - 1];
1140static EV_ATOMIC_T gotsig;
1141 1270
1142/*****************************************************************************/ 1271/*****************************************************************************/
1143 1272
1144/* used to prepare libev internal fd's */ 1273#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1145/* this is not fork-safe */
1146inline_speed void
1147fd_intern (int fd)
1148{
1149#ifdef _WIN32
1150 unsigned long arg = 1;
1151 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1152#else
1153 fcntl (fd, F_SETFD, FD_CLOEXEC);
1154 fcntl (fd, F_SETFL, O_NONBLOCK);
1155#endif
1156}
1157 1274
1158static void noinline 1275static void noinline
1159evpipe_init (EV_P) 1276evpipe_init (EV_P)
1160{ 1277{
1161 if (!ev_is_active (&pipe_w)) 1278 if (!ev_is_active (&pipe_w))
1162 { 1279 {
1163#if EV_USE_EVENTFD 1280# if EV_USE_EVENTFD
1164 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1281 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1165 if (evfd < 0 && errno == EINVAL) 1282 if (evfd < 0 && errno == EINVAL)
1166 evfd = eventfd (0, 0); 1283 evfd = eventfd (0, 0);
1167 1284
1168 if (evfd >= 0) 1285 if (evfd >= 0)
… …
1170 evpipe [0] = -1; 1287 evpipe [0] = -1;
1171 fd_intern (evfd); /* doing it twice doesn't hurt */ 1288 fd_intern (evfd); /* doing it twice doesn't hurt */
1172 ev_io_set (&pipe_w, evfd, EV_READ); 1289 ev_io_set (&pipe_w, evfd, EV_READ);
1173 } 1290 }
1174 else 1291 else
1175#endif 1292# endif
1176 { 1293 {
1177 while (pipe (evpipe)) 1294 while (pipe (evpipe))
1178 ev_syserr ("(libev) error creating signal/async pipe"); 1295 ev_syserr ("(libev) error creating signal/async pipe");
1179 1296
1180 fd_intern (evpipe [0]); 1297 fd_intern (evpipe [0]);
… …
1191evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1308evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1192{ 1309{
1193 if (!*flag) 1310 if (!*flag)
1194 { 1311 {
1195 int old_errno = errno; /* save errno because write might clobber it */ 1312 int old_errno = errno; /* save errno because write might clobber it */
1313 char dummy;
1196 1314
1197 *flag = 1; 1315 *flag = 1;
1198 1316
1199#if EV_USE_EVENTFD 1317#if EV_USE_EVENTFD
1200 if (evfd >= 0) 1318 if (evfd >= 0)
… …
1202 uint64_t counter = 1; 1320 uint64_t counter = 1;
1203 write (evfd, &counter, sizeof (uint64_t)); 1321 write (evfd, &counter, sizeof (uint64_t));
1204 } 1322 }
1205 else 1323 else
1206#endif 1324#endif
1325 /* win32 people keep sending patches that change this write() to send() */
1326 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1327 /* so when you think this write should be a send instead, please find out */
1328 /* where your send() is from - it's definitely not the microsoft send, and */
1329 /* tell me. thank you. */
1207 write (evpipe [1], &old_errno, 1); 1330 write (evpipe [1], &dummy, 1);
1208 1331
1209 errno = old_errno; 1332 errno = old_errno;
1210 } 1333 }
1211} 1334}
1212 1335
1213/* called whenever the libev signal pipe */ 1336/* called whenever the libev signal pipe */
1214/* got some events (signal, async) */ 1337/* got some events (signal, async) */
1215static void 1338static void
1216pipecb (EV_P_ ev_io *iow, int revents) 1339pipecb (EV_P_ ev_io *iow, int revents)
1217{ 1340{
1341 int i;
1342
1218#if EV_USE_EVENTFD 1343#if EV_USE_EVENTFD
1219 if (evfd >= 0) 1344 if (evfd >= 0)
1220 { 1345 {
1221 uint64_t counter; 1346 uint64_t counter;
1222 read (evfd, &counter, sizeof (uint64_t)); 1347 read (evfd, &counter, sizeof (uint64_t));
1223 } 1348 }
1224 else 1349 else
1225#endif 1350#endif
1226 { 1351 {
1227 char dummy; 1352 char dummy;
1353 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1228 read (evpipe [0], &dummy, 1); 1354 read (evpipe [0], &dummy, 1);
1229 } 1355 }
1230 1356
1231 if (gotsig && ev_is_default_loop (EV_A)) 1357#if EV_SIGNAL_ENABLE
1358 if (sig_pending)
1232 { 1359 {
1233 int signum; 1360 sig_pending = 0;
1234 gotsig = 0;
1235 1361
1236 for (signum = EV_NSIG - 1; signum--; ) 1362 for (i = EV_NSIG - 1; i--; )
1237 if (signals [signum].gotsig) 1363 if (expect_false (signals [i].pending))
1238 ev_feed_signal_event (EV_A_ signum + 1); 1364 ev_feed_signal_event (EV_A_ i + 1);
1239 } 1365 }
1366#endif
1240 1367
1241#if EV_ASYNC_ENABLE 1368#if EV_ASYNC_ENABLE
1242 if (gotasync) 1369 if (async_pending)
1243 { 1370 {
1244 int i; 1371 async_pending = 0;
1245 gotasync = 0;
1246 1372
1247 for (i = asynccnt; i--; ) 1373 for (i = asynccnt; i--; )
1248 if (asyncs [i]->sent) 1374 if (asyncs [i]->sent)
1249 { 1375 {
1250 asyncs [i]->sent = 0; 1376 asyncs [i]->sent = 0;
… …
1254#endif 1380#endif
1255} 1381}
1256 1382
1257/*****************************************************************************/ 1383/*****************************************************************************/
1258 1384
1385void
1386ev_feed_signal (int signum)
1387{
1388#if EV_MULTIPLICITY
1389 EV_P = signals [signum - 1].loop;
1390
1391 if (!EV_A)
1392 return;
1393#endif
1394
1395 signals [signum - 1].pending = 1;
1396 evpipe_write (EV_A_ &sig_pending);
1397}
1398
1259static void 1399static void
1260ev_sighandler (int signum) 1400ev_sighandler (int signum)
1261{ 1401{
1262#if EV_MULTIPLICITY
1263 EV_P = signals [signum - 1].loop;
1264#endif
1265
1266#if _WIN32 1402#ifdef _WIN32
1267 signal (signum, ev_sighandler); 1403 signal (signum, ev_sighandler);
1268#endif 1404#endif
1269 1405
1270 signals [signum - 1].gotsig = 1; 1406 ev_feed_signal (signum);
1271 evpipe_write (EV_A_ &gotsig);
1272} 1407}
1273 1408
1274void noinline 1409void noinline
1275ev_feed_signal_event (EV_P_ int signum) 1410ev_feed_signal_event (EV_P_ int signum)
1276{ 1411{
1277 WL w; 1412 WL w;
1278 1413
1414 if (expect_false (signum <= 0 || signum > EV_NSIG))
1415 return;
1416
1417 --signum;
1418
1279#if EV_MULTIPLICITY 1419#if EV_MULTIPLICITY
1280 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1420 /* it is permissible to try to feed a signal to the wrong loop */
1281#endif 1421 /* or, likely more useful, feeding a signal nobody is waiting for */
1282 1422
1283 if (signum <= 0 || signum > EV_NSIG) 1423 if (expect_false (signals [signum].loop != EV_A))
1284 return; 1424 return;
1425#endif
1285 1426
1286 --signum;
1287
1288 signals [signum].gotsig = 0; 1427 signals [signum].pending = 0;
1289 1428
1290 for (w = signals [signum].head; w; w = w->next) 1429 for (w = signals [signum].head; w; w = w->next)
1291 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1430 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1292} 1431}
1293 1432
… …
1309 break; 1448 break;
1310 } 1449 }
1311} 1450}
1312#endif 1451#endif
1313 1452
1453#endif
1454
1314/*****************************************************************************/ 1455/*****************************************************************************/
1315 1456
1457#if EV_CHILD_ENABLE
1316static WL childs [EV_PID_HASHSIZE]; 1458static WL childs [EV_PID_HASHSIZE];
1317
1318#ifndef _WIN32
1319 1459
1320static ev_signal childev; 1460static ev_signal childev;
1321 1461
1322#ifndef WIFCONTINUED 1462#ifndef WIFCONTINUED
1323# define WIFCONTINUED(status) 0 1463# define WIFCONTINUED(status) 0
… …
1328child_reap (EV_P_ int chain, int pid, int status) 1468child_reap (EV_P_ int chain, int pid, int status)
1329{ 1469{
1330 ev_child *w; 1470 ev_child *w;
1331 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1471 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1332 1472
1333 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1473 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1334 { 1474 {
1335 if ((w->pid == pid || !w->pid) 1475 if ((w->pid == pid || !w->pid)
1336 && (!traced || (w->flags & 1))) 1476 && (!traced || (w->flags & 1)))
1337 { 1477 {
1338 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1478 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1363 /* make sure we are called again until all children have been reaped */ 1503 /* make sure we are called again until all children have been reaped */
1364 /* we need to do it this way so that the callback gets called before we continue */ 1504 /* we need to do it this way so that the callback gets called before we continue */
1365 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1505 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1366 1506
1367 child_reap (EV_A_ pid, pid, status); 1507 child_reap (EV_A_ pid, pid, status);
1368 if (EV_PID_HASHSIZE > 1) 1508 if ((EV_PID_HASHSIZE) > 1)
1369 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1509 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1370} 1510}
1371 1511
1372#endif 1512#endif
1373 1513
1374/*****************************************************************************/ 1514/*****************************************************************************/
1375 1515
1516#if EV_USE_IOCP
1517# include "ev_iocp.c"
1518#endif
1376#if EV_USE_PORT 1519#if EV_USE_PORT
1377# include "ev_port.c" 1520# include "ev_port.c"
1378#endif 1521#endif
1379#if EV_USE_KQUEUE 1522#if EV_USE_KQUEUE
1380# include "ev_kqueue.c" 1523# include "ev_kqueue.c"
… …
1440#ifdef __APPLE__ 1583#ifdef __APPLE__
1441 /* only select works correctly on that "unix-certified" platform */ 1584 /* only select works correctly on that "unix-certified" platform */
1442 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1585 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1443 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1586 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1444#endif 1587#endif
1588#ifdef __FreeBSD__
1589 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1590#endif
1445 1591
1446 return flags; 1592 return flags;
1447} 1593}
1448 1594
1449unsigned int 1595unsigned int
1450ev_embeddable_backends (void) 1596ev_embeddable_backends (void)
1451{ 1597{
1452 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1598 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1453 1599
1454 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1600 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1455 /* please fix it and tell me how to detect the fix */ 1601 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1456 flags &= ~EVBACKEND_EPOLL; 1602 flags &= ~EVBACKEND_EPOLL;
1457 1603
1458 return flags; 1604 return flags;
1459} 1605}
1460 1606
1461unsigned int 1607unsigned int
1462ev_backend (EV_P) 1608ev_backend (EV_P)
1463{ 1609{
1464 return backend; 1610 return backend;
1465} 1611}
1466 1612
1467#if EV_MINIMAL < 2 1613#if EV_FEATURE_API
1468unsigned int 1614unsigned int
1469ev_loop_count (EV_P) 1615ev_iteration (EV_P)
1470{ 1616{
1471 return loop_count; 1617 return loop_count;
1472} 1618}
1473 1619
1474unsigned int 1620unsigned int
1475ev_loop_depth (EV_P) 1621ev_depth (EV_P)
1476{ 1622{
1477 return loop_depth; 1623 return loop_depth;
1478} 1624}
1479 1625
1480void 1626void
… …
1517static void noinline 1663static void noinline
1518loop_init (EV_P_ unsigned int flags) 1664loop_init (EV_P_ unsigned int flags)
1519{ 1665{
1520 if (!backend) 1666 if (!backend)
1521 { 1667 {
1668 origflags = flags;
1669
1522#if EV_USE_REALTIME 1670#if EV_USE_REALTIME
1523 if (!have_realtime) 1671 if (!have_realtime)
1524 { 1672 {
1525 struct timespec ts; 1673 struct timespec ts;
1526 1674
… …
1552 1700
1553 ev_rt_now = ev_time (); 1701 ev_rt_now = ev_time ();
1554 mn_now = get_clock (); 1702 mn_now = get_clock ();
1555 now_floor = mn_now; 1703 now_floor = mn_now;
1556 rtmn_diff = ev_rt_now - mn_now; 1704 rtmn_diff = ev_rt_now - mn_now;
1557#if EV_MINIMAL < 2 1705#if EV_FEATURE_API
1558 invoke_cb = ev_invoke_pending; 1706 invoke_cb = ev_invoke_pending;
1559#endif 1707#endif
1560 1708
1561 io_blocktime = 0.; 1709 io_blocktime = 0.;
1562 timeout_blocktime = 0.; 1710 timeout_blocktime = 0.;
1563 backend = 0; 1711 backend = 0;
1564 backend_fd = -1; 1712 backend_fd = -1;
1565 gotasync = 0; 1713 sig_pending = 0;
1714#if EV_ASYNC_ENABLE
1715 async_pending = 0;
1716#endif
1566#if EV_USE_INOTIFY 1717#if EV_USE_INOTIFY
1567 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1718 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1568#endif 1719#endif
1569#if EV_USE_SIGNALFD 1720#if EV_USE_SIGNALFD
1570 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1721 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1571#endif 1722#endif
1572 1723
1573 if (!(flags & 0x0000ffffU)) 1724 if (!(flags & EVBACKEND_MASK))
1574 flags |= ev_recommended_backends (); 1725 flags |= ev_recommended_backends ();
1575 1726
1727#if EV_USE_IOCP
1728 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1729#endif
1576#if EV_USE_PORT 1730#if EV_USE_PORT
1577 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1731 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1578#endif 1732#endif
1579#if EV_USE_KQUEUE 1733#if EV_USE_KQUEUE
1580 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1734 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1589 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1743 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1590#endif 1744#endif
1591 1745
1592 ev_prepare_init (&pending_w, pendingcb); 1746 ev_prepare_init (&pending_w, pendingcb);
1593 1747
1748#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1594 ev_init (&pipe_w, pipecb); 1749 ev_init (&pipe_w, pipecb);
1595 ev_set_priority (&pipe_w, EV_MAXPRI); 1750 ev_set_priority (&pipe_w, EV_MAXPRI);
1751#endif
1596 } 1752 }
1597} 1753}
1598 1754
1599/* free up a loop structure */ 1755/* free up a loop structure */
1600static void noinline 1756void
1601loop_destroy (EV_P) 1757ev_loop_destroy (EV_P)
1602{ 1758{
1603 int i; 1759 int i;
1760
1761#if EV_MULTIPLICITY
1762 /* mimic free (0) */
1763 if (!EV_A)
1764 return;
1765#endif
1766
1767#if EV_CLEANUP_ENABLE
1768 /* queue cleanup watchers (and execute them) */
1769 if (expect_false (cleanupcnt))
1770 {
1771 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1772 EV_INVOKE_PENDING;
1773 }
1774#endif
1775
1776#if EV_CHILD_ENABLE
1777 if (ev_is_active (&childev))
1778 {
1779 ev_ref (EV_A); /* child watcher */
1780 ev_signal_stop (EV_A_ &childev);
1781 }
1782#endif
1604 1783
1605 if (ev_is_active (&pipe_w)) 1784 if (ev_is_active (&pipe_w))
1606 { 1785 {
1607 /*ev_ref (EV_A);*/ 1786 /*ev_ref (EV_A);*/
1608 /*ev_io_stop (EV_A_ &pipe_w);*/ 1787 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1612 close (evfd); 1791 close (evfd);
1613#endif 1792#endif
1614 1793
1615 if (evpipe [0] >= 0) 1794 if (evpipe [0] >= 0)
1616 { 1795 {
1617 close (evpipe [0]); 1796 EV_WIN32_CLOSE_FD (evpipe [0]);
1618 close (evpipe [1]); 1797 EV_WIN32_CLOSE_FD (evpipe [1]);
1619 } 1798 }
1620 } 1799 }
1621 1800
1622#if EV_USE_SIGNALFD 1801#if EV_USE_SIGNALFD
1623 if (ev_is_active (&sigfd_w)) 1802 if (ev_is_active (&sigfd_w))
1624 {
1625 /*ev_ref (EV_A);*/
1626 /*ev_io_stop (EV_A_ &sigfd_w);*/
1627
1628 close (sigfd); 1803 close (sigfd);
1629 }
1630#endif 1804#endif
1631 1805
1632#if EV_USE_INOTIFY 1806#if EV_USE_INOTIFY
1633 if (fs_fd >= 0) 1807 if (fs_fd >= 0)
1634 close (fs_fd); 1808 close (fs_fd);
1635#endif 1809#endif
1636 1810
1637 if (backend_fd >= 0) 1811 if (backend_fd >= 0)
1638 close (backend_fd); 1812 close (backend_fd);
1639 1813
1814#if EV_USE_IOCP
1815 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1816#endif
1640#if EV_USE_PORT 1817#if EV_USE_PORT
1641 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1818 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1642#endif 1819#endif
1643#if EV_USE_KQUEUE 1820#if EV_USE_KQUEUE
1644 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1821 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1671 array_free (periodic, EMPTY); 1848 array_free (periodic, EMPTY);
1672#endif 1849#endif
1673#if EV_FORK_ENABLE 1850#if EV_FORK_ENABLE
1674 array_free (fork, EMPTY); 1851 array_free (fork, EMPTY);
1675#endif 1852#endif
1853#if EV_CLEANUP_ENABLE
1854 array_free (cleanup, EMPTY);
1855#endif
1676 array_free (prepare, EMPTY); 1856 array_free (prepare, EMPTY);
1677 array_free (check, EMPTY); 1857 array_free (check, EMPTY);
1678#if EV_ASYNC_ENABLE 1858#if EV_ASYNC_ENABLE
1679 array_free (async, EMPTY); 1859 array_free (async, EMPTY);
1680#endif 1860#endif
1681 1861
1682 backend = 0; 1862 backend = 0;
1863
1864#if EV_MULTIPLICITY
1865 if (ev_is_default_loop (EV_A))
1866#endif
1867 ev_default_loop_ptr = 0;
1868#if EV_MULTIPLICITY
1869 else
1870 ev_free (EV_A);
1871#endif
1683} 1872}
1684 1873
1685#if EV_USE_INOTIFY 1874#if EV_USE_INOTIFY
1686inline_size void infy_fork (EV_P); 1875inline_size void infy_fork (EV_P);
1687#endif 1876#endif
… …
1704 1893
1705 if (ev_is_active (&pipe_w)) 1894 if (ev_is_active (&pipe_w))
1706 { 1895 {
1707 /* this "locks" the handlers against writing to the pipe */ 1896 /* this "locks" the handlers against writing to the pipe */
1708 /* while we modify the fd vars */ 1897 /* while we modify the fd vars */
1709 gotsig = 1; 1898 sig_pending = 1;
1710#if EV_ASYNC_ENABLE 1899#if EV_ASYNC_ENABLE
1711 gotasync = 1; 1900 async_pending = 1;
1712#endif 1901#endif
1713 1902
1714 ev_ref (EV_A); 1903 ev_ref (EV_A);
1715 ev_io_stop (EV_A_ &pipe_w); 1904 ev_io_stop (EV_A_ &pipe_w);
1716 1905
… …
1719 close (evfd); 1908 close (evfd);
1720#endif 1909#endif
1721 1910
1722 if (evpipe [0] >= 0) 1911 if (evpipe [0] >= 0)
1723 { 1912 {
1724 close (evpipe [0]); 1913 EV_WIN32_CLOSE_FD (evpipe [0]);
1725 close (evpipe [1]); 1914 EV_WIN32_CLOSE_FD (evpipe [1]);
1726 } 1915 }
1727 1916
1917#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1728 evpipe_init (EV_A); 1918 evpipe_init (EV_A);
1729 /* now iterate over everything, in case we missed something */ 1919 /* now iterate over everything, in case we missed something */
1730 pipecb (EV_A_ &pipe_w, EV_READ); 1920 pipecb (EV_A_ &pipe_w, EV_READ);
1921#endif
1731 } 1922 }
1732 1923
1733 postfork = 0; 1924 postfork = 0;
1734} 1925}
1735 1926
… …
1744 loop_init (EV_A_ flags); 1935 loop_init (EV_A_ flags);
1745 1936
1746 if (ev_backend (EV_A)) 1937 if (ev_backend (EV_A))
1747 return EV_A; 1938 return EV_A;
1748 1939
1940 ev_free (EV_A);
1749 return 0; 1941 return 0;
1750} 1942}
1751 1943
1752void
1753ev_loop_destroy (EV_P)
1754{
1755 loop_destroy (EV_A);
1756 ev_free (loop);
1757}
1758
1759void
1760ev_loop_fork (EV_P)
1761{
1762 postfork = 1; /* must be in line with ev_default_fork */
1763}
1764#endif /* multiplicity */ 1944#endif /* multiplicity */
1765 1945
1766#if EV_VERIFY 1946#if EV_VERIFY
1767static void noinline 1947static void noinline
1768verify_watcher (EV_P_ W w) 1948verify_watcher (EV_P_ W w)
… …
1797 verify_watcher (EV_A_ ws [cnt]); 1977 verify_watcher (EV_A_ ws [cnt]);
1798 } 1978 }
1799} 1979}
1800#endif 1980#endif
1801 1981
1802#if EV_MINIMAL < 2 1982#if EV_FEATURE_API
1803void 1983void
1804ev_loop_verify (EV_P) 1984ev_verify (EV_P)
1805{ 1985{
1806#if EV_VERIFY 1986#if EV_VERIFY
1807 int i; 1987 int i;
1808 WL w; 1988 WL w;
1809 1989
… …
1843#if EV_FORK_ENABLE 2023#if EV_FORK_ENABLE
1844 assert (forkmax >= forkcnt); 2024 assert (forkmax >= forkcnt);
1845 array_verify (EV_A_ (W *)forks, forkcnt); 2025 array_verify (EV_A_ (W *)forks, forkcnt);
1846#endif 2026#endif
1847 2027
2028#if EV_CLEANUP_ENABLE
2029 assert (cleanupmax >= cleanupcnt);
2030 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2031#endif
2032
1848#if EV_ASYNC_ENABLE 2033#if EV_ASYNC_ENABLE
1849 assert (asyncmax >= asynccnt); 2034 assert (asyncmax >= asynccnt);
1850 array_verify (EV_A_ (W *)asyncs, asynccnt); 2035 array_verify (EV_A_ (W *)asyncs, asynccnt);
1851#endif 2036#endif
1852 2037
2038#if EV_PREPARE_ENABLE
1853 assert (preparemax >= preparecnt); 2039 assert (preparemax >= preparecnt);
1854 array_verify (EV_A_ (W *)prepares, preparecnt); 2040 array_verify (EV_A_ (W *)prepares, preparecnt);
2041#endif
1855 2042
2043#if EV_CHECK_ENABLE
1856 assert (checkmax >= checkcnt); 2044 assert (checkmax >= checkcnt);
1857 array_verify (EV_A_ (W *)checks, checkcnt); 2045 array_verify (EV_A_ (W *)checks, checkcnt);
2046#endif
1858 2047
1859# if 0 2048# if 0
2049#if EV_CHILD_ENABLE
1860 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2050 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1861 for (signum = EV_NSIG; signum--; ) if (signals [signum].gotsig) 2051 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2052#endif
1862# endif 2053# endif
1863#endif 2054#endif
1864} 2055}
1865#endif 2056#endif
1866 2057
1867#if EV_MULTIPLICITY 2058#if EV_MULTIPLICITY
1868struct ev_loop * 2059struct ev_loop *
1869ev_default_loop_init (unsigned int flags)
1870#else 2060#else
1871int 2061int
2062#endif
1872ev_default_loop (unsigned int flags) 2063ev_default_loop (unsigned int flags)
1873#endif
1874{ 2064{
1875 if (!ev_default_loop_ptr) 2065 if (!ev_default_loop_ptr)
1876 { 2066 {
1877#if EV_MULTIPLICITY 2067#if EV_MULTIPLICITY
1878 EV_P = ev_default_loop_ptr = &default_loop_struct; 2068 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1882 2072
1883 loop_init (EV_A_ flags); 2073 loop_init (EV_A_ flags);
1884 2074
1885 if (ev_backend (EV_A)) 2075 if (ev_backend (EV_A))
1886 { 2076 {
1887#ifndef _WIN32 2077#if EV_CHILD_ENABLE
1888 ev_signal_init (&childev, childcb, SIGCHLD); 2078 ev_signal_init (&childev, childcb, SIGCHLD);
1889 ev_set_priority (&childev, EV_MAXPRI); 2079 ev_set_priority (&childev, EV_MAXPRI);
1890 ev_signal_start (EV_A_ &childev); 2080 ev_signal_start (EV_A_ &childev);
1891 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2081 ev_unref (EV_A); /* child watcher should not keep loop alive */
1892#endif 2082#endif
… …
1897 2087
1898 return ev_default_loop_ptr; 2088 return ev_default_loop_ptr;
1899} 2089}
1900 2090
1901void 2091void
1902ev_default_destroy (void) 2092ev_loop_fork (EV_P)
1903{ 2093{
1904#if EV_MULTIPLICITY
1905 EV_P = ev_default_loop_ptr;
1906#endif
1907
1908 ev_default_loop_ptr = 0;
1909
1910#ifndef _WIN32
1911 ev_ref (EV_A); /* child watcher */
1912 ev_signal_stop (EV_A_ &childev);
1913#endif
1914
1915 loop_destroy (EV_A);
1916}
1917
1918void
1919ev_default_fork (void)
1920{
1921#if EV_MULTIPLICITY
1922 EV_P = ev_default_loop_ptr;
1923#endif
1924
1925 postfork = 1; /* must be in line with ev_loop_fork */ 2094 postfork = 1; /* must be in line with ev_default_fork */
1926} 2095}
1927 2096
1928/*****************************************************************************/ 2097/*****************************************************************************/
1929 2098
1930void 2099void
… …
1952 2121
1953 for (pri = NUMPRI; pri--; ) 2122 for (pri = NUMPRI; pri--; )
1954 while (pendingcnt [pri]) 2123 while (pendingcnt [pri])
1955 { 2124 {
1956 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2125 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1957
1958 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1959 /* ^ this is no longer true, as pending_w could be here */
1960 2126
1961 p->w->pending = 0; 2127 p->w->pending = 0;
1962 EV_CB_INVOKE (p->w, p->events); 2128 EV_CB_INVOKE (p->w, p->events);
1963 EV_FREQUENT_CHECK; 2129 EV_FREQUENT_CHECK;
1964 } 2130 }
… …
2021 EV_FREQUENT_CHECK; 2187 EV_FREQUENT_CHECK;
2022 feed_reverse (EV_A_ (W)w); 2188 feed_reverse (EV_A_ (W)w);
2023 } 2189 }
2024 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2190 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2025 2191
2026 feed_reverse_done (EV_A_ EV_TIMEOUT); 2192 feed_reverse_done (EV_A_ EV_TIMER);
2027 } 2193 }
2028} 2194}
2029 2195
2030#if EV_PERIODIC_ENABLE 2196#if EV_PERIODIC_ENABLE
2197
2198inline_speed
2199periodic_recalc (EV_P_ ev_periodic *w)
2200{
2201 /* TODO: use slow but potentially more correct incremental algo, */
2202 /* also do not rely on ceil */
2203 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2204}
2205
2031/* make periodics pending */ 2206/* make periodics pending */
2032inline_size void 2207inline_size void
2033periodics_reify (EV_P) 2208periodics_reify (EV_P)
2034{ 2209{
2035 EV_FREQUENT_CHECK; 2210 EV_FREQUENT_CHECK;
… …
2054 ANHE_at_cache (periodics [HEAP0]); 2229 ANHE_at_cache (periodics [HEAP0]);
2055 downheap (periodics, periodiccnt, HEAP0); 2230 downheap (periodics, periodiccnt, HEAP0);
2056 } 2231 }
2057 else if (w->interval) 2232 else if (w->interval)
2058 { 2233 {
2059 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2234 periodic_recalc (EV_A_ w);
2235
2060 /* if next trigger time is not sufficiently in the future, put it there */ 2236 /* if next trigger time is not sufficiently in the future, put it there */
2061 /* this might happen because of floating point inexactness */ 2237 /* this might happen because of floating point inexactness */
2062 if (ev_at (w) - ev_rt_now < TIME_EPSILON) 2238 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2063 { 2239 {
2064 ev_at (w) += w->interval; 2240 ev_at (w) += w->interval;
… …
2084 feed_reverse_done (EV_A_ EV_PERIODIC); 2260 feed_reverse_done (EV_A_ EV_PERIODIC);
2085 } 2261 }
2086} 2262}
2087 2263
2088/* simply recalculate all periodics */ 2264/* simply recalculate all periodics */
2089/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2265/* TODO: maybe ensure that at least one event happens when jumping forward? */
2090static void noinline 2266static void noinline
2091periodics_reschedule (EV_P) 2267periodics_reschedule (EV_P)
2092{ 2268{
2093 int i; 2269 int i;
2094 2270
… …
2098 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2274 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2099 2275
2100 if (w->reschedule_cb) 2276 if (w->reschedule_cb)
2101 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2277 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2102 else if (w->interval) 2278 else if (w->interval)
2103 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2279 periodic_recalc (EV_A_ w);
2104 2280
2105 ANHE_at_cache (periodics [i]); 2281 ANHE_at_cache (periodics [i]);
2106 } 2282 }
2107 2283
2108 reheap (periodics, periodiccnt); 2284 reheap (periodics, periodiccnt);
… …
2122 ANHE_at_cache (*he); 2298 ANHE_at_cache (*he);
2123 } 2299 }
2124} 2300}
2125 2301
2126/* fetch new monotonic and realtime times from the kernel */ 2302/* fetch new monotonic and realtime times from the kernel */
2127/* also detetc if there was a timejump, and act accordingly */ 2303/* also detect if there was a timejump, and act accordingly */
2128inline_speed void 2304inline_speed void
2129time_update (EV_P_ ev_tstamp max_block) 2305time_update (EV_P_ ev_tstamp max_block)
2130{ 2306{
2131#if EV_USE_MONOTONIC 2307#if EV_USE_MONOTONIC
2132 if (expect_true (have_monotonic)) 2308 if (expect_true (have_monotonic))
… …
2190 mn_now = ev_rt_now; 2366 mn_now = ev_rt_now;
2191 } 2367 }
2192} 2368}
2193 2369
2194void 2370void
2195ev_loop (EV_P_ int flags) 2371ev_run (EV_P_ int flags)
2196{ 2372{
2197#if EV_MINIMAL < 2 2373#if EV_FEATURE_API
2198 ++loop_depth; 2374 ++loop_depth;
2199#endif 2375#endif
2200 2376
2201 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2377 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2202 2378
2203 loop_done = EVUNLOOP_CANCEL; 2379 loop_done = EVBREAK_CANCEL;
2204 2380
2205 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2381 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2206 2382
2207 do 2383 do
2208 { 2384 {
2209#if EV_VERIFY >= 2 2385#if EV_VERIFY >= 2
2210 ev_loop_verify (EV_A); 2386 ev_verify (EV_A);
2211#endif 2387#endif
2212 2388
2213#ifndef _WIN32 2389#ifndef _WIN32
2214 if (expect_false (curpid)) /* penalise the forking check even more */ 2390 if (expect_false (curpid)) /* penalise the forking check even more */
2215 if (expect_false (getpid () != curpid)) 2391 if (expect_false (getpid () != curpid))
… …
2227 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2403 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2228 EV_INVOKE_PENDING; 2404 EV_INVOKE_PENDING;
2229 } 2405 }
2230#endif 2406#endif
2231 2407
2408#if EV_PREPARE_ENABLE
2232 /* queue prepare watchers (and execute them) */ 2409 /* queue prepare watchers (and execute them) */
2233 if (expect_false (preparecnt)) 2410 if (expect_false (preparecnt))
2234 { 2411 {
2235 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2412 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2236 EV_INVOKE_PENDING; 2413 EV_INVOKE_PENDING;
2237 } 2414 }
2415#endif
2238 2416
2239 if (expect_false (loop_done)) 2417 if (expect_false (loop_done))
2240 break; 2418 break;
2241 2419
2242 /* we might have forked, so reify kernel state if necessary */ 2420 /* we might have forked, so reify kernel state if necessary */
… …
2249 /* calculate blocking time */ 2427 /* calculate blocking time */
2250 { 2428 {
2251 ev_tstamp waittime = 0.; 2429 ev_tstamp waittime = 0.;
2252 ev_tstamp sleeptime = 0.; 2430 ev_tstamp sleeptime = 0.;
2253 2431
2432 /* remember old timestamp for io_blocktime calculation */
2433 ev_tstamp prev_mn_now = mn_now;
2434
2435 /* update time to cancel out callback processing overhead */
2436 time_update (EV_A_ 1e100);
2437
2254 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2438 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2255 { 2439 {
2256 /* remember old timestamp for io_blocktime calculation */
2257 ev_tstamp prev_mn_now = mn_now;
2258
2259 /* update time to cancel out callback processing overhead */
2260 time_update (EV_A_ 1e100);
2261
2262 waittime = MAX_BLOCKTIME; 2440 waittime = MAX_BLOCKTIME;
2263 2441
2264 if (timercnt) 2442 if (timercnt)
2265 { 2443 {
2266 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2444 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2293 waittime -= sleeptime; 2471 waittime -= sleeptime;
2294 } 2472 }
2295 } 2473 }
2296 } 2474 }
2297 2475
2298#if EV_MINIMAL < 2 2476#if EV_FEATURE_API
2299 ++loop_count; 2477 ++loop_count;
2300#endif 2478#endif
2301 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2479 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2302 backend_poll (EV_A_ waittime); 2480 backend_poll (EV_A_ waittime);
2303 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2481 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2304 2482
2305 /* update ev_rt_now, do magic */ 2483 /* update ev_rt_now, do magic */
2306 time_update (EV_A_ waittime + sleeptime); 2484 time_update (EV_A_ waittime + sleeptime);
2307 } 2485 }
2308 2486
… …
2315#if EV_IDLE_ENABLE 2493#if EV_IDLE_ENABLE
2316 /* queue idle watchers unless other events are pending */ 2494 /* queue idle watchers unless other events are pending */
2317 idle_reify (EV_A); 2495 idle_reify (EV_A);
2318#endif 2496#endif
2319 2497
2498#if EV_CHECK_ENABLE
2320 /* queue check watchers, to be executed first */ 2499 /* queue check watchers, to be executed first */
2321 if (expect_false (checkcnt)) 2500 if (expect_false (checkcnt))
2322 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2501 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2502#endif
2323 2503
2324 EV_INVOKE_PENDING; 2504 EV_INVOKE_PENDING;
2325 } 2505 }
2326 while (expect_true ( 2506 while (expect_true (
2327 activecnt 2507 activecnt
2328 && !loop_done 2508 && !loop_done
2329 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2509 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2330 )); 2510 ));
2331 2511
2332 if (loop_done == EVUNLOOP_ONE) 2512 if (loop_done == EVBREAK_ONE)
2333 loop_done = EVUNLOOP_CANCEL; 2513 loop_done = EVBREAK_CANCEL;
2334 2514
2335#if EV_MINIMAL < 2 2515#if EV_FEATURE_API
2336 --loop_depth; 2516 --loop_depth;
2337#endif 2517#endif
2338} 2518}
2339 2519
2340void 2520void
2341ev_unloop (EV_P_ int how) 2521ev_break (EV_P_ int how)
2342{ 2522{
2343 loop_done = how; 2523 loop_done = how;
2344} 2524}
2345 2525
2346void 2526void
… …
2393inline_size void 2573inline_size void
2394wlist_del (WL *head, WL elem) 2574wlist_del (WL *head, WL elem)
2395{ 2575{
2396 while (*head) 2576 while (*head)
2397 { 2577 {
2398 if (*head == elem) 2578 if (expect_true (*head == elem))
2399 { 2579 {
2400 *head = elem->next; 2580 *head = elem->next;
2401 return; 2581 break;
2402 } 2582 }
2403 2583
2404 head = &(*head)->next; 2584 head = &(*head)->next;
2405 } 2585 }
2406} 2586}
… …
2466 2646
2467 if (expect_false (ev_is_active (w))) 2647 if (expect_false (ev_is_active (w)))
2468 return; 2648 return;
2469 2649
2470 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2650 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2471 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2651 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2472 2652
2473 EV_FREQUENT_CHECK; 2653 EV_FREQUENT_CHECK;
2474 2654
2475 ev_start (EV_A_ (W)w, 1); 2655 ev_start (EV_A_ (W)w, 1);
2476 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2656 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2494 EV_FREQUENT_CHECK; 2674 EV_FREQUENT_CHECK;
2495 2675
2496 wlist_del (&anfds[w->fd].head, (WL)w); 2676 wlist_del (&anfds[w->fd].head, (WL)w);
2497 ev_stop (EV_A_ (W)w); 2677 ev_stop (EV_A_ (W)w);
2498 2678
2499 fd_change (EV_A_ w->fd, 1); 2679 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2500 2680
2501 EV_FREQUENT_CHECK; 2681 EV_FREQUENT_CHECK;
2502} 2682}
2503 2683
2504void noinline 2684void noinline
… …
2546 timers [active] = timers [timercnt + HEAP0]; 2726 timers [active] = timers [timercnt + HEAP0];
2547 adjustheap (timers, timercnt, active); 2727 adjustheap (timers, timercnt, active);
2548 } 2728 }
2549 } 2729 }
2550 2730
2551 EV_FREQUENT_CHECK;
2552
2553 ev_at (w) -= mn_now; 2731 ev_at (w) -= mn_now;
2554 2732
2555 ev_stop (EV_A_ (W)w); 2733 ev_stop (EV_A_ (W)w);
2734
2735 EV_FREQUENT_CHECK;
2556} 2736}
2557 2737
2558void noinline 2738void noinline
2559ev_timer_again (EV_P_ ev_timer *w) 2739ev_timer_again (EV_P_ ev_timer *w)
2560{ 2740{
… …
2596 if (w->reschedule_cb) 2776 if (w->reschedule_cb)
2597 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2777 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2598 else if (w->interval) 2778 else if (w->interval)
2599 { 2779 {
2600 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2780 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2601 /* this formula differs from the one in periodic_reify because we do not always round up */ 2781 periodic_recalc (EV_A_ w);
2602 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2603 } 2782 }
2604 else 2783 else
2605 ev_at (w) = w->offset; 2784 ev_at (w) = w->offset;
2606 2785
2607 EV_FREQUENT_CHECK; 2786 EV_FREQUENT_CHECK;
… …
2639 periodics [active] = periodics [periodiccnt + HEAP0]; 2818 periodics [active] = periodics [periodiccnt + HEAP0];
2640 adjustheap (periodics, periodiccnt, active); 2819 adjustheap (periodics, periodiccnt, active);
2641 } 2820 }
2642 } 2821 }
2643 2822
2644 EV_FREQUENT_CHECK;
2645
2646 ev_stop (EV_A_ (W)w); 2823 ev_stop (EV_A_ (W)w);
2824
2825 EV_FREQUENT_CHECK;
2647} 2826}
2648 2827
2649void noinline 2828void noinline
2650ev_periodic_again (EV_P_ ev_periodic *w) 2829ev_periodic_again (EV_P_ ev_periodic *w)
2651{ 2830{
… …
2657 2836
2658#ifndef SA_RESTART 2837#ifndef SA_RESTART
2659# define SA_RESTART 0 2838# define SA_RESTART 0
2660#endif 2839#endif
2661 2840
2841#if EV_SIGNAL_ENABLE
2842
2662void noinline 2843void noinline
2663ev_signal_start (EV_P_ ev_signal *w) 2844ev_signal_start (EV_P_ ev_signal *w)
2664{ 2845{
2665 if (expect_false (ev_is_active (w))) 2846 if (expect_false (ev_is_active (w)))
2666 return; 2847 return;
2667 2848
2668 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG)); 2849 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2669 2850
2670#if EV_MULTIPLICITY 2851#if EV_MULTIPLICITY
2671 assert (("libev: tried to attach to a signal from two different loops", 2852 assert (("libev: a signal must not be attached to two different loops",
2672 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 2853 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2673 2854
2674 signals [w->signum - 1].loop = EV_A; 2855 signals [w->signum - 1].loop = EV_A;
2675#endif 2856#endif
2676 2857
… …
2712 if (!((WL)w)->next) 2893 if (!((WL)w)->next)
2713# if EV_USE_SIGNALFD 2894# if EV_USE_SIGNALFD
2714 if (sigfd < 0) /*TODO*/ 2895 if (sigfd < 0) /*TODO*/
2715# endif 2896# endif
2716 { 2897 {
2717# if _WIN32 2898# ifdef _WIN32
2899 evpipe_init (EV_A);
2900
2718 signal (w->signum, ev_sighandler); 2901 signal (w->signum, ev_sighandler);
2719# else 2902# else
2720 struct sigaction sa; 2903 struct sigaction sa;
2721 2904
2722 evpipe_init (EV_A); 2905 evpipe_init (EV_A);
… …
2724 sa.sa_handler = ev_sighandler; 2907 sa.sa_handler = ev_sighandler;
2725 sigfillset (&sa.sa_mask); 2908 sigfillset (&sa.sa_mask);
2726 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2909 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2727 sigaction (w->signum, &sa, 0); 2910 sigaction (w->signum, &sa, 0);
2728 2911
2912 if (origflags & EVFLAG_NOSIGMASK)
2913 {
2729 sigemptyset (&sa.sa_mask); 2914 sigemptyset (&sa.sa_mask);
2730 sigaddset (&sa.sa_mask, w->signum); 2915 sigaddset (&sa.sa_mask, w->signum);
2731 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2916 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2917 }
2732#endif 2918#endif
2733 } 2919 }
2734 2920
2735 EV_FREQUENT_CHECK; 2921 EV_FREQUENT_CHECK;
2736} 2922}
… …
2747 wlist_del (&signals [w->signum - 1].head, (WL)w); 2933 wlist_del (&signals [w->signum - 1].head, (WL)w);
2748 ev_stop (EV_A_ (W)w); 2934 ev_stop (EV_A_ (W)w);
2749 2935
2750 if (!signals [w->signum - 1].head) 2936 if (!signals [w->signum - 1].head)
2751 { 2937 {
2752 #if EV_MULTIPLICITY 2938#if EV_MULTIPLICITY
2753 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2939 signals [w->signum - 1].loop = 0; /* unattach from signal */
2754 #endif 2940#endif
2755 #if EV_USE_SIGNALFD 2941#if EV_USE_SIGNALFD
2756 if (sigfd >= 0) 2942 if (sigfd >= 0)
2757 { 2943 {
2758 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2944 sigset_t ss;
2945
2946 sigemptyset (&ss);
2947 sigaddset (&ss, w->signum);
2759 sigdelset (&sigfd_set, w->signum); 2948 sigdelset (&sigfd_set, w->signum);
2949
2760 signalfd (sigfd, &sigfd_set, 0); 2950 signalfd (sigfd, &sigfd_set, 0);
2761 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2951 sigprocmask (SIG_UNBLOCK, &ss, 0);
2762 /*TODO: maybe unblock signal? */
2763 } 2952 }
2764 else 2953 else
2765 #endif 2954#endif
2766 signal (w->signum, SIG_DFL); 2955 signal (w->signum, SIG_DFL);
2767 } 2956 }
2768 2957
2769 EV_FREQUENT_CHECK; 2958 EV_FREQUENT_CHECK;
2770} 2959}
2960
2961#endif
2962
2963#if EV_CHILD_ENABLE
2771 2964
2772void 2965void
2773ev_child_start (EV_P_ ev_child *w) 2966ev_child_start (EV_P_ ev_child *w)
2774{ 2967{
2775#if EV_MULTIPLICITY 2968#if EV_MULTIPLICITY
… …
2779 return; 2972 return;
2780 2973
2781 EV_FREQUENT_CHECK; 2974 EV_FREQUENT_CHECK;
2782 2975
2783 ev_start (EV_A_ (W)w, 1); 2976 ev_start (EV_A_ (W)w, 1);
2784 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2977 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2785 2978
2786 EV_FREQUENT_CHECK; 2979 EV_FREQUENT_CHECK;
2787} 2980}
2788 2981
2789void 2982void
… …
2793 if (expect_false (!ev_is_active (w))) 2986 if (expect_false (!ev_is_active (w)))
2794 return; 2987 return;
2795 2988
2796 EV_FREQUENT_CHECK; 2989 EV_FREQUENT_CHECK;
2797 2990
2798 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2991 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2799 ev_stop (EV_A_ (W)w); 2992 ev_stop (EV_A_ (W)w);
2800 2993
2801 EV_FREQUENT_CHECK; 2994 EV_FREQUENT_CHECK;
2802} 2995}
2996
2997#endif
2803 2998
2804#if EV_STAT_ENABLE 2999#if EV_STAT_ENABLE
2805 3000
2806# ifdef _WIN32 3001# ifdef _WIN32
2807# undef lstat 3002# undef lstat
… …
2813#define MIN_STAT_INTERVAL 0.1074891 3008#define MIN_STAT_INTERVAL 0.1074891
2814 3009
2815static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 3010static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2816 3011
2817#if EV_USE_INOTIFY 3012#if EV_USE_INOTIFY
2818# define EV_INOTIFY_BUFSIZE 8192 3013
3014/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
3015# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2819 3016
2820static void noinline 3017static void noinline
2821infy_add (EV_P_ ev_stat *w) 3018infy_add (EV_P_ ev_stat *w)
2822{ 3019{
2823 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); 3020 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);
2824 3021
2825 if (w->wd < 0) 3022 if (w->wd >= 0)
3023 {
3024 struct statfs sfs;
3025
3026 /* now local changes will be tracked by inotify, but remote changes won't */
3027 /* unless the filesystem is known to be local, we therefore still poll */
3028 /* also do poll on <2.6.25, but with normal frequency */
3029
3030 if (!fs_2625)
3031 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3032 else if (!statfs (w->path, &sfs)
3033 && (sfs.f_type == 0x1373 /* devfs */
3034 || sfs.f_type == 0xEF53 /* ext2/3 */
3035 || sfs.f_type == 0x3153464a /* jfs */
3036 || sfs.f_type == 0x52654973 /* reiser3 */
3037 || sfs.f_type == 0x01021994 /* tempfs */
3038 || sfs.f_type == 0x58465342 /* xfs */))
3039 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3040 else
3041 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2826 { 3042 }
3043 else
3044 {
3045 /* can't use inotify, continue to stat */
2827 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3046 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2828 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2829 3047
2830 /* monitor some parent directory for speedup hints */ 3048 /* if path is not there, monitor some parent directory for speedup hints */
2831 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3049 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2832 /* but an efficiency issue only */ 3050 /* but an efficiency issue only */
2833 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3051 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2834 { 3052 {
2835 char path [4096]; 3053 char path [4096];
… …
2851 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3069 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2852 } 3070 }
2853 } 3071 }
2854 3072
2855 if (w->wd >= 0) 3073 if (w->wd >= 0)
2856 {
2857 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3074 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2858 3075
2859 /* now local changes will be tracked by inotify, but remote changes won't */ 3076 /* now re-arm timer, if required */
2860 /* unless the filesystem it known to be local, we therefore still poll */ 3077 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2861 /* also do poll on <2.6.25, but with normal frequency */
2862 struct statfs sfs;
2863
2864 if (fs_2625 && !statfs (w->path, &sfs))
2865 if (sfs.f_type == 0x1373 /* devfs */
2866 || sfs.f_type == 0xEF53 /* ext2/3 */
2867 || sfs.f_type == 0x3153464a /* jfs */
2868 || sfs.f_type == 0x52654973 /* reiser3 */
2869 || sfs.f_type == 0x01021994 /* tempfs */
2870 || sfs.f_type == 0x58465342 /* xfs */)
2871 return;
2872
2873 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2874 ev_timer_again (EV_A_ &w->timer); 3078 ev_timer_again (EV_A_ &w->timer);
2875 } 3079 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2876} 3080}
2877 3081
2878static void noinline 3082static void noinline
2879infy_del (EV_P_ ev_stat *w) 3083infy_del (EV_P_ ev_stat *w)
2880{ 3084{
… …
2883 3087
2884 if (wd < 0) 3088 if (wd < 0)
2885 return; 3089 return;
2886 3090
2887 w->wd = -2; 3091 w->wd = -2;
2888 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3092 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2889 wlist_del (&fs_hash [slot].head, (WL)w); 3093 wlist_del (&fs_hash [slot].head, (WL)w);
2890 3094
2891 /* remove this watcher, if others are watching it, they will rearm */ 3095 /* remove this watcher, if others are watching it, they will rearm */
2892 inotify_rm_watch (fs_fd, wd); 3096 inotify_rm_watch (fs_fd, wd);
2893} 3097}
… …
2895static void noinline 3099static void noinline
2896infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3100infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2897{ 3101{
2898 if (slot < 0) 3102 if (slot < 0)
2899 /* overflow, need to check for all hash slots */ 3103 /* overflow, need to check for all hash slots */
2900 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3104 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2901 infy_wd (EV_A_ slot, wd, ev); 3105 infy_wd (EV_A_ slot, wd, ev);
2902 else 3106 else
2903 { 3107 {
2904 WL w_; 3108 WL w_;
2905 3109
2906 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3110 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2907 { 3111 {
2908 ev_stat *w = (ev_stat *)w_; 3112 ev_stat *w = (ev_stat *)w_;
2909 w_ = w_->next; /* lets us remove this watcher and all before it */ 3113 w_ = w_->next; /* lets us remove this watcher and all before it */
2910 3114
2911 if (w->wd == wd || wd == -1) 3115 if (w->wd == wd || wd == -1)
2912 { 3116 {
2913 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3117 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2914 { 3118 {
2915 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3119 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2916 w->wd = -1; 3120 w->wd = -1;
2917 infy_add (EV_A_ w); /* re-add, no matter what */ 3121 infy_add (EV_A_ w); /* re-add, no matter what */
2918 } 3122 }
2919 3123
2920 stat_timer_cb (EV_A_ &w->timer, 0); 3124 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2925 3129
2926static void 3130static void
2927infy_cb (EV_P_ ev_io *w, int revents) 3131infy_cb (EV_P_ ev_io *w, int revents)
2928{ 3132{
2929 char buf [EV_INOTIFY_BUFSIZE]; 3133 char buf [EV_INOTIFY_BUFSIZE];
2930 struct inotify_event *ev = (struct inotify_event *)buf;
2931 int ofs; 3134 int ofs;
2932 int len = read (fs_fd, buf, sizeof (buf)); 3135 int len = read (fs_fd, buf, sizeof (buf));
2933 3136
2934 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3137 for (ofs = 0; ofs < len; )
3138 {
3139 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2935 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3140 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3141 ofs += sizeof (struct inotify_event) + ev->len;
3142 }
2936} 3143}
2937 3144
2938inline_size void 3145inline_size void
2939check_2625 (EV_P) 3146ev_check_2625 (EV_P)
2940{ 3147{
2941 /* kernels < 2.6.25 are borked 3148 /* kernels < 2.6.25 are borked
2942 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3149 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2943 */ 3150 */
2944 struct utsname buf; 3151 if (ev_linux_version () < 0x020619)
2945 int major, minor, micro;
2946
2947 if (uname (&buf))
2948 return; 3152 return;
2949 3153
2950 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2951 return;
2952
2953 if (major < 2
2954 || (major == 2 && minor < 6)
2955 || (major == 2 && minor == 6 && micro < 25))
2956 return;
2957
2958 fs_2625 = 1; 3154 fs_2625 = 1;
3155}
3156
3157inline_size int
3158infy_newfd (void)
3159{
3160#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3161 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3162 if (fd >= 0)
3163 return fd;
3164#endif
3165 return inotify_init ();
2959} 3166}
2960 3167
2961inline_size void 3168inline_size void
2962infy_init (EV_P) 3169infy_init (EV_P)
2963{ 3170{
2964 if (fs_fd != -2) 3171 if (fs_fd != -2)
2965 return; 3172 return;
2966 3173
2967 fs_fd = -1; 3174 fs_fd = -1;
2968 3175
2969 check_2625 (EV_A); 3176 ev_check_2625 (EV_A);
2970 3177
2971 fs_fd = inotify_init (); 3178 fs_fd = infy_newfd ();
2972 3179
2973 if (fs_fd >= 0) 3180 if (fs_fd >= 0)
2974 { 3181 {
3182 fd_intern (fs_fd);
2975 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3183 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2976 ev_set_priority (&fs_w, EV_MAXPRI); 3184 ev_set_priority (&fs_w, EV_MAXPRI);
2977 ev_io_start (EV_A_ &fs_w); 3185 ev_io_start (EV_A_ &fs_w);
3186 ev_unref (EV_A);
2978 } 3187 }
2979} 3188}
2980 3189
2981inline_size void 3190inline_size void
2982infy_fork (EV_P) 3191infy_fork (EV_P)
… …
2984 int slot; 3193 int slot;
2985 3194
2986 if (fs_fd < 0) 3195 if (fs_fd < 0)
2987 return; 3196 return;
2988 3197
3198 ev_ref (EV_A);
3199 ev_io_stop (EV_A_ &fs_w);
2989 close (fs_fd); 3200 close (fs_fd);
2990 fs_fd = inotify_init (); 3201 fs_fd = infy_newfd ();
2991 3202
3203 if (fs_fd >= 0)
3204 {
3205 fd_intern (fs_fd);
3206 ev_io_set (&fs_w, fs_fd, EV_READ);
3207 ev_io_start (EV_A_ &fs_w);
3208 ev_unref (EV_A);
3209 }
3210
2992 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3211 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2993 { 3212 {
2994 WL w_ = fs_hash [slot].head; 3213 WL w_ = fs_hash [slot].head;
2995 fs_hash [slot].head = 0; 3214 fs_hash [slot].head = 0;
2996 3215
2997 while (w_) 3216 while (w_)
… …
3002 w->wd = -1; 3221 w->wd = -1;
3003 3222
3004 if (fs_fd >= 0) 3223 if (fs_fd >= 0)
3005 infy_add (EV_A_ w); /* re-add, no matter what */ 3224 infy_add (EV_A_ w); /* re-add, no matter what */
3006 else 3225 else
3226 {
3227 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3228 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3007 ev_timer_again (EV_A_ &w->timer); 3229 ev_timer_again (EV_A_ &w->timer);
3230 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3231 }
3008 } 3232 }
3009 } 3233 }
3010} 3234}
3011 3235
3012#endif 3236#endif
… …
3029static void noinline 3253static void noinline
3030stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3254stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3031{ 3255{
3032 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3256 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3033 3257
3034 /* we copy this here each the time so that */ 3258 ev_statdata prev = w->attr;
3035 /* prev has the old value when the callback gets invoked */
3036 w->prev = w->attr;
3037 ev_stat_stat (EV_A_ w); 3259 ev_stat_stat (EV_A_ w);
3038 3260
3039 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3261 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3040 if ( 3262 if (
3041 w->prev.st_dev != w->attr.st_dev 3263 prev.st_dev != w->attr.st_dev
3042 || w->prev.st_ino != w->attr.st_ino 3264 || prev.st_ino != w->attr.st_ino
3043 || w->prev.st_mode != w->attr.st_mode 3265 || prev.st_mode != w->attr.st_mode
3044 || w->prev.st_nlink != w->attr.st_nlink 3266 || prev.st_nlink != w->attr.st_nlink
3045 || w->prev.st_uid != w->attr.st_uid 3267 || prev.st_uid != w->attr.st_uid
3046 || w->prev.st_gid != w->attr.st_gid 3268 || prev.st_gid != w->attr.st_gid
3047 || w->prev.st_rdev != w->attr.st_rdev 3269 || prev.st_rdev != w->attr.st_rdev
3048 || w->prev.st_size != w->attr.st_size 3270 || prev.st_size != w->attr.st_size
3049 || w->prev.st_atime != w->attr.st_atime 3271 || prev.st_atime != w->attr.st_atime
3050 || w->prev.st_mtime != w->attr.st_mtime 3272 || prev.st_mtime != w->attr.st_mtime
3051 || w->prev.st_ctime != w->attr.st_ctime 3273 || prev.st_ctime != w->attr.st_ctime
3052 ) { 3274 ) {
3275 /* we only update w->prev on actual differences */
3276 /* in case we test more often than invoke the callback, */
3277 /* to ensure that prev is always different to attr */
3278 w->prev = prev;
3279
3053 #if EV_USE_INOTIFY 3280 #if EV_USE_INOTIFY
3054 if (fs_fd >= 0) 3281 if (fs_fd >= 0)
3055 { 3282 {
3056 infy_del (EV_A_ w); 3283 infy_del (EV_A_ w);
3057 infy_add (EV_A_ w); 3284 infy_add (EV_A_ w);
… …
3082 3309
3083 if (fs_fd >= 0) 3310 if (fs_fd >= 0)
3084 infy_add (EV_A_ w); 3311 infy_add (EV_A_ w);
3085 else 3312 else
3086#endif 3313#endif
3314 {
3087 ev_timer_again (EV_A_ &w->timer); 3315 ev_timer_again (EV_A_ &w->timer);
3316 ev_unref (EV_A);
3317 }
3088 3318
3089 ev_start (EV_A_ (W)w, 1); 3319 ev_start (EV_A_ (W)w, 1);
3090 3320
3091 EV_FREQUENT_CHECK; 3321 EV_FREQUENT_CHECK;
3092} 3322}
… …
3101 EV_FREQUENT_CHECK; 3331 EV_FREQUENT_CHECK;
3102 3332
3103#if EV_USE_INOTIFY 3333#if EV_USE_INOTIFY
3104 infy_del (EV_A_ w); 3334 infy_del (EV_A_ w);
3105#endif 3335#endif
3336
3337 if (ev_is_active (&w->timer))
3338 {
3339 ev_ref (EV_A);
3106 ev_timer_stop (EV_A_ &w->timer); 3340 ev_timer_stop (EV_A_ &w->timer);
3341 }
3107 3342
3108 ev_stop (EV_A_ (W)w); 3343 ev_stop (EV_A_ (W)w);
3109 3344
3110 EV_FREQUENT_CHECK; 3345 EV_FREQUENT_CHECK;
3111} 3346}
… …
3156 3391
3157 EV_FREQUENT_CHECK; 3392 EV_FREQUENT_CHECK;
3158} 3393}
3159#endif 3394#endif
3160 3395
3396#if EV_PREPARE_ENABLE
3161void 3397void
3162ev_prepare_start (EV_P_ ev_prepare *w) 3398ev_prepare_start (EV_P_ ev_prepare *w)
3163{ 3399{
3164 if (expect_false (ev_is_active (w))) 3400 if (expect_false (ev_is_active (w)))
3165 return; 3401 return;
… …
3191 3427
3192 ev_stop (EV_A_ (W)w); 3428 ev_stop (EV_A_ (W)w);
3193 3429
3194 EV_FREQUENT_CHECK; 3430 EV_FREQUENT_CHECK;
3195} 3431}
3432#endif
3196 3433
3434#if EV_CHECK_ENABLE
3197void 3435void
3198ev_check_start (EV_P_ ev_check *w) 3436ev_check_start (EV_P_ ev_check *w)
3199{ 3437{
3200 if (expect_false (ev_is_active (w))) 3438 if (expect_false (ev_is_active (w)))
3201 return; 3439 return;
… …
3227 3465
3228 ev_stop (EV_A_ (W)w); 3466 ev_stop (EV_A_ (W)w);
3229 3467
3230 EV_FREQUENT_CHECK; 3468 EV_FREQUENT_CHECK;
3231} 3469}
3470#endif
3232 3471
3233#if EV_EMBED_ENABLE 3472#if EV_EMBED_ENABLE
3234void noinline 3473void noinline
3235ev_embed_sweep (EV_P_ ev_embed *w) 3474ev_embed_sweep (EV_P_ ev_embed *w)
3236{ 3475{
3237 ev_loop (w->other, EVLOOP_NONBLOCK); 3476 ev_run (w->other, EVRUN_NOWAIT);
3238} 3477}
3239 3478
3240static void 3479static void
3241embed_io_cb (EV_P_ ev_io *io, int revents) 3480embed_io_cb (EV_P_ ev_io *io, int revents)
3242{ 3481{
3243 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3482 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3244 3483
3245 if (ev_cb (w)) 3484 if (ev_cb (w))
3246 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3485 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3247 else 3486 else
3248 ev_loop (w->other, EVLOOP_NONBLOCK); 3487 ev_run (w->other, EVRUN_NOWAIT);
3249} 3488}
3250 3489
3251static void 3490static void
3252embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3491embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3253{ 3492{
… …
3257 EV_P = w->other; 3496 EV_P = w->other;
3258 3497
3259 while (fdchangecnt) 3498 while (fdchangecnt)
3260 { 3499 {
3261 fd_reify (EV_A); 3500 fd_reify (EV_A);
3262 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3501 ev_run (EV_A_ EVRUN_NOWAIT);
3263 } 3502 }
3264 } 3503 }
3265} 3504}
3266 3505
3267static void 3506static void
… …
3273 3512
3274 { 3513 {
3275 EV_P = w->other; 3514 EV_P = w->other;
3276 3515
3277 ev_loop_fork (EV_A); 3516 ev_loop_fork (EV_A);
3278 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3517 ev_run (EV_A_ EVRUN_NOWAIT);
3279 } 3518 }
3280 3519
3281 ev_embed_start (EV_A_ w); 3520 ev_embed_start (EV_A_ w);
3282} 3521}
3283 3522
… …
3331 3570
3332 ev_io_stop (EV_A_ &w->io); 3571 ev_io_stop (EV_A_ &w->io);
3333 ev_prepare_stop (EV_A_ &w->prepare); 3572 ev_prepare_stop (EV_A_ &w->prepare);
3334 ev_fork_stop (EV_A_ &w->fork); 3573 ev_fork_stop (EV_A_ &w->fork);
3335 3574
3575 ev_stop (EV_A_ (W)w);
3576
3336 EV_FREQUENT_CHECK; 3577 EV_FREQUENT_CHECK;
3337} 3578}
3338#endif 3579#endif
3339 3580
3340#if EV_FORK_ENABLE 3581#if EV_FORK_ENABLE
… …
3373 3614
3374 EV_FREQUENT_CHECK; 3615 EV_FREQUENT_CHECK;
3375} 3616}
3376#endif 3617#endif
3377 3618
3378#if EV_ASYNC_ENABLE 3619#if EV_CLEANUP_ENABLE
3379void 3620void
3380ev_async_start (EV_P_ ev_async *w) 3621ev_cleanup_start (EV_P_ ev_cleanup *w)
3381{ 3622{
3382 if (expect_false (ev_is_active (w))) 3623 if (expect_false (ev_is_active (w)))
3383 return; 3624 return;
3625
3626 EV_FREQUENT_CHECK;
3627
3628 ev_start (EV_A_ (W)w, ++cleanupcnt);
3629 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3630 cleanups [cleanupcnt - 1] = w;
3631
3632 /* cleanup watchers should never keep a refcount on the loop */
3633 ev_unref (EV_A);
3634 EV_FREQUENT_CHECK;
3635}
3636
3637void
3638ev_cleanup_stop (EV_P_ ev_cleanup *w)
3639{
3640 clear_pending (EV_A_ (W)w);
3641 if (expect_false (!ev_is_active (w)))
3642 return;
3643
3644 EV_FREQUENT_CHECK;
3645 ev_ref (EV_A);
3646
3647 {
3648 int active = ev_active (w);
3649
3650 cleanups [active - 1] = cleanups [--cleanupcnt];
3651 ev_active (cleanups [active - 1]) = active;
3652 }
3653
3654 ev_stop (EV_A_ (W)w);
3655
3656 EV_FREQUENT_CHECK;
3657}
3658#endif
3659
3660#if EV_ASYNC_ENABLE
3661void
3662ev_async_start (EV_P_ ev_async *w)
3663{
3664 if (expect_false (ev_is_active (w)))
3665 return;
3666
3667 w->sent = 0;
3384 3668
3385 evpipe_init (EV_A); 3669 evpipe_init (EV_A);
3386 3670
3387 EV_FREQUENT_CHECK; 3671 EV_FREQUENT_CHECK;
3388 3672
… …
3416 3700
3417void 3701void
3418ev_async_send (EV_P_ ev_async *w) 3702ev_async_send (EV_P_ ev_async *w)
3419{ 3703{
3420 w->sent = 1; 3704 w->sent = 1;
3421 evpipe_write (EV_A_ &gotasync); 3705 evpipe_write (EV_A_ &async_pending);
3422} 3706}
3423#endif 3707#endif
3424 3708
3425/*****************************************************************************/ 3709/*****************************************************************************/
3426 3710
… …
3466{ 3750{
3467 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3751 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3468 3752
3469 if (expect_false (!once)) 3753 if (expect_false (!once))
3470 { 3754 {
3471 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3755 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3472 return; 3756 return;
3473 } 3757 }
3474 3758
3475 once->cb = cb; 3759 once->cb = cb;
3476 once->arg = arg; 3760 once->arg = arg;
… …
3563 if (types & EV_ASYNC) 3847 if (types & EV_ASYNC)
3564 for (i = asynccnt; i--; ) 3848 for (i = asynccnt; i--; )
3565 cb (EV_A_ EV_ASYNC, asyncs [i]); 3849 cb (EV_A_ EV_ASYNC, asyncs [i]);
3566#endif 3850#endif
3567 3851
3852#if EV_PREPARE_ENABLE
3568 if (types & EV_PREPARE) 3853 if (types & EV_PREPARE)
3569 for (i = preparecnt; i--; ) 3854 for (i = preparecnt; i--; )
3570#if EV_EMBED_ENABLE 3855# if EV_EMBED_ENABLE
3571 if (ev_cb (prepares [i]) != embed_prepare_cb) 3856 if (ev_cb (prepares [i]) != embed_prepare_cb)
3572#endif 3857# endif
3573 cb (EV_A_ EV_PREPARE, prepares [i]); 3858 cb (EV_A_ EV_PREPARE, prepares [i]);
3859#endif
3574 3860
3861#if EV_CHECK_ENABLE
3575 if (types & EV_CHECK) 3862 if (types & EV_CHECK)
3576 for (i = checkcnt; i--; ) 3863 for (i = checkcnt; i--; )
3577 cb (EV_A_ EV_CHECK, checks [i]); 3864 cb (EV_A_ EV_CHECK, checks [i]);
3865#endif
3578 3866
3867#if EV_SIGNAL_ENABLE
3579 if (types & EV_SIGNAL) 3868 if (types & EV_SIGNAL)
3580 for (i = 0; i < EV_NSIG - 1; ++i) 3869 for (i = 0; i < EV_NSIG - 1; ++i)
3581 for (wl = signals [i].head; wl; ) 3870 for (wl = signals [i].head; wl; )
3582 { 3871 {
3583 wn = wl->next; 3872 wn = wl->next;
3584 cb (EV_A_ EV_SIGNAL, wl); 3873 cb (EV_A_ EV_SIGNAL, wl);
3585 wl = wn; 3874 wl = wn;
3586 } 3875 }
3876#endif
3587 3877
3878#if EV_CHILD_ENABLE
3588 if (types & EV_CHILD) 3879 if (types & EV_CHILD)
3589 for (i = EV_PID_HASHSIZE; i--; ) 3880 for (i = (EV_PID_HASHSIZE); i--; )
3590 for (wl = childs [i]; wl; ) 3881 for (wl = childs [i]; wl; )
3591 { 3882 {
3592 wn = wl->next; 3883 wn = wl->next;
3593 cb (EV_A_ EV_CHILD, wl); 3884 cb (EV_A_ EV_CHILD, wl);
3594 wl = wn; 3885 wl = wn;
3595 } 3886 }
3887#endif
3596/* EV_STAT 0x00001000 /* stat data changed */ 3888/* EV_STAT 0x00001000 /* stat data changed */
3597/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3889/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3598} 3890}
3599#endif 3891#endif
3600 3892
3601#if EV_MULTIPLICITY 3893#if EV_MULTIPLICITY
3602 #include "ev_wrap.h" 3894 #include "ev_wrap.h"
3603#endif 3895#endif
3604 3896
3605#ifdef __cplusplus 3897EV_CPP(})
3606}
3607#endif
3608 3898

Diff Legend

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