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

Comparing libev/ev.c (file contents):
Revision 1.267 by root, Mon Oct 27 11:08:29 2008 UTC vs.
Revision 1.356 by root, Fri Oct 22 11:21:52 2010 UTC

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

Diff Legend

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