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

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

Diff Legend

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