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

Comparing libev/ev.c (file contents):
Revision 1.307 by root, Sun Jul 19 07:20:41 2009 UTC vs.
Revision 1.371 by root, Mon Feb 7 21:45:32 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
… …
359# undef EV_USE_INOTIFY 376# undef EV_USE_INOTIFY
360# define EV_USE_INOTIFY 0 377# define EV_USE_INOTIFY 0
361#endif 378#endif
362 379
363#if !EV_USE_NANOSLEEP 380#if !EV_USE_NANOSLEEP
364# ifndef _WIN32 381/* hp-ux has it in sys/time.h, which we unconditionally include above */
382# if !defined(_WIN32) && !defined(__hpux)
365# include <sys/select.h> 383# include <sys/select.h>
366# endif 384# endif
367#endif 385#endif
368 386
369#if EV_USE_INOTIFY 387#if EV_USE_INOTIFY
370# include <sys/utsname.h>
371# include <sys/statfs.h> 388# include <sys/statfs.h>
372# include <sys/inotify.h> 389# include <sys/inotify.h>
373/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 390/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
374# ifndef IN_DONT_FOLLOW 391# ifndef IN_DONT_FOLLOW
375# undef EV_USE_INOTIFY 392# undef EV_USE_INOTIFY
… …
386# include <stdint.h> 403# include <stdint.h>
387# ifndef EFD_NONBLOCK 404# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK 405# define EFD_NONBLOCK O_NONBLOCK
389# endif 406# endif
390# ifndef EFD_CLOEXEC 407# ifndef EFD_CLOEXEC
408# ifdef O_CLOEXEC
391# define EFD_CLOEXEC O_CLOEXEC 409# define EFD_CLOEXEC O_CLOEXEC
410# else
411# define EFD_CLOEXEC 02000000
412# endif
392# endif 413# endif
393# ifdef __cplusplus 414EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
394extern "C" { 415#endif
416
417#if EV_USE_SIGNALFD
418/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
419# include <stdint.h>
420# ifndef SFD_NONBLOCK
421# define SFD_NONBLOCK O_NONBLOCK
395# endif 422# endif
396int eventfd (unsigned int initval, int flags); 423# ifndef SFD_CLOEXEC
397# ifdef __cplusplus 424# ifdef O_CLOEXEC
398} 425# define SFD_CLOEXEC O_CLOEXEC
426# else
427# define SFD_CLOEXEC 02000000
428# endif
399# endif 429# endif
400#endif 430EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
401 431
402#if EV_USE_SIGNALFD 432struct signalfd_siginfo
403# include <sys/signalfd.h> 433{
434 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)];
436};
404#endif 437#endif
405 438
406/**/ 439/**/
407 440
408#if EV_VERIFY >= 3 441#if EV_VERIFY >= 3
409# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 442# define EV_FREQUENT_CHECK ev_verify (EV_A)
410#else 443#else
411# define EV_FREQUENT_CHECK do { } while (0) 444# define EV_FREQUENT_CHECK do { } while (0)
412#endif 445#endif
413 446
414/* 447/*
… …
421 */ 454 */
422#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 455#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
423 456
424#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 457#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
425#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 458#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
426/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 459
460#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
461#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
427 462
428#if __GNUC__ >= 4 463#if __GNUC__ >= 4
429# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
430# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
431#else 466#else
… …
438 473
439#define expect_false(expr) expect ((expr) != 0, 0) 474#define expect_false(expr) expect ((expr) != 0, 0)
440#define expect_true(expr) expect ((expr) != 0, 1) 475#define expect_true(expr) expect ((expr) != 0, 1)
441#define inline_size static inline 476#define inline_size static inline
442 477
443#if EV_MINIMAL 478#if EV_FEATURE_CODE
479# define inline_speed static inline
480#else
444# define inline_speed static noinline 481# define inline_speed static noinline
445#else
446# define inline_speed static inline
447#endif 482#endif
448 483
449#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
450 485
451#if EV_MINPRI == EV_MAXPRI 486#if EV_MINPRI == EV_MAXPRI
… …
464#define ev_active(w) ((W)(w))->active 499#define ev_active(w) ((W)(w))->active
465#define ev_at(w) ((WT)(w))->at 500#define ev_at(w) ((WT)(w))->at
466 501
467#if EV_USE_REALTIME 502#if EV_USE_REALTIME
468/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 503/* sig_atomic_t is used to avoid per-thread variables or locking but still */
469/* giving it a reasonably high chance of working on typical architetcures */ 504/* giving it a reasonably high chance of working on typical architectures */
470static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
471#endif 506#endif
472 507
473#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
474static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
475#endif 510#endif
476 511
512#ifndef EV_FD_TO_WIN32_HANDLE
513# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
514#endif
515#ifndef EV_WIN32_HANDLE_TO_FD
516# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
517#endif
518#ifndef EV_WIN32_CLOSE_FD
519# define EV_WIN32_CLOSE_FD(fd) close (fd)
520#endif
521
477#ifdef _WIN32 522#ifdef _WIN32
478# include "ev_win32.c" 523# include "ev_win32.c"
479#endif 524#endif
480 525
481/*****************************************************************************/ 526/*****************************************************************************/
527
528#ifdef __linux
529# include <sys/utsname.h>
530#endif
531
532static unsigned int noinline
533ev_linux_version (void)
534{
535#ifdef __linux
536 unsigned int v = 0;
537 struct utsname buf;
538 int i;
539 char *p = buf.release;
540
541 if (uname (&buf))
542 return 0;
543
544 for (i = 3+1; --i; )
545 {
546 unsigned int c = 0;
547
548 for (;;)
549 {
550 if (*p >= '0' && *p <= '9')
551 c = c * 10 + *p++ - '0';
552 else
553 {
554 p += *p == '.';
555 break;
556 }
557 }
558
559 v = (v << 8) | c;
560 }
561
562 return v;
563#else
564 return 0;
565#endif
566}
567
568/*****************************************************************************/
569
570#if EV_AVOID_STDIO
571static void noinline
572ev_printerr (const char *msg)
573{
574 write (STDERR_FILENO, msg, strlen (msg));
575}
576#endif
482 577
483static void (*syserr_cb)(const char *msg); 578static void (*syserr_cb)(const char *msg);
484 579
485void 580void
486ev_set_syserr_cb (void (*cb)(const char *msg)) 581ev_set_syserr_cb (void (*cb)(const char *msg))
… …
496 591
497 if (syserr_cb) 592 if (syserr_cb)
498 syserr_cb (msg); 593 syserr_cb (msg);
499 else 594 else
500 { 595 {
596#if EV_AVOID_STDIO
597 ev_printerr (msg);
598 ev_printerr (": ");
599 ev_printerr (strerror (errno));
600 ev_printerr ("\n");
601#else
501 perror (msg); 602 perror (msg);
603#endif
502 abort (); 604 abort ();
503 } 605 }
504} 606}
505 607
506static void * 608static void *
507ev_realloc_emul (void *ptr, long size) 609ev_realloc_emul (void *ptr, long size)
508{ 610{
611#if __GLIBC__
612 return realloc (ptr, size);
613#else
509 /* some systems, notably openbsd and darwin, fail to properly 614 /* some systems, notably openbsd and darwin, fail to properly
510 * implement realloc (x, 0) (as required by both ansi c-98 and 615 * implement realloc (x, 0) (as required by both ansi c-89 and
511 * the single unix specification, so work around them here. 616 * the single unix specification, so work around them here.
512 */ 617 */
513 618
514 if (size) 619 if (size)
515 return realloc (ptr, size); 620 return realloc (ptr, size);
516 621
517 free (ptr); 622 free (ptr);
518 return 0; 623 return 0;
624#endif
519} 625}
520 626
521static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 627static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
522 628
523void 629void
… …
531{ 637{
532 ptr = alloc (ptr, size); 638 ptr = alloc (ptr, size);
533 639
534 if (!ptr && size) 640 if (!ptr && size)
535 { 641 {
642#if EV_AVOID_STDIO
643 ev_printerr ("(libev) memory allocation failed, aborting.\n");
644#else
536 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 645 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
646#endif
537 abort (); 647 abort ();
538 } 648 }
539 649
540 return ptr; 650 return ptr;
541} 651}
… …
557 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 667 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
558 unsigned char unused; 668 unsigned char unused;
559#if EV_USE_EPOLL 669#if EV_USE_EPOLL
560 unsigned int egen; /* generation counter to counter epoll bugs */ 670 unsigned int egen; /* generation counter to counter epoll bugs */
561#endif 671#endif
562#if EV_SELECT_IS_WINSOCKET 672#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
563 SOCKET handle; 673 SOCKET handle;
674#endif
675#if EV_USE_IOCP
676 OVERLAPPED or, ow;
564#endif 677#endif
565} ANFD; 678} ANFD;
566 679
567/* stores the pending event set for a given watcher */ 680/* stores the pending event set for a given watcher */
568typedef struct 681typedef struct
… …
623 736
624 static int ev_default_loop_ptr; 737 static int ev_default_loop_ptr;
625 738
626#endif 739#endif
627 740
628#if EV_MINIMAL < 2 741#if EV_FEATURE_API
629# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 742# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
630# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 743# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
631# define EV_INVOKE_PENDING invoke_cb (EV_A) 744# define EV_INVOKE_PENDING invoke_cb (EV_A)
632#else 745#else
633# define EV_RELEASE_CB (void)0 746# define EV_RELEASE_CB (void)0
634# define EV_ACQUIRE_CB (void)0 747# define EV_ACQUIRE_CB (void)0
635# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 748# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
636#endif 749#endif
637 750
638#define EVUNLOOP_RECURSE 0x80 751#define EVBREAK_RECURSE 0x80
639 752
640/*****************************************************************************/ 753/*****************************************************************************/
641 754
642#ifndef EV_HAVE_EV_TIME 755#ifndef EV_HAVE_EV_TIME
643ev_tstamp 756ev_tstamp
… …
687 if (delay > 0.) 800 if (delay > 0.)
688 { 801 {
689#if EV_USE_NANOSLEEP 802#if EV_USE_NANOSLEEP
690 struct timespec ts; 803 struct timespec ts;
691 804
692 ts.tv_sec = (time_t)delay; 805 EV_TS_SET (ts, delay);
693 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
694
695 nanosleep (&ts, 0); 806 nanosleep (&ts, 0);
696#elif defined(_WIN32) 807#elif defined(_WIN32)
697 Sleep ((unsigned long)(delay * 1e3)); 808 Sleep ((unsigned long)(delay * 1e3));
698#else 809#else
699 struct timeval tv; 810 struct timeval tv;
700 811
701 tv.tv_sec = (time_t)delay;
702 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
703
704 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 812 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
705 /* something not guaranteed by newer posix versions, but guaranteed */ 813 /* something not guaranteed by newer posix versions, but guaranteed */
706 /* by older ones */ 814 /* by older ones */
815 EV_TV_SET (tv, delay);
707 select (0, 0, 0, 0, &tv); 816 select (0, 0, 0, 0, &tv);
708#endif 817#endif
709 } 818 }
710} 819}
711 820
821inline_speed int
822ev_timeout_to_ms (ev_tstamp timeout)
823{
824 int ms = timeout * 1000. + .999999;
825
826 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
827}
828
712/*****************************************************************************/ 829/*****************************************************************************/
713 830
714#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 831#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
715 832
716/* find a suitable new size for the given array, */ 833/* find a suitable new size for the given array, */
717/* hopefully by rounding to a ncie-to-malloc size */ 834/* hopefully by rounding to a nice-to-malloc size */
718inline_size int 835inline_size int
719array_nextsize (int elem, int cur, int cnt) 836array_nextsize (int elem, int cur, int cnt)
720{ 837{
721 int ncur = cur + 1; 838 int ncur = cur + 1;
722 839
… …
818} 935}
819 936
820/*****************************************************************************/ 937/*****************************************************************************/
821 938
822inline_speed void 939inline_speed void
823fd_event_nc (EV_P_ int fd, int revents) 940fd_event_nocheck (EV_P_ int fd, int revents)
824{ 941{
825 ANFD *anfd = anfds + fd; 942 ANFD *anfd = anfds + fd;
826 ev_io *w; 943 ev_io *w;
827 944
828 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 945 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
840fd_event (EV_P_ int fd, int revents) 957fd_event (EV_P_ int fd, int revents)
841{ 958{
842 ANFD *anfd = anfds + fd; 959 ANFD *anfd = anfds + fd;
843 960
844 if (expect_true (!anfd->reify)) 961 if (expect_true (!anfd->reify))
845 fd_event_nc (EV_A_ fd, revents); 962 fd_event_nocheck (EV_A_ fd, revents);
846} 963}
847 964
848void 965void
849ev_feed_fd_event (EV_P_ int fd, int revents) 966ev_feed_fd_event (EV_P_ int fd, int revents)
850{ 967{
851 if (fd >= 0 && fd < anfdmax) 968 if (fd >= 0 && fd < anfdmax)
852 fd_event_nc (EV_A_ fd, revents); 969 fd_event_nocheck (EV_A_ fd, revents);
853} 970}
854 971
855/* make sure the external fd watch events are in-sync */ 972/* make sure the external fd watch events are in-sync */
856/* with the kernel/libev internal state */ 973/* with the kernel/libev internal state */
857inline_size void 974inline_size void
858fd_reify (EV_P) 975fd_reify (EV_P)
859{ 976{
860 int i; 977 int i;
861 978
979#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
980 for (i = 0; i < fdchangecnt; ++i)
981 {
982 int fd = fdchanges [i];
983 ANFD *anfd = anfds + fd;
984
985 if (anfd->reify & EV__IOFDSET)
986 {
987 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
988
989 if (handle != anfd->handle)
990 {
991 unsigned long arg;
992
993 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
994
995 /* handle changed, but fd didn't - we need to do it in two steps */
996 backend_modify (EV_A_ fd, anfd->events, 0);
997 anfd->events = 0;
998 anfd->handle = handle;
999 }
1000 }
1001 }
1002#endif
1003
862 for (i = 0; i < fdchangecnt; ++i) 1004 for (i = 0; i < fdchangecnt; ++i)
863 { 1005 {
864 int fd = fdchanges [i]; 1006 int fd = fdchanges [i];
865 ANFD *anfd = anfds + fd; 1007 ANFD *anfd = anfds + fd;
866 ev_io *w; 1008 ev_io *w;
867 1009
868 unsigned char events = 0; 1010 unsigned char o_events = anfd->events;
1011 unsigned char o_reify = anfd->reify;
869 1012
870 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1013 anfd->reify = 0;
871 events |= (unsigned char)w->events;
872 1014
873#if EV_SELECT_IS_WINSOCKET 1015 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
874 if (events)
875 { 1016 {
876 unsigned long arg; 1017 anfd->events = 0;
877 #ifdef EV_FD_TO_WIN32_HANDLE 1018
878 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 1019 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
879 #else 1020 anfd->events |= (unsigned char)w->events;
880 anfd->handle = _get_osfhandle (fd); 1021
881 #endif 1022 if (o_events != anfd->events)
882 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 1023 o_reify = EV__IOFDSET; /* actually |= */
883 } 1024 }
884#endif
885 1025
886 { 1026 if (o_reify & EV__IOFDSET)
887 unsigned char o_events = anfd->events;
888 unsigned char o_reify = anfd->reify;
889
890 anfd->reify = 0;
891 anfd->events = events;
892
893 if (o_events != events || o_reify & EV__IOFDSET)
894 backend_modify (EV_A_ fd, o_events, events); 1027 backend_modify (EV_A_ fd, o_events, anfd->events);
895 }
896 } 1028 }
897 1029
898 fdchangecnt = 0; 1030 fdchangecnt = 0;
899} 1031}
900 1032
… …
924 ev_io_stop (EV_A_ w); 1056 ev_io_stop (EV_A_ w);
925 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1057 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
926 } 1058 }
927} 1059}
928 1060
929/* check whether the given fd is atcually valid, for error recovery */ 1061/* check whether the given fd is actually valid, for error recovery */
930inline_size int 1062inline_size int
931fd_valid (int fd) 1063fd_valid (int fd)
932{ 1064{
933#ifdef _WIN32 1065#ifdef _WIN32
934 return _get_osfhandle (fd) != -1; 1066 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
935#else 1067#else
936 return fcntl (fd, F_GETFD) != -1; 1068 return fcntl (fd, F_GETFD) != -1;
937#endif 1069#endif
938} 1070}
939 1071
… …
976 anfds [fd].emask = 0; 1108 anfds [fd].emask = 0;
977 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1109 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
978 } 1110 }
979} 1111}
980 1112
1113/* used to prepare libev internal fd's */
1114/* this is not fork-safe */
1115inline_speed void
1116fd_intern (int fd)
1117{
1118#ifdef _WIN32
1119 unsigned long arg = 1;
1120 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1121#else
1122 fcntl (fd, F_SETFD, FD_CLOEXEC);
1123 fcntl (fd, F_SETFL, O_NONBLOCK);
1124#endif
1125}
1126
981/*****************************************************************************/ 1127/*****************************************************************************/
982 1128
983/* 1129/*
984 * the heap functions want a real array index. array index 0 uis guaranteed to not 1130 * the heap functions want a real array index. array index 0 is guaranteed to not
985 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1131 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
986 * the branching factor of the d-tree. 1132 * the branching factor of the d-tree.
987 */ 1133 */
988 1134
989/* 1135/*
… …
1057 1203
1058 for (;;) 1204 for (;;)
1059 { 1205 {
1060 int c = k << 1; 1206 int c = k << 1;
1061 1207
1062 if (c > N + HEAP0 - 1) 1208 if (c >= N + HEAP0)
1063 break; 1209 break;
1064 1210
1065 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1211 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1066 ? 1 : 0; 1212 ? 1 : 0;
1067 1213
… …
1103 1249
1104/* move an element suitably so it is in a correct place */ 1250/* move an element suitably so it is in a correct place */
1105inline_size void 1251inline_size void
1106adjustheap (ANHE *heap, int N, int k) 1252adjustheap (ANHE *heap, int N, int k)
1107{ 1253{
1108 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1254 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1109 upheap (heap, k); 1255 upheap (heap, k);
1110 else 1256 else
1111 downheap (heap, N, k); 1257 downheap (heap, N, k);
1112} 1258}
1113 1259
… …
1137 1283
1138static ANSIG signals [EV_NSIG - 1]; 1284static ANSIG signals [EV_NSIG - 1];
1139 1285
1140/*****************************************************************************/ 1286/*****************************************************************************/
1141 1287
1142/* used to prepare libev internal fd's */ 1288#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1143/* this is not fork-safe */
1144inline_speed void
1145fd_intern (int fd)
1146{
1147#ifdef _WIN32
1148 unsigned long arg = 1;
1149 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1150#else
1151 fcntl (fd, F_SETFD, FD_CLOEXEC);
1152 fcntl (fd, F_SETFL, O_NONBLOCK);
1153#endif
1154}
1155 1289
1156static void noinline 1290static void noinline
1157evpipe_init (EV_P) 1291evpipe_init (EV_P)
1158{ 1292{
1159 if (!ev_is_active (&pipe_w)) 1293 if (!ev_is_active (&pipe_w))
1160 { 1294 {
1161#if EV_USE_EVENTFD 1295# if EV_USE_EVENTFD
1162 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1296 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1163 if (evfd < 0 && errno == EINVAL) 1297 if (evfd < 0 && errno == EINVAL)
1164 evfd = eventfd (0, 0); 1298 evfd = eventfd (0, 0);
1165 1299
1166 if (evfd >= 0) 1300 if (evfd >= 0)
… …
1168 evpipe [0] = -1; 1302 evpipe [0] = -1;
1169 fd_intern (evfd); /* doing it twice doesn't hurt */ 1303 fd_intern (evfd); /* doing it twice doesn't hurt */
1170 ev_io_set (&pipe_w, evfd, EV_READ); 1304 ev_io_set (&pipe_w, evfd, EV_READ);
1171 } 1305 }
1172 else 1306 else
1173#endif 1307# endif
1174 { 1308 {
1175 while (pipe (evpipe)) 1309 while (pipe (evpipe))
1176 ev_syserr ("(libev) error creating signal/async pipe"); 1310 ev_syserr ("(libev) error creating signal/async pipe");
1177 1311
1178 fd_intern (evpipe [0]); 1312 fd_intern (evpipe [0]);
… …
1189evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1323evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1190{ 1324{
1191 if (!*flag) 1325 if (!*flag)
1192 { 1326 {
1193 int old_errno = errno; /* save errno because write might clobber it */ 1327 int old_errno = errno; /* save errno because write might clobber it */
1328 char dummy;
1194 1329
1195 *flag = 1; 1330 *flag = 1;
1196 1331
1197#if EV_USE_EVENTFD 1332#if EV_USE_EVENTFD
1198 if (evfd >= 0) 1333 if (evfd >= 0)
… …
1200 uint64_t counter = 1; 1335 uint64_t counter = 1;
1201 write (evfd, &counter, sizeof (uint64_t)); 1336 write (evfd, &counter, sizeof (uint64_t));
1202 } 1337 }
1203 else 1338 else
1204#endif 1339#endif
1340 /* win32 people keep sending patches that change this write() to send() */
1341 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1342 /* so when you think this write should be a send instead, please find out */
1343 /* where your send() is from - it's definitely not the microsoft send, and */
1344 /* tell me. thank you. */
1205 write (evpipe [1], &old_errno, 1); 1345 write (evpipe [1], &dummy, 1);
1206 1346
1207 errno = old_errno; 1347 errno = old_errno;
1208 } 1348 }
1209} 1349}
1210 1350
… …
1223 } 1363 }
1224 else 1364 else
1225#endif 1365#endif
1226 { 1366 {
1227 char dummy; 1367 char dummy;
1368 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1228 read (evpipe [0], &dummy, 1); 1369 read (evpipe [0], &dummy, 1);
1229 } 1370 }
1230 1371
1372#if EV_SIGNAL_ENABLE
1231 if (sig_pending) 1373 if (sig_pending)
1232 { 1374 {
1233 sig_pending = 0; 1375 sig_pending = 0;
1234 1376
1235 for (i = EV_NSIG - 1; i--; ) 1377 for (i = EV_NSIG - 1; i--; )
1236 if (expect_false (signals [i].pending)) 1378 if (expect_false (signals [i].pending))
1237 ev_feed_signal_event (EV_A_ i + 1); 1379 ev_feed_signal_event (EV_A_ i + 1);
1238 } 1380 }
1381#endif
1239 1382
1240#if EV_ASYNC_ENABLE 1383#if EV_ASYNC_ENABLE
1241 if (async_pending) 1384 if (async_pending)
1242 { 1385 {
1243 async_pending = 0; 1386 async_pending = 0;
… …
1252#endif 1395#endif
1253} 1396}
1254 1397
1255/*****************************************************************************/ 1398/*****************************************************************************/
1256 1399
1400void
1401ev_feed_signal (int signum)
1402{
1403#if EV_MULTIPLICITY
1404 EV_P = signals [signum - 1].loop;
1405
1406 if (!EV_A)
1407 return;
1408#endif
1409
1410 signals [signum - 1].pending = 1;
1411 evpipe_write (EV_A_ &sig_pending);
1412}
1413
1257static void 1414static void
1258ev_sighandler (int signum) 1415ev_sighandler (int signum)
1259{ 1416{
1260#if EV_MULTIPLICITY
1261 EV_P = signals [signum - 1].loop;
1262#endif
1263
1264#if _WIN32 1417#ifdef _WIN32
1265 signal (signum, ev_sighandler); 1418 signal (signum, ev_sighandler);
1266#endif 1419#endif
1267 1420
1268 signals [signum - 1].pending = 1; 1421 ev_feed_signal (signum);
1269 evpipe_write (EV_A_ &sig_pending);
1270} 1422}
1271 1423
1272void noinline 1424void noinline
1273ev_feed_signal_event (EV_P_ int signum) 1425ev_feed_signal_event (EV_P_ int signum)
1274{ 1426{
… …
1311 break; 1463 break;
1312 } 1464 }
1313} 1465}
1314#endif 1466#endif
1315 1467
1468#endif
1469
1316/*****************************************************************************/ 1470/*****************************************************************************/
1317 1471
1472#if EV_CHILD_ENABLE
1318static WL childs [EV_PID_HASHSIZE]; 1473static WL childs [EV_PID_HASHSIZE];
1319
1320#ifndef _WIN32
1321 1474
1322static ev_signal childev; 1475static ev_signal childev;
1323 1476
1324#ifndef WIFCONTINUED 1477#ifndef WIFCONTINUED
1325# define WIFCONTINUED(status) 0 1478# define WIFCONTINUED(status) 0
… …
1330child_reap (EV_P_ int chain, int pid, int status) 1483child_reap (EV_P_ int chain, int pid, int status)
1331{ 1484{
1332 ev_child *w; 1485 ev_child *w;
1333 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1486 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1334 1487
1335 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1488 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1336 { 1489 {
1337 if ((w->pid == pid || !w->pid) 1490 if ((w->pid == pid || !w->pid)
1338 && (!traced || (w->flags & 1))) 1491 && (!traced || (w->flags & 1)))
1339 { 1492 {
1340 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1493 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1365 /* make sure we are called again until all children have been reaped */ 1518 /* make sure we are called again until all children have been reaped */
1366 /* we need to do it this way so that the callback gets called before we continue */ 1519 /* we need to do it this way so that the callback gets called before we continue */
1367 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1520 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1368 1521
1369 child_reap (EV_A_ pid, pid, status); 1522 child_reap (EV_A_ pid, pid, status);
1370 if (EV_PID_HASHSIZE > 1) 1523 if ((EV_PID_HASHSIZE) > 1)
1371 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1524 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1372} 1525}
1373 1526
1374#endif 1527#endif
1375 1528
1376/*****************************************************************************/ 1529/*****************************************************************************/
1377 1530
1531#if EV_USE_IOCP
1532# include "ev_iocp.c"
1533#endif
1378#if EV_USE_PORT 1534#if EV_USE_PORT
1379# include "ev_port.c" 1535# include "ev_port.c"
1380#endif 1536#endif
1381#if EV_USE_KQUEUE 1537#if EV_USE_KQUEUE
1382# include "ev_kqueue.c" 1538# include "ev_kqueue.c"
… …
1442#ifdef __APPLE__ 1598#ifdef __APPLE__
1443 /* only select works correctly on that "unix-certified" platform */ 1599 /* only select works correctly on that "unix-certified" platform */
1444 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1600 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1445 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1601 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1446#endif 1602#endif
1603#ifdef __FreeBSD__
1604 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1605#endif
1447 1606
1448 return flags; 1607 return flags;
1449} 1608}
1450 1609
1451unsigned int 1610unsigned int
1452ev_embeddable_backends (void) 1611ev_embeddable_backends (void)
1453{ 1612{
1454 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1613 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1455 1614
1456 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1615 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1457 /* please fix it and tell me how to detect the fix */ 1616 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1458 flags &= ~EVBACKEND_EPOLL; 1617 flags &= ~EVBACKEND_EPOLL;
1459 1618
1460 return flags; 1619 return flags;
1461} 1620}
1462 1621
1463unsigned int 1622unsigned int
1464ev_backend (EV_P) 1623ev_backend (EV_P)
1465{ 1624{
1466 return backend; 1625 return backend;
1467} 1626}
1468 1627
1469#if EV_MINIMAL < 2 1628#if EV_FEATURE_API
1470unsigned int 1629unsigned int
1471ev_loop_count (EV_P) 1630ev_iteration (EV_P)
1472{ 1631{
1473 return loop_count; 1632 return loop_count;
1474} 1633}
1475 1634
1476unsigned int 1635unsigned int
1477ev_loop_depth (EV_P) 1636ev_depth (EV_P)
1478{ 1637{
1479 return loop_depth; 1638 return loop_depth;
1480} 1639}
1481 1640
1482void 1641void
… …
1519static void noinline 1678static void noinline
1520loop_init (EV_P_ unsigned int flags) 1679loop_init (EV_P_ unsigned int flags)
1521{ 1680{
1522 if (!backend) 1681 if (!backend)
1523 { 1682 {
1683 origflags = flags;
1684
1524#if EV_USE_REALTIME 1685#if EV_USE_REALTIME
1525 if (!have_realtime) 1686 if (!have_realtime)
1526 { 1687 {
1527 struct timespec ts; 1688 struct timespec ts;
1528 1689
… …
1554 1715
1555 ev_rt_now = ev_time (); 1716 ev_rt_now = ev_time ();
1556 mn_now = get_clock (); 1717 mn_now = get_clock ();
1557 now_floor = mn_now; 1718 now_floor = mn_now;
1558 rtmn_diff = ev_rt_now - mn_now; 1719 rtmn_diff = ev_rt_now - mn_now;
1559#if EV_MINIMAL < 2 1720#if EV_FEATURE_API
1560 invoke_cb = ev_invoke_pending; 1721 invoke_cb = ev_invoke_pending;
1561#endif 1722#endif
1562 1723
1563 io_blocktime = 0.; 1724 io_blocktime = 0.;
1564 timeout_blocktime = 0.; 1725 timeout_blocktime = 0.;
… …
1570#endif 1731#endif
1571#if EV_USE_INOTIFY 1732#if EV_USE_INOTIFY
1572 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1733 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1573#endif 1734#endif
1574#if EV_USE_SIGNALFD 1735#if EV_USE_SIGNALFD
1575 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1736 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1576#endif 1737#endif
1577 1738
1578 if (!(flags & 0x0000ffffU)) 1739 if (!(flags & EVBACKEND_MASK))
1579 flags |= ev_recommended_backends (); 1740 flags |= ev_recommended_backends ();
1580 1741
1742#if EV_USE_IOCP
1743 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1744#endif
1581#if EV_USE_PORT 1745#if EV_USE_PORT
1582 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1746 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1583#endif 1747#endif
1584#if EV_USE_KQUEUE 1748#if EV_USE_KQUEUE
1585 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1749 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1594 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1758 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1595#endif 1759#endif
1596 1760
1597 ev_prepare_init (&pending_w, pendingcb); 1761 ev_prepare_init (&pending_w, pendingcb);
1598 1762
1763#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1599 ev_init (&pipe_w, pipecb); 1764 ev_init (&pipe_w, pipecb);
1600 ev_set_priority (&pipe_w, EV_MAXPRI); 1765 ev_set_priority (&pipe_w, EV_MAXPRI);
1766#endif
1601 } 1767 }
1602} 1768}
1603 1769
1604/* free up a loop structure */ 1770/* free up a loop structure */
1605static void noinline 1771void
1606loop_destroy (EV_P) 1772ev_loop_destroy (EV_P)
1607{ 1773{
1608 int i; 1774 int i;
1775
1776#if EV_MULTIPLICITY
1777 /* mimic free (0) */
1778 if (!EV_A)
1779 return;
1780#endif
1781
1782#if EV_CLEANUP_ENABLE
1783 /* queue cleanup watchers (and execute them) */
1784 if (expect_false (cleanupcnt))
1785 {
1786 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1787 EV_INVOKE_PENDING;
1788 }
1789#endif
1790
1791#if EV_CHILD_ENABLE
1792 if (ev_is_active (&childev))
1793 {
1794 ev_ref (EV_A); /* child watcher */
1795 ev_signal_stop (EV_A_ &childev);
1796 }
1797#endif
1609 1798
1610 if (ev_is_active (&pipe_w)) 1799 if (ev_is_active (&pipe_w))
1611 { 1800 {
1612 /*ev_ref (EV_A);*/ 1801 /*ev_ref (EV_A);*/
1613 /*ev_io_stop (EV_A_ &pipe_w);*/ 1802 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1617 close (evfd); 1806 close (evfd);
1618#endif 1807#endif
1619 1808
1620 if (evpipe [0] >= 0) 1809 if (evpipe [0] >= 0)
1621 { 1810 {
1622 close (evpipe [0]); 1811 EV_WIN32_CLOSE_FD (evpipe [0]);
1623 close (evpipe [1]); 1812 EV_WIN32_CLOSE_FD (evpipe [1]);
1624 } 1813 }
1625 } 1814 }
1626 1815
1627#if EV_USE_SIGNALFD 1816#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w)) 1817 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd); 1818 close (sigfd);
1634 }
1635#endif 1819#endif
1636 1820
1637#if EV_USE_INOTIFY 1821#if EV_USE_INOTIFY
1638 if (fs_fd >= 0) 1822 if (fs_fd >= 0)
1639 close (fs_fd); 1823 close (fs_fd);
1640#endif 1824#endif
1641 1825
1642 if (backend_fd >= 0) 1826 if (backend_fd >= 0)
1643 close (backend_fd); 1827 close (backend_fd);
1644 1828
1829#if EV_USE_IOCP
1830 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1831#endif
1645#if EV_USE_PORT 1832#if EV_USE_PORT
1646 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1833 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1647#endif 1834#endif
1648#if EV_USE_KQUEUE 1835#if EV_USE_KQUEUE
1649 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1836 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1676 array_free (periodic, EMPTY); 1863 array_free (periodic, EMPTY);
1677#endif 1864#endif
1678#if EV_FORK_ENABLE 1865#if EV_FORK_ENABLE
1679 array_free (fork, EMPTY); 1866 array_free (fork, EMPTY);
1680#endif 1867#endif
1868#if EV_CLEANUP_ENABLE
1869 array_free (cleanup, EMPTY);
1870#endif
1681 array_free (prepare, EMPTY); 1871 array_free (prepare, EMPTY);
1682 array_free (check, EMPTY); 1872 array_free (check, EMPTY);
1683#if EV_ASYNC_ENABLE 1873#if EV_ASYNC_ENABLE
1684 array_free (async, EMPTY); 1874 array_free (async, EMPTY);
1685#endif 1875#endif
1686 1876
1687 backend = 0; 1877 backend = 0;
1878
1879#if EV_MULTIPLICITY
1880 if (ev_is_default_loop (EV_A))
1881#endif
1882 ev_default_loop_ptr = 0;
1883#if EV_MULTIPLICITY
1884 else
1885 ev_free (EV_A);
1886#endif
1688} 1887}
1689 1888
1690#if EV_USE_INOTIFY 1889#if EV_USE_INOTIFY
1691inline_size void infy_fork (EV_P); 1890inline_size void infy_fork (EV_P);
1692#endif 1891#endif
… …
1724 close (evfd); 1923 close (evfd);
1725#endif 1924#endif
1726 1925
1727 if (evpipe [0] >= 0) 1926 if (evpipe [0] >= 0)
1728 { 1927 {
1729 close (evpipe [0]); 1928 EV_WIN32_CLOSE_FD (evpipe [0]);
1730 close (evpipe [1]); 1929 EV_WIN32_CLOSE_FD (evpipe [1]);
1731 } 1930 }
1732 1931
1932#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1733 evpipe_init (EV_A); 1933 evpipe_init (EV_A);
1734 /* now iterate over everything, in case we missed something */ 1934 /* now iterate over everything, in case we missed something */
1735 pipecb (EV_A_ &pipe_w, EV_READ); 1935 pipecb (EV_A_ &pipe_w, EV_READ);
1936#endif
1736 } 1937 }
1737 1938
1738 postfork = 0; 1939 postfork = 0;
1739} 1940}
1740 1941
… …
1749 loop_init (EV_A_ flags); 1950 loop_init (EV_A_ flags);
1750 1951
1751 if (ev_backend (EV_A)) 1952 if (ev_backend (EV_A))
1752 return EV_A; 1953 return EV_A;
1753 1954
1955 ev_free (EV_A);
1754 return 0; 1956 return 0;
1755} 1957}
1756 1958
1757void
1758ev_loop_destroy (EV_P)
1759{
1760 loop_destroy (EV_A);
1761 ev_free (loop);
1762}
1763
1764void
1765ev_loop_fork (EV_P)
1766{
1767 postfork = 1; /* must be in line with ev_default_fork */
1768}
1769#endif /* multiplicity */ 1959#endif /* multiplicity */
1770 1960
1771#if EV_VERIFY 1961#if EV_VERIFY
1772static void noinline 1962static void noinline
1773verify_watcher (EV_P_ W w) 1963verify_watcher (EV_P_ W w)
… …
1802 verify_watcher (EV_A_ ws [cnt]); 1992 verify_watcher (EV_A_ ws [cnt]);
1803 } 1993 }
1804} 1994}
1805#endif 1995#endif
1806 1996
1807#if EV_MINIMAL < 2 1997#if EV_FEATURE_API
1808void 1998void
1809ev_loop_verify (EV_P) 1999ev_verify (EV_P)
1810{ 2000{
1811#if EV_VERIFY 2001#if EV_VERIFY
1812 int i; 2002 int i;
1813 WL w; 2003 WL w;
1814 2004
… …
1848#if EV_FORK_ENABLE 2038#if EV_FORK_ENABLE
1849 assert (forkmax >= forkcnt); 2039 assert (forkmax >= forkcnt);
1850 array_verify (EV_A_ (W *)forks, forkcnt); 2040 array_verify (EV_A_ (W *)forks, forkcnt);
1851#endif 2041#endif
1852 2042
2043#if EV_CLEANUP_ENABLE
2044 assert (cleanupmax >= cleanupcnt);
2045 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2046#endif
2047
1853#if EV_ASYNC_ENABLE 2048#if EV_ASYNC_ENABLE
1854 assert (asyncmax >= asynccnt); 2049 assert (asyncmax >= asynccnt);
1855 array_verify (EV_A_ (W *)asyncs, asynccnt); 2050 array_verify (EV_A_ (W *)asyncs, asynccnt);
1856#endif 2051#endif
1857 2052
2053#if EV_PREPARE_ENABLE
1858 assert (preparemax >= preparecnt); 2054 assert (preparemax >= preparecnt);
1859 array_verify (EV_A_ (W *)prepares, preparecnt); 2055 array_verify (EV_A_ (W *)prepares, preparecnt);
2056#endif
1860 2057
2058#if EV_CHECK_ENABLE
1861 assert (checkmax >= checkcnt); 2059 assert (checkmax >= checkcnt);
1862 array_verify (EV_A_ (W *)checks, checkcnt); 2060 array_verify (EV_A_ (W *)checks, checkcnt);
2061#endif
1863 2062
1864# if 0 2063# if 0
2064#if EV_CHILD_ENABLE
1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2065 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1866 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 2066 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2067#endif
1867# endif 2068# endif
1868#endif 2069#endif
1869} 2070}
1870#endif 2071#endif
1871 2072
1872#if EV_MULTIPLICITY 2073#if EV_MULTIPLICITY
1873struct ev_loop * 2074struct ev_loop *
1874ev_default_loop_init (unsigned int flags)
1875#else 2075#else
1876int 2076int
2077#endif
1877ev_default_loop (unsigned int flags) 2078ev_default_loop (unsigned int flags)
1878#endif
1879{ 2079{
1880 if (!ev_default_loop_ptr) 2080 if (!ev_default_loop_ptr)
1881 { 2081 {
1882#if EV_MULTIPLICITY 2082#if EV_MULTIPLICITY
1883 EV_P = ev_default_loop_ptr = &default_loop_struct; 2083 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1887 2087
1888 loop_init (EV_A_ flags); 2088 loop_init (EV_A_ flags);
1889 2089
1890 if (ev_backend (EV_A)) 2090 if (ev_backend (EV_A))
1891 { 2091 {
1892#ifndef _WIN32 2092#if EV_CHILD_ENABLE
1893 ev_signal_init (&childev, childcb, SIGCHLD); 2093 ev_signal_init (&childev, childcb, SIGCHLD);
1894 ev_set_priority (&childev, EV_MAXPRI); 2094 ev_set_priority (&childev, EV_MAXPRI);
1895 ev_signal_start (EV_A_ &childev); 2095 ev_signal_start (EV_A_ &childev);
1896 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2096 ev_unref (EV_A); /* child watcher should not keep loop alive */
1897#endif 2097#endif
… …
1902 2102
1903 return ev_default_loop_ptr; 2103 return ev_default_loop_ptr;
1904} 2104}
1905 2105
1906void 2106void
1907ev_default_destroy (void) 2107ev_loop_fork (EV_P)
1908{ 2108{
1909#if EV_MULTIPLICITY
1910 EV_P = ev_default_loop_ptr;
1911#endif
1912
1913 ev_default_loop_ptr = 0;
1914
1915#ifndef _WIN32
1916 ev_ref (EV_A); /* child watcher */
1917 ev_signal_stop (EV_A_ &childev);
1918#endif
1919
1920 loop_destroy (EV_A);
1921}
1922
1923void
1924ev_default_fork (void)
1925{
1926#if EV_MULTIPLICITY
1927 EV_P = ev_default_loop_ptr;
1928#endif
1929
1930 postfork = 1; /* must be in line with ev_loop_fork */ 2109 postfork = 1; /* must be in line with ev_default_fork */
1931} 2110}
1932 2111
1933/*****************************************************************************/ 2112/*****************************************************************************/
1934 2113
1935void 2114void
… …
1957 2136
1958 for (pri = NUMPRI; pri--; ) 2137 for (pri = NUMPRI; pri--; )
1959 while (pendingcnt [pri]) 2138 while (pendingcnt [pri])
1960 { 2139 {
1961 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2140 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1962
1963 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1964 /* ^ this is no longer true, as pending_w could be here */
1965 2141
1966 p->w->pending = 0; 2142 p->w->pending = 0;
1967 EV_CB_INVOKE (p->w, p->events); 2143 EV_CB_INVOKE (p->w, p->events);
1968 EV_FREQUENT_CHECK; 2144 EV_FREQUENT_CHECK;
1969 } 2145 }
… …
2026 EV_FREQUENT_CHECK; 2202 EV_FREQUENT_CHECK;
2027 feed_reverse (EV_A_ (W)w); 2203 feed_reverse (EV_A_ (W)w);
2028 } 2204 }
2029 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2205 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2030 2206
2031 feed_reverse_done (EV_A_ EV_TIMEOUT); 2207 feed_reverse_done (EV_A_ EV_TIMER);
2032 } 2208 }
2033} 2209}
2034 2210
2035#if EV_PERIODIC_ENABLE 2211#if EV_PERIODIC_ENABLE
2212
2213inline_speed void
2214periodic_recalc (EV_P_ ev_periodic *w)
2215{
2216 /* TODO: use slow but potentially more correct incremental algo, */
2217 /* also do not rely on ceil */
2218 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2219}
2220
2036/* make periodics pending */ 2221/* make periodics pending */
2037inline_size void 2222inline_size void
2038periodics_reify (EV_P) 2223periodics_reify (EV_P)
2039{ 2224{
2040 EV_FREQUENT_CHECK; 2225 EV_FREQUENT_CHECK;
… …
2059 ANHE_at_cache (periodics [HEAP0]); 2244 ANHE_at_cache (periodics [HEAP0]);
2060 downheap (periodics, periodiccnt, HEAP0); 2245 downheap (periodics, periodiccnt, HEAP0);
2061 } 2246 }
2062 else if (w->interval) 2247 else if (w->interval)
2063 { 2248 {
2064 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2249 periodic_recalc (EV_A_ w);
2250
2065 /* if next trigger time is not sufficiently in the future, put it there */ 2251 /* if next trigger time is not sufficiently in the future, put it there */
2066 /* this might happen because of floating point inexactness */ 2252 /* this might happen because of floating point inexactness */
2067 if (ev_at (w) - ev_rt_now < TIME_EPSILON) 2253 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2068 { 2254 {
2069 ev_at (w) += w->interval; 2255 ev_at (w) += w->interval;
… …
2089 feed_reverse_done (EV_A_ EV_PERIODIC); 2275 feed_reverse_done (EV_A_ EV_PERIODIC);
2090 } 2276 }
2091} 2277}
2092 2278
2093/* simply recalculate all periodics */ 2279/* simply recalculate all periodics */
2094/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2280/* TODO: maybe ensure that at least one event happens when jumping forward? */
2095static void noinline 2281static void noinline
2096periodics_reschedule (EV_P) 2282periodics_reschedule (EV_P)
2097{ 2283{
2098 int i; 2284 int i;
2099 2285
… …
2103 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2289 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2104 2290
2105 if (w->reschedule_cb) 2291 if (w->reschedule_cb)
2106 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2292 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2107 else if (w->interval) 2293 else if (w->interval)
2108 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2294 periodic_recalc (EV_A_ w);
2109 2295
2110 ANHE_at_cache (periodics [i]); 2296 ANHE_at_cache (periodics [i]);
2111 } 2297 }
2112 2298
2113 reheap (periodics, periodiccnt); 2299 reheap (periodics, periodiccnt);
… …
2127 ANHE_at_cache (*he); 2313 ANHE_at_cache (*he);
2128 } 2314 }
2129} 2315}
2130 2316
2131/* fetch new monotonic and realtime times from the kernel */ 2317/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */ 2318/* also detect if there was a timejump, and act accordingly */
2133inline_speed void 2319inline_speed void
2134time_update (EV_P_ ev_tstamp max_block) 2320time_update (EV_P_ ev_tstamp max_block)
2135{ 2321{
2136#if EV_USE_MONOTONIC 2322#if EV_USE_MONOTONIC
2137 if (expect_true (have_monotonic)) 2323 if (expect_true (have_monotonic))
… …
2195 mn_now = ev_rt_now; 2381 mn_now = ev_rt_now;
2196 } 2382 }
2197} 2383}
2198 2384
2199void 2385void
2200ev_loop (EV_P_ int flags) 2386ev_run (EV_P_ int flags)
2201{ 2387{
2202#if EV_MINIMAL < 2 2388#if EV_FEATURE_API
2203 ++loop_depth; 2389 ++loop_depth;
2204#endif 2390#endif
2205 2391
2206 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2392 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2207 2393
2208 loop_done = EVUNLOOP_CANCEL; 2394 loop_done = EVBREAK_CANCEL;
2209 2395
2210 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2396 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2211 2397
2212 do 2398 do
2213 { 2399 {
2214#if EV_VERIFY >= 2 2400#if EV_VERIFY >= 2
2215 ev_loop_verify (EV_A); 2401 ev_verify (EV_A);
2216#endif 2402#endif
2217 2403
2218#ifndef _WIN32 2404#ifndef _WIN32
2219 if (expect_false (curpid)) /* penalise the forking check even more */ 2405 if (expect_false (curpid)) /* penalise the forking check even more */
2220 if (expect_false (getpid () != curpid)) 2406 if (expect_false (getpid () != curpid))
… …
2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2418 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2233 EV_INVOKE_PENDING; 2419 EV_INVOKE_PENDING;
2234 } 2420 }
2235#endif 2421#endif
2236 2422
2423#if EV_PREPARE_ENABLE
2237 /* queue prepare watchers (and execute them) */ 2424 /* queue prepare watchers (and execute them) */
2238 if (expect_false (preparecnt)) 2425 if (expect_false (preparecnt))
2239 { 2426 {
2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2427 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2241 EV_INVOKE_PENDING; 2428 EV_INVOKE_PENDING;
2242 } 2429 }
2430#endif
2243 2431
2244 if (expect_false (loop_done)) 2432 if (expect_false (loop_done))
2245 break; 2433 break;
2246 2434
2247 /* we might have forked, so reify kernel state if necessary */ 2435 /* we might have forked, so reify kernel state if necessary */
… …
2254 /* calculate blocking time */ 2442 /* calculate blocking time */
2255 { 2443 {
2256 ev_tstamp waittime = 0.; 2444 ev_tstamp waittime = 0.;
2257 ev_tstamp sleeptime = 0.; 2445 ev_tstamp sleeptime = 0.;
2258 2446
2447 /* remember old timestamp for io_blocktime calculation */
2448 ev_tstamp prev_mn_now = mn_now;
2449
2450 /* update time to cancel out callback processing overhead */
2451 time_update (EV_A_ 1e100);
2452
2259 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2453 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2260 { 2454 {
2261 /* remember old timestamp for io_blocktime calculation */
2262 ev_tstamp prev_mn_now = mn_now;
2263
2264 /* update time to cancel out callback processing overhead */
2265 time_update (EV_A_ 1e100);
2266
2267 waittime = MAX_BLOCKTIME; 2455 waittime = MAX_BLOCKTIME;
2268 2456
2269 if (timercnt) 2457 if (timercnt)
2270 { 2458 {
2271 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2459 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2298 waittime -= sleeptime; 2486 waittime -= sleeptime;
2299 } 2487 }
2300 } 2488 }
2301 } 2489 }
2302 2490
2303#if EV_MINIMAL < 2 2491#if EV_FEATURE_API
2304 ++loop_count; 2492 ++loop_count;
2305#endif 2493#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2494 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2307 backend_poll (EV_A_ waittime); 2495 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2496 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2309 2497
2310 /* update ev_rt_now, do magic */ 2498 /* update ev_rt_now, do magic */
2311 time_update (EV_A_ waittime + sleeptime); 2499 time_update (EV_A_ waittime + sleeptime);
2312 } 2500 }
2313 2501
… …
2320#if EV_IDLE_ENABLE 2508#if EV_IDLE_ENABLE
2321 /* queue idle watchers unless other events are pending */ 2509 /* queue idle watchers unless other events are pending */
2322 idle_reify (EV_A); 2510 idle_reify (EV_A);
2323#endif 2511#endif
2324 2512
2513#if EV_CHECK_ENABLE
2325 /* queue check watchers, to be executed first */ 2514 /* queue check watchers, to be executed first */
2326 if (expect_false (checkcnt)) 2515 if (expect_false (checkcnt))
2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2516 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2517#endif
2328 2518
2329 EV_INVOKE_PENDING; 2519 EV_INVOKE_PENDING;
2330 } 2520 }
2331 while (expect_true ( 2521 while (expect_true (
2332 activecnt 2522 activecnt
2333 && !loop_done 2523 && !loop_done
2334 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2524 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2335 )); 2525 ));
2336 2526
2337 if (loop_done == EVUNLOOP_ONE) 2527 if (loop_done == EVBREAK_ONE)
2338 loop_done = EVUNLOOP_CANCEL; 2528 loop_done = EVBREAK_CANCEL;
2339 2529
2340#if EV_MINIMAL < 2 2530#if EV_FEATURE_API
2341 --loop_depth; 2531 --loop_depth;
2342#endif 2532#endif
2343} 2533}
2344 2534
2345void 2535void
2346ev_unloop (EV_P_ int how) 2536ev_break (EV_P_ int how)
2347{ 2537{
2348 loop_done = how; 2538 loop_done = how;
2349} 2539}
2350 2540
2351void 2541void
… …
2471 2661
2472 if (expect_false (ev_is_active (w))) 2662 if (expect_false (ev_is_active (w)))
2473 return; 2663 return;
2474 2664
2475 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2665 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2476 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2666 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2477 2667
2478 EV_FREQUENT_CHECK; 2668 EV_FREQUENT_CHECK;
2479 2669
2480 ev_start (EV_A_ (W)w, 1); 2670 ev_start (EV_A_ (W)w, 1);
2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2671 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2499 EV_FREQUENT_CHECK; 2689 EV_FREQUENT_CHECK;
2500 2690
2501 wlist_del (&anfds[w->fd].head, (WL)w); 2691 wlist_del (&anfds[w->fd].head, (WL)w);
2502 ev_stop (EV_A_ (W)w); 2692 ev_stop (EV_A_ (W)w);
2503 2693
2504 fd_change (EV_A_ w->fd, 1); 2694 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2505 2695
2506 EV_FREQUENT_CHECK; 2696 EV_FREQUENT_CHECK;
2507} 2697}
2508 2698
2509void noinline 2699void noinline
… …
2551 timers [active] = timers [timercnt + HEAP0]; 2741 timers [active] = timers [timercnt + HEAP0];
2552 adjustheap (timers, timercnt, active); 2742 adjustheap (timers, timercnt, active);
2553 } 2743 }
2554 } 2744 }
2555 2745
2556 EV_FREQUENT_CHECK;
2557
2558 ev_at (w) -= mn_now; 2746 ev_at (w) -= mn_now;
2559 2747
2560 ev_stop (EV_A_ (W)w); 2748 ev_stop (EV_A_ (W)w);
2749
2750 EV_FREQUENT_CHECK;
2561} 2751}
2562 2752
2563void noinline 2753void noinline
2564ev_timer_again (EV_P_ ev_timer *w) 2754ev_timer_again (EV_P_ ev_timer *w)
2565{ 2755{
… …
2601 if (w->reschedule_cb) 2791 if (w->reschedule_cb)
2602 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2792 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2603 else if (w->interval) 2793 else if (w->interval)
2604 { 2794 {
2605 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2795 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2606 /* this formula differs from the one in periodic_reify because we do not always round up */ 2796 periodic_recalc (EV_A_ w);
2607 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2608 } 2797 }
2609 else 2798 else
2610 ev_at (w) = w->offset; 2799 ev_at (w) = w->offset;
2611 2800
2612 EV_FREQUENT_CHECK; 2801 EV_FREQUENT_CHECK;
… …
2644 periodics [active] = periodics [periodiccnt + HEAP0]; 2833 periodics [active] = periodics [periodiccnt + HEAP0];
2645 adjustheap (periodics, periodiccnt, active); 2834 adjustheap (periodics, periodiccnt, active);
2646 } 2835 }
2647 } 2836 }
2648 2837
2649 EV_FREQUENT_CHECK;
2650
2651 ev_stop (EV_A_ (W)w); 2838 ev_stop (EV_A_ (W)w);
2839
2840 EV_FREQUENT_CHECK;
2652} 2841}
2653 2842
2654void noinline 2843void noinline
2655ev_periodic_again (EV_P_ ev_periodic *w) 2844ev_periodic_again (EV_P_ ev_periodic *w)
2656{ 2845{
… …
2662 2851
2663#ifndef SA_RESTART 2852#ifndef SA_RESTART
2664# define SA_RESTART 0 2853# define SA_RESTART 0
2665#endif 2854#endif
2666 2855
2856#if EV_SIGNAL_ENABLE
2857
2667void noinline 2858void noinline
2668ev_signal_start (EV_P_ ev_signal *w) 2859ev_signal_start (EV_P_ ev_signal *w)
2669{ 2860{
2670 if (expect_false (ev_is_active (w))) 2861 if (expect_false (ev_is_active (w)))
2671 return; 2862 return;
2672 2863
2673 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG)); 2864 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2674 2865
2675#if EV_MULTIPLICITY 2866#if EV_MULTIPLICITY
2676 assert (("libev: tried to attach to a signal from two different loops", 2867 assert (("libev: a signal must not be attached to two different loops",
2677 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 2868 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2678 2869
2679 signals [w->signum - 1].loop = EV_A; 2870 signals [w->signum - 1].loop = EV_A;
2680#endif 2871#endif
2681 2872
… …
2717 if (!((WL)w)->next) 2908 if (!((WL)w)->next)
2718# if EV_USE_SIGNALFD 2909# if EV_USE_SIGNALFD
2719 if (sigfd < 0) /*TODO*/ 2910 if (sigfd < 0) /*TODO*/
2720# endif 2911# endif
2721 { 2912 {
2722# if _WIN32 2913# ifdef _WIN32
2914 evpipe_init (EV_A);
2915
2723 signal (w->signum, ev_sighandler); 2916 signal (w->signum, ev_sighandler);
2724# else 2917# else
2725 struct sigaction sa; 2918 struct sigaction sa;
2726 2919
2727 evpipe_init (EV_A); 2920 evpipe_init (EV_A);
… …
2729 sa.sa_handler = ev_sighandler; 2922 sa.sa_handler = ev_sighandler;
2730 sigfillset (&sa.sa_mask); 2923 sigfillset (&sa.sa_mask);
2731 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2924 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2732 sigaction (w->signum, &sa, 0); 2925 sigaction (w->signum, &sa, 0);
2733 2926
2927 if (origflags & EVFLAG_NOSIGMASK)
2928 {
2734 sigemptyset (&sa.sa_mask); 2929 sigemptyset (&sa.sa_mask);
2735 sigaddset (&sa.sa_mask, w->signum); 2930 sigaddset (&sa.sa_mask, w->signum);
2736 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2931 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2932 }
2737#endif 2933#endif
2738 } 2934 }
2739 2935
2740 EV_FREQUENT_CHECK; 2936 EV_FREQUENT_CHECK;
2741} 2937}
… …
2758 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2954 signals [w->signum - 1].loop = 0; /* unattach from signal */
2759#endif 2955#endif
2760#if EV_USE_SIGNALFD 2956#if EV_USE_SIGNALFD
2761 if (sigfd >= 0) 2957 if (sigfd >= 0)
2762 { 2958 {
2763 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2959 sigset_t ss;
2960
2961 sigemptyset (&ss);
2962 sigaddset (&ss, w->signum);
2764 sigdelset (&sigfd_set, w->signum); 2963 sigdelset (&sigfd_set, w->signum);
2964
2765 signalfd (sigfd, &sigfd_set, 0); 2965 signalfd (sigfd, &sigfd_set, 0);
2766 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2966 sigprocmask (SIG_UNBLOCK, &ss, 0);
2767 /*TODO: maybe unblock signal? */
2768 } 2967 }
2769 else 2968 else
2770#endif 2969#endif
2771 signal (w->signum, SIG_DFL); 2970 signal (w->signum, SIG_DFL);
2772 } 2971 }
2773 2972
2774 EV_FREQUENT_CHECK; 2973 EV_FREQUENT_CHECK;
2775} 2974}
2776 2975
2976#endif
2977
2978#if EV_CHILD_ENABLE
2979
2777void 2980void
2778ev_child_start (EV_P_ ev_child *w) 2981ev_child_start (EV_P_ ev_child *w)
2779{ 2982{
2780#if EV_MULTIPLICITY 2983#if EV_MULTIPLICITY
2781 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2984 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2784 return; 2987 return;
2785 2988
2786 EV_FREQUENT_CHECK; 2989 EV_FREQUENT_CHECK;
2787 2990
2788 ev_start (EV_A_ (W)w, 1); 2991 ev_start (EV_A_ (W)w, 1);
2789 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2992 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2790 2993
2791 EV_FREQUENT_CHECK; 2994 EV_FREQUENT_CHECK;
2792} 2995}
2793 2996
2794void 2997void
… …
2798 if (expect_false (!ev_is_active (w))) 3001 if (expect_false (!ev_is_active (w)))
2799 return; 3002 return;
2800 3003
2801 EV_FREQUENT_CHECK; 3004 EV_FREQUENT_CHECK;
2802 3005
2803 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3006 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2804 ev_stop (EV_A_ (W)w); 3007 ev_stop (EV_A_ (W)w);
2805 3008
2806 EV_FREQUENT_CHECK; 3009 EV_FREQUENT_CHECK;
2807} 3010}
3011
3012#endif
2808 3013
2809#if EV_STAT_ENABLE 3014#if EV_STAT_ENABLE
2810 3015
2811# ifdef _WIN32 3016# ifdef _WIN32
2812# undef lstat 3017# undef lstat
… …
2818#define MIN_STAT_INTERVAL 0.1074891 3023#define MIN_STAT_INTERVAL 0.1074891
2819 3024
2820static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 3025static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2821 3026
2822#if EV_USE_INOTIFY 3027#if EV_USE_INOTIFY
2823# define EV_INOTIFY_BUFSIZE 8192 3028
3029/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
3030# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2824 3031
2825static void noinline 3032static void noinline
2826infy_add (EV_P_ ev_stat *w) 3033infy_add (EV_P_ ev_stat *w)
2827{ 3034{
2828 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); 3035 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);
2829 3036
2830 if (w->wd < 0) 3037 if (w->wd >= 0)
3038 {
3039 struct statfs sfs;
3040
3041 /* now local changes will be tracked by inotify, but remote changes won't */
3042 /* unless the filesystem is known to be local, we therefore still poll */
3043 /* also do poll on <2.6.25, but with normal frequency */
3044
3045 if (!fs_2625)
3046 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3047 else if (!statfs (w->path, &sfs)
3048 && (sfs.f_type == 0x1373 /* devfs */
3049 || sfs.f_type == 0xEF53 /* ext2/3 */
3050 || sfs.f_type == 0x3153464a /* jfs */
3051 || sfs.f_type == 0x52654973 /* reiser3 */
3052 || sfs.f_type == 0x01021994 /* tempfs */
3053 || sfs.f_type == 0x58465342 /* xfs */))
3054 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3055 else
3056 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2831 { 3057 }
3058 else
3059 {
3060 /* can't use inotify, continue to stat */
2832 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3061 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2833 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2834 3062
2835 /* monitor some parent directory for speedup hints */ 3063 /* if path is not there, monitor some parent directory for speedup hints */
2836 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3064 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2837 /* but an efficiency issue only */ 3065 /* but an efficiency issue only */
2838 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3066 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2839 { 3067 {
2840 char path [4096]; 3068 char path [4096];
… …
2856 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3084 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2857 } 3085 }
2858 } 3086 }
2859 3087
2860 if (w->wd >= 0) 3088 if (w->wd >= 0)
2861 {
2862 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3089 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2863 3090
2864 /* now local changes will be tracked by inotify, but remote changes won't */ 3091 /* now re-arm timer, if required */
2865 /* unless the filesystem it known to be local, we therefore still poll */ 3092 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2866 /* also do poll on <2.6.25, but with normal frequency */
2867 struct statfs sfs;
2868
2869 if (fs_2625 && !statfs (w->path, &sfs))
2870 if (sfs.f_type == 0x1373 /* devfs */
2871 || sfs.f_type == 0xEF53 /* ext2/3 */
2872 || sfs.f_type == 0x3153464a /* jfs */
2873 || sfs.f_type == 0x52654973 /* reiser3 */
2874 || sfs.f_type == 0x01021994 /* tempfs */
2875 || sfs.f_type == 0x58465342 /* xfs */)
2876 return;
2877
2878 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2879 ev_timer_again (EV_A_ &w->timer); 3093 ev_timer_again (EV_A_ &w->timer);
2880 } 3094 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2881} 3095}
2882 3096
2883static void noinline 3097static void noinline
2884infy_del (EV_P_ ev_stat *w) 3098infy_del (EV_P_ ev_stat *w)
2885{ 3099{
… …
2888 3102
2889 if (wd < 0) 3103 if (wd < 0)
2890 return; 3104 return;
2891 3105
2892 w->wd = -2; 3106 w->wd = -2;
2893 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3107 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2894 wlist_del (&fs_hash [slot].head, (WL)w); 3108 wlist_del (&fs_hash [slot].head, (WL)w);
2895 3109
2896 /* remove this watcher, if others are watching it, they will rearm */ 3110 /* remove this watcher, if others are watching it, they will rearm */
2897 inotify_rm_watch (fs_fd, wd); 3111 inotify_rm_watch (fs_fd, wd);
2898} 3112}
… …
2900static void noinline 3114static void noinline
2901infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3115infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2902{ 3116{
2903 if (slot < 0) 3117 if (slot < 0)
2904 /* overflow, need to check for all hash slots */ 3118 /* overflow, need to check for all hash slots */
2905 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3119 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2906 infy_wd (EV_A_ slot, wd, ev); 3120 infy_wd (EV_A_ slot, wd, ev);
2907 else 3121 else
2908 { 3122 {
2909 WL w_; 3123 WL w_;
2910 3124
2911 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3125 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2912 { 3126 {
2913 ev_stat *w = (ev_stat *)w_; 3127 ev_stat *w = (ev_stat *)w_;
2914 w_ = w_->next; /* lets us remove this watcher and all before it */ 3128 w_ = w_->next; /* lets us remove this watcher and all before it */
2915 3129
2916 if (w->wd == wd || wd == -1) 3130 if (w->wd == wd || wd == -1)
2917 { 3131 {
2918 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3132 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2919 { 3133 {
2920 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3134 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2921 w->wd = -1; 3135 w->wd = -1;
2922 infy_add (EV_A_ w); /* re-add, no matter what */ 3136 infy_add (EV_A_ w); /* re-add, no matter what */
2923 } 3137 }
2924 3138
2925 stat_timer_cb (EV_A_ &w->timer, 0); 3139 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2930 3144
2931static void 3145static void
2932infy_cb (EV_P_ ev_io *w, int revents) 3146infy_cb (EV_P_ ev_io *w, int revents)
2933{ 3147{
2934 char buf [EV_INOTIFY_BUFSIZE]; 3148 char buf [EV_INOTIFY_BUFSIZE];
2935 struct inotify_event *ev = (struct inotify_event *)buf;
2936 int ofs; 3149 int ofs;
2937 int len = read (fs_fd, buf, sizeof (buf)); 3150 int len = read (fs_fd, buf, sizeof (buf));
2938 3151
2939 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3152 for (ofs = 0; ofs < len; )
3153 {
3154 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2940 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3155 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3156 ofs += sizeof (struct inotify_event) + ev->len;
3157 }
2941} 3158}
2942 3159
2943inline_size void 3160inline_size void
2944check_2625 (EV_P) 3161ev_check_2625 (EV_P)
2945{ 3162{
2946 /* kernels < 2.6.25 are borked 3163 /* kernels < 2.6.25 are borked
2947 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3164 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2948 */ 3165 */
2949 struct utsname buf; 3166 if (ev_linux_version () < 0x020619)
2950 int major, minor, micro;
2951
2952 if (uname (&buf))
2953 return; 3167 return;
2954 3168
2955 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2956 return;
2957
2958 if (major < 2
2959 || (major == 2 && minor < 6)
2960 || (major == 2 && minor == 6 && micro < 25))
2961 return;
2962
2963 fs_2625 = 1; 3169 fs_2625 = 1;
3170}
3171
3172inline_size int
3173infy_newfd (void)
3174{
3175#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3176 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3177 if (fd >= 0)
3178 return fd;
3179#endif
3180 return inotify_init ();
2964} 3181}
2965 3182
2966inline_size void 3183inline_size void
2967infy_init (EV_P) 3184infy_init (EV_P)
2968{ 3185{
2969 if (fs_fd != -2) 3186 if (fs_fd != -2)
2970 return; 3187 return;
2971 3188
2972 fs_fd = -1; 3189 fs_fd = -1;
2973 3190
2974 check_2625 (EV_A); 3191 ev_check_2625 (EV_A);
2975 3192
2976 fs_fd = inotify_init (); 3193 fs_fd = infy_newfd ();
2977 3194
2978 if (fs_fd >= 0) 3195 if (fs_fd >= 0)
2979 { 3196 {
3197 fd_intern (fs_fd);
2980 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3198 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2981 ev_set_priority (&fs_w, EV_MAXPRI); 3199 ev_set_priority (&fs_w, EV_MAXPRI);
2982 ev_io_start (EV_A_ &fs_w); 3200 ev_io_start (EV_A_ &fs_w);
3201 ev_unref (EV_A);
2983 } 3202 }
2984} 3203}
2985 3204
2986inline_size void 3205inline_size void
2987infy_fork (EV_P) 3206infy_fork (EV_P)
… …
2989 int slot; 3208 int slot;
2990 3209
2991 if (fs_fd < 0) 3210 if (fs_fd < 0)
2992 return; 3211 return;
2993 3212
3213 ev_ref (EV_A);
3214 ev_io_stop (EV_A_ &fs_w);
2994 close (fs_fd); 3215 close (fs_fd);
2995 fs_fd = inotify_init (); 3216 fs_fd = infy_newfd ();
2996 3217
3218 if (fs_fd >= 0)
3219 {
3220 fd_intern (fs_fd);
3221 ev_io_set (&fs_w, fs_fd, EV_READ);
3222 ev_io_start (EV_A_ &fs_w);
3223 ev_unref (EV_A);
3224 }
3225
2997 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3226 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2998 { 3227 {
2999 WL w_ = fs_hash [slot].head; 3228 WL w_ = fs_hash [slot].head;
3000 fs_hash [slot].head = 0; 3229 fs_hash [slot].head = 0;
3001 3230
3002 while (w_) 3231 while (w_)
… …
3007 w->wd = -1; 3236 w->wd = -1;
3008 3237
3009 if (fs_fd >= 0) 3238 if (fs_fd >= 0)
3010 infy_add (EV_A_ w); /* re-add, no matter what */ 3239 infy_add (EV_A_ w); /* re-add, no matter what */
3011 else 3240 else
3241 {
3242 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3243 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3012 ev_timer_again (EV_A_ &w->timer); 3244 ev_timer_again (EV_A_ &w->timer);
3245 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3246 }
3013 } 3247 }
3014 } 3248 }
3015} 3249}
3016 3250
3017#endif 3251#endif
… …
3034static void noinline 3268static void noinline
3035stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3269stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3036{ 3270{
3037 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3271 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3038 3272
3039 /* we copy this here each the time so that */ 3273 ev_statdata prev = w->attr;
3040 /* prev has the old value when the callback gets invoked */
3041 w->prev = w->attr;
3042 ev_stat_stat (EV_A_ w); 3274 ev_stat_stat (EV_A_ w);
3043 3275
3044 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3276 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3045 if ( 3277 if (
3046 w->prev.st_dev != w->attr.st_dev 3278 prev.st_dev != w->attr.st_dev
3047 || w->prev.st_ino != w->attr.st_ino 3279 || prev.st_ino != w->attr.st_ino
3048 || w->prev.st_mode != w->attr.st_mode 3280 || prev.st_mode != w->attr.st_mode
3049 || w->prev.st_nlink != w->attr.st_nlink 3281 || prev.st_nlink != w->attr.st_nlink
3050 || w->prev.st_uid != w->attr.st_uid 3282 || prev.st_uid != w->attr.st_uid
3051 || w->prev.st_gid != w->attr.st_gid 3283 || prev.st_gid != w->attr.st_gid
3052 || w->prev.st_rdev != w->attr.st_rdev 3284 || prev.st_rdev != w->attr.st_rdev
3053 || w->prev.st_size != w->attr.st_size 3285 || prev.st_size != w->attr.st_size
3054 || w->prev.st_atime != w->attr.st_atime 3286 || prev.st_atime != w->attr.st_atime
3055 || w->prev.st_mtime != w->attr.st_mtime 3287 || prev.st_mtime != w->attr.st_mtime
3056 || w->prev.st_ctime != w->attr.st_ctime 3288 || prev.st_ctime != w->attr.st_ctime
3057 ) { 3289 ) {
3290 /* we only update w->prev on actual differences */
3291 /* in case we test more often than invoke the callback, */
3292 /* to ensure that prev is always different to attr */
3293 w->prev = prev;
3294
3058 #if EV_USE_INOTIFY 3295 #if EV_USE_INOTIFY
3059 if (fs_fd >= 0) 3296 if (fs_fd >= 0)
3060 { 3297 {
3061 infy_del (EV_A_ w); 3298 infy_del (EV_A_ w);
3062 infy_add (EV_A_ w); 3299 infy_add (EV_A_ w);
… …
3087 3324
3088 if (fs_fd >= 0) 3325 if (fs_fd >= 0)
3089 infy_add (EV_A_ w); 3326 infy_add (EV_A_ w);
3090 else 3327 else
3091#endif 3328#endif
3329 {
3092 ev_timer_again (EV_A_ &w->timer); 3330 ev_timer_again (EV_A_ &w->timer);
3331 ev_unref (EV_A);
3332 }
3093 3333
3094 ev_start (EV_A_ (W)w, 1); 3334 ev_start (EV_A_ (W)w, 1);
3095 3335
3096 EV_FREQUENT_CHECK; 3336 EV_FREQUENT_CHECK;
3097} 3337}
… …
3106 EV_FREQUENT_CHECK; 3346 EV_FREQUENT_CHECK;
3107 3347
3108#if EV_USE_INOTIFY 3348#if EV_USE_INOTIFY
3109 infy_del (EV_A_ w); 3349 infy_del (EV_A_ w);
3110#endif 3350#endif
3351
3352 if (ev_is_active (&w->timer))
3353 {
3354 ev_ref (EV_A);
3111 ev_timer_stop (EV_A_ &w->timer); 3355 ev_timer_stop (EV_A_ &w->timer);
3356 }
3112 3357
3113 ev_stop (EV_A_ (W)w); 3358 ev_stop (EV_A_ (W)w);
3114 3359
3115 EV_FREQUENT_CHECK; 3360 EV_FREQUENT_CHECK;
3116} 3361}
… …
3161 3406
3162 EV_FREQUENT_CHECK; 3407 EV_FREQUENT_CHECK;
3163} 3408}
3164#endif 3409#endif
3165 3410
3411#if EV_PREPARE_ENABLE
3166void 3412void
3167ev_prepare_start (EV_P_ ev_prepare *w) 3413ev_prepare_start (EV_P_ ev_prepare *w)
3168{ 3414{
3169 if (expect_false (ev_is_active (w))) 3415 if (expect_false (ev_is_active (w)))
3170 return; 3416 return;
… …
3196 3442
3197 ev_stop (EV_A_ (W)w); 3443 ev_stop (EV_A_ (W)w);
3198 3444
3199 EV_FREQUENT_CHECK; 3445 EV_FREQUENT_CHECK;
3200} 3446}
3447#endif
3201 3448
3449#if EV_CHECK_ENABLE
3202void 3450void
3203ev_check_start (EV_P_ ev_check *w) 3451ev_check_start (EV_P_ ev_check *w)
3204{ 3452{
3205 if (expect_false (ev_is_active (w))) 3453 if (expect_false (ev_is_active (w)))
3206 return; 3454 return;
… …
3232 3480
3233 ev_stop (EV_A_ (W)w); 3481 ev_stop (EV_A_ (W)w);
3234 3482
3235 EV_FREQUENT_CHECK; 3483 EV_FREQUENT_CHECK;
3236} 3484}
3485#endif
3237 3486
3238#if EV_EMBED_ENABLE 3487#if EV_EMBED_ENABLE
3239void noinline 3488void noinline
3240ev_embed_sweep (EV_P_ ev_embed *w) 3489ev_embed_sweep (EV_P_ ev_embed *w)
3241{ 3490{
3242 ev_loop (w->other, EVLOOP_NONBLOCK); 3491 ev_run (w->other, EVRUN_NOWAIT);
3243} 3492}
3244 3493
3245static void 3494static void
3246embed_io_cb (EV_P_ ev_io *io, int revents) 3495embed_io_cb (EV_P_ ev_io *io, int revents)
3247{ 3496{
3248 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3497 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3249 3498
3250 if (ev_cb (w)) 3499 if (ev_cb (w))
3251 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3500 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3252 else 3501 else
3253 ev_loop (w->other, EVLOOP_NONBLOCK); 3502 ev_run (w->other, EVRUN_NOWAIT);
3254} 3503}
3255 3504
3256static void 3505static void
3257embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3506embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3258{ 3507{
… …
3262 EV_P = w->other; 3511 EV_P = w->other;
3263 3512
3264 while (fdchangecnt) 3513 while (fdchangecnt)
3265 { 3514 {
3266 fd_reify (EV_A); 3515 fd_reify (EV_A);
3267 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3516 ev_run (EV_A_ EVRUN_NOWAIT);
3268 } 3517 }
3269 } 3518 }
3270} 3519}
3271 3520
3272static void 3521static void
… …
3278 3527
3279 { 3528 {
3280 EV_P = w->other; 3529 EV_P = w->other;
3281 3530
3282 ev_loop_fork (EV_A); 3531 ev_loop_fork (EV_A);
3283 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3532 ev_run (EV_A_ EVRUN_NOWAIT);
3284 } 3533 }
3285 3534
3286 ev_embed_start (EV_A_ w); 3535 ev_embed_start (EV_A_ w);
3287} 3536}
3288 3537
… …
3336 3585
3337 ev_io_stop (EV_A_ &w->io); 3586 ev_io_stop (EV_A_ &w->io);
3338 ev_prepare_stop (EV_A_ &w->prepare); 3587 ev_prepare_stop (EV_A_ &w->prepare);
3339 ev_fork_stop (EV_A_ &w->fork); 3588 ev_fork_stop (EV_A_ &w->fork);
3340 3589
3590 ev_stop (EV_A_ (W)w);
3591
3341 EV_FREQUENT_CHECK; 3592 EV_FREQUENT_CHECK;
3342} 3593}
3343#endif 3594#endif
3344 3595
3345#if EV_FORK_ENABLE 3596#if EV_FORK_ENABLE
… …
3378 3629
3379 EV_FREQUENT_CHECK; 3630 EV_FREQUENT_CHECK;
3380} 3631}
3381#endif 3632#endif
3382 3633
3383#if EV_ASYNC_ENABLE 3634#if EV_CLEANUP_ENABLE
3384void 3635void
3385ev_async_start (EV_P_ ev_async *w) 3636ev_cleanup_start (EV_P_ ev_cleanup *w)
3386{ 3637{
3387 if (expect_false (ev_is_active (w))) 3638 if (expect_false (ev_is_active (w)))
3388 return; 3639 return;
3640
3641 EV_FREQUENT_CHECK;
3642
3643 ev_start (EV_A_ (W)w, ++cleanupcnt);
3644 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3645 cleanups [cleanupcnt - 1] = w;
3646
3647 /* cleanup watchers should never keep a refcount on the loop */
3648 ev_unref (EV_A);
3649 EV_FREQUENT_CHECK;
3650}
3651
3652void
3653ev_cleanup_stop (EV_P_ ev_cleanup *w)
3654{
3655 clear_pending (EV_A_ (W)w);
3656 if (expect_false (!ev_is_active (w)))
3657 return;
3658
3659 EV_FREQUENT_CHECK;
3660 ev_ref (EV_A);
3661
3662 {
3663 int active = ev_active (w);
3664
3665 cleanups [active - 1] = cleanups [--cleanupcnt];
3666 ev_active (cleanups [active - 1]) = active;
3667 }
3668
3669 ev_stop (EV_A_ (W)w);
3670
3671 EV_FREQUENT_CHECK;
3672}
3673#endif
3674
3675#if EV_ASYNC_ENABLE
3676void
3677ev_async_start (EV_P_ ev_async *w)
3678{
3679 if (expect_false (ev_is_active (w)))
3680 return;
3681
3682 w->sent = 0;
3389 3683
3390 evpipe_init (EV_A); 3684 evpipe_init (EV_A);
3391 3685
3392 EV_FREQUENT_CHECK; 3686 EV_FREQUENT_CHECK;
3393 3687
… …
3471{ 3765{
3472 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3766 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3473 3767
3474 if (expect_false (!once)) 3768 if (expect_false (!once))
3475 { 3769 {
3476 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3770 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3477 return; 3771 return;
3478 } 3772 }
3479 3773
3480 once->cb = cb; 3774 once->cb = cb;
3481 once->arg = arg; 3775 once->arg = arg;
… …
3568 if (types & EV_ASYNC) 3862 if (types & EV_ASYNC)
3569 for (i = asynccnt; i--; ) 3863 for (i = asynccnt; i--; )
3570 cb (EV_A_ EV_ASYNC, asyncs [i]); 3864 cb (EV_A_ EV_ASYNC, asyncs [i]);
3571#endif 3865#endif
3572 3866
3867#if EV_PREPARE_ENABLE
3573 if (types & EV_PREPARE) 3868 if (types & EV_PREPARE)
3574 for (i = preparecnt; i--; ) 3869 for (i = preparecnt; i--; )
3575#if EV_EMBED_ENABLE 3870# if EV_EMBED_ENABLE
3576 if (ev_cb (prepares [i]) != embed_prepare_cb) 3871 if (ev_cb (prepares [i]) != embed_prepare_cb)
3577#endif 3872# endif
3578 cb (EV_A_ EV_PREPARE, prepares [i]); 3873 cb (EV_A_ EV_PREPARE, prepares [i]);
3874#endif
3579 3875
3876#if EV_CHECK_ENABLE
3580 if (types & EV_CHECK) 3877 if (types & EV_CHECK)
3581 for (i = checkcnt; i--; ) 3878 for (i = checkcnt; i--; )
3582 cb (EV_A_ EV_CHECK, checks [i]); 3879 cb (EV_A_ EV_CHECK, checks [i]);
3880#endif
3583 3881
3882#if EV_SIGNAL_ENABLE
3584 if (types & EV_SIGNAL) 3883 if (types & EV_SIGNAL)
3585 for (i = 0; i < EV_NSIG - 1; ++i) 3884 for (i = 0; i < EV_NSIG - 1; ++i)
3586 for (wl = signals [i].head; wl; ) 3885 for (wl = signals [i].head; wl; )
3587 { 3886 {
3588 wn = wl->next; 3887 wn = wl->next;
3589 cb (EV_A_ EV_SIGNAL, wl); 3888 cb (EV_A_ EV_SIGNAL, wl);
3590 wl = wn; 3889 wl = wn;
3591 } 3890 }
3891#endif
3592 3892
3893#if EV_CHILD_ENABLE
3593 if (types & EV_CHILD) 3894 if (types & EV_CHILD)
3594 for (i = EV_PID_HASHSIZE; i--; ) 3895 for (i = (EV_PID_HASHSIZE); i--; )
3595 for (wl = childs [i]; wl; ) 3896 for (wl = childs [i]; wl; )
3596 { 3897 {
3597 wn = wl->next; 3898 wn = wl->next;
3598 cb (EV_A_ EV_CHILD, wl); 3899 cb (EV_A_ EV_CHILD, wl);
3599 wl = wn; 3900 wl = wn;
3600 } 3901 }
3902#endif
3601/* EV_STAT 0x00001000 /* stat data changed */ 3903/* EV_STAT 0x00001000 /* stat data changed */
3602/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3904/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3603} 3905}
3604#endif 3906#endif
3605 3907
3606#if EV_MULTIPLICITY 3908#if EV_MULTIPLICITY
3607 #include "ev_wrap.h" 3909 #include "ev_wrap.h"
3608#endif 3910#endif
3609 3911
3610#ifdef __cplusplus 3912EV_CPP(})
3611}
3612#endif
3613 3913

Diff Legend

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