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

Comparing libev/ev.c (file contents):
Revision 1.306 by root, Sun Jul 19 06:35:25 2009 UTC vs.
Revision 1.356 by root, Fri Oct 22 11:21:52 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,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
… …
77# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
79# endif 75# endif
80# endif 76# endif
81 77
78# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
85# else 82# else
83# undef EV_USE_NANOSLEEP
86# 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
87# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
88# endif 94# endif
89 95
96# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 98# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 99# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 100# else
101# undef EV_USE_POLL
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif
104# endif 103# endif
105 104
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 106# ifndef EV_USE_EPOLL
109# else 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
112# endif 112# endif
113 113
114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# ifndef EV_USE_KQUEUE 115# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
116# define EV_USE_KQUEUE 1
117# else
118# define EV_USE_KQUEUE 0
119# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
120# endif 121# endif
121 122
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 124# ifndef EV_USE_PORT
125# else 125# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
128# endif 130# endif
129 131
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 133# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
136# endif 139# endif
137 140
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 142# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 143# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
144# endif 148# endif
145 149
150# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 151# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 152# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
152# endif 157# endif
153 158
154#endif 159#endif
155 160
156#include <math.h> 161#include <math.h>
157#include <stdlib.h> 162#include <stdlib.h>
163#include <string.h>
158#include <fcntl.h> 164#include <fcntl.h>
159#include <stddef.h> 165#include <stddef.h>
160 166
161#include <stdio.h> 167#include <stdio.h>
162 168
163#include <assert.h> 169#include <assert.h>
164#include <errno.h> 170#include <errno.h>
165#include <sys/types.h> 171#include <sys/types.h>
166#include <time.h> 172#include <time.h>
173#include <limits.h>
167 174
168#include <signal.h> 175#include <signal.h>
169 176
170#ifdef EV_H 177#ifdef EV_H
171# include EV_H 178# include EV_H
172#else 179#else
173# include "ev.h" 180# include "ev.h"
174#endif 181#endif
182
183EV_CPP(extern "C" {)
175 184
176#ifndef _WIN32 185#ifndef _WIN32
177# include <sys/time.h> 186# include <sys/time.h>
178# include <sys/wait.h> 187# include <sys/wait.h>
179# include <unistd.h> 188# include <unistd.h>
… …
182# define WIN32_LEAN_AND_MEAN 191# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 192# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
186# endif 195# endif
196# undef EV_AVOID_STDIO
187#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
188 206
189/* 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 */
190 208
191/* try to deduce the maximum number of signals on this platform */ 209/* try to deduce the maximum number of signals on this platform */
192/* one some platforms, NSIG is one too large. we do not bother */
193#if defined (EV_NSIG) 210#if defined (EV_NSIG)
194/* use what's provided */ 211/* use what's provided */
195#elif defined (NSIG) 212#elif defined (NSIG)
196# define EV_NSIG (NSIG) 213# define EV_NSIG (NSIG)
197#elif defined(_NSIG) 214#elif defined(_NSIG)
… …
205#elif defined (MAXSIG) 222#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1) 223# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG) 224#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1) 225# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE) 226#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig) 228#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else 230#else
214# error "unable to find value for NSIG, please report" 231# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */ 232/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */
216# define EV_NSIG 65 234# define EV_NSIG 65
217#endif 235#endif
218 236
219#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
220# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
221# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
222# else 240# else
223# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
224# endif 242# endif
225#endif 243#endif
226 244
227#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
228# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
229# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
230# else 248# else
231# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
232# endif 250# endif
233#endif 251#endif
234 252
… …
236# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
237#endif 255#endif
238 256
239#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
240# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
241# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
242# else 260# else
243# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
244# endif 262# endif
245#endif 263#endif
246 264
247#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
248# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
249#endif 267#endif
250 268
251#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
252# ifdef _WIN32 270# ifdef _WIN32
253# define EV_USE_POLL 0 271# define EV_USE_POLL 0
254# else 272# else
255# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
256# endif 274# endif
257#endif 275#endif
258 276
259#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
260# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
261# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
262# else 280# else
263# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
264# endif 282# endif
265#endif 283#endif
266 284
… …
272# define EV_USE_PORT 0 290# define EV_USE_PORT 0
273#endif 291#endif
274 292
275#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
276# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
277# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
278# else 296# else
279# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
280# endif 298# endif
281#endif 299#endif
282 300
283#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
284# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
285# define EV_PID_HASHSIZE 1
286# else
287# define EV_PID_HASHSIZE 16
288# endif
289#endif 303#endif
290 304
291#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
292# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
293# define EV_INOTIFY_HASHSIZE 1
294# else
295# define EV_INOTIFY_HASHSIZE 16
296# endif
297#endif 307#endif
298 308
299#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
300# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
301# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
302# else 312# else
303# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
304# endif 314# endif
305#endif 315#endif
306 316
307#ifndef EV_USE_SIGNALFD 317#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1 319# define EV_USE_SIGNALFD EV_FEATURE_OS
310# else 320# else
311# define EV_USE_SIGNALFD 0 321# define EV_USE_SIGNALFD 0
312# endif 322# endif
313#endif 323#endif
314 324
… …
317# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
318# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
319#endif 329#endif
320 330
321#ifndef EV_VERIFY 331#ifndef EV_VERIFY
322# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
323#endif 333#endif
324 334
325#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
326# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
327#endif 337#endif
328 338
329#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
330# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
331#endif 341#endif
332 342
333/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 343/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
334/* which makes programs even slower. might work on other unices, too. */ 344/* which makes programs even slower. might work on other unices, too. */
335#if EV_USE_CLOCK_SYSCALL 345#if EV_USE_CLOCK_SYSCALL
… …
344# endif 354# endif
345#endif 355#endif
346 356
347/* 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 */
348 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
364
349#ifndef CLOCK_MONOTONIC 365#ifndef CLOCK_MONOTONIC
350# undef EV_USE_MONOTONIC 366# undef EV_USE_MONOTONIC
351# define EV_USE_MONOTONIC 0 367# define EV_USE_MONOTONIC 0
352#endif 368#endif
353 369
… …
366# include <sys/select.h> 382# include <sys/select.h>
367# endif 383# endif
368#endif 384#endif
369 385
370#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
371# include <sys/utsname.h>
372# include <sys/statfs.h> 387# include <sys/statfs.h>
373# include <sys/inotify.h> 388# include <sys/inotify.h>
374/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
375# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
376# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
387# include <stdint.h> 402# include <stdint.h>
388# ifndef EFD_NONBLOCK 403# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK 404# define EFD_NONBLOCK O_NONBLOCK
390# endif 405# endif
391# ifndef EFD_CLOEXEC 406# ifndef EFD_CLOEXEC
407# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
409# else
410# define EFD_CLOEXEC 02000000
411# endif
393# endif 412# endif
394# ifdef __cplusplus 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
395extern "C" { 414#endif
415
416#if EV_USE_SIGNALFD
417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
418# include <stdint.h>
419# ifndef SFD_NONBLOCK
420# define SFD_NONBLOCK O_NONBLOCK
396# endif 421# endif
397int eventfd (unsigned int initval, int flags); 422# ifndef SFD_CLOEXEC
398# ifdef __cplusplus 423# ifdef O_CLOEXEC
399} 424# define SFD_CLOEXEC O_CLOEXEC
425# else
426# define SFD_CLOEXEC 02000000
427# endif
400# endif 428# endif
401#endif 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
402 430
403#if EV_USE_SIGNALFD 431struct signalfd_siginfo
404# include <sys/signalfd.h> 432{
433 uint32_t ssi_signo;
434 char pad[128 - sizeof (uint32_t)];
435};
405#endif 436#endif
406 437
407/**/ 438/**/
408 439
409#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
410# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
411#else 442#else
412# define EV_FREQUENT_CHECK do { } while (0) 443# define EV_FREQUENT_CHECK do { } while (0)
413#endif 444#endif
414 445
415/* 446/*
… …
422 */ 453 */
423#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
424 455
425#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 456#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
426#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 457#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
427/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 458
459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
460#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
428 461
429#if __GNUC__ >= 4 462#if __GNUC__ >= 4
430# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
431# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
432#else 465#else
… …
439 472
440#define expect_false(expr) expect ((expr) != 0, 0) 473#define expect_false(expr) expect ((expr) != 0, 0)
441#define expect_true(expr) expect ((expr) != 0, 1) 474#define expect_true(expr) expect ((expr) != 0, 1)
442#define inline_size static inline 475#define inline_size static inline
443 476
444#if EV_MINIMAL 477#if EV_FEATURE_CODE
478# define inline_speed static inline
479#else
445# define inline_speed static noinline 480# define inline_speed static noinline
446#else
447# define inline_speed static inline
448#endif 481#endif
449 482
450#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
451 484
452#if EV_MINPRI == EV_MAXPRI 485#if EV_MINPRI == EV_MAXPRI
… …
465#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
466#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
467 500
468#if EV_USE_REALTIME 501#if EV_USE_REALTIME
469/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 502/* sig_atomic_t is used to avoid per-thread variables or locking but still */
470/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
471static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
472#endif 505#endif
473 506
474#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
475static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
476#endif 509#endif
477 510
511#ifndef EV_FD_TO_WIN32_HANDLE
512# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
513#endif
514#ifndef EV_WIN32_HANDLE_TO_FD
515# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
516#endif
517#ifndef EV_WIN32_CLOSE_FD
518# define EV_WIN32_CLOSE_FD(fd) close (fd)
519#endif
520
478#ifdef _WIN32 521#ifdef _WIN32
479# include "ev_win32.c" 522# include "ev_win32.c"
480#endif 523#endif
481 524
482/*****************************************************************************/ 525/*****************************************************************************/
526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
531static unsigned int noinline
532ev_linux_version (void)
533{
534#ifdef __linux
535 struct utsname buf;
536 unsigned int v;
537 int i;
538 char *p = buf.release;
539
540 if (uname (&buf))
541 return 0;
542
543 for (i = 3+1; --i; )
544 {
545 unsigned int c = 0;
546
547 for (;;)
548 {
549 if (*p >= '0' && *p <= '9')
550 c = c * 10 + *p++ - '0';
551 else
552 {
553 p += *p == '.';
554 break;
555 }
556 }
557
558 v = (v << 8) | c;
559 }
560
561 return v;
562#else
563 return 0;
564#endif
565}
566
567/*****************************************************************************/
568
569#if EV_AVOID_STDIO
570static void noinline
571ev_printerr (const char *msg)
572{
573 write (STDERR_FILENO, msg, strlen (msg));
574}
575#endif
483 576
484static void (*syserr_cb)(const char *msg); 577static void (*syserr_cb)(const char *msg);
485 578
486void 579void
487ev_set_syserr_cb (void (*cb)(const char *msg)) 580ev_set_syserr_cb (void (*cb)(const char *msg))
… …
497 590
498 if (syserr_cb) 591 if (syserr_cb)
499 syserr_cb (msg); 592 syserr_cb (msg);
500 else 593 else
501 { 594 {
595#if EV_AVOID_STDIO
596 const char *err = strerror (errno);
597
598 ev_printerr (msg);
599 ev_printerr (": ");
600 ev_printerr (err);
601 ev_printerr ("\n");
602#else
502 perror (msg); 603 perror (msg);
604#endif
503 abort (); 605 abort ();
504 } 606 }
505} 607}
506 608
507static void * 609static void *
508ev_realloc_emul (void *ptr, long size) 610ev_realloc_emul (void *ptr, long size)
509{ 611{
612#if __GLIBC__
613 return realloc (ptr, size);
614#else
510 /* some systems, notably openbsd and darwin, fail to properly 615 /* some systems, notably openbsd and darwin, fail to properly
511 * implement realloc (x, 0) (as required by both ansi c-98 and 616 * implement realloc (x, 0) (as required by both ansi c-89 and
512 * the single unix specification, so work around them here. 617 * the single unix specification, so work around them here.
513 */ 618 */
514 619
515 if (size) 620 if (size)
516 return realloc (ptr, size); 621 return realloc (ptr, size);
517 622
518 free (ptr); 623 free (ptr);
519 return 0; 624 return 0;
625#endif
520} 626}
521 627
522static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 628static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
523 629
524void 630void
… …
532{ 638{
533 ptr = alloc (ptr, size); 639 ptr = alloc (ptr, size);
534 640
535 if (!ptr && size) 641 if (!ptr && size)
536 { 642 {
643#if EV_AVOID_STDIO
644 ev_printerr ("libev: memory allocation failed, aborting.\n");
645#else
537 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 646 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
647#endif
538 abort (); 648 abort ();
539 } 649 }
540 650
541 return ptr; 651 return ptr;
542} 652}
… …
624 734
625 static int ev_default_loop_ptr; 735 static int ev_default_loop_ptr;
626 736
627#endif 737#endif
628 738
629#if EV_MINIMAL < 2 739#if EV_FEATURE_API
630# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 740# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
631# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 741# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
632# define EV_INVOKE_PENDING invoke_cb (EV_A) 742# define EV_INVOKE_PENDING invoke_cb (EV_A)
633#else 743#else
634# define EV_RELEASE_CB (void)0 744# define EV_RELEASE_CB (void)0
635# define EV_ACQUIRE_CB (void)0 745# define EV_ACQUIRE_CB (void)0
636# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 746# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
637#endif 747#endif
638 748
639#define EVUNLOOP_RECURSE 0x80 749#define EVBREAK_RECURSE 0x80
640 750
641/*****************************************************************************/ 751/*****************************************************************************/
642 752
643#ifndef EV_HAVE_EV_TIME 753#ifndef EV_HAVE_EV_TIME
644ev_tstamp 754ev_tstamp
… …
688 if (delay > 0.) 798 if (delay > 0.)
689 { 799 {
690#if EV_USE_NANOSLEEP 800#if EV_USE_NANOSLEEP
691 struct timespec ts; 801 struct timespec ts;
692 802
693 ts.tv_sec = (time_t)delay; 803 EV_TS_SET (ts, delay);
694 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
695
696 nanosleep (&ts, 0); 804 nanosleep (&ts, 0);
697#elif defined(_WIN32) 805#elif defined(_WIN32)
698 Sleep ((unsigned long)(delay * 1e3)); 806 Sleep ((unsigned long)(delay * 1e3));
699#else 807#else
700 struct timeval tv; 808 struct timeval tv;
701 809
702 tv.tv_sec = (time_t)delay;
703 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
704
705 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 810 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
706 /* something not guaranteed by newer posix versions, but guaranteed */ 811 /* something not guaranteed by newer posix versions, but guaranteed */
707 /* by older ones */ 812 /* by older ones */
813 EV_TV_SET (tv, delay);
708 select (0, 0, 0, 0, &tv); 814 select (0, 0, 0, 0, &tv);
709#endif 815#endif
710 } 816 }
711} 817}
712 818
713/*****************************************************************************/ 819/*****************************************************************************/
714 820
715#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 821#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
716 822
717/* find a suitable new size for the given array, */ 823/* find a suitable new size for the given array, */
718/* hopefully by rounding to a ncie-to-malloc size */ 824/* hopefully by rounding to a nice-to-malloc size */
719inline_size int 825inline_size int
720array_nextsize (int elem, int cur, int cnt) 826array_nextsize (int elem, int cur, int cnt)
721{ 827{
722 int ncur = cur + 1; 828 int ncur = cur + 1;
723 829
… …
819} 925}
820 926
821/*****************************************************************************/ 927/*****************************************************************************/
822 928
823inline_speed void 929inline_speed void
824fd_event_nc (EV_P_ int fd, int revents) 930fd_event_nocheck (EV_P_ int fd, int revents)
825{ 931{
826 ANFD *anfd = anfds + fd; 932 ANFD *anfd = anfds + fd;
827 ev_io *w; 933 ev_io *w;
828 934
829 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 935 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
841fd_event (EV_P_ int fd, int revents) 947fd_event (EV_P_ int fd, int revents)
842{ 948{
843 ANFD *anfd = anfds + fd; 949 ANFD *anfd = anfds + fd;
844 950
845 if (expect_true (!anfd->reify)) 951 if (expect_true (!anfd->reify))
846 fd_event_nc (EV_A_ fd, revents); 952 fd_event_nocheck (EV_A_ fd, revents);
847} 953}
848 954
849void 955void
850ev_feed_fd_event (EV_P_ int fd, int revents) 956ev_feed_fd_event (EV_P_ int fd, int revents)
851{ 957{
852 if (fd >= 0 && fd < anfdmax) 958 if (fd >= 0 && fd < anfdmax)
853 fd_event_nc (EV_A_ fd, revents); 959 fd_event_nocheck (EV_A_ fd, revents);
854} 960}
855 961
856/* make sure the external fd watch events are in-sync */ 962/* make sure the external fd watch events are in-sync */
857/* with the kernel/libev internal state */ 963/* with the kernel/libev internal state */
858inline_size void 964inline_size void
… …
864 { 970 {
865 int fd = fdchanges [i]; 971 int fd = fdchanges [i];
866 ANFD *anfd = anfds + fd; 972 ANFD *anfd = anfds + fd;
867 ev_io *w; 973 ev_io *w;
868 974
869 unsigned char events = 0; 975 unsigned char o_events = anfd->events;
976 unsigned char o_reify = anfd->reify;
870 977
871 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 978 anfd->reify = 0;
872 events |= (unsigned char)w->events;
873 979
874#if EV_SELECT_IS_WINSOCKET 980#if EV_SELECT_IS_WINSOCKET
875 if (events) 981 if (o_reify & EV__IOFDSET)
876 { 982 {
877 unsigned long arg; 983 unsigned long arg;
878 #ifdef EV_FD_TO_WIN32_HANDLE
879 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 984 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
880 #else
881 anfd->handle = _get_osfhandle (fd);
882 #endif
883 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 985 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
884 } 986 }
885#endif 987#endif
886 988
989 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
887 { 990 {
888 unsigned char o_events = anfd->events;
889 unsigned char o_reify = anfd->reify;
890
891 anfd->reify = 0;
892 anfd->events = events; 991 anfd->events = 0;
893 992
894 if (o_events != events || o_reify & EV__IOFDSET) 993 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
994 anfd->events |= (unsigned char)w->events;
995
996 if (o_events != anfd->events)
997 o_reify = EV__IOFDSET; /* actually |= */
998 }
999
1000 if (o_reify & EV__IOFDSET)
895 backend_modify (EV_A_ fd, o_events, events); 1001 backend_modify (EV_A_ fd, o_events, anfd->events);
896 }
897 } 1002 }
898 1003
899 fdchangecnt = 0; 1004 fdchangecnt = 0;
900} 1005}
901 1006
… …
925 ev_io_stop (EV_A_ w); 1030 ev_io_stop (EV_A_ w);
926 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1031 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
927 } 1032 }
928} 1033}
929 1034
930/* check whether the given fd is atcually valid, for error recovery */ 1035/* check whether the given fd is actually valid, for error recovery */
931inline_size int 1036inline_size int
932fd_valid (int fd) 1037fd_valid (int fd)
933{ 1038{
934#ifdef _WIN32 1039#ifdef _WIN32
935 return _get_osfhandle (fd) != -1; 1040 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
936#else 1041#else
937 return fcntl (fd, F_GETFD) != -1; 1042 return fcntl (fd, F_GETFD) != -1;
938#endif 1043#endif
939} 1044}
940 1045
… …
958 1063
959 for (fd = anfdmax; fd--; ) 1064 for (fd = anfdmax; fd--; )
960 if (anfds [fd].events) 1065 if (anfds [fd].events)
961 { 1066 {
962 fd_kill (EV_A_ fd); 1067 fd_kill (EV_A_ fd);
963 return; 1068 break;
964 } 1069 }
965} 1070}
966 1071
967/* usually called after fork if backend needs to re-arm all fds from scratch */ 1072/* usually called after fork if backend needs to re-arm all fds from scratch */
968static void noinline 1073static void noinline
… …
977 anfds [fd].emask = 0; 1082 anfds [fd].emask = 0;
978 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1083 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
979 } 1084 }
980} 1085}
981 1086
1087/* used to prepare libev internal fd's */
1088/* this is not fork-safe */
1089inline_speed void
1090fd_intern (int fd)
1091{
1092#ifdef _WIN32
1093 unsigned long arg = 1;
1094 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1095#else
1096 fcntl (fd, F_SETFD, FD_CLOEXEC);
1097 fcntl (fd, F_SETFL, O_NONBLOCK);
1098#endif
1099}
1100
982/*****************************************************************************/ 1101/*****************************************************************************/
983 1102
984/* 1103/*
985 * the heap functions want a real array index. array index 0 uis guaranteed to not 1104 * the heap functions want a real array index. array index 0 is guaranteed to not
986 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1105 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
987 * the branching factor of the d-tree. 1106 * the branching factor of the d-tree.
988 */ 1107 */
989 1108
990/* 1109/*
… …
1058 1177
1059 for (;;) 1178 for (;;)
1060 { 1179 {
1061 int c = k << 1; 1180 int c = k << 1;
1062 1181
1063 if (c > N + HEAP0 - 1) 1182 if (c >= N + HEAP0)
1064 break; 1183 break;
1065 1184
1066 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1185 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1067 ? 1 : 0; 1186 ? 1 : 0;
1068 1187
… …
1104 1223
1105/* move an element suitably so it is in a correct place */ 1224/* move an element suitably so it is in a correct place */
1106inline_size void 1225inline_size void
1107adjustheap (ANHE *heap, int N, int k) 1226adjustheap (ANHE *heap, int N, int k)
1108{ 1227{
1109 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1228 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1110 upheap (heap, k); 1229 upheap (heap, k);
1111 else 1230 else
1112 downheap (heap, N, k); 1231 downheap (heap, N, k);
1113} 1232}
1114 1233
… …
1127/*****************************************************************************/ 1246/*****************************************************************************/
1128 1247
1129/* associate signal watchers to a signal signal */ 1248/* associate signal watchers to a signal signal */
1130typedef struct 1249typedef struct
1131{ 1250{
1251 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY 1252#if EV_MULTIPLICITY
1133 EV_P; 1253 EV_P;
1134#endif 1254#endif
1135 WL head; 1255 WL head;
1136 EV_ATOMIC_T gotsig;
1137} ANSIG; 1256} ANSIG;
1138 1257
1139static ANSIG signals [EV_NSIG - 1]; 1258static ANSIG signals [EV_NSIG - 1];
1140static EV_ATOMIC_T gotsig;
1141 1259
1142/*****************************************************************************/ 1260/*****************************************************************************/
1143 1261
1144/* used to prepare libev internal fd's */ 1262#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1145/* this is not fork-safe */
1146inline_speed void
1147fd_intern (int fd)
1148{
1149#ifdef _WIN32
1150 unsigned long arg = 1;
1151 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1152#else
1153 fcntl (fd, F_SETFD, FD_CLOEXEC);
1154 fcntl (fd, F_SETFL, O_NONBLOCK);
1155#endif
1156}
1157 1263
1158static void noinline 1264static void noinline
1159evpipe_init (EV_P) 1265evpipe_init (EV_P)
1160{ 1266{
1161 if (!ev_is_active (&pipe_w)) 1267 if (!ev_is_active (&pipe_w))
1162 { 1268 {
1163#if EV_USE_EVENTFD 1269# if EV_USE_EVENTFD
1164 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1270 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1165 if (evfd < 0 && errno == EINVAL) 1271 if (evfd < 0 && errno == EINVAL)
1166 evfd = eventfd (0, 0); 1272 evfd = eventfd (0, 0);
1167 1273
1168 if (evfd >= 0) 1274 if (evfd >= 0)
… …
1170 evpipe [0] = -1; 1276 evpipe [0] = -1;
1171 fd_intern (evfd); /* doing it twice doesn't hurt */ 1277 fd_intern (evfd); /* doing it twice doesn't hurt */
1172 ev_io_set (&pipe_w, evfd, EV_READ); 1278 ev_io_set (&pipe_w, evfd, EV_READ);
1173 } 1279 }
1174 else 1280 else
1175#endif 1281# endif
1176 { 1282 {
1177 while (pipe (evpipe)) 1283 while (pipe (evpipe))
1178 ev_syserr ("(libev) error creating signal/async pipe"); 1284 ev_syserr ("(libev) error creating signal/async pipe");
1179 1285
1180 fd_intern (evpipe [0]); 1286 fd_intern (evpipe [0]);
… …
1191evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1297evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1192{ 1298{
1193 if (!*flag) 1299 if (!*flag)
1194 { 1300 {
1195 int old_errno = errno; /* save errno because write might clobber it */ 1301 int old_errno = errno; /* save errno because write might clobber it */
1302 char dummy;
1196 1303
1197 *flag = 1; 1304 *flag = 1;
1198 1305
1199#if EV_USE_EVENTFD 1306#if EV_USE_EVENTFD
1200 if (evfd >= 0) 1307 if (evfd >= 0)
… …
1202 uint64_t counter = 1; 1309 uint64_t counter = 1;
1203 write (evfd, &counter, sizeof (uint64_t)); 1310 write (evfd, &counter, sizeof (uint64_t));
1204 } 1311 }
1205 else 1312 else
1206#endif 1313#endif
1314 /* win32 people keep sending patches that change this write() to send() */
1315 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1316 /* so when you think this write should be a send instead, please find out */
1317 /* where your send() is from - it's definitely not the microsoft send, and */
1318 /* tell me. thank you. */
1207 write (evpipe [1], &old_errno, 1); 1319 write (evpipe [1], &dummy, 1);
1208 1320
1209 errno = old_errno; 1321 errno = old_errno;
1210 } 1322 }
1211} 1323}
1212 1324
1213/* called whenever the libev signal pipe */ 1325/* called whenever the libev signal pipe */
1214/* got some events (signal, async) */ 1326/* got some events (signal, async) */
1215static void 1327static void
1216pipecb (EV_P_ ev_io *iow, int revents) 1328pipecb (EV_P_ ev_io *iow, int revents)
1217{ 1329{
1330 int i;
1331
1218#if EV_USE_EVENTFD 1332#if EV_USE_EVENTFD
1219 if (evfd >= 0) 1333 if (evfd >= 0)
1220 { 1334 {
1221 uint64_t counter; 1335 uint64_t counter;
1222 read (evfd, &counter, sizeof (uint64_t)); 1336 read (evfd, &counter, sizeof (uint64_t));
1223 } 1337 }
1224 else 1338 else
1225#endif 1339#endif
1226 { 1340 {
1227 char dummy; 1341 char dummy;
1342 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1228 read (evpipe [0], &dummy, 1); 1343 read (evpipe [0], &dummy, 1);
1229 } 1344 }
1230 1345
1231 if (gotsig && ev_is_default_loop (EV_A)) 1346 if (sig_pending)
1232 { 1347 {
1233 int signum; 1348 sig_pending = 0;
1234 gotsig = 0;
1235 1349
1236 for (signum = EV_NSIG - 1; signum--; ) 1350 for (i = EV_NSIG - 1; i--; )
1237 if (signals [signum].gotsig) 1351 if (expect_false (signals [i].pending))
1238 ev_feed_signal_event (EV_A_ signum + 1); 1352 ev_feed_signal_event (EV_A_ i + 1);
1239 } 1353 }
1240 1354
1241#if EV_ASYNC_ENABLE 1355#if EV_ASYNC_ENABLE
1242 if (gotasync) 1356 if (async_pending)
1243 { 1357 {
1244 int i; 1358 async_pending = 0;
1245 gotasync = 0;
1246 1359
1247 for (i = asynccnt; i--; ) 1360 for (i = asynccnt; i--; )
1248 if (asyncs [i]->sent) 1361 if (asyncs [i]->sent)
1249 { 1362 {
1250 asyncs [i]->sent = 0; 1363 asyncs [i]->sent = 0;
… …
1261{ 1374{
1262#if EV_MULTIPLICITY 1375#if EV_MULTIPLICITY
1263 EV_P = signals [signum - 1].loop; 1376 EV_P = signals [signum - 1].loop;
1264#endif 1377#endif
1265 1378
1266#if _WIN32 1379#ifdef _WIN32
1267 signal (signum, ev_sighandler); 1380 signal (signum, ev_sighandler);
1268#endif 1381#endif
1269 1382
1270 signals [signum - 1].gotsig = 1; 1383 signals [signum - 1].pending = 1;
1271 evpipe_write (EV_A_ &gotsig); 1384 evpipe_write (EV_A_ &sig_pending);
1272} 1385}
1273 1386
1274void noinline 1387void noinline
1275ev_feed_signal_event (EV_P_ int signum) 1388ev_feed_signal_event (EV_P_ int signum)
1276{ 1389{
1277 WL w; 1390 WL w;
1278 1391
1392 if (expect_false (signum <= 0 || signum > EV_NSIG))
1393 return;
1394
1395 --signum;
1396
1279#if EV_MULTIPLICITY 1397#if EV_MULTIPLICITY
1280 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1398 /* it is permissible to try to feed a signal to the wrong loop */
1281#endif 1399 /* or, likely more useful, feeding a signal nobody is waiting for */
1282 1400
1283 if (signum <= 0 || signum > EV_NSIG) 1401 if (expect_false (signals [signum].loop != EV_A))
1284 return; 1402 return;
1403#endif
1285 1404
1286 --signum;
1287
1288 signals [signum].gotsig = 0; 1405 signals [signum].pending = 0;
1289 1406
1290 for (w = signals [signum].head; w; w = w->next) 1407 for (w = signals [signum].head; w; w = w->next)
1291 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1408 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1292} 1409}
1293 1410
… …
1309 break; 1426 break;
1310 } 1427 }
1311} 1428}
1312#endif 1429#endif
1313 1430
1431#endif
1432
1314/*****************************************************************************/ 1433/*****************************************************************************/
1315 1434
1435#if EV_CHILD_ENABLE
1316static WL childs [EV_PID_HASHSIZE]; 1436static WL childs [EV_PID_HASHSIZE];
1317
1318#ifndef _WIN32
1319 1437
1320static ev_signal childev; 1438static ev_signal childev;
1321 1439
1322#ifndef WIFCONTINUED 1440#ifndef WIFCONTINUED
1323# define WIFCONTINUED(status) 0 1441# define WIFCONTINUED(status) 0
… …
1328child_reap (EV_P_ int chain, int pid, int status) 1446child_reap (EV_P_ int chain, int pid, int status)
1329{ 1447{
1330 ev_child *w; 1448 ev_child *w;
1331 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1449 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1332 1450
1333 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1451 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1334 { 1452 {
1335 if ((w->pid == pid || !w->pid) 1453 if ((w->pid == pid || !w->pid)
1336 && (!traced || (w->flags & 1))) 1454 && (!traced || (w->flags & 1)))
1337 { 1455 {
1338 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1456 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1363 /* make sure we are called again until all children have been reaped */ 1481 /* make sure we are called again until all children have been reaped */
1364 /* we need to do it this way so that the callback gets called before we continue */ 1482 /* we need to do it this way so that the callback gets called before we continue */
1365 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1483 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1366 1484
1367 child_reap (EV_A_ pid, pid, status); 1485 child_reap (EV_A_ pid, pid, status);
1368 if (EV_PID_HASHSIZE > 1) 1486 if ((EV_PID_HASHSIZE) > 1)
1369 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1487 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1370} 1488}
1371 1489
1372#endif 1490#endif
1373 1491
… …
1440#ifdef __APPLE__ 1558#ifdef __APPLE__
1441 /* only select works correctly on that "unix-certified" platform */ 1559 /* only select works correctly on that "unix-certified" platform */
1442 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1560 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1443 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1561 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1444#endif 1562#endif
1563#ifdef __FreeBSD__
1564 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1565#endif
1445 1566
1446 return flags; 1567 return flags;
1447} 1568}
1448 1569
1449unsigned int 1570unsigned int
1450ev_embeddable_backends (void) 1571ev_embeddable_backends (void)
1451{ 1572{
1452 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1573 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1453 1574
1454 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1575 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1455 /* please fix it and tell me how to detect the fix */ 1576 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1456 flags &= ~EVBACKEND_EPOLL; 1577 flags &= ~EVBACKEND_EPOLL;
1457 1578
1458 return flags; 1579 return flags;
1459} 1580}
1460 1581
1461unsigned int 1582unsigned int
1462ev_backend (EV_P) 1583ev_backend (EV_P)
1463{ 1584{
1464 return backend; 1585 return backend;
1465} 1586}
1466 1587
1467#if EV_MINIMAL < 2 1588#if EV_FEATURE_API
1468unsigned int 1589unsigned int
1469ev_loop_count (EV_P) 1590ev_iteration (EV_P)
1470{ 1591{
1471 return loop_count; 1592 return loop_count;
1472} 1593}
1473 1594
1474unsigned int 1595unsigned int
1475ev_loop_depth (EV_P) 1596ev_depth (EV_P)
1476{ 1597{
1477 return loop_depth; 1598 return loop_depth;
1478} 1599}
1479 1600
1480void 1601void
… …
1552 1673
1553 ev_rt_now = ev_time (); 1674 ev_rt_now = ev_time ();
1554 mn_now = get_clock (); 1675 mn_now = get_clock ();
1555 now_floor = mn_now; 1676 now_floor = mn_now;
1556 rtmn_diff = ev_rt_now - mn_now; 1677 rtmn_diff = ev_rt_now - mn_now;
1557#if EV_MINIMAL < 2 1678#if EV_FEATURE_API
1558 invoke_cb = ev_invoke_pending; 1679 invoke_cb = ev_invoke_pending;
1559#endif 1680#endif
1560 1681
1561 io_blocktime = 0.; 1682 io_blocktime = 0.;
1562 timeout_blocktime = 0.; 1683 timeout_blocktime = 0.;
1563 backend = 0; 1684 backend = 0;
1564 backend_fd = -1; 1685 backend_fd = -1;
1565 gotasync = 0; 1686 sig_pending = 0;
1687#if EV_ASYNC_ENABLE
1688 async_pending = 0;
1689#endif
1566#if EV_USE_INOTIFY 1690#if EV_USE_INOTIFY
1567 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1691 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1568#endif 1692#endif
1569#if EV_USE_SIGNALFD 1693#if EV_USE_SIGNALFD
1570 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1694 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1571#endif 1695#endif
1572 1696
1573 if (!(flags & 0x0000ffffU)) 1697 if (!(flags & 0x0000ffffU))
1574 flags |= ev_recommended_backends (); 1698 flags |= ev_recommended_backends ();
1575 1699
… …
1589 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1713 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1590#endif 1714#endif
1591 1715
1592 ev_prepare_init (&pending_w, pendingcb); 1716 ev_prepare_init (&pending_w, pendingcb);
1593 1717
1718#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1594 ev_init (&pipe_w, pipecb); 1719 ev_init (&pipe_w, pipecb);
1595 ev_set_priority (&pipe_w, EV_MAXPRI); 1720 ev_set_priority (&pipe_w, EV_MAXPRI);
1721#endif
1596 } 1722 }
1597} 1723}
1598 1724
1599/* free up a loop structure */ 1725/* free up a loop structure */
1600static void noinline 1726static void noinline
… …
1612 close (evfd); 1738 close (evfd);
1613#endif 1739#endif
1614 1740
1615 if (evpipe [0] >= 0) 1741 if (evpipe [0] >= 0)
1616 { 1742 {
1617 close (evpipe [0]); 1743 EV_WIN32_CLOSE_FD (evpipe [0]);
1618 close (evpipe [1]); 1744 EV_WIN32_CLOSE_FD (evpipe [1]);
1619 } 1745 }
1620 } 1746 }
1621 1747
1622#if EV_USE_SIGNALFD 1748#if EV_USE_SIGNALFD
1623 if (ev_is_active (&sigfd_w)) 1749 if (ev_is_active (&sigfd_w))
1624 {
1625 /*ev_ref (EV_A);*/
1626 /*ev_io_stop (EV_A_ &sigfd_w);*/
1627
1628 close (sigfd); 1750 close (sigfd);
1629 }
1630#endif 1751#endif
1631 1752
1632#if EV_USE_INOTIFY 1753#if EV_USE_INOTIFY
1633 if (fs_fd >= 0) 1754 if (fs_fd >= 0)
1634 close (fs_fd); 1755 close (fs_fd);
… …
1704 1825
1705 if (ev_is_active (&pipe_w)) 1826 if (ev_is_active (&pipe_w))
1706 { 1827 {
1707 /* this "locks" the handlers against writing to the pipe */ 1828 /* this "locks" the handlers against writing to the pipe */
1708 /* while we modify the fd vars */ 1829 /* while we modify the fd vars */
1709 gotsig = 1; 1830 sig_pending = 1;
1710#if EV_ASYNC_ENABLE 1831#if EV_ASYNC_ENABLE
1711 gotasync = 1; 1832 async_pending = 1;
1712#endif 1833#endif
1713 1834
1714 ev_ref (EV_A); 1835 ev_ref (EV_A);
1715 ev_io_stop (EV_A_ &pipe_w); 1836 ev_io_stop (EV_A_ &pipe_w);
1716 1837
… …
1719 close (evfd); 1840 close (evfd);
1720#endif 1841#endif
1721 1842
1722 if (evpipe [0] >= 0) 1843 if (evpipe [0] >= 0)
1723 { 1844 {
1724 close (evpipe [0]); 1845 EV_WIN32_CLOSE_FD (evpipe [0]);
1725 close (evpipe [1]); 1846 EV_WIN32_CLOSE_FD (evpipe [1]);
1726 } 1847 }
1727 1848
1849#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1728 evpipe_init (EV_A); 1850 evpipe_init (EV_A);
1729 /* now iterate over everything, in case we missed something */ 1851 /* now iterate over everything, in case we missed something */
1730 pipecb (EV_A_ &pipe_w, EV_READ); 1852 pipecb (EV_A_ &pipe_w, EV_READ);
1853#endif
1731 } 1854 }
1732 1855
1733 postfork = 0; 1856 postfork = 0;
1734} 1857}
1735 1858
… …
1797 verify_watcher (EV_A_ ws [cnt]); 1920 verify_watcher (EV_A_ ws [cnt]);
1798 } 1921 }
1799} 1922}
1800#endif 1923#endif
1801 1924
1802#if EV_MINIMAL < 2 1925#if EV_FEATURE_API
1803void 1926void
1804ev_loop_verify (EV_P) 1927ev_verify (EV_P)
1805{ 1928{
1806#if EV_VERIFY 1929#if EV_VERIFY
1807 int i; 1930 int i;
1808 WL w; 1931 WL w;
1809 1932
… …
1848#if EV_ASYNC_ENABLE 1971#if EV_ASYNC_ENABLE
1849 assert (asyncmax >= asynccnt); 1972 assert (asyncmax >= asynccnt);
1850 array_verify (EV_A_ (W *)asyncs, asynccnt); 1973 array_verify (EV_A_ (W *)asyncs, asynccnt);
1851#endif 1974#endif
1852 1975
1976#if EV_PREPARE_ENABLE
1853 assert (preparemax >= preparecnt); 1977 assert (preparemax >= preparecnt);
1854 array_verify (EV_A_ (W *)prepares, preparecnt); 1978 array_verify (EV_A_ (W *)prepares, preparecnt);
1979#endif
1855 1980
1981#if EV_CHECK_ENABLE
1856 assert (checkmax >= checkcnt); 1982 assert (checkmax >= checkcnt);
1857 array_verify (EV_A_ (W *)checks, checkcnt); 1983 array_verify (EV_A_ (W *)checks, checkcnt);
1984#endif
1858 1985
1859# if 0 1986# if 0
1987#if EV_CHILD_ENABLE
1860 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1988 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1861 for (signum = EV_NSIG; signum--; ) if (signals [signum].gotsig) 1989 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1990#endif
1862# endif 1991# endif
1863#endif 1992#endif
1864} 1993}
1865#endif 1994#endif
1866 1995
… …
1882 2011
1883 loop_init (EV_A_ flags); 2012 loop_init (EV_A_ flags);
1884 2013
1885 if (ev_backend (EV_A)) 2014 if (ev_backend (EV_A))
1886 { 2015 {
1887#ifndef _WIN32 2016#if EV_CHILD_ENABLE
1888 ev_signal_init (&childev, childcb, SIGCHLD); 2017 ev_signal_init (&childev, childcb, SIGCHLD);
1889 ev_set_priority (&childev, EV_MAXPRI); 2018 ev_set_priority (&childev, EV_MAXPRI);
1890 ev_signal_start (EV_A_ &childev); 2019 ev_signal_start (EV_A_ &childev);
1891 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2020 ev_unref (EV_A); /* child watcher should not keep loop alive */
1892#endif 2021#endif
… …
1905 EV_P = ev_default_loop_ptr; 2034 EV_P = ev_default_loop_ptr;
1906#endif 2035#endif
1907 2036
1908 ev_default_loop_ptr = 0; 2037 ev_default_loop_ptr = 0;
1909 2038
1910#ifndef _WIN32 2039#if EV_CHILD_ENABLE
1911 ev_ref (EV_A); /* child watcher */ 2040 ev_ref (EV_A); /* child watcher */
1912 ev_signal_stop (EV_A_ &childev); 2041 ev_signal_stop (EV_A_ &childev);
1913#endif 2042#endif
1914 2043
1915 loop_destroy (EV_A); 2044 loop_destroy (EV_A);
… …
2021 EV_FREQUENT_CHECK; 2150 EV_FREQUENT_CHECK;
2022 feed_reverse (EV_A_ (W)w); 2151 feed_reverse (EV_A_ (W)w);
2023 } 2152 }
2024 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2153 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2025 2154
2026 feed_reverse_done (EV_A_ EV_TIMEOUT); 2155 feed_reverse_done (EV_A_ EV_TIMER);
2027 } 2156 }
2028} 2157}
2029 2158
2030#if EV_PERIODIC_ENABLE 2159#if EV_PERIODIC_ENABLE
2031/* make periodics pending */ 2160/* make periodics pending */
… …
2084 feed_reverse_done (EV_A_ EV_PERIODIC); 2213 feed_reverse_done (EV_A_ EV_PERIODIC);
2085 } 2214 }
2086} 2215}
2087 2216
2088/* simply recalculate all periodics */ 2217/* simply recalculate all periodics */
2089/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2218/* TODO: maybe ensure that at least one event happens when jumping forward? */
2090static void noinline 2219static void noinline
2091periodics_reschedule (EV_P) 2220periodics_reschedule (EV_P)
2092{ 2221{
2093 int i; 2222 int i;
2094 2223
… …
2122 ANHE_at_cache (*he); 2251 ANHE_at_cache (*he);
2123 } 2252 }
2124} 2253}
2125 2254
2126/* fetch new monotonic and realtime times from the kernel */ 2255/* fetch new monotonic and realtime times from the kernel */
2127/* also detetc if there was a timejump, and act accordingly */ 2256/* also detect if there was a timejump, and act accordingly */
2128inline_speed void 2257inline_speed void
2129time_update (EV_P_ ev_tstamp max_block) 2258time_update (EV_P_ ev_tstamp max_block)
2130{ 2259{
2131#if EV_USE_MONOTONIC 2260#if EV_USE_MONOTONIC
2132 if (expect_true (have_monotonic)) 2261 if (expect_true (have_monotonic))
… …
2190 mn_now = ev_rt_now; 2319 mn_now = ev_rt_now;
2191 } 2320 }
2192} 2321}
2193 2322
2194void 2323void
2195ev_loop (EV_P_ int flags) 2324ev_run (EV_P_ int flags)
2196{ 2325{
2197#if EV_MINIMAL < 2 2326#if EV_FEATURE_API
2198 ++loop_depth; 2327 ++loop_depth;
2199#endif 2328#endif
2200 2329
2201 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2330 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2202 2331
2203 loop_done = EVUNLOOP_CANCEL; 2332 loop_done = EVBREAK_CANCEL;
2204 2333
2205 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2334 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2206 2335
2207 do 2336 do
2208 { 2337 {
2209#if EV_VERIFY >= 2 2338#if EV_VERIFY >= 2
2210 ev_loop_verify (EV_A); 2339 ev_verify (EV_A);
2211#endif 2340#endif
2212 2341
2213#ifndef _WIN32 2342#ifndef _WIN32
2214 if (expect_false (curpid)) /* penalise the forking check even more */ 2343 if (expect_false (curpid)) /* penalise the forking check even more */
2215 if (expect_false (getpid () != curpid)) 2344 if (expect_false (getpid () != curpid))
… …
2227 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2356 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2228 EV_INVOKE_PENDING; 2357 EV_INVOKE_PENDING;
2229 } 2358 }
2230#endif 2359#endif
2231 2360
2361#if EV_PREPARE_ENABLE
2232 /* queue prepare watchers (and execute them) */ 2362 /* queue prepare watchers (and execute them) */
2233 if (expect_false (preparecnt)) 2363 if (expect_false (preparecnt))
2234 { 2364 {
2235 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2365 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2236 EV_INVOKE_PENDING; 2366 EV_INVOKE_PENDING;
2237 } 2367 }
2368#endif
2238 2369
2239 if (expect_false (loop_done)) 2370 if (expect_false (loop_done))
2240 break; 2371 break;
2241 2372
2242 /* we might have forked, so reify kernel state if necessary */ 2373 /* we might have forked, so reify kernel state if necessary */
… …
2249 /* calculate blocking time */ 2380 /* calculate blocking time */
2250 { 2381 {
2251 ev_tstamp waittime = 0.; 2382 ev_tstamp waittime = 0.;
2252 ev_tstamp sleeptime = 0.; 2383 ev_tstamp sleeptime = 0.;
2253 2384
2385 /* remember old timestamp for io_blocktime calculation */
2386 ev_tstamp prev_mn_now = mn_now;
2387
2388 /* update time to cancel out callback processing overhead */
2389 time_update (EV_A_ 1e100);
2390
2254 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2391 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2255 { 2392 {
2256 /* remember old timestamp for io_blocktime calculation */
2257 ev_tstamp prev_mn_now = mn_now;
2258
2259 /* update time to cancel out callback processing overhead */
2260 time_update (EV_A_ 1e100);
2261
2262 waittime = MAX_BLOCKTIME; 2393 waittime = MAX_BLOCKTIME;
2263 2394
2264 if (timercnt) 2395 if (timercnt)
2265 { 2396 {
2266 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2397 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2293 waittime -= sleeptime; 2424 waittime -= sleeptime;
2294 } 2425 }
2295 } 2426 }
2296 } 2427 }
2297 2428
2298#if EV_MINIMAL < 2 2429#if EV_FEATURE_API
2299 ++loop_count; 2430 ++loop_count;
2300#endif 2431#endif
2301 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2432 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2302 backend_poll (EV_A_ waittime); 2433 backend_poll (EV_A_ waittime);
2303 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2434 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2304 2435
2305 /* update ev_rt_now, do magic */ 2436 /* update ev_rt_now, do magic */
2306 time_update (EV_A_ waittime + sleeptime); 2437 time_update (EV_A_ waittime + sleeptime);
2307 } 2438 }
2308 2439
… …
2315#if EV_IDLE_ENABLE 2446#if EV_IDLE_ENABLE
2316 /* queue idle watchers unless other events are pending */ 2447 /* queue idle watchers unless other events are pending */
2317 idle_reify (EV_A); 2448 idle_reify (EV_A);
2318#endif 2449#endif
2319 2450
2451#if EV_CHECK_ENABLE
2320 /* queue check watchers, to be executed first */ 2452 /* queue check watchers, to be executed first */
2321 if (expect_false (checkcnt)) 2453 if (expect_false (checkcnt))
2322 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2454 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2455#endif
2323 2456
2324 EV_INVOKE_PENDING; 2457 EV_INVOKE_PENDING;
2325 } 2458 }
2326 while (expect_true ( 2459 while (expect_true (
2327 activecnt 2460 activecnt
2328 && !loop_done 2461 && !loop_done
2329 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2462 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2330 )); 2463 ));
2331 2464
2332 if (loop_done == EVUNLOOP_ONE) 2465 if (loop_done == EVBREAK_ONE)
2333 loop_done = EVUNLOOP_CANCEL; 2466 loop_done = EVBREAK_CANCEL;
2334 2467
2335#if EV_MINIMAL < 2 2468#if EV_FEATURE_API
2336 --loop_depth; 2469 --loop_depth;
2337#endif 2470#endif
2338} 2471}
2339 2472
2340void 2473void
2341ev_unloop (EV_P_ int how) 2474ev_break (EV_P_ int how)
2342{ 2475{
2343 loop_done = how; 2476 loop_done = how;
2344} 2477}
2345 2478
2346void 2479void
… …
2393inline_size void 2526inline_size void
2394wlist_del (WL *head, WL elem) 2527wlist_del (WL *head, WL elem)
2395{ 2528{
2396 while (*head) 2529 while (*head)
2397 { 2530 {
2398 if (*head == elem) 2531 if (expect_true (*head == elem))
2399 { 2532 {
2400 *head = elem->next; 2533 *head = elem->next;
2401 return; 2534 break;
2402 } 2535 }
2403 2536
2404 head = &(*head)->next; 2537 head = &(*head)->next;
2405 } 2538 }
2406} 2539}
… …
2466 2599
2467 if (expect_false (ev_is_active (w))) 2600 if (expect_false (ev_is_active (w)))
2468 return; 2601 return;
2469 2602
2470 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2603 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2471 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2604 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2472 2605
2473 EV_FREQUENT_CHECK; 2606 EV_FREQUENT_CHECK;
2474 2607
2475 ev_start (EV_A_ (W)w, 1); 2608 ev_start (EV_A_ (W)w, 1);
2476 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2609 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2494 EV_FREQUENT_CHECK; 2627 EV_FREQUENT_CHECK;
2495 2628
2496 wlist_del (&anfds[w->fd].head, (WL)w); 2629 wlist_del (&anfds[w->fd].head, (WL)w);
2497 ev_stop (EV_A_ (W)w); 2630 ev_stop (EV_A_ (W)w);
2498 2631
2499 fd_change (EV_A_ w->fd, 1); 2632 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2500 2633
2501 EV_FREQUENT_CHECK; 2634 EV_FREQUENT_CHECK;
2502} 2635}
2503 2636
2504void noinline 2637void noinline
… …
2546 timers [active] = timers [timercnt + HEAP0]; 2679 timers [active] = timers [timercnt + HEAP0];
2547 adjustheap (timers, timercnt, active); 2680 adjustheap (timers, timercnt, active);
2548 } 2681 }
2549 } 2682 }
2550 2683
2551 EV_FREQUENT_CHECK;
2552
2553 ev_at (w) -= mn_now; 2684 ev_at (w) -= mn_now;
2554 2685
2555 ev_stop (EV_A_ (W)w); 2686 ev_stop (EV_A_ (W)w);
2687
2688 EV_FREQUENT_CHECK;
2556} 2689}
2557 2690
2558void noinline 2691void noinline
2559ev_timer_again (EV_P_ ev_timer *w) 2692ev_timer_again (EV_P_ ev_timer *w)
2560{ 2693{
… …
2639 periodics [active] = periodics [periodiccnt + HEAP0]; 2772 periodics [active] = periodics [periodiccnt + HEAP0];
2640 adjustheap (periodics, periodiccnt, active); 2773 adjustheap (periodics, periodiccnt, active);
2641 } 2774 }
2642 } 2775 }
2643 2776
2644 EV_FREQUENT_CHECK;
2645
2646 ev_stop (EV_A_ (W)w); 2777 ev_stop (EV_A_ (W)w);
2778
2779 EV_FREQUENT_CHECK;
2647} 2780}
2648 2781
2649void noinline 2782void noinline
2650ev_periodic_again (EV_P_ ev_periodic *w) 2783ev_periodic_again (EV_P_ ev_periodic *w)
2651{ 2784{
… …
2657 2790
2658#ifndef SA_RESTART 2791#ifndef SA_RESTART
2659# define SA_RESTART 0 2792# define SA_RESTART 0
2660#endif 2793#endif
2661 2794
2795#if EV_SIGNAL_ENABLE
2796
2662void noinline 2797void noinline
2663ev_signal_start (EV_P_ ev_signal *w) 2798ev_signal_start (EV_P_ ev_signal *w)
2664{ 2799{
2665 if (expect_false (ev_is_active (w))) 2800 if (expect_false (ev_is_active (w)))
2666 return; 2801 return;
2667 2802
2668 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG)); 2803 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2669 2804
2670#if EV_MULTIPLICITY 2805#if EV_MULTIPLICITY
2671 assert (("libev: tried to attach to a signal from two different loops", 2806 assert (("libev: a signal must not be attached to two different loops",
2672 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 2807 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2673 2808
2674 signals [w->signum - 1].loop = EV_A; 2809 signals [w->signum - 1].loop = EV_A;
2675#endif 2810#endif
2676 2811
… …
2712 if (!((WL)w)->next) 2847 if (!((WL)w)->next)
2713# if EV_USE_SIGNALFD 2848# if EV_USE_SIGNALFD
2714 if (sigfd < 0) /*TODO*/ 2849 if (sigfd < 0) /*TODO*/
2715# endif 2850# endif
2716 { 2851 {
2717# if _WIN32 2852# ifdef _WIN32
2853 evpipe_init (EV_A);
2854
2718 signal (w->signum, ev_sighandler); 2855 signal (w->signum, ev_sighandler);
2719# else 2856# else
2720 struct sigaction sa; 2857 struct sigaction sa;
2721 2858
2722 evpipe_init (EV_A); 2859 evpipe_init (EV_A);
… …
2747 wlist_del (&signals [w->signum - 1].head, (WL)w); 2884 wlist_del (&signals [w->signum - 1].head, (WL)w);
2748 ev_stop (EV_A_ (W)w); 2885 ev_stop (EV_A_ (W)w);
2749 2886
2750 if (!signals [w->signum - 1].head) 2887 if (!signals [w->signum - 1].head)
2751 { 2888 {
2752 #if EV_MULTIPLICITY 2889#if EV_MULTIPLICITY
2753 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2890 signals [w->signum - 1].loop = 0; /* unattach from signal */
2754 #endif 2891#endif
2755 #if EV_USE_SIGNALFD 2892#if EV_USE_SIGNALFD
2756 if (sigfd >= 0) 2893 if (sigfd >= 0)
2757 { 2894 {
2758 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2895 sigset_t ss;
2896
2897 sigemptyset (&ss);
2898 sigaddset (&ss, w->signum);
2759 sigdelset (&sigfd_set, w->signum); 2899 sigdelset (&sigfd_set, w->signum);
2900
2760 signalfd (sigfd, &sigfd_set, 0); 2901 signalfd (sigfd, &sigfd_set, 0);
2761 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2902 sigprocmask (SIG_UNBLOCK, &ss, 0);
2762 /*TODO: maybe unblock signal? */
2763 } 2903 }
2764 else 2904 else
2765 #endif 2905#endif
2766 signal (w->signum, SIG_DFL); 2906 signal (w->signum, SIG_DFL);
2767 } 2907 }
2768 2908
2769 EV_FREQUENT_CHECK; 2909 EV_FREQUENT_CHECK;
2770} 2910}
2911
2912#endif
2913
2914#if EV_CHILD_ENABLE
2771 2915
2772void 2916void
2773ev_child_start (EV_P_ ev_child *w) 2917ev_child_start (EV_P_ ev_child *w)
2774{ 2918{
2775#if EV_MULTIPLICITY 2919#if EV_MULTIPLICITY
… …
2779 return; 2923 return;
2780 2924
2781 EV_FREQUENT_CHECK; 2925 EV_FREQUENT_CHECK;
2782 2926
2783 ev_start (EV_A_ (W)w, 1); 2927 ev_start (EV_A_ (W)w, 1);
2784 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2928 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2785 2929
2786 EV_FREQUENT_CHECK; 2930 EV_FREQUENT_CHECK;
2787} 2931}
2788 2932
2789void 2933void
… …
2793 if (expect_false (!ev_is_active (w))) 2937 if (expect_false (!ev_is_active (w)))
2794 return; 2938 return;
2795 2939
2796 EV_FREQUENT_CHECK; 2940 EV_FREQUENT_CHECK;
2797 2941
2798 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2942 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2799 ev_stop (EV_A_ (W)w); 2943 ev_stop (EV_A_ (W)w);
2800 2944
2801 EV_FREQUENT_CHECK; 2945 EV_FREQUENT_CHECK;
2802} 2946}
2947
2948#endif
2803 2949
2804#if EV_STAT_ENABLE 2950#if EV_STAT_ENABLE
2805 2951
2806# ifdef _WIN32 2952# ifdef _WIN32
2807# undef lstat 2953# undef lstat
… …
2813#define MIN_STAT_INTERVAL 0.1074891 2959#define MIN_STAT_INTERVAL 0.1074891
2814 2960
2815static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2961static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2816 2962
2817#if EV_USE_INOTIFY 2963#if EV_USE_INOTIFY
2818# define EV_INOTIFY_BUFSIZE 8192 2964
2965/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2966# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2819 2967
2820static void noinline 2968static void noinline
2821infy_add (EV_P_ ev_stat *w) 2969infy_add (EV_P_ ev_stat *w)
2822{ 2970{
2823 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2971 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2824 2972
2825 if (w->wd < 0) 2973 if (w->wd >= 0)
2974 {
2975 struct statfs sfs;
2976
2977 /* now local changes will be tracked by inotify, but remote changes won't */
2978 /* unless the filesystem is known to be local, we therefore still poll */
2979 /* also do poll on <2.6.25, but with normal frequency */
2980
2981 if (!fs_2625)
2982 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2983 else if (!statfs (w->path, &sfs)
2984 && (sfs.f_type == 0x1373 /* devfs */
2985 || sfs.f_type == 0xEF53 /* ext2/3 */
2986 || sfs.f_type == 0x3153464a /* jfs */
2987 || sfs.f_type == 0x52654973 /* reiser3 */
2988 || sfs.f_type == 0x01021994 /* tempfs */
2989 || sfs.f_type == 0x58465342 /* xfs */))
2990 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2991 else
2992 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2826 { 2993 }
2994 else
2995 {
2996 /* can't use inotify, continue to stat */
2827 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2997 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2828 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2829 2998
2830 /* monitor some parent directory for speedup hints */ 2999 /* if path is not there, monitor some parent directory for speedup hints */
2831 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3000 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2832 /* but an efficiency issue only */ 3001 /* but an efficiency issue only */
2833 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3002 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2834 { 3003 {
2835 char path [4096]; 3004 char path [4096];
… …
2851 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3020 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2852 } 3021 }
2853 } 3022 }
2854 3023
2855 if (w->wd >= 0) 3024 if (w->wd >= 0)
2856 {
2857 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3025 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2858 3026
2859 /* now local changes will be tracked by inotify, but remote changes won't */ 3027 /* now re-arm timer, if required */
2860 /* unless the filesystem it known to be local, we therefore still poll */ 3028 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2861 /* also do poll on <2.6.25, but with normal frequency */
2862 struct statfs sfs;
2863
2864 if (fs_2625 && !statfs (w->path, &sfs))
2865 if (sfs.f_type == 0x1373 /* devfs */
2866 || sfs.f_type == 0xEF53 /* ext2/3 */
2867 || sfs.f_type == 0x3153464a /* jfs */
2868 || sfs.f_type == 0x52654973 /* reiser3 */
2869 || sfs.f_type == 0x01021994 /* tempfs */
2870 || sfs.f_type == 0x58465342 /* xfs */)
2871 return;
2872
2873 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2874 ev_timer_again (EV_A_ &w->timer); 3029 ev_timer_again (EV_A_ &w->timer);
2875 } 3030 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2876} 3031}
2877 3032
2878static void noinline 3033static void noinline
2879infy_del (EV_P_ ev_stat *w) 3034infy_del (EV_P_ ev_stat *w)
2880{ 3035{
… …
2883 3038
2884 if (wd < 0) 3039 if (wd < 0)
2885 return; 3040 return;
2886 3041
2887 w->wd = -2; 3042 w->wd = -2;
2888 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3043 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2889 wlist_del (&fs_hash [slot].head, (WL)w); 3044 wlist_del (&fs_hash [slot].head, (WL)w);
2890 3045
2891 /* remove this watcher, if others are watching it, they will rearm */ 3046 /* remove this watcher, if others are watching it, they will rearm */
2892 inotify_rm_watch (fs_fd, wd); 3047 inotify_rm_watch (fs_fd, wd);
2893} 3048}
… …
2895static void noinline 3050static void noinline
2896infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3051infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2897{ 3052{
2898 if (slot < 0) 3053 if (slot < 0)
2899 /* overflow, need to check for all hash slots */ 3054 /* overflow, need to check for all hash slots */
2900 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3055 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2901 infy_wd (EV_A_ slot, wd, ev); 3056 infy_wd (EV_A_ slot, wd, ev);
2902 else 3057 else
2903 { 3058 {
2904 WL w_; 3059 WL w_;
2905 3060
2906 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3061 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2907 { 3062 {
2908 ev_stat *w = (ev_stat *)w_; 3063 ev_stat *w = (ev_stat *)w_;
2909 w_ = w_->next; /* lets us remove this watcher and all before it */ 3064 w_ = w_->next; /* lets us remove this watcher and all before it */
2910 3065
2911 if (w->wd == wd || wd == -1) 3066 if (w->wd == wd || wd == -1)
2912 { 3067 {
2913 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3068 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2914 { 3069 {
2915 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3070 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2916 w->wd = -1; 3071 w->wd = -1;
2917 infy_add (EV_A_ w); /* re-add, no matter what */ 3072 infy_add (EV_A_ w); /* re-add, no matter what */
2918 } 3073 }
2919 3074
2920 stat_timer_cb (EV_A_ &w->timer, 0); 3075 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2925 3080
2926static void 3081static void
2927infy_cb (EV_P_ ev_io *w, int revents) 3082infy_cb (EV_P_ ev_io *w, int revents)
2928{ 3083{
2929 char buf [EV_INOTIFY_BUFSIZE]; 3084 char buf [EV_INOTIFY_BUFSIZE];
2930 struct inotify_event *ev = (struct inotify_event *)buf;
2931 int ofs; 3085 int ofs;
2932 int len = read (fs_fd, buf, sizeof (buf)); 3086 int len = read (fs_fd, buf, sizeof (buf));
2933 3087
2934 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3088 for (ofs = 0; ofs < len; )
3089 {
3090 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2935 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3091 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3092 ofs += sizeof (struct inotify_event) + ev->len;
3093 }
2936} 3094}
2937 3095
2938inline_size void 3096inline_size void
2939check_2625 (EV_P) 3097ev_check_2625 (EV_P)
2940{ 3098{
2941 /* kernels < 2.6.25 are borked 3099 /* kernels < 2.6.25 are borked
2942 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3100 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2943 */ 3101 */
2944 struct utsname buf; 3102 if (ev_linux_version () < 0x020619)
2945 int major, minor, micro;
2946
2947 if (uname (&buf))
2948 return; 3103 return;
2949 3104
2950 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2951 return;
2952
2953 if (major < 2
2954 || (major == 2 && minor < 6)
2955 || (major == 2 && minor == 6 && micro < 25))
2956 return;
2957
2958 fs_2625 = 1; 3105 fs_2625 = 1;
3106}
3107
3108inline_size int
3109infy_newfd (void)
3110{
3111#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3112 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3113 if (fd >= 0)
3114 return fd;
3115#endif
3116 return inotify_init ();
2959} 3117}
2960 3118
2961inline_size void 3119inline_size void
2962infy_init (EV_P) 3120infy_init (EV_P)
2963{ 3121{
2964 if (fs_fd != -2) 3122 if (fs_fd != -2)
2965 return; 3123 return;
2966 3124
2967 fs_fd = -1; 3125 fs_fd = -1;
2968 3126
2969 check_2625 (EV_A); 3127 ev_check_2625 (EV_A);
2970 3128
2971 fs_fd = inotify_init (); 3129 fs_fd = infy_newfd ();
2972 3130
2973 if (fs_fd >= 0) 3131 if (fs_fd >= 0)
2974 { 3132 {
3133 fd_intern (fs_fd);
2975 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3134 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2976 ev_set_priority (&fs_w, EV_MAXPRI); 3135 ev_set_priority (&fs_w, EV_MAXPRI);
2977 ev_io_start (EV_A_ &fs_w); 3136 ev_io_start (EV_A_ &fs_w);
3137 ev_unref (EV_A);
2978 } 3138 }
2979} 3139}
2980 3140
2981inline_size void 3141inline_size void
2982infy_fork (EV_P) 3142infy_fork (EV_P)
… …
2984 int slot; 3144 int slot;
2985 3145
2986 if (fs_fd < 0) 3146 if (fs_fd < 0)
2987 return; 3147 return;
2988 3148
3149 ev_ref (EV_A);
3150 ev_io_stop (EV_A_ &fs_w);
2989 close (fs_fd); 3151 close (fs_fd);
2990 fs_fd = inotify_init (); 3152 fs_fd = infy_newfd ();
2991 3153
3154 if (fs_fd >= 0)
3155 {
3156 fd_intern (fs_fd);
3157 ev_io_set (&fs_w, fs_fd, EV_READ);
3158 ev_io_start (EV_A_ &fs_w);
3159 ev_unref (EV_A);
3160 }
3161
2992 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3162 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2993 { 3163 {
2994 WL w_ = fs_hash [slot].head; 3164 WL w_ = fs_hash [slot].head;
2995 fs_hash [slot].head = 0; 3165 fs_hash [slot].head = 0;
2996 3166
2997 while (w_) 3167 while (w_)
… …
3002 w->wd = -1; 3172 w->wd = -1;
3003 3173
3004 if (fs_fd >= 0) 3174 if (fs_fd >= 0)
3005 infy_add (EV_A_ w); /* re-add, no matter what */ 3175 infy_add (EV_A_ w); /* re-add, no matter what */
3006 else 3176 else
3177 {
3178 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3179 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3007 ev_timer_again (EV_A_ &w->timer); 3180 ev_timer_again (EV_A_ &w->timer);
3181 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3182 }
3008 } 3183 }
3009 } 3184 }
3010} 3185}
3011 3186
3012#endif 3187#endif
… …
3029static void noinline 3204static void noinline
3030stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3205stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3031{ 3206{
3032 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3207 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3033 3208
3034 /* we copy this here each the time so that */ 3209 ev_statdata prev = w->attr;
3035 /* prev has the old value when the callback gets invoked */
3036 w->prev = w->attr;
3037 ev_stat_stat (EV_A_ w); 3210 ev_stat_stat (EV_A_ w);
3038 3211
3039 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3212 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3040 if ( 3213 if (
3041 w->prev.st_dev != w->attr.st_dev 3214 prev.st_dev != w->attr.st_dev
3042 || w->prev.st_ino != w->attr.st_ino 3215 || prev.st_ino != w->attr.st_ino
3043 || w->prev.st_mode != w->attr.st_mode 3216 || prev.st_mode != w->attr.st_mode
3044 || w->prev.st_nlink != w->attr.st_nlink 3217 || prev.st_nlink != w->attr.st_nlink
3045 || w->prev.st_uid != w->attr.st_uid 3218 || prev.st_uid != w->attr.st_uid
3046 || w->prev.st_gid != w->attr.st_gid 3219 || prev.st_gid != w->attr.st_gid
3047 || w->prev.st_rdev != w->attr.st_rdev 3220 || prev.st_rdev != w->attr.st_rdev
3048 || w->prev.st_size != w->attr.st_size 3221 || prev.st_size != w->attr.st_size
3049 || w->prev.st_atime != w->attr.st_atime 3222 || prev.st_atime != w->attr.st_atime
3050 || w->prev.st_mtime != w->attr.st_mtime 3223 || prev.st_mtime != w->attr.st_mtime
3051 || w->prev.st_ctime != w->attr.st_ctime 3224 || prev.st_ctime != w->attr.st_ctime
3052 ) { 3225 ) {
3226 /* we only update w->prev on actual differences */
3227 /* in case we test more often than invoke the callback, */
3228 /* to ensure that prev is always different to attr */
3229 w->prev = prev;
3230
3053 #if EV_USE_INOTIFY 3231 #if EV_USE_INOTIFY
3054 if (fs_fd >= 0) 3232 if (fs_fd >= 0)
3055 { 3233 {
3056 infy_del (EV_A_ w); 3234 infy_del (EV_A_ w);
3057 infy_add (EV_A_ w); 3235 infy_add (EV_A_ w);
… …
3082 3260
3083 if (fs_fd >= 0) 3261 if (fs_fd >= 0)
3084 infy_add (EV_A_ w); 3262 infy_add (EV_A_ w);
3085 else 3263 else
3086#endif 3264#endif
3265 {
3087 ev_timer_again (EV_A_ &w->timer); 3266 ev_timer_again (EV_A_ &w->timer);
3267 ev_unref (EV_A);
3268 }
3088 3269
3089 ev_start (EV_A_ (W)w, 1); 3270 ev_start (EV_A_ (W)w, 1);
3090 3271
3091 EV_FREQUENT_CHECK; 3272 EV_FREQUENT_CHECK;
3092} 3273}
… …
3101 EV_FREQUENT_CHECK; 3282 EV_FREQUENT_CHECK;
3102 3283
3103#if EV_USE_INOTIFY 3284#if EV_USE_INOTIFY
3104 infy_del (EV_A_ w); 3285 infy_del (EV_A_ w);
3105#endif 3286#endif
3287
3288 if (ev_is_active (&w->timer))
3289 {
3290 ev_ref (EV_A);
3106 ev_timer_stop (EV_A_ &w->timer); 3291 ev_timer_stop (EV_A_ &w->timer);
3292 }
3107 3293
3108 ev_stop (EV_A_ (W)w); 3294 ev_stop (EV_A_ (W)w);
3109 3295
3110 EV_FREQUENT_CHECK; 3296 EV_FREQUENT_CHECK;
3111} 3297}
… …
3156 3342
3157 EV_FREQUENT_CHECK; 3343 EV_FREQUENT_CHECK;
3158} 3344}
3159#endif 3345#endif
3160 3346
3347#if EV_PREPARE_ENABLE
3161void 3348void
3162ev_prepare_start (EV_P_ ev_prepare *w) 3349ev_prepare_start (EV_P_ ev_prepare *w)
3163{ 3350{
3164 if (expect_false (ev_is_active (w))) 3351 if (expect_false (ev_is_active (w)))
3165 return; 3352 return;
… …
3191 3378
3192 ev_stop (EV_A_ (W)w); 3379 ev_stop (EV_A_ (W)w);
3193 3380
3194 EV_FREQUENT_CHECK; 3381 EV_FREQUENT_CHECK;
3195} 3382}
3383#endif
3196 3384
3385#if EV_CHECK_ENABLE
3197void 3386void
3198ev_check_start (EV_P_ ev_check *w) 3387ev_check_start (EV_P_ ev_check *w)
3199{ 3388{
3200 if (expect_false (ev_is_active (w))) 3389 if (expect_false (ev_is_active (w)))
3201 return; 3390 return;
… …
3227 3416
3228 ev_stop (EV_A_ (W)w); 3417 ev_stop (EV_A_ (W)w);
3229 3418
3230 EV_FREQUENT_CHECK; 3419 EV_FREQUENT_CHECK;
3231} 3420}
3421#endif
3232 3422
3233#if EV_EMBED_ENABLE 3423#if EV_EMBED_ENABLE
3234void noinline 3424void noinline
3235ev_embed_sweep (EV_P_ ev_embed *w) 3425ev_embed_sweep (EV_P_ ev_embed *w)
3236{ 3426{
3237 ev_loop (w->other, EVLOOP_NONBLOCK); 3427 ev_run (w->other, EVRUN_NOWAIT);
3238} 3428}
3239 3429
3240static void 3430static void
3241embed_io_cb (EV_P_ ev_io *io, int revents) 3431embed_io_cb (EV_P_ ev_io *io, int revents)
3242{ 3432{
3243 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3433 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3244 3434
3245 if (ev_cb (w)) 3435 if (ev_cb (w))
3246 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3436 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3247 else 3437 else
3248 ev_loop (w->other, EVLOOP_NONBLOCK); 3438 ev_run (w->other, EVRUN_NOWAIT);
3249} 3439}
3250 3440
3251static void 3441static void
3252embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3442embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3253{ 3443{
… …
3257 EV_P = w->other; 3447 EV_P = w->other;
3258 3448
3259 while (fdchangecnt) 3449 while (fdchangecnt)
3260 { 3450 {
3261 fd_reify (EV_A); 3451 fd_reify (EV_A);
3262 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3452 ev_run (EV_A_ EVRUN_NOWAIT);
3263 } 3453 }
3264 } 3454 }
3265} 3455}
3266 3456
3267static void 3457static void
… …
3273 3463
3274 { 3464 {
3275 EV_P = w->other; 3465 EV_P = w->other;
3276 3466
3277 ev_loop_fork (EV_A); 3467 ev_loop_fork (EV_A);
3278 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3468 ev_run (EV_A_ EVRUN_NOWAIT);
3279 } 3469 }
3280 3470
3281 ev_embed_start (EV_A_ w); 3471 ev_embed_start (EV_A_ w);
3282} 3472}
3283 3473
… …
3331 3521
3332 ev_io_stop (EV_A_ &w->io); 3522 ev_io_stop (EV_A_ &w->io);
3333 ev_prepare_stop (EV_A_ &w->prepare); 3523 ev_prepare_stop (EV_A_ &w->prepare);
3334 ev_fork_stop (EV_A_ &w->fork); 3524 ev_fork_stop (EV_A_ &w->fork);
3335 3525
3526 ev_stop (EV_A_ (W)w);
3527
3336 EV_FREQUENT_CHECK; 3528 EV_FREQUENT_CHECK;
3337} 3529}
3338#endif 3530#endif
3339 3531
3340#if EV_FORK_ENABLE 3532#if EV_FORK_ENABLE
… …
3380ev_async_start (EV_P_ ev_async *w) 3572ev_async_start (EV_P_ ev_async *w)
3381{ 3573{
3382 if (expect_false (ev_is_active (w))) 3574 if (expect_false (ev_is_active (w)))
3383 return; 3575 return;
3384 3576
3577 w->sent = 0;
3578
3385 evpipe_init (EV_A); 3579 evpipe_init (EV_A);
3386 3580
3387 EV_FREQUENT_CHECK; 3581 EV_FREQUENT_CHECK;
3388 3582
3389 ev_start (EV_A_ (W)w, ++asynccnt); 3583 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3416 3610
3417void 3611void
3418ev_async_send (EV_P_ ev_async *w) 3612ev_async_send (EV_P_ ev_async *w)
3419{ 3613{
3420 w->sent = 1; 3614 w->sent = 1;
3421 evpipe_write (EV_A_ &gotasync); 3615 evpipe_write (EV_A_ &async_pending);
3422} 3616}
3423#endif 3617#endif
3424 3618
3425/*****************************************************************************/ 3619/*****************************************************************************/
3426 3620
… …
3466{ 3660{
3467 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3661 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3468 3662
3469 if (expect_false (!once)) 3663 if (expect_false (!once))
3470 { 3664 {
3471 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3665 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3472 return; 3666 return;
3473 } 3667 }
3474 3668
3475 once->cb = cb; 3669 once->cb = cb;
3476 once->arg = arg; 3670 once->arg = arg;
… …
3563 if (types & EV_ASYNC) 3757 if (types & EV_ASYNC)
3564 for (i = asynccnt; i--; ) 3758 for (i = asynccnt; i--; )
3565 cb (EV_A_ EV_ASYNC, asyncs [i]); 3759 cb (EV_A_ EV_ASYNC, asyncs [i]);
3566#endif 3760#endif
3567 3761
3762#if EV_PREPARE_ENABLE
3568 if (types & EV_PREPARE) 3763 if (types & EV_PREPARE)
3569 for (i = preparecnt; i--; ) 3764 for (i = preparecnt; i--; )
3570#if EV_EMBED_ENABLE 3765# if EV_EMBED_ENABLE
3571 if (ev_cb (prepares [i]) != embed_prepare_cb) 3766 if (ev_cb (prepares [i]) != embed_prepare_cb)
3572#endif 3767# endif
3573 cb (EV_A_ EV_PREPARE, prepares [i]); 3768 cb (EV_A_ EV_PREPARE, prepares [i]);
3769#endif
3574 3770
3771#if EV_CHECK_ENABLE
3575 if (types & EV_CHECK) 3772 if (types & EV_CHECK)
3576 for (i = checkcnt; i--; ) 3773 for (i = checkcnt; i--; )
3577 cb (EV_A_ EV_CHECK, checks [i]); 3774 cb (EV_A_ EV_CHECK, checks [i]);
3775#endif
3578 3776
3777#if EV_SIGNAL_ENABLE
3579 if (types & EV_SIGNAL) 3778 if (types & EV_SIGNAL)
3580 for (i = 0; i < EV_NSIG - 1; ++i) 3779 for (i = 0; i < EV_NSIG - 1; ++i)
3581 for (wl = signals [i].head; wl; ) 3780 for (wl = signals [i].head; wl; )
3582 { 3781 {
3583 wn = wl->next; 3782 wn = wl->next;
3584 cb (EV_A_ EV_SIGNAL, wl); 3783 cb (EV_A_ EV_SIGNAL, wl);
3585 wl = wn; 3784 wl = wn;
3586 } 3785 }
3786#endif
3587 3787
3788#if EV_CHILD_ENABLE
3588 if (types & EV_CHILD) 3789 if (types & EV_CHILD)
3589 for (i = EV_PID_HASHSIZE; i--; ) 3790 for (i = (EV_PID_HASHSIZE); i--; )
3590 for (wl = childs [i]; wl; ) 3791 for (wl = childs [i]; wl; )
3591 { 3792 {
3592 wn = wl->next; 3793 wn = wl->next;
3593 cb (EV_A_ EV_CHILD, wl); 3794 cb (EV_A_ EV_CHILD, wl);
3594 wl = wn; 3795 wl = wn;
3595 } 3796 }
3797#endif
3596/* EV_STAT 0x00001000 /* stat data changed */ 3798/* EV_STAT 0x00001000 /* stat data changed */
3597/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3799/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3598} 3800}
3599#endif 3801#endif
3600 3802
3601#if EV_MULTIPLICITY 3803#if EV_MULTIPLICITY
3602 #include "ev_wrap.h" 3804 #include "ev_wrap.h"
3603#endif 3805#endif
3604 3806
3605#ifdef __cplusplus 3807EV_CPP(})
3606}
3607#endif
3608 3808

Diff Legend

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