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

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

Diff Legend

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