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.368 by root, Mon Jan 17 12:11:11 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
1241 if (sig_pending) 1356 if (sig_pending)
1242 { 1357 {
… …
1262#endif 1377#endif
1263} 1378}
1264 1379
1265/*****************************************************************************/ 1380/*****************************************************************************/
1266 1381
1382void
1383ev_feed_signal (int signum)
1384{
1385#if EV_MULTIPLICITY
1386 EV_P = signals [signum - 1].loop;
1387
1388 if (!EV_A)
1389 return;
1390#endif
1391
1392 signals [signum - 1].pending = 1;
1393 evpipe_write (EV_A_ &sig_pending);
1394}
1395
1267static void 1396static void
1268ev_sighandler (int signum) 1397ev_sighandler (int signum)
1269{ 1398{
1270#if EV_MULTIPLICITY
1271 EV_P = signals [signum - 1].loop;
1272#endif
1273
1274#if _WIN32 1399#ifdef _WIN32
1275 signal (signum, ev_sighandler); 1400 signal (signum, ev_sighandler);
1276#endif 1401#endif
1277 1402
1278 signals [signum - 1].pending = 1; 1403 ev_feed_signal (signum);
1279 evpipe_write (EV_A_ &sig_pending);
1280} 1404}
1281 1405
1282void noinline 1406void noinline
1283ev_feed_signal_event (EV_P_ int signum) 1407ev_feed_signal_event (EV_P_ int signum)
1284{ 1408{
… …
1321 break; 1445 break;
1322 } 1446 }
1323} 1447}
1324#endif 1448#endif
1325 1449
1450#endif
1451
1326/*****************************************************************************/ 1452/*****************************************************************************/
1327 1453
1454#if EV_CHILD_ENABLE
1328static WL childs [EV_PID_HASHSIZE]; 1455static WL childs [EV_PID_HASHSIZE];
1329
1330#ifndef _WIN32
1331 1456
1332static ev_signal childev; 1457static ev_signal childev;
1333 1458
1334#ifndef WIFCONTINUED 1459#ifndef WIFCONTINUED
1335# define WIFCONTINUED(status) 0 1460# define WIFCONTINUED(status) 0
… …
1340child_reap (EV_P_ int chain, int pid, int status) 1465child_reap (EV_P_ int chain, int pid, int status)
1341{ 1466{
1342 ev_child *w; 1467 ev_child *w;
1343 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1468 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1344 1469
1345 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1470 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1346 { 1471 {
1347 if ((w->pid == pid || !w->pid) 1472 if ((w->pid == pid || !w->pid)
1348 && (!traced || (w->flags & 1))) 1473 && (!traced || (w->flags & 1)))
1349 { 1474 {
1350 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1475 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 */ 1500 /* 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 */ 1501 /* 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); 1502 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1378 1503
1379 child_reap (EV_A_ pid, pid, status); 1504 child_reap (EV_A_ pid, pid, status);
1380 if (EV_PID_HASHSIZE > 1) 1505 if ((EV_PID_HASHSIZE) > 1)
1381 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1506 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1382} 1507}
1383 1508
1384#endif 1509#endif
1385 1510
1386/*****************************************************************************/ 1511/*****************************************************************************/
1387 1512
1513#if EV_USE_IOCP
1514# include "ev_iocp.c"
1515#endif
1388#if EV_USE_PORT 1516#if EV_USE_PORT
1389# include "ev_port.c" 1517# include "ev_port.c"
1390#endif 1518#endif
1391#if EV_USE_KQUEUE 1519#if EV_USE_KQUEUE
1392# include "ev_kqueue.c" 1520# include "ev_kqueue.c"
… …
1452#ifdef __APPLE__ 1580#ifdef __APPLE__
1453 /* only select works correctly on that "unix-certified" platform */ 1581 /* only select works correctly on that "unix-certified" platform */
1454 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1582 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1455 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1583 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1456#endif 1584#endif
1585#ifdef __FreeBSD__
1586 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1587#endif
1457 1588
1458 return flags; 1589 return flags;
1459} 1590}
1460 1591
1461unsigned int 1592unsigned int
1462ev_embeddable_backends (void) 1593ev_embeddable_backends (void)
1463{ 1594{
1464 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1595 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1465 1596
1466 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1597 /* 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 */ 1598 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1468 flags &= ~EVBACKEND_EPOLL; 1599 flags &= ~EVBACKEND_EPOLL;
1469 1600
1470 return flags; 1601 return flags;
1471} 1602}
1472 1603
1473unsigned int 1604unsigned int
1474ev_backend (EV_P) 1605ev_backend (EV_P)
1475{ 1606{
1476 return backend; 1607 return backend;
1477} 1608}
1478 1609
1479#if EV_MINIMAL < 2 1610#if EV_FEATURE_API
1480unsigned int 1611unsigned int
1481ev_loop_count (EV_P) 1612ev_iteration (EV_P)
1482{ 1613{
1483 return loop_count; 1614 return loop_count;
1484} 1615}
1485 1616
1486unsigned int 1617unsigned int
1487ev_loop_depth (EV_P) 1618ev_depth (EV_P)
1488{ 1619{
1489 return loop_depth; 1620 return loop_depth;
1490} 1621}
1491 1622
1492void 1623void
… …
1529static void noinline 1660static void noinline
1530loop_init (EV_P_ unsigned int flags) 1661loop_init (EV_P_ unsigned int flags)
1531{ 1662{
1532 if (!backend) 1663 if (!backend)
1533 { 1664 {
1665 origflags = flags;
1666
1534#if EV_USE_REALTIME 1667#if EV_USE_REALTIME
1535 if (!have_realtime) 1668 if (!have_realtime)
1536 { 1669 {
1537 struct timespec ts; 1670 struct timespec ts;
1538 1671
… …
1564 1697
1565 ev_rt_now = ev_time (); 1698 ev_rt_now = ev_time ();
1566 mn_now = get_clock (); 1699 mn_now = get_clock ();
1567 now_floor = mn_now; 1700 now_floor = mn_now;
1568 rtmn_diff = ev_rt_now - mn_now; 1701 rtmn_diff = ev_rt_now - mn_now;
1569#if EV_MINIMAL < 2 1702#if EV_FEATURE_API
1570 invoke_cb = ev_invoke_pending; 1703 invoke_cb = ev_invoke_pending;
1571#endif 1704#endif
1572 1705
1573 io_blocktime = 0.; 1706 io_blocktime = 0.;
1574 timeout_blocktime = 0.; 1707 timeout_blocktime = 0.;
… …
1580#endif 1713#endif
1581#if EV_USE_INOTIFY 1714#if EV_USE_INOTIFY
1582 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1715 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1583#endif 1716#endif
1584#if EV_USE_SIGNALFD 1717#if EV_USE_SIGNALFD
1585 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1718 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1586#endif 1719#endif
1587 1720
1588 if (!(flags & 0x0000ffffU)) 1721 if (!(flags & EVBACKEND_MASK))
1589 flags |= ev_recommended_backends (); 1722 flags |= ev_recommended_backends ();
1590 1723
1724#if EV_USE_IOCP
1725 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1726#endif
1591#if EV_USE_PORT 1727#if EV_USE_PORT
1592 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1728 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1593#endif 1729#endif
1594#if EV_USE_KQUEUE 1730#if EV_USE_KQUEUE
1595 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1731 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1604 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1740 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1605#endif 1741#endif
1606 1742
1607 ev_prepare_init (&pending_w, pendingcb); 1743 ev_prepare_init (&pending_w, pendingcb);
1608 1744
1745#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1609 ev_init (&pipe_w, pipecb); 1746 ev_init (&pipe_w, pipecb);
1610 ev_set_priority (&pipe_w, EV_MAXPRI); 1747 ev_set_priority (&pipe_w, EV_MAXPRI);
1748#endif
1611 } 1749 }
1612} 1750}
1613 1751
1614/* free up a loop structure */ 1752/* free up a loop structure */
1615static void noinline 1753void
1616loop_destroy (EV_P) 1754ev_loop_destroy (EV_P)
1617{ 1755{
1618 int i; 1756 int i;
1757
1758#if EV_MULTIPLICITY
1759 /* mimic free (0) */
1760 if (!EV_A)
1761 return;
1762#endif
1763
1764#if EV_CLEANUP_ENABLE
1765 /* queue cleanup watchers (and execute them) */
1766 if (expect_false (cleanupcnt))
1767 {
1768 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1769 EV_INVOKE_PENDING;
1770 }
1771#endif
1772
1773#if EV_CHILD_ENABLE
1774 if (ev_is_active (&childev))
1775 {
1776 ev_ref (EV_A); /* child watcher */
1777 ev_signal_stop (EV_A_ &childev);
1778 }
1779#endif
1619 1780
1620 if (ev_is_active (&pipe_w)) 1781 if (ev_is_active (&pipe_w))
1621 { 1782 {
1622 /*ev_ref (EV_A);*/ 1783 /*ev_ref (EV_A);*/
1623 /*ev_io_stop (EV_A_ &pipe_w);*/ 1784 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1634 } 1795 }
1635 } 1796 }
1636 1797
1637#if EV_USE_SIGNALFD 1798#if EV_USE_SIGNALFD
1638 if (ev_is_active (&sigfd_w)) 1799 if (ev_is_active (&sigfd_w))
1639 {
1640 /*ev_ref (EV_A);*/
1641 /*ev_io_stop (EV_A_ &sigfd_w);*/
1642
1643 close (sigfd); 1800 close (sigfd);
1644 }
1645#endif 1801#endif
1646 1802
1647#if EV_USE_INOTIFY 1803#if EV_USE_INOTIFY
1648 if (fs_fd >= 0) 1804 if (fs_fd >= 0)
1649 close (fs_fd); 1805 close (fs_fd);
1650#endif 1806#endif
1651 1807
1652 if (backend_fd >= 0) 1808 if (backend_fd >= 0)
1653 close (backend_fd); 1809 close (backend_fd);
1654 1810
1811#if EV_USE_IOCP
1812 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1813#endif
1655#if EV_USE_PORT 1814#if EV_USE_PORT
1656 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1815 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1657#endif 1816#endif
1658#if EV_USE_KQUEUE 1817#if EV_USE_KQUEUE
1659 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1818 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1686 array_free (periodic, EMPTY); 1845 array_free (periodic, EMPTY);
1687#endif 1846#endif
1688#if EV_FORK_ENABLE 1847#if EV_FORK_ENABLE
1689 array_free (fork, EMPTY); 1848 array_free (fork, EMPTY);
1690#endif 1849#endif
1850#if EV_CLEANUP_ENABLE
1851 array_free (cleanup, EMPTY);
1852#endif
1691 array_free (prepare, EMPTY); 1853 array_free (prepare, EMPTY);
1692 array_free (check, EMPTY); 1854 array_free (check, EMPTY);
1693#if EV_ASYNC_ENABLE 1855#if EV_ASYNC_ENABLE
1694 array_free (async, EMPTY); 1856 array_free (async, EMPTY);
1695#endif 1857#endif
1696 1858
1697 backend = 0; 1859 backend = 0;
1860
1861#if EV_MULTIPLICITY
1862 if (ev_is_default_loop (EV_A))
1863#endif
1864 ev_default_loop_ptr = 0;
1865#if EV_MULTIPLICITY
1866 else
1867 ev_free (EV_A);
1868#endif
1698} 1869}
1699 1870
1700#if EV_USE_INOTIFY 1871#if EV_USE_INOTIFY
1701inline_size void infy_fork (EV_P); 1872inline_size void infy_fork (EV_P);
1702#endif 1873#endif
… …
1738 { 1909 {
1739 EV_WIN32_CLOSE_FD (evpipe [0]); 1910 EV_WIN32_CLOSE_FD (evpipe [0]);
1740 EV_WIN32_CLOSE_FD (evpipe [1]); 1911 EV_WIN32_CLOSE_FD (evpipe [1]);
1741 } 1912 }
1742 1913
1914#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1743 evpipe_init (EV_A); 1915 evpipe_init (EV_A);
1744 /* now iterate over everything, in case we missed something */ 1916 /* now iterate over everything, in case we missed something */
1745 pipecb (EV_A_ &pipe_w, EV_READ); 1917 pipecb (EV_A_ &pipe_w, EV_READ);
1918#endif
1746 } 1919 }
1747 1920
1748 postfork = 0; 1921 postfork = 0;
1749} 1922}
1750 1923
… …
1759 loop_init (EV_A_ flags); 1932 loop_init (EV_A_ flags);
1760 1933
1761 if (ev_backend (EV_A)) 1934 if (ev_backend (EV_A))
1762 return EV_A; 1935 return EV_A;
1763 1936
1937 ev_free (EV_A);
1764 return 0; 1938 return 0;
1765} 1939}
1766 1940
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 */ 1941#endif /* multiplicity */
1780 1942
1781#if EV_VERIFY 1943#if EV_VERIFY
1782static void noinline 1944static void noinline
1783verify_watcher (EV_P_ W w) 1945verify_watcher (EV_P_ W w)
… …
1812 verify_watcher (EV_A_ ws [cnt]); 1974 verify_watcher (EV_A_ ws [cnt]);
1813 } 1975 }
1814} 1976}
1815#endif 1977#endif
1816 1978
1817#if EV_MINIMAL < 2 1979#if EV_FEATURE_API
1818void 1980void
1819ev_loop_verify (EV_P) 1981ev_verify (EV_P)
1820{ 1982{
1821#if EV_VERIFY 1983#if EV_VERIFY
1822 int i; 1984 int i;
1823 WL w; 1985 WL w;
1824 1986
… …
1858#if EV_FORK_ENABLE 2020#if EV_FORK_ENABLE
1859 assert (forkmax >= forkcnt); 2021 assert (forkmax >= forkcnt);
1860 array_verify (EV_A_ (W *)forks, forkcnt); 2022 array_verify (EV_A_ (W *)forks, forkcnt);
1861#endif 2023#endif
1862 2024
2025#if EV_CLEANUP_ENABLE
2026 assert (cleanupmax >= cleanupcnt);
2027 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2028#endif
2029
1863#if EV_ASYNC_ENABLE 2030#if EV_ASYNC_ENABLE
1864 assert (asyncmax >= asynccnt); 2031 assert (asyncmax >= asynccnt);
1865 array_verify (EV_A_ (W *)asyncs, asynccnt); 2032 array_verify (EV_A_ (W *)asyncs, asynccnt);
1866#endif 2033#endif
1867 2034
2035#if EV_PREPARE_ENABLE
1868 assert (preparemax >= preparecnt); 2036 assert (preparemax >= preparecnt);
1869 array_verify (EV_A_ (W *)prepares, preparecnt); 2037 array_verify (EV_A_ (W *)prepares, preparecnt);
2038#endif
1870 2039
2040#if EV_CHECK_ENABLE
1871 assert (checkmax >= checkcnt); 2041 assert (checkmax >= checkcnt);
1872 array_verify (EV_A_ (W *)checks, checkcnt); 2042 array_verify (EV_A_ (W *)checks, checkcnt);
2043#endif
1873 2044
1874# if 0 2045# if 0
2046#if EV_CHILD_ENABLE
1875 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2047 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) 2048 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2049#endif
1877# endif 2050# endif
1878#endif 2051#endif
1879} 2052}
1880#endif 2053#endif
1881 2054
1882#if EV_MULTIPLICITY 2055#if EV_MULTIPLICITY
1883struct ev_loop * 2056struct ev_loop *
1884ev_default_loop_init (unsigned int flags)
1885#else 2057#else
1886int 2058int
2059#endif
1887ev_default_loop (unsigned int flags) 2060ev_default_loop (unsigned int flags)
1888#endif
1889{ 2061{
1890 if (!ev_default_loop_ptr) 2062 if (!ev_default_loop_ptr)
1891 { 2063 {
1892#if EV_MULTIPLICITY 2064#if EV_MULTIPLICITY
1893 EV_P = ev_default_loop_ptr = &default_loop_struct; 2065 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1897 2069
1898 loop_init (EV_A_ flags); 2070 loop_init (EV_A_ flags);
1899 2071
1900 if (ev_backend (EV_A)) 2072 if (ev_backend (EV_A))
1901 { 2073 {
1902#ifndef _WIN32 2074#if EV_CHILD_ENABLE
1903 ev_signal_init (&childev, childcb, SIGCHLD); 2075 ev_signal_init (&childev, childcb, SIGCHLD);
1904 ev_set_priority (&childev, EV_MAXPRI); 2076 ev_set_priority (&childev, EV_MAXPRI);
1905 ev_signal_start (EV_A_ &childev); 2077 ev_signal_start (EV_A_ &childev);
1906 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2078 ev_unref (EV_A); /* child watcher should not keep loop alive */
1907#endif 2079#endif
… …
1912 2084
1913 return ev_default_loop_ptr; 2085 return ev_default_loop_ptr;
1914} 2086}
1915 2087
1916void 2088void
1917ev_default_destroy (void) 2089ev_loop_fork (EV_P)
1918{ 2090{
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 */ 2091 postfork = 1; /* must be in line with ev_default_fork */
1941} 2092}
1942 2093
1943/*****************************************************************************/ 2094/*****************************************************************************/
1944 2095
1945void 2096void
… …
1967 2118
1968 for (pri = NUMPRI; pri--; ) 2119 for (pri = NUMPRI; pri--; )
1969 while (pendingcnt [pri]) 2120 while (pendingcnt [pri])
1970 { 2121 {
1971 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2122 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 2123
1976 p->w->pending = 0; 2124 p->w->pending = 0;
1977 EV_CB_INVOKE (p->w, p->events); 2125 EV_CB_INVOKE (p->w, p->events);
1978 EV_FREQUENT_CHECK; 2126 EV_FREQUENT_CHECK;
1979 } 2127 }
… …
2036 EV_FREQUENT_CHECK; 2184 EV_FREQUENT_CHECK;
2037 feed_reverse (EV_A_ (W)w); 2185 feed_reverse (EV_A_ (W)w);
2038 } 2186 }
2039 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2187 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2040 2188
2041 feed_reverse_done (EV_A_ EV_TIMEOUT); 2189 feed_reverse_done (EV_A_ EV_TIMER);
2042 } 2190 }
2043} 2191}
2044 2192
2045#if EV_PERIODIC_ENABLE 2193#if EV_PERIODIC_ENABLE
2046/* make periodics pending */ 2194/* make periodics pending */
… …
2099 feed_reverse_done (EV_A_ EV_PERIODIC); 2247 feed_reverse_done (EV_A_ EV_PERIODIC);
2100 } 2248 }
2101} 2249}
2102 2250
2103/* simply recalculate all periodics */ 2251/* simply recalculate all periodics */
2104/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2252/* TODO: maybe ensure that at least one event happens when jumping forward? */
2105static void noinline 2253static void noinline
2106periodics_reschedule (EV_P) 2254periodics_reschedule (EV_P)
2107{ 2255{
2108 int i; 2256 int i;
2109 2257
… …
2137 ANHE_at_cache (*he); 2285 ANHE_at_cache (*he);
2138 } 2286 }
2139} 2287}
2140 2288
2141/* fetch new monotonic and realtime times from the kernel */ 2289/* fetch new monotonic and realtime times from the kernel */
2142/* also detetc if there was a timejump, and act accordingly */ 2290/* also detect if there was a timejump, and act accordingly */
2143inline_speed void 2291inline_speed void
2144time_update (EV_P_ ev_tstamp max_block) 2292time_update (EV_P_ ev_tstamp max_block)
2145{ 2293{
2146#if EV_USE_MONOTONIC 2294#if EV_USE_MONOTONIC
2147 if (expect_true (have_monotonic)) 2295 if (expect_true (have_monotonic))
… …
2205 mn_now = ev_rt_now; 2353 mn_now = ev_rt_now;
2206 } 2354 }
2207} 2355}
2208 2356
2209void 2357void
2210ev_loop (EV_P_ int flags) 2358ev_run (EV_P_ int flags)
2211{ 2359{
2212#if EV_MINIMAL < 2 2360#if EV_FEATURE_API
2213 ++loop_depth; 2361 ++loop_depth;
2214#endif 2362#endif
2215 2363
2216 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2364 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2217 2365
2218 loop_done = EVUNLOOP_CANCEL; 2366 loop_done = EVBREAK_CANCEL;
2219 2367
2220 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2368 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2221 2369
2222 do 2370 do
2223 { 2371 {
2224#if EV_VERIFY >= 2 2372#if EV_VERIFY >= 2
2225 ev_loop_verify (EV_A); 2373 ev_verify (EV_A);
2226#endif 2374#endif
2227 2375
2228#ifndef _WIN32 2376#ifndef _WIN32
2229 if (expect_false (curpid)) /* penalise the forking check even more */ 2377 if (expect_false (curpid)) /* penalise the forking check even more */
2230 if (expect_false (getpid () != curpid)) 2378 if (expect_false (getpid () != curpid))
… …
2242 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2390 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2243 EV_INVOKE_PENDING; 2391 EV_INVOKE_PENDING;
2244 } 2392 }
2245#endif 2393#endif
2246 2394
2395#if EV_PREPARE_ENABLE
2247 /* queue prepare watchers (and execute them) */ 2396 /* queue prepare watchers (and execute them) */
2248 if (expect_false (preparecnt)) 2397 if (expect_false (preparecnt))
2249 { 2398 {
2250 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2399 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2251 EV_INVOKE_PENDING; 2400 EV_INVOKE_PENDING;
2252 } 2401 }
2402#endif
2253 2403
2254 if (expect_false (loop_done)) 2404 if (expect_false (loop_done))
2255 break; 2405 break;
2256 2406
2257 /* we might have forked, so reify kernel state if necessary */ 2407 /* we might have forked, so reify kernel state if necessary */
… …
2264 /* calculate blocking time */ 2414 /* calculate blocking time */
2265 { 2415 {
2266 ev_tstamp waittime = 0.; 2416 ev_tstamp waittime = 0.;
2267 ev_tstamp sleeptime = 0.; 2417 ev_tstamp sleeptime = 0.;
2268 2418
2419 /* remember old timestamp for io_blocktime calculation */
2420 ev_tstamp prev_mn_now = mn_now;
2421
2422 /* update time to cancel out callback processing overhead */
2423 time_update (EV_A_ 1e100);
2424
2269 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2425 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2270 { 2426 {
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; 2427 waittime = MAX_BLOCKTIME;
2278 2428
2279 if (timercnt) 2429 if (timercnt)
2280 { 2430 {
2281 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2431 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2308 waittime -= sleeptime; 2458 waittime -= sleeptime;
2309 } 2459 }
2310 } 2460 }
2311 } 2461 }
2312 2462
2313#if EV_MINIMAL < 2 2463#if EV_FEATURE_API
2314 ++loop_count; 2464 ++loop_count;
2315#endif 2465#endif
2316 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2466 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2317 backend_poll (EV_A_ waittime); 2467 backend_poll (EV_A_ waittime);
2318 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2468 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2319 2469
2320 /* update ev_rt_now, do magic */ 2470 /* update ev_rt_now, do magic */
2321 time_update (EV_A_ waittime + sleeptime); 2471 time_update (EV_A_ waittime + sleeptime);
2322 } 2472 }
2323 2473
… …
2330#if EV_IDLE_ENABLE 2480#if EV_IDLE_ENABLE
2331 /* queue idle watchers unless other events are pending */ 2481 /* queue idle watchers unless other events are pending */
2332 idle_reify (EV_A); 2482 idle_reify (EV_A);
2333#endif 2483#endif
2334 2484
2485#if EV_CHECK_ENABLE
2335 /* queue check watchers, to be executed first */ 2486 /* queue check watchers, to be executed first */
2336 if (expect_false (checkcnt)) 2487 if (expect_false (checkcnt))
2337 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2488 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2489#endif
2338 2490
2339 EV_INVOKE_PENDING; 2491 EV_INVOKE_PENDING;
2340 } 2492 }
2341 while (expect_true ( 2493 while (expect_true (
2342 activecnt 2494 activecnt
2343 && !loop_done 2495 && !loop_done
2344 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2496 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2345 )); 2497 ));
2346 2498
2347 if (loop_done == EVUNLOOP_ONE) 2499 if (loop_done == EVBREAK_ONE)
2348 loop_done = EVUNLOOP_CANCEL; 2500 loop_done = EVBREAK_CANCEL;
2349 2501
2350#if EV_MINIMAL < 2 2502#if EV_FEATURE_API
2351 --loop_depth; 2503 --loop_depth;
2352#endif 2504#endif
2353} 2505}
2354 2506
2355void 2507void
2356ev_unloop (EV_P_ int how) 2508ev_break (EV_P_ int how)
2357{ 2509{
2358 loop_done = how; 2510 loop_done = how;
2359} 2511}
2360 2512
2361void 2513void
… …
2481 2633
2482 if (expect_false (ev_is_active (w))) 2634 if (expect_false (ev_is_active (w)))
2483 return; 2635 return;
2484 2636
2485 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2637 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)))); 2638 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2487 2639
2488 EV_FREQUENT_CHECK; 2640 EV_FREQUENT_CHECK;
2489 2641
2490 ev_start (EV_A_ (W)w, 1); 2642 ev_start (EV_A_ (W)w, 1);
2491 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2643 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2509 EV_FREQUENT_CHECK; 2661 EV_FREQUENT_CHECK;
2510 2662
2511 wlist_del (&anfds[w->fd].head, (WL)w); 2663 wlist_del (&anfds[w->fd].head, (WL)w);
2512 ev_stop (EV_A_ (W)w); 2664 ev_stop (EV_A_ (W)w);
2513 2665
2514 fd_change (EV_A_ w->fd, 1); 2666 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2515 2667
2516 EV_FREQUENT_CHECK; 2668 EV_FREQUENT_CHECK;
2517} 2669}
2518 2670
2519void noinline 2671void noinline
… …
2561 timers [active] = timers [timercnt + HEAP0]; 2713 timers [active] = timers [timercnt + HEAP0];
2562 adjustheap (timers, timercnt, active); 2714 adjustheap (timers, timercnt, active);
2563 } 2715 }
2564 } 2716 }
2565 2717
2566 EV_FREQUENT_CHECK;
2567
2568 ev_at (w) -= mn_now; 2718 ev_at (w) -= mn_now;
2569 2719
2570 ev_stop (EV_A_ (W)w); 2720 ev_stop (EV_A_ (W)w);
2721
2722 EV_FREQUENT_CHECK;
2571} 2723}
2572 2724
2573void noinline 2725void noinline
2574ev_timer_again (EV_P_ ev_timer *w) 2726ev_timer_again (EV_P_ ev_timer *w)
2575{ 2727{
… …
2654 periodics [active] = periodics [periodiccnt + HEAP0]; 2806 periodics [active] = periodics [periodiccnt + HEAP0];
2655 adjustheap (periodics, periodiccnt, active); 2807 adjustheap (periodics, periodiccnt, active);
2656 } 2808 }
2657 } 2809 }
2658 2810
2659 EV_FREQUENT_CHECK;
2660
2661 ev_stop (EV_A_ (W)w); 2811 ev_stop (EV_A_ (W)w);
2812
2813 EV_FREQUENT_CHECK;
2662} 2814}
2663 2815
2664void noinline 2816void noinline
2665ev_periodic_again (EV_P_ ev_periodic *w) 2817ev_periodic_again (EV_P_ ev_periodic *w)
2666{ 2818{
… …
2671#endif 2823#endif
2672 2824
2673#ifndef SA_RESTART 2825#ifndef SA_RESTART
2674# define SA_RESTART 0 2826# define SA_RESTART 0
2675#endif 2827#endif
2828
2829#if EV_SIGNAL_ENABLE
2676 2830
2677void noinline 2831void noinline
2678ev_signal_start (EV_P_ ev_signal *w) 2832ev_signal_start (EV_P_ ev_signal *w)
2679{ 2833{
2680 if (expect_false (ev_is_active (w))) 2834 if (expect_false (ev_is_active (w)))
… …
2727 if (!((WL)w)->next) 2881 if (!((WL)w)->next)
2728# if EV_USE_SIGNALFD 2882# if EV_USE_SIGNALFD
2729 if (sigfd < 0) /*TODO*/ 2883 if (sigfd < 0) /*TODO*/
2730# endif 2884# endif
2731 { 2885 {
2732# if _WIN32 2886# ifdef _WIN32
2887 evpipe_init (EV_A);
2888
2733 signal (w->signum, ev_sighandler); 2889 signal (w->signum, ev_sighandler);
2734# else 2890# else
2735 struct sigaction sa; 2891 struct sigaction sa;
2736 2892
2737 evpipe_init (EV_A); 2893 evpipe_init (EV_A);
… …
2739 sa.sa_handler = ev_sighandler; 2895 sa.sa_handler = ev_sighandler;
2740 sigfillset (&sa.sa_mask); 2896 sigfillset (&sa.sa_mask);
2741 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2897 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2742 sigaction (w->signum, &sa, 0); 2898 sigaction (w->signum, &sa, 0);
2743 2899
2900 if (origflags & EVFLAG_NOSIGMASK)
2901 {
2744 sigemptyset (&sa.sa_mask); 2902 sigemptyset (&sa.sa_mask);
2745 sigaddset (&sa.sa_mask, w->signum); 2903 sigaddset (&sa.sa_mask, w->signum);
2746 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2904 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2905 }
2747#endif 2906#endif
2748 } 2907 }
2749 2908
2750 EV_FREQUENT_CHECK; 2909 EV_FREQUENT_CHECK;
2751} 2910}
… …
2768 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2927 signals [w->signum - 1].loop = 0; /* unattach from signal */
2769#endif 2928#endif
2770#if EV_USE_SIGNALFD 2929#if EV_USE_SIGNALFD
2771 if (sigfd >= 0) 2930 if (sigfd >= 0)
2772 { 2931 {
2773 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2932 sigset_t ss;
2933
2934 sigemptyset (&ss);
2935 sigaddset (&ss, w->signum);
2774 sigdelset (&sigfd_set, w->signum); 2936 sigdelset (&sigfd_set, w->signum);
2937
2775 signalfd (sigfd, &sigfd_set, 0); 2938 signalfd (sigfd, &sigfd_set, 0);
2776 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2939 sigprocmask (SIG_UNBLOCK, &ss, 0);
2777 /*TODO: maybe unblock signal? */
2778 } 2940 }
2779 else 2941 else
2780#endif 2942#endif
2781 signal (w->signum, SIG_DFL); 2943 signal (w->signum, SIG_DFL);
2782 } 2944 }
2783 2945
2784 EV_FREQUENT_CHECK; 2946 EV_FREQUENT_CHECK;
2785} 2947}
2786 2948
2949#endif
2950
2951#if EV_CHILD_ENABLE
2952
2787void 2953void
2788ev_child_start (EV_P_ ev_child *w) 2954ev_child_start (EV_P_ ev_child *w)
2789{ 2955{
2790#if EV_MULTIPLICITY 2956#if EV_MULTIPLICITY
2791 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2957 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2794 return; 2960 return;
2795 2961
2796 EV_FREQUENT_CHECK; 2962 EV_FREQUENT_CHECK;
2797 2963
2798 ev_start (EV_A_ (W)w, 1); 2964 ev_start (EV_A_ (W)w, 1);
2799 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2965 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2800 2966
2801 EV_FREQUENT_CHECK; 2967 EV_FREQUENT_CHECK;
2802} 2968}
2803 2969
2804void 2970void
… …
2808 if (expect_false (!ev_is_active (w))) 2974 if (expect_false (!ev_is_active (w)))
2809 return; 2975 return;
2810 2976
2811 EV_FREQUENT_CHECK; 2977 EV_FREQUENT_CHECK;
2812 2978
2813 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2979 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2814 ev_stop (EV_A_ (W)w); 2980 ev_stop (EV_A_ (W)w);
2815 2981
2816 EV_FREQUENT_CHECK; 2982 EV_FREQUENT_CHECK;
2817} 2983}
2984
2985#endif
2818 2986
2819#if EV_STAT_ENABLE 2987#if EV_STAT_ENABLE
2820 2988
2821# ifdef _WIN32 2989# ifdef _WIN32
2822# undef lstat 2990# undef lstat
… …
2828#define MIN_STAT_INTERVAL 0.1074891 2996#define MIN_STAT_INTERVAL 0.1074891
2829 2997
2830static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2998static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2831 2999
2832#if EV_USE_INOTIFY 3000#if EV_USE_INOTIFY
2833# define EV_INOTIFY_BUFSIZE 8192 3001
3002/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
3003# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2834 3004
2835static void noinline 3005static void noinline
2836infy_add (EV_P_ ev_stat *w) 3006infy_add (EV_P_ ev_stat *w)
2837{ 3007{
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); 3008 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 3009
2840 if (w->wd < 0) 3010 if (w->wd >= 0)
3011 {
3012 struct statfs sfs;
3013
3014 /* now local changes will be tracked by inotify, but remote changes won't */
3015 /* unless the filesystem is known to be local, we therefore still poll */
3016 /* also do poll on <2.6.25, but with normal frequency */
3017
3018 if (!fs_2625)
3019 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3020 else if (!statfs (w->path, &sfs)
3021 && (sfs.f_type == 0x1373 /* devfs */
3022 || sfs.f_type == 0xEF53 /* ext2/3 */
3023 || sfs.f_type == 0x3153464a /* jfs */
3024 || sfs.f_type == 0x52654973 /* reiser3 */
3025 || sfs.f_type == 0x01021994 /* tempfs */
3026 || sfs.f_type == 0x58465342 /* xfs */))
3027 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3028 else
3029 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2841 { 3030 }
3031 else
3032 {
3033 /* can't use inotify, continue to stat */
2842 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3034 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 3035
2845 /* monitor some parent directory for speedup hints */ 3036 /* 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, */ 3037 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2847 /* but an efficiency issue only */ 3038 /* but an efficiency issue only */
2848 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3039 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2849 { 3040 {
2850 char path [4096]; 3041 char path [4096];
… …
2866 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3057 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2867 } 3058 }
2868 } 3059 }
2869 3060
2870 if (w->wd >= 0) 3061 if (w->wd >= 0)
2871 {
2872 struct statfs sfs;
2873
2874 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3062 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2875 3063
2876 /* now local changes will be tracked by inotify, but remote changes won't */ 3064 /* now re-arm timer, if required */
2877 /* unless the filesystem it known to be local, we therefore still poll */ 3065 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); 3066 ev_timer_again (EV_A_ &w->timer);
2891 } 3067 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2892} 3068}
2893 3069
2894static void noinline 3070static void noinline
2895infy_del (EV_P_ ev_stat *w) 3071infy_del (EV_P_ ev_stat *w)
2896{ 3072{
… …
2899 3075
2900 if (wd < 0) 3076 if (wd < 0)
2901 return; 3077 return;
2902 3078
2903 w->wd = -2; 3079 w->wd = -2;
2904 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3080 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2905 wlist_del (&fs_hash [slot].head, (WL)w); 3081 wlist_del (&fs_hash [slot].head, (WL)w);
2906 3082
2907 /* remove this watcher, if others are watching it, they will rearm */ 3083 /* remove this watcher, if others are watching it, they will rearm */
2908 inotify_rm_watch (fs_fd, wd); 3084 inotify_rm_watch (fs_fd, wd);
2909} 3085}
… …
2911static void noinline 3087static void noinline
2912infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3088infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2913{ 3089{
2914 if (slot < 0) 3090 if (slot < 0)
2915 /* overflow, need to check for all hash slots */ 3091 /* overflow, need to check for all hash slots */
2916 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3092 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2917 infy_wd (EV_A_ slot, wd, ev); 3093 infy_wd (EV_A_ slot, wd, ev);
2918 else 3094 else
2919 { 3095 {
2920 WL w_; 3096 WL w_;
2921 3097
2922 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3098 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2923 { 3099 {
2924 ev_stat *w = (ev_stat *)w_; 3100 ev_stat *w = (ev_stat *)w_;
2925 w_ = w_->next; /* lets us remove this watcher and all before it */ 3101 w_ = w_->next; /* lets us remove this watcher and all before it */
2926 3102
2927 if (w->wd == wd || wd == -1) 3103 if (w->wd == wd || wd == -1)
2928 { 3104 {
2929 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3105 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2930 { 3106 {
2931 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3107 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2932 w->wd = -1; 3108 w->wd = -1;
2933 infy_add (EV_A_ w); /* re-add, no matter what */ 3109 infy_add (EV_A_ w); /* re-add, no matter what */
2934 } 3110 }
2935 3111
2936 stat_timer_cb (EV_A_ &w->timer, 0); 3112 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2941 3117
2942static void 3118static void
2943infy_cb (EV_P_ ev_io *w, int revents) 3119infy_cb (EV_P_ ev_io *w, int revents)
2944{ 3120{
2945 char buf [EV_INOTIFY_BUFSIZE]; 3121 char buf [EV_INOTIFY_BUFSIZE];
2946 struct inotify_event *ev = (struct inotify_event *)buf;
2947 int ofs; 3122 int ofs;
2948 int len = read (fs_fd, buf, sizeof (buf)); 3123 int len = read (fs_fd, buf, sizeof (buf));
2949 3124
2950 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3125 for (ofs = 0; ofs < len; )
3126 {
3127 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2951 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3128 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3129 ofs += sizeof (struct inotify_event) + ev->len;
3130 }
2952} 3131}
2953 3132
2954inline_size void 3133inline_size void
2955check_2625 (EV_P) 3134ev_check_2625 (EV_P)
2956{ 3135{
2957 /* kernels < 2.6.25 are borked 3136 /* kernels < 2.6.25 are borked
2958 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3137 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2959 */ 3138 */
2960 struct utsname buf; 3139 if (ev_linux_version () < 0x020619)
2961 int major, minor, micro;
2962
2963 if (uname (&buf))
2964 return; 3140 return;
2965 3141
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; 3142 fs_2625 = 1;
3143}
3144
3145inline_size int
3146infy_newfd (void)
3147{
3148#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3149 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3150 if (fd >= 0)
3151 return fd;
3152#endif
3153 return inotify_init ();
2975} 3154}
2976 3155
2977inline_size void 3156inline_size void
2978infy_init (EV_P) 3157infy_init (EV_P)
2979{ 3158{
2980 if (fs_fd != -2) 3159 if (fs_fd != -2)
2981 return; 3160 return;
2982 3161
2983 fs_fd = -1; 3162 fs_fd = -1;
2984 3163
2985 check_2625 (EV_A); 3164 ev_check_2625 (EV_A);
2986 3165
2987 fs_fd = inotify_init (); 3166 fs_fd = infy_newfd ();
2988 3167
2989 if (fs_fd >= 0) 3168 if (fs_fd >= 0)
2990 { 3169 {
3170 fd_intern (fs_fd);
2991 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3171 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2992 ev_set_priority (&fs_w, EV_MAXPRI); 3172 ev_set_priority (&fs_w, EV_MAXPRI);
2993 ev_io_start (EV_A_ &fs_w); 3173 ev_io_start (EV_A_ &fs_w);
3174 ev_unref (EV_A);
2994 } 3175 }
2995} 3176}
2996 3177
2997inline_size void 3178inline_size void
2998infy_fork (EV_P) 3179infy_fork (EV_P)
… …
3000 int slot; 3181 int slot;
3001 3182
3002 if (fs_fd < 0) 3183 if (fs_fd < 0)
3003 return; 3184 return;
3004 3185
3186 ev_ref (EV_A);
3187 ev_io_stop (EV_A_ &fs_w);
3005 close (fs_fd); 3188 close (fs_fd);
3006 fs_fd = inotify_init (); 3189 fs_fd = infy_newfd ();
3007 3190
3191 if (fs_fd >= 0)
3192 {
3193 fd_intern (fs_fd);
3194 ev_io_set (&fs_w, fs_fd, EV_READ);
3195 ev_io_start (EV_A_ &fs_w);
3196 ev_unref (EV_A);
3197 }
3198
3008 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3199 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3009 { 3200 {
3010 WL w_ = fs_hash [slot].head; 3201 WL w_ = fs_hash [slot].head;
3011 fs_hash [slot].head = 0; 3202 fs_hash [slot].head = 0;
3012 3203
3013 while (w_) 3204 while (w_)
… …
3018 w->wd = -1; 3209 w->wd = -1;
3019 3210
3020 if (fs_fd >= 0) 3211 if (fs_fd >= 0)
3021 infy_add (EV_A_ w); /* re-add, no matter what */ 3212 infy_add (EV_A_ w); /* re-add, no matter what */
3022 else 3213 else
3214 {
3215 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3216 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3023 ev_timer_again (EV_A_ &w->timer); 3217 ev_timer_again (EV_A_ &w->timer);
3218 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3219 }
3024 } 3220 }
3025 } 3221 }
3026} 3222}
3027 3223
3028#endif 3224#endif
… …
3045static void noinline 3241static void noinline
3046stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3242stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3047{ 3243{
3048 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3244 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3049 3245
3050 /* we copy this here each the time so that */ 3246 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); 3247 ev_stat_stat (EV_A_ w);
3054 3248
3055 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3249 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3056 if ( 3250 if (
3057 w->prev.st_dev != w->attr.st_dev 3251 prev.st_dev != w->attr.st_dev
3058 || w->prev.st_ino != w->attr.st_ino 3252 || prev.st_ino != w->attr.st_ino
3059 || w->prev.st_mode != w->attr.st_mode 3253 || prev.st_mode != w->attr.st_mode
3060 || w->prev.st_nlink != w->attr.st_nlink 3254 || prev.st_nlink != w->attr.st_nlink
3061 || w->prev.st_uid != w->attr.st_uid 3255 || prev.st_uid != w->attr.st_uid
3062 || w->prev.st_gid != w->attr.st_gid 3256 || prev.st_gid != w->attr.st_gid
3063 || w->prev.st_rdev != w->attr.st_rdev 3257 || prev.st_rdev != w->attr.st_rdev
3064 || w->prev.st_size != w->attr.st_size 3258 || prev.st_size != w->attr.st_size
3065 || w->prev.st_atime != w->attr.st_atime 3259 || prev.st_atime != w->attr.st_atime
3066 || w->prev.st_mtime != w->attr.st_mtime 3260 || prev.st_mtime != w->attr.st_mtime
3067 || w->prev.st_ctime != w->attr.st_ctime 3261 || prev.st_ctime != w->attr.st_ctime
3068 ) { 3262 ) {
3263 /* we only update w->prev on actual differences */
3264 /* in case we test more often than invoke the callback, */
3265 /* to ensure that prev is always different to attr */
3266 w->prev = prev;
3267
3069 #if EV_USE_INOTIFY 3268 #if EV_USE_INOTIFY
3070 if (fs_fd >= 0) 3269 if (fs_fd >= 0)
3071 { 3270 {
3072 infy_del (EV_A_ w); 3271 infy_del (EV_A_ w);
3073 infy_add (EV_A_ w); 3272 infy_add (EV_A_ w);
… …
3098 3297
3099 if (fs_fd >= 0) 3298 if (fs_fd >= 0)
3100 infy_add (EV_A_ w); 3299 infy_add (EV_A_ w);
3101 else 3300 else
3102#endif 3301#endif
3302 {
3103 ev_timer_again (EV_A_ &w->timer); 3303 ev_timer_again (EV_A_ &w->timer);
3304 ev_unref (EV_A);
3305 }
3104 3306
3105 ev_start (EV_A_ (W)w, 1); 3307 ev_start (EV_A_ (W)w, 1);
3106 3308
3107 EV_FREQUENT_CHECK; 3309 EV_FREQUENT_CHECK;
3108} 3310}
… …
3117 EV_FREQUENT_CHECK; 3319 EV_FREQUENT_CHECK;
3118 3320
3119#if EV_USE_INOTIFY 3321#if EV_USE_INOTIFY
3120 infy_del (EV_A_ w); 3322 infy_del (EV_A_ w);
3121#endif 3323#endif
3324
3325 if (ev_is_active (&w->timer))
3326 {
3327 ev_ref (EV_A);
3122 ev_timer_stop (EV_A_ &w->timer); 3328 ev_timer_stop (EV_A_ &w->timer);
3329 }
3123 3330
3124 ev_stop (EV_A_ (W)w); 3331 ev_stop (EV_A_ (W)w);
3125 3332
3126 EV_FREQUENT_CHECK; 3333 EV_FREQUENT_CHECK;
3127} 3334}
… …
3172 3379
3173 EV_FREQUENT_CHECK; 3380 EV_FREQUENT_CHECK;
3174} 3381}
3175#endif 3382#endif
3176 3383
3384#if EV_PREPARE_ENABLE
3177void 3385void
3178ev_prepare_start (EV_P_ ev_prepare *w) 3386ev_prepare_start (EV_P_ ev_prepare *w)
3179{ 3387{
3180 if (expect_false (ev_is_active (w))) 3388 if (expect_false (ev_is_active (w)))
3181 return; 3389 return;
… …
3207 3415
3208 ev_stop (EV_A_ (W)w); 3416 ev_stop (EV_A_ (W)w);
3209 3417
3210 EV_FREQUENT_CHECK; 3418 EV_FREQUENT_CHECK;
3211} 3419}
3420#endif
3212 3421
3422#if EV_CHECK_ENABLE
3213void 3423void
3214ev_check_start (EV_P_ ev_check *w) 3424ev_check_start (EV_P_ ev_check *w)
3215{ 3425{
3216 if (expect_false (ev_is_active (w))) 3426 if (expect_false (ev_is_active (w)))
3217 return; 3427 return;
… …
3243 3453
3244 ev_stop (EV_A_ (W)w); 3454 ev_stop (EV_A_ (W)w);
3245 3455
3246 EV_FREQUENT_CHECK; 3456 EV_FREQUENT_CHECK;
3247} 3457}
3458#endif
3248 3459
3249#if EV_EMBED_ENABLE 3460#if EV_EMBED_ENABLE
3250void noinline 3461void noinline
3251ev_embed_sweep (EV_P_ ev_embed *w) 3462ev_embed_sweep (EV_P_ ev_embed *w)
3252{ 3463{
3253 ev_loop (w->other, EVLOOP_NONBLOCK); 3464 ev_run (w->other, EVRUN_NOWAIT);
3254} 3465}
3255 3466
3256static void 3467static void
3257embed_io_cb (EV_P_ ev_io *io, int revents) 3468embed_io_cb (EV_P_ ev_io *io, int revents)
3258{ 3469{
3259 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3470 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3260 3471
3261 if (ev_cb (w)) 3472 if (ev_cb (w))
3262 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3473 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3263 else 3474 else
3264 ev_loop (w->other, EVLOOP_NONBLOCK); 3475 ev_run (w->other, EVRUN_NOWAIT);
3265} 3476}
3266 3477
3267static void 3478static void
3268embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3479embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3269{ 3480{
… …
3273 EV_P = w->other; 3484 EV_P = w->other;
3274 3485
3275 while (fdchangecnt) 3486 while (fdchangecnt)
3276 { 3487 {
3277 fd_reify (EV_A); 3488 fd_reify (EV_A);
3278 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3489 ev_run (EV_A_ EVRUN_NOWAIT);
3279 } 3490 }
3280 } 3491 }
3281} 3492}
3282 3493
3283static void 3494static void
… …
3289 3500
3290 { 3501 {
3291 EV_P = w->other; 3502 EV_P = w->other;
3292 3503
3293 ev_loop_fork (EV_A); 3504 ev_loop_fork (EV_A);
3294 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3505 ev_run (EV_A_ EVRUN_NOWAIT);
3295 } 3506 }
3296 3507
3297 ev_embed_start (EV_A_ w); 3508 ev_embed_start (EV_A_ w);
3298} 3509}
3299 3510
… …
3347 3558
3348 ev_io_stop (EV_A_ &w->io); 3559 ev_io_stop (EV_A_ &w->io);
3349 ev_prepare_stop (EV_A_ &w->prepare); 3560 ev_prepare_stop (EV_A_ &w->prepare);
3350 ev_fork_stop (EV_A_ &w->fork); 3561 ev_fork_stop (EV_A_ &w->fork);
3351 3562
3563 ev_stop (EV_A_ (W)w);
3564
3352 EV_FREQUENT_CHECK; 3565 EV_FREQUENT_CHECK;
3353} 3566}
3354#endif 3567#endif
3355 3568
3356#if EV_FORK_ENABLE 3569#if EV_FORK_ENABLE
… …
3389 3602
3390 EV_FREQUENT_CHECK; 3603 EV_FREQUENT_CHECK;
3391} 3604}
3392#endif 3605#endif
3393 3606
3394#if EV_ASYNC_ENABLE 3607#if EV_CLEANUP_ENABLE
3395void 3608void
3396ev_async_start (EV_P_ ev_async *w) 3609ev_cleanup_start (EV_P_ ev_cleanup *w)
3397{ 3610{
3398 if (expect_false (ev_is_active (w))) 3611 if (expect_false (ev_is_active (w)))
3399 return; 3612 return;
3613
3614 EV_FREQUENT_CHECK;
3615
3616 ev_start (EV_A_ (W)w, ++cleanupcnt);
3617 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3618 cleanups [cleanupcnt - 1] = w;
3619
3620 /* cleanup watchers should never keep a refcount on the loop */
3621 ev_unref (EV_A);
3622 EV_FREQUENT_CHECK;
3623}
3624
3625void
3626ev_cleanup_stop (EV_P_ ev_cleanup *w)
3627{
3628 clear_pending (EV_A_ (W)w);
3629 if (expect_false (!ev_is_active (w)))
3630 return;
3631
3632 EV_FREQUENT_CHECK;
3633 ev_ref (EV_A);
3634
3635 {
3636 int active = ev_active (w);
3637
3638 cleanups [active - 1] = cleanups [--cleanupcnt];
3639 ev_active (cleanups [active - 1]) = active;
3640 }
3641
3642 ev_stop (EV_A_ (W)w);
3643
3644 EV_FREQUENT_CHECK;
3645}
3646#endif
3647
3648#if EV_ASYNC_ENABLE
3649void
3650ev_async_start (EV_P_ ev_async *w)
3651{
3652 if (expect_false (ev_is_active (w)))
3653 return;
3654
3655 w->sent = 0;
3400 3656
3401 evpipe_init (EV_A); 3657 evpipe_init (EV_A);
3402 3658
3403 EV_FREQUENT_CHECK; 3659 EV_FREQUENT_CHECK;
3404 3660
… …
3482{ 3738{
3483 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3739 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3484 3740
3485 if (expect_false (!once)) 3741 if (expect_false (!once))
3486 { 3742 {
3487 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3743 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3488 return; 3744 return;
3489 } 3745 }
3490 3746
3491 once->cb = cb; 3747 once->cb = cb;
3492 once->arg = arg; 3748 once->arg = arg;
… …
3579 if (types & EV_ASYNC) 3835 if (types & EV_ASYNC)
3580 for (i = asynccnt; i--; ) 3836 for (i = asynccnt; i--; )
3581 cb (EV_A_ EV_ASYNC, asyncs [i]); 3837 cb (EV_A_ EV_ASYNC, asyncs [i]);
3582#endif 3838#endif
3583 3839
3840#if EV_PREPARE_ENABLE
3584 if (types & EV_PREPARE) 3841 if (types & EV_PREPARE)
3585 for (i = preparecnt; i--; ) 3842 for (i = preparecnt; i--; )
3586#if EV_EMBED_ENABLE 3843# if EV_EMBED_ENABLE
3587 if (ev_cb (prepares [i]) != embed_prepare_cb) 3844 if (ev_cb (prepares [i]) != embed_prepare_cb)
3588#endif 3845# endif
3589 cb (EV_A_ EV_PREPARE, prepares [i]); 3846 cb (EV_A_ EV_PREPARE, prepares [i]);
3847#endif
3590 3848
3849#if EV_CHECK_ENABLE
3591 if (types & EV_CHECK) 3850 if (types & EV_CHECK)
3592 for (i = checkcnt; i--; ) 3851 for (i = checkcnt; i--; )
3593 cb (EV_A_ EV_CHECK, checks [i]); 3852 cb (EV_A_ EV_CHECK, checks [i]);
3853#endif
3594 3854
3855#if EV_SIGNAL_ENABLE
3595 if (types & EV_SIGNAL) 3856 if (types & EV_SIGNAL)
3596 for (i = 0; i < EV_NSIG - 1; ++i) 3857 for (i = 0; i < EV_NSIG - 1; ++i)
3597 for (wl = signals [i].head; wl; ) 3858 for (wl = signals [i].head; wl; )
3598 { 3859 {
3599 wn = wl->next; 3860 wn = wl->next;
3600 cb (EV_A_ EV_SIGNAL, wl); 3861 cb (EV_A_ EV_SIGNAL, wl);
3601 wl = wn; 3862 wl = wn;
3602 } 3863 }
3864#endif
3603 3865
3866#if EV_CHILD_ENABLE
3604 if (types & EV_CHILD) 3867 if (types & EV_CHILD)
3605 for (i = EV_PID_HASHSIZE; i--; ) 3868 for (i = (EV_PID_HASHSIZE); i--; )
3606 for (wl = childs [i]; wl; ) 3869 for (wl = childs [i]; wl; )
3607 { 3870 {
3608 wn = wl->next; 3871 wn = wl->next;
3609 cb (EV_A_ EV_CHILD, wl); 3872 cb (EV_A_ EV_CHILD, wl);
3610 wl = wn; 3873 wl = wn;
3611 } 3874 }
3875#endif
3612/* EV_STAT 0x00001000 /* stat data changed */ 3876/* EV_STAT 0x00001000 /* stat data changed */
3613/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3877/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3614} 3878}
3615#endif 3879#endif
3616 3880
3617#if EV_MULTIPLICITY 3881#if EV_MULTIPLICITY
3618 #include "ev_wrap.h" 3882 #include "ev_wrap.h"
3619#endif 3883#endif
3620 3884
3621#ifdef __cplusplus 3885EV_CPP(})
3622}
3623#endif
3624 3886

Diff Legend

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