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

Comparing libev/ev.c (file contents):
Revision 1.284 by root, Wed Apr 15 17:49:26 2009 UTC vs.
Revision 1.355 by root, Fri Oct 22 10:09:12 2010 UTC

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

Diff Legend

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