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.358 by root, Sun Oct 24 14:44:40 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}
… …
558 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 668 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
559 unsigned char unused; 669 unsigned char unused;
560#if EV_USE_EPOLL 670#if EV_USE_EPOLL
561 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
562#endif 672#endif
563#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
564 SOCKET handle; 674 SOCKET handle;
675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
565#endif 678#endif
566} ANFD; 679} ANFD;
567 680
568/* stores the pending event set for a given watcher */ 681/* stores the pending event set for a given watcher */
569typedef struct 682typedef struct
… …
624 737
625 static int ev_default_loop_ptr; 738 static int ev_default_loop_ptr;
626 739
627#endif 740#endif
628 741
629#if EV_MINIMAL < 2 742#if EV_FEATURE_API
630# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 743# 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) 744# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
632# define EV_INVOKE_PENDING invoke_cb (EV_A) 745# define EV_INVOKE_PENDING invoke_cb (EV_A)
633#else 746#else
634# define EV_RELEASE_CB (void)0 747# define EV_RELEASE_CB (void)0
635# define EV_ACQUIRE_CB (void)0 748# define EV_ACQUIRE_CB (void)0
636# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 749# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
637#endif 750#endif
638 751
639#define EVUNLOOP_RECURSE 0x80 752#define EVBREAK_RECURSE 0x80
640 753
641/*****************************************************************************/ 754/*****************************************************************************/
642 755
643#ifndef EV_HAVE_EV_TIME 756#ifndef EV_HAVE_EV_TIME
644ev_tstamp 757ev_tstamp
… …
688 if (delay > 0.) 801 if (delay > 0.)
689 { 802 {
690#if EV_USE_NANOSLEEP 803#if EV_USE_NANOSLEEP
691 struct timespec ts; 804 struct timespec ts;
692 805
693 ts.tv_sec = (time_t)delay; 806 EV_TS_SET (ts, delay);
694 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
695
696 nanosleep (&ts, 0); 807 nanosleep (&ts, 0);
697#elif defined(_WIN32) 808#elif defined(_WIN32)
698 Sleep ((unsigned long)(delay * 1e3)); 809 Sleep ((unsigned long)(delay * 1e3));
699#else 810#else
700 struct timeval tv; 811 struct timeval tv;
701 812
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 */ 813 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
706 /* something not guaranteed by newer posix versions, but guaranteed */ 814 /* something not guaranteed by newer posix versions, but guaranteed */
707 /* by older ones */ 815 /* by older ones */
816 EV_TV_SET (tv, delay);
708 select (0, 0, 0, 0, &tv); 817 select (0, 0, 0, 0, &tv);
709#endif 818#endif
710 } 819 }
711} 820}
712 821
713/*****************************************************************************/ 822/*****************************************************************************/
714 823
715#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 824#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
716 825
717/* find a suitable new size for the given array, */ 826/* find a suitable new size for the given array, */
718/* hopefully by rounding to a ncie-to-malloc size */ 827/* hopefully by rounding to a nice-to-malloc size */
719inline_size int 828inline_size int
720array_nextsize (int elem, int cur, int cnt) 829array_nextsize (int elem, int cur, int cnt)
721{ 830{
722 int ncur = cur + 1; 831 int ncur = cur + 1;
723 832
… …
819} 928}
820 929
821/*****************************************************************************/ 930/*****************************************************************************/
822 931
823inline_speed void 932inline_speed void
824fd_event_nc (EV_P_ int fd, int revents) 933fd_event_nocheck (EV_P_ int fd, int revents)
825{ 934{
826 ANFD *anfd = anfds + fd; 935 ANFD *anfd = anfds + fd;
827 ev_io *w; 936 ev_io *w;
828 937
829 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 938 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
841fd_event (EV_P_ int fd, int revents) 950fd_event (EV_P_ int fd, int revents)
842{ 951{
843 ANFD *anfd = anfds + fd; 952 ANFD *anfd = anfds + fd;
844 953
845 if (expect_true (!anfd->reify)) 954 if (expect_true (!anfd->reify))
846 fd_event_nc (EV_A_ fd, revents); 955 fd_event_nocheck (EV_A_ fd, revents);
847} 956}
848 957
849void 958void
850ev_feed_fd_event (EV_P_ int fd, int revents) 959ev_feed_fd_event (EV_P_ int fd, int revents)
851{ 960{
852 if (fd >= 0 && fd < anfdmax) 961 if (fd >= 0 && fd < anfdmax)
853 fd_event_nc (EV_A_ fd, revents); 962 fd_event_nocheck (EV_A_ fd, revents);
854} 963}
855 964
856/* make sure the external fd watch events are in-sync */ 965/* make sure the external fd watch events are in-sync */
857/* with the kernel/libev internal state */ 966/* with the kernel/libev internal state */
858inline_size void 967inline_size void
… …
864 { 973 {
865 int fd = fdchanges [i]; 974 int fd = fdchanges [i];
866 ANFD *anfd = anfds + fd; 975 ANFD *anfd = anfds + fd;
867 ev_io *w; 976 ev_io *w;
868 977
869 unsigned char events = 0; 978 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify;
870 980
871 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 981 anfd->reify = 0;
872 events |= (unsigned char)w->events;
873 982
874#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
875 if (events) 984 if (o_reify & EV__IOFDSET)
876 { 985 {
877 unsigned long arg; 986 unsigned long arg;
878 #ifdef EV_FD_TO_WIN32_HANDLE
879 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 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)); 988 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
989 printf ("oi %d %x\n", fd, anfd->handle);//D
884 } 990 }
885#endif 991#endif
886 992
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
887 { 994 {
888 unsigned char o_events = anfd->events;
889 unsigned char o_reify = anfd->reify;
890
891 anfd->reify = 0;
892 anfd->events = events; 995 anfd->events = 0;
893 996
894 if (o_events != events || o_reify & EV__IOFDSET) 997 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
998 anfd->events |= (unsigned char)w->events;
999
1000 if (o_events != anfd->events)
1001 o_reify = EV__IOFDSET; /* actually |= */
1002 }
1003
1004 if (o_reify & EV__IOFDSET)
895 backend_modify (EV_A_ fd, o_events, events); 1005 backend_modify (EV_A_ fd, o_events, anfd->events);
896 }
897 } 1006 }
898 1007
899 fdchangecnt = 0; 1008 fdchangecnt = 0;
900} 1009}
901 1010
… …
925 ev_io_stop (EV_A_ w); 1034 ev_io_stop (EV_A_ w);
926 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1035 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
927 } 1036 }
928} 1037}
929 1038
930/* check whether the given fd is atcually valid, for error recovery */ 1039/* check whether the given fd is actually valid, for error recovery */
931inline_size int 1040inline_size int
932fd_valid (int fd) 1041fd_valid (int fd)
933{ 1042{
934#ifdef _WIN32 1043#ifdef _WIN32
935 return _get_osfhandle (fd) != -1; 1044 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
936#else 1045#else
937 return fcntl (fd, F_GETFD) != -1; 1046 return fcntl (fd, F_GETFD) != -1;
938#endif 1047#endif
939} 1048}
940 1049
… …
958 1067
959 for (fd = anfdmax; fd--; ) 1068 for (fd = anfdmax; fd--; )
960 if (anfds [fd].events) 1069 if (anfds [fd].events)
961 { 1070 {
962 fd_kill (EV_A_ fd); 1071 fd_kill (EV_A_ fd);
963 return; 1072 break;
964 } 1073 }
965} 1074}
966 1075
967/* usually called after fork if backend needs to re-arm all fds from scratch */ 1076/* usually called after fork if backend needs to re-arm all fds from scratch */
968static void noinline 1077static void noinline
… …
977 anfds [fd].emask = 0; 1086 anfds [fd].emask = 0;
978 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1087 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
979 } 1088 }
980} 1089}
981 1090
1091/* used to prepare libev internal fd's */
1092/* this is not fork-safe */
1093inline_speed void
1094fd_intern (int fd)
1095{
1096#ifdef _WIN32
1097 unsigned long arg = 1;
1098 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1099#else
1100 fcntl (fd, F_SETFD, FD_CLOEXEC);
1101 fcntl (fd, F_SETFL, O_NONBLOCK);
1102#endif
1103}
1104
982/*****************************************************************************/ 1105/*****************************************************************************/
983 1106
984/* 1107/*
985 * the heap functions want a real array index. array index 0 uis guaranteed to not 1108 * 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 1109 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
987 * the branching factor of the d-tree. 1110 * the branching factor of the d-tree.
988 */ 1111 */
989 1112
990/* 1113/*
… …
1058 1181
1059 for (;;) 1182 for (;;)
1060 { 1183 {
1061 int c = k << 1; 1184 int c = k << 1;
1062 1185
1063 if (c > N + HEAP0 - 1) 1186 if (c >= N + HEAP0)
1064 break; 1187 break;
1065 1188
1066 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1189 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1067 ? 1 : 0; 1190 ? 1 : 0;
1068 1191
… …
1104 1227
1105/* move an element suitably so it is in a correct place */ 1228/* move an element suitably so it is in a correct place */
1106inline_size void 1229inline_size void
1107adjustheap (ANHE *heap, int N, int k) 1230adjustheap (ANHE *heap, int N, int k)
1108{ 1231{
1109 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1232 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1110 upheap (heap, k); 1233 upheap (heap, k);
1111 else 1234 else
1112 downheap (heap, N, k); 1235 downheap (heap, N, k);
1113} 1236}
1114 1237
… …
1127/*****************************************************************************/ 1250/*****************************************************************************/
1128 1251
1129/* associate signal watchers to a signal signal */ 1252/* associate signal watchers to a signal signal */
1130typedef struct 1253typedef struct
1131{ 1254{
1255 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY 1256#if EV_MULTIPLICITY
1133 EV_P; 1257 EV_P;
1134#endif 1258#endif
1135 WL head; 1259 WL head;
1136 EV_ATOMIC_T gotsig;
1137} ANSIG; 1260} ANSIG;
1138 1261
1139static ANSIG signals [EV_NSIG - 1]; 1262static ANSIG signals [EV_NSIG - 1];
1140static EV_ATOMIC_T gotsig;
1141 1263
1142/*****************************************************************************/ 1264/*****************************************************************************/
1143 1265
1144/* used to prepare libev internal fd's */ 1266#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 1267
1158static void noinline 1268static void noinline
1159evpipe_init (EV_P) 1269evpipe_init (EV_P)
1160{ 1270{
1161 if (!ev_is_active (&pipe_w)) 1271 if (!ev_is_active (&pipe_w))
1162 { 1272 {
1163#if EV_USE_EVENTFD 1273# if EV_USE_EVENTFD
1164 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1274 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1165 if (evfd < 0 && errno == EINVAL) 1275 if (evfd < 0 && errno == EINVAL)
1166 evfd = eventfd (0, 0); 1276 evfd = eventfd (0, 0);
1167 1277
1168 if (evfd >= 0) 1278 if (evfd >= 0)
… …
1170 evpipe [0] = -1; 1280 evpipe [0] = -1;
1171 fd_intern (evfd); /* doing it twice doesn't hurt */ 1281 fd_intern (evfd); /* doing it twice doesn't hurt */
1172 ev_io_set (&pipe_w, evfd, EV_READ); 1282 ev_io_set (&pipe_w, evfd, EV_READ);
1173 } 1283 }
1174 else 1284 else
1175#endif 1285# endif
1176 { 1286 {
1177 while (pipe (evpipe)) 1287 while (pipe (evpipe))
1178 ev_syserr ("(libev) error creating signal/async pipe"); 1288 ev_syserr ("(libev) error creating signal/async pipe");
1179 1289
1180 fd_intern (evpipe [0]); 1290 fd_intern (evpipe [0]);
… …
1191evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1301evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1192{ 1302{
1193 if (!*flag) 1303 if (!*flag)
1194 { 1304 {
1195 int old_errno = errno; /* save errno because write might clobber it */ 1305 int old_errno = errno; /* save errno because write might clobber it */
1306 char dummy;
1196 1307
1197 *flag = 1; 1308 *flag = 1;
1198 1309
1199#if EV_USE_EVENTFD 1310#if EV_USE_EVENTFD
1200 if (evfd >= 0) 1311 if (evfd >= 0)
… …
1202 uint64_t counter = 1; 1313 uint64_t counter = 1;
1203 write (evfd, &counter, sizeof (uint64_t)); 1314 write (evfd, &counter, sizeof (uint64_t));
1204 } 1315 }
1205 else 1316 else
1206#endif 1317#endif
1318 /* win32 people keep sending patches that change this write() to send() */
1319 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1320 /* so when you think this write should be a send instead, please find out */
1321 /* where your send() is from - it's definitely not the microsoft send, and */
1322 /* tell me. thank you. */
1207 write (evpipe [1], &old_errno, 1); 1323 write (evpipe [1], &dummy, 1);
1208 1324
1209 errno = old_errno; 1325 errno = old_errno;
1210 } 1326 }
1211} 1327}
1212 1328
1213/* called whenever the libev signal pipe */ 1329/* called whenever the libev signal pipe */
1214/* got some events (signal, async) */ 1330/* got some events (signal, async) */
1215static void 1331static void
1216pipecb (EV_P_ ev_io *iow, int revents) 1332pipecb (EV_P_ ev_io *iow, int revents)
1217{ 1333{
1334 int i;
1335
1218#if EV_USE_EVENTFD 1336#if EV_USE_EVENTFD
1219 if (evfd >= 0) 1337 if (evfd >= 0)
1220 { 1338 {
1221 uint64_t counter; 1339 uint64_t counter;
1222 read (evfd, &counter, sizeof (uint64_t)); 1340 read (evfd, &counter, sizeof (uint64_t));
1223 } 1341 }
1224 else 1342 else
1225#endif 1343#endif
1226 { 1344 {
1227 char dummy; 1345 char dummy;
1346 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1228 read (evpipe [0], &dummy, 1); 1347 read (evpipe [0], &dummy, 1);
1229 } 1348 }
1230 1349
1231 if (gotsig && ev_is_default_loop (EV_A)) 1350 if (sig_pending)
1232 { 1351 {
1233 int signum; 1352 sig_pending = 0;
1234 gotsig = 0;
1235 1353
1236 for (signum = EV_NSIG - 1; signum--; ) 1354 for (i = EV_NSIG - 1; i--; )
1237 if (signals [signum].gotsig) 1355 if (expect_false (signals [i].pending))
1238 ev_feed_signal_event (EV_A_ signum + 1); 1356 ev_feed_signal_event (EV_A_ i + 1);
1239 } 1357 }
1240 1358
1241#if EV_ASYNC_ENABLE 1359#if EV_ASYNC_ENABLE
1242 if (gotasync) 1360 if (async_pending)
1243 { 1361 {
1244 int i; 1362 async_pending = 0;
1245 gotasync = 0;
1246 1363
1247 for (i = asynccnt; i--; ) 1364 for (i = asynccnt; i--; )
1248 if (asyncs [i]->sent) 1365 if (asyncs [i]->sent)
1249 { 1366 {
1250 asyncs [i]->sent = 0; 1367 asyncs [i]->sent = 0;
… …
1261{ 1378{
1262#if EV_MULTIPLICITY 1379#if EV_MULTIPLICITY
1263 EV_P = signals [signum - 1].loop; 1380 EV_P = signals [signum - 1].loop;
1264#endif 1381#endif
1265 1382
1266#if _WIN32 1383#ifdef _WIN32
1267 signal (signum, ev_sighandler); 1384 signal (signum, ev_sighandler);
1268#endif 1385#endif
1269 1386
1270 signals [signum - 1].gotsig = 1; 1387 signals [signum - 1].pending = 1;
1271 evpipe_write (EV_A_ &gotsig); 1388 evpipe_write (EV_A_ &sig_pending);
1272} 1389}
1273 1390
1274void noinline 1391void noinline
1275ev_feed_signal_event (EV_P_ int signum) 1392ev_feed_signal_event (EV_P_ int signum)
1276{ 1393{
1277 WL w; 1394 WL w;
1278 1395
1396 if (expect_false (signum <= 0 || signum > EV_NSIG))
1397 return;
1398
1399 --signum;
1400
1279#if EV_MULTIPLICITY 1401#if EV_MULTIPLICITY
1280 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1402 /* it is permissible to try to feed a signal to the wrong loop */
1281#endif 1403 /* or, likely more useful, feeding a signal nobody is waiting for */
1282 1404
1283 if (signum <= 0 || signum > EV_NSIG) 1405 if (expect_false (signals [signum].loop != EV_A))
1284 return; 1406 return;
1407#endif
1285 1408
1286 --signum;
1287
1288 signals [signum].gotsig = 0; 1409 signals [signum].pending = 0;
1289 1410
1290 for (w = signals [signum].head; w; w = w->next) 1411 for (w = signals [signum].head; w; w = w->next)
1291 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1412 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1292} 1413}
1293 1414
… …
1309 break; 1430 break;
1310 } 1431 }
1311} 1432}
1312#endif 1433#endif
1313 1434
1435#endif
1436
1314/*****************************************************************************/ 1437/*****************************************************************************/
1315 1438
1439#if EV_CHILD_ENABLE
1316static WL childs [EV_PID_HASHSIZE]; 1440static WL childs [EV_PID_HASHSIZE];
1317
1318#ifndef _WIN32
1319 1441
1320static ev_signal childev; 1442static ev_signal childev;
1321 1443
1322#ifndef WIFCONTINUED 1444#ifndef WIFCONTINUED
1323# define WIFCONTINUED(status) 0 1445# define WIFCONTINUED(status) 0
… …
1328child_reap (EV_P_ int chain, int pid, int status) 1450child_reap (EV_P_ int chain, int pid, int status)
1329{ 1451{
1330 ev_child *w; 1452 ev_child *w;
1331 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1453 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1332 1454
1333 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1455 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1334 { 1456 {
1335 if ((w->pid == pid || !w->pid) 1457 if ((w->pid == pid || !w->pid)
1336 && (!traced || (w->flags & 1))) 1458 && (!traced || (w->flags & 1)))
1337 { 1459 {
1338 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1460 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 */ 1485 /* 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 */ 1486 /* 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); 1487 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1366 1488
1367 child_reap (EV_A_ pid, pid, status); 1489 child_reap (EV_A_ pid, pid, status);
1368 if (EV_PID_HASHSIZE > 1) 1490 if ((EV_PID_HASHSIZE) > 1)
1369 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1491 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1370} 1492}
1371 1493
1372#endif 1494#endif
1373 1495
1374/*****************************************************************************/ 1496/*****************************************************************************/
1375 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1376#if EV_USE_PORT 1501#if EV_USE_PORT
1377# include "ev_port.c" 1502# include "ev_port.c"
1378#endif 1503#endif
1379#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1380# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1440#ifdef __APPLE__ 1565#ifdef __APPLE__
1441 /* only select works correctly on that "unix-certified" platform */ 1566 /* only select works correctly on that "unix-certified" platform */
1442 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1567 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1443 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1568 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1444#endif 1569#endif
1570#ifdef __FreeBSD__
1571 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1572#endif
1445 1573
1446 return flags; 1574 return flags;
1447} 1575}
1448 1576
1449unsigned int 1577unsigned int
1450ev_embeddable_backends (void) 1578ev_embeddable_backends (void)
1451{ 1579{
1452 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1580 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1453 1581
1454 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1582 /* 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 */ 1583 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1456 flags &= ~EVBACKEND_EPOLL; 1584 flags &= ~EVBACKEND_EPOLL;
1457 1585
1458 return flags; 1586 return flags;
1459} 1587}
1460 1588
1461unsigned int 1589unsigned int
1462ev_backend (EV_P) 1590ev_backend (EV_P)
1463{ 1591{
1464 return backend; 1592 return backend;
1465} 1593}
1466 1594
1467#if EV_MINIMAL < 2 1595#if EV_FEATURE_API
1468unsigned int 1596unsigned int
1469ev_loop_count (EV_P) 1597ev_iteration (EV_P)
1470{ 1598{
1471 return loop_count; 1599 return loop_count;
1472} 1600}
1473 1601
1474unsigned int 1602unsigned int
1475ev_loop_depth (EV_P) 1603ev_depth (EV_P)
1476{ 1604{
1477 return loop_depth; 1605 return loop_depth;
1478} 1606}
1479 1607
1480void 1608void
… …
1552 1680
1553 ev_rt_now = ev_time (); 1681 ev_rt_now = ev_time ();
1554 mn_now = get_clock (); 1682 mn_now = get_clock ();
1555 now_floor = mn_now; 1683 now_floor = mn_now;
1556 rtmn_diff = ev_rt_now - mn_now; 1684 rtmn_diff = ev_rt_now - mn_now;
1557#if EV_MINIMAL < 2 1685#if EV_FEATURE_API
1558 invoke_cb = ev_invoke_pending; 1686 invoke_cb = ev_invoke_pending;
1559#endif 1687#endif
1560 1688
1561 io_blocktime = 0.; 1689 io_blocktime = 0.;
1562 timeout_blocktime = 0.; 1690 timeout_blocktime = 0.;
1563 backend = 0; 1691 backend = 0;
1564 backend_fd = -1; 1692 backend_fd = -1;
1565 gotasync = 0; 1693 sig_pending = 0;
1694#if EV_ASYNC_ENABLE
1695 async_pending = 0;
1696#endif
1566#if EV_USE_INOTIFY 1697#if EV_USE_INOTIFY
1567 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1698 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1568#endif 1699#endif
1569#if EV_USE_SIGNALFD 1700#if EV_USE_SIGNALFD
1570 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1701 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1571#endif 1702#endif
1572 1703
1573 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1574 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1575 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1576#if EV_USE_PORT 1710#if EV_USE_PORT
1577 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1578#endif 1712#endif
1579#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1580 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1589 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1723 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1590#endif 1724#endif
1591 1725
1592 ev_prepare_init (&pending_w, pendingcb); 1726 ev_prepare_init (&pending_w, pendingcb);
1593 1727
1728#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1594 ev_init (&pipe_w, pipecb); 1729 ev_init (&pipe_w, pipecb);
1595 ev_set_priority (&pipe_w, EV_MAXPRI); 1730 ev_set_priority (&pipe_w, EV_MAXPRI);
1731#endif
1596 } 1732 }
1597} 1733}
1598 1734
1599/* free up a loop structure */ 1735/* free up a loop structure */
1600static void noinline 1736static void noinline
… …
1612 close (evfd); 1748 close (evfd);
1613#endif 1749#endif
1614 1750
1615 if (evpipe [0] >= 0) 1751 if (evpipe [0] >= 0)
1616 { 1752 {
1617 close (evpipe [0]); 1753 EV_WIN32_CLOSE_FD (evpipe [0]);
1618 close (evpipe [1]); 1754 EV_WIN32_CLOSE_FD (evpipe [1]);
1619 } 1755 }
1620 } 1756 }
1621 1757
1622#if EV_USE_SIGNALFD 1758#if EV_USE_SIGNALFD
1623 if (ev_is_active (&sigfd_w)) 1759 if (ev_is_active (&sigfd_w))
1624 {
1625 /*ev_ref (EV_A);*/
1626 /*ev_io_stop (EV_A_ &sigfd_w);*/
1627
1628 close (sigfd); 1760 close (sigfd);
1629 }
1630#endif 1761#endif
1631 1762
1632#if EV_USE_INOTIFY 1763#if EV_USE_INOTIFY
1633 if (fs_fd >= 0) 1764 if (fs_fd >= 0)
1634 close (fs_fd); 1765 close (fs_fd);
1635#endif 1766#endif
1636 1767
1637 if (backend_fd >= 0) 1768 if (backend_fd >= 0)
1638 close (backend_fd); 1769 close (backend_fd);
1639 1770
1771#if EV_USE_IOCP
1772 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1773#endif
1640#if EV_USE_PORT 1774#if EV_USE_PORT
1641 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1775 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1642#endif 1776#endif
1643#if EV_USE_KQUEUE 1777#if EV_USE_KQUEUE
1644 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1778 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1704 1838
1705 if (ev_is_active (&pipe_w)) 1839 if (ev_is_active (&pipe_w))
1706 { 1840 {
1707 /* this "locks" the handlers against writing to the pipe */ 1841 /* this "locks" the handlers against writing to the pipe */
1708 /* while we modify the fd vars */ 1842 /* while we modify the fd vars */
1709 gotsig = 1; 1843 sig_pending = 1;
1710#if EV_ASYNC_ENABLE 1844#if EV_ASYNC_ENABLE
1711 gotasync = 1; 1845 async_pending = 1;
1712#endif 1846#endif
1713 1847
1714 ev_ref (EV_A); 1848 ev_ref (EV_A);
1715 ev_io_stop (EV_A_ &pipe_w); 1849 ev_io_stop (EV_A_ &pipe_w);
1716 1850
… …
1719 close (evfd); 1853 close (evfd);
1720#endif 1854#endif
1721 1855
1722 if (evpipe [0] >= 0) 1856 if (evpipe [0] >= 0)
1723 { 1857 {
1724 close (evpipe [0]); 1858 EV_WIN32_CLOSE_FD (evpipe [0]);
1725 close (evpipe [1]); 1859 EV_WIN32_CLOSE_FD (evpipe [1]);
1726 } 1860 }
1727 1861
1862#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1728 evpipe_init (EV_A); 1863 evpipe_init (EV_A);
1729 /* now iterate over everything, in case we missed something */ 1864 /* now iterate over everything, in case we missed something */
1730 pipecb (EV_A_ &pipe_w, EV_READ); 1865 pipecb (EV_A_ &pipe_w, EV_READ);
1866#endif
1731 } 1867 }
1732 1868
1733 postfork = 0; 1869 postfork = 0;
1734} 1870}
1735 1871
… …
1797 verify_watcher (EV_A_ ws [cnt]); 1933 verify_watcher (EV_A_ ws [cnt]);
1798 } 1934 }
1799} 1935}
1800#endif 1936#endif
1801 1937
1802#if EV_MINIMAL < 2 1938#if EV_FEATURE_API
1803void 1939void
1804ev_loop_verify (EV_P) 1940ev_verify (EV_P)
1805{ 1941{
1806#if EV_VERIFY 1942#if EV_VERIFY
1807 int i; 1943 int i;
1808 WL w; 1944 WL w;
1809 1945
… …
1848#if EV_ASYNC_ENABLE 1984#if EV_ASYNC_ENABLE
1849 assert (asyncmax >= asynccnt); 1985 assert (asyncmax >= asynccnt);
1850 array_verify (EV_A_ (W *)asyncs, asynccnt); 1986 array_verify (EV_A_ (W *)asyncs, asynccnt);
1851#endif 1987#endif
1852 1988
1989#if EV_PREPARE_ENABLE
1853 assert (preparemax >= preparecnt); 1990 assert (preparemax >= preparecnt);
1854 array_verify (EV_A_ (W *)prepares, preparecnt); 1991 array_verify (EV_A_ (W *)prepares, preparecnt);
1992#endif
1855 1993
1994#if EV_CHECK_ENABLE
1856 assert (checkmax >= checkcnt); 1995 assert (checkmax >= checkcnt);
1857 array_verify (EV_A_ (W *)checks, checkcnt); 1996 array_verify (EV_A_ (W *)checks, checkcnt);
1997#endif
1858 1998
1859# if 0 1999# if 0
2000#if EV_CHILD_ENABLE
1860 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2001 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) 2002 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2003#endif
1862# endif 2004# endif
1863#endif 2005#endif
1864} 2006}
1865#endif 2007#endif
1866 2008
1867#if EV_MULTIPLICITY 2009#if EV_MULTIPLICITY
1868struct ev_loop * 2010struct ev_loop *
1869ev_default_loop_init (unsigned int flags)
1870#else 2011#else
1871int 2012int
2013#endif
1872ev_default_loop (unsigned int flags) 2014ev_default_loop (unsigned int flags)
1873#endif
1874{ 2015{
1875 if (!ev_default_loop_ptr) 2016 if (!ev_default_loop_ptr)
1876 { 2017 {
1877#if EV_MULTIPLICITY 2018#if EV_MULTIPLICITY
1878 EV_P = ev_default_loop_ptr = &default_loop_struct; 2019 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1882 2023
1883 loop_init (EV_A_ flags); 2024 loop_init (EV_A_ flags);
1884 2025
1885 if (ev_backend (EV_A)) 2026 if (ev_backend (EV_A))
1886 { 2027 {
1887#ifndef _WIN32 2028#if EV_CHILD_ENABLE
1888 ev_signal_init (&childev, childcb, SIGCHLD); 2029 ev_signal_init (&childev, childcb, SIGCHLD);
1889 ev_set_priority (&childev, EV_MAXPRI); 2030 ev_set_priority (&childev, EV_MAXPRI);
1890 ev_signal_start (EV_A_ &childev); 2031 ev_signal_start (EV_A_ &childev);
1891 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2032 ev_unref (EV_A); /* child watcher should not keep loop alive */
1892#endif 2033#endif
… …
1905 EV_P = ev_default_loop_ptr; 2046 EV_P = ev_default_loop_ptr;
1906#endif 2047#endif
1907 2048
1908 ev_default_loop_ptr = 0; 2049 ev_default_loop_ptr = 0;
1909 2050
1910#ifndef _WIN32 2051#if EV_CHILD_ENABLE
1911 ev_ref (EV_A); /* child watcher */ 2052 ev_ref (EV_A); /* child watcher */
1912 ev_signal_stop (EV_A_ &childev); 2053 ev_signal_stop (EV_A_ &childev);
1913#endif 2054#endif
1914 2055
1915 loop_destroy (EV_A); 2056 loop_destroy (EV_A);
… …
2021 EV_FREQUENT_CHECK; 2162 EV_FREQUENT_CHECK;
2022 feed_reverse (EV_A_ (W)w); 2163 feed_reverse (EV_A_ (W)w);
2023 } 2164 }
2024 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2165 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2025 2166
2026 feed_reverse_done (EV_A_ EV_TIMEOUT); 2167 feed_reverse_done (EV_A_ EV_TIMER);
2027 } 2168 }
2028} 2169}
2029 2170
2030#if EV_PERIODIC_ENABLE 2171#if EV_PERIODIC_ENABLE
2031/* make periodics pending */ 2172/* make periodics pending */
… …
2084 feed_reverse_done (EV_A_ EV_PERIODIC); 2225 feed_reverse_done (EV_A_ EV_PERIODIC);
2085 } 2226 }
2086} 2227}
2087 2228
2088/* simply recalculate all periodics */ 2229/* simply recalculate all periodics */
2089/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2230/* TODO: maybe ensure that at least one event happens when jumping forward? */
2090static void noinline 2231static void noinline
2091periodics_reschedule (EV_P) 2232periodics_reschedule (EV_P)
2092{ 2233{
2093 int i; 2234 int i;
2094 2235
… …
2122 ANHE_at_cache (*he); 2263 ANHE_at_cache (*he);
2123 } 2264 }
2124} 2265}
2125 2266
2126/* fetch new monotonic and realtime times from the kernel */ 2267/* fetch new monotonic and realtime times from the kernel */
2127/* also detetc if there was a timejump, and act accordingly */ 2268/* also detect if there was a timejump, and act accordingly */
2128inline_speed void 2269inline_speed void
2129time_update (EV_P_ ev_tstamp max_block) 2270time_update (EV_P_ ev_tstamp max_block)
2130{ 2271{
2131#if EV_USE_MONOTONIC 2272#if EV_USE_MONOTONIC
2132 if (expect_true (have_monotonic)) 2273 if (expect_true (have_monotonic))
… …
2190 mn_now = ev_rt_now; 2331 mn_now = ev_rt_now;
2191 } 2332 }
2192} 2333}
2193 2334
2194void 2335void
2195ev_loop (EV_P_ int flags) 2336ev_run (EV_P_ int flags)
2196{ 2337{
2197#if EV_MINIMAL < 2 2338#if EV_FEATURE_API
2198 ++loop_depth; 2339 ++loop_depth;
2199#endif 2340#endif
2200 2341
2201 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2342 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2202 2343
2203 loop_done = EVUNLOOP_CANCEL; 2344 loop_done = EVBREAK_CANCEL;
2204 2345
2205 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2346 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2206 2347
2207 do 2348 do
2208 { 2349 {
2209#if EV_VERIFY >= 2 2350#if EV_VERIFY >= 2
2210 ev_loop_verify (EV_A); 2351 ev_verify (EV_A);
2211#endif 2352#endif
2212 2353
2213#ifndef _WIN32 2354#ifndef _WIN32
2214 if (expect_false (curpid)) /* penalise the forking check even more */ 2355 if (expect_false (curpid)) /* penalise the forking check even more */
2215 if (expect_false (getpid () != curpid)) 2356 if (expect_false (getpid () != curpid))
… …
2227 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2368 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2228 EV_INVOKE_PENDING; 2369 EV_INVOKE_PENDING;
2229 } 2370 }
2230#endif 2371#endif
2231 2372
2373#if EV_PREPARE_ENABLE
2232 /* queue prepare watchers (and execute them) */ 2374 /* queue prepare watchers (and execute them) */
2233 if (expect_false (preparecnt)) 2375 if (expect_false (preparecnt))
2234 { 2376 {
2235 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2377 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2236 EV_INVOKE_PENDING; 2378 EV_INVOKE_PENDING;
2237 } 2379 }
2380#endif
2238 2381
2239 if (expect_false (loop_done)) 2382 if (expect_false (loop_done))
2240 break; 2383 break;
2241 2384
2242 /* we might have forked, so reify kernel state if necessary */ 2385 /* we might have forked, so reify kernel state if necessary */
… …
2249 /* calculate blocking time */ 2392 /* calculate blocking time */
2250 { 2393 {
2251 ev_tstamp waittime = 0.; 2394 ev_tstamp waittime = 0.;
2252 ev_tstamp sleeptime = 0.; 2395 ev_tstamp sleeptime = 0.;
2253 2396
2397 /* remember old timestamp for io_blocktime calculation */
2398 ev_tstamp prev_mn_now = mn_now;
2399
2400 /* update time to cancel out callback processing overhead */
2401 time_update (EV_A_ 1e100);
2402
2254 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2403 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2255 { 2404 {
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; 2405 waittime = MAX_BLOCKTIME;
2263 2406
2264 if (timercnt) 2407 if (timercnt)
2265 { 2408 {
2266 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2409 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2293 waittime -= sleeptime; 2436 waittime -= sleeptime;
2294 } 2437 }
2295 } 2438 }
2296 } 2439 }
2297 2440
2298#if EV_MINIMAL < 2 2441#if EV_FEATURE_API
2299 ++loop_count; 2442 ++loop_count;
2300#endif 2443#endif
2301 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2444 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2302 backend_poll (EV_A_ waittime); 2445 backend_poll (EV_A_ waittime);
2303 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2446 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2304 2447
2305 /* update ev_rt_now, do magic */ 2448 /* update ev_rt_now, do magic */
2306 time_update (EV_A_ waittime + sleeptime); 2449 time_update (EV_A_ waittime + sleeptime);
2307 } 2450 }
2308 2451
… …
2315#if EV_IDLE_ENABLE 2458#if EV_IDLE_ENABLE
2316 /* queue idle watchers unless other events are pending */ 2459 /* queue idle watchers unless other events are pending */
2317 idle_reify (EV_A); 2460 idle_reify (EV_A);
2318#endif 2461#endif
2319 2462
2463#if EV_CHECK_ENABLE
2320 /* queue check watchers, to be executed first */ 2464 /* queue check watchers, to be executed first */
2321 if (expect_false (checkcnt)) 2465 if (expect_false (checkcnt))
2322 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2466 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2467#endif
2323 2468
2324 EV_INVOKE_PENDING; 2469 EV_INVOKE_PENDING;
2325 } 2470 }
2326 while (expect_true ( 2471 while (expect_true (
2327 activecnt 2472 activecnt
2328 && !loop_done 2473 && !loop_done
2329 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2474 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2330 )); 2475 ));
2331 2476
2332 if (loop_done == EVUNLOOP_ONE) 2477 if (loop_done == EVBREAK_ONE)
2333 loop_done = EVUNLOOP_CANCEL; 2478 loop_done = EVBREAK_CANCEL;
2334 2479
2335#if EV_MINIMAL < 2 2480#if EV_FEATURE_API
2336 --loop_depth; 2481 --loop_depth;
2337#endif 2482#endif
2338} 2483}
2339 2484
2340void 2485void
2341ev_unloop (EV_P_ int how) 2486ev_break (EV_P_ int how)
2342{ 2487{
2343 loop_done = how; 2488 loop_done = how;
2344} 2489}
2345 2490
2346void 2491void
… …
2393inline_size void 2538inline_size void
2394wlist_del (WL *head, WL elem) 2539wlist_del (WL *head, WL elem)
2395{ 2540{
2396 while (*head) 2541 while (*head)
2397 { 2542 {
2398 if (*head == elem) 2543 if (expect_true (*head == elem))
2399 { 2544 {
2400 *head = elem->next; 2545 *head = elem->next;
2401 return; 2546 break;
2402 } 2547 }
2403 2548
2404 head = &(*head)->next; 2549 head = &(*head)->next;
2405 } 2550 }
2406} 2551}
… …
2466 2611
2467 if (expect_false (ev_is_active (w))) 2612 if (expect_false (ev_is_active (w)))
2468 return; 2613 return;
2469 2614
2470 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2615 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)))); 2616 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2472 2617
2473 EV_FREQUENT_CHECK; 2618 EV_FREQUENT_CHECK;
2474 2619
2475 ev_start (EV_A_ (W)w, 1); 2620 ev_start (EV_A_ (W)w, 1);
2476 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2621 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2494 EV_FREQUENT_CHECK; 2639 EV_FREQUENT_CHECK;
2495 2640
2496 wlist_del (&anfds[w->fd].head, (WL)w); 2641 wlist_del (&anfds[w->fd].head, (WL)w);
2497 ev_stop (EV_A_ (W)w); 2642 ev_stop (EV_A_ (W)w);
2498 2643
2499 fd_change (EV_A_ w->fd, 1); 2644 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2500 2645
2501 EV_FREQUENT_CHECK; 2646 EV_FREQUENT_CHECK;
2502} 2647}
2503 2648
2504void noinline 2649void noinline
… …
2546 timers [active] = timers [timercnt + HEAP0]; 2691 timers [active] = timers [timercnt + HEAP0];
2547 adjustheap (timers, timercnt, active); 2692 adjustheap (timers, timercnt, active);
2548 } 2693 }
2549 } 2694 }
2550 2695
2551 EV_FREQUENT_CHECK;
2552
2553 ev_at (w) -= mn_now; 2696 ev_at (w) -= mn_now;
2554 2697
2555 ev_stop (EV_A_ (W)w); 2698 ev_stop (EV_A_ (W)w);
2699
2700 EV_FREQUENT_CHECK;
2556} 2701}
2557 2702
2558void noinline 2703void noinline
2559ev_timer_again (EV_P_ ev_timer *w) 2704ev_timer_again (EV_P_ ev_timer *w)
2560{ 2705{
… …
2639 periodics [active] = periodics [periodiccnt + HEAP0]; 2784 periodics [active] = periodics [periodiccnt + HEAP0];
2640 adjustheap (periodics, periodiccnt, active); 2785 adjustheap (periodics, periodiccnt, active);
2641 } 2786 }
2642 } 2787 }
2643 2788
2644 EV_FREQUENT_CHECK;
2645
2646 ev_stop (EV_A_ (W)w); 2789 ev_stop (EV_A_ (W)w);
2790
2791 EV_FREQUENT_CHECK;
2647} 2792}
2648 2793
2649void noinline 2794void noinline
2650ev_periodic_again (EV_P_ ev_periodic *w) 2795ev_periodic_again (EV_P_ ev_periodic *w)
2651{ 2796{
… …
2657 2802
2658#ifndef SA_RESTART 2803#ifndef SA_RESTART
2659# define SA_RESTART 0 2804# define SA_RESTART 0
2660#endif 2805#endif
2661 2806
2807#if EV_SIGNAL_ENABLE
2808
2662void noinline 2809void noinline
2663ev_signal_start (EV_P_ ev_signal *w) 2810ev_signal_start (EV_P_ ev_signal *w)
2664{ 2811{
2665 if (expect_false (ev_is_active (w))) 2812 if (expect_false (ev_is_active (w)))
2666 return; 2813 return;
2667 2814
2668 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG)); 2815 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2669 2816
2670#if EV_MULTIPLICITY 2817#if EV_MULTIPLICITY
2671 assert (("libev: tried to attach to a signal from two different loops", 2818 assert (("libev: a signal must not be attached to two different loops",
2672 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 2819 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2673 2820
2674 signals [w->signum - 1].loop = EV_A; 2821 signals [w->signum - 1].loop = EV_A;
2675#endif 2822#endif
2676 2823
… …
2712 if (!((WL)w)->next) 2859 if (!((WL)w)->next)
2713# if EV_USE_SIGNALFD 2860# if EV_USE_SIGNALFD
2714 if (sigfd < 0) /*TODO*/ 2861 if (sigfd < 0) /*TODO*/
2715# endif 2862# endif
2716 { 2863 {
2717# if _WIN32 2864# ifdef _WIN32
2865 evpipe_init (EV_A);
2866
2718 signal (w->signum, ev_sighandler); 2867 signal (w->signum, ev_sighandler);
2719# else 2868# else
2720 struct sigaction sa; 2869 struct sigaction sa;
2721 2870
2722 evpipe_init (EV_A); 2871 evpipe_init (EV_A);
… …
2747 wlist_del (&signals [w->signum - 1].head, (WL)w); 2896 wlist_del (&signals [w->signum - 1].head, (WL)w);
2748 ev_stop (EV_A_ (W)w); 2897 ev_stop (EV_A_ (W)w);
2749 2898
2750 if (!signals [w->signum - 1].head) 2899 if (!signals [w->signum - 1].head)
2751 { 2900 {
2752 #if EV_MULTIPLICITY 2901#if EV_MULTIPLICITY
2753 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2902 signals [w->signum - 1].loop = 0; /* unattach from signal */
2754 #endif 2903#endif
2755 #if EV_USE_SIGNALFD 2904#if EV_USE_SIGNALFD
2756 if (sigfd >= 0) 2905 if (sigfd >= 0)
2757 { 2906 {
2758 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2907 sigset_t ss;
2908
2909 sigemptyset (&ss);
2910 sigaddset (&ss, w->signum);
2759 sigdelset (&sigfd_set, w->signum); 2911 sigdelset (&sigfd_set, w->signum);
2912
2760 signalfd (sigfd, &sigfd_set, 0); 2913 signalfd (sigfd, &sigfd_set, 0);
2761 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2914 sigprocmask (SIG_UNBLOCK, &ss, 0);
2762 /*TODO: maybe unblock signal? */
2763 } 2915 }
2764 else 2916 else
2765 #endif 2917#endif
2766 signal (w->signum, SIG_DFL); 2918 signal (w->signum, SIG_DFL);
2767 } 2919 }
2768 2920
2769 EV_FREQUENT_CHECK; 2921 EV_FREQUENT_CHECK;
2770} 2922}
2923
2924#endif
2925
2926#if EV_CHILD_ENABLE
2771 2927
2772void 2928void
2773ev_child_start (EV_P_ ev_child *w) 2929ev_child_start (EV_P_ ev_child *w)
2774{ 2930{
2775#if EV_MULTIPLICITY 2931#if EV_MULTIPLICITY
… …
2779 return; 2935 return;
2780 2936
2781 EV_FREQUENT_CHECK; 2937 EV_FREQUENT_CHECK;
2782 2938
2783 ev_start (EV_A_ (W)w, 1); 2939 ev_start (EV_A_ (W)w, 1);
2784 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2940 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2785 2941
2786 EV_FREQUENT_CHECK; 2942 EV_FREQUENT_CHECK;
2787} 2943}
2788 2944
2789void 2945void
… …
2793 if (expect_false (!ev_is_active (w))) 2949 if (expect_false (!ev_is_active (w)))
2794 return; 2950 return;
2795 2951
2796 EV_FREQUENT_CHECK; 2952 EV_FREQUENT_CHECK;
2797 2953
2798 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2954 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2799 ev_stop (EV_A_ (W)w); 2955 ev_stop (EV_A_ (W)w);
2800 2956
2801 EV_FREQUENT_CHECK; 2957 EV_FREQUENT_CHECK;
2802} 2958}
2959
2960#endif
2803 2961
2804#if EV_STAT_ENABLE 2962#if EV_STAT_ENABLE
2805 2963
2806# ifdef _WIN32 2964# ifdef _WIN32
2807# undef lstat 2965# undef lstat
… …
2813#define MIN_STAT_INTERVAL 0.1074891 2971#define MIN_STAT_INTERVAL 0.1074891
2814 2972
2815static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2973static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2816 2974
2817#if EV_USE_INOTIFY 2975#if EV_USE_INOTIFY
2818# define EV_INOTIFY_BUFSIZE 8192 2976
2977/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2978# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2819 2979
2820static void noinline 2980static void noinline
2821infy_add (EV_P_ ev_stat *w) 2981infy_add (EV_P_ ev_stat *w)
2822{ 2982{
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); 2983 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 2984
2825 if (w->wd < 0) 2985 if (w->wd >= 0)
2986 {
2987 struct statfs sfs;
2988
2989 /* now local changes will be tracked by inotify, but remote changes won't */
2990 /* unless the filesystem is known to be local, we therefore still poll */
2991 /* also do poll on <2.6.25, but with normal frequency */
2992
2993 if (!fs_2625)
2994 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2995 else if (!statfs (w->path, &sfs)
2996 && (sfs.f_type == 0x1373 /* devfs */
2997 || sfs.f_type == 0xEF53 /* ext2/3 */
2998 || sfs.f_type == 0x3153464a /* jfs */
2999 || sfs.f_type == 0x52654973 /* reiser3 */
3000 || sfs.f_type == 0x01021994 /* tempfs */
3001 || sfs.f_type == 0x58465342 /* xfs */))
3002 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3003 else
3004 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2826 { 3005 }
3006 else
3007 {
3008 /* can't use inotify, continue to stat */
2827 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3009 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 3010
2830 /* monitor some parent directory for speedup hints */ 3011 /* 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, */ 3012 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2832 /* but an efficiency issue only */ 3013 /* but an efficiency issue only */
2833 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3014 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2834 { 3015 {
2835 char path [4096]; 3016 char path [4096];
… …
2851 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3032 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2852 } 3033 }
2853 } 3034 }
2854 3035
2855 if (w->wd >= 0) 3036 if (w->wd >= 0)
2856 {
2857 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3037 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2858 3038
2859 /* now local changes will be tracked by inotify, but remote changes won't */ 3039 /* now re-arm timer, if required */
2860 /* unless the filesystem it known to be local, we therefore still poll */ 3040 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); 3041 ev_timer_again (EV_A_ &w->timer);
2875 } 3042 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2876} 3043}
2877 3044
2878static void noinline 3045static void noinline
2879infy_del (EV_P_ ev_stat *w) 3046infy_del (EV_P_ ev_stat *w)
2880{ 3047{
… …
2883 3050
2884 if (wd < 0) 3051 if (wd < 0)
2885 return; 3052 return;
2886 3053
2887 w->wd = -2; 3054 w->wd = -2;
2888 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3055 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2889 wlist_del (&fs_hash [slot].head, (WL)w); 3056 wlist_del (&fs_hash [slot].head, (WL)w);
2890 3057
2891 /* remove this watcher, if others are watching it, they will rearm */ 3058 /* remove this watcher, if others are watching it, they will rearm */
2892 inotify_rm_watch (fs_fd, wd); 3059 inotify_rm_watch (fs_fd, wd);
2893} 3060}
… …
2895static void noinline 3062static void noinline
2896infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3063infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2897{ 3064{
2898 if (slot < 0) 3065 if (slot < 0)
2899 /* overflow, need to check for all hash slots */ 3066 /* overflow, need to check for all hash slots */
2900 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3067 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2901 infy_wd (EV_A_ slot, wd, ev); 3068 infy_wd (EV_A_ slot, wd, ev);
2902 else 3069 else
2903 { 3070 {
2904 WL w_; 3071 WL w_;
2905 3072
2906 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3073 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2907 { 3074 {
2908 ev_stat *w = (ev_stat *)w_; 3075 ev_stat *w = (ev_stat *)w_;
2909 w_ = w_->next; /* lets us remove this watcher and all before it */ 3076 w_ = w_->next; /* lets us remove this watcher and all before it */
2910 3077
2911 if (w->wd == wd || wd == -1) 3078 if (w->wd == wd || wd == -1)
2912 { 3079 {
2913 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3080 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2914 { 3081 {
2915 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3082 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2916 w->wd = -1; 3083 w->wd = -1;
2917 infy_add (EV_A_ w); /* re-add, no matter what */ 3084 infy_add (EV_A_ w); /* re-add, no matter what */
2918 } 3085 }
2919 3086
2920 stat_timer_cb (EV_A_ &w->timer, 0); 3087 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2925 3092
2926static void 3093static void
2927infy_cb (EV_P_ ev_io *w, int revents) 3094infy_cb (EV_P_ ev_io *w, int revents)
2928{ 3095{
2929 char buf [EV_INOTIFY_BUFSIZE]; 3096 char buf [EV_INOTIFY_BUFSIZE];
2930 struct inotify_event *ev = (struct inotify_event *)buf;
2931 int ofs; 3097 int ofs;
2932 int len = read (fs_fd, buf, sizeof (buf)); 3098 int len = read (fs_fd, buf, sizeof (buf));
2933 3099
2934 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3100 for (ofs = 0; ofs < len; )
3101 {
3102 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2935 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3103 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3104 ofs += sizeof (struct inotify_event) + ev->len;
3105 }
2936} 3106}
2937 3107
2938inline_size void 3108inline_size void
2939check_2625 (EV_P) 3109ev_check_2625 (EV_P)
2940{ 3110{
2941 /* kernels < 2.6.25 are borked 3111 /* kernels < 2.6.25 are borked
2942 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3112 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2943 */ 3113 */
2944 struct utsname buf; 3114 if (ev_linux_version () < 0x020619)
2945 int major, minor, micro;
2946
2947 if (uname (&buf))
2948 return; 3115 return;
2949 3116
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; 3117 fs_2625 = 1;
3118}
3119
3120inline_size int
3121infy_newfd (void)
3122{
3123#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3124 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3125 if (fd >= 0)
3126 return fd;
3127#endif
3128 return inotify_init ();
2959} 3129}
2960 3130
2961inline_size void 3131inline_size void
2962infy_init (EV_P) 3132infy_init (EV_P)
2963{ 3133{
2964 if (fs_fd != -2) 3134 if (fs_fd != -2)
2965 return; 3135 return;
2966 3136
2967 fs_fd = -1; 3137 fs_fd = -1;
2968 3138
2969 check_2625 (EV_A); 3139 ev_check_2625 (EV_A);
2970 3140
2971 fs_fd = inotify_init (); 3141 fs_fd = infy_newfd ();
2972 3142
2973 if (fs_fd >= 0) 3143 if (fs_fd >= 0)
2974 { 3144 {
3145 fd_intern (fs_fd);
2975 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3146 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2976 ev_set_priority (&fs_w, EV_MAXPRI); 3147 ev_set_priority (&fs_w, EV_MAXPRI);
2977 ev_io_start (EV_A_ &fs_w); 3148 ev_io_start (EV_A_ &fs_w);
3149 ev_unref (EV_A);
2978 } 3150 }
2979} 3151}
2980 3152
2981inline_size void 3153inline_size void
2982infy_fork (EV_P) 3154infy_fork (EV_P)
… …
2984 int slot; 3156 int slot;
2985 3157
2986 if (fs_fd < 0) 3158 if (fs_fd < 0)
2987 return; 3159 return;
2988 3160
3161 ev_ref (EV_A);
3162 ev_io_stop (EV_A_ &fs_w);
2989 close (fs_fd); 3163 close (fs_fd);
2990 fs_fd = inotify_init (); 3164 fs_fd = infy_newfd ();
2991 3165
3166 if (fs_fd >= 0)
3167 {
3168 fd_intern (fs_fd);
3169 ev_io_set (&fs_w, fs_fd, EV_READ);
3170 ev_io_start (EV_A_ &fs_w);
3171 ev_unref (EV_A);
3172 }
3173
2992 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3174 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2993 { 3175 {
2994 WL w_ = fs_hash [slot].head; 3176 WL w_ = fs_hash [slot].head;
2995 fs_hash [slot].head = 0; 3177 fs_hash [slot].head = 0;
2996 3178
2997 while (w_) 3179 while (w_)
… …
3002 w->wd = -1; 3184 w->wd = -1;
3003 3185
3004 if (fs_fd >= 0) 3186 if (fs_fd >= 0)
3005 infy_add (EV_A_ w); /* re-add, no matter what */ 3187 infy_add (EV_A_ w); /* re-add, no matter what */
3006 else 3188 else
3189 {
3190 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3191 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3007 ev_timer_again (EV_A_ &w->timer); 3192 ev_timer_again (EV_A_ &w->timer);
3193 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3194 }
3008 } 3195 }
3009 } 3196 }
3010} 3197}
3011 3198
3012#endif 3199#endif
… …
3029static void noinline 3216static void noinline
3030stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3217stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3031{ 3218{
3032 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3219 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3033 3220
3034 /* we copy this here each the time so that */ 3221 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); 3222 ev_stat_stat (EV_A_ w);
3038 3223
3039 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3224 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3040 if ( 3225 if (
3041 w->prev.st_dev != w->attr.st_dev 3226 prev.st_dev != w->attr.st_dev
3042 || w->prev.st_ino != w->attr.st_ino 3227 || prev.st_ino != w->attr.st_ino
3043 || w->prev.st_mode != w->attr.st_mode 3228 || prev.st_mode != w->attr.st_mode
3044 || w->prev.st_nlink != w->attr.st_nlink 3229 || prev.st_nlink != w->attr.st_nlink
3045 || w->prev.st_uid != w->attr.st_uid 3230 || prev.st_uid != w->attr.st_uid
3046 || w->prev.st_gid != w->attr.st_gid 3231 || prev.st_gid != w->attr.st_gid
3047 || w->prev.st_rdev != w->attr.st_rdev 3232 || prev.st_rdev != w->attr.st_rdev
3048 || w->prev.st_size != w->attr.st_size 3233 || prev.st_size != w->attr.st_size
3049 || w->prev.st_atime != w->attr.st_atime 3234 || prev.st_atime != w->attr.st_atime
3050 || w->prev.st_mtime != w->attr.st_mtime 3235 || prev.st_mtime != w->attr.st_mtime
3051 || w->prev.st_ctime != w->attr.st_ctime 3236 || prev.st_ctime != w->attr.st_ctime
3052 ) { 3237 ) {
3238 /* we only update w->prev on actual differences */
3239 /* in case we test more often than invoke the callback, */
3240 /* to ensure that prev is always different to attr */
3241 w->prev = prev;
3242
3053 #if EV_USE_INOTIFY 3243 #if EV_USE_INOTIFY
3054 if (fs_fd >= 0) 3244 if (fs_fd >= 0)
3055 { 3245 {
3056 infy_del (EV_A_ w); 3246 infy_del (EV_A_ w);
3057 infy_add (EV_A_ w); 3247 infy_add (EV_A_ w);
… …
3082 3272
3083 if (fs_fd >= 0) 3273 if (fs_fd >= 0)
3084 infy_add (EV_A_ w); 3274 infy_add (EV_A_ w);
3085 else 3275 else
3086#endif 3276#endif
3277 {
3087 ev_timer_again (EV_A_ &w->timer); 3278 ev_timer_again (EV_A_ &w->timer);
3279 ev_unref (EV_A);
3280 }
3088 3281
3089 ev_start (EV_A_ (W)w, 1); 3282 ev_start (EV_A_ (W)w, 1);
3090 3283
3091 EV_FREQUENT_CHECK; 3284 EV_FREQUENT_CHECK;
3092} 3285}
… …
3101 EV_FREQUENT_CHECK; 3294 EV_FREQUENT_CHECK;
3102 3295
3103#if EV_USE_INOTIFY 3296#if EV_USE_INOTIFY
3104 infy_del (EV_A_ w); 3297 infy_del (EV_A_ w);
3105#endif 3298#endif
3299
3300 if (ev_is_active (&w->timer))
3301 {
3302 ev_ref (EV_A);
3106 ev_timer_stop (EV_A_ &w->timer); 3303 ev_timer_stop (EV_A_ &w->timer);
3304 }
3107 3305
3108 ev_stop (EV_A_ (W)w); 3306 ev_stop (EV_A_ (W)w);
3109 3307
3110 EV_FREQUENT_CHECK; 3308 EV_FREQUENT_CHECK;
3111} 3309}
… …
3156 3354
3157 EV_FREQUENT_CHECK; 3355 EV_FREQUENT_CHECK;
3158} 3356}
3159#endif 3357#endif
3160 3358
3359#if EV_PREPARE_ENABLE
3161void 3360void
3162ev_prepare_start (EV_P_ ev_prepare *w) 3361ev_prepare_start (EV_P_ ev_prepare *w)
3163{ 3362{
3164 if (expect_false (ev_is_active (w))) 3363 if (expect_false (ev_is_active (w)))
3165 return; 3364 return;
… …
3191 3390
3192 ev_stop (EV_A_ (W)w); 3391 ev_stop (EV_A_ (W)w);
3193 3392
3194 EV_FREQUENT_CHECK; 3393 EV_FREQUENT_CHECK;
3195} 3394}
3395#endif
3196 3396
3397#if EV_CHECK_ENABLE
3197void 3398void
3198ev_check_start (EV_P_ ev_check *w) 3399ev_check_start (EV_P_ ev_check *w)
3199{ 3400{
3200 if (expect_false (ev_is_active (w))) 3401 if (expect_false (ev_is_active (w)))
3201 return; 3402 return;
… …
3227 3428
3228 ev_stop (EV_A_ (W)w); 3429 ev_stop (EV_A_ (W)w);
3229 3430
3230 EV_FREQUENT_CHECK; 3431 EV_FREQUENT_CHECK;
3231} 3432}
3433#endif
3232 3434
3233#if EV_EMBED_ENABLE 3435#if EV_EMBED_ENABLE
3234void noinline 3436void noinline
3235ev_embed_sweep (EV_P_ ev_embed *w) 3437ev_embed_sweep (EV_P_ ev_embed *w)
3236{ 3438{
3237 ev_loop (w->other, EVLOOP_NONBLOCK); 3439 ev_run (w->other, EVRUN_NOWAIT);
3238} 3440}
3239 3441
3240static void 3442static void
3241embed_io_cb (EV_P_ ev_io *io, int revents) 3443embed_io_cb (EV_P_ ev_io *io, int revents)
3242{ 3444{
3243 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3445 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3244 3446
3245 if (ev_cb (w)) 3447 if (ev_cb (w))
3246 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3448 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3247 else 3449 else
3248 ev_loop (w->other, EVLOOP_NONBLOCK); 3450 ev_run (w->other, EVRUN_NOWAIT);
3249} 3451}
3250 3452
3251static void 3453static void
3252embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3454embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3253{ 3455{
… …
3257 EV_P = w->other; 3459 EV_P = w->other;
3258 3460
3259 while (fdchangecnt) 3461 while (fdchangecnt)
3260 { 3462 {
3261 fd_reify (EV_A); 3463 fd_reify (EV_A);
3262 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3464 ev_run (EV_A_ EVRUN_NOWAIT);
3263 } 3465 }
3264 } 3466 }
3265} 3467}
3266 3468
3267static void 3469static void
… …
3273 3475
3274 { 3476 {
3275 EV_P = w->other; 3477 EV_P = w->other;
3276 3478
3277 ev_loop_fork (EV_A); 3479 ev_loop_fork (EV_A);
3278 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3480 ev_run (EV_A_ EVRUN_NOWAIT);
3279 } 3481 }
3280 3482
3281 ev_embed_start (EV_A_ w); 3483 ev_embed_start (EV_A_ w);
3282} 3484}
3283 3485
… …
3331 3533
3332 ev_io_stop (EV_A_ &w->io); 3534 ev_io_stop (EV_A_ &w->io);
3333 ev_prepare_stop (EV_A_ &w->prepare); 3535 ev_prepare_stop (EV_A_ &w->prepare);
3334 ev_fork_stop (EV_A_ &w->fork); 3536 ev_fork_stop (EV_A_ &w->fork);
3335 3537
3538 ev_stop (EV_A_ (W)w);
3539
3336 EV_FREQUENT_CHECK; 3540 EV_FREQUENT_CHECK;
3337} 3541}
3338#endif 3542#endif
3339 3543
3340#if EV_FORK_ENABLE 3544#if EV_FORK_ENABLE
… …
3380ev_async_start (EV_P_ ev_async *w) 3584ev_async_start (EV_P_ ev_async *w)
3381{ 3585{
3382 if (expect_false (ev_is_active (w))) 3586 if (expect_false (ev_is_active (w)))
3383 return; 3587 return;
3384 3588
3589 w->sent = 0;
3590
3385 evpipe_init (EV_A); 3591 evpipe_init (EV_A);
3386 3592
3387 EV_FREQUENT_CHECK; 3593 EV_FREQUENT_CHECK;
3388 3594
3389 ev_start (EV_A_ (W)w, ++asynccnt); 3595 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3416 3622
3417void 3623void
3418ev_async_send (EV_P_ ev_async *w) 3624ev_async_send (EV_P_ ev_async *w)
3419{ 3625{
3420 w->sent = 1; 3626 w->sent = 1;
3421 evpipe_write (EV_A_ &gotasync); 3627 evpipe_write (EV_A_ &async_pending);
3422} 3628}
3423#endif 3629#endif
3424 3630
3425/*****************************************************************************/ 3631/*****************************************************************************/
3426 3632
… …
3466{ 3672{
3467 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3673 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3468 3674
3469 if (expect_false (!once)) 3675 if (expect_false (!once))
3470 { 3676 {
3471 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3677 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3472 return; 3678 return;
3473 } 3679 }
3474 3680
3475 once->cb = cb; 3681 once->cb = cb;
3476 once->arg = arg; 3682 once->arg = arg;
… …
3563 if (types & EV_ASYNC) 3769 if (types & EV_ASYNC)
3564 for (i = asynccnt; i--; ) 3770 for (i = asynccnt; i--; )
3565 cb (EV_A_ EV_ASYNC, asyncs [i]); 3771 cb (EV_A_ EV_ASYNC, asyncs [i]);
3566#endif 3772#endif
3567 3773
3774#if EV_PREPARE_ENABLE
3568 if (types & EV_PREPARE) 3775 if (types & EV_PREPARE)
3569 for (i = preparecnt; i--; ) 3776 for (i = preparecnt; i--; )
3570#if EV_EMBED_ENABLE 3777# if EV_EMBED_ENABLE
3571 if (ev_cb (prepares [i]) != embed_prepare_cb) 3778 if (ev_cb (prepares [i]) != embed_prepare_cb)
3572#endif 3779# endif
3573 cb (EV_A_ EV_PREPARE, prepares [i]); 3780 cb (EV_A_ EV_PREPARE, prepares [i]);
3781#endif
3574 3782
3783#if EV_CHECK_ENABLE
3575 if (types & EV_CHECK) 3784 if (types & EV_CHECK)
3576 for (i = checkcnt; i--; ) 3785 for (i = checkcnt; i--; )
3577 cb (EV_A_ EV_CHECK, checks [i]); 3786 cb (EV_A_ EV_CHECK, checks [i]);
3787#endif
3578 3788
3789#if EV_SIGNAL_ENABLE
3579 if (types & EV_SIGNAL) 3790 if (types & EV_SIGNAL)
3580 for (i = 0; i < EV_NSIG - 1; ++i) 3791 for (i = 0; i < EV_NSIG - 1; ++i)
3581 for (wl = signals [i].head; wl; ) 3792 for (wl = signals [i].head; wl; )
3582 { 3793 {
3583 wn = wl->next; 3794 wn = wl->next;
3584 cb (EV_A_ EV_SIGNAL, wl); 3795 cb (EV_A_ EV_SIGNAL, wl);
3585 wl = wn; 3796 wl = wn;
3586 } 3797 }
3798#endif
3587 3799
3800#if EV_CHILD_ENABLE
3588 if (types & EV_CHILD) 3801 if (types & EV_CHILD)
3589 for (i = EV_PID_HASHSIZE; i--; ) 3802 for (i = (EV_PID_HASHSIZE); i--; )
3590 for (wl = childs [i]; wl; ) 3803 for (wl = childs [i]; wl; )
3591 { 3804 {
3592 wn = wl->next; 3805 wn = wl->next;
3593 cb (EV_A_ EV_CHILD, wl); 3806 cb (EV_A_ EV_CHILD, wl);
3594 wl = wn; 3807 wl = wn;
3595 } 3808 }
3809#endif
3596/* EV_STAT 0x00001000 /* stat data changed */ 3810/* EV_STAT 0x00001000 /* stat data changed */
3597/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3811/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3598} 3812}
3599#endif 3813#endif
3600 3814
3601#if EV_MULTIPLICITY 3815#if EV_MULTIPLICITY
3602 #include "ev_wrap.h" 3816 #include "ev_wrap.h"
3603#endif 3817#endif
3604 3818
3605#ifdef __cplusplus 3819EV_CPP(})
3606}
3607#endif
3608 3820

Diff Legend

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