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

Comparing libev/ev.c (file contents):
Revision 1.314 by root, Wed Aug 26 17:31:20 2009 UTC vs.
Revision 1.364 by root, Sun Oct 24 21:51:03 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#if defined (EV_NSIG) 210#if defined (EV_NSIG)
… …
204#elif defined (MAXSIG) 222#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 223# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 224#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 225# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 226#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 228#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 230#else
213# error "unable to find value for NSIG, please report" 231# error "unable to find value for NSIG, please report"
214/* 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! :) */
215# define EV_NSIG 65 234# define EV_NSIG 65
216#endif 235#endif
217 236
218#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
220# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
221# else 240# else
222# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
223# endif 242# endif
224#endif 243#endif
225 244
226#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
227# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
228# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
229# else 248# else
230# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
231# endif 250# endif
232#endif 251#endif
233 252
… …
235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
236#endif 255#endif
237 256
238#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
239# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
240# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
241# else 260# else
242# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
243# endif 262# endif
244#endif 263#endif
245 264
246#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
247# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
248#endif 267#endif
249 268
250#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
251# ifdef _WIN32 270# ifdef _WIN32
252# define EV_USE_POLL 0 271# define EV_USE_POLL 0
253# else 272# else
254# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
255# endif 274# endif
256#endif 275#endif
257 276
258#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
259# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
260# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
261# else 280# else
262# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
263# endif 282# endif
264#endif 283#endif
265 284
… …
271# define EV_USE_PORT 0 290# define EV_USE_PORT 0
272#endif 291#endif
273 292
274#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
275# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
276# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
277# else 296# else
278# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
279# endif 298# endif
280#endif 299#endif
281 300
282#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
283# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
284# define EV_PID_HASHSIZE 1
285# else
286# define EV_PID_HASHSIZE 16
287# endif
288#endif 303#endif
289 304
290#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
291# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
292# define EV_INOTIFY_HASHSIZE 1
293# else
294# define EV_INOTIFY_HASHSIZE 16
295# endif
296#endif 307#endif
297 308
298#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
299# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
300# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
301# else 312# else
302# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
303# endif 314# endif
304#endif 315#endif
305 316
306#ifndef EV_USE_SIGNALFD 317#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1 319# define EV_USE_SIGNALFD EV_FEATURE_OS
309# else 320# else
310# define EV_USE_SIGNALFD 0 321# define EV_USE_SIGNALFD 0
311# endif 322# endif
312#endif 323#endif
313 324
… …
316# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
317# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
318#endif 329#endif
319 330
320#ifndef EV_VERIFY 331#ifndef EV_VERIFY
321# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
322#endif 333#endif
323 334
324#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
325# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
326#endif 337#endif
327 338
328#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
329# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
330#endif 341#endif
331 342
332/* 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, */
333/* which makes programs even slower. might work on other unices, too. */ 344/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL 345#if EV_USE_CLOCK_SYSCALL
… …
343# endif 354# endif
344#endif 355#endif
345 356
346/* 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 */
347 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
348#ifndef CLOCK_MONOTONIC 365#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 366# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 367# define EV_USE_MONOTONIC 0
351#endif 368#endif
352 369
… …
365# include <sys/select.h> 382# include <sys/select.h>
366# endif 383# endif
367#endif 384#endif
368 385
369#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
370# include <sys/utsname.h>
371# include <sys/statfs.h> 387# include <sys/statfs.h>
372# include <sys/inotify.h> 388# include <sys/inotify.h>
373/* 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 */
374# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
375# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
392# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
393# else 409# else
394# define EFD_CLOEXEC 02000000 410# define EFD_CLOEXEC 02000000
395# endif 411# endif
396# endif 412# endif
397# ifdef __cplusplus
398extern "C" {
399# endif
400int eventfd (unsigned int initval, int flags); 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
401# ifdef __cplusplus
402}
403# endif
404#endif 414#endif
405 415
406#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
407/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
408# include <stdint.h> 418# include <stdint.h>
… …
414# define SFD_CLOEXEC O_CLOEXEC 424# define SFD_CLOEXEC O_CLOEXEC
415# else 425# else
416# define SFD_CLOEXEC 02000000 426# define SFD_CLOEXEC 02000000
417# endif 427# endif
418# endif 428# endif
419# ifdef __cplusplus
420extern "C" {
421# endif
422int signalfd (int fd, const sigset_t *mask, int flags); 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
423 430
424struct signalfd_siginfo 431struct signalfd_siginfo
425{ 432{
426 uint32_t ssi_signo; 433 uint32_t ssi_signo;
427 char pad[128 - sizeof (uint32_t)]; 434 char pad[128 - sizeof (uint32_t)];
428}; 435};
429# ifdef __cplusplus
430}
431# endif 436#endif
432#endif
433
434 437
435/**/ 438/**/
436 439
437#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
439#else 442#else
440# define EV_FREQUENT_CHECK do { } while (0) 443# define EV_FREQUENT_CHECK do { } while (0)
441#endif 444#endif
442 445
443/* 446/*
… …
450 */ 453 */
451#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
452 455
453#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) */
454#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) */
455/*#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)
456 461
457#if __GNUC__ >= 4 462#if __GNUC__ >= 4
458# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
459# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
460#else 465#else
… …
467 472
468#define expect_false(expr) expect ((expr) != 0, 0) 473#define expect_false(expr) expect ((expr) != 0, 0)
469#define expect_true(expr) expect ((expr) != 0, 1) 474#define expect_true(expr) expect ((expr) != 0, 1)
470#define inline_size static inline 475#define inline_size static inline
471 476
472#if EV_MINIMAL 477#if EV_FEATURE_CODE
478# define inline_speed static inline
479#else
473# define inline_speed static noinline 480# define inline_speed static noinline
474#else
475# define inline_speed static inline
476#endif 481#endif
477 482
478#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
479 484
480#if EV_MINPRI == EV_MAXPRI 485#if EV_MINPRI == EV_MAXPRI
… …
493#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
494#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
495 500
496#if EV_USE_REALTIME 501#if EV_USE_REALTIME
497/* 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 */
498/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
499static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
500#endif 505#endif
501 506
502#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
505 510
506#ifndef EV_FD_TO_WIN32_HANDLE 511#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 512# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif 513#endif
509#ifndef EV_WIN32_HANDLE_TO_FD 514#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 515# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
511#endif 516#endif
512#ifndef EV_WIN32_CLOSE_FD 517#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd) 518# define EV_WIN32_CLOSE_FD(fd) close (fd)
514#endif 519#endif
515 520
516#ifdef _WIN32 521#ifdef _WIN32
517# include "ev_win32.c" 522# include "ev_win32.c"
518#endif 523#endif
519 524
520/*****************************************************************************/ 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 unsigned int v = 0;
536 struct utsname buf;
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
521 576
522static void (*syserr_cb)(const char *msg); 577static void (*syserr_cb)(const char *msg);
523 578
524void 579void
525ev_set_syserr_cb (void (*cb)(const char *msg)) 580ev_set_syserr_cb (void (*cb)(const char *msg))
… …
535 590
536 if (syserr_cb) 591 if (syserr_cb)
537 syserr_cb (msg); 592 syserr_cb (msg);
538 else 593 else
539 { 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
540 perror (msg); 603 perror (msg);
604#endif
541 abort (); 605 abort ();
542 } 606 }
543} 607}
544 608
545static void * 609static void *
546ev_realloc_emul (void *ptr, long size) 610ev_realloc_emul (void *ptr, long size)
547{ 611{
612#if __GLIBC__
613 return realloc (ptr, size);
614#else
548 /* some systems, notably openbsd and darwin, fail to properly 615 /* some systems, notably openbsd and darwin, fail to properly
549 * 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
550 * the single unix specification, so work around them here. 617 * the single unix specification, so work around them here.
551 */ 618 */
552 619
553 if (size) 620 if (size)
554 return realloc (ptr, size); 621 return realloc (ptr, size);
555 622
556 free (ptr); 623 free (ptr);
557 return 0; 624 return 0;
625#endif
558} 626}
559 627
560static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 628static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
561 629
562void 630void
… …
570{ 638{
571 ptr = alloc (ptr, size); 639 ptr = alloc (ptr, size);
572 640
573 if (!ptr && size) 641 if (!ptr && size)
574 { 642 {
643#if EV_AVOID_STDIO
644 ev_printerr ("libev: memory allocation failed, aborting.\n");
645#else
575 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 646 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
647#endif
576 abort (); 648 abort ();
577 } 649 }
578 650
579 return ptr; 651 return ptr;
580} 652}
… …
596 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 */
597 unsigned char unused; 669 unsigned char unused;
598#if EV_USE_EPOLL 670#if EV_USE_EPOLL
599 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
600#endif 672#endif
601#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
602 SOCKET handle; 674 SOCKET handle;
675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
603#endif 678#endif
604} ANFD; 679} ANFD;
605 680
606/* stores the pending event set for a given watcher */ 681/* stores the pending event set for a given watcher */
607typedef struct 682typedef struct
… …
662 737
663 static int ev_default_loop_ptr; 738 static int ev_default_loop_ptr;
664 739
665#endif 740#endif
666 741
667#if EV_MINIMAL < 2 742#if EV_FEATURE_API
668# 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)
669# 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)
670# define EV_INVOKE_PENDING invoke_cb (EV_A) 745# define EV_INVOKE_PENDING invoke_cb (EV_A)
671#else 746#else
672# define EV_RELEASE_CB (void)0 747# define EV_RELEASE_CB (void)0
673# define EV_ACQUIRE_CB (void)0 748# define EV_ACQUIRE_CB (void)0
674# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 749# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
675#endif 750#endif
676 751
677#define EVUNLOOP_RECURSE 0x80 752#define EVBREAK_RECURSE 0x80
678 753
679/*****************************************************************************/ 754/*****************************************************************************/
680 755
681#ifndef EV_HAVE_EV_TIME 756#ifndef EV_HAVE_EV_TIME
682ev_tstamp 757ev_tstamp
… …
726 if (delay > 0.) 801 if (delay > 0.)
727 { 802 {
728#if EV_USE_NANOSLEEP 803#if EV_USE_NANOSLEEP
729 struct timespec ts; 804 struct timespec ts;
730 805
731 ts.tv_sec = (time_t)delay; 806 EV_TS_SET (ts, delay);
732 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
733
734 nanosleep (&ts, 0); 807 nanosleep (&ts, 0);
735#elif defined(_WIN32) 808#elif defined(_WIN32)
736 Sleep ((unsigned long)(delay * 1e3)); 809 Sleep ((unsigned long)(delay * 1e3));
737#else 810#else
738 struct timeval tv; 811 struct timeval tv;
739 812
740 tv.tv_sec = (time_t)delay;
741 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
742
743 /* 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 */
744 /* something not guaranteed by newer posix versions, but guaranteed */ 814 /* something not guaranteed by newer posix versions, but guaranteed */
745 /* by older ones */ 815 /* by older ones */
816 EV_TV_SET (tv, delay);
746 select (0, 0, 0, 0, &tv); 817 select (0, 0, 0, 0, &tv);
747#endif 818#endif
748 } 819 }
749} 820}
750 821
751/*****************************************************************************/ 822/*****************************************************************************/
752 823
753#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 */
754 825
755/* find a suitable new size for the given array, */ 826/* find a suitable new size for the given array, */
756/* hopefully by rounding to a ncie-to-malloc size */ 827/* hopefully by rounding to a nice-to-malloc size */
757inline_size int 828inline_size int
758array_nextsize (int elem, int cur, int cnt) 829array_nextsize (int elem, int cur, int cnt)
759{ 830{
760 int ncur = cur + 1; 831 int ncur = cur + 1;
761 832
… …
857} 928}
858 929
859/*****************************************************************************/ 930/*****************************************************************************/
860 931
861inline_speed void 932inline_speed void
862fd_event_nc (EV_P_ int fd, int revents) 933fd_event_nocheck (EV_P_ int fd, int revents)
863{ 934{
864 ANFD *anfd = anfds + fd; 935 ANFD *anfd = anfds + fd;
865 ev_io *w; 936 ev_io *w;
866 937
867 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)
… …
879fd_event (EV_P_ int fd, int revents) 950fd_event (EV_P_ int fd, int revents)
880{ 951{
881 ANFD *anfd = anfds + fd; 952 ANFD *anfd = anfds + fd;
882 953
883 if (expect_true (!anfd->reify)) 954 if (expect_true (!anfd->reify))
884 fd_event_nc (EV_A_ fd, revents); 955 fd_event_nocheck (EV_A_ fd, revents);
885} 956}
886 957
887void 958void
888ev_feed_fd_event (EV_P_ int fd, int revents) 959ev_feed_fd_event (EV_P_ int fd, int revents)
889{ 960{
890 if (fd >= 0 && fd < anfdmax) 961 if (fd >= 0 && fd < anfdmax)
891 fd_event_nc (EV_A_ fd, revents); 962 fd_event_nocheck (EV_A_ fd, revents);
892} 963}
893 964
894/* make sure the external fd watch events are in-sync */ 965/* make sure the external fd watch events are in-sync */
895/* with the kernel/libev internal state */ 966/* with the kernel/libev internal state */
896inline_size void 967inline_size void
… …
902 { 973 {
903 int fd = fdchanges [i]; 974 int fd = fdchanges [i];
904 ANFD *anfd = anfds + fd; 975 ANFD *anfd = anfds + fd;
905 ev_io *w; 976 ev_io *w;
906 977
907 unsigned char events = 0; 978 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify;
908 980
909 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 981 anfd->reify = 0;
910 events |= (unsigned char)w->events;
911 982
912#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
913 if (events) 984 if (o_reify & EV__IOFDSET)
914 { 985 {
915 unsigned long arg; 986 unsigned long arg;
916 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
917 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
918 } 990 }
919#endif 991#endif
920 992
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
921 { 994 {
922 unsigned char o_events = anfd->events;
923 unsigned char o_reify = anfd->reify;
924
925 anfd->reify = 0;
926 anfd->events = events; 995 anfd->events = 0;
927 996
928 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)
929 backend_modify (EV_A_ fd, o_events, events); 1005 backend_modify (EV_A_ fd, o_events, anfd->events);
930 }
931 } 1006 }
932 1007
933 fdchangecnt = 0; 1008 fdchangecnt = 0;
934} 1009}
935 1010
… …
959 ev_io_stop (EV_A_ w); 1034 ev_io_stop (EV_A_ w);
960 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);
961 } 1036 }
962} 1037}
963 1038
964/* check whether the given fd is atcually valid, for error recovery */ 1039/* check whether the given fd is actually valid, for error recovery */
965inline_size int 1040inline_size int
966fd_valid (int fd) 1041fd_valid (int fd)
967{ 1042{
968#ifdef _WIN32 1043#ifdef _WIN32
969 return _get_osfhandle (fd) != -1; 1044 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
970#else 1045#else
971 return fcntl (fd, F_GETFD) != -1; 1046 return fcntl (fd, F_GETFD) != -1;
972#endif 1047#endif
973} 1048}
974 1049
… …
1011 anfds [fd].emask = 0; 1086 anfds [fd].emask = 0;
1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1087 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1013 } 1088 }
1014} 1089}
1015 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
1016/*****************************************************************************/ 1105/*****************************************************************************/
1017 1106
1018/* 1107/*
1019 * 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
1020 * 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
1021 * the branching factor of the d-tree. 1110 * the branching factor of the d-tree.
1022 */ 1111 */
1023 1112
1024/* 1113/*
… …
1172 1261
1173static ANSIG signals [EV_NSIG - 1]; 1262static ANSIG signals [EV_NSIG - 1];
1174 1263
1175/*****************************************************************************/ 1264/*****************************************************************************/
1176 1265
1177/* used to prepare libev internal fd's */ 1266#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1178/* this is not fork-safe */
1179inline_speed void
1180fd_intern (int fd)
1181{
1182#ifdef _WIN32
1183 unsigned long arg = 1;
1184 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1185#else
1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
1187 fcntl (fd, F_SETFL, O_NONBLOCK);
1188#endif
1189}
1190 1267
1191static void noinline 1268static void noinline
1192evpipe_init (EV_P) 1269evpipe_init (EV_P)
1193{ 1270{
1194 if (!ev_is_active (&pipe_w)) 1271 if (!ev_is_active (&pipe_w))
1195 { 1272 {
1196#if EV_USE_EVENTFD 1273# if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1274 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL) 1275 if (evfd < 0 && errno == EINVAL)
1199 evfd = eventfd (0, 0); 1276 evfd = eventfd (0, 0);
1200 1277
1201 if (evfd >= 0) 1278 if (evfd >= 0)
… …
1203 evpipe [0] = -1; 1280 evpipe [0] = -1;
1204 fd_intern (evfd); /* doing it twice doesn't hurt */ 1281 fd_intern (evfd); /* doing it twice doesn't hurt */
1205 ev_io_set (&pipe_w, evfd, EV_READ); 1282 ev_io_set (&pipe_w, evfd, EV_READ);
1206 } 1283 }
1207 else 1284 else
1208#endif 1285# endif
1209 { 1286 {
1210 while (pipe (evpipe)) 1287 while (pipe (evpipe))
1211 ev_syserr ("(libev) error creating signal/async pipe"); 1288 ev_syserr ("(libev) error creating signal/async pipe");
1212 1289
1213 fd_intern (evpipe [0]); 1290 fd_intern (evpipe [0]);
… …
1224evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1301evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1225{ 1302{
1226 if (!*flag) 1303 if (!*flag)
1227 { 1304 {
1228 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;
1229 1307
1230 *flag = 1; 1308 *flag = 1;
1231 1309
1232#if EV_USE_EVENTFD 1310#if EV_USE_EVENTFD
1233 if (evfd >= 0) 1311 if (evfd >= 0)
… …
1235 uint64_t counter = 1; 1313 uint64_t counter = 1;
1236 write (evfd, &counter, sizeof (uint64_t)); 1314 write (evfd, &counter, sizeof (uint64_t));
1237 } 1315 }
1238 else 1316 else
1239#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. */
1240 write (evpipe [1], &old_errno, 1); 1323 write (evpipe [1], &dummy, 1);
1241 1324
1242 errno = old_errno; 1325 errno = old_errno;
1243 } 1326 }
1244} 1327}
1245 1328
… …
1258 } 1341 }
1259 else 1342 else
1260#endif 1343#endif
1261 { 1344 {
1262 char dummy; 1345 char dummy;
1346 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1263 read (evpipe [0], &dummy, 1); 1347 read (evpipe [0], &dummy, 1);
1264 } 1348 }
1265 1349
1266 if (sig_pending) 1350 if (sig_pending)
1267 { 1351 {
… …
1294{ 1378{
1295#if EV_MULTIPLICITY 1379#if EV_MULTIPLICITY
1296 EV_P = signals [signum - 1].loop; 1380 EV_P = signals [signum - 1].loop;
1297#endif 1381#endif
1298 1382
1299#if _WIN32 1383#ifdef _WIN32
1300 signal (signum, ev_sighandler); 1384 signal (signum, ev_sighandler);
1301#endif 1385#endif
1302 1386
1303 signals [signum - 1].pending = 1; 1387 signals [signum - 1].pending = 1;
1304 evpipe_write (EV_A_ &sig_pending); 1388 evpipe_write (EV_A_ &sig_pending);
… …
1346 break; 1430 break;
1347 } 1431 }
1348} 1432}
1349#endif 1433#endif
1350 1434
1435#endif
1436
1351/*****************************************************************************/ 1437/*****************************************************************************/
1352 1438
1439#if EV_CHILD_ENABLE
1353static WL childs [EV_PID_HASHSIZE]; 1440static WL childs [EV_PID_HASHSIZE];
1354
1355#ifndef _WIN32
1356 1441
1357static ev_signal childev; 1442static ev_signal childev;
1358 1443
1359#ifndef WIFCONTINUED 1444#ifndef WIFCONTINUED
1360# define WIFCONTINUED(status) 0 1445# define WIFCONTINUED(status) 0
… …
1365child_reap (EV_P_ int chain, int pid, int status) 1450child_reap (EV_P_ int chain, int pid, int status)
1366{ 1451{
1367 ev_child *w; 1452 ev_child *w;
1368 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1453 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1369 1454
1370 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)
1371 { 1456 {
1372 if ((w->pid == pid || !w->pid) 1457 if ((w->pid == pid || !w->pid)
1373 && (!traced || (w->flags & 1))) 1458 && (!traced || (w->flags & 1)))
1374 { 1459 {
1375 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 */
… …
1400 /* 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 */
1401 /* 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 */
1402 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1487 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1403 1488
1404 child_reap (EV_A_ pid, pid, status); 1489 child_reap (EV_A_ pid, pid, status);
1405 if (EV_PID_HASHSIZE > 1) 1490 if ((EV_PID_HASHSIZE) > 1)
1406 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 */
1407} 1492}
1408 1493
1409#endif 1494#endif
1410 1495
1411/*****************************************************************************/ 1496/*****************************************************************************/
1412 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1413#if EV_USE_PORT 1501#if EV_USE_PORT
1414# include "ev_port.c" 1502# include "ev_port.c"
1415#endif 1503#endif
1416#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1417# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1477#ifdef __APPLE__ 1565#ifdef __APPLE__
1478 /* only select works correctly on that "unix-certified" platform */ 1566 /* only select works correctly on that "unix-certified" platform */
1479 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1567 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1480 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 */
1481#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
1482 1573
1483 return flags; 1574 return flags;
1484} 1575}
1485 1576
1486unsigned int 1577unsigned int
1487ev_embeddable_backends (void) 1578ev_embeddable_backends (void)
1488{ 1579{
1489 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1580 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1490 1581
1491 /* 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 */
1492 /* please fix it and tell me how to detect the fix */ 1583 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1493 flags &= ~EVBACKEND_EPOLL; 1584 flags &= ~EVBACKEND_EPOLL;
1494 1585
1495 return flags; 1586 return flags;
1496} 1587}
1497 1588
1498unsigned int 1589unsigned int
1499ev_backend (EV_P) 1590ev_backend (EV_P)
1500{ 1591{
1501 return backend; 1592 return backend;
1502} 1593}
1503 1594
1504#if EV_MINIMAL < 2 1595#if EV_FEATURE_API
1505unsigned int 1596unsigned int
1506ev_loop_count (EV_P) 1597ev_iteration (EV_P)
1507{ 1598{
1508 return loop_count; 1599 return loop_count;
1509} 1600}
1510 1601
1511unsigned int 1602unsigned int
1512ev_loop_depth (EV_P) 1603ev_depth (EV_P)
1513{ 1604{
1514 return loop_depth; 1605 return loop_depth;
1515} 1606}
1516 1607
1517void 1608void
… …
1589 1680
1590 ev_rt_now = ev_time (); 1681 ev_rt_now = ev_time ();
1591 mn_now = get_clock (); 1682 mn_now = get_clock ();
1592 now_floor = mn_now; 1683 now_floor = mn_now;
1593 rtmn_diff = ev_rt_now - mn_now; 1684 rtmn_diff = ev_rt_now - mn_now;
1594#if EV_MINIMAL < 2 1685#if EV_FEATURE_API
1595 invoke_cb = ev_invoke_pending; 1686 invoke_cb = ev_invoke_pending;
1596#endif 1687#endif
1597 1688
1598 io_blocktime = 0.; 1689 io_blocktime = 0.;
1599 timeout_blocktime = 0.; 1690 timeout_blocktime = 0.;
… …
1605#endif 1696#endif
1606#if EV_USE_INOTIFY 1697#if EV_USE_INOTIFY
1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1698 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1608#endif 1699#endif
1609#if EV_USE_SIGNALFD 1700#if EV_USE_SIGNALFD
1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1701 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1611#endif 1702#endif
1612 1703
1613 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1614 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1615 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1616#if EV_USE_PORT 1710#if EV_USE_PORT
1617 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1618#endif 1712#endif
1619#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1620 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1629 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1723 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1630#endif 1724#endif
1631 1725
1632 ev_prepare_init (&pending_w, pendingcb); 1726 ev_prepare_init (&pending_w, pendingcb);
1633 1727
1728#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1634 ev_init (&pipe_w, pipecb); 1729 ev_init (&pipe_w, pipecb);
1635 ev_set_priority (&pipe_w, EV_MAXPRI); 1730 ev_set_priority (&pipe_w, EV_MAXPRI);
1731#endif
1636 } 1732 }
1637} 1733}
1638 1734
1639/* free up a loop structure */ 1735/* free up a loop structure */
1640static void noinline 1736void
1641loop_destroy (EV_P) 1737ev_loop_destroy (EV_P)
1642{ 1738{
1643 int i; 1739 int i;
1740
1741#if EV_MULTIPLICITY
1742 /* mimic free (0) */
1743 if (!EV_A)
1744 return;
1745#endif
1746
1747#if EV_CLEANUP_ENABLE
1748 /* queue cleanup watchers (and execute them) */
1749 if (expect_false (cleanupcnt))
1750 {
1751 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1752 EV_INVOKE_PENDING;
1753 }
1754#endif
1755
1756#if EV_CHILD_ENABLE
1757 if (ev_is_active (&childev))
1758 {
1759 ev_ref (EV_A); /* child watcher */
1760 ev_signal_stop (EV_A_ &childev);
1761 }
1762#endif
1644 1763
1645 if (ev_is_active (&pipe_w)) 1764 if (ev_is_active (&pipe_w))
1646 { 1765 {
1647 /*ev_ref (EV_A);*/ 1766 /*ev_ref (EV_A);*/
1648 /*ev_io_stop (EV_A_ &pipe_w);*/ 1767 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1659 } 1778 }
1660 } 1779 }
1661 1780
1662#if EV_USE_SIGNALFD 1781#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w)) 1782 if (ev_is_active (&sigfd_w))
1664 {
1665 /*ev_ref (EV_A);*/
1666 /*ev_io_stop (EV_A_ &sigfd_w);*/
1667
1668 close (sigfd); 1783 close (sigfd);
1669 }
1670#endif 1784#endif
1671 1785
1672#if EV_USE_INOTIFY 1786#if EV_USE_INOTIFY
1673 if (fs_fd >= 0) 1787 if (fs_fd >= 0)
1674 close (fs_fd); 1788 close (fs_fd);
1675#endif 1789#endif
1676 1790
1677 if (backend_fd >= 0) 1791 if (backend_fd >= 0)
1678 close (backend_fd); 1792 close (backend_fd);
1679 1793
1794#if EV_USE_IOCP
1795 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1796#endif
1680#if EV_USE_PORT 1797#if EV_USE_PORT
1681 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1798 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1682#endif 1799#endif
1683#if EV_USE_KQUEUE 1800#if EV_USE_KQUEUE
1684 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1801 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1711 array_free (periodic, EMPTY); 1828 array_free (periodic, EMPTY);
1712#endif 1829#endif
1713#if EV_FORK_ENABLE 1830#if EV_FORK_ENABLE
1714 array_free (fork, EMPTY); 1831 array_free (fork, EMPTY);
1715#endif 1832#endif
1833#if EV_CLEANUP_ENABLE
1834 array_free (cleanup, EMPTY);
1835#endif
1716 array_free (prepare, EMPTY); 1836 array_free (prepare, EMPTY);
1717 array_free (check, EMPTY); 1837 array_free (check, EMPTY);
1718#if EV_ASYNC_ENABLE 1838#if EV_ASYNC_ENABLE
1719 array_free (async, EMPTY); 1839 array_free (async, EMPTY);
1720#endif 1840#endif
1721 1841
1722 backend = 0; 1842 backend = 0;
1843
1844#if EV_MULTIPLICITY
1845 if (ev_is_default_loop (EV_A))
1846#endif
1847 ev_default_loop_ptr = 0;
1848#if EV_MULTIPLICITY
1849 else
1850 ev_free (EV_A);
1851#endif
1723} 1852}
1724 1853
1725#if EV_USE_INOTIFY 1854#if EV_USE_INOTIFY
1726inline_size void infy_fork (EV_P); 1855inline_size void infy_fork (EV_P);
1727#endif 1856#endif
… …
1763 { 1892 {
1764 EV_WIN32_CLOSE_FD (evpipe [0]); 1893 EV_WIN32_CLOSE_FD (evpipe [0]);
1765 EV_WIN32_CLOSE_FD (evpipe [1]); 1894 EV_WIN32_CLOSE_FD (evpipe [1]);
1766 } 1895 }
1767 1896
1897#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1768 evpipe_init (EV_A); 1898 evpipe_init (EV_A);
1769 /* now iterate over everything, in case we missed something */ 1899 /* now iterate over everything, in case we missed something */
1770 pipecb (EV_A_ &pipe_w, EV_READ); 1900 pipecb (EV_A_ &pipe_w, EV_READ);
1901#endif
1771 } 1902 }
1772 1903
1773 postfork = 0; 1904 postfork = 0;
1774} 1905}
1775 1906
… …
1784 loop_init (EV_A_ flags); 1915 loop_init (EV_A_ flags);
1785 1916
1786 if (ev_backend (EV_A)) 1917 if (ev_backend (EV_A))
1787 return EV_A; 1918 return EV_A;
1788 1919
1920 ev_free (EV_A);
1789 return 0; 1921 return 0;
1790} 1922}
1791 1923
1792void
1793ev_loop_destroy (EV_P)
1794{
1795 loop_destroy (EV_A);
1796 ev_free (loop);
1797}
1798
1799void
1800ev_loop_fork (EV_P)
1801{
1802 postfork = 1; /* must be in line with ev_default_fork */
1803}
1804#endif /* multiplicity */ 1924#endif /* multiplicity */
1805 1925
1806#if EV_VERIFY 1926#if EV_VERIFY
1807static void noinline 1927static void noinline
1808verify_watcher (EV_P_ W w) 1928verify_watcher (EV_P_ W w)
… …
1837 verify_watcher (EV_A_ ws [cnt]); 1957 verify_watcher (EV_A_ ws [cnt]);
1838 } 1958 }
1839} 1959}
1840#endif 1960#endif
1841 1961
1842#if EV_MINIMAL < 2 1962#if EV_FEATURE_API
1843void 1963void
1844ev_loop_verify (EV_P) 1964ev_verify (EV_P)
1845{ 1965{
1846#if EV_VERIFY 1966#if EV_VERIFY
1847 int i; 1967 int i;
1848 WL w; 1968 WL w;
1849 1969
… …
1883#if EV_FORK_ENABLE 2003#if EV_FORK_ENABLE
1884 assert (forkmax >= forkcnt); 2004 assert (forkmax >= forkcnt);
1885 array_verify (EV_A_ (W *)forks, forkcnt); 2005 array_verify (EV_A_ (W *)forks, forkcnt);
1886#endif 2006#endif
1887 2007
2008#if EV_CLEANUP_ENABLE
2009 assert (cleanupmax >= cleanupcnt);
2010 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2011#endif
2012
1888#if EV_ASYNC_ENABLE 2013#if EV_ASYNC_ENABLE
1889 assert (asyncmax >= asynccnt); 2014 assert (asyncmax >= asynccnt);
1890 array_verify (EV_A_ (W *)asyncs, asynccnt); 2015 array_verify (EV_A_ (W *)asyncs, asynccnt);
1891#endif 2016#endif
1892 2017
2018#if EV_PREPARE_ENABLE
1893 assert (preparemax >= preparecnt); 2019 assert (preparemax >= preparecnt);
1894 array_verify (EV_A_ (W *)prepares, preparecnt); 2020 array_verify (EV_A_ (W *)prepares, preparecnt);
2021#endif
1895 2022
2023#if EV_CHECK_ENABLE
1896 assert (checkmax >= checkcnt); 2024 assert (checkmax >= checkcnt);
1897 array_verify (EV_A_ (W *)checks, checkcnt); 2025 array_verify (EV_A_ (W *)checks, checkcnt);
2026#endif
1898 2027
1899# if 0 2028# if 0
2029#if EV_CHILD_ENABLE
1900 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2030 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1901 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 2031 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2032#endif
1902# endif 2033# endif
1903#endif 2034#endif
1904} 2035}
1905#endif 2036#endif
1906 2037
1907#if EV_MULTIPLICITY 2038#if EV_MULTIPLICITY
1908struct ev_loop * 2039struct ev_loop *
1909ev_default_loop_init (unsigned int flags)
1910#else 2040#else
1911int 2041int
2042#endif
1912ev_default_loop (unsigned int flags) 2043ev_default_loop (unsigned int flags)
1913#endif
1914{ 2044{
1915 if (!ev_default_loop_ptr) 2045 if (!ev_default_loop_ptr)
1916 { 2046 {
1917#if EV_MULTIPLICITY 2047#if EV_MULTIPLICITY
1918 EV_P = ev_default_loop_ptr = &default_loop_struct; 2048 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1922 2052
1923 loop_init (EV_A_ flags); 2053 loop_init (EV_A_ flags);
1924 2054
1925 if (ev_backend (EV_A)) 2055 if (ev_backend (EV_A))
1926 { 2056 {
1927#ifndef _WIN32 2057#if EV_CHILD_ENABLE
1928 ev_signal_init (&childev, childcb, SIGCHLD); 2058 ev_signal_init (&childev, childcb, SIGCHLD);
1929 ev_set_priority (&childev, EV_MAXPRI); 2059 ev_set_priority (&childev, EV_MAXPRI);
1930 ev_signal_start (EV_A_ &childev); 2060 ev_signal_start (EV_A_ &childev);
1931 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2061 ev_unref (EV_A); /* child watcher should not keep loop alive */
1932#endif 2062#endif
… …
1937 2067
1938 return ev_default_loop_ptr; 2068 return ev_default_loop_ptr;
1939} 2069}
1940 2070
1941void 2071void
1942ev_default_destroy (void) 2072ev_loop_fork (EV_P)
1943{ 2073{
1944#if EV_MULTIPLICITY
1945 EV_P = ev_default_loop_ptr;
1946#endif
1947
1948 ev_default_loop_ptr = 0;
1949
1950#ifndef _WIN32
1951 ev_ref (EV_A); /* child watcher */
1952 ev_signal_stop (EV_A_ &childev);
1953#endif
1954
1955 loop_destroy (EV_A);
1956}
1957
1958void
1959ev_default_fork (void)
1960{
1961#if EV_MULTIPLICITY
1962 EV_P = ev_default_loop_ptr;
1963#endif
1964
1965 postfork = 1; /* must be in line with ev_loop_fork */ 2074 postfork = 1; /* must be in line with ev_default_fork */
1966} 2075}
1967 2076
1968/*****************************************************************************/ 2077/*****************************************************************************/
1969 2078
1970void 2079void
… …
2061 EV_FREQUENT_CHECK; 2170 EV_FREQUENT_CHECK;
2062 feed_reverse (EV_A_ (W)w); 2171 feed_reverse (EV_A_ (W)w);
2063 } 2172 }
2064 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2173 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2065 2174
2066 feed_reverse_done (EV_A_ EV_TIMEOUT); 2175 feed_reverse_done (EV_A_ EV_TIMER);
2067 } 2176 }
2068} 2177}
2069 2178
2070#if EV_PERIODIC_ENABLE 2179#if EV_PERIODIC_ENABLE
2071/* make periodics pending */ 2180/* make periodics pending */
… …
2124 feed_reverse_done (EV_A_ EV_PERIODIC); 2233 feed_reverse_done (EV_A_ EV_PERIODIC);
2125 } 2234 }
2126} 2235}
2127 2236
2128/* simply recalculate all periodics */ 2237/* simply recalculate all periodics */
2129/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2238/* TODO: maybe ensure that at least one event happens when jumping forward? */
2130static void noinline 2239static void noinline
2131periodics_reschedule (EV_P) 2240periodics_reschedule (EV_P)
2132{ 2241{
2133 int i; 2242 int i;
2134 2243
… …
2162 ANHE_at_cache (*he); 2271 ANHE_at_cache (*he);
2163 } 2272 }
2164} 2273}
2165 2274
2166/* fetch new monotonic and realtime times from the kernel */ 2275/* fetch new monotonic and realtime times from the kernel */
2167/* also detetc if there was a timejump, and act accordingly */ 2276/* also detect if there was a timejump, and act accordingly */
2168inline_speed void 2277inline_speed void
2169time_update (EV_P_ ev_tstamp max_block) 2278time_update (EV_P_ ev_tstamp max_block)
2170{ 2279{
2171#if EV_USE_MONOTONIC 2280#if EV_USE_MONOTONIC
2172 if (expect_true (have_monotonic)) 2281 if (expect_true (have_monotonic))
… …
2230 mn_now = ev_rt_now; 2339 mn_now = ev_rt_now;
2231 } 2340 }
2232} 2341}
2233 2342
2234void 2343void
2235ev_loop (EV_P_ int flags) 2344ev_run (EV_P_ int flags)
2236{ 2345{
2237#if EV_MINIMAL < 2 2346#if EV_FEATURE_API
2238 ++loop_depth; 2347 ++loop_depth;
2239#endif 2348#endif
2240 2349
2241 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2350 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2242 2351
2243 loop_done = EVUNLOOP_CANCEL; 2352 loop_done = EVBREAK_CANCEL;
2244 2353
2245 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2354 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2246 2355
2247 do 2356 do
2248 { 2357 {
2249#if EV_VERIFY >= 2 2358#if EV_VERIFY >= 2
2250 ev_loop_verify (EV_A); 2359 ev_verify (EV_A);
2251#endif 2360#endif
2252 2361
2253#ifndef _WIN32 2362#ifndef _WIN32
2254 if (expect_false (curpid)) /* penalise the forking check even more */ 2363 if (expect_false (curpid)) /* penalise the forking check even more */
2255 if (expect_false (getpid () != curpid)) 2364 if (expect_false (getpid () != curpid))
… …
2267 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2376 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2268 EV_INVOKE_PENDING; 2377 EV_INVOKE_PENDING;
2269 } 2378 }
2270#endif 2379#endif
2271 2380
2381#if EV_PREPARE_ENABLE
2272 /* queue prepare watchers (and execute them) */ 2382 /* queue prepare watchers (and execute them) */
2273 if (expect_false (preparecnt)) 2383 if (expect_false (preparecnt))
2274 { 2384 {
2275 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2385 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2276 EV_INVOKE_PENDING; 2386 EV_INVOKE_PENDING;
2277 } 2387 }
2388#endif
2278 2389
2279 if (expect_false (loop_done)) 2390 if (expect_false (loop_done))
2280 break; 2391 break;
2281 2392
2282 /* we might have forked, so reify kernel state if necessary */ 2393 /* we might have forked, so reify kernel state if necessary */
… …
2289 /* calculate blocking time */ 2400 /* calculate blocking time */
2290 { 2401 {
2291 ev_tstamp waittime = 0.; 2402 ev_tstamp waittime = 0.;
2292 ev_tstamp sleeptime = 0.; 2403 ev_tstamp sleeptime = 0.;
2293 2404
2405 /* remember old timestamp for io_blocktime calculation */
2406 ev_tstamp prev_mn_now = mn_now;
2407
2408 /* update time to cancel out callback processing overhead */
2409 time_update (EV_A_ 1e100);
2410
2294 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2411 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2295 { 2412 {
2296 /* remember old timestamp for io_blocktime calculation */
2297 ev_tstamp prev_mn_now = mn_now;
2298
2299 /* update time to cancel out callback processing overhead */
2300 time_update (EV_A_ 1e100);
2301
2302 waittime = MAX_BLOCKTIME; 2413 waittime = MAX_BLOCKTIME;
2303 2414
2304 if (timercnt) 2415 if (timercnt)
2305 { 2416 {
2306 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2417 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2333 waittime -= sleeptime; 2444 waittime -= sleeptime;
2334 } 2445 }
2335 } 2446 }
2336 } 2447 }
2337 2448
2338#if EV_MINIMAL < 2 2449#if EV_FEATURE_API
2339 ++loop_count; 2450 ++loop_count;
2340#endif 2451#endif
2341 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2452 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2342 backend_poll (EV_A_ waittime); 2453 backend_poll (EV_A_ waittime);
2343 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2454 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2344 2455
2345 /* update ev_rt_now, do magic */ 2456 /* update ev_rt_now, do magic */
2346 time_update (EV_A_ waittime + sleeptime); 2457 time_update (EV_A_ waittime + sleeptime);
2347 } 2458 }
2348 2459
… …
2355#if EV_IDLE_ENABLE 2466#if EV_IDLE_ENABLE
2356 /* queue idle watchers unless other events are pending */ 2467 /* queue idle watchers unless other events are pending */
2357 idle_reify (EV_A); 2468 idle_reify (EV_A);
2358#endif 2469#endif
2359 2470
2471#if EV_CHECK_ENABLE
2360 /* queue check watchers, to be executed first */ 2472 /* queue check watchers, to be executed first */
2361 if (expect_false (checkcnt)) 2473 if (expect_false (checkcnt))
2362 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2474 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2475#endif
2363 2476
2364 EV_INVOKE_PENDING; 2477 EV_INVOKE_PENDING;
2365 } 2478 }
2366 while (expect_true ( 2479 while (expect_true (
2367 activecnt 2480 activecnt
2368 && !loop_done 2481 && !loop_done
2369 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2482 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2370 )); 2483 ));
2371 2484
2372 if (loop_done == EVUNLOOP_ONE) 2485 if (loop_done == EVBREAK_ONE)
2373 loop_done = EVUNLOOP_CANCEL; 2486 loop_done = EVBREAK_CANCEL;
2374 2487
2375#if EV_MINIMAL < 2 2488#if EV_FEATURE_API
2376 --loop_depth; 2489 --loop_depth;
2377#endif 2490#endif
2378} 2491}
2379 2492
2380void 2493void
2381ev_unloop (EV_P_ int how) 2494ev_break (EV_P_ int how)
2382{ 2495{
2383 loop_done = how; 2496 loop_done = how;
2384} 2497}
2385 2498
2386void 2499void
… …
2506 2619
2507 if (expect_false (ev_is_active (w))) 2620 if (expect_false (ev_is_active (w)))
2508 return; 2621 return;
2509 2622
2510 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2623 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2511 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2624 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2512 2625
2513 EV_FREQUENT_CHECK; 2626 EV_FREQUENT_CHECK;
2514 2627
2515 ev_start (EV_A_ (W)w, 1); 2628 ev_start (EV_A_ (W)w, 1);
2516 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2629 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2534 EV_FREQUENT_CHECK; 2647 EV_FREQUENT_CHECK;
2535 2648
2536 wlist_del (&anfds[w->fd].head, (WL)w); 2649 wlist_del (&anfds[w->fd].head, (WL)w);
2537 ev_stop (EV_A_ (W)w); 2650 ev_stop (EV_A_ (W)w);
2538 2651
2539 fd_change (EV_A_ w->fd, 1); 2652 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2540 2653
2541 EV_FREQUENT_CHECK; 2654 EV_FREQUENT_CHECK;
2542} 2655}
2543 2656
2544void noinline 2657void noinline
… …
2586 timers [active] = timers [timercnt + HEAP0]; 2699 timers [active] = timers [timercnt + HEAP0];
2587 adjustheap (timers, timercnt, active); 2700 adjustheap (timers, timercnt, active);
2588 } 2701 }
2589 } 2702 }
2590 2703
2591 EV_FREQUENT_CHECK;
2592
2593 ev_at (w) -= mn_now; 2704 ev_at (w) -= mn_now;
2594 2705
2595 ev_stop (EV_A_ (W)w); 2706 ev_stop (EV_A_ (W)w);
2707
2708 EV_FREQUENT_CHECK;
2596} 2709}
2597 2710
2598void noinline 2711void noinline
2599ev_timer_again (EV_P_ ev_timer *w) 2712ev_timer_again (EV_P_ ev_timer *w)
2600{ 2713{
… …
2679 periodics [active] = periodics [periodiccnt + HEAP0]; 2792 periodics [active] = periodics [periodiccnt + HEAP0];
2680 adjustheap (periodics, periodiccnt, active); 2793 adjustheap (periodics, periodiccnt, active);
2681 } 2794 }
2682 } 2795 }
2683 2796
2684 EV_FREQUENT_CHECK;
2685
2686 ev_stop (EV_A_ (W)w); 2797 ev_stop (EV_A_ (W)w);
2798
2799 EV_FREQUENT_CHECK;
2687} 2800}
2688 2801
2689void noinline 2802void noinline
2690ev_periodic_again (EV_P_ ev_periodic *w) 2803ev_periodic_again (EV_P_ ev_periodic *w)
2691{ 2804{
… …
2696#endif 2809#endif
2697 2810
2698#ifndef SA_RESTART 2811#ifndef SA_RESTART
2699# define SA_RESTART 0 2812# define SA_RESTART 0
2700#endif 2813#endif
2814
2815#if EV_SIGNAL_ENABLE
2701 2816
2702void noinline 2817void noinline
2703ev_signal_start (EV_P_ ev_signal *w) 2818ev_signal_start (EV_P_ ev_signal *w)
2704{ 2819{
2705 if (expect_false (ev_is_active (w))) 2820 if (expect_false (ev_is_active (w)))
… …
2752 if (!((WL)w)->next) 2867 if (!((WL)w)->next)
2753# if EV_USE_SIGNALFD 2868# if EV_USE_SIGNALFD
2754 if (sigfd < 0) /*TODO*/ 2869 if (sigfd < 0) /*TODO*/
2755# endif 2870# endif
2756 { 2871 {
2757# if _WIN32 2872# ifdef _WIN32
2873 evpipe_init (EV_A);
2874
2758 signal (w->signum, ev_sighandler); 2875 signal (w->signum, ev_sighandler);
2759# else 2876# else
2760 struct sigaction sa; 2877 struct sigaction sa;
2761 2878
2762 evpipe_init (EV_A); 2879 evpipe_init (EV_A);
… …
2793 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2910 signals [w->signum - 1].loop = 0; /* unattach from signal */
2794#endif 2911#endif
2795#if EV_USE_SIGNALFD 2912#if EV_USE_SIGNALFD
2796 if (sigfd >= 0) 2913 if (sigfd >= 0)
2797 { 2914 {
2798 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2915 sigset_t ss;
2916
2917 sigemptyset (&ss);
2918 sigaddset (&ss, w->signum);
2799 sigdelset (&sigfd_set, w->signum); 2919 sigdelset (&sigfd_set, w->signum);
2920
2800 signalfd (sigfd, &sigfd_set, 0); 2921 signalfd (sigfd, &sigfd_set, 0);
2801 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2922 sigprocmask (SIG_UNBLOCK, &ss, 0);
2802 /*TODO: maybe unblock signal? */
2803 } 2923 }
2804 else 2924 else
2805#endif 2925#endif
2806 signal (w->signum, SIG_DFL); 2926 signal (w->signum, SIG_DFL);
2807 } 2927 }
2808 2928
2809 EV_FREQUENT_CHECK; 2929 EV_FREQUENT_CHECK;
2810} 2930}
2811 2931
2932#endif
2933
2934#if EV_CHILD_ENABLE
2935
2812void 2936void
2813ev_child_start (EV_P_ ev_child *w) 2937ev_child_start (EV_P_ ev_child *w)
2814{ 2938{
2815#if EV_MULTIPLICITY 2939#if EV_MULTIPLICITY
2816 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2940 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2819 return; 2943 return;
2820 2944
2821 EV_FREQUENT_CHECK; 2945 EV_FREQUENT_CHECK;
2822 2946
2823 ev_start (EV_A_ (W)w, 1); 2947 ev_start (EV_A_ (W)w, 1);
2824 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2948 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2825 2949
2826 EV_FREQUENT_CHECK; 2950 EV_FREQUENT_CHECK;
2827} 2951}
2828 2952
2829void 2953void
… …
2833 if (expect_false (!ev_is_active (w))) 2957 if (expect_false (!ev_is_active (w)))
2834 return; 2958 return;
2835 2959
2836 EV_FREQUENT_CHECK; 2960 EV_FREQUENT_CHECK;
2837 2961
2838 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2962 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2839 ev_stop (EV_A_ (W)w); 2963 ev_stop (EV_A_ (W)w);
2840 2964
2841 EV_FREQUENT_CHECK; 2965 EV_FREQUENT_CHECK;
2842} 2966}
2967
2968#endif
2843 2969
2844#if EV_STAT_ENABLE 2970#if EV_STAT_ENABLE
2845 2971
2846# ifdef _WIN32 2972# ifdef _WIN32
2847# undef lstat 2973# undef lstat
… …
2853#define MIN_STAT_INTERVAL 0.1074891 2979#define MIN_STAT_INTERVAL 0.1074891
2854 2980
2855static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2981static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2856 2982
2857#if EV_USE_INOTIFY 2983#if EV_USE_INOTIFY
2858# define EV_INOTIFY_BUFSIZE 8192 2984
2985/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2986# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2859 2987
2860static void noinline 2988static void noinline
2861infy_add (EV_P_ ev_stat *w) 2989infy_add (EV_P_ ev_stat *w)
2862{ 2990{
2863 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); 2991 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);
2864 2992
2865 if (w->wd < 0) 2993 if (w->wd >= 0)
2994 {
2995 struct statfs sfs;
2996
2997 /* now local changes will be tracked by inotify, but remote changes won't */
2998 /* unless the filesystem is known to be local, we therefore still poll */
2999 /* also do poll on <2.6.25, but with normal frequency */
3000
3001 if (!fs_2625)
3002 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3003 else if (!statfs (w->path, &sfs)
3004 && (sfs.f_type == 0x1373 /* devfs */
3005 || sfs.f_type == 0xEF53 /* ext2/3 */
3006 || sfs.f_type == 0x3153464a /* jfs */
3007 || sfs.f_type == 0x52654973 /* reiser3 */
3008 || sfs.f_type == 0x01021994 /* tempfs */
3009 || sfs.f_type == 0x58465342 /* xfs */))
3010 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3011 else
3012 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2866 { 3013 }
3014 else
3015 {
3016 /* can't use inotify, continue to stat */
2867 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3017 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2868 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2869 3018
2870 /* monitor some parent directory for speedup hints */ 3019 /* if path is not there, monitor some parent directory for speedup hints */
2871 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3020 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2872 /* but an efficiency issue only */ 3021 /* but an efficiency issue only */
2873 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3022 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2874 { 3023 {
2875 char path [4096]; 3024 char path [4096];
… …
2891 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3040 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2892 } 3041 }
2893 } 3042 }
2894 3043
2895 if (w->wd >= 0) 3044 if (w->wd >= 0)
2896 {
2897 struct statfs sfs;
2898
2899 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3045 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2900 3046
2901 /* now local changes will be tracked by inotify, but remote changes won't */ 3047 /* now re-arm timer, if required */
2902 /* unless the filesystem it known to be local, we therefore still poll */ 3048 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2903 /* also do poll on <2.6.25, but with normal frequency */
2904
2905 if (fs_2625 && !statfs (w->path, &sfs))
2906 if (sfs.f_type == 0x1373 /* devfs */
2907 || sfs.f_type == 0xEF53 /* ext2/3 */
2908 || sfs.f_type == 0x3153464a /* jfs */
2909 || sfs.f_type == 0x52654973 /* reiser3 */
2910 || sfs.f_type == 0x01021994 /* tempfs */
2911 || sfs.f_type == 0x58465342 /* xfs */)
2912 return;
2913
2914 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2915 ev_timer_again (EV_A_ &w->timer); 3049 ev_timer_again (EV_A_ &w->timer);
2916 } 3050 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2917} 3051}
2918 3052
2919static void noinline 3053static void noinline
2920infy_del (EV_P_ ev_stat *w) 3054infy_del (EV_P_ ev_stat *w)
2921{ 3055{
… …
2924 3058
2925 if (wd < 0) 3059 if (wd < 0)
2926 return; 3060 return;
2927 3061
2928 w->wd = -2; 3062 w->wd = -2;
2929 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3063 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2930 wlist_del (&fs_hash [slot].head, (WL)w); 3064 wlist_del (&fs_hash [slot].head, (WL)w);
2931 3065
2932 /* remove this watcher, if others are watching it, they will rearm */ 3066 /* remove this watcher, if others are watching it, they will rearm */
2933 inotify_rm_watch (fs_fd, wd); 3067 inotify_rm_watch (fs_fd, wd);
2934} 3068}
… …
2936static void noinline 3070static void noinline
2937infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3071infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2938{ 3072{
2939 if (slot < 0) 3073 if (slot < 0)
2940 /* overflow, need to check for all hash slots */ 3074 /* overflow, need to check for all hash slots */
2941 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3075 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2942 infy_wd (EV_A_ slot, wd, ev); 3076 infy_wd (EV_A_ slot, wd, ev);
2943 else 3077 else
2944 { 3078 {
2945 WL w_; 3079 WL w_;
2946 3080
2947 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3081 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2948 { 3082 {
2949 ev_stat *w = (ev_stat *)w_; 3083 ev_stat *w = (ev_stat *)w_;
2950 w_ = w_->next; /* lets us remove this watcher and all before it */ 3084 w_ = w_->next; /* lets us remove this watcher and all before it */
2951 3085
2952 if (w->wd == wd || wd == -1) 3086 if (w->wd == wd || wd == -1)
2953 { 3087 {
2954 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3088 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2955 { 3089 {
2956 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3090 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2957 w->wd = -1; 3091 w->wd = -1;
2958 infy_add (EV_A_ w); /* re-add, no matter what */ 3092 infy_add (EV_A_ w); /* re-add, no matter what */
2959 } 3093 }
2960 3094
2961 stat_timer_cb (EV_A_ &w->timer, 0); 3095 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2966 3100
2967static void 3101static void
2968infy_cb (EV_P_ ev_io *w, int revents) 3102infy_cb (EV_P_ ev_io *w, int revents)
2969{ 3103{
2970 char buf [EV_INOTIFY_BUFSIZE]; 3104 char buf [EV_INOTIFY_BUFSIZE];
2971 struct inotify_event *ev = (struct inotify_event *)buf;
2972 int ofs; 3105 int ofs;
2973 int len = read (fs_fd, buf, sizeof (buf)); 3106 int len = read (fs_fd, buf, sizeof (buf));
2974 3107
2975 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3108 for (ofs = 0; ofs < len; )
3109 {
3110 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2976 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3111 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3112 ofs += sizeof (struct inotify_event) + ev->len;
3113 }
2977} 3114}
2978 3115
2979inline_size void 3116inline_size void
2980check_2625 (EV_P) 3117ev_check_2625 (EV_P)
2981{ 3118{
2982 /* kernels < 2.6.25 are borked 3119 /* kernels < 2.6.25 are borked
2983 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3120 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2984 */ 3121 */
2985 struct utsname buf; 3122 if (ev_linux_version () < 0x020619)
2986 int major, minor, micro;
2987
2988 if (uname (&buf))
2989 return; 3123 return;
2990 3124
2991 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2992 return;
2993
2994 if (major < 2
2995 || (major == 2 && minor < 6)
2996 || (major == 2 && minor == 6 && micro < 25))
2997 return;
2998
2999 fs_2625 = 1; 3125 fs_2625 = 1;
3126}
3127
3128inline_size int
3129infy_newfd (void)
3130{
3131#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3132 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3133 if (fd >= 0)
3134 return fd;
3135#endif
3136 return inotify_init ();
3000} 3137}
3001 3138
3002inline_size void 3139inline_size void
3003infy_init (EV_P) 3140infy_init (EV_P)
3004{ 3141{
3005 if (fs_fd != -2) 3142 if (fs_fd != -2)
3006 return; 3143 return;
3007 3144
3008 fs_fd = -1; 3145 fs_fd = -1;
3009 3146
3010 check_2625 (EV_A); 3147 ev_check_2625 (EV_A);
3011 3148
3012 fs_fd = inotify_init (); 3149 fs_fd = infy_newfd ();
3013 3150
3014 if (fs_fd >= 0) 3151 if (fs_fd >= 0)
3015 { 3152 {
3153 fd_intern (fs_fd);
3016 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3154 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
3017 ev_set_priority (&fs_w, EV_MAXPRI); 3155 ev_set_priority (&fs_w, EV_MAXPRI);
3018 ev_io_start (EV_A_ &fs_w); 3156 ev_io_start (EV_A_ &fs_w);
3157 ev_unref (EV_A);
3019 } 3158 }
3020} 3159}
3021 3160
3022inline_size void 3161inline_size void
3023infy_fork (EV_P) 3162infy_fork (EV_P)
… …
3025 int slot; 3164 int slot;
3026 3165
3027 if (fs_fd < 0) 3166 if (fs_fd < 0)
3028 return; 3167 return;
3029 3168
3169 ev_ref (EV_A);
3170 ev_io_stop (EV_A_ &fs_w);
3030 close (fs_fd); 3171 close (fs_fd);
3031 fs_fd = inotify_init (); 3172 fs_fd = infy_newfd ();
3032 3173
3174 if (fs_fd >= 0)
3175 {
3176 fd_intern (fs_fd);
3177 ev_io_set (&fs_w, fs_fd, EV_READ);
3178 ev_io_start (EV_A_ &fs_w);
3179 ev_unref (EV_A);
3180 }
3181
3033 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3182 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3034 { 3183 {
3035 WL w_ = fs_hash [slot].head; 3184 WL w_ = fs_hash [slot].head;
3036 fs_hash [slot].head = 0; 3185 fs_hash [slot].head = 0;
3037 3186
3038 while (w_) 3187 while (w_)
… …
3043 w->wd = -1; 3192 w->wd = -1;
3044 3193
3045 if (fs_fd >= 0) 3194 if (fs_fd >= 0)
3046 infy_add (EV_A_ w); /* re-add, no matter what */ 3195 infy_add (EV_A_ w); /* re-add, no matter what */
3047 else 3196 else
3197 {
3198 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3199 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3048 ev_timer_again (EV_A_ &w->timer); 3200 ev_timer_again (EV_A_ &w->timer);
3201 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3202 }
3049 } 3203 }
3050 } 3204 }
3051} 3205}
3052 3206
3053#endif 3207#endif
… …
3070static void noinline 3224static void noinline
3071stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3225stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3072{ 3226{
3073 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3227 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3074 3228
3075 /* we copy this here each the time so that */ 3229 ev_statdata prev = w->attr;
3076 /* prev has the old value when the callback gets invoked */
3077 w->prev = w->attr;
3078 ev_stat_stat (EV_A_ w); 3230 ev_stat_stat (EV_A_ w);
3079 3231
3080 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3232 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3081 if ( 3233 if (
3082 w->prev.st_dev != w->attr.st_dev 3234 prev.st_dev != w->attr.st_dev
3083 || w->prev.st_ino != w->attr.st_ino 3235 || prev.st_ino != w->attr.st_ino
3084 || w->prev.st_mode != w->attr.st_mode 3236 || prev.st_mode != w->attr.st_mode
3085 || w->prev.st_nlink != w->attr.st_nlink 3237 || prev.st_nlink != w->attr.st_nlink
3086 || w->prev.st_uid != w->attr.st_uid 3238 || prev.st_uid != w->attr.st_uid
3087 || w->prev.st_gid != w->attr.st_gid 3239 || prev.st_gid != w->attr.st_gid
3088 || w->prev.st_rdev != w->attr.st_rdev 3240 || prev.st_rdev != w->attr.st_rdev
3089 || w->prev.st_size != w->attr.st_size 3241 || prev.st_size != w->attr.st_size
3090 || w->prev.st_atime != w->attr.st_atime 3242 || prev.st_atime != w->attr.st_atime
3091 || w->prev.st_mtime != w->attr.st_mtime 3243 || prev.st_mtime != w->attr.st_mtime
3092 || w->prev.st_ctime != w->attr.st_ctime 3244 || prev.st_ctime != w->attr.st_ctime
3093 ) { 3245 ) {
3246 /* we only update w->prev on actual differences */
3247 /* in case we test more often than invoke the callback, */
3248 /* to ensure that prev is always different to attr */
3249 w->prev = prev;
3250
3094 #if EV_USE_INOTIFY 3251 #if EV_USE_INOTIFY
3095 if (fs_fd >= 0) 3252 if (fs_fd >= 0)
3096 { 3253 {
3097 infy_del (EV_A_ w); 3254 infy_del (EV_A_ w);
3098 infy_add (EV_A_ w); 3255 infy_add (EV_A_ w);
… …
3123 3280
3124 if (fs_fd >= 0) 3281 if (fs_fd >= 0)
3125 infy_add (EV_A_ w); 3282 infy_add (EV_A_ w);
3126 else 3283 else
3127#endif 3284#endif
3285 {
3128 ev_timer_again (EV_A_ &w->timer); 3286 ev_timer_again (EV_A_ &w->timer);
3287 ev_unref (EV_A);
3288 }
3129 3289
3130 ev_start (EV_A_ (W)w, 1); 3290 ev_start (EV_A_ (W)w, 1);
3131 3291
3132 EV_FREQUENT_CHECK; 3292 EV_FREQUENT_CHECK;
3133} 3293}
… …
3142 EV_FREQUENT_CHECK; 3302 EV_FREQUENT_CHECK;
3143 3303
3144#if EV_USE_INOTIFY 3304#if EV_USE_INOTIFY
3145 infy_del (EV_A_ w); 3305 infy_del (EV_A_ w);
3146#endif 3306#endif
3307
3308 if (ev_is_active (&w->timer))
3309 {
3310 ev_ref (EV_A);
3147 ev_timer_stop (EV_A_ &w->timer); 3311 ev_timer_stop (EV_A_ &w->timer);
3312 }
3148 3313
3149 ev_stop (EV_A_ (W)w); 3314 ev_stop (EV_A_ (W)w);
3150 3315
3151 EV_FREQUENT_CHECK; 3316 EV_FREQUENT_CHECK;
3152} 3317}
… …
3197 3362
3198 EV_FREQUENT_CHECK; 3363 EV_FREQUENT_CHECK;
3199} 3364}
3200#endif 3365#endif
3201 3366
3367#if EV_PREPARE_ENABLE
3202void 3368void
3203ev_prepare_start (EV_P_ ev_prepare *w) 3369ev_prepare_start (EV_P_ ev_prepare *w)
3204{ 3370{
3205 if (expect_false (ev_is_active (w))) 3371 if (expect_false (ev_is_active (w)))
3206 return; 3372 return;
… …
3232 3398
3233 ev_stop (EV_A_ (W)w); 3399 ev_stop (EV_A_ (W)w);
3234 3400
3235 EV_FREQUENT_CHECK; 3401 EV_FREQUENT_CHECK;
3236} 3402}
3403#endif
3237 3404
3405#if EV_CHECK_ENABLE
3238void 3406void
3239ev_check_start (EV_P_ ev_check *w) 3407ev_check_start (EV_P_ ev_check *w)
3240{ 3408{
3241 if (expect_false (ev_is_active (w))) 3409 if (expect_false (ev_is_active (w)))
3242 return; 3410 return;
… …
3268 3436
3269 ev_stop (EV_A_ (W)w); 3437 ev_stop (EV_A_ (W)w);
3270 3438
3271 EV_FREQUENT_CHECK; 3439 EV_FREQUENT_CHECK;
3272} 3440}
3441#endif
3273 3442
3274#if EV_EMBED_ENABLE 3443#if EV_EMBED_ENABLE
3275void noinline 3444void noinline
3276ev_embed_sweep (EV_P_ ev_embed *w) 3445ev_embed_sweep (EV_P_ ev_embed *w)
3277{ 3446{
3278 ev_loop (w->other, EVLOOP_NONBLOCK); 3447 ev_run (w->other, EVRUN_NOWAIT);
3279} 3448}
3280 3449
3281static void 3450static void
3282embed_io_cb (EV_P_ ev_io *io, int revents) 3451embed_io_cb (EV_P_ ev_io *io, int revents)
3283{ 3452{
3284 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3453 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3285 3454
3286 if (ev_cb (w)) 3455 if (ev_cb (w))
3287 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3456 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3288 else 3457 else
3289 ev_loop (w->other, EVLOOP_NONBLOCK); 3458 ev_run (w->other, EVRUN_NOWAIT);
3290} 3459}
3291 3460
3292static void 3461static void
3293embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3462embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3294{ 3463{
… …
3298 EV_P = w->other; 3467 EV_P = w->other;
3299 3468
3300 while (fdchangecnt) 3469 while (fdchangecnt)
3301 { 3470 {
3302 fd_reify (EV_A); 3471 fd_reify (EV_A);
3303 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3472 ev_run (EV_A_ EVRUN_NOWAIT);
3304 } 3473 }
3305 } 3474 }
3306} 3475}
3307 3476
3308static void 3477static void
… …
3314 3483
3315 { 3484 {
3316 EV_P = w->other; 3485 EV_P = w->other;
3317 3486
3318 ev_loop_fork (EV_A); 3487 ev_loop_fork (EV_A);
3319 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3488 ev_run (EV_A_ EVRUN_NOWAIT);
3320 } 3489 }
3321 3490
3322 ev_embed_start (EV_A_ w); 3491 ev_embed_start (EV_A_ w);
3323} 3492}
3324 3493
… …
3372 3541
3373 ev_io_stop (EV_A_ &w->io); 3542 ev_io_stop (EV_A_ &w->io);
3374 ev_prepare_stop (EV_A_ &w->prepare); 3543 ev_prepare_stop (EV_A_ &w->prepare);
3375 ev_fork_stop (EV_A_ &w->fork); 3544 ev_fork_stop (EV_A_ &w->fork);
3376 3545
3546 ev_stop (EV_A_ (W)w);
3547
3377 EV_FREQUENT_CHECK; 3548 EV_FREQUENT_CHECK;
3378} 3549}
3379#endif 3550#endif
3380 3551
3381#if EV_FORK_ENABLE 3552#if EV_FORK_ENABLE
… …
3414 3585
3415 EV_FREQUENT_CHECK; 3586 EV_FREQUENT_CHECK;
3416} 3587}
3417#endif 3588#endif
3418 3589
3419#if EV_ASYNC_ENABLE 3590#if EV_CLEANUP_ENABLE
3420void 3591void
3421ev_async_start (EV_P_ ev_async *w) 3592ev_cleanup_start (EV_P_ ev_cleanup *w)
3422{ 3593{
3423 if (expect_false (ev_is_active (w))) 3594 if (expect_false (ev_is_active (w)))
3424 return; 3595 return;
3596
3597 EV_FREQUENT_CHECK;
3598
3599 ev_start (EV_A_ (W)w, ++cleanupcnt);
3600 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3601 cleanups [cleanupcnt - 1] = w;
3602
3603 /* cleanup watchers should never keep a refcount on the loop */
3604 ev_unref (EV_A);
3605 EV_FREQUENT_CHECK;
3606}
3607
3608void
3609ev_cleanup_stop (EV_P_ ev_cleanup *w)
3610{
3611 clear_pending (EV_A_ (W)w);
3612 if (expect_false (!ev_is_active (w)))
3613 return;
3614
3615 EV_FREQUENT_CHECK;
3616 ev_ref (EV_A);
3617
3618 {
3619 int active = ev_active (w);
3620
3621 cleanups [active - 1] = cleanups [--cleanupcnt];
3622 ev_active (cleanups [active - 1]) = active;
3623 }
3624
3625 ev_stop (EV_A_ (W)w);
3626
3627 EV_FREQUENT_CHECK;
3628}
3629#endif
3630
3631#if EV_ASYNC_ENABLE
3632void
3633ev_async_start (EV_P_ ev_async *w)
3634{
3635 if (expect_false (ev_is_active (w)))
3636 return;
3637
3638 w->sent = 0;
3425 3639
3426 evpipe_init (EV_A); 3640 evpipe_init (EV_A);
3427 3641
3428 EV_FREQUENT_CHECK; 3642 EV_FREQUENT_CHECK;
3429 3643
… …
3507{ 3721{
3508 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3722 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3509 3723
3510 if (expect_false (!once)) 3724 if (expect_false (!once))
3511 { 3725 {
3512 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3726 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3513 return; 3727 return;
3514 } 3728 }
3515 3729
3516 once->cb = cb; 3730 once->cb = cb;
3517 once->arg = arg; 3731 once->arg = arg;
… …
3604 if (types & EV_ASYNC) 3818 if (types & EV_ASYNC)
3605 for (i = asynccnt; i--; ) 3819 for (i = asynccnt; i--; )
3606 cb (EV_A_ EV_ASYNC, asyncs [i]); 3820 cb (EV_A_ EV_ASYNC, asyncs [i]);
3607#endif 3821#endif
3608 3822
3823#if EV_PREPARE_ENABLE
3609 if (types & EV_PREPARE) 3824 if (types & EV_PREPARE)
3610 for (i = preparecnt; i--; ) 3825 for (i = preparecnt; i--; )
3611#if EV_EMBED_ENABLE 3826# if EV_EMBED_ENABLE
3612 if (ev_cb (prepares [i]) != embed_prepare_cb) 3827 if (ev_cb (prepares [i]) != embed_prepare_cb)
3613#endif 3828# endif
3614 cb (EV_A_ EV_PREPARE, prepares [i]); 3829 cb (EV_A_ EV_PREPARE, prepares [i]);
3830#endif
3615 3831
3832#if EV_CHECK_ENABLE
3616 if (types & EV_CHECK) 3833 if (types & EV_CHECK)
3617 for (i = checkcnt; i--; ) 3834 for (i = checkcnt; i--; )
3618 cb (EV_A_ EV_CHECK, checks [i]); 3835 cb (EV_A_ EV_CHECK, checks [i]);
3836#endif
3619 3837
3838#if EV_SIGNAL_ENABLE
3620 if (types & EV_SIGNAL) 3839 if (types & EV_SIGNAL)
3621 for (i = 0; i < EV_NSIG - 1; ++i) 3840 for (i = 0; i < EV_NSIG - 1; ++i)
3622 for (wl = signals [i].head; wl; ) 3841 for (wl = signals [i].head; wl; )
3623 { 3842 {
3624 wn = wl->next; 3843 wn = wl->next;
3625 cb (EV_A_ EV_SIGNAL, wl); 3844 cb (EV_A_ EV_SIGNAL, wl);
3626 wl = wn; 3845 wl = wn;
3627 } 3846 }
3847#endif
3628 3848
3849#if EV_CHILD_ENABLE
3629 if (types & EV_CHILD) 3850 if (types & EV_CHILD)
3630 for (i = EV_PID_HASHSIZE; i--; ) 3851 for (i = (EV_PID_HASHSIZE); i--; )
3631 for (wl = childs [i]; wl; ) 3852 for (wl = childs [i]; wl; )
3632 { 3853 {
3633 wn = wl->next; 3854 wn = wl->next;
3634 cb (EV_A_ EV_CHILD, wl); 3855 cb (EV_A_ EV_CHILD, wl);
3635 wl = wn; 3856 wl = wn;
3636 } 3857 }
3858#endif
3637/* EV_STAT 0x00001000 /* stat data changed */ 3859/* EV_STAT 0x00001000 /* stat data changed */
3638/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3860/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3639} 3861}
3640#endif 3862#endif
3641 3863
3642#if EV_MULTIPLICITY 3864#if EV_MULTIPLICITY
3643 #include "ev_wrap.h" 3865 #include "ev_wrap.h"
3644#endif 3866#endif
3645 3867
3646#ifdef __cplusplus 3868EV_CPP(})
3647}
3648#endif
3649 3869

Diff Legend

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