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

Comparing libev/ev.c (file contents):
Revision 1.299 by root, Tue Jul 14 00:09:59 2009 UTC vs.
Revision 1.362 by root, Sun Oct 24 19:15:52 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
… …
77# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
79# endif 75# endif
80# endif 76# endif
81 77
78# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
85# else 82# else
83# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 84# define EV_USE_NANOSLEEP 0
85# endif
86
87# if HAVE_SELECT && HAVE_SYS_SELECT_H
88# ifndef EV_USE_SELECT
89# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
88# endif 94# endif
89 95
96# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 98# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 99# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 100# else
101# undef EV_USE_POLL
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif
104# endif 103# endif
105 104
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 106# ifndef EV_USE_EPOLL
109# else 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
112# endif 112# endif
113 113
114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# ifndef EV_USE_KQUEUE 115# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
116# define EV_USE_KQUEUE 1
117# else
118# define EV_USE_KQUEUE 0
119# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
120# endif 121# endif
121 122
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 124# ifndef EV_USE_PORT
125# else 125# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
128# endif 130# endif
129 131
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 133# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
136# endif 139# endif
137 140
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 const char *err = strerror (errno);
597
598 ev_printerr (msg);
599 ev_printerr (": ");
600 ev_printerr (err);
601 ev_printerr ("\n");
602#else
448 perror (msg); 603 perror (msg);
604#endif
449 abort (); 605 abort ();
450 } 606 }
451} 607}
452 608
453static void * 609static void *
454ev_realloc_emul (void *ptr, long size) 610ev_realloc_emul (void *ptr, long size)
455{ 611{
612#if __GLIBC__
613 return realloc (ptr, size);
614#else
456 /* some systems, notably openbsd and darwin, fail to properly 615 /* some systems, notably openbsd and darwin, fail to properly
457 * implement realloc (x, 0) (as required by both ansi c-98 and 616 * implement realloc (x, 0) (as required by both ansi c-89 and
458 * the single unix specification, so work around them here. 617 * the single unix specification, so work around them here.
459 */ 618 */
460 619
461 if (size) 620 if (size)
462 return realloc (ptr, size); 621 return realloc (ptr, size);
463 622
464 free (ptr); 623 free (ptr);
465 return 0; 624 return 0;
625#endif
466} 626}
467 627
468static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 628static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
469 629
470void 630void
… …
478{ 638{
479 ptr = alloc (ptr, size); 639 ptr = alloc (ptr, size);
480 640
481 if (!ptr && size) 641 if (!ptr && size)
482 { 642 {
643#if EV_AVOID_STDIO
644 ev_printerr ("libev: memory allocation failed, aborting.\n");
645#else
483 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 646 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
647#endif
484 abort (); 648 abort ();
485 } 649 }
486 650
487 return ptr; 651 return ptr;
488} 652}
… …
504 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 668 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
505 unsigned char unused; 669 unsigned char unused;
506#if EV_USE_EPOLL 670#if EV_USE_EPOLL
507 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
508#endif 672#endif
509#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
510 SOCKET handle; 674 SOCKET handle;
675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
511#endif 678#endif
512} ANFD; 679} ANFD;
513 680
514/* stores the pending event set for a given watcher */ 681/* stores the pending event set for a given watcher */
515typedef struct 682typedef struct
… …
570 737
571 static int ev_default_loop_ptr; 738 static int ev_default_loop_ptr;
572 739
573#endif 740#endif
574 741
575#if EV_MINIMAL < 2 742#if EV_FEATURE_API
576# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 743# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
577# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 744# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
578# define EV_INVOKE_PENDING invoke_cb (EV_A) 745# define EV_INVOKE_PENDING invoke_cb (EV_A)
579#else 746#else
580# define EV_RELEASE_CB (void)0 747# define EV_RELEASE_CB (void)0
581# define EV_ACQUIRE_CB (void)0 748# define EV_ACQUIRE_CB (void)0
582# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 749# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
583#endif 750#endif
584 751
585#define EVUNLOOP_RECURSE 0x80 752#define EVBREAK_RECURSE 0x80
586 753
587/*****************************************************************************/ 754/*****************************************************************************/
588 755
589#ifndef EV_HAVE_EV_TIME 756#ifndef EV_HAVE_EV_TIME
590ev_tstamp 757ev_tstamp
… …
634 if (delay > 0.) 801 if (delay > 0.)
635 { 802 {
636#if EV_USE_NANOSLEEP 803#if EV_USE_NANOSLEEP
637 struct timespec ts; 804 struct timespec ts;
638 805
639 ts.tv_sec = (time_t)delay; 806 EV_TS_SET (ts, delay);
640 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
641
642 nanosleep (&ts, 0); 807 nanosleep (&ts, 0);
643#elif defined(_WIN32) 808#elif defined(_WIN32)
644 Sleep ((unsigned long)(delay * 1e3)); 809 Sleep ((unsigned long)(delay * 1e3));
645#else 810#else
646 struct timeval tv; 811 struct timeval tv;
647 812
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 */ 813 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
652 /* somehting not guaranteed by newer posix versions, but guaranteed */ 814 /* something not guaranteed by newer posix versions, but guaranteed */
653 /* by older ones */ 815 /* by older ones */
816 EV_TV_SET (tv, delay);
654 select (0, 0, 0, 0, &tv); 817 select (0, 0, 0, 0, &tv);
655#endif 818#endif
656 } 819 }
657} 820}
658 821
659/*****************************************************************************/ 822/*****************************************************************************/
660 823
661#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 824#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
662 825
663/* find a suitable new size for the given array, */ 826/* find a suitable new size for the given array, */
664/* hopefully by rounding to a ncie-to-malloc size */ 827/* hopefully by rounding to a nice-to-malloc size */
665inline_size int 828inline_size int
666array_nextsize (int elem, int cur, int cnt) 829array_nextsize (int elem, int cur, int cnt)
667{ 830{
668 int ncur = cur + 1; 831 int ncur = cur + 1;
669 832
… …
765} 928}
766 929
767/*****************************************************************************/ 930/*****************************************************************************/
768 931
769inline_speed void 932inline_speed void
770fd_event_nc (EV_P_ int fd, int revents) 933fd_event_nocheck (EV_P_ int fd, int revents)
771{ 934{
772 ANFD *anfd = anfds + fd; 935 ANFD *anfd = anfds + fd;
773 ev_io *w; 936 ev_io *w;
774 937
775 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 938 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
787fd_event (EV_P_ int fd, int revents) 950fd_event (EV_P_ int fd, int revents)
788{ 951{
789 ANFD *anfd = anfds + fd; 952 ANFD *anfd = anfds + fd;
790 953
791 if (expect_true (!anfd->reify)) 954 if (expect_true (!anfd->reify))
792 fd_event_nc (EV_A_ fd, revents); 955 fd_event_nocheck (EV_A_ fd, revents);
793} 956}
794 957
795void 958void
796ev_feed_fd_event (EV_P_ int fd, int revents) 959ev_feed_fd_event (EV_P_ int fd, int revents)
797{ 960{
798 if (fd >= 0 && fd < anfdmax) 961 if (fd >= 0 && fd < anfdmax)
799 fd_event_nc (EV_A_ fd, revents); 962 fd_event_nocheck (EV_A_ fd, revents);
800} 963}
801 964
802/* make sure the external fd watch events are in-sync */ 965/* make sure the external fd watch events are in-sync */
803/* with the kernel/libev internal state */ 966/* with the kernel/libev internal state */
804inline_size void 967inline_size void
… …
810 { 973 {
811 int fd = fdchanges [i]; 974 int fd = fdchanges [i];
812 ANFD *anfd = anfds + fd; 975 ANFD *anfd = anfds + fd;
813 ev_io *w; 976 ev_io *w;
814 977
815 unsigned char events = 0; 978 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify;
816 980
817 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 981 anfd->reify = 0;
818 events |= (unsigned char)w->events;
819 982
820#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
821 if (events) 984 if (o_reify & EV__IOFDSET)
822 { 985 {
823 unsigned long arg; 986 unsigned long arg;
824 #ifdef EV_FD_TO_WIN32_HANDLE
825 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 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)); 988 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
989 printf ("oi %d %x\n", fd, anfd->handle);//D
830 } 990 }
831#endif 991#endif
832 992
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
833 { 994 {
834 unsigned char o_events = anfd->events;
835 unsigned char o_reify = anfd->reify;
836
837 anfd->reify = 0;
838 anfd->events = events; 995 anfd->events = 0;
839 996
840 if (o_events != events || o_reify & EV__IOFDSET) 997 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
998 anfd->events |= (unsigned char)w->events;
999
1000 if (o_events != anfd->events)
1001 o_reify = EV__IOFDSET; /* actually |= */
1002 }
1003
1004 if (o_reify & EV__IOFDSET)
841 backend_modify (EV_A_ fd, o_events, events); 1005 backend_modify (EV_A_ fd, o_events, anfd->events);
842 }
843 } 1006 }
844 1007
845 fdchangecnt = 0; 1008 fdchangecnt = 0;
846} 1009}
847 1010
… …
871 ev_io_stop (EV_A_ w); 1034 ev_io_stop (EV_A_ w);
872 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1035 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
873 } 1036 }
874} 1037}
875 1038
876/* check whether the given fd is atcually valid, for error recovery */ 1039/* check whether the given fd is actually valid, for error recovery */
877inline_size int 1040inline_size int
878fd_valid (int fd) 1041fd_valid (int fd)
879{ 1042{
880#ifdef _WIN32 1043#ifdef _WIN32
881 return _get_osfhandle (fd) != -1; 1044 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
882#else 1045#else
883 return fcntl (fd, F_GETFD) != -1; 1046 return fcntl (fd, F_GETFD) != -1;
884#endif 1047#endif
885} 1048}
886 1049
… …
904 1067
905 for (fd = anfdmax; fd--; ) 1068 for (fd = anfdmax; fd--; )
906 if (anfds [fd].events) 1069 if (anfds [fd].events)
907 { 1070 {
908 fd_kill (EV_A_ fd); 1071 fd_kill (EV_A_ fd);
909 return; 1072 break;
910 } 1073 }
911} 1074}
912 1075
913/* usually called after fork if backend needs to re-arm all fds from scratch */ 1076/* usually called after fork if backend needs to re-arm all fds from scratch */
914static void noinline 1077static void noinline
… …
923 anfds [fd].emask = 0; 1086 anfds [fd].emask = 0;
924 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1087 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
925 } 1088 }
926} 1089}
927 1090
1091/* used to prepare libev internal fd's */
1092/* this is not fork-safe */
1093inline_speed void
1094fd_intern (int fd)
1095{
1096#ifdef _WIN32
1097 unsigned long arg = 1;
1098 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1099#else
1100 fcntl (fd, F_SETFD, FD_CLOEXEC);
1101 fcntl (fd, F_SETFL, O_NONBLOCK);
1102#endif
1103}
1104
928/*****************************************************************************/ 1105/*****************************************************************************/
929 1106
930/* 1107/*
931 * the heap functions want a real array index. array index 0 uis guaranteed to not 1108 * the heap functions want a real array index. array index 0 is guaranteed to not
932 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1109 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
933 * the branching factor of the d-tree. 1110 * the branching factor of the d-tree.
934 */ 1111 */
935 1112
936/* 1113/*
… …
1004 1181
1005 for (;;) 1182 for (;;)
1006 { 1183 {
1007 int c = k << 1; 1184 int c = k << 1;
1008 1185
1009 if (c > N + HEAP0 - 1) 1186 if (c >= N + HEAP0)
1010 break; 1187 break;
1011 1188
1012 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1189 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1013 ? 1 : 0; 1190 ? 1 : 0;
1014 1191
… …
1050 1227
1051/* move an element suitably so it is in a correct place */ 1228/* move an element suitably so it is in a correct place */
1052inline_size void 1229inline_size void
1053adjustheap (ANHE *heap, int N, int k) 1230adjustheap (ANHE *heap, int N, int k)
1054{ 1231{
1055 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1232 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1056 upheap (heap, k); 1233 upheap (heap, k);
1057 else 1234 else
1058 downheap (heap, N, k); 1235 downheap (heap, N, k);
1059} 1236}
1060 1237
… …
1073/*****************************************************************************/ 1250/*****************************************************************************/
1074 1251
1075/* associate signal watchers to a signal signal */ 1252/* associate signal watchers to a signal signal */
1076typedef struct 1253typedef struct
1077{ 1254{
1255 EV_ATOMIC_T pending;
1256#if EV_MULTIPLICITY
1257 EV_P;
1258#endif
1078 WL head; 1259 WL head;
1079 EV_ATOMIC_T gotsig;
1080} ANSIG; 1260} ANSIG;
1081 1261
1082static ANSIG *signals; 1262static ANSIG signals [EV_NSIG - 1];
1083static int signalmax;
1084
1085static EV_ATOMIC_T gotsig;
1086 1263
1087/*****************************************************************************/ 1264/*****************************************************************************/
1088 1265
1089/* used to prepare libev internal fd's */ 1266#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 1267
1103static void noinline 1268static void noinline
1104evpipe_init (EV_P) 1269evpipe_init (EV_P)
1105{ 1270{
1106 if (!ev_is_active (&pipe_w)) 1271 if (!ev_is_active (&pipe_w))
1107 { 1272 {
1108#if EV_USE_EVENTFD 1273# if EV_USE_EVENTFD
1274 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1275 if (evfd < 0 && errno == EINVAL)
1109 if ((evfd = eventfd (0, 0)) >= 0) 1276 evfd = eventfd (0, 0);
1277
1278 if (evfd >= 0)
1110 { 1279 {
1111 evpipe [0] = -1; 1280 evpipe [0] = -1;
1112 fd_intern (evfd); 1281 fd_intern (evfd); /* doing it twice doesn't hurt */
1113 ev_io_set (&pipe_w, evfd, EV_READ); 1282 ev_io_set (&pipe_w, evfd, EV_READ);
1114 } 1283 }
1115 else 1284 else
1116#endif 1285# endif
1117 { 1286 {
1118 while (pipe (evpipe)) 1287 while (pipe (evpipe))
1119 ev_syserr ("(libev) error creating signal/async pipe"); 1288 ev_syserr ("(libev) error creating signal/async pipe");
1120 1289
1121 fd_intern (evpipe [0]); 1290 fd_intern (evpipe [0]);
… …
1132evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1301evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1133{ 1302{
1134 if (!*flag) 1303 if (!*flag)
1135 { 1304 {
1136 int old_errno = errno; /* save errno because write might clobber it */ 1305 int old_errno = errno; /* save errno because write might clobber it */
1306 char dummy;
1137 1307
1138 *flag = 1; 1308 *flag = 1;
1139 1309
1140#if EV_USE_EVENTFD 1310#if EV_USE_EVENTFD
1141 if (evfd >= 0) 1311 if (evfd >= 0)
… …
1143 uint64_t counter = 1; 1313 uint64_t counter = 1;
1144 write (evfd, &counter, sizeof (uint64_t)); 1314 write (evfd, &counter, sizeof (uint64_t));
1145 } 1315 }
1146 else 1316 else
1147#endif 1317#endif
1318 /* win32 people keep sending patches that change this write() to send() */
1319 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1320 /* so when you think this write should be a send instead, please find out */
1321 /* where your send() is from - it's definitely not the microsoft send, and */
1322 /* tell me. thank you. */
1148 write (evpipe [1], &old_errno, 1); 1323 write (evpipe [1], &dummy, 1);
1149 1324
1150 errno = old_errno; 1325 errno = old_errno;
1151 } 1326 }
1152} 1327}
1153 1328
1154/* called whenever the libev signal pipe */ 1329/* called whenever the libev signal pipe */
1155/* got some events (signal, async) */ 1330/* got some events (signal, async) */
1156static void 1331static void
1157pipecb (EV_P_ ev_io *iow, int revents) 1332pipecb (EV_P_ ev_io *iow, int revents)
1158{ 1333{
1334 int i;
1335
1159#if EV_USE_EVENTFD 1336#if EV_USE_EVENTFD
1160 if (evfd >= 0) 1337 if (evfd >= 0)
1161 { 1338 {
1162 uint64_t counter; 1339 uint64_t counter;
1163 read (evfd, &counter, sizeof (uint64_t)); 1340 read (evfd, &counter, sizeof (uint64_t));
1164 } 1341 }
1165 else 1342 else
1166#endif 1343#endif
1167 { 1344 {
1168 char dummy; 1345 char dummy;
1346 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1169 read (evpipe [0], &dummy, 1); 1347 read (evpipe [0], &dummy, 1);
1170 } 1348 }
1171 1349
1172 if (gotsig && ev_is_default_loop (EV_A)) 1350 if (sig_pending)
1173 { 1351 {
1174 int signum; 1352 sig_pending = 0;
1175 gotsig = 0;
1176 1353
1177 for (signum = signalmax; signum--; ) 1354 for (i = EV_NSIG - 1; i--; )
1178 if (signals [signum].gotsig) 1355 if (expect_false (signals [i].pending))
1179 ev_feed_signal_event (EV_A_ signum + 1); 1356 ev_feed_signal_event (EV_A_ i + 1);
1180 } 1357 }
1181 1358
1182#if EV_ASYNC_ENABLE 1359#if EV_ASYNC_ENABLE
1183 if (gotasync) 1360 if (async_pending)
1184 { 1361 {
1185 int i; 1362 async_pending = 0;
1186 gotasync = 0;
1187 1363
1188 for (i = asynccnt; i--; ) 1364 for (i = asynccnt; i--; )
1189 if (asyncs [i]->sent) 1365 if (asyncs [i]->sent)
1190 { 1366 {
1191 asyncs [i]->sent = 0; 1367 asyncs [i]->sent = 0;
… …
1199 1375
1200static void 1376static void
1201ev_sighandler (int signum) 1377ev_sighandler (int signum)
1202{ 1378{
1203#if EV_MULTIPLICITY 1379#if EV_MULTIPLICITY
1204 struct ev_loop *loop = &default_loop_struct; 1380 EV_P = signals [signum - 1].loop;
1205#endif 1381#endif
1206 1382
1207#if _WIN32 1383#ifdef _WIN32
1208 signal (signum, ev_sighandler); 1384 signal (signum, ev_sighandler);
1209#endif 1385#endif
1210 1386
1211 signals [signum - 1].gotsig = 1; 1387 signals [signum - 1].pending = 1;
1212 evpipe_write (EV_A_ &gotsig); 1388 evpipe_write (EV_A_ &sig_pending);
1213} 1389}
1214 1390
1215void noinline 1391void noinline
1216ev_feed_signal_event (EV_P_ int signum) 1392ev_feed_signal_event (EV_P_ int signum)
1217{ 1393{
1218 WL w; 1394 WL w;
1219 1395
1396 if (expect_false (signum <= 0 || signum > EV_NSIG))
1397 return;
1398
1399 --signum;
1400
1220#if EV_MULTIPLICITY 1401#if EV_MULTIPLICITY
1221 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1402 /* it is permissible to try to feed a signal to the wrong loop */
1222#endif 1403 /* or, likely more useful, feeding a signal nobody is waiting for */
1223 1404
1224 --signum; 1405 if (expect_false (signals [signum].loop != EV_A))
1225
1226 if (signum < 0 || signum >= signalmax)
1227 return; 1406 return;
1407#endif
1228 1408
1229 signals [signum].gotsig = 0; 1409 signals [signum].pending = 0;
1230 1410
1231 for (w = signals [signum].head; w; w = w->next) 1411 for (w = signals [signum].head; w; w = w->next)
1232 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1412 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1233} 1413}
1234 1414
1415#if EV_USE_SIGNALFD
1416static void
1417sigfdcb (EV_P_ ev_io *iow, int revents)
1418{
1419 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1420
1421 for (;;)
1422 {
1423 ssize_t res = read (sigfd, si, sizeof (si));
1424
1425 /* not ISO-C, as res might be -1, but works with SuS */
1426 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1427 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1428
1429 if (res < (ssize_t)sizeof (si))
1430 break;
1431 }
1432}
1433#endif
1434
1435#endif
1436
1235/*****************************************************************************/ 1437/*****************************************************************************/
1236 1438
1439#if EV_CHILD_ENABLE
1237static WL childs [EV_PID_HASHSIZE]; 1440static WL childs [EV_PID_HASHSIZE];
1238
1239#ifndef _WIN32
1240 1441
1241static ev_signal childev; 1442static ev_signal childev;
1242 1443
1243#ifndef WIFCONTINUED 1444#ifndef WIFCONTINUED
1244# define WIFCONTINUED(status) 0 1445# define WIFCONTINUED(status) 0
… …
1249child_reap (EV_P_ int chain, int pid, int status) 1450child_reap (EV_P_ int chain, int pid, int status)
1250{ 1451{
1251 ev_child *w; 1452 ev_child *w;
1252 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1453 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1253 1454
1254 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1455 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1255 { 1456 {
1256 if ((w->pid == pid || !w->pid) 1457 if ((w->pid == pid || !w->pid)
1257 && (!traced || (w->flags & 1))) 1458 && (!traced || (w->flags & 1)))
1258 { 1459 {
1259 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1460 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1284 /* make sure we are called again until all children have been reaped */ 1485 /* make sure we are called again until all children have been reaped */
1285 /* we need to do it this way so that the callback gets called before we continue */ 1486 /* we need to do it this way so that the callback gets called before we continue */
1286 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1487 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1287 1488
1288 child_reap (EV_A_ pid, pid, status); 1489 child_reap (EV_A_ pid, pid, status);
1289 if (EV_PID_HASHSIZE > 1) 1490 if ((EV_PID_HASHSIZE) > 1)
1290 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1491 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1291} 1492}
1292 1493
1293#endif 1494#endif
1294 1495
1295/*****************************************************************************/ 1496/*****************************************************************************/
1296 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1297#if EV_USE_PORT 1501#if EV_USE_PORT
1298# include "ev_port.c" 1502# include "ev_port.c"
1299#endif 1503#endif
1300#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1301# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1361#ifdef __APPLE__ 1565#ifdef __APPLE__
1362 /* only select works correctly on that "unix-certified" platform */ 1566 /* only select works correctly on that "unix-certified" platform */
1363 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1567 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1364 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1568 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1365#endif 1569#endif
1570#ifdef __FreeBSD__
1571 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1572#endif
1366 1573
1367 return flags; 1574 return flags;
1368} 1575}
1369 1576
1370unsigned int 1577unsigned int
1371ev_embeddable_backends (void) 1578ev_embeddable_backends (void)
1372{ 1579{
1373 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1580 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1374 1581
1375 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1582 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1376 /* please fix it and tell me how to detect the fix */ 1583 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1377 flags &= ~EVBACKEND_EPOLL; 1584 flags &= ~EVBACKEND_EPOLL;
1378 1585
1379 return flags; 1586 return flags;
1380} 1587}
1381 1588
1382unsigned int 1589unsigned int
1383ev_backend (EV_P) 1590ev_backend (EV_P)
1384{ 1591{
1385 return backend; 1592 return backend;
1386} 1593}
1387 1594
1388#if EV_MINIMAL < 2 1595#if EV_FEATURE_API
1389unsigned int 1596unsigned int
1390ev_loop_count (EV_P) 1597ev_iteration (EV_P)
1391{ 1598{
1392 return loop_count; 1599 return loop_count;
1393} 1600}
1394 1601
1395unsigned int 1602unsigned int
1396ev_loop_depth (EV_P) 1603ev_depth (EV_P)
1397{ 1604{
1398 return loop_depth; 1605 return loop_depth;
1399} 1606}
1400 1607
1401void 1608void
… …
1458 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1665 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1459 have_monotonic = 1; 1666 have_monotonic = 1;
1460 } 1667 }
1461#endif 1668#endif
1462 1669
1670 /* pid check not overridable via env */
1671#ifndef _WIN32
1672 if (flags & EVFLAG_FORKCHECK)
1673 curpid = getpid ();
1674#endif
1675
1676 if (!(flags & EVFLAG_NOENV)
1677 && !enable_secure ()
1678 && getenv ("LIBEV_FLAGS"))
1679 flags = atoi (getenv ("LIBEV_FLAGS"));
1680
1463 ev_rt_now = ev_time (); 1681 ev_rt_now = ev_time ();
1464 mn_now = get_clock (); 1682 mn_now = get_clock ();
1465 now_floor = mn_now; 1683 now_floor = mn_now;
1466 rtmn_diff = ev_rt_now - mn_now; 1684 rtmn_diff = ev_rt_now - mn_now;
1467#if EV_MINIMAL < 2 1685#if EV_FEATURE_API
1468 invoke_cb = ev_invoke_pending; 1686 invoke_cb = ev_invoke_pending;
1469#endif 1687#endif
1470 1688
1471 io_blocktime = 0.; 1689 io_blocktime = 0.;
1472 timeout_blocktime = 0.; 1690 timeout_blocktime = 0.;
1473 backend = 0; 1691 backend = 0;
1474 backend_fd = -1; 1692 backend_fd = -1;
1475 gotasync = 0; 1693 sig_pending = 0;
1694#if EV_ASYNC_ENABLE
1695 async_pending = 0;
1696#endif
1476#if EV_USE_INOTIFY 1697#if EV_USE_INOTIFY
1477 fs_fd = -2; 1698 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1478#endif 1699#endif
1479 1700#if EV_USE_SIGNALFD
1480 /* pid check not overridable via env */ 1701 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1481#ifndef _WIN32
1482 if (flags & EVFLAG_FORKCHECK)
1483 curpid = getpid ();
1484#endif 1702#endif
1485
1486 if (!(flags & EVFLAG_NOENV)
1487 && !enable_secure ()
1488 && getenv ("LIBEV_FLAGS"))
1489 flags = atoi (getenv ("LIBEV_FLAGS"));
1490 1703
1491 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1492 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1493 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1494#if EV_USE_PORT 1710#if EV_USE_PORT
1495 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1496#endif 1712#endif
1497#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1498 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1507 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1723 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1508#endif 1724#endif
1509 1725
1510 ev_prepare_init (&pending_w, pendingcb); 1726 ev_prepare_init (&pending_w, pendingcb);
1511 1727
1728#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1512 ev_init (&pipe_w, pipecb); 1729 ev_init (&pipe_w, pipecb);
1513 ev_set_priority (&pipe_w, EV_MAXPRI); 1730 ev_set_priority (&pipe_w, EV_MAXPRI);
1731#endif
1514 } 1732 }
1515} 1733}
1516 1734
1517/* free up a loop structure */ 1735/* free up a loop structure */
1518static void noinline 1736void
1519loop_destroy (EV_P) 1737ev_loop_destroy (EV_P)
1520{ 1738{
1521 int i; 1739 int i;
1522 1740
1741#if EV_CLEANUP_ENABLE
1742 /* queue cleanup watchers (and execute them) */
1743 if (expect_false (cleanupcnt))
1744 {
1745 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1746 EV_INVOKE_PENDING;
1747 }
1748#endif
1749
1750#if EV_CHILD_ENABLE
1751 if (ev_is_active (&childev))
1752 {
1753 ev_ref (EV_A); /* child watcher */
1754 ev_signal_stop (EV_A_ &childev);
1755 }
1756#endif
1757
1523 if (ev_is_active (&pipe_w)) 1758 if (ev_is_active (&pipe_w))
1524 { 1759 {
1525 ev_ref (EV_A); /* signal watcher */ 1760 /*ev_ref (EV_A);*/
1526 ev_io_stop (EV_A_ &pipe_w); 1761 /*ev_io_stop (EV_A_ &pipe_w);*/
1527 1762
1528#if EV_USE_EVENTFD 1763#if EV_USE_EVENTFD
1529 if (evfd >= 0) 1764 if (evfd >= 0)
1530 close (evfd); 1765 close (evfd);
1531#endif 1766#endif
1532 1767
1533 if (evpipe [0] >= 0) 1768 if (evpipe [0] >= 0)
1534 { 1769 {
1535 close (evpipe [0]); 1770 EV_WIN32_CLOSE_FD (evpipe [0]);
1536 close (evpipe [1]); 1771 EV_WIN32_CLOSE_FD (evpipe [1]);
1537 } 1772 }
1538 } 1773 }
1774
1775#if EV_USE_SIGNALFD
1776 if (ev_is_active (&sigfd_w))
1777 close (sigfd);
1778#endif
1539 1779
1540#if EV_USE_INOTIFY 1780#if EV_USE_INOTIFY
1541 if (fs_fd >= 0) 1781 if (fs_fd >= 0)
1542 close (fs_fd); 1782 close (fs_fd);
1543#endif 1783#endif
1544 1784
1545 if (backend_fd >= 0) 1785 if (backend_fd >= 0)
1546 close (backend_fd); 1786 close (backend_fd);
1547 1787
1788#if EV_USE_IOCP
1789 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1790#endif
1548#if EV_USE_PORT 1791#if EV_USE_PORT
1549 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1792 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1550#endif 1793#endif
1551#if EV_USE_KQUEUE 1794#if EV_USE_KQUEUE
1552 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1795 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1567#if EV_IDLE_ENABLE 1810#if EV_IDLE_ENABLE
1568 array_free (idle, [i]); 1811 array_free (idle, [i]);
1569#endif 1812#endif
1570 } 1813 }
1571 1814
1572 ev_free (anfds); anfdmax = 0; 1815 ev_free (anfds); anfds = 0; anfdmax = 0;
1573 1816
1574 /* have to use the microsoft-never-gets-it-right macro */ 1817 /* have to use the microsoft-never-gets-it-right macro */
1575 array_free (rfeed, EMPTY); 1818 array_free (rfeed, EMPTY);
1576 array_free (fdchange, EMPTY); 1819 array_free (fdchange, EMPTY);
1577 array_free (timer, EMPTY); 1820 array_free (timer, EMPTY);
… …
1579 array_free (periodic, EMPTY); 1822 array_free (periodic, EMPTY);
1580#endif 1823#endif
1581#if EV_FORK_ENABLE 1824#if EV_FORK_ENABLE
1582 array_free (fork, EMPTY); 1825 array_free (fork, EMPTY);
1583#endif 1826#endif
1827#if EV_CLEANUP_ENABLE
1828 array_free (cleanup, EMPTY);
1829#endif
1584 array_free (prepare, EMPTY); 1830 array_free (prepare, EMPTY);
1585 array_free (check, EMPTY); 1831 array_free (check, EMPTY);
1586#if EV_ASYNC_ENABLE 1832#if EV_ASYNC_ENABLE
1587 array_free (async, EMPTY); 1833 array_free (async, EMPTY);
1588#endif 1834#endif
1589 1835
1590 backend = 0; 1836 backend = 0;
1837
1838#if EV_MULTIPLICITY
1839 if (ev_is_default_loop (EV_A))
1840#endif
1841 ev_default_loop_ptr = 0;
1842#if EV_MULTIPLICITY
1843 else
1844 ev_free (EV_A);
1845#endif
1591} 1846}
1592 1847
1593#if EV_USE_INOTIFY 1848#if EV_USE_INOTIFY
1594inline_size void infy_fork (EV_P); 1849inline_size void infy_fork (EV_P);
1595#endif 1850#endif
… …
1612 1867
1613 if (ev_is_active (&pipe_w)) 1868 if (ev_is_active (&pipe_w))
1614 { 1869 {
1615 /* this "locks" the handlers against writing to the pipe */ 1870 /* this "locks" the handlers against writing to the pipe */
1616 /* while we modify the fd vars */ 1871 /* while we modify the fd vars */
1617 gotsig = 1; 1872 sig_pending = 1;
1618#if EV_ASYNC_ENABLE 1873#if EV_ASYNC_ENABLE
1619 gotasync = 1; 1874 async_pending = 1;
1620#endif 1875#endif
1621 1876
1622 ev_ref (EV_A); 1877 ev_ref (EV_A);
1623 ev_io_stop (EV_A_ &pipe_w); 1878 ev_io_stop (EV_A_ &pipe_w);
1624 1879
… …
1627 close (evfd); 1882 close (evfd);
1628#endif 1883#endif
1629 1884
1630 if (evpipe [0] >= 0) 1885 if (evpipe [0] >= 0)
1631 { 1886 {
1632 close (evpipe [0]); 1887 EV_WIN32_CLOSE_FD (evpipe [0]);
1633 close (evpipe [1]); 1888 EV_WIN32_CLOSE_FD (evpipe [1]);
1634 } 1889 }
1635 1890
1891#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1636 evpipe_init (EV_A); 1892 evpipe_init (EV_A);
1637 /* now iterate over everything, in case we missed something */ 1893 /* now iterate over everything, in case we missed something */
1638 pipecb (EV_A_ &pipe_w, EV_READ); 1894 pipecb (EV_A_ &pipe_w, EV_READ);
1895#endif
1639 } 1896 }
1640 1897
1641 postfork = 0; 1898 postfork = 0;
1642} 1899}
1643 1900
1644#if EV_MULTIPLICITY 1901#if EV_MULTIPLICITY
1645 1902
1646struct ev_loop * 1903struct ev_loop *
1647ev_loop_new (unsigned int flags) 1904ev_loop_new (unsigned int flags)
1648{ 1905{
1649 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1906 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1650 1907
1651 memset (loop, 0, sizeof (struct ev_loop)); 1908 memset (EV_A, 0, sizeof (struct ev_loop));
1652
1653 loop_init (EV_A_ flags); 1909 loop_init (EV_A_ flags);
1654 1910
1655 if (ev_backend (EV_A)) 1911 if (ev_backend (EV_A))
1656 return loop; 1912 return EV_A;
1657 1913
1914 ev_free (EV_A);
1658 return 0; 1915 return 0;
1659} 1916}
1660 1917
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 */ 1918#endif /* multiplicity */
1674 1919
1675#if EV_VERIFY 1920#if EV_VERIFY
1676static void noinline 1921static void noinline
1677verify_watcher (EV_P_ W w) 1922verify_watcher (EV_P_ W w)
… …
1706 verify_watcher (EV_A_ ws [cnt]); 1951 verify_watcher (EV_A_ ws [cnt]);
1707 } 1952 }
1708} 1953}
1709#endif 1954#endif
1710 1955
1711#if EV_MINIMAL < 2 1956#if EV_FEATURE_API
1712void 1957void
1713ev_loop_verify (EV_P) 1958ev_verify (EV_P)
1714{ 1959{
1715#if EV_VERIFY 1960#if EV_VERIFY
1716 int i; 1961 int i;
1717 WL w; 1962 WL w;
1718 1963
… …
1752#if EV_FORK_ENABLE 1997#if EV_FORK_ENABLE
1753 assert (forkmax >= forkcnt); 1998 assert (forkmax >= forkcnt);
1754 array_verify (EV_A_ (W *)forks, forkcnt); 1999 array_verify (EV_A_ (W *)forks, forkcnt);
1755#endif 2000#endif
1756 2001
2002#if EV_CLEANUP_ENABLE
2003 assert (cleanupmax >= cleanupcnt);
2004 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2005#endif
2006
1757#if EV_ASYNC_ENABLE 2007#if EV_ASYNC_ENABLE
1758 assert (asyncmax >= asynccnt); 2008 assert (asyncmax >= asynccnt);
1759 array_verify (EV_A_ (W *)asyncs, asynccnt); 2009 array_verify (EV_A_ (W *)asyncs, asynccnt);
1760#endif 2010#endif
1761 2011
2012#if EV_PREPARE_ENABLE
1762 assert (preparemax >= preparecnt); 2013 assert (preparemax >= preparecnt);
1763 array_verify (EV_A_ (W *)prepares, preparecnt); 2014 array_verify (EV_A_ (W *)prepares, preparecnt);
2015#endif
1764 2016
2017#if EV_CHECK_ENABLE
1765 assert (checkmax >= checkcnt); 2018 assert (checkmax >= checkcnt);
1766 array_verify (EV_A_ (W *)checks, checkcnt); 2019 array_verify (EV_A_ (W *)checks, checkcnt);
2020#endif
1767 2021
1768# if 0 2022# if 0
2023#if EV_CHILD_ENABLE
1769 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2024 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) 2025 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2026#endif
1771# endif 2027# endif
1772#endif 2028#endif
1773} 2029}
1774#endif 2030#endif
1775 2031
1776#if EV_MULTIPLICITY 2032#if EV_MULTIPLICITY
1777struct ev_loop * 2033struct ev_loop *
1778ev_default_loop_init (unsigned int flags)
1779#else 2034#else
1780int 2035int
2036#endif
1781ev_default_loop (unsigned int flags) 2037ev_default_loop (unsigned int flags)
1782#endif
1783{ 2038{
1784 if (!ev_default_loop_ptr) 2039 if (!ev_default_loop_ptr)
1785 { 2040 {
1786#if EV_MULTIPLICITY 2041#if EV_MULTIPLICITY
1787 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2042 EV_P = ev_default_loop_ptr = &default_loop_struct;
1788#else 2043#else
1789 ev_default_loop_ptr = 1; 2044 ev_default_loop_ptr = 1;
1790#endif 2045#endif
1791 2046
1792 loop_init (EV_A_ flags); 2047 loop_init (EV_A_ flags);
1793 2048
1794 if (ev_backend (EV_A)) 2049 if (ev_backend (EV_A))
1795 { 2050 {
1796#ifndef _WIN32 2051#if EV_CHILD_ENABLE
1797 ev_signal_init (&childev, childcb, SIGCHLD); 2052 ev_signal_init (&childev, childcb, SIGCHLD);
1798 ev_set_priority (&childev, EV_MAXPRI); 2053 ev_set_priority (&childev, EV_MAXPRI);
1799 ev_signal_start (EV_A_ &childev); 2054 ev_signal_start (EV_A_ &childev);
1800 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2055 ev_unref (EV_A); /* child watcher should not keep loop alive */
1801#endif 2056#endif
… …
1806 2061
1807 return ev_default_loop_ptr; 2062 return ev_default_loop_ptr;
1808} 2063}
1809 2064
1810void 2065void
1811ev_default_destroy (void) 2066ev_loop_fork (EV_P)
1812{ 2067{
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 */ 2068 postfork = 1; /* must be in line with ev_default_fork */
1835} 2069}
1836 2070
1837/*****************************************************************************/ 2071/*****************************************************************************/
1838 2072
1839void 2073void
1840ev_invoke (EV_P_ void *w, int revents) 2074ev_invoke (EV_P_ void *w, int revents)
1841{ 2075{
1842 EV_CB_INVOKE ((W)w, revents); 2076 EV_CB_INVOKE ((W)w, revents);
2077}
2078
2079unsigned int
2080ev_pending_count (EV_P)
2081{
2082 int pri;
2083 unsigned int count = 0;
2084
2085 for (pri = NUMPRI; pri--; )
2086 count += pendingcnt [pri];
2087
2088 return count;
1843} 2089}
1844 2090
1845void noinline 2091void noinline
1846ev_invoke_pending (EV_P) 2092ev_invoke_pending (EV_P)
1847{ 2093{
… …
1918 EV_FREQUENT_CHECK; 2164 EV_FREQUENT_CHECK;
1919 feed_reverse (EV_A_ (W)w); 2165 feed_reverse (EV_A_ (W)w);
1920 } 2166 }
1921 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2167 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1922 2168
1923 feed_reverse_done (EV_A_ EV_TIMEOUT); 2169 feed_reverse_done (EV_A_ EV_TIMER);
1924 } 2170 }
1925} 2171}
1926 2172
1927#if EV_PERIODIC_ENABLE 2173#if EV_PERIODIC_ENABLE
1928/* make periodics pending */ 2174/* make periodics pending */
… …
1981 feed_reverse_done (EV_A_ EV_PERIODIC); 2227 feed_reverse_done (EV_A_ EV_PERIODIC);
1982 } 2228 }
1983} 2229}
1984 2230
1985/* simply recalculate all periodics */ 2231/* simply recalculate all periodics */
1986/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2232/* TODO: maybe ensure that at least one event happens when jumping forward? */
1987static void noinline 2233static void noinline
1988periodics_reschedule (EV_P) 2234periodics_reschedule (EV_P)
1989{ 2235{
1990 int i; 2236 int i;
1991 2237
… …
2019 ANHE_at_cache (*he); 2265 ANHE_at_cache (*he);
2020 } 2266 }
2021} 2267}
2022 2268
2023/* fetch new monotonic and realtime times from the kernel */ 2269/* fetch new monotonic and realtime times from the kernel */
2024/* also detetc if there was a timejump, and act accordingly */ 2270/* also detect if there was a timejump, and act accordingly */
2025inline_speed void 2271inline_speed void
2026time_update (EV_P_ ev_tstamp max_block) 2272time_update (EV_P_ ev_tstamp max_block)
2027{ 2273{
2028#if EV_USE_MONOTONIC 2274#if EV_USE_MONOTONIC
2029 if (expect_true (have_monotonic)) 2275 if (expect_true (have_monotonic))
… …
2087 mn_now = ev_rt_now; 2333 mn_now = ev_rt_now;
2088 } 2334 }
2089} 2335}
2090 2336
2091void 2337void
2092ev_loop (EV_P_ int flags) 2338ev_run (EV_P_ int flags)
2093{ 2339{
2094#if EV_MINIMAL < 2 2340#if EV_FEATURE_API
2095 ++loop_depth; 2341 ++loop_depth;
2096#endif 2342#endif
2097 2343
2098 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2344 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2099 2345
2100 loop_done = EVUNLOOP_CANCEL; 2346 loop_done = EVBREAK_CANCEL;
2101 2347
2102 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2348 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2103 2349
2104 do 2350 do
2105 { 2351 {
2106#if EV_VERIFY >= 2 2352#if EV_VERIFY >= 2
2107 ev_loop_verify (EV_A); 2353 ev_verify (EV_A);
2108#endif 2354#endif
2109 2355
2110#ifndef _WIN32 2356#ifndef _WIN32
2111 if (expect_false (curpid)) /* penalise the forking check even more */ 2357 if (expect_false (curpid)) /* penalise the forking check even more */
2112 if (expect_false (getpid () != curpid)) 2358 if (expect_false (getpid () != curpid))
… …
2124 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2370 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2125 EV_INVOKE_PENDING; 2371 EV_INVOKE_PENDING;
2126 } 2372 }
2127#endif 2373#endif
2128 2374
2375#if EV_PREPARE_ENABLE
2129 /* queue prepare watchers (and execute them) */ 2376 /* queue prepare watchers (and execute them) */
2130 if (expect_false (preparecnt)) 2377 if (expect_false (preparecnt))
2131 { 2378 {
2132 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2379 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2133 EV_INVOKE_PENDING; 2380 EV_INVOKE_PENDING;
2134 } 2381 }
2382#endif
2135 2383
2136 if (expect_false (loop_done)) 2384 if (expect_false (loop_done))
2137 break; 2385 break;
2138 2386
2139 /* we might have forked, so reify kernel state if necessary */ 2387 /* we might have forked, so reify kernel state if necessary */
… …
2146 /* calculate blocking time */ 2394 /* calculate blocking time */
2147 { 2395 {
2148 ev_tstamp waittime = 0.; 2396 ev_tstamp waittime = 0.;
2149 ev_tstamp sleeptime = 0.; 2397 ev_tstamp sleeptime = 0.;
2150 2398
2399 /* remember old timestamp for io_blocktime calculation */
2400 ev_tstamp prev_mn_now = mn_now;
2401
2402 /* update time to cancel out callback processing overhead */
2403 time_update (EV_A_ 1e100);
2404
2151 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2405 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2152 { 2406 {
2153 /* remember old timestamp for io_blocktime calculation */
2154 ev_tstamp prev_mn_now = mn_now;
2155
2156 /* update time to cancel out callback processing overhead */
2157 time_update (EV_A_ 1e100);
2158
2159 waittime = MAX_BLOCKTIME; 2407 waittime = MAX_BLOCKTIME;
2160 2408
2161 if (timercnt) 2409 if (timercnt)
2162 { 2410 {
2163 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2411 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2190 waittime -= sleeptime; 2438 waittime -= sleeptime;
2191 } 2439 }
2192 } 2440 }
2193 } 2441 }
2194 2442
2195#if EV_MINIMAL < 2 2443#if EV_FEATURE_API
2196 ++loop_count; 2444 ++loop_count;
2197#endif 2445#endif
2198 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2446 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2199 backend_poll (EV_A_ waittime); 2447 backend_poll (EV_A_ waittime);
2200 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2448 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2201 2449
2202 /* update ev_rt_now, do magic */ 2450 /* update ev_rt_now, do magic */
2203 time_update (EV_A_ waittime + sleeptime); 2451 time_update (EV_A_ waittime + sleeptime);
2204 } 2452 }
2205 2453
… …
2212#if EV_IDLE_ENABLE 2460#if EV_IDLE_ENABLE
2213 /* queue idle watchers unless other events are pending */ 2461 /* queue idle watchers unless other events are pending */
2214 idle_reify (EV_A); 2462 idle_reify (EV_A);
2215#endif 2463#endif
2216 2464
2465#if EV_CHECK_ENABLE
2217 /* queue check watchers, to be executed first */ 2466 /* queue check watchers, to be executed first */
2218 if (expect_false (checkcnt)) 2467 if (expect_false (checkcnt))
2219 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2468 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2469#endif
2220 2470
2221 EV_INVOKE_PENDING; 2471 EV_INVOKE_PENDING;
2222 } 2472 }
2223 while (expect_true ( 2473 while (expect_true (
2224 activecnt 2474 activecnt
2225 && !loop_done 2475 && !loop_done
2226 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2476 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2227 )); 2477 ));
2228 2478
2229 if (loop_done == EVUNLOOP_ONE) 2479 if (loop_done == EVBREAK_ONE)
2230 loop_done = EVUNLOOP_CANCEL; 2480 loop_done = EVBREAK_CANCEL;
2231 2481
2232#if EV_MINIMAL < 2 2482#if EV_FEATURE_API
2233 --loop_depth; 2483 --loop_depth;
2234#endif 2484#endif
2235} 2485}
2236 2486
2237void 2487void
2238ev_unloop (EV_P_ int how) 2488ev_break (EV_P_ int how)
2239{ 2489{
2240 loop_done = how; 2490 loop_done = how;
2241} 2491}
2242 2492
2243void 2493void
… …
2290inline_size void 2540inline_size void
2291wlist_del (WL *head, WL elem) 2541wlist_del (WL *head, WL elem)
2292{ 2542{
2293 while (*head) 2543 while (*head)
2294 { 2544 {
2295 if (*head == elem) 2545 if (expect_true (*head == elem))
2296 { 2546 {
2297 *head = elem->next; 2547 *head = elem->next;
2298 return; 2548 break;
2299 } 2549 }
2300 2550
2301 head = &(*head)->next; 2551 head = &(*head)->next;
2302 } 2552 }
2303} 2553}
… …
2363 2613
2364 if (expect_false (ev_is_active (w))) 2614 if (expect_false (ev_is_active (w)))
2365 return; 2615 return;
2366 2616
2367 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2617 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2368 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2618 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2369 2619
2370 EV_FREQUENT_CHECK; 2620 EV_FREQUENT_CHECK;
2371 2621
2372 ev_start (EV_A_ (W)w, 1); 2622 ev_start (EV_A_ (W)w, 1);
2373 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2623 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2391 EV_FREQUENT_CHECK; 2641 EV_FREQUENT_CHECK;
2392 2642
2393 wlist_del (&anfds[w->fd].head, (WL)w); 2643 wlist_del (&anfds[w->fd].head, (WL)w);
2394 ev_stop (EV_A_ (W)w); 2644 ev_stop (EV_A_ (W)w);
2395 2645
2396 fd_change (EV_A_ w->fd, 1); 2646 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2397 2647
2398 EV_FREQUENT_CHECK; 2648 EV_FREQUENT_CHECK;
2399} 2649}
2400 2650
2401void noinline 2651void noinline
… …
2443 timers [active] = timers [timercnt + HEAP0]; 2693 timers [active] = timers [timercnt + HEAP0];
2444 adjustheap (timers, timercnt, active); 2694 adjustheap (timers, timercnt, active);
2445 } 2695 }
2446 } 2696 }
2447 2697
2448 EV_FREQUENT_CHECK;
2449
2450 ev_at (w) -= mn_now; 2698 ev_at (w) -= mn_now;
2451 2699
2452 ev_stop (EV_A_ (W)w); 2700 ev_stop (EV_A_ (W)w);
2701
2702 EV_FREQUENT_CHECK;
2453} 2703}
2454 2704
2455void noinline 2705void noinline
2456ev_timer_again (EV_P_ ev_timer *w) 2706ev_timer_again (EV_P_ ev_timer *w)
2457{ 2707{
… …
2475 } 2725 }
2476 2726
2477 EV_FREQUENT_CHECK; 2727 EV_FREQUENT_CHECK;
2478} 2728}
2479 2729
2730ev_tstamp
2731ev_timer_remaining (EV_P_ ev_timer *w)
2732{
2733 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2734}
2735
2480#if EV_PERIODIC_ENABLE 2736#if EV_PERIODIC_ENABLE
2481void noinline 2737void noinline
2482ev_periodic_start (EV_P_ ev_periodic *w) 2738ev_periodic_start (EV_P_ ev_periodic *w)
2483{ 2739{
2484 if (expect_false (ev_is_active (w))) 2740 if (expect_false (ev_is_active (w)))
… …
2530 periodics [active] = periodics [periodiccnt + HEAP0]; 2786 periodics [active] = periodics [periodiccnt + HEAP0];
2531 adjustheap (periodics, periodiccnt, active); 2787 adjustheap (periodics, periodiccnt, active);
2532 } 2788 }
2533 } 2789 }
2534 2790
2535 EV_FREQUENT_CHECK;
2536
2537 ev_stop (EV_A_ (W)w); 2791 ev_stop (EV_A_ (W)w);
2792
2793 EV_FREQUENT_CHECK;
2538} 2794}
2539 2795
2540void noinline 2796void noinline
2541ev_periodic_again (EV_P_ ev_periodic *w) 2797ev_periodic_again (EV_P_ ev_periodic *w)
2542{ 2798{
… …
2548 2804
2549#ifndef SA_RESTART 2805#ifndef SA_RESTART
2550# define SA_RESTART 0 2806# define SA_RESTART 0
2551#endif 2807#endif
2552 2808
2809#if EV_SIGNAL_ENABLE
2810
2553void noinline 2811void noinline
2554ev_signal_start (EV_P_ ev_signal *w) 2812ev_signal_start (EV_P_ ev_signal *w)
2555{ 2813{
2556#if EV_MULTIPLICITY
2557 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2558#endif
2559 if (expect_false (ev_is_active (w))) 2814 if (expect_false (ev_is_active (w)))
2560 return; 2815 return;
2561 2816
2562 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2817 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2563 2818
2564 evpipe_init (EV_A); 2819#if EV_MULTIPLICITY
2820 assert (("libev: a signal must not be attached to two different loops",
2821 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2565 2822
2566 EV_FREQUENT_CHECK; 2823 signals [w->signum - 1].loop = EV_A;
2824#endif
2567 2825
2826 EV_FREQUENT_CHECK;
2827
2828#if EV_USE_SIGNALFD
2829 if (sigfd == -2)
2568 { 2830 {
2569#ifndef _WIN32 2831 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2570 sigset_t full, prev; 2832 if (sigfd < 0 && errno == EINVAL)
2571 sigfillset (&full); 2833 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2572 sigprocmask (SIG_SETMASK, &full, &prev);
2573#endif
2574 2834
2575 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2835 if (sigfd >= 0)
2836 {
2837 fd_intern (sigfd); /* doing it twice will not hurt */
2576 2838
2577#ifndef _WIN32 2839 sigemptyset (&sigfd_set);
2578 sigprocmask (SIG_SETMASK, &prev, 0); 2840
2579#endif 2841 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2842 ev_set_priority (&sigfd_w, EV_MAXPRI);
2843 ev_io_start (EV_A_ &sigfd_w);
2844 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2845 }
2580 } 2846 }
2847
2848 if (sigfd >= 0)
2849 {
2850 /* TODO: check .head */
2851 sigaddset (&sigfd_set, w->signum);
2852 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2853
2854 signalfd (sigfd, &sigfd_set, 0);
2855 }
2856#endif
2581 2857
2582 ev_start (EV_A_ (W)w, 1); 2858 ev_start (EV_A_ (W)w, 1);
2583 wlist_add (&signals [w->signum - 1].head, (WL)w); 2859 wlist_add (&signals [w->signum - 1].head, (WL)w);
2584 2860
2585 if (!((WL)w)->next) 2861 if (!((WL)w)->next)
2862# if EV_USE_SIGNALFD
2863 if (sigfd < 0) /*TODO*/
2864# endif
2586 { 2865 {
2587#if _WIN32 2866# ifdef _WIN32
2867 evpipe_init (EV_A);
2868
2588 signal (w->signum, ev_sighandler); 2869 signal (w->signum, ev_sighandler);
2589#else 2870# else
2590 struct sigaction sa = { }; 2871 struct sigaction sa;
2872
2873 evpipe_init (EV_A);
2874
2591 sa.sa_handler = ev_sighandler; 2875 sa.sa_handler = ev_sighandler;
2592 sigfillset (&sa.sa_mask); 2876 sigfillset (&sa.sa_mask);
2593 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2877 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2594 sigaction (w->signum, &sa, 0); 2878 sigaction (w->signum, &sa, 0);
2879
2880 sigemptyset (&sa.sa_mask);
2881 sigaddset (&sa.sa_mask, w->signum);
2882 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2595#endif 2883#endif
2596 } 2884 }
2597 2885
2598 EV_FREQUENT_CHECK; 2886 EV_FREQUENT_CHECK;
2599} 2887}
2600 2888
2601void noinline 2889void noinline
… …
2609 2897
2610 wlist_del (&signals [w->signum - 1].head, (WL)w); 2898 wlist_del (&signals [w->signum - 1].head, (WL)w);
2611 ev_stop (EV_A_ (W)w); 2899 ev_stop (EV_A_ (W)w);
2612 2900
2613 if (!signals [w->signum - 1].head) 2901 if (!signals [w->signum - 1].head)
2902 {
2903#if EV_MULTIPLICITY
2904 signals [w->signum - 1].loop = 0; /* unattach from signal */
2905#endif
2906#if EV_USE_SIGNALFD
2907 if (sigfd >= 0)
2908 {
2909 sigset_t ss;
2910
2911 sigemptyset (&ss);
2912 sigaddset (&ss, w->signum);
2913 sigdelset (&sigfd_set, w->signum);
2914
2915 signalfd (sigfd, &sigfd_set, 0);
2916 sigprocmask (SIG_UNBLOCK, &ss, 0);
2917 }
2918 else
2919#endif
2614 signal (w->signum, SIG_DFL); 2920 signal (w->signum, SIG_DFL);
2921 }
2615 2922
2616 EV_FREQUENT_CHECK; 2923 EV_FREQUENT_CHECK;
2617} 2924}
2925
2926#endif
2927
2928#if EV_CHILD_ENABLE
2618 2929
2619void 2930void
2620ev_child_start (EV_P_ ev_child *w) 2931ev_child_start (EV_P_ ev_child *w)
2621{ 2932{
2622#if EV_MULTIPLICITY 2933#if EV_MULTIPLICITY
… …
2626 return; 2937 return;
2627 2938
2628 EV_FREQUENT_CHECK; 2939 EV_FREQUENT_CHECK;
2629 2940
2630 ev_start (EV_A_ (W)w, 1); 2941 ev_start (EV_A_ (W)w, 1);
2631 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2942 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2632 2943
2633 EV_FREQUENT_CHECK; 2944 EV_FREQUENT_CHECK;
2634} 2945}
2635 2946
2636void 2947void
… …
2640 if (expect_false (!ev_is_active (w))) 2951 if (expect_false (!ev_is_active (w)))
2641 return; 2952 return;
2642 2953
2643 EV_FREQUENT_CHECK; 2954 EV_FREQUENT_CHECK;
2644 2955
2645 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2956 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2646 ev_stop (EV_A_ (W)w); 2957 ev_stop (EV_A_ (W)w);
2647 2958
2648 EV_FREQUENT_CHECK; 2959 EV_FREQUENT_CHECK;
2649} 2960}
2961
2962#endif
2650 2963
2651#if EV_STAT_ENABLE 2964#if EV_STAT_ENABLE
2652 2965
2653# ifdef _WIN32 2966# ifdef _WIN32
2654# undef lstat 2967# undef lstat
… …
2660#define MIN_STAT_INTERVAL 0.1074891 2973#define MIN_STAT_INTERVAL 0.1074891
2661 2974
2662static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2975static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2663 2976
2664#if EV_USE_INOTIFY 2977#if EV_USE_INOTIFY
2665# define EV_INOTIFY_BUFSIZE 8192 2978
2979/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2980# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2666 2981
2667static void noinline 2982static void noinline
2668infy_add (EV_P_ ev_stat *w) 2983infy_add (EV_P_ ev_stat *w)
2669{ 2984{
2670 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); 2985 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);
2671 2986
2672 if (w->wd < 0) 2987 if (w->wd >= 0)
2988 {
2989 struct statfs sfs;
2990
2991 /* now local changes will be tracked by inotify, but remote changes won't */
2992 /* unless the filesystem is known to be local, we therefore still poll */
2993 /* also do poll on <2.6.25, but with normal frequency */
2994
2995 if (!fs_2625)
2996 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2997 else if (!statfs (w->path, &sfs)
2998 && (sfs.f_type == 0x1373 /* devfs */
2999 || sfs.f_type == 0xEF53 /* ext2/3 */
3000 || sfs.f_type == 0x3153464a /* jfs */
3001 || sfs.f_type == 0x52654973 /* reiser3 */
3002 || sfs.f_type == 0x01021994 /* tempfs */
3003 || sfs.f_type == 0x58465342 /* xfs */))
3004 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3005 else
3006 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2673 { 3007 }
3008 else
3009 {
3010 /* can't use inotify, continue to stat */
2674 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3011 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2675 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2676 3012
2677 /* monitor some parent directory for speedup hints */ 3013 /* if path is not there, monitor some parent directory for speedup hints */
2678 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3014 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2679 /* but an efficiency issue only */ 3015 /* but an efficiency issue only */
2680 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3016 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2681 { 3017 {
2682 char path [4096]; 3018 char path [4096];
… …
2698 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3034 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2699 } 3035 }
2700 } 3036 }
2701 3037
2702 if (w->wd >= 0) 3038 if (w->wd >= 0)
2703 {
2704 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3039 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2705 3040
2706 /* now local changes will be tracked by inotify, but remote changes won't */ 3041 /* now re-arm timer, if required */
2707 /* unless the filesystem it known to be local, we therefore still poll */ 3042 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2708 /* also do poll on <2.6.25, but with normal frequency */
2709 struct statfs sfs;
2710
2711 if (fs_2625 && !statfs (w->path, &sfs))
2712 if (sfs.f_type == 0x1373 /* devfs */
2713 || sfs.f_type == 0xEF53 /* ext2/3 */
2714 || sfs.f_type == 0x3153464a /* jfs */
2715 || sfs.f_type == 0x52654973 /* reiser3 */
2716 || sfs.f_type == 0x01021994 /* tempfs */
2717 || sfs.f_type == 0x58465342 /* xfs */)
2718 return;
2719
2720 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2721 ev_timer_again (EV_A_ &w->timer); 3043 ev_timer_again (EV_A_ &w->timer);
2722 } 3044 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2723} 3045}
2724 3046
2725static void noinline 3047static void noinline
2726infy_del (EV_P_ ev_stat *w) 3048infy_del (EV_P_ ev_stat *w)
2727{ 3049{
… …
2730 3052
2731 if (wd < 0) 3053 if (wd < 0)
2732 return; 3054 return;
2733 3055
2734 w->wd = -2; 3056 w->wd = -2;
2735 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3057 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2736 wlist_del (&fs_hash [slot].head, (WL)w); 3058 wlist_del (&fs_hash [slot].head, (WL)w);
2737 3059
2738 /* remove this watcher, if others are watching it, they will rearm */ 3060 /* remove this watcher, if others are watching it, they will rearm */
2739 inotify_rm_watch (fs_fd, wd); 3061 inotify_rm_watch (fs_fd, wd);
2740} 3062}
… …
2742static void noinline 3064static void noinline
2743infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3065infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2744{ 3066{
2745 if (slot < 0) 3067 if (slot < 0)
2746 /* overflow, need to check for all hash slots */ 3068 /* overflow, need to check for all hash slots */
2747 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3069 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2748 infy_wd (EV_A_ slot, wd, ev); 3070 infy_wd (EV_A_ slot, wd, ev);
2749 else 3071 else
2750 { 3072 {
2751 WL w_; 3073 WL w_;
2752 3074
2753 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3075 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2754 { 3076 {
2755 ev_stat *w = (ev_stat *)w_; 3077 ev_stat *w = (ev_stat *)w_;
2756 w_ = w_->next; /* lets us remove this watcher and all before it */ 3078 w_ = w_->next; /* lets us remove this watcher and all before it */
2757 3079
2758 if (w->wd == wd || wd == -1) 3080 if (w->wd == wd || wd == -1)
2759 { 3081 {
2760 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3082 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2761 { 3083 {
2762 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3084 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2763 w->wd = -1; 3085 w->wd = -1;
2764 infy_add (EV_A_ w); /* re-add, no matter what */ 3086 infy_add (EV_A_ w); /* re-add, no matter what */
2765 } 3087 }
2766 3088
2767 stat_timer_cb (EV_A_ &w->timer, 0); 3089 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2772 3094
2773static void 3095static void
2774infy_cb (EV_P_ ev_io *w, int revents) 3096infy_cb (EV_P_ ev_io *w, int revents)
2775{ 3097{
2776 char buf [EV_INOTIFY_BUFSIZE]; 3098 char buf [EV_INOTIFY_BUFSIZE];
2777 struct inotify_event *ev = (struct inotify_event *)buf;
2778 int ofs; 3099 int ofs;
2779 int len = read (fs_fd, buf, sizeof (buf)); 3100 int len = read (fs_fd, buf, sizeof (buf));
2780 3101
2781 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3102 for (ofs = 0; ofs < len; )
3103 {
3104 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2782 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3105 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3106 ofs += sizeof (struct inotify_event) + ev->len;
3107 }
2783} 3108}
2784 3109
2785inline_size void 3110inline_size void
2786check_2625 (EV_P) 3111ev_check_2625 (EV_P)
2787{ 3112{
2788 /* kernels < 2.6.25 are borked 3113 /* kernels < 2.6.25 are borked
2789 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3114 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2790 */ 3115 */
2791 struct utsname buf; 3116 if (ev_linux_version () < 0x020619)
2792 int major, minor, micro;
2793
2794 if (uname (&buf))
2795 return; 3117 return;
2796 3118
2797 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2798 return;
2799
2800 if (major < 2
2801 || (major == 2 && minor < 6)
2802 || (major == 2 && minor == 6 && micro < 25))
2803 return;
2804
2805 fs_2625 = 1; 3119 fs_2625 = 1;
3120}
3121
3122inline_size int
3123infy_newfd (void)
3124{
3125#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3126 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3127 if (fd >= 0)
3128 return fd;
3129#endif
3130 return inotify_init ();
2806} 3131}
2807 3132
2808inline_size void 3133inline_size void
2809infy_init (EV_P) 3134infy_init (EV_P)
2810{ 3135{
2811 if (fs_fd != -2) 3136 if (fs_fd != -2)
2812 return; 3137 return;
2813 3138
2814 fs_fd = -1; 3139 fs_fd = -1;
2815 3140
2816 check_2625 (EV_A); 3141 ev_check_2625 (EV_A);
2817 3142
2818 fs_fd = inotify_init (); 3143 fs_fd = infy_newfd ();
2819 3144
2820 if (fs_fd >= 0) 3145 if (fs_fd >= 0)
2821 { 3146 {
3147 fd_intern (fs_fd);
2822 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3148 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2823 ev_set_priority (&fs_w, EV_MAXPRI); 3149 ev_set_priority (&fs_w, EV_MAXPRI);
2824 ev_io_start (EV_A_ &fs_w); 3150 ev_io_start (EV_A_ &fs_w);
3151 ev_unref (EV_A);
2825 } 3152 }
2826} 3153}
2827 3154
2828inline_size void 3155inline_size void
2829infy_fork (EV_P) 3156infy_fork (EV_P)
… …
2831 int slot; 3158 int slot;
2832 3159
2833 if (fs_fd < 0) 3160 if (fs_fd < 0)
2834 return; 3161 return;
2835 3162
3163 ev_ref (EV_A);
3164 ev_io_stop (EV_A_ &fs_w);
2836 close (fs_fd); 3165 close (fs_fd);
2837 fs_fd = inotify_init (); 3166 fs_fd = infy_newfd ();
2838 3167
3168 if (fs_fd >= 0)
3169 {
3170 fd_intern (fs_fd);
3171 ev_io_set (&fs_w, fs_fd, EV_READ);
3172 ev_io_start (EV_A_ &fs_w);
3173 ev_unref (EV_A);
3174 }
3175
2839 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3176 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2840 { 3177 {
2841 WL w_ = fs_hash [slot].head; 3178 WL w_ = fs_hash [slot].head;
2842 fs_hash [slot].head = 0; 3179 fs_hash [slot].head = 0;
2843 3180
2844 while (w_) 3181 while (w_)
… …
2849 w->wd = -1; 3186 w->wd = -1;
2850 3187
2851 if (fs_fd >= 0) 3188 if (fs_fd >= 0)
2852 infy_add (EV_A_ w); /* re-add, no matter what */ 3189 infy_add (EV_A_ w); /* re-add, no matter what */
2853 else 3190 else
3191 {
3192 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3193 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2854 ev_timer_again (EV_A_ &w->timer); 3194 ev_timer_again (EV_A_ &w->timer);
3195 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3196 }
2855 } 3197 }
2856 } 3198 }
2857} 3199}
2858 3200
2859#endif 3201#endif
… …
2876static void noinline 3218static void noinline
2877stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3219stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2878{ 3220{
2879 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3221 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2880 3222
2881 /* we copy this here each the time so that */ 3223 ev_statdata prev = w->attr;
2882 /* prev has the old value when the callback gets invoked */
2883 w->prev = w->attr;
2884 ev_stat_stat (EV_A_ w); 3224 ev_stat_stat (EV_A_ w);
2885 3225
2886 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3226 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2887 if ( 3227 if (
2888 w->prev.st_dev != w->attr.st_dev 3228 prev.st_dev != w->attr.st_dev
2889 || w->prev.st_ino != w->attr.st_ino 3229 || prev.st_ino != w->attr.st_ino
2890 || w->prev.st_mode != w->attr.st_mode 3230 || prev.st_mode != w->attr.st_mode
2891 || w->prev.st_nlink != w->attr.st_nlink 3231 || prev.st_nlink != w->attr.st_nlink
2892 || w->prev.st_uid != w->attr.st_uid 3232 || prev.st_uid != w->attr.st_uid
2893 || w->prev.st_gid != w->attr.st_gid 3233 || prev.st_gid != w->attr.st_gid
2894 || w->prev.st_rdev != w->attr.st_rdev 3234 || prev.st_rdev != w->attr.st_rdev
2895 || w->prev.st_size != w->attr.st_size 3235 || prev.st_size != w->attr.st_size
2896 || w->prev.st_atime != w->attr.st_atime 3236 || prev.st_atime != w->attr.st_atime
2897 || w->prev.st_mtime != w->attr.st_mtime 3237 || prev.st_mtime != w->attr.st_mtime
2898 || w->prev.st_ctime != w->attr.st_ctime 3238 || prev.st_ctime != w->attr.st_ctime
2899 ) { 3239 ) {
3240 /* we only update w->prev on actual differences */
3241 /* in case we test more often than invoke the callback, */
3242 /* to ensure that prev is always different to attr */
3243 w->prev = prev;
3244
2900 #if EV_USE_INOTIFY 3245 #if EV_USE_INOTIFY
2901 if (fs_fd >= 0) 3246 if (fs_fd >= 0)
2902 { 3247 {
2903 infy_del (EV_A_ w); 3248 infy_del (EV_A_ w);
2904 infy_add (EV_A_ w); 3249 infy_add (EV_A_ w);
… …
2929 3274
2930 if (fs_fd >= 0) 3275 if (fs_fd >= 0)
2931 infy_add (EV_A_ w); 3276 infy_add (EV_A_ w);
2932 else 3277 else
2933#endif 3278#endif
3279 {
2934 ev_timer_again (EV_A_ &w->timer); 3280 ev_timer_again (EV_A_ &w->timer);
3281 ev_unref (EV_A);
3282 }
2935 3283
2936 ev_start (EV_A_ (W)w, 1); 3284 ev_start (EV_A_ (W)w, 1);
2937 3285
2938 EV_FREQUENT_CHECK; 3286 EV_FREQUENT_CHECK;
2939} 3287}
… …
2948 EV_FREQUENT_CHECK; 3296 EV_FREQUENT_CHECK;
2949 3297
2950#if EV_USE_INOTIFY 3298#if EV_USE_INOTIFY
2951 infy_del (EV_A_ w); 3299 infy_del (EV_A_ w);
2952#endif 3300#endif
3301
3302 if (ev_is_active (&w->timer))
3303 {
3304 ev_ref (EV_A);
2953 ev_timer_stop (EV_A_ &w->timer); 3305 ev_timer_stop (EV_A_ &w->timer);
3306 }
2954 3307
2955 ev_stop (EV_A_ (W)w); 3308 ev_stop (EV_A_ (W)w);
2956 3309
2957 EV_FREQUENT_CHECK; 3310 EV_FREQUENT_CHECK;
2958} 3311}
… …
3003 3356
3004 EV_FREQUENT_CHECK; 3357 EV_FREQUENT_CHECK;
3005} 3358}
3006#endif 3359#endif
3007 3360
3361#if EV_PREPARE_ENABLE
3008void 3362void
3009ev_prepare_start (EV_P_ ev_prepare *w) 3363ev_prepare_start (EV_P_ ev_prepare *w)
3010{ 3364{
3011 if (expect_false (ev_is_active (w))) 3365 if (expect_false (ev_is_active (w)))
3012 return; 3366 return;
… …
3038 3392
3039 ev_stop (EV_A_ (W)w); 3393 ev_stop (EV_A_ (W)w);
3040 3394
3041 EV_FREQUENT_CHECK; 3395 EV_FREQUENT_CHECK;
3042} 3396}
3397#endif
3043 3398
3399#if EV_CHECK_ENABLE
3044void 3400void
3045ev_check_start (EV_P_ ev_check *w) 3401ev_check_start (EV_P_ ev_check *w)
3046{ 3402{
3047 if (expect_false (ev_is_active (w))) 3403 if (expect_false (ev_is_active (w)))
3048 return; 3404 return;
… …
3074 3430
3075 ev_stop (EV_A_ (W)w); 3431 ev_stop (EV_A_ (W)w);
3076 3432
3077 EV_FREQUENT_CHECK; 3433 EV_FREQUENT_CHECK;
3078} 3434}
3435#endif
3079 3436
3080#if EV_EMBED_ENABLE 3437#if EV_EMBED_ENABLE
3081void noinline 3438void noinline
3082ev_embed_sweep (EV_P_ ev_embed *w) 3439ev_embed_sweep (EV_P_ ev_embed *w)
3083{ 3440{
3084 ev_loop (w->other, EVLOOP_NONBLOCK); 3441 ev_run (w->other, EVRUN_NOWAIT);
3085} 3442}
3086 3443
3087static void 3444static void
3088embed_io_cb (EV_P_ ev_io *io, int revents) 3445embed_io_cb (EV_P_ ev_io *io, int revents)
3089{ 3446{
3090 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3447 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3091 3448
3092 if (ev_cb (w)) 3449 if (ev_cb (w))
3093 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3450 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3094 else 3451 else
3095 ev_loop (w->other, EVLOOP_NONBLOCK); 3452 ev_run (w->other, EVRUN_NOWAIT);
3096} 3453}
3097 3454
3098static void 3455static void
3099embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3456embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3100{ 3457{
3101 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3458 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3102 3459
3103 { 3460 {
3104 struct ev_loop *loop = w->other; 3461 EV_P = w->other;
3105 3462
3106 while (fdchangecnt) 3463 while (fdchangecnt)
3107 { 3464 {
3108 fd_reify (EV_A); 3465 fd_reify (EV_A);
3109 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3466 ev_run (EV_A_ EVRUN_NOWAIT);
3110 } 3467 }
3111 } 3468 }
3112} 3469}
3113 3470
3114static void 3471static void
… …
3117 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3474 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3118 3475
3119 ev_embed_stop (EV_A_ w); 3476 ev_embed_stop (EV_A_ w);
3120 3477
3121 { 3478 {
3122 struct ev_loop *loop = w->other; 3479 EV_P = w->other;
3123 3480
3124 ev_loop_fork (EV_A); 3481 ev_loop_fork (EV_A);
3125 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3482 ev_run (EV_A_ EVRUN_NOWAIT);
3126 } 3483 }
3127 3484
3128 ev_embed_start (EV_A_ w); 3485 ev_embed_start (EV_A_ w);
3129} 3486}
3130 3487
… …
3141{ 3498{
3142 if (expect_false (ev_is_active (w))) 3499 if (expect_false (ev_is_active (w)))
3143 return; 3500 return;
3144 3501
3145 { 3502 {
3146 struct ev_loop *loop = w->other; 3503 EV_P = w->other;
3147 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3504 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3148 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3505 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3149 } 3506 }
3150 3507
3151 EV_FREQUENT_CHECK; 3508 EV_FREQUENT_CHECK;
… …
3178 3535
3179 ev_io_stop (EV_A_ &w->io); 3536 ev_io_stop (EV_A_ &w->io);
3180 ev_prepare_stop (EV_A_ &w->prepare); 3537 ev_prepare_stop (EV_A_ &w->prepare);
3181 ev_fork_stop (EV_A_ &w->fork); 3538 ev_fork_stop (EV_A_ &w->fork);
3182 3539
3540 ev_stop (EV_A_ (W)w);
3541
3183 EV_FREQUENT_CHECK; 3542 EV_FREQUENT_CHECK;
3184} 3543}
3185#endif 3544#endif
3186 3545
3187#if EV_FORK_ENABLE 3546#if EV_FORK_ENABLE
… …
3220 3579
3221 EV_FREQUENT_CHECK; 3580 EV_FREQUENT_CHECK;
3222} 3581}
3223#endif 3582#endif
3224 3583
3225#if EV_ASYNC_ENABLE 3584#if EV_CLEANUP_ENABLE
3226void 3585void
3227ev_async_start (EV_P_ ev_async *w) 3586ev_cleanup_start (EV_P_ ev_cleanup *w)
3228{ 3587{
3229 if (expect_false (ev_is_active (w))) 3588 if (expect_false (ev_is_active (w)))
3230 return; 3589 return;
3590
3591 EV_FREQUENT_CHECK;
3592
3593 ev_start (EV_A_ (W)w, ++cleanupcnt);
3594 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3595 cleanups [cleanupcnt - 1] = w;
3596
3597 /* cleanup watchers should never keep a refcount on the loop */
3598 ev_unref (EV_A);
3599 EV_FREQUENT_CHECK;
3600}
3601
3602void
3603ev_cleanup_stop (EV_P_ ev_cleanup *w)
3604{
3605 clear_pending (EV_A_ (W)w);
3606 if (expect_false (!ev_is_active (w)))
3607 return;
3608
3609 EV_FREQUENT_CHECK;
3610 ev_ref (EV_A);
3611
3612 {
3613 int active = ev_active (w);
3614
3615 cleanups [active - 1] = cleanups [--cleanupcnt];
3616 ev_active (cleanups [active - 1]) = active;
3617 }
3618
3619 ev_stop (EV_A_ (W)w);
3620
3621 EV_FREQUENT_CHECK;
3622}
3623#endif
3624
3625#if EV_ASYNC_ENABLE
3626void
3627ev_async_start (EV_P_ ev_async *w)
3628{
3629 if (expect_false (ev_is_active (w)))
3630 return;
3631
3632 w->sent = 0;
3231 3633
3232 evpipe_init (EV_A); 3634 evpipe_init (EV_A);
3233 3635
3234 EV_FREQUENT_CHECK; 3636 EV_FREQUENT_CHECK;
3235 3637
… …
3263 3665
3264void 3666void
3265ev_async_send (EV_P_ ev_async *w) 3667ev_async_send (EV_P_ ev_async *w)
3266{ 3668{
3267 w->sent = 1; 3669 w->sent = 1;
3268 evpipe_write (EV_A_ &gotasync); 3670 evpipe_write (EV_A_ &async_pending);
3269} 3671}
3270#endif 3672#endif
3271 3673
3272/*****************************************************************************/ 3674/*****************************************************************************/
3273 3675
… …
3313{ 3715{
3314 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3716 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3315 3717
3316 if (expect_false (!once)) 3718 if (expect_false (!once))
3317 { 3719 {
3318 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3720 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3319 return; 3721 return;
3320 } 3722 }
3321 3723
3322 once->cb = cb; 3724 once->cb = cb;
3323 once->arg = arg; 3725 once->arg = arg;
… …
3410 if (types & EV_ASYNC) 3812 if (types & EV_ASYNC)
3411 for (i = asynccnt; i--; ) 3813 for (i = asynccnt; i--; )
3412 cb (EV_A_ EV_ASYNC, asyncs [i]); 3814 cb (EV_A_ EV_ASYNC, asyncs [i]);
3413#endif 3815#endif
3414 3816
3817#if EV_PREPARE_ENABLE
3415 if (types & EV_PREPARE) 3818 if (types & EV_PREPARE)
3416 for (i = preparecnt; i--; ) 3819 for (i = preparecnt; i--; )
3417#if EV_EMBED_ENABLE 3820# if EV_EMBED_ENABLE
3418 if (ev_cb (prepares [i]) != embed_prepare_cb) 3821 if (ev_cb (prepares [i]) != embed_prepare_cb)
3419#endif 3822# endif
3420 cb (EV_A_ EV_PREPARE, prepares [i]); 3823 cb (EV_A_ EV_PREPARE, prepares [i]);
3824#endif
3421 3825
3826#if EV_CHECK_ENABLE
3422 if (types & EV_CHECK) 3827 if (types & EV_CHECK)
3423 for (i = checkcnt; i--; ) 3828 for (i = checkcnt; i--; )
3424 cb (EV_A_ EV_CHECK, checks [i]); 3829 cb (EV_A_ EV_CHECK, checks [i]);
3830#endif
3425 3831
3832#if EV_SIGNAL_ENABLE
3426 if (types & EV_SIGNAL) 3833 if (types & EV_SIGNAL)
3427 for (i = 0; i < signalmax; ++i) 3834 for (i = 0; i < EV_NSIG - 1; ++i)
3428 for (wl = signals [i].head; wl; ) 3835 for (wl = signals [i].head; wl; )
3429 { 3836 {
3430 wn = wl->next; 3837 wn = wl->next;
3431 cb (EV_A_ EV_SIGNAL, wl); 3838 cb (EV_A_ EV_SIGNAL, wl);
3432 wl = wn; 3839 wl = wn;
3433 } 3840 }
3841#endif
3434 3842
3843#if EV_CHILD_ENABLE
3435 if (types & EV_CHILD) 3844 if (types & EV_CHILD)
3436 for (i = EV_PID_HASHSIZE; i--; ) 3845 for (i = (EV_PID_HASHSIZE); i--; )
3437 for (wl = childs [i]; wl; ) 3846 for (wl = childs [i]; wl; )
3438 { 3847 {
3439 wn = wl->next; 3848 wn = wl->next;
3440 cb (EV_A_ EV_CHILD, wl); 3849 cb (EV_A_ EV_CHILD, wl);
3441 wl = wn; 3850 wl = wn;
3442 } 3851 }
3852#endif
3443/* EV_STAT 0x00001000 /* stat data changed */ 3853/* EV_STAT 0x00001000 /* stat data changed */
3444/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3854/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3445} 3855}
3446#endif 3856#endif
3447 3857
3448#if EV_MULTIPLICITY 3858#if EV_MULTIPLICITY
3449 #include "ev_wrap.h" 3859 #include "ev_wrap.h"
3450#endif 3860#endif
3451 3861
3452#ifdef __cplusplus 3862EV_CPP(})
3453}
3454#endif
3455 3863

Diff Legend

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