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

Comparing libev/ev.c (file contents):
Revision 1.302 by root, Thu Jul 16 15:08:08 2009 UTC vs.
Revision 1.372 by root, Wed Feb 16 08:02:50 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 *
10 * 1. Redistributions of source code must retain the above copyright notice, 10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer. 11 * this list of conditions and the following disclaimer.
12 * 12 *
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
16 * 16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
… …
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 /* something 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
805fd_reify (EV_P) 975fd_reify (EV_P)
806{ 976{
807 int i; 977 int i;
808 978
979#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
980 for (i = 0; i < fdchangecnt; ++i)
981 {
982 int fd = fdchanges [i];
983 ANFD *anfd = anfds + fd;
984
985 if (anfd->reify & EV__IOFDSET)
986 {
987 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
988
989 if (handle != anfd->handle)
990 {
991 unsigned long arg;
992
993 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
994
995 /* handle changed, but fd didn't - we need to do it in two steps */
996 backend_modify (EV_A_ fd, anfd->events, 0);
997 anfd->events = 0;
998 anfd->handle = handle;
999 }
1000 }
1001 }
1002#endif
1003
809 for (i = 0; i < fdchangecnt; ++i) 1004 for (i = 0; i < fdchangecnt; ++i)
810 { 1005 {
811 int fd = fdchanges [i]; 1006 int fd = fdchanges [i];
812 ANFD *anfd = anfds + fd; 1007 ANFD *anfd = anfds + fd;
813 ev_io *w; 1008 ev_io *w;
814 1009
815 unsigned char events = 0; 1010 unsigned char o_events = anfd->events;
1011 unsigned char o_reify = anfd->reify;
816 1012
817 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1013 anfd->reify = 0;
818 events |= (unsigned char)w->events;
819 1014
820#if EV_SELECT_IS_WINSOCKET 1015 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
821 if (events)
822 { 1016 {
823 unsigned long arg; 1017 anfd->events = 0;
824 #ifdef EV_FD_TO_WIN32_HANDLE 1018
825 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 1019 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
826 #else 1020 anfd->events |= (unsigned char)w->events;
827 anfd->handle = _get_osfhandle (fd); 1021
828 #endif 1022 if (o_events != anfd->events)
829 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 1023 o_reify = EV__IOFDSET; /* actually |= */
830 } 1024 }
831#endif
832 1025
833 { 1026 if (o_reify & EV__IOFDSET)
834 unsigned char o_events = anfd->events;
835 unsigned char o_reify = anfd->reify;
836
837 anfd->reify = 0;
838 anfd->events = events;
839
840 if (o_events != events || o_reify & EV__IOFDSET)
841 backend_modify (EV_A_ fd, o_events, events); 1027 backend_modify (EV_A_ fd, o_events, anfd->events);
842 }
843 } 1028 }
844 1029
845 fdchangecnt = 0; 1030 fdchangecnt = 0;
846} 1031}
847 1032
… …
871 ev_io_stop (EV_A_ w); 1056 ev_io_stop (EV_A_ w);
872 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1057 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
873 } 1058 }
874} 1059}
875 1060
876/* check whether the given fd is atcually valid, for error recovery */ 1061/* check whether the given fd is actually valid, for error recovery */
877inline_size int 1062inline_size int
878fd_valid (int fd) 1063fd_valid (int fd)
879{ 1064{
880#ifdef _WIN32 1065#ifdef _WIN32
881 return _get_osfhandle (fd) != -1; 1066 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
882#else 1067#else
883 return fcntl (fd, F_GETFD) != -1; 1068 return fcntl (fd, F_GETFD) != -1;
884#endif 1069#endif
885} 1070}
886 1071
… …
904 1089
905 for (fd = anfdmax; fd--; ) 1090 for (fd = anfdmax; fd--; )
906 if (anfds [fd].events) 1091 if (anfds [fd].events)
907 { 1092 {
908 fd_kill (EV_A_ fd); 1093 fd_kill (EV_A_ fd);
909 return; 1094 break;
910 } 1095 }
911} 1096}
912 1097
913/* usually called after fork if backend needs to re-arm all fds from scratch */ 1098/* usually called after fork if backend needs to re-arm all fds from scratch */
914static void noinline 1099static void noinline
… …
923 anfds [fd].emask = 0; 1108 anfds [fd].emask = 0;
924 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1109 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
925 } 1110 }
926} 1111}
927 1112
1113/* used to prepare libev internal fd's */
1114/* this is not fork-safe */
1115inline_speed void
1116fd_intern (int fd)
1117{
1118#ifdef _WIN32
1119 unsigned long arg = 1;
1120 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1121#else
1122 fcntl (fd, F_SETFD, FD_CLOEXEC);
1123 fcntl (fd, F_SETFL, O_NONBLOCK);
1124#endif
1125}
1126
928/*****************************************************************************/ 1127/*****************************************************************************/
929 1128
930/* 1129/*
931 * the heap functions want a real array index. array index 0 uis guaranteed to not 1130 * 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 1131 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
933 * the branching factor of the d-tree. 1132 * the branching factor of the d-tree.
934 */ 1133 */
935 1134
936/* 1135/*
… …
1004 1203
1005 for (;;) 1204 for (;;)
1006 { 1205 {
1007 int c = k << 1; 1206 int c = k << 1;
1008 1207
1009 if (c > N + HEAP0 - 1) 1208 if (c >= N + HEAP0)
1010 break; 1209 break;
1011 1210
1012 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1211 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1013 ? 1 : 0; 1212 ? 1 : 0;
1014 1213
… …
1050 1249
1051/* move an element suitably so it is in a correct place */ 1250/* move an element suitably so it is in a correct place */
1052inline_size void 1251inline_size void
1053adjustheap (ANHE *heap, int N, int k) 1252adjustheap (ANHE *heap, int N, int k)
1054{ 1253{
1055 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1254 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1056 upheap (heap, k); 1255 upheap (heap, k);
1057 else 1256 else
1058 downheap (heap, N, k); 1257 downheap (heap, N, k);
1059} 1258}
1060 1259
… …
1073/*****************************************************************************/ 1272/*****************************************************************************/
1074 1273
1075/* associate signal watchers to a signal signal */ 1274/* associate signal watchers to a signal signal */
1076typedef struct 1275typedef struct
1077{ 1276{
1277 EV_ATOMIC_T pending;
1278#if EV_MULTIPLICITY
1279 EV_P;
1280#endif
1078 WL head; 1281 WL head;
1079 EV_ATOMIC_T gotsig;
1080} ANSIG; 1282} ANSIG;
1081 1283
1082static ANSIG *signals; 1284static ANSIG signals [EV_NSIG - 1];
1083static int signalmax;
1084
1085static EV_ATOMIC_T gotsig;
1086 1285
1087/*****************************************************************************/ 1286/*****************************************************************************/
1088 1287
1089/* used to prepare libev internal fd's */ 1288#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 1289
1103static void noinline 1290static void noinline
1104evpipe_init (EV_P) 1291evpipe_init (EV_P)
1105{ 1292{
1106 if (!ev_is_active (&pipe_w)) 1293 if (!ev_is_active (&pipe_w))
1107 { 1294 {
1108#if EV_USE_EVENTFD 1295# if EV_USE_EVENTFD
1296 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1297 if (evfd < 0 && errno == EINVAL)
1109 if ((evfd = eventfd (0, 0)) >= 0) 1298 evfd = eventfd (0, 0);
1299
1300 if (evfd >= 0)
1110 { 1301 {
1111 evpipe [0] = -1; 1302 evpipe [0] = -1;
1112 fd_intern (evfd); 1303 fd_intern (evfd); /* doing it twice doesn't hurt */
1113 ev_io_set (&pipe_w, evfd, EV_READ); 1304 ev_io_set (&pipe_w, evfd, EV_READ);
1114 } 1305 }
1115 else 1306 else
1116#endif 1307# endif
1117 { 1308 {
1118 while (pipe (evpipe)) 1309 while (pipe (evpipe))
1119 ev_syserr ("(libev) error creating signal/async pipe"); 1310 ev_syserr ("(libev) error creating signal/async pipe");
1120 1311
1121 fd_intern (evpipe [0]); 1312 fd_intern (evpipe [0]);
… …
1132evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1323evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1133{ 1324{
1134 if (!*flag) 1325 if (!*flag)
1135 { 1326 {
1136 int old_errno = errno; /* save errno because write might clobber it */ 1327 int old_errno = errno; /* save errno because write might clobber it */
1328 char dummy;
1137 1329
1138 *flag = 1; 1330 *flag = 1;
1139 1331
1140#if EV_USE_EVENTFD 1332#if EV_USE_EVENTFD
1141 if (evfd >= 0) 1333 if (evfd >= 0)
… …
1143 uint64_t counter = 1; 1335 uint64_t counter = 1;
1144 write (evfd, &counter, sizeof (uint64_t)); 1336 write (evfd, &counter, sizeof (uint64_t));
1145 } 1337 }
1146 else 1338 else
1147#endif 1339#endif
1340 /* win32 people keep sending patches that change this write() to send() */
1341 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1342 /* so when you think this write should be a send instead, please find out */
1343 /* where your send() is from - it's definitely not the microsoft send, and */
1344 /* tell me. thank you. */
1148 write (evpipe [1], &old_errno, 1); 1345 write (evpipe [1], &dummy, 1);
1149 1346
1150 errno = old_errno; 1347 errno = old_errno;
1151 } 1348 }
1152} 1349}
1153 1350
1154/* called whenever the libev signal pipe */ 1351/* called whenever the libev signal pipe */
1155/* got some events (signal, async) */ 1352/* got some events (signal, async) */
1156static void 1353static void
1157pipecb (EV_P_ ev_io *iow, int revents) 1354pipecb (EV_P_ ev_io *iow, int revents)
1158{ 1355{
1356 int i;
1357
1159#if EV_USE_EVENTFD 1358#if EV_USE_EVENTFD
1160 if (evfd >= 0) 1359 if (evfd >= 0)
1161 { 1360 {
1162 uint64_t counter; 1361 uint64_t counter;
1163 read (evfd, &counter, sizeof (uint64_t)); 1362 read (evfd, &counter, sizeof (uint64_t));
1164 } 1363 }
1165 else 1364 else
1166#endif 1365#endif
1167 { 1366 {
1168 char dummy; 1367 char dummy;
1368 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1169 read (evpipe [0], &dummy, 1); 1369 read (evpipe [0], &dummy, 1);
1170 } 1370 }
1171 1371
1172 if (gotsig && ev_is_default_loop (EV_A)) 1372#if EV_SIGNAL_ENABLE
1173 { 1373 if (sig_pending)
1174 int signum; 1374 {
1175 gotsig = 0; 1375 sig_pending = 0;
1176 1376
1177 for (signum = signalmax; signum--; ) 1377 for (i = EV_NSIG - 1; i--; )
1178 if (signals [signum].gotsig) 1378 if (expect_false (signals [i].pending))
1179 ev_feed_signal_event (EV_A_ signum + 1); 1379 ev_feed_signal_event (EV_A_ i + 1);
1180 } 1380 }
1381#endif
1181 1382
1182#if EV_ASYNC_ENABLE 1383#if EV_ASYNC_ENABLE
1183 if (gotasync) 1384 if (async_pending)
1184 { 1385 {
1185 int i; 1386 async_pending = 0;
1186 gotasync = 0;
1187 1387
1188 for (i = asynccnt; i--; ) 1388 for (i = asynccnt; i--; )
1189 if (asyncs [i]->sent) 1389 if (asyncs [i]->sent)
1190 { 1390 {
1191 asyncs [i]->sent = 0; 1391 asyncs [i]->sent = 0;
… …
1195#endif 1395#endif
1196} 1396}
1197 1397
1198/*****************************************************************************/ 1398/*****************************************************************************/
1199 1399
1400void
1401ev_feed_signal (int signum)
1402{
1403#if EV_MULTIPLICITY
1404 EV_P = signals [signum - 1].loop;
1405
1406 if (!EV_A)
1407 return;
1408#endif
1409
1410 signals [signum - 1].pending = 1;
1411 evpipe_write (EV_A_ &sig_pending);
1412}
1413
1200static void 1414static void
1201ev_sighandler (int signum) 1415ev_sighandler (int signum)
1202{ 1416{
1203#if EV_MULTIPLICITY
1204 struct ev_loop *loop = &default_loop_struct;
1205#endif
1206
1207#if _WIN32 1417#ifdef _WIN32
1208 signal (signum, ev_sighandler); 1418 signal (signum, ev_sighandler);
1209#endif 1419#endif
1210 1420
1211 signals [signum - 1].gotsig = 1; 1421 ev_feed_signal (signum);
1212 evpipe_write (EV_A_ &gotsig);
1213} 1422}
1214 1423
1215void noinline 1424void noinline
1216ev_feed_signal_event (EV_P_ int signum) 1425ev_feed_signal_event (EV_P_ int signum)
1217{ 1426{
1218 WL w; 1427 WL w;
1219 1428
1429 if (expect_false (signum <= 0 || signum > EV_NSIG))
1430 return;
1431
1432 --signum;
1433
1220#if EV_MULTIPLICITY 1434#if EV_MULTIPLICITY
1221 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1435 /* it is permissible to try to feed a signal to the wrong loop */
1222#endif 1436 /* or, likely more useful, feeding a signal nobody is waiting for */
1223 1437
1224 --signum; 1438 if (expect_false (signals [signum].loop != EV_A))
1225
1226 if (signum < 0 || signum >= signalmax)
1227 return; 1439 return;
1440#endif
1228 1441
1229 signals [signum].gotsig = 0; 1442 signals [signum].pending = 0;
1230 1443
1231 for (w = signals [signum].head; w; w = w->next) 1444 for (w = signals [signum].head; w; w = w->next)
1232 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1445 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1233} 1446}
1234 1447
1448#if EV_USE_SIGNALFD
1449static void
1450sigfdcb (EV_P_ ev_io *iow, int revents)
1451{
1452 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1453
1454 for (;;)
1455 {
1456 ssize_t res = read (sigfd, si, sizeof (si));
1457
1458 /* not ISO-C, as res might be -1, but works with SuS */
1459 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1460 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1461
1462 if (res < (ssize_t)sizeof (si))
1463 break;
1464 }
1465}
1466#endif
1467
1468#endif
1469
1235/*****************************************************************************/ 1470/*****************************************************************************/
1236 1471
1472#if EV_CHILD_ENABLE
1237static WL childs [EV_PID_HASHSIZE]; 1473static WL childs [EV_PID_HASHSIZE];
1238
1239#ifndef _WIN32
1240 1474
1241static ev_signal childev; 1475static ev_signal childev;
1242 1476
1243#ifndef WIFCONTINUED 1477#ifndef WIFCONTINUED
1244# define WIFCONTINUED(status) 0 1478# define WIFCONTINUED(status) 0
… …
1249child_reap (EV_P_ int chain, int pid, int status) 1483child_reap (EV_P_ int chain, int pid, int status)
1250{ 1484{
1251 ev_child *w; 1485 ev_child *w;
1252 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1486 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1253 1487
1254 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1488 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1255 { 1489 {
1256 if ((w->pid == pid || !w->pid) 1490 if ((w->pid == pid || !w->pid)
1257 && (!traced || (w->flags & 1))) 1491 && (!traced || (w->flags & 1)))
1258 { 1492 {
1259 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1493 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 */ 1518 /* 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 */ 1519 /* 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); 1520 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1287 1521
1288 child_reap (EV_A_ pid, pid, status); 1522 child_reap (EV_A_ pid, pid, status);
1289 if (EV_PID_HASHSIZE > 1) 1523 if ((EV_PID_HASHSIZE) > 1)
1290 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1524 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1291} 1525}
1292 1526
1293#endif 1527#endif
1294 1528
1295/*****************************************************************************/ 1529/*****************************************************************************/
1296 1530
1531#if EV_USE_IOCP
1532# include "ev_iocp.c"
1533#endif
1297#if EV_USE_PORT 1534#if EV_USE_PORT
1298# include "ev_port.c" 1535# include "ev_port.c"
1299#endif 1536#endif
1300#if EV_USE_KQUEUE 1537#if EV_USE_KQUEUE
1301# include "ev_kqueue.c" 1538# include "ev_kqueue.c"
… …
1361#ifdef __APPLE__ 1598#ifdef __APPLE__
1362 /* only select works correctly on that "unix-certified" platform */ 1599 /* only select works correctly on that "unix-certified" platform */
1363 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1600 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1364 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1601 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1365#endif 1602#endif
1603#ifdef __FreeBSD__
1604 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1605#endif
1366 1606
1367 return flags; 1607 return flags;
1368} 1608}
1369 1609
1370unsigned int 1610unsigned int
1371ev_embeddable_backends (void) 1611ev_embeddable_backends (void)
1372{ 1612{
1373 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1613 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1374 1614
1375 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1615 /* 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 */ 1616 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1377 flags &= ~EVBACKEND_EPOLL; 1617 flags &= ~EVBACKEND_EPOLL;
1378 1618
1379 return flags; 1619 return flags;
1380} 1620}
1381 1621
1382unsigned int 1622unsigned int
1383ev_backend (EV_P) 1623ev_backend (EV_P)
1384{ 1624{
1385 return backend; 1625 return backend;
1386} 1626}
1387 1627
1388#if EV_MINIMAL < 2 1628#if EV_FEATURE_API
1389unsigned int 1629unsigned int
1390ev_loop_count (EV_P) 1630ev_iteration (EV_P)
1391{ 1631{
1392 return loop_count; 1632 return loop_count;
1393} 1633}
1394 1634
1395unsigned int 1635unsigned int
1396ev_loop_depth (EV_P) 1636ev_depth (EV_P)
1397{ 1637{
1398 return loop_depth; 1638 return loop_depth;
1399} 1639}
1400 1640
1401void 1641void
… …
1438static void noinline 1678static void noinline
1439loop_init (EV_P_ unsigned int flags) 1679loop_init (EV_P_ unsigned int flags)
1440{ 1680{
1441 if (!backend) 1681 if (!backend)
1442 { 1682 {
1683 origflags = flags;
1684
1443#if EV_USE_REALTIME 1685#if EV_USE_REALTIME
1444 if (!have_realtime) 1686 if (!have_realtime)
1445 { 1687 {
1446 struct timespec ts; 1688 struct timespec ts;
1447 1689
… …
1458 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1700 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1459 have_monotonic = 1; 1701 have_monotonic = 1;
1460 } 1702 }
1461#endif 1703#endif
1462 1704
1705 /* pid check not overridable via env */
1706#ifndef _WIN32
1707 if (flags & EVFLAG_FORKCHECK)
1708 curpid = getpid ();
1709#endif
1710
1711 if (!(flags & EVFLAG_NOENV)
1712 && !enable_secure ()
1713 && getenv ("LIBEV_FLAGS"))
1714 flags = atoi (getenv ("LIBEV_FLAGS"));
1715
1463 ev_rt_now = ev_time (); 1716 ev_rt_now = ev_time ();
1464 mn_now = get_clock (); 1717 mn_now = get_clock ();
1465 now_floor = mn_now; 1718 now_floor = mn_now;
1466 rtmn_diff = ev_rt_now - mn_now; 1719 rtmn_diff = ev_rt_now - mn_now;
1467#if EV_MINIMAL < 2 1720#if EV_FEATURE_API
1468 invoke_cb = ev_invoke_pending; 1721 invoke_cb = ev_invoke_pending;
1469#endif 1722#endif
1470 1723
1471 io_blocktime = 0.; 1724 io_blocktime = 0.;
1472 timeout_blocktime = 0.; 1725 timeout_blocktime = 0.;
1473 backend = 0; 1726 backend = 0;
1474 backend_fd = -1; 1727 backend_fd = -1;
1475 gotasync = 0; 1728 sig_pending = 0;
1729#if EV_ASYNC_ENABLE
1730 async_pending = 0;
1731#endif
1476#if EV_USE_INOTIFY 1732#if EV_USE_INOTIFY
1477 fs_fd = -2; 1733 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1478#endif 1734#endif
1479 1735#if EV_USE_SIGNALFD
1480 /* pid check not overridable via env */ 1736 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1481#ifndef _WIN32
1482 if (flags & EVFLAG_FORKCHECK)
1483 curpid = getpid ();
1484#endif 1737#endif
1485 1738
1486 if (!(flags & EVFLAG_NOENV) 1739 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 (); 1740 flags |= ev_recommended_backends ();
1493 1741
1742#if EV_USE_IOCP
1743 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1744#endif
1494#if EV_USE_PORT 1745#if EV_USE_PORT
1495 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1746 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1496#endif 1747#endif
1497#if EV_USE_KQUEUE 1748#if EV_USE_KQUEUE
1498 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1749 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1507 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1758 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1508#endif 1759#endif
1509 1760
1510 ev_prepare_init (&pending_w, pendingcb); 1761 ev_prepare_init (&pending_w, pendingcb);
1511 1762
1763#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1512 ev_init (&pipe_w, pipecb); 1764 ev_init (&pipe_w, pipecb);
1513 ev_set_priority (&pipe_w, EV_MAXPRI); 1765 ev_set_priority (&pipe_w, EV_MAXPRI);
1766#endif
1514 } 1767 }
1515} 1768}
1516 1769
1517/* free up a loop structure */ 1770/* free up a loop structure */
1518static void noinline 1771void
1519loop_destroy (EV_P) 1772ev_loop_destroy (EV_P)
1520{ 1773{
1521 int i; 1774 int i;
1522 1775
1776#if EV_MULTIPLICITY
1777 /* mimic free (0) */
1778 if (!EV_A)
1779 return;
1780#endif
1781
1782#if EV_CLEANUP_ENABLE
1783 /* queue cleanup watchers (and execute them) */
1784 if (expect_false (cleanupcnt))
1785 {
1786 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1787 EV_INVOKE_PENDING;
1788 }
1789#endif
1790
1791#if EV_CHILD_ENABLE
1792 if (ev_is_active (&childev))
1793 {
1794 ev_ref (EV_A); /* child watcher */
1795 ev_signal_stop (EV_A_ &childev);
1796 }
1797#endif
1798
1523 if (ev_is_active (&pipe_w)) 1799 if (ev_is_active (&pipe_w))
1524 { 1800 {
1525 ev_ref (EV_A); /* signal watcher */ 1801 /*ev_ref (EV_A);*/
1526 ev_io_stop (EV_A_ &pipe_w); 1802 /*ev_io_stop (EV_A_ &pipe_w);*/
1527 1803
1528#if EV_USE_EVENTFD 1804#if EV_USE_EVENTFD
1529 if (evfd >= 0) 1805 if (evfd >= 0)
1530 close (evfd); 1806 close (evfd);
1531#endif 1807#endif
1532 1808
1533 if (evpipe [0] >= 0) 1809 if (evpipe [0] >= 0)
1534 { 1810 {
1535 close (evpipe [0]); 1811 EV_WIN32_CLOSE_FD (evpipe [0]);
1536 close (evpipe [1]); 1812 EV_WIN32_CLOSE_FD (evpipe [1]);
1537 } 1813 }
1538 } 1814 }
1815
1816#if EV_USE_SIGNALFD
1817 if (ev_is_active (&sigfd_w))
1818 close (sigfd);
1819#endif
1539 1820
1540#if EV_USE_INOTIFY 1821#if EV_USE_INOTIFY
1541 if (fs_fd >= 0) 1822 if (fs_fd >= 0)
1542 close (fs_fd); 1823 close (fs_fd);
1543#endif 1824#endif
1544 1825
1545 if (backend_fd >= 0) 1826 if (backend_fd >= 0)
1546 close (backend_fd); 1827 close (backend_fd);
1547 1828
1829#if EV_USE_IOCP
1830 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1831#endif
1548#if EV_USE_PORT 1832#if EV_USE_PORT
1549 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1833 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1550#endif 1834#endif
1551#if EV_USE_KQUEUE 1835#if EV_USE_KQUEUE
1552 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1836 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1567#if EV_IDLE_ENABLE 1851#if EV_IDLE_ENABLE
1568 array_free (idle, [i]); 1852 array_free (idle, [i]);
1569#endif 1853#endif
1570 } 1854 }
1571 1855
1572 ev_free (anfds); anfdmax = 0; 1856 ev_free (anfds); anfds = 0; anfdmax = 0;
1573 1857
1574 /* have to use the microsoft-never-gets-it-right macro */ 1858 /* have to use the microsoft-never-gets-it-right macro */
1575 array_free (rfeed, EMPTY); 1859 array_free (rfeed, EMPTY);
1576 array_free (fdchange, EMPTY); 1860 array_free (fdchange, EMPTY);
1577 array_free (timer, EMPTY); 1861 array_free (timer, EMPTY);
… …
1579 array_free (periodic, EMPTY); 1863 array_free (periodic, EMPTY);
1580#endif 1864#endif
1581#if EV_FORK_ENABLE 1865#if EV_FORK_ENABLE
1582 array_free (fork, EMPTY); 1866 array_free (fork, EMPTY);
1583#endif 1867#endif
1868#if EV_CLEANUP_ENABLE
1869 array_free (cleanup, EMPTY);
1870#endif
1584 array_free (prepare, EMPTY); 1871 array_free (prepare, EMPTY);
1585 array_free (check, EMPTY); 1872 array_free (check, EMPTY);
1586#if EV_ASYNC_ENABLE 1873#if EV_ASYNC_ENABLE
1587 array_free (async, EMPTY); 1874 array_free (async, EMPTY);
1588#endif 1875#endif
1589 1876
1590 backend = 0; 1877 backend = 0;
1878
1879#if EV_MULTIPLICITY
1880 if (ev_is_default_loop (EV_A))
1881#endif
1882 ev_default_loop_ptr = 0;
1883#if EV_MULTIPLICITY
1884 else
1885 ev_free (EV_A);
1886#endif
1591} 1887}
1592 1888
1593#if EV_USE_INOTIFY 1889#if EV_USE_INOTIFY
1594inline_size void infy_fork (EV_P); 1890inline_size void infy_fork (EV_P);
1595#endif 1891#endif
… …
1612 1908
1613 if (ev_is_active (&pipe_w)) 1909 if (ev_is_active (&pipe_w))
1614 { 1910 {
1615 /* this "locks" the handlers against writing to the pipe */ 1911 /* this "locks" the handlers against writing to the pipe */
1616 /* while we modify the fd vars */ 1912 /* while we modify the fd vars */
1617 gotsig = 1; 1913 sig_pending = 1;
1618#if EV_ASYNC_ENABLE 1914#if EV_ASYNC_ENABLE
1619 gotasync = 1; 1915 async_pending = 1;
1620#endif 1916#endif
1621 1917
1622 ev_ref (EV_A); 1918 ev_ref (EV_A);
1623 ev_io_stop (EV_A_ &pipe_w); 1919 ev_io_stop (EV_A_ &pipe_w);
1624 1920
… …
1627 close (evfd); 1923 close (evfd);
1628#endif 1924#endif
1629 1925
1630 if (evpipe [0] >= 0) 1926 if (evpipe [0] >= 0)
1631 { 1927 {
1632 close (evpipe [0]); 1928 EV_WIN32_CLOSE_FD (evpipe [0]);
1633 close (evpipe [1]); 1929 EV_WIN32_CLOSE_FD (evpipe [1]);
1634 } 1930 }
1635 1931
1932#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1636 evpipe_init (EV_A); 1933 evpipe_init (EV_A);
1637 /* now iterate over everything, in case we missed something */ 1934 /* now iterate over everything, in case we missed something */
1638 pipecb (EV_A_ &pipe_w, EV_READ); 1935 pipecb (EV_A_ &pipe_w, EV_READ);
1936#endif
1639 } 1937 }
1640 1938
1641 postfork = 0; 1939 postfork = 0;
1642} 1940}
1643 1941
1644#if EV_MULTIPLICITY 1942#if EV_MULTIPLICITY
1645 1943
1646struct ev_loop * 1944struct ev_loop *
1647ev_loop_new (unsigned int flags) 1945ev_loop_new (unsigned int flags)
1648{ 1946{
1649 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1947 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1650 1948
1651 memset (loop, 0, sizeof (struct ev_loop)); 1949 memset (EV_A, 0, sizeof (struct ev_loop));
1652
1653 loop_init (EV_A_ flags); 1950 loop_init (EV_A_ flags);
1654 1951
1655 if (ev_backend (EV_A)) 1952 if (ev_backend (EV_A))
1656 return loop; 1953 return EV_A;
1657 1954
1955 ev_free (EV_A);
1658 return 0; 1956 return 0;
1659} 1957}
1660 1958
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 */ 1959#endif /* multiplicity */
1674 1960
1675#if EV_VERIFY 1961#if EV_VERIFY
1676static void noinline 1962static void noinline
1677verify_watcher (EV_P_ W w) 1963verify_watcher (EV_P_ W w)
… …
1706 verify_watcher (EV_A_ ws [cnt]); 1992 verify_watcher (EV_A_ ws [cnt]);
1707 } 1993 }
1708} 1994}
1709#endif 1995#endif
1710 1996
1711#if EV_MINIMAL < 2 1997#if EV_FEATURE_API
1712void 1998void
1713ev_loop_verify (EV_P) 1999ev_verify (EV_P)
1714{ 2000{
1715#if EV_VERIFY 2001#if EV_VERIFY
1716 int i; 2002 int i;
1717 WL w; 2003 WL w;
1718 2004
… …
1752#if EV_FORK_ENABLE 2038#if EV_FORK_ENABLE
1753 assert (forkmax >= forkcnt); 2039 assert (forkmax >= forkcnt);
1754 array_verify (EV_A_ (W *)forks, forkcnt); 2040 array_verify (EV_A_ (W *)forks, forkcnt);
1755#endif 2041#endif
1756 2042
2043#if EV_CLEANUP_ENABLE
2044 assert (cleanupmax >= cleanupcnt);
2045 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2046#endif
2047
1757#if EV_ASYNC_ENABLE 2048#if EV_ASYNC_ENABLE
1758 assert (asyncmax >= asynccnt); 2049 assert (asyncmax >= asynccnt);
1759 array_verify (EV_A_ (W *)asyncs, asynccnt); 2050 array_verify (EV_A_ (W *)asyncs, asynccnt);
1760#endif 2051#endif
1761 2052
2053#if EV_PREPARE_ENABLE
1762 assert (preparemax >= preparecnt); 2054 assert (preparemax >= preparecnt);
1763 array_verify (EV_A_ (W *)prepares, preparecnt); 2055 array_verify (EV_A_ (W *)prepares, preparecnt);
2056#endif
1764 2057
2058#if EV_CHECK_ENABLE
1765 assert (checkmax >= checkcnt); 2059 assert (checkmax >= checkcnt);
1766 array_verify (EV_A_ (W *)checks, checkcnt); 2060 array_verify (EV_A_ (W *)checks, checkcnt);
2061#endif
1767 2062
1768# if 0 2063# if 0
2064#if EV_CHILD_ENABLE
1769 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2065 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) 2066 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2067#endif
1771# endif 2068# endif
1772#endif 2069#endif
1773} 2070}
1774#endif 2071#endif
1775 2072
1776#if EV_MULTIPLICITY 2073#if EV_MULTIPLICITY
1777struct ev_loop * 2074struct ev_loop *
1778ev_default_loop_init (unsigned int flags)
1779#else 2075#else
1780int 2076int
2077#endif
1781ev_default_loop (unsigned int flags) 2078ev_default_loop (unsigned int flags)
1782#endif
1783{ 2079{
1784 if (!ev_default_loop_ptr) 2080 if (!ev_default_loop_ptr)
1785 { 2081 {
1786#if EV_MULTIPLICITY 2082#if EV_MULTIPLICITY
1787 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2083 EV_P = ev_default_loop_ptr = &default_loop_struct;
1788#else 2084#else
1789 ev_default_loop_ptr = 1; 2085 ev_default_loop_ptr = 1;
1790#endif 2086#endif
1791 2087
1792 loop_init (EV_A_ flags); 2088 loop_init (EV_A_ flags);
1793 2089
1794 if (ev_backend (EV_A)) 2090 if (ev_backend (EV_A))
1795 { 2091 {
1796#ifndef _WIN32 2092#if EV_CHILD_ENABLE
1797 ev_signal_init (&childev, childcb, SIGCHLD); 2093 ev_signal_init (&childev, childcb, SIGCHLD);
1798 ev_set_priority (&childev, EV_MAXPRI); 2094 ev_set_priority (&childev, EV_MAXPRI);
1799 ev_signal_start (EV_A_ &childev); 2095 ev_signal_start (EV_A_ &childev);
1800 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2096 ev_unref (EV_A); /* child watcher should not keep loop alive */
1801#endif 2097#endif
… …
1806 2102
1807 return ev_default_loop_ptr; 2103 return ev_default_loop_ptr;
1808} 2104}
1809 2105
1810void 2106void
1811ev_default_destroy (void) 2107ev_loop_fork (EV_P)
1812{ 2108{
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 */ 2109 postfork = 1; /* must be in line with ev_default_fork */
1835} 2110}
1836 2111
1837/*****************************************************************************/ 2112/*****************************************************************************/
1838 2113
1839void 2114void
… …
1861 2136
1862 for (pri = NUMPRI; pri--; ) 2137 for (pri = NUMPRI; pri--; )
1863 while (pendingcnt [pri]) 2138 while (pendingcnt [pri])
1864 { 2139 {
1865 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2140 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 2141
1870 p->w->pending = 0; 2142 p->w->pending = 0;
1871 EV_CB_INVOKE (p->w, p->events); 2143 EV_CB_INVOKE (p->w, p->events);
1872 EV_FREQUENT_CHECK; 2144 EV_FREQUENT_CHECK;
1873 } 2145 }
… …
1930 EV_FREQUENT_CHECK; 2202 EV_FREQUENT_CHECK;
1931 feed_reverse (EV_A_ (W)w); 2203 feed_reverse (EV_A_ (W)w);
1932 } 2204 }
1933 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2205 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1934 2206
1935 feed_reverse_done (EV_A_ EV_TIMEOUT); 2207 feed_reverse_done (EV_A_ EV_TIMER);
1936 } 2208 }
1937} 2209}
1938 2210
1939#if EV_PERIODIC_ENABLE 2211#if EV_PERIODIC_ENABLE
2212
2213inline_speed void
2214periodic_recalc (EV_P_ ev_periodic *w)
2215{
2216 /* TODO: use slow but potentially more correct incremental algo, */
2217 /* also do not rely on ceil */
2218 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2219}
2220
1940/* make periodics pending */ 2221/* make periodics pending */
1941inline_size void 2222inline_size void
1942periodics_reify (EV_P) 2223periodics_reify (EV_P)
1943{ 2224{
1944 EV_FREQUENT_CHECK; 2225 EV_FREQUENT_CHECK;
… …
1963 ANHE_at_cache (periodics [HEAP0]); 2244 ANHE_at_cache (periodics [HEAP0]);
1964 downheap (periodics, periodiccnt, HEAP0); 2245 downheap (periodics, periodiccnt, HEAP0);
1965 } 2246 }
1966 else if (w->interval) 2247 else if (w->interval)
1967 { 2248 {
1968 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2249 periodic_recalc (EV_A_ w);
2250
1969 /* if next trigger time is not sufficiently in the future, put it there */ 2251 /* if next trigger time is not sufficiently in the future, put it there */
1970 /* this might happen because of floating point inexactness */ 2252 /* this might happen because of floating point inexactness */
1971 if (ev_at (w) - ev_rt_now < TIME_EPSILON) 2253 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1972 { 2254 {
1973 ev_at (w) += w->interval; 2255 ev_at (w) += w->interval;
… …
1993 feed_reverse_done (EV_A_ EV_PERIODIC); 2275 feed_reverse_done (EV_A_ EV_PERIODIC);
1994 } 2276 }
1995} 2277}
1996 2278
1997/* simply recalculate all periodics */ 2279/* simply recalculate all periodics */
1998/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2280/* TODO: maybe ensure that at least one event happens when jumping forward? */
1999static void noinline 2281static void noinline
2000periodics_reschedule (EV_P) 2282periodics_reschedule (EV_P)
2001{ 2283{
2002 int i; 2284 int i;
2003 2285
… …
2007 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2289 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2008 2290
2009 if (w->reschedule_cb) 2291 if (w->reschedule_cb)
2010 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2292 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2011 else if (w->interval) 2293 else if (w->interval)
2012 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2294 periodic_recalc (EV_A_ w);
2013 2295
2014 ANHE_at_cache (periodics [i]); 2296 ANHE_at_cache (periodics [i]);
2015 } 2297 }
2016 2298
2017 reheap (periodics, periodiccnt); 2299 reheap (periodics, periodiccnt);
… …
2031 ANHE_at_cache (*he); 2313 ANHE_at_cache (*he);
2032 } 2314 }
2033} 2315}
2034 2316
2035/* fetch new monotonic and realtime times from the kernel */ 2317/* fetch new monotonic and realtime times from the kernel */
2036/* also detetc if there was a timejump, and act accordingly */ 2318/* also detect if there was a timejump, and act accordingly */
2037inline_speed void 2319inline_speed void
2038time_update (EV_P_ ev_tstamp max_block) 2320time_update (EV_P_ ev_tstamp max_block)
2039{ 2321{
2040#if EV_USE_MONOTONIC 2322#if EV_USE_MONOTONIC
2041 if (expect_true (have_monotonic)) 2323 if (expect_true (have_monotonic))
… …
2099 mn_now = ev_rt_now; 2381 mn_now = ev_rt_now;
2100 } 2382 }
2101} 2383}
2102 2384
2103void 2385void
2104ev_loop (EV_P_ int flags) 2386ev_run (EV_P_ int flags)
2105{ 2387{
2106#if EV_MINIMAL < 2 2388#if EV_FEATURE_API
2107 ++loop_depth; 2389 ++loop_depth;
2108#endif 2390#endif
2109 2391
2110 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2392 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2111 2393
2112 loop_done = EVUNLOOP_CANCEL; 2394 loop_done = EVBREAK_CANCEL;
2113 2395
2114 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2396 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2115 2397
2116 do 2398 do
2117 { 2399 {
2118#if EV_VERIFY >= 2 2400#if EV_VERIFY >= 2
2119 ev_loop_verify (EV_A); 2401 ev_verify (EV_A);
2120#endif 2402#endif
2121 2403
2122#ifndef _WIN32 2404#ifndef _WIN32
2123 if (expect_false (curpid)) /* penalise the forking check even more */ 2405 if (expect_false (curpid)) /* penalise the forking check even more */
2124 if (expect_false (getpid () != curpid)) 2406 if (expect_false (getpid () != curpid))
… …
2136 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2418 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2137 EV_INVOKE_PENDING; 2419 EV_INVOKE_PENDING;
2138 } 2420 }
2139#endif 2421#endif
2140 2422
2423#if EV_PREPARE_ENABLE
2141 /* queue prepare watchers (and execute them) */ 2424 /* queue prepare watchers (and execute them) */
2142 if (expect_false (preparecnt)) 2425 if (expect_false (preparecnt))
2143 { 2426 {
2144 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2427 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2145 EV_INVOKE_PENDING; 2428 EV_INVOKE_PENDING;
2146 } 2429 }
2430#endif
2147 2431
2148 if (expect_false (loop_done)) 2432 if (expect_false (loop_done))
2149 break; 2433 break;
2150 2434
2151 /* we might have forked, so reify kernel state if necessary */ 2435 /* we might have forked, so reify kernel state if necessary */
… …
2158 /* calculate blocking time */ 2442 /* calculate blocking time */
2159 { 2443 {
2160 ev_tstamp waittime = 0.; 2444 ev_tstamp waittime = 0.;
2161 ev_tstamp sleeptime = 0.; 2445 ev_tstamp sleeptime = 0.;
2162 2446
2447 /* remember old timestamp for io_blocktime calculation */
2448 ev_tstamp prev_mn_now = mn_now;
2449
2450 /* update time to cancel out callback processing overhead */
2451 time_update (EV_A_ 1e100);
2452
2163 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2453 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2164 { 2454 {
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; 2455 waittime = MAX_BLOCKTIME;
2172 2456
2173 if (timercnt) 2457 if (timercnt)
2174 { 2458 {
2175 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2459 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2202 waittime -= sleeptime; 2486 waittime -= sleeptime;
2203 } 2487 }
2204 } 2488 }
2205 } 2489 }
2206 2490
2207#if EV_MINIMAL < 2 2491#if EV_FEATURE_API
2208 ++loop_count; 2492 ++loop_count;
2209#endif 2493#endif
2210 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2494 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2211 backend_poll (EV_A_ waittime); 2495 backend_poll (EV_A_ waittime);
2212 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2496 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2213 2497
2214 /* update ev_rt_now, do magic */ 2498 /* update ev_rt_now, do magic */
2215 time_update (EV_A_ waittime + sleeptime); 2499 time_update (EV_A_ waittime + sleeptime);
2216 } 2500 }
2217 2501
… …
2224#if EV_IDLE_ENABLE 2508#if EV_IDLE_ENABLE
2225 /* queue idle watchers unless other events are pending */ 2509 /* queue idle watchers unless other events are pending */
2226 idle_reify (EV_A); 2510 idle_reify (EV_A);
2227#endif 2511#endif
2228 2512
2513#if EV_CHECK_ENABLE
2229 /* queue check watchers, to be executed first */ 2514 /* queue check watchers, to be executed first */
2230 if (expect_false (checkcnt)) 2515 if (expect_false (checkcnt))
2231 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2516 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2517#endif
2232 2518
2233 EV_INVOKE_PENDING; 2519 EV_INVOKE_PENDING;
2234 } 2520 }
2235 while (expect_true ( 2521 while (expect_true (
2236 activecnt 2522 activecnt
2237 && !loop_done 2523 && !loop_done
2238 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2524 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2239 )); 2525 ));
2240 2526
2241 if (loop_done == EVUNLOOP_ONE) 2527 if (loop_done == EVBREAK_ONE)
2242 loop_done = EVUNLOOP_CANCEL; 2528 loop_done = EVBREAK_CANCEL;
2243 2529
2244#if EV_MINIMAL < 2 2530#if EV_FEATURE_API
2245 --loop_depth; 2531 --loop_depth;
2246#endif 2532#endif
2247} 2533}
2248 2534
2249void 2535void
2250ev_unloop (EV_P_ int how) 2536ev_break (EV_P_ int how)
2251{ 2537{
2252 loop_done = how; 2538 loop_done = how;
2253} 2539}
2254 2540
2255void 2541void
… …
2302inline_size void 2588inline_size void
2303wlist_del (WL *head, WL elem) 2589wlist_del (WL *head, WL elem)
2304{ 2590{
2305 while (*head) 2591 while (*head)
2306 { 2592 {
2307 if (*head == elem) 2593 if (expect_true (*head == elem))
2308 { 2594 {
2309 *head = elem->next; 2595 *head = elem->next;
2310 return; 2596 break;
2311 } 2597 }
2312 2598
2313 head = &(*head)->next; 2599 head = &(*head)->next;
2314 } 2600 }
2315} 2601}
… …
2375 2661
2376 if (expect_false (ev_is_active (w))) 2662 if (expect_false (ev_is_active (w)))
2377 return; 2663 return;
2378 2664
2379 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2665 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)))); 2666 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2381 2667
2382 EV_FREQUENT_CHECK; 2668 EV_FREQUENT_CHECK;
2383 2669
2384 ev_start (EV_A_ (W)w, 1); 2670 ev_start (EV_A_ (W)w, 1);
2385 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2671 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2403 EV_FREQUENT_CHECK; 2689 EV_FREQUENT_CHECK;
2404 2690
2405 wlist_del (&anfds[w->fd].head, (WL)w); 2691 wlist_del (&anfds[w->fd].head, (WL)w);
2406 ev_stop (EV_A_ (W)w); 2692 ev_stop (EV_A_ (W)w);
2407 2693
2408 fd_change (EV_A_ w->fd, 1); 2694 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2409 2695
2410 EV_FREQUENT_CHECK; 2696 EV_FREQUENT_CHECK;
2411} 2697}
2412 2698
2413void noinline 2699void noinline
… …
2455 timers [active] = timers [timercnt + HEAP0]; 2741 timers [active] = timers [timercnt + HEAP0];
2456 adjustheap (timers, timercnt, active); 2742 adjustheap (timers, timercnt, active);
2457 } 2743 }
2458 } 2744 }
2459 2745
2460 EV_FREQUENT_CHECK;
2461
2462 ev_at (w) -= mn_now; 2746 ev_at (w) -= mn_now;
2463 2747
2464 ev_stop (EV_A_ (W)w); 2748 ev_stop (EV_A_ (W)w);
2749
2750 EV_FREQUENT_CHECK;
2465} 2751}
2466 2752
2467void noinline 2753void noinline
2468ev_timer_again (EV_P_ ev_timer *w) 2754ev_timer_again (EV_P_ ev_timer *w)
2469{ 2755{
… …
2505 if (w->reschedule_cb) 2791 if (w->reschedule_cb)
2506 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2792 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2507 else if (w->interval) 2793 else if (w->interval)
2508 { 2794 {
2509 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2795 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2510 /* this formula differs from the one in periodic_reify because we do not always round up */ 2796 periodic_recalc (EV_A_ w);
2511 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2512 } 2797 }
2513 else 2798 else
2514 ev_at (w) = w->offset; 2799 ev_at (w) = w->offset;
2515 2800
2516 EV_FREQUENT_CHECK; 2801 EV_FREQUENT_CHECK;
… …
2548 periodics [active] = periodics [periodiccnt + HEAP0]; 2833 periodics [active] = periodics [periodiccnt + HEAP0];
2549 adjustheap (periodics, periodiccnt, active); 2834 adjustheap (periodics, periodiccnt, active);
2550 } 2835 }
2551 } 2836 }
2552 2837
2553 EV_FREQUENT_CHECK;
2554
2555 ev_stop (EV_A_ (W)w); 2838 ev_stop (EV_A_ (W)w);
2839
2840 EV_FREQUENT_CHECK;
2556} 2841}
2557 2842
2558void noinline 2843void noinline
2559ev_periodic_again (EV_P_ ev_periodic *w) 2844ev_periodic_again (EV_P_ ev_periodic *w)
2560{ 2845{
… …
2566 2851
2567#ifndef SA_RESTART 2852#ifndef SA_RESTART
2568# define SA_RESTART 0 2853# define SA_RESTART 0
2569#endif 2854#endif
2570 2855
2856#if EV_SIGNAL_ENABLE
2857
2571void noinline 2858void noinline
2572ev_signal_start (EV_P_ ev_signal *w) 2859ev_signal_start (EV_P_ ev_signal *w)
2573{ 2860{
2574#if EV_MULTIPLICITY
2575 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2576#endif
2577 if (expect_false (ev_is_active (w))) 2861 if (expect_false (ev_is_active (w)))
2578 return; 2862 return;
2579 2863
2580 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2864 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2581 2865
2582 evpipe_init (EV_A); 2866#if EV_MULTIPLICITY
2867 assert (("libev: a signal must not be attached to two different loops",
2868 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2583 2869
2584 EV_FREQUENT_CHECK; 2870 signals [w->signum - 1].loop = EV_A;
2871#endif
2585 2872
2873 EV_FREQUENT_CHECK;
2874
2875#if EV_USE_SIGNALFD
2876 if (sigfd == -2)
2586 { 2877 {
2587#ifndef _WIN32 2878 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2588 sigset_t full, prev; 2879 if (sigfd < 0 && errno == EINVAL)
2589 sigfillset (&full); 2880 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2590 sigprocmask (SIG_SETMASK, &full, &prev);
2591#endif
2592 2881
2593 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2882 if (sigfd >= 0)
2883 {
2884 fd_intern (sigfd); /* doing it twice will not hurt */
2594 2885
2595#ifndef _WIN32 2886 sigemptyset (&sigfd_set);
2596 sigprocmask (SIG_SETMASK, &prev, 0); 2887
2597#endif 2888 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2889 ev_set_priority (&sigfd_w, EV_MAXPRI);
2890 ev_io_start (EV_A_ &sigfd_w);
2891 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2892 }
2598 } 2893 }
2894
2895 if (sigfd >= 0)
2896 {
2897 /* TODO: check .head */
2898 sigaddset (&sigfd_set, w->signum);
2899 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2900
2901 signalfd (sigfd, &sigfd_set, 0);
2902 }
2903#endif
2599 2904
2600 ev_start (EV_A_ (W)w, 1); 2905 ev_start (EV_A_ (W)w, 1);
2601 wlist_add (&signals [w->signum - 1].head, (WL)w); 2906 wlist_add (&signals [w->signum - 1].head, (WL)w);
2602 2907
2603 if (!((WL)w)->next) 2908 if (!((WL)w)->next)
2909# if EV_USE_SIGNALFD
2910 if (sigfd < 0) /*TODO*/
2911# endif
2604 { 2912 {
2605#if _WIN32 2913# ifdef _WIN32
2914 evpipe_init (EV_A);
2915
2606 signal (w->signum, ev_sighandler); 2916 signal (w->signum, ev_sighandler);
2607#else 2917# else
2608 struct sigaction sa = { }; 2918 struct sigaction sa;
2919
2920 evpipe_init (EV_A);
2921
2609 sa.sa_handler = ev_sighandler; 2922 sa.sa_handler = ev_sighandler;
2610 sigfillset (&sa.sa_mask); 2923 sigfillset (&sa.sa_mask);
2611 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2924 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2612 sigaction (w->signum, &sa, 0); 2925 sigaction (w->signum, &sa, 0);
2926
2927 if (origflags & EVFLAG_NOSIGMASK)
2928 {
2929 sigemptyset (&sa.sa_mask);
2930 sigaddset (&sa.sa_mask, w->signum);
2931 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2932 }
2613#endif 2933#endif
2614 } 2934 }
2615 2935
2616 EV_FREQUENT_CHECK; 2936 EV_FREQUENT_CHECK;
2617} 2937}
2618 2938
2619void noinline 2939void noinline
… …
2627 2947
2628 wlist_del (&signals [w->signum - 1].head, (WL)w); 2948 wlist_del (&signals [w->signum - 1].head, (WL)w);
2629 ev_stop (EV_A_ (W)w); 2949 ev_stop (EV_A_ (W)w);
2630 2950
2631 if (!signals [w->signum - 1].head) 2951 if (!signals [w->signum - 1].head)
2952 {
2953#if EV_MULTIPLICITY
2954 signals [w->signum - 1].loop = 0; /* unattach from signal */
2955#endif
2956#if EV_USE_SIGNALFD
2957 if (sigfd >= 0)
2958 {
2959 sigset_t ss;
2960
2961 sigemptyset (&ss);
2962 sigaddset (&ss, w->signum);
2963 sigdelset (&sigfd_set, w->signum);
2964
2965 signalfd (sigfd, &sigfd_set, 0);
2966 sigprocmask (SIG_UNBLOCK, &ss, 0);
2967 }
2968 else
2969#endif
2632 signal (w->signum, SIG_DFL); 2970 signal (w->signum, SIG_DFL);
2971 }
2633 2972
2634 EV_FREQUENT_CHECK; 2973 EV_FREQUENT_CHECK;
2635} 2974}
2975
2976#endif
2977
2978#if EV_CHILD_ENABLE
2636 2979
2637void 2980void
2638ev_child_start (EV_P_ ev_child *w) 2981ev_child_start (EV_P_ ev_child *w)
2639{ 2982{
2640#if EV_MULTIPLICITY 2983#if EV_MULTIPLICITY
… …
2644 return; 2987 return;
2645 2988
2646 EV_FREQUENT_CHECK; 2989 EV_FREQUENT_CHECK;
2647 2990
2648 ev_start (EV_A_ (W)w, 1); 2991 ev_start (EV_A_ (W)w, 1);
2649 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2992 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2650 2993
2651 EV_FREQUENT_CHECK; 2994 EV_FREQUENT_CHECK;
2652} 2995}
2653 2996
2654void 2997void
… …
2658 if (expect_false (!ev_is_active (w))) 3001 if (expect_false (!ev_is_active (w)))
2659 return; 3002 return;
2660 3003
2661 EV_FREQUENT_CHECK; 3004 EV_FREQUENT_CHECK;
2662 3005
2663 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3006 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2664 ev_stop (EV_A_ (W)w); 3007 ev_stop (EV_A_ (W)w);
2665 3008
2666 EV_FREQUENT_CHECK; 3009 EV_FREQUENT_CHECK;
2667} 3010}
3011
3012#endif
2668 3013
2669#if EV_STAT_ENABLE 3014#if EV_STAT_ENABLE
2670 3015
2671# ifdef _WIN32 3016# ifdef _WIN32
2672# undef lstat 3017# undef lstat
… …
2678#define MIN_STAT_INTERVAL 0.1074891 3023#define MIN_STAT_INTERVAL 0.1074891
2679 3024
2680static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 3025static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2681 3026
2682#if EV_USE_INOTIFY 3027#if EV_USE_INOTIFY
2683# define EV_INOTIFY_BUFSIZE 8192 3028
3029/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
3030# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2684 3031
2685static void noinline 3032static void noinline
2686infy_add (EV_P_ ev_stat *w) 3033infy_add (EV_P_ ev_stat *w)
2687{ 3034{
2688 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 3035 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2689 3036
2690 if (w->wd < 0) 3037 if (w->wd >= 0)
3038 {
3039 struct statfs sfs;
3040
3041 /* now local changes will be tracked by inotify, but remote changes won't */
3042 /* unless the filesystem is known to be local, we therefore still poll */
3043 /* also do poll on <2.6.25, but with normal frequency */
3044
3045 if (!fs_2625)
3046 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3047 else if (!statfs (w->path, &sfs)
3048 && (sfs.f_type == 0x1373 /* devfs */
3049 || sfs.f_type == 0xEF53 /* ext2/3 */
3050 || sfs.f_type == 0x3153464a /* jfs */
3051 || sfs.f_type == 0x52654973 /* reiser3 */
3052 || sfs.f_type == 0x01021994 /* tempfs */
3053 || sfs.f_type == 0x58465342 /* xfs */))
3054 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3055 else
3056 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2691 { 3057 }
3058 else
3059 {
3060 /* can't use inotify, continue to stat */
2692 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3061 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2693 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2694 3062
2695 /* monitor some parent directory for speedup hints */ 3063 /* if path is not there, monitor some parent directory for speedup hints */
2696 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3064 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2697 /* but an efficiency issue only */ 3065 /* but an efficiency issue only */
2698 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3066 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2699 { 3067 {
2700 char path [4096]; 3068 char path [4096];
… …
2710 if (!pend || pend == path) 3078 if (!pend || pend == path)
2711 break; 3079 break;
2712 3080
2713 *pend = 0; 3081 *pend = 0;
2714 w->wd = inotify_add_watch (fs_fd, path, mask); 3082 w->wd = inotify_add_watch (fs_fd, path, mask);
2715 } 3083 }
2716 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3084 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2717 } 3085 }
2718 } 3086 }
2719 3087
2720 if (w->wd >= 0) 3088 if (w->wd >= 0)
2721 {
2722 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3089 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2723 3090
2724 /* now local changes will be tracked by inotify, but remote changes won't */ 3091 /* now re-arm timer, if required */
2725 /* unless the filesystem it known to be local, we therefore still poll */ 3092 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2726 /* also do poll on <2.6.25, but with normal frequency */
2727 struct statfs sfs;
2728
2729 if (fs_2625 && !statfs (w->path, &sfs))
2730 if (sfs.f_type == 0x1373 /* devfs */
2731 || sfs.f_type == 0xEF53 /* ext2/3 */
2732 || sfs.f_type == 0x3153464a /* jfs */
2733 || sfs.f_type == 0x52654973 /* reiser3 */
2734 || sfs.f_type == 0x01021994 /* tempfs */
2735 || sfs.f_type == 0x58465342 /* xfs */)
2736 return;
2737
2738 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2739 ev_timer_again (EV_A_ &w->timer); 3093 ev_timer_again (EV_A_ &w->timer);
2740 } 3094 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2741} 3095}
2742 3096
2743static void noinline 3097static void noinline
2744infy_del (EV_P_ ev_stat *w) 3098infy_del (EV_P_ ev_stat *w)
2745{ 3099{
… …
2748 3102
2749 if (wd < 0) 3103 if (wd < 0)
2750 return; 3104 return;
2751 3105
2752 w->wd = -2; 3106 w->wd = -2;
2753 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3107 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2754 wlist_del (&fs_hash [slot].head, (WL)w); 3108 wlist_del (&fs_hash [slot].head, (WL)w);
2755 3109
2756 /* remove this watcher, if others are watching it, they will rearm */ 3110 /* remove this watcher, if others are watching it, they will rearm */
2757 inotify_rm_watch (fs_fd, wd); 3111 inotify_rm_watch (fs_fd, wd);
2758} 3112}
… …
2760static void noinline 3114static void noinline
2761infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3115infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2762{ 3116{
2763 if (slot < 0) 3117 if (slot < 0)
2764 /* overflow, need to check for all hash slots */ 3118 /* overflow, need to check for all hash slots */
2765 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3119 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2766 infy_wd (EV_A_ slot, wd, ev); 3120 infy_wd (EV_A_ slot, wd, ev);
2767 else 3121 else
2768 { 3122 {
2769 WL w_; 3123 WL w_;
2770 3124
2771 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3125 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2772 { 3126 {
2773 ev_stat *w = (ev_stat *)w_; 3127 ev_stat *w = (ev_stat *)w_;
2774 w_ = w_->next; /* lets us remove this watcher and all before it */ 3128 w_ = w_->next; /* lets us remove this watcher and all before it */
2775 3129
2776 if (w->wd == wd || wd == -1) 3130 if (w->wd == wd || wd == -1)
2777 { 3131 {
2778 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3132 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2779 { 3133 {
2780 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3134 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2781 w->wd = -1; 3135 w->wd = -1;
2782 infy_add (EV_A_ w); /* re-add, no matter what */ 3136 infy_add (EV_A_ w); /* re-add, no matter what */
2783 } 3137 }
2784 3138
2785 stat_timer_cb (EV_A_ &w->timer, 0); 3139 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2790 3144
2791static void 3145static void
2792infy_cb (EV_P_ ev_io *w, int revents) 3146infy_cb (EV_P_ ev_io *w, int revents)
2793{ 3147{
2794 char buf [EV_INOTIFY_BUFSIZE]; 3148 char buf [EV_INOTIFY_BUFSIZE];
2795 struct inotify_event *ev = (struct inotify_event *)buf;
2796 int ofs; 3149 int ofs;
2797 int len = read (fs_fd, buf, sizeof (buf)); 3150 int len = read (fs_fd, buf, sizeof (buf));
2798 3151
2799 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3152 for (ofs = 0; ofs < len; )
3153 {
3154 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2800 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3155 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3156 ofs += sizeof (struct inotify_event) + ev->len;
3157 }
2801} 3158}
2802 3159
2803inline_size void 3160inline_size void
2804check_2625 (EV_P) 3161ev_check_2625 (EV_P)
2805{ 3162{
2806 /* kernels < 2.6.25 are borked 3163 /* kernels < 2.6.25 are borked
2807 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3164 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2808 */ 3165 */
2809 struct utsname buf; 3166 if (ev_linux_version () < 0x020619)
2810 int major, minor, micro;
2811
2812 if (uname (&buf))
2813 return; 3167 return;
2814 3168
2815 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2816 return;
2817
2818 if (major < 2
2819 || (major == 2 && minor < 6)
2820 || (major == 2 && minor == 6 && micro < 25))
2821 return;
2822
2823 fs_2625 = 1; 3169 fs_2625 = 1;
3170}
3171
3172inline_size int
3173infy_newfd (void)
3174{
3175#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3176 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3177 if (fd >= 0)
3178 return fd;
3179#endif
3180 return inotify_init ();
2824} 3181}
2825 3182
2826inline_size void 3183inline_size void
2827infy_init (EV_P) 3184infy_init (EV_P)
2828{ 3185{
2829 if (fs_fd != -2) 3186 if (fs_fd != -2)
2830 return; 3187 return;
2831 3188
2832 fs_fd = -1; 3189 fs_fd = -1;
2833 3190
2834 check_2625 (EV_A); 3191 ev_check_2625 (EV_A);
2835 3192
2836 fs_fd = inotify_init (); 3193 fs_fd = infy_newfd ();
2837 3194
2838 if (fs_fd >= 0) 3195 if (fs_fd >= 0)
2839 { 3196 {
3197 fd_intern (fs_fd);
2840 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3198 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2841 ev_set_priority (&fs_w, EV_MAXPRI); 3199 ev_set_priority (&fs_w, EV_MAXPRI);
2842 ev_io_start (EV_A_ &fs_w); 3200 ev_io_start (EV_A_ &fs_w);
3201 ev_unref (EV_A);
2843 } 3202 }
2844} 3203}
2845 3204
2846inline_size void 3205inline_size void
2847infy_fork (EV_P) 3206infy_fork (EV_P)
… …
2849 int slot; 3208 int slot;
2850 3209
2851 if (fs_fd < 0) 3210 if (fs_fd < 0)
2852 return; 3211 return;
2853 3212
3213 ev_ref (EV_A);
3214 ev_io_stop (EV_A_ &fs_w);
2854 close (fs_fd); 3215 close (fs_fd);
2855 fs_fd = inotify_init (); 3216 fs_fd = infy_newfd ();
2856 3217
3218 if (fs_fd >= 0)
3219 {
3220 fd_intern (fs_fd);
3221 ev_io_set (&fs_w, fs_fd, EV_READ);
3222 ev_io_start (EV_A_ &fs_w);
3223 ev_unref (EV_A);
3224 }
3225
2857 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3226 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2858 { 3227 {
2859 WL w_ = fs_hash [slot].head; 3228 WL w_ = fs_hash [slot].head;
2860 fs_hash [slot].head = 0; 3229 fs_hash [slot].head = 0;
2861 3230
2862 while (w_) 3231 while (w_)
… …
2867 w->wd = -1; 3236 w->wd = -1;
2868 3237
2869 if (fs_fd >= 0) 3238 if (fs_fd >= 0)
2870 infy_add (EV_A_ w); /* re-add, no matter what */ 3239 infy_add (EV_A_ w); /* re-add, no matter what */
2871 else 3240 else
3241 {
3242 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3243 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2872 ev_timer_again (EV_A_ &w->timer); 3244 ev_timer_again (EV_A_ &w->timer);
3245 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3246 }
2873 } 3247 }
2874 } 3248 }
2875} 3249}
2876 3250
2877#endif 3251#endif
… …
2894static void noinline 3268static void noinline
2895stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3269stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2896{ 3270{
2897 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3271 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2898 3272
2899 /* we copy this here each the time so that */ 3273 ev_statdata prev = w->attr;
2900 /* prev has the old value when the callback gets invoked */
2901 w->prev = w->attr;
2902 ev_stat_stat (EV_A_ w); 3274 ev_stat_stat (EV_A_ w);
2903 3275
2904 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3276 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2905 if ( 3277 if (
2906 w->prev.st_dev != w->attr.st_dev 3278 prev.st_dev != w->attr.st_dev
2907 || w->prev.st_ino != w->attr.st_ino 3279 || prev.st_ino != w->attr.st_ino
2908 || w->prev.st_mode != w->attr.st_mode 3280 || prev.st_mode != w->attr.st_mode
2909 || w->prev.st_nlink != w->attr.st_nlink 3281 || prev.st_nlink != w->attr.st_nlink
2910 || w->prev.st_uid != w->attr.st_uid 3282 || prev.st_uid != w->attr.st_uid
2911 || w->prev.st_gid != w->attr.st_gid 3283 || prev.st_gid != w->attr.st_gid
2912 || w->prev.st_rdev != w->attr.st_rdev 3284 || prev.st_rdev != w->attr.st_rdev
2913 || w->prev.st_size != w->attr.st_size 3285 || prev.st_size != w->attr.st_size
2914 || w->prev.st_atime != w->attr.st_atime 3286 || prev.st_atime != w->attr.st_atime
2915 || w->prev.st_mtime != w->attr.st_mtime 3287 || prev.st_mtime != w->attr.st_mtime
2916 || w->prev.st_ctime != w->attr.st_ctime 3288 || prev.st_ctime != w->attr.st_ctime
2917 ) { 3289 ) {
3290 /* we only update w->prev on actual differences */
3291 /* in case we test more often than invoke the callback, */
3292 /* to ensure that prev is always different to attr */
3293 w->prev = prev;
3294
2918 #if EV_USE_INOTIFY 3295 #if EV_USE_INOTIFY
2919 if (fs_fd >= 0) 3296 if (fs_fd >= 0)
2920 { 3297 {
2921 infy_del (EV_A_ w); 3298 infy_del (EV_A_ w);
2922 infy_add (EV_A_ w); 3299 infy_add (EV_A_ w);
… …
2947 3324
2948 if (fs_fd >= 0) 3325 if (fs_fd >= 0)
2949 infy_add (EV_A_ w); 3326 infy_add (EV_A_ w);
2950 else 3327 else
2951#endif 3328#endif
3329 {
2952 ev_timer_again (EV_A_ &w->timer); 3330 ev_timer_again (EV_A_ &w->timer);
3331 ev_unref (EV_A);
3332 }
2953 3333
2954 ev_start (EV_A_ (W)w, 1); 3334 ev_start (EV_A_ (W)w, 1);
2955 3335
2956 EV_FREQUENT_CHECK; 3336 EV_FREQUENT_CHECK;
2957} 3337}
… …
2966 EV_FREQUENT_CHECK; 3346 EV_FREQUENT_CHECK;
2967 3347
2968#if EV_USE_INOTIFY 3348#if EV_USE_INOTIFY
2969 infy_del (EV_A_ w); 3349 infy_del (EV_A_ w);
2970#endif 3350#endif
3351
3352 if (ev_is_active (&w->timer))
3353 {
3354 ev_ref (EV_A);
2971 ev_timer_stop (EV_A_ &w->timer); 3355 ev_timer_stop (EV_A_ &w->timer);
3356 }
2972 3357
2973 ev_stop (EV_A_ (W)w); 3358 ev_stop (EV_A_ (W)w);
2974 3359
2975 EV_FREQUENT_CHECK; 3360 EV_FREQUENT_CHECK;
2976} 3361}
… …
3021 3406
3022 EV_FREQUENT_CHECK; 3407 EV_FREQUENT_CHECK;
3023} 3408}
3024#endif 3409#endif
3025 3410
3411#if EV_PREPARE_ENABLE
3026void 3412void
3027ev_prepare_start (EV_P_ ev_prepare *w) 3413ev_prepare_start (EV_P_ ev_prepare *w)
3028{ 3414{
3029 if (expect_false (ev_is_active (w))) 3415 if (expect_false (ev_is_active (w)))
3030 return; 3416 return;
… …
3056 3442
3057 ev_stop (EV_A_ (W)w); 3443 ev_stop (EV_A_ (W)w);
3058 3444
3059 EV_FREQUENT_CHECK; 3445 EV_FREQUENT_CHECK;
3060} 3446}
3447#endif
3061 3448
3449#if EV_CHECK_ENABLE
3062void 3450void
3063ev_check_start (EV_P_ ev_check *w) 3451ev_check_start (EV_P_ ev_check *w)
3064{ 3452{
3065 if (expect_false (ev_is_active (w))) 3453 if (expect_false (ev_is_active (w)))
3066 return; 3454 return;
… …
3092 3480
3093 ev_stop (EV_A_ (W)w); 3481 ev_stop (EV_A_ (W)w);
3094 3482
3095 EV_FREQUENT_CHECK; 3483 EV_FREQUENT_CHECK;
3096} 3484}
3485#endif
3097 3486
3098#if EV_EMBED_ENABLE 3487#if EV_EMBED_ENABLE
3099void noinline 3488void noinline
3100ev_embed_sweep (EV_P_ ev_embed *w) 3489ev_embed_sweep (EV_P_ ev_embed *w)
3101{ 3490{
3102 ev_loop (w->other, EVLOOP_NONBLOCK); 3491 ev_run (w->other, EVRUN_NOWAIT);
3103} 3492}
3104 3493
3105static void 3494static void
3106embed_io_cb (EV_P_ ev_io *io, int revents) 3495embed_io_cb (EV_P_ ev_io *io, int revents)
3107{ 3496{
3108 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3497 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3109 3498
3110 if (ev_cb (w)) 3499 if (ev_cb (w))
3111 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3500 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3112 else 3501 else
3113 ev_loop (w->other, EVLOOP_NONBLOCK); 3502 ev_run (w->other, EVRUN_NOWAIT);
3114} 3503}
3115 3504
3116static void 3505static void
3117embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3506embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3118{ 3507{
3119 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3508 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3120 3509
3121 { 3510 {
3122 struct ev_loop *loop = w->other; 3511 EV_P = w->other;
3123 3512
3124 while (fdchangecnt) 3513 while (fdchangecnt)
3125 { 3514 {
3126 fd_reify (EV_A); 3515 fd_reify (EV_A);
3127 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3516 ev_run (EV_A_ EVRUN_NOWAIT);
3128 } 3517 }
3129 } 3518 }
3130} 3519}
3131 3520
3132static void 3521static void
… …
3135 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3524 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3136 3525
3137 ev_embed_stop (EV_A_ w); 3526 ev_embed_stop (EV_A_ w);
3138 3527
3139 { 3528 {
3140 struct ev_loop *loop = w->other; 3529 EV_P = w->other;
3141 3530
3142 ev_loop_fork (EV_A); 3531 ev_loop_fork (EV_A);
3143 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3532 ev_run (EV_A_ EVRUN_NOWAIT);
3144 } 3533 }
3145 3534
3146 ev_embed_start (EV_A_ w); 3535 ev_embed_start (EV_A_ w);
3147} 3536}
3148 3537
… …
3159{ 3548{
3160 if (expect_false (ev_is_active (w))) 3549 if (expect_false (ev_is_active (w)))
3161 return; 3550 return;
3162 3551
3163 { 3552 {
3164 struct ev_loop *loop = w->other; 3553 EV_P = w->other;
3165 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3554 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3166 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3555 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3167 } 3556 }
3168 3557
3169 EV_FREQUENT_CHECK; 3558 EV_FREQUENT_CHECK;
… …
3196 3585
3197 ev_io_stop (EV_A_ &w->io); 3586 ev_io_stop (EV_A_ &w->io);
3198 ev_prepare_stop (EV_A_ &w->prepare); 3587 ev_prepare_stop (EV_A_ &w->prepare);
3199 ev_fork_stop (EV_A_ &w->fork); 3588 ev_fork_stop (EV_A_ &w->fork);
3200 3589
3590 ev_stop (EV_A_ (W)w);
3591
3201 EV_FREQUENT_CHECK; 3592 EV_FREQUENT_CHECK;
3202} 3593}
3203#endif 3594#endif
3204 3595
3205#if EV_FORK_ENABLE 3596#if EV_FORK_ENABLE
… …
3238 3629
3239 EV_FREQUENT_CHECK; 3630 EV_FREQUENT_CHECK;
3240} 3631}
3241#endif 3632#endif
3242 3633
3243#if EV_ASYNC_ENABLE 3634#if EV_CLEANUP_ENABLE
3244void 3635void
3245ev_async_start (EV_P_ ev_async *w) 3636ev_cleanup_start (EV_P_ ev_cleanup *w)
3246{ 3637{
3247 if (expect_false (ev_is_active (w))) 3638 if (expect_false (ev_is_active (w)))
3248 return; 3639 return;
3640
3641 EV_FREQUENT_CHECK;
3642
3643 ev_start (EV_A_ (W)w, ++cleanupcnt);
3644 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3645 cleanups [cleanupcnt - 1] = w;
3646
3647 /* cleanup watchers should never keep a refcount on the loop */
3648 ev_unref (EV_A);
3649 EV_FREQUENT_CHECK;
3650}
3651
3652void
3653ev_cleanup_stop (EV_P_ ev_cleanup *w)
3654{
3655 clear_pending (EV_A_ (W)w);
3656 if (expect_false (!ev_is_active (w)))
3657 return;
3658
3659 EV_FREQUENT_CHECK;
3660 ev_ref (EV_A);
3661
3662 {
3663 int active = ev_active (w);
3664
3665 cleanups [active - 1] = cleanups [--cleanupcnt];
3666 ev_active (cleanups [active - 1]) = active;
3667 }
3668
3669 ev_stop (EV_A_ (W)w);
3670
3671 EV_FREQUENT_CHECK;
3672}
3673#endif
3674
3675#if EV_ASYNC_ENABLE
3676void
3677ev_async_start (EV_P_ ev_async *w)
3678{
3679 if (expect_false (ev_is_active (w)))
3680 return;
3681
3682 w->sent = 0;
3249 3683
3250 evpipe_init (EV_A); 3684 evpipe_init (EV_A);
3251 3685
3252 EV_FREQUENT_CHECK; 3686 EV_FREQUENT_CHECK;
3253 3687
… …
3281 3715
3282void 3716void
3283ev_async_send (EV_P_ ev_async *w) 3717ev_async_send (EV_P_ ev_async *w)
3284{ 3718{
3285 w->sent = 1; 3719 w->sent = 1;
3286 evpipe_write (EV_A_ &gotasync); 3720 evpipe_write (EV_A_ &async_pending);
3287} 3721}
3288#endif 3722#endif
3289 3723
3290/*****************************************************************************/ 3724/*****************************************************************************/
3291 3725
… …
3331{ 3765{
3332 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3766 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3333 3767
3334 if (expect_false (!once)) 3768 if (expect_false (!once))
3335 { 3769 {
3336 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3770 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3337 return; 3771 return;
3338 } 3772 }
3339 3773
3340 once->cb = cb; 3774 once->cb = cb;
3341 once->arg = arg; 3775 once->arg = arg;
… …
3428 if (types & EV_ASYNC) 3862 if (types & EV_ASYNC)
3429 for (i = asynccnt; i--; ) 3863 for (i = asynccnt; i--; )
3430 cb (EV_A_ EV_ASYNC, asyncs [i]); 3864 cb (EV_A_ EV_ASYNC, asyncs [i]);
3431#endif 3865#endif
3432 3866
3867#if EV_PREPARE_ENABLE
3433 if (types & EV_PREPARE) 3868 if (types & EV_PREPARE)
3434 for (i = preparecnt; i--; ) 3869 for (i = preparecnt; i--; )
3435#if EV_EMBED_ENABLE 3870# if EV_EMBED_ENABLE
3436 if (ev_cb (prepares [i]) != embed_prepare_cb) 3871 if (ev_cb (prepares [i]) != embed_prepare_cb)
3437#endif 3872# endif
3438 cb (EV_A_ EV_PREPARE, prepares [i]); 3873 cb (EV_A_ EV_PREPARE, prepares [i]);
3874#endif
3439 3875
3876#if EV_CHECK_ENABLE
3440 if (types & EV_CHECK) 3877 if (types & EV_CHECK)
3441 for (i = checkcnt; i--; ) 3878 for (i = checkcnt; i--; )
3442 cb (EV_A_ EV_CHECK, checks [i]); 3879 cb (EV_A_ EV_CHECK, checks [i]);
3880#endif
3443 3881
3882#if EV_SIGNAL_ENABLE
3444 if (types & EV_SIGNAL) 3883 if (types & EV_SIGNAL)
3445 for (i = 0; i < signalmax; ++i) 3884 for (i = 0; i < EV_NSIG - 1; ++i)
3446 for (wl = signals [i].head; wl; ) 3885 for (wl = signals [i].head; wl; )
3447 { 3886 {
3448 wn = wl->next; 3887 wn = wl->next;
3449 cb (EV_A_ EV_SIGNAL, wl); 3888 cb (EV_A_ EV_SIGNAL, wl);
3450 wl = wn; 3889 wl = wn;
3451 } 3890 }
3891#endif
3452 3892
3893#if EV_CHILD_ENABLE
3453 if (types & EV_CHILD) 3894 if (types & EV_CHILD)
3454 for (i = EV_PID_HASHSIZE; i--; ) 3895 for (i = (EV_PID_HASHSIZE); i--; )
3455 for (wl = childs [i]; wl; ) 3896 for (wl = childs [i]; wl; )
3456 { 3897 {
3457 wn = wl->next; 3898 wn = wl->next;
3458 cb (EV_A_ EV_CHILD, wl); 3899 cb (EV_A_ EV_CHILD, wl);
3459 wl = wn; 3900 wl = wn;
3460 } 3901 }
3902#endif
3461/* EV_STAT 0x00001000 /* stat data changed */ 3903/* EV_STAT 0x00001000 /* stat data changed */
3462/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3904/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3463} 3905}
3464#endif 3906#endif
3465 3907
3466#if EV_MULTIPLICITY 3908#if EV_MULTIPLICITY
3467 #include "ev_wrap.h" 3909 #include "ev_wrap.h"
3468#endif 3910#endif
3469 3911
3470#ifdef __cplusplus 3912EV_CPP(})
3471}
3472#endif
3473 3913

Diff Legend

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