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

Comparing libev/ev.c (file contents):
Revision 1.304 by root, Sun Jul 19 03:12:28 2009 UTC vs.
Revision 1.370 by root, Sun Jan 30 19:05:41 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 */
208
209/* try to deduce the maximum number of signals on this platform */
210#if defined (EV_NSIG)
211/* use what's provided */
212#elif defined (NSIG)
213# define EV_NSIG (NSIG)
214#elif defined(_NSIG)
215# define EV_NSIG (_NSIG)
216#elif defined (SIGMAX)
217# define EV_NSIG (SIGMAX+1)
218#elif defined (SIG_MAX)
219# define EV_NSIG (SIG_MAX+1)
220#elif defined (_SIG_MAX)
221# define EV_NSIG (_SIG_MAX+1)
222#elif defined (MAXSIG)
223# define EV_NSIG (MAXSIG+1)
224#elif defined (MAX_SIG)
225# define EV_NSIG (MAX_SIG+1)
226#elif defined (SIGARRAYSIZE)
227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
228#elif defined (_sys_nsig)
229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
230#else
231# error "unable to find value for NSIG, please report"
232/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */
234# define EV_NSIG 65
235#endif
190 236
191#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
192# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
193# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
194# else 240# else
195# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
196# endif 242# endif
197#endif 243#endif
198 244
199#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
200# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
201# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
202# else 248# else
203# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
204# endif 250# endif
205#endif 251#endif
206 252
… …
208# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
209#endif 255#endif
210 256
211#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
212# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
213# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
214# else 260# else
215# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
216# endif 262# endif
217#endif 263#endif
218 264
219#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
220# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
221#endif 267#endif
222 268
223#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
224# ifdef _WIN32 270# ifdef _WIN32
225# define EV_USE_POLL 0 271# define EV_USE_POLL 0
226# else 272# else
227# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
228# endif 274# endif
229#endif 275#endif
230 276
231#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
232# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
233# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
234# else 280# else
235# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
236# endif 282# endif
237#endif 283#endif
238 284
… …
244# define EV_USE_PORT 0 290# define EV_USE_PORT 0
245#endif 291#endif
246 292
247#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
248# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
249# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
250# else 296# else
251# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
252# endif 298# endif
253#endif 299#endif
254 300
255#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
256# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
257# define EV_PID_HASHSIZE 1
258# else
259# define EV_PID_HASHSIZE 16
260# endif
261#endif 303#endif
262 304
263#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
264# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
265# define EV_INOTIFY_HASHSIZE 1
266# else
267# define EV_INOTIFY_HASHSIZE 16
268# endif
269#endif 307#endif
270 308
271#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
272# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
273# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
274# else 312# else
275# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
276# endif 314# endif
277#endif 315#endif
278 316
279#ifndef EV_USE_SIGNALFD 317#ifndef EV_USE_SIGNALFD
280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
281# define EV_USE_SIGNALFD 1 319# define EV_USE_SIGNALFD EV_FEATURE_OS
282# else 320# else
283# define EV_USE_SIGNALFD 0 321# define EV_USE_SIGNALFD 0
284# endif 322# endif
285#endif 323#endif
286 324
… …
289# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
290# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
291#endif 329#endif
292 330
293#ifndef EV_VERIFY 331#ifndef EV_VERIFY
294# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
295#endif 333#endif
296 334
297#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
298# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
299#endif 337#endif
300 338
301#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
302# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
303#endif 341#endif
304 342
305/* 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, */
306/* which makes programs even slower. might work on other unices, too. */ 344/* which makes programs even slower. might work on other unices, too. */
307#if EV_USE_CLOCK_SYSCALL 345#if EV_USE_CLOCK_SYSCALL
… …
316# endif 354# endif
317#endif 355#endif
318 356
319/* 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 */
320 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
321#ifndef CLOCK_MONOTONIC 365#ifndef CLOCK_MONOTONIC
322# undef EV_USE_MONOTONIC 366# undef EV_USE_MONOTONIC
323# define EV_USE_MONOTONIC 0 367# define EV_USE_MONOTONIC 0
324#endif 368#endif
325 369
… …
332# undef EV_USE_INOTIFY 376# undef EV_USE_INOTIFY
333# define EV_USE_INOTIFY 0 377# define EV_USE_INOTIFY 0
334#endif 378#endif
335 379
336#if !EV_USE_NANOSLEEP 380#if !EV_USE_NANOSLEEP
337# ifndef _WIN32 381/* hp-ux has it in sys/time.h, which we unconditionally include above */
382# if !defined(_WIN32) && !defined(__hpux)
338# include <sys/select.h> 383# include <sys/select.h>
339# endif 384# endif
340#endif 385#endif
341 386
342#if EV_USE_INOTIFY 387#if EV_USE_INOTIFY
343# include <sys/utsname.h>
344# include <sys/statfs.h> 388# include <sys/statfs.h>
345# include <sys/inotify.h> 389# include <sys/inotify.h>
346/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 390/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
347# ifndef IN_DONT_FOLLOW 391# ifndef IN_DONT_FOLLOW
348# undef EV_USE_INOTIFY 392# undef EV_USE_INOTIFY
… …
359# include <stdint.h> 403# include <stdint.h>
360# ifndef EFD_NONBLOCK 404# ifndef EFD_NONBLOCK
361# define EFD_NONBLOCK O_NONBLOCK 405# define EFD_NONBLOCK O_NONBLOCK
362# endif 406# endif
363# ifndef EFD_CLOEXEC 407# ifndef EFD_CLOEXEC
408# ifdef O_CLOEXEC
364# define EFD_CLOEXEC O_CLOEXEC 409# define EFD_CLOEXEC O_CLOEXEC
410# else
411# define EFD_CLOEXEC 02000000
412# endif
365# endif 413# endif
366# ifdef __cplusplus 414EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
367extern "C" { 415#endif
416
417#if EV_USE_SIGNALFD
418/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
419# include <stdint.h>
420# ifndef SFD_NONBLOCK
421# define SFD_NONBLOCK O_NONBLOCK
368# endif 422# endif
369int eventfd (unsigned int initval, int flags); 423# ifndef SFD_CLOEXEC
370# ifdef __cplusplus 424# ifdef O_CLOEXEC
371} 425# define SFD_CLOEXEC O_CLOEXEC
426# else
427# define SFD_CLOEXEC 02000000
428# endif
372# endif 429# endif
373#endif 430EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
374 431
375#if EV_USE_SIGNALFD 432struct signalfd_siginfo
376# include <sys/signalfd.h> 433{
434 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)];
436};
377#endif 437#endif
378 438
379/**/ 439/**/
380 440
381#if EV_VERIFY >= 3 441#if EV_VERIFY >= 3
382# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 442# define EV_FREQUENT_CHECK ev_verify (EV_A)
383#else 443#else
384# define EV_FREQUENT_CHECK do { } while (0) 444# define EV_FREQUENT_CHECK do { } while (0)
385#endif 445#endif
386 446
387/* 447/*
… …
394 */ 454 */
395#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 455#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
396 456
397#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 457#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
398#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 458#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
399/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 459
460#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
461#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
400 462
401#if __GNUC__ >= 4 463#if __GNUC__ >= 4
402# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
403# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
404#else 466#else
… …
411 473
412#define expect_false(expr) expect ((expr) != 0, 0) 474#define expect_false(expr) expect ((expr) != 0, 0)
413#define expect_true(expr) expect ((expr) != 0, 1) 475#define expect_true(expr) expect ((expr) != 0, 1)
414#define inline_size static inline 476#define inline_size static inline
415 477
416#if EV_MINIMAL 478#if EV_FEATURE_CODE
479# define inline_speed static inline
480#else
417# define inline_speed static noinline 481# define inline_speed static noinline
418#else
419# define inline_speed static inline
420#endif 482#endif
421 483
422#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
423 485
424#if EV_MINPRI == EV_MAXPRI 486#if EV_MINPRI == EV_MAXPRI
… …
437#define ev_active(w) ((W)(w))->active 499#define ev_active(w) ((W)(w))->active
438#define ev_at(w) ((WT)(w))->at 500#define ev_at(w) ((WT)(w))->at
439 501
440#if EV_USE_REALTIME 502#if EV_USE_REALTIME
441/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 503/* sig_atomic_t is used to avoid per-thread variables or locking but still */
442/* giving it a reasonably high chance of working on typical architetcures */ 504/* giving it a reasonably high chance of working on typical architectures */
443static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
444#endif 506#endif
445 507
446#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
447static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
448#endif 510#endif
449 511
512#ifndef EV_FD_TO_WIN32_HANDLE
513# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
514#endif
515#ifndef EV_WIN32_HANDLE_TO_FD
516# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
517#endif
518#ifndef EV_WIN32_CLOSE_FD
519# define EV_WIN32_CLOSE_FD(fd) close (fd)
520#endif
521
450#ifdef _WIN32 522#ifdef _WIN32
451# include "ev_win32.c" 523# include "ev_win32.c"
452#endif 524#endif
453 525
454/*****************************************************************************/ 526/*****************************************************************************/
527
528#ifdef __linux
529# include <sys/utsname.h>
530#endif
531
532static unsigned int noinline
533ev_linux_version (void)
534{
535#ifdef __linux
536 unsigned int v = 0;
537 struct utsname buf;
538 int i;
539 char *p = buf.release;
540
541 if (uname (&buf))
542 return 0;
543
544 for (i = 3+1; --i; )
545 {
546 unsigned int c = 0;
547
548 for (;;)
549 {
550 if (*p >= '0' && *p <= '9')
551 c = c * 10 + *p++ - '0';
552 else
553 {
554 p += *p == '.';
555 break;
556 }
557 }
558
559 v = (v << 8) | c;
560 }
561
562 return v;
563#else
564 return 0;
565#endif
566}
567
568/*****************************************************************************/
569
570#if EV_AVOID_STDIO
571static void noinline
572ev_printerr (const char *msg)
573{
574 write (STDERR_FILENO, msg, strlen (msg));
575}
576#endif
455 577
456static void (*syserr_cb)(const char *msg); 578static void (*syserr_cb)(const char *msg);
457 579
458void 580void
459ev_set_syserr_cb (void (*cb)(const char *msg)) 581ev_set_syserr_cb (void (*cb)(const char *msg))
… …
469 591
470 if (syserr_cb) 592 if (syserr_cb)
471 syserr_cb (msg); 593 syserr_cb (msg);
472 else 594 else
473 { 595 {
596#if EV_AVOID_STDIO
597 ev_printerr (msg);
598 ev_printerr (": ");
599 ev_printerr (strerror (errno));
600 ev_printerr ("\n");
601#else
474 perror (msg); 602 perror (msg);
603#endif
475 abort (); 604 abort ();
476 } 605 }
477} 606}
478 607
479static void * 608static void *
480ev_realloc_emul (void *ptr, long size) 609ev_realloc_emul (void *ptr, long size)
481{ 610{
611#if __GLIBC__
612 return realloc (ptr, size);
613#else
482 /* some systems, notably openbsd and darwin, fail to properly 614 /* some systems, notably openbsd and darwin, fail to properly
483 * implement realloc (x, 0) (as required by both ansi c-98 and 615 * implement realloc (x, 0) (as required by both ansi c-89 and
484 * the single unix specification, so work around them here. 616 * the single unix specification, so work around them here.
485 */ 617 */
486 618
487 if (size) 619 if (size)
488 return realloc (ptr, size); 620 return realloc (ptr, size);
489 621
490 free (ptr); 622 free (ptr);
491 return 0; 623 return 0;
624#endif
492} 625}
493 626
494static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 627static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
495 628
496void 629void
… …
504{ 637{
505 ptr = alloc (ptr, size); 638 ptr = alloc (ptr, size);
506 639
507 if (!ptr && size) 640 if (!ptr && size)
508 { 641 {
642#if EV_AVOID_STDIO
643 ev_printerr ("(libev) memory allocation failed, aborting.\n");
644#else
509 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 645 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
646#endif
510 abort (); 647 abort ();
511 } 648 }
512 649
513 return ptr; 650 return ptr;
514} 651}
… …
530 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 667 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
531 unsigned char unused; 668 unsigned char unused;
532#if EV_USE_EPOLL 669#if EV_USE_EPOLL
533 unsigned int egen; /* generation counter to counter epoll bugs */ 670 unsigned int egen; /* generation counter to counter epoll bugs */
534#endif 671#endif
535#if EV_SELECT_IS_WINSOCKET 672#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
536 SOCKET handle; 673 SOCKET handle;
674#endif
675#if EV_USE_IOCP
676 OVERLAPPED or, ow;
537#endif 677#endif
538} ANFD; 678} ANFD;
539 679
540/* stores the pending event set for a given watcher */ 680/* stores the pending event set for a given watcher */
541typedef struct 681typedef struct
… …
596 736
597 static int ev_default_loop_ptr; 737 static int ev_default_loop_ptr;
598 738
599#endif 739#endif
600 740
601#if EV_MINIMAL < 2 741#if EV_FEATURE_API
602# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 742# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
603# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 743# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
604# define EV_INVOKE_PENDING invoke_cb (EV_A) 744# define EV_INVOKE_PENDING invoke_cb (EV_A)
605#else 745#else
606# define EV_RELEASE_CB (void)0 746# define EV_RELEASE_CB (void)0
607# define EV_ACQUIRE_CB (void)0 747# define EV_ACQUIRE_CB (void)0
608# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 748# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
609#endif 749#endif
610 750
611#define EVUNLOOP_RECURSE 0x80 751#define EVBREAK_RECURSE 0x80
612 752
613/*****************************************************************************/ 753/*****************************************************************************/
614 754
615#ifndef EV_HAVE_EV_TIME 755#ifndef EV_HAVE_EV_TIME
616ev_tstamp 756ev_tstamp
… …
660 if (delay > 0.) 800 if (delay > 0.)
661 { 801 {
662#if EV_USE_NANOSLEEP 802#if EV_USE_NANOSLEEP
663 struct timespec ts; 803 struct timespec ts;
664 804
665 ts.tv_sec = (time_t)delay; 805 EV_TS_SET (ts, delay);
666 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
667
668 nanosleep (&ts, 0); 806 nanosleep (&ts, 0);
669#elif defined(_WIN32) 807#elif defined(_WIN32)
670 Sleep ((unsigned long)(delay * 1e3)); 808 Sleep ((unsigned long)(delay * 1e3));
671#else 809#else
672 struct timeval tv; 810 struct timeval tv;
673 811
674 tv.tv_sec = (time_t)delay;
675 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
676
677 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 812 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
678 /* something not guaranteed by newer posix versions, but guaranteed */ 813 /* something not guaranteed by newer posix versions, but guaranteed */
679 /* by older ones */ 814 /* by older ones */
815 EV_TV_SET (tv, delay);
680 select (0, 0, 0, 0, &tv); 816 select (0, 0, 0, 0, &tv);
681#endif 817#endif
682 } 818 }
683} 819}
684 820
821inline_speed int
822ev_timeout_to_ms (ev_tstamp timeout)
823{
824 int ms = timeout * 1000. + .999999;
825
826 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
827}
828
685/*****************************************************************************/ 829/*****************************************************************************/
686 830
687#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 831#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
688 832
689/* find a suitable new size for the given array, */ 833/* find a suitable new size for the given array, */
690/* hopefully by rounding to a ncie-to-malloc size */ 834/* hopefully by rounding to a nice-to-malloc size */
691inline_size int 835inline_size int
692array_nextsize (int elem, int cur, int cnt) 836array_nextsize (int elem, int cur, int cnt)
693{ 837{
694 int ncur = cur + 1; 838 int ncur = cur + 1;
695 839
… …
791} 935}
792 936
793/*****************************************************************************/ 937/*****************************************************************************/
794 938
795inline_speed void 939inline_speed void
796fd_event_nc (EV_P_ int fd, int revents) 940fd_event_nocheck (EV_P_ int fd, int revents)
797{ 941{
798 ANFD *anfd = anfds + fd; 942 ANFD *anfd = anfds + fd;
799 ev_io *w; 943 ev_io *w;
800 944
801 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 945 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
813fd_event (EV_P_ int fd, int revents) 957fd_event (EV_P_ int fd, int revents)
814{ 958{
815 ANFD *anfd = anfds + fd; 959 ANFD *anfd = anfds + fd;
816 960
817 if (expect_true (!anfd->reify)) 961 if (expect_true (!anfd->reify))
818 fd_event_nc (EV_A_ fd, revents); 962 fd_event_nocheck (EV_A_ fd, revents);
819} 963}
820 964
821void 965void
822ev_feed_fd_event (EV_P_ int fd, int revents) 966ev_feed_fd_event (EV_P_ int fd, int revents)
823{ 967{
824 if (fd >= 0 && fd < anfdmax) 968 if (fd >= 0 && fd < anfdmax)
825 fd_event_nc (EV_A_ fd, revents); 969 fd_event_nocheck (EV_A_ fd, revents);
826} 970}
827 971
828/* make sure the external fd watch events are in-sync */ 972/* make sure the external fd watch events are in-sync */
829/* with the kernel/libev internal state */ 973/* with the kernel/libev internal state */
830inline_size void 974inline_size void
… …
836 { 980 {
837 int fd = fdchanges [i]; 981 int fd = fdchanges [i];
838 ANFD *anfd = anfds + fd; 982 ANFD *anfd = anfds + fd;
839 ev_io *w; 983 ev_io *w;
840 984
841 unsigned char events = 0; 985 unsigned char o_events = anfd->events;
986 unsigned char o_reify = anfd->reify;
842 987
843 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 988 anfd->reify = 0;
844 events |= (unsigned char)w->events;
845 989
846#if EV_SELECT_IS_WINSOCKET 990#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
847 if (events) 991 if (o_reify & EV__IOFDSET)
848 { 992 {
849 unsigned long arg; 993 unsigned long arg;
850 #ifdef EV_FD_TO_WIN32_HANDLE
851 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 994 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
852 #else
853 anfd->handle = _get_osfhandle (fd);
854 #endif
855 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 995 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
996 printf ("oi %d %x\n", fd, anfd->handle);//D
856 } 997 }
857#endif 998#endif
858 999
1000 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
859 { 1001 {
860 unsigned char o_events = anfd->events;
861 unsigned char o_reify = anfd->reify;
862
863 anfd->reify = 0;
864 anfd->events = events; 1002 anfd->events = 0;
865 1003
866 if (o_events != events || o_reify & EV__IOFDSET) 1004 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1005 anfd->events |= (unsigned char)w->events;
1006
1007 if (o_events != anfd->events)
1008 o_reify = EV__IOFDSET; /* actually |= */
1009 }
1010
1011 if (o_reify & EV__IOFDSET)
867 backend_modify (EV_A_ fd, o_events, events); 1012 backend_modify (EV_A_ fd, o_events, anfd->events);
868 }
869 } 1013 }
870 1014
871 fdchangecnt = 0; 1015 fdchangecnt = 0;
872} 1016}
873 1017
… …
897 ev_io_stop (EV_A_ w); 1041 ev_io_stop (EV_A_ w);
898 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1042 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
899 } 1043 }
900} 1044}
901 1045
902/* check whether the given fd is atcually valid, for error recovery */ 1046/* check whether the given fd is actually valid, for error recovery */
903inline_size int 1047inline_size int
904fd_valid (int fd) 1048fd_valid (int fd)
905{ 1049{
906#ifdef _WIN32 1050#ifdef _WIN32
907 return _get_osfhandle (fd) != -1; 1051 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
908#else 1052#else
909 return fcntl (fd, F_GETFD) != -1; 1053 return fcntl (fd, F_GETFD) != -1;
910#endif 1054#endif
911} 1055}
912 1056
… …
930 1074
931 for (fd = anfdmax; fd--; ) 1075 for (fd = anfdmax; fd--; )
932 if (anfds [fd].events) 1076 if (anfds [fd].events)
933 { 1077 {
934 fd_kill (EV_A_ fd); 1078 fd_kill (EV_A_ fd);
935 return; 1079 break;
936 } 1080 }
937} 1081}
938 1082
939/* usually called after fork if backend needs to re-arm all fds from scratch */ 1083/* usually called after fork if backend needs to re-arm all fds from scratch */
940static void noinline 1084static void noinline
… …
949 anfds [fd].emask = 0; 1093 anfds [fd].emask = 0;
950 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1094 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
951 } 1095 }
952} 1096}
953 1097
1098/* used to prepare libev internal fd's */
1099/* this is not fork-safe */
1100inline_speed void
1101fd_intern (int fd)
1102{
1103#ifdef _WIN32
1104 unsigned long arg = 1;
1105 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1106#else
1107 fcntl (fd, F_SETFD, FD_CLOEXEC);
1108 fcntl (fd, F_SETFL, O_NONBLOCK);
1109#endif
1110}
1111
954/*****************************************************************************/ 1112/*****************************************************************************/
955 1113
956/* 1114/*
957 * the heap functions want a real array index. array index 0 uis guaranteed to not 1115 * the heap functions want a real array index. array index 0 is guaranteed to not
958 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1116 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
959 * the branching factor of the d-tree. 1117 * the branching factor of the d-tree.
960 */ 1118 */
961 1119
962/* 1120/*
… …
1030 1188
1031 for (;;) 1189 for (;;)
1032 { 1190 {
1033 int c = k << 1; 1191 int c = k << 1;
1034 1192
1035 if (c > N + HEAP0 - 1) 1193 if (c >= N + HEAP0)
1036 break; 1194 break;
1037 1195
1038 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1196 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1039 ? 1 : 0; 1197 ? 1 : 0;
1040 1198
… …
1076 1234
1077/* move an element suitably so it is in a correct place */ 1235/* move an element suitably so it is in a correct place */
1078inline_size void 1236inline_size void
1079adjustheap (ANHE *heap, int N, int k) 1237adjustheap (ANHE *heap, int N, int k)
1080{ 1238{
1081 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1239 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1082 upheap (heap, k); 1240 upheap (heap, k);
1083 else 1241 else
1084 downheap (heap, N, k); 1242 downheap (heap, N, k);
1085} 1243}
1086 1244
… …
1099/*****************************************************************************/ 1257/*****************************************************************************/
1100 1258
1101/* associate signal watchers to a signal signal */ 1259/* associate signal watchers to a signal signal */
1102typedef struct 1260typedef struct
1103{ 1261{
1262 EV_ATOMIC_T pending;
1263#if EV_MULTIPLICITY
1264 EV_P;
1265#endif
1104 WL head; 1266 WL head;
1105 EV_ATOMIC_T gotsig;
1106} ANSIG; 1267} ANSIG;
1107 1268
1108static ANSIG *signals; 1269static ANSIG signals [EV_NSIG - 1];
1109static int signalmax;
1110
1111static EV_ATOMIC_T gotsig;
1112 1270
1113/*****************************************************************************/ 1271/*****************************************************************************/
1114 1272
1115/* used to prepare libev internal fd's */ 1273#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1116/* this is not fork-safe */
1117inline_speed void
1118fd_intern (int fd)
1119{
1120#ifdef _WIN32
1121 unsigned long arg = 1;
1122 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1123#else
1124 fcntl (fd, F_SETFD, FD_CLOEXEC);
1125 fcntl (fd, F_SETFL, O_NONBLOCK);
1126#endif
1127}
1128 1274
1129static void noinline 1275static void noinline
1130evpipe_init (EV_P) 1276evpipe_init (EV_P)
1131{ 1277{
1132 if (!ev_is_active (&pipe_w)) 1278 if (!ev_is_active (&pipe_w))
1133 { 1279 {
1134#if EV_USE_EVENTFD 1280# if EV_USE_EVENTFD
1135 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1281 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1136 if (evfd < 0 && errno == EINVAL) 1282 if (evfd < 0 && errno == EINVAL)
1137 evfd = eventfd (0, 0); 1283 evfd = eventfd (0, 0);
1138 1284
1139 if (evfd >= 0) 1285 if (evfd >= 0)
… …
1141 evpipe [0] = -1; 1287 evpipe [0] = -1;
1142 fd_intern (evfd); /* doing it twice doesn't hurt */ 1288 fd_intern (evfd); /* doing it twice doesn't hurt */
1143 ev_io_set (&pipe_w, evfd, EV_READ); 1289 ev_io_set (&pipe_w, evfd, EV_READ);
1144 } 1290 }
1145 else 1291 else
1146#endif 1292# endif
1147 { 1293 {
1148 while (pipe (evpipe)) 1294 while (pipe (evpipe))
1149 ev_syserr ("(libev) error creating signal/async pipe"); 1295 ev_syserr ("(libev) error creating signal/async pipe");
1150 1296
1151 fd_intern (evpipe [0]); 1297 fd_intern (evpipe [0]);
… …
1162evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1308evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1163{ 1309{
1164 if (!*flag) 1310 if (!*flag)
1165 { 1311 {
1166 int old_errno = errno; /* save errno because write might clobber it */ 1312 int old_errno = errno; /* save errno because write might clobber it */
1313 char dummy;
1167 1314
1168 *flag = 1; 1315 *flag = 1;
1169 1316
1170#if EV_USE_EVENTFD 1317#if EV_USE_EVENTFD
1171 if (evfd >= 0) 1318 if (evfd >= 0)
… …
1173 uint64_t counter = 1; 1320 uint64_t counter = 1;
1174 write (evfd, &counter, sizeof (uint64_t)); 1321 write (evfd, &counter, sizeof (uint64_t));
1175 } 1322 }
1176 else 1323 else
1177#endif 1324#endif
1325 /* win32 people keep sending patches that change this write() to send() */
1326 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1327 /* so when you think this write should be a send instead, please find out */
1328 /* where your send() is from - it's definitely not the microsoft send, and */
1329 /* tell me. thank you. */
1178 write (evpipe [1], &old_errno, 1); 1330 write (evpipe [1], &dummy, 1);
1179 1331
1180 errno = old_errno; 1332 errno = old_errno;
1181 } 1333 }
1182} 1334}
1183 1335
1184/* called whenever the libev signal pipe */ 1336/* called whenever the libev signal pipe */
1185/* got some events (signal, async) */ 1337/* got some events (signal, async) */
1186static void 1338static void
1187pipecb (EV_P_ ev_io *iow, int revents) 1339pipecb (EV_P_ ev_io *iow, int revents)
1188{ 1340{
1341 int i;
1342
1189#if EV_USE_EVENTFD 1343#if EV_USE_EVENTFD
1190 if (evfd >= 0) 1344 if (evfd >= 0)
1191 { 1345 {
1192 uint64_t counter; 1346 uint64_t counter;
1193 read (evfd, &counter, sizeof (uint64_t)); 1347 read (evfd, &counter, sizeof (uint64_t));
1194 } 1348 }
1195 else 1349 else
1196#endif 1350#endif
1197 { 1351 {
1198 char dummy; 1352 char dummy;
1353 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1199 read (evpipe [0], &dummy, 1); 1354 read (evpipe [0], &dummy, 1);
1200 } 1355 }
1201 1356
1202 if (gotsig && ev_is_default_loop (EV_A)) 1357#if EV_SIGNAL_ENABLE
1358 if (sig_pending)
1203 { 1359 {
1204 int signum; 1360 sig_pending = 0;
1205 gotsig = 0;
1206 1361
1207 for (signum = signalmax; signum--; ) 1362 for (i = EV_NSIG - 1; i--; )
1208 if (signals [signum].gotsig) 1363 if (expect_false (signals [i].pending))
1209 ev_feed_signal_event (EV_A_ signum + 1); 1364 ev_feed_signal_event (EV_A_ i + 1);
1210 } 1365 }
1366#endif
1211 1367
1212#if EV_ASYNC_ENABLE 1368#if EV_ASYNC_ENABLE
1213 if (gotasync) 1369 if (async_pending)
1214 { 1370 {
1215 int i; 1371 async_pending = 0;
1216 gotasync = 0;
1217 1372
1218 for (i = asynccnt; i--; ) 1373 for (i = asynccnt; i--; )
1219 if (asyncs [i]->sent) 1374 if (asyncs [i]->sent)
1220 { 1375 {
1221 asyncs [i]->sent = 0; 1376 asyncs [i]->sent = 0;
… …
1225#endif 1380#endif
1226} 1381}
1227 1382
1228/*****************************************************************************/ 1383/*****************************************************************************/
1229 1384
1385void
1386ev_feed_signal (int signum)
1387{
1388#if EV_MULTIPLICITY
1389 EV_P = signals [signum - 1].loop;
1390
1391 if (!EV_A)
1392 return;
1393#endif
1394
1395 signals [signum - 1].pending = 1;
1396 evpipe_write (EV_A_ &sig_pending);
1397}
1398
1230static void 1399static void
1231ev_sighandler (int signum) 1400ev_sighandler (int signum)
1232{ 1401{
1233#if EV_MULTIPLICITY
1234 struct ev_loop *loop = &default_loop_struct;
1235#endif
1236
1237#if _WIN32 1402#ifdef _WIN32
1238 signal (signum, ev_sighandler); 1403 signal (signum, ev_sighandler);
1239#endif 1404#endif
1240 1405
1241 signals [signum - 1].gotsig = 1; 1406 ev_feed_signal (signum);
1242 evpipe_write (EV_A_ &gotsig);
1243} 1407}
1244 1408
1245void noinline 1409void noinline
1246ev_feed_signal_event (EV_P_ int signum) 1410ev_feed_signal_event (EV_P_ int signum)
1247{ 1411{
1248 WL w; 1412 WL w;
1249 1413
1414 if (expect_false (signum <= 0 || signum > EV_NSIG))
1415 return;
1416
1417 --signum;
1418
1250#if EV_MULTIPLICITY 1419#if EV_MULTIPLICITY
1251 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1420 /* it is permissible to try to feed a signal to the wrong loop */
1252#endif 1421 /* or, likely more useful, feeding a signal nobody is waiting for */
1253 1422
1254 --signum; 1423 if (expect_false (signals [signum].loop != EV_A))
1255
1256 if (signum < 0 || signum >= signalmax)
1257 return; 1424 return;
1425#endif
1258 1426
1259 signals [signum].gotsig = 0; 1427 signals [signum].pending = 0;
1260 1428
1261 for (w = signals [signum].head; w; w = w->next) 1429 for (w = signals [signum].head; w; w = w->next)
1262 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1430 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1263} 1431}
1264 1432
1265#if EV_USE_SIGNALFD 1433#if EV_USE_SIGNALFD
1266static void 1434static void
1267sigfdcb (EV_P_ ev_io *iow, int revents) 1435sigfdcb (EV_P_ ev_io *iow, int revents)
1268{ 1436{
1269 struct signalfd_siginfo si[4], *sip; 1437 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1270 1438
1271 for (;;) 1439 for (;;)
1272 { 1440 {
1273 ssize_t res = read (sigfd, si, sizeof (si)); 1441 ssize_t res = read (sigfd, si, sizeof (si));
1274 1442
… …
1280 break; 1448 break;
1281 } 1449 }
1282} 1450}
1283#endif 1451#endif
1284 1452
1453#endif
1454
1285/*****************************************************************************/ 1455/*****************************************************************************/
1286 1456
1457#if EV_CHILD_ENABLE
1287static WL childs [EV_PID_HASHSIZE]; 1458static WL childs [EV_PID_HASHSIZE];
1288
1289#ifndef _WIN32
1290 1459
1291static ev_signal childev; 1460static ev_signal childev;
1292 1461
1293#ifndef WIFCONTINUED 1462#ifndef WIFCONTINUED
1294# define WIFCONTINUED(status) 0 1463# define WIFCONTINUED(status) 0
… …
1299child_reap (EV_P_ int chain, int pid, int status) 1468child_reap (EV_P_ int chain, int pid, int status)
1300{ 1469{
1301 ev_child *w; 1470 ev_child *w;
1302 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1471 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1303 1472
1304 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1473 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1305 { 1474 {
1306 if ((w->pid == pid || !w->pid) 1475 if ((w->pid == pid || !w->pid)
1307 && (!traced || (w->flags & 1))) 1476 && (!traced || (w->flags & 1)))
1308 { 1477 {
1309 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1478 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1334 /* make sure we are called again until all children have been reaped */ 1503 /* make sure we are called again until all children have been reaped */
1335 /* we need to do it this way so that the callback gets called before we continue */ 1504 /* we need to do it this way so that the callback gets called before we continue */
1336 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1505 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1337 1506
1338 child_reap (EV_A_ pid, pid, status); 1507 child_reap (EV_A_ pid, pid, status);
1339 if (EV_PID_HASHSIZE > 1) 1508 if ((EV_PID_HASHSIZE) > 1)
1340 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1509 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1341} 1510}
1342 1511
1343#endif 1512#endif
1344 1513
1345/*****************************************************************************/ 1514/*****************************************************************************/
1346 1515
1516#if EV_USE_IOCP
1517# include "ev_iocp.c"
1518#endif
1347#if EV_USE_PORT 1519#if EV_USE_PORT
1348# include "ev_port.c" 1520# include "ev_port.c"
1349#endif 1521#endif
1350#if EV_USE_KQUEUE 1522#if EV_USE_KQUEUE
1351# include "ev_kqueue.c" 1523# include "ev_kqueue.c"
… …
1411#ifdef __APPLE__ 1583#ifdef __APPLE__
1412 /* only select works correctly on that "unix-certified" platform */ 1584 /* only select works correctly on that "unix-certified" platform */
1413 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1585 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1414 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1586 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1415#endif 1587#endif
1588#ifdef __FreeBSD__
1589 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1590#endif
1416 1591
1417 return flags; 1592 return flags;
1418} 1593}
1419 1594
1420unsigned int 1595unsigned int
1421ev_embeddable_backends (void) 1596ev_embeddable_backends (void)
1422{ 1597{
1423 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1598 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1424 1599
1425 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1600 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1426 /* please fix it and tell me how to detect the fix */ 1601 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1427 flags &= ~EVBACKEND_EPOLL; 1602 flags &= ~EVBACKEND_EPOLL;
1428 1603
1429 return flags; 1604 return flags;
1430} 1605}
1431 1606
1432unsigned int 1607unsigned int
1433ev_backend (EV_P) 1608ev_backend (EV_P)
1434{ 1609{
1435 return backend; 1610 return backend;
1436} 1611}
1437 1612
1438#if EV_MINIMAL < 2 1613#if EV_FEATURE_API
1439unsigned int 1614unsigned int
1440ev_loop_count (EV_P) 1615ev_iteration (EV_P)
1441{ 1616{
1442 return loop_count; 1617 return loop_count;
1443} 1618}
1444 1619
1445unsigned int 1620unsigned int
1446ev_loop_depth (EV_P) 1621ev_depth (EV_P)
1447{ 1622{
1448 return loop_depth; 1623 return loop_depth;
1449} 1624}
1450 1625
1451void 1626void
… …
1488static void noinline 1663static void noinline
1489loop_init (EV_P_ unsigned int flags) 1664loop_init (EV_P_ unsigned int flags)
1490{ 1665{
1491 if (!backend) 1666 if (!backend)
1492 { 1667 {
1668 origflags = flags;
1669
1493#if EV_USE_REALTIME 1670#if EV_USE_REALTIME
1494 if (!have_realtime) 1671 if (!have_realtime)
1495 { 1672 {
1496 struct timespec ts; 1673 struct timespec ts;
1497 1674
… …
1508 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1685 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1509 have_monotonic = 1; 1686 have_monotonic = 1;
1510 } 1687 }
1511#endif 1688#endif
1512 1689
1690 /* pid check not overridable via env */
1691#ifndef _WIN32
1692 if (flags & EVFLAG_FORKCHECK)
1693 curpid = getpid ();
1694#endif
1695
1696 if (!(flags & EVFLAG_NOENV)
1697 && !enable_secure ()
1698 && getenv ("LIBEV_FLAGS"))
1699 flags = atoi (getenv ("LIBEV_FLAGS"));
1700
1513 ev_rt_now = ev_time (); 1701 ev_rt_now = ev_time ();
1514 mn_now = get_clock (); 1702 mn_now = get_clock ();
1515 now_floor = mn_now; 1703 now_floor = mn_now;
1516 rtmn_diff = ev_rt_now - mn_now; 1704 rtmn_diff = ev_rt_now - mn_now;
1517#if EV_MINIMAL < 2 1705#if EV_FEATURE_API
1518 invoke_cb = ev_invoke_pending; 1706 invoke_cb = ev_invoke_pending;
1519#endif 1707#endif
1520 1708
1521 io_blocktime = 0.; 1709 io_blocktime = 0.;
1522 timeout_blocktime = 0.; 1710 timeout_blocktime = 0.;
1523 backend = 0; 1711 backend = 0;
1524 backend_fd = -1; 1712 backend_fd = -1;
1525 gotasync = 0; 1713 sig_pending = 0;
1714#if EV_ASYNC_ENABLE
1715 async_pending = 0;
1716#endif
1526#if EV_USE_INOTIFY 1717#if EV_USE_INOTIFY
1527 fs_fd = -2; 1718 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1528#endif 1719#endif
1529#if EV_USE_SIGNALFD 1720#if EV_USE_SIGNALFD
1530 sigfd = -2; 1721 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1531#endif 1722#endif
1532 1723
1533 /* pid check not overridable via env */
1534#ifndef _WIN32
1535 if (flags & EVFLAG_FORKCHECK)
1536 curpid = getpid ();
1537#endif
1538
1539 if (!(flags & EVFLAG_NOENV) 1724 if (!(flags & EVBACKEND_MASK))
1540 && !enable_secure ()
1541 && getenv ("LIBEV_FLAGS"))
1542 flags = atoi (getenv ("LIBEV_FLAGS"));
1543
1544 if (!(flags & 0x0000ffffU))
1545 flags |= ev_recommended_backends (); 1725 flags |= ev_recommended_backends ();
1546 1726
1727#if EV_USE_IOCP
1728 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1729#endif
1547#if EV_USE_PORT 1730#if EV_USE_PORT
1548 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1731 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1549#endif 1732#endif
1550#if EV_USE_KQUEUE 1733#if EV_USE_KQUEUE
1551 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1734 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1560 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1743 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1561#endif 1744#endif
1562 1745
1563 ev_prepare_init (&pending_w, pendingcb); 1746 ev_prepare_init (&pending_w, pendingcb);
1564 1747
1748#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1565 ev_init (&pipe_w, pipecb); 1749 ev_init (&pipe_w, pipecb);
1566 ev_set_priority (&pipe_w, EV_MAXPRI); 1750 ev_set_priority (&pipe_w, EV_MAXPRI);
1751#endif
1567 } 1752 }
1568} 1753}
1569 1754
1570/* free up a loop structure */ 1755/* free up a loop structure */
1571static void noinline 1756void
1572loop_destroy (EV_P) 1757ev_loop_destroy (EV_P)
1573{ 1758{
1574 int i; 1759 int i;
1760
1761#if EV_MULTIPLICITY
1762 /* mimic free (0) */
1763 if (!EV_A)
1764 return;
1765#endif
1766
1767#if EV_CLEANUP_ENABLE
1768 /* queue cleanup watchers (and execute them) */
1769 if (expect_false (cleanupcnt))
1770 {
1771 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1772 EV_INVOKE_PENDING;
1773 }
1774#endif
1775
1776#if EV_CHILD_ENABLE
1777 if (ev_is_active (&childev))
1778 {
1779 ev_ref (EV_A); /* child watcher */
1780 ev_signal_stop (EV_A_ &childev);
1781 }
1782#endif
1575 1783
1576 if (ev_is_active (&pipe_w)) 1784 if (ev_is_active (&pipe_w))
1577 { 1785 {
1578 /*ev_ref (EV_A);*/ 1786 /*ev_ref (EV_A);*/
1579 /*ev_io_stop (EV_A_ &pipe_w);*/ 1787 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1583 close (evfd); 1791 close (evfd);
1584#endif 1792#endif
1585 1793
1586 if (evpipe [0] >= 0) 1794 if (evpipe [0] >= 0)
1587 { 1795 {
1588 close (evpipe [0]); 1796 EV_WIN32_CLOSE_FD (evpipe [0]);
1589 close (evpipe [1]); 1797 EV_WIN32_CLOSE_FD (evpipe [1]);
1590 } 1798 }
1591 } 1799 }
1592 1800
1593#if EV_USE_SIGNALFD 1801#if EV_USE_SIGNALFD
1594 if (ev_is_active (&sigfd_w)) 1802 if (ev_is_active (&sigfd_w))
1595 {
1596 /*ev_ref (EV_A);*/
1597 /*ev_io_stop (EV_A_ &sigfd_w);*/
1598
1599 close (sigfd); 1803 close (sigfd);
1600 }
1601#endif 1804#endif
1602 1805
1603#if EV_USE_INOTIFY 1806#if EV_USE_INOTIFY
1604 if (fs_fd >= 0) 1807 if (fs_fd >= 0)
1605 close (fs_fd); 1808 close (fs_fd);
1606#endif 1809#endif
1607 1810
1608 if (backend_fd >= 0) 1811 if (backend_fd >= 0)
1609 close (backend_fd); 1812 close (backend_fd);
1610 1813
1814#if EV_USE_IOCP
1815 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1816#endif
1611#if EV_USE_PORT 1817#if EV_USE_PORT
1612 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1818 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1613#endif 1819#endif
1614#if EV_USE_KQUEUE 1820#if EV_USE_KQUEUE
1615 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1821 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1630#if EV_IDLE_ENABLE 1836#if EV_IDLE_ENABLE
1631 array_free (idle, [i]); 1837 array_free (idle, [i]);
1632#endif 1838#endif
1633 } 1839 }
1634 1840
1635 ev_free (anfds); anfdmax = 0; 1841 ev_free (anfds); anfds = 0; anfdmax = 0;
1636 1842
1637 /* have to use the microsoft-never-gets-it-right macro */ 1843 /* have to use the microsoft-never-gets-it-right macro */
1638 array_free (rfeed, EMPTY); 1844 array_free (rfeed, EMPTY);
1639 array_free (fdchange, EMPTY); 1845 array_free (fdchange, EMPTY);
1640 array_free (timer, EMPTY); 1846 array_free (timer, EMPTY);
… …
1642 array_free (periodic, EMPTY); 1848 array_free (periodic, EMPTY);
1643#endif 1849#endif
1644#if EV_FORK_ENABLE 1850#if EV_FORK_ENABLE
1645 array_free (fork, EMPTY); 1851 array_free (fork, EMPTY);
1646#endif 1852#endif
1853#if EV_CLEANUP_ENABLE
1854 array_free (cleanup, EMPTY);
1855#endif
1647 array_free (prepare, EMPTY); 1856 array_free (prepare, EMPTY);
1648 array_free (check, EMPTY); 1857 array_free (check, EMPTY);
1649#if EV_ASYNC_ENABLE 1858#if EV_ASYNC_ENABLE
1650 array_free (async, EMPTY); 1859 array_free (async, EMPTY);
1651#endif 1860#endif
1652 1861
1653 backend = 0; 1862 backend = 0;
1863
1864#if EV_MULTIPLICITY
1865 if (ev_is_default_loop (EV_A))
1866#endif
1867 ev_default_loop_ptr = 0;
1868#if EV_MULTIPLICITY
1869 else
1870 ev_free (EV_A);
1871#endif
1654} 1872}
1655 1873
1656#if EV_USE_INOTIFY 1874#if EV_USE_INOTIFY
1657inline_size void infy_fork (EV_P); 1875inline_size void infy_fork (EV_P);
1658#endif 1876#endif
… …
1675 1893
1676 if (ev_is_active (&pipe_w)) 1894 if (ev_is_active (&pipe_w))
1677 { 1895 {
1678 /* this "locks" the handlers against writing to the pipe */ 1896 /* this "locks" the handlers against writing to the pipe */
1679 /* while we modify the fd vars */ 1897 /* while we modify the fd vars */
1680 gotsig = 1; 1898 sig_pending = 1;
1681#if EV_ASYNC_ENABLE 1899#if EV_ASYNC_ENABLE
1682 gotasync = 1; 1900 async_pending = 1;
1683#endif 1901#endif
1684 1902
1685 ev_ref (EV_A); 1903 ev_ref (EV_A);
1686 ev_io_stop (EV_A_ &pipe_w); 1904 ev_io_stop (EV_A_ &pipe_w);
1687 1905
… …
1690 close (evfd); 1908 close (evfd);
1691#endif 1909#endif
1692 1910
1693 if (evpipe [0] >= 0) 1911 if (evpipe [0] >= 0)
1694 { 1912 {
1695 close (evpipe [0]); 1913 EV_WIN32_CLOSE_FD (evpipe [0]);
1696 close (evpipe [1]); 1914 EV_WIN32_CLOSE_FD (evpipe [1]);
1697 } 1915 }
1698 1916
1917#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1699 evpipe_init (EV_A); 1918 evpipe_init (EV_A);
1700 /* now iterate over everything, in case we missed something */ 1919 /* now iterate over everything, in case we missed something */
1701 pipecb (EV_A_ &pipe_w, EV_READ); 1920 pipecb (EV_A_ &pipe_w, EV_READ);
1921#endif
1702 } 1922 }
1703 1923
1704 postfork = 0; 1924 postfork = 0;
1705} 1925}
1706 1926
1707#if EV_MULTIPLICITY 1927#if EV_MULTIPLICITY
1708 1928
1709struct ev_loop * 1929struct ev_loop *
1710ev_loop_new (unsigned int flags) 1930ev_loop_new (unsigned int flags)
1711{ 1931{
1712 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1932 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1713 1933
1714 memset (loop, 0, sizeof (struct ev_loop)); 1934 memset (EV_A, 0, sizeof (struct ev_loop));
1715 loop_init (EV_A_ flags); 1935 loop_init (EV_A_ flags);
1716 1936
1717 if (ev_backend (EV_A)) 1937 if (ev_backend (EV_A))
1718 return loop; 1938 return EV_A;
1719 1939
1940 ev_free (EV_A);
1720 return 0; 1941 return 0;
1721} 1942}
1722 1943
1723void
1724ev_loop_destroy (EV_P)
1725{
1726 loop_destroy (EV_A);
1727 ev_free (loop);
1728}
1729
1730void
1731ev_loop_fork (EV_P)
1732{
1733 postfork = 1; /* must be in line with ev_default_fork */
1734}
1735#endif /* multiplicity */ 1944#endif /* multiplicity */
1736 1945
1737#if EV_VERIFY 1946#if EV_VERIFY
1738static void noinline 1947static void noinline
1739verify_watcher (EV_P_ W w) 1948verify_watcher (EV_P_ W w)
… …
1768 verify_watcher (EV_A_ ws [cnt]); 1977 verify_watcher (EV_A_ ws [cnt]);
1769 } 1978 }
1770} 1979}
1771#endif 1980#endif
1772 1981
1773#if EV_MINIMAL < 2 1982#if EV_FEATURE_API
1774void 1983void
1775ev_loop_verify (EV_P) 1984ev_verify (EV_P)
1776{ 1985{
1777#if EV_VERIFY 1986#if EV_VERIFY
1778 int i; 1987 int i;
1779 WL w; 1988 WL w;
1780 1989
… …
1814#if EV_FORK_ENABLE 2023#if EV_FORK_ENABLE
1815 assert (forkmax >= forkcnt); 2024 assert (forkmax >= forkcnt);
1816 array_verify (EV_A_ (W *)forks, forkcnt); 2025 array_verify (EV_A_ (W *)forks, forkcnt);
1817#endif 2026#endif
1818 2027
2028#if EV_CLEANUP_ENABLE
2029 assert (cleanupmax >= cleanupcnt);
2030 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2031#endif
2032
1819#if EV_ASYNC_ENABLE 2033#if EV_ASYNC_ENABLE
1820 assert (asyncmax >= asynccnt); 2034 assert (asyncmax >= asynccnt);
1821 array_verify (EV_A_ (W *)asyncs, asynccnt); 2035 array_verify (EV_A_ (W *)asyncs, asynccnt);
1822#endif 2036#endif
1823 2037
2038#if EV_PREPARE_ENABLE
1824 assert (preparemax >= preparecnt); 2039 assert (preparemax >= preparecnt);
1825 array_verify (EV_A_ (W *)prepares, preparecnt); 2040 array_verify (EV_A_ (W *)prepares, preparecnt);
2041#endif
1826 2042
2043#if EV_CHECK_ENABLE
1827 assert (checkmax >= checkcnt); 2044 assert (checkmax >= checkcnt);
1828 array_verify (EV_A_ (W *)checks, checkcnt); 2045 array_verify (EV_A_ (W *)checks, checkcnt);
2046#endif
1829 2047
1830# if 0 2048# if 0
2049#if EV_CHILD_ENABLE
1831 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2050 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1832 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 2051 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2052#endif
1833# endif 2053# endif
1834#endif 2054#endif
1835} 2055}
1836#endif 2056#endif
1837 2057
1838#if EV_MULTIPLICITY 2058#if EV_MULTIPLICITY
1839struct ev_loop * 2059struct ev_loop *
1840ev_default_loop_init (unsigned int flags)
1841#else 2060#else
1842int 2061int
2062#endif
1843ev_default_loop (unsigned int flags) 2063ev_default_loop (unsigned int flags)
1844#endif
1845{ 2064{
1846 if (!ev_default_loop_ptr) 2065 if (!ev_default_loop_ptr)
1847 { 2066 {
1848#if EV_MULTIPLICITY 2067#if EV_MULTIPLICITY
1849 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2068 EV_P = ev_default_loop_ptr = &default_loop_struct;
1850#else 2069#else
1851 ev_default_loop_ptr = 1; 2070 ev_default_loop_ptr = 1;
1852#endif 2071#endif
1853 2072
1854 loop_init (EV_A_ flags); 2073 loop_init (EV_A_ flags);
1855 2074
1856 if (ev_backend (EV_A)) 2075 if (ev_backend (EV_A))
1857 { 2076 {
1858#ifndef _WIN32 2077#if EV_CHILD_ENABLE
1859 ev_signal_init (&childev, childcb, SIGCHLD); 2078 ev_signal_init (&childev, childcb, SIGCHLD);
1860 ev_set_priority (&childev, EV_MAXPRI); 2079 ev_set_priority (&childev, EV_MAXPRI);
1861 ev_signal_start (EV_A_ &childev); 2080 ev_signal_start (EV_A_ &childev);
1862 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2081 ev_unref (EV_A); /* child watcher should not keep loop alive */
1863#endif 2082#endif
… …
1868 2087
1869 return ev_default_loop_ptr; 2088 return ev_default_loop_ptr;
1870} 2089}
1871 2090
1872void 2091void
1873ev_default_destroy (void) 2092ev_loop_fork (EV_P)
1874{ 2093{
1875#if EV_MULTIPLICITY
1876 struct ev_loop *loop = ev_default_loop_ptr;
1877#endif
1878
1879 ev_default_loop_ptr = 0;
1880
1881#ifndef _WIN32
1882 ev_ref (EV_A); /* child watcher */
1883 ev_signal_stop (EV_A_ &childev);
1884#endif
1885
1886 loop_destroy (EV_A);
1887}
1888
1889void
1890ev_default_fork (void)
1891{
1892#if EV_MULTIPLICITY
1893 struct ev_loop *loop = ev_default_loop_ptr;
1894#endif
1895
1896 postfork = 1; /* must be in line with ev_loop_fork */ 2094 postfork = 1; /* must be in line with ev_default_fork */
1897} 2095}
1898 2096
1899/*****************************************************************************/ 2097/*****************************************************************************/
1900 2098
1901void 2099void
… …
1923 2121
1924 for (pri = NUMPRI; pri--; ) 2122 for (pri = NUMPRI; pri--; )
1925 while (pendingcnt [pri]) 2123 while (pendingcnt [pri])
1926 { 2124 {
1927 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2125 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1928
1929 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1930 /* ^ this is no longer true, as pending_w could be here */
1931 2126
1932 p->w->pending = 0; 2127 p->w->pending = 0;
1933 EV_CB_INVOKE (p->w, p->events); 2128 EV_CB_INVOKE (p->w, p->events);
1934 EV_FREQUENT_CHECK; 2129 EV_FREQUENT_CHECK;
1935 } 2130 }
… …
1992 EV_FREQUENT_CHECK; 2187 EV_FREQUENT_CHECK;
1993 feed_reverse (EV_A_ (W)w); 2188 feed_reverse (EV_A_ (W)w);
1994 } 2189 }
1995 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2190 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1996 2191
1997 feed_reverse_done (EV_A_ EV_TIMEOUT); 2192 feed_reverse_done (EV_A_ EV_TIMER);
1998 } 2193 }
1999} 2194}
2000 2195
2001#if EV_PERIODIC_ENABLE 2196#if EV_PERIODIC_ENABLE
2197
2198inline_speed
2199periodic_recalc (EV_P_ ev_periodic *w)
2200{
2201 /* TODO: use slow but potentially more correct incremental algo, */
2202 /* also do not rely on ceil */
2203 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2204}
2205
2002/* make periodics pending */ 2206/* make periodics pending */
2003inline_size void 2207inline_size void
2004periodics_reify (EV_P) 2208periodics_reify (EV_P)
2005{ 2209{
2006 EV_FREQUENT_CHECK; 2210 EV_FREQUENT_CHECK;
… …
2025 ANHE_at_cache (periodics [HEAP0]); 2229 ANHE_at_cache (periodics [HEAP0]);
2026 downheap (periodics, periodiccnt, HEAP0); 2230 downheap (periodics, periodiccnt, HEAP0);
2027 } 2231 }
2028 else if (w->interval) 2232 else if (w->interval)
2029 { 2233 {
2030 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2234 periodic_recalc (EV_A_ w);
2235
2031 /* if next trigger time is not sufficiently in the future, put it there */ 2236 /* if next trigger time is not sufficiently in the future, put it there */
2032 /* this might happen because of floating point inexactness */ 2237 /* this might happen because of floating point inexactness */
2033 if (ev_at (w) - ev_rt_now < TIME_EPSILON) 2238 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2034 { 2239 {
2035 ev_at (w) += w->interval; 2240 ev_at (w) += w->interval;
… …
2055 feed_reverse_done (EV_A_ EV_PERIODIC); 2260 feed_reverse_done (EV_A_ EV_PERIODIC);
2056 } 2261 }
2057} 2262}
2058 2263
2059/* simply recalculate all periodics */ 2264/* simply recalculate all periodics */
2060/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2265/* TODO: maybe ensure that at least one event happens when jumping forward? */
2061static void noinline 2266static void noinline
2062periodics_reschedule (EV_P) 2267periodics_reschedule (EV_P)
2063{ 2268{
2064 int i; 2269 int i;
2065 2270
… …
2069 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2274 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2070 2275
2071 if (w->reschedule_cb) 2276 if (w->reschedule_cb)
2072 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2277 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2073 else if (w->interval) 2278 else if (w->interval)
2074 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2279 periodic_recalc (EV_A_ w);
2075 2280
2076 ANHE_at_cache (periodics [i]); 2281 ANHE_at_cache (periodics [i]);
2077 } 2282 }
2078 2283
2079 reheap (periodics, periodiccnt); 2284 reheap (periodics, periodiccnt);
… …
2093 ANHE_at_cache (*he); 2298 ANHE_at_cache (*he);
2094 } 2299 }
2095} 2300}
2096 2301
2097/* fetch new monotonic and realtime times from the kernel */ 2302/* fetch new monotonic and realtime times from the kernel */
2098/* also detetc if there was a timejump, and act accordingly */ 2303/* also detect if there was a timejump, and act accordingly */
2099inline_speed void 2304inline_speed void
2100time_update (EV_P_ ev_tstamp max_block) 2305time_update (EV_P_ ev_tstamp max_block)
2101{ 2306{
2102#if EV_USE_MONOTONIC 2307#if EV_USE_MONOTONIC
2103 if (expect_true (have_monotonic)) 2308 if (expect_true (have_monotonic))
… …
2161 mn_now = ev_rt_now; 2366 mn_now = ev_rt_now;
2162 } 2367 }
2163} 2368}
2164 2369
2165void 2370void
2166ev_loop (EV_P_ int flags) 2371ev_run (EV_P_ int flags)
2167{ 2372{
2168#if EV_MINIMAL < 2 2373#if EV_FEATURE_API
2169 ++loop_depth; 2374 ++loop_depth;
2170#endif 2375#endif
2171 2376
2172 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2377 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2173 2378
2174 loop_done = EVUNLOOP_CANCEL; 2379 loop_done = EVBREAK_CANCEL;
2175 2380
2176 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2381 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2177 2382
2178 do 2383 do
2179 { 2384 {
2180#if EV_VERIFY >= 2 2385#if EV_VERIFY >= 2
2181 ev_loop_verify (EV_A); 2386 ev_verify (EV_A);
2182#endif 2387#endif
2183 2388
2184#ifndef _WIN32 2389#ifndef _WIN32
2185 if (expect_false (curpid)) /* penalise the forking check even more */ 2390 if (expect_false (curpid)) /* penalise the forking check even more */
2186 if (expect_false (getpid () != curpid)) 2391 if (expect_false (getpid () != curpid))
… …
2198 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2403 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2199 EV_INVOKE_PENDING; 2404 EV_INVOKE_PENDING;
2200 } 2405 }
2201#endif 2406#endif
2202 2407
2408#if EV_PREPARE_ENABLE
2203 /* queue prepare watchers (and execute them) */ 2409 /* queue prepare watchers (and execute them) */
2204 if (expect_false (preparecnt)) 2410 if (expect_false (preparecnt))
2205 { 2411 {
2206 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2412 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2207 EV_INVOKE_PENDING; 2413 EV_INVOKE_PENDING;
2208 } 2414 }
2415#endif
2209 2416
2210 if (expect_false (loop_done)) 2417 if (expect_false (loop_done))
2211 break; 2418 break;
2212 2419
2213 /* we might have forked, so reify kernel state if necessary */ 2420 /* we might have forked, so reify kernel state if necessary */
… …
2220 /* calculate blocking time */ 2427 /* calculate blocking time */
2221 { 2428 {
2222 ev_tstamp waittime = 0.; 2429 ev_tstamp waittime = 0.;
2223 ev_tstamp sleeptime = 0.; 2430 ev_tstamp sleeptime = 0.;
2224 2431
2432 /* remember old timestamp for io_blocktime calculation */
2433 ev_tstamp prev_mn_now = mn_now;
2434
2435 /* update time to cancel out callback processing overhead */
2436 time_update (EV_A_ 1e100);
2437
2225 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2438 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2226 { 2439 {
2227 /* remember old timestamp for io_blocktime calculation */
2228 ev_tstamp prev_mn_now = mn_now;
2229
2230 /* update time to cancel out callback processing overhead */
2231 time_update (EV_A_ 1e100);
2232
2233 waittime = MAX_BLOCKTIME; 2440 waittime = MAX_BLOCKTIME;
2234 2441
2235 if (timercnt) 2442 if (timercnt)
2236 { 2443 {
2237 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2444 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2264 waittime -= sleeptime; 2471 waittime -= sleeptime;
2265 } 2472 }
2266 } 2473 }
2267 } 2474 }
2268 2475
2269#if EV_MINIMAL < 2 2476#if EV_FEATURE_API
2270 ++loop_count; 2477 ++loop_count;
2271#endif 2478#endif
2272 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2479 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2273 backend_poll (EV_A_ waittime); 2480 backend_poll (EV_A_ waittime);
2274 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2481 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2275 2482
2276 /* update ev_rt_now, do magic */ 2483 /* update ev_rt_now, do magic */
2277 time_update (EV_A_ waittime + sleeptime); 2484 time_update (EV_A_ waittime + sleeptime);
2278 } 2485 }
2279 2486
… …
2286#if EV_IDLE_ENABLE 2493#if EV_IDLE_ENABLE
2287 /* queue idle watchers unless other events are pending */ 2494 /* queue idle watchers unless other events are pending */
2288 idle_reify (EV_A); 2495 idle_reify (EV_A);
2289#endif 2496#endif
2290 2497
2498#if EV_CHECK_ENABLE
2291 /* queue check watchers, to be executed first */ 2499 /* queue check watchers, to be executed first */
2292 if (expect_false (checkcnt)) 2500 if (expect_false (checkcnt))
2293 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2501 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2502#endif
2294 2503
2295 EV_INVOKE_PENDING; 2504 EV_INVOKE_PENDING;
2296 } 2505 }
2297 while (expect_true ( 2506 while (expect_true (
2298 activecnt 2507 activecnt
2299 && !loop_done 2508 && !loop_done
2300 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2509 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2301 )); 2510 ));
2302 2511
2303 if (loop_done == EVUNLOOP_ONE) 2512 if (loop_done == EVBREAK_ONE)
2304 loop_done = EVUNLOOP_CANCEL; 2513 loop_done = EVBREAK_CANCEL;
2305 2514
2306#if EV_MINIMAL < 2 2515#if EV_FEATURE_API
2307 --loop_depth; 2516 --loop_depth;
2308#endif 2517#endif
2309} 2518}
2310 2519
2311void 2520void
2312ev_unloop (EV_P_ int how) 2521ev_break (EV_P_ int how)
2313{ 2522{
2314 loop_done = how; 2523 loop_done = how;
2315} 2524}
2316 2525
2317void 2526void
… …
2364inline_size void 2573inline_size void
2365wlist_del (WL *head, WL elem) 2574wlist_del (WL *head, WL elem)
2366{ 2575{
2367 while (*head) 2576 while (*head)
2368 { 2577 {
2369 if (*head == elem) 2578 if (expect_true (*head == elem))
2370 { 2579 {
2371 *head = elem->next; 2580 *head = elem->next;
2372 return; 2581 break;
2373 } 2582 }
2374 2583
2375 head = &(*head)->next; 2584 head = &(*head)->next;
2376 } 2585 }
2377} 2586}
… …
2437 2646
2438 if (expect_false (ev_is_active (w))) 2647 if (expect_false (ev_is_active (w)))
2439 return; 2648 return;
2440 2649
2441 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2650 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2442 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2651 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2443 2652
2444 EV_FREQUENT_CHECK; 2653 EV_FREQUENT_CHECK;
2445 2654
2446 ev_start (EV_A_ (W)w, 1); 2655 ev_start (EV_A_ (W)w, 1);
2447 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2656 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2465 EV_FREQUENT_CHECK; 2674 EV_FREQUENT_CHECK;
2466 2675
2467 wlist_del (&anfds[w->fd].head, (WL)w); 2676 wlist_del (&anfds[w->fd].head, (WL)w);
2468 ev_stop (EV_A_ (W)w); 2677 ev_stop (EV_A_ (W)w);
2469 2678
2470 fd_change (EV_A_ w->fd, 1); 2679 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2471 2680
2472 EV_FREQUENT_CHECK; 2681 EV_FREQUENT_CHECK;
2473} 2682}
2474 2683
2475void noinline 2684void noinline
… …
2517 timers [active] = timers [timercnt + HEAP0]; 2726 timers [active] = timers [timercnt + HEAP0];
2518 adjustheap (timers, timercnt, active); 2727 adjustheap (timers, timercnt, active);
2519 } 2728 }
2520 } 2729 }
2521 2730
2522 EV_FREQUENT_CHECK;
2523
2524 ev_at (w) -= mn_now; 2731 ev_at (w) -= mn_now;
2525 2732
2526 ev_stop (EV_A_ (W)w); 2733 ev_stop (EV_A_ (W)w);
2734
2735 EV_FREQUENT_CHECK;
2527} 2736}
2528 2737
2529void noinline 2738void noinline
2530ev_timer_again (EV_P_ ev_timer *w) 2739ev_timer_again (EV_P_ ev_timer *w)
2531{ 2740{
… …
2567 if (w->reschedule_cb) 2776 if (w->reschedule_cb)
2568 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2777 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2569 else if (w->interval) 2778 else if (w->interval)
2570 { 2779 {
2571 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2780 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2572 /* this formula differs from the one in periodic_reify because we do not always round up */ 2781 periodic_recalc (EV_A_ w);
2573 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2574 } 2782 }
2575 else 2783 else
2576 ev_at (w) = w->offset; 2784 ev_at (w) = w->offset;
2577 2785
2578 EV_FREQUENT_CHECK; 2786 EV_FREQUENT_CHECK;
… …
2610 periodics [active] = periodics [periodiccnt + HEAP0]; 2818 periodics [active] = periodics [periodiccnt + HEAP0];
2611 adjustheap (periodics, periodiccnt, active); 2819 adjustheap (periodics, periodiccnt, active);
2612 } 2820 }
2613 } 2821 }
2614 2822
2615 EV_FREQUENT_CHECK;
2616
2617 ev_stop (EV_A_ (W)w); 2823 ev_stop (EV_A_ (W)w);
2824
2825 EV_FREQUENT_CHECK;
2618} 2826}
2619 2827
2620void noinline 2828void noinline
2621ev_periodic_again (EV_P_ ev_periodic *w) 2829ev_periodic_again (EV_P_ ev_periodic *w)
2622{ 2830{
… …
2628 2836
2629#ifndef SA_RESTART 2837#ifndef SA_RESTART
2630# define SA_RESTART 0 2838# define SA_RESTART 0
2631#endif 2839#endif
2632 2840
2841#if EV_SIGNAL_ENABLE
2842
2633void noinline 2843void noinline
2634ev_signal_start (EV_P_ ev_signal *w) 2844ev_signal_start (EV_P_ ev_signal *w)
2635{ 2845{
2636#if EV_MULTIPLICITY
2637 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2638#endif
2639 if (expect_false (ev_is_active (w))) 2846 if (expect_false (ev_is_active (w)))
2640 return; 2847 return;
2641 2848
2642 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2849 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2850
2851#if EV_MULTIPLICITY
2852 assert (("libev: a signal must not be attached to two different loops",
2853 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2854
2855 signals [w->signum - 1].loop = EV_A;
2856#endif
2643 2857
2644 EV_FREQUENT_CHECK; 2858 EV_FREQUENT_CHECK;
2645 2859
2646#if EV_USE_SIGNALFD 2860#if EV_USE_SIGNALFD
2647 if (sigfd == -2) 2861 if (sigfd == -2)
… …
2669 sigaddset (&sigfd_set, w->signum); 2883 sigaddset (&sigfd_set, w->signum);
2670 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2884 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2671 2885
2672 signalfd (sigfd, &sigfd_set, 0); 2886 signalfd (sigfd, &sigfd_set, 0);
2673 } 2887 }
2674 else
2675#endif
2676 evpipe_init (EV_A);
2677
2678 {
2679#ifndef _WIN32
2680 sigset_t full, prev;
2681 sigfillset (&full);
2682 sigprocmask (SIG_SETMASK, &full, &prev);
2683#endif
2684
2685 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2686
2687#ifndef _WIN32
2688# if EV_USE_SIGNALFD
2689 if (sigfd < 0)/*TODO*/
2690# endif 2888#endif
2691 sigdelset (&prev, w->signum);
2692 sigprocmask (SIG_SETMASK, &prev, 0);
2693#endif
2694 }
2695 2889
2696 ev_start (EV_A_ (W)w, 1); 2890 ev_start (EV_A_ (W)w, 1);
2697 wlist_add (&signals [w->signum - 1].head, (WL)w); 2891 wlist_add (&signals [w->signum - 1].head, (WL)w);
2698 2892
2699 if (!((WL)w)->next) 2893 if (!((WL)w)->next)
2700 {
2701#if _WIN32
2702 signal (w->signum, ev_sighandler);
2703#else
2704# if EV_USE_SIGNALFD 2894# if EV_USE_SIGNALFD
2705 if (sigfd < 0) /*TODO*/ 2895 if (sigfd < 0) /*TODO*/
2706# endif 2896# endif
2707 { 2897 {
2898# ifdef _WIN32
2899 evpipe_init (EV_A);
2900
2901 signal (w->signum, ev_sighandler);
2902# else
2708 struct sigaction sa = { }; 2903 struct sigaction sa;
2904
2905 evpipe_init (EV_A);
2906
2709 sa.sa_handler = ev_sighandler; 2907 sa.sa_handler = ev_sighandler;
2710 sigfillset (&sa.sa_mask); 2908 sigfillset (&sa.sa_mask);
2711 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2909 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2712 sigaction (w->signum, &sa, 0); 2910 sigaction (w->signum, &sa, 0);
2911
2912 if (origflags & EVFLAG_NOSIGMASK)
2913 {
2914 sigemptyset (&sa.sa_mask);
2915 sigaddset (&sa.sa_mask, w->signum);
2916 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2713 } 2917 }
2714#endif 2918#endif
2715 } 2919 }
2716 2920
2717 EV_FREQUENT_CHECK; 2921 EV_FREQUENT_CHECK;
2718} 2922}
2719 2923
2720void noinline 2924void noinline
… …
2728 2932
2729 wlist_del (&signals [w->signum - 1].head, (WL)w); 2933 wlist_del (&signals [w->signum - 1].head, (WL)w);
2730 ev_stop (EV_A_ (W)w); 2934 ev_stop (EV_A_ (W)w);
2731 2935
2732 if (!signals [w->signum - 1].head) 2936 if (!signals [w->signum - 1].head)
2937 {
2938#if EV_MULTIPLICITY
2939 signals [w->signum - 1].loop = 0; /* unattach from signal */
2940#endif
2733#if EV_USE_SIGNALFD 2941#if EV_USE_SIGNALFD
2734 if (sigfd >= 0) 2942 if (sigfd >= 0)
2735 { 2943 {
2736 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2944 sigset_t ss;
2945
2946 sigemptyset (&ss);
2947 sigaddset (&ss, w->signum);
2737 sigdelset (&sigfd_set, w->signum); 2948 sigdelset (&sigfd_set, w->signum);
2949
2738 signalfd (sigfd, &sigfd_set, 0); 2950 signalfd (sigfd, &sigfd_set, 0);
2739 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2951 sigprocmask (SIG_UNBLOCK, &ss, 0);
2740 /*TODO: maybe unblock signal? */
2741 } 2952 }
2742 else 2953 else
2743#endif 2954#endif
2744 signal (w->signum, SIG_DFL); 2955 signal (w->signum, SIG_DFL);
2956 }
2745 2957
2746 EV_FREQUENT_CHECK; 2958 EV_FREQUENT_CHECK;
2747} 2959}
2960
2961#endif
2962
2963#if EV_CHILD_ENABLE
2748 2964
2749void 2965void
2750ev_child_start (EV_P_ ev_child *w) 2966ev_child_start (EV_P_ ev_child *w)
2751{ 2967{
2752#if EV_MULTIPLICITY 2968#if EV_MULTIPLICITY
… …
2756 return; 2972 return;
2757 2973
2758 EV_FREQUENT_CHECK; 2974 EV_FREQUENT_CHECK;
2759 2975
2760 ev_start (EV_A_ (W)w, 1); 2976 ev_start (EV_A_ (W)w, 1);
2761 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2977 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2762 2978
2763 EV_FREQUENT_CHECK; 2979 EV_FREQUENT_CHECK;
2764} 2980}
2765 2981
2766void 2982void
… …
2770 if (expect_false (!ev_is_active (w))) 2986 if (expect_false (!ev_is_active (w)))
2771 return; 2987 return;
2772 2988
2773 EV_FREQUENT_CHECK; 2989 EV_FREQUENT_CHECK;
2774 2990
2775 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2991 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2776 ev_stop (EV_A_ (W)w); 2992 ev_stop (EV_A_ (W)w);
2777 2993
2778 EV_FREQUENT_CHECK; 2994 EV_FREQUENT_CHECK;
2779} 2995}
2996
2997#endif
2780 2998
2781#if EV_STAT_ENABLE 2999#if EV_STAT_ENABLE
2782 3000
2783# ifdef _WIN32 3001# ifdef _WIN32
2784# undef lstat 3002# undef lstat
… …
2790#define MIN_STAT_INTERVAL 0.1074891 3008#define MIN_STAT_INTERVAL 0.1074891
2791 3009
2792static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 3010static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2793 3011
2794#if EV_USE_INOTIFY 3012#if EV_USE_INOTIFY
2795# define EV_INOTIFY_BUFSIZE 8192 3013
3014/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
3015# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2796 3016
2797static void noinline 3017static void noinline
2798infy_add (EV_P_ ev_stat *w) 3018infy_add (EV_P_ ev_stat *w)
2799{ 3019{
2800 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); 3020 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);
2801 3021
2802 if (w->wd < 0) 3022 if (w->wd >= 0)
3023 {
3024 struct statfs sfs;
3025
3026 /* now local changes will be tracked by inotify, but remote changes won't */
3027 /* unless the filesystem is known to be local, we therefore still poll */
3028 /* also do poll on <2.6.25, but with normal frequency */
3029
3030 if (!fs_2625)
3031 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3032 else if (!statfs (w->path, &sfs)
3033 && (sfs.f_type == 0x1373 /* devfs */
3034 || sfs.f_type == 0xEF53 /* ext2/3 */
3035 || sfs.f_type == 0x3153464a /* jfs */
3036 || sfs.f_type == 0x52654973 /* reiser3 */
3037 || sfs.f_type == 0x01021994 /* tempfs */
3038 || sfs.f_type == 0x58465342 /* xfs */))
3039 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3040 else
3041 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2803 { 3042 }
3043 else
3044 {
3045 /* can't use inotify, continue to stat */
2804 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3046 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2805 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2806 3047
2807 /* monitor some parent directory for speedup hints */ 3048 /* if path is not there, monitor some parent directory for speedup hints */
2808 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3049 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2809 /* but an efficiency issue only */ 3050 /* but an efficiency issue only */
2810 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3051 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2811 { 3052 {
2812 char path [4096]; 3053 char path [4096];
… …
2828 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3069 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2829 } 3070 }
2830 } 3071 }
2831 3072
2832 if (w->wd >= 0) 3073 if (w->wd >= 0)
2833 {
2834 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3074 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2835 3075
2836 /* now local changes will be tracked by inotify, but remote changes won't */ 3076 /* now re-arm timer, if required */
2837 /* unless the filesystem it known to be local, we therefore still poll */ 3077 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2838 /* also do poll on <2.6.25, but with normal frequency */
2839 struct statfs sfs;
2840
2841 if (fs_2625 && !statfs (w->path, &sfs))
2842 if (sfs.f_type == 0x1373 /* devfs */
2843 || sfs.f_type == 0xEF53 /* ext2/3 */
2844 || sfs.f_type == 0x3153464a /* jfs */
2845 || sfs.f_type == 0x52654973 /* reiser3 */
2846 || sfs.f_type == 0x01021994 /* tempfs */
2847 || sfs.f_type == 0x58465342 /* xfs */)
2848 return;
2849
2850 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2851 ev_timer_again (EV_A_ &w->timer); 3078 ev_timer_again (EV_A_ &w->timer);
2852 } 3079 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2853} 3080}
2854 3081
2855static void noinline 3082static void noinline
2856infy_del (EV_P_ ev_stat *w) 3083infy_del (EV_P_ ev_stat *w)
2857{ 3084{
… …
2860 3087
2861 if (wd < 0) 3088 if (wd < 0)
2862 return; 3089 return;
2863 3090
2864 w->wd = -2; 3091 w->wd = -2;
2865 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3092 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2866 wlist_del (&fs_hash [slot].head, (WL)w); 3093 wlist_del (&fs_hash [slot].head, (WL)w);
2867 3094
2868 /* remove this watcher, if others are watching it, they will rearm */ 3095 /* remove this watcher, if others are watching it, they will rearm */
2869 inotify_rm_watch (fs_fd, wd); 3096 inotify_rm_watch (fs_fd, wd);
2870} 3097}
… …
2872static void noinline 3099static void noinline
2873infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3100infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2874{ 3101{
2875 if (slot < 0) 3102 if (slot < 0)
2876 /* overflow, need to check for all hash slots */ 3103 /* overflow, need to check for all hash slots */
2877 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3104 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2878 infy_wd (EV_A_ slot, wd, ev); 3105 infy_wd (EV_A_ slot, wd, ev);
2879 else 3106 else
2880 { 3107 {
2881 WL w_; 3108 WL w_;
2882 3109
2883 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3110 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2884 { 3111 {
2885 ev_stat *w = (ev_stat *)w_; 3112 ev_stat *w = (ev_stat *)w_;
2886 w_ = w_->next; /* lets us remove this watcher and all before it */ 3113 w_ = w_->next; /* lets us remove this watcher and all before it */
2887 3114
2888 if (w->wd == wd || wd == -1) 3115 if (w->wd == wd || wd == -1)
2889 { 3116 {
2890 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3117 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2891 { 3118 {
2892 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3119 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2893 w->wd = -1; 3120 w->wd = -1;
2894 infy_add (EV_A_ w); /* re-add, no matter what */ 3121 infy_add (EV_A_ w); /* re-add, no matter what */
2895 } 3122 }
2896 3123
2897 stat_timer_cb (EV_A_ &w->timer, 0); 3124 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2902 3129
2903static void 3130static void
2904infy_cb (EV_P_ ev_io *w, int revents) 3131infy_cb (EV_P_ ev_io *w, int revents)
2905{ 3132{
2906 char buf [EV_INOTIFY_BUFSIZE]; 3133 char buf [EV_INOTIFY_BUFSIZE];
2907 struct inotify_event *ev = (struct inotify_event *)buf;
2908 int ofs; 3134 int ofs;
2909 int len = read (fs_fd, buf, sizeof (buf)); 3135 int len = read (fs_fd, buf, sizeof (buf));
2910 3136
2911 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3137 for (ofs = 0; ofs < len; )
3138 {
3139 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2912 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3140 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3141 ofs += sizeof (struct inotify_event) + ev->len;
3142 }
2913} 3143}
2914 3144
2915inline_size void 3145inline_size void
2916check_2625 (EV_P) 3146ev_check_2625 (EV_P)
2917{ 3147{
2918 /* kernels < 2.6.25 are borked 3148 /* kernels < 2.6.25 are borked
2919 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3149 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2920 */ 3150 */
2921 struct utsname buf; 3151 if (ev_linux_version () < 0x020619)
2922 int major, minor, micro;
2923
2924 if (uname (&buf))
2925 return; 3152 return;
2926 3153
2927 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2928 return;
2929
2930 if (major < 2
2931 || (major == 2 && minor < 6)
2932 || (major == 2 && minor == 6 && micro < 25))
2933 return;
2934
2935 fs_2625 = 1; 3154 fs_2625 = 1;
3155}
3156
3157inline_size int
3158infy_newfd (void)
3159{
3160#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3161 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3162 if (fd >= 0)
3163 return fd;
3164#endif
3165 return inotify_init ();
2936} 3166}
2937 3167
2938inline_size void 3168inline_size void
2939infy_init (EV_P) 3169infy_init (EV_P)
2940{ 3170{
2941 if (fs_fd != -2) 3171 if (fs_fd != -2)
2942 return; 3172 return;
2943 3173
2944 fs_fd = -1; 3174 fs_fd = -1;
2945 3175
2946 check_2625 (EV_A); 3176 ev_check_2625 (EV_A);
2947 3177
2948 fs_fd = inotify_init (); 3178 fs_fd = infy_newfd ();
2949 3179
2950 if (fs_fd >= 0) 3180 if (fs_fd >= 0)
2951 { 3181 {
3182 fd_intern (fs_fd);
2952 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3183 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2953 ev_set_priority (&fs_w, EV_MAXPRI); 3184 ev_set_priority (&fs_w, EV_MAXPRI);
2954 ev_io_start (EV_A_ &fs_w); 3185 ev_io_start (EV_A_ &fs_w);
3186 ev_unref (EV_A);
2955 } 3187 }
2956} 3188}
2957 3189
2958inline_size void 3190inline_size void
2959infy_fork (EV_P) 3191infy_fork (EV_P)
… …
2961 int slot; 3193 int slot;
2962 3194
2963 if (fs_fd < 0) 3195 if (fs_fd < 0)
2964 return; 3196 return;
2965 3197
3198 ev_ref (EV_A);
3199 ev_io_stop (EV_A_ &fs_w);
2966 close (fs_fd); 3200 close (fs_fd);
2967 fs_fd = inotify_init (); 3201 fs_fd = infy_newfd ();
2968 3202
3203 if (fs_fd >= 0)
3204 {
3205 fd_intern (fs_fd);
3206 ev_io_set (&fs_w, fs_fd, EV_READ);
3207 ev_io_start (EV_A_ &fs_w);
3208 ev_unref (EV_A);
3209 }
3210
2969 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3211 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2970 { 3212 {
2971 WL w_ = fs_hash [slot].head; 3213 WL w_ = fs_hash [slot].head;
2972 fs_hash [slot].head = 0; 3214 fs_hash [slot].head = 0;
2973 3215
2974 while (w_) 3216 while (w_)
… …
2979 w->wd = -1; 3221 w->wd = -1;
2980 3222
2981 if (fs_fd >= 0) 3223 if (fs_fd >= 0)
2982 infy_add (EV_A_ w); /* re-add, no matter what */ 3224 infy_add (EV_A_ w); /* re-add, no matter what */
2983 else 3225 else
3226 {
3227 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3228 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2984 ev_timer_again (EV_A_ &w->timer); 3229 ev_timer_again (EV_A_ &w->timer);
3230 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3231 }
2985 } 3232 }
2986 } 3233 }
2987} 3234}
2988 3235
2989#endif 3236#endif
… …
3006static void noinline 3253static void noinline
3007stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3254stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3008{ 3255{
3009 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3256 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3010 3257
3011 /* we copy this here each the time so that */ 3258 ev_statdata prev = w->attr;
3012 /* prev has the old value when the callback gets invoked */
3013 w->prev = w->attr;
3014 ev_stat_stat (EV_A_ w); 3259 ev_stat_stat (EV_A_ w);
3015 3260
3016 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3261 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3017 if ( 3262 if (
3018 w->prev.st_dev != w->attr.st_dev 3263 prev.st_dev != w->attr.st_dev
3019 || w->prev.st_ino != w->attr.st_ino 3264 || prev.st_ino != w->attr.st_ino
3020 || w->prev.st_mode != w->attr.st_mode 3265 || prev.st_mode != w->attr.st_mode
3021 || w->prev.st_nlink != w->attr.st_nlink 3266 || prev.st_nlink != w->attr.st_nlink
3022 || w->prev.st_uid != w->attr.st_uid 3267 || prev.st_uid != w->attr.st_uid
3023 || w->prev.st_gid != w->attr.st_gid 3268 || prev.st_gid != w->attr.st_gid
3024 || w->prev.st_rdev != w->attr.st_rdev 3269 || prev.st_rdev != w->attr.st_rdev
3025 || w->prev.st_size != w->attr.st_size 3270 || prev.st_size != w->attr.st_size
3026 || w->prev.st_atime != w->attr.st_atime 3271 || prev.st_atime != w->attr.st_atime
3027 || w->prev.st_mtime != w->attr.st_mtime 3272 || prev.st_mtime != w->attr.st_mtime
3028 || w->prev.st_ctime != w->attr.st_ctime 3273 || prev.st_ctime != w->attr.st_ctime
3029 ) { 3274 ) {
3275 /* we only update w->prev on actual differences */
3276 /* in case we test more often than invoke the callback, */
3277 /* to ensure that prev is always different to attr */
3278 w->prev = prev;
3279
3030 #if EV_USE_INOTIFY 3280 #if EV_USE_INOTIFY
3031 if (fs_fd >= 0) 3281 if (fs_fd >= 0)
3032 { 3282 {
3033 infy_del (EV_A_ w); 3283 infy_del (EV_A_ w);
3034 infy_add (EV_A_ w); 3284 infy_add (EV_A_ w);
… …
3059 3309
3060 if (fs_fd >= 0) 3310 if (fs_fd >= 0)
3061 infy_add (EV_A_ w); 3311 infy_add (EV_A_ w);
3062 else 3312 else
3063#endif 3313#endif
3314 {
3064 ev_timer_again (EV_A_ &w->timer); 3315 ev_timer_again (EV_A_ &w->timer);
3316 ev_unref (EV_A);
3317 }
3065 3318
3066 ev_start (EV_A_ (W)w, 1); 3319 ev_start (EV_A_ (W)w, 1);
3067 3320
3068 EV_FREQUENT_CHECK; 3321 EV_FREQUENT_CHECK;
3069} 3322}
… …
3078 EV_FREQUENT_CHECK; 3331 EV_FREQUENT_CHECK;
3079 3332
3080#if EV_USE_INOTIFY 3333#if EV_USE_INOTIFY
3081 infy_del (EV_A_ w); 3334 infy_del (EV_A_ w);
3082#endif 3335#endif
3336
3337 if (ev_is_active (&w->timer))
3338 {
3339 ev_ref (EV_A);
3083 ev_timer_stop (EV_A_ &w->timer); 3340 ev_timer_stop (EV_A_ &w->timer);
3341 }
3084 3342
3085 ev_stop (EV_A_ (W)w); 3343 ev_stop (EV_A_ (W)w);
3086 3344
3087 EV_FREQUENT_CHECK; 3345 EV_FREQUENT_CHECK;
3088} 3346}
… …
3133 3391
3134 EV_FREQUENT_CHECK; 3392 EV_FREQUENT_CHECK;
3135} 3393}
3136#endif 3394#endif
3137 3395
3396#if EV_PREPARE_ENABLE
3138void 3397void
3139ev_prepare_start (EV_P_ ev_prepare *w) 3398ev_prepare_start (EV_P_ ev_prepare *w)
3140{ 3399{
3141 if (expect_false (ev_is_active (w))) 3400 if (expect_false (ev_is_active (w)))
3142 return; 3401 return;
… …
3168 3427
3169 ev_stop (EV_A_ (W)w); 3428 ev_stop (EV_A_ (W)w);
3170 3429
3171 EV_FREQUENT_CHECK; 3430 EV_FREQUENT_CHECK;
3172} 3431}
3432#endif
3173 3433
3434#if EV_CHECK_ENABLE
3174void 3435void
3175ev_check_start (EV_P_ ev_check *w) 3436ev_check_start (EV_P_ ev_check *w)
3176{ 3437{
3177 if (expect_false (ev_is_active (w))) 3438 if (expect_false (ev_is_active (w)))
3178 return; 3439 return;
… …
3204 3465
3205 ev_stop (EV_A_ (W)w); 3466 ev_stop (EV_A_ (W)w);
3206 3467
3207 EV_FREQUENT_CHECK; 3468 EV_FREQUENT_CHECK;
3208} 3469}
3470#endif
3209 3471
3210#if EV_EMBED_ENABLE 3472#if EV_EMBED_ENABLE
3211void noinline 3473void noinline
3212ev_embed_sweep (EV_P_ ev_embed *w) 3474ev_embed_sweep (EV_P_ ev_embed *w)
3213{ 3475{
3214 ev_loop (w->other, EVLOOP_NONBLOCK); 3476 ev_run (w->other, EVRUN_NOWAIT);
3215} 3477}
3216 3478
3217static void 3479static void
3218embed_io_cb (EV_P_ ev_io *io, int revents) 3480embed_io_cb (EV_P_ ev_io *io, int revents)
3219{ 3481{
3220 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3482 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3221 3483
3222 if (ev_cb (w)) 3484 if (ev_cb (w))
3223 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3485 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3224 else 3486 else
3225 ev_loop (w->other, EVLOOP_NONBLOCK); 3487 ev_run (w->other, EVRUN_NOWAIT);
3226} 3488}
3227 3489
3228static void 3490static void
3229embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3491embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3230{ 3492{
3231 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3493 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3232 3494
3233 { 3495 {
3234 struct ev_loop *loop = w->other; 3496 EV_P = w->other;
3235 3497
3236 while (fdchangecnt) 3498 while (fdchangecnt)
3237 { 3499 {
3238 fd_reify (EV_A); 3500 fd_reify (EV_A);
3239 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3501 ev_run (EV_A_ EVRUN_NOWAIT);
3240 } 3502 }
3241 } 3503 }
3242} 3504}
3243 3505
3244static void 3506static void
… …
3247 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3509 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3248 3510
3249 ev_embed_stop (EV_A_ w); 3511 ev_embed_stop (EV_A_ w);
3250 3512
3251 { 3513 {
3252 struct ev_loop *loop = w->other; 3514 EV_P = w->other;
3253 3515
3254 ev_loop_fork (EV_A); 3516 ev_loop_fork (EV_A);
3255 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3517 ev_run (EV_A_ EVRUN_NOWAIT);
3256 } 3518 }
3257 3519
3258 ev_embed_start (EV_A_ w); 3520 ev_embed_start (EV_A_ w);
3259} 3521}
3260 3522
… …
3271{ 3533{
3272 if (expect_false (ev_is_active (w))) 3534 if (expect_false (ev_is_active (w)))
3273 return; 3535 return;
3274 3536
3275 { 3537 {
3276 struct ev_loop *loop = w->other; 3538 EV_P = w->other;
3277 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3539 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3278 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3540 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3279 } 3541 }
3280 3542
3281 EV_FREQUENT_CHECK; 3543 EV_FREQUENT_CHECK;
… …
3308 3570
3309 ev_io_stop (EV_A_ &w->io); 3571 ev_io_stop (EV_A_ &w->io);
3310 ev_prepare_stop (EV_A_ &w->prepare); 3572 ev_prepare_stop (EV_A_ &w->prepare);
3311 ev_fork_stop (EV_A_ &w->fork); 3573 ev_fork_stop (EV_A_ &w->fork);
3312 3574
3575 ev_stop (EV_A_ (W)w);
3576
3313 EV_FREQUENT_CHECK; 3577 EV_FREQUENT_CHECK;
3314} 3578}
3315#endif 3579#endif
3316 3580
3317#if EV_FORK_ENABLE 3581#if EV_FORK_ENABLE
… …
3350 3614
3351 EV_FREQUENT_CHECK; 3615 EV_FREQUENT_CHECK;
3352} 3616}
3353#endif 3617#endif
3354 3618
3355#if EV_ASYNC_ENABLE 3619#if EV_CLEANUP_ENABLE
3356void 3620void
3357ev_async_start (EV_P_ ev_async *w) 3621ev_cleanup_start (EV_P_ ev_cleanup *w)
3358{ 3622{
3359 if (expect_false (ev_is_active (w))) 3623 if (expect_false (ev_is_active (w)))
3360 return; 3624 return;
3625
3626 EV_FREQUENT_CHECK;
3627
3628 ev_start (EV_A_ (W)w, ++cleanupcnt);
3629 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3630 cleanups [cleanupcnt - 1] = w;
3631
3632 /* cleanup watchers should never keep a refcount on the loop */
3633 ev_unref (EV_A);
3634 EV_FREQUENT_CHECK;
3635}
3636
3637void
3638ev_cleanup_stop (EV_P_ ev_cleanup *w)
3639{
3640 clear_pending (EV_A_ (W)w);
3641 if (expect_false (!ev_is_active (w)))
3642 return;
3643
3644 EV_FREQUENT_CHECK;
3645 ev_ref (EV_A);
3646
3647 {
3648 int active = ev_active (w);
3649
3650 cleanups [active - 1] = cleanups [--cleanupcnt];
3651 ev_active (cleanups [active - 1]) = active;
3652 }
3653
3654 ev_stop (EV_A_ (W)w);
3655
3656 EV_FREQUENT_CHECK;
3657}
3658#endif
3659
3660#if EV_ASYNC_ENABLE
3661void
3662ev_async_start (EV_P_ ev_async *w)
3663{
3664 if (expect_false (ev_is_active (w)))
3665 return;
3666
3667 w->sent = 0;
3361 3668
3362 evpipe_init (EV_A); 3669 evpipe_init (EV_A);
3363 3670
3364 EV_FREQUENT_CHECK; 3671 EV_FREQUENT_CHECK;
3365 3672
… …
3393 3700
3394void 3701void
3395ev_async_send (EV_P_ ev_async *w) 3702ev_async_send (EV_P_ ev_async *w)
3396{ 3703{
3397 w->sent = 1; 3704 w->sent = 1;
3398 evpipe_write (EV_A_ &gotasync); 3705 evpipe_write (EV_A_ &async_pending);
3399} 3706}
3400#endif 3707#endif
3401 3708
3402/*****************************************************************************/ 3709/*****************************************************************************/
3403 3710
… …
3443{ 3750{
3444 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3751 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3445 3752
3446 if (expect_false (!once)) 3753 if (expect_false (!once))
3447 { 3754 {
3448 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3755 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3449 return; 3756 return;
3450 } 3757 }
3451 3758
3452 once->cb = cb; 3759 once->cb = cb;
3453 once->arg = arg; 3760 once->arg = arg;
… …
3540 if (types & EV_ASYNC) 3847 if (types & EV_ASYNC)
3541 for (i = asynccnt; i--; ) 3848 for (i = asynccnt; i--; )
3542 cb (EV_A_ EV_ASYNC, asyncs [i]); 3849 cb (EV_A_ EV_ASYNC, asyncs [i]);
3543#endif 3850#endif
3544 3851
3852#if EV_PREPARE_ENABLE
3545 if (types & EV_PREPARE) 3853 if (types & EV_PREPARE)
3546 for (i = preparecnt; i--; ) 3854 for (i = preparecnt; i--; )
3547#if EV_EMBED_ENABLE 3855# if EV_EMBED_ENABLE
3548 if (ev_cb (prepares [i]) != embed_prepare_cb) 3856 if (ev_cb (prepares [i]) != embed_prepare_cb)
3549#endif 3857# endif
3550 cb (EV_A_ EV_PREPARE, prepares [i]); 3858 cb (EV_A_ EV_PREPARE, prepares [i]);
3859#endif
3551 3860
3861#if EV_CHECK_ENABLE
3552 if (types & EV_CHECK) 3862 if (types & EV_CHECK)
3553 for (i = checkcnt; i--; ) 3863 for (i = checkcnt; i--; )
3554 cb (EV_A_ EV_CHECK, checks [i]); 3864 cb (EV_A_ EV_CHECK, checks [i]);
3865#endif
3555 3866
3867#if EV_SIGNAL_ENABLE
3556 if (types & EV_SIGNAL) 3868 if (types & EV_SIGNAL)
3557 for (i = 0; i < signalmax; ++i) 3869 for (i = 0; i < EV_NSIG - 1; ++i)
3558 for (wl = signals [i].head; wl; ) 3870 for (wl = signals [i].head; wl; )
3559 { 3871 {
3560 wn = wl->next; 3872 wn = wl->next;
3561 cb (EV_A_ EV_SIGNAL, wl); 3873 cb (EV_A_ EV_SIGNAL, wl);
3562 wl = wn; 3874 wl = wn;
3563 } 3875 }
3876#endif
3564 3877
3878#if EV_CHILD_ENABLE
3565 if (types & EV_CHILD) 3879 if (types & EV_CHILD)
3566 for (i = EV_PID_HASHSIZE; i--; ) 3880 for (i = (EV_PID_HASHSIZE); i--; )
3567 for (wl = childs [i]; wl; ) 3881 for (wl = childs [i]; wl; )
3568 { 3882 {
3569 wn = wl->next; 3883 wn = wl->next;
3570 cb (EV_A_ EV_CHILD, wl); 3884 cb (EV_A_ EV_CHILD, wl);
3571 wl = wn; 3885 wl = wn;
3572 } 3886 }
3887#endif
3573/* EV_STAT 0x00001000 /* stat data changed */ 3888/* EV_STAT 0x00001000 /* stat data changed */
3574/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3889/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3575} 3890}
3576#endif 3891#endif
3577 3892
3578#if EV_MULTIPLICITY 3893#if EV_MULTIPLICITY
3579 #include "ev_wrap.h" 3894 #include "ev_wrap.h"
3580#endif 3895#endif
3581 3896
3582#ifdef __cplusplus 3897EV_CPP(})
3583}
3584#endif
3585 3898

Diff Legend

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