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

Comparing libev/ev.c (file contents):
Revision 1.311 by root, Wed Jul 29 09:36:05 2009 UTC vs.
Revision 1.359 by root, Sun Oct 24 17:58:41 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__ >= 9)) 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 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
398extern "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
399# endif 421# endif
400int eventfd (unsigned int initval, int flags); 422# ifndef SFD_CLOEXEC
401# ifdef __cplusplus 423# ifdef O_CLOEXEC
402} 424# define SFD_CLOEXEC O_CLOEXEC
425# else
426# define SFD_CLOEXEC 02000000
427# endif
403# endif 428# endif
404#endif 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
405 430
406#if EV_USE_SIGNALFD 431struct signalfd_siginfo
407# include <sys/signalfd.h> 432{
433 uint32_t ssi_signo;
434 char pad[128 - sizeof (uint32_t)];
435};
408#endif 436#endif
409 437
410/**/ 438/**/
411 439
412#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
413# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
414#else 442#else
415# define EV_FREQUENT_CHECK do { } while (0) 443# define EV_FREQUENT_CHECK do { } while (0)
416#endif 444#endif
417 445
418/* 446/*
… …
425 */ 453 */
426#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
427 455
428#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) */
429#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) */
430/*#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)
431 461
432#if __GNUC__ >= 4 462#if __GNUC__ >= 4
433# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
434# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
435#else 465#else
… …
442 472
443#define expect_false(expr) expect ((expr) != 0, 0) 473#define expect_false(expr) expect ((expr) != 0, 0)
444#define expect_true(expr) expect ((expr) != 0, 1) 474#define expect_true(expr) expect ((expr) != 0, 1)
445#define inline_size static inline 475#define inline_size static inline
446 476
447#if EV_MINIMAL 477#if EV_FEATURE_CODE
478# define inline_speed static inline
479#else
448# define inline_speed static noinline 480# define inline_speed static noinline
449#else
450# define inline_speed static inline
451#endif 481#endif
452 482
453#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
454 484
455#if EV_MINPRI == EV_MAXPRI 485#if EV_MINPRI == EV_MAXPRI
… …
468#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
469#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
470 500
471#if EV_USE_REALTIME 501#if EV_USE_REALTIME
472/* 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 */
473/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
474static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
475#endif 505#endif
476 506
477#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
478static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
479#endif 509#endif
480 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
481#ifdef _WIN32 521#ifdef _WIN32
482# include "ev_win32.c" 522# include "ev_win32.c"
483#endif 523#endif
484 524
485/*****************************************************************************/ 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
486 576
487static void (*syserr_cb)(const char *msg); 577static void (*syserr_cb)(const char *msg);
488 578
489void 579void
490ev_set_syserr_cb (void (*cb)(const char *msg)) 580ev_set_syserr_cb (void (*cb)(const char *msg))
… …
500 590
501 if (syserr_cb) 591 if (syserr_cb)
502 syserr_cb (msg); 592 syserr_cb (msg);
503 else 593 else
504 { 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
505 perror (msg); 603 perror (msg);
604#endif
506 abort (); 605 abort ();
507 } 606 }
508} 607}
509 608
510static void * 609static void *
511ev_realloc_emul (void *ptr, long size) 610ev_realloc_emul (void *ptr, long size)
512{ 611{
612#if __GLIBC__
613 return realloc (ptr, size);
614#else
513 /* some systems, notably openbsd and darwin, fail to properly 615 /* some systems, notably openbsd and darwin, fail to properly
514 * 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
515 * the single unix specification, so work around them here. 617 * the single unix specification, so work around them here.
516 */ 618 */
517 619
518 if (size) 620 if (size)
519 return realloc (ptr, size); 621 return realloc (ptr, size);
520 622
521 free (ptr); 623 free (ptr);
522 return 0; 624 return 0;
625#endif
523} 626}
524 627
525static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 628static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
526 629
527void 630void
… …
535{ 638{
536 ptr = alloc (ptr, size); 639 ptr = alloc (ptr, size);
537 640
538 if (!ptr && size) 641 if (!ptr && size)
539 { 642 {
643#if EV_AVOID_STDIO
644 ev_printerr ("libev: memory allocation failed, aborting.\n");
645#else
540 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 646 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
647#endif
541 abort (); 648 abort ();
542 } 649 }
543 650
544 return ptr; 651 return ptr;
545} 652}
… …
561 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 */
562 unsigned char unused; 669 unsigned char unused;
563#if EV_USE_EPOLL 670#if EV_USE_EPOLL
564 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
565#endif 672#endif
566#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
567 SOCKET handle; 674 SOCKET handle;
675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
568#endif 678#endif
569} ANFD; 679} ANFD;
570 680
571/* stores the pending event set for a given watcher */ 681/* stores the pending event set for a given watcher */
572typedef struct 682typedef struct
… …
627 737
628 static int ev_default_loop_ptr; 738 static int ev_default_loop_ptr;
629 739
630#endif 740#endif
631 741
632#if EV_MINIMAL < 2 742#if EV_FEATURE_API
633# 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)
634# 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)
635# define EV_INVOKE_PENDING invoke_cb (EV_A) 745# define EV_INVOKE_PENDING invoke_cb (EV_A)
636#else 746#else
637# define EV_RELEASE_CB (void)0 747# define EV_RELEASE_CB (void)0
638# define EV_ACQUIRE_CB (void)0 748# define EV_ACQUIRE_CB (void)0
639# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 749# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
640#endif 750#endif
641 751
642#define EVUNLOOP_RECURSE 0x80 752#define EVBREAK_RECURSE 0x80
643 753
644/*****************************************************************************/ 754/*****************************************************************************/
645 755
646#ifndef EV_HAVE_EV_TIME 756#ifndef EV_HAVE_EV_TIME
647ev_tstamp 757ev_tstamp
… …
691 if (delay > 0.) 801 if (delay > 0.)
692 { 802 {
693#if EV_USE_NANOSLEEP 803#if EV_USE_NANOSLEEP
694 struct timespec ts; 804 struct timespec ts;
695 805
696 ts.tv_sec = (time_t)delay; 806 EV_TS_SET (ts, delay);
697 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
698
699 nanosleep (&ts, 0); 807 nanosleep (&ts, 0);
700#elif defined(_WIN32) 808#elif defined(_WIN32)
701 Sleep ((unsigned long)(delay * 1e3)); 809 Sleep ((unsigned long)(delay * 1e3));
702#else 810#else
703 struct timeval tv; 811 struct timeval tv;
704 812
705 tv.tv_sec = (time_t)delay;
706 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
707
708 /* 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 */
709 /* something not guaranteed by newer posix versions, but guaranteed */ 814 /* something not guaranteed by newer posix versions, but guaranteed */
710 /* by older ones */ 815 /* by older ones */
816 EV_TV_SET (tv, delay);
711 select (0, 0, 0, 0, &tv); 817 select (0, 0, 0, 0, &tv);
712#endif 818#endif
713 } 819 }
714} 820}
715 821
716/*****************************************************************************/ 822/*****************************************************************************/
717 823
718#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 */
719 825
720/* find a suitable new size for the given array, */ 826/* find a suitable new size for the given array, */
721/* hopefully by rounding to a ncie-to-malloc size */ 827/* hopefully by rounding to a nice-to-malloc size */
722inline_size int 828inline_size int
723array_nextsize (int elem, int cur, int cnt) 829array_nextsize (int elem, int cur, int cnt)
724{ 830{
725 int ncur = cur + 1; 831 int ncur = cur + 1;
726 832
… …
822} 928}
823 929
824/*****************************************************************************/ 930/*****************************************************************************/
825 931
826inline_speed void 932inline_speed void
827fd_event_nc (EV_P_ int fd, int revents) 933fd_event_nocheck (EV_P_ int fd, int revents)
828{ 934{
829 ANFD *anfd = anfds + fd; 935 ANFD *anfd = anfds + fd;
830 ev_io *w; 936 ev_io *w;
831 937
832 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)
… …
844fd_event (EV_P_ int fd, int revents) 950fd_event (EV_P_ int fd, int revents)
845{ 951{
846 ANFD *anfd = anfds + fd; 952 ANFD *anfd = anfds + fd;
847 953
848 if (expect_true (!anfd->reify)) 954 if (expect_true (!anfd->reify))
849 fd_event_nc (EV_A_ fd, revents); 955 fd_event_nocheck (EV_A_ fd, revents);
850} 956}
851 957
852void 958void
853ev_feed_fd_event (EV_P_ int fd, int revents) 959ev_feed_fd_event (EV_P_ int fd, int revents)
854{ 960{
855 if (fd >= 0 && fd < anfdmax) 961 if (fd >= 0 && fd < anfdmax)
856 fd_event_nc (EV_A_ fd, revents); 962 fd_event_nocheck (EV_A_ fd, revents);
857} 963}
858 964
859/* make sure the external fd watch events are in-sync */ 965/* make sure the external fd watch events are in-sync */
860/* with the kernel/libev internal state */ 966/* with the kernel/libev internal state */
861inline_size void 967inline_size void
… …
867 { 973 {
868 int fd = fdchanges [i]; 974 int fd = fdchanges [i];
869 ANFD *anfd = anfds + fd; 975 ANFD *anfd = anfds + fd;
870 ev_io *w; 976 ev_io *w;
871 977
872 unsigned char events = 0; 978 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify;
873 980
874 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 981 anfd->reify = 0;
875 events |= (unsigned char)w->events;
876 982
877#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
878 if (events) 984 if (o_reify & EV__IOFDSET)
879 { 985 {
880 unsigned long arg; 986 unsigned long arg;
881 #ifdef EV_FD_TO_WIN32_HANDLE
882 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
883 #else
884 anfd->handle = _get_osfhandle (fd);
885 #endif
886 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
887 } 990 }
888#endif 991#endif
889 992
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
890 { 994 {
891 unsigned char o_events = anfd->events;
892 unsigned char o_reify = anfd->reify;
893
894 anfd->reify = 0;
895 anfd->events = events; 995 anfd->events = 0;
896 996
897 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)
898 backend_modify (EV_A_ fd, o_events, events); 1005 backend_modify (EV_A_ fd, o_events, anfd->events);
899 }
900 } 1006 }
901 1007
902 fdchangecnt = 0; 1008 fdchangecnt = 0;
903} 1009}
904 1010
… …
928 ev_io_stop (EV_A_ w); 1034 ev_io_stop (EV_A_ w);
929 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);
930 } 1036 }
931} 1037}
932 1038
933/* check whether the given fd is atcually valid, for error recovery */ 1039/* check whether the given fd is actually valid, for error recovery */
934inline_size int 1040inline_size int
935fd_valid (int fd) 1041fd_valid (int fd)
936{ 1042{
937#ifdef _WIN32 1043#ifdef _WIN32
938 return _get_osfhandle (fd) != -1; 1044 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
939#else 1045#else
940 return fcntl (fd, F_GETFD) != -1; 1046 return fcntl (fd, F_GETFD) != -1;
941#endif 1047#endif
942} 1048}
943 1049
… …
980 anfds [fd].emask = 0; 1086 anfds [fd].emask = 0;
981 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1087 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
982 } 1088 }
983} 1089}
984 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
985/*****************************************************************************/ 1105/*****************************************************************************/
986 1106
987/* 1107/*
988 * 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
989 * 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
990 * the branching factor of the d-tree. 1110 * the branching factor of the d-tree.
991 */ 1111 */
992 1112
993/* 1113/*
… …
1141 1261
1142static ANSIG signals [EV_NSIG - 1]; 1262static ANSIG signals [EV_NSIG - 1];
1143 1263
1144/*****************************************************************************/ 1264/*****************************************************************************/
1145 1265
1146/* used to prepare libev internal fd's */ 1266#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1147/* this is not fork-safe */
1148inline_speed void
1149fd_intern (int fd)
1150{
1151#ifdef _WIN32
1152 unsigned long arg = 1;
1153 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1154#else
1155 fcntl (fd, F_SETFD, FD_CLOEXEC);
1156 fcntl (fd, F_SETFL, O_NONBLOCK);
1157#endif
1158}
1159 1267
1160static void noinline 1268static void noinline
1161evpipe_init (EV_P) 1269evpipe_init (EV_P)
1162{ 1270{
1163 if (!ev_is_active (&pipe_w)) 1271 if (!ev_is_active (&pipe_w))
1164 { 1272 {
1165#if EV_USE_EVENTFD 1273# if EV_USE_EVENTFD
1166 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1274 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1167 if (evfd < 0 && errno == EINVAL) 1275 if (evfd < 0 && errno == EINVAL)
1168 evfd = eventfd (0, 0); 1276 evfd = eventfd (0, 0);
1169 1277
1170 if (evfd >= 0) 1278 if (evfd >= 0)
… …
1172 evpipe [0] = -1; 1280 evpipe [0] = -1;
1173 fd_intern (evfd); /* doing it twice doesn't hurt */ 1281 fd_intern (evfd); /* doing it twice doesn't hurt */
1174 ev_io_set (&pipe_w, evfd, EV_READ); 1282 ev_io_set (&pipe_w, evfd, EV_READ);
1175 } 1283 }
1176 else 1284 else
1177#endif 1285# endif
1178 { 1286 {
1179 while (pipe (evpipe)) 1287 while (pipe (evpipe))
1180 ev_syserr ("(libev) error creating signal/async pipe"); 1288 ev_syserr ("(libev) error creating signal/async pipe");
1181 1289
1182 fd_intern (evpipe [0]); 1290 fd_intern (evpipe [0]);
… …
1193evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1301evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1194{ 1302{
1195 if (!*flag) 1303 if (!*flag)
1196 { 1304 {
1197 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;
1198 1307
1199 *flag = 1; 1308 *flag = 1;
1200 1309
1201#if EV_USE_EVENTFD 1310#if EV_USE_EVENTFD
1202 if (evfd >= 0) 1311 if (evfd >= 0)
… …
1204 uint64_t counter = 1; 1313 uint64_t counter = 1;
1205 write (evfd, &counter, sizeof (uint64_t)); 1314 write (evfd, &counter, sizeof (uint64_t));
1206 } 1315 }
1207 else 1316 else
1208#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. */
1209 write (evpipe [1], &old_errno, 1); 1323 write (evpipe [1], &dummy, 1);
1210 1324
1211 errno = old_errno; 1325 errno = old_errno;
1212 } 1326 }
1213} 1327}
1214 1328
… …
1227 } 1341 }
1228 else 1342 else
1229#endif 1343#endif
1230 { 1344 {
1231 char dummy; 1345 char dummy;
1346 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1232 read (evpipe [0], &dummy, 1); 1347 read (evpipe [0], &dummy, 1);
1233 } 1348 }
1234 1349
1235 if (sig_pending) 1350 if (sig_pending)
1236 { 1351 {
… …
1263{ 1378{
1264#if EV_MULTIPLICITY 1379#if EV_MULTIPLICITY
1265 EV_P = signals [signum - 1].loop; 1380 EV_P = signals [signum - 1].loop;
1266#endif 1381#endif
1267 1382
1268#if _WIN32 1383#ifdef _WIN32
1269 signal (signum, ev_sighandler); 1384 signal (signum, ev_sighandler);
1270#endif 1385#endif
1271 1386
1272 signals [signum - 1].pending = 1; 1387 signals [signum - 1].pending = 1;
1273 evpipe_write (EV_A_ &sig_pending); 1388 evpipe_write (EV_A_ &sig_pending);
… …
1315 break; 1430 break;
1316 } 1431 }
1317} 1432}
1318#endif 1433#endif
1319 1434
1435#endif
1436
1320/*****************************************************************************/ 1437/*****************************************************************************/
1321 1438
1439#if EV_CHILD_ENABLE
1322static WL childs [EV_PID_HASHSIZE]; 1440static WL childs [EV_PID_HASHSIZE];
1323
1324#ifndef _WIN32
1325 1441
1326static ev_signal childev; 1442static ev_signal childev;
1327 1443
1328#ifndef WIFCONTINUED 1444#ifndef WIFCONTINUED
1329# define WIFCONTINUED(status) 0 1445# define WIFCONTINUED(status) 0
… …
1334child_reap (EV_P_ int chain, int pid, int status) 1450child_reap (EV_P_ int chain, int pid, int status)
1335{ 1451{
1336 ev_child *w; 1452 ev_child *w;
1337 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1453 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1338 1454
1339 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)
1340 { 1456 {
1341 if ((w->pid == pid || !w->pid) 1457 if ((w->pid == pid || !w->pid)
1342 && (!traced || (w->flags & 1))) 1458 && (!traced || (w->flags & 1)))
1343 { 1459 {
1344 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 */
… …
1369 /* 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 */
1370 /* 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 */
1371 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1487 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1372 1488
1373 child_reap (EV_A_ pid, pid, status); 1489 child_reap (EV_A_ pid, pid, status);
1374 if (EV_PID_HASHSIZE > 1) 1490 if ((EV_PID_HASHSIZE) > 1)
1375 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 */
1376} 1492}
1377 1493
1378#endif 1494#endif
1379 1495
1380/*****************************************************************************/ 1496/*****************************************************************************/
1381 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1382#if EV_USE_PORT 1501#if EV_USE_PORT
1383# include "ev_port.c" 1502# include "ev_port.c"
1384#endif 1503#endif
1385#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1386# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1446#ifdef __APPLE__ 1565#ifdef __APPLE__
1447 /* only select works correctly on that "unix-certified" platform */ 1566 /* only select works correctly on that "unix-certified" platform */
1448 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1567 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1449 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 */
1450#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
1451 1573
1452 return flags; 1574 return flags;
1453} 1575}
1454 1576
1455unsigned int 1577unsigned int
1456ev_embeddable_backends (void) 1578ev_embeddable_backends (void)
1457{ 1579{
1458 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1580 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1459 1581
1460 /* 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 */
1461 /* please fix it and tell me how to detect the fix */ 1583 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1462 flags &= ~EVBACKEND_EPOLL; 1584 flags &= ~EVBACKEND_EPOLL;
1463 1585
1464 return flags; 1586 return flags;
1465} 1587}
1466 1588
1467unsigned int 1589unsigned int
1468ev_backend (EV_P) 1590ev_backend (EV_P)
1469{ 1591{
1470 return backend; 1592 return backend;
1471} 1593}
1472 1594
1473#if EV_MINIMAL < 2 1595#if EV_FEATURE_API
1474unsigned int 1596unsigned int
1475ev_loop_count (EV_P) 1597ev_iteration (EV_P)
1476{ 1598{
1477 return loop_count; 1599 return loop_count;
1478} 1600}
1479 1601
1480unsigned int 1602unsigned int
1481ev_loop_depth (EV_P) 1603ev_depth (EV_P)
1482{ 1604{
1483 return loop_depth; 1605 return loop_depth;
1484} 1606}
1485 1607
1486void 1608void
… …
1558 1680
1559 ev_rt_now = ev_time (); 1681 ev_rt_now = ev_time ();
1560 mn_now = get_clock (); 1682 mn_now = get_clock ();
1561 now_floor = mn_now; 1683 now_floor = mn_now;
1562 rtmn_diff = ev_rt_now - mn_now; 1684 rtmn_diff = ev_rt_now - mn_now;
1563#if EV_MINIMAL < 2 1685#if EV_FEATURE_API
1564 invoke_cb = ev_invoke_pending; 1686 invoke_cb = ev_invoke_pending;
1565#endif 1687#endif
1566 1688
1567 io_blocktime = 0.; 1689 io_blocktime = 0.;
1568 timeout_blocktime = 0.; 1690 timeout_blocktime = 0.;
… …
1574#endif 1696#endif
1575#if EV_USE_INOTIFY 1697#if EV_USE_INOTIFY
1576 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1698 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1577#endif 1699#endif
1578#if EV_USE_SIGNALFD 1700#if EV_USE_SIGNALFD
1579 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1701 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1580#endif 1702#endif
1581 1703
1582 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1583 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1584 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1585#if EV_USE_PORT 1710#if EV_USE_PORT
1586 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1587#endif 1712#endif
1588#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1589 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1598 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1723 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1599#endif 1724#endif
1600 1725
1601 ev_prepare_init (&pending_w, pendingcb); 1726 ev_prepare_init (&pending_w, pendingcb);
1602 1727
1728#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1603 ev_init (&pipe_w, pipecb); 1729 ev_init (&pipe_w, pipecb);
1604 ev_set_priority (&pipe_w, EV_MAXPRI); 1730 ev_set_priority (&pipe_w, EV_MAXPRI);
1731#endif
1605 } 1732 }
1606} 1733}
1607 1734
1608/* free up a loop structure */ 1735/* free up a loop structure */
1609static void noinline 1736void
1610loop_destroy (EV_P) 1737ev_loop_destroy (EV_P)
1611{ 1738{
1612 int i; 1739 int i;
1740
1741#if EV_CHILD_ENABLE
1742 if (ev_is_active (&childev))
1743 {
1744 ev_ref (EV_A); /* child watcher */
1745 ev_signal_stop (EV_A_ &childev);
1746 }
1747#endif
1613 1748
1614 if (ev_is_active (&pipe_w)) 1749 if (ev_is_active (&pipe_w))
1615 { 1750 {
1616 /*ev_ref (EV_A);*/ 1751 /*ev_ref (EV_A);*/
1617 /*ev_io_stop (EV_A_ &pipe_w);*/ 1752 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1621 close (evfd); 1756 close (evfd);
1622#endif 1757#endif
1623 1758
1624 if (evpipe [0] >= 0) 1759 if (evpipe [0] >= 0)
1625 { 1760 {
1626 close (evpipe [0]); 1761 EV_WIN32_CLOSE_FD (evpipe [0]);
1627 close (evpipe [1]); 1762 EV_WIN32_CLOSE_FD (evpipe [1]);
1628 } 1763 }
1629 } 1764 }
1630 1765
1631#if EV_USE_SIGNALFD 1766#if EV_USE_SIGNALFD
1632 if (ev_is_active (&sigfd_w)) 1767 if (ev_is_active (&sigfd_w))
1633 {
1634 /*ev_ref (EV_A);*/
1635 /*ev_io_stop (EV_A_ &sigfd_w);*/
1636
1637 close (sigfd); 1768 close (sigfd);
1638 }
1639#endif 1769#endif
1640 1770
1641#if EV_USE_INOTIFY 1771#if EV_USE_INOTIFY
1642 if (fs_fd >= 0) 1772 if (fs_fd >= 0)
1643 close (fs_fd); 1773 close (fs_fd);
1644#endif 1774#endif
1645 1775
1646 if (backend_fd >= 0) 1776 if (backend_fd >= 0)
1647 close (backend_fd); 1777 close (backend_fd);
1648 1778
1779#if EV_USE_IOCP
1780 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1781#endif
1649#if EV_USE_PORT 1782#if EV_USE_PORT
1650 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1783 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1651#endif 1784#endif
1652#if EV_USE_KQUEUE 1785#if EV_USE_KQUEUE
1653 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1786 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1687#if EV_ASYNC_ENABLE 1820#if EV_ASYNC_ENABLE
1688 array_free (async, EMPTY); 1821 array_free (async, EMPTY);
1689#endif 1822#endif
1690 1823
1691 backend = 0; 1824 backend = 0;
1825
1826#if EV_MULTIPLICITY
1827 if (ev_is_default_loop (EV_A))
1828#endif
1829 ev_default_loop_ptr = 0;
1830#if EV_MULTIPLICITY
1831 else
1832 ev_free (EV_A);
1833#endif
1692} 1834}
1693 1835
1694#if EV_USE_INOTIFY 1836#if EV_USE_INOTIFY
1695inline_size void infy_fork (EV_P); 1837inline_size void infy_fork (EV_P);
1696#endif 1838#endif
… …
1728 close (evfd); 1870 close (evfd);
1729#endif 1871#endif
1730 1872
1731 if (evpipe [0] >= 0) 1873 if (evpipe [0] >= 0)
1732 { 1874 {
1733 close (evpipe [0]); 1875 EV_WIN32_CLOSE_FD (evpipe [0]);
1734 close (evpipe [1]); 1876 EV_WIN32_CLOSE_FD (evpipe [1]);
1735 } 1877 }
1736 1878
1879#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1737 evpipe_init (EV_A); 1880 evpipe_init (EV_A);
1738 /* now iterate over everything, in case we missed something */ 1881 /* now iterate over everything, in case we missed something */
1739 pipecb (EV_A_ &pipe_w, EV_READ); 1882 pipecb (EV_A_ &pipe_w, EV_READ);
1883#endif
1740 } 1884 }
1741 1885
1742 postfork = 0; 1886 postfork = 0;
1743} 1887}
1744 1888
… …
1753 loop_init (EV_A_ flags); 1897 loop_init (EV_A_ flags);
1754 1898
1755 if (ev_backend (EV_A)) 1899 if (ev_backend (EV_A))
1756 return EV_A; 1900 return EV_A;
1757 1901
1902 ev_free (EV_A);
1758 return 0; 1903 return 0;
1759} 1904}
1760 1905
1761void
1762ev_loop_destroy (EV_P)
1763{
1764 loop_destroy (EV_A);
1765 ev_free (loop);
1766}
1767
1768void
1769ev_loop_fork (EV_P)
1770{
1771 postfork = 1; /* must be in line with ev_default_fork */
1772}
1773#endif /* multiplicity */ 1906#endif /* multiplicity */
1774 1907
1775#if EV_VERIFY 1908#if EV_VERIFY
1776static void noinline 1909static void noinline
1777verify_watcher (EV_P_ W w) 1910verify_watcher (EV_P_ W w)
… …
1806 verify_watcher (EV_A_ ws [cnt]); 1939 verify_watcher (EV_A_ ws [cnt]);
1807 } 1940 }
1808} 1941}
1809#endif 1942#endif
1810 1943
1811#if EV_MINIMAL < 2 1944#if EV_FEATURE_API
1812void 1945void
1813ev_loop_verify (EV_P) 1946ev_verify (EV_P)
1814{ 1947{
1815#if EV_VERIFY 1948#if EV_VERIFY
1816 int i; 1949 int i;
1817 WL w; 1950 WL w;
1818 1951
… …
1857#if EV_ASYNC_ENABLE 1990#if EV_ASYNC_ENABLE
1858 assert (asyncmax >= asynccnt); 1991 assert (asyncmax >= asynccnt);
1859 array_verify (EV_A_ (W *)asyncs, asynccnt); 1992 array_verify (EV_A_ (W *)asyncs, asynccnt);
1860#endif 1993#endif
1861 1994
1995#if EV_PREPARE_ENABLE
1862 assert (preparemax >= preparecnt); 1996 assert (preparemax >= preparecnt);
1863 array_verify (EV_A_ (W *)prepares, preparecnt); 1997 array_verify (EV_A_ (W *)prepares, preparecnt);
1998#endif
1864 1999
2000#if EV_CHECK_ENABLE
1865 assert (checkmax >= checkcnt); 2001 assert (checkmax >= checkcnt);
1866 array_verify (EV_A_ (W *)checks, checkcnt); 2002 array_verify (EV_A_ (W *)checks, checkcnt);
2003#endif
1867 2004
1868# if 0 2005# if 0
2006#if EV_CHILD_ENABLE
1869 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2007 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1870 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 2008 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2009#endif
1871# endif 2010# endif
1872#endif 2011#endif
1873} 2012}
1874#endif 2013#endif
1875 2014
1876#if EV_MULTIPLICITY 2015#if EV_MULTIPLICITY
1877struct ev_loop * 2016struct ev_loop *
1878ev_default_loop_init (unsigned int flags)
1879#else 2017#else
1880int 2018int
2019#endif
1881ev_default_loop (unsigned int flags) 2020ev_default_loop (unsigned int flags)
1882#endif
1883{ 2021{
1884 if (!ev_default_loop_ptr) 2022 if (!ev_default_loop_ptr)
1885 { 2023 {
1886#if EV_MULTIPLICITY 2024#if EV_MULTIPLICITY
1887 EV_P = ev_default_loop_ptr = &default_loop_struct; 2025 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1891 2029
1892 loop_init (EV_A_ flags); 2030 loop_init (EV_A_ flags);
1893 2031
1894 if (ev_backend (EV_A)) 2032 if (ev_backend (EV_A))
1895 { 2033 {
1896#ifndef _WIN32 2034#if EV_CHILD_ENABLE
1897 ev_signal_init (&childev, childcb, SIGCHLD); 2035 ev_signal_init (&childev, childcb, SIGCHLD);
1898 ev_set_priority (&childev, EV_MAXPRI); 2036 ev_set_priority (&childev, EV_MAXPRI);
1899 ev_signal_start (EV_A_ &childev); 2037 ev_signal_start (EV_A_ &childev);
1900 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2038 ev_unref (EV_A); /* child watcher should not keep loop alive */
1901#endif 2039#endif
… …
1906 2044
1907 return ev_default_loop_ptr; 2045 return ev_default_loop_ptr;
1908} 2046}
1909 2047
1910void 2048void
1911ev_default_destroy (void) 2049ev_loop_fork (EV_P)
1912{ 2050{
1913#if EV_MULTIPLICITY
1914 EV_P = ev_default_loop_ptr;
1915#endif
1916
1917 ev_default_loop_ptr = 0;
1918
1919#ifndef _WIN32
1920 ev_ref (EV_A); /* child watcher */
1921 ev_signal_stop (EV_A_ &childev);
1922#endif
1923
1924 loop_destroy (EV_A);
1925}
1926
1927void
1928ev_default_fork (void)
1929{
1930#if EV_MULTIPLICITY
1931 EV_P = ev_default_loop_ptr;
1932#endif
1933
1934 postfork = 1; /* must be in line with ev_loop_fork */ 2051 postfork = 1; /* must be in line with ev_default_fork */
1935} 2052}
1936 2053
1937/*****************************************************************************/ 2054/*****************************************************************************/
1938 2055
1939void 2056void
… …
2030 EV_FREQUENT_CHECK; 2147 EV_FREQUENT_CHECK;
2031 feed_reverse (EV_A_ (W)w); 2148 feed_reverse (EV_A_ (W)w);
2032 } 2149 }
2033 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2150 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2034 2151
2035 feed_reverse_done (EV_A_ EV_TIMEOUT); 2152 feed_reverse_done (EV_A_ EV_TIMER);
2036 } 2153 }
2037} 2154}
2038 2155
2039#if EV_PERIODIC_ENABLE 2156#if EV_PERIODIC_ENABLE
2040/* make periodics pending */ 2157/* make periodics pending */
… …
2093 feed_reverse_done (EV_A_ EV_PERIODIC); 2210 feed_reverse_done (EV_A_ EV_PERIODIC);
2094 } 2211 }
2095} 2212}
2096 2213
2097/* simply recalculate all periodics */ 2214/* simply recalculate all periodics */
2098/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2215/* TODO: maybe ensure that at least one event happens when jumping forward? */
2099static void noinline 2216static void noinline
2100periodics_reschedule (EV_P) 2217periodics_reschedule (EV_P)
2101{ 2218{
2102 int i; 2219 int i;
2103 2220
… …
2131 ANHE_at_cache (*he); 2248 ANHE_at_cache (*he);
2132 } 2249 }
2133} 2250}
2134 2251
2135/* fetch new monotonic and realtime times from the kernel */ 2252/* fetch new monotonic and realtime times from the kernel */
2136/* also detetc if there was a timejump, and act accordingly */ 2253/* also detect if there was a timejump, and act accordingly */
2137inline_speed void 2254inline_speed void
2138time_update (EV_P_ ev_tstamp max_block) 2255time_update (EV_P_ ev_tstamp max_block)
2139{ 2256{
2140#if EV_USE_MONOTONIC 2257#if EV_USE_MONOTONIC
2141 if (expect_true (have_monotonic)) 2258 if (expect_true (have_monotonic))
… …
2199 mn_now = ev_rt_now; 2316 mn_now = ev_rt_now;
2200 } 2317 }
2201} 2318}
2202 2319
2203void 2320void
2204ev_loop (EV_P_ int flags) 2321ev_run (EV_P_ int flags)
2205{ 2322{
2206#if EV_MINIMAL < 2 2323#if EV_FEATURE_API
2207 ++loop_depth; 2324 ++loop_depth;
2208#endif 2325#endif
2209 2326
2210 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2327 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2211 2328
2212 loop_done = EVUNLOOP_CANCEL; 2329 loop_done = EVBREAK_CANCEL;
2213 2330
2214 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2331 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2215 2332
2216 do 2333 do
2217 { 2334 {
2218#if EV_VERIFY >= 2 2335#if EV_VERIFY >= 2
2219 ev_loop_verify (EV_A); 2336 ev_verify (EV_A);
2220#endif 2337#endif
2221 2338
2222#ifndef _WIN32 2339#ifndef _WIN32
2223 if (expect_false (curpid)) /* penalise the forking check even more */ 2340 if (expect_false (curpid)) /* penalise the forking check even more */
2224 if (expect_false (getpid () != curpid)) 2341 if (expect_false (getpid () != curpid))
… …
2236 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2353 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2237 EV_INVOKE_PENDING; 2354 EV_INVOKE_PENDING;
2238 } 2355 }
2239#endif 2356#endif
2240 2357
2358#if EV_PREPARE_ENABLE
2241 /* queue prepare watchers (and execute them) */ 2359 /* queue prepare watchers (and execute them) */
2242 if (expect_false (preparecnt)) 2360 if (expect_false (preparecnt))
2243 { 2361 {
2244 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2362 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2245 EV_INVOKE_PENDING; 2363 EV_INVOKE_PENDING;
2246 } 2364 }
2365#endif
2247 2366
2248 if (expect_false (loop_done)) 2367 if (expect_false (loop_done))
2249 break; 2368 break;
2250 2369
2251 /* we might have forked, so reify kernel state if necessary */ 2370 /* we might have forked, so reify kernel state if necessary */
… …
2258 /* calculate blocking time */ 2377 /* calculate blocking time */
2259 { 2378 {
2260 ev_tstamp waittime = 0.; 2379 ev_tstamp waittime = 0.;
2261 ev_tstamp sleeptime = 0.; 2380 ev_tstamp sleeptime = 0.;
2262 2381
2382 /* remember old timestamp for io_blocktime calculation */
2383 ev_tstamp prev_mn_now = mn_now;
2384
2385 /* update time to cancel out callback processing overhead */
2386 time_update (EV_A_ 1e100);
2387
2263 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2388 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2264 { 2389 {
2265 /* remember old timestamp for io_blocktime calculation */
2266 ev_tstamp prev_mn_now = mn_now;
2267
2268 /* update time to cancel out callback processing overhead */
2269 time_update (EV_A_ 1e100);
2270
2271 waittime = MAX_BLOCKTIME; 2390 waittime = MAX_BLOCKTIME;
2272 2391
2273 if (timercnt) 2392 if (timercnt)
2274 { 2393 {
2275 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2394 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2302 waittime -= sleeptime; 2421 waittime -= sleeptime;
2303 } 2422 }
2304 } 2423 }
2305 } 2424 }
2306 2425
2307#if EV_MINIMAL < 2 2426#if EV_FEATURE_API
2308 ++loop_count; 2427 ++loop_count;
2309#endif 2428#endif
2310 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2429 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2311 backend_poll (EV_A_ waittime); 2430 backend_poll (EV_A_ waittime);
2312 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2431 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2313 2432
2314 /* update ev_rt_now, do magic */ 2433 /* update ev_rt_now, do magic */
2315 time_update (EV_A_ waittime + sleeptime); 2434 time_update (EV_A_ waittime + sleeptime);
2316 } 2435 }
2317 2436
… …
2324#if EV_IDLE_ENABLE 2443#if EV_IDLE_ENABLE
2325 /* queue idle watchers unless other events are pending */ 2444 /* queue idle watchers unless other events are pending */
2326 idle_reify (EV_A); 2445 idle_reify (EV_A);
2327#endif 2446#endif
2328 2447
2448#if EV_CHECK_ENABLE
2329 /* queue check watchers, to be executed first */ 2449 /* queue check watchers, to be executed first */
2330 if (expect_false (checkcnt)) 2450 if (expect_false (checkcnt))
2331 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2451 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2452#endif
2332 2453
2333 EV_INVOKE_PENDING; 2454 EV_INVOKE_PENDING;
2334 } 2455 }
2335 while (expect_true ( 2456 while (expect_true (
2336 activecnt 2457 activecnt
2337 && !loop_done 2458 && !loop_done
2338 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2459 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2339 )); 2460 ));
2340 2461
2341 if (loop_done == EVUNLOOP_ONE) 2462 if (loop_done == EVBREAK_ONE)
2342 loop_done = EVUNLOOP_CANCEL; 2463 loop_done = EVBREAK_CANCEL;
2343 2464
2344#if EV_MINIMAL < 2 2465#if EV_FEATURE_API
2345 --loop_depth; 2466 --loop_depth;
2346#endif 2467#endif
2347} 2468}
2348 2469
2349void 2470void
2350ev_unloop (EV_P_ int how) 2471ev_break (EV_P_ int how)
2351{ 2472{
2352 loop_done = how; 2473 loop_done = how;
2353} 2474}
2354 2475
2355void 2476void
… …
2475 2596
2476 if (expect_false (ev_is_active (w))) 2597 if (expect_false (ev_is_active (w)))
2477 return; 2598 return;
2478 2599
2479 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2600 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2480 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2601 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2481 2602
2482 EV_FREQUENT_CHECK; 2603 EV_FREQUENT_CHECK;
2483 2604
2484 ev_start (EV_A_ (W)w, 1); 2605 ev_start (EV_A_ (W)w, 1);
2485 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2606 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2503 EV_FREQUENT_CHECK; 2624 EV_FREQUENT_CHECK;
2504 2625
2505 wlist_del (&anfds[w->fd].head, (WL)w); 2626 wlist_del (&anfds[w->fd].head, (WL)w);
2506 ev_stop (EV_A_ (W)w); 2627 ev_stop (EV_A_ (W)w);
2507 2628
2508 fd_change (EV_A_ w->fd, 1); 2629 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2509 2630
2510 EV_FREQUENT_CHECK; 2631 EV_FREQUENT_CHECK;
2511} 2632}
2512 2633
2513void noinline 2634void noinline
… …
2555 timers [active] = timers [timercnt + HEAP0]; 2676 timers [active] = timers [timercnt + HEAP0];
2556 adjustheap (timers, timercnt, active); 2677 adjustheap (timers, timercnt, active);
2557 } 2678 }
2558 } 2679 }
2559 2680
2560 EV_FREQUENT_CHECK;
2561
2562 ev_at (w) -= mn_now; 2681 ev_at (w) -= mn_now;
2563 2682
2564 ev_stop (EV_A_ (W)w); 2683 ev_stop (EV_A_ (W)w);
2684
2685 EV_FREQUENT_CHECK;
2565} 2686}
2566 2687
2567void noinline 2688void noinline
2568ev_timer_again (EV_P_ ev_timer *w) 2689ev_timer_again (EV_P_ ev_timer *w)
2569{ 2690{
… …
2648 periodics [active] = periodics [periodiccnt + HEAP0]; 2769 periodics [active] = periodics [periodiccnt + HEAP0];
2649 adjustheap (periodics, periodiccnt, active); 2770 adjustheap (periodics, periodiccnt, active);
2650 } 2771 }
2651 } 2772 }
2652 2773
2653 EV_FREQUENT_CHECK;
2654
2655 ev_stop (EV_A_ (W)w); 2774 ev_stop (EV_A_ (W)w);
2775
2776 EV_FREQUENT_CHECK;
2656} 2777}
2657 2778
2658void noinline 2779void noinline
2659ev_periodic_again (EV_P_ ev_periodic *w) 2780ev_periodic_again (EV_P_ ev_periodic *w)
2660{ 2781{
… …
2665#endif 2786#endif
2666 2787
2667#ifndef SA_RESTART 2788#ifndef SA_RESTART
2668# define SA_RESTART 0 2789# define SA_RESTART 0
2669#endif 2790#endif
2791
2792#if EV_SIGNAL_ENABLE
2670 2793
2671void noinline 2794void noinline
2672ev_signal_start (EV_P_ ev_signal *w) 2795ev_signal_start (EV_P_ ev_signal *w)
2673{ 2796{
2674 if (expect_false (ev_is_active (w))) 2797 if (expect_false (ev_is_active (w)))
… …
2721 if (!((WL)w)->next) 2844 if (!((WL)w)->next)
2722# if EV_USE_SIGNALFD 2845# if EV_USE_SIGNALFD
2723 if (sigfd < 0) /*TODO*/ 2846 if (sigfd < 0) /*TODO*/
2724# endif 2847# endif
2725 { 2848 {
2726# if _WIN32 2849# ifdef _WIN32
2850 evpipe_init (EV_A);
2851
2727 signal (w->signum, ev_sighandler); 2852 signal (w->signum, ev_sighandler);
2728# else 2853# else
2729 struct sigaction sa; 2854 struct sigaction sa;
2730 2855
2731 evpipe_init (EV_A); 2856 evpipe_init (EV_A);
… …
2762 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2887 signals [w->signum - 1].loop = 0; /* unattach from signal */
2763#endif 2888#endif
2764#if EV_USE_SIGNALFD 2889#if EV_USE_SIGNALFD
2765 if (sigfd >= 0) 2890 if (sigfd >= 0)
2766 { 2891 {
2767 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2892 sigset_t ss;
2893
2894 sigemptyset (&ss);
2895 sigaddset (&ss, w->signum);
2768 sigdelset (&sigfd_set, w->signum); 2896 sigdelset (&sigfd_set, w->signum);
2897
2769 signalfd (sigfd, &sigfd_set, 0); 2898 signalfd (sigfd, &sigfd_set, 0);
2770 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2899 sigprocmask (SIG_UNBLOCK, &ss, 0);
2771 /*TODO: maybe unblock signal? */
2772 } 2900 }
2773 else 2901 else
2774#endif 2902#endif
2775 signal (w->signum, SIG_DFL); 2903 signal (w->signum, SIG_DFL);
2776 } 2904 }
2777 2905
2778 EV_FREQUENT_CHECK; 2906 EV_FREQUENT_CHECK;
2779} 2907}
2780 2908
2909#endif
2910
2911#if EV_CHILD_ENABLE
2912
2781void 2913void
2782ev_child_start (EV_P_ ev_child *w) 2914ev_child_start (EV_P_ ev_child *w)
2783{ 2915{
2784#if EV_MULTIPLICITY 2916#if EV_MULTIPLICITY
2785 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2917 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2788 return; 2920 return;
2789 2921
2790 EV_FREQUENT_CHECK; 2922 EV_FREQUENT_CHECK;
2791 2923
2792 ev_start (EV_A_ (W)w, 1); 2924 ev_start (EV_A_ (W)w, 1);
2793 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2925 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2794 2926
2795 EV_FREQUENT_CHECK; 2927 EV_FREQUENT_CHECK;
2796} 2928}
2797 2929
2798void 2930void
… …
2802 if (expect_false (!ev_is_active (w))) 2934 if (expect_false (!ev_is_active (w)))
2803 return; 2935 return;
2804 2936
2805 EV_FREQUENT_CHECK; 2937 EV_FREQUENT_CHECK;
2806 2938
2807 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2939 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2808 ev_stop (EV_A_ (W)w); 2940 ev_stop (EV_A_ (W)w);
2809 2941
2810 EV_FREQUENT_CHECK; 2942 EV_FREQUENT_CHECK;
2811} 2943}
2944
2945#endif
2812 2946
2813#if EV_STAT_ENABLE 2947#if EV_STAT_ENABLE
2814 2948
2815# ifdef _WIN32 2949# ifdef _WIN32
2816# undef lstat 2950# undef lstat
… …
2822#define MIN_STAT_INTERVAL 0.1074891 2956#define MIN_STAT_INTERVAL 0.1074891
2823 2957
2824static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2958static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2825 2959
2826#if EV_USE_INOTIFY 2960#if EV_USE_INOTIFY
2827# define EV_INOTIFY_BUFSIZE 8192 2961
2962/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2963# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2828 2964
2829static void noinline 2965static void noinline
2830infy_add (EV_P_ ev_stat *w) 2966infy_add (EV_P_ ev_stat *w)
2831{ 2967{
2832 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2968 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2833 2969
2834 if (w->wd < 0) 2970 if (w->wd >= 0)
2971 {
2972 struct statfs sfs;
2973
2974 /* now local changes will be tracked by inotify, but remote changes won't */
2975 /* unless the filesystem is known to be local, we therefore still poll */
2976 /* also do poll on <2.6.25, but with normal frequency */
2977
2978 if (!fs_2625)
2979 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2980 else if (!statfs (w->path, &sfs)
2981 && (sfs.f_type == 0x1373 /* devfs */
2982 || sfs.f_type == 0xEF53 /* ext2/3 */
2983 || sfs.f_type == 0x3153464a /* jfs */
2984 || sfs.f_type == 0x52654973 /* reiser3 */
2985 || sfs.f_type == 0x01021994 /* tempfs */
2986 || sfs.f_type == 0x58465342 /* xfs */))
2987 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2988 else
2989 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2835 { 2990 }
2991 else
2992 {
2993 /* can't use inotify, continue to stat */
2836 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2994 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2837 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2838 2995
2839 /* monitor some parent directory for speedup hints */ 2996 /* if path is not there, monitor some parent directory for speedup hints */
2840 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2997 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2841 /* but an efficiency issue only */ 2998 /* but an efficiency issue only */
2842 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2999 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2843 { 3000 {
2844 char path [4096]; 3001 char path [4096];
… …
2860 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3017 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2861 } 3018 }
2862 } 3019 }
2863 3020
2864 if (w->wd >= 0) 3021 if (w->wd >= 0)
2865 {
2866 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3022 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2867 3023
2868 /* now local changes will be tracked by inotify, but remote changes won't */ 3024 /* now re-arm timer, if required */
2869 /* unless the filesystem it known to be local, we therefore still poll */ 3025 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2870 /* also do poll on <2.6.25, but with normal frequency */
2871 struct statfs sfs;
2872
2873 if (fs_2625 && !statfs (w->path, &sfs))
2874 if (sfs.f_type == 0x1373 /* devfs */
2875 || sfs.f_type == 0xEF53 /* ext2/3 */
2876 || sfs.f_type == 0x3153464a /* jfs */
2877 || sfs.f_type == 0x52654973 /* reiser3 */
2878 || sfs.f_type == 0x01021994 /* tempfs */
2879 || sfs.f_type == 0x58465342 /* xfs */)
2880 return;
2881
2882 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2883 ev_timer_again (EV_A_ &w->timer); 3026 ev_timer_again (EV_A_ &w->timer);
2884 } 3027 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2885} 3028}
2886 3029
2887static void noinline 3030static void noinline
2888infy_del (EV_P_ ev_stat *w) 3031infy_del (EV_P_ ev_stat *w)
2889{ 3032{
… …
2892 3035
2893 if (wd < 0) 3036 if (wd < 0)
2894 return; 3037 return;
2895 3038
2896 w->wd = -2; 3039 w->wd = -2;
2897 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3040 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2898 wlist_del (&fs_hash [slot].head, (WL)w); 3041 wlist_del (&fs_hash [slot].head, (WL)w);
2899 3042
2900 /* remove this watcher, if others are watching it, they will rearm */ 3043 /* remove this watcher, if others are watching it, they will rearm */
2901 inotify_rm_watch (fs_fd, wd); 3044 inotify_rm_watch (fs_fd, wd);
2902} 3045}
… …
2904static void noinline 3047static void noinline
2905infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3048infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2906{ 3049{
2907 if (slot < 0) 3050 if (slot < 0)
2908 /* overflow, need to check for all hash slots */ 3051 /* overflow, need to check for all hash slots */
2909 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3052 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2910 infy_wd (EV_A_ slot, wd, ev); 3053 infy_wd (EV_A_ slot, wd, ev);
2911 else 3054 else
2912 { 3055 {
2913 WL w_; 3056 WL w_;
2914 3057
2915 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3058 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2916 { 3059 {
2917 ev_stat *w = (ev_stat *)w_; 3060 ev_stat *w = (ev_stat *)w_;
2918 w_ = w_->next; /* lets us remove this watcher and all before it */ 3061 w_ = w_->next; /* lets us remove this watcher and all before it */
2919 3062
2920 if (w->wd == wd || wd == -1) 3063 if (w->wd == wd || wd == -1)
2921 { 3064 {
2922 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3065 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2923 { 3066 {
2924 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3067 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2925 w->wd = -1; 3068 w->wd = -1;
2926 infy_add (EV_A_ w); /* re-add, no matter what */ 3069 infy_add (EV_A_ w); /* re-add, no matter what */
2927 } 3070 }
2928 3071
2929 stat_timer_cb (EV_A_ &w->timer, 0); 3072 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2934 3077
2935static void 3078static void
2936infy_cb (EV_P_ ev_io *w, int revents) 3079infy_cb (EV_P_ ev_io *w, int revents)
2937{ 3080{
2938 char buf [EV_INOTIFY_BUFSIZE]; 3081 char buf [EV_INOTIFY_BUFSIZE];
2939 struct inotify_event *ev = (struct inotify_event *)buf;
2940 int ofs; 3082 int ofs;
2941 int len = read (fs_fd, buf, sizeof (buf)); 3083 int len = read (fs_fd, buf, sizeof (buf));
2942 3084
2943 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3085 for (ofs = 0; ofs < len; )
3086 {
3087 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2944 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3088 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3089 ofs += sizeof (struct inotify_event) + ev->len;
3090 }
2945} 3091}
2946 3092
2947inline_size void 3093inline_size void
2948check_2625 (EV_P) 3094ev_check_2625 (EV_P)
2949{ 3095{
2950 /* kernels < 2.6.25 are borked 3096 /* kernels < 2.6.25 are borked
2951 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3097 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2952 */ 3098 */
2953 struct utsname buf; 3099 if (ev_linux_version () < 0x020619)
2954 int major, minor, micro;
2955
2956 if (uname (&buf))
2957 return; 3100 return;
2958 3101
2959 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2960 return;
2961
2962 if (major < 2
2963 || (major == 2 && minor < 6)
2964 || (major == 2 && minor == 6 && micro < 25))
2965 return;
2966
2967 fs_2625 = 1; 3102 fs_2625 = 1;
3103}
3104
3105inline_size int
3106infy_newfd (void)
3107{
3108#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3109 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3110 if (fd >= 0)
3111 return fd;
3112#endif
3113 return inotify_init ();
2968} 3114}
2969 3115
2970inline_size void 3116inline_size void
2971infy_init (EV_P) 3117infy_init (EV_P)
2972{ 3118{
2973 if (fs_fd != -2) 3119 if (fs_fd != -2)
2974 return; 3120 return;
2975 3121
2976 fs_fd = -1; 3122 fs_fd = -1;
2977 3123
2978 check_2625 (EV_A); 3124 ev_check_2625 (EV_A);
2979 3125
2980 fs_fd = inotify_init (); 3126 fs_fd = infy_newfd ();
2981 3127
2982 if (fs_fd >= 0) 3128 if (fs_fd >= 0)
2983 { 3129 {
3130 fd_intern (fs_fd);
2984 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3131 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2985 ev_set_priority (&fs_w, EV_MAXPRI); 3132 ev_set_priority (&fs_w, EV_MAXPRI);
2986 ev_io_start (EV_A_ &fs_w); 3133 ev_io_start (EV_A_ &fs_w);
3134 ev_unref (EV_A);
2987 } 3135 }
2988} 3136}
2989 3137
2990inline_size void 3138inline_size void
2991infy_fork (EV_P) 3139infy_fork (EV_P)
… …
2993 int slot; 3141 int slot;
2994 3142
2995 if (fs_fd < 0) 3143 if (fs_fd < 0)
2996 return; 3144 return;
2997 3145
3146 ev_ref (EV_A);
3147 ev_io_stop (EV_A_ &fs_w);
2998 close (fs_fd); 3148 close (fs_fd);
2999 fs_fd = inotify_init (); 3149 fs_fd = infy_newfd ();
3000 3150
3151 if (fs_fd >= 0)
3152 {
3153 fd_intern (fs_fd);
3154 ev_io_set (&fs_w, fs_fd, EV_READ);
3155 ev_io_start (EV_A_ &fs_w);
3156 ev_unref (EV_A);
3157 }
3158
3001 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3159 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3002 { 3160 {
3003 WL w_ = fs_hash [slot].head; 3161 WL w_ = fs_hash [slot].head;
3004 fs_hash [slot].head = 0; 3162 fs_hash [slot].head = 0;
3005 3163
3006 while (w_) 3164 while (w_)
… …
3011 w->wd = -1; 3169 w->wd = -1;
3012 3170
3013 if (fs_fd >= 0) 3171 if (fs_fd >= 0)
3014 infy_add (EV_A_ w); /* re-add, no matter what */ 3172 infy_add (EV_A_ w); /* re-add, no matter what */
3015 else 3173 else
3174 {
3175 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3176 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3016 ev_timer_again (EV_A_ &w->timer); 3177 ev_timer_again (EV_A_ &w->timer);
3178 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3179 }
3017 } 3180 }
3018 } 3181 }
3019} 3182}
3020 3183
3021#endif 3184#endif
… …
3038static void noinline 3201static void noinline
3039stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3202stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3040{ 3203{
3041 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3204 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3042 3205
3043 /* we copy this here each the time so that */ 3206 ev_statdata prev = w->attr;
3044 /* prev has the old value when the callback gets invoked */
3045 w->prev = w->attr;
3046 ev_stat_stat (EV_A_ w); 3207 ev_stat_stat (EV_A_ w);
3047 3208
3048 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3209 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3049 if ( 3210 if (
3050 w->prev.st_dev != w->attr.st_dev 3211 prev.st_dev != w->attr.st_dev
3051 || w->prev.st_ino != w->attr.st_ino 3212 || prev.st_ino != w->attr.st_ino
3052 || w->prev.st_mode != w->attr.st_mode 3213 || prev.st_mode != w->attr.st_mode
3053 || w->prev.st_nlink != w->attr.st_nlink 3214 || prev.st_nlink != w->attr.st_nlink
3054 || w->prev.st_uid != w->attr.st_uid 3215 || prev.st_uid != w->attr.st_uid
3055 || w->prev.st_gid != w->attr.st_gid 3216 || prev.st_gid != w->attr.st_gid
3056 || w->prev.st_rdev != w->attr.st_rdev 3217 || prev.st_rdev != w->attr.st_rdev
3057 || w->prev.st_size != w->attr.st_size 3218 || prev.st_size != w->attr.st_size
3058 || w->prev.st_atime != w->attr.st_atime 3219 || prev.st_atime != w->attr.st_atime
3059 || w->prev.st_mtime != w->attr.st_mtime 3220 || prev.st_mtime != w->attr.st_mtime
3060 || w->prev.st_ctime != w->attr.st_ctime 3221 || prev.st_ctime != w->attr.st_ctime
3061 ) { 3222 ) {
3223 /* we only update w->prev on actual differences */
3224 /* in case we test more often than invoke the callback, */
3225 /* to ensure that prev is always different to attr */
3226 w->prev = prev;
3227
3062 #if EV_USE_INOTIFY 3228 #if EV_USE_INOTIFY
3063 if (fs_fd >= 0) 3229 if (fs_fd >= 0)
3064 { 3230 {
3065 infy_del (EV_A_ w); 3231 infy_del (EV_A_ w);
3066 infy_add (EV_A_ w); 3232 infy_add (EV_A_ w);
… …
3091 3257
3092 if (fs_fd >= 0) 3258 if (fs_fd >= 0)
3093 infy_add (EV_A_ w); 3259 infy_add (EV_A_ w);
3094 else 3260 else
3095#endif 3261#endif
3262 {
3096 ev_timer_again (EV_A_ &w->timer); 3263 ev_timer_again (EV_A_ &w->timer);
3264 ev_unref (EV_A);
3265 }
3097 3266
3098 ev_start (EV_A_ (W)w, 1); 3267 ev_start (EV_A_ (W)w, 1);
3099 3268
3100 EV_FREQUENT_CHECK; 3269 EV_FREQUENT_CHECK;
3101} 3270}
… …
3110 EV_FREQUENT_CHECK; 3279 EV_FREQUENT_CHECK;
3111 3280
3112#if EV_USE_INOTIFY 3281#if EV_USE_INOTIFY
3113 infy_del (EV_A_ w); 3282 infy_del (EV_A_ w);
3114#endif 3283#endif
3284
3285 if (ev_is_active (&w->timer))
3286 {
3287 ev_ref (EV_A);
3115 ev_timer_stop (EV_A_ &w->timer); 3288 ev_timer_stop (EV_A_ &w->timer);
3289 }
3116 3290
3117 ev_stop (EV_A_ (W)w); 3291 ev_stop (EV_A_ (W)w);
3118 3292
3119 EV_FREQUENT_CHECK; 3293 EV_FREQUENT_CHECK;
3120} 3294}
… …
3165 3339
3166 EV_FREQUENT_CHECK; 3340 EV_FREQUENT_CHECK;
3167} 3341}
3168#endif 3342#endif
3169 3343
3344#if EV_PREPARE_ENABLE
3170void 3345void
3171ev_prepare_start (EV_P_ ev_prepare *w) 3346ev_prepare_start (EV_P_ ev_prepare *w)
3172{ 3347{
3173 if (expect_false (ev_is_active (w))) 3348 if (expect_false (ev_is_active (w)))
3174 return; 3349 return;
… …
3200 3375
3201 ev_stop (EV_A_ (W)w); 3376 ev_stop (EV_A_ (W)w);
3202 3377
3203 EV_FREQUENT_CHECK; 3378 EV_FREQUENT_CHECK;
3204} 3379}
3380#endif
3205 3381
3382#if EV_CHECK_ENABLE
3206void 3383void
3207ev_check_start (EV_P_ ev_check *w) 3384ev_check_start (EV_P_ ev_check *w)
3208{ 3385{
3209 if (expect_false (ev_is_active (w))) 3386 if (expect_false (ev_is_active (w)))
3210 return; 3387 return;
… …
3236 3413
3237 ev_stop (EV_A_ (W)w); 3414 ev_stop (EV_A_ (W)w);
3238 3415
3239 EV_FREQUENT_CHECK; 3416 EV_FREQUENT_CHECK;
3240} 3417}
3418#endif
3241 3419
3242#if EV_EMBED_ENABLE 3420#if EV_EMBED_ENABLE
3243void noinline 3421void noinline
3244ev_embed_sweep (EV_P_ ev_embed *w) 3422ev_embed_sweep (EV_P_ ev_embed *w)
3245{ 3423{
3246 ev_loop (w->other, EVLOOP_NONBLOCK); 3424 ev_run (w->other, EVRUN_NOWAIT);
3247} 3425}
3248 3426
3249static void 3427static void
3250embed_io_cb (EV_P_ ev_io *io, int revents) 3428embed_io_cb (EV_P_ ev_io *io, int revents)
3251{ 3429{
3252 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3430 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3253 3431
3254 if (ev_cb (w)) 3432 if (ev_cb (w))
3255 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3433 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3256 else 3434 else
3257 ev_loop (w->other, EVLOOP_NONBLOCK); 3435 ev_run (w->other, EVRUN_NOWAIT);
3258} 3436}
3259 3437
3260static void 3438static void
3261embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3439embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3262{ 3440{
… …
3266 EV_P = w->other; 3444 EV_P = w->other;
3267 3445
3268 while (fdchangecnt) 3446 while (fdchangecnt)
3269 { 3447 {
3270 fd_reify (EV_A); 3448 fd_reify (EV_A);
3271 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3449 ev_run (EV_A_ EVRUN_NOWAIT);
3272 } 3450 }
3273 } 3451 }
3274} 3452}
3275 3453
3276static void 3454static void
… …
3282 3460
3283 { 3461 {
3284 EV_P = w->other; 3462 EV_P = w->other;
3285 3463
3286 ev_loop_fork (EV_A); 3464 ev_loop_fork (EV_A);
3287 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3465 ev_run (EV_A_ EVRUN_NOWAIT);
3288 } 3466 }
3289 3467
3290 ev_embed_start (EV_A_ w); 3468 ev_embed_start (EV_A_ w);
3291} 3469}
3292 3470
… …
3340 3518
3341 ev_io_stop (EV_A_ &w->io); 3519 ev_io_stop (EV_A_ &w->io);
3342 ev_prepare_stop (EV_A_ &w->prepare); 3520 ev_prepare_stop (EV_A_ &w->prepare);
3343 ev_fork_stop (EV_A_ &w->fork); 3521 ev_fork_stop (EV_A_ &w->fork);
3344 3522
3523 ev_stop (EV_A_ (W)w);
3524
3345 EV_FREQUENT_CHECK; 3525 EV_FREQUENT_CHECK;
3346} 3526}
3347#endif 3527#endif
3348 3528
3349#if EV_FORK_ENABLE 3529#if EV_FORK_ENABLE
… …
3388void 3568void
3389ev_async_start (EV_P_ ev_async *w) 3569ev_async_start (EV_P_ ev_async *w)
3390{ 3570{
3391 if (expect_false (ev_is_active (w))) 3571 if (expect_false (ev_is_active (w)))
3392 return; 3572 return;
3573
3574 w->sent = 0;
3393 3575
3394 evpipe_init (EV_A); 3576 evpipe_init (EV_A);
3395 3577
3396 EV_FREQUENT_CHECK; 3578 EV_FREQUENT_CHECK;
3397 3579
… …
3475{ 3657{
3476 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3658 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3477 3659
3478 if (expect_false (!once)) 3660 if (expect_false (!once))
3479 { 3661 {
3480 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3662 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3481 return; 3663 return;
3482 } 3664 }
3483 3665
3484 once->cb = cb; 3666 once->cb = cb;
3485 once->arg = arg; 3667 once->arg = arg;
… …
3572 if (types & EV_ASYNC) 3754 if (types & EV_ASYNC)
3573 for (i = asynccnt; i--; ) 3755 for (i = asynccnt; i--; )
3574 cb (EV_A_ EV_ASYNC, asyncs [i]); 3756 cb (EV_A_ EV_ASYNC, asyncs [i]);
3575#endif 3757#endif
3576 3758
3759#if EV_PREPARE_ENABLE
3577 if (types & EV_PREPARE) 3760 if (types & EV_PREPARE)
3578 for (i = preparecnt; i--; ) 3761 for (i = preparecnt; i--; )
3579#if EV_EMBED_ENABLE 3762# if EV_EMBED_ENABLE
3580 if (ev_cb (prepares [i]) != embed_prepare_cb) 3763 if (ev_cb (prepares [i]) != embed_prepare_cb)
3581#endif 3764# endif
3582 cb (EV_A_ EV_PREPARE, prepares [i]); 3765 cb (EV_A_ EV_PREPARE, prepares [i]);
3766#endif
3583 3767
3768#if EV_CHECK_ENABLE
3584 if (types & EV_CHECK) 3769 if (types & EV_CHECK)
3585 for (i = checkcnt; i--; ) 3770 for (i = checkcnt; i--; )
3586 cb (EV_A_ EV_CHECK, checks [i]); 3771 cb (EV_A_ EV_CHECK, checks [i]);
3772#endif
3587 3773
3774#if EV_SIGNAL_ENABLE
3588 if (types & EV_SIGNAL) 3775 if (types & EV_SIGNAL)
3589 for (i = 0; i < EV_NSIG - 1; ++i) 3776 for (i = 0; i < EV_NSIG - 1; ++i)
3590 for (wl = signals [i].head; wl; ) 3777 for (wl = signals [i].head; wl; )
3591 { 3778 {
3592 wn = wl->next; 3779 wn = wl->next;
3593 cb (EV_A_ EV_SIGNAL, wl); 3780 cb (EV_A_ EV_SIGNAL, wl);
3594 wl = wn; 3781 wl = wn;
3595 } 3782 }
3783#endif
3596 3784
3785#if EV_CHILD_ENABLE
3597 if (types & EV_CHILD) 3786 if (types & EV_CHILD)
3598 for (i = EV_PID_HASHSIZE; i--; ) 3787 for (i = (EV_PID_HASHSIZE); i--; )
3599 for (wl = childs [i]; wl; ) 3788 for (wl = childs [i]; wl; )
3600 { 3789 {
3601 wn = wl->next; 3790 wn = wl->next;
3602 cb (EV_A_ EV_CHILD, wl); 3791 cb (EV_A_ EV_CHILD, wl);
3603 wl = wn; 3792 wl = wn;
3604 } 3793 }
3794#endif
3605/* EV_STAT 0x00001000 /* stat data changed */ 3795/* EV_STAT 0x00001000 /* stat data changed */
3606/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3796/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3607} 3797}
3608#endif 3798#endif
3609 3799
3610#if EV_MULTIPLICITY 3800#if EV_MULTIPLICITY
3611 #include "ev_wrap.h" 3801 #include "ev_wrap.h"
3612#endif 3802#endif
3613 3803
3614#ifdef __cplusplus 3804EV_CPP(})
3615}
3616#endif
3617 3805

Diff Legend

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