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

Comparing libev/ev.c (file contents):
Revision 1.306 by root, Sun Jul 19 06:35:25 2009 UTC vs.
Revision 1.377 by root, Wed Jun 8 13:11:55 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
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 147# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 148# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 149# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 150# endif
151# else
152# undef EV_USE_SIGNALFD
153# define EV_USE_SIGNALFD 0
144# endif 154# endif
145 155
156# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 157# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 158# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 159# endif
160# else
161# undef EV_USE_EVENTFD
162# define EV_USE_EVENTFD 0
152# endif 163# endif
153 164
154#endif 165#endif
155 166
156#include <math.h>
157#include <stdlib.h> 167#include <stdlib.h>
168#include <string.h>
158#include <fcntl.h> 169#include <fcntl.h>
159#include <stddef.h> 170#include <stddef.h>
160 171
161#include <stdio.h> 172#include <stdio.h>
162 173
163#include <assert.h> 174#include <assert.h>
164#include <errno.h> 175#include <errno.h>
165#include <sys/types.h> 176#include <sys/types.h>
166#include <time.h> 177#include <time.h>
178#include <limits.h>
167 179
168#include <signal.h> 180#include <signal.h>
169 181
170#ifdef EV_H 182#ifdef EV_H
171# include EV_H 183# include EV_H
172#else 184#else
173# include "ev.h" 185# include "ev.h"
174#endif 186#endif
187
188EV_CPP(extern "C" {)
175 189
176#ifndef _WIN32 190#ifndef _WIN32
177# include <sys/time.h> 191# include <sys/time.h>
178# include <sys/wait.h> 192# include <sys/wait.h>
179# include <unistd.h> 193# include <unistd.h>
… …
182# define WIN32_LEAN_AND_MEAN 196# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 197# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 198# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 199# define EV_SELECT_IS_WINSOCKET 1
186# endif 200# endif
201# undef EV_AVOID_STDIO
187#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
188 211
189/* 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 */
190 213
191/* try to deduce the maximum number of signals on this platform */ 214/* try to deduce the maximum number of signals on this platform */
192/* one some platforms, NSIG is one too large. we do not bother */
193#if defined (EV_NSIG) 215#if defined (EV_NSIG)
194/* use what's provided */ 216/* use what's provided */
195#elif defined (NSIG) 217#elif defined (NSIG)
196# define EV_NSIG (NSIG) 218# define EV_NSIG (NSIG)
197#elif defined(_NSIG) 219#elif defined(_NSIG)
… …
205#elif defined (MAXSIG) 227#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1) 228# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG) 229#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1) 230# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE) 231#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 232# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig) 233#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 234# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else 235#else
214# error "unable to find value for NSIG, please report" 236# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */ 237/* to make it compile regardless, just remove the above line, */
238/* but consider reporting it, too! :) */
216# define EV_NSIG 65 239# define EV_NSIG 65
240#endif
241
242#ifndef EV_USE_FLOOR
243# define EV_USE_FLOOR 0
217#endif 244#endif
218 245
219#ifndef EV_USE_CLOCK_SYSCALL 246#ifndef EV_USE_CLOCK_SYSCALL
220# if __linux && __GLIBC__ >= 2 247# if __linux && __GLIBC__ >= 2
221# define EV_USE_CLOCK_SYSCALL 1 248# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
222# else 249# else
223# define EV_USE_CLOCK_SYSCALL 0 250# define EV_USE_CLOCK_SYSCALL 0
224# endif 251# endif
225#endif 252#endif
226 253
227#ifndef EV_USE_MONOTONIC 254#ifndef EV_USE_MONOTONIC
228# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 255# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
229# define EV_USE_MONOTONIC 1 256# define EV_USE_MONOTONIC EV_FEATURE_OS
230# else 257# else
231# define EV_USE_MONOTONIC 0 258# define EV_USE_MONOTONIC 0
232# endif 259# endif
233#endif 260#endif
234 261
… …
236# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 263# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
237#endif 264#endif
238 265
239#ifndef EV_USE_NANOSLEEP 266#ifndef EV_USE_NANOSLEEP
240# if _POSIX_C_SOURCE >= 199309L 267# if _POSIX_C_SOURCE >= 199309L
241# define EV_USE_NANOSLEEP 1 268# define EV_USE_NANOSLEEP EV_FEATURE_OS
242# else 269# else
243# define EV_USE_NANOSLEEP 0 270# define EV_USE_NANOSLEEP 0
244# endif 271# endif
245#endif 272#endif
246 273
247#ifndef EV_USE_SELECT 274#ifndef EV_USE_SELECT
248# define EV_USE_SELECT 1 275# define EV_USE_SELECT EV_FEATURE_BACKENDS
249#endif 276#endif
250 277
251#ifndef EV_USE_POLL 278#ifndef EV_USE_POLL
252# ifdef _WIN32 279# ifdef _WIN32
253# define EV_USE_POLL 0 280# define EV_USE_POLL 0
254# else 281# else
255# define EV_USE_POLL 1 282# define EV_USE_POLL EV_FEATURE_BACKENDS
256# endif 283# endif
257#endif 284#endif
258 285
259#ifndef EV_USE_EPOLL 286#ifndef EV_USE_EPOLL
260# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 287# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
261# define EV_USE_EPOLL 1 288# define EV_USE_EPOLL EV_FEATURE_BACKENDS
262# else 289# else
263# define EV_USE_EPOLL 0 290# define EV_USE_EPOLL 0
264# endif 291# endif
265#endif 292#endif
266 293
… …
272# define EV_USE_PORT 0 299# define EV_USE_PORT 0
273#endif 300#endif
274 301
275#ifndef EV_USE_INOTIFY 302#ifndef EV_USE_INOTIFY
276# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
277# define EV_USE_INOTIFY 1 304# define EV_USE_INOTIFY EV_FEATURE_OS
278# else 305# else
279# define EV_USE_INOTIFY 0 306# define EV_USE_INOTIFY 0
280# endif 307# endif
281#endif 308#endif
282 309
283#ifndef EV_PID_HASHSIZE 310#ifndef EV_PID_HASHSIZE
284# if EV_MINIMAL 311# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
285# define EV_PID_HASHSIZE 1
286# else
287# define EV_PID_HASHSIZE 16
288# endif
289#endif 312#endif
290 313
291#ifndef EV_INOTIFY_HASHSIZE 314#ifndef EV_INOTIFY_HASHSIZE
292# if EV_MINIMAL 315# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
293# define EV_INOTIFY_HASHSIZE 1
294# else
295# define EV_INOTIFY_HASHSIZE 16
296# endif
297#endif 316#endif
298 317
299#ifndef EV_USE_EVENTFD 318#ifndef EV_USE_EVENTFD
300# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 319# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
301# define EV_USE_EVENTFD 1 320# define EV_USE_EVENTFD EV_FEATURE_OS
302# else 321# else
303# define EV_USE_EVENTFD 0 322# define EV_USE_EVENTFD 0
304# endif 323# endif
305#endif 324#endif
306 325
307#ifndef EV_USE_SIGNALFD 326#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 327# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1 328# define EV_USE_SIGNALFD EV_FEATURE_OS
310# else 329# else
311# define EV_USE_SIGNALFD 0 330# define EV_USE_SIGNALFD 0
312# endif 331# endif
313#endif 332#endif
314 333
… …
317# define EV_USE_4HEAP 1 336# define EV_USE_4HEAP 1
318# define EV_HEAP_CACHE_AT 1 337# define EV_HEAP_CACHE_AT 1
319#endif 338#endif
320 339
321#ifndef EV_VERIFY 340#ifndef EV_VERIFY
322# define EV_VERIFY !EV_MINIMAL 341# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
323#endif 342#endif
324 343
325#ifndef EV_USE_4HEAP 344#ifndef EV_USE_4HEAP
326# define EV_USE_4HEAP !EV_MINIMAL 345# define EV_USE_4HEAP EV_FEATURE_DATA
327#endif 346#endif
328 347
329#ifndef EV_HEAP_CACHE_AT 348#ifndef EV_HEAP_CACHE_AT
330# define EV_HEAP_CACHE_AT !EV_MINIMAL 349# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
331#endif 350#endif
332 351
333/* 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, */
334/* which makes programs even slower. might work on other unices, too. */ 353/* which makes programs even slower. might work on other unices, too. */
335#if EV_USE_CLOCK_SYSCALL 354#if EV_USE_CLOCK_SYSCALL
… …
344# endif 363# endif
345#endif 364#endif
346 365
347/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 366/* this block fixes any misconfiguration where we know we run into trouble otherwise */
348 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
349#ifndef CLOCK_MONOTONIC 374#ifndef CLOCK_MONOTONIC
350# undef EV_USE_MONOTONIC 375# undef EV_USE_MONOTONIC
351# define EV_USE_MONOTONIC 0 376# define EV_USE_MONOTONIC 0
352#endif 377#endif
353 378
… …
360# undef EV_USE_INOTIFY 385# undef EV_USE_INOTIFY
361# define EV_USE_INOTIFY 0 386# define EV_USE_INOTIFY 0
362#endif 387#endif
363 388
364#if !EV_USE_NANOSLEEP 389#if !EV_USE_NANOSLEEP
365# ifndef _WIN32 390/* hp-ux has it in sys/time.h, which we unconditionally include above */
391# if !defined(_WIN32) && !defined(__hpux)
366# include <sys/select.h> 392# include <sys/select.h>
367# endif 393# endif
368#endif 394#endif
369 395
370#if EV_USE_INOTIFY 396#if EV_USE_INOTIFY
371# include <sys/utsname.h>
372# include <sys/statfs.h> 397# include <sys/statfs.h>
373# include <sys/inotify.h> 398# include <sys/inotify.h>
374/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 399/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
375# ifndef IN_DONT_FOLLOW 400# ifndef IN_DONT_FOLLOW
376# undef EV_USE_INOTIFY 401# undef EV_USE_INOTIFY
… …
387# include <stdint.h> 412# include <stdint.h>
388# ifndef EFD_NONBLOCK 413# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK 414# define EFD_NONBLOCK O_NONBLOCK
390# endif 415# endif
391# ifndef EFD_CLOEXEC 416# ifndef EFD_CLOEXEC
417# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC 418# define EFD_CLOEXEC O_CLOEXEC
419# else
420# define EFD_CLOEXEC 02000000
421# endif
393# endif 422# endif
394# ifdef __cplusplus 423EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
395extern "C" { 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
396# endif 431# endif
397int eventfd (unsigned int initval, int flags); 432# ifndef SFD_CLOEXEC
398# ifdef __cplusplus 433# ifdef O_CLOEXEC
399} 434# define SFD_CLOEXEC O_CLOEXEC
435# else
436# define SFD_CLOEXEC 02000000
437# endif
400# endif 438# endif
401#endif 439EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
402 440
403#if EV_USE_SIGNALFD 441struct signalfd_siginfo
404# include <sys/signalfd.h> 442{
443 uint32_t ssi_signo;
444 char pad[128 - sizeof (uint32_t)];
445};
405#endif 446#endif
406 447
407/**/ 448/**/
408 449
409#if EV_VERIFY >= 3 450#if EV_VERIFY >= 3
410# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 451# define EV_FREQUENT_CHECK ev_verify (EV_A)
411#else 452#else
412# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
413#endif 454#endif
414 455
415/* 456/*
416 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
417 * It is added to ev_rt_now when scheduling periodics
418 * to ensure progress, time-wise, even when rounding
419 * errors are against us.
420 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
421 * Better solutions welcome.
422 */ 459 */
423#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 */
424 462
425#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) */
426#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) */
427/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 465
466#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
467#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
428 468
429#if __GNUC__ >= 4 469#if __GNUC__ >= 4
430# define expect(expr,value) __builtin_expect ((expr),(value)) 470# define expect(expr,value) __builtin_expect ((expr),(value))
431# define noinline __attribute__ ((noinline)) 471# define noinline __attribute__ ((noinline))
432#else 472#else
… …
439 479
440#define expect_false(expr) expect ((expr) != 0, 0) 480#define expect_false(expr) expect ((expr) != 0, 0)
441#define expect_true(expr) expect ((expr) != 0, 1) 481#define expect_true(expr) expect ((expr) != 0, 1)
442#define inline_size static inline 482#define inline_size static inline
443 483
444#if EV_MINIMAL 484#if EV_FEATURE_CODE
485# define inline_speed static inline
486#else
445# define inline_speed static noinline 487# define inline_speed static noinline
446#else
447# define inline_speed static inline
448#endif 488#endif
449 489
450#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 490#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
451 491
452#if EV_MINPRI == EV_MAXPRI 492#if EV_MINPRI == EV_MAXPRI
… …
465#define ev_active(w) ((W)(w))->active 505#define ev_active(w) ((W)(w))->active
466#define ev_at(w) ((WT)(w))->at 506#define ev_at(w) ((WT)(w))->at
467 507
468#if EV_USE_REALTIME 508#if EV_USE_REALTIME
469/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 509/* sig_atomic_t is used to avoid per-thread variables or locking but still */
470/* giving it a reasonably high chance of working on typical architetcures */ 510/* giving it a reasonably high chance of working on typical architectures */
471static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 511static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
472#endif 512#endif
473 513
474#if EV_USE_MONOTONIC 514#if EV_USE_MONOTONIC
475static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 515static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
476#endif 516#endif
477 517
518#ifndef EV_FD_TO_WIN32_HANDLE
519# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
520#endif
521#ifndef EV_WIN32_HANDLE_TO_FD
522# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
523#endif
524#ifndef EV_WIN32_CLOSE_FD
525# define EV_WIN32_CLOSE_FD(fd) close (fd)
526#endif
527
478#ifdef _WIN32 528#ifdef _WIN32
479# include "ev_win32.c" 529# include "ev_win32.c"
480#endif 530#endif
481 531
482/*****************************************************************************/ 532/*****************************************************************************/
533
534/* define a suitable floor function (only used by periodics atm) */
535
536#if EV_USE_FLOOR
537# include <math.h>
538# define ev_floor(v) floor (v)
539#else
540
541#include <float.h>
542
543/* a floor() replacement function, should be independent of ev_tstamp type */
544static ev_tstamp noinline
545ev_floor (ev_tstamp v)
546{
547 /* the choice of shift factor is not terribly important */
548#if FLT_RADIX != 2 /* assume FLT_RADIX == 10 */
549 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 10000000000000000000. : 1000000000.;
550#else
551 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 18446744073709551616. : 4294967296.;
552#endif
553
554 /* argument too large for an unsigned long? */
555 if (expect_false (v >= shift))
556 {
557 ev_tstamp f;
558
559 if (v == v - 1.)
560 return v; /* very large number */
561
562 f = shift * ev_floor (v * (1. / shift));
563 return f + ev_floor (v - f);
564 }
565
566 /* special treatment for negative args? */
567 if (expect_false (v < 0.))
568 {
569 ev_tstamp f = -ev_floor (-v);
570
571 return f - (f == v ? 0 : 1);
572 }
573
574 /* fits into an unsigned long */
575 return (unsigned long)v;
576}
577
578#endif
579
580/*****************************************************************************/
581
582#ifdef __linux
583# include <sys/utsname.h>
584#endif
585
586static unsigned int noinline
587ev_linux_version (void)
588{
589#ifdef __linux
590 unsigned int v = 0;
591 struct utsname buf;
592 int i;
593 char *p = buf.release;
594
595 if (uname (&buf))
596 return 0;
597
598 for (i = 3+1; --i; )
599 {
600 unsigned int c = 0;
601
602 for (;;)
603 {
604 if (*p >= '0' && *p <= '9')
605 c = c * 10 + *p++ - '0';
606 else
607 {
608 p += *p == '.';
609 break;
610 }
611 }
612
613 v = (v << 8) | c;
614 }
615
616 return v;
617#else
618 return 0;
619#endif
620}
621
622/*****************************************************************************/
623
624#if EV_AVOID_STDIO
625static void noinline
626ev_printerr (const char *msg)
627{
628 write (STDERR_FILENO, msg, strlen (msg));
629}
630#endif
483 631
484static void (*syserr_cb)(const char *msg); 632static void (*syserr_cb)(const char *msg);
485 633
486void 634void
487ev_set_syserr_cb (void (*cb)(const char *msg)) 635ev_set_syserr_cb (void (*cb)(const char *msg))
… …
497 645
498 if (syserr_cb) 646 if (syserr_cb)
499 syserr_cb (msg); 647 syserr_cb (msg);
500 else 648 else
501 { 649 {
650#if EV_AVOID_STDIO
651 ev_printerr (msg);
652 ev_printerr (": ");
653 ev_printerr (strerror (errno));
654 ev_printerr ("\n");
655#else
502 perror (msg); 656 perror (msg);
657#endif
503 abort (); 658 abort ();
504 } 659 }
505} 660}
506 661
507static void * 662static void *
508ev_realloc_emul (void *ptr, long size) 663ev_realloc_emul (void *ptr, long size)
509{ 664{
665#if __GLIBC__
666 return realloc (ptr, size);
667#else
510 /* some systems, notably openbsd and darwin, fail to properly 668 /* some systems, notably openbsd and darwin, fail to properly
511 * implement realloc (x, 0) (as required by both ansi c-98 and 669 * implement realloc (x, 0) (as required by both ansi c-89 and
512 * the single unix specification, so work around them here. 670 * the single unix specification, so work around them here.
513 */ 671 */
514 672
515 if (size) 673 if (size)
516 return realloc (ptr, size); 674 return realloc (ptr, size);
517 675
518 free (ptr); 676 free (ptr);
519 return 0; 677 return 0;
678#endif
520} 679}
521 680
522static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 681static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
523 682
524void 683void
… …
532{ 691{
533 ptr = alloc (ptr, size); 692 ptr = alloc (ptr, size);
534 693
535 if (!ptr && size) 694 if (!ptr && size)
536 { 695 {
696#if EV_AVOID_STDIO
697 ev_printerr ("(libev) memory allocation failed, aborting.\n");
698#else
537 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 699 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
700#endif
538 abort (); 701 abort ();
539 } 702 }
540 703
541 return ptr; 704 return ptr;
542} 705}
… …
558 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 721 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
559 unsigned char unused; 722 unsigned char unused;
560#if EV_USE_EPOLL 723#if EV_USE_EPOLL
561 unsigned int egen; /* generation counter to counter epoll bugs */ 724 unsigned int egen; /* generation counter to counter epoll bugs */
562#endif 725#endif
563#if EV_SELECT_IS_WINSOCKET 726#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
564 SOCKET handle; 727 SOCKET handle;
728#endif
729#if EV_USE_IOCP
730 OVERLAPPED or, ow;
565#endif 731#endif
566} ANFD; 732} ANFD;
567 733
568/* stores the pending event set for a given watcher */ 734/* stores the pending event set for a given watcher */
569typedef struct 735typedef struct
… …
624 790
625 static int ev_default_loop_ptr; 791 static int ev_default_loop_ptr;
626 792
627#endif 793#endif
628 794
629#if EV_MINIMAL < 2 795#if EV_FEATURE_API
630# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 796# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
631# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 797# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
632# define EV_INVOKE_PENDING invoke_cb (EV_A) 798# define EV_INVOKE_PENDING invoke_cb (EV_A)
633#else 799#else
634# define EV_RELEASE_CB (void)0 800# define EV_RELEASE_CB (void)0
635# define EV_ACQUIRE_CB (void)0 801# define EV_ACQUIRE_CB (void)0
636# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 802# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
637#endif 803#endif
638 804
639#define EVUNLOOP_RECURSE 0x80 805#define EVBREAK_RECURSE 0x80
640 806
641/*****************************************************************************/ 807/*****************************************************************************/
642 808
643#ifndef EV_HAVE_EV_TIME 809#ifndef EV_HAVE_EV_TIME
644ev_tstamp 810ev_tstamp
… …
688 if (delay > 0.) 854 if (delay > 0.)
689 { 855 {
690#if EV_USE_NANOSLEEP 856#if EV_USE_NANOSLEEP
691 struct timespec ts; 857 struct timespec ts;
692 858
693 ts.tv_sec = (time_t)delay; 859 EV_TS_SET (ts, delay);
694 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
695
696 nanosleep (&ts, 0); 860 nanosleep (&ts, 0);
697#elif defined(_WIN32) 861#elif defined(_WIN32)
698 Sleep ((unsigned long)(delay * 1e3)); 862 Sleep ((unsigned long)(delay * 1e3));
699#else 863#else
700 struct timeval tv; 864 struct timeval tv;
701 865
702 tv.tv_sec = (time_t)delay;
703 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
704
705 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 866 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
706 /* something not guaranteed by newer posix versions, but guaranteed */ 867 /* something not guaranteed by newer posix versions, but guaranteed */
707 /* by older ones */ 868 /* by older ones */
869 EV_TV_SET (tv, delay);
708 select (0, 0, 0, 0, &tv); 870 select (0, 0, 0, 0, &tv);
709#endif 871#endif
710 } 872 }
711} 873}
712 874
713/*****************************************************************************/ 875/*****************************************************************************/
714 876
715#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 877#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
716 878
717/* find a suitable new size for the given array, */ 879/* find a suitable new size for the given array, */
718/* hopefully by rounding to a ncie-to-malloc size */ 880/* hopefully by rounding to a nice-to-malloc size */
719inline_size int 881inline_size int
720array_nextsize (int elem, int cur, int cnt) 882array_nextsize (int elem, int cur, int cnt)
721{ 883{
722 int ncur = cur + 1; 884 int ncur = cur + 1;
723 885
… …
819} 981}
820 982
821/*****************************************************************************/ 983/*****************************************************************************/
822 984
823inline_speed void 985inline_speed void
824fd_event_nc (EV_P_ int fd, int revents) 986fd_event_nocheck (EV_P_ int fd, int revents)
825{ 987{
826 ANFD *anfd = anfds + fd; 988 ANFD *anfd = anfds + fd;
827 ev_io *w; 989 ev_io *w;
828 990
829 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 991 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
841fd_event (EV_P_ int fd, int revents) 1003fd_event (EV_P_ int fd, int revents)
842{ 1004{
843 ANFD *anfd = anfds + fd; 1005 ANFD *anfd = anfds + fd;
844 1006
845 if (expect_true (!anfd->reify)) 1007 if (expect_true (!anfd->reify))
846 fd_event_nc (EV_A_ fd, revents); 1008 fd_event_nocheck (EV_A_ fd, revents);
847} 1009}
848 1010
849void 1011void
850ev_feed_fd_event (EV_P_ int fd, int revents) 1012ev_feed_fd_event (EV_P_ int fd, int revents)
851{ 1013{
852 if (fd >= 0 && fd < anfdmax) 1014 if (fd >= 0 && fd < anfdmax)
853 fd_event_nc (EV_A_ fd, revents); 1015 fd_event_nocheck (EV_A_ fd, revents);
854} 1016}
855 1017
856/* make sure the external fd watch events are in-sync */ 1018/* make sure the external fd watch events are in-sync */
857/* with the kernel/libev internal state */ 1019/* with the kernel/libev internal state */
858inline_size void 1020inline_size void
859fd_reify (EV_P) 1021fd_reify (EV_P)
860{ 1022{
861 int i; 1023 int i;
862 1024
1025#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1026 for (i = 0; i < fdchangecnt; ++i)
1027 {
1028 int fd = fdchanges [i];
1029 ANFD *anfd = anfds + fd;
1030
1031 if (anfd->reify & EV__IOFDSET && anfd->head)
1032 {
1033 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1034
1035 if (handle != anfd->handle)
1036 {
1037 unsigned long arg;
1038
1039 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1040
1041 /* handle changed, but fd didn't - we need to do it in two steps */
1042 backend_modify (EV_A_ fd, anfd->events, 0);
1043 anfd->events = 0;
1044 anfd->handle = handle;
1045 }
1046 }
1047 }
1048#endif
1049
863 for (i = 0; i < fdchangecnt; ++i) 1050 for (i = 0; i < fdchangecnt; ++i)
864 { 1051 {
865 int fd = fdchanges [i]; 1052 int fd = fdchanges [i];
866 ANFD *anfd = anfds + fd; 1053 ANFD *anfd = anfds + fd;
867 ev_io *w; 1054 ev_io *w;
868 1055
869 unsigned char events = 0; 1056 unsigned char o_events = anfd->events;
1057 unsigned char o_reify = anfd->reify;
870 1058
871 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1059 anfd->reify = 0;
872 events |= (unsigned char)w->events;
873 1060
874#if EV_SELECT_IS_WINSOCKET 1061 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
875 if (events)
876 { 1062 {
877 unsigned long arg; 1063 anfd->events = 0;
878 #ifdef EV_FD_TO_WIN32_HANDLE 1064
879 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 1065 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
880 #else 1066 anfd->events |= (unsigned char)w->events;
881 anfd->handle = _get_osfhandle (fd); 1067
882 #endif 1068 if (o_events != anfd->events)
883 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 1069 o_reify = EV__IOFDSET; /* actually |= */
884 } 1070 }
885#endif
886 1071
887 { 1072 if (o_reify & EV__IOFDSET)
888 unsigned char o_events = anfd->events;
889 unsigned char o_reify = anfd->reify;
890
891 anfd->reify = 0;
892 anfd->events = events;
893
894 if (o_events != events || o_reify & EV__IOFDSET)
895 backend_modify (EV_A_ fd, o_events, events); 1073 backend_modify (EV_A_ fd, o_events, anfd->events);
896 }
897 } 1074 }
898 1075
899 fdchangecnt = 0; 1076 fdchangecnt = 0;
900} 1077}
901 1078
… …
925 ev_io_stop (EV_A_ w); 1102 ev_io_stop (EV_A_ w);
926 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1103 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
927 } 1104 }
928} 1105}
929 1106
930/* check whether the given fd is atcually valid, for error recovery */ 1107/* check whether the given fd is actually valid, for error recovery */
931inline_size int 1108inline_size int
932fd_valid (int fd) 1109fd_valid (int fd)
933{ 1110{
934#ifdef _WIN32 1111#ifdef _WIN32
935 return _get_osfhandle (fd) != -1; 1112 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
936#else 1113#else
937 return fcntl (fd, F_GETFD) != -1; 1114 return fcntl (fd, F_GETFD) != -1;
938#endif 1115#endif
939} 1116}
940 1117
… …
958 1135
959 for (fd = anfdmax; fd--; ) 1136 for (fd = anfdmax; fd--; )
960 if (anfds [fd].events) 1137 if (anfds [fd].events)
961 { 1138 {
962 fd_kill (EV_A_ fd); 1139 fd_kill (EV_A_ fd);
963 return; 1140 break;
964 } 1141 }
965} 1142}
966 1143
967/* usually called after fork if backend needs to re-arm all fds from scratch */ 1144/* usually called after fork if backend needs to re-arm all fds from scratch */
968static void noinline 1145static void noinline
… …
977 anfds [fd].emask = 0; 1154 anfds [fd].emask = 0;
978 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1155 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
979 } 1156 }
980} 1157}
981 1158
1159/* used to prepare libev internal fd's */
1160/* this is not fork-safe */
1161inline_speed void
1162fd_intern (int fd)
1163{
1164#ifdef _WIN32
1165 unsigned long arg = 1;
1166 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1167#else
1168 fcntl (fd, F_SETFD, FD_CLOEXEC);
1169 fcntl (fd, F_SETFL, O_NONBLOCK);
1170#endif
1171}
1172
982/*****************************************************************************/ 1173/*****************************************************************************/
983 1174
984/* 1175/*
985 * the heap functions want a real array index. array index 0 uis guaranteed to not 1176 * the heap functions want a real array index. array index 0 is guaranteed to not
986 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1177 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
987 * the branching factor of the d-tree. 1178 * the branching factor of the d-tree.
988 */ 1179 */
989 1180
990/* 1181/*
… …
1058 1249
1059 for (;;) 1250 for (;;)
1060 { 1251 {
1061 int c = k << 1; 1252 int c = k << 1;
1062 1253
1063 if (c > N + HEAP0 - 1) 1254 if (c >= N + HEAP0)
1064 break; 1255 break;
1065 1256
1066 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1257 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1067 ? 1 : 0; 1258 ? 1 : 0;
1068 1259
… …
1104 1295
1105/* move an element suitably so it is in a correct place */ 1296/* move an element suitably so it is in a correct place */
1106inline_size void 1297inline_size void
1107adjustheap (ANHE *heap, int N, int k) 1298adjustheap (ANHE *heap, int N, int k)
1108{ 1299{
1109 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1300 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1110 upheap (heap, k); 1301 upheap (heap, k);
1111 else 1302 else
1112 downheap (heap, N, k); 1303 downheap (heap, N, k);
1113} 1304}
1114 1305
… …
1127/*****************************************************************************/ 1318/*****************************************************************************/
1128 1319
1129/* associate signal watchers to a signal signal */ 1320/* associate signal watchers to a signal signal */
1130typedef struct 1321typedef struct
1131{ 1322{
1323 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1133 EV_P; 1325 EV_P;
1134#endif 1326#endif
1135 WL head; 1327 WL head;
1136 EV_ATOMIC_T gotsig;
1137} ANSIG; 1328} ANSIG;
1138 1329
1139static ANSIG signals [EV_NSIG - 1]; 1330static ANSIG signals [EV_NSIG - 1];
1140static EV_ATOMIC_T gotsig;
1141 1331
1142/*****************************************************************************/ 1332/*****************************************************************************/
1143 1333
1144/* used to prepare libev internal fd's */ 1334#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1145/* this is not fork-safe */
1146inline_speed void
1147fd_intern (int fd)
1148{
1149#ifdef _WIN32
1150 unsigned long arg = 1;
1151 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1152#else
1153 fcntl (fd, F_SETFD, FD_CLOEXEC);
1154 fcntl (fd, F_SETFL, O_NONBLOCK);
1155#endif
1156}
1157 1335
1158static void noinline 1336static void noinline
1159evpipe_init (EV_P) 1337evpipe_init (EV_P)
1160{ 1338{
1161 if (!ev_is_active (&pipe_w)) 1339 if (!ev_is_active (&pipe_w))
1162 { 1340 {
1163#if EV_USE_EVENTFD 1341# if EV_USE_EVENTFD
1164 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1342 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1165 if (evfd < 0 && errno == EINVAL) 1343 if (evfd < 0 && errno == EINVAL)
1166 evfd = eventfd (0, 0); 1344 evfd = eventfd (0, 0);
1167 1345
1168 if (evfd >= 0) 1346 if (evfd >= 0)
… …
1170 evpipe [0] = -1; 1348 evpipe [0] = -1;
1171 fd_intern (evfd); /* doing it twice doesn't hurt */ 1349 fd_intern (evfd); /* doing it twice doesn't hurt */
1172 ev_io_set (&pipe_w, evfd, EV_READ); 1350 ev_io_set (&pipe_w, evfd, EV_READ);
1173 } 1351 }
1174 else 1352 else
1175#endif 1353# endif
1176 { 1354 {
1177 while (pipe (evpipe)) 1355 while (pipe (evpipe))
1178 ev_syserr ("(libev) error creating signal/async pipe"); 1356 ev_syserr ("(libev) error creating signal/async pipe");
1179 1357
1180 fd_intern (evpipe [0]); 1358 fd_intern (evpipe [0]);
… …
1191evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1369evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1192{ 1370{
1193 if (!*flag) 1371 if (!*flag)
1194 { 1372 {
1195 int old_errno = errno; /* save errno because write might clobber it */ 1373 int old_errno = errno; /* save errno because write might clobber it */
1374 char dummy;
1196 1375
1197 *flag = 1; 1376 *flag = 1;
1198 1377
1199#if EV_USE_EVENTFD 1378#if EV_USE_EVENTFD
1200 if (evfd >= 0) 1379 if (evfd >= 0)
… …
1202 uint64_t counter = 1; 1381 uint64_t counter = 1;
1203 write (evfd, &counter, sizeof (uint64_t)); 1382 write (evfd, &counter, sizeof (uint64_t));
1204 } 1383 }
1205 else 1384 else
1206#endif 1385#endif
1386 /* win32 people keep sending patches that change this write() to send() */
1387 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1388 /* so when you think this write should be a send instead, please find out */
1389 /* where your send() is from - it's definitely not the microsoft send, and */
1390 /* tell me. thank you. */
1207 write (evpipe [1], &old_errno, 1); 1391 write (evpipe [1], &dummy, 1);
1208 1392
1209 errno = old_errno; 1393 errno = old_errno;
1210 } 1394 }
1211} 1395}
1212 1396
1213/* called whenever the libev signal pipe */ 1397/* called whenever the libev signal pipe */
1214/* got some events (signal, async) */ 1398/* got some events (signal, async) */
1215static void 1399static void
1216pipecb (EV_P_ ev_io *iow, int revents) 1400pipecb (EV_P_ ev_io *iow, int revents)
1217{ 1401{
1402 int i;
1403
1218#if EV_USE_EVENTFD 1404#if EV_USE_EVENTFD
1219 if (evfd >= 0) 1405 if (evfd >= 0)
1220 { 1406 {
1221 uint64_t counter; 1407 uint64_t counter;
1222 read (evfd, &counter, sizeof (uint64_t)); 1408 read (evfd, &counter, sizeof (uint64_t));
1223 } 1409 }
1224 else 1410 else
1225#endif 1411#endif
1226 { 1412 {
1227 char dummy; 1413 char dummy;
1414 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1228 read (evpipe [0], &dummy, 1); 1415 read (evpipe [0], &dummy, 1);
1229 } 1416 }
1230 1417
1231 if (gotsig && ev_is_default_loop (EV_A)) 1418#if EV_SIGNAL_ENABLE
1232 { 1419 if (sig_pending)
1233 int signum; 1420 {
1234 gotsig = 0; 1421 sig_pending = 0;
1235 1422
1236 for (signum = EV_NSIG - 1; signum--; ) 1423 for (i = EV_NSIG - 1; i--; )
1237 if (signals [signum].gotsig) 1424 if (expect_false (signals [i].pending))
1238 ev_feed_signal_event (EV_A_ signum + 1); 1425 ev_feed_signal_event (EV_A_ i + 1);
1239 } 1426 }
1427#endif
1240 1428
1241#if EV_ASYNC_ENABLE 1429#if EV_ASYNC_ENABLE
1242 if (gotasync) 1430 if (async_pending)
1243 { 1431 {
1244 int i; 1432 async_pending = 0;
1245 gotasync = 0;
1246 1433
1247 for (i = asynccnt; i--; ) 1434 for (i = asynccnt; i--; )
1248 if (asyncs [i]->sent) 1435 if (asyncs [i]->sent)
1249 { 1436 {
1250 asyncs [i]->sent = 0; 1437 asyncs [i]->sent = 0;
… …
1254#endif 1441#endif
1255} 1442}
1256 1443
1257/*****************************************************************************/ 1444/*****************************************************************************/
1258 1445
1446void
1447ev_feed_signal (int signum)
1448{
1449#if EV_MULTIPLICITY
1450 EV_P = signals [signum - 1].loop;
1451
1452 if (!EV_A)
1453 return;
1454#endif
1455
1456 signals [signum - 1].pending = 1;
1457 evpipe_write (EV_A_ &sig_pending);
1458}
1459
1259static void 1460static void
1260ev_sighandler (int signum) 1461ev_sighandler (int signum)
1261{ 1462{
1262#if EV_MULTIPLICITY
1263 EV_P = signals [signum - 1].loop;
1264#endif
1265
1266#if _WIN32 1463#ifdef _WIN32
1267 signal (signum, ev_sighandler); 1464 signal (signum, ev_sighandler);
1268#endif 1465#endif
1269 1466
1270 signals [signum - 1].gotsig = 1; 1467 ev_feed_signal (signum);
1271 evpipe_write (EV_A_ &gotsig);
1272} 1468}
1273 1469
1274void noinline 1470void noinline
1275ev_feed_signal_event (EV_P_ int signum) 1471ev_feed_signal_event (EV_P_ int signum)
1276{ 1472{
1277 WL w; 1473 WL w;
1278 1474
1475 if (expect_false (signum <= 0 || signum > EV_NSIG))
1476 return;
1477
1478 --signum;
1479
1279#if EV_MULTIPLICITY 1480#if EV_MULTIPLICITY
1280 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1481 /* it is permissible to try to feed a signal to the wrong loop */
1281#endif 1482 /* or, likely more useful, feeding a signal nobody is waiting for */
1282 1483
1283 if (signum <= 0 || signum > EV_NSIG) 1484 if (expect_false (signals [signum].loop != EV_A))
1284 return; 1485 return;
1486#endif
1285 1487
1286 --signum;
1287
1288 signals [signum].gotsig = 0; 1488 signals [signum].pending = 0;
1289 1489
1290 for (w = signals [signum].head; w; w = w->next) 1490 for (w = signals [signum].head; w; w = w->next)
1291 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1491 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1292} 1492}
1293 1493
… …
1309 break; 1509 break;
1310 } 1510 }
1311} 1511}
1312#endif 1512#endif
1313 1513
1514#endif
1515
1314/*****************************************************************************/ 1516/*****************************************************************************/
1315 1517
1518#if EV_CHILD_ENABLE
1316static WL childs [EV_PID_HASHSIZE]; 1519static WL childs [EV_PID_HASHSIZE];
1317
1318#ifndef _WIN32
1319 1520
1320static ev_signal childev; 1521static ev_signal childev;
1321 1522
1322#ifndef WIFCONTINUED 1523#ifndef WIFCONTINUED
1323# define WIFCONTINUED(status) 0 1524# define WIFCONTINUED(status) 0
… …
1328child_reap (EV_P_ int chain, int pid, int status) 1529child_reap (EV_P_ int chain, int pid, int status)
1329{ 1530{
1330 ev_child *w; 1531 ev_child *w;
1331 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1532 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1332 1533
1333 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1534 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1334 { 1535 {
1335 if ((w->pid == pid || !w->pid) 1536 if ((w->pid == pid || !w->pid)
1336 && (!traced || (w->flags & 1))) 1537 && (!traced || (w->flags & 1)))
1337 { 1538 {
1338 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1539 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1363 /* make sure we are called again until all children have been reaped */ 1564 /* make sure we are called again until all children have been reaped */
1364 /* we need to do it this way so that the callback gets called before we continue */ 1565 /* we need to do it this way so that the callback gets called before we continue */
1365 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1566 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1366 1567
1367 child_reap (EV_A_ pid, pid, status); 1568 child_reap (EV_A_ pid, pid, status);
1368 if (EV_PID_HASHSIZE > 1) 1569 if ((EV_PID_HASHSIZE) > 1)
1369 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1570 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1370} 1571}
1371 1572
1372#endif 1573#endif
1373 1574
1374/*****************************************************************************/ 1575/*****************************************************************************/
1375 1576
1577#if EV_USE_IOCP
1578# include "ev_iocp.c"
1579#endif
1376#if EV_USE_PORT 1580#if EV_USE_PORT
1377# include "ev_port.c" 1581# include "ev_port.c"
1378#endif 1582#endif
1379#if EV_USE_KQUEUE 1583#if EV_USE_KQUEUE
1380# include "ev_kqueue.c" 1584# include "ev_kqueue.c"
… …
1440#ifdef __APPLE__ 1644#ifdef __APPLE__
1441 /* only select works correctly on that "unix-certified" platform */ 1645 /* only select works correctly on that "unix-certified" platform */
1442 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1646 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1443 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1647 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1444#endif 1648#endif
1649#ifdef __FreeBSD__
1650 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1651#endif
1445 1652
1446 return flags; 1653 return flags;
1447} 1654}
1448 1655
1449unsigned int 1656unsigned int
1450ev_embeddable_backends (void) 1657ev_embeddable_backends (void)
1451{ 1658{
1452 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1659 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1453 1660
1454 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1661 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1455 /* please fix it and tell me how to detect the fix */ 1662 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1456 flags &= ~EVBACKEND_EPOLL; 1663 flags &= ~EVBACKEND_EPOLL;
1457 1664
1458 return flags; 1665 return flags;
1459} 1666}
1460 1667
1461unsigned int 1668unsigned int
1462ev_backend (EV_P) 1669ev_backend (EV_P)
1463{ 1670{
1464 return backend; 1671 return backend;
1465} 1672}
1466 1673
1467#if EV_MINIMAL < 2 1674#if EV_FEATURE_API
1468unsigned int 1675unsigned int
1469ev_loop_count (EV_P) 1676ev_iteration (EV_P)
1470{ 1677{
1471 return loop_count; 1678 return loop_count;
1472} 1679}
1473 1680
1474unsigned int 1681unsigned int
1475ev_loop_depth (EV_P) 1682ev_depth (EV_P)
1476{ 1683{
1477 return loop_depth; 1684 return loop_depth;
1478} 1685}
1479 1686
1480void 1687void
… …
1517static void noinline 1724static void noinline
1518loop_init (EV_P_ unsigned int flags) 1725loop_init (EV_P_ unsigned int flags)
1519{ 1726{
1520 if (!backend) 1727 if (!backend)
1521 { 1728 {
1729 origflags = flags;
1730
1522#if EV_USE_REALTIME 1731#if EV_USE_REALTIME
1523 if (!have_realtime) 1732 if (!have_realtime)
1524 { 1733 {
1525 struct timespec ts; 1734 struct timespec ts;
1526 1735
… …
1552 1761
1553 ev_rt_now = ev_time (); 1762 ev_rt_now = ev_time ();
1554 mn_now = get_clock (); 1763 mn_now = get_clock ();
1555 now_floor = mn_now; 1764 now_floor = mn_now;
1556 rtmn_diff = ev_rt_now - mn_now; 1765 rtmn_diff = ev_rt_now - mn_now;
1557#if EV_MINIMAL < 2 1766#if EV_FEATURE_API
1558 invoke_cb = ev_invoke_pending; 1767 invoke_cb = ev_invoke_pending;
1559#endif 1768#endif
1560 1769
1561 io_blocktime = 0.; 1770 io_blocktime = 0.;
1562 timeout_blocktime = 0.; 1771 timeout_blocktime = 0.;
1563 backend = 0; 1772 backend = 0;
1564 backend_fd = -1; 1773 backend_fd = -1;
1565 gotasync = 0; 1774 sig_pending = 0;
1775#if EV_ASYNC_ENABLE
1776 async_pending = 0;
1777#endif
1566#if EV_USE_INOTIFY 1778#if EV_USE_INOTIFY
1567 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1779 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1568#endif 1780#endif
1569#if EV_USE_SIGNALFD 1781#if EV_USE_SIGNALFD
1570 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1782 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1571#endif 1783#endif
1572 1784
1573 if (!(flags & 0x0000ffffU)) 1785 if (!(flags & EVBACKEND_MASK))
1574 flags |= ev_recommended_backends (); 1786 flags |= ev_recommended_backends ();
1575 1787
1788#if EV_USE_IOCP
1789 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1790#endif
1576#if EV_USE_PORT 1791#if EV_USE_PORT
1577 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1792 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1578#endif 1793#endif
1579#if EV_USE_KQUEUE 1794#if EV_USE_KQUEUE
1580 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1795 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1589 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1804 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1590#endif 1805#endif
1591 1806
1592 ev_prepare_init (&pending_w, pendingcb); 1807 ev_prepare_init (&pending_w, pendingcb);
1593 1808
1809#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1594 ev_init (&pipe_w, pipecb); 1810 ev_init (&pipe_w, pipecb);
1595 ev_set_priority (&pipe_w, EV_MAXPRI); 1811 ev_set_priority (&pipe_w, EV_MAXPRI);
1812#endif
1596 } 1813 }
1597} 1814}
1598 1815
1599/* free up a loop structure */ 1816/* free up a loop structure */
1600static void noinline 1817void
1601loop_destroy (EV_P) 1818ev_loop_destroy (EV_P)
1602{ 1819{
1603 int i; 1820 int i;
1821
1822#if EV_MULTIPLICITY
1823 /* mimic free (0) */
1824 if (!EV_A)
1825 return;
1826#endif
1827
1828#if EV_CLEANUP_ENABLE
1829 /* queue cleanup watchers (and execute them) */
1830 if (expect_false (cleanupcnt))
1831 {
1832 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1833 EV_INVOKE_PENDING;
1834 }
1835#endif
1836
1837#if EV_CHILD_ENABLE
1838 if (ev_is_active (&childev))
1839 {
1840 ev_ref (EV_A); /* child watcher */
1841 ev_signal_stop (EV_A_ &childev);
1842 }
1843#endif
1604 1844
1605 if (ev_is_active (&pipe_w)) 1845 if (ev_is_active (&pipe_w))
1606 { 1846 {
1607 /*ev_ref (EV_A);*/ 1847 /*ev_ref (EV_A);*/
1608 /*ev_io_stop (EV_A_ &pipe_w);*/ 1848 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1612 close (evfd); 1852 close (evfd);
1613#endif 1853#endif
1614 1854
1615 if (evpipe [0] >= 0) 1855 if (evpipe [0] >= 0)
1616 { 1856 {
1617 close (evpipe [0]); 1857 EV_WIN32_CLOSE_FD (evpipe [0]);
1618 close (evpipe [1]); 1858 EV_WIN32_CLOSE_FD (evpipe [1]);
1619 } 1859 }
1620 } 1860 }
1621 1861
1622#if EV_USE_SIGNALFD 1862#if EV_USE_SIGNALFD
1623 if (ev_is_active (&sigfd_w)) 1863 if (ev_is_active (&sigfd_w))
1624 {
1625 /*ev_ref (EV_A);*/
1626 /*ev_io_stop (EV_A_ &sigfd_w);*/
1627
1628 close (sigfd); 1864 close (sigfd);
1629 }
1630#endif 1865#endif
1631 1866
1632#if EV_USE_INOTIFY 1867#if EV_USE_INOTIFY
1633 if (fs_fd >= 0) 1868 if (fs_fd >= 0)
1634 close (fs_fd); 1869 close (fs_fd);
1635#endif 1870#endif
1636 1871
1637 if (backend_fd >= 0) 1872 if (backend_fd >= 0)
1638 close (backend_fd); 1873 close (backend_fd);
1639 1874
1875#if EV_USE_IOCP
1876 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1877#endif
1640#if EV_USE_PORT 1878#if EV_USE_PORT
1641 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1879 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1642#endif 1880#endif
1643#if EV_USE_KQUEUE 1881#if EV_USE_KQUEUE
1644 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1882 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1671 array_free (periodic, EMPTY); 1909 array_free (periodic, EMPTY);
1672#endif 1910#endif
1673#if EV_FORK_ENABLE 1911#if EV_FORK_ENABLE
1674 array_free (fork, EMPTY); 1912 array_free (fork, EMPTY);
1675#endif 1913#endif
1914#if EV_CLEANUP_ENABLE
1915 array_free (cleanup, EMPTY);
1916#endif
1676 array_free (prepare, EMPTY); 1917 array_free (prepare, EMPTY);
1677 array_free (check, EMPTY); 1918 array_free (check, EMPTY);
1678#if EV_ASYNC_ENABLE 1919#if EV_ASYNC_ENABLE
1679 array_free (async, EMPTY); 1920 array_free (async, EMPTY);
1680#endif 1921#endif
1681 1922
1682 backend = 0; 1923 backend = 0;
1924
1925#if EV_MULTIPLICITY
1926 if (ev_is_default_loop (EV_A))
1927#endif
1928 ev_default_loop_ptr = 0;
1929#if EV_MULTIPLICITY
1930 else
1931 ev_free (EV_A);
1932#endif
1683} 1933}
1684 1934
1685#if EV_USE_INOTIFY 1935#if EV_USE_INOTIFY
1686inline_size void infy_fork (EV_P); 1936inline_size void infy_fork (EV_P);
1687#endif 1937#endif
… …
1704 1954
1705 if (ev_is_active (&pipe_w)) 1955 if (ev_is_active (&pipe_w))
1706 { 1956 {
1707 /* this "locks" the handlers against writing to the pipe */ 1957 /* this "locks" the handlers against writing to the pipe */
1708 /* while we modify the fd vars */ 1958 /* while we modify the fd vars */
1709 gotsig = 1; 1959 sig_pending = 1;
1710#if EV_ASYNC_ENABLE 1960#if EV_ASYNC_ENABLE
1711 gotasync = 1; 1961 async_pending = 1;
1712#endif 1962#endif
1713 1963
1714 ev_ref (EV_A); 1964 ev_ref (EV_A);
1715 ev_io_stop (EV_A_ &pipe_w); 1965 ev_io_stop (EV_A_ &pipe_w);
1716 1966
… …
1719 close (evfd); 1969 close (evfd);
1720#endif 1970#endif
1721 1971
1722 if (evpipe [0] >= 0) 1972 if (evpipe [0] >= 0)
1723 { 1973 {
1724 close (evpipe [0]); 1974 EV_WIN32_CLOSE_FD (evpipe [0]);
1725 close (evpipe [1]); 1975 EV_WIN32_CLOSE_FD (evpipe [1]);
1726 } 1976 }
1727 1977
1978#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1728 evpipe_init (EV_A); 1979 evpipe_init (EV_A);
1729 /* now iterate over everything, in case we missed something */ 1980 /* now iterate over everything, in case we missed something */
1730 pipecb (EV_A_ &pipe_w, EV_READ); 1981 pipecb (EV_A_ &pipe_w, EV_READ);
1982#endif
1731 } 1983 }
1732 1984
1733 postfork = 0; 1985 postfork = 0;
1734} 1986}
1735 1987
… …
1744 loop_init (EV_A_ flags); 1996 loop_init (EV_A_ flags);
1745 1997
1746 if (ev_backend (EV_A)) 1998 if (ev_backend (EV_A))
1747 return EV_A; 1999 return EV_A;
1748 2000
2001 ev_free (EV_A);
1749 return 0; 2002 return 0;
1750} 2003}
1751 2004
1752void
1753ev_loop_destroy (EV_P)
1754{
1755 loop_destroy (EV_A);
1756 ev_free (loop);
1757}
1758
1759void
1760ev_loop_fork (EV_P)
1761{
1762 postfork = 1; /* must be in line with ev_default_fork */
1763}
1764#endif /* multiplicity */ 2005#endif /* multiplicity */
1765 2006
1766#if EV_VERIFY 2007#if EV_VERIFY
1767static void noinline 2008static void noinline
1768verify_watcher (EV_P_ W w) 2009verify_watcher (EV_P_ W w)
… …
1797 verify_watcher (EV_A_ ws [cnt]); 2038 verify_watcher (EV_A_ ws [cnt]);
1798 } 2039 }
1799} 2040}
1800#endif 2041#endif
1801 2042
1802#if EV_MINIMAL < 2 2043#if EV_FEATURE_API
1803void 2044void
1804ev_loop_verify (EV_P) 2045ev_verify (EV_P)
1805{ 2046{
1806#if EV_VERIFY 2047#if EV_VERIFY
1807 int i; 2048 int i;
1808 WL w; 2049 WL w;
1809 2050
… …
1843#if EV_FORK_ENABLE 2084#if EV_FORK_ENABLE
1844 assert (forkmax >= forkcnt); 2085 assert (forkmax >= forkcnt);
1845 array_verify (EV_A_ (W *)forks, forkcnt); 2086 array_verify (EV_A_ (W *)forks, forkcnt);
1846#endif 2087#endif
1847 2088
2089#if EV_CLEANUP_ENABLE
2090 assert (cleanupmax >= cleanupcnt);
2091 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2092#endif
2093
1848#if EV_ASYNC_ENABLE 2094#if EV_ASYNC_ENABLE
1849 assert (asyncmax >= asynccnt); 2095 assert (asyncmax >= asynccnt);
1850 array_verify (EV_A_ (W *)asyncs, asynccnt); 2096 array_verify (EV_A_ (W *)asyncs, asynccnt);
1851#endif 2097#endif
1852 2098
2099#if EV_PREPARE_ENABLE
1853 assert (preparemax >= preparecnt); 2100 assert (preparemax >= preparecnt);
1854 array_verify (EV_A_ (W *)prepares, preparecnt); 2101 array_verify (EV_A_ (W *)prepares, preparecnt);
2102#endif
1855 2103
2104#if EV_CHECK_ENABLE
1856 assert (checkmax >= checkcnt); 2105 assert (checkmax >= checkcnt);
1857 array_verify (EV_A_ (W *)checks, checkcnt); 2106 array_verify (EV_A_ (W *)checks, checkcnt);
2107#endif
1858 2108
1859# if 0 2109# if 0
2110#if EV_CHILD_ENABLE
1860 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2111 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1861 for (signum = EV_NSIG; signum--; ) if (signals [signum].gotsig) 2112 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2113#endif
1862# endif 2114# endif
1863#endif 2115#endif
1864} 2116}
1865#endif 2117#endif
1866 2118
1867#if EV_MULTIPLICITY 2119#if EV_MULTIPLICITY
1868struct ev_loop * 2120struct ev_loop *
1869ev_default_loop_init (unsigned int flags)
1870#else 2121#else
1871int 2122int
2123#endif
1872ev_default_loop (unsigned int flags) 2124ev_default_loop (unsigned int flags)
1873#endif
1874{ 2125{
1875 if (!ev_default_loop_ptr) 2126 if (!ev_default_loop_ptr)
1876 { 2127 {
1877#if EV_MULTIPLICITY 2128#if EV_MULTIPLICITY
1878 EV_P = ev_default_loop_ptr = &default_loop_struct; 2129 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1882 2133
1883 loop_init (EV_A_ flags); 2134 loop_init (EV_A_ flags);
1884 2135
1885 if (ev_backend (EV_A)) 2136 if (ev_backend (EV_A))
1886 { 2137 {
1887#ifndef _WIN32 2138#if EV_CHILD_ENABLE
1888 ev_signal_init (&childev, childcb, SIGCHLD); 2139 ev_signal_init (&childev, childcb, SIGCHLD);
1889 ev_set_priority (&childev, EV_MAXPRI); 2140 ev_set_priority (&childev, EV_MAXPRI);
1890 ev_signal_start (EV_A_ &childev); 2141 ev_signal_start (EV_A_ &childev);
1891 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2142 ev_unref (EV_A); /* child watcher should not keep loop alive */
1892#endif 2143#endif
… …
1897 2148
1898 return ev_default_loop_ptr; 2149 return ev_default_loop_ptr;
1899} 2150}
1900 2151
1901void 2152void
1902ev_default_destroy (void) 2153ev_loop_fork (EV_P)
1903{ 2154{
1904#if EV_MULTIPLICITY
1905 EV_P = ev_default_loop_ptr;
1906#endif
1907
1908 ev_default_loop_ptr = 0;
1909
1910#ifndef _WIN32
1911 ev_ref (EV_A); /* child watcher */
1912 ev_signal_stop (EV_A_ &childev);
1913#endif
1914
1915 loop_destroy (EV_A);
1916}
1917
1918void
1919ev_default_fork (void)
1920{
1921#if EV_MULTIPLICITY
1922 EV_P = ev_default_loop_ptr;
1923#endif
1924
1925 postfork = 1; /* must be in line with ev_loop_fork */ 2155 postfork = 1; /* must be in line with ev_default_fork */
1926} 2156}
1927 2157
1928/*****************************************************************************/ 2158/*****************************************************************************/
1929 2159
1930void 2160void
… …
1952 2182
1953 for (pri = NUMPRI; pri--; ) 2183 for (pri = NUMPRI; pri--; )
1954 while (pendingcnt [pri]) 2184 while (pendingcnt [pri])
1955 { 2185 {
1956 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2186 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1957
1958 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1959 /* ^ this is no longer true, as pending_w could be here */
1960 2187
1961 p->w->pending = 0; 2188 p->w->pending = 0;
1962 EV_CB_INVOKE (p->w, p->events); 2189 EV_CB_INVOKE (p->w, p->events);
1963 EV_FREQUENT_CHECK; 2190 EV_FREQUENT_CHECK;
1964 } 2191 }
… …
2021 EV_FREQUENT_CHECK; 2248 EV_FREQUENT_CHECK;
2022 feed_reverse (EV_A_ (W)w); 2249 feed_reverse (EV_A_ (W)w);
2023 } 2250 }
2024 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2251 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2025 2252
2026 feed_reverse_done (EV_A_ EV_TIMEOUT); 2253 feed_reverse_done (EV_A_ EV_TIMER);
2027 } 2254 }
2028} 2255}
2029 2256
2030#if EV_PERIODIC_ENABLE 2257#if EV_PERIODIC_ENABLE
2258
2259static void noinline
2260periodic_recalc (EV_P_ ev_periodic *w)
2261{
2262 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2263 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2264
2265 /* the above almost always errs on the low side */
2266 while (at <= ev_rt_now)
2267 {
2268 ev_tstamp nat = at + w->interval;
2269
2270 /* when resolution fails us, we use ev_rt_now */
2271 if (expect_false (nat == at))
2272 {
2273 at = ev_rt_now;
2274 break;
2275 }
2276
2277 at = nat;
2278 }
2279
2280 ev_at (w) = at;
2281}
2282
2031/* make periodics pending */ 2283/* make periodics pending */
2032inline_size void 2284inline_size void
2033periodics_reify (EV_P) 2285periodics_reify (EV_P)
2034{ 2286{
2035 EV_FREQUENT_CHECK; 2287 EV_FREQUENT_CHECK;
… …
2054 ANHE_at_cache (periodics [HEAP0]); 2306 ANHE_at_cache (periodics [HEAP0]);
2055 downheap (periodics, periodiccnt, HEAP0); 2307 downheap (periodics, periodiccnt, HEAP0);
2056 } 2308 }
2057 else if (w->interval) 2309 else if (w->interval)
2058 { 2310 {
2059 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2311 periodic_recalc (EV_A_ w);
2060 /* if next trigger time is not sufficiently in the future, put it there */
2061 /* this might happen because of floating point inexactness */
2062 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2063 {
2064 ev_at (w) += w->interval;
2065
2066 /* if interval is unreasonably low we might still have a time in the past */
2067 /* so correct this. this will make the periodic very inexact, but the user */
2068 /* has effectively asked to get triggered more often than possible */
2069 if (ev_at (w) < ev_rt_now)
2070 ev_at (w) = ev_rt_now;
2071 }
2072
2073 ANHE_at_cache (periodics [HEAP0]); 2312 ANHE_at_cache (periodics [HEAP0]);
2074 downheap (periodics, periodiccnt, HEAP0); 2313 downheap (periodics, periodiccnt, HEAP0);
2075 } 2314 }
2076 else 2315 else
2077 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2316 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2084 feed_reverse_done (EV_A_ EV_PERIODIC); 2323 feed_reverse_done (EV_A_ EV_PERIODIC);
2085 } 2324 }
2086} 2325}
2087 2326
2088/* simply recalculate all periodics */ 2327/* simply recalculate all periodics */
2089/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2328/* TODO: maybe ensure that at least one event happens when jumping forward? */
2090static void noinline 2329static void noinline
2091periodics_reschedule (EV_P) 2330periodics_reschedule (EV_P)
2092{ 2331{
2093 int i; 2332 int i;
2094 2333
… …
2098 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2337 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2099 2338
2100 if (w->reschedule_cb) 2339 if (w->reschedule_cb)
2101 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2340 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2102 else if (w->interval) 2341 else if (w->interval)
2103 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2342 periodic_recalc (EV_A_ w);
2104 2343
2105 ANHE_at_cache (periodics [i]); 2344 ANHE_at_cache (periodics [i]);
2106 } 2345 }
2107 2346
2108 reheap (periodics, periodiccnt); 2347 reheap (periodics, periodiccnt);
… …
2122 ANHE_at_cache (*he); 2361 ANHE_at_cache (*he);
2123 } 2362 }
2124} 2363}
2125 2364
2126/* fetch new monotonic and realtime times from the kernel */ 2365/* fetch new monotonic and realtime times from the kernel */
2127/* also detetc if there was a timejump, and act accordingly */ 2366/* also detect if there was a timejump, and act accordingly */
2128inline_speed void 2367inline_speed void
2129time_update (EV_P_ ev_tstamp max_block) 2368time_update (EV_P_ ev_tstamp max_block)
2130{ 2369{
2131#if EV_USE_MONOTONIC 2370#if EV_USE_MONOTONIC
2132 if (expect_true (have_monotonic)) 2371 if (expect_true (have_monotonic))
… …
2155 * doesn't hurt either as we only do this on time-jumps or 2394 * doesn't hurt either as we only do this on time-jumps or
2156 * in the unlikely event of having been preempted here. 2395 * in the unlikely event of having been preempted here.
2157 */ 2396 */
2158 for (i = 4; --i; ) 2397 for (i = 4; --i; )
2159 { 2398 {
2399 ev_tstamp diff;
2160 rtmn_diff = ev_rt_now - mn_now; 2400 rtmn_diff = ev_rt_now - mn_now;
2161 2401
2402 diff = odiff - rtmn_diff;
2403
2162 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2404 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2163 return; /* all is well */ 2405 return; /* all is well */
2164 2406
2165 ev_rt_now = ev_time (); 2407 ev_rt_now = ev_time ();
2166 mn_now = get_clock (); 2408 mn_now = get_clock ();
2167 now_floor = mn_now; 2409 now_floor = mn_now;
… …
2190 mn_now = ev_rt_now; 2432 mn_now = ev_rt_now;
2191 } 2433 }
2192} 2434}
2193 2435
2194void 2436void
2195ev_loop (EV_P_ int flags) 2437ev_run (EV_P_ int flags)
2196{ 2438{
2197#if EV_MINIMAL < 2 2439#if EV_FEATURE_API
2198 ++loop_depth; 2440 ++loop_depth;
2199#endif 2441#endif
2200 2442
2201 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2443 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2202 2444
2203 loop_done = EVUNLOOP_CANCEL; 2445 loop_done = EVBREAK_CANCEL;
2204 2446
2205 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2447 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2206 2448
2207 do 2449 do
2208 { 2450 {
2209#if EV_VERIFY >= 2 2451#if EV_VERIFY >= 2
2210 ev_loop_verify (EV_A); 2452 ev_verify (EV_A);
2211#endif 2453#endif
2212 2454
2213#ifndef _WIN32 2455#ifndef _WIN32
2214 if (expect_false (curpid)) /* penalise the forking check even more */ 2456 if (expect_false (curpid)) /* penalise the forking check even more */
2215 if (expect_false (getpid () != curpid)) 2457 if (expect_false (getpid () != curpid))
… …
2227 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2469 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2228 EV_INVOKE_PENDING; 2470 EV_INVOKE_PENDING;
2229 } 2471 }
2230#endif 2472#endif
2231 2473
2474#if EV_PREPARE_ENABLE
2232 /* queue prepare watchers (and execute them) */ 2475 /* queue prepare watchers (and execute them) */
2233 if (expect_false (preparecnt)) 2476 if (expect_false (preparecnt))
2234 { 2477 {
2235 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2478 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2236 EV_INVOKE_PENDING; 2479 EV_INVOKE_PENDING;
2237 } 2480 }
2481#endif
2238 2482
2239 if (expect_false (loop_done)) 2483 if (expect_false (loop_done))
2240 break; 2484 break;
2241 2485
2242 /* we might have forked, so reify kernel state if necessary */ 2486 /* we might have forked, so reify kernel state if necessary */
… …
2249 /* calculate blocking time */ 2493 /* calculate blocking time */
2250 { 2494 {
2251 ev_tstamp waittime = 0.; 2495 ev_tstamp waittime = 0.;
2252 ev_tstamp sleeptime = 0.; 2496 ev_tstamp sleeptime = 0.;
2253 2497
2498 /* remember old timestamp for io_blocktime calculation */
2499 ev_tstamp prev_mn_now = mn_now;
2500
2501 /* update time to cancel out callback processing overhead */
2502 time_update (EV_A_ 1e100);
2503
2254 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2504 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2255 { 2505 {
2256 /* remember old timestamp for io_blocktime calculation */
2257 ev_tstamp prev_mn_now = mn_now;
2258
2259 /* update time to cancel out callback processing overhead */
2260 time_update (EV_A_ 1e100);
2261
2262 waittime = MAX_BLOCKTIME; 2506 waittime = MAX_BLOCKTIME;
2263 2507
2264 if (timercnt) 2508 if (timercnt)
2265 { 2509 {
2266 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2510 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2267 if (waittime > to) waittime = to; 2511 if (waittime > to) waittime = to;
2268 } 2512 }
2269 2513
2270#if EV_PERIODIC_ENABLE 2514#if EV_PERIODIC_ENABLE
2271 if (periodiccnt) 2515 if (periodiccnt)
2272 { 2516 {
2273 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2517 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2274 if (waittime > to) waittime = to; 2518 if (waittime > to) waittime = to;
2275 } 2519 }
2276#endif 2520#endif
2277 2521
2278 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2522 /* don't let timeouts decrease the waittime below timeout_blocktime */
2279 if (expect_false (waittime < timeout_blocktime)) 2523 if (expect_false (waittime < timeout_blocktime))
2280 waittime = timeout_blocktime; 2524 waittime = timeout_blocktime;
2525
2526 /* at this point, we NEED to wait, so we have to ensure */
2527 /* to pass a minimum nonzero value to the backend */
2528 if (expect_false (waittime < backend_mintime))
2529 waittime = backend_mintime;
2281 2530
2282 /* extra check because io_blocktime is commonly 0 */ 2531 /* extra check because io_blocktime is commonly 0 */
2283 if (expect_false (io_blocktime)) 2532 if (expect_false (io_blocktime))
2284 { 2533 {
2285 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2534 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2286 2535
2287 if (sleeptime > waittime - backend_fudge) 2536 if (sleeptime > waittime - backend_mintime)
2288 sleeptime = waittime - backend_fudge; 2537 sleeptime = waittime - backend_mintime;
2289 2538
2290 if (expect_true (sleeptime > 0.)) 2539 if (expect_true (sleeptime > 0.))
2291 { 2540 {
2292 ev_sleep (sleeptime); 2541 ev_sleep (sleeptime);
2293 waittime -= sleeptime; 2542 waittime -= sleeptime;
2294 } 2543 }
2295 } 2544 }
2296 } 2545 }
2297 2546
2298#if EV_MINIMAL < 2 2547#if EV_FEATURE_API
2299 ++loop_count; 2548 ++loop_count;
2300#endif 2549#endif
2301 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2550 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2302 backend_poll (EV_A_ waittime); 2551 backend_poll (EV_A_ waittime);
2303 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2552 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2304 2553
2305 /* update ev_rt_now, do magic */ 2554 /* update ev_rt_now, do magic */
2306 time_update (EV_A_ waittime + sleeptime); 2555 time_update (EV_A_ waittime + sleeptime);
2307 } 2556 }
2308 2557
… …
2315#if EV_IDLE_ENABLE 2564#if EV_IDLE_ENABLE
2316 /* queue idle watchers unless other events are pending */ 2565 /* queue idle watchers unless other events are pending */
2317 idle_reify (EV_A); 2566 idle_reify (EV_A);
2318#endif 2567#endif
2319 2568
2569#if EV_CHECK_ENABLE
2320 /* queue check watchers, to be executed first */ 2570 /* queue check watchers, to be executed first */
2321 if (expect_false (checkcnt)) 2571 if (expect_false (checkcnt))
2322 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2572 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2573#endif
2323 2574
2324 EV_INVOKE_PENDING; 2575 EV_INVOKE_PENDING;
2325 } 2576 }
2326 while (expect_true ( 2577 while (expect_true (
2327 activecnt 2578 activecnt
2328 && !loop_done 2579 && !loop_done
2329 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2580 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2330 )); 2581 ));
2331 2582
2332 if (loop_done == EVUNLOOP_ONE) 2583 if (loop_done == EVBREAK_ONE)
2333 loop_done = EVUNLOOP_CANCEL; 2584 loop_done = EVBREAK_CANCEL;
2334 2585
2335#if EV_MINIMAL < 2 2586#if EV_FEATURE_API
2336 --loop_depth; 2587 --loop_depth;
2337#endif 2588#endif
2338} 2589}
2339 2590
2340void 2591void
2341ev_unloop (EV_P_ int how) 2592ev_break (EV_P_ int how)
2342{ 2593{
2343 loop_done = how; 2594 loop_done = how;
2344} 2595}
2345 2596
2346void 2597void
… …
2393inline_size void 2644inline_size void
2394wlist_del (WL *head, WL elem) 2645wlist_del (WL *head, WL elem)
2395{ 2646{
2396 while (*head) 2647 while (*head)
2397 { 2648 {
2398 if (*head == elem) 2649 if (expect_true (*head == elem))
2399 { 2650 {
2400 *head = elem->next; 2651 *head = elem->next;
2401 return; 2652 break;
2402 } 2653 }
2403 2654
2404 head = &(*head)->next; 2655 head = &(*head)->next;
2405 } 2656 }
2406} 2657}
… …
2466 2717
2467 if (expect_false (ev_is_active (w))) 2718 if (expect_false (ev_is_active (w)))
2468 return; 2719 return;
2469 2720
2470 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2721 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2471 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2722 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2472 2723
2473 EV_FREQUENT_CHECK; 2724 EV_FREQUENT_CHECK;
2474 2725
2475 ev_start (EV_A_ (W)w, 1); 2726 ev_start (EV_A_ (W)w, 1);
2476 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2727 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2494 EV_FREQUENT_CHECK; 2745 EV_FREQUENT_CHECK;
2495 2746
2496 wlist_del (&anfds[w->fd].head, (WL)w); 2747 wlist_del (&anfds[w->fd].head, (WL)w);
2497 ev_stop (EV_A_ (W)w); 2748 ev_stop (EV_A_ (W)w);
2498 2749
2499 fd_change (EV_A_ w->fd, 1); 2750 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2500 2751
2501 EV_FREQUENT_CHECK; 2752 EV_FREQUENT_CHECK;
2502} 2753}
2503 2754
2504void noinline 2755void noinline
… …
2546 timers [active] = timers [timercnt + HEAP0]; 2797 timers [active] = timers [timercnt + HEAP0];
2547 adjustheap (timers, timercnt, active); 2798 adjustheap (timers, timercnt, active);
2548 } 2799 }
2549 } 2800 }
2550 2801
2551 EV_FREQUENT_CHECK;
2552
2553 ev_at (w) -= mn_now; 2802 ev_at (w) -= mn_now;
2554 2803
2555 ev_stop (EV_A_ (W)w); 2804 ev_stop (EV_A_ (W)w);
2805
2806 EV_FREQUENT_CHECK;
2556} 2807}
2557 2808
2558void noinline 2809void noinline
2559ev_timer_again (EV_P_ ev_timer *w) 2810ev_timer_again (EV_P_ ev_timer *w)
2560{ 2811{
… …
2596 if (w->reschedule_cb) 2847 if (w->reschedule_cb)
2597 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2848 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2598 else if (w->interval) 2849 else if (w->interval)
2599 { 2850 {
2600 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2851 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2601 /* this formula differs from the one in periodic_reify because we do not always round up */ 2852 periodic_recalc (EV_A_ w);
2602 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2603 } 2853 }
2604 else 2854 else
2605 ev_at (w) = w->offset; 2855 ev_at (w) = w->offset;
2606 2856
2607 EV_FREQUENT_CHECK; 2857 EV_FREQUENT_CHECK;
… …
2639 periodics [active] = periodics [periodiccnt + HEAP0]; 2889 periodics [active] = periodics [periodiccnt + HEAP0];
2640 adjustheap (periodics, periodiccnt, active); 2890 adjustheap (periodics, periodiccnt, active);
2641 } 2891 }
2642 } 2892 }
2643 2893
2644 EV_FREQUENT_CHECK;
2645
2646 ev_stop (EV_A_ (W)w); 2894 ev_stop (EV_A_ (W)w);
2895
2896 EV_FREQUENT_CHECK;
2647} 2897}
2648 2898
2649void noinline 2899void noinline
2650ev_periodic_again (EV_P_ ev_periodic *w) 2900ev_periodic_again (EV_P_ ev_periodic *w)
2651{ 2901{
… …
2657 2907
2658#ifndef SA_RESTART 2908#ifndef SA_RESTART
2659# define SA_RESTART 0 2909# define SA_RESTART 0
2660#endif 2910#endif
2661 2911
2912#if EV_SIGNAL_ENABLE
2913
2662void noinline 2914void noinline
2663ev_signal_start (EV_P_ ev_signal *w) 2915ev_signal_start (EV_P_ ev_signal *w)
2664{ 2916{
2665 if (expect_false (ev_is_active (w))) 2917 if (expect_false (ev_is_active (w)))
2666 return; 2918 return;
2667 2919
2668 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG)); 2920 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2669 2921
2670#if EV_MULTIPLICITY 2922#if EV_MULTIPLICITY
2671 assert (("libev: tried to attach to a signal from two different loops", 2923 assert (("libev: a signal must not be attached to two different loops",
2672 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 2924 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2673 2925
2674 signals [w->signum - 1].loop = EV_A; 2926 signals [w->signum - 1].loop = EV_A;
2675#endif 2927#endif
2676 2928
… …
2712 if (!((WL)w)->next) 2964 if (!((WL)w)->next)
2713# if EV_USE_SIGNALFD 2965# if EV_USE_SIGNALFD
2714 if (sigfd < 0) /*TODO*/ 2966 if (sigfd < 0) /*TODO*/
2715# endif 2967# endif
2716 { 2968 {
2717# if _WIN32 2969# ifdef _WIN32
2970 evpipe_init (EV_A);
2971
2718 signal (w->signum, ev_sighandler); 2972 signal (w->signum, ev_sighandler);
2719# else 2973# else
2720 struct sigaction sa; 2974 struct sigaction sa;
2721 2975
2722 evpipe_init (EV_A); 2976 evpipe_init (EV_A);
… …
2724 sa.sa_handler = ev_sighandler; 2978 sa.sa_handler = ev_sighandler;
2725 sigfillset (&sa.sa_mask); 2979 sigfillset (&sa.sa_mask);
2726 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2980 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2727 sigaction (w->signum, &sa, 0); 2981 sigaction (w->signum, &sa, 0);
2728 2982
2983 if (origflags & EVFLAG_NOSIGMASK)
2984 {
2729 sigemptyset (&sa.sa_mask); 2985 sigemptyset (&sa.sa_mask);
2730 sigaddset (&sa.sa_mask, w->signum); 2986 sigaddset (&sa.sa_mask, w->signum);
2731 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2987 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2988 }
2732#endif 2989#endif
2733 } 2990 }
2734 2991
2735 EV_FREQUENT_CHECK; 2992 EV_FREQUENT_CHECK;
2736} 2993}
… …
2747 wlist_del (&signals [w->signum - 1].head, (WL)w); 3004 wlist_del (&signals [w->signum - 1].head, (WL)w);
2748 ev_stop (EV_A_ (W)w); 3005 ev_stop (EV_A_ (W)w);
2749 3006
2750 if (!signals [w->signum - 1].head) 3007 if (!signals [w->signum - 1].head)
2751 { 3008 {
2752 #if EV_MULTIPLICITY 3009#if EV_MULTIPLICITY
2753 signals [w->signum - 1].loop = 0; /* unattach from signal */ 3010 signals [w->signum - 1].loop = 0; /* unattach from signal */
2754 #endif 3011#endif
2755 #if EV_USE_SIGNALFD 3012#if EV_USE_SIGNALFD
2756 if (sigfd >= 0) 3013 if (sigfd >= 0)
2757 { 3014 {
2758 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 3015 sigset_t ss;
3016
3017 sigemptyset (&ss);
3018 sigaddset (&ss, w->signum);
2759 sigdelset (&sigfd_set, w->signum); 3019 sigdelset (&sigfd_set, w->signum);
3020
2760 signalfd (sigfd, &sigfd_set, 0); 3021 signalfd (sigfd, &sigfd_set, 0);
2761 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 3022 sigprocmask (SIG_UNBLOCK, &ss, 0);
2762 /*TODO: maybe unblock signal? */
2763 } 3023 }
2764 else 3024 else
2765 #endif 3025#endif
2766 signal (w->signum, SIG_DFL); 3026 signal (w->signum, SIG_DFL);
2767 } 3027 }
2768 3028
2769 EV_FREQUENT_CHECK; 3029 EV_FREQUENT_CHECK;
2770} 3030}
3031
3032#endif
3033
3034#if EV_CHILD_ENABLE
2771 3035
2772void 3036void
2773ev_child_start (EV_P_ ev_child *w) 3037ev_child_start (EV_P_ ev_child *w)
2774{ 3038{
2775#if EV_MULTIPLICITY 3039#if EV_MULTIPLICITY
… …
2779 return; 3043 return;
2780 3044
2781 EV_FREQUENT_CHECK; 3045 EV_FREQUENT_CHECK;
2782 3046
2783 ev_start (EV_A_ (W)w, 1); 3047 ev_start (EV_A_ (W)w, 1);
2784 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3048 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2785 3049
2786 EV_FREQUENT_CHECK; 3050 EV_FREQUENT_CHECK;
2787} 3051}
2788 3052
2789void 3053void
… …
2793 if (expect_false (!ev_is_active (w))) 3057 if (expect_false (!ev_is_active (w)))
2794 return; 3058 return;
2795 3059
2796 EV_FREQUENT_CHECK; 3060 EV_FREQUENT_CHECK;
2797 3061
2798 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3062 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2799 ev_stop (EV_A_ (W)w); 3063 ev_stop (EV_A_ (W)w);
2800 3064
2801 EV_FREQUENT_CHECK; 3065 EV_FREQUENT_CHECK;
2802} 3066}
3067
3068#endif
2803 3069
2804#if EV_STAT_ENABLE 3070#if EV_STAT_ENABLE
2805 3071
2806# ifdef _WIN32 3072# ifdef _WIN32
2807# undef lstat 3073# undef lstat
… …
2813#define MIN_STAT_INTERVAL 0.1074891 3079#define MIN_STAT_INTERVAL 0.1074891
2814 3080
2815static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 3081static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2816 3082
2817#if EV_USE_INOTIFY 3083#if EV_USE_INOTIFY
2818# define EV_INOTIFY_BUFSIZE 8192 3084
3085/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
3086# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2819 3087
2820static void noinline 3088static void noinline
2821infy_add (EV_P_ ev_stat *w) 3089infy_add (EV_P_ ev_stat *w)
2822{ 3090{
2823 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); 3091 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);
2824 3092
2825 if (w->wd < 0) 3093 if (w->wd >= 0)
3094 {
3095 struct statfs sfs;
3096
3097 /* now local changes will be tracked by inotify, but remote changes won't */
3098 /* unless the filesystem is known to be local, we therefore still poll */
3099 /* also do poll on <2.6.25, but with normal frequency */
3100
3101 if (!fs_2625)
3102 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3103 else if (!statfs (w->path, &sfs)
3104 && (sfs.f_type == 0x1373 /* devfs */
3105 || sfs.f_type == 0xEF53 /* ext2/3 */
3106 || sfs.f_type == 0x3153464a /* jfs */
3107 || sfs.f_type == 0x52654973 /* reiser3 */
3108 || sfs.f_type == 0x01021994 /* tempfs */
3109 || sfs.f_type == 0x58465342 /* xfs */))
3110 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3111 else
3112 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2826 { 3113 }
3114 else
3115 {
3116 /* can't use inotify, continue to stat */
2827 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3117 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2828 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2829 3118
2830 /* monitor some parent directory for speedup hints */ 3119 /* if path is not there, monitor some parent directory for speedup hints */
2831 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3120 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2832 /* but an efficiency issue only */ 3121 /* but an efficiency issue only */
2833 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3122 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2834 { 3123 {
2835 char path [4096]; 3124 char path [4096];
… …
2845 if (!pend || pend == path) 3134 if (!pend || pend == path)
2846 break; 3135 break;
2847 3136
2848 *pend = 0; 3137 *pend = 0;
2849 w->wd = inotify_add_watch (fs_fd, path, mask); 3138 w->wd = inotify_add_watch (fs_fd, path, mask);
2850 } 3139 }
2851 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3140 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2852 } 3141 }
2853 } 3142 }
2854 3143
2855 if (w->wd >= 0) 3144 if (w->wd >= 0)
2856 {
2857 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3145 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2858 3146
2859 /* now local changes will be tracked by inotify, but remote changes won't */ 3147 /* now re-arm timer, if required */
2860 /* unless the filesystem it known to be local, we therefore still poll */ 3148 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2861 /* also do poll on <2.6.25, but with normal frequency */
2862 struct statfs sfs;
2863
2864 if (fs_2625 && !statfs (w->path, &sfs))
2865 if (sfs.f_type == 0x1373 /* devfs */
2866 || sfs.f_type == 0xEF53 /* ext2/3 */
2867 || sfs.f_type == 0x3153464a /* jfs */
2868 || sfs.f_type == 0x52654973 /* reiser3 */
2869 || sfs.f_type == 0x01021994 /* tempfs */
2870 || sfs.f_type == 0x58465342 /* xfs */)
2871 return;
2872
2873 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2874 ev_timer_again (EV_A_ &w->timer); 3149 ev_timer_again (EV_A_ &w->timer);
2875 } 3150 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2876} 3151}
2877 3152
2878static void noinline 3153static void noinline
2879infy_del (EV_P_ ev_stat *w) 3154infy_del (EV_P_ ev_stat *w)
2880{ 3155{
… …
2883 3158
2884 if (wd < 0) 3159 if (wd < 0)
2885 return; 3160 return;
2886 3161
2887 w->wd = -2; 3162 w->wd = -2;
2888 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3163 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2889 wlist_del (&fs_hash [slot].head, (WL)w); 3164 wlist_del (&fs_hash [slot].head, (WL)w);
2890 3165
2891 /* remove this watcher, if others are watching it, they will rearm */ 3166 /* remove this watcher, if others are watching it, they will rearm */
2892 inotify_rm_watch (fs_fd, wd); 3167 inotify_rm_watch (fs_fd, wd);
2893} 3168}
… …
2895static void noinline 3170static void noinline
2896infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3171infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2897{ 3172{
2898 if (slot < 0) 3173 if (slot < 0)
2899 /* overflow, need to check for all hash slots */ 3174 /* overflow, need to check for all hash slots */
2900 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3175 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2901 infy_wd (EV_A_ slot, wd, ev); 3176 infy_wd (EV_A_ slot, wd, ev);
2902 else 3177 else
2903 { 3178 {
2904 WL w_; 3179 WL w_;
2905 3180
2906 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3181 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2907 { 3182 {
2908 ev_stat *w = (ev_stat *)w_; 3183 ev_stat *w = (ev_stat *)w_;
2909 w_ = w_->next; /* lets us remove this watcher and all before it */ 3184 w_ = w_->next; /* lets us remove this watcher and all before it */
2910 3185
2911 if (w->wd == wd || wd == -1) 3186 if (w->wd == wd || wd == -1)
2912 { 3187 {
2913 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3188 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2914 { 3189 {
2915 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3190 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2916 w->wd = -1; 3191 w->wd = -1;
2917 infy_add (EV_A_ w); /* re-add, no matter what */ 3192 infy_add (EV_A_ w); /* re-add, no matter what */
2918 } 3193 }
2919 3194
2920 stat_timer_cb (EV_A_ &w->timer, 0); 3195 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2925 3200
2926static void 3201static void
2927infy_cb (EV_P_ ev_io *w, int revents) 3202infy_cb (EV_P_ ev_io *w, int revents)
2928{ 3203{
2929 char buf [EV_INOTIFY_BUFSIZE]; 3204 char buf [EV_INOTIFY_BUFSIZE];
2930 struct inotify_event *ev = (struct inotify_event *)buf;
2931 int ofs; 3205 int ofs;
2932 int len = read (fs_fd, buf, sizeof (buf)); 3206 int len = read (fs_fd, buf, sizeof (buf));
2933 3207
2934 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3208 for (ofs = 0; ofs < len; )
3209 {
3210 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2935 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3211 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3212 ofs += sizeof (struct inotify_event) + ev->len;
3213 }
2936} 3214}
2937 3215
2938inline_size void 3216inline_size void
2939check_2625 (EV_P) 3217ev_check_2625 (EV_P)
2940{ 3218{
2941 /* kernels < 2.6.25 are borked 3219 /* kernels < 2.6.25 are borked
2942 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3220 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2943 */ 3221 */
2944 struct utsname buf; 3222 if (ev_linux_version () < 0x020619)
2945 int major, minor, micro;
2946
2947 if (uname (&buf))
2948 return; 3223 return;
2949 3224
2950 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2951 return;
2952
2953 if (major < 2
2954 || (major == 2 && minor < 6)
2955 || (major == 2 && minor == 6 && micro < 25))
2956 return;
2957
2958 fs_2625 = 1; 3225 fs_2625 = 1;
3226}
3227
3228inline_size int
3229infy_newfd (void)
3230{
3231#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3232 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3233 if (fd >= 0)
3234 return fd;
3235#endif
3236 return inotify_init ();
2959} 3237}
2960 3238
2961inline_size void 3239inline_size void
2962infy_init (EV_P) 3240infy_init (EV_P)
2963{ 3241{
2964 if (fs_fd != -2) 3242 if (fs_fd != -2)
2965 return; 3243 return;
2966 3244
2967 fs_fd = -1; 3245 fs_fd = -1;
2968 3246
2969 check_2625 (EV_A); 3247 ev_check_2625 (EV_A);
2970 3248
2971 fs_fd = inotify_init (); 3249 fs_fd = infy_newfd ();
2972 3250
2973 if (fs_fd >= 0) 3251 if (fs_fd >= 0)
2974 { 3252 {
3253 fd_intern (fs_fd);
2975 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3254 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2976 ev_set_priority (&fs_w, EV_MAXPRI); 3255 ev_set_priority (&fs_w, EV_MAXPRI);
2977 ev_io_start (EV_A_ &fs_w); 3256 ev_io_start (EV_A_ &fs_w);
3257 ev_unref (EV_A);
2978 } 3258 }
2979} 3259}
2980 3260
2981inline_size void 3261inline_size void
2982infy_fork (EV_P) 3262infy_fork (EV_P)
… …
2984 int slot; 3264 int slot;
2985 3265
2986 if (fs_fd < 0) 3266 if (fs_fd < 0)
2987 return; 3267 return;
2988 3268
3269 ev_ref (EV_A);
3270 ev_io_stop (EV_A_ &fs_w);
2989 close (fs_fd); 3271 close (fs_fd);
2990 fs_fd = inotify_init (); 3272 fs_fd = infy_newfd ();
2991 3273
3274 if (fs_fd >= 0)
3275 {
3276 fd_intern (fs_fd);
3277 ev_io_set (&fs_w, fs_fd, EV_READ);
3278 ev_io_start (EV_A_ &fs_w);
3279 ev_unref (EV_A);
3280 }
3281
2992 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3282 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2993 { 3283 {
2994 WL w_ = fs_hash [slot].head; 3284 WL w_ = fs_hash [slot].head;
2995 fs_hash [slot].head = 0; 3285 fs_hash [slot].head = 0;
2996 3286
2997 while (w_) 3287 while (w_)
… …
3002 w->wd = -1; 3292 w->wd = -1;
3003 3293
3004 if (fs_fd >= 0) 3294 if (fs_fd >= 0)
3005 infy_add (EV_A_ w); /* re-add, no matter what */ 3295 infy_add (EV_A_ w); /* re-add, no matter what */
3006 else 3296 else
3297 {
3298 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3299 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3007 ev_timer_again (EV_A_ &w->timer); 3300 ev_timer_again (EV_A_ &w->timer);
3301 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3302 }
3008 } 3303 }
3009 } 3304 }
3010} 3305}
3011 3306
3012#endif 3307#endif
… …
3029static void noinline 3324static void noinline
3030stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3325stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3031{ 3326{
3032 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3327 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3033 3328
3034 /* we copy this here each the time so that */ 3329 ev_statdata prev = w->attr;
3035 /* prev has the old value when the callback gets invoked */
3036 w->prev = w->attr;
3037 ev_stat_stat (EV_A_ w); 3330 ev_stat_stat (EV_A_ w);
3038 3331
3039 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3332 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3040 if ( 3333 if (
3041 w->prev.st_dev != w->attr.st_dev 3334 prev.st_dev != w->attr.st_dev
3042 || w->prev.st_ino != w->attr.st_ino 3335 || prev.st_ino != w->attr.st_ino
3043 || w->prev.st_mode != w->attr.st_mode 3336 || prev.st_mode != w->attr.st_mode
3044 || w->prev.st_nlink != w->attr.st_nlink 3337 || prev.st_nlink != w->attr.st_nlink
3045 || w->prev.st_uid != w->attr.st_uid 3338 || prev.st_uid != w->attr.st_uid
3046 || w->prev.st_gid != w->attr.st_gid 3339 || prev.st_gid != w->attr.st_gid
3047 || w->prev.st_rdev != w->attr.st_rdev 3340 || prev.st_rdev != w->attr.st_rdev
3048 || w->prev.st_size != w->attr.st_size 3341 || prev.st_size != w->attr.st_size
3049 || w->prev.st_atime != w->attr.st_atime 3342 || prev.st_atime != w->attr.st_atime
3050 || w->prev.st_mtime != w->attr.st_mtime 3343 || prev.st_mtime != w->attr.st_mtime
3051 || w->prev.st_ctime != w->attr.st_ctime 3344 || prev.st_ctime != w->attr.st_ctime
3052 ) { 3345 ) {
3346 /* we only update w->prev on actual differences */
3347 /* in case we test more often than invoke the callback, */
3348 /* to ensure that prev is always different to attr */
3349 w->prev = prev;
3350
3053 #if EV_USE_INOTIFY 3351 #if EV_USE_INOTIFY
3054 if (fs_fd >= 0) 3352 if (fs_fd >= 0)
3055 { 3353 {
3056 infy_del (EV_A_ w); 3354 infy_del (EV_A_ w);
3057 infy_add (EV_A_ w); 3355 infy_add (EV_A_ w);
… …
3082 3380
3083 if (fs_fd >= 0) 3381 if (fs_fd >= 0)
3084 infy_add (EV_A_ w); 3382 infy_add (EV_A_ w);
3085 else 3383 else
3086#endif 3384#endif
3385 {
3087 ev_timer_again (EV_A_ &w->timer); 3386 ev_timer_again (EV_A_ &w->timer);
3387 ev_unref (EV_A);
3388 }
3088 3389
3089 ev_start (EV_A_ (W)w, 1); 3390 ev_start (EV_A_ (W)w, 1);
3090 3391
3091 EV_FREQUENT_CHECK; 3392 EV_FREQUENT_CHECK;
3092} 3393}
… …
3101 EV_FREQUENT_CHECK; 3402 EV_FREQUENT_CHECK;
3102 3403
3103#if EV_USE_INOTIFY 3404#if EV_USE_INOTIFY
3104 infy_del (EV_A_ w); 3405 infy_del (EV_A_ w);
3105#endif 3406#endif
3407
3408 if (ev_is_active (&w->timer))
3409 {
3410 ev_ref (EV_A);
3106 ev_timer_stop (EV_A_ &w->timer); 3411 ev_timer_stop (EV_A_ &w->timer);
3412 }
3107 3413
3108 ev_stop (EV_A_ (W)w); 3414 ev_stop (EV_A_ (W)w);
3109 3415
3110 EV_FREQUENT_CHECK; 3416 EV_FREQUENT_CHECK;
3111} 3417}
… …
3156 3462
3157 EV_FREQUENT_CHECK; 3463 EV_FREQUENT_CHECK;
3158} 3464}
3159#endif 3465#endif
3160 3466
3467#if EV_PREPARE_ENABLE
3161void 3468void
3162ev_prepare_start (EV_P_ ev_prepare *w) 3469ev_prepare_start (EV_P_ ev_prepare *w)
3163{ 3470{
3164 if (expect_false (ev_is_active (w))) 3471 if (expect_false (ev_is_active (w)))
3165 return; 3472 return;
… …
3191 3498
3192 ev_stop (EV_A_ (W)w); 3499 ev_stop (EV_A_ (W)w);
3193 3500
3194 EV_FREQUENT_CHECK; 3501 EV_FREQUENT_CHECK;
3195} 3502}
3503#endif
3196 3504
3505#if EV_CHECK_ENABLE
3197void 3506void
3198ev_check_start (EV_P_ ev_check *w) 3507ev_check_start (EV_P_ ev_check *w)
3199{ 3508{
3200 if (expect_false (ev_is_active (w))) 3509 if (expect_false (ev_is_active (w)))
3201 return; 3510 return;
… …
3227 3536
3228 ev_stop (EV_A_ (W)w); 3537 ev_stop (EV_A_ (W)w);
3229 3538
3230 EV_FREQUENT_CHECK; 3539 EV_FREQUENT_CHECK;
3231} 3540}
3541#endif
3232 3542
3233#if EV_EMBED_ENABLE 3543#if EV_EMBED_ENABLE
3234void noinline 3544void noinline
3235ev_embed_sweep (EV_P_ ev_embed *w) 3545ev_embed_sweep (EV_P_ ev_embed *w)
3236{ 3546{
3237 ev_loop (w->other, EVLOOP_NONBLOCK); 3547 ev_run (w->other, EVRUN_NOWAIT);
3238} 3548}
3239 3549
3240static void 3550static void
3241embed_io_cb (EV_P_ ev_io *io, int revents) 3551embed_io_cb (EV_P_ ev_io *io, int revents)
3242{ 3552{
3243 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3553 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3244 3554
3245 if (ev_cb (w)) 3555 if (ev_cb (w))
3246 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3556 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3247 else 3557 else
3248 ev_loop (w->other, EVLOOP_NONBLOCK); 3558 ev_run (w->other, EVRUN_NOWAIT);
3249} 3559}
3250 3560
3251static void 3561static void
3252embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3562embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3253{ 3563{
… …
3257 EV_P = w->other; 3567 EV_P = w->other;
3258 3568
3259 while (fdchangecnt) 3569 while (fdchangecnt)
3260 { 3570 {
3261 fd_reify (EV_A); 3571 fd_reify (EV_A);
3262 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3572 ev_run (EV_A_ EVRUN_NOWAIT);
3263 } 3573 }
3264 } 3574 }
3265} 3575}
3266 3576
3267static void 3577static void
… …
3273 3583
3274 { 3584 {
3275 EV_P = w->other; 3585 EV_P = w->other;
3276 3586
3277 ev_loop_fork (EV_A); 3587 ev_loop_fork (EV_A);
3278 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3588 ev_run (EV_A_ EVRUN_NOWAIT);
3279 } 3589 }
3280 3590
3281 ev_embed_start (EV_A_ w); 3591 ev_embed_start (EV_A_ w);
3282} 3592}
3283 3593
… …
3331 3641
3332 ev_io_stop (EV_A_ &w->io); 3642 ev_io_stop (EV_A_ &w->io);
3333 ev_prepare_stop (EV_A_ &w->prepare); 3643 ev_prepare_stop (EV_A_ &w->prepare);
3334 ev_fork_stop (EV_A_ &w->fork); 3644 ev_fork_stop (EV_A_ &w->fork);
3335 3645
3646 ev_stop (EV_A_ (W)w);
3647
3336 EV_FREQUENT_CHECK; 3648 EV_FREQUENT_CHECK;
3337} 3649}
3338#endif 3650#endif
3339 3651
3340#if EV_FORK_ENABLE 3652#if EV_FORK_ENABLE
… …
3373 3685
3374 EV_FREQUENT_CHECK; 3686 EV_FREQUENT_CHECK;
3375} 3687}
3376#endif 3688#endif
3377 3689
3378#if EV_ASYNC_ENABLE 3690#if EV_CLEANUP_ENABLE
3379void 3691void
3380ev_async_start (EV_P_ ev_async *w) 3692ev_cleanup_start (EV_P_ ev_cleanup *w)
3381{ 3693{
3382 if (expect_false (ev_is_active (w))) 3694 if (expect_false (ev_is_active (w)))
3383 return; 3695 return;
3696
3697 EV_FREQUENT_CHECK;
3698
3699 ev_start (EV_A_ (W)w, ++cleanupcnt);
3700 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3701 cleanups [cleanupcnt - 1] = w;
3702
3703 /* cleanup watchers should never keep a refcount on the loop */
3704 ev_unref (EV_A);
3705 EV_FREQUENT_CHECK;
3706}
3707
3708void
3709ev_cleanup_stop (EV_P_ ev_cleanup *w)
3710{
3711 clear_pending (EV_A_ (W)w);
3712 if (expect_false (!ev_is_active (w)))
3713 return;
3714
3715 EV_FREQUENT_CHECK;
3716 ev_ref (EV_A);
3717
3718 {
3719 int active = ev_active (w);
3720
3721 cleanups [active - 1] = cleanups [--cleanupcnt];
3722 ev_active (cleanups [active - 1]) = active;
3723 }
3724
3725 ev_stop (EV_A_ (W)w);
3726
3727 EV_FREQUENT_CHECK;
3728}
3729#endif
3730
3731#if EV_ASYNC_ENABLE
3732void
3733ev_async_start (EV_P_ ev_async *w)
3734{
3735 if (expect_false (ev_is_active (w)))
3736 return;
3737
3738 w->sent = 0;
3384 3739
3385 evpipe_init (EV_A); 3740 evpipe_init (EV_A);
3386 3741
3387 EV_FREQUENT_CHECK; 3742 EV_FREQUENT_CHECK;
3388 3743
… …
3416 3771
3417void 3772void
3418ev_async_send (EV_P_ ev_async *w) 3773ev_async_send (EV_P_ ev_async *w)
3419{ 3774{
3420 w->sent = 1; 3775 w->sent = 1;
3421 evpipe_write (EV_A_ &gotasync); 3776 evpipe_write (EV_A_ &async_pending);
3422} 3777}
3423#endif 3778#endif
3424 3779
3425/*****************************************************************************/ 3780/*****************************************************************************/
3426 3781
… …
3466{ 3821{
3467 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3822 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3468 3823
3469 if (expect_false (!once)) 3824 if (expect_false (!once))
3470 { 3825 {
3471 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3826 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3472 return; 3827 return;
3473 } 3828 }
3474 3829
3475 once->cb = cb; 3830 once->cb = cb;
3476 once->arg = arg; 3831 once->arg = arg;
… …
3563 if (types & EV_ASYNC) 3918 if (types & EV_ASYNC)
3564 for (i = asynccnt; i--; ) 3919 for (i = asynccnt; i--; )
3565 cb (EV_A_ EV_ASYNC, asyncs [i]); 3920 cb (EV_A_ EV_ASYNC, asyncs [i]);
3566#endif 3921#endif
3567 3922
3923#if EV_PREPARE_ENABLE
3568 if (types & EV_PREPARE) 3924 if (types & EV_PREPARE)
3569 for (i = preparecnt; i--; ) 3925 for (i = preparecnt; i--; )
3570#if EV_EMBED_ENABLE 3926# if EV_EMBED_ENABLE
3571 if (ev_cb (prepares [i]) != embed_prepare_cb) 3927 if (ev_cb (prepares [i]) != embed_prepare_cb)
3572#endif 3928# endif
3573 cb (EV_A_ EV_PREPARE, prepares [i]); 3929 cb (EV_A_ EV_PREPARE, prepares [i]);
3930#endif
3574 3931
3932#if EV_CHECK_ENABLE
3575 if (types & EV_CHECK) 3933 if (types & EV_CHECK)
3576 for (i = checkcnt; i--; ) 3934 for (i = checkcnt; i--; )
3577 cb (EV_A_ EV_CHECK, checks [i]); 3935 cb (EV_A_ EV_CHECK, checks [i]);
3936#endif
3578 3937
3938#if EV_SIGNAL_ENABLE
3579 if (types & EV_SIGNAL) 3939 if (types & EV_SIGNAL)
3580 for (i = 0; i < EV_NSIG - 1; ++i) 3940 for (i = 0; i < EV_NSIG - 1; ++i)
3581 for (wl = signals [i].head; wl; ) 3941 for (wl = signals [i].head; wl; )
3582 { 3942 {
3583 wn = wl->next; 3943 wn = wl->next;
3584 cb (EV_A_ EV_SIGNAL, wl); 3944 cb (EV_A_ EV_SIGNAL, wl);
3585 wl = wn; 3945 wl = wn;
3586 } 3946 }
3947#endif
3587 3948
3949#if EV_CHILD_ENABLE
3588 if (types & EV_CHILD) 3950 if (types & EV_CHILD)
3589 for (i = EV_PID_HASHSIZE; i--; ) 3951 for (i = (EV_PID_HASHSIZE); i--; )
3590 for (wl = childs [i]; wl; ) 3952 for (wl = childs [i]; wl; )
3591 { 3953 {
3592 wn = wl->next; 3954 wn = wl->next;
3593 cb (EV_A_ EV_CHILD, wl); 3955 cb (EV_A_ EV_CHILD, wl);
3594 wl = wn; 3956 wl = wn;
3595 } 3957 }
3958#endif
3596/* EV_STAT 0x00001000 /* stat data changed */ 3959/* EV_STAT 0x00001000 /* stat data changed */
3597/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3960/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3598} 3961}
3599#endif 3962#endif
3600 3963
3601#if EV_MULTIPLICITY 3964#if EV_MULTIPLICITY
3602 #include "ev_wrap.h" 3965 #include "ev_wrap.h"
3603#endif 3966#endif
3604 3967
3605#ifdef __cplusplus 3968EV_CPP(})
3606}
3607#endif
3608 3969

Diff Legend

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