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

Comparing libev/ev.c (file contents):
Revision 1.301 by root, Wed Jul 15 16:58:53 2009 UTC vs.
Revision 1.369 by root, Sun Jan 23 18:53:06 2011 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,2011 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
141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
138# ifndef EV_USE_EVENTFD 142# ifndef EV_USE_SIGNALFD
139# if HAVE_EVENTFD 143# define EV_USE_SIGNALFD EV_FEATURE_OS
140# define EV_USE_EVENTFD 1
141# else
142# define EV_USE_EVENTFD 0
143# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
148# endif
149
150# if HAVE_EVENTFD
151# ifndef EV_USE_EVENTFD
152# define EV_USE_EVENTFD EV_FEATURE_OS
153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
144# endif 157# endif
145 158
146#endif 159#endif
147 160
148#include <math.h> 161#include <math.h>
149#include <stdlib.h> 162#include <stdlib.h>
163#include <string.h>
150#include <fcntl.h> 164#include <fcntl.h>
151#include <stddef.h> 165#include <stddef.h>
152 166
153#include <stdio.h> 167#include <stdio.h>
154 168
155#include <assert.h> 169#include <assert.h>
156#include <errno.h> 170#include <errno.h>
157#include <sys/types.h> 171#include <sys/types.h>
158#include <time.h> 172#include <time.h>
173#include <limits.h>
159 174
160#include <signal.h> 175#include <signal.h>
161 176
162#ifdef EV_H 177#ifdef EV_H
163# include EV_H 178# include EV_H
164#else 179#else
165# include "ev.h" 180# include "ev.h"
166#endif 181#endif
182
183EV_CPP(extern "C" {)
167 184
168#ifndef _WIN32 185#ifndef _WIN32
169# include <sys/time.h> 186# include <sys/time.h>
170# include <sys/wait.h> 187# include <sys/wait.h>
171# include <unistd.h> 188# include <unistd.h>
… …
174# define WIN32_LEAN_AND_MEAN 191# define WIN32_LEAN_AND_MEAN
175# include <windows.h> 192# include <windows.h>
176# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
177# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
178# endif 195# endif
196# undef EV_AVOID_STDIO
179#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
180 206
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 207/* this block tries to deduce configuration from header-defined symbols and defaults */
208
209/* try to deduce the maximum number of signals on this platform */
210#if defined (EV_NSIG)
211/* use what's provided */
212#elif defined (NSIG)
213# define EV_NSIG (NSIG)
214#elif defined(_NSIG)
215# define EV_NSIG (_NSIG)
216#elif defined (SIGMAX)
217# define EV_NSIG (SIGMAX+1)
218#elif defined (SIG_MAX)
219# define EV_NSIG (SIG_MAX+1)
220#elif defined (_SIG_MAX)
221# define EV_NSIG (_SIG_MAX+1)
222#elif defined (MAXSIG)
223# define EV_NSIG (MAXSIG+1)
224#elif defined (MAX_SIG)
225# define EV_NSIG (MAX_SIG+1)
226#elif defined (SIGARRAYSIZE)
227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
228#elif defined (_sys_nsig)
229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
230#else
231# error "unable to find value for NSIG, please report"
232/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */
234# define EV_NSIG 65
235#endif
182 236
183#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
186# else 240# else
187# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
188# endif 242# endif
189#endif 243#endif
190 244
191#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
192# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
193# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
194# else 248# else
195# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
196# endif 250# endif
197#endif 251#endif
198 252
… …
200# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
201#endif 255#endif
202 256
203#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
204# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
205# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
206# else 260# else
207# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
208# endif 262# endif
209#endif 263#endif
210 264
211#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
212# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
213#endif 267#endif
214 268
215#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
216# ifdef _WIN32 270# ifdef _WIN32
217# define EV_USE_POLL 0 271# define EV_USE_POLL 0
218# else 272# else
219# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
220# endif 274# endif
221#endif 275#endif
222 276
223#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
224# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
225# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
226# else 280# else
227# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
228# endif 282# endif
229#endif 283#endif
230 284
… …
236# define EV_USE_PORT 0 290# define EV_USE_PORT 0
237#endif 291#endif
238 292
239#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
240# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
241# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
242# else 296# else
243# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
244# endif 298# endif
245#endif 299#endif
246 300
247#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
248# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
249# define EV_PID_HASHSIZE 1
250# else
251# define EV_PID_HASHSIZE 16
252# endif
253#endif 303#endif
254 304
255#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
256# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
257# define EV_INOTIFY_HASHSIZE 1
258# else
259# define EV_INOTIFY_HASHSIZE 16
260# endif
261#endif 307#endif
262 308
263#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
266# else 312# else
267# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
314# endif
315#endif
316
317#ifndef EV_USE_SIGNALFD
318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
319# define EV_USE_SIGNALFD EV_FEATURE_OS
320# else
321# define EV_USE_SIGNALFD 0
268# endif 322# endif
269#endif 323#endif
270 324
271#if 0 /* debugging */ 325#if 0 /* debugging */
272# define EV_VERIFY 3 326# define EV_VERIFY 3
273# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
274# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
275#endif 329#endif
276 330
277#ifndef EV_VERIFY 331#ifndef EV_VERIFY
278# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
279#endif 333#endif
280 334
281#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
282# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
283#endif 337#endif
284 338
285#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
286# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
287#endif 341#endif
288 342
289/* 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, */
290/* which makes programs even slower. might work on other unices, too. */ 344/* which makes programs even slower. might work on other unices, too. */
291#if EV_USE_CLOCK_SYSCALL 345#if EV_USE_CLOCK_SYSCALL
… …
300# endif 354# endif
301#endif 355#endif
302 356
303/* 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 */
304 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
305#ifndef CLOCK_MONOTONIC 365#ifndef CLOCK_MONOTONIC
306# undef EV_USE_MONOTONIC 366# undef EV_USE_MONOTONIC
307# define EV_USE_MONOTONIC 0 367# define EV_USE_MONOTONIC 0
308#endif 368#endif
309 369
… …
322# include <sys/select.h> 382# include <sys/select.h>
323# endif 383# endif
324#endif 384#endif
325 385
326#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
327# include <sys/utsname.h>
328# include <sys/statfs.h> 387# include <sys/statfs.h>
329# include <sys/inotify.h> 388# include <sys/inotify.h>
330/* 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 */
331# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
332# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
339#endif 398#endif
340 399
341#if EV_USE_EVENTFD 400#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 401/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 402# include <stdint.h>
344# ifdef __cplusplus 403# ifndef EFD_NONBLOCK
345extern "C" { 404# define EFD_NONBLOCK O_NONBLOCK
346# endif 405# endif
347int eventfd (unsigned int initval, int flags); 406# ifndef EFD_CLOEXEC
348# ifdef __cplusplus 407# ifdef O_CLOEXEC
349} 408# define EFD_CLOEXEC O_CLOEXEC
409# else
410# define EFD_CLOEXEC 02000000
411# endif
350# endif 412# endif
413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
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
421# endif
422# ifndef SFD_CLOEXEC
423# ifdef O_CLOEXEC
424# define SFD_CLOEXEC O_CLOEXEC
425# else
426# define SFD_CLOEXEC 02000000
427# endif
428# endif
429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
430
431struct signalfd_siginfo
432{
433 uint32_t ssi_signo;
434 char pad[128 - sizeof (uint32_t)];
435};
351#endif 436#endif
352 437
353/**/ 438/**/
354 439
355#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
357#else 442#else
358# define EV_FREQUENT_CHECK do { } while (0) 443# define EV_FREQUENT_CHECK do { } while (0)
359#endif 444#endif
360 445
361/* 446/*
… …
368 */ 453 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 455
371#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) */
372#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) */
373/*#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)
374 461
375#if __GNUC__ >= 4 462#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
378#else 465#else
… …
385 472
386#define expect_false(expr) expect ((expr) != 0, 0) 473#define expect_false(expr) expect ((expr) != 0, 0)
387#define expect_true(expr) expect ((expr) != 0, 1) 474#define expect_true(expr) expect ((expr) != 0, 1)
388#define inline_size static inline 475#define inline_size static inline
389 476
390#if EV_MINIMAL 477#if EV_FEATURE_CODE
478# define inline_speed static inline
479#else
391# define inline_speed static noinline 480# define inline_speed static noinline
392#else
393# define inline_speed static inline
394#endif 481#endif
395 482
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
397 484
398#if EV_MINPRI == EV_MAXPRI 485#if EV_MINPRI == EV_MAXPRI
… …
411#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
412#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
413 500
414#if EV_USE_REALTIME 501#if EV_USE_REALTIME
415/* 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 */
416/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
417static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
418#endif 505#endif
419 506
420#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
422#endif 509#endif
423 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
424#ifdef _WIN32 521#ifdef _WIN32
425# include "ev_win32.c" 522# include "ev_win32.c"
426#endif 523#endif
427 524
428/*****************************************************************************/ 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
429 576
430static void (*syserr_cb)(const char *msg); 577static void (*syserr_cb)(const char *msg);
431 578
432void 579void
433ev_set_syserr_cb (void (*cb)(const char *msg)) 580ev_set_syserr_cb (void (*cb)(const char *msg))
… …
443 590
444 if (syserr_cb) 591 if (syserr_cb)
445 syserr_cb (msg); 592 syserr_cb (msg);
446 else 593 else
447 { 594 {
595#if EV_AVOID_STDIO
596 ev_printerr (msg);
597 ev_printerr (": ");
598 ev_printerr (strerror (errno));
599 ev_printerr ("\n");
600#else
448 perror (msg); 601 perror (msg);
602#endif
449 abort (); 603 abort ();
450 } 604 }
451} 605}
452 606
453static void * 607static void *
454ev_realloc_emul (void *ptr, long size) 608ev_realloc_emul (void *ptr, long size)
455{ 609{
610#if __GLIBC__
611 return realloc (ptr, size);
612#else
456 /* some systems, notably openbsd and darwin, fail to properly 613 /* some systems, notably openbsd and darwin, fail to properly
457 * implement realloc (x, 0) (as required by both ansi c-98 and 614 * implement realloc (x, 0) (as required by both ansi c-89 and
458 * the single unix specification, so work around them here. 615 * the single unix specification, so work around them here.
459 */ 616 */
460 617
461 if (size) 618 if (size)
462 return realloc (ptr, size); 619 return realloc (ptr, size);
463 620
464 free (ptr); 621 free (ptr);
465 return 0; 622 return 0;
623#endif
466} 624}
467 625
468static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 626static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
469 627
470void 628void
… …
478{ 636{
479 ptr = alloc (ptr, size); 637 ptr = alloc (ptr, size);
480 638
481 if (!ptr && size) 639 if (!ptr && size)
482 { 640 {
641#if EV_AVOID_STDIO
642 ev_printerr ("(libev) memory allocation failed, aborting.\n");
643#else
483 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 644 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
645#endif
484 abort (); 646 abort ();
485 } 647 }
486 648
487 return ptr; 649 return ptr;
488} 650}
… …
504 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 666 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
505 unsigned char unused; 667 unsigned char unused;
506#if EV_USE_EPOLL 668#if EV_USE_EPOLL
507 unsigned int egen; /* generation counter to counter epoll bugs */ 669 unsigned int egen; /* generation counter to counter epoll bugs */
508#endif 670#endif
509#if EV_SELECT_IS_WINSOCKET 671#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
510 SOCKET handle; 672 SOCKET handle;
673#endif
674#if EV_USE_IOCP
675 OVERLAPPED or, ow;
511#endif 676#endif
512} ANFD; 677} ANFD;
513 678
514/* stores the pending event set for a given watcher */ 679/* stores the pending event set for a given watcher */
515typedef struct 680typedef struct
… …
570 735
571 static int ev_default_loop_ptr; 736 static int ev_default_loop_ptr;
572 737
573#endif 738#endif
574 739
575#if EV_MINIMAL < 2 740#if EV_FEATURE_API
576# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 741# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
577# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 742# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
578# define EV_INVOKE_PENDING invoke_cb (EV_A) 743# define EV_INVOKE_PENDING invoke_cb (EV_A)
579#else 744#else
580# define EV_RELEASE_CB (void)0 745# define EV_RELEASE_CB (void)0
581# define EV_ACQUIRE_CB (void)0 746# define EV_ACQUIRE_CB (void)0
582# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 747# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
583#endif 748#endif
584 749
585#define EVUNLOOP_RECURSE 0x80 750#define EVBREAK_RECURSE 0x80
586 751
587/*****************************************************************************/ 752/*****************************************************************************/
588 753
589#ifndef EV_HAVE_EV_TIME 754#ifndef EV_HAVE_EV_TIME
590ev_tstamp 755ev_tstamp
… …
634 if (delay > 0.) 799 if (delay > 0.)
635 { 800 {
636#if EV_USE_NANOSLEEP 801#if EV_USE_NANOSLEEP
637 struct timespec ts; 802 struct timespec ts;
638 803
639 ts.tv_sec = (time_t)delay; 804 EV_TS_SET (ts, delay);
640 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
641
642 nanosleep (&ts, 0); 805 nanosleep (&ts, 0);
643#elif defined(_WIN32) 806#elif defined(_WIN32)
644 Sleep ((unsigned long)(delay * 1e3)); 807 Sleep ((unsigned long)(delay * 1e3));
645#else 808#else
646 struct timeval tv; 809 struct timeval tv;
647 810
648 tv.tv_sec = (time_t)delay;
649 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
650
651 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 811 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
652 /* somehting not guaranteed by newer posix versions, but guaranteed */ 812 /* something not guaranteed by newer posix versions, but guaranteed */
653 /* by older ones */ 813 /* by older ones */
814 EV_TV_SET (tv, delay);
654 select (0, 0, 0, 0, &tv); 815 select (0, 0, 0, 0, &tv);
655#endif 816#endif
656 } 817 }
657} 818}
658 819
820inline_speed int
821ev_timeout_to_ms (ev_tstamp timeout)
822{
823 int ms = timeout * 1000. + .999999;
824
825 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
826}
827
659/*****************************************************************************/ 828/*****************************************************************************/
660 829
661#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 830#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
662 831
663/* find a suitable new size for the given array, */ 832/* find a suitable new size for the given array, */
664/* hopefully by rounding to a ncie-to-malloc size */ 833/* hopefully by rounding to a nice-to-malloc size */
665inline_size int 834inline_size int
666array_nextsize (int elem, int cur, int cnt) 835array_nextsize (int elem, int cur, int cnt)
667{ 836{
668 int ncur = cur + 1; 837 int ncur = cur + 1;
669 838
… …
765} 934}
766 935
767/*****************************************************************************/ 936/*****************************************************************************/
768 937
769inline_speed void 938inline_speed void
770fd_event_nc (EV_P_ int fd, int revents) 939fd_event_nocheck (EV_P_ int fd, int revents)
771{ 940{
772 ANFD *anfd = anfds + fd; 941 ANFD *anfd = anfds + fd;
773 ev_io *w; 942 ev_io *w;
774 943
775 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 944 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
787fd_event (EV_P_ int fd, int revents) 956fd_event (EV_P_ int fd, int revents)
788{ 957{
789 ANFD *anfd = anfds + fd; 958 ANFD *anfd = anfds + fd;
790 959
791 if (expect_true (!anfd->reify)) 960 if (expect_true (!anfd->reify))
792 fd_event_nc (EV_A_ fd, revents); 961 fd_event_nocheck (EV_A_ fd, revents);
793} 962}
794 963
795void 964void
796ev_feed_fd_event (EV_P_ int fd, int revents) 965ev_feed_fd_event (EV_P_ int fd, int revents)
797{ 966{
798 if (fd >= 0 && fd < anfdmax) 967 if (fd >= 0 && fd < anfdmax)
799 fd_event_nc (EV_A_ fd, revents); 968 fd_event_nocheck (EV_A_ fd, revents);
800} 969}
801 970
802/* make sure the external fd watch events are in-sync */ 971/* make sure the external fd watch events are in-sync */
803/* with the kernel/libev internal state */ 972/* with the kernel/libev internal state */
804inline_size void 973inline_size void
… …
810 { 979 {
811 int fd = fdchanges [i]; 980 int fd = fdchanges [i];
812 ANFD *anfd = anfds + fd; 981 ANFD *anfd = anfds + fd;
813 ev_io *w; 982 ev_io *w;
814 983
815 unsigned char events = 0; 984 unsigned char o_events = anfd->events;
985 unsigned char o_reify = anfd->reify;
816 986
817 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 987 anfd->reify = 0;
818 events |= (unsigned char)w->events;
819 988
820#if EV_SELECT_IS_WINSOCKET 989#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
821 if (events) 990 if (o_reify & EV__IOFDSET)
822 { 991 {
823 unsigned long arg; 992 unsigned long arg;
824 #ifdef EV_FD_TO_WIN32_HANDLE
825 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 993 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
826 #else
827 anfd->handle = _get_osfhandle (fd);
828 #endif
829 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 994 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
995 printf ("oi %d %x\n", fd, anfd->handle);//D
830 } 996 }
831#endif 997#endif
832 998
999 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
833 { 1000 {
834 unsigned char o_events = anfd->events;
835 unsigned char o_reify = anfd->reify;
836
837 anfd->reify = 0;
838 anfd->events = events; 1001 anfd->events = 0;
839 1002
840 if (o_events != events || o_reify & EV__IOFDSET) 1003 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1004 anfd->events |= (unsigned char)w->events;
1005
1006 if (o_events != anfd->events)
1007 o_reify = EV__IOFDSET; /* actually |= */
1008 }
1009
1010 if (o_reify & EV__IOFDSET)
841 backend_modify (EV_A_ fd, o_events, events); 1011 backend_modify (EV_A_ fd, o_events, anfd->events);
842 }
843 } 1012 }
844 1013
845 fdchangecnt = 0; 1014 fdchangecnt = 0;
846} 1015}
847 1016
… …
871 ev_io_stop (EV_A_ w); 1040 ev_io_stop (EV_A_ w);
872 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1041 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
873 } 1042 }
874} 1043}
875 1044
876/* check whether the given fd is atcually valid, for error recovery */ 1045/* check whether the given fd is actually valid, for error recovery */
877inline_size int 1046inline_size int
878fd_valid (int fd) 1047fd_valid (int fd)
879{ 1048{
880#ifdef _WIN32 1049#ifdef _WIN32
881 return _get_osfhandle (fd) != -1; 1050 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
882#else 1051#else
883 return fcntl (fd, F_GETFD) != -1; 1052 return fcntl (fd, F_GETFD) != -1;
884#endif 1053#endif
885} 1054}
886 1055
… …
904 1073
905 for (fd = anfdmax; fd--; ) 1074 for (fd = anfdmax; fd--; )
906 if (anfds [fd].events) 1075 if (anfds [fd].events)
907 { 1076 {
908 fd_kill (EV_A_ fd); 1077 fd_kill (EV_A_ fd);
909 return; 1078 break;
910 } 1079 }
911} 1080}
912 1081
913/* usually called after fork if backend needs to re-arm all fds from scratch */ 1082/* usually called after fork if backend needs to re-arm all fds from scratch */
914static void noinline 1083static void noinline
… …
923 anfds [fd].emask = 0; 1092 anfds [fd].emask = 0;
924 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1093 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
925 } 1094 }
926} 1095}
927 1096
1097/* used to prepare libev internal fd's */
1098/* this is not fork-safe */
1099inline_speed void
1100fd_intern (int fd)
1101{
1102#ifdef _WIN32
1103 unsigned long arg = 1;
1104 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1105#else
1106 fcntl (fd, F_SETFD, FD_CLOEXEC);
1107 fcntl (fd, F_SETFL, O_NONBLOCK);
1108#endif
1109}
1110
928/*****************************************************************************/ 1111/*****************************************************************************/
929 1112
930/* 1113/*
931 * the heap functions want a real array index. array index 0 uis guaranteed to not 1114 * the heap functions want a real array index. array index 0 is guaranteed to not
932 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1115 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
933 * the branching factor of the d-tree. 1116 * the branching factor of the d-tree.
934 */ 1117 */
935 1118
936/* 1119/*
… …
1004 1187
1005 for (;;) 1188 for (;;)
1006 { 1189 {
1007 int c = k << 1; 1190 int c = k << 1;
1008 1191
1009 if (c > N + HEAP0 - 1) 1192 if (c >= N + HEAP0)
1010 break; 1193 break;
1011 1194
1012 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1195 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1013 ? 1 : 0; 1196 ? 1 : 0;
1014 1197
… …
1050 1233
1051/* move an element suitably so it is in a correct place */ 1234/* move an element suitably so it is in a correct place */
1052inline_size void 1235inline_size void
1053adjustheap (ANHE *heap, int N, int k) 1236adjustheap (ANHE *heap, int N, int k)
1054{ 1237{
1055 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1238 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1056 upheap (heap, k); 1239 upheap (heap, k);
1057 else 1240 else
1058 downheap (heap, N, k); 1241 downheap (heap, N, k);
1059} 1242}
1060 1243
… …
1073/*****************************************************************************/ 1256/*****************************************************************************/
1074 1257
1075/* associate signal watchers to a signal signal */ 1258/* associate signal watchers to a signal signal */
1076typedef struct 1259typedef struct
1077{ 1260{
1261 EV_ATOMIC_T pending;
1262#if EV_MULTIPLICITY
1263 EV_P;
1264#endif
1078 WL head; 1265 WL head;
1079 EV_ATOMIC_T gotsig;
1080} ANSIG; 1266} ANSIG;
1081 1267
1082static ANSIG *signals; 1268static ANSIG signals [EV_NSIG - 1];
1083static int signalmax;
1084
1085static EV_ATOMIC_T gotsig;
1086 1269
1087/*****************************************************************************/ 1270/*****************************************************************************/
1088 1271
1089/* used to prepare libev internal fd's */ 1272#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1090/* this is not fork-safe */
1091inline_speed void
1092fd_intern (int fd)
1093{
1094#ifdef _WIN32
1095 unsigned long arg = 1;
1096 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1097#else
1098 fcntl (fd, F_SETFD, FD_CLOEXEC);
1099 fcntl (fd, F_SETFL, O_NONBLOCK);
1100#endif
1101}
1102 1273
1103static void noinline 1274static void noinline
1104evpipe_init (EV_P) 1275evpipe_init (EV_P)
1105{ 1276{
1106 if (!ev_is_active (&pipe_w)) 1277 if (!ev_is_active (&pipe_w))
1107 { 1278 {
1108#if EV_USE_EVENTFD 1279# if EV_USE_EVENTFD
1280 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1281 if (evfd < 0 && errno == EINVAL)
1109 if ((evfd = eventfd (0, 0)) >= 0) 1282 evfd = eventfd (0, 0);
1283
1284 if (evfd >= 0)
1110 { 1285 {
1111 evpipe [0] = -1; 1286 evpipe [0] = -1;
1112 fd_intern (evfd); 1287 fd_intern (evfd); /* doing it twice doesn't hurt */
1113 ev_io_set (&pipe_w, evfd, EV_READ); 1288 ev_io_set (&pipe_w, evfd, EV_READ);
1114 } 1289 }
1115 else 1290 else
1116#endif 1291# endif
1117 { 1292 {
1118 while (pipe (evpipe)) 1293 while (pipe (evpipe))
1119 ev_syserr ("(libev) error creating signal/async pipe"); 1294 ev_syserr ("(libev) error creating signal/async pipe");
1120 1295
1121 fd_intern (evpipe [0]); 1296 fd_intern (evpipe [0]);
… …
1132evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1307evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1133{ 1308{
1134 if (!*flag) 1309 if (!*flag)
1135 { 1310 {
1136 int old_errno = errno; /* save errno because write might clobber it */ 1311 int old_errno = errno; /* save errno because write might clobber it */
1312 char dummy;
1137 1313
1138 *flag = 1; 1314 *flag = 1;
1139 1315
1140#if EV_USE_EVENTFD 1316#if EV_USE_EVENTFD
1141 if (evfd >= 0) 1317 if (evfd >= 0)
… …
1143 uint64_t counter = 1; 1319 uint64_t counter = 1;
1144 write (evfd, &counter, sizeof (uint64_t)); 1320 write (evfd, &counter, sizeof (uint64_t));
1145 } 1321 }
1146 else 1322 else
1147#endif 1323#endif
1324 /* win32 people keep sending patches that change this write() to send() */
1325 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1326 /* so when you think this write should be a send instead, please find out */
1327 /* where your send() is from - it's definitely not the microsoft send, and */
1328 /* tell me. thank you. */
1148 write (evpipe [1], &old_errno, 1); 1329 write (evpipe [1], &dummy, 1);
1149 1330
1150 errno = old_errno; 1331 errno = old_errno;
1151 } 1332 }
1152} 1333}
1153 1334
1154/* called whenever the libev signal pipe */ 1335/* called whenever the libev signal pipe */
1155/* got some events (signal, async) */ 1336/* got some events (signal, async) */
1156static void 1337static void
1157pipecb (EV_P_ ev_io *iow, int revents) 1338pipecb (EV_P_ ev_io *iow, int revents)
1158{ 1339{
1340 int i;
1341
1159#if EV_USE_EVENTFD 1342#if EV_USE_EVENTFD
1160 if (evfd >= 0) 1343 if (evfd >= 0)
1161 { 1344 {
1162 uint64_t counter; 1345 uint64_t counter;
1163 read (evfd, &counter, sizeof (uint64_t)); 1346 read (evfd, &counter, sizeof (uint64_t));
1164 } 1347 }
1165 else 1348 else
1166#endif 1349#endif
1167 { 1350 {
1168 char dummy; 1351 char dummy;
1352 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1169 read (evpipe [0], &dummy, 1); 1353 read (evpipe [0], &dummy, 1);
1170 } 1354 }
1171 1355
1172 if (gotsig && ev_is_default_loop (EV_A)) 1356#if EV_SIGNAL_ENABLE
1357 if (sig_pending)
1173 { 1358 {
1174 int signum; 1359 sig_pending = 0;
1175 gotsig = 0;
1176 1360
1177 for (signum = signalmax; signum--; ) 1361 for (i = EV_NSIG - 1; i--; )
1178 if (signals [signum].gotsig) 1362 if (expect_false (signals [i].pending))
1179 ev_feed_signal_event (EV_A_ signum + 1); 1363 ev_feed_signal_event (EV_A_ i + 1);
1180 } 1364 }
1365#endif
1181 1366
1182#if EV_ASYNC_ENABLE 1367#if EV_ASYNC_ENABLE
1183 if (gotasync) 1368 if (async_pending)
1184 { 1369 {
1185 int i; 1370 async_pending = 0;
1186 gotasync = 0;
1187 1371
1188 for (i = asynccnt; i--; ) 1372 for (i = asynccnt; i--; )
1189 if (asyncs [i]->sent) 1373 if (asyncs [i]->sent)
1190 { 1374 {
1191 asyncs [i]->sent = 0; 1375 asyncs [i]->sent = 0;
… …
1195#endif 1379#endif
1196} 1380}
1197 1381
1198/*****************************************************************************/ 1382/*****************************************************************************/
1199 1383
1384void
1385ev_feed_signal (int signum)
1386{
1387#if EV_MULTIPLICITY
1388 EV_P = signals [signum - 1].loop;
1389
1390 if (!EV_A)
1391 return;
1392#endif
1393
1394 signals [signum - 1].pending = 1;
1395 evpipe_write (EV_A_ &sig_pending);
1396}
1397
1200static void 1398static void
1201ev_sighandler (int signum) 1399ev_sighandler (int signum)
1202{ 1400{
1203#if EV_MULTIPLICITY
1204 struct ev_loop *loop = &default_loop_struct;
1205#endif
1206
1207#if _WIN32 1401#ifdef _WIN32
1208 signal (signum, ev_sighandler); 1402 signal (signum, ev_sighandler);
1209#endif 1403#endif
1210 1404
1211 signals [signum - 1].gotsig = 1; 1405 ev_feed_signal (signum);
1212 evpipe_write (EV_A_ &gotsig);
1213} 1406}
1214 1407
1215void noinline 1408void noinline
1216ev_feed_signal_event (EV_P_ int signum) 1409ev_feed_signal_event (EV_P_ int signum)
1217{ 1410{
1218 WL w; 1411 WL w;
1219 1412
1413 if (expect_false (signum <= 0 || signum > EV_NSIG))
1414 return;
1415
1416 --signum;
1417
1220#if EV_MULTIPLICITY 1418#if EV_MULTIPLICITY
1221 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1419 /* it is permissible to try to feed a signal to the wrong loop */
1222#endif 1420 /* or, likely more useful, feeding a signal nobody is waiting for */
1223 1421
1224 --signum; 1422 if (expect_false (signals [signum].loop != EV_A))
1225
1226 if (signum < 0 || signum >= signalmax)
1227 return; 1423 return;
1424#endif
1228 1425
1229 signals [signum].gotsig = 0; 1426 signals [signum].pending = 0;
1230 1427
1231 for (w = signals [signum].head; w; w = w->next) 1428 for (w = signals [signum].head; w; w = w->next)
1232 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1429 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1233} 1430}
1234 1431
1432#if EV_USE_SIGNALFD
1433static void
1434sigfdcb (EV_P_ ev_io *iow, int revents)
1435{
1436 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1437
1438 for (;;)
1439 {
1440 ssize_t res = read (sigfd, si, sizeof (si));
1441
1442 /* not ISO-C, as res might be -1, but works with SuS */
1443 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1444 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1445
1446 if (res < (ssize_t)sizeof (si))
1447 break;
1448 }
1449}
1450#endif
1451
1452#endif
1453
1235/*****************************************************************************/ 1454/*****************************************************************************/
1236 1455
1456#if EV_CHILD_ENABLE
1237static WL childs [EV_PID_HASHSIZE]; 1457static WL childs [EV_PID_HASHSIZE];
1238
1239#ifndef _WIN32
1240 1458
1241static ev_signal childev; 1459static ev_signal childev;
1242 1460
1243#ifndef WIFCONTINUED 1461#ifndef WIFCONTINUED
1244# define WIFCONTINUED(status) 0 1462# define WIFCONTINUED(status) 0
… …
1249child_reap (EV_P_ int chain, int pid, int status) 1467child_reap (EV_P_ int chain, int pid, int status)
1250{ 1468{
1251 ev_child *w; 1469 ev_child *w;
1252 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1470 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1253 1471
1254 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1472 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1255 { 1473 {
1256 if ((w->pid == pid || !w->pid) 1474 if ((w->pid == pid || !w->pid)
1257 && (!traced || (w->flags & 1))) 1475 && (!traced || (w->flags & 1)))
1258 { 1476 {
1259 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1477 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1284 /* make sure we are called again until all children have been reaped */ 1502 /* make sure we are called again until all children have been reaped */
1285 /* we need to do it this way so that the callback gets called before we continue */ 1503 /* we need to do it this way so that the callback gets called before we continue */
1286 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1504 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1287 1505
1288 child_reap (EV_A_ pid, pid, status); 1506 child_reap (EV_A_ pid, pid, status);
1289 if (EV_PID_HASHSIZE > 1) 1507 if ((EV_PID_HASHSIZE) > 1)
1290 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1508 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1291} 1509}
1292 1510
1293#endif 1511#endif
1294 1512
1295/*****************************************************************************/ 1513/*****************************************************************************/
1296 1514
1515#if EV_USE_IOCP
1516# include "ev_iocp.c"
1517#endif
1297#if EV_USE_PORT 1518#if EV_USE_PORT
1298# include "ev_port.c" 1519# include "ev_port.c"
1299#endif 1520#endif
1300#if EV_USE_KQUEUE 1521#if EV_USE_KQUEUE
1301# include "ev_kqueue.c" 1522# include "ev_kqueue.c"
… …
1361#ifdef __APPLE__ 1582#ifdef __APPLE__
1362 /* only select works correctly on that "unix-certified" platform */ 1583 /* only select works correctly on that "unix-certified" platform */
1363 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1584 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1364 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1585 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1365#endif 1586#endif
1587#ifdef __FreeBSD__
1588 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1589#endif
1366 1590
1367 return flags; 1591 return flags;
1368} 1592}
1369 1593
1370unsigned int 1594unsigned int
1371ev_embeddable_backends (void) 1595ev_embeddable_backends (void)
1372{ 1596{
1373 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1597 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1374 1598
1375 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1599 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1376 /* please fix it and tell me how to detect the fix */ 1600 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1377 flags &= ~EVBACKEND_EPOLL; 1601 flags &= ~EVBACKEND_EPOLL;
1378 1602
1379 return flags; 1603 return flags;
1380} 1604}
1381 1605
1382unsigned int 1606unsigned int
1383ev_backend (EV_P) 1607ev_backend (EV_P)
1384{ 1608{
1385 return backend; 1609 return backend;
1386} 1610}
1387 1611
1388#if EV_MINIMAL < 2 1612#if EV_FEATURE_API
1389unsigned int 1613unsigned int
1390ev_loop_count (EV_P) 1614ev_iteration (EV_P)
1391{ 1615{
1392 return loop_count; 1616 return loop_count;
1393} 1617}
1394 1618
1395unsigned int 1619unsigned int
1396ev_loop_depth (EV_P) 1620ev_depth (EV_P)
1397{ 1621{
1398 return loop_depth; 1622 return loop_depth;
1399} 1623}
1400 1624
1401void 1625void
… …
1438static void noinline 1662static void noinline
1439loop_init (EV_P_ unsigned int flags) 1663loop_init (EV_P_ unsigned int flags)
1440{ 1664{
1441 if (!backend) 1665 if (!backend)
1442 { 1666 {
1667 origflags = flags;
1668
1443#if EV_USE_REALTIME 1669#if EV_USE_REALTIME
1444 if (!have_realtime) 1670 if (!have_realtime)
1445 { 1671 {
1446 struct timespec ts; 1672 struct timespec ts;
1447 1673
… …
1458 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1684 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1459 have_monotonic = 1; 1685 have_monotonic = 1;
1460 } 1686 }
1461#endif 1687#endif
1462 1688
1689 /* pid check not overridable via env */
1690#ifndef _WIN32
1691 if (flags & EVFLAG_FORKCHECK)
1692 curpid = getpid ();
1693#endif
1694
1695 if (!(flags & EVFLAG_NOENV)
1696 && !enable_secure ()
1697 && getenv ("LIBEV_FLAGS"))
1698 flags = atoi (getenv ("LIBEV_FLAGS"));
1699
1463 ev_rt_now = ev_time (); 1700 ev_rt_now = ev_time ();
1464 mn_now = get_clock (); 1701 mn_now = get_clock ();
1465 now_floor = mn_now; 1702 now_floor = mn_now;
1466 rtmn_diff = ev_rt_now - mn_now; 1703 rtmn_diff = ev_rt_now - mn_now;
1467#if EV_MINIMAL < 2 1704#if EV_FEATURE_API
1468 invoke_cb = ev_invoke_pending; 1705 invoke_cb = ev_invoke_pending;
1469#endif 1706#endif
1470 1707
1471 io_blocktime = 0.; 1708 io_blocktime = 0.;
1472 timeout_blocktime = 0.; 1709 timeout_blocktime = 0.;
1473 backend = 0; 1710 backend = 0;
1474 backend_fd = -1; 1711 backend_fd = -1;
1475 gotasync = 0; 1712 sig_pending = 0;
1713#if EV_ASYNC_ENABLE
1714 async_pending = 0;
1715#endif
1476#if EV_USE_INOTIFY 1716#if EV_USE_INOTIFY
1477 fs_fd = -2; 1717 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1478#endif 1718#endif
1479 1719#if EV_USE_SIGNALFD
1480 /* pid check not overridable via env */ 1720 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1481#ifndef _WIN32
1482 if (flags & EVFLAG_FORKCHECK)
1483 curpid = getpid ();
1484#endif 1721#endif
1485 1722
1486 if (!(flags & EVFLAG_NOENV) 1723 if (!(flags & EVBACKEND_MASK))
1487 && !enable_secure ()
1488 && getenv ("LIBEV_FLAGS"))
1489 flags = atoi (getenv ("LIBEV_FLAGS"));
1490
1491 if (!(flags & 0x0000ffffU))
1492 flags |= ev_recommended_backends (); 1724 flags |= ev_recommended_backends ();
1493 1725
1726#if EV_USE_IOCP
1727 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1728#endif
1494#if EV_USE_PORT 1729#if EV_USE_PORT
1495 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1730 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1496#endif 1731#endif
1497#if EV_USE_KQUEUE 1732#if EV_USE_KQUEUE
1498 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1733 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1507 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1742 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1508#endif 1743#endif
1509 1744
1510 ev_prepare_init (&pending_w, pendingcb); 1745 ev_prepare_init (&pending_w, pendingcb);
1511 1746
1747#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1512 ev_init (&pipe_w, pipecb); 1748 ev_init (&pipe_w, pipecb);
1513 ev_set_priority (&pipe_w, EV_MAXPRI); 1749 ev_set_priority (&pipe_w, EV_MAXPRI);
1750#endif
1514 } 1751 }
1515} 1752}
1516 1753
1517/* free up a loop structure */ 1754/* free up a loop structure */
1518static void noinline 1755void
1519loop_destroy (EV_P) 1756ev_loop_destroy (EV_P)
1520{ 1757{
1521 int i; 1758 int i;
1522 1759
1760#if EV_MULTIPLICITY
1761 /* mimic free (0) */
1762 if (!EV_A)
1763 return;
1764#endif
1765
1766#if EV_CLEANUP_ENABLE
1767 /* queue cleanup watchers (and execute them) */
1768 if (expect_false (cleanupcnt))
1769 {
1770 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1771 EV_INVOKE_PENDING;
1772 }
1773#endif
1774
1775#if EV_CHILD_ENABLE
1776 if (ev_is_active (&childev))
1777 {
1778 ev_ref (EV_A); /* child watcher */
1779 ev_signal_stop (EV_A_ &childev);
1780 }
1781#endif
1782
1523 if (ev_is_active (&pipe_w)) 1783 if (ev_is_active (&pipe_w))
1524 { 1784 {
1525 ev_ref (EV_A); /* signal watcher */ 1785 /*ev_ref (EV_A);*/
1526 ev_io_stop (EV_A_ &pipe_w); 1786 /*ev_io_stop (EV_A_ &pipe_w);*/
1527 1787
1528#if EV_USE_EVENTFD 1788#if EV_USE_EVENTFD
1529 if (evfd >= 0) 1789 if (evfd >= 0)
1530 close (evfd); 1790 close (evfd);
1531#endif 1791#endif
1532 1792
1533 if (evpipe [0] >= 0) 1793 if (evpipe [0] >= 0)
1534 { 1794 {
1535 close (evpipe [0]); 1795 EV_WIN32_CLOSE_FD (evpipe [0]);
1536 close (evpipe [1]); 1796 EV_WIN32_CLOSE_FD (evpipe [1]);
1537 } 1797 }
1538 } 1798 }
1799
1800#if EV_USE_SIGNALFD
1801 if (ev_is_active (&sigfd_w))
1802 close (sigfd);
1803#endif
1539 1804
1540#if EV_USE_INOTIFY 1805#if EV_USE_INOTIFY
1541 if (fs_fd >= 0) 1806 if (fs_fd >= 0)
1542 close (fs_fd); 1807 close (fs_fd);
1543#endif 1808#endif
1544 1809
1545 if (backend_fd >= 0) 1810 if (backend_fd >= 0)
1546 close (backend_fd); 1811 close (backend_fd);
1547 1812
1813#if EV_USE_IOCP
1814 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1815#endif
1548#if EV_USE_PORT 1816#if EV_USE_PORT
1549 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1817 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1550#endif 1818#endif
1551#if EV_USE_KQUEUE 1819#if EV_USE_KQUEUE
1552 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1820 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1567#if EV_IDLE_ENABLE 1835#if EV_IDLE_ENABLE
1568 array_free (idle, [i]); 1836 array_free (idle, [i]);
1569#endif 1837#endif
1570 } 1838 }
1571 1839
1572 ev_free (anfds); anfdmax = 0; 1840 ev_free (anfds); anfds = 0; anfdmax = 0;
1573 1841
1574 /* have to use the microsoft-never-gets-it-right macro */ 1842 /* have to use the microsoft-never-gets-it-right macro */
1575 array_free (rfeed, EMPTY); 1843 array_free (rfeed, EMPTY);
1576 array_free (fdchange, EMPTY); 1844 array_free (fdchange, EMPTY);
1577 array_free (timer, EMPTY); 1845 array_free (timer, EMPTY);
… …
1579 array_free (periodic, EMPTY); 1847 array_free (periodic, EMPTY);
1580#endif 1848#endif
1581#if EV_FORK_ENABLE 1849#if EV_FORK_ENABLE
1582 array_free (fork, EMPTY); 1850 array_free (fork, EMPTY);
1583#endif 1851#endif
1852#if EV_CLEANUP_ENABLE
1853 array_free (cleanup, EMPTY);
1854#endif
1584 array_free (prepare, EMPTY); 1855 array_free (prepare, EMPTY);
1585 array_free (check, EMPTY); 1856 array_free (check, EMPTY);
1586#if EV_ASYNC_ENABLE 1857#if EV_ASYNC_ENABLE
1587 array_free (async, EMPTY); 1858 array_free (async, EMPTY);
1588#endif 1859#endif
1589 1860
1590 backend = 0; 1861 backend = 0;
1862
1863#if EV_MULTIPLICITY
1864 if (ev_is_default_loop (EV_A))
1865#endif
1866 ev_default_loop_ptr = 0;
1867#if EV_MULTIPLICITY
1868 else
1869 ev_free (EV_A);
1870#endif
1591} 1871}
1592 1872
1593#if EV_USE_INOTIFY 1873#if EV_USE_INOTIFY
1594inline_size void infy_fork (EV_P); 1874inline_size void infy_fork (EV_P);
1595#endif 1875#endif
… …
1612 1892
1613 if (ev_is_active (&pipe_w)) 1893 if (ev_is_active (&pipe_w))
1614 { 1894 {
1615 /* this "locks" the handlers against writing to the pipe */ 1895 /* this "locks" the handlers against writing to the pipe */
1616 /* while we modify the fd vars */ 1896 /* while we modify the fd vars */
1617 gotsig = 1; 1897 sig_pending = 1;
1618#if EV_ASYNC_ENABLE 1898#if EV_ASYNC_ENABLE
1619 gotasync = 1; 1899 async_pending = 1;
1620#endif 1900#endif
1621 1901
1622 ev_ref (EV_A); 1902 ev_ref (EV_A);
1623 ev_io_stop (EV_A_ &pipe_w); 1903 ev_io_stop (EV_A_ &pipe_w);
1624 1904
… …
1627 close (evfd); 1907 close (evfd);
1628#endif 1908#endif
1629 1909
1630 if (evpipe [0] >= 0) 1910 if (evpipe [0] >= 0)
1631 { 1911 {
1632 close (evpipe [0]); 1912 EV_WIN32_CLOSE_FD (evpipe [0]);
1633 close (evpipe [1]); 1913 EV_WIN32_CLOSE_FD (evpipe [1]);
1634 } 1914 }
1635 1915
1916#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1636 evpipe_init (EV_A); 1917 evpipe_init (EV_A);
1637 /* now iterate over everything, in case we missed something */ 1918 /* now iterate over everything, in case we missed something */
1638 pipecb (EV_A_ &pipe_w, EV_READ); 1919 pipecb (EV_A_ &pipe_w, EV_READ);
1920#endif
1639 } 1921 }
1640 1922
1641 postfork = 0; 1923 postfork = 0;
1642} 1924}
1643 1925
1644#if EV_MULTIPLICITY 1926#if EV_MULTIPLICITY
1645 1927
1646struct ev_loop * 1928struct ev_loop *
1647ev_loop_new (unsigned int flags) 1929ev_loop_new (unsigned int flags)
1648{ 1930{
1649 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1931 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1650 1932
1651 memset (loop, 0, sizeof (struct ev_loop)); 1933 memset (EV_A, 0, sizeof (struct ev_loop));
1652
1653 loop_init (EV_A_ flags); 1934 loop_init (EV_A_ flags);
1654 1935
1655 if (ev_backend (EV_A)) 1936 if (ev_backend (EV_A))
1656 return loop; 1937 return EV_A;
1657 1938
1939 ev_free (EV_A);
1658 return 0; 1940 return 0;
1659} 1941}
1660 1942
1661void
1662ev_loop_destroy (EV_P)
1663{
1664 loop_destroy (EV_A);
1665 ev_free (loop);
1666}
1667
1668void
1669ev_loop_fork (EV_P)
1670{
1671 postfork = 1; /* must be in line with ev_default_fork */
1672}
1673#endif /* multiplicity */ 1943#endif /* multiplicity */
1674 1944
1675#if EV_VERIFY 1945#if EV_VERIFY
1676static void noinline 1946static void noinline
1677verify_watcher (EV_P_ W w) 1947verify_watcher (EV_P_ W w)
… …
1706 verify_watcher (EV_A_ ws [cnt]); 1976 verify_watcher (EV_A_ ws [cnt]);
1707 } 1977 }
1708} 1978}
1709#endif 1979#endif
1710 1980
1711#if EV_MINIMAL < 2 1981#if EV_FEATURE_API
1712void 1982void
1713ev_loop_verify (EV_P) 1983ev_verify (EV_P)
1714{ 1984{
1715#if EV_VERIFY 1985#if EV_VERIFY
1716 int i; 1986 int i;
1717 WL w; 1987 WL w;
1718 1988
… …
1752#if EV_FORK_ENABLE 2022#if EV_FORK_ENABLE
1753 assert (forkmax >= forkcnt); 2023 assert (forkmax >= forkcnt);
1754 array_verify (EV_A_ (W *)forks, forkcnt); 2024 array_verify (EV_A_ (W *)forks, forkcnt);
1755#endif 2025#endif
1756 2026
2027#if EV_CLEANUP_ENABLE
2028 assert (cleanupmax >= cleanupcnt);
2029 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2030#endif
2031
1757#if EV_ASYNC_ENABLE 2032#if EV_ASYNC_ENABLE
1758 assert (asyncmax >= asynccnt); 2033 assert (asyncmax >= asynccnt);
1759 array_verify (EV_A_ (W *)asyncs, asynccnt); 2034 array_verify (EV_A_ (W *)asyncs, asynccnt);
1760#endif 2035#endif
1761 2036
2037#if EV_PREPARE_ENABLE
1762 assert (preparemax >= preparecnt); 2038 assert (preparemax >= preparecnt);
1763 array_verify (EV_A_ (W *)prepares, preparecnt); 2039 array_verify (EV_A_ (W *)prepares, preparecnt);
2040#endif
1764 2041
2042#if EV_CHECK_ENABLE
1765 assert (checkmax >= checkcnt); 2043 assert (checkmax >= checkcnt);
1766 array_verify (EV_A_ (W *)checks, checkcnt); 2044 array_verify (EV_A_ (W *)checks, checkcnt);
2045#endif
1767 2046
1768# if 0 2047# if 0
2048#if EV_CHILD_ENABLE
1769 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2049 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1770 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 2050 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2051#endif
1771# endif 2052# endif
1772#endif 2053#endif
1773} 2054}
1774#endif 2055#endif
1775 2056
1776#if EV_MULTIPLICITY 2057#if EV_MULTIPLICITY
1777struct ev_loop * 2058struct ev_loop *
1778ev_default_loop_init (unsigned int flags)
1779#else 2059#else
1780int 2060int
2061#endif
1781ev_default_loop (unsigned int flags) 2062ev_default_loop (unsigned int flags)
1782#endif
1783{ 2063{
1784 if (!ev_default_loop_ptr) 2064 if (!ev_default_loop_ptr)
1785 { 2065 {
1786#if EV_MULTIPLICITY 2066#if EV_MULTIPLICITY
1787 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2067 EV_P = ev_default_loop_ptr = &default_loop_struct;
1788#else 2068#else
1789 ev_default_loop_ptr = 1; 2069 ev_default_loop_ptr = 1;
1790#endif 2070#endif
1791 2071
1792 loop_init (EV_A_ flags); 2072 loop_init (EV_A_ flags);
1793 2073
1794 if (ev_backend (EV_A)) 2074 if (ev_backend (EV_A))
1795 { 2075 {
1796#ifndef _WIN32 2076#if EV_CHILD_ENABLE
1797 ev_signal_init (&childev, childcb, SIGCHLD); 2077 ev_signal_init (&childev, childcb, SIGCHLD);
1798 ev_set_priority (&childev, EV_MAXPRI); 2078 ev_set_priority (&childev, EV_MAXPRI);
1799 ev_signal_start (EV_A_ &childev); 2079 ev_signal_start (EV_A_ &childev);
1800 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2080 ev_unref (EV_A); /* child watcher should not keep loop alive */
1801#endif 2081#endif
… …
1806 2086
1807 return ev_default_loop_ptr; 2087 return ev_default_loop_ptr;
1808} 2088}
1809 2089
1810void 2090void
1811ev_default_destroy (void) 2091ev_loop_fork (EV_P)
1812{ 2092{
1813#if EV_MULTIPLICITY
1814 struct ev_loop *loop = ev_default_loop_ptr;
1815#endif
1816
1817 ev_default_loop_ptr = 0;
1818
1819#ifndef _WIN32
1820 ev_ref (EV_A); /* child watcher */
1821 ev_signal_stop (EV_A_ &childev);
1822#endif
1823
1824 loop_destroy (EV_A);
1825}
1826
1827void
1828ev_default_fork (void)
1829{
1830#if EV_MULTIPLICITY
1831 struct ev_loop *loop = ev_default_loop_ptr;
1832#endif
1833
1834 postfork = 1; /* must be in line with ev_loop_fork */ 2093 postfork = 1; /* must be in line with ev_default_fork */
1835} 2094}
1836 2095
1837/*****************************************************************************/ 2096/*****************************************************************************/
1838 2097
1839void 2098void
… …
1861 2120
1862 for (pri = NUMPRI; pri--; ) 2121 for (pri = NUMPRI; pri--; )
1863 while (pendingcnt [pri]) 2122 while (pendingcnt [pri])
1864 { 2123 {
1865 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2124 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1866
1867 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1868 /* ^ this is no longer true, as pending_w could be here */
1869 2125
1870 p->w->pending = 0; 2126 p->w->pending = 0;
1871 EV_CB_INVOKE (p->w, p->events); 2127 EV_CB_INVOKE (p->w, p->events);
1872 EV_FREQUENT_CHECK; 2128 EV_FREQUENT_CHECK;
1873 } 2129 }
… …
1930 EV_FREQUENT_CHECK; 2186 EV_FREQUENT_CHECK;
1931 feed_reverse (EV_A_ (W)w); 2187 feed_reverse (EV_A_ (W)w);
1932 } 2188 }
1933 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2189 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1934 2190
1935 feed_reverse_done (EV_A_ EV_TIMEOUT); 2191 feed_reverse_done (EV_A_ EV_TIMER);
1936 } 2192 }
1937} 2193}
1938 2194
1939#if EV_PERIODIC_ENABLE 2195#if EV_PERIODIC_ENABLE
1940/* make periodics pending */ 2196/* make periodics pending */
… …
1993 feed_reverse_done (EV_A_ EV_PERIODIC); 2249 feed_reverse_done (EV_A_ EV_PERIODIC);
1994 } 2250 }
1995} 2251}
1996 2252
1997/* simply recalculate all periodics */ 2253/* simply recalculate all periodics */
1998/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2254/* TODO: maybe ensure that at least one event happens when jumping forward? */
1999static void noinline 2255static void noinline
2000periodics_reschedule (EV_P) 2256periodics_reschedule (EV_P)
2001{ 2257{
2002 int i; 2258 int i;
2003 2259
… …
2031 ANHE_at_cache (*he); 2287 ANHE_at_cache (*he);
2032 } 2288 }
2033} 2289}
2034 2290
2035/* fetch new monotonic and realtime times from the kernel */ 2291/* fetch new monotonic and realtime times from the kernel */
2036/* also detetc if there was a timejump, and act accordingly */ 2292/* also detect if there was a timejump, and act accordingly */
2037inline_speed void 2293inline_speed void
2038time_update (EV_P_ ev_tstamp max_block) 2294time_update (EV_P_ ev_tstamp max_block)
2039{ 2295{
2040#if EV_USE_MONOTONIC 2296#if EV_USE_MONOTONIC
2041 if (expect_true (have_monotonic)) 2297 if (expect_true (have_monotonic))
… …
2099 mn_now = ev_rt_now; 2355 mn_now = ev_rt_now;
2100 } 2356 }
2101} 2357}
2102 2358
2103void 2359void
2104ev_loop (EV_P_ int flags) 2360ev_run (EV_P_ int flags)
2105{ 2361{
2106#if EV_MINIMAL < 2 2362#if EV_FEATURE_API
2107 ++loop_depth; 2363 ++loop_depth;
2108#endif 2364#endif
2109 2365
2110 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2366 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2111 2367
2112 loop_done = EVUNLOOP_CANCEL; 2368 loop_done = EVBREAK_CANCEL;
2113 2369
2114 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2370 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2115 2371
2116 do 2372 do
2117 { 2373 {
2118#if EV_VERIFY >= 2 2374#if EV_VERIFY >= 2
2119 ev_loop_verify (EV_A); 2375 ev_verify (EV_A);
2120#endif 2376#endif
2121 2377
2122#ifndef _WIN32 2378#ifndef _WIN32
2123 if (expect_false (curpid)) /* penalise the forking check even more */ 2379 if (expect_false (curpid)) /* penalise the forking check even more */
2124 if (expect_false (getpid () != curpid)) 2380 if (expect_false (getpid () != curpid))
… …
2136 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2392 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2137 EV_INVOKE_PENDING; 2393 EV_INVOKE_PENDING;
2138 } 2394 }
2139#endif 2395#endif
2140 2396
2397#if EV_PREPARE_ENABLE
2141 /* queue prepare watchers (and execute them) */ 2398 /* queue prepare watchers (and execute them) */
2142 if (expect_false (preparecnt)) 2399 if (expect_false (preparecnt))
2143 { 2400 {
2144 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2401 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2145 EV_INVOKE_PENDING; 2402 EV_INVOKE_PENDING;
2146 } 2403 }
2404#endif
2147 2405
2148 if (expect_false (loop_done)) 2406 if (expect_false (loop_done))
2149 break; 2407 break;
2150 2408
2151 /* we might have forked, so reify kernel state if necessary */ 2409 /* we might have forked, so reify kernel state if necessary */
… …
2158 /* calculate blocking time */ 2416 /* calculate blocking time */
2159 { 2417 {
2160 ev_tstamp waittime = 0.; 2418 ev_tstamp waittime = 0.;
2161 ev_tstamp sleeptime = 0.; 2419 ev_tstamp sleeptime = 0.;
2162 2420
2421 /* remember old timestamp for io_blocktime calculation */
2422 ev_tstamp prev_mn_now = mn_now;
2423
2424 /* update time to cancel out callback processing overhead */
2425 time_update (EV_A_ 1e100);
2426
2163 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2427 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2164 { 2428 {
2165 /* remember old timestamp for io_blocktime calculation */
2166 ev_tstamp prev_mn_now = mn_now;
2167
2168 /* update time to cancel out callback processing overhead */
2169 time_update (EV_A_ 1e100);
2170
2171 waittime = MAX_BLOCKTIME; 2429 waittime = MAX_BLOCKTIME;
2172 2430
2173 if (timercnt) 2431 if (timercnt)
2174 { 2432 {
2175 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2433 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2202 waittime -= sleeptime; 2460 waittime -= sleeptime;
2203 } 2461 }
2204 } 2462 }
2205 } 2463 }
2206 2464
2207#if EV_MINIMAL < 2 2465#if EV_FEATURE_API
2208 ++loop_count; 2466 ++loop_count;
2209#endif 2467#endif
2210 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2468 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2211 backend_poll (EV_A_ waittime); 2469 backend_poll (EV_A_ waittime);
2212 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2470 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2213 2471
2214 /* update ev_rt_now, do magic */ 2472 /* update ev_rt_now, do magic */
2215 time_update (EV_A_ waittime + sleeptime); 2473 time_update (EV_A_ waittime + sleeptime);
2216 } 2474 }
2217 2475
… …
2224#if EV_IDLE_ENABLE 2482#if EV_IDLE_ENABLE
2225 /* queue idle watchers unless other events are pending */ 2483 /* queue idle watchers unless other events are pending */
2226 idle_reify (EV_A); 2484 idle_reify (EV_A);
2227#endif 2485#endif
2228 2486
2487#if EV_CHECK_ENABLE
2229 /* queue check watchers, to be executed first */ 2488 /* queue check watchers, to be executed first */
2230 if (expect_false (checkcnt)) 2489 if (expect_false (checkcnt))
2231 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2490 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2491#endif
2232 2492
2233 EV_INVOKE_PENDING; 2493 EV_INVOKE_PENDING;
2234 } 2494 }
2235 while (expect_true ( 2495 while (expect_true (
2236 activecnt 2496 activecnt
2237 && !loop_done 2497 && !loop_done
2238 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2498 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2239 )); 2499 ));
2240 2500
2241 if (loop_done == EVUNLOOP_ONE) 2501 if (loop_done == EVBREAK_ONE)
2242 loop_done = EVUNLOOP_CANCEL; 2502 loop_done = EVBREAK_CANCEL;
2243 2503
2244#if EV_MINIMAL < 2 2504#if EV_FEATURE_API
2245 --loop_depth; 2505 --loop_depth;
2246#endif 2506#endif
2247} 2507}
2248 2508
2249void 2509void
2250ev_unloop (EV_P_ int how) 2510ev_break (EV_P_ int how)
2251{ 2511{
2252 loop_done = how; 2512 loop_done = how;
2253} 2513}
2254 2514
2255void 2515void
… …
2302inline_size void 2562inline_size void
2303wlist_del (WL *head, WL elem) 2563wlist_del (WL *head, WL elem)
2304{ 2564{
2305 while (*head) 2565 while (*head)
2306 { 2566 {
2307 if (*head == elem) 2567 if (expect_true (*head == elem))
2308 { 2568 {
2309 *head = elem->next; 2569 *head = elem->next;
2310 return; 2570 break;
2311 } 2571 }
2312 2572
2313 head = &(*head)->next; 2573 head = &(*head)->next;
2314 } 2574 }
2315} 2575}
… …
2375 2635
2376 if (expect_false (ev_is_active (w))) 2636 if (expect_false (ev_is_active (w)))
2377 return; 2637 return;
2378 2638
2379 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2639 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2380 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2640 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2381 2641
2382 EV_FREQUENT_CHECK; 2642 EV_FREQUENT_CHECK;
2383 2643
2384 ev_start (EV_A_ (W)w, 1); 2644 ev_start (EV_A_ (W)w, 1);
2385 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2645 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2403 EV_FREQUENT_CHECK; 2663 EV_FREQUENT_CHECK;
2404 2664
2405 wlist_del (&anfds[w->fd].head, (WL)w); 2665 wlist_del (&anfds[w->fd].head, (WL)w);
2406 ev_stop (EV_A_ (W)w); 2666 ev_stop (EV_A_ (W)w);
2407 2667
2408 fd_change (EV_A_ w->fd, 1); 2668 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2409 2669
2410 EV_FREQUENT_CHECK; 2670 EV_FREQUENT_CHECK;
2411} 2671}
2412 2672
2413void noinline 2673void noinline
… …
2455 timers [active] = timers [timercnt + HEAP0]; 2715 timers [active] = timers [timercnt + HEAP0];
2456 adjustheap (timers, timercnt, active); 2716 adjustheap (timers, timercnt, active);
2457 } 2717 }
2458 } 2718 }
2459 2719
2460 EV_FREQUENT_CHECK;
2461
2462 ev_at (w) -= mn_now; 2720 ev_at (w) -= mn_now;
2463 2721
2464 ev_stop (EV_A_ (W)w); 2722 ev_stop (EV_A_ (W)w);
2723
2724 EV_FREQUENT_CHECK;
2465} 2725}
2466 2726
2467void noinline 2727void noinline
2468ev_timer_again (EV_P_ ev_timer *w) 2728ev_timer_again (EV_P_ ev_timer *w)
2469{ 2729{
… …
2548 periodics [active] = periodics [periodiccnt + HEAP0]; 2808 periodics [active] = periodics [periodiccnt + HEAP0];
2549 adjustheap (periodics, periodiccnt, active); 2809 adjustheap (periodics, periodiccnt, active);
2550 } 2810 }
2551 } 2811 }
2552 2812
2553 EV_FREQUENT_CHECK;
2554
2555 ev_stop (EV_A_ (W)w); 2813 ev_stop (EV_A_ (W)w);
2814
2815 EV_FREQUENT_CHECK;
2556} 2816}
2557 2817
2558void noinline 2818void noinline
2559ev_periodic_again (EV_P_ ev_periodic *w) 2819ev_periodic_again (EV_P_ ev_periodic *w)
2560{ 2820{
… …
2566 2826
2567#ifndef SA_RESTART 2827#ifndef SA_RESTART
2568# define SA_RESTART 0 2828# define SA_RESTART 0
2569#endif 2829#endif
2570 2830
2831#if EV_SIGNAL_ENABLE
2832
2571void noinline 2833void noinline
2572ev_signal_start (EV_P_ ev_signal *w) 2834ev_signal_start (EV_P_ ev_signal *w)
2573{ 2835{
2574#if EV_MULTIPLICITY
2575 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2576#endif
2577 if (expect_false (ev_is_active (w))) 2836 if (expect_false (ev_is_active (w)))
2578 return; 2837 return;
2579 2838
2580 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2839 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2581 2840
2582 evpipe_init (EV_A); 2841#if EV_MULTIPLICITY
2842 assert (("libev: a signal must not be attached to two different loops",
2843 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2583 2844
2584 EV_FREQUENT_CHECK; 2845 signals [w->signum - 1].loop = EV_A;
2846#endif
2585 2847
2848 EV_FREQUENT_CHECK;
2849
2850#if EV_USE_SIGNALFD
2851 if (sigfd == -2)
2586 { 2852 {
2587#ifndef _WIN32 2853 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2588 sigset_t full, prev; 2854 if (sigfd < 0 && errno == EINVAL)
2589 sigfillset (&full); 2855 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2590 sigprocmask (SIG_SETMASK, &full, &prev);
2591#endif
2592 2856
2593 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2857 if (sigfd >= 0)
2858 {
2859 fd_intern (sigfd); /* doing it twice will not hurt */
2594 2860
2595#ifndef _WIN32 2861 sigemptyset (&sigfd_set);
2596 sigprocmask (SIG_SETMASK, &prev, 0); 2862
2597#endif 2863 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2864 ev_set_priority (&sigfd_w, EV_MAXPRI);
2865 ev_io_start (EV_A_ &sigfd_w);
2866 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2867 }
2598 } 2868 }
2869
2870 if (sigfd >= 0)
2871 {
2872 /* TODO: check .head */
2873 sigaddset (&sigfd_set, w->signum);
2874 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2875
2876 signalfd (sigfd, &sigfd_set, 0);
2877 }
2878#endif
2599 2879
2600 ev_start (EV_A_ (W)w, 1); 2880 ev_start (EV_A_ (W)w, 1);
2601 wlist_add (&signals [w->signum - 1].head, (WL)w); 2881 wlist_add (&signals [w->signum - 1].head, (WL)w);
2602 2882
2603 if (!((WL)w)->next) 2883 if (!((WL)w)->next)
2884# if EV_USE_SIGNALFD
2885 if (sigfd < 0) /*TODO*/
2886# endif
2604 { 2887 {
2605#if _WIN32 2888# ifdef _WIN32
2889 evpipe_init (EV_A);
2890
2606 signal (w->signum, ev_sighandler); 2891 signal (w->signum, ev_sighandler);
2607#else 2892# else
2608 struct sigaction sa = { }; 2893 struct sigaction sa;
2894
2895 evpipe_init (EV_A);
2896
2609 sa.sa_handler = ev_sighandler; 2897 sa.sa_handler = ev_sighandler;
2610 sigfillset (&sa.sa_mask); 2898 sigfillset (&sa.sa_mask);
2611 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2899 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2612 sigaction (w->signum, &sa, 0); 2900 sigaction (w->signum, &sa, 0);
2901
2902 if (origflags & EVFLAG_NOSIGMASK)
2903 {
2904 sigemptyset (&sa.sa_mask);
2905 sigaddset (&sa.sa_mask, w->signum);
2906 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2907 }
2613#endif 2908#endif
2614 } 2909 }
2615 2910
2616 EV_FREQUENT_CHECK; 2911 EV_FREQUENT_CHECK;
2617} 2912}
2618 2913
2619void noinline 2914void noinline
… …
2627 2922
2628 wlist_del (&signals [w->signum - 1].head, (WL)w); 2923 wlist_del (&signals [w->signum - 1].head, (WL)w);
2629 ev_stop (EV_A_ (W)w); 2924 ev_stop (EV_A_ (W)w);
2630 2925
2631 if (!signals [w->signum - 1].head) 2926 if (!signals [w->signum - 1].head)
2927 {
2928#if EV_MULTIPLICITY
2929 signals [w->signum - 1].loop = 0; /* unattach from signal */
2930#endif
2931#if EV_USE_SIGNALFD
2932 if (sigfd >= 0)
2933 {
2934 sigset_t ss;
2935
2936 sigemptyset (&ss);
2937 sigaddset (&ss, w->signum);
2938 sigdelset (&sigfd_set, w->signum);
2939
2940 signalfd (sigfd, &sigfd_set, 0);
2941 sigprocmask (SIG_UNBLOCK, &ss, 0);
2942 }
2943 else
2944#endif
2632 signal (w->signum, SIG_DFL); 2945 signal (w->signum, SIG_DFL);
2946 }
2633 2947
2634 EV_FREQUENT_CHECK; 2948 EV_FREQUENT_CHECK;
2635} 2949}
2950
2951#endif
2952
2953#if EV_CHILD_ENABLE
2636 2954
2637void 2955void
2638ev_child_start (EV_P_ ev_child *w) 2956ev_child_start (EV_P_ ev_child *w)
2639{ 2957{
2640#if EV_MULTIPLICITY 2958#if EV_MULTIPLICITY
… …
2644 return; 2962 return;
2645 2963
2646 EV_FREQUENT_CHECK; 2964 EV_FREQUENT_CHECK;
2647 2965
2648 ev_start (EV_A_ (W)w, 1); 2966 ev_start (EV_A_ (W)w, 1);
2649 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2967 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2650 2968
2651 EV_FREQUENT_CHECK; 2969 EV_FREQUENT_CHECK;
2652} 2970}
2653 2971
2654void 2972void
… …
2658 if (expect_false (!ev_is_active (w))) 2976 if (expect_false (!ev_is_active (w)))
2659 return; 2977 return;
2660 2978
2661 EV_FREQUENT_CHECK; 2979 EV_FREQUENT_CHECK;
2662 2980
2663 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2981 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2664 ev_stop (EV_A_ (W)w); 2982 ev_stop (EV_A_ (W)w);
2665 2983
2666 EV_FREQUENT_CHECK; 2984 EV_FREQUENT_CHECK;
2667} 2985}
2986
2987#endif
2668 2988
2669#if EV_STAT_ENABLE 2989#if EV_STAT_ENABLE
2670 2990
2671# ifdef _WIN32 2991# ifdef _WIN32
2672# undef lstat 2992# undef lstat
… …
2678#define MIN_STAT_INTERVAL 0.1074891 2998#define MIN_STAT_INTERVAL 0.1074891
2679 2999
2680static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 3000static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2681 3001
2682#if EV_USE_INOTIFY 3002#if EV_USE_INOTIFY
2683# define EV_INOTIFY_BUFSIZE 8192 3003
3004/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
3005# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2684 3006
2685static void noinline 3007static void noinline
2686infy_add (EV_P_ ev_stat *w) 3008infy_add (EV_P_ ev_stat *w)
2687{ 3009{
2688 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); 3010 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);
2689 3011
2690 if (w->wd < 0) 3012 if (w->wd >= 0)
3013 {
3014 struct statfs sfs;
3015
3016 /* now local changes will be tracked by inotify, but remote changes won't */
3017 /* unless the filesystem is known to be local, we therefore still poll */
3018 /* also do poll on <2.6.25, but with normal frequency */
3019
3020 if (!fs_2625)
3021 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3022 else if (!statfs (w->path, &sfs)
3023 && (sfs.f_type == 0x1373 /* devfs */
3024 || sfs.f_type == 0xEF53 /* ext2/3 */
3025 || sfs.f_type == 0x3153464a /* jfs */
3026 || sfs.f_type == 0x52654973 /* reiser3 */
3027 || sfs.f_type == 0x01021994 /* tempfs */
3028 || sfs.f_type == 0x58465342 /* xfs */))
3029 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3030 else
3031 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2691 { 3032 }
3033 else
3034 {
3035 /* can't use inotify, continue to stat */
2692 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3036 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2693 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2694 3037
2695 /* monitor some parent directory for speedup hints */ 3038 /* if path is not there, monitor some parent directory for speedup hints */
2696 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3039 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2697 /* but an efficiency issue only */ 3040 /* but an efficiency issue only */
2698 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3041 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2699 { 3042 {
2700 char path [4096]; 3043 char path [4096];
… …
2716 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3059 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2717 } 3060 }
2718 } 3061 }
2719 3062
2720 if (w->wd >= 0) 3063 if (w->wd >= 0)
2721 {
2722 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3064 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2723 3065
2724 /* now local changes will be tracked by inotify, but remote changes won't */ 3066 /* now re-arm timer, if required */
2725 /* unless the filesystem it known to be local, we therefore still poll */ 3067 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2726 /* also do poll on <2.6.25, but with normal frequency */
2727 struct statfs sfs;
2728
2729 if (fs_2625 && !statfs (w->path, &sfs))
2730 if (sfs.f_type == 0x1373 /* devfs */
2731 || sfs.f_type == 0xEF53 /* ext2/3 */
2732 || sfs.f_type == 0x3153464a /* jfs */
2733 || sfs.f_type == 0x52654973 /* reiser3 */
2734 || sfs.f_type == 0x01021994 /* tempfs */
2735 || sfs.f_type == 0x58465342 /* xfs */)
2736 return;
2737
2738 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2739 ev_timer_again (EV_A_ &w->timer); 3068 ev_timer_again (EV_A_ &w->timer);
2740 } 3069 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2741} 3070}
2742 3071
2743static void noinline 3072static void noinline
2744infy_del (EV_P_ ev_stat *w) 3073infy_del (EV_P_ ev_stat *w)
2745{ 3074{
… …
2748 3077
2749 if (wd < 0) 3078 if (wd < 0)
2750 return; 3079 return;
2751 3080
2752 w->wd = -2; 3081 w->wd = -2;
2753 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3082 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2754 wlist_del (&fs_hash [slot].head, (WL)w); 3083 wlist_del (&fs_hash [slot].head, (WL)w);
2755 3084
2756 /* remove this watcher, if others are watching it, they will rearm */ 3085 /* remove this watcher, if others are watching it, they will rearm */
2757 inotify_rm_watch (fs_fd, wd); 3086 inotify_rm_watch (fs_fd, wd);
2758} 3087}
… …
2760static void noinline 3089static void noinline
2761infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3090infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2762{ 3091{
2763 if (slot < 0) 3092 if (slot < 0)
2764 /* overflow, need to check for all hash slots */ 3093 /* overflow, need to check for all hash slots */
2765 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3094 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2766 infy_wd (EV_A_ slot, wd, ev); 3095 infy_wd (EV_A_ slot, wd, ev);
2767 else 3096 else
2768 { 3097 {
2769 WL w_; 3098 WL w_;
2770 3099
2771 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3100 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2772 { 3101 {
2773 ev_stat *w = (ev_stat *)w_; 3102 ev_stat *w = (ev_stat *)w_;
2774 w_ = w_->next; /* lets us remove this watcher and all before it */ 3103 w_ = w_->next; /* lets us remove this watcher and all before it */
2775 3104
2776 if (w->wd == wd || wd == -1) 3105 if (w->wd == wd || wd == -1)
2777 { 3106 {
2778 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3107 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2779 { 3108 {
2780 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3109 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2781 w->wd = -1; 3110 w->wd = -1;
2782 infy_add (EV_A_ w); /* re-add, no matter what */ 3111 infy_add (EV_A_ w); /* re-add, no matter what */
2783 } 3112 }
2784 3113
2785 stat_timer_cb (EV_A_ &w->timer, 0); 3114 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2790 3119
2791static void 3120static void
2792infy_cb (EV_P_ ev_io *w, int revents) 3121infy_cb (EV_P_ ev_io *w, int revents)
2793{ 3122{
2794 char buf [EV_INOTIFY_BUFSIZE]; 3123 char buf [EV_INOTIFY_BUFSIZE];
2795 struct inotify_event *ev = (struct inotify_event *)buf;
2796 int ofs; 3124 int ofs;
2797 int len = read (fs_fd, buf, sizeof (buf)); 3125 int len = read (fs_fd, buf, sizeof (buf));
2798 3126
2799 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3127 for (ofs = 0; ofs < len; )
3128 {
3129 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2800 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3130 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3131 ofs += sizeof (struct inotify_event) + ev->len;
3132 }
2801} 3133}
2802 3134
2803inline_size void 3135inline_size void
2804check_2625 (EV_P) 3136ev_check_2625 (EV_P)
2805{ 3137{
2806 /* kernels < 2.6.25 are borked 3138 /* kernels < 2.6.25 are borked
2807 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3139 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2808 */ 3140 */
2809 struct utsname buf; 3141 if (ev_linux_version () < 0x020619)
2810 int major, minor, micro;
2811
2812 if (uname (&buf))
2813 return; 3142 return;
2814 3143
2815 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2816 return;
2817
2818 if (major < 2
2819 || (major == 2 && minor < 6)
2820 || (major == 2 && minor == 6 && micro < 25))
2821 return;
2822
2823 fs_2625 = 1; 3144 fs_2625 = 1;
3145}
3146
3147inline_size int
3148infy_newfd (void)
3149{
3150#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3151 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3152 if (fd >= 0)
3153 return fd;
3154#endif
3155 return inotify_init ();
2824} 3156}
2825 3157
2826inline_size void 3158inline_size void
2827infy_init (EV_P) 3159infy_init (EV_P)
2828{ 3160{
2829 if (fs_fd != -2) 3161 if (fs_fd != -2)
2830 return; 3162 return;
2831 3163
2832 fs_fd = -1; 3164 fs_fd = -1;
2833 3165
2834 check_2625 (EV_A); 3166 ev_check_2625 (EV_A);
2835 3167
2836 fs_fd = inotify_init (); 3168 fs_fd = infy_newfd ();
2837 3169
2838 if (fs_fd >= 0) 3170 if (fs_fd >= 0)
2839 { 3171 {
3172 fd_intern (fs_fd);
2840 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3173 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2841 ev_set_priority (&fs_w, EV_MAXPRI); 3174 ev_set_priority (&fs_w, EV_MAXPRI);
2842 ev_io_start (EV_A_ &fs_w); 3175 ev_io_start (EV_A_ &fs_w);
3176 ev_unref (EV_A);
2843 } 3177 }
2844} 3178}
2845 3179
2846inline_size void 3180inline_size void
2847infy_fork (EV_P) 3181infy_fork (EV_P)
… …
2849 int slot; 3183 int slot;
2850 3184
2851 if (fs_fd < 0) 3185 if (fs_fd < 0)
2852 return; 3186 return;
2853 3187
3188 ev_ref (EV_A);
3189 ev_io_stop (EV_A_ &fs_w);
2854 close (fs_fd); 3190 close (fs_fd);
2855 fs_fd = inotify_init (); 3191 fs_fd = infy_newfd ();
2856 3192
3193 if (fs_fd >= 0)
3194 {
3195 fd_intern (fs_fd);
3196 ev_io_set (&fs_w, fs_fd, EV_READ);
3197 ev_io_start (EV_A_ &fs_w);
3198 ev_unref (EV_A);
3199 }
3200
2857 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3201 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2858 { 3202 {
2859 WL w_ = fs_hash [slot].head; 3203 WL w_ = fs_hash [slot].head;
2860 fs_hash [slot].head = 0; 3204 fs_hash [slot].head = 0;
2861 3205
2862 while (w_) 3206 while (w_)
… …
2867 w->wd = -1; 3211 w->wd = -1;
2868 3212
2869 if (fs_fd >= 0) 3213 if (fs_fd >= 0)
2870 infy_add (EV_A_ w); /* re-add, no matter what */ 3214 infy_add (EV_A_ w); /* re-add, no matter what */
2871 else 3215 else
3216 {
3217 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3218 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2872 ev_timer_again (EV_A_ &w->timer); 3219 ev_timer_again (EV_A_ &w->timer);
3220 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3221 }
2873 } 3222 }
2874 } 3223 }
2875} 3224}
2876 3225
2877#endif 3226#endif
… …
2894static void noinline 3243static void noinline
2895stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3244stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2896{ 3245{
2897 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3246 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2898 3247
2899 /* we copy this here each the time so that */ 3248 ev_statdata prev = w->attr;
2900 /* prev has the old value when the callback gets invoked */
2901 w->prev = w->attr;
2902 ev_stat_stat (EV_A_ w); 3249 ev_stat_stat (EV_A_ w);
2903 3250
2904 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3251 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2905 if ( 3252 if (
2906 w->prev.st_dev != w->attr.st_dev 3253 prev.st_dev != w->attr.st_dev
2907 || w->prev.st_ino != w->attr.st_ino 3254 || prev.st_ino != w->attr.st_ino
2908 || w->prev.st_mode != w->attr.st_mode 3255 || prev.st_mode != w->attr.st_mode
2909 || w->prev.st_nlink != w->attr.st_nlink 3256 || prev.st_nlink != w->attr.st_nlink
2910 || w->prev.st_uid != w->attr.st_uid 3257 || prev.st_uid != w->attr.st_uid
2911 || w->prev.st_gid != w->attr.st_gid 3258 || prev.st_gid != w->attr.st_gid
2912 || w->prev.st_rdev != w->attr.st_rdev 3259 || prev.st_rdev != w->attr.st_rdev
2913 || w->prev.st_size != w->attr.st_size 3260 || prev.st_size != w->attr.st_size
2914 || w->prev.st_atime != w->attr.st_atime 3261 || prev.st_atime != w->attr.st_atime
2915 || w->prev.st_mtime != w->attr.st_mtime 3262 || prev.st_mtime != w->attr.st_mtime
2916 || w->prev.st_ctime != w->attr.st_ctime 3263 || prev.st_ctime != w->attr.st_ctime
2917 ) { 3264 ) {
3265 /* we only update w->prev on actual differences */
3266 /* in case we test more often than invoke the callback, */
3267 /* to ensure that prev is always different to attr */
3268 w->prev = prev;
3269
2918 #if EV_USE_INOTIFY 3270 #if EV_USE_INOTIFY
2919 if (fs_fd >= 0) 3271 if (fs_fd >= 0)
2920 { 3272 {
2921 infy_del (EV_A_ w); 3273 infy_del (EV_A_ w);
2922 infy_add (EV_A_ w); 3274 infy_add (EV_A_ w);
… …
2947 3299
2948 if (fs_fd >= 0) 3300 if (fs_fd >= 0)
2949 infy_add (EV_A_ w); 3301 infy_add (EV_A_ w);
2950 else 3302 else
2951#endif 3303#endif
3304 {
2952 ev_timer_again (EV_A_ &w->timer); 3305 ev_timer_again (EV_A_ &w->timer);
3306 ev_unref (EV_A);
3307 }
2953 3308
2954 ev_start (EV_A_ (W)w, 1); 3309 ev_start (EV_A_ (W)w, 1);
2955 3310
2956 EV_FREQUENT_CHECK; 3311 EV_FREQUENT_CHECK;
2957} 3312}
… …
2966 EV_FREQUENT_CHECK; 3321 EV_FREQUENT_CHECK;
2967 3322
2968#if EV_USE_INOTIFY 3323#if EV_USE_INOTIFY
2969 infy_del (EV_A_ w); 3324 infy_del (EV_A_ w);
2970#endif 3325#endif
3326
3327 if (ev_is_active (&w->timer))
3328 {
3329 ev_ref (EV_A);
2971 ev_timer_stop (EV_A_ &w->timer); 3330 ev_timer_stop (EV_A_ &w->timer);
3331 }
2972 3332
2973 ev_stop (EV_A_ (W)w); 3333 ev_stop (EV_A_ (W)w);
2974 3334
2975 EV_FREQUENT_CHECK; 3335 EV_FREQUENT_CHECK;
2976} 3336}
… …
3021 3381
3022 EV_FREQUENT_CHECK; 3382 EV_FREQUENT_CHECK;
3023} 3383}
3024#endif 3384#endif
3025 3385
3386#if EV_PREPARE_ENABLE
3026void 3387void
3027ev_prepare_start (EV_P_ ev_prepare *w) 3388ev_prepare_start (EV_P_ ev_prepare *w)
3028{ 3389{
3029 if (expect_false (ev_is_active (w))) 3390 if (expect_false (ev_is_active (w)))
3030 return; 3391 return;
… …
3056 3417
3057 ev_stop (EV_A_ (W)w); 3418 ev_stop (EV_A_ (W)w);
3058 3419
3059 EV_FREQUENT_CHECK; 3420 EV_FREQUENT_CHECK;
3060} 3421}
3422#endif
3061 3423
3424#if EV_CHECK_ENABLE
3062void 3425void
3063ev_check_start (EV_P_ ev_check *w) 3426ev_check_start (EV_P_ ev_check *w)
3064{ 3427{
3065 if (expect_false (ev_is_active (w))) 3428 if (expect_false (ev_is_active (w)))
3066 return; 3429 return;
… …
3092 3455
3093 ev_stop (EV_A_ (W)w); 3456 ev_stop (EV_A_ (W)w);
3094 3457
3095 EV_FREQUENT_CHECK; 3458 EV_FREQUENT_CHECK;
3096} 3459}
3460#endif
3097 3461
3098#if EV_EMBED_ENABLE 3462#if EV_EMBED_ENABLE
3099void noinline 3463void noinline
3100ev_embed_sweep (EV_P_ ev_embed *w) 3464ev_embed_sweep (EV_P_ ev_embed *w)
3101{ 3465{
3102 ev_loop (w->other, EVLOOP_NONBLOCK); 3466 ev_run (w->other, EVRUN_NOWAIT);
3103} 3467}
3104 3468
3105static void 3469static void
3106embed_io_cb (EV_P_ ev_io *io, int revents) 3470embed_io_cb (EV_P_ ev_io *io, int revents)
3107{ 3471{
3108 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3472 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3109 3473
3110 if (ev_cb (w)) 3474 if (ev_cb (w))
3111 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3475 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3112 else 3476 else
3113 ev_loop (w->other, EVLOOP_NONBLOCK); 3477 ev_run (w->other, EVRUN_NOWAIT);
3114} 3478}
3115 3479
3116static void 3480static void
3117embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3481embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3118{ 3482{
3119 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3483 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3120 3484
3121 { 3485 {
3122 struct ev_loop *loop = w->other; 3486 EV_P = w->other;
3123 3487
3124 while (fdchangecnt) 3488 while (fdchangecnt)
3125 { 3489 {
3126 fd_reify (EV_A); 3490 fd_reify (EV_A);
3127 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3491 ev_run (EV_A_ EVRUN_NOWAIT);
3128 } 3492 }
3129 } 3493 }
3130} 3494}
3131 3495
3132static void 3496static void
… …
3135 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3499 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3136 3500
3137 ev_embed_stop (EV_A_ w); 3501 ev_embed_stop (EV_A_ w);
3138 3502
3139 { 3503 {
3140 struct ev_loop *loop = w->other; 3504 EV_P = w->other;
3141 3505
3142 ev_loop_fork (EV_A); 3506 ev_loop_fork (EV_A);
3143 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3507 ev_run (EV_A_ EVRUN_NOWAIT);
3144 } 3508 }
3145 3509
3146 ev_embed_start (EV_A_ w); 3510 ev_embed_start (EV_A_ w);
3147} 3511}
3148 3512
… …
3159{ 3523{
3160 if (expect_false (ev_is_active (w))) 3524 if (expect_false (ev_is_active (w)))
3161 return; 3525 return;
3162 3526
3163 { 3527 {
3164 struct ev_loop *loop = w->other; 3528 EV_P = w->other;
3165 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3529 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3166 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3530 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3167 } 3531 }
3168 3532
3169 EV_FREQUENT_CHECK; 3533 EV_FREQUENT_CHECK;
… …
3196 3560
3197 ev_io_stop (EV_A_ &w->io); 3561 ev_io_stop (EV_A_ &w->io);
3198 ev_prepare_stop (EV_A_ &w->prepare); 3562 ev_prepare_stop (EV_A_ &w->prepare);
3199 ev_fork_stop (EV_A_ &w->fork); 3563 ev_fork_stop (EV_A_ &w->fork);
3200 3564
3565 ev_stop (EV_A_ (W)w);
3566
3201 EV_FREQUENT_CHECK; 3567 EV_FREQUENT_CHECK;
3202} 3568}
3203#endif 3569#endif
3204 3570
3205#if EV_FORK_ENABLE 3571#if EV_FORK_ENABLE
… …
3238 3604
3239 EV_FREQUENT_CHECK; 3605 EV_FREQUENT_CHECK;
3240} 3606}
3241#endif 3607#endif
3242 3608
3243#if EV_ASYNC_ENABLE 3609#if EV_CLEANUP_ENABLE
3244void 3610void
3245ev_async_start (EV_P_ ev_async *w) 3611ev_cleanup_start (EV_P_ ev_cleanup *w)
3246{ 3612{
3247 if (expect_false (ev_is_active (w))) 3613 if (expect_false (ev_is_active (w)))
3248 return; 3614 return;
3615
3616 EV_FREQUENT_CHECK;
3617
3618 ev_start (EV_A_ (W)w, ++cleanupcnt);
3619 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3620 cleanups [cleanupcnt - 1] = w;
3621
3622 /* cleanup watchers should never keep a refcount on the loop */
3623 ev_unref (EV_A);
3624 EV_FREQUENT_CHECK;
3625}
3626
3627void
3628ev_cleanup_stop (EV_P_ ev_cleanup *w)
3629{
3630 clear_pending (EV_A_ (W)w);
3631 if (expect_false (!ev_is_active (w)))
3632 return;
3633
3634 EV_FREQUENT_CHECK;
3635 ev_ref (EV_A);
3636
3637 {
3638 int active = ev_active (w);
3639
3640 cleanups [active - 1] = cleanups [--cleanupcnt];
3641 ev_active (cleanups [active - 1]) = active;
3642 }
3643
3644 ev_stop (EV_A_ (W)w);
3645
3646 EV_FREQUENT_CHECK;
3647}
3648#endif
3649
3650#if EV_ASYNC_ENABLE
3651void
3652ev_async_start (EV_P_ ev_async *w)
3653{
3654 if (expect_false (ev_is_active (w)))
3655 return;
3656
3657 w->sent = 0;
3249 3658
3250 evpipe_init (EV_A); 3659 evpipe_init (EV_A);
3251 3660
3252 EV_FREQUENT_CHECK; 3661 EV_FREQUENT_CHECK;
3253 3662
… …
3281 3690
3282void 3691void
3283ev_async_send (EV_P_ ev_async *w) 3692ev_async_send (EV_P_ ev_async *w)
3284{ 3693{
3285 w->sent = 1; 3694 w->sent = 1;
3286 evpipe_write (EV_A_ &gotasync); 3695 evpipe_write (EV_A_ &async_pending);
3287} 3696}
3288#endif 3697#endif
3289 3698
3290/*****************************************************************************/ 3699/*****************************************************************************/
3291 3700
… …
3331{ 3740{
3332 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3741 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3333 3742
3334 if (expect_false (!once)) 3743 if (expect_false (!once))
3335 { 3744 {
3336 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3745 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3337 return; 3746 return;
3338 } 3747 }
3339 3748
3340 once->cb = cb; 3749 once->cb = cb;
3341 once->arg = arg; 3750 once->arg = arg;
… …
3428 if (types & EV_ASYNC) 3837 if (types & EV_ASYNC)
3429 for (i = asynccnt; i--; ) 3838 for (i = asynccnt; i--; )
3430 cb (EV_A_ EV_ASYNC, asyncs [i]); 3839 cb (EV_A_ EV_ASYNC, asyncs [i]);
3431#endif 3840#endif
3432 3841
3842#if EV_PREPARE_ENABLE
3433 if (types & EV_PREPARE) 3843 if (types & EV_PREPARE)
3434 for (i = preparecnt; i--; ) 3844 for (i = preparecnt; i--; )
3435#if EV_EMBED_ENABLE 3845# if EV_EMBED_ENABLE
3436 if (ev_cb (prepares [i]) != embed_prepare_cb) 3846 if (ev_cb (prepares [i]) != embed_prepare_cb)
3437#endif 3847# endif
3438 cb (EV_A_ EV_PREPARE, prepares [i]); 3848 cb (EV_A_ EV_PREPARE, prepares [i]);
3849#endif
3439 3850
3851#if EV_CHECK_ENABLE
3440 if (types & EV_CHECK) 3852 if (types & EV_CHECK)
3441 for (i = checkcnt; i--; ) 3853 for (i = checkcnt; i--; )
3442 cb (EV_A_ EV_CHECK, checks [i]); 3854 cb (EV_A_ EV_CHECK, checks [i]);
3855#endif
3443 3856
3857#if EV_SIGNAL_ENABLE
3444 if (types & EV_SIGNAL) 3858 if (types & EV_SIGNAL)
3445 for (i = 0; i < signalmax; ++i) 3859 for (i = 0; i < EV_NSIG - 1; ++i)
3446 for (wl = signals [i].head; wl; ) 3860 for (wl = signals [i].head; wl; )
3447 { 3861 {
3448 wn = wl->next; 3862 wn = wl->next;
3449 cb (EV_A_ EV_SIGNAL, wl); 3863 cb (EV_A_ EV_SIGNAL, wl);
3450 wl = wn; 3864 wl = wn;
3451 } 3865 }
3866#endif
3452 3867
3868#if EV_CHILD_ENABLE
3453 if (types & EV_CHILD) 3869 if (types & EV_CHILD)
3454 for (i = EV_PID_HASHSIZE; i--; ) 3870 for (i = (EV_PID_HASHSIZE); i--; )
3455 for (wl = childs [i]; wl; ) 3871 for (wl = childs [i]; wl; )
3456 { 3872 {
3457 wn = wl->next; 3873 wn = wl->next;
3458 cb (EV_A_ EV_CHILD, wl); 3874 cb (EV_A_ EV_CHILD, wl);
3459 wl = wn; 3875 wl = wn;
3460 } 3876 }
3877#endif
3461/* EV_STAT 0x00001000 /* stat data changed */ 3878/* EV_STAT 0x00001000 /* stat data changed */
3462/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3879/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3463} 3880}
3464#endif 3881#endif
3465 3882
3466#if EV_MULTIPLICITY 3883#if EV_MULTIPLICITY
3467 #include "ev_wrap.h" 3884 #include "ev_wrap.h"
3468#endif 3885#endif
3469 3886
3470#ifdef __cplusplus 3887EV_CPP(})
3471}
3472#endif
3473 3888

Diff Legend

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