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

Comparing libev/ev.c (file contents):
Revision 1.313 by root, Wed Aug 19 23:44:51 2009 UTC vs.
Revision 1.369 by root, Sun Jan 23 18:53:06 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#if defined (EV_NSIG) 210#if defined (EV_NSIG)
… …
204#elif defined (MAXSIG) 222#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 223# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 224#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 225# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 226#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 228#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 230#else
213# error "unable to find value for NSIG, please report" 231# error "unable to find value for NSIG, please report"
214/* 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! :) */
215# define EV_NSIG 65 234# define EV_NSIG 65
216#endif 235#endif
217 236
218#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
220# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
221# else 240# else
222# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
223# endif 242# endif
224#endif 243#endif
225 244
226#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
227# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
228# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
229# else 248# else
230# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
231# endif 250# endif
232#endif 251#endif
233 252
… …
235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
236#endif 255#endif
237 256
238#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
239# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
240# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
241# else 260# else
242# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
243# endif 262# endif
244#endif 263#endif
245 264
246#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
247# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
248#endif 267#endif
249 268
250#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
251# ifdef _WIN32 270# ifdef _WIN32
252# define EV_USE_POLL 0 271# define EV_USE_POLL 0
253# else 272# else
254# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
255# endif 274# endif
256#endif 275#endif
257 276
258#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
259# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
260# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
261# else 280# else
262# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
263# endif 282# endif
264#endif 283#endif
265 284
… …
271# define EV_USE_PORT 0 290# define EV_USE_PORT 0
272#endif 291#endif
273 292
274#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
275# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
276# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
277# else 296# else
278# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
279# endif 298# endif
280#endif 299#endif
281 300
282#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
283# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
284# define EV_PID_HASHSIZE 1
285# else
286# define EV_PID_HASHSIZE 16
287# endif
288#endif 303#endif
289 304
290#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
291# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
292# define EV_INOTIFY_HASHSIZE 1
293# else
294# define EV_INOTIFY_HASHSIZE 16
295# endif
296#endif 307#endif
297 308
298#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
299# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
300# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
301# else 312# else
302# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
303# endif 314# endif
304#endif 315#endif
305 316
306#ifndef EV_USE_SIGNALFD 317#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1 319# define EV_USE_SIGNALFD EV_FEATURE_OS
309# else 320# else
310# define EV_USE_SIGNALFD 0 321# define EV_USE_SIGNALFD 0
311# endif 322# endif
312#endif 323#endif
313 324
… …
316# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
317# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
318#endif 329#endif
319 330
320#ifndef EV_VERIFY 331#ifndef EV_VERIFY
321# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
322#endif 333#endif
323 334
324#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
325# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
326#endif 337#endif
327 338
328#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
329# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
330#endif 341#endif
331 342
332/* 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, */
333/* which makes programs even slower. might work on other unices, too. */ 344/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL 345#if EV_USE_CLOCK_SYSCALL
… …
343# endif 354# endif
344#endif 355#endif
345 356
346/* 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 */
347 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
348#ifndef CLOCK_MONOTONIC 365#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 366# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 367# define EV_USE_MONOTONIC 0
351#endif 368#endif
352 369
… …
365# include <sys/select.h> 382# include <sys/select.h>
366# endif 383# endif
367#endif 384#endif
368 385
369#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
370# include <sys/utsname.h>
371# include <sys/statfs.h> 387# include <sys/statfs.h>
372# include <sys/inotify.h> 388# include <sys/inotify.h>
373/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
374# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
375# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
392# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
393# else 409# else
394# define EFD_CLOEXEC 02000000 410# define EFD_CLOEXEC 02000000
395# endif 411# endif
396# endif 412# endif
397# ifdef __cplusplus 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
398extern "C" { 414#endif
415
416#if EV_USE_SIGNALFD
417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
418# include <stdint.h>
419# ifndef SFD_NONBLOCK
420# define SFD_NONBLOCK O_NONBLOCK
399# endif 421# endif
400int eventfd (unsigned int initval, int flags); 422# ifndef SFD_CLOEXEC
401# ifdef __cplusplus 423# ifdef O_CLOEXEC
402} 424# define SFD_CLOEXEC O_CLOEXEC
425# else
426# define SFD_CLOEXEC 02000000
427# endif
403# endif 428# endif
404#endif 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
405 430
406#if EV_USE_SIGNALFD 431struct signalfd_siginfo
407# include <sys/signalfd.h> 432{
433 uint32_t ssi_signo;
434 char pad[128 - sizeof (uint32_t)];
435};
408#endif 436#endif
409 437
410/**/ 438/**/
411 439
412#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
413# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
414#else 442#else
415# define EV_FREQUENT_CHECK do { } while (0) 443# define EV_FREQUENT_CHECK do { } while (0)
416#endif 444#endif
417 445
418/* 446/*
… …
425 */ 453 */
426#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
427 455
428#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 456#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
429#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 457#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
430/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 458
459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
460#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
431 461
432#if __GNUC__ >= 4 462#if __GNUC__ >= 4
433# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
434# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
435#else 465#else
… …
442 472
443#define expect_false(expr) expect ((expr) != 0, 0) 473#define expect_false(expr) expect ((expr) != 0, 0)
444#define expect_true(expr) expect ((expr) != 0, 1) 474#define expect_true(expr) expect ((expr) != 0, 1)
445#define inline_size static inline 475#define inline_size static inline
446 476
447#if EV_MINIMAL 477#if EV_FEATURE_CODE
478# define inline_speed static inline
479#else
448# define inline_speed static noinline 480# define inline_speed static noinline
449#else
450# define inline_speed static inline
451#endif 481#endif
452 482
453#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
454 484
455#if EV_MINPRI == EV_MAXPRI 485#if EV_MINPRI == EV_MAXPRI
… …
468#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
469#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
470 500
471#if EV_USE_REALTIME 501#if EV_USE_REALTIME
472/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 502/* sig_atomic_t is used to avoid per-thread variables or locking but still */
473/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
474static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
475#endif 505#endif
476 506
477#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
478static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
480 510
481#ifndef EV_FD_TO_WIN32_HANDLE 511#ifndef EV_FD_TO_WIN32_HANDLE
482# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 512# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
483#endif 513#endif
484#ifndef EV_WIN32_HANDLE_TO_FD 514#ifndef EV_WIN32_HANDLE_TO_FD
485# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 515# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
486#endif 516#endif
487#ifndef EV_WIN32_CLOSE_FD 517#ifndef EV_WIN32_CLOSE_FD
488# define EV_WIN32_CLOSE_FD(fd) close (fd) 518# define EV_WIN32_CLOSE_FD(fd) close (fd)
489#endif 519#endif
490 520
491#ifdef _WIN32 521#ifdef _WIN32
492# include "ev_win32.c" 522# include "ev_win32.c"
493#endif 523#endif
494 524
495/*****************************************************************************/ 525/*****************************************************************************/
526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
531static unsigned int noinline
532ev_linux_version (void)
533{
534#ifdef __linux
535 unsigned int v = 0;
536 struct utsname buf;
537 int i;
538 char *p = buf.release;
539
540 if (uname (&buf))
541 return 0;
542
543 for (i = 3+1; --i; )
544 {
545 unsigned int c = 0;
546
547 for (;;)
548 {
549 if (*p >= '0' && *p <= '9')
550 c = c * 10 + *p++ - '0';
551 else
552 {
553 p += *p == '.';
554 break;
555 }
556 }
557
558 v = (v << 8) | c;
559 }
560
561 return v;
562#else
563 return 0;
564#endif
565}
566
567/*****************************************************************************/
568
569#if EV_AVOID_STDIO
570static void noinline
571ev_printerr (const char *msg)
572{
573 write (STDERR_FILENO, msg, strlen (msg));
574}
575#endif
496 576
497static void (*syserr_cb)(const char *msg); 577static void (*syserr_cb)(const char *msg);
498 578
499void 579void
500ev_set_syserr_cb (void (*cb)(const char *msg)) 580ev_set_syserr_cb (void (*cb)(const char *msg))
… …
510 590
511 if (syserr_cb) 591 if (syserr_cb)
512 syserr_cb (msg); 592 syserr_cb (msg);
513 else 593 else
514 { 594 {
595#if EV_AVOID_STDIO
596 ev_printerr (msg);
597 ev_printerr (": ");
598 ev_printerr (strerror (errno));
599 ev_printerr ("\n");
600#else
515 perror (msg); 601 perror (msg);
602#endif
516 abort (); 603 abort ();
517 } 604 }
518} 605}
519 606
520static void * 607static void *
521ev_realloc_emul (void *ptr, long size) 608ev_realloc_emul (void *ptr, long size)
522{ 609{
610#if __GLIBC__
611 return realloc (ptr, size);
612#else
523 /* some systems, notably openbsd and darwin, fail to properly 613 /* some systems, notably openbsd and darwin, fail to properly
524 * implement realloc (x, 0) (as required by both ansi c-98 and 614 * implement realloc (x, 0) (as required by both ansi c-89 and
525 * the single unix specification, so work around them here. 615 * the single unix specification, so work around them here.
526 */ 616 */
527 617
528 if (size) 618 if (size)
529 return realloc (ptr, size); 619 return realloc (ptr, size);
530 620
531 free (ptr); 621 free (ptr);
532 return 0; 622 return 0;
623#endif
533} 624}
534 625
535static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 626static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
536 627
537void 628void
… …
545{ 636{
546 ptr = alloc (ptr, size); 637 ptr = alloc (ptr, size);
547 638
548 if (!ptr && size) 639 if (!ptr && size)
549 { 640 {
641#if EV_AVOID_STDIO
642 ev_printerr ("(libev) memory allocation failed, aborting.\n");
643#else
550 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 644 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
645#endif
551 abort (); 646 abort ();
552 } 647 }
553 648
554 return ptr; 649 return ptr;
555} 650}
… …
571 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 666 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
572 unsigned char unused; 667 unsigned char unused;
573#if EV_USE_EPOLL 668#if EV_USE_EPOLL
574 unsigned int egen; /* generation counter to counter epoll bugs */ 669 unsigned int egen; /* generation counter to counter epoll bugs */
575#endif 670#endif
576#if EV_SELECT_IS_WINSOCKET 671#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
577 SOCKET handle; 672 SOCKET handle;
673#endif
674#if EV_USE_IOCP
675 OVERLAPPED or, ow;
578#endif 676#endif
579} ANFD; 677} ANFD;
580 678
581/* stores the pending event set for a given watcher */ 679/* stores the pending event set for a given watcher */
582typedef struct 680typedef struct
… …
637 735
638 static int ev_default_loop_ptr; 736 static int ev_default_loop_ptr;
639 737
640#endif 738#endif
641 739
642#if EV_MINIMAL < 2 740#if EV_FEATURE_API
643# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 741# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
644# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 742# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
645# define EV_INVOKE_PENDING invoke_cb (EV_A) 743# define EV_INVOKE_PENDING invoke_cb (EV_A)
646#else 744#else
647# define EV_RELEASE_CB (void)0 745# define EV_RELEASE_CB (void)0
648# define EV_ACQUIRE_CB (void)0 746# define EV_ACQUIRE_CB (void)0
649# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 747# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
650#endif 748#endif
651 749
652#define EVUNLOOP_RECURSE 0x80 750#define EVBREAK_RECURSE 0x80
653 751
654/*****************************************************************************/ 752/*****************************************************************************/
655 753
656#ifndef EV_HAVE_EV_TIME 754#ifndef EV_HAVE_EV_TIME
657ev_tstamp 755ev_tstamp
… …
701 if (delay > 0.) 799 if (delay > 0.)
702 { 800 {
703#if EV_USE_NANOSLEEP 801#if EV_USE_NANOSLEEP
704 struct timespec ts; 802 struct timespec ts;
705 803
706 ts.tv_sec = (time_t)delay; 804 EV_TS_SET (ts, delay);
707 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
708
709 nanosleep (&ts, 0); 805 nanosleep (&ts, 0);
710#elif defined(_WIN32) 806#elif defined(_WIN32)
711 Sleep ((unsigned long)(delay * 1e3)); 807 Sleep ((unsigned long)(delay * 1e3));
712#else 808#else
713 struct timeval tv; 809 struct timeval tv;
714 810
715 tv.tv_sec = (time_t)delay;
716 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
717
718 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 811 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
719 /* something not guaranteed by newer posix versions, but guaranteed */ 812 /* something not guaranteed by newer posix versions, but guaranteed */
720 /* by older ones */ 813 /* by older ones */
814 EV_TV_SET (tv, delay);
721 select (0, 0, 0, 0, &tv); 815 select (0, 0, 0, 0, &tv);
722#endif 816#endif
723 } 817 }
724} 818}
725 819
820inline_speed int
821ev_timeout_to_ms (ev_tstamp timeout)
822{
823 int ms = timeout * 1000. + .999999;
824
825 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
826}
827
726/*****************************************************************************/ 828/*****************************************************************************/
727 829
728#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 830#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
729 831
730/* find a suitable new size for the given array, */ 832/* find a suitable new size for the given array, */
731/* hopefully by rounding to a ncie-to-malloc size */ 833/* hopefully by rounding to a nice-to-malloc size */
732inline_size int 834inline_size int
733array_nextsize (int elem, int cur, int cnt) 835array_nextsize (int elem, int cur, int cnt)
734{ 836{
735 int ncur = cur + 1; 837 int ncur = cur + 1;
736 838
… …
832} 934}
833 935
834/*****************************************************************************/ 936/*****************************************************************************/
835 937
836inline_speed void 938inline_speed void
837fd_event_nc (EV_P_ int fd, int revents) 939fd_event_nocheck (EV_P_ int fd, int revents)
838{ 940{
839 ANFD *anfd = anfds + fd; 941 ANFD *anfd = anfds + fd;
840 ev_io *w; 942 ev_io *w;
841 943
842 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 944 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
854fd_event (EV_P_ int fd, int revents) 956fd_event (EV_P_ int fd, int revents)
855{ 957{
856 ANFD *anfd = anfds + fd; 958 ANFD *anfd = anfds + fd;
857 959
858 if (expect_true (!anfd->reify)) 960 if (expect_true (!anfd->reify))
859 fd_event_nc (EV_A_ fd, revents); 961 fd_event_nocheck (EV_A_ fd, revents);
860} 962}
861 963
862void 964void
863ev_feed_fd_event (EV_P_ int fd, int revents) 965ev_feed_fd_event (EV_P_ int fd, int revents)
864{ 966{
865 if (fd >= 0 && fd < anfdmax) 967 if (fd >= 0 && fd < anfdmax)
866 fd_event_nc (EV_A_ fd, revents); 968 fd_event_nocheck (EV_A_ fd, revents);
867} 969}
868 970
869/* make sure the external fd watch events are in-sync */ 971/* make sure the external fd watch events are in-sync */
870/* with the kernel/libev internal state */ 972/* with the kernel/libev internal state */
871inline_size void 973inline_size void
… …
877 { 979 {
878 int fd = fdchanges [i]; 980 int fd = fdchanges [i];
879 ANFD *anfd = anfds + fd; 981 ANFD *anfd = anfds + fd;
880 ev_io *w; 982 ev_io *w;
881 983
882 unsigned char events = 0; 984 unsigned char o_events = anfd->events;
985 unsigned char o_reify = anfd->reify;
883 986
884 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 987 anfd->reify = 0;
885 events |= (unsigned char)w->events;
886 988
887#if EV_SELECT_IS_WINSOCKET 989#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
888 if (events) 990 if (o_reify & EV__IOFDSET)
889 { 991 {
890 unsigned long arg; 992 unsigned long arg;
891 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 993 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
892 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 994 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
995 printf ("oi %d %x\n", fd, anfd->handle);//D
893 } 996 }
894#endif 997#endif
895 998
999 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
896 { 1000 {
897 unsigned char o_events = anfd->events;
898 unsigned char o_reify = anfd->reify;
899
900 anfd->reify = 0;
901 anfd->events = events; 1001 anfd->events = 0;
902 1002
903 if (o_events != events || o_reify & EV__IOFDSET) 1003 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1004 anfd->events |= (unsigned char)w->events;
1005
1006 if (o_events != anfd->events)
1007 o_reify = EV__IOFDSET; /* actually |= */
1008 }
1009
1010 if (o_reify & EV__IOFDSET)
904 backend_modify (EV_A_ fd, o_events, events); 1011 backend_modify (EV_A_ fd, o_events, anfd->events);
905 }
906 } 1012 }
907 1013
908 fdchangecnt = 0; 1014 fdchangecnt = 0;
909} 1015}
910 1016
… …
934 ev_io_stop (EV_A_ w); 1040 ev_io_stop (EV_A_ w);
935 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1041 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
936 } 1042 }
937} 1043}
938 1044
939/* check whether the given fd is atcually valid, for error recovery */ 1045/* check whether the given fd is actually valid, for error recovery */
940inline_size int 1046inline_size int
941fd_valid (int fd) 1047fd_valid (int fd)
942{ 1048{
943#ifdef _WIN32 1049#ifdef _WIN32
944 return _get_osfhandle (fd) != -1; 1050 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
945#else 1051#else
946 return fcntl (fd, F_GETFD) != -1; 1052 return fcntl (fd, F_GETFD) != -1;
947#endif 1053#endif
948} 1054}
949 1055
… …
986 anfds [fd].emask = 0; 1092 anfds [fd].emask = 0;
987 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1093 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
988 } 1094 }
989} 1095}
990 1096
1097/* used to prepare libev internal fd's */
1098/* this is not fork-safe */
1099inline_speed void
1100fd_intern (int fd)
1101{
1102#ifdef _WIN32
1103 unsigned long arg = 1;
1104 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1105#else
1106 fcntl (fd, F_SETFD, FD_CLOEXEC);
1107 fcntl (fd, F_SETFL, O_NONBLOCK);
1108#endif
1109}
1110
991/*****************************************************************************/ 1111/*****************************************************************************/
992 1112
993/* 1113/*
994 * the heap functions want a real array index. array index 0 uis guaranteed to not 1114 * the heap functions want a real array index. array index 0 is guaranteed to not
995 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1115 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
996 * the branching factor of the d-tree. 1116 * the branching factor of the d-tree.
997 */ 1117 */
998 1118
999/* 1119/*
… …
1147 1267
1148static ANSIG signals [EV_NSIG - 1]; 1268static ANSIG signals [EV_NSIG - 1];
1149 1269
1150/*****************************************************************************/ 1270/*****************************************************************************/
1151 1271
1152/* used to prepare libev internal fd's */ 1272#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1153/* this is not fork-safe */
1154inline_speed void
1155fd_intern (int fd)
1156{
1157#ifdef _WIN32
1158 unsigned long arg = 1;
1159 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1160#else
1161 fcntl (fd, F_SETFD, FD_CLOEXEC);
1162 fcntl (fd, F_SETFL, O_NONBLOCK);
1163#endif
1164}
1165 1273
1166static void noinline 1274static void noinline
1167evpipe_init (EV_P) 1275evpipe_init (EV_P)
1168{ 1276{
1169 if (!ev_is_active (&pipe_w)) 1277 if (!ev_is_active (&pipe_w))
1170 { 1278 {
1171#if EV_USE_EVENTFD 1279# if EV_USE_EVENTFD
1172 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1280 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1173 if (evfd < 0 && errno == EINVAL) 1281 if (evfd < 0 && errno == EINVAL)
1174 evfd = eventfd (0, 0); 1282 evfd = eventfd (0, 0);
1175 1283
1176 if (evfd >= 0) 1284 if (evfd >= 0)
… …
1178 evpipe [0] = -1; 1286 evpipe [0] = -1;
1179 fd_intern (evfd); /* doing it twice doesn't hurt */ 1287 fd_intern (evfd); /* doing it twice doesn't hurt */
1180 ev_io_set (&pipe_w, evfd, EV_READ); 1288 ev_io_set (&pipe_w, evfd, EV_READ);
1181 } 1289 }
1182 else 1290 else
1183#endif 1291# endif
1184 { 1292 {
1185 while (pipe (evpipe)) 1293 while (pipe (evpipe))
1186 ev_syserr ("(libev) error creating signal/async pipe"); 1294 ev_syserr ("(libev) error creating signal/async pipe");
1187 1295
1188 fd_intern (evpipe [0]); 1296 fd_intern (evpipe [0]);
… …
1199evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1307evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1200{ 1308{
1201 if (!*flag) 1309 if (!*flag)
1202 { 1310 {
1203 int old_errno = errno; /* save errno because write might clobber it */ 1311 int old_errno = errno; /* save errno because write might clobber it */
1312 char dummy;
1204 1313
1205 *flag = 1; 1314 *flag = 1;
1206 1315
1207#if EV_USE_EVENTFD 1316#if EV_USE_EVENTFD
1208 if (evfd >= 0) 1317 if (evfd >= 0)
… …
1210 uint64_t counter = 1; 1319 uint64_t counter = 1;
1211 write (evfd, &counter, sizeof (uint64_t)); 1320 write (evfd, &counter, sizeof (uint64_t));
1212 } 1321 }
1213 else 1322 else
1214#endif 1323#endif
1324 /* win32 people keep sending patches that change this write() to send() */
1325 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1326 /* so when you think this write should be a send instead, please find out */
1327 /* where your send() is from - it's definitely not the microsoft send, and */
1328 /* tell me. thank you. */
1215 write (evpipe [1], &old_errno, 1); 1329 write (evpipe [1], &dummy, 1);
1216 1330
1217 errno = old_errno; 1331 errno = old_errno;
1218 } 1332 }
1219} 1333}
1220 1334
… …
1233 } 1347 }
1234 else 1348 else
1235#endif 1349#endif
1236 { 1350 {
1237 char dummy; 1351 char dummy;
1352 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1238 read (evpipe [0], &dummy, 1); 1353 read (evpipe [0], &dummy, 1);
1239 } 1354 }
1240 1355
1356#if EV_SIGNAL_ENABLE
1241 if (sig_pending) 1357 if (sig_pending)
1242 { 1358 {
1243 sig_pending = 0; 1359 sig_pending = 0;
1244 1360
1245 for (i = EV_NSIG - 1; i--; ) 1361 for (i = EV_NSIG - 1; i--; )
1246 if (expect_false (signals [i].pending)) 1362 if (expect_false (signals [i].pending))
1247 ev_feed_signal_event (EV_A_ i + 1); 1363 ev_feed_signal_event (EV_A_ i + 1);
1248 } 1364 }
1365#endif
1249 1366
1250#if EV_ASYNC_ENABLE 1367#if EV_ASYNC_ENABLE
1251 if (async_pending) 1368 if (async_pending)
1252 { 1369 {
1253 async_pending = 0; 1370 async_pending = 0;
… …
1262#endif 1379#endif
1263} 1380}
1264 1381
1265/*****************************************************************************/ 1382/*****************************************************************************/
1266 1383
1384void
1385ev_feed_signal (int signum)
1386{
1387#if EV_MULTIPLICITY
1388 EV_P = signals [signum - 1].loop;
1389
1390 if (!EV_A)
1391 return;
1392#endif
1393
1394 signals [signum - 1].pending = 1;
1395 evpipe_write (EV_A_ &sig_pending);
1396}
1397
1267static void 1398static void
1268ev_sighandler (int signum) 1399ev_sighandler (int signum)
1269{ 1400{
1270#if EV_MULTIPLICITY
1271 EV_P = signals [signum - 1].loop;
1272#endif
1273
1274#if _WIN32 1401#ifdef _WIN32
1275 signal (signum, ev_sighandler); 1402 signal (signum, ev_sighandler);
1276#endif 1403#endif
1277 1404
1278 signals [signum - 1].pending = 1; 1405 ev_feed_signal (signum);
1279 evpipe_write (EV_A_ &sig_pending);
1280} 1406}
1281 1407
1282void noinline 1408void noinline
1283ev_feed_signal_event (EV_P_ int signum) 1409ev_feed_signal_event (EV_P_ int signum)
1284{ 1410{
… …
1321 break; 1447 break;
1322 } 1448 }
1323} 1449}
1324#endif 1450#endif
1325 1451
1452#endif
1453
1326/*****************************************************************************/ 1454/*****************************************************************************/
1327 1455
1456#if EV_CHILD_ENABLE
1328static WL childs [EV_PID_HASHSIZE]; 1457static WL childs [EV_PID_HASHSIZE];
1329
1330#ifndef _WIN32
1331 1458
1332static ev_signal childev; 1459static ev_signal childev;
1333 1460
1334#ifndef WIFCONTINUED 1461#ifndef WIFCONTINUED
1335# define WIFCONTINUED(status) 0 1462# define WIFCONTINUED(status) 0
… …
1340child_reap (EV_P_ int chain, int pid, int status) 1467child_reap (EV_P_ int chain, int pid, int status)
1341{ 1468{
1342 ev_child *w; 1469 ev_child *w;
1343 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1470 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1344 1471
1345 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1472 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1346 { 1473 {
1347 if ((w->pid == pid || !w->pid) 1474 if ((w->pid == pid || !w->pid)
1348 && (!traced || (w->flags & 1))) 1475 && (!traced || (w->flags & 1)))
1349 { 1476 {
1350 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1477 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1375 /* make sure we are called again until all children have been reaped */ 1502 /* make sure we are called again until all children have been reaped */
1376 /* we need to do it this way so that the callback gets called before we continue */ 1503 /* we need to do it this way so that the callback gets called before we continue */
1377 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1504 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1378 1505
1379 child_reap (EV_A_ pid, pid, status); 1506 child_reap (EV_A_ pid, pid, status);
1380 if (EV_PID_HASHSIZE > 1) 1507 if ((EV_PID_HASHSIZE) > 1)
1381 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1508 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1382} 1509}
1383 1510
1384#endif 1511#endif
1385 1512
1386/*****************************************************************************/ 1513/*****************************************************************************/
1387 1514
1515#if EV_USE_IOCP
1516# include "ev_iocp.c"
1517#endif
1388#if EV_USE_PORT 1518#if EV_USE_PORT
1389# include "ev_port.c" 1519# include "ev_port.c"
1390#endif 1520#endif
1391#if EV_USE_KQUEUE 1521#if EV_USE_KQUEUE
1392# include "ev_kqueue.c" 1522# include "ev_kqueue.c"
… …
1452#ifdef __APPLE__ 1582#ifdef __APPLE__
1453 /* only select works correctly on that "unix-certified" platform */ 1583 /* only select works correctly on that "unix-certified" platform */
1454 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1584 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1455 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1585 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1456#endif 1586#endif
1587#ifdef __FreeBSD__
1588 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1589#endif
1457 1590
1458 return flags; 1591 return flags;
1459} 1592}
1460 1593
1461unsigned int 1594unsigned int
1462ev_embeddable_backends (void) 1595ev_embeddable_backends (void)
1463{ 1596{
1464 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1597 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1465 1598
1466 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1599 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1467 /* please fix it and tell me how to detect the fix */ 1600 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1468 flags &= ~EVBACKEND_EPOLL; 1601 flags &= ~EVBACKEND_EPOLL;
1469 1602
1470 return flags; 1603 return flags;
1471} 1604}
1472 1605
1473unsigned int 1606unsigned int
1474ev_backend (EV_P) 1607ev_backend (EV_P)
1475{ 1608{
1476 return backend; 1609 return backend;
1477} 1610}
1478 1611
1479#if EV_MINIMAL < 2 1612#if EV_FEATURE_API
1480unsigned int 1613unsigned int
1481ev_loop_count (EV_P) 1614ev_iteration (EV_P)
1482{ 1615{
1483 return loop_count; 1616 return loop_count;
1484} 1617}
1485 1618
1486unsigned int 1619unsigned int
1487ev_loop_depth (EV_P) 1620ev_depth (EV_P)
1488{ 1621{
1489 return loop_depth; 1622 return loop_depth;
1490} 1623}
1491 1624
1492void 1625void
… …
1529static void noinline 1662static void noinline
1530loop_init (EV_P_ unsigned int flags) 1663loop_init (EV_P_ unsigned int flags)
1531{ 1664{
1532 if (!backend) 1665 if (!backend)
1533 { 1666 {
1667 origflags = flags;
1668
1534#if EV_USE_REALTIME 1669#if EV_USE_REALTIME
1535 if (!have_realtime) 1670 if (!have_realtime)
1536 { 1671 {
1537 struct timespec ts; 1672 struct timespec ts;
1538 1673
… …
1564 1699
1565 ev_rt_now = ev_time (); 1700 ev_rt_now = ev_time ();
1566 mn_now = get_clock (); 1701 mn_now = get_clock ();
1567 now_floor = mn_now; 1702 now_floor = mn_now;
1568 rtmn_diff = ev_rt_now - mn_now; 1703 rtmn_diff = ev_rt_now - mn_now;
1569#if EV_MINIMAL < 2 1704#if EV_FEATURE_API
1570 invoke_cb = ev_invoke_pending; 1705 invoke_cb = ev_invoke_pending;
1571#endif 1706#endif
1572 1707
1573 io_blocktime = 0.; 1708 io_blocktime = 0.;
1574 timeout_blocktime = 0.; 1709 timeout_blocktime = 0.;
… …
1580#endif 1715#endif
1581#if EV_USE_INOTIFY 1716#if EV_USE_INOTIFY
1582 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1717 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1583#endif 1718#endif
1584#if EV_USE_SIGNALFD 1719#if EV_USE_SIGNALFD
1585 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1720 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1586#endif 1721#endif
1587 1722
1588 if (!(flags & 0x0000ffffU)) 1723 if (!(flags & EVBACKEND_MASK))
1589 flags |= ev_recommended_backends (); 1724 flags |= ev_recommended_backends ();
1590 1725
1726#if EV_USE_IOCP
1727 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1728#endif
1591#if EV_USE_PORT 1729#if EV_USE_PORT
1592 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1730 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1593#endif 1731#endif
1594#if EV_USE_KQUEUE 1732#if EV_USE_KQUEUE
1595 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1733 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1604 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1742 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1605#endif 1743#endif
1606 1744
1607 ev_prepare_init (&pending_w, pendingcb); 1745 ev_prepare_init (&pending_w, pendingcb);
1608 1746
1747#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1609 ev_init (&pipe_w, pipecb); 1748 ev_init (&pipe_w, pipecb);
1610 ev_set_priority (&pipe_w, EV_MAXPRI); 1749 ev_set_priority (&pipe_w, EV_MAXPRI);
1750#endif
1611 } 1751 }
1612} 1752}
1613 1753
1614/* free up a loop structure */ 1754/* free up a loop structure */
1615static void noinline 1755void
1616loop_destroy (EV_P) 1756ev_loop_destroy (EV_P)
1617{ 1757{
1618 int i; 1758 int i;
1759
1760#if EV_MULTIPLICITY
1761 /* mimic free (0) */
1762 if (!EV_A)
1763 return;
1764#endif
1765
1766#if EV_CLEANUP_ENABLE
1767 /* queue cleanup watchers (and execute them) */
1768 if (expect_false (cleanupcnt))
1769 {
1770 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1771 EV_INVOKE_PENDING;
1772 }
1773#endif
1774
1775#if EV_CHILD_ENABLE
1776 if (ev_is_active (&childev))
1777 {
1778 ev_ref (EV_A); /* child watcher */
1779 ev_signal_stop (EV_A_ &childev);
1780 }
1781#endif
1619 1782
1620 if (ev_is_active (&pipe_w)) 1783 if (ev_is_active (&pipe_w))
1621 { 1784 {
1622 /*ev_ref (EV_A);*/ 1785 /*ev_ref (EV_A);*/
1623 /*ev_io_stop (EV_A_ &pipe_w);*/ 1786 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1634 } 1797 }
1635 } 1798 }
1636 1799
1637#if EV_USE_SIGNALFD 1800#if EV_USE_SIGNALFD
1638 if (ev_is_active (&sigfd_w)) 1801 if (ev_is_active (&sigfd_w))
1639 {
1640 /*ev_ref (EV_A);*/
1641 /*ev_io_stop (EV_A_ &sigfd_w);*/
1642
1643 close (sigfd); 1802 close (sigfd);
1644 }
1645#endif 1803#endif
1646 1804
1647#if EV_USE_INOTIFY 1805#if EV_USE_INOTIFY
1648 if (fs_fd >= 0) 1806 if (fs_fd >= 0)
1649 close (fs_fd); 1807 close (fs_fd);
1650#endif 1808#endif
1651 1809
1652 if (backend_fd >= 0) 1810 if (backend_fd >= 0)
1653 close (backend_fd); 1811 close (backend_fd);
1654 1812
1813#if EV_USE_IOCP
1814 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1815#endif
1655#if EV_USE_PORT 1816#if EV_USE_PORT
1656 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1817 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1657#endif 1818#endif
1658#if EV_USE_KQUEUE 1819#if EV_USE_KQUEUE
1659 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1820 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1686 array_free (periodic, EMPTY); 1847 array_free (periodic, EMPTY);
1687#endif 1848#endif
1688#if EV_FORK_ENABLE 1849#if EV_FORK_ENABLE
1689 array_free (fork, EMPTY); 1850 array_free (fork, EMPTY);
1690#endif 1851#endif
1852#if EV_CLEANUP_ENABLE
1853 array_free (cleanup, EMPTY);
1854#endif
1691 array_free (prepare, EMPTY); 1855 array_free (prepare, EMPTY);
1692 array_free (check, EMPTY); 1856 array_free (check, EMPTY);
1693#if EV_ASYNC_ENABLE 1857#if EV_ASYNC_ENABLE
1694 array_free (async, EMPTY); 1858 array_free (async, EMPTY);
1695#endif 1859#endif
1696 1860
1697 backend = 0; 1861 backend = 0;
1862
1863#if EV_MULTIPLICITY
1864 if (ev_is_default_loop (EV_A))
1865#endif
1866 ev_default_loop_ptr = 0;
1867#if EV_MULTIPLICITY
1868 else
1869 ev_free (EV_A);
1870#endif
1698} 1871}
1699 1872
1700#if EV_USE_INOTIFY 1873#if EV_USE_INOTIFY
1701inline_size void infy_fork (EV_P); 1874inline_size void infy_fork (EV_P);
1702#endif 1875#endif
… …
1738 { 1911 {
1739 EV_WIN32_CLOSE_FD (evpipe [0]); 1912 EV_WIN32_CLOSE_FD (evpipe [0]);
1740 EV_WIN32_CLOSE_FD (evpipe [1]); 1913 EV_WIN32_CLOSE_FD (evpipe [1]);
1741 } 1914 }
1742 1915
1916#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1743 evpipe_init (EV_A); 1917 evpipe_init (EV_A);
1744 /* now iterate over everything, in case we missed something */ 1918 /* now iterate over everything, in case we missed something */
1745 pipecb (EV_A_ &pipe_w, EV_READ); 1919 pipecb (EV_A_ &pipe_w, EV_READ);
1920#endif
1746 } 1921 }
1747 1922
1748 postfork = 0; 1923 postfork = 0;
1749} 1924}
1750 1925
… …
1759 loop_init (EV_A_ flags); 1934 loop_init (EV_A_ flags);
1760 1935
1761 if (ev_backend (EV_A)) 1936 if (ev_backend (EV_A))
1762 return EV_A; 1937 return EV_A;
1763 1938
1939 ev_free (EV_A);
1764 return 0; 1940 return 0;
1765} 1941}
1766 1942
1767void
1768ev_loop_destroy (EV_P)
1769{
1770 loop_destroy (EV_A);
1771 ev_free (loop);
1772}
1773
1774void
1775ev_loop_fork (EV_P)
1776{
1777 postfork = 1; /* must be in line with ev_default_fork */
1778}
1779#endif /* multiplicity */ 1943#endif /* multiplicity */
1780 1944
1781#if EV_VERIFY 1945#if EV_VERIFY
1782static void noinline 1946static void noinline
1783verify_watcher (EV_P_ W w) 1947verify_watcher (EV_P_ W w)
… …
1812 verify_watcher (EV_A_ ws [cnt]); 1976 verify_watcher (EV_A_ ws [cnt]);
1813 } 1977 }
1814} 1978}
1815#endif 1979#endif
1816 1980
1817#if EV_MINIMAL < 2 1981#if EV_FEATURE_API
1818void 1982void
1819ev_loop_verify (EV_P) 1983ev_verify (EV_P)
1820{ 1984{
1821#if EV_VERIFY 1985#if EV_VERIFY
1822 int i; 1986 int i;
1823 WL w; 1987 WL w;
1824 1988
… …
1858#if EV_FORK_ENABLE 2022#if EV_FORK_ENABLE
1859 assert (forkmax >= forkcnt); 2023 assert (forkmax >= forkcnt);
1860 array_verify (EV_A_ (W *)forks, forkcnt); 2024 array_verify (EV_A_ (W *)forks, forkcnt);
1861#endif 2025#endif
1862 2026
2027#if EV_CLEANUP_ENABLE
2028 assert (cleanupmax >= cleanupcnt);
2029 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2030#endif
2031
1863#if EV_ASYNC_ENABLE 2032#if EV_ASYNC_ENABLE
1864 assert (asyncmax >= asynccnt); 2033 assert (asyncmax >= asynccnt);
1865 array_verify (EV_A_ (W *)asyncs, asynccnt); 2034 array_verify (EV_A_ (W *)asyncs, asynccnt);
1866#endif 2035#endif
1867 2036
2037#if EV_PREPARE_ENABLE
1868 assert (preparemax >= preparecnt); 2038 assert (preparemax >= preparecnt);
1869 array_verify (EV_A_ (W *)prepares, preparecnt); 2039 array_verify (EV_A_ (W *)prepares, preparecnt);
2040#endif
1870 2041
2042#if EV_CHECK_ENABLE
1871 assert (checkmax >= checkcnt); 2043 assert (checkmax >= checkcnt);
1872 array_verify (EV_A_ (W *)checks, checkcnt); 2044 array_verify (EV_A_ (W *)checks, checkcnt);
2045#endif
1873 2046
1874# if 0 2047# if 0
2048#if EV_CHILD_ENABLE
1875 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2049 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1876 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 2050 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2051#endif
1877# endif 2052# endif
1878#endif 2053#endif
1879} 2054}
1880#endif 2055#endif
1881 2056
1882#if EV_MULTIPLICITY 2057#if EV_MULTIPLICITY
1883struct ev_loop * 2058struct ev_loop *
1884ev_default_loop_init (unsigned int flags)
1885#else 2059#else
1886int 2060int
2061#endif
1887ev_default_loop (unsigned int flags) 2062ev_default_loop (unsigned int flags)
1888#endif
1889{ 2063{
1890 if (!ev_default_loop_ptr) 2064 if (!ev_default_loop_ptr)
1891 { 2065 {
1892#if EV_MULTIPLICITY 2066#if EV_MULTIPLICITY
1893 EV_P = ev_default_loop_ptr = &default_loop_struct; 2067 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1897 2071
1898 loop_init (EV_A_ flags); 2072 loop_init (EV_A_ flags);
1899 2073
1900 if (ev_backend (EV_A)) 2074 if (ev_backend (EV_A))
1901 { 2075 {
1902#ifndef _WIN32 2076#if EV_CHILD_ENABLE
1903 ev_signal_init (&childev, childcb, SIGCHLD); 2077 ev_signal_init (&childev, childcb, SIGCHLD);
1904 ev_set_priority (&childev, EV_MAXPRI); 2078 ev_set_priority (&childev, EV_MAXPRI);
1905 ev_signal_start (EV_A_ &childev); 2079 ev_signal_start (EV_A_ &childev);
1906 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2080 ev_unref (EV_A); /* child watcher should not keep loop alive */
1907#endif 2081#endif
… …
1912 2086
1913 return ev_default_loop_ptr; 2087 return ev_default_loop_ptr;
1914} 2088}
1915 2089
1916void 2090void
1917ev_default_destroy (void) 2091ev_loop_fork (EV_P)
1918{ 2092{
1919#if EV_MULTIPLICITY
1920 EV_P = ev_default_loop_ptr;
1921#endif
1922
1923 ev_default_loop_ptr = 0;
1924
1925#ifndef _WIN32
1926 ev_ref (EV_A); /* child watcher */
1927 ev_signal_stop (EV_A_ &childev);
1928#endif
1929
1930 loop_destroy (EV_A);
1931}
1932
1933void
1934ev_default_fork (void)
1935{
1936#if EV_MULTIPLICITY
1937 EV_P = ev_default_loop_ptr;
1938#endif
1939
1940 postfork = 1; /* must be in line with ev_loop_fork */ 2093 postfork = 1; /* must be in line with ev_default_fork */
1941} 2094}
1942 2095
1943/*****************************************************************************/ 2096/*****************************************************************************/
1944 2097
1945void 2098void
… …
1967 2120
1968 for (pri = NUMPRI; pri--; ) 2121 for (pri = NUMPRI; pri--; )
1969 while (pendingcnt [pri]) 2122 while (pendingcnt [pri])
1970 { 2123 {
1971 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2124 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1972
1973 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1974 /* ^ this is no longer true, as pending_w could be here */
1975 2125
1976 p->w->pending = 0; 2126 p->w->pending = 0;
1977 EV_CB_INVOKE (p->w, p->events); 2127 EV_CB_INVOKE (p->w, p->events);
1978 EV_FREQUENT_CHECK; 2128 EV_FREQUENT_CHECK;
1979 } 2129 }
… …
2036 EV_FREQUENT_CHECK; 2186 EV_FREQUENT_CHECK;
2037 feed_reverse (EV_A_ (W)w); 2187 feed_reverse (EV_A_ (W)w);
2038 } 2188 }
2039 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2189 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2040 2190
2041 feed_reverse_done (EV_A_ EV_TIMEOUT); 2191 feed_reverse_done (EV_A_ EV_TIMER);
2042 } 2192 }
2043} 2193}
2044 2194
2045#if EV_PERIODIC_ENABLE 2195#if EV_PERIODIC_ENABLE
2046/* make periodics pending */ 2196/* make periodics pending */
… …
2099 feed_reverse_done (EV_A_ EV_PERIODIC); 2249 feed_reverse_done (EV_A_ EV_PERIODIC);
2100 } 2250 }
2101} 2251}
2102 2252
2103/* simply recalculate all periodics */ 2253/* simply recalculate all periodics */
2104/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2254/* TODO: maybe ensure that at least one event happens when jumping forward? */
2105static void noinline 2255static void noinline
2106periodics_reschedule (EV_P) 2256periodics_reschedule (EV_P)
2107{ 2257{
2108 int i; 2258 int i;
2109 2259
… …
2137 ANHE_at_cache (*he); 2287 ANHE_at_cache (*he);
2138 } 2288 }
2139} 2289}
2140 2290
2141/* fetch new monotonic and realtime times from the kernel */ 2291/* fetch new monotonic and realtime times from the kernel */
2142/* also detetc if there was a timejump, and act accordingly */ 2292/* also detect if there was a timejump, and act accordingly */
2143inline_speed void 2293inline_speed void
2144time_update (EV_P_ ev_tstamp max_block) 2294time_update (EV_P_ ev_tstamp max_block)
2145{ 2295{
2146#if EV_USE_MONOTONIC 2296#if EV_USE_MONOTONIC
2147 if (expect_true (have_monotonic)) 2297 if (expect_true (have_monotonic))
… …
2205 mn_now = ev_rt_now; 2355 mn_now = ev_rt_now;
2206 } 2356 }
2207} 2357}
2208 2358
2209void 2359void
2210ev_loop (EV_P_ int flags) 2360ev_run (EV_P_ int flags)
2211{ 2361{
2212#if EV_MINIMAL < 2 2362#if EV_FEATURE_API
2213 ++loop_depth; 2363 ++loop_depth;
2214#endif 2364#endif
2215 2365
2216 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2366 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2217 2367
2218 loop_done = EVUNLOOP_CANCEL; 2368 loop_done = EVBREAK_CANCEL;
2219 2369
2220 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2370 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2221 2371
2222 do 2372 do
2223 { 2373 {
2224#if EV_VERIFY >= 2 2374#if EV_VERIFY >= 2
2225 ev_loop_verify (EV_A); 2375 ev_verify (EV_A);
2226#endif 2376#endif
2227 2377
2228#ifndef _WIN32 2378#ifndef _WIN32
2229 if (expect_false (curpid)) /* penalise the forking check even more */ 2379 if (expect_false (curpid)) /* penalise the forking check even more */
2230 if (expect_false (getpid () != curpid)) 2380 if (expect_false (getpid () != curpid))
… …
2242 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2392 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2243 EV_INVOKE_PENDING; 2393 EV_INVOKE_PENDING;
2244 } 2394 }
2245#endif 2395#endif
2246 2396
2397#if EV_PREPARE_ENABLE
2247 /* queue prepare watchers (and execute them) */ 2398 /* queue prepare watchers (and execute them) */
2248 if (expect_false (preparecnt)) 2399 if (expect_false (preparecnt))
2249 { 2400 {
2250 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2401 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2251 EV_INVOKE_PENDING; 2402 EV_INVOKE_PENDING;
2252 } 2403 }
2404#endif
2253 2405
2254 if (expect_false (loop_done)) 2406 if (expect_false (loop_done))
2255 break; 2407 break;
2256 2408
2257 /* we might have forked, so reify kernel state if necessary */ 2409 /* we might have forked, so reify kernel state if necessary */
… …
2264 /* calculate blocking time */ 2416 /* calculate blocking time */
2265 { 2417 {
2266 ev_tstamp waittime = 0.; 2418 ev_tstamp waittime = 0.;
2267 ev_tstamp sleeptime = 0.; 2419 ev_tstamp sleeptime = 0.;
2268 2420
2421 /* remember old timestamp for io_blocktime calculation */
2422 ev_tstamp prev_mn_now = mn_now;
2423
2424 /* update time to cancel out callback processing overhead */
2425 time_update (EV_A_ 1e100);
2426
2269 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2427 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2270 { 2428 {
2271 /* remember old timestamp for io_blocktime calculation */
2272 ev_tstamp prev_mn_now = mn_now;
2273
2274 /* update time to cancel out callback processing overhead */
2275 time_update (EV_A_ 1e100);
2276
2277 waittime = MAX_BLOCKTIME; 2429 waittime = MAX_BLOCKTIME;
2278 2430
2279 if (timercnt) 2431 if (timercnt)
2280 { 2432 {
2281 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2433 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2308 waittime -= sleeptime; 2460 waittime -= sleeptime;
2309 } 2461 }
2310 } 2462 }
2311 } 2463 }
2312 2464
2313#if EV_MINIMAL < 2 2465#if EV_FEATURE_API
2314 ++loop_count; 2466 ++loop_count;
2315#endif 2467#endif
2316 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2468 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2317 backend_poll (EV_A_ waittime); 2469 backend_poll (EV_A_ waittime);
2318 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2470 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2319 2471
2320 /* update ev_rt_now, do magic */ 2472 /* update ev_rt_now, do magic */
2321 time_update (EV_A_ waittime + sleeptime); 2473 time_update (EV_A_ waittime + sleeptime);
2322 } 2474 }
2323 2475
… …
2330#if EV_IDLE_ENABLE 2482#if EV_IDLE_ENABLE
2331 /* queue idle watchers unless other events are pending */ 2483 /* queue idle watchers unless other events are pending */
2332 idle_reify (EV_A); 2484 idle_reify (EV_A);
2333#endif 2485#endif
2334 2486
2487#if EV_CHECK_ENABLE
2335 /* queue check watchers, to be executed first */ 2488 /* queue check watchers, to be executed first */
2336 if (expect_false (checkcnt)) 2489 if (expect_false (checkcnt))
2337 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2490 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2491#endif
2338 2492
2339 EV_INVOKE_PENDING; 2493 EV_INVOKE_PENDING;
2340 } 2494 }
2341 while (expect_true ( 2495 while (expect_true (
2342 activecnt 2496 activecnt
2343 && !loop_done 2497 && !loop_done
2344 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2498 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2345 )); 2499 ));
2346 2500
2347 if (loop_done == EVUNLOOP_ONE) 2501 if (loop_done == EVBREAK_ONE)
2348 loop_done = EVUNLOOP_CANCEL; 2502 loop_done = EVBREAK_CANCEL;
2349 2503
2350#if EV_MINIMAL < 2 2504#if EV_FEATURE_API
2351 --loop_depth; 2505 --loop_depth;
2352#endif 2506#endif
2353} 2507}
2354 2508
2355void 2509void
2356ev_unloop (EV_P_ int how) 2510ev_break (EV_P_ int how)
2357{ 2511{
2358 loop_done = how; 2512 loop_done = how;
2359} 2513}
2360 2514
2361void 2515void
… …
2481 2635
2482 if (expect_false (ev_is_active (w))) 2636 if (expect_false (ev_is_active (w)))
2483 return; 2637 return;
2484 2638
2485 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2639 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2486 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2640 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2487 2641
2488 EV_FREQUENT_CHECK; 2642 EV_FREQUENT_CHECK;
2489 2643
2490 ev_start (EV_A_ (W)w, 1); 2644 ev_start (EV_A_ (W)w, 1);
2491 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2645 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2509 EV_FREQUENT_CHECK; 2663 EV_FREQUENT_CHECK;
2510 2664
2511 wlist_del (&anfds[w->fd].head, (WL)w); 2665 wlist_del (&anfds[w->fd].head, (WL)w);
2512 ev_stop (EV_A_ (W)w); 2666 ev_stop (EV_A_ (W)w);
2513 2667
2514 fd_change (EV_A_ w->fd, 1); 2668 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2515 2669
2516 EV_FREQUENT_CHECK; 2670 EV_FREQUENT_CHECK;
2517} 2671}
2518 2672
2519void noinline 2673void noinline
… …
2561 timers [active] = timers [timercnt + HEAP0]; 2715 timers [active] = timers [timercnt + HEAP0];
2562 adjustheap (timers, timercnt, active); 2716 adjustheap (timers, timercnt, active);
2563 } 2717 }
2564 } 2718 }
2565 2719
2566 EV_FREQUENT_CHECK;
2567
2568 ev_at (w) -= mn_now; 2720 ev_at (w) -= mn_now;
2569 2721
2570 ev_stop (EV_A_ (W)w); 2722 ev_stop (EV_A_ (W)w);
2723
2724 EV_FREQUENT_CHECK;
2571} 2725}
2572 2726
2573void noinline 2727void noinline
2574ev_timer_again (EV_P_ ev_timer *w) 2728ev_timer_again (EV_P_ ev_timer *w)
2575{ 2729{
… …
2654 periodics [active] = periodics [periodiccnt + HEAP0]; 2808 periodics [active] = periodics [periodiccnt + HEAP0];
2655 adjustheap (periodics, periodiccnt, active); 2809 adjustheap (periodics, periodiccnt, active);
2656 } 2810 }
2657 } 2811 }
2658 2812
2659 EV_FREQUENT_CHECK;
2660
2661 ev_stop (EV_A_ (W)w); 2813 ev_stop (EV_A_ (W)w);
2814
2815 EV_FREQUENT_CHECK;
2662} 2816}
2663 2817
2664void noinline 2818void noinline
2665ev_periodic_again (EV_P_ ev_periodic *w) 2819ev_periodic_again (EV_P_ ev_periodic *w)
2666{ 2820{
… …
2671#endif 2825#endif
2672 2826
2673#ifndef SA_RESTART 2827#ifndef SA_RESTART
2674# define SA_RESTART 0 2828# define SA_RESTART 0
2675#endif 2829#endif
2830
2831#if EV_SIGNAL_ENABLE
2676 2832
2677void noinline 2833void noinline
2678ev_signal_start (EV_P_ ev_signal *w) 2834ev_signal_start (EV_P_ ev_signal *w)
2679{ 2835{
2680 if (expect_false (ev_is_active (w))) 2836 if (expect_false (ev_is_active (w)))
… …
2727 if (!((WL)w)->next) 2883 if (!((WL)w)->next)
2728# if EV_USE_SIGNALFD 2884# if EV_USE_SIGNALFD
2729 if (sigfd < 0) /*TODO*/ 2885 if (sigfd < 0) /*TODO*/
2730# endif 2886# endif
2731 { 2887 {
2732# if _WIN32 2888# ifdef _WIN32
2889 evpipe_init (EV_A);
2890
2733 signal (w->signum, ev_sighandler); 2891 signal (w->signum, ev_sighandler);
2734# else 2892# else
2735 struct sigaction sa; 2893 struct sigaction sa;
2736 2894
2737 evpipe_init (EV_A); 2895 evpipe_init (EV_A);
… …
2739 sa.sa_handler = ev_sighandler; 2897 sa.sa_handler = ev_sighandler;
2740 sigfillset (&sa.sa_mask); 2898 sigfillset (&sa.sa_mask);
2741 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2899 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2742 sigaction (w->signum, &sa, 0); 2900 sigaction (w->signum, &sa, 0);
2743 2901
2902 if (origflags & EVFLAG_NOSIGMASK)
2903 {
2744 sigemptyset (&sa.sa_mask); 2904 sigemptyset (&sa.sa_mask);
2745 sigaddset (&sa.sa_mask, w->signum); 2905 sigaddset (&sa.sa_mask, w->signum);
2746 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2906 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2907 }
2747#endif 2908#endif
2748 } 2909 }
2749 2910
2750 EV_FREQUENT_CHECK; 2911 EV_FREQUENT_CHECK;
2751} 2912}
… …
2768 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2929 signals [w->signum - 1].loop = 0; /* unattach from signal */
2769#endif 2930#endif
2770#if EV_USE_SIGNALFD 2931#if EV_USE_SIGNALFD
2771 if (sigfd >= 0) 2932 if (sigfd >= 0)
2772 { 2933 {
2773 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2934 sigset_t ss;
2935
2936 sigemptyset (&ss);
2937 sigaddset (&ss, w->signum);
2774 sigdelset (&sigfd_set, w->signum); 2938 sigdelset (&sigfd_set, w->signum);
2939
2775 signalfd (sigfd, &sigfd_set, 0); 2940 signalfd (sigfd, &sigfd_set, 0);
2776 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2941 sigprocmask (SIG_UNBLOCK, &ss, 0);
2777 /*TODO: maybe unblock signal? */
2778 } 2942 }
2779 else 2943 else
2780#endif 2944#endif
2781 signal (w->signum, SIG_DFL); 2945 signal (w->signum, SIG_DFL);
2782 } 2946 }
2783 2947
2784 EV_FREQUENT_CHECK; 2948 EV_FREQUENT_CHECK;
2785} 2949}
2786 2950
2951#endif
2952
2953#if EV_CHILD_ENABLE
2954
2787void 2955void
2788ev_child_start (EV_P_ ev_child *w) 2956ev_child_start (EV_P_ ev_child *w)
2789{ 2957{
2790#if EV_MULTIPLICITY 2958#if EV_MULTIPLICITY
2791 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2959 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2794 return; 2962 return;
2795 2963
2796 EV_FREQUENT_CHECK; 2964 EV_FREQUENT_CHECK;
2797 2965
2798 ev_start (EV_A_ (W)w, 1); 2966 ev_start (EV_A_ (W)w, 1);
2799 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2967 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2800 2968
2801 EV_FREQUENT_CHECK; 2969 EV_FREQUENT_CHECK;
2802} 2970}
2803 2971
2804void 2972void
… …
2808 if (expect_false (!ev_is_active (w))) 2976 if (expect_false (!ev_is_active (w)))
2809 return; 2977 return;
2810 2978
2811 EV_FREQUENT_CHECK; 2979 EV_FREQUENT_CHECK;
2812 2980
2813 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2981 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2814 ev_stop (EV_A_ (W)w); 2982 ev_stop (EV_A_ (W)w);
2815 2983
2816 EV_FREQUENT_CHECK; 2984 EV_FREQUENT_CHECK;
2817} 2985}
2986
2987#endif
2818 2988
2819#if EV_STAT_ENABLE 2989#if EV_STAT_ENABLE
2820 2990
2821# ifdef _WIN32 2991# ifdef _WIN32
2822# undef lstat 2992# undef lstat
… …
2828#define MIN_STAT_INTERVAL 0.1074891 2998#define MIN_STAT_INTERVAL 0.1074891
2829 2999
2830static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 3000static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2831 3001
2832#if EV_USE_INOTIFY 3002#if EV_USE_INOTIFY
2833# define EV_INOTIFY_BUFSIZE 8192 3003
3004/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
3005# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2834 3006
2835static void noinline 3007static void noinline
2836infy_add (EV_P_ ev_stat *w) 3008infy_add (EV_P_ ev_stat *w)
2837{ 3009{
2838 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); 3010 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);
2839 3011
2840 if (w->wd < 0) 3012 if (w->wd >= 0)
3013 {
3014 struct statfs sfs;
3015
3016 /* now local changes will be tracked by inotify, but remote changes won't */
3017 /* unless the filesystem is known to be local, we therefore still poll */
3018 /* also do poll on <2.6.25, but with normal frequency */
3019
3020 if (!fs_2625)
3021 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3022 else if (!statfs (w->path, &sfs)
3023 && (sfs.f_type == 0x1373 /* devfs */
3024 || sfs.f_type == 0xEF53 /* ext2/3 */
3025 || sfs.f_type == 0x3153464a /* jfs */
3026 || sfs.f_type == 0x52654973 /* reiser3 */
3027 || sfs.f_type == 0x01021994 /* tempfs */
3028 || sfs.f_type == 0x58465342 /* xfs */))
3029 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3030 else
3031 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2841 { 3032 }
3033 else
3034 {
3035 /* can't use inotify, continue to stat */
2842 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3036 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2843 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2844 3037
2845 /* monitor some parent directory for speedup hints */ 3038 /* if path is not there, monitor some parent directory for speedup hints */
2846 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3039 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2847 /* but an efficiency issue only */ 3040 /* but an efficiency issue only */
2848 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3041 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2849 { 3042 {
2850 char path [4096]; 3043 char path [4096];
… …
2866 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3059 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2867 } 3060 }
2868 } 3061 }
2869 3062
2870 if (w->wd >= 0) 3063 if (w->wd >= 0)
2871 {
2872 struct statfs sfs;
2873
2874 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3064 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2875 3065
2876 /* now local changes will be tracked by inotify, but remote changes won't */ 3066 /* now re-arm timer, if required */
2877 /* unless the filesystem it known to be local, we therefore still poll */ 3067 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2878 /* also do poll on <2.6.25, but with normal frequency */
2879
2880 if (fs_2625 && !statfs (w->path, &sfs))
2881 if (sfs.f_type == 0x1373 /* devfs */
2882 || sfs.f_type == 0xEF53 /* ext2/3 */
2883 || sfs.f_type == 0x3153464a /* jfs */
2884 || sfs.f_type == 0x52654973 /* reiser3 */
2885 || sfs.f_type == 0x01021994 /* tempfs */
2886 || sfs.f_type == 0x58465342 /* xfs */)
2887 return;
2888
2889 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2890 ev_timer_again (EV_A_ &w->timer); 3068 ev_timer_again (EV_A_ &w->timer);
2891 } 3069 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2892} 3070}
2893 3071
2894static void noinline 3072static void noinline
2895infy_del (EV_P_ ev_stat *w) 3073infy_del (EV_P_ ev_stat *w)
2896{ 3074{
… …
2899 3077
2900 if (wd < 0) 3078 if (wd < 0)
2901 return; 3079 return;
2902 3080
2903 w->wd = -2; 3081 w->wd = -2;
2904 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3082 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2905 wlist_del (&fs_hash [slot].head, (WL)w); 3083 wlist_del (&fs_hash [slot].head, (WL)w);
2906 3084
2907 /* remove this watcher, if others are watching it, they will rearm */ 3085 /* remove this watcher, if others are watching it, they will rearm */
2908 inotify_rm_watch (fs_fd, wd); 3086 inotify_rm_watch (fs_fd, wd);
2909} 3087}
… …
2911static void noinline 3089static void noinline
2912infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3090infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2913{ 3091{
2914 if (slot < 0) 3092 if (slot < 0)
2915 /* overflow, need to check for all hash slots */ 3093 /* overflow, need to check for all hash slots */
2916 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3094 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2917 infy_wd (EV_A_ slot, wd, ev); 3095 infy_wd (EV_A_ slot, wd, ev);
2918 else 3096 else
2919 { 3097 {
2920 WL w_; 3098 WL w_;
2921 3099
2922 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3100 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2923 { 3101 {
2924 ev_stat *w = (ev_stat *)w_; 3102 ev_stat *w = (ev_stat *)w_;
2925 w_ = w_->next; /* lets us remove this watcher and all before it */ 3103 w_ = w_->next; /* lets us remove this watcher and all before it */
2926 3104
2927 if (w->wd == wd || wd == -1) 3105 if (w->wd == wd || wd == -1)
2928 { 3106 {
2929 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3107 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2930 { 3108 {
2931 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3109 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2932 w->wd = -1; 3110 w->wd = -1;
2933 infy_add (EV_A_ w); /* re-add, no matter what */ 3111 infy_add (EV_A_ w); /* re-add, no matter what */
2934 } 3112 }
2935 3113
2936 stat_timer_cb (EV_A_ &w->timer, 0); 3114 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2941 3119
2942static void 3120static void
2943infy_cb (EV_P_ ev_io *w, int revents) 3121infy_cb (EV_P_ ev_io *w, int revents)
2944{ 3122{
2945 char buf [EV_INOTIFY_BUFSIZE]; 3123 char buf [EV_INOTIFY_BUFSIZE];
2946 struct inotify_event *ev = (struct inotify_event *)buf;
2947 int ofs; 3124 int ofs;
2948 int len = read (fs_fd, buf, sizeof (buf)); 3125 int len = read (fs_fd, buf, sizeof (buf));
2949 3126
2950 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3127 for (ofs = 0; ofs < len; )
3128 {
3129 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2951 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3130 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3131 ofs += sizeof (struct inotify_event) + ev->len;
3132 }
2952} 3133}
2953 3134
2954inline_size void 3135inline_size void
2955check_2625 (EV_P) 3136ev_check_2625 (EV_P)
2956{ 3137{
2957 /* kernels < 2.6.25 are borked 3138 /* kernels < 2.6.25 are borked
2958 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3139 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2959 */ 3140 */
2960 struct utsname buf; 3141 if (ev_linux_version () < 0x020619)
2961 int major, minor, micro;
2962
2963 if (uname (&buf))
2964 return; 3142 return;
2965 3143
2966 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2967 return;
2968
2969 if (major < 2
2970 || (major == 2 && minor < 6)
2971 || (major == 2 && minor == 6 && micro < 25))
2972 return;
2973
2974 fs_2625 = 1; 3144 fs_2625 = 1;
3145}
3146
3147inline_size int
3148infy_newfd (void)
3149{
3150#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3151 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3152 if (fd >= 0)
3153 return fd;
3154#endif
3155 return inotify_init ();
2975} 3156}
2976 3157
2977inline_size void 3158inline_size void
2978infy_init (EV_P) 3159infy_init (EV_P)
2979{ 3160{
2980 if (fs_fd != -2) 3161 if (fs_fd != -2)
2981 return; 3162 return;
2982 3163
2983 fs_fd = -1; 3164 fs_fd = -1;
2984 3165
2985 check_2625 (EV_A); 3166 ev_check_2625 (EV_A);
2986 3167
2987 fs_fd = inotify_init (); 3168 fs_fd = infy_newfd ();
2988 3169
2989 if (fs_fd >= 0) 3170 if (fs_fd >= 0)
2990 { 3171 {
3172 fd_intern (fs_fd);
2991 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3173 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2992 ev_set_priority (&fs_w, EV_MAXPRI); 3174 ev_set_priority (&fs_w, EV_MAXPRI);
2993 ev_io_start (EV_A_ &fs_w); 3175 ev_io_start (EV_A_ &fs_w);
3176 ev_unref (EV_A);
2994 } 3177 }
2995} 3178}
2996 3179
2997inline_size void 3180inline_size void
2998infy_fork (EV_P) 3181infy_fork (EV_P)
… …
3000 int slot; 3183 int slot;
3001 3184
3002 if (fs_fd < 0) 3185 if (fs_fd < 0)
3003 return; 3186 return;
3004 3187
3188 ev_ref (EV_A);
3189 ev_io_stop (EV_A_ &fs_w);
3005 close (fs_fd); 3190 close (fs_fd);
3006 fs_fd = inotify_init (); 3191 fs_fd = infy_newfd ();
3007 3192
3193 if (fs_fd >= 0)
3194 {
3195 fd_intern (fs_fd);
3196 ev_io_set (&fs_w, fs_fd, EV_READ);
3197 ev_io_start (EV_A_ &fs_w);
3198 ev_unref (EV_A);
3199 }
3200
3008 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3201 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3009 { 3202 {
3010 WL w_ = fs_hash [slot].head; 3203 WL w_ = fs_hash [slot].head;
3011 fs_hash [slot].head = 0; 3204 fs_hash [slot].head = 0;
3012 3205
3013 while (w_) 3206 while (w_)
… …
3018 w->wd = -1; 3211 w->wd = -1;
3019 3212
3020 if (fs_fd >= 0) 3213 if (fs_fd >= 0)
3021 infy_add (EV_A_ w); /* re-add, no matter what */ 3214 infy_add (EV_A_ w); /* re-add, no matter what */
3022 else 3215 else
3216 {
3217 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3218 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3023 ev_timer_again (EV_A_ &w->timer); 3219 ev_timer_again (EV_A_ &w->timer);
3220 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3221 }
3024 } 3222 }
3025 } 3223 }
3026} 3224}
3027 3225
3028#endif 3226#endif
… …
3045static void noinline 3243static void noinline
3046stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3244stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3047{ 3245{
3048 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3246 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3049 3247
3050 /* we copy this here each the time so that */ 3248 ev_statdata prev = w->attr;
3051 /* prev has the old value when the callback gets invoked */
3052 w->prev = w->attr;
3053 ev_stat_stat (EV_A_ w); 3249 ev_stat_stat (EV_A_ w);
3054 3250
3055 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3251 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3056 if ( 3252 if (
3057 w->prev.st_dev != w->attr.st_dev 3253 prev.st_dev != w->attr.st_dev
3058 || w->prev.st_ino != w->attr.st_ino 3254 || prev.st_ino != w->attr.st_ino
3059 || w->prev.st_mode != w->attr.st_mode 3255 || prev.st_mode != w->attr.st_mode
3060 || w->prev.st_nlink != w->attr.st_nlink 3256 || prev.st_nlink != w->attr.st_nlink
3061 || w->prev.st_uid != w->attr.st_uid 3257 || prev.st_uid != w->attr.st_uid
3062 || w->prev.st_gid != w->attr.st_gid 3258 || prev.st_gid != w->attr.st_gid
3063 || w->prev.st_rdev != w->attr.st_rdev 3259 || prev.st_rdev != w->attr.st_rdev
3064 || w->prev.st_size != w->attr.st_size 3260 || prev.st_size != w->attr.st_size
3065 || w->prev.st_atime != w->attr.st_atime 3261 || prev.st_atime != w->attr.st_atime
3066 || w->prev.st_mtime != w->attr.st_mtime 3262 || prev.st_mtime != w->attr.st_mtime
3067 || w->prev.st_ctime != w->attr.st_ctime 3263 || prev.st_ctime != w->attr.st_ctime
3068 ) { 3264 ) {
3265 /* we only update w->prev on actual differences */
3266 /* in case we test more often than invoke the callback, */
3267 /* to ensure that prev is always different to attr */
3268 w->prev = prev;
3269
3069 #if EV_USE_INOTIFY 3270 #if EV_USE_INOTIFY
3070 if (fs_fd >= 0) 3271 if (fs_fd >= 0)
3071 { 3272 {
3072 infy_del (EV_A_ w); 3273 infy_del (EV_A_ w);
3073 infy_add (EV_A_ w); 3274 infy_add (EV_A_ w);
… …
3098 3299
3099 if (fs_fd >= 0) 3300 if (fs_fd >= 0)
3100 infy_add (EV_A_ w); 3301 infy_add (EV_A_ w);
3101 else 3302 else
3102#endif 3303#endif
3304 {
3103 ev_timer_again (EV_A_ &w->timer); 3305 ev_timer_again (EV_A_ &w->timer);
3306 ev_unref (EV_A);
3307 }
3104 3308
3105 ev_start (EV_A_ (W)w, 1); 3309 ev_start (EV_A_ (W)w, 1);
3106 3310
3107 EV_FREQUENT_CHECK; 3311 EV_FREQUENT_CHECK;
3108} 3312}
… …
3117 EV_FREQUENT_CHECK; 3321 EV_FREQUENT_CHECK;
3118 3322
3119#if EV_USE_INOTIFY 3323#if EV_USE_INOTIFY
3120 infy_del (EV_A_ w); 3324 infy_del (EV_A_ w);
3121#endif 3325#endif
3326
3327 if (ev_is_active (&w->timer))
3328 {
3329 ev_ref (EV_A);
3122 ev_timer_stop (EV_A_ &w->timer); 3330 ev_timer_stop (EV_A_ &w->timer);
3331 }
3123 3332
3124 ev_stop (EV_A_ (W)w); 3333 ev_stop (EV_A_ (W)w);
3125 3334
3126 EV_FREQUENT_CHECK; 3335 EV_FREQUENT_CHECK;
3127} 3336}
… …
3172 3381
3173 EV_FREQUENT_CHECK; 3382 EV_FREQUENT_CHECK;
3174} 3383}
3175#endif 3384#endif
3176 3385
3386#if EV_PREPARE_ENABLE
3177void 3387void
3178ev_prepare_start (EV_P_ ev_prepare *w) 3388ev_prepare_start (EV_P_ ev_prepare *w)
3179{ 3389{
3180 if (expect_false (ev_is_active (w))) 3390 if (expect_false (ev_is_active (w)))
3181 return; 3391 return;
… …
3207 3417
3208 ev_stop (EV_A_ (W)w); 3418 ev_stop (EV_A_ (W)w);
3209 3419
3210 EV_FREQUENT_CHECK; 3420 EV_FREQUENT_CHECK;
3211} 3421}
3422#endif
3212 3423
3424#if EV_CHECK_ENABLE
3213void 3425void
3214ev_check_start (EV_P_ ev_check *w) 3426ev_check_start (EV_P_ ev_check *w)
3215{ 3427{
3216 if (expect_false (ev_is_active (w))) 3428 if (expect_false (ev_is_active (w)))
3217 return; 3429 return;
… …
3243 3455
3244 ev_stop (EV_A_ (W)w); 3456 ev_stop (EV_A_ (W)w);
3245 3457
3246 EV_FREQUENT_CHECK; 3458 EV_FREQUENT_CHECK;
3247} 3459}
3460#endif
3248 3461
3249#if EV_EMBED_ENABLE 3462#if EV_EMBED_ENABLE
3250void noinline 3463void noinline
3251ev_embed_sweep (EV_P_ ev_embed *w) 3464ev_embed_sweep (EV_P_ ev_embed *w)
3252{ 3465{
3253 ev_loop (w->other, EVLOOP_NONBLOCK); 3466 ev_run (w->other, EVRUN_NOWAIT);
3254} 3467}
3255 3468
3256static void 3469static void
3257embed_io_cb (EV_P_ ev_io *io, int revents) 3470embed_io_cb (EV_P_ ev_io *io, int revents)
3258{ 3471{
3259 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3472 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3260 3473
3261 if (ev_cb (w)) 3474 if (ev_cb (w))
3262 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3475 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3263 else 3476 else
3264 ev_loop (w->other, EVLOOP_NONBLOCK); 3477 ev_run (w->other, EVRUN_NOWAIT);
3265} 3478}
3266 3479
3267static void 3480static void
3268embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3481embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3269{ 3482{
… …
3273 EV_P = w->other; 3486 EV_P = w->other;
3274 3487
3275 while (fdchangecnt) 3488 while (fdchangecnt)
3276 { 3489 {
3277 fd_reify (EV_A); 3490 fd_reify (EV_A);
3278 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3491 ev_run (EV_A_ EVRUN_NOWAIT);
3279 } 3492 }
3280 } 3493 }
3281} 3494}
3282 3495
3283static void 3496static void
… …
3289 3502
3290 { 3503 {
3291 EV_P = w->other; 3504 EV_P = w->other;
3292 3505
3293 ev_loop_fork (EV_A); 3506 ev_loop_fork (EV_A);
3294 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3507 ev_run (EV_A_ EVRUN_NOWAIT);
3295 } 3508 }
3296 3509
3297 ev_embed_start (EV_A_ w); 3510 ev_embed_start (EV_A_ w);
3298} 3511}
3299 3512
… …
3347 3560
3348 ev_io_stop (EV_A_ &w->io); 3561 ev_io_stop (EV_A_ &w->io);
3349 ev_prepare_stop (EV_A_ &w->prepare); 3562 ev_prepare_stop (EV_A_ &w->prepare);
3350 ev_fork_stop (EV_A_ &w->fork); 3563 ev_fork_stop (EV_A_ &w->fork);
3351 3564
3565 ev_stop (EV_A_ (W)w);
3566
3352 EV_FREQUENT_CHECK; 3567 EV_FREQUENT_CHECK;
3353} 3568}
3354#endif 3569#endif
3355 3570
3356#if EV_FORK_ENABLE 3571#if EV_FORK_ENABLE
… …
3389 3604
3390 EV_FREQUENT_CHECK; 3605 EV_FREQUENT_CHECK;
3391} 3606}
3392#endif 3607#endif
3393 3608
3394#if EV_ASYNC_ENABLE 3609#if EV_CLEANUP_ENABLE
3395void 3610void
3396ev_async_start (EV_P_ ev_async *w) 3611ev_cleanup_start (EV_P_ ev_cleanup *w)
3397{ 3612{
3398 if (expect_false (ev_is_active (w))) 3613 if (expect_false (ev_is_active (w)))
3399 return; 3614 return;
3615
3616 EV_FREQUENT_CHECK;
3617
3618 ev_start (EV_A_ (W)w, ++cleanupcnt);
3619 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3620 cleanups [cleanupcnt - 1] = w;
3621
3622 /* cleanup watchers should never keep a refcount on the loop */
3623 ev_unref (EV_A);
3624 EV_FREQUENT_CHECK;
3625}
3626
3627void
3628ev_cleanup_stop (EV_P_ ev_cleanup *w)
3629{
3630 clear_pending (EV_A_ (W)w);
3631 if (expect_false (!ev_is_active (w)))
3632 return;
3633
3634 EV_FREQUENT_CHECK;
3635 ev_ref (EV_A);
3636
3637 {
3638 int active = ev_active (w);
3639
3640 cleanups [active - 1] = cleanups [--cleanupcnt];
3641 ev_active (cleanups [active - 1]) = active;
3642 }
3643
3644 ev_stop (EV_A_ (W)w);
3645
3646 EV_FREQUENT_CHECK;
3647}
3648#endif
3649
3650#if EV_ASYNC_ENABLE
3651void
3652ev_async_start (EV_P_ ev_async *w)
3653{
3654 if (expect_false (ev_is_active (w)))
3655 return;
3656
3657 w->sent = 0;
3400 3658
3401 evpipe_init (EV_A); 3659 evpipe_init (EV_A);
3402 3660
3403 EV_FREQUENT_CHECK; 3661 EV_FREQUENT_CHECK;
3404 3662
… …
3482{ 3740{
3483 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3741 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3484 3742
3485 if (expect_false (!once)) 3743 if (expect_false (!once))
3486 { 3744 {
3487 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3745 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3488 return; 3746 return;
3489 } 3747 }
3490 3748
3491 once->cb = cb; 3749 once->cb = cb;
3492 once->arg = arg; 3750 once->arg = arg;
… …
3579 if (types & EV_ASYNC) 3837 if (types & EV_ASYNC)
3580 for (i = asynccnt; i--; ) 3838 for (i = asynccnt; i--; )
3581 cb (EV_A_ EV_ASYNC, asyncs [i]); 3839 cb (EV_A_ EV_ASYNC, asyncs [i]);
3582#endif 3840#endif
3583 3841
3842#if EV_PREPARE_ENABLE
3584 if (types & EV_PREPARE) 3843 if (types & EV_PREPARE)
3585 for (i = preparecnt; i--; ) 3844 for (i = preparecnt; i--; )
3586#if EV_EMBED_ENABLE 3845# if EV_EMBED_ENABLE
3587 if (ev_cb (prepares [i]) != embed_prepare_cb) 3846 if (ev_cb (prepares [i]) != embed_prepare_cb)
3588#endif 3847# endif
3589 cb (EV_A_ EV_PREPARE, prepares [i]); 3848 cb (EV_A_ EV_PREPARE, prepares [i]);
3849#endif
3590 3850
3851#if EV_CHECK_ENABLE
3591 if (types & EV_CHECK) 3852 if (types & EV_CHECK)
3592 for (i = checkcnt; i--; ) 3853 for (i = checkcnt; i--; )
3593 cb (EV_A_ EV_CHECK, checks [i]); 3854 cb (EV_A_ EV_CHECK, checks [i]);
3855#endif
3594 3856
3857#if EV_SIGNAL_ENABLE
3595 if (types & EV_SIGNAL) 3858 if (types & EV_SIGNAL)
3596 for (i = 0; i < EV_NSIG - 1; ++i) 3859 for (i = 0; i < EV_NSIG - 1; ++i)
3597 for (wl = signals [i].head; wl; ) 3860 for (wl = signals [i].head; wl; )
3598 { 3861 {
3599 wn = wl->next; 3862 wn = wl->next;
3600 cb (EV_A_ EV_SIGNAL, wl); 3863 cb (EV_A_ EV_SIGNAL, wl);
3601 wl = wn; 3864 wl = wn;
3602 } 3865 }
3866#endif
3603 3867
3868#if EV_CHILD_ENABLE
3604 if (types & EV_CHILD) 3869 if (types & EV_CHILD)
3605 for (i = EV_PID_HASHSIZE; i--; ) 3870 for (i = (EV_PID_HASHSIZE); i--; )
3606 for (wl = childs [i]; wl; ) 3871 for (wl = childs [i]; wl; )
3607 { 3872 {
3608 wn = wl->next; 3873 wn = wl->next;
3609 cb (EV_A_ EV_CHILD, wl); 3874 cb (EV_A_ EV_CHILD, wl);
3610 wl = wn; 3875 wl = wn;
3611 } 3876 }
3877#endif
3612/* EV_STAT 0x00001000 /* stat data changed */ 3878/* EV_STAT 0x00001000 /* stat data changed */
3613/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3879/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3614} 3880}
3615#endif 3881#endif
3616 3882
3617#if EV_MULTIPLICITY 3883#if EV_MULTIPLICITY
3618 #include "ev_wrap.h" 3884 #include "ev_wrap.h"
3619#endif 3885#endif
3620 3886
3621#ifdef __cplusplus 3887EV_CPP(})
3622}
3623#endif
3624 3888

Diff Legend

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