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

Comparing libev/ev.c (file contents):
Revision 1.290 by root, Mon Jun 29 04:41:34 2009 UTC vs.
Revision 1.387 by root, Wed Jul 20 01:04:43 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
49# include "config.h" 45# include "config.h"
50# endif 46# endif
47
48#if HAVE_FLOOR
49# ifndef EV_USE_FLOOR
50# define EV_USE_FLOOR 1
51# endif
52#endif
51 53
52# if HAVE_CLOCK_SYSCALL 54# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL 55# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1 56# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME 57# ifndef EV_USE_REALTIME
… …
77# ifndef EV_USE_REALTIME 79# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 80# define EV_USE_REALTIME 0
79# endif 81# endif
80# endif 82# endif
81 83
84# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 85# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 86# define EV_USE_NANOSLEEP EV_FEATURE_OS
87# endif
85# else 88# else
89# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 90# define EV_USE_NANOSLEEP 0
91# endif
92
93# if HAVE_SELECT && HAVE_SYS_SELECT_H
94# ifndef EV_USE_SELECT
95# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 96# endif
97# else
98# undef EV_USE_SELECT
99# define EV_USE_SELECT 0
88# endif 100# endif
89 101
102# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 103# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 104# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 105# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 106# else
107# undef EV_USE_POLL
102# define EV_USE_POLL 0 108# define EV_USE_POLL 0
103# endif
104# endif 109# endif
105 110
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 111# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 112# ifndef EV_USE_EPOLL
109# else 113# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 114# endif
115# else
116# undef EV_USE_EPOLL
117# define EV_USE_EPOLL 0
112# endif 118# endif
113 119
120# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# ifndef EV_USE_KQUEUE 121# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 122# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
116# define EV_USE_KQUEUE 1
117# else
118# define EV_USE_KQUEUE 0
119# endif 123# endif
124# else
125# undef EV_USE_KQUEUE
126# define EV_USE_KQUEUE 0
120# endif 127# endif
121 128
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 129# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 130# ifndef EV_USE_PORT
125# else 131# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 132# endif
133# else
134# undef EV_USE_PORT
135# define EV_USE_PORT 0
128# endif 136# endif
129 137
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 138# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 139# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 140# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 141# endif
142# else
143# undef EV_USE_INOTIFY
144# define EV_USE_INOTIFY 0
136# endif 145# endif
137 146
147# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
138# ifndef EV_USE_EVENTFD 148# ifndef EV_USE_SIGNALFD
139# if HAVE_EVENTFD 149# define EV_USE_SIGNALFD EV_FEATURE_OS
140# define EV_USE_EVENTFD 1
141# else
142# define EV_USE_EVENTFD 0
143# endif 150# endif
151# else
152# undef EV_USE_SIGNALFD
153# define EV_USE_SIGNALFD 0
154# endif
155
156# if HAVE_EVENTFD
157# ifndef EV_USE_EVENTFD
158# define EV_USE_EVENTFD EV_FEATURE_OS
159# endif
160# else
161# undef EV_USE_EVENTFD
162# define EV_USE_EVENTFD 0
144# endif 163# endif
145 164
146#endif 165#endif
147 166
148#include <math.h>
149#include <stdlib.h> 167#include <stdlib.h>
168#include <string.h>
150#include <fcntl.h> 169#include <fcntl.h>
151#include <stddef.h> 170#include <stddef.h>
152 171
153#include <stdio.h> 172#include <stdio.h>
154 173
155#include <assert.h> 174#include <assert.h>
156#include <errno.h> 175#include <errno.h>
157#include <sys/types.h> 176#include <sys/types.h>
158#include <time.h> 177#include <time.h>
178#include <limits.h>
159 179
160#include <signal.h> 180#include <signal.h>
161 181
162#ifdef EV_H 182#ifdef EV_H
163# include EV_H 183# include EV_H
164#else 184#else
165# include "ev.h" 185# include "ev.h"
166#endif 186#endif
187
188EV_CPP(extern "C" {)
167 189
168#ifndef _WIN32 190#ifndef _WIN32
169# include <sys/time.h> 191# include <sys/time.h>
170# include <sys/wait.h> 192# include <sys/wait.h>
171# include <unistd.h> 193# include <unistd.h>
… …
174# define WIN32_LEAN_AND_MEAN 196# define WIN32_LEAN_AND_MEAN
175# include <windows.h> 197# include <windows.h>
176# ifndef EV_SELECT_IS_WINSOCKET 198# ifndef EV_SELECT_IS_WINSOCKET
177# define EV_SELECT_IS_WINSOCKET 1 199# define EV_SELECT_IS_WINSOCKET 1
178# endif 200# endif
201# undef EV_AVOID_STDIO
179#endif 202#endif
203
204/* OS X, in its infinite idiocy, actually HARDCODES
205 * a limit of 1024 into their select. Where people have brains,
206 * OS X engineers apparently have a vacuum. Or maybe they were
207 * ordered to have a vacuum, or they do anything for money.
208 * This might help. Or not.
209 */
210#define _DARWIN_UNLIMITED_SELECT 1
180 211
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 212/* this block tries to deduce configuration from header-defined symbols and defaults */
213
214/* try to deduce the maximum number of signals on this platform */
215#if defined (EV_NSIG)
216/* use what's provided */
217#elif defined (NSIG)
218# define EV_NSIG (NSIG)
219#elif defined(_NSIG)
220# define EV_NSIG (_NSIG)
221#elif defined (SIGMAX)
222# define EV_NSIG (SIGMAX+1)
223#elif defined (SIG_MAX)
224# define EV_NSIG (SIG_MAX+1)
225#elif defined (_SIG_MAX)
226# define EV_NSIG (_SIG_MAX+1)
227#elif defined (MAXSIG)
228# define EV_NSIG (MAXSIG+1)
229#elif defined (MAX_SIG)
230# define EV_NSIG (MAX_SIG+1)
231#elif defined (SIGARRAYSIZE)
232# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
233#elif defined (_sys_nsig)
234# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
235#else
236# error "unable to find value for NSIG, please report"
237/* to make it compile regardless, just remove the above line, */
238/* but consider reporting it, too! :) */
239# define EV_NSIG 65
240#endif
241
242#ifndef EV_USE_FLOOR
243# define EV_USE_FLOOR 0
244#endif
182 245
183#ifndef EV_USE_CLOCK_SYSCALL 246#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 247# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 248# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
186# else 249# else
187# define EV_USE_CLOCK_SYSCALL 0 250# define EV_USE_CLOCK_SYSCALL 0
188# endif 251# endif
189#endif 252#endif
190 253
191#ifndef EV_USE_MONOTONIC 254#ifndef EV_USE_MONOTONIC
192# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 255# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
193# define EV_USE_MONOTONIC 1 256# define EV_USE_MONOTONIC EV_FEATURE_OS
194# else 257# else
195# define EV_USE_MONOTONIC 0 258# define EV_USE_MONOTONIC 0
196# endif 259# endif
197#endif 260#endif
198 261
… …
200# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 263# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
201#endif 264#endif
202 265
203#ifndef EV_USE_NANOSLEEP 266#ifndef EV_USE_NANOSLEEP
204# if _POSIX_C_SOURCE >= 199309L 267# if _POSIX_C_SOURCE >= 199309L
205# define EV_USE_NANOSLEEP 1 268# define EV_USE_NANOSLEEP EV_FEATURE_OS
206# else 269# else
207# define EV_USE_NANOSLEEP 0 270# define EV_USE_NANOSLEEP 0
208# endif 271# endif
209#endif 272#endif
210 273
211#ifndef EV_USE_SELECT 274#ifndef EV_USE_SELECT
212# define EV_USE_SELECT 1 275# define EV_USE_SELECT EV_FEATURE_BACKENDS
213#endif 276#endif
214 277
215#ifndef EV_USE_POLL 278#ifndef EV_USE_POLL
216# ifdef _WIN32 279# ifdef _WIN32
217# define EV_USE_POLL 0 280# define EV_USE_POLL 0
218# else 281# else
219# define EV_USE_POLL 1 282# define EV_USE_POLL EV_FEATURE_BACKENDS
220# endif 283# endif
221#endif 284#endif
222 285
223#ifndef EV_USE_EPOLL 286#ifndef EV_USE_EPOLL
224# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 287# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
225# define EV_USE_EPOLL 1 288# define EV_USE_EPOLL EV_FEATURE_BACKENDS
226# else 289# else
227# define EV_USE_EPOLL 0 290# define EV_USE_EPOLL 0
228# endif 291# endif
229#endif 292#endif
230 293
… …
236# define EV_USE_PORT 0 299# define EV_USE_PORT 0
237#endif 300#endif
238 301
239#ifndef EV_USE_INOTIFY 302#ifndef EV_USE_INOTIFY
240# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
241# define EV_USE_INOTIFY 1 304# define EV_USE_INOTIFY EV_FEATURE_OS
242# else 305# else
243# define EV_USE_INOTIFY 0 306# define EV_USE_INOTIFY 0
244# endif 307# endif
245#endif 308#endif
246 309
247#ifndef EV_PID_HASHSIZE 310#ifndef EV_PID_HASHSIZE
248# if EV_MINIMAL 311# 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 312#endif
254 313
255#ifndef EV_INOTIFY_HASHSIZE 314#ifndef EV_INOTIFY_HASHSIZE
256# if EV_MINIMAL 315# 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 316#endif
262 317
263#ifndef EV_USE_EVENTFD 318#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 319# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 320# define EV_USE_EVENTFD EV_FEATURE_OS
266# else 321# else
267# define EV_USE_EVENTFD 0 322# define EV_USE_EVENTFD 0
323# endif
324#endif
325
326#ifndef EV_USE_SIGNALFD
327# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
328# define EV_USE_SIGNALFD EV_FEATURE_OS
329# else
330# define EV_USE_SIGNALFD 0
268# endif 331# endif
269#endif 332#endif
270 333
271#if 0 /* debugging */ 334#if 0 /* debugging */
272# define EV_VERIFY 3 335# define EV_VERIFY 3
273# define EV_USE_4HEAP 1 336# define EV_USE_4HEAP 1
274# define EV_HEAP_CACHE_AT 1 337# define EV_HEAP_CACHE_AT 1
275#endif 338#endif
276 339
277#ifndef EV_VERIFY 340#ifndef EV_VERIFY
278# define EV_VERIFY !EV_MINIMAL 341# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
279#endif 342#endif
280 343
281#ifndef EV_USE_4HEAP 344#ifndef EV_USE_4HEAP
282# define EV_USE_4HEAP !EV_MINIMAL 345# define EV_USE_4HEAP EV_FEATURE_DATA
283#endif 346#endif
284 347
285#ifndef EV_HEAP_CACHE_AT 348#ifndef EV_HEAP_CACHE_AT
286# define EV_HEAP_CACHE_AT !EV_MINIMAL 349# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
287#endif
288
289/* this block fixes any misconfiguration where we know we run into trouble otherwise */
290
291#ifndef CLOCK_MONOTONIC
292# undef EV_USE_MONOTONIC
293# define EV_USE_MONOTONIC 0
294#endif
295
296#ifndef CLOCK_REALTIME
297# undef EV_USE_REALTIME
298# define EV_USE_REALTIME 0
299#endif
300
301#if !EV_STAT_ENABLE
302# undef EV_USE_INOTIFY
303# define EV_USE_INOTIFY 0
304#endif
305
306#if !EV_USE_NANOSLEEP
307# ifndef _WIN32
308# include <sys/select.h>
309# endif
310#endif
311
312#if EV_USE_INOTIFY
313# include <sys/utsname.h>
314# include <sys/statfs.h>
315# include <sys/inotify.h>
316/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
317# ifndef IN_DONT_FOLLOW
318# undef EV_USE_INOTIFY
319# define EV_USE_INOTIFY 0
320# endif
321#endif
322
323#if EV_SELECT_IS_WINSOCKET
324# include <winsock.h>
325#endif 350#endif
326 351
327/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 352/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
328/* which makes programs even slower. might work on other unices, too. */ 353/* which makes programs even slower. might work on other unices, too. */
329#if EV_USE_CLOCK_SYSCALL 354#if EV_USE_CLOCK_SYSCALL
… …
336# undef EV_USE_CLOCK_SYSCALL 361# undef EV_USE_CLOCK_SYSCALL
337# define EV_USE_CLOCK_SYSCALL 0 362# define EV_USE_CLOCK_SYSCALL 0
338# endif 363# endif
339#endif 364#endif
340 365
366/* this block fixes any misconfiguration where we know we run into trouble otherwise */
367
368#ifdef _AIX
369/* AIX has a completely broken poll.h header */
370# undef EV_USE_POLL
371# define EV_USE_POLL 0
372#endif
373
374#ifndef CLOCK_MONOTONIC
375# undef EV_USE_MONOTONIC
376# define EV_USE_MONOTONIC 0
377#endif
378
379#ifndef CLOCK_REALTIME
380# undef EV_USE_REALTIME
381# define EV_USE_REALTIME 0
382#endif
383
384#if !EV_STAT_ENABLE
385# undef EV_USE_INOTIFY
386# define EV_USE_INOTIFY 0
387#endif
388
389#if !EV_USE_NANOSLEEP
390/* hp-ux has it in sys/time.h, which we unconditionally include above */
391# if !defined(_WIN32) && !defined(__hpux)
392# include <sys/select.h>
393# endif
394#endif
395
396#if EV_USE_INOTIFY
397# include <sys/statfs.h>
398# include <sys/inotify.h>
399/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
400# ifndef IN_DONT_FOLLOW
401# undef EV_USE_INOTIFY
402# define EV_USE_INOTIFY 0
403# endif
404#endif
405
406#if EV_SELECT_IS_WINSOCKET
407# include <winsock.h>
408#endif
409
341#if EV_USE_EVENTFD 410#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 411/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 412# include <stdint.h>
344# ifdef __cplusplus 413# ifndef EFD_NONBLOCK
345extern "C" { 414# define EFD_NONBLOCK O_NONBLOCK
346# endif 415# endif
347int eventfd (unsigned int initval, int flags); 416# ifndef EFD_CLOEXEC
348# ifdef __cplusplus 417# ifdef O_CLOEXEC
349} 418# define EFD_CLOEXEC O_CLOEXEC
419# else
420# define EFD_CLOEXEC 02000000
421# endif
350# endif 422# endif
423EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
424#endif
425
426#if EV_USE_SIGNALFD
427/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
428# include <stdint.h>
429# ifndef SFD_NONBLOCK
430# define SFD_NONBLOCK O_NONBLOCK
431# endif
432# ifndef SFD_CLOEXEC
433# ifdef O_CLOEXEC
434# define SFD_CLOEXEC O_CLOEXEC
435# else
436# define SFD_CLOEXEC 02000000
437# endif
438# endif
439EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
440
441struct signalfd_siginfo
442{
443 uint32_t ssi_signo;
444 char pad[128 - sizeof (uint32_t)];
445};
351#endif 446#endif
352 447
353/**/ 448/**/
354 449
355#if EV_VERIFY >= 3 450#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 451# define EV_FREQUENT_CHECK ev_verify (EV_A)
357#else 452#else
358# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
359#endif 454#endif
360 455
361/* 456/*
362 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
363 * It is added to ev_rt_now when scheduling periodics
364 * to ensure progress, time-wise, even when rounding
365 * errors are against us.
366 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
367 * Better solutions welcome.
368 */ 459 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define MIN_INTERVAL 0.0001220703125 /* 1/2**13, good till 4000 */
461/*#define MIN_INTERVAL 0.00000095367431640625 /* 1/2**20, good till 2200 */
370 462
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 463#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) */ 464#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 */
374 465
375#if __GNUC__ >= 4 466#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
376# define expect(expr,value) __builtin_expect ((expr),(value)) 467#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
377# define noinline __attribute__ ((noinline)) 468
469/* the following are taken from libecb */
470/* ecb.h start */
471
472/* many compilers define _GNUC_ to some versions but then only implement
473 * what their idiot authors think are the "more important" extensions,
474 * causing enourmous grief in return for some better fake benchmark numbers.
475 * or so.
476 * we try to detect these and simply assume they are not gcc - if they have
477 * an issue with that they should have done it right in the first place.
478 */
479#ifndef ECB_GCC_VERSION
480 #if !defined(__GNUC_MINOR__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__llvm__) || defined(__clang__)
481 #define ECB_GCC_VERSION(major,minor) 0
482 #else
483 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
484 #endif
485#endif
486
487#if __cplusplus
488 #define ecb_inline static inline
489#elif ECB_GCC_VERSION(2,5)
490 #define ecb_inline static __inline__
491#elif ECB_C99
492 #define ecb_inline static inline
378#else 493#else
379# define expect(expr,value) (expr) 494 #define ecb_inline static
380# define noinline
381# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
382# define inline
383# endif 495#endif
496
497#ifndef ECB_MEMORY_FENCE
498 #if ECB_GCC_VERSION(2,5)
499 #if __x86
500 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
501 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
502 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
503 #elif __amd64
504 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
505 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory")
506 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence")
507 #endif
384#endif 508 #endif
509#endif
385 510
511#ifndef ECB_MEMORY_FENCE
512 #if ECB_GCC_VERSION(4,4)
513 #define ECB_MEMORY_FENCE __sync_synchronize ()
514 #define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); })
515 #define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); })
516 #elif defined(_WIN32) && defined(MemoryBarrier)
517 #define ECB_MEMORY_FENCE MemoryBarrier ()
518 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
519 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
520 #endif
521#endif
522
523#ifndef ECB_MEMORY_FENCE
524 #include <pthread.h>
525
526 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
527 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
528 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
529 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
530#endif
531
532#if ECB_GCC_VERSION(3,1)
533 #define ecb_attribute(attrlist) __attribute__(attrlist)
534 #define ecb_is_constant(expr) __builtin_constant_p (expr)
535 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
536 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
537#else
538 #define ecb_attribute(attrlist)
539 #define ecb_is_constant(expr) 0
540 #define ecb_expect(expr,value) (expr)
541 #define ecb_prefetch(addr,rw,locality)
542#endif
543
544#define ecb_noinline ecb_attribute ((__noinline__))
545#define ecb_noreturn ecb_attribute ((__noreturn__))
546#define ecb_unused ecb_attribute ((__unused__))
547#define ecb_const ecb_attribute ((__const__))
548#define ecb_pure ecb_attribute ((__pure__))
549
550#if ECB_GCC_VERSION(4,3)
551 #define ecb_artificial ecb_attribute ((__artificial__))
552 #define ecb_hot ecb_attribute ((__hot__))
553 #define ecb_cold ecb_attribute ((__cold__))
554#else
555 #define ecb_artificial
556 #define ecb_hot
557 #define ecb_cold
558#endif
559
560/* put around conditional expressions if you are very sure that the */
561/* expression is mostly true or mostly false. note that these return */
562/* booleans, not the expression. */
386#define expect_false(expr) expect ((expr) != 0, 0) 563#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
387#define expect_true(expr) expect ((expr) != 0, 1) 564#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
565/* ecb.h end */
566
567#define expect_false(cond) ecb_expect_false (cond)
568#define expect_true(cond) ecb_expect_true (cond)
569#define noinline ecb_noinline
570
388#define inline_size static inline 571#define inline_size ecb_inline
389 572
390#if EV_MINIMAL 573#if EV_FEATURE_CODE
574# define inline_speed ecb_inline
575#else
391# define inline_speed static noinline 576# define inline_speed static noinline
577#endif
578
579#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
580
581#if EV_MINPRI == EV_MAXPRI
582# define ABSPRI(w) (((W)w), 0)
392#else 583#else
393# define inline_speed static inline
394#endif
395
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 584# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
585#endif
398 586
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 587#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 588#define EMPTY2(a,b) /* used to suppress some warnings */
401 589
402typedef ev_watcher *W; 590typedef ev_watcher *W;
… …
406#define ev_active(w) ((W)(w))->active 594#define ev_active(w) ((W)(w))->active
407#define ev_at(w) ((WT)(w))->at 595#define ev_at(w) ((WT)(w))->at
408 596
409#if EV_USE_REALTIME 597#if EV_USE_REALTIME
410/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 598/* sig_atomic_t is used to avoid per-thread variables or locking but still */
411/* giving it a reasonably high chance of working on typical architetcures */ 599/* giving it a reasonably high chance of working on typical architectures */
412static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 600static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
413#endif 601#endif
414 602
415#if EV_USE_MONOTONIC 603#if EV_USE_MONOTONIC
416static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 604static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
417#endif 605#endif
418 606
607#ifndef EV_FD_TO_WIN32_HANDLE
608# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
609#endif
610#ifndef EV_WIN32_HANDLE_TO_FD
611# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
612#endif
613#ifndef EV_WIN32_CLOSE_FD
614# define EV_WIN32_CLOSE_FD(fd) close (fd)
615#endif
616
419#ifdef _WIN32 617#ifdef _WIN32
420# include "ev_win32.c" 618# include "ev_win32.c"
421#endif 619#endif
422 620
423/*****************************************************************************/ 621/*****************************************************************************/
424 622
623/* define a suitable floor function (only used by periodics atm) */
624
625#if EV_USE_FLOOR
626# include <math.h>
627# define ev_floor(v) floor (v)
628#else
629
630#include <float.h>
631
632/* a floor() replacement function, should be independent of ev_tstamp type */
633static ev_tstamp noinline
634ev_floor (ev_tstamp v)
635{
636 /* the choice of shift factor is not terribly important */
637#if FLT_RADIX != 2 /* assume FLT_RADIX == 10 */
638 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 10000000000000000000. : 1000000000.;
639#else
640 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 18446744073709551616. : 4294967296.;
641#endif
642
643 /* argument too large for an unsigned long? */
644 if (expect_false (v >= shift))
645 {
646 ev_tstamp f;
647
648 if (v == v - 1.)
649 return v; /* very large number */
650
651 f = shift * ev_floor (v * (1. / shift));
652 return f + ev_floor (v - f);
653 }
654
655 /* special treatment for negative args? */
656 if (expect_false (v < 0.))
657 {
658 ev_tstamp f = -ev_floor (-v);
659
660 return f - (f == v ? 0 : 1);
661 }
662
663 /* fits into an unsigned long */
664 return (unsigned long)v;
665}
666
667#endif
668
669/*****************************************************************************/
670
671#ifdef __linux
672# include <sys/utsname.h>
673#endif
674
675static unsigned int noinline ecb_cold
676ev_linux_version (void)
677{
678#ifdef __linux
679 unsigned int v = 0;
680 struct utsname buf;
681 int i;
682 char *p = buf.release;
683
684 if (uname (&buf))
685 return 0;
686
687 for (i = 3+1; --i; )
688 {
689 unsigned int c = 0;
690
691 for (;;)
692 {
693 if (*p >= '0' && *p <= '9')
694 c = c * 10 + *p++ - '0';
695 else
696 {
697 p += *p == '.';
698 break;
699 }
700 }
701
702 v = (v << 8) | c;
703 }
704
705 return v;
706#else
707 return 0;
708#endif
709}
710
711/*****************************************************************************/
712
713#if EV_AVOID_STDIO
714static void noinline ecb_cold
715ev_printerr (const char *msg)
716{
717 write (STDERR_FILENO, msg, strlen (msg));
718}
719#endif
720
425static void (*syserr_cb)(const char *msg); 721static void (*syserr_cb)(const char *msg);
426 722
427void 723void ecb_cold
428ev_set_syserr_cb (void (*cb)(const char *msg)) 724ev_set_syserr_cb (void (*cb)(const char *msg))
429{ 725{
430 syserr_cb = cb; 726 syserr_cb = cb;
431} 727}
432 728
433static void noinline 729static void noinline ecb_cold
434ev_syserr (const char *msg) 730ev_syserr (const char *msg)
435{ 731{
436 if (!msg) 732 if (!msg)
437 msg = "(libev) system error"; 733 msg = "(libev) system error";
438 734
439 if (syserr_cb) 735 if (syserr_cb)
440 syserr_cb (msg); 736 syserr_cb (msg);
441 else 737 else
442 { 738 {
739#if EV_AVOID_STDIO
740 ev_printerr (msg);
741 ev_printerr (": ");
742 ev_printerr (strerror (errno));
743 ev_printerr ("\n");
744#else
443 perror (msg); 745 perror (msg);
746#endif
444 abort (); 747 abort ();
445 } 748 }
446} 749}
447 750
448static void * 751static void *
449ev_realloc_emul (void *ptr, long size) 752ev_realloc_emul (void *ptr, long size)
450{ 753{
754#if __GLIBC__
755 return realloc (ptr, size);
756#else
451 /* some systems, notably openbsd and darwin, fail to properly 757 /* some systems, notably openbsd and darwin, fail to properly
452 * implement realloc (x, 0) (as required by both ansi c-98 and 758 * implement realloc (x, 0) (as required by both ansi c-89 and
453 * the single unix specification, so work around them here. 759 * the single unix specification, so work around them here.
454 */ 760 */
455 761
456 if (size) 762 if (size)
457 return realloc (ptr, size); 763 return realloc (ptr, size);
458 764
459 free (ptr); 765 free (ptr);
460 return 0; 766 return 0;
767#endif
461} 768}
462 769
463static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 770static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
464 771
465void 772void ecb_cold
466ev_set_allocator (void *(*cb)(void *ptr, long size)) 773ev_set_allocator (void *(*cb)(void *ptr, long size))
467{ 774{
468 alloc = cb; 775 alloc = cb;
469} 776}
470 777
… …
473{ 780{
474 ptr = alloc (ptr, size); 781 ptr = alloc (ptr, size);
475 782
476 if (!ptr && size) 783 if (!ptr && size)
477 { 784 {
785#if EV_AVOID_STDIO
786 ev_printerr ("(libev) memory allocation failed, aborting.\n");
787#else
478 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 788 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
789#endif
479 abort (); 790 abort ();
480 } 791 }
481 792
482 return ptr; 793 return ptr;
483} 794}
… …
485#define ev_malloc(size) ev_realloc (0, (size)) 796#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 797#define ev_free(ptr) ev_realloc ((ptr), 0)
487 798
488/*****************************************************************************/ 799/*****************************************************************************/
489 800
801/* set in reify when reification needed */
802#define EV_ANFD_REIFY 1
803
490/* file descriptor info structure */ 804/* file descriptor info structure */
491typedef struct 805typedef struct
492{ 806{
493 WL head; 807 WL head;
494 unsigned char events; /* the events watched for */ 808 unsigned char events; /* the events watched for */
495 unsigned char reify; /* flag set when this ANFD needs reification */ 809 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
496 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 810 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
497 unsigned char unused; 811 unsigned char unused;
498#if EV_USE_EPOLL 812#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 813 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 814#endif
501#if EV_SELECT_IS_WINSOCKET 815#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
502 SOCKET handle; 816 SOCKET handle;
817#endif
818#if EV_USE_IOCP
819 OVERLAPPED or, ow;
503#endif 820#endif
504} ANFD; 821} ANFD;
505 822
506/* stores the pending event set for a given watcher */ 823/* stores the pending event set for a given watcher */
507typedef struct 824typedef struct
… …
562 879
563 static int ev_default_loop_ptr; 880 static int ev_default_loop_ptr;
564 881
565#endif 882#endif
566 883
884#if EV_FEATURE_API
885# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
886# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
887# define EV_INVOKE_PENDING invoke_cb (EV_A)
888#else
889# define EV_RELEASE_CB (void)0
890# define EV_ACQUIRE_CB (void)0
891# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
892#endif
893
894#define EVBREAK_RECURSE 0x80
895
567/*****************************************************************************/ 896/*****************************************************************************/
568 897
898#ifndef EV_HAVE_EV_TIME
569ev_tstamp 899ev_tstamp
570ev_time (void) 900ev_time (void)
571{ 901{
572#if EV_USE_REALTIME 902#if EV_USE_REALTIME
573 if (expect_true (have_realtime)) 903 if (expect_true (have_realtime))
… …
580 910
581 struct timeval tv; 911 struct timeval tv;
582 gettimeofday (&tv, 0); 912 gettimeofday (&tv, 0);
583 return tv.tv_sec + tv.tv_usec * 1e-6; 913 return tv.tv_sec + tv.tv_usec * 1e-6;
584} 914}
915#endif
585 916
586inline_size ev_tstamp 917inline_size ev_tstamp
587get_clock (void) 918get_clock (void)
588{ 919{
589#if EV_USE_MONOTONIC 920#if EV_USE_MONOTONIC
… …
612 if (delay > 0.) 943 if (delay > 0.)
613 { 944 {
614#if EV_USE_NANOSLEEP 945#if EV_USE_NANOSLEEP
615 struct timespec ts; 946 struct timespec ts;
616 947
617 ts.tv_sec = (time_t)delay; 948 EV_TS_SET (ts, delay);
618 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
619
620 nanosleep (&ts, 0); 949 nanosleep (&ts, 0);
621#elif defined(_WIN32) 950#elif defined(_WIN32)
622 Sleep ((unsigned long)(delay * 1e3)); 951 Sleep ((unsigned long)(delay * 1e3));
623#else 952#else
624 struct timeval tv; 953 struct timeval tv;
625 954
626 tv.tv_sec = (time_t)delay;
627 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
628
629 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 955 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
630 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 956 /* something not guaranteed by newer posix versions, but guaranteed */
631 /* by older ones */ 957 /* by older ones */
958 EV_TV_SET (tv, delay);
632 select (0, 0, 0, 0, &tv); 959 select (0, 0, 0, 0, &tv);
633#endif 960#endif
634 } 961 }
635} 962}
636 963
637/*****************************************************************************/ 964/*****************************************************************************/
638 965
639#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 966#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
640 967
641/* find a suitable new size for the given array, */ 968/* find a suitable new size for the given array, */
642/* hopefully by rounding to a ncie-to-malloc size */ 969/* hopefully by rounding to a nice-to-malloc size */
643inline_size int 970inline_size int
644array_nextsize (int elem, int cur, int cnt) 971array_nextsize (int elem, int cur, int cnt)
645{ 972{
646 int ncur = cur + 1; 973 int ncur = cur + 1;
647 974
… …
659 } 986 }
660 987
661 return ncur; 988 return ncur;
662} 989}
663 990
664static noinline void * 991static void * noinline ecb_cold
665array_realloc (int elem, void *base, int *cur, int cnt) 992array_realloc (int elem, void *base, int *cur, int cnt)
666{ 993{
667 *cur = array_nextsize (elem, *cur, cnt); 994 *cur = array_nextsize (elem, *cur, cnt);
668 return ev_realloc (base, elem * *cur); 995 return ev_realloc (base, elem * *cur);
669} 996}
… …
672 memset ((void *)(base), 0, sizeof (*(base)) * (count)) 999 memset ((void *)(base), 0, sizeof (*(base)) * (count))
673 1000
674#define array_needsize(type,base,cur,cnt,init) \ 1001#define array_needsize(type,base,cur,cnt,init) \
675 if (expect_false ((cnt) > (cur))) \ 1002 if (expect_false ((cnt) > (cur))) \
676 { \ 1003 { \
677 int ocur_ = (cur); \ 1004 int ecb_unused ocur_ = (cur); \
678 (base) = (type *)array_realloc \ 1005 (base) = (type *)array_realloc \
679 (sizeof (type), (base), &(cur), (cnt)); \ 1006 (sizeof (type), (base), &(cur), (cnt)); \
680 init ((base) + (ocur_), (cur) - ocur_); \ 1007 init ((base) + (ocur_), (cur) - ocur_); \
681 } 1008 }
682 1009
… …
743} 1070}
744 1071
745/*****************************************************************************/ 1072/*****************************************************************************/
746 1073
747inline_speed void 1074inline_speed void
748fd_event (EV_P_ int fd, int revents) 1075fd_event_nocheck (EV_P_ int fd, int revents)
749{ 1076{
750 ANFD *anfd = anfds + fd; 1077 ANFD *anfd = anfds + fd;
751 ev_io *w; 1078 ev_io *w;
752 1079
753 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1080 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
757 if (ev) 1084 if (ev)
758 ev_feed_event (EV_A_ (W)w, ev); 1085 ev_feed_event (EV_A_ (W)w, ev);
759 } 1086 }
760} 1087}
761 1088
1089/* do not submit kernel events for fds that have reify set */
1090/* because that means they changed while we were polling for new events */
1091inline_speed void
1092fd_event (EV_P_ int fd, int revents)
1093{
1094 ANFD *anfd = anfds + fd;
1095
1096 if (expect_true (!anfd->reify))
1097 fd_event_nocheck (EV_A_ fd, revents);
1098}
1099
762void 1100void
763ev_feed_fd_event (EV_P_ int fd, int revents) 1101ev_feed_fd_event (EV_P_ int fd, int revents)
764{ 1102{
765 if (fd >= 0 && fd < anfdmax) 1103 if (fd >= 0 && fd < anfdmax)
766 fd_event (EV_A_ fd, revents); 1104 fd_event_nocheck (EV_A_ fd, revents);
767} 1105}
768 1106
769/* make sure the external fd watch events are in-sync */ 1107/* make sure the external fd watch events are in-sync */
770/* with the kernel/libev internal state */ 1108/* with the kernel/libev internal state */
771inline_size void 1109inline_size void
772fd_reify (EV_P) 1110fd_reify (EV_P)
773{ 1111{
774 int i; 1112 int i;
775 1113
1114#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1115 for (i = 0; i < fdchangecnt; ++i)
1116 {
1117 int fd = fdchanges [i];
1118 ANFD *anfd = anfds + fd;
1119
1120 if (anfd->reify & EV__IOFDSET && anfd->head)
1121 {
1122 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1123
1124 if (handle != anfd->handle)
1125 {
1126 unsigned long arg;
1127
1128 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1129
1130 /* handle changed, but fd didn't - we need to do it in two steps */
1131 backend_modify (EV_A_ fd, anfd->events, 0);
1132 anfd->events = 0;
1133 anfd->handle = handle;
1134 }
1135 }
1136 }
1137#endif
1138
776 for (i = 0; i < fdchangecnt; ++i) 1139 for (i = 0; i < fdchangecnt; ++i)
777 { 1140 {
778 int fd = fdchanges [i]; 1141 int fd = fdchanges [i];
779 ANFD *anfd = anfds + fd; 1142 ANFD *anfd = anfds + fd;
780 ev_io *w; 1143 ev_io *w;
781 1144
782 unsigned char events = 0; 1145 unsigned char o_events = anfd->events;
1146 unsigned char o_reify = anfd->reify;
783 1147
784 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1148 anfd->reify = 0;
785 events |= (unsigned char)w->events;
786 1149
787#if EV_SELECT_IS_WINSOCKET 1150 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
788 if (events)
789 { 1151 {
790 unsigned long arg; 1152 anfd->events = 0;
791 #ifdef EV_FD_TO_WIN32_HANDLE 1153
792 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 1154 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
793 #else 1155 anfd->events |= (unsigned char)w->events;
794 anfd->handle = _get_osfhandle (fd); 1156
795 #endif 1157 if (o_events != anfd->events)
796 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 1158 o_reify = EV__IOFDSET; /* actually |= */
797 } 1159 }
798#endif
799 1160
800 { 1161 if (o_reify & EV__IOFDSET)
801 unsigned char o_events = anfd->events;
802 unsigned char o_reify = anfd->reify;
803
804 anfd->reify = 0;
805 anfd->events = events;
806
807 if (o_events != events || o_reify & EV__IOFDSET)
808 backend_modify (EV_A_ fd, o_events, events); 1162 backend_modify (EV_A_ fd, o_events, anfd->events);
809 }
810 } 1163 }
811 1164
812 fdchangecnt = 0; 1165 fdchangecnt = 0;
813} 1166}
814 1167
… …
826 fdchanges [fdchangecnt - 1] = fd; 1179 fdchanges [fdchangecnt - 1] = fd;
827 } 1180 }
828} 1181}
829 1182
830/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */ 1183/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
831inline_speed void 1184inline_speed void ecb_cold
832fd_kill (EV_P_ int fd) 1185fd_kill (EV_P_ int fd)
833{ 1186{
834 ev_io *w; 1187 ev_io *w;
835 1188
836 while ((w = (ev_io *)anfds [fd].head)) 1189 while ((w = (ev_io *)anfds [fd].head))
… …
838 ev_io_stop (EV_A_ w); 1191 ev_io_stop (EV_A_ w);
839 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1192 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
840 } 1193 }
841} 1194}
842 1195
843/* check whether the given fd is atcually valid, for error recovery */ 1196/* check whether the given fd is actually valid, for error recovery */
844inline_size int 1197inline_size int ecb_cold
845fd_valid (int fd) 1198fd_valid (int fd)
846{ 1199{
847#ifdef _WIN32 1200#ifdef _WIN32
848 return _get_osfhandle (fd) != -1; 1201 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
849#else 1202#else
850 return fcntl (fd, F_GETFD) != -1; 1203 return fcntl (fd, F_GETFD) != -1;
851#endif 1204#endif
852} 1205}
853 1206
854/* called on EBADF to verify fds */ 1207/* called on EBADF to verify fds */
855static void noinline 1208static void noinline ecb_cold
856fd_ebadf (EV_P) 1209fd_ebadf (EV_P)
857{ 1210{
858 int fd; 1211 int fd;
859 1212
860 for (fd = 0; fd < anfdmax; ++fd) 1213 for (fd = 0; fd < anfdmax; ++fd)
… …
862 if (!fd_valid (fd) && errno == EBADF) 1215 if (!fd_valid (fd) && errno == EBADF)
863 fd_kill (EV_A_ fd); 1216 fd_kill (EV_A_ fd);
864} 1217}
865 1218
866/* called on ENOMEM in select/poll to kill some fds and retry */ 1219/* called on ENOMEM in select/poll to kill some fds and retry */
867static void noinline 1220static void noinline ecb_cold
868fd_enomem (EV_P) 1221fd_enomem (EV_P)
869{ 1222{
870 int fd; 1223 int fd;
871 1224
872 for (fd = anfdmax; fd--; ) 1225 for (fd = anfdmax; fd--; )
873 if (anfds [fd].events) 1226 if (anfds [fd].events)
874 { 1227 {
875 fd_kill (EV_A_ fd); 1228 fd_kill (EV_A_ fd);
876 return; 1229 break;
877 } 1230 }
878} 1231}
879 1232
880/* usually called after fork if backend needs to re-arm all fds from scratch */ 1233/* usually called after fork if backend needs to re-arm all fds from scratch */
881static void noinline 1234static void noinline
… …
886 for (fd = 0; fd < anfdmax; ++fd) 1239 for (fd = 0; fd < anfdmax; ++fd)
887 if (anfds [fd].events) 1240 if (anfds [fd].events)
888 { 1241 {
889 anfds [fd].events = 0; 1242 anfds [fd].events = 0;
890 anfds [fd].emask = 0; 1243 anfds [fd].emask = 0;
891 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1244 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
892 } 1245 }
893} 1246}
894 1247
1248/* used to prepare libev internal fd's */
1249/* this is not fork-safe */
1250inline_speed void
1251fd_intern (int fd)
1252{
1253#ifdef _WIN32
1254 unsigned long arg = 1;
1255 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1256#else
1257 fcntl (fd, F_SETFD, FD_CLOEXEC);
1258 fcntl (fd, F_SETFL, O_NONBLOCK);
1259#endif
1260}
1261
895/*****************************************************************************/ 1262/*****************************************************************************/
896 1263
897/* 1264/*
898 * the heap functions want a real array index. array index 0 uis guaranteed to not 1265 * the heap functions want a real array index. array index 0 is guaranteed to not
899 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1266 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
900 * the branching factor of the d-tree. 1267 * the branching factor of the d-tree.
901 */ 1268 */
902 1269
903/* 1270/*
… …
971 1338
972 for (;;) 1339 for (;;)
973 { 1340 {
974 int c = k << 1; 1341 int c = k << 1;
975 1342
976 if (c > N + HEAP0 - 1) 1343 if (c >= N + HEAP0)
977 break; 1344 break;
978 1345
979 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1346 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
980 ? 1 : 0; 1347 ? 1 : 0;
981 1348
… …
1017 1384
1018/* move an element suitably so it is in a correct place */ 1385/* move an element suitably so it is in a correct place */
1019inline_size void 1386inline_size void
1020adjustheap (ANHE *heap, int N, int k) 1387adjustheap (ANHE *heap, int N, int k)
1021{ 1388{
1022 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1389 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1023 upheap (heap, k); 1390 upheap (heap, k);
1024 else 1391 else
1025 downheap (heap, N, k); 1392 downheap (heap, N, k);
1026} 1393}
1027 1394
… …
1040/*****************************************************************************/ 1407/*****************************************************************************/
1041 1408
1042/* associate signal watchers to a signal signal */ 1409/* associate signal watchers to a signal signal */
1043typedef struct 1410typedef struct
1044{ 1411{
1412 EV_ATOMIC_T pending;
1413#if EV_MULTIPLICITY
1414 EV_P;
1415#endif
1045 WL head; 1416 WL head;
1046 EV_ATOMIC_T gotsig;
1047} ANSIG; 1417} ANSIG;
1048 1418
1049static ANSIG *signals; 1419static ANSIG signals [EV_NSIG - 1];
1050static int signalmax;
1051
1052static EV_ATOMIC_T gotsig;
1053 1420
1054/*****************************************************************************/ 1421/*****************************************************************************/
1055 1422
1056/* used to prepare libev internal fd's */ 1423#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1057/* this is not fork-safe */
1058inline_speed void
1059fd_intern (int fd)
1060{
1061#ifdef _WIN32
1062 unsigned long arg = 1;
1063 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1064#else
1065 fcntl (fd, F_SETFD, FD_CLOEXEC);
1066 fcntl (fd, F_SETFL, O_NONBLOCK);
1067#endif
1068}
1069 1424
1070static void noinline 1425static void noinline ecb_cold
1071evpipe_init (EV_P) 1426evpipe_init (EV_P)
1072{ 1427{
1073 if (!ev_is_active (&pipe_w)) 1428 if (!ev_is_active (&pipe_w))
1074 { 1429 {
1075#if EV_USE_EVENTFD 1430# if EV_USE_EVENTFD
1431 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1432 if (evfd < 0 && errno == EINVAL)
1076 if ((evfd = eventfd (0, 0)) >= 0) 1433 evfd = eventfd (0, 0);
1434
1435 if (evfd >= 0)
1077 { 1436 {
1078 evpipe [0] = -1; 1437 evpipe [0] = -1;
1079 fd_intern (evfd); 1438 fd_intern (evfd); /* doing it twice doesn't hurt */
1080 ev_io_set (&pipe_w, evfd, EV_READ); 1439 ev_io_set (&pipe_w, evfd, EV_READ);
1081 } 1440 }
1082 else 1441 else
1083#endif 1442# endif
1084 { 1443 {
1085 while (pipe (evpipe)) 1444 while (pipe (evpipe))
1086 ev_syserr ("(libev) error creating signal/async pipe"); 1445 ev_syserr ("(libev) error creating signal/async pipe");
1087 1446
1088 fd_intern (evpipe [0]); 1447 fd_intern (evpipe [0]);
… …
1093 ev_io_start (EV_A_ &pipe_w); 1452 ev_io_start (EV_A_ &pipe_w);
1094 ev_unref (EV_A); /* watcher should not keep loop alive */ 1453 ev_unref (EV_A); /* watcher should not keep loop alive */
1095 } 1454 }
1096} 1455}
1097 1456
1098inline_size void 1457inline_speed void
1099evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1458evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1100{ 1459{
1101 if (!*flag) 1460 if (expect_true (*flag))
1461 return;
1462
1463 *flag = 1;
1464
1465 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1466
1467 pipe_write_skipped = 1;
1468
1469 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1470
1471 if (pipe_write_wanted)
1102 { 1472 {
1473 int old_errno;
1474
1475 pipe_write_skipped = 0; /* just an optimsiation, no fence needed */
1476
1103 int old_errno = errno; /* save errno because write might clobber it */ 1477 old_errno = errno; /* save errno because write will clobber it */
1104
1105 *flag = 1;
1106 1478
1107#if EV_USE_EVENTFD 1479#if EV_USE_EVENTFD
1108 if (evfd >= 0) 1480 if (evfd >= 0)
1109 { 1481 {
1110 uint64_t counter = 1; 1482 uint64_t counter = 1;
1111 write (evfd, &counter, sizeof (uint64_t)); 1483 write (evfd, &counter, sizeof (uint64_t));
1112 } 1484 }
1113 else 1485 else
1114#endif 1486#endif
1487 {
1488 /* win32 people keep sending patches that change this write() to send() */
1489 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1490 /* so when you think this write should be a send instead, please find out */
1491 /* where your send() is from - it's definitely not the microsoft send, and */
1492 /* tell me. thank you. */
1115 write (evpipe [1], &old_errno, 1); 1493 write (evpipe [1], &(evpipe [1]), 1);
1494 }
1116 1495
1117 errno = old_errno; 1496 errno = old_errno;
1118 } 1497 }
1119} 1498}
1120 1499
1121/* called whenever the libev signal pipe */ 1500/* called whenever the libev signal pipe */
1122/* got some events (signal, async) */ 1501/* got some events (signal, async) */
1123static void 1502static void
1124pipecb (EV_P_ ev_io *iow, int revents) 1503pipecb (EV_P_ ev_io *iow, int revents)
1125{ 1504{
1505 int i;
1506
1507 if (revents & EV_READ)
1508 {
1126#if EV_USE_EVENTFD 1509#if EV_USE_EVENTFD
1127 if (evfd >= 0) 1510 if (evfd >= 0)
1128 { 1511 {
1129 uint64_t counter; 1512 uint64_t counter;
1130 read (evfd, &counter, sizeof (uint64_t)); 1513 read (evfd, &counter, sizeof (uint64_t));
1131 } 1514 }
1132 else 1515 else
1133#endif 1516#endif
1134 { 1517 {
1135 char dummy; 1518 char dummy;
1519 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1136 read (evpipe [0], &dummy, 1); 1520 read (evpipe [0], &dummy, 1);
1521 }
1522 }
1523
1524 pipe_write_skipped = 0;
1525
1526#if EV_SIGNAL_ENABLE
1527 if (sig_pending)
1137 } 1528 {
1529 sig_pending = 0;
1138 1530
1139 if (gotsig && ev_is_default_loop (EV_A)) 1531 for (i = EV_NSIG - 1; i--; )
1140 { 1532 if (expect_false (signals [i].pending))
1141 int signum;
1142 gotsig = 0;
1143
1144 for (signum = signalmax; signum--; )
1145 if (signals [signum].gotsig)
1146 ev_feed_signal_event (EV_A_ signum + 1); 1533 ev_feed_signal_event (EV_A_ i + 1);
1147 } 1534 }
1535#endif
1148 1536
1149#if EV_ASYNC_ENABLE 1537#if EV_ASYNC_ENABLE
1150 if (gotasync) 1538 if (async_pending)
1151 { 1539 {
1152 int i; 1540 async_pending = 0;
1153 gotasync = 0;
1154 1541
1155 for (i = asynccnt; i--; ) 1542 for (i = asynccnt; i--; )
1156 if (asyncs [i]->sent) 1543 if (asyncs [i]->sent)
1157 { 1544 {
1158 asyncs [i]->sent = 0; 1545 asyncs [i]->sent = 0;
… …
1162#endif 1549#endif
1163} 1550}
1164 1551
1165/*****************************************************************************/ 1552/*****************************************************************************/
1166 1553
1554void
1555ev_feed_signal (int signum)
1556{
1557#if EV_MULTIPLICITY
1558 EV_P = signals [signum - 1].loop;
1559
1560 if (!EV_A)
1561 return;
1562#endif
1563
1564 if (!ev_active (&pipe_w))
1565 return;
1566
1567 signals [signum - 1].pending = 1;
1568 evpipe_write (EV_A_ &sig_pending);
1569}
1570
1167static void 1571static void
1168ev_sighandler (int signum) 1572ev_sighandler (int signum)
1169{ 1573{
1170#if EV_MULTIPLICITY
1171 struct ev_loop *loop = &default_loop_struct;
1172#endif
1173
1174#if _WIN32 1574#ifdef _WIN32
1175 signal (signum, ev_sighandler); 1575 signal (signum, ev_sighandler);
1176#endif 1576#endif
1177 1577
1178 signals [signum - 1].gotsig = 1; 1578 ev_feed_signal (signum);
1179 evpipe_write (EV_A_ &gotsig);
1180} 1579}
1181 1580
1182void noinline 1581void noinline
1183ev_feed_signal_event (EV_P_ int signum) 1582ev_feed_signal_event (EV_P_ int signum)
1184{ 1583{
1185 WL w; 1584 WL w;
1186 1585
1586 if (expect_false (signum <= 0 || signum > EV_NSIG))
1587 return;
1588
1589 --signum;
1590
1187#if EV_MULTIPLICITY 1591#if EV_MULTIPLICITY
1188 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1592 /* it is permissible to try to feed a signal to the wrong loop */
1189#endif 1593 /* or, likely more useful, feeding a signal nobody is waiting for */
1190 1594
1191 --signum; 1595 if (expect_false (signals [signum].loop != EV_A))
1192
1193 if (signum < 0 || signum >= signalmax)
1194 return; 1596 return;
1597#endif
1195 1598
1196 signals [signum].gotsig = 0; 1599 signals [signum].pending = 0;
1197 1600
1198 for (w = signals [signum].head; w; w = w->next) 1601 for (w = signals [signum].head; w; w = w->next)
1199 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1602 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1200} 1603}
1201 1604
1605#if EV_USE_SIGNALFD
1606static void
1607sigfdcb (EV_P_ ev_io *iow, int revents)
1608{
1609 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1610
1611 for (;;)
1612 {
1613 ssize_t res = read (sigfd, si, sizeof (si));
1614
1615 /* not ISO-C, as res might be -1, but works with SuS */
1616 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1617 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1618
1619 if (res < (ssize_t)sizeof (si))
1620 break;
1621 }
1622}
1623#endif
1624
1625#endif
1626
1202/*****************************************************************************/ 1627/*****************************************************************************/
1203 1628
1629#if EV_CHILD_ENABLE
1204static WL childs [EV_PID_HASHSIZE]; 1630static WL childs [EV_PID_HASHSIZE];
1205
1206#ifndef _WIN32
1207 1631
1208static ev_signal childev; 1632static ev_signal childev;
1209 1633
1210#ifndef WIFCONTINUED 1634#ifndef WIFCONTINUED
1211# define WIFCONTINUED(status) 0 1635# define WIFCONTINUED(status) 0
… …
1216child_reap (EV_P_ int chain, int pid, int status) 1640child_reap (EV_P_ int chain, int pid, int status)
1217{ 1641{
1218 ev_child *w; 1642 ev_child *w;
1219 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1643 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1220 1644
1221 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1645 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1222 { 1646 {
1223 if ((w->pid == pid || !w->pid) 1647 if ((w->pid == pid || !w->pid)
1224 && (!traced || (w->flags & 1))) 1648 && (!traced || (w->flags & 1)))
1225 { 1649 {
1226 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1650 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1251 /* make sure we are called again until all children have been reaped */ 1675 /* make sure we are called again until all children have been reaped */
1252 /* we need to do it this way so that the callback gets called before we continue */ 1676 /* we need to do it this way so that the callback gets called before we continue */
1253 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1677 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1254 1678
1255 child_reap (EV_A_ pid, pid, status); 1679 child_reap (EV_A_ pid, pid, status);
1256 if (EV_PID_HASHSIZE > 1) 1680 if ((EV_PID_HASHSIZE) > 1)
1257 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1681 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1258} 1682}
1259 1683
1260#endif 1684#endif
1261 1685
1262/*****************************************************************************/ 1686/*****************************************************************************/
1263 1687
1688#if EV_USE_IOCP
1689# include "ev_iocp.c"
1690#endif
1264#if EV_USE_PORT 1691#if EV_USE_PORT
1265# include "ev_port.c" 1692# include "ev_port.c"
1266#endif 1693#endif
1267#if EV_USE_KQUEUE 1694#if EV_USE_KQUEUE
1268# include "ev_kqueue.c" 1695# include "ev_kqueue.c"
… …
1275#endif 1702#endif
1276#if EV_USE_SELECT 1703#if EV_USE_SELECT
1277# include "ev_select.c" 1704# include "ev_select.c"
1278#endif 1705#endif
1279 1706
1280int 1707int ecb_cold
1281ev_version_major (void) 1708ev_version_major (void)
1282{ 1709{
1283 return EV_VERSION_MAJOR; 1710 return EV_VERSION_MAJOR;
1284} 1711}
1285 1712
1286int 1713int ecb_cold
1287ev_version_minor (void) 1714ev_version_minor (void)
1288{ 1715{
1289 return EV_VERSION_MINOR; 1716 return EV_VERSION_MINOR;
1290} 1717}
1291 1718
1292/* return true if we are running with elevated privileges and should ignore env variables */ 1719/* return true if we are running with elevated privileges and should ignore env variables */
1293int inline_size 1720int inline_size ecb_cold
1294enable_secure (void) 1721enable_secure (void)
1295{ 1722{
1296#ifdef _WIN32 1723#ifdef _WIN32
1297 return 0; 1724 return 0;
1298#else 1725#else
1299 return getuid () != geteuid () 1726 return getuid () != geteuid ()
1300 || getgid () != getegid (); 1727 || getgid () != getegid ();
1301#endif 1728#endif
1302} 1729}
1303 1730
1304unsigned int 1731unsigned int ecb_cold
1305ev_supported_backends (void) 1732ev_supported_backends (void)
1306{ 1733{
1307 unsigned int flags = 0; 1734 unsigned int flags = 0;
1308 1735
1309 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 1736 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
… …
1313 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 1740 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1314 1741
1315 return flags; 1742 return flags;
1316} 1743}
1317 1744
1318unsigned int 1745unsigned int ecb_cold
1319ev_recommended_backends (void) 1746ev_recommended_backends (void)
1320{ 1747{
1321 unsigned int flags = ev_supported_backends (); 1748 unsigned int flags = ev_supported_backends ();
1322 1749
1323#ifndef __NetBSD__ 1750#ifndef __NetBSD__
… …
1328#ifdef __APPLE__ 1755#ifdef __APPLE__
1329 /* only select works correctly on that "unix-certified" platform */ 1756 /* only select works correctly on that "unix-certified" platform */
1330 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1757 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1331 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1758 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1332#endif 1759#endif
1760#ifdef __FreeBSD__
1761 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1762#endif
1333 1763
1334 return flags; 1764 return flags;
1335} 1765}
1336 1766
1337unsigned int 1767unsigned int ecb_cold
1338ev_embeddable_backends (void) 1768ev_embeddable_backends (void)
1339{ 1769{
1340 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1770 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1341 1771
1342 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1772 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1343 /* please fix it and tell me how to detect the fix */ 1773 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1344 flags &= ~EVBACKEND_EPOLL; 1774 flags &= ~EVBACKEND_EPOLL;
1345 1775
1346 return flags; 1776 return flags;
1347} 1777}
1348 1778
1349unsigned int 1779unsigned int
1350ev_backend (EV_P) 1780ev_backend (EV_P)
1351{ 1781{
1352 return backend; 1782 return backend;
1353} 1783}
1354 1784
1785#if EV_FEATURE_API
1355unsigned int 1786unsigned int
1356ev_loop_count (EV_P) 1787ev_iteration (EV_P)
1357{ 1788{
1358 return loop_count; 1789 return loop_count;
1790}
1791
1792unsigned int
1793ev_depth (EV_P)
1794{
1795 return loop_depth;
1359} 1796}
1360 1797
1361void 1798void
1362ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1799ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1363{ 1800{
… …
1368ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1805ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1369{ 1806{
1370 timeout_blocktime = interval; 1807 timeout_blocktime = interval;
1371} 1808}
1372 1809
1810void
1811ev_set_userdata (EV_P_ void *data)
1812{
1813 userdata = data;
1814}
1815
1816void *
1817ev_userdata (EV_P)
1818{
1819 return userdata;
1820}
1821
1822void
1823ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1824{
1825 invoke_cb = invoke_pending_cb;
1826}
1827
1828void
1829ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1830{
1831 release_cb = release;
1832 acquire_cb = acquire;
1833}
1834#endif
1835
1373/* initialise a loop structure, must be zero-initialised */ 1836/* initialise a loop structure, must be zero-initialised */
1374static void noinline 1837static void noinline ecb_cold
1375loop_init (EV_P_ unsigned int flags) 1838loop_init (EV_P_ unsigned int flags)
1376{ 1839{
1377 if (!backend) 1840 if (!backend)
1378 { 1841 {
1842 origflags = flags;
1843
1379#if EV_USE_REALTIME 1844#if EV_USE_REALTIME
1380 if (!have_realtime) 1845 if (!have_realtime)
1381 { 1846 {
1382 struct timespec ts; 1847 struct timespec ts;
1383 1848
… …
1394 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1859 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1395 have_monotonic = 1; 1860 have_monotonic = 1;
1396 } 1861 }
1397#endif 1862#endif
1398 1863
1399 ev_rt_now = ev_time ();
1400 mn_now = get_clock ();
1401 now_floor = mn_now;
1402 rtmn_diff = ev_rt_now - mn_now;
1403
1404 io_blocktime = 0.;
1405 timeout_blocktime = 0.;
1406 backend = 0;
1407 backend_fd = -1;
1408 gotasync = 0;
1409#if EV_USE_INOTIFY
1410 fs_fd = -2;
1411#endif
1412
1413 /* pid check not overridable via env */ 1864 /* pid check not overridable via env */
1414#ifndef _WIN32 1865#ifndef _WIN32
1415 if (flags & EVFLAG_FORKCHECK) 1866 if (flags & EVFLAG_FORKCHECK)
1416 curpid = getpid (); 1867 curpid = getpid ();
1417#endif 1868#endif
… …
1419 if (!(flags & EVFLAG_NOENV) 1870 if (!(flags & EVFLAG_NOENV)
1420 && !enable_secure () 1871 && !enable_secure ()
1421 && getenv ("LIBEV_FLAGS")) 1872 && getenv ("LIBEV_FLAGS"))
1422 flags = atoi (getenv ("LIBEV_FLAGS")); 1873 flags = atoi (getenv ("LIBEV_FLAGS"));
1423 1874
1424 if (!(flags & 0x0000ffffU)) 1875 ev_rt_now = ev_time ();
1876 mn_now = get_clock ();
1877 now_floor = mn_now;
1878 rtmn_diff = ev_rt_now - mn_now;
1879#if EV_FEATURE_API
1880 invoke_cb = ev_invoke_pending;
1881#endif
1882
1883 io_blocktime = 0.;
1884 timeout_blocktime = 0.;
1885 backend = 0;
1886 backend_fd = -1;
1887 sig_pending = 0;
1888#if EV_ASYNC_ENABLE
1889 async_pending = 0;
1890#endif
1891 pipe_write_skipped = 0;
1892 pipe_write_wanted = 0;
1893#if EV_USE_INOTIFY
1894 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1895#endif
1896#if EV_USE_SIGNALFD
1897 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1898#endif
1899
1900 if (!(flags & EVBACKEND_MASK))
1425 flags |= ev_recommended_backends (); 1901 flags |= ev_recommended_backends ();
1426 1902
1903#if EV_USE_IOCP
1904 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1905#endif
1427#if EV_USE_PORT 1906#if EV_USE_PORT
1428 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1907 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1429#endif 1908#endif
1430#if EV_USE_KQUEUE 1909#if EV_USE_KQUEUE
1431 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1910 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1440 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1919 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1441#endif 1920#endif
1442 1921
1443 ev_prepare_init (&pending_w, pendingcb); 1922 ev_prepare_init (&pending_w, pendingcb);
1444 1923
1924#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1445 ev_init (&pipe_w, pipecb); 1925 ev_init (&pipe_w, pipecb);
1446 ev_set_priority (&pipe_w, EV_MAXPRI); 1926 ev_set_priority (&pipe_w, EV_MAXPRI);
1927#endif
1447 } 1928 }
1448} 1929}
1449 1930
1450/* free up a loop structure */ 1931/* free up a loop structure */
1451static void noinline 1932void ecb_cold
1452loop_destroy (EV_P) 1933ev_loop_destroy (EV_P)
1453{ 1934{
1454 int i; 1935 int i;
1455 1936
1937#if EV_MULTIPLICITY
1938 /* mimic free (0) */
1939 if (!EV_A)
1940 return;
1941#endif
1942
1943#if EV_CLEANUP_ENABLE
1944 /* queue cleanup watchers (and execute them) */
1945 if (expect_false (cleanupcnt))
1946 {
1947 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1948 EV_INVOKE_PENDING;
1949 }
1950#endif
1951
1952#if EV_CHILD_ENABLE
1953 if (ev_is_active (&childev))
1954 {
1955 ev_ref (EV_A); /* child watcher */
1956 ev_signal_stop (EV_A_ &childev);
1957 }
1958#endif
1959
1456 if (ev_is_active (&pipe_w)) 1960 if (ev_is_active (&pipe_w))
1457 { 1961 {
1458 ev_ref (EV_A); /* signal watcher */ 1962 /*ev_ref (EV_A);*/
1459 ev_io_stop (EV_A_ &pipe_w); 1963 /*ev_io_stop (EV_A_ &pipe_w);*/
1460 1964
1461#if EV_USE_EVENTFD 1965#if EV_USE_EVENTFD
1462 if (evfd >= 0) 1966 if (evfd >= 0)
1463 close (evfd); 1967 close (evfd);
1464#endif 1968#endif
1465 1969
1466 if (evpipe [0] >= 0) 1970 if (evpipe [0] >= 0)
1467 { 1971 {
1468 close (evpipe [0]); 1972 EV_WIN32_CLOSE_FD (evpipe [0]);
1469 close (evpipe [1]); 1973 EV_WIN32_CLOSE_FD (evpipe [1]);
1470 } 1974 }
1471 } 1975 }
1976
1977#if EV_USE_SIGNALFD
1978 if (ev_is_active (&sigfd_w))
1979 close (sigfd);
1980#endif
1472 1981
1473#if EV_USE_INOTIFY 1982#if EV_USE_INOTIFY
1474 if (fs_fd >= 0) 1983 if (fs_fd >= 0)
1475 close (fs_fd); 1984 close (fs_fd);
1476#endif 1985#endif
1477 1986
1478 if (backend_fd >= 0) 1987 if (backend_fd >= 0)
1479 close (backend_fd); 1988 close (backend_fd);
1480 1989
1990#if EV_USE_IOCP
1991 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1992#endif
1481#if EV_USE_PORT 1993#if EV_USE_PORT
1482 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1994 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1483#endif 1995#endif
1484#if EV_USE_KQUEUE 1996#if EV_USE_KQUEUE
1485 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1997 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1500#if EV_IDLE_ENABLE 2012#if EV_IDLE_ENABLE
1501 array_free (idle, [i]); 2013 array_free (idle, [i]);
1502#endif 2014#endif
1503 } 2015 }
1504 2016
1505 ev_free (anfds); anfdmax = 0; 2017 ev_free (anfds); anfds = 0; anfdmax = 0;
1506 2018
1507 /* have to use the microsoft-never-gets-it-right macro */ 2019 /* have to use the microsoft-never-gets-it-right macro */
1508 array_free (rfeed, EMPTY); 2020 array_free (rfeed, EMPTY);
1509 array_free (fdchange, EMPTY); 2021 array_free (fdchange, EMPTY);
1510 array_free (timer, EMPTY); 2022 array_free (timer, EMPTY);
… …
1512 array_free (periodic, EMPTY); 2024 array_free (periodic, EMPTY);
1513#endif 2025#endif
1514#if EV_FORK_ENABLE 2026#if EV_FORK_ENABLE
1515 array_free (fork, EMPTY); 2027 array_free (fork, EMPTY);
1516#endif 2028#endif
2029#if EV_CLEANUP_ENABLE
2030 array_free (cleanup, EMPTY);
2031#endif
1517 array_free (prepare, EMPTY); 2032 array_free (prepare, EMPTY);
1518 array_free (check, EMPTY); 2033 array_free (check, EMPTY);
1519#if EV_ASYNC_ENABLE 2034#if EV_ASYNC_ENABLE
1520 array_free (async, EMPTY); 2035 array_free (async, EMPTY);
1521#endif 2036#endif
1522 2037
1523 backend = 0; 2038 backend = 0;
2039
2040#if EV_MULTIPLICITY
2041 if (ev_is_default_loop (EV_A))
2042#endif
2043 ev_default_loop_ptr = 0;
2044#if EV_MULTIPLICITY
2045 else
2046 ev_free (EV_A);
2047#endif
1524} 2048}
1525 2049
1526#if EV_USE_INOTIFY 2050#if EV_USE_INOTIFY
1527inline_size void infy_fork (EV_P); 2051inline_size void infy_fork (EV_P);
1528#endif 2052#endif
… …
1543 infy_fork (EV_A); 2067 infy_fork (EV_A);
1544#endif 2068#endif
1545 2069
1546 if (ev_is_active (&pipe_w)) 2070 if (ev_is_active (&pipe_w))
1547 { 2071 {
1548 /* this "locks" the handlers against writing to the pipe */ 2072 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1549 /* while we modify the fd vars */
1550 gotsig = 1;
1551#if EV_ASYNC_ENABLE
1552 gotasync = 1;
1553#endif
1554 2073
1555 ev_ref (EV_A); 2074 ev_ref (EV_A);
1556 ev_io_stop (EV_A_ &pipe_w); 2075 ev_io_stop (EV_A_ &pipe_w);
1557 2076
1558#if EV_USE_EVENTFD 2077#if EV_USE_EVENTFD
… …
1560 close (evfd); 2079 close (evfd);
1561#endif 2080#endif
1562 2081
1563 if (evpipe [0] >= 0) 2082 if (evpipe [0] >= 0)
1564 { 2083 {
1565 close (evpipe [0]); 2084 EV_WIN32_CLOSE_FD (evpipe [0]);
1566 close (evpipe [1]); 2085 EV_WIN32_CLOSE_FD (evpipe [1]);
1567 } 2086 }
1568 2087
2088#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1569 evpipe_init (EV_A); 2089 evpipe_init (EV_A);
1570 /* now iterate over everything, in case we missed something */ 2090 /* now iterate over everything, in case we missed something */
1571 pipecb (EV_A_ &pipe_w, EV_READ); 2091 pipecb (EV_A_ &pipe_w, EV_READ);
2092#endif
1572 } 2093 }
1573 2094
1574 postfork = 0; 2095 postfork = 0;
1575} 2096}
1576 2097
1577#if EV_MULTIPLICITY 2098#if EV_MULTIPLICITY
1578 2099
1579struct ev_loop * 2100struct ev_loop * ecb_cold
1580ev_loop_new (unsigned int flags) 2101ev_loop_new (unsigned int flags)
1581{ 2102{
1582 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2103 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1583 2104
1584 memset (loop, 0, sizeof (struct ev_loop)); 2105 memset (EV_A, 0, sizeof (struct ev_loop));
1585
1586 loop_init (EV_A_ flags); 2106 loop_init (EV_A_ flags);
1587 2107
1588 if (ev_backend (EV_A)) 2108 if (ev_backend (EV_A))
1589 return loop; 2109 return EV_A;
1590 2110
2111 ev_free (EV_A);
1591 return 0; 2112 return 0;
1592} 2113}
1593 2114
1594void 2115#endif /* multiplicity */
1595ev_loop_destroy (EV_P)
1596{
1597 loop_destroy (EV_A);
1598 ev_free (loop);
1599}
1600
1601void
1602ev_loop_fork (EV_P)
1603{
1604 postfork = 1; /* must be in line with ev_default_fork */
1605}
1606 2116
1607#if EV_VERIFY 2117#if EV_VERIFY
1608static void noinline 2118static void noinline ecb_cold
1609verify_watcher (EV_P_ W w) 2119verify_watcher (EV_P_ W w)
1610{ 2120{
1611 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2121 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1612 2122
1613 if (w->pending) 2123 if (w->pending)
1614 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2124 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1615} 2125}
1616 2126
1617static void noinline 2127static void noinline ecb_cold
1618verify_heap (EV_P_ ANHE *heap, int N) 2128verify_heap (EV_P_ ANHE *heap, int N)
1619{ 2129{
1620 int i; 2130 int i;
1621 2131
1622 for (i = HEAP0; i < N + HEAP0; ++i) 2132 for (i = HEAP0; i < N + HEAP0; ++i)
… …
1627 2137
1628 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2138 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1629 } 2139 }
1630} 2140}
1631 2141
1632static void noinline 2142static void noinline ecb_cold
1633array_verify (EV_P_ W *ws, int cnt) 2143array_verify (EV_P_ W *ws, int cnt)
1634{ 2144{
1635 while (cnt--) 2145 while (cnt--)
1636 { 2146 {
1637 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2147 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1638 verify_watcher (EV_A_ ws [cnt]); 2148 verify_watcher (EV_A_ ws [cnt]);
1639 } 2149 }
1640} 2150}
1641#endif 2151#endif
1642 2152
1643void 2153#if EV_FEATURE_API
2154void ecb_cold
1644ev_loop_verify (EV_P) 2155ev_verify (EV_P)
1645{ 2156{
1646#if EV_VERIFY 2157#if EV_VERIFY
1647 int i; 2158 int i;
1648 WL w; 2159 WL w;
1649 2160
… …
1683#if EV_FORK_ENABLE 2194#if EV_FORK_ENABLE
1684 assert (forkmax >= forkcnt); 2195 assert (forkmax >= forkcnt);
1685 array_verify (EV_A_ (W *)forks, forkcnt); 2196 array_verify (EV_A_ (W *)forks, forkcnt);
1686#endif 2197#endif
1687 2198
2199#if EV_CLEANUP_ENABLE
2200 assert (cleanupmax >= cleanupcnt);
2201 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2202#endif
2203
1688#if EV_ASYNC_ENABLE 2204#if EV_ASYNC_ENABLE
1689 assert (asyncmax >= asynccnt); 2205 assert (asyncmax >= asynccnt);
1690 array_verify (EV_A_ (W *)asyncs, asynccnt); 2206 array_verify (EV_A_ (W *)asyncs, asynccnt);
1691#endif 2207#endif
1692 2208
2209#if EV_PREPARE_ENABLE
1693 assert (preparemax >= preparecnt); 2210 assert (preparemax >= preparecnt);
1694 array_verify (EV_A_ (W *)prepares, preparecnt); 2211 array_verify (EV_A_ (W *)prepares, preparecnt);
2212#endif
1695 2213
2214#if EV_CHECK_ENABLE
1696 assert (checkmax >= checkcnt); 2215 assert (checkmax >= checkcnt);
1697 array_verify (EV_A_ (W *)checks, checkcnt); 2216 array_verify (EV_A_ (W *)checks, checkcnt);
2217#endif
1698 2218
1699# if 0 2219# if 0
2220#if EV_CHILD_ENABLE
1700 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2221 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1701 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 2222 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2223#endif
1702# endif 2224# endif
1703#endif 2225#endif
1704} 2226}
1705 2227#endif
1706#endif /* multiplicity */
1707 2228
1708#if EV_MULTIPLICITY 2229#if EV_MULTIPLICITY
1709struct ev_loop * 2230struct ev_loop * ecb_cold
1710ev_default_loop_init (unsigned int flags)
1711#else 2231#else
1712int 2232int
2233#endif
1713ev_default_loop (unsigned int flags) 2234ev_default_loop (unsigned int flags)
1714#endif
1715{ 2235{
1716 if (!ev_default_loop_ptr) 2236 if (!ev_default_loop_ptr)
1717 { 2237 {
1718#if EV_MULTIPLICITY 2238#if EV_MULTIPLICITY
1719 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2239 EV_P = ev_default_loop_ptr = &default_loop_struct;
1720#else 2240#else
1721 ev_default_loop_ptr = 1; 2241 ev_default_loop_ptr = 1;
1722#endif 2242#endif
1723 2243
1724 loop_init (EV_A_ flags); 2244 loop_init (EV_A_ flags);
1725 2245
1726 if (ev_backend (EV_A)) 2246 if (ev_backend (EV_A))
1727 { 2247 {
1728#ifndef _WIN32 2248#if EV_CHILD_ENABLE
1729 ev_signal_init (&childev, childcb, SIGCHLD); 2249 ev_signal_init (&childev, childcb, SIGCHLD);
1730 ev_set_priority (&childev, EV_MAXPRI); 2250 ev_set_priority (&childev, EV_MAXPRI);
1731 ev_signal_start (EV_A_ &childev); 2251 ev_signal_start (EV_A_ &childev);
1732 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2252 ev_unref (EV_A); /* child watcher should not keep loop alive */
1733#endif 2253#endif
… …
1738 2258
1739 return ev_default_loop_ptr; 2259 return ev_default_loop_ptr;
1740} 2260}
1741 2261
1742void 2262void
1743ev_default_destroy (void) 2263ev_loop_fork (EV_P)
1744{ 2264{
1745#if EV_MULTIPLICITY
1746 struct ev_loop *loop = ev_default_loop_ptr;
1747#endif
1748
1749 ev_default_loop_ptr = 0;
1750
1751#ifndef _WIN32
1752 ev_ref (EV_A); /* child watcher */
1753 ev_signal_stop (EV_A_ &childev);
1754#endif
1755
1756 loop_destroy (EV_A);
1757}
1758
1759void
1760ev_default_fork (void)
1761{
1762#if EV_MULTIPLICITY
1763 struct ev_loop *loop = ev_default_loop_ptr;
1764#endif
1765
1766 postfork = 1; /* must be in line with ev_loop_fork */ 2265 postfork = 1; /* must be in line with ev_default_fork */
1767} 2266}
1768 2267
1769/*****************************************************************************/ 2268/*****************************************************************************/
1770 2269
1771void 2270void
1772ev_invoke (EV_P_ void *w, int revents) 2271ev_invoke (EV_P_ void *w, int revents)
1773{ 2272{
1774 EV_CB_INVOKE ((W)w, revents); 2273 EV_CB_INVOKE ((W)w, revents);
1775} 2274}
1776 2275
1777inline_speed void 2276unsigned int
1778call_pending (EV_P) 2277ev_pending_count (EV_P)
2278{
2279 int pri;
2280 unsigned int count = 0;
2281
2282 for (pri = NUMPRI; pri--; )
2283 count += pendingcnt [pri];
2284
2285 return count;
2286}
2287
2288void noinline
2289ev_invoke_pending (EV_P)
1779{ 2290{
1780 int pri; 2291 int pri;
1781 2292
1782 for (pri = NUMPRI; pri--; ) 2293 for (pri = NUMPRI; pri--; )
1783 while (pendingcnt [pri]) 2294 while (pendingcnt [pri])
1784 { 2295 {
1785 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2296 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1786
1787 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1788 /* ^ this is no longer true, as pending_w could be here */
1789 2297
1790 p->w->pending = 0; 2298 p->w->pending = 0;
1791 EV_CB_INVOKE (p->w, p->events); 2299 EV_CB_INVOKE (p->w, p->events);
1792 EV_FREQUENT_CHECK; 2300 EV_FREQUENT_CHECK;
1793 } 2301 }
… …
1850 EV_FREQUENT_CHECK; 2358 EV_FREQUENT_CHECK;
1851 feed_reverse (EV_A_ (W)w); 2359 feed_reverse (EV_A_ (W)w);
1852 } 2360 }
1853 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2361 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1854 2362
1855 feed_reverse_done (EV_A_ EV_TIMEOUT); 2363 feed_reverse_done (EV_A_ EV_TIMER);
1856 } 2364 }
1857} 2365}
1858 2366
1859#if EV_PERIODIC_ENABLE 2367#if EV_PERIODIC_ENABLE
2368
2369static void noinline
2370periodic_recalc (EV_P_ ev_periodic *w)
2371{
2372 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2373 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2374
2375 /* the above almost always errs on the low side */
2376 while (at <= ev_rt_now)
2377 {
2378 ev_tstamp nat = at + w->interval;
2379
2380 /* when resolution fails us, we use ev_rt_now */
2381 if (expect_false (nat == at))
2382 {
2383 at = ev_rt_now;
2384 break;
2385 }
2386
2387 at = nat;
2388 }
2389
2390 ev_at (w) = at;
2391}
2392
1860/* make periodics pending */ 2393/* make periodics pending */
1861inline_size void 2394inline_size void
1862periodics_reify (EV_P) 2395periodics_reify (EV_P)
1863{ 2396{
1864 EV_FREQUENT_CHECK; 2397 EV_FREQUENT_CHECK;
… …
1883 ANHE_at_cache (periodics [HEAP0]); 2416 ANHE_at_cache (periodics [HEAP0]);
1884 downheap (periodics, periodiccnt, HEAP0); 2417 downheap (periodics, periodiccnt, HEAP0);
1885 } 2418 }
1886 else if (w->interval) 2419 else if (w->interval)
1887 { 2420 {
1888 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2421 periodic_recalc (EV_A_ w);
1889 /* if next trigger time is not sufficiently in the future, put it there */
1890 /* this might happen because of floating point inexactness */
1891 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1892 {
1893 ev_at (w) += w->interval;
1894
1895 /* if interval is unreasonably low we might still have a time in the past */
1896 /* so correct this. this will make the periodic very inexact, but the user */
1897 /* has effectively asked to get triggered more often than possible */
1898 if (ev_at (w) < ev_rt_now)
1899 ev_at (w) = ev_rt_now;
1900 }
1901
1902 ANHE_at_cache (periodics [HEAP0]); 2422 ANHE_at_cache (periodics [HEAP0]);
1903 downheap (periodics, periodiccnt, HEAP0); 2423 downheap (periodics, periodiccnt, HEAP0);
1904 } 2424 }
1905 else 2425 else
1906 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2426 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
1913 feed_reverse_done (EV_A_ EV_PERIODIC); 2433 feed_reverse_done (EV_A_ EV_PERIODIC);
1914 } 2434 }
1915} 2435}
1916 2436
1917/* simply recalculate all periodics */ 2437/* simply recalculate all periodics */
1918/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2438/* TODO: maybe ensure that at least one event happens when jumping forward? */
1919static void noinline 2439static void noinline ecb_cold
1920periodics_reschedule (EV_P) 2440periodics_reschedule (EV_P)
1921{ 2441{
1922 int i; 2442 int i;
1923 2443
1924 /* adjust periodics after time jump */ 2444 /* adjust periodics after time jump */
… …
1927 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2447 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1928 2448
1929 if (w->reschedule_cb) 2449 if (w->reschedule_cb)
1930 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2450 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1931 else if (w->interval) 2451 else if (w->interval)
1932 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2452 periodic_recalc (EV_A_ w);
1933 2453
1934 ANHE_at_cache (periodics [i]); 2454 ANHE_at_cache (periodics [i]);
1935 } 2455 }
1936 2456
1937 reheap (periodics, periodiccnt); 2457 reheap (periodics, periodiccnt);
1938} 2458}
1939#endif 2459#endif
1940 2460
1941/* adjust all timers by a given offset */ 2461/* adjust all timers by a given offset */
1942static void noinline 2462static void noinline ecb_cold
1943timers_reschedule (EV_P_ ev_tstamp adjust) 2463timers_reschedule (EV_P_ ev_tstamp adjust)
1944{ 2464{
1945 int i; 2465 int i;
1946 2466
1947 for (i = 0; i < timercnt; ++i) 2467 for (i = 0; i < timercnt; ++i)
… …
1951 ANHE_at_cache (*he); 2471 ANHE_at_cache (*he);
1952 } 2472 }
1953} 2473}
1954 2474
1955/* fetch new monotonic and realtime times from the kernel */ 2475/* fetch new monotonic and realtime times from the kernel */
1956/* also detetc if there was a timejump, and act accordingly */ 2476/* also detect if there was a timejump, and act accordingly */
1957inline_speed void 2477inline_speed void
1958time_update (EV_P_ ev_tstamp max_block) 2478time_update (EV_P_ ev_tstamp max_block)
1959{ 2479{
1960#if EV_USE_MONOTONIC 2480#if EV_USE_MONOTONIC
1961 if (expect_true (have_monotonic)) 2481 if (expect_true (have_monotonic))
… …
1984 * doesn't hurt either as we only do this on time-jumps or 2504 * doesn't hurt either as we only do this on time-jumps or
1985 * in the unlikely event of having been preempted here. 2505 * in the unlikely event of having been preempted here.
1986 */ 2506 */
1987 for (i = 4; --i; ) 2507 for (i = 4; --i; )
1988 { 2508 {
2509 ev_tstamp diff;
1989 rtmn_diff = ev_rt_now - mn_now; 2510 rtmn_diff = ev_rt_now - mn_now;
1990 2511
2512 diff = odiff - rtmn_diff;
2513
1991 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2514 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
1992 return; /* all is well */ 2515 return; /* all is well */
1993 2516
1994 ev_rt_now = ev_time (); 2517 ev_rt_now = ev_time ();
1995 mn_now = get_clock (); 2518 mn_now = get_clock ();
1996 now_floor = mn_now; 2519 now_floor = mn_now;
… …
2018 2541
2019 mn_now = ev_rt_now; 2542 mn_now = ev_rt_now;
2020 } 2543 }
2021} 2544}
2022 2545
2023static int loop_done;
2024
2025void 2546void
2026ev_loop (EV_P_ int flags) 2547ev_run (EV_P_ int flags)
2027{ 2548{
2549#if EV_FEATURE_API
2550 ++loop_depth;
2551#endif
2552
2553 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2554
2028 loop_done = EVUNLOOP_CANCEL; 2555 loop_done = EVBREAK_CANCEL;
2029 2556
2030 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2557 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2031 2558
2032 do 2559 do
2033 { 2560 {
2034#if EV_VERIFY >= 2 2561#if EV_VERIFY >= 2
2035 ev_loop_verify (EV_A); 2562 ev_verify (EV_A);
2036#endif 2563#endif
2037 2564
2038#ifndef _WIN32 2565#ifndef _WIN32
2039 if (expect_false (curpid)) /* penalise the forking check even more */ 2566 if (expect_false (curpid)) /* penalise the forking check even more */
2040 if (expect_false (getpid () != curpid)) 2567 if (expect_false (getpid () != curpid))
… …
2048 /* we might have forked, so queue fork handlers */ 2575 /* we might have forked, so queue fork handlers */
2049 if (expect_false (postfork)) 2576 if (expect_false (postfork))
2050 if (forkcnt) 2577 if (forkcnt)
2051 { 2578 {
2052 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2579 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2053 call_pending (EV_A); 2580 EV_INVOKE_PENDING;
2054 } 2581 }
2055#endif 2582#endif
2056 2583
2584#if EV_PREPARE_ENABLE
2057 /* queue prepare watchers (and execute them) */ 2585 /* queue prepare watchers (and execute them) */
2058 if (expect_false (preparecnt)) 2586 if (expect_false (preparecnt))
2059 { 2587 {
2060 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2588 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2061 call_pending (EV_A); 2589 EV_INVOKE_PENDING;
2062 } 2590 }
2591#endif
2592
2593 if (expect_false (loop_done))
2594 break;
2063 2595
2064 /* we might have forked, so reify kernel state if necessary */ 2596 /* we might have forked, so reify kernel state if necessary */
2065 if (expect_false (postfork)) 2597 if (expect_false (postfork))
2066 loop_fork (EV_A); 2598 loop_fork (EV_A);
2067 2599
… …
2071 /* calculate blocking time */ 2603 /* calculate blocking time */
2072 { 2604 {
2073 ev_tstamp waittime = 0.; 2605 ev_tstamp waittime = 0.;
2074 ev_tstamp sleeptime = 0.; 2606 ev_tstamp sleeptime = 0.;
2075 2607
2608 /* remember old timestamp for io_blocktime calculation */
2609 ev_tstamp prev_mn_now = mn_now;
2610
2611 /* update time to cancel out callback processing overhead */
2612 time_update (EV_A_ 1e100);
2613
2614 /* from now on, we want a pipe-wake-up */
2615 pipe_write_wanted = 1;
2616
2617 ECB_MEMORY_FENCE; /* amke sure pipe_write_wanted is visible before we check for potential skips */
2618
2076 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2619 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2077 { 2620 {
2078 /* update time to cancel out callback processing overhead */
2079 time_update (EV_A_ 1e100);
2080
2081 waittime = MAX_BLOCKTIME; 2621 waittime = MAX_BLOCKTIME;
2082 2622
2083 if (timercnt) 2623 if (timercnt)
2084 { 2624 {
2085 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2625 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2086 if (waittime > to) waittime = to; 2626 if (waittime > to) waittime = to;
2087 } 2627 }
2088 2628
2089#if EV_PERIODIC_ENABLE 2629#if EV_PERIODIC_ENABLE
2090 if (periodiccnt) 2630 if (periodiccnt)
2091 { 2631 {
2092 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2632 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2093 if (waittime > to) waittime = to; 2633 if (waittime > to) waittime = to;
2094 } 2634 }
2095#endif 2635#endif
2096 2636
2637 /* don't let timeouts decrease the waittime below timeout_blocktime */
2097 if (expect_false (waittime < timeout_blocktime)) 2638 if (expect_false (waittime < timeout_blocktime))
2098 waittime = timeout_blocktime; 2639 waittime = timeout_blocktime;
2099 2640
2100 sleeptime = waittime - backend_fudge; 2641 /* at this point, we NEED to wait, so we have to ensure */
2642 /* to pass a minimum nonzero value to the backend */
2643 if (expect_false (waittime < backend_mintime))
2644 waittime = backend_mintime;
2101 2645
2646 /* extra check because io_blocktime is commonly 0 */
2102 if (expect_true (sleeptime > io_blocktime)) 2647 if (expect_false (io_blocktime))
2103 sleeptime = io_blocktime;
2104
2105 if (sleeptime)
2106 { 2648 {
2649 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2650
2651 if (sleeptime > waittime - backend_mintime)
2652 sleeptime = waittime - backend_mintime;
2653
2654 if (expect_true (sleeptime > 0.))
2655 {
2107 ev_sleep (sleeptime); 2656 ev_sleep (sleeptime);
2108 waittime -= sleeptime; 2657 waittime -= sleeptime;
2658 }
2109 } 2659 }
2110 } 2660 }
2111 2661
2662#if EV_FEATURE_API
2112 ++loop_count; 2663 ++loop_count;
2664#endif
2665 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2113 backend_poll (EV_A_ waittime); 2666 backend_poll (EV_A_ waittime);
2667 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2668
2669 pipe_write_wanted = 0; /* just an optimsiation, no fence needed */
2670
2671 if (pipe_write_skipped)
2672 {
2673 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2674 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2675 }
2676
2114 2677
2115 /* update ev_rt_now, do magic */ 2678 /* update ev_rt_now, do magic */
2116 time_update (EV_A_ waittime + sleeptime); 2679 time_update (EV_A_ waittime + sleeptime);
2117 } 2680 }
2118 2681
… …
2125#if EV_IDLE_ENABLE 2688#if EV_IDLE_ENABLE
2126 /* queue idle watchers unless other events are pending */ 2689 /* queue idle watchers unless other events are pending */
2127 idle_reify (EV_A); 2690 idle_reify (EV_A);
2128#endif 2691#endif
2129 2692
2693#if EV_CHECK_ENABLE
2130 /* queue check watchers, to be executed first */ 2694 /* queue check watchers, to be executed first */
2131 if (expect_false (checkcnt)) 2695 if (expect_false (checkcnt))
2132 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2696 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2697#endif
2133 2698
2134 call_pending (EV_A); 2699 EV_INVOKE_PENDING;
2135 } 2700 }
2136 while (expect_true ( 2701 while (expect_true (
2137 activecnt 2702 activecnt
2138 && !loop_done 2703 && !loop_done
2139 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2704 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2140 )); 2705 ));
2141 2706
2142 if (loop_done == EVUNLOOP_ONE) 2707 if (loop_done == EVBREAK_ONE)
2143 loop_done = EVUNLOOP_CANCEL; 2708 loop_done = EVBREAK_CANCEL;
2709
2710#if EV_FEATURE_API
2711 --loop_depth;
2712#endif
2144} 2713}
2145 2714
2146void 2715void
2147ev_unloop (EV_P_ int how) 2716ev_break (EV_P_ int how)
2148{ 2717{
2149 loop_done = how; 2718 loop_done = how;
2150} 2719}
2151 2720
2152void 2721void
… …
2199inline_size void 2768inline_size void
2200wlist_del (WL *head, WL elem) 2769wlist_del (WL *head, WL elem)
2201{ 2770{
2202 while (*head) 2771 while (*head)
2203 { 2772 {
2204 if (*head == elem) 2773 if (expect_true (*head == elem))
2205 { 2774 {
2206 *head = elem->next; 2775 *head = elem->next;
2207 return; 2776 break;
2208 } 2777 }
2209 2778
2210 head = &(*head)->next; 2779 head = &(*head)->next;
2211 } 2780 }
2212} 2781}
… …
2240} 2809}
2241 2810
2242inline_size void 2811inline_size void
2243pri_adjust (EV_P_ W w) 2812pri_adjust (EV_P_ W w)
2244{ 2813{
2245 int pri = w->priority; 2814 int pri = ev_priority (w);
2246 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2815 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2247 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2816 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2248 w->priority = pri; 2817 ev_set_priority (w, pri);
2249} 2818}
2250 2819
2251inline_speed void 2820inline_speed void
2252ev_start (EV_P_ W w, int active) 2821ev_start (EV_P_ W w, int active)
2253{ 2822{
… …
2272 2841
2273 if (expect_false (ev_is_active (w))) 2842 if (expect_false (ev_is_active (w)))
2274 return; 2843 return;
2275 2844
2276 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2845 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2277 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2846 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2278 2847
2279 EV_FREQUENT_CHECK; 2848 EV_FREQUENT_CHECK;
2280 2849
2281 ev_start (EV_A_ (W)w, 1); 2850 ev_start (EV_A_ (W)w, 1);
2282 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2851 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2283 wlist_add (&anfds[fd].head, (WL)w); 2852 wlist_add (&anfds[fd].head, (WL)w);
2284 2853
2285 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2854 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2286 w->events &= ~EV__IOFDSET; 2855 w->events &= ~EV__IOFDSET;
2287 2856
2288 EV_FREQUENT_CHECK; 2857 EV_FREQUENT_CHECK;
2289} 2858}
2290 2859
… …
2300 EV_FREQUENT_CHECK; 2869 EV_FREQUENT_CHECK;
2301 2870
2302 wlist_del (&anfds[w->fd].head, (WL)w); 2871 wlist_del (&anfds[w->fd].head, (WL)w);
2303 ev_stop (EV_A_ (W)w); 2872 ev_stop (EV_A_ (W)w);
2304 2873
2305 fd_change (EV_A_ w->fd, 1); 2874 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2306 2875
2307 EV_FREQUENT_CHECK; 2876 EV_FREQUENT_CHECK;
2308} 2877}
2309 2878
2310void noinline 2879void noinline
… …
2352 timers [active] = timers [timercnt + HEAP0]; 2921 timers [active] = timers [timercnt + HEAP0];
2353 adjustheap (timers, timercnt, active); 2922 adjustheap (timers, timercnt, active);
2354 } 2923 }
2355 } 2924 }
2356 2925
2357 EV_FREQUENT_CHECK;
2358
2359 ev_at (w) -= mn_now; 2926 ev_at (w) -= mn_now;
2360 2927
2361 ev_stop (EV_A_ (W)w); 2928 ev_stop (EV_A_ (W)w);
2929
2930 EV_FREQUENT_CHECK;
2362} 2931}
2363 2932
2364void noinline 2933void noinline
2365ev_timer_again (EV_P_ ev_timer *w) 2934ev_timer_again (EV_P_ ev_timer *w)
2366{ 2935{
… …
2384 } 2953 }
2385 2954
2386 EV_FREQUENT_CHECK; 2955 EV_FREQUENT_CHECK;
2387} 2956}
2388 2957
2958ev_tstamp
2959ev_timer_remaining (EV_P_ ev_timer *w)
2960{
2961 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2962}
2963
2389#if EV_PERIODIC_ENABLE 2964#if EV_PERIODIC_ENABLE
2390void noinline 2965void noinline
2391ev_periodic_start (EV_P_ ev_periodic *w) 2966ev_periodic_start (EV_P_ ev_periodic *w)
2392{ 2967{
2393 if (expect_false (ev_is_active (w))) 2968 if (expect_false (ev_is_active (w)))
… …
2396 if (w->reschedule_cb) 2971 if (w->reschedule_cb)
2397 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2972 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2398 else if (w->interval) 2973 else if (w->interval)
2399 { 2974 {
2400 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2975 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2401 /* this formula differs from the one in periodic_reify because we do not always round up */ 2976 periodic_recalc (EV_A_ w);
2402 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2403 } 2977 }
2404 else 2978 else
2405 ev_at (w) = w->offset; 2979 ev_at (w) = w->offset;
2406 2980
2407 EV_FREQUENT_CHECK; 2981 EV_FREQUENT_CHECK;
… …
2439 periodics [active] = periodics [periodiccnt + HEAP0]; 3013 periodics [active] = periodics [periodiccnt + HEAP0];
2440 adjustheap (periodics, periodiccnt, active); 3014 adjustheap (periodics, periodiccnt, active);
2441 } 3015 }
2442 } 3016 }
2443 3017
2444 EV_FREQUENT_CHECK;
2445
2446 ev_stop (EV_A_ (W)w); 3018 ev_stop (EV_A_ (W)w);
3019
3020 EV_FREQUENT_CHECK;
2447} 3021}
2448 3022
2449void noinline 3023void noinline
2450ev_periodic_again (EV_P_ ev_periodic *w) 3024ev_periodic_again (EV_P_ ev_periodic *w)
2451{ 3025{
… …
2457 3031
2458#ifndef SA_RESTART 3032#ifndef SA_RESTART
2459# define SA_RESTART 0 3033# define SA_RESTART 0
2460#endif 3034#endif
2461 3035
3036#if EV_SIGNAL_ENABLE
3037
2462void noinline 3038void noinline
2463ev_signal_start (EV_P_ ev_signal *w) 3039ev_signal_start (EV_P_ ev_signal *w)
2464{ 3040{
2465#if EV_MULTIPLICITY
2466 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2467#endif
2468 if (expect_false (ev_is_active (w))) 3041 if (expect_false (ev_is_active (w)))
2469 return; 3042 return;
2470 3043
2471 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 3044 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2472 3045
2473 evpipe_init (EV_A); 3046#if EV_MULTIPLICITY
3047 assert (("libev: a signal must not be attached to two different loops",
3048 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2474 3049
2475 EV_FREQUENT_CHECK; 3050 signals [w->signum - 1].loop = EV_A;
3051#endif
2476 3052
3053 EV_FREQUENT_CHECK;
3054
3055#if EV_USE_SIGNALFD
3056 if (sigfd == -2)
2477 { 3057 {
2478#ifndef _WIN32 3058 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2479 sigset_t full, prev; 3059 if (sigfd < 0 && errno == EINVAL)
2480 sigfillset (&full); 3060 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2481 sigprocmask (SIG_SETMASK, &full, &prev);
2482#endif
2483 3061
2484 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 3062 if (sigfd >= 0)
3063 {
3064 fd_intern (sigfd); /* doing it twice will not hurt */
2485 3065
2486#ifndef _WIN32 3066 sigemptyset (&sigfd_set);
2487 sigprocmask (SIG_SETMASK, &prev, 0); 3067
2488#endif 3068 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
3069 ev_set_priority (&sigfd_w, EV_MAXPRI);
3070 ev_io_start (EV_A_ &sigfd_w);
3071 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
3072 }
2489 } 3073 }
3074
3075 if (sigfd >= 0)
3076 {
3077 /* TODO: check .head */
3078 sigaddset (&sigfd_set, w->signum);
3079 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
3080
3081 signalfd (sigfd, &sigfd_set, 0);
3082 }
3083#endif
2490 3084
2491 ev_start (EV_A_ (W)w, 1); 3085 ev_start (EV_A_ (W)w, 1);
2492 wlist_add (&signals [w->signum - 1].head, (WL)w); 3086 wlist_add (&signals [w->signum - 1].head, (WL)w);
2493 3087
2494 if (!((WL)w)->next) 3088 if (!((WL)w)->next)
3089# if EV_USE_SIGNALFD
3090 if (sigfd < 0) /*TODO*/
3091# endif
2495 { 3092 {
2496#if _WIN32 3093# ifdef _WIN32
3094 evpipe_init (EV_A);
3095
2497 signal (w->signum, ev_sighandler); 3096 signal (w->signum, ev_sighandler);
2498#else 3097# else
2499 struct sigaction sa; 3098 struct sigaction sa;
3099
3100 evpipe_init (EV_A);
3101
2500 sa.sa_handler = ev_sighandler; 3102 sa.sa_handler = ev_sighandler;
2501 sigfillset (&sa.sa_mask); 3103 sigfillset (&sa.sa_mask);
2502 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 3104 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2503 sigaction (w->signum, &sa, 0); 3105 sigaction (w->signum, &sa, 0);
3106
3107 if (origflags & EVFLAG_NOSIGMASK)
3108 {
3109 sigemptyset (&sa.sa_mask);
3110 sigaddset (&sa.sa_mask, w->signum);
3111 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
3112 }
2504#endif 3113#endif
2505 } 3114 }
2506 3115
2507 EV_FREQUENT_CHECK; 3116 EV_FREQUENT_CHECK;
2508} 3117}
2509 3118
2510void noinline 3119void noinline
… …
2518 3127
2519 wlist_del (&signals [w->signum - 1].head, (WL)w); 3128 wlist_del (&signals [w->signum - 1].head, (WL)w);
2520 ev_stop (EV_A_ (W)w); 3129 ev_stop (EV_A_ (W)w);
2521 3130
2522 if (!signals [w->signum - 1].head) 3131 if (!signals [w->signum - 1].head)
3132 {
3133#if EV_MULTIPLICITY
3134 signals [w->signum - 1].loop = 0; /* unattach from signal */
3135#endif
3136#if EV_USE_SIGNALFD
3137 if (sigfd >= 0)
3138 {
3139 sigset_t ss;
3140
3141 sigemptyset (&ss);
3142 sigaddset (&ss, w->signum);
3143 sigdelset (&sigfd_set, w->signum);
3144
3145 signalfd (sigfd, &sigfd_set, 0);
3146 sigprocmask (SIG_UNBLOCK, &ss, 0);
3147 }
3148 else
3149#endif
2523 signal (w->signum, SIG_DFL); 3150 signal (w->signum, SIG_DFL);
3151 }
2524 3152
2525 EV_FREQUENT_CHECK; 3153 EV_FREQUENT_CHECK;
2526} 3154}
3155
3156#endif
3157
3158#if EV_CHILD_ENABLE
2527 3159
2528void 3160void
2529ev_child_start (EV_P_ ev_child *w) 3161ev_child_start (EV_P_ ev_child *w)
2530{ 3162{
2531#if EV_MULTIPLICITY 3163#if EV_MULTIPLICITY
… …
2535 return; 3167 return;
2536 3168
2537 EV_FREQUENT_CHECK; 3169 EV_FREQUENT_CHECK;
2538 3170
2539 ev_start (EV_A_ (W)w, 1); 3171 ev_start (EV_A_ (W)w, 1);
2540 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3172 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2541 3173
2542 EV_FREQUENT_CHECK; 3174 EV_FREQUENT_CHECK;
2543} 3175}
2544 3176
2545void 3177void
… …
2549 if (expect_false (!ev_is_active (w))) 3181 if (expect_false (!ev_is_active (w)))
2550 return; 3182 return;
2551 3183
2552 EV_FREQUENT_CHECK; 3184 EV_FREQUENT_CHECK;
2553 3185
2554 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3186 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2555 ev_stop (EV_A_ (W)w); 3187 ev_stop (EV_A_ (W)w);
2556 3188
2557 EV_FREQUENT_CHECK; 3189 EV_FREQUENT_CHECK;
2558} 3190}
3191
3192#endif
2559 3193
2560#if EV_STAT_ENABLE 3194#if EV_STAT_ENABLE
2561 3195
2562# ifdef _WIN32 3196# ifdef _WIN32
2563# undef lstat 3197# undef lstat
… …
2569#define MIN_STAT_INTERVAL 0.1074891 3203#define MIN_STAT_INTERVAL 0.1074891
2570 3204
2571static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 3205static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2572 3206
2573#if EV_USE_INOTIFY 3207#if EV_USE_INOTIFY
2574# define EV_INOTIFY_BUFSIZE 8192 3208
3209/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
3210# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2575 3211
2576static void noinline 3212static void noinline
2577infy_add (EV_P_ ev_stat *w) 3213infy_add (EV_P_ ev_stat *w)
2578{ 3214{
2579 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); 3215 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);
2580 3216
2581 if (w->wd < 0) 3217 if (w->wd >= 0)
3218 {
3219 struct statfs sfs;
3220
3221 /* now local changes will be tracked by inotify, but remote changes won't */
3222 /* unless the filesystem is known to be local, we therefore still poll */
3223 /* also do poll on <2.6.25, but with normal frequency */
3224
3225 if (!fs_2625)
3226 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3227 else if (!statfs (w->path, &sfs)
3228 && (sfs.f_type == 0x1373 /* devfs */
3229 || sfs.f_type == 0xEF53 /* ext2/3 */
3230 || sfs.f_type == 0x3153464a /* jfs */
3231 || sfs.f_type == 0x52654973 /* reiser3 */
3232 || sfs.f_type == 0x01021994 /* tempfs */
3233 || sfs.f_type == 0x58465342 /* xfs */))
3234 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3235 else
3236 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2582 { 3237 }
3238 else
3239 {
3240 /* can't use inotify, continue to stat */
2583 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3241 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2584 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2585 3242
2586 /* monitor some parent directory for speedup hints */ 3243 /* if path is not there, monitor some parent directory for speedup hints */
2587 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3244 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2588 /* but an efficiency issue only */ 3245 /* but an efficiency issue only */
2589 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3246 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2590 { 3247 {
2591 char path [4096]; 3248 char path [4096];
… …
2601 if (!pend || pend == path) 3258 if (!pend || pend == path)
2602 break; 3259 break;
2603 3260
2604 *pend = 0; 3261 *pend = 0;
2605 w->wd = inotify_add_watch (fs_fd, path, mask); 3262 w->wd = inotify_add_watch (fs_fd, path, mask);
2606 } 3263 }
2607 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3264 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2608 } 3265 }
2609 } 3266 }
2610 3267
2611 if (w->wd >= 0) 3268 if (w->wd >= 0)
2612 {
2613 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3269 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2614 3270
2615 /* now local changes will be tracked by inotify, but remote changes won't */ 3271 /* now re-arm timer, if required */
2616 /* unless the filesystem it known to be local, we therefore still poll */ 3272 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2617 /* also do poll on <2.6.25, but with normal frequency */
2618 struct statfs sfs;
2619
2620 if (fs_2625 && !statfs (w->path, &sfs))
2621 if (sfs.f_type == 0x1373 /* devfs */
2622 || sfs.f_type == 0xEF53 /* ext2/3 */
2623 || sfs.f_type == 0x3153464a /* jfs */
2624 || sfs.f_type == 0x52654973 /* reiser3 */
2625 || sfs.f_type == 0x01021994 /* tempfs */
2626 || sfs.f_type == 0x58465342 /* xfs */)
2627 return;
2628
2629 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2630 ev_timer_again (EV_A_ &w->timer); 3273 ev_timer_again (EV_A_ &w->timer);
2631 } 3274 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2632} 3275}
2633 3276
2634static void noinline 3277static void noinline
2635infy_del (EV_P_ ev_stat *w) 3278infy_del (EV_P_ ev_stat *w)
2636{ 3279{
… …
2639 3282
2640 if (wd < 0) 3283 if (wd < 0)
2641 return; 3284 return;
2642 3285
2643 w->wd = -2; 3286 w->wd = -2;
2644 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3287 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2645 wlist_del (&fs_hash [slot].head, (WL)w); 3288 wlist_del (&fs_hash [slot].head, (WL)w);
2646 3289
2647 /* remove this watcher, if others are watching it, they will rearm */ 3290 /* remove this watcher, if others are watching it, they will rearm */
2648 inotify_rm_watch (fs_fd, wd); 3291 inotify_rm_watch (fs_fd, wd);
2649} 3292}
… …
2651static void noinline 3294static void noinline
2652infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3295infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2653{ 3296{
2654 if (slot < 0) 3297 if (slot < 0)
2655 /* overflow, need to check for all hash slots */ 3298 /* overflow, need to check for all hash slots */
2656 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3299 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2657 infy_wd (EV_A_ slot, wd, ev); 3300 infy_wd (EV_A_ slot, wd, ev);
2658 else 3301 else
2659 { 3302 {
2660 WL w_; 3303 WL w_;
2661 3304
2662 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3305 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2663 { 3306 {
2664 ev_stat *w = (ev_stat *)w_; 3307 ev_stat *w = (ev_stat *)w_;
2665 w_ = w_->next; /* lets us remove this watcher and all before it */ 3308 w_ = w_->next; /* lets us remove this watcher and all before it */
2666 3309
2667 if (w->wd == wd || wd == -1) 3310 if (w->wd == wd || wd == -1)
2668 { 3311 {
2669 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3312 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2670 { 3313 {
2671 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3314 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2672 w->wd = -1; 3315 w->wd = -1;
2673 infy_add (EV_A_ w); /* re-add, no matter what */ 3316 infy_add (EV_A_ w); /* re-add, no matter what */
2674 } 3317 }
2675 3318
2676 stat_timer_cb (EV_A_ &w->timer, 0); 3319 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2681 3324
2682static void 3325static void
2683infy_cb (EV_P_ ev_io *w, int revents) 3326infy_cb (EV_P_ ev_io *w, int revents)
2684{ 3327{
2685 char buf [EV_INOTIFY_BUFSIZE]; 3328 char buf [EV_INOTIFY_BUFSIZE];
2686 struct inotify_event *ev = (struct inotify_event *)buf;
2687 int ofs; 3329 int ofs;
2688 int len = read (fs_fd, buf, sizeof (buf)); 3330 int len = read (fs_fd, buf, sizeof (buf));
2689 3331
2690 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3332 for (ofs = 0; ofs < len; )
3333 {
3334 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2691 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3335 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3336 ofs += sizeof (struct inotify_event) + ev->len;
3337 }
2692} 3338}
2693 3339
2694inline_size void 3340inline_size void ecb_cold
2695check_2625 (EV_P) 3341ev_check_2625 (EV_P)
2696{ 3342{
2697 /* kernels < 2.6.25 are borked 3343 /* kernels < 2.6.25 are borked
2698 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3344 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2699 */ 3345 */
2700 struct utsname buf; 3346 if (ev_linux_version () < 0x020619)
2701 int major, minor, micro;
2702
2703 if (uname (&buf))
2704 return; 3347 return;
2705 3348
2706 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2707 return;
2708
2709 if (major < 2
2710 || (major == 2 && minor < 6)
2711 || (major == 2 && minor == 6 && micro < 25))
2712 return;
2713
2714 fs_2625 = 1; 3349 fs_2625 = 1;
3350}
3351
3352inline_size int
3353infy_newfd (void)
3354{
3355#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3356 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3357 if (fd >= 0)
3358 return fd;
3359#endif
3360 return inotify_init ();
2715} 3361}
2716 3362
2717inline_size void 3363inline_size void
2718infy_init (EV_P) 3364infy_init (EV_P)
2719{ 3365{
2720 if (fs_fd != -2) 3366 if (fs_fd != -2)
2721 return; 3367 return;
2722 3368
2723 fs_fd = -1; 3369 fs_fd = -1;
2724 3370
2725 check_2625 (EV_A); 3371 ev_check_2625 (EV_A);
2726 3372
2727 fs_fd = inotify_init (); 3373 fs_fd = infy_newfd ();
2728 3374
2729 if (fs_fd >= 0) 3375 if (fs_fd >= 0)
2730 { 3376 {
3377 fd_intern (fs_fd);
2731 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3378 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2732 ev_set_priority (&fs_w, EV_MAXPRI); 3379 ev_set_priority (&fs_w, EV_MAXPRI);
2733 ev_io_start (EV_A_ &fs_w); 3380 ev_io_start (EV_A_ &fs_w);
3381 ev_unref (EV_A);
2734 } 3382 }
2735} 3383}
2736 3384
2737inline_size void 3385inline_size void
2738infy_fork (EV_P) 3386infy_fork (EV_P)
… …
2740 int slot; 3388 int slot;
2741 3389
2742 if (fs_fd < 0) 3390 if (fs_fd < 0)
2743 return; 3391 return;
2744 3392
3393 ev_ref (EV_A);
3394 ev_io_stop (EV_A_ &fs_w);
2745 close (fs_fd); 3395 close (fs_fd);
2746 fs_fd = inotify_init (); 3396 fs_fd = infy_newfd ();
2747 3397
3398 if (fs_fd >= 0)
3399 {
3400 fd_intern (fs_fd);
3401 ev_io_set (&fs_w, fs_fd, EV_READ);
3402 ev_io_start (EV_A_ &fs_w);
3403 ev_unref (EV_A);
3404 }
3405
2748 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3406 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2749 { 3407 {
2750 WL w_ = fs_hash [slot].head; 3408 WL w_ = fs_hash [slot].head;
2751 fs_hash [slot].head = 0; 3409 fs_hash [slot].head = 0;
2752 3410
2753 while (w_) 3411 while (w_)
… …
2758 w->wd = -1; 3416 w->wd = -1;
2759 3417
2760 if (fs_fd >= 0) 3418 if (fs_fd >= 0)
2761 infy_add (EV_A_ w); /* re-add, no matter what */ 3419 infy_add (EV_A_ w); /* re-add, no matter what */
2762 else 3420 else
3421 {
3422 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3423 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2763 ev_timer_again (EV_A_ &w->timer); 3424 ev_timer_again (EV_A_ &w->timer);
3425 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3426 }
2764 } 3427 }
2765 } 3428 }
2766} 3429}
2767 3430
2768#endif 3431#endif
… …
2785static void noinline 3448static void noinline
2786stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3449stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2787{ 3450{
2788 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3451 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2789 3452
2790 /* we copy this here each the time so that */ 3453 ev_statdata prev = w->attr;
2791 /* prev has the old value when the callback gets invoked */
2792 w->prev = w->attr;
2793 ev_stat_stat (EV_A_ w); 3454 ev_stat_stat (EV_A_ w);
2794 3455
2795 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3456 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2796 if ( 3457 if (
2797 w->prev.st_dev != w->attr.st_dev 3458 prev.st_dev != w->attr.st_dev
2798 || w->prev.st_ino != w->attr.st_ino 3459 || prev.st_ino != w->attr.st_ino
2799 || w->prev.st_mode != w->attr.st_mode 3460 || prev.st_mode != w->attr.st_mode
2800 || w->prev.st_nlink != w->attr.st_nlink 3461 || prev.st_nlink != w->attr.st_nlink
2801 || w->prev.st_uid != w->attr.st_uid 3462 || prev.st_uid != w->attr.st_uid
2802 || w->prev.st_gid != w->attr.st_gid 3463 || prev.st_gid != w->attr.st_gid
2803 || w->prev.st_rdev != w->attr.st_rdev 3464 || prev.st_rdev != w->attr.st_rdev
2804 || w->prev.st_size != w->attr.st_size 3465 || prev.st_size != w->attr.st_size
2805 || w->prev.st_atime != w->attr.st_atime 3466 || prev.st_atime != w->attr.st_atime
2806 || w->prev.st_mtime != w->attr.st_mtime 3467 || prev.st_mtime != w->attr.st_mtime
2807 || w->prev.st_ctime != w->attr.st_ctime 3468 || prev.st_ctime != w->attr.st_ctime
2808 ) { 3469 ) {
3470 /* we only update w->prev on actual differences */
3471 /* in case we test more often than invoke the callback, */
3472 /* to ensure that prev is always different to attr */
3473 w->prev = prev;
3474
2809 #if EV_USE_INOTIFY 3475 #if EV_USE_INOTIFY
2810 if (fs_fd >= 0) 3476 if (fs_fd >= 0)
2811 { 3477 {
2812 infy_del (EV_A_ w); 3478 infy_del (EV_A_ w);
2813 infy_add (EV_A_ w); 3479 infy_add (EV_A_ w);
… …
2838 3504
2839 if (fs_fd >= 0) 3505 if (fs_fd >= 0)
2840 infy_add (EV_A_ w); 3506 infy_add (EV_A_ w);
2841 else 3507 else
2842#endif 3508#endif
3509 {
2843 ev_timer_again (EV_A_ &w->timer); 3510 ev_timer_again (EV_A_ &w->timer);
3511 ev_unref (EV_A);
3512 }
2844 3513
2845 ev_start (EV_A_ (W)w, 1); 3514 ev_start (EV_A_ (W)w, 1);
2846 3515
2847 EV_FREQUENT_CHECK; 3516 EV_FREQUENT_CHECK;
2848} 3517}
… …
2857 EV_FREQUENT_CHECK; 3526 EV_FREQUENT_CHECK;
2858 3527
2859#if EV_USE_INOTIFY 3528#if EV_USE_INOTIFY
2860 infy_del (EV_A_ w); 3529 infy_del (EV_A_ w);
2861#endif 3530#endif
3531
3532 if (ev_is_active (&w->timer))
3533 {
3534 ev_ref (EV_A);
2862 ev_timer_stop (EV_A_ &w->timer); 3535 ev_timer_stop (EV_A_ &w->timer);
3536 }
2863 3537
2864 ev_stop (EV_A_ (W)w); 3538 ev_stop (EV_A_ (W)w);
2865 3539
2866 EV_FREQUENT_CHECK; 3540 EV_FREQUENT_CHECK;
2867} 3541}
… …
2912 3586
2913 EV_FREQUENT_CHECK; 3587 EV_FREQUENT_CHECK;
2914} 3588}
2915#endif 3589#endif
2916 3590
3591#if EV_PREPARE_ENABLE
2917void 3592void
2918ev_prepare_start (EV_P_ ev_prepare *w) 3593ev_prepare_start (EV_P_ ev_prepare *w)
2919{ 3594{
2920 if (expect_false (ev_is_active (w))) 3595 if (expect_false (ev_is_active (w)))
2921 return; 3596 return;
… …
2947 3622
2948 ev_stop (EV_A_ (W)w); 3623 ev_stop (EV_A_ (W)w);
2949 3624
2950 EV_FREQUENT_CHECK; 3625 EV_FREQUENT_CHECK;
2951} 3626}
3627#endif
2952 3628
3629#if EV_CHECK_ENABLE
2953void 3630void
2954ev_check_start (EV_P_ ev_check *w) 3631ev_check_start (EV_P_ ev_check *w)
2955{ 3632{
2956 if (expect_false (ev_is_active (w))) 3633 if (expect_false (ev_is_active (w)))
2957 return; 3634 return;
… …
2983 3660
2984 ev_stop (EV_A_ (W)w); 3661 ev_stop (EV_A_ (W)w);
2985 3662
2986 EV_FREQUENT_CHECK; 3663 EV_FREQUENT_CHECK;
2987} 3664}
3665#endif
2988 3666
2989#if EV_EMBED_ENABLE 3667#if EV_EMBED_ENABLE
2990void noinline 3668void noinline
2991ev_embed_sweep (EV_P_ ev_embed *w) 3669ev_embed_sweep (EV_P_ ev_embed *w)
2992{ 3670{
2993 ev_loop (w->other, EVLOOP_NONBLOCK); 3671 ev_run (w->other, EVRUN_NOWAIT);
2994} 3672}
2995 3673
2996static void 3674static void
2997embed_io_cb (EV_P_ ev_io *io, int revents) 3675embed_io_cb (EV_P_ ev_io *io, int revents)
2998{ 3676{
2999 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3677 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3000 3678
3001 if (ev_cb (w)) 3679 if (ev_cb (w))
3002 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3680 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3003 else 3681 else
3004 ev_loop (w->other, EVLOOP_NONBLOCK); 3682 ev_run (w->other, EVRUN_NOWAIT);
3005} 3683}
3006 3684
3007static void 3685static void
3008embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3686embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3009{ 3687{
3010 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3688 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3011 3689
3012 { 3690 {
3013 struct ev_loop *loop = w->other; 3691 EV_P = w->other;
3014 3692
3015 while (fdchangecnt) 3693 while (fdchangecnt)
3016 { 3694 {
3017 fd_reify (EV_A); 3695 fd_reify (EV_A);
3018 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3696 ev_run (EV_A_ EVRUN_NOWAIT);
3019 } 3697 }
3020 } 3698 }
3021} 3699}
3022 3700
3023static void 3701static void
… …
3026 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3704 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3027 3705
3028 ev_embed_stop (EV_A_ w); 3706 ev_embed_stop (EV_A_ w);
3029 3707
3030 { 3708 {
3031 struct ev_loop *loop = w->other; 3709 EV_P = w->other;
3032 3710
3033 ev_loop_fork (EV_A); 3711 ev_loop_fork (EV_A);
3034 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3712 ev_run (EV_A_ EVRUN_NOWAIT);
3035 } 3713 }
3036 3714
3037 ev_embed_start (EV_A_ w); 3715 ev_embed_start (EV_A_ w);
3038} 3716}
3039 3717
… …
3050{ 3728{
3051 if (expect_false (ev_is_active (w))) 3729 if (expect_false (ev_is_active (w)))
3052 return; 3730 return;
3053 3731
3054 { 3732 {
3055 struct ev_loop *loop = w->other; 3733 EV_P = w->other;
3056 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3734 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3057 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3735 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3058 } 3736 }
3059 3737
3060 EV_FREQUENT_CHECK; 3738 EV_FREQUENT_CHECK;
… …
3087 3765
3088 ev_io_stop (EV_A_ &w->io); 3766 ev_io_stop (EV_A_ &w->io);
3089 ev_prepare_stop (EV_A_ &w->prepare); 3767 ev_prepare_stop (EV_A_ &w->prepare);
3090 ev_fork_stop (EV_A_ &w->fork); 3768 ev_fork_stop (EV_A_ &w->fork);
3091 3769
3770 ev_stop (EV_A_ (W)w);
3771
3092 EV_FREQUENT_CHECK; 3772 EV_FREQUENT_CHECK;
3093} 3773}
3094#endif 3774#endif
3095 3775
3096#if EV_FORK_ENABLE 3776#if EV_FORK_ENABLE
… …
3129 3809
3130 EV_FREQUENT_CHECK; 3810 EV_FREQUENT_CHECK;
3131} 3811}
3132#endif 3812#endif
3133 3813
3814#if EV_CLEANUP_ENABLE
3815void
3816ev_cleanup_start (EV_P_ ev_cleanup *w)
3817{
3818 if (expect_false (ev_is_active (w)))
3819 return;
3820
3821 EV_FREQUENT_CHECK;
3822
3823 ev_start (EV_A_ (W)w, ++cleanupcnt);
3824 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3825 cleanups [cleanupcnt - 1] = w;
3826
3827 /* cleanup watchers should never keep a refcount on the loop */
3828 ev_unref (EV_A);
3829 EV_FREQUENT_CHECK;
3830}
3831
3832void
3833ev_cleanup_stop (EV_P_ ev_cleanup *w)
3834{
3835 clear_pending (EV_A_ (W)w);
3836 if (expect_false (!ev_is_active (w)))
3837 return;
3838
3839 EV_FREQUENT_CHECK;
3840 ev_ref (EV_A);
3841
3842 {
3843 int active = ev_active (w);
3844
3845 cleanups [active - 1] = cleanups [--cleanupcnt];
3846 ev_active (cleanups [active - 1]) = active;
3847 }
3848
3849 ev_stop (EV_A_ (W)w);
3850
3851 EV_FREQUENT_CHECK;
3852}
3853#endif
3854
3134#if EV_ASYNC_ENABLE 3855#if EV_ASYNC_ENABLE
3135void 3856void
3136ev_async_start (EV_P_ ev_async *w) 3857ev_async_start (EV_P_ ev_async *w)
3137{ 3858{
3138 if (expect_false (ev_is_active (w))) 3859 if (expect_false (ev_is_active (w)))
3139 return; 3860 return;
3140 3861
3862 w->sent = 0;
3863
3141 evpipe_init (EV_A); 3864 evpipe_init (EV_A);
3142 3865
3143 EV_FREQUENT_CHECK; 3866 EV_FREQUENT_CHECK;
3144 3867
3145 ev_start (EV_A_ (W)w, ++asynccnt); 3868 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3172 3895
3173void 3896void
3174ev_async_send (EV_P_ ev_async *w) 3897ev_async_send (EV_P_ ev_async *w)
3175{ 3898{
3176 w->sent = 1; 3899 w->sent = 1;
3177 evpipe_write (EV_A_ &gotasync); 3900 evpipe_write (EV_A_ &async_pending);
3178} 3901}
3179#endif 3902#endif
3180 3903
3181/*****************************************************************************/ 3904/*****************************************************************************/
3182 3905
… …
3222{ 3945{
3223 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3946 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3224 3947
3225 if (expect_false (!once)) 3948 if (expect_false (!once))
3226 { 3949 {
3227 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3950 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3228 return; 3951 return;
3229 } 3952 }
3230 3953
3231 once->cb = cb; 3954 once->cb = cb;
3232 once->arg = arg; 3955 once->arg = arg;
… …
3247} 3970}
3248 3971
3249/*****************************************************************************/ 3972/*****************************************************************************/
3250 3973
3251#if EV_WALK_ENABLE 3974#if EV_WALK_ENABLE
3252void 3975void ecb_cold
3253ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3976ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3254{ 3977{
3255 int i, j; 3978 int i, j;
3256 ev_watcher_list *wl, *wn; 3979 ev_watcher_list *wl, *wn;
3257 3980
… …
3319 if (types & EV_ASYNC) 4042 if (types & EV_ASYNC)
3320 for (i = asynccnt; i--; ) 4043 for (i = asynccnt; i--; )
3321 cb (EV_A_ EV_ASYNC, asyncs [i]); 4044 cb (EV_A_ EV_ASYNC, asyncs [i]);
3322#endif 4045#endif
3323 4046
4047#if EV_PREPARE_ENABLE
3324 if (types & EV_PREPARE) 4048 if (types & EV_PREPARE)
3325 for (i = preparecnt; i--; ) 4049 for (i = preparecnt; i--; )
3326#if EV_EMBED_ENABLE 4050# if EV_EMBED_ENABLE
3327 if (ev_cb (prepares [i]) != embed_prepare_cb) 4051 if (ev_cb (prepares [i]) != embed_prepare_cb)
3328#endif 4052# endif
3329 cb (EV_A_ EV_PREPARE, prepares [i]); 4053 cb (EV_A_ EV_PREPARE, prepares [i]);
4054#endif
3330 4055
4056#if EV_CHECK_ENABLE
3331 if (types & EV_CHECK) 4057 if (types & EV_CHECK)
3332 for (i = checkcnt; i--; ) 4058 for (i = checkcnt; i--; )
3333 cb (EV_A_ EV_CHECK, checks [i]); 4059 cb (EV_A_ EV_CHECK, checks [i]);
4060#endif
3334 4061
4062#if EV_SIGNAL_ENABLE
3335 if (types & EV_SIGNAL) 4063 if (types & EV_SIGNAL)
3336 for (i = 0; i < signalmax; ++i) 4064 for (i = 0; i < EV_NSIG - 1; ++i)
3337 for (wl = signals [i].head; wl; ) 4065 for (wl = signals [i].head; wl; )
3338 { 4066 {
3339 wn = wl->next; 4067 wn = wl->next;
3340 cb (EV_A_ EV_SIGNAL, wl); 4068 cb (EV_A_ EV_SIGNAL, wl);
3341 wl = wn; 4069 wl = wn;
3342 } 4070 }
4071#endif
3343 4072
4073#if EV_CHILD_ENABLE
3344 if (types & EV_CHILD) 4074 if (types & EV_CHILD)
3345 for (i = EV_PID_HASHSIZE; i--; ) 4075 for (i = (EV_PID_HASHSIZE); i--; )
3346 for (wl = childs [i]; wl; ) 4076 for (wl = childs [i]; wl; )
3347 { 4077 {
3348 wn = wl->next; 4078 wn = wl->next;
3349 cb (EV_A_ EV_CHILD, wl); 4079 cb (EV_A_ EV_CHILD, wl);
3350 wl = wn; 4080 wl = wn;
3351 } 4081 }
4082#endif
3352/* EV_STAT 0x00001000 /* stat data changed */ 4083/* EV_STAT 0x00001000 /* stat data changed */
3353/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 4084/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3354} 4085}
3355#endif 4086#endif
3356 4087
3357#if EV_MULTIPLICITY 4088#if EV_MULTIPLICITY
3358 #include "ev_wrap.h" 4089 #include "ev_wrap.h"
3359#endif 4090#endif
3360 4091
3361#ifdef __cplusplus 4092EV_CPP(})
3362}
3363#endif
3364 4093

Diff Legend

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