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

Comparing libev/ev.c (file contents):
Revision 1.305 by root, Sun Jul 19 03:49:04 2009 UTC vs.
Revision 1.366 by root, Mon Jan 10 01:58:54 2011 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
… …
77# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
79# endif 75# endif
80# endif 76# endif
81 77
78# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
85# else 82# else
83# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 84# define EV_USE_NANOSLEEP 0
85# endif
86
87# if HAVE_SELECT && HAVE_SYS_SELECT_H
88# ifndef EV_USE_SELECT
89# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
88# endif 94# endif
89 95
96# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 98# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 99# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 100# else
101# undef EV_USE_POLL
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif
104# endif 103# endif
105 104
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 106# ifndef EV_USE_EPOLL
109# else 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
112# endif 112# endif
113 113
114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# ifndef EV_USE_KQUEUE 115# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
116# define EV_USE_KQUEUE 1
117# else
118# define EV_USE_KQUEUE 0
119# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
120# endif 121# endif
121 122
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 124# ifndef EV_USE_PORT
125# else 125# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
128# endif 130# endif
129 131
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 133# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
136# endif 139# endif
137 140
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 142# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 143# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
144# endif 148# endif
145 149
150# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 151# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 152# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
152# endif 157# endif
153 158
154#endif 159#endif
155 160
156#include <math.h> 161#include <math.h>
157#include <stdlib.h> 162#include <stdlib.h>
163#include <string.h>
158#include <fcntl.h> 164#include <fcntl.h>
159#include <stddef.h> 165#include <stddef.h>
160 166
161#include <stdio.h> 167#include <stdio.h>
162 168
163#include <assert.h> 169#include <assert.h>
164#include <errno.h> 170#include <errno.h>
165#include <sys/types.h> 171#include <sys/types.h>
166#include <time.h> 172#include <time.h>
173#include <limits.h>
167 174
168#include <signal.h> 175#include <signal.h>
169 176
170#ifdef EV_H 177#ifdef EV_H
171# include EV_H 178# include EV_H
172#else 179#else
173# include "ev.h" 180# include "ev.h"
174#endif 181#endif
182
183EV_CPP(extern "C" {)
175 184
176#ifndef _WIN32 185#ifndef _WIN32
177# include <sys/time.h> 186# include <sys/time.h>
178# include <sys/wait.h> 187# include <sys/wait.h>
179# include <unistd.h> 188# include <unistd.h>
… …
182# define WIN32_LEAN_AND_MEAN 191# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 192# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
186# endif 195# endif
196# undef EV_AVOID_STDIO
187#endif 197#endif
198
199/* OS X, in its infinite idiocy, actually HARDCODES
200 * a limit of 1024 into their select. Where people have brains,
201 * OS X engineers apparently have a vacuum. Or maybe they were
202 * ordered to have a vacuum, or they do anything for money.
203 * This might help. Or not.
204 */
205#define _DARWIN_UNLIMITED_SELECT 1
188 206
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 207/* this block tries to deduce configuration from header-defined symbols and defaults */
190 208
191/* try to deduce the maximum number of signals on this platform */ 209/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG) 210#if defined (EV_NSIG)
… …
204#elif defined (MAXSIG) 222#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 223# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 224#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 225# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 226#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 228#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 230#else
213# error "unable to find value for NSIG, please report" 231# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 232/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */
215# define EV_NSIG 64 234# define EV_NSIG 65
216#endif 235#endif
217 236
218/* Default to some arbitrary number that's big enough to get most
219 of the common signals.
220*/
221#ifndef NSIG
222# define NSIG 50
223#endif
224/* <-- NSIG logic from Configure */
225#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
226# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
227# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
228# else 240# else
229# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
230# endif 242# endif
231#endif 243#endif
232 244
233#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
234# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
235# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
236# else 248# else
237# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
238# endif 250# endif
239#endif 251#endif
240 252
… …
242# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
243#endif 255#endif
244 256
245#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
246# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
247# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
248# else 260# else
249# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
250# endif 262# endif
251#endif 263#endif
252 264
253#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
254# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
255#endif 267#endif
256 268
257#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
258# ifdef _WIN32 270# ifdef _WIN32
259# define EV_USE_POLL 0 271# define EV_USE_POLL 0
260# else 272# else
261# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
262# endif 274# endif
263#endif 275#endif
264 276
265#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
266# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
267# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
268# else 280# else
269# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
270# endif 282# endif
271#endif 283#endif
272 284
… …
278# define EV_USE_PORT 0 290# define EV_USE_PORT 0
279#endif 291#endif
280 292
281#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
282# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
283# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
284# else 296# else
285# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
286# endif 298# endif
287#endif 299#endif
288 300
289#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
290# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
291# define EV_PID_HASHSIZE 1
292# else
293# define EV_PID_HASHSIZE 16
294# endif
295#endif 303#endif
296 304
297#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
298# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
299# define EV_INOTIFY_HASHSIZE 1
300# else
301# define EV_INOTIFY_HASHSIZE 16
302# endif
303#endif 307#endif
304 308
305#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
306# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
307# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
308# else 312# else
309# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
310# endif 314# endif
311#endif 315#endif
312 316
313#ifndef EV_USE_SIGNALFD 317#ifndef EV_USE_SIGNALFD
314# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
315# define EV_USE_SIGNALFD 1 319# define EV_USE_SIGNALFD EV_FEATURE_OS
316# else 320# else
317# define EV_USE_SIGNALFD 0 321# define EV_USE_SIGNALFD 0
318# endif 322# endif
319#endif 323#endif
320 324
… …
323# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
324# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
325#endif 329#endif
326 330
327#ifndef EV_VERIFY 331#ifndef EV_VERIFY
328# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
329#endif 333#endif
330 334
331#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
332# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
333#endif 337#endif
334 338
335#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
336# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
337#endif 341#endif
338 342
339/* 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, */
340/* which makes programs even slower. might work on other unices, too. */ 344/* which makes programs even slower. might work on other unices, too. */
341#if EV_USE_CLOCK_SYSCALL 345#if EV_USE_CLOCK_SYSCALL
… …
350# endif 354# endif
351#endif 355#endif
352 356
353/* 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 */
354 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
355#ifndef CLOCK_MONOTONIC 365#ifndef CLOCK_MONOTONIC
356# undef EV_USE_MONOTONIC 366# undef EV_USE_MONOTONIC
357# define EV_USE_MONOTONIC 0 367# define EV_USE_MONOTONIC 0
358#endif 368#endif
359 369
… …
372# include <sys/select.h> 382# include <sys/select.h>
373# endif 383# endif
374#endif 384#endif
375 385
376#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
377# include <sys/utsname.h>
378# include <sys/statfs.h> 387# include <sys/statfs.h>
379# include <sys/inotify.h> 388# include <sys/inotify.h>
380/* 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 */
381# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
382# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
393# include <stdint.h> 402# include <stdint.h>
394# ifndef EFD_NONBLOCK 403# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK 404# define EFD_NONBLOCK O_NONBLOCK
396# endif 405# endif
397# ifndef EFD_CLOEXEC 406# ifndef EFD_CLOEXEC
407# ifdef O_CLOEXEC
398# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
409# else
410# define EFD_CLOEXEC 02000000
411# endif
399# endif 412# endif
400# ifdef __cplusplus 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
401extern "C" { 414#endif
415
416#if EV_USE_SIGNALFD
417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
418# include <stdint.h>
419# ifndef SFD_NONBLOCK
420# define SFD_NONBLOCK O_NONBLOCK
402# endif 421# endif
403int eventfd (unsigned int initval, int flags); 422# ifndef SFD_CLOEXEC
404# ifdef __cplusplus 423# ifdef O_CLOEXEC
405} 424# define SFD_CLOEXEC O_CLOEXEC
425# else
426# define SFD_CLOEXEC 02000000
427# endif
406# endif 428# endif
407#endif 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
408 430
409#if EV_USE_SIGNALFD 431struct signalfd_siginfo
410# include <sys/signalfd.h> 432{
433 uint32_t ssi_signo;
434 char pad[128 - sizeof (uint32_t)];
435};
411#endif 436#endif
412 437
413/**/ 438/**/
414 439
415#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
416# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
417#else 442#else
418# define EV_FREQUENT_CHECK do { } while (0) 443# define EV_FREQUENT_CHECK do { } while (0)
419#endif 444#endif
420 445
421/* 446/*
… …
428 */ 453 */
429#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
430 455
431#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) */
432#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) */
433/*#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)
434 461
435#if __GNUC__ >= 4 462#if __GNUC__ >= 4
436# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
437# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
438#else 465#else
… …
445 472
446#define expect_false(expr) expect ((expr) != 0, 0) 473#define expect_false(expr) expect ((expr) != 0, 0)
447#define expect_true(expr) expect ((expr) != 0, 1) 474#define expect_true(expr) expect ((expr) != 0, 1)
448#define inline_size static inline 475#define inline_size static inline
449 476
450#if EV_MINIMAL 477#if EV_FEATURE_CODE
478# define inline_speed static inline
479#else
451# define inline_speed static noinline 480# define inline_speed static noinline
452#else
453# define inline_speed static inline
454#endif 481#endif
455 482
456#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
457 484
458#if EV_MINPRI == EV_MAXPRI 485#if EV_MINPRI == EV_MAXPRI
… …
471#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
472#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
473 500
474#if EV_USE_REALTIME 501#if EV_USE_REALTIME
475/* 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 */
476/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
477static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
478#endif 505#endif
479 506
480#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
481static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
482#endif 509#endif
483 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
484#ifdef _WIN32 521#ifdef _WIN32
485# include "ev_win32.c" 522# include "ev_win32.c"
486#endif 523#endif
487 524
488/*****************************************************************************/ 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
489 576
490static void (*syserr_cb)(const char *msg); 577static void (*syserr_cb)(const char *msg);
491 578
492void 579void
493ev_set_syserr_cb (void (*cb)(const char *msg)) 580ev_set_syserr_cb (void (*cb)(const char *msg))
… …
503 590
504 if (syserr_cb) 591 if (syserr_cb)
505 syserr_cb (msg); 592 syserr_cb (msg);
506 else 593 else
507 { 594 {
595#if EV_AVOID_STDIO
596 ev_printerr (msg);
597 ev_printerr (": ");
598 ev_printerr (strerror (errno));
599 ev_printerr ("\n");
600#else
508 perror (msg); 601 perror (msg);
602#endif
509 abort (); 603 abort ();
510 } 604 }
511} 605}
512 606
513static void * 607static void *
514ev_realloc_emul (void *ptr, long size) 608ev_realloc_emul (void *ptr, long size)
515{ 609{
610#if __GLIBC__
611 return realloc (ptr, size);
612#else
516 /* some systems, notably openbsd and darwin, fail to properly 613 /* some systems, notably openbsd and darwin, fail to properly
517 * implement realloc (x, 0) (as required by both ansi c-98 and 614 * implement realloc (x, 0) (as required by both ansi c-89 and
518 * the single unix specification, so work around them here. 615 * the single unix specification, so work around them here.
519 */ 616 */
520 617
521 if (size) 618 if (size)
522 return realloc (ptr, size); 619 return realloc (ptr, size);
523 620
524 free (ptr); 621 free (ptr);
525 return 0; 622 return 0;
623#endif
526} 624}
527 625
528static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 626static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
529 627
530void 628void
… …
538{ 636{
539 ptr = alloc (ptr, size); 637 ptr = alloc (ptr, size);
540 638
541 if (!ptr && size) 639 if (!ptr && size)
542 { 640 {
641#if EV_AVOID_STDIO
642 ev_printerr ("(libev) memory allocation failed, aborting.\n");
643#else
543 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 644 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
645#endif
544 abort (); 646 abort ();
545 } 647 }
546 648
547 return ptr; 649 return ptr;
548} 650}
… …
564 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 666 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
565 unsigned char unused; 667 unsigned char unused;
566#if EV_USE_EPOLL 668#if EV_USE_EPOLL
567 unsigned int egen; /* generation counter to counter epoll bugs */ 669 unsigned int egen; /* generation counter to counter epoll bugs */
568#endif 670#endif
569#if EV_SELECT_IS_WINSOCKET 671#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
570 SOCKET handle; 672 SOCKET handle;
673#endif
674#if EV_USE_IOCP
675 OVERLAPPED or, ow;
571#endif 676#endif
572} ANFD; 677} ANFD;
573 678
574/* stores the pending event set for a given watcher */ 679/* stores the pending event set for a given watcher */
575typedef struct 680typedef struct
… …
630 735
631 static int ev_default_loop_ptr; 736 static int ev_default_loop_ptr;
632 737
633#endif 738#endif
634 739
635#if EV_MINIMAL < 2 740#if EV_FEATURE_API
636# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 741# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
637# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 742# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
638# define EV_INVOKE_PENDING invoke_cb (EV_A) 743# define EV_INVOKE_PENDING invoke_cb (EV_A)
639#else 744#else
640# define EV_RELEASE_CB (void)0 745# define EV_RELEASE_CB (void)0
641# define EV_ACQUIRE_CB (void)0 746# define EV_ACQUIRE_CB (void)0
642# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 747# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
643#endif 748#endif
644 749
645#define EVUNLOOP_RECURSE 0x80 750#define EVBREAK_RECURSE 0x80
646 751
647/*****************************************************************************/ 752/*****************************************************************************/
648 753
649#ifndef EV_HAVE_EV_TIME 754#ifndef EV_HAVE_EV_TIME
650ev_tstamp 755ev_tstamp
… …
694 if (delay > 0.) 799 if (delay > 0.)
695 { 800 {
696#if EV_USE_NANOSLEEP 801#if EV_USE_NANOSLEEP
697 struct timespec ts; 802 struct timespec ts;
698 803
699 ts.tv_sec = (time_t)delay; 804 EV_TS_SET (ts, delay);
700 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
701
702 nanosleep (&ts, 0); 805 nanosleep (&ts, 0);
703#elif defined(_WIN32) 806#elif defined(_WIN32)
704 Sleep ((unsigned long)(delay * 1e3)); 807 Sleep ((unsigned long)(delay * 1e3));
705#else 808#else
706 struct timeval tv; 809 struct timeval tv;
707 810
708 tv.tv_sec = (time_t)delay;
709 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
710
711 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 811 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
712 /* something not guaranteed by newer posix versions, but guaranteed */ 812 /* something not guaranteed by newer posix versions, but guaranteed */
713 /* by older ones */ 813 /* by older ones */
814 EV_TV_SET (tv, delay);
714 select (0, 0, 0, 0, &tv); 815 select (0, 0, 0, 0, &tv);
715#endif 816#endif
716 } 817 }
717} 818}
718 819
719/*****************************************************************************/ 820/*****************************************************************************/
720 821
721#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 822#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
722 823
723/* find a suitable new size for the given array, */ 824/* find a suitable new size for the given array, */
724/* hopefully by rounding to a ncie-to-malloc size */ 825/* hopefully by rounding to a nice-to-malloc size */
725inline_size int 826inline_size int
726array_nextsize (int elem, int cur, int cnt) 827array_nextsize (int elem, int cur, int cnt)
727{ 828{
728 int ncur = cur + 1; 829 int ncur = cur + 1;
729 830
… …
825} 926}
826 927
827/*****************************************************************************/ 928/*****************************************************************************/
828 929
829inline_speed void 930inline_speed void
830fd_event_nc (EV_P_ int fd, int revents) 931fd_event_nocheck (EV_P_ int fd, int revents)
831{ 932{
832 ANFD *anfd = anfds + fd; 933 ANFD *anfd = anfds + fd;
833 ev_io *w; 934 ev_io *w;
834 935
835 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 936 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
847fd_event (EV_P_ int fd, int revents) 948fd_event (EV_P_ int fd, int revents)
848{ 949{
849 ANFD *anfd = anfds + fd; 950 ANFD *anfd = anfds + fd;
850 951
851 if (expect_true (!anfd->reify)) 952 if (expect_true (!anfd->reify))
852 fd_event_nc (EV_A_ fd, revents); 953 fd_event_nocheck (EV_A_ fd, revents);
853} 954}
854 955
855void 956void
856ev_feed_fd_event (EV_P_ int fd, int revents) 957ev_feed_fd_event (EV_P_ int fd, int revents)
857{ 958{
858 if (fd >= 0 && fd < anfdmax) 959 if (fd >= 0 && fd < anfdmax)
859 fd_event_nc (EV_A_ fd, revents); 960 fd_event_nocheck (EV_A_ fd, revents);
860} 961}
861 962
862/* make sure the external fd watch events are in-sync */ 963/* make sure the external fd watch events are in-sync */
863/* with the kernel/libev internal state */ 964/* with the kernel/libev internal state */
864inline_size void 965inline_size void
… …
870 { 971 {
871 int fd = fdchanges [i]; 972 int fd = fdchanges [i];
872 ANFD *anfd = anfds + fd; 973 ANFD *anfd = anfds + fd;
873 ev_io *w; 974 ev_io *w;
874 975
875 unsigned char events = 0; 976 unsigned char o_events = anfd->events;
977 unsigned char o_reify = anfd->reify;
876 978
877 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 979 anfd->reify = 0;
878 events |= (unsigned char)w->events;
879 980
880#if EV_SELECT_IS_WINSOCKET 981#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
881 if (events) 982 if (o_reify & EV__IOFDSET)
882 { 983 {
883 unsigned long arg; 984 unsigned long arg;
884 #ifdef EV_FD_TO_WIN32_HANDLE
885 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 985 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
886 #else
887 anfd->handle = _get_osfhandle (fd);
888 #endif
889 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 986 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
987 printf ("oi %d %x\n", fd, anfd->handle);//D
890 } 988 }
891#endif 989#endif
892 990
991 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
893 { 992 {
894 unsigned char o_events = anfd->events;
895 unsigned char o_reify = anfd->reify;
896
897 anfd->reify = 0;
898 anfd->events = events; 993 anfd->events = 0;
899 994
900 if (o_events != events || o_reify & EV__IOFDSET) 995 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
996 anfd->events |= (unsigned char)w->events;
997
998 if (o_events != anfd->events)
999 o_reify = EV__IOFDSET; /* actually |= */
1000 }
1001
1002 if (o_reify & EV__IOFDSET)
901 backend_modify (EV_A_ fd, o_events, events); 1003 backend_modify (EV_A_ fd, o_events, anfd->events);
902 }
903 } 1004 }
904 1005
905 fdchangecnt = 0; 1006 fdchangecnt = 0;
906} 1007}
907 1008
… …
931 ev_io_stop (EV_A_ w); 1032 ev_io_stop (EV_A_ w);
932 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1033 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
933 } 1034 }
934} 1035}
935 1036
936/* check whether the given fd is atcually valid, for error recovery */ 1037/* check whether the given fd is actually valid, for error recovery */
937inline_size int 1038inline_size int
938fd_valid (int fd) 1039fd_valid (int fd)
939{ 1040{
940#ifdef _WIN32 1041#ifdef _WIN32
941 return _get_osfhandle (fd) != -1; 1042 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
942#else 1043#else
943 return fcntl (fd, F_GETFD) != -1; 1044 return fcntl (fd, F_GETFD) != -1;
944#endif 1045#endif
945} 1046}
946 1047
… …
964 1065
965 for (fd = anfdmax; fd--; ) 1066 for (fd = anfdmax; fd--; )
966 if (anfds [fd].events) 1067 if (anfds [fd].events)
967 { 1068 {
968 fd_kill (EV_A_ fd); 1069 fd_kill (EV_A_ fd);
969 return; 1070 break;
970 } 1071 }
971} 1072}
972 1073
973/* usually called after fork if backend needs to re-arm all fds from scratch */ 1074/* usually called after fork if backend needs to re-arm all fds from scratch */
974static void noinline 1075static void noinline
… …
983 anfds [fd].emask = 0; 1084 anfds [fd].emask = 0;
984 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1085 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
985 } 1086 }
986} 1087}
987 1088
1089/* used to prepare libev internal fd's */
1090/* this is not fork-safe */
1091inline_speed void
1092fd_intern (int fd)
1093{
1094#ifdef _WIN32
1095 unsigned long arg = 1;
1096 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1097#else
1098 fcntl (fd, F_SETFD, FD_CLOEXEC);
1099 fcntl (fd, F_SETFL, O_NONBLOCK);
1100#endif
1101}
1102
988/*****************************************************************************/ 1103/*****************************************************************************/
989 1104
990/* 1105/*
991 * the heap functions want a real array index. array index 0 uis guaranteed to not 1106 * the heap functions want a real array index. array index 0 is guaranteed to not
992 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1107 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
993 * the branching factor of the d-tree. 1108 * the branching factor of the d-tree.
994 */ 1109 */
995 1110
996/* 1111/*
… …
1064 1179
1065 for (;;) 1180 for (;;)
1066 { 1181 {
1067 int c = k << 1; 1182 int c = k << 1;
1068 1183
1069 if (c > N + HEAP0 - 1) 1184 if (c >= N + HEAP0)
1070 break; 1185 break;
1071 1186
1072 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1187 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1073 ? 1 : 0; 1188 ? 1 : 0;
1074 1189
… …
1110 1225
1111/* move an element suitably so it is in a correct place */ 1226/* move an element suitably so it is in a correct place */
1112inline_size void 1227inline_size void
1113adjustheap (ANHE *heap, int N, int k) 1228adjustheap (ANHE *heap, int N, int k)
1114{ 1229{
1115 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1230 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1116 upheap (heap, k); 1231 upheap (heap, k);
1117 else 1232 else
1118 downheap (heap, N, k); 1233 downheap (heap, N, k);
1119} 1234}
1120 1235
… …
1133/*****************************************************************************/ 1248/*****************************************************************************/
1134 1249
1135/* associate signal watchers to a signal signal */ 1250/* associate signal watchers to a signal signal */
1136typedef struct 1251typedef struct
1137{ 1252{
1253 EV_ATOMIC_T pending;
1254#if EV_MULTIPLICITY
1255 EV_P;
1256#endif
1138 WL head; 1257 WL head;
1139 EV_ATOMIC_T gotsig;
1140} ANSIG; 1258} ANSIG;
1141 1259
1142static ANSIG *signals; 1260static ANSIG signals [EV_NSIG - 1];
1143static int signalmax;
1144
1145static EV_ATOMIC_T gotsig;
1146 1261
1147/*****************************************************************************/ 1262/*****************************************************************************/
1148 1263
1149/* used to prepare libev internal fd's */ 1264#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1150/* this is not fork-safe */
1151inline_speed void
1152fd_intern (int fd)
1153{
1154#ifdef _WIN32
1155 unsigned long arg = 1;
1156 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1157#else
1158 fcntl (fd, F_SETFD, FD_CLOEXEC);
1159 fcntl (fd, F_SETFL, O_NONBLOCK);
1160#endif
1161}
1162 1265
1163static void noinline 1266static void noinline
1164evpipe_init (EV_P) 1267evpipe_init (EV_P)
1165{ 1268{
1166 if (!ev_is_active (&pipe_w)) 1269 if (!ev_is_active (&pipe_w))
1167 { 1270 {
1168#if EV_USE_EVENTFD 1271# if EV_USE_EVENTFD
1169 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1272 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1170 if (evfd < 0 && errno == EINVAL) 1273 if (evfd < 0 && errno == EINVAL)
1171 evfd = eventfd (0, 0); 1274 evfd = eventfd (0, 0);
1172 1275
1173 if (evfd >= 0) 1276 if (evfd >= 0)
… …
1175 evpipe [0] = -1; 1278 evpipe [0] = -1;
1176 fd_intern (evfd); /* doing it twice doesn't hurt */ 1279 fd_intern (evfd); /* doing it twice doesn't hurt */
1177 ev_io_set (&pipe_w, evfd, EV_READ); 1280 ev_io_set (&pipe_w, evfd, EV_READ);
1178 } 1281 }
1179 else 1282 else
1180#endif 1283# endif
1181 { 1284 {
1182 while (pipe (evpipe)) 1285 while (pipe (evpipe))
1183 ev_syserr ("(libev) error creating signal/async pipe"); 1286 ev_syserr ("(libev) error creating signal/async pipe");
1184 1287
1185 fd_intern (evpipe [0]); 1288 fd_intern (evpipe [0]);
… …
1196evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1299evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1197{ 1300{
1198 if (!*flag) 1301 if (!*flag)
1199 { 1302 {
1200 int old_errno = errno; /* save errno because write might clobber it */ 1303 int old_errno = errno; /* save errno because write might clobber it */
1304 char dummy;
1201 1305
1202 *flag = 1; 1306 *flag = 1;
1203 1307
1204#if EV_USE_EVENTFD 1308#if EV_USE_EVENTFD
1205 if (evfd >= 0) 1309 if (evfd >= 0)
… …
1207 uint64_t counter = 1; 1311 uint64_t counter = 1;
1208 write (evfd, &counter, sizeof (uint64_t)); 1312 write (evfd, &counter, sizeof (uint64_t));
1209 } 1313 }
1210 else 1314 else
1211#endif 1315#endif
1316 /* win32 people keep sending patches that change this write() to send() */
1317 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1318 /* so when you think this write should be a send instead, please find out */
1319 /* where your send() is from - it's definitely not the microsoft send, and */
1320 /* tell me. thank you. */
1212 write (evpipe [1], &old_errno, 1); 1321 write (evpipe [1], &dummy, 1);
1213 1322
1214 errno = old_errno; 1323 errno = old_errno;
1215 } 1324 }
1216} 1325}
1217 1326
1218/* called whenever the libev signal pipe */ 1327/* called whenever the libev signal pipe */
1219/* got some events (signal, async) */ 1328/* got some events (signal, async) */
1220static void 1329static void
1221pipecb (EV_P_ ev_io *iow, int revents) 1330pipecb (EV_P_ ev_io *iow, int revents)
1222{ 1331{
1332 int i;
1333
1223#if EV_USE_EVENTFD 1334#if EV_USE_EVENTFD
1224 if (evfd >= 0) 1335 if (evfd >= 0)
1225 { 1336 {
1226 uint64_t counter; 1337 uint64_t counter;
1227 read (evfd, &counter, sizeof (uint64_t)); 1338 read (evfd, &counter, sizeof (uint64_t));
1228 } 1339 }
1229 else 1340 else
1230#endif 1341#endif
1231 { 1342 {
1232 char dummy; 1343 char dummy;
1344 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1233 read (evpipe [0], &dummy, 1); 1345 read (evpipe [0], &dummy, 1);
1234 } 1346 }
1235 1347
1236 if (gotsig && ev_is_default_loop (EV_A)) 1348 if (sig_pending)
1237 { 1349 {
1238 int signum; 1350 sig_pending = 0;
1239 gotsig = 0;
1240 1351
1241 for (signum = signalmax; signum--; ) 1352 for (i = EV_NSIG - 1; i--; )
1242 if (signals [signum].gotsig) 1353 if (expect_false (signals [i].pending))
1243 ev_feed_signal_event (EV_A_ signum + 1); 1354 ev_feed_signal_event (EV_A_ i + 1);
1244 } 1355 }
1245 1356
1246#if EV_ASYNC_ENABLE 1357#if EV_ASYNC_ENABLE
1247 if (gotasync) 1358 if (async_pending)
1248 { 1359 {
1249 int i; 1360 async_pending = 0;
1250 gotasync = 0;
1251 1361
1252 for (i = asynccnt; i--; ) 1362 for (i = asynccnt; i--; )
1253 if (asyncs [i]->sent) 1363 if (asyncs [i]->sent)
1254 { 1364 {
1255 asyncs [i]->sent = 0; 1365 asyncs [i]->sent = 0;
… …
1259#endif 1369#endif
1260} 1370}
1261 1371
1262/*****************************************************************************/ 1372/*****************************************************************************/
1263 1373
1374void
1375ev_feed_signal (int signum)
1376{
1377#if EV_MULTIPLICITY
1378 EV_P = signals [signum - 1].loop;
1379
1380 if (!EV_A)
1381 return;
1382#endif
1383
1384 signals [signum - 1].pending = 1;
1385 evpipe_write (EV_A_ &sig_pending);
1386}
1387
1264static void 1388static void
1265ev_sighandler (int signum) 1389ev_sighandler (int signum)
1266{ 1390{
1267#if EV_MULTIPLICITY
1268 struct ev_loop *loop = &default_loop_struct;
1269#endif
1270
1271#if _WIN32 1391#ifdef _WIN32
1272 signal (signum, ev_sighandler); 1392 signal (signum, ev_sighandler);
1273#endif 1393#endif
1274 1394
1275 signals [signum - 1].gotsig = 1; 1395 ev_feed_signal (signum);
1276 evpipe_write (EV_A_ &gotsig);
1277} 1396}
1278 1397
1279void noinline 1398void noinline
1280ev_feed_signal_event (EV_P_ int signum) 1399ev_feed_signal_event (EV_P_ int signum)
1281{ 1400{
1282 WL w; 1401 WL w;
1283 1402
1403 if (expect_false (signum <= 0 || signum > EV_NSIG))
1404 return;
1405
1406 --signum;
1407
1284#if EV_MULTIPLICITY 1408#if EV_MULTIPLICITY
1285 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1409 /* it is permissible to try to feed a signal to the wrong loop */
1286#endif 1410 /* or, likely more useful, feeding a signal nobody is waiting for */
1287 1411
1288 --signum; 1412 if (expect_false (signals [signum].loop != EV_A))
1289
1290 if (signum < 0 || signum >= signalmax)
1291 return; 1413 return;
1414#endif
1292 1415
1293 signals [signum].gotsig = 0; 1416 signals [signum].pending = 0;
1294 1417
1295 for (w = signals [signum].head; w; w = w->next) 1418 for (w = signals [signum].head; w; w = w->next)
1296 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1419 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1297} 1420}
1298 1421
1299#if EV_USE_SIGNALFD 1422#if EV_USE_SIGNALFD
1300static void 1423static void
1301sigfdcb (EV_P_ ev_io *iow, int revents) 1424sigfdcb (EV_P_ ev_io *iow, int revents)
1302{ 1425{
1303 struct signalfd_siginfo si[4], *sip; 1426 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1304 1427
1305 for (;;) 1428 for (;;)
1306 { 1429 {
1307 ssize_t res = read (sigfd, si, sizeof (si)); 1430 ssize_t res = read (sigfd, si, sizeof (si));
1308 1431
… …
1314 break; 1437 break;
1315 } 1438 }
1316} 1439}
1317#endif 1440#endif
1318 1441
1442#endif
1443
1319/*****************************************************************************/ 1444/*****************************************************************************/
1320 1445
1446#if EV_CHILD_ENABLE
1321static WL childs [EV_PID_HASHSIZE]; 1447static WL childs [EV_PID_HASHSIZE];
1322
1323#ifndef _WIN32
1324 1448
1325static ev_signal childev; 1449static ev_signal childev;
1326 1450
1327#ifndef WIFCONTINUED 1451#ifndef WIFCONTINUED
1328# define WIFCONTINUED(status) 0 1452# define WIFCONTINUED(status) 0
… …
1333child_reap (EV_P_ int chain, int pid, int status) 1457child_reap (EV_P_ int chain, int pid, int status)
1334{ 1458{
1335 ev_child *w; 1459 ev_child *w;
1336 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1460 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1337 1461
1338 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1462 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1339 { 1463 {
1340 if ((w->pid == pid || !w->pid) 1464 if ((w->pid == pid || !w->pid)
1341 && (!traced || (w->flags & 1))) 1465 && (!traced || (w->flags & 1)))
1342 { 1466 {
1343 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1467 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1368 /* make sure we are called again until all children have been reaped */ 1492 /* make sure we are called again until all children have been reaped */
1369 /* we need to do it this way so that the callback gets called before we continue */ 1493 /* we need to do it this way so that the callback gets called before we continue */
1370 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1494 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1371 1495
1372 child_reap (EV_A_ pid, pid, status); 1496 child_reap (EV_A_ pid, pid, status);
1373 if (EV_PID_HASHSIZE > 1) 1497 if ((EV_PID_HASHSIZE) > 1)
1374 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1498 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1375} 1499}
1376 1500
1377#endif 1501#endif
1378 1502
1379/*****************************************************************************/ 1503/*****************************************************************************/
1380 1504
1505#if EV_USE_IOCP
1506# include "ev_iocp.c"
1507#endif
1381#if EV_USE_PORT 1508#if EV_USE_PORT
1382# include "ev_port.c" 1509# include "ev_port.c"
1383#endif 1510#endif
1384#if EV_USE_KQUEUE 1511#if EV_USE_KQUEUE
1385# include "ev_kqueue.c" 1512# include "ev_kqueue.c"
… …
1445#ifdef __APPLE__ 1572#ifdef __APPLE__
1446 /* only select works correctly on that "unix-certified" platform */ 1573 /* only select works correctly on that "unix-certified" platform */
1447 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1574 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1448 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1575 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1449#endif 1576#endif
1577#ifdef __FreeBSD__
1578 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1579#endif
1450 1580
1451 return flags; 1581 return flags;
1452} 1582}
1453 1583
1454unsigned int 1584unsigned int
1455ev_embeddable_backends (void) 1585ev_embeddable_backends (void)
1456{ 1586{
1457 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1587 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1458 1588
1459 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1589 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1460 /* please fix it and tell me how to detect the fix */ 1590 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1461 flags &= ~EVBACKEND_EPOLL; 1591 flags &= ~EVBACKEND_EPOLL;
1462 1592
1463 return flags; 1593 return flags;
1464} 1594}
1465 1595
1466unsigned int 1596unsigned int
1467ev_backend (EV_P) 1597ev_backend (EV_P)
1468{ 1598{
1469 return backend; 1599 return backend;
1470} 1600}
1471 1601
1472#if EV_MINIMAL < 2 1602#if EV_FEATURE_API
1473unsigned int 1603unsigned int
1474ev_loop_count (EV_P) 1604ev_iteration (EV_P)
1475{ 1605{
1476 return loop_count; 1606 return loop_count;
1477} 1607}
1478 1608
1479unsigned int 1609unsigned int
1480ev_loop_depth (EV_P) 1610ev_depth (EV_P)
1481{ 1611{
1482 return loop_depth; 1612 return loop_depth;
1483} 1613}
1484 1614
1485void 1615void
… …
1522static void noinline 1652static void noinline
1523loop_init (EV_P_ unsigned int flags) 1653loop_init (EV_P_ unsigned int flags)
1524{ 1654{
1525 if (!backend) 1655 if (!backend)
1526 { 1656 {
1657 origflags = flags;
1658
1527#if EV_USE_REALTIME 1659#if EV_USE_REALTIME
1528 if (!have_realtime) 1660 if (!have_realtime)
1529 { 1661 {
1530 struct timespec ts; 1662 struct timespec ts;
1531 1663
… …
1542 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1674 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1543 have_monotonic = 1; 1675 have_monotonic = 1;
1544 } 1676 }
1545#endif 1677#endif
1546 1678
1679 /* pid check not overridable via env */
1680#ifndef _WIN32
1681 if (flags & EVFLAG_FORKCHECK)
1682 curpid = getpid ();
1683#endif
1684
1685 if (!(flags & EVFLAG_NOENV)
1686 && !enable_secure ()
1687 && getenv ("LIBEV_FLAGS"))
1688 flags = atoi (getenv ("LIBEV_FLAGS"));
1689
1547 ev_rt_now = ev_time (); 1690 ev_rt_now = ev_time ();
1548 mn_now = get_clock (); 1691 mn_now = get_clock ();
1549 now_floor = mn_now; 1692 now_floor = mn_now;
1550 rtmn_diff = ev_rt_now - mn_now; 1693 rtmn_diff = ev_rt_now - mn_now;
1551#if EV_MINIMAL < 2 1694#if EV_FEATURE_API
1552 invoke_cb = ev_invoke_pending; 1695 invoke_cb = ev_invoke_pending;
1553#endif 1696#endif
1554 1697
1555 io_blocktime = 0.; 1698 io_blocktime = 0.;
1556 timeout_blocktime = 0.; 1699 timeout_blocktime = 0.;
1557 backend = 0; 1700 backend = 0;
1558 backend_fd = -1; 1701 backend_fd = -1;
1559 gotasync = 0; 1702 sig_pending = 0;
1703#if EV_ASYNC_ENABLE
1704 async_pending = 0;
1705#endif
1560#if EV_USE_INOTIFY 1706#if EV_USE_INOTIFY
1561 fs_fd = -2; 1707 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1562#endif 1708#endif
1563#if EV_USE_SIGNALFD 1709#if EV_USE_SIGNALFD
1564 sigfd = -2; 1710 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1565#endif 1711#endif
1566 1712
1567 /* pid check not overridable via env */
1568#ifndef _WIN32
1569 if (flags & EVFLAG_FORKCHECK)
1570 curpid = getpid ();
1571#endif
1572
1573 if (!(flags & EVFLAG_NOENV) 1713 if (!(flags & EVBACKEND_MASK))
1574 && !enable_secure ()
1575 && getenv ("LIBEV_FLAGS"))
1576 flags = atoi (getenv ("LIBEV_FLAGS"));
1577
1578 if (!(flags & 0x0000ffffU))
1579 flags |= ev_recommended_backends (); 1714 flags |= ev_recommended_backends ();
1580 1715
1716#if EV_USE_IOCP
1717 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1718#endif
1581#if EV_USE_PORT 1719#if EV_USE_PORT
1582 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1720 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1583#endif 1721#endif
1584#if EV_USE_KQUEUE 1722#if EV_USE_KQUEUE
1585 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1723 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1594 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1732 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1595#endif 1733#endif
1596 1734
1597 ev_prepare_init (&pending_w, pendingcb); 1735 ev_prepare_init (&pending_w, pendingcb);
1598 1736
1737#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1599 ev_init (&pipe_w, pipecb); 1738 ev_init (&pipe_w, pipecb);
1600 ev_set_priority (&pipe_w, EV_MAXPRI); 1739 ev_set_priority (&pipe_w, EV_MAXPRI);
1740#endif
1601 } 1741 }
1602} 1742}
1603 1743
1604/* free up a loop structure */ 1744/* free up a loop structure */
1605static void noinline 1745void
1606loop_destroy (EV_P) 1746ev_loop_destroy (EV_P)
1607{ 1747{
1608 int i; 1748 int i;
1749
1750#if EV_MULTIPLICITY
1751 /* mimic free (0) */
1752 if (!EV_A)
1753 return;
1754#endif
1755
1756#if EV_CLEANUP_ENABLE
1757 /* queue cleanup watchers (and execute them) */
1758 if (expect_false (cleanupcnt))
1759 {
1760 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1761 EV_INVOKE_PENDING;
1762 }
1763#endif
1764
1765#if EV_CHILD_ENABLE
1766 if (ev_is_active (&childev))
1767 {
1768 ev_ref (EV_A); /* child watcher */
1769 ev_signal_stop (EV_A_ &childev);
1770 }
1771#endif
1609 1772
1610 if (ev_is_active (&pipe_w)) 1773 if (ev_is_active (&pipe_w))
1611 { 1774 {
1612 /*ev_ref (EV_A);*/ 1775 /*ev_ref (EV_A);*/
1613 /*ev_io_stop (EV_A_ &pipe_w);*/ 1776 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1617 close (evfd); 1780 close (evfd);
1618#endif 1781#endif
1619 1782
1620 if (evpipe [0] >= 0) 1783 if (evpipe [0] >= 0)
1621 { 1784 {
1622 close (evpipe [0]); 1785 EV_WIN32_CLOSE_FD (evpipe [0]);
1623 close (evpipe [1]); 1786 EV_WIN32_CLOSE_FD (evpipe [1]);
1624 } 1787 }
1625 } 1788 }
1626 1789
1627#if EV_USE_SIGNALFD 1790#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w)) 1791 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd); 1792 close (sigfd);
1634 }
1635#endif 1793#endif
1636 1794
1637#if EV_USE_INOTIFY 1795#if EV_USE_INOTIFY
1638 if (fs_fd >= 0) 1796 if (fs_fd >= 0)
1639 close (fs_fd); 1797 close (fs_fd);
1640#endif 1798#endif
1641 1799
1642 if (backend_fd >= 0) 1800 if (backend_fd >= 0)
1643 close (backend_fd); 1801 close (backend_fd);
1644 1802
1803#if EV_USE_IOCP
1804 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1805#endif
1645#if EV_USE_PORT 1806#if EV_USE_PORT
1646 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1807 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1647#endif 1808#endif
1648#if EV_USE_KQUEUE 1809#if EV_USE_KQUEUE
1649 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1810 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1676 array_free (periodic, EMPTY); 1837 array_free (periodic, EMPTY);
1677#endif 1838#endif
1678#if EV_FORK_ENABLE 1839#if EV_FORK_ENABLE
1679 array_free (fork, EMPTY); 1840 array_free (fork, EMPTY);
1680#endif 1841#endif
1842#if EV_CLEANUP_ENABLE
1843 array_free (cleanup, EMPTY);
1844#endif
1681 array_free (prepare, EMPTY); 1845 array_free (prepare, EMPTY);
1682 array_free (check, EMPTY); 1846 array_free (check, EMPTY);
1683#if EV_ASYNC_ENABLE 1847#if EV_ASYNC_ENABLE
1684 array_free (async, EMPTY); 1848 array_free (async, EMPTY);
1685#endif 1849#endif
1686 1850
1687 backend = 0; 1851 backend = 0;
1852
1853#if EV_MULTIPLICITY
1854 if (ev_is_default_loop (EV_A))
1855#endif
1856 ev_default_loop_ptr = 0;
1857#if EV_MULTIPLICITY
1858 else
1859 ev_free (EV_A);
1860#endif
1688} 1861}
1689 1862
1690#if EV_USE_INOTIFY 1863#if EV_USE_INOTIFY
1691inline_size void infy_fork (EV_P); 1864inline_size void infy_fork (EV_P);
1692#endif 1865#endif
… …
1709 1882
1710 if (ev_is_active (&pipe_w)) 1883 if (ev_is_active (&pipe_w))
1711 { 1884 {
1712 /* this "locks" the handlers against writing to the pipe */ 1885 /* this "locks" the handlers against writing to the pipe */
1713 /* while we modify the fd vars */ 1886 /* while we modify the fd vars */
1714 gotsig = 1; 1887 sig_pending = 1;
1715#if EV_ASYNC_ENABLE 1888#if EV_ASYNC_ENABLE
1716 gotasync = 1; 1889 async_pending = 1;
1717#endif 1890#endif
1718 1891
1719 ev_ref (EV_A); 1892 ev_ref (EV_A);
1720 ev_io_stop (EV_A_ &pipe_w); 1893 ev_io_stop (EV_A_ &pipe_w);
1721 1894
… …
1724 close (evfd); 1897 close (evfd);
1725#endif 1898#endif
1726 1899
1727 if (evpipe [0] >= 0) 1900 if (evpipe [0] >= 0)
1728 { 1901 {
1729 close (evpipe [0]); 1902 EV_WIN32_CLOSE_FD (evpipe [0]);
1730 close (evpipe [1]); 1903 EV_WIN32_CLOSE_FD (evpipe [1]);
1731 } 1904 }
1732 1905
1906#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1733 evpipe_init (EV_A); 1907 evpipe_init (EV_A);
1734 /* now iterate over everything, in case we missed something */ 1908 /* now iterate over everything, in case we missed something */
1735 pipecb (EV_A_ &pipe_w, EV_READ); 1909 pipecb (EV_A_ &pipe_w, EV_READ);
1910#endif
1736 } 1911 }
1737 1912
1738 postfork = 0; 1913 postfork = 0;
1739} 1914}
1740 1915
1741#if EV_MULTIPLICITY 1916#if EV_MULTIPLICITY
1742 1917
1743struct ev_loop * 1918struct ev_loop *
1744ev_loop_new (unsigned int flags) 1919ev_loop_new (unsigned int flags)
1745{ 1920{
1746 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1921 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1747 1922
1748 memset (loop, 0, sizeof (struct ev_loop)); 1923 memset (EV_A, 0, sizeof (struct ev_loop));
1749 loop_init (EV_A_ flags); 1924 loop_init (EV_A_ flags);
1750 1925
1751 if (ev_backend (EV_A)) 1926 if (ev_backend (EV_A))
1752 return loop; 1927 return EV_A;
1753 1928
1929 ev_free (EV_A);
1754 return 0; 1930 return 0;
1755} 1931}
1756 1932
1757void
1758ev_loop_destroy (EV_P)
1759{
1760 loop_destroy (EV_A);
1761 ev_free (loop);
1762}
1763
1764void
1765ev_loop_fork (EV_P)
1766{
1767 postfork = 1; /* must be in line with ev_default_fork */
1768}
1769#endif /* multiplicity */ 1933#endif /* multiplicity */
1770 1934
1771#if EV_VERIFY 1935#if EV_VERIFY
1772static void noinline 1936static void noinline
1773verify_watcher (EV_P_ W w) 1937verify_watcher (EV_P_ W w)
… …
1802 verify_watcher (EV_A_ ws [cnt]); 1966 verify_watcher (EV_A_ ws [cnt]);
1803 } 1967 }
1804} 1968}
1805#endif 1969#endif
1806 1970
1807#if EV_MINIMAL < 2 1971#if EV_FEATURE_API
1808void 1972void
1809ev_loop_verify (EV_P) 1973ev_verify (EV_P)
1810{ 1974{
1811#if EV_VERIFY 1975#if EV_VERIFY
1812 int i; 1976 int i;
1813 WL w; 1977 WL w;
1814 1978
… …
1848#if EV_FORK_ENABLE 2012#if EV_FORK_ENABLE
1849 assert (forkmax >= forkcnt); 2013 assert (forkmax >= forkcnt);
1850 array_verify (EV_A_ (W *)forks, forkcnt); 2014 array_verify (EV_A_ (W *)forks, forkcnt);
1851#endif 2015#endif
1852 2016
2017#if EV_CLEANUP_ENABLE
2018 assert (cleanupmax >= cleanupcnt);
2019 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2020#endif
2021
1853#if EV_ASYNC_ENABLE 2022#if EV_ASYNC_ENABLE
1854 assert (asyncmax >= asynccnt); 2023 assert (asyncmax >= asynccnt);
1855 array_verify (EV_A_ (W *)asyncs, asynccnt); 2024 array_verify (EV_A_ (W *)asyncs, asynccnt);
1856#endif 2025#endif
1857 2026
2027#if EV_PREPARE_ENABLE
1858 assert (preparemax >= preparecnt); 2028 assert (preparemax >= preparecnt);
1859 array_verify (EV_A_ (W *)prepares, preparecnt); 2029 array_verify (EV_A_ (W *)prepares, preparecnt);
2030#endif
1860 2031
2032#if EV_CHECK_ENABLE
1861 assert (checkmax >= checkcnt); 2033 assert (checkmax >= checkcnt);
1862 array_verify (EV_A_ (W *)checks, checkcnt); 2034 array_verify (EV_A_ (W *)checks, checkcnt);
2035#endif
1863 2036
1864# if 0 2037# if 0
2038#if EV_CHILD_ENABLE
1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2039 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1866 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 2040 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2041#endif
1867# endif 2042# endif
1868#endif 2043#endif
1869} 2044}
1870#endif 2045#endif
1871 2046
1872#if EV_MULTIPLICITY 2047#if EV_MULTIPLICITY
1873struct ev_loop * 2048struct ev_loop *
1874ev_default_loop_init (unsigned int flags)
1875#else 2049#else
1876int 2050int
2051#endif
1877ev_default_loop (unsigned int flags) 2052ev_default_loop (unsigned int flags)
1878#endif
1879{ 2053{
1880 if (!ev_default_loop_ptr) 2054 if (!ev_default_loop_ptr)
1881 { 2055 {
1882#if EV_MULTIPLICITY 2056#if EV_MULTIPLICITY
1883 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2057 EV_P = ev_default_loop_ptr = &default_loop_struct;
1884#else 2058#else
1885 ev_default_loop_ptr = 1; 2059 ev_default_loop_ptr = 1;
1886#endif 2060#endif
1887 2061
1888 loop_init (EV_A_ flags); 2062 loop_init (EV_A_ flags);
1889 2063
1890 if (ev_backend (EV_A)) 2064 if (ev_backend (EV_A))
1891 { 2065 {
1892#ifndef _WIN32 2066#if EV_CHILD_ENABLE
1893 ev_signal_init (&childev, childcb, SIGCHLD); 2067 ev_signal_init (&childev, childcb, SIGCHLD);
1894 ev_set_priority (&childev, EV_MAXPRI); 2068 ev_set_priority (&childev, EV_MAXPRI);
1895 ev_signal_start (EV_A_ &childev); 2069 ev_signal_start (EV_A_ &childev);
1896 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2070 ev_unref (EV_A); /* child watcher should not keep loop alive */
1897#endif 2071#endif
… …
1902 2076
1903 return ev_default_loop_ptr; 2077 return ev_default_loop_ptr;
1904} 2078}
1905 2079
1906void 2080void
1907ev_default_destroy (void) 2081ev_loop_fork (EV_P)
1908{ 2082{
1909#if EV_MULTIPLICITY
1910 struct ev_loop *loop = ev_default_loop_ptr;
1911#endif
1912
1913 ev_default_loop_ptr = 0;
1914
1915#ifndef _WIN32
1916 ev_ref (EV_A); /* child watcher */
1917 ev_signal_stop (EV_A_ &childev);
1918#endif
1919
1920 loop_destroy (EV_A);
1921}
1922
1923void
1924ev_default_fork (void)
1925{
1926#if EV_MULTIPLICITY
1927 struct ev_loop *loop = ev_default_loop_ptr;
1928#endif
1929
1930 postfork = 1; /* must be in line with ev_loop_fork */ 2083 postfork = 1; /* must be in line with ev_default_fork */
1931} 2084}
1932 2085
1933/*****************************************************************************/ 2086/*****************************************************************************/
1934 2087
1935void 2088void
… …
2026 EV_FREQUENT_CHECK; 2179 EV_FREQUENT_CHECK;
2027 feed_reverse (EV_A_ (W)w); 2180 feed_reverse (EV_A_ (W)w);
2028 } 2181 }
2029 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2182 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2030 2183
2031 feed_reverse_done (EV_A_ EV_TIMEOUT); 2184 feed_reverse_done (EV_A_ EV_TIMER);
2032 } 2185 }
2033} 2186}
2034 2187
2035#if EV_PERIODIC_ENABLE 2188#if EV_PERIODIC_ENABLE
2036/* make periodics pending */ 2189/* make periodics pending */
… …
2089 feed_reverse_done (EV_A_ EV_PERIODIC); 2242 feed_reverse_done (EV_A_ EV_PERIODIC);
2090 } 2243 }
2091} 2244}
2092 2245
2093/* simply recalculate all periodics */ 2246/* simply recalculate all periodics */
2094/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2247/* TODO: maybe ensure that at least one event happens when jumping forward? */
2095static void noinline 2248static void noinline
2096periodics_reschedule (EV_P) 2249periodics_reschedule (EV_P)
2097{ 2250{
2098 int i; 2251 int i;
2099 2252
… …
2127 ANHE_at_cache (*he); 2280 ANHE_at_cache (*he);
2128 } 2281 }
2129} 2282}
2130 2283
2131/* fetch new monotonic and realtime times from the kernel */ 2284/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */ 2285/* also detect if there was a timejump, and act accordingly */
2133inline_speed void 2286inline_speed void
2134time_update (EV_P_ ev_tstamp max_block) 2287time_update (EV_P_ ev_tstamp max_block)
2135{ 2288{
2136#if EV_USE_MONOTONIC 2289#if EV_USE_MONOTONIC
2137 if (expect_true (have_monotonic)) 2290 if (expect_true (have_monotonic))
… …
2195 mn_now = ev_rt_now; 2348 mn_now = ev_rt_now;
2196 } 2349 }
2197} 2350}
2198 2351
2199void 2352void
2200ev_loop (EV_P_ int flags) 2353ev_run (EV_P_ int flags)
2201{ 2354{
2202#if EV_MINIMAL < 2 2355#if EV_FEATURE_API
2203 ++loop_depth; 2356 ++loop_depth;
2204#endif 2357#endif
2205 2358
2206 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2359 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2207 2360
2208 loop_done = EVUNLOOP_CANCEL; 2361 loop_done = EVBREAK_CANCEL;
2209 2362
2210 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2363 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2211 2364
2212 do 2365 do
2213 { 2366 {
2214#if EV_VERIFY >= 2 2367#if EV_VERIFY >= 2
2215 ev_loop_verify (EV_A); 2368 ev_verify (EV_A);
2216#endif 2369#endif
2217 2370
2218#ifndef _WIN32 2371#ifndef _WIN32
2219 if (expect_false (curpid)) /* penalise the forking check even more */ 2372 if (expect_false (curpid)) /* penalise the forking check even more */
2220 if (expect_false (getpid () != curpid)) 2373 if (expect_false (getpid () != curpid))
… …
2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2385 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2233 EV_INVOKE_PENDING; 2386 EV_INVOKE_PENDING;
2234 } 2387 }
2235#endif 2388#endif
2236 2389
2390#if EV_PREPARE_ENABLE
2237 /* queue prepare watchers (and execute them) */ 2391 /* queue prepare watchers (and execute them) */
2238 if (expect_false (preparecnt)) 2392 if (expect_false (preparecnt))
2239 { 2393 {
2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2394 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2241 EV_INVOKE_PENDING; 2395 EV_INVOKE_PENDING;
2242 } 2396 }
2397#endif
2243 2398
2244 if (expect_false (loop_done)) 2399 if (expect_false (loop_done))
2245 break; 2400 break;
2246 2401
2247 /* we might have forked, so reify kernel state if necessary */ 2402 /* we might have forked, so reify kernel state if necessary */
… …
2254 /* calculate blocking time */ 2409 /* calculate blocking time */
2255 { 2410 {
2256 ev_tstamp waittime = 0.; 2411 ev_tstamp waittime = 0.;
2257 ev_tstamp sleeptime = 0.; 2412 ev_tstamp sleeptime = 0.;
2258 2413
2414 /* remember old timestamp for io_blocktime calculation */
2415 ev_tstamp prev_mn_now = mn_now;
2416
2417 /* update time to cancel out callback processing overhead */
2418 time_update (EV_A_ 1e100);
2419
2259 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2420 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2260 { 2421 {
2261 /* remember old timestamp for io_blocktime calculation */
2262 ev_tstamp prev_mn_now = mn_now;
2263
2264 /* update time to cancel out callback processing overhead */
2265 time_update (EV_A_ 1e100);
2266
2267 waittime = MAX_BLOCKTIME; 2422 waittime = MAX_BLOCKTIME;
2268 2423
2269 if (timercnt) 2424 if (timercnt)
2270 { 2425 {
2271 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2426 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2298 waittime -= sleeptime; 2453 waittime -= sleeptime;
2299 } 2454 }
2300 } 2455 }
2301 } 2456 }
2302 2457
2303#if EV_MINIMAL < 2 2458#if EV_FEATURE_API
2304 ++loop_count; 2459 ++loop_count;
2305#endif 2460#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2461 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2307 backend_poll (EV_A_ waittime); 2462 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2463 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2309 2464
2310 /* update ev_rt_now, do magic */ 2465 /* update ev_rt_now, do magic */
2311 time_update (EV_A_ waittime + sleeptime); 2466 time_update (EV_A_ waittime + sleeptime);
2312 } 2467 }
2313 2468
… …
2320#if EV_IDLE_ENABLE 2475#if EV_IDLE_ENABLE
2321 /* queue idle watchers unless other events are pending */ 2476 /* queue idle watchers unless other events are pending */
2322 idle_reify (EV_A); 2477 idle_reify (EV_A);
2323#endif 2478#endif
2324 2479
2480#if EV_CHECK_ENABLE
2325 /* queue check watchers, to be executed first */ 2481 /* queue check watchers, to be executed first */
2326 if (expect_false (checkcnt)) 2482 if (expect_false (checkcnt))
2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2483 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2484#endif
2328 2485
2329 EV_INVOKE_PENDING; 2486 EV_INVOKE_PENDING;
2330 } 2487 }
2331 while (expect_true ( 2488 while (expect_true (
2332 activecnt 2489 activecnt
2333 && !loop_done 2490 && !loop_done
2334 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2491 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2335 )); 2492 ));
2336 2493
2337 if (loop_done == EVUNLOOP_ONE) 2494 if (loop_done == EVBREAK_ONE)
2338 loop_done = EVUNLOOP_CANCEL; 2495 loop_done = EVBREAK_CANCEL;
2339 2496
2340#if EV_MINIMAL < 2 2497#if EV_FEATURE_API
2341 --loop_depth; 2498 --loop_depth;
2342#endif 2499#endif
2343} 2500}
2344 2501
2345void 2502void
2346ev_unloop (EV_P_ int how) 2503ev_break (EV_P_ int how)
2347{ 2504{
2348 loop_done = how; 2505 loop_done = how;
2349} 2506}
2350 2507
2351void 2508void
… …
2398inline_size void 2555inline_size void
2399wlist_del (WL *head, WL elem) 2556wlist_del (WL *head, WL elem)
2400{ 2557{
2401 while (*head) 2558 while (*head)
2402 { 2559 {
2403 if (*head == elem) 2560 if (expect_true (*head == elem))
2404 { 2561 {
2405 *head = elem->next; 2562 *head = elem->next;
2406 return; 2563 break;
2407 } 2564 }
2408 2565
2409 head = &(*head)->next; 2566 head = &(*head)->next;
2410 } 2567 }
2411} 2568}
… …
2471 2628
2472 if (expect_false (ev_is_active (w))) 2629 if (expect_false (ev_is_active (w)))
2473 return; 2630 return;
2474 2631
2475 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2632 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2476 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2633 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2477 2634
2478 EV_FREQUENT_CHECK; 2635 EV_FREQUENT_CHECK;
2479 2636
2480 ev_start (EV_A_ (W)w, 1); 2637 ev_start (EV_A_ (W)w, 1);
2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2638 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2499 EV_FREQUENT_CHECK; 2656 EV_FREQUENT_CHECK;
2500 2657
2501 wlist_del (&anfds[w->fd].head, (WL)w); 2658 wlist_del (&anfds[w->fd].head, (WL)w);
2502 ev_stop (EV_A_ (W)w); 2659 ev_stop (EV_A_ (W)w);
2503 2660
2504 fd_change (EV_A_ w->fd, 1); 2661 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2505 2662
2506 EV_FREQUENT_CHECK; 2663 EV_FREQUENT_CHECK;
2507} 2664}
2508 2665
2509void noinline 2666void noinline
… …
2551 timers [active] = timers [timercnt + HEAP0]; 2708 timers [active] = timers [timercnt + HEAP0];
2552 adjustheap (timers, timercnt, active); 2709 adjustheap (timers, timercnt, active);
2553 } 2710 }
2554 } 2711 }
2555 2712
2556 EV_FREQUENT_CHECK;
2557
2558 ev_at (w) -= mn_now; 2713 ev_at (w) -= mn_now;
2559 2714
2560 ev_stop (EV_A_ (W)w); 2715 ev_stop (EV_A_ (W)w);
2716
2717 EV_FREQUENT_CHECK;
2561} 2718}
2562 2719
2563void noinline 2720void noinline
2564ev_timer_again (EV_P_ ev_timer *w) 2721ev_timer_again (EV_P_ ev_timer *w)
2565{ 2722{
… …
2644 periodics [active] = periodics [periodiccnt + HEAP0]; 2801 periodics [active] = periodics [periodiccnt + HEAP0];
2645 adjustheap (periodics, periodiccnt, active); 2802 adjustheap (periodics, periodiccnt, active);
2646 } 2803 }
2647 } 2804 }
2648 2805
2649 EV_FREQUENT_CHECK;
2650
2651 ev_stop (EV_A_ (W)w); 2806 ev_stop (EV_A_ (W)w);
2807
2808 EV_FREQUENT_CHECK;
2652} 2809}
2653 2810
2654void noinline 2811void noinline
2655ev_periodic_again (EV_P_ ev_periodic *w) 2812ev_periodic_again (EV_P_ ev_periodic *w)
2656{ 2813{
… …
2662 2819
2663#ifndef SA_RESTART 2820#ifndef SA_RESTART
2664# define SA_RESTART 0 2821# define SA_RESTART 0
2665#endif 2822#endif
2666 2823
2824#if EV_SIGNAL_ENABLE
2825
2667void noinline 2826void noinline
2668ev_signal_start (EV_P_ ev_signal *w) 2827ev_signal_start (EV_P_ ev_signal *w)
2669{ 2828{
2670#if EV_MULTIPLICITY
2671 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2672#endif
2673 if (expect_false (ev_is_active (w))) 2829 if (expect_false (ev_is_active (w)))
2674 return; 2830 return;
2675 2831
2676 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2832 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2833
2834#if EV_MULTIPLICITY
2835 assert (("libev: a signal must not be attached to two different loops",
2836 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2837
2838 signals [w->signum - 1].loop = EV_A;
2839#endif
2677 2840
2678 EV_FREQUENT_CHECK; 2841 EV_FREQUENT_CHECK;
2679 2842
2680#if EV_USE_SIGNALFD 2843#if EV_USE_SIGNALFD
2681 if (sigfd == -2) 2844 if (sigfd == -2)
… …
2703 sigaddset (&sigfd_set, w->signum); 2866 sigaddset (&sigfd_set, w->signum);
2704 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2867 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2705 2868
2706 signalfd (sigfd, &sigfd_set, 0); 2869 signalfd (sigfd, &sigfd_set, 0);
2707 } 2870 }
2708 else
2709#endif
2710 evpipe_init (EV_A);
2711
2712 {
2713#ifndef _WIN32
2714 sigset_t full, prev;
2715 sigfillset (&full);
2716 sigprocmask (SIG_SETMASK, &full, &prev);
2717#endif
2718
2719 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2720
2721#ifndef _WIN32
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0)/*TODO*/
2724# endif 2871#endif
2725 sigdelset (&prev, w->signum);
2726 sigprocmask (SIG_SETMASK, &prev, 0);
2727#endif
2728 }
2729 2872
2730 ev_start (EV_A_ (W)w, 1); 2873 ev_start (EV_A_ (W)w, 1);
2731 wlist_add (&signals [w->signum - 1].head, (WL)w); 2874 wlist_add (&signals [w->signum - 1].head, (WL)w);
2732 2875
2733 if (!((WL)w)->next) 2876 if (!((WL)w)->next)
2734 {
2735#if _WIN32
2736 signal (w->signum, ev_sighandler);
2737#else
2738# if EV_USE_SIGNALFD 2877# if EV_USE_SIGNALFD
2739 if (sigfd < 0) /*TODO*/ 2878 if (sigfd < 0) /*TODO*/
2740# endif 2879# endif
2741 { 2880 {
2881# ifdef _WIN32
2882 evpipe_init (EV_A);
2883
2884 signal (w->signum, ev_sighandler);
2885# else
2742 struct sigaction sa = { }; 2886 struct sigaction sa;
2887
2888 evpipe_init (EV_A);
2889
2743 sa.sa_handler = ev_sighandler; 2890 sa.sa_handler = ev_sighandler;
2744 sigfillset (&sa.sa_mask); 2891 sigfillset (&sa.sa_mask);
2745 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2892 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2746 sigaction (w->signum, &sa, 0); 2893 sigaction (w->signum, &sa, 0);
2894
2895 if (origflags & EVFLAG_NOSIGMASK)
2896 {
2897 sigemptyset (&sa.sa_mask);
2898 sigaddset (&sa.sa_mask, w->signum);
2899 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2747 } 2900 }
2748#endif 2901#endif
2749 } 2902 }
2750 2903
2751 EV_FREQUENT_CHECK; 2904 EV_FREQUENT_CHECK;
2752} 2905}
2753 2906
2754void noinline 2907void noinline
… …
2762 2915
2763 wlist_del (&signals [w->signum - 1].head, (WL)w); 2916 wlist_del (&signals [w->signum - 1].head, (WL)w);
2764 ev_stop (EV_A_ (W)w); 2917 ev_stop (EV_A_ (W)w);
2765 2918
2766 if (!signals [w->signum - 1].head) 2919 if (!signals [w->signum - 1].head)
2920 {
2921#if EV_MULTIPLICITY
2922 signals [w->signum - 1].loop = 0; /* unattach from signal */
2923#endif
2767#if EV_USE_SIGNALFD 2924#if EV_USE_SIGNALFD
2768 if (sigfd >= 0) 2925 if (sigfd >= 0)
2769 { 2926 {
2770 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2927 sigset_t ss;
2928
2929 sigemptyset (&ss);
2930 sigaddset (&ss, w->signum);
2771 sigdelset (&sigfd_set, w->signum); 2931 sigdelset (&sigfd_set, w->signum);
2932
2772 signalfd (sigfd, &sigfd_set, 0); 2933 signalfd (sigfd, &sigfd_set, 0);
2773 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2934 sigprocmask (SIG_UNBLOCK, &ss, 0);
2774 /*TODO: maybe unblock signal? */
2775 } 2935 }
2776 else 2936 else
2777#endif 2937#endif
2778 signal (w->signum, SIG_DFL); 2938 signal (w->signum, SIG_DFL);
2939 }
2779 2940
2780 EV_FREQUENT_CHECK; 2941 EV_FREQUENT_CHECK;
2781} 2942}
2943
2944#endif
2945
2946#if EV_CHILD_ENABLE
2782 2947
2783void 2948void
2784ev_child_start (EV_P_ ev_child *w) 2949ev_child_start (EV_P_ ev_child *w)
2785{ 2950{
2786#if EV_MULTIPLICITY 2951#if EV_MULTIPLICITY
… …
2790 return; 2955 return;
2791 2956
2792 EV_FREQUENT_CHECK; 2957 EV_FREQUENT_CHECK;
2793 2958
2794 ev_start (EV_A_ (W)w, 1); 2959 ev_start (EV_A_ (W)w, 1);
2795 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2960 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2796 2961
2797 EV_FREQUENT_CHECK; 2962 EV_FREQUENT_CHECK;
2798} 2963}
2799 2964
2800void 2965void
… …
2804 if (expect_false (!ev_is_active (w))) 2969 if (expect_false (!ev_is_active (w)))
2805 return; 2970 return;
2806 2971
2807 EV_FREQUENT_CHECK; 2972 EV_FREQUENT_CHECK;
2808 2973
2809 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2974 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2810 ev_stop (EV_A_ (W)w); 2975 ev_stop (EV_A_ (W)w);
2811 2976
2812 EV_FREQUENT_CHECK; 2977 EV_FREQUENT_CHECK;
2813} 2978}
2979
2980#endif
2814 2981
2815#if EV_STAT_ENABLE 2982#if EV_STAT_ENABLE
2816 2983
2817# ifdef _WIN32 2984# ifdef _WIN32
2818# undef lstat 2985# undef lstat
… …
2824#define MIN_STAT_INTERVAL 0.1074891 2991#define MIN_STAT_INTERVAL 0.1074891
2825 2992
2826static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2993static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2827 2994
2828#if EV_USE_INOTIFY 2995#if EV_USE_INOTIFY
2829# define EV_INOTIFY_BUFSIZE 8192 2996
2997/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2998# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2830 2999
2831static void noinline 3000static void noinline
2832infy_add (EV_P_ ev_stat *w) 3001infy_add (EV_P_ ev_stat *w)
2833{ 3002{
2834 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); 3003 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);
2835 3004
2836 if (w->wd < 0) 3005 if (w->wd >= 0)
3006 {
3007 struct statfs sfs;
3008
3009 /* now local changes will be tracked by inotify, but remote changes won't */
3010 /* unless the filesystem is known to be local, we therefore still poll */
3011 /* also do poll on <2.6.25, but with normal frequency */
3012
3013 if (!fs_2625)
3014 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3015 else if (!statfs (w->path, &sfs)
3016 && (sfs.f_type == 0x1373 /* devfs */
3017 || sfs.f_type == 0xEF53 /* ext2/3 */
3018 || sfs.f_type == 0x3153464a /* jfs */
3019 || sfs.f_type == 0x52654973 /* reiser3 */
3020 || sfs.f_type == 0x01021994 /* tempfs */
3021 || sfs.f_type == 0x58465342 /* xfs */))
3022 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3023 else
3024 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2837 { 3025 }
3026 else
3027 {
3028 /* can't use inotify, continue to stat */
2838 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3029 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2839 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2840 3030
2841 /* monitor some parent directory for speedup hints */ 3031 /* if path is not there, monitor some parent directory for speedup hints */
2842 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3032 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2843 /* but an efficiency issue only */ 3033 /* but an efficiency issue only */
2844 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3034 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2845 { 3035 {
2846 char path [4096]; 3036 char path [4096];
… …
2862 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3052 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2863 } 3053 }
2864 } 3054 }
2865 3055
2866 if (w->wd >= 0) 3056 if (w->wd >= 0)
2867 {
2868 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3057 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2869 3058
2870 /* now local changes will be tracked by inotify, but remote changes won't */ 3059 /* now re-arm timer, if required */
2871 /* unless the filesystem it known to be local, we therefore still poll */ 3060 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2872 /* also do poll on <2.6.25, but with normal frequency */
2873 struct statfs sfs;
2874
2875 if (fs_2625 && !statfs (w->path, &sfs))
2876 if (sfs.f_type == 0x1373 /* devfs */
2877 || sfs.f_type == 0xEF53 /* ext2/3 */
2878 || sfs.f_type == 0x3153464a /* jfs */
2879 || sfs.f_type == 0x52654973 /* reiser3 */
2880 || sfs.f_type == 0x01021994 /* tempfs */
2881 || sfs.f_type == 0x58465342 /* xfs */)
2882 return;
2883
2884 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2885 ev_timer_again (EV_A_ &w->timer); 3061 ev_timer_again (EV_A_ &w->timer);
2886 } 3062 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2887} 3063}
2888 3064
2889static void noinline 3065static void noinline
2890infy_del (EV_P_ ev_stat *w) 3066infy_del (EV_P_ ev_stat *w)
2891{ 3067{
… …
2894 3070
2895 if (wd < 0) 3071 if (wd < 0)
2896 return; 3072 return;
2897 3073
2898 w->wd = -2; 3074 w->wd = -2;
2899 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3075 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2900 wlist_del (&fs_hash [slot].head, (WL)w); 3076 wlist_del (&fs_hash [slot].head, (WL)w);
2901 3077
2902 /* remove this watcher, if others are watching it, they will rearm */ 3078 /* remove this watcher, if others are watching it, they will rearm */
2903 inotify_rm_watch (fs_fd, wd); 3079 inotify_rm_watch (fs_fd, wd);
2904} 3080}
… …
2906static void noinline 3082static void noinline
2907infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3083infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2908{ 3084{
2909 if (slot < 0) 3085 if (slot < 0)
2910 /* overflow, need to check for all hash slots */ 3086 /* overflow, need to check for all hash slots */
2911 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3087 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2912 infy_wd (EV_A_ slot, wd, ev); 3088 infy_wd (EV_A_ slot, wd, ev);
2913 else 3089 else
2914 { 3090 {
2915 WL w_; 3091 WL w_;
2916 3092
2917 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3093 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2918 { 3094 {
2919 ev_stat *w = (ev_stat *)w_; 3095 ev_stat *w = (ev_stat *)w_;
2920 w_ = w_->next; /* lets us remove this watcher and all before it */ 3096 w_ = w_->next; /* lets us remove this watcher and all before it */
2921 3097
2922 if (w->wd == wd || wd == -1) 3098 if (w->wd == wd || wd == -1)
2923 { 3099 {
2924 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3100 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2925 { 3101 {
2926 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3102 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2927 w->wd = -1; 3103 w->wd = -1;
2928 infy_add (EV_A_ w); /* re-add, no matter what */ 3104 infy_add (EV_A_ w); /* re-add, no matter what */
2929 } 3105 }
2930 3106
2931 stat_timer_cb (EV_A_ &w->timer, 0); 3107 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2936 3112
2937static void 3113static void
2938infy_cb (EV_P_ ev_io *w, int revents) 3114infy_cb (EV_P_ ev_io *w, int revents)
2939{ 3115{
2940 char buf [EV_INOTIFY_BUFSIZE]; 3116 char buf [EV_INOTIFY_BUFSIZE];
2941 struct inotify_event *ev = (struct inotify_event *)buf;
2942 int ofs; 3117 int ofs;
2943 int len = read (fs_fd, buf, sizeof (buf)); 3118 int len = read (fs_fd, buf, sizeof (buf));
2944 3119
2945 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3120 for (ofs = 0; ofs < len; )
3121 {
3122 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2946 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3123 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3124 ofs += sizeof (struct inotify_event) + ev->len;
3125 }
2947} 3126}
2948 3127
2949inline_size void 3128inline_size void
2950check_2625 (EV_P) 3129ev_check_2625 (EV_P)
2951{ 3130{
2952 /* kernels < 2.6.25 are borked 3131 /* kernels < 2.6.25 are borked
2953 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3132 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2954 */ 3133 */
2955 struct utsname buf; 3134 if (ev_linux_version () < 0x020619)
2956 int major, minor, micro;
2957
2958 if (uname (&buf))
2959 return; 3135 return;
2960 3136
2961 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2962 return;
2963
2964 if (major < 2
2965 || (major == 2 && minor < 6)
2966 || (major == 2 && minor == 6 && micro < 25))
2967 return;
2968
2969 fs_2625 = 1; 3137 fs_2625 = 1;
3138}
3139
3140inline_size int
3141infy_newfd (void)
3142{
3143#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3144 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3145 if (fd >= 0)
3146 return fd;
3147#endif
3148 return inotify_init ();
2970} 3149}
2971 3150
2972inline_size void 3151inline_size void
2973infy_init (EV_P) 3152infy_init (EV_P)
2974{ 3153{
2975 if (fs_fd != -2) 3154 if (fs_fd != -2)
2976 return; 3155 return;
2977 3156
2978 fs_fd = -1; 3157 fs_fd = -1;
2979 3158
2980 check_2625 (EV_A); 3159 ev_check_2625 (EV_A);
2981 3160
2982 fs_fd = inotify_init (); 3161 fs_fd = infy_newfd ();
2983 3162
2984 if (fs_fd >= 0) 3163 if (fs_fd >= 0)
2985 { 3164 {
3165 fd_intern (fs_fd);
2986 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3166 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2987 ev_set_priority (&fs_w, EV_MAXPRI); 3167 ev_set_priority (&fs_w, EV_MAXPRI);
2988 ev_io_start (EV_A_ &fs_w); 3168 ev_io_start (EV_A_ &fs_w);
3169 ev_unref (EV_A);
2989 } 3170 }
2990} 3171}
2991 3172
2992inline_size void 3173inline_size void
2993infy_fork (EV_P) 3174infy_fork (EV_P)
… …
2995 int slot; 3176 int slot;
2996 3177
2997 if (fs_fd < 0) 3178 if (fs_fd < 0)
2998 return; 3179 return;
2999 3180
3181 ev_ref (EV_A);
3182 ev_io_stop (EV_A_ &fs_w);
3000 close (fs_fd); 3183 close (fs_fd);
3001 fs_fd = inotify_init (); 3184 fs_fd = infy_newfd ();
3002 3185
3186 if (fs_fd >= 0)
3187 {
3188 fd_intern (fs_fd);
3189 ev_io_set (&fs_w, fs_fd, EV_READ);
3190 ev_io_start (EV_A_ &fs_w);
3191 ev_unref (EV_A);
3192 }
3193
3003 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3194 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3004 { 3195 {
3005 WL w_ = fs_hash [slot].head; 3196 WL w_ = fs_hash [slot].head;
3006 fs_hash [slot].head = 0; 3197 fs_hash [slot].head = 0;
3007 3198
3008 while (w_) 3199 while (w_)
… …
3013 w->wd = -1; 3204 w->wd = -1;
3014 3205
3015 if (fs_fd >= 0) 3206 if (fs_fd >= 0)
3016 infy_add (EV_A_ w); /* re-add, no matter what */ 3207 infy_add (EV_A_ w); /* re-add, no matter what */
3017 else 3208 else
3209 {
3210 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3211 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3018 ev_timer_again (EV_A_ &w->timer); 3212 ev_timer_again (EV_A_ &w->timer);
3213 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3214 }
3019 } 3215 }
3020 } 3216 }
3021} 3217}
3022 3218
3023#endif 3219#endif
… …
3040static void noinline 3236static void noinline
3041stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3237stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3042{ 3238{
3043 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3239 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3044 3240
3045 /* we copy this here each the time so that */ 3241 ev_statdata prev = w->attr;
3046 /* prev has the old value when the callback gets invoked */
3047 w->prev = w->attr;
3048 ev_stat_stat (EV_A_ w); 3242 ev_stat_stat (EV_A_ w);
3049 3243
3050 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3244 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3051 if ( 3245 if (
3052 w->prev.st_dev != w->attr.st_dev 3246 prev.st_dev != w->attr.st_dev
3053 || w->prev.st_ino != w->attr.st_ino 3247 || prev.st_ino != w->attr.st_ino
3054 || w->prev.st_mode != w->attr.st_mode 3248 || prev.st_mode != w->attr.st_mode
3055 || w->prev.st_nlink != w->attr.st_nlink 3249 || prev.st_nlink != w->attr.st_nlink
3056 || w->prev.st_uid != w->attr.st_uid 3250 || prev.st_uid != w->attr.st_uid
3057 || w->prev.st_gid != w->attr.st_gid 3251 || prev.st_gid != w->attr.st_gid
3058 || w->prev.st_rdev != w->attr.st_rdev 3252 || prev.st_rdev != w->attr.st_rdev
3059 || w->prev.st_size != w->attr.st_size 3253 || prev.st_size != w->attr.st_size
3060 || w->prev.st_atime != w->attr.st_atime 3254 || prev.st_atime != w->attr.st_atime
3061 || w->prev.st_mtime != w->attr.st_mtime 3255 || prev.st_mtime != w->attr.st_mtime
3062 || w->prev.st_ctime != w->attr.st_ctime 3256 || prev.st_ctime != w->attr.st_ctime
3063 ) { 3257 ) {
3258 /* we only update w->prev on actual differences */
3259 /* in case we test more often than invoke the callback, */
3260 /* to ensure that prev is always different to attr */
3261 w->prev = prev;
3262
3064 #if EV_USE_INOTIFY 3263 #if EV_USE_INOTIFY
3065 if (fs_fd >= 0) 3264 if (fs_fd >= 0)
3066 { 3265 {
3067 infy_del (EV_A_ w); 3266 infy_del (EV_A_ w);
3068 infy_add (EV_A_ w); 3267 infy_add (EV_A_ w);
… …
3093 3292
3094 if (fs_fd >= 0) 3293 if (fs_fd >= 0)
3095 infy_add (EV_A_ w); 3294 infy_add (EV_A_ w);
3096 else 3295 else
3097#endif 3296#endif
3297 {
3098 ev_timer_again (EV_A_ &w->timer); 3298 ev_timer_again (EV_A_ &w->timer);
3299 ev_unref (EV_A);
3300 }
3099 3301
3100 ev_start (EV_A_ (W)w, 1); 3302 ev_start (EV_A_ (W)w, 1);
3101 3303
3102 EV_FREQUENT_CHECK; 3304 EV_FREQUENT_CHECK;
3103} 3305}
… …
3112 EV_FREQUENT_CHECK; 3314 EV_FREQUENT_CHECK;
3113 3315
3114#if EV_USE_INOTIFY 3316#if EV_USE_INOTIFY
3115 infy_del (EV_A_ w); 3317 infy_del (EV_A_ w);
3116#endif 3318#endif
3319
3320 if (ev_is_active (&w->timer))
3321 {
3322 ev_ref (EV_A);
3117 ev_timer_stop (EV_A_ &w->timer); 3323 ev_timer_stop (EV_A_ &w->timer);
3324 }
3118 3325
3119 ev_stop (EV_A_ (W)w); 3326 ev_stop (EV_A_ (W)w);
3120 3327
3121 EV_FREQUENT_CHECK; 3328 EV_FREQUENT_CHECK;
3122} 3329}
… …
3167 3374
3168 EV_FREQUENT_CHECK; 3375 EV_FREQUENT_CHECK;
3169} 3376}
3170#endif 3377#endif
3171 3378
3379#if EV_PREPARE_ENABLE
3172void 3380void
3173ev_prepare_start (EV_P_ ev_prepare *w) 3381ev_prepare_start (EV_P_ ev_prepare *w)
3174{ 3382{
3175 if (expect_false (ev_is_active (w))) 3383 if (expect_false (ev_is_active (w)))
3176 return; 3384 return;
… …
3202 3410
3203 ev_stop (EV_A_ (W)w); 3411 ev_stop (EV_A_ (W)w);
3204 3412
3205 EV_FREQUENT_CHECK; 3413 EV_FREQUENT_CHECK;
3206} 3414}
3415#endif
3207 3416
3417#if EV_CHECK_ENABLE
3208void 3418void
3209ev_check_start (EV_P_ ev_check *w) 3419ev_check_start (EV_P_ ev_check *w)
3210{ 3420{
3211 if (expect_false (ev_is_active (w))) 3421 if (expect_false (ev_is_active (w)))
3212 return; 3422 return;
… …
3238 3448
3239 ev_stop (EV_A_ (W)w); 3449 ev_stop (EV_A_ (W)w);
3240 3450
3241 EV_FREQUENT_CHECK; 3451 EV_FREQUENT_CHECK;
3242} 3452}
3453#endif
3243 3454
3244#if EV_EMBED_ENABLE 3455#if EV_EMBED_ENABLE
3245void noinline 3456void noinline
3246ev_embed_sweep (EV_P_ ev_embed *w) 3457ev_embed_sweep (EV_P_ ev_embed *w)
3247{ 3458{
3248 ev_loop (w->other, EVLOOP_NONBLOCK); 3459 ev_run (w->other, EVRUN_NOWAIT);
3249} 3460}
3250 3461
3251static void 3462static void
3252embed_io_cb (EV_P_ ev_io *io, int revents) 3463embed_io_cb (EV_P_ ev_io *io, int revents)
3253{ 3464{
3254 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3465 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3255 3466
3256 if (ev_cb (w)) 3467 if (ev_cb (w))
3257 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3468 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3258 else 3469 else
3259 ev_loop (w->other, EVLOOP_NONBLOCK); 3470 ev_run (w->other, EVRUN_NOWAIT);
3260} 3471}
3261 3472
3262static void 3473static void
3263embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3474embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3264{ 3475{
3265 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3476 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3266 3477
3267 { 3478 {
3268 struct ev_loop *loop = w->other; 3479 EV_P = w->other;
3269 3480
3270 while (fdchangecnt) 3481 while (fdchangecnt)
3271 { 3482 {
3272 fd_reify (EV_A); 3483 fd_reify (EV_A);
3273 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3484 ev_run (EV_A_ EVRUN_NOWAIT);
3274 } 3485 }
3275 } 3486 }
3276} 3487}
3277 3488
3278static void 3489static void
… …
3281 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3492 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3282 3493
3283 ev_embed_stop (EV_A_ w); 3494 ev_embed_stop (EV_A_ w);
3284 3495
3285 { 3496 {
3286 struct ev_loop *loop = w->other; 3497 EV_P = w->other;
3287 3498
3288 ev_loop_fork (EV_A); 3499 ev_loop_fork (EV_A);
3289 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3500 ev_run (EV_A_ EVRUN_NOWAIT);
3290 } 3501 }
3291 3502
3292 ev_embed_start (EV_A_ w); 3503 ev_embed_start (EV_A_ w);
3293} 3504}
3294 3505
… …
3305{ 3516{
3306 if (expect_false (ev_is_active (w))) 3517 if (expect_false (ev_is_active (w)))
3307 return; 3518 return;
3308 3519
3309 { 3520 {
3310 struct ev_loop *loop = w->other; 3521 EV_P = w->other;
3311 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3522 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3312 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3523 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3313 } 3524 }
3314 3525
3315 EV_FREQUENT_CHECK; 3526 EV_FREQUENT_CHECK;
… …
3342 3553
3343 ev_io_stop (EV_A_ &w->io); 3554 ev_io_stop (EV_A_ &w->io);
3344 ev_prepare_stop (EV_A_ &w->prepare); 3555 ev_prepare_stop (EV_A_ &w->prepare);
3345 ev_fork_stop (EV_A_ &w->fork); 3556 ev_fork_stop (EV_A_ &w->fork);
3346 3557
3558 ev_stop (EV_A_ (W)w);
3559
3347 EV_FREQUENT_CHECK; 3560 EV_FREQUENT_CHECK;
3348} 3561}
3349#endif 3562#endif
3350 3563
3351#if EV_FORK_ENABLE 3564#if EV_FORK_ENABLE
… …
3384 3597
3385 EV_FREQUENT_CHECK; 3598 EV_FREQUENT_CHECK;
3386} 3599}
3387#endif 3600#endif
3388 3601
3389#if EV_ASYNC_ENABLE 3602#if EV_CLEANUP_ENABLE
3390void 3603void
3391ev_async_start (EV_P_ ev_async *w) 3604ev_cleanup_start (EV_P_ ev_cleanup *w)
3392{ 3605{
3393 if (expect_false (ev_is_active (w))) 3606 if (expect_false (ev_is_active (w)))
3394 return; 3607 return;
3608
3609 EV_FREQUENT_CHECK;
3610
3611 ev_start (EV_A_ (W)w, ++cleanupcnt);
3612 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3613 cleanups [cleanupcnt - 1] = w;
3614
3615 /* cleanup watchers should never keep a refcount on the loop */
3616 ev_unref (EV_A);
3617 EV_FREQUENT_CHECK;
3618}
3619
3620void
3621ev_cleanup_stop (EV_P_ ev_cleanup *w)
3622{
3623 clear_pending (EV_A_ (W)w);
3624 if (expect_false (!ev_is_active (w)))
3625 return;
3626
3627 EV_FREQUENT_CHECK;
3628 ev_ref (EV_A);
3629
3630 {
3631 int active = ev_active (w);
3632
3633 cleanups [active - 1] = cleanups [--cleanupcnt];
3634 ev_active (cleanups [active - 1]) = active;
3635 }
3636
3637 ev_stop (EV_A_ (W)w);
3638
3639 EV_FREQUENT_CHECK;
3640}
3641#endif
3642
3643#if EV_ASYNC_ENABLE
3644void
3645ev_async_start (EV_P_ ev_async *w)
3646{
3647 if (expect_false (ev_is_active (w)))
3648 return;
3649
3650 w->sent = 0;
3395 3651
3396 evpipe_init (EV_A); 3652 evpipe_init (EV_A);
3397 3653
3398 EV_FREQUENT_CHECK; 3654 EV_FREQUENT_CHECK;
3399 3655
… …
3427 3683
3428void 3684void
3429ev_async_send (EV_P_ ev_async *w) 3685ev_async_send (EV_P_ ev_async *w)
3430{ 3686{
3431 w->sent = 1; 3687 w->sent = 1;
3432 evpipe_write (EV_A_ &gotasync); 3688 evpipe_write (EV_A_ &async_pending);
3433} 3689}
3434#endif 3690#endif
3435 3691
3436/*****************************************************************************/ 3692/*****************************************************************************/
3437 3693
… …
3477{ 3733{
3478 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3734 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3479 3735
3480 if (expect_false (!once)) 3736 if (expect_false (!once))
3481 { 3737 {
3482 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3738 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3483 return; 3739 return;
3484 } 3740 }
3485 3741
3486 once->cb = cb; 3742 once->cb = cb;
3487 once->arg = arg; 3743 once->arg = arg;
… …
3574 if (types & EV_ASYNC) 3830 if (types & EV_ASYNC)
3575 for (i = asynccnt; i--; ) 3831 for (i = asynccnt; i--; )
3576 cb (EV_A_ EV_ASYNC, asyncs [i]); 3832 cb (EV_A_ EV_ASYNC, asyncs [i]);
3577#endif 3833#endif
3578 3834
3835#if EV_PREPARE_ENABLE
3579 if (types & EV_PREPARE) 3836 if (types & EV_PREPARE)
3580 for (i = preparecnt; i--; ) 3837 for (i = preparecnt; i--; )
3581#if EV_EMBED_ENABLE 3838# if EV_EMBED_ENABLE
3582 if (ev_cb (prepares [i]) != embed_prepare_cb) 3839 if (ev_cb (prepares [i]) != embed_prepare_cb)
3583#endif 3840# endif
3584 cb (EV_A_ EV_PREPARE, prepares [i]); 3841 cb (EV_A_ EV_PREPARE, prepares [i]);
3842#endif
3585 3843
3844#if EV_CHECK_ENABLE
3586 if (types & EV_CHECK) 3845 if (types & EV_CHECK)
3587 for (i = checkcnt; i--; ) 3846 for (i = checkcnt; i--; )
3588 cb (EV_A_ EV_CHECK, checks [i]); 3847 cb (EV_A_ EV_CHECK, checks [i]);
3848#endif
3589 3849
3850#if EV_SIGNAL_ENABLE
3590 if (types & EV_SIGNAL) 3851 if (types & EV_SIGNAL)
3591 for (i = 0; i < signalmax; ++i) 3852 for (i = 0; i < EV_NSIG - 1; ++i)
3592 for (wl = signals [i].head; wl; ) 3853 for (wl = signals [i].head; wl; )
3593 { 3854 {
3594 wn = wl->next; 3855 wn = wl->next;
3595 cb (EV_A_ EV_SIGNAL, wl); 3856 cb (EV_A_ EV_SIGNAL, wl);
3596 wl = wn; 3857 wl = wn;
3597 } 3858 }
3859#endif
3598 3860
3861#if EV_CHILD_ENABLE
3599 if (types & EV_CHILD) 3862 if (types & EV_CHILD)
3600 for (i = EV_PID_HASHSIZE; i--; ) 3863 for (i = (EV_PID_HASHSIZE); i--; )
3601 for (wl = childs [i]; wl; ) 3864 for (wl = childs [i]; wl; )
3602 { 3865 {
3603 wn = wl->next; 3866 wn = wl->next;
3604 cb (EV_A_ EV_CHILD, wl); 3867 cb (EV_A_ EV_CHILD, wl);
3605 wl = wn; 3868 wl = wn;
3606 } 3869 }
3870#endif
3607/* EV_STAT 0x00001000 /* stat data changed */ 3871/* EV_STAT 0x00001000 /* stat data changed */
3608/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3872/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3609} 3873}
3610#endif 3874#endif
3611 3875
3612#if EV_MULTIPLICITY 3876#if EV_MULTIPLICITY
3613 #include "ev_wrap.h" 3877 #include "ev_wrap.h"
3614#endif 3878#endif
3615 3879
3616#ifdef __cplusplus 3880EV_CPP(})
3617}
3618#endif
3619 3881

Diff Legend

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