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

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

Diff Legend

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