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

Comparing libev/ev.c (file contents):
Revision 1.270 by root, Thu Oct 30 13:07:10 2008 UTC vs.
Revision 1.358 by root, Sun Oct 24 14:44:40 2010 UTC

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

Diff Legend

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