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

Comparing libev/ev.c (file contents):
Revision 1.304 by root, Sun Jul 19 03:12:28 2009 UTC vs.
Revision 1.374 by root, Sat Feb 26 15:21:01 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 */
213
214/* try to deduce the maximum number of signals on this platform */
215#if defined (EV_NSIG)
216/* use what's provided */
217#elif defined (NSIG)
218# define EV_NSIG (NSIG)
219#elif defined(_NSIG)
220# define EV_NSIG (_NSIG)
221#elif defined (SIGMAX)
222# define EV_NSIG (SIGMAX+1)
223#elif defined (SIG_MAX)
224# define EV_NSIG (SIG_MAX+1)
225#elif defined (_SIG_MAX)
226# define EV_NSIG (_SIG_MAX+1)
227#elif defined (MAXSIG)
228# define EV_NSIG (MAXSIG+1)
229#elif defined (MAX_SIG)
230# define EV_NSIG (MAX_SIG+1)
231#elif defined (SIGARRAYSIZE)
232# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
233#elif defined (_sys_nsig)
234# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
235#else
236# error "unable to find value for NSIG, please report"
237/* to make it compile regardless, just remove the above line, */
238/* but consider reporting it, too! :) */
239# define EV_NSIG 65
240#endif
241
242#ifndef EV_USE_FLOOR
243# define EV_USE_FLOOR 0
244#endif
190 245
191#ifndef EV_USE_CLOCK_SYSCALL 246#ifndef EV_USE_CLOCK_SYSCALL
192# if __linux && __GLIBC__ >= 2 247# if __linux && __GLIBC__ >= 2
193# define EV_USE_CLOCK_SYSCALL 1 248# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
194# else 249# else
195# define EV_USE_CLOCK_SYSCALL 0 250# define EV_USE_CLOCK_SYSCALL 0
196# endif 251# endif
197#endif 252#endif
198 253
199#ifndef EV_USE_MONOTONIC 254#ifndef EV_USE_MONOTONIC
200# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 255# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
201# define EV_USE_MONOTONIC 1 256# define EV_USE_MONOTONIC EV_FEATURE_OS
202# else 257# else
203# define EV_USE_MONOTONIC 0 258# define EV_USE_MONOTONIC 0
204# endif 259# endif
205#endif 260#endif
206 261
… …
208# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 263# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
209#endif 264#endif
210 265
211#ifndef EV_USE_NANOSLEEP 266#ifndef EV_USE_NANOSLEEP
212# if _POSIX_C_SOURCE >= 199309L 267# if _POSIX_C_SOURCE >= 199309L
213# define EV_USE_NANOSLEEP 1 268# define EV_USE_NANOSLEEP EV_FEATURE_OS
214# else 269# else
215# define EV_USE_NANOSLEEP 0 270# define EV_USE_NANOSLEEP 0
216# endif 271# endif
217#endif 272#endif
218 273
219#ifndef EV_USE_SELECT 274#ifndef EV_USE_SELECT
220# define EV_USE_SELECT 1 275# define EV_USE_SELECT EV_FEATURE_BACKENDS
221#endif 276#endif
222 277
223#ifndef EV_USE_POLL 278#ifndef EV_USE_POLL
224# ifdef _WIN32 279# ifdef _WIN32
225# define EV_USE_POLL 0 280# define EV_USE_POLL 0
226# else 281# else
227# define EV_USE_POLL 1 282# define EV_USE_POLL EV_FEATURE_BACKENDS
228# endif 283# endif
229#endif 284#endif
230 285
231#ifndef EV_USE_EPOLL 286#ifndef EV_USE_EPOLL
232# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 287# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
233# define EV_USE_EPOLL 1 288# define EV_USE_EPOLL EV_FEATURE_BACKENDS
234# else 289# else
235# define EV_USE_EPOLL 0 290# define EV_USE_EPOLL 0
236# endif 291# endif
237#endif 292#endif
238 293
… …
244# define EV_USE_PORT 0 299# define EV_USE_PORT 0
245#endif 300#endif
246 301
247#ifndef EV_USE_INOTIFY 302#ifndef EV_USE_INOTIFY
248# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
249# define EV_USE_INOTIFY 1 304# define EV_USE_INOTIFY EV_FEATURE_OS
250# else 305# else
251# define EV_USE_INOTIFY 0 306# define EV_USE_INOTIFY 0
252# endif 307# endif
253#endif 308#endif
254 309
255#ifndef EV_PID_HASHSIZE 310#ifndef EV_PID_HASHSIZE
256# if EV_MINIMAL 311# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
257# define EV_PID_HASHSIZE 1
258# else
259# define EV_PID_HASHSIZE 16
260# endif
261#endif 312#endif
262 313
263#ifndef EV_INOTIFY_HASHSIZE 314#ifndef EV_INOTIFY_HASHSIZE
264# if EV_MINIMAL 315# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
265# define EV_INOTIFY_HASHSIZE 1
266# else
267# define EV_INOTIFY_HASHSIZE 16
268# endif
269#endif 316#endif
270 317
271#ifndef EV_USE_EVENTFD 318#ifndef EV_USE_EVENTFD
272# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 319# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
273# define EV_USE_EVENTFD 1 320# define EV_USE_EVENTFD EV_FEATURE_OS
274# else 321# else
275# define EV_USE_EVENTFD 0 322# define EV_USE_EVENTFD 0
276# endif 323# endif
277#endif 324#endif
278 325
279#ifndef EV_USE_SIGNALFD 326#ifndef EV_USE_SIGNALFD
280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 327# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
281# define EV_USE_SIGNALFD 1 328# define EV_USE_SIGNALFD EV_FEATURE_OS
282# else 329# else
283# define EV_USE_SIGNALFD 0 330# define EV_USE_SIGNALFD 0
284# endif 331# endif
285#endif 332#endif
286 333
… …
289# define EV_USE_4HEAP 1 336# define EV_USE_4HEAP 1
290# define EV_HEAP_CACHE_AT 1 337# define EV_HEAP_CACHE_AT 1
291#endif 338#endif
292 339
293#ifndef EV_VERIFY 340#ifndef EV_VERIFY
294# define EV_VERIFY !EV_MINIMAL 341# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
295#endif 342#endif
296 343
297#ifndef EV_USE_4HEAP 344#ifndef EV_USE_4HEAP
298# define EV_USE_4HEAP !EV_MINIMAL 345# define EV_USE_4HEAP EV_FEATURE_DATA
299#endif 346#endif
300 347
301#ifndef EV_HEAP_CACHE_AT 348#ifndef EV_HEAP_CACHE_AT
302# define EV_HEAP_CACHE_AT !EV_MINIMAL 349# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
303#endif 350#endif
304 351
305/* 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, */
306/* which makes programs even slower. might work on other unices, too. */ 353/* which makes programs even slower. might work on other unices, too. */
307#if EV_USE_CLOCK_SYSCALL 354#if EV_USE_CLOCK_SYSCALL
… …
316# endif 363# endif
317#endif 364#endif
318 365
319/* 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 */
320 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
321#ifndef CLOCK_MONOTONIC 374#ifndef CLOCK_MONOTONIC
322# undef EV_USE_MONOTONIC 375# undef EV_USE_MONOTONIC
323# define EV_USE_MONOTONIC 0 376# define EV_USE_MONOTONIC 0
324#endif 377#endif
325 378
… …
332# undef EV_USE_INOTIFY 385# undef EV_USE_INOTIFY
333# define EV_USE_INOTIFY 0 386# define EV_USE_INOTIFY 0
334#endif 387#endif
335 388
336#if !EV_USE_NANOSLEEP 389#if !EV_USE_NANOSLEEP
337# ifndef _WIN32 390/* hp-ux has it in sys/time.h, which we unconditionally include above */
391# if !defined(_WIN32) && !defined(__hpux)
338# include <sys/select.h> 392# include <sys/select.h>
339# endif 393# endif
340#endif 394#endif
341 395
342#if EV_USE_INOTIFY 396#if EV_USE_INOTIFY
343# include <sys/utsname.h>
344# include <sys/statfs.h> 397# include <sys/statfs.h>
345# include <sys/inotify.h> 398# include <sys/inotify.h>
346/* 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 */
347# ifndef IN_DONT_FOLLOW 400# ifndef IN_DONT_FOLLOW
348# undef EV_USE_INOTIFY 401# undef EV_USE_INOTIFY
… …
359# include <stdint.h> 412# include <stdint.h>
360# ifndef EFD_NONBLOCK 413# ifndef EFD_NONBLOCK
361# define EFD_NONBLOCK O_NONBLOCK 414# define EFD_NONBLOCK O_NONBLOCK
362# endif 415# endif
363# ifndef EFD_CLOEXEC 416# ifndef EFD_CLOEXEC
417# ifdef O_CLOEXEC
364# define EFD_CLOEXEC O_CLOEXEC 418# define EFD_CLOEXEC O_CLOEXEC
419# else
420# define EFD_CLOEXEC 02000000
421# endif
365# endif 422# endif
366# ifdef __cplusplus 423EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
367extern "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
368# endif 431# endif
369int eventfd (unsigned int initval, int flags); 432# ifndef SFD_CLOEXEC
370# ifdef __cplusplus 433# ifdef O_CLOEXEC
371} 434# define SFD_CLOEXEC O_CLOEXEC
435# else
436# define SFD_CLOEXEC 02000000
437# endif
372# endif 438# endif
373#endif 439EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
374 440
375#if EV_USE_SIGNALFD 441struct signalfd_siginfo
376# include <sys/signalfd.h> 442{
443 uint32_t ssi_signo;
444 char pad[128 - sizeof (uint32_t)];
445};
377#endif 446#endif
378 447
379/**/ 448/**/
380 449
381#if EV_VERIFY >= 3 450#if EV_VERIFY >= 3
382# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 451# define EV_FREQUENT_CHECK ev_verify (EV_A)
383#else 452#else
384# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
385#endif 454#endif
386 455
387/* 456/*
388 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
389 * It is added to ev_rt_now when scheduling periodics
390 * to ensure progress, time-wise, even when rounding
391 * errors are against us.
392 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
393 * Better solutions welcome.
394 */ 459 */
395#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 */
396 462
397#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) */
398#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) */
399/*#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)
400 468
401#if __GNUC__ >= 4 469#if __GNUC__ >= 4
402# define expect(expr,value) __builtin_expect ((expr),(value)) 470# define expect(expr,value) __builtin_expect ((expr),(value))
403# define noinline __attribute__ ((noinline)) 471# define noinline __attribute__ ((noinline))
404#else 472#else
… …
411 479
412#define expect_false(expr) expect ((expr) != 0, 0) 480#define expect_false(expr) expect ((expr) != 0, 0)
413#define expect_true(expr) expect ((expr) != 0, 1) 481#define expect_true(expr) expect ((expr) != 0, 1)
414#define inline_size static inline 482#define inline_size static inline
415 483
416#if EV_MINIMAL 484#if EV_FEATURE_CODE
485# define inline_speed static inline
486#else
417# define inline_speed static noinline 487# define inline_speed static noinline
418#else
419# define inline_speed static inline
420#endif 488#endif
421 489
422#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 490#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
423 491
424#if EV_MINPRI == EV_MAXPRI 492#if EV_MINPRI == EV_MAXPRI
… …
437#define ev_active(w) ((W)(w))->active 505#define ev_active(w) ((W)(w))->active
438#define ev_at(w) ((WT)(w))->at 506#define ev_at(w) ((WT)(w))->at
439 507
440#if EV_USE_REALTIME 508#if EV_USE_REALTIME
441/* 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 */
442/* giving it a reasonably high chance of working on typical architetcures */ 510/* giving it a reasonably high chance of working on typical architectures */
443static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 511static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
444#endif 512#endif
445 513
446#if EV_USE_MONOTONIC 514#if EV_USE_MONOTONIC
447static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 515static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
448#endif 516#endif
449 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
450#ifdef _WIN32 528#ifdef _WIN32
451# include "ev_win32.c" 529# include "ev_win32.c"
452#endif 530#endif
453 531
454/*****************************************************************************/ 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
455 631
456static void (*syserr_cb)(const char *msg); 632static void (*syserr_cb)(const char *msg);
457 633
458void 634void
459ev_set_syserr_cb (void (*cb)(const char *msg)) 635ev_set_syserr_cb (void (*cb)(const char *msg))
… …
469 645
470 if (syserr_cb) 646 if (syserr_cb)
471 syserr_cb (msg); 647 syserr_cb (msg);
472 else 648 else
473 { 649 {
650#if EV_AVOID_STDIO
651 ev_printerr (msg);
652 ev_printerr (": ");
653 ev_printerr (strerror (errno));
654 ev_printerr ("\n");
655#else
474 perror (msg); 656 perror (msg);
657#endif
475 abort (); 658 abort ();
476 } 659 }
477} 660}
478 661
479static void * 662static void *
480ev_realloc_emul (void *ptr, long size) 663ev_realloc_emul (void *ptr, long size)
481{ 664{
665#if __GLIBC__
666 return realloc (ptr, size);
667#else
482 /* some systems, notably openbsd and darwin, fail to properly 668 /* some systems, notably openbsd and darwin, fail to properly
483 * 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
484 * the single unix specification, so work around them here. 670 * the single unix specification, so work around them here.
485 */ 671 */
486 672
487 if (size) 673 if (size)
488 return realloc (ptr, size); 674 return realloc (ptr, size);
489 675
490 free (ptr); 676 free (ptr);
491 return 0; 677 return 0;
678#endif
492} 679}
493 680
494static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 681static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
495 682
496void 683void
… …
504{ 691{
505 ptr = alloc (ptr, size); 692 ptr = alloc (ptr, size);
506 693
507 if (!ptr && size) 694 if (!ptr && size)
508 { 695 {
696#if EV_AVOID_STDIO
697 ev_printerr ("(libev) memory allocation failed, aborting.\n");
698#else
509 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 699 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
700#endif
510 abort (); 701 abort ();
511 } 702 }
512 703
513 return ptr; 704 return ptr;
514} 705}
… …
530 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 */
531 unsigned char unused; 722 unsigned char unused;
532#if EV_USE_EPOLL 723#if EV_USE_EPOLL
533 unsigned int egen; /* generation counter to counter epoll bugs */ 724 unsigned int egen; /* generation counter to counter epoll bugs */
534#endif 725#endif
535#if EV_SELECT_IS_WINSOCKET 726#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
536 SOCKET handle; 727 SOCKET handle;
728#endif
729#if EV_USE_IOCP
730 OVERLAPPED or, ow;
537#endif 731#endif
538} ANFD; 732} ANFD;
539 733
540/* stores the pending event set for a given watcher */ 734/* stores the pending event set for a given watcher */
541typedef struct 735typedef struct
… …
596 790
597 static int ev_default_loop_ptr; 791 static int ev_default_loop_ptr;
598 792
599#endif 793#endif
600 794
601#if EV_MINIMAL < 2 795#if EV_FEATURE_API
602# 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)
603# 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)
604# define EV_INVOKE_PENDING invoke_cb (EV_A) 798# define EV_INVOKE_PENDING invoke_cb (EV_A)
605#else 799#else
606# define EV_RELEASE_CB (void)0 800# define EV_RELEASE_CB (void)0
607# define EV_ACQUIRE_CB (void)0 801# define EV_ACQUIRE_CB (void)0
608# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 802# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
609#endif 803#endif
610 804
611#define EVUNLOOP_RECURSE 0x80 805#define EVBREAK_RECURSE 0x80
612 806
613/*****************************************************************************/ 807/*****************************************************************************/
614 808
615#ifndef EV_HAVE_EV_TIME 809#ifndef EV_HAVE_EV_TIME
616ev_tstamp 810ev_tstamp
… …
660 if (delay > 0.) 854 if (delay > 0.)
661 { 855 {
662#if EV_USE_NANOSLEEP 856#if EV_USE_NANOSLEEP
663 struct timespec ts; 857 struct timespec ts;
664 858
665 ts.tv_sec = (time_t)delay; 859 EV_TS_SET (ts, delay);
666 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
667
668 nanosleep (&ts, 0); 860 nanosleep (&ts, 0);
669#elif defined(_WIN32) 861#elif defined(_WIN32)
670 Sleep ((unsigned long)(delay * 1e3)); 862 Sleep ((unsigned long)(delay * 1e3));
671#else 863#else
672 struct timeval tv; 864 struct timeval tv;
673 865
674 tv.tv_sec = (time_t)delay;
675 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
676
677 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 866 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
678 /* something not guaranteed by newer posix versions, but guaranteed */ 867 /* something not guaranteed by newer posix versions, but guaranteed */
679 /* by older ones */ 868 /* by older ones */
869 EV_TV_SET (tv, delay);
680 select (0, 0, 0, 0, &tv); 870 select (0, 0, 0, 0, &tv);
681#endif 871#endif
682 } 872 }
683} 873}
684 874
875inline_speed int
876ev_timeout_to_ms (ev_tstamp timeout)
877{
878 int ms = timeout * 1000. + .999999;
879
880 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
881}
882
685/*****************************************************************************/ 883/*****************************************************************************/
686 884
687#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 885#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
688 886
689/* find a suitable new size for the given array, */ 887/* find a suitable new size for the given array, */
690/* hopefully by rounding to a ncie-to-malloc size */ 888/* hopefully by rounding to a nice-to-malloc size */
691inline_size int 889inline_size int
692array_nextsize (int elem, int cur, int cnt) 890array_nextsize (int elem, int cur, int cnt)
693{ 891{
694 int ncur = cur + 1; 892 int ncur = cur + 1;
695 893
… …
791} 989}
792 990
793/*****************************************************************************/ 991/*****************************************************************************/
794 992
795inline_speed void 993inline_speed void
796fd_event_nc (EV_P_ int fd, int revents) 994fd_event_nocheck (EV_P_ int fd, int revents)
797{ 995{
798 ANFD *anfd = anfds + fd; 996 ANFD *anfd = anfds + fd;
799 ev_io *w; 997 ev_io *w;
800 998
801 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 999 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
813fd_event (EV_P_ int fd, int revents) 1011fd_event (EV_P_ int fd, int revents)
814{ 1012{
815 ANFD *anfd = anfds + fd; 1013 ANFD *anfd = anfds + fd;
816 1014
817 if (expect_true (!anfd->reify)) 1015 if (expect_true (!anfd->reify))
818 fd_event_nc (EV_A_ fd, revents); 1016 fd_event_nocheck (EV_A_ fd, revents);
819} 1017}
820 1018
821void 1019void
822ev_feed_fd_event (EV_P_ int fd, int revents) 1020ev_feed_fd_event (EV_P_ int fd, int revents)
823{ 1021{
824 if (fd >= 0 && fd < anfdmax) 1022 if (fd >= 0 && fd < anfdmax)
825 fd_event_nc (EV_A_ fd, revents); 1023 fd_event_nocheck (EV_A_ fd, revents);
826} 1024}
827 1025
828/* make sure the external fd watch events are in-sync */ 1026/* make sure the external fd watch events are in-sync */
829/* with the kernel/libev internal state */ 1027/* with the kernel/libev internal state */
830inline_size void 1028inline_size void
831fd_reify (EV_P) 1029fd_reify (EV_P)
832{ 1030{
833 int i; 1031 int i;
834 1032
1033#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1034 for (i = 0; i < fdchangecnt; ++i)
1035 {
1036 int fd = fdchanges [i];
1037 ANFD *anfd = anfds + fd;
1038
1039 if (anfd->reify & EV__IOFDSET && anfd->head)
1040 {
1041 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1042
1043 if (handle != anfd->handle)
1044 {
1045 unsigned long arg;
1046
1047 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1048
1049 /* handle changed, but fd didn't - we need to do it in two steps */
1050 backend_modify (EV_A_ fd, anfd->events, 0);
1051 anfd->events = 0;
1052 anfd->handle = handle;
1053 }
1054 }
1055 }
1056#endif
1057
835 for (i = 0; i < fdchangecnt; ++i) 1058 for (i = 0; i < fdchangecnt; ++i)
836 { 1059 {
837 int fd = fdchanges [i]; 1060 int fd = fdchanges [i];
838 ANFD *anfd = anfds + fd; 1061 ANFD *anfd = anfds + fd;
839 ev_io *w; 1062 ev_io *w;
840 1063
841 unsigned char events = 0; 1064 unsigned char o_events = anfd->events;
1065 unsigned char o_reify = anfd->reify;
842 1066
843 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1067 anfd->reify = 0;
844 events |= (unsigned char)w->events;
845 1068
846#if EV_SELECT_IS_WINSOCKET 1069 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
847 if (events)
848 { 1070 {
849 unsigned long arg; 1071 anfd->events = 0;
850 #ifdef EV_FD_TO_WIN32_HANDLE 1072
851 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 1073 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
852 #else 1074 anfd->events |= (unsigned char)w->events;
853 anfd->handle = _get_osfhandle (fd); 1075
854 #endif 1076 if (o_events != anfd->events)
855 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 1077 o_reify = EV__IOFDSET; /* actually |= */
856 } 1078 }
857#endif
858 1079
859 { 1080 if (o_reify & EV__IOFDSET)
860 unsigned char o_events = anfd->events;
861 unsigned char o_reify = anfd->reify;
862
863 anfd->reify = 0;
864 anfd->events = events;
865
866 if (o_events != events || o_reify & EV__IOFDSET)
867 backend_modify (EV_A_ fd, o_events, events); 1081 backend_modify (EV_A_ fd, o_events, anfd->events);
868 }
869 } 1082 }
870 1083
871 fdchangecnt = 0; 1084 fdchangecnt = 0;
872} 1085}
873 1086
… …
897 ev_io_stop (EV_A_ w); 1110 ev_io_stop (EV_A_ w);
898 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1111 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
899 } 1112 }
900} 1113}
901 1114
902/* check whether the given fd is atcually valid, for error recovery */ 1115/* check whether the given fd is actually valid, for error recovery */
903inline_size int 1116inline_size int
904fd_valid (int fd) 1117fd_valid (int fd)
905{ 1118{
906#ifdef _WIN32 1119#ifdef _WIN32
907 return _get_osfhandle (fd) != -1; 1120 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
908#else 1121#else
909 return fcntl (fd, F_GETFD) != -1; 1122 return fcntl (fd, F_GETFD) != -1;
910#endif 1123#endif
911} 1124}
912 1125
… …
930 1143
931 for (fd = anfdmax; fd--; ) 1144 for (fd = anfdmax; fd--; )
932 if (anfds [fd].events) 1145 if (anfds [fd].events)
933 { 1146 {
934 fd_kill (EV_A_ fd); 1147 fd_kill (EV_A_ fd);
935 return; 1148 break;
936 } 1149 }
937} 1150}
938 1151
939/* usually called after fork if backend needs to re-arm all fds from scratch */ 1152/* usually called after fork if backend needs to re-arm all fds from scratch */
940static void noinline 1153static void noinline
… …
949 anfds [fd].emask = 0; 1162 anfds [fd].emask = 0;
950 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1163 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
951 } 1164 }
952} 1165}
953 1166
1167/* used to prepare libev internal fd's */
1168/* this is not fork-safe */
1169inline_speed void
1170fd_intern (int fd)
1171{
1172#ifdef _WIN32
1173 unsigned long arg = 1;
1174 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1175#else
1176 fcntl (fd, F_SETFD, FD_CLOEXEC);
1177 fcntl (fd, F_SETFL, O_NONBLOCK);
1178#endif
1179}
1180
954/*****************************************************************************/ 1181/*****************************************************************************/
955 1182
956/* 1183/*
957 * the heap functions want a real array index. array index 0 uis guaranteed to not 1184 * the heap functions want a real array index. array index 0 is guaranteed to not
958 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1185 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
959 * the branching factor of the d-tree. 1186 * the branching factor of the d-tree.
960 */ 1187 */
961 1188
962/* 1189/*
… …
1030 1257
1031 for (;;) 1258 for (;;)
1032 { 1259 {
1033 int c = k << 1; 1260 int c = k << 1;
1034 1261
1035 if (c > N + HEAP0 - 1) 1262 if (c >= N + HEAP0)
1036 break; 1263 break;
1037 1264
1038 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1265 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1039 ? 1 : 0; 1266 ? 1 : 0;
1040 1267
… …
1076 1303
1077/* move an element suitably so it is in a correct place */ 1304/* move an element suitably so it is in a correct place */
1078inline_size void 1305inline_size void
1079adjustheap (ANHE *heap, int N, int k) 1306adjustheap (ANHE *heap, int N, int k)
1080{ 1307{
1081 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1308 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1082 upheap (heap, k); 1309 upheap (heap, k);
1083 else 1310 else
1084 downheap (heap, N, k); 1311 downheap (heap, N, k);
1085} 1312}
1086 1313
… …
1099/*****************************************************************************/ 1326/*****************************************************************************/
1100 1327
1101/* associate signal watchers to a signal signal */ 1328/* associate signal watchers to a signal signal */
1102typedef struct 1329typedef struct
1103{ 1330{
1331 EV_ATOMIC_T pending;
1332#if EV_MULTIPLICITY
1333 EV_P;
1334#endif
1104 WL head; 1335 WL head;
1105 EV_ATOMIC_T gotsig;
1106} ANSIG; 1336} ANSIG;
1107 1337
1108static ANSIG *signals; 1338static ANSIG signals [EV_NSIG - 1];
1109static int signalmax;
1110
1111static EV_ATOMIC_T gotsig;
1112 1339
1113/*****************************************************************************/ 1340/*****************************************************************************/
1114 1341
1115/* used to prepare libev internal fd's */ 1342#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1116/* this is not fork-safe */
1117inline_speed void
1118fd_intern (int fd)
1119{
1120#ifdef _WIN32
1121 unsigned long arg = 1;
1122 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1123#else
1124 fcntl (fd, F_SETFD, FD_CLOEXEC);
1125 fcntl (fd, F_SETFL, O_NONBLOCK);
1126#endif
1127}
1128 1343
1129static void noinline 1344static void noinline
1130evpipe_init (EV_P) 1345evpipe_init (EV_P)
1131{ 1346{
1132 if (!ev_is_active (&pipe_w)) 1347 if (!ev_is_active (&pipe_w))
1133 { 1348 {
1134#if EV_USE_EVENTFD 1349# if EV_USE_EVENTFD
1135 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1350 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1136 if (evfd < 0 && errno == EINVAL) 1351 if (evfd < 0 && errno == EINVAL)
1137 evfd = eventfd (0, 0); 1352 evfd = eventfd (0, 0);
1138 1353
1139 if (evfd >= 0) 1354 if (evfd >= 0)
… …
1141 evpipe [0] = -1; 1356 evpipe [0] = -1;
1142 fd_intern (evfd); /* doing it twice doesn't hurt */ 1357 fd_intern (evfd); /* doing it twice doesn't hurt */
1143 ev_io_set (&pipe_w, evfd, EV_READ); 1358 ev_io_set (&pipe_w, evfd, EV_READ);
1144 } 1359 }
1145 else 1360 else
1146#endif 1361# endif
1147 { 1362 {
1148 while (pipe (evpipe)) 1363 while (pipe (evpipe))
1149 ev_syserr ("(libev) error creating signal/async pipe"); 1364 ev_syserr ("(libev) error creating signal/async pipe");
1150 1365
1151 fd_intern (evpipe [0]); 1366 fd_intern (evpipe [0]);
… …
1162evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1377evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1163{ 1378{
1164 if (!*flag) 1379 if (!*flag)
1165 { 1380 {
1166 int old_errno = errno; /* save errno because write might clobber it */ 1381 int old_errno = errno; /* save errno because write might clobber it */
1382 char dummy;
1167 1383
1168 *flag = 1; 1384 *flag = 1;
1169 1385
1170#if EV_USE_EVENTFD 1386#if EV_USE_EVENTFD
1171 if (evfd >= 0) 1387 if (evfd >= 0)
… …
1173 uint64_t counter = 1; 1389 uint64_t counter = 1;
1174 write (evfd, &counter, sizeof (uint64_t)); 1390 write (evfd, &counter, sizeof (uint64_t));
1175 } 1391 }
1176 else 1392 else
1177#endif 1393#endif
1394 /* win32 people keep sending patches that change this write() to send() */
1395 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1396 /* so when you think this write should be a send instead, please find out */
1397 /* where your send() is from - it's definitely not the microsoft send, and */
1398 /* tell me. thank you. */
1178 write (evpipe [1], &old_errno, 1); 1399 write (evpipe [1], &dummy, 1);
1179 1400
1180 errno = old_errno; 1401 errno = old_errno;
1181 } 1402 }
1182} 1403}
1183 1404
1184/* called whenever the libev signal pipe */ 1405/* called whenever the libev signal pipe */
1185/* got some events (signal, async) */ 1406/* got some events (signal, async) */
1186static void 1407static void
1187pipecb (EV_P_ ev_io *iow, int revents) 1408pipecb (EV_P_ ev_io *iow, int revents)
1188{ 1409{
1410 int i;
1411
1189#if EV_USE_EVENTFD 1412#if EV_USE_EVENTFD
1190 if (evfd >= 0) 1413 if (evfd >= 0)
1191 { 1414 {
1192 uint64_t counter; 1415 uint64_t counter;
1193 read (evfd, &counter, sizeof (uint64_t)); 1416 read (evfd, &counter, sizeof (uint64_t));
1194 } 1417 }
1195 else 1418 else
1196#endif 1419#endif
1197 { 1420 {
1198 char dummy; 1421 char dummy;
1422 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1199 read (evpipe [0], &dummy, 1); 1423 read (evpipe [0], &dummy, 1);
1200 } 1424 }
1201 1425
1202 if (gotsig && ev_is_default_loop (EV_A)) 1426#if EV_SIGNAL_ENABLE
1203 { 1427 if (sig_pending)
1204 int signum; 1428 {
1205 gotsig = 0; 1429 sig_pending = 0;
1206 1430
1207 for (signum = signalmax; signum--; ) 1431 for (i = EV_NSIG - 1; i--; )
1208 if (signals [signum].gotsig) 1432 if (expect_false (signals [i].pending))
1209 ev_feed_signal_event (EV_A_ signum + 1); 1433 ev_feed_signal_event (EV_A_ i + 1);
1210 } 1434 }
1435#endif
1211 1436
1212#if EV_ASYNC_ENABLE 1437#if EV_ASYNC_ENABLE
1213 if (gotasync) 1438 if (async_pending)
1214 { 1439 {
1215 int i; 1440 async_pending = 0;
1216 gotasync = 0;
1217 1441
1218 for (i = asynccnt; i--; ) 1442 for (i = asynccnt; i--; )
1219 if (asyncs [i]->sent) 1443 if (asyncs [i]->sent)
1220 { 1444 {
1221 asyncs [i]->sent = 0; 1445 asyncs [i]->sent = 0;
… …
1225#endif 1449#endif
1226} 1450}
1227 1451
1228/*****************************************************************************/ 1452/*****************************************************************************/
1229 1453
1454void
1455ev_feed_signal (int signum)
1456{
1457#if EV_MULTIPLICITY
1458 EV_P = signals [signum - 1].loop;
1459
1460 if (!EV_A)
1461 return;
1462#endif
1463
1464 signals [signum - 1].pending = 1;
1465 evpipe_write (EV_A_ &sig_pending);
1466}
1467
1230static void 1468static void
1231ev_sighandler (int signum) 1469ev_sighandler (int signum)
1232{ 1470{
1233#if EV_MULTIPLICITY
1234 struct ev_loop *loop = &default_loop_struct;
1235#endif
1236
1237#if _WIN32 1471#ifdef _WIN32
1238 signal (signum, ev_sighandler); 1472 signal (signum, ev_sighandler);
1239#endif 1473#endif
1240 1474
1241 signals [signum - 1].gotsig = 1; 1475 ev_feed_signal (signum);
1242 evpipe_write (EV_A_ &gotsig);
1243} 1476}
1244 1477
1245void noinline 1478void noinline
1246ev_feed_signal_event (EV_P_ int signum) 1479ev_feed_signal_event (EV_P_ int signum)
1247{ 1480{
1248 WL w; 1481 WL w;
1249 1482
1483 if (expect_false (signum <= 0 || signum > EV_NSIG))
1484 return;
1485
1486 --signum;
1487
1250#if EV_MULTIPLICITY 1488#if EV_MULTIPLICITY
1251 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1489 /* it is permissible to try to feed a signal to the wrong loop */
1252#endif 1490 /* or, likely more useful, feeding a signal nobody is waiting for */
1253 1491
1254 --signum; 1492 if (expect_false (signals [signum].loop != EV_A))
1255
1256 if (signum < 0 || signum >= signalmax)
1257 return; 1493 return;
1494#endif
1258 1495
1259 signals [signum].gotsig = 0; 1496 signals [signum].pending = 0;
1260 1497
1261 for (w = signals [signum].head; w; w = w->next) 1498 for (w = signals [signum].head; w; w = w->next)
1262 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1499 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1263} 1500}
1264 1501
1265#if EV_USE_SIGNALFD 1502#if EV_USE_SIGNALFD
1266static void 1503static void
1267sigfdcb (EV_P_ ev_io *iow, int revents) 1504sigfdcb (EV_P_ ev_io *iow, int revents)
1268{ 1505{
1269 struct signalfd_siginfo si[4], *sip; 1506 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1270 1507
1271 for (;;) 1508 for (;;)
1272 { 1509 {
1273 ssize_t res = read (sigfd, si, sizeof (si)); 1510 ssize_t res = read (sigfd, si, sizeof (si));
1274 1511
… …
1280 break; 1517 break;
1281 } 1518 }
1282} 1519}
1283#endif 1520#endif
1284 1521
1522#endif
1523
1285/*****************************************************************************/ 1524/*****************************************************************************/
1286 1525
1526#if EV_CHILD_ENABLE
1287static WL childs [EV_PID_HASHSIZE]; 1527static WL childs [EV_PID_HASHSIZE];
1288
1289#ifndef _WIN32
1290 1528
1291static ev_signal childev; 1529static ev_signal childev;
1292 1530
1293#ifndef WIFCONTINUED 1531#ifndef WIFCONTINUED
1294# define WIFCONTINUED(status) 0 1532# define WIFCONTINUED(status) 0
… …
1299child_reap (EV_P_ int chain, int pid, int status) 1537child_reap (EV_P_ int chain, int pid, int status)
1300{ 1538{
1301 ev_child *w; 1539 ev_child *w;
1302 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1540 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1303 1541
1304 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1542 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1305 { 1543 {
1306 if ((w->pid == pid || !w->pid) 1544 if ((w->pid == pid || !w->pid)
1307 && (!traced || (w->flags & 1))) 1545 && (!traced || (w->flags & 1)))
1308 { 1546 {
1309 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1547 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1334 /* make sure we are called again until all children have been reaped */ 1572 /* make sure we are called again until all children have been reaped */
1335 /* we need to do it this way so that the callback gets called before we continue */ 1573 /* we need to do it this way so that the callback gets called before we continue */
1336 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1574 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1337 1575
1338 child_reap (EV_A_ pid, pid, status); 1576 child_reap (EV_A_ pid, pid, status);
1339 if (EV_PID_HASHSIZE > 1) 1577 if ((EV_PID_HASHSIZE) > 1)
1340 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1578 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1341} 1579}
1342 1580
1343#endif 1581#endif
1344 1582
1345/*****************************************************************************/ 1583/*****************************************************************************/
1346 1584
1585#if EV_USE_IOCP
1586# include "ev_iocp.c"
1587#endif
1347#if EV_USE_PORT 1588#if EV_USE_PORT
1348# include "ev_port.c" 1589# include "ev_port.c"
1349#endif 1590#endif
1350#if EV_USE_KQUEUE 1591#if EV_USE_KQUEUE
1351# include "ev_kqueue.c" 1592# include "ev_kqueue.c"
… …
1411#ifdef __APPLE__ 1652#ifdef __APPLE__
1412 /* only select works correctly on that "unix-certified" platform */ 1653 /* only select works correctly on that "unix-certified" platform */
1413 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1654 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1414 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1655 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1415#endif 1656#endif
1657#ifdef __FreeBSD__
1658 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1659#endif
1416 1660
1417 return flags; 1661 return flags;
1418} 1662}
1419 1663
1420unsigned int 1664unsigned int
1421ev_embeddable_backends (void) 1665ev_embeddable_backends (void)
1422{ 1666{
1423 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1667 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1424 1668
1425 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1669 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1426 /* please fix it and tell me how to detect the fix */ 1670 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1427 flags &= ~EVBACKEND_EPOLL; 1671 flags &= ~EVBACKEND_EPOLL;
1428 1672
1429 return flags; 1673 return flags;
1430} 1674}
1431 1675
1432unsigned int 1676unsigned int
1433ev_backend (EV_P) 1677ev_backend (EV_P)
1434{ 1678{
1435 return backend; 1679 return backend;
1436} 1680}
1437 1681
1438#if EV_MINIMAL < 2 1682#if EV_FEATURE_API
1439unsigned int 1683unsigned int
1440ev_loop_count (EV_P) 1684ev_iteration (EV_P)
1441{ 1685{
1442 return loop_count; 1686 return loop_count;
1443} 1687}
1444 1688
1445unsigned int 1689unsigned int
1446ev_loop_depth (EV_P) 1690ev_depth (EV_P)
1447{ 1691{
1448 return loop_depth; 1692 return loop_depth;
1449} 1693}
1450 1694
1451void 1695void
… …
1488static void noinline 1732static void noinline
1489loop_init (EV_P_ unsigned int flags) 1733loop_init (EV_P_ unsigned int flags)
1490{ 1734{
1491 if (!backend) 1735 if (!backend)
1492 { 1736 {
1737 origflags = flags;
1738
1493#if EV_USE_REALTIME 1739#if EV_USE_REALTIME
1494 if (!have_realtime) 1740 if (!have_realtime)
1495 { 1741 {
1496 struct timespec ts; 1742 struct timespec ts;
1497 1743
… …
1508 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1754 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1509 have_monotonic = 1; 1755 have_monotonic = 1;
1510 } 1756 }
1511#endif 1757#endif
1512 1758
1759 /* pid check not overridable via env */
1760#ifndef _WIN32
1761 if (flags & EVFLAG_FORKCHECK)
1762 curpid = getpid ();
1763#endif
1764
1765 if (!(flags & EVFLAG_NOENV)
1766 && !enable_secure ()
1767 && getenv ("LIBEV_FLAGS"))
1768 flags = atoi (getenv ("LIBEV_FLAGS"));
1769
1513 ev_rt_now = ev_time (); 1770 ev_rt_now = ev_time ();
1514 mn_now = get_clock (); 1771 mn_now = get_clock ();
1515 now_floor = mn_now; 1772 now_floor = mn_now;
1516 rtmn_diff = ev_rt_now - mn_now; 1773 rtmn_diff = ev_rt_now - mn_now;
1517#if EV_MINIMAL < 2 1774#if EV_FEATURE_API
1518 invoke_cb = ev_invoke_pending; 1775 invoke_cb = ev_invoke_pending;
1519#endif 1776#endif
1520 1777
1521 io_blocktime = 0.; 1778 io_blocktime = 0.;
1522 timeout_blocktime = 0.; 1779 timeout_blocktime = 0.;
1523 backend = 0; 1780 backend = 0;
1524 backend_fd = -1; 1781 backend_fd = -1;
1525 gotasync = 0; 1782 sig_pending = 0;
1783#if EV_ASYNC_ENABLE
1784 async_pending = 0;
1785#endif
1526#if EV_USE_INOTIFY 1786#if EV_USE_INOTIFY
1527 fs_fd = -2; 1787 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1528#endif 1788#endif
1529#if EV_USE_SIGNALFD 1789#if EV_USE_SIGNALFD
1530 sigfd = -2; 1790 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1531#endif 1791#endif
1532 1792
1533 /* pid check not overridable via env */
1534#ifndef _WIN32
1535 if (flags & EVFLAG_FORKCHECK)
1536 curpid = getpid ();
1537#endif
1538
1539 if (!(flags & EVFLAG_NOENV) 1793 if (!(flags & EVBACKEND_MASK))
1540 && !enable_secure ()
1541 && getenv ("LIBEV_FLAGS"))
1542 flags = atoi (getenv ("LIBEV_FLAGS"));
1543
1544 if (!(flags & 0x0000ffffU))
1545 flags |= ev_recommended_backends (); 1794 flags |= ev_recommended_backends ();
1546 1795
1796#if EV_USE_IOCP
1797 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1798#endif
1547#if EV_USE_PORT 1799#if EV_USE_PORT
1548 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1800 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1549#endif 1801#endif
1550#if EV_USE_KQUEUE 1802#if EV_USE_KQUEUE
1551 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1803 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1560 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1812 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1561#endif 1813#endif
1562 1814
1563 ev_prepare_init (&pending_w, pendingcb); 1815 ev_prepare_init (&pending_w, pendingcb);
1564 1816
1817#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1565 ev_init (&pipe_w, pipecb); 1818 ev_init (&pipe_w, pipecb);
1566 ev_set_priority (&pipe_w, EV_MAXPRI); 1819 ev_set_priority (&pipe_w, EV_MAXPRI);
1820#endif
1567 } 1821 }
1568} 1822}
1569 1823
1570/* free up a loop structure */ 1824/* free up a loop structure */
1571static void noinline 1825void
1572loop_destroy (EV_P) 1826ev_loop_destroy (EV_P)
1573{ 1827{
1574 int i; 1828 int i;
1829
1830#if EV_MULTIPLICITY
1831 /* mimic free (0) */
1832 if (!EV_A)
1833 return;
1834#endif
1835
1836#if EV_CLEANUP_ENABLE
1837 /* queue cleanup watchers (and execute them) */
1838 if (expect_false (cleanupcnt))
1839 {
1840 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1841 EV_INVOKE_PENDING;
1842 }
1843#endif
1844
1845#if EV_CHILD_ENABLE
1846 if (ev_is_active (&childev))
1847 {
1848 ev_ref (EV_A); /* child watcher */
1849 ev_signal_stop (EV_A_ &childev);
1850 }
1851#endif
1575 1852
1576 if (ev_is_active (&pipe_w)) 1853 if (ev_is_active (&pipe_w))
1577 { 1854 {
1578 /*ev_ref (EV_A);*/ 1855 /*ev_ref (EV_A);*/
1579 /*ev_io_stop (EV_A_ &pipe_w);*/ 1856 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1583 close (evfd); 1860 close (evfd);
1584#endif 1861#endif
1585 1862
1586 if (evpipe [0] >= 0) 1863 if (evpipe [0] >= 0)
1587 { 1864 {
1588 close (evpipe [0]); 1865 EV_WIN32_CLOSE_FD (evpipe [0]);
1589 close (evpipe [1]); 1866 EV_WIN32_CLOSE_FD (evpipe [1]);
1590 } 1867 }
1591 } 1868 }
1592 1869
1593#if EV_USE_SIGNALFD 1870#if EV_USE_SIGNALFD
1594 if (ev_is_active (&sigfd_w)) 1871 if (ev_is_active (&sigfd_w))
1595 {
1596 /*ev_ref (EV_A);*/
1597 /*ev_io_stop (EV_A_ &sigfd_w);*/
1598
1599 close (sigfd); 1872 close (sigfd);
1600 }
1601#endif 1873#endif
1602 1874
1603#if EV_USE_INOTIFY 1875#if EV_USE_INOTIFY
1604 if (fs_fd >= 0) 1876 if (fs_fd >= 0)
1605 close (fs_fd); 1877 close (fs_fd);
1606#endif 1878#endif
1607 1879
1608 if (backend_fd >= 0) 1880 if (backend_fd >= 0)
1609 close (backend_fd); 1881 close (backend_fd);
1610 1882
1883#if EV_USE_IOCP
1884 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1885#endif
1611#if EV_USE_PORT 1886#if EV_USE_PORT
1612 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1887 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1613#endif 1888#endif
1614#if EV_USE_KQUEUE 1889#if EV_USE_KQUEUE
1615 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1890 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1630#if EV_IDLE_ENABLE 1905#if EV_IDLE_ENABLE
1631 array_free (idle, [i]); 1906 array_free (idle, [i]);
1632#endif 1907#endif
1633 } 1908 }
1634 1909
1635 ev_free (anfds); anfdmax = 0; 1910 ev_free (anfds); anfds = 0; anfdmax = 0;
1636 1911
1637 /* have to use the microsoft-never-gets-it-right macro */ 1912 /* have to use the microsoft-never-gets-it-right macro */
1638 array_free (rfeed, EMPTY); 1913 array_free (rfeed, EMPTY);
1639 array_free (fdchange, EMPTY); 1914 array_free (fdchange, EMPTY);
1640 array_free (timer, EMPTY); 1915 array_free (timer, EMPTY);
… …
1642 array_free (periodic, EMPTY); 1917 array_free (periodic, EMPTY);
1643#endif 1918#endif
1644#if EV_FORK_ENABLE 1919#if EV_FORK_ENABLE
1645 array_free (fork, EMPTY); 1920 array_free (fork, EMPTY);
1646#endif 1921#endif
1922#if EV_CLEANUP_ENABLE
1923 array_free (cleanup, EMPTY);
1924#endif
1647 array_free (prepare, EMPTY); 1925 array_free (prepare, EMPTY);
1648 array_free (check, EMPTY); 1926 array_free (check, EMPTY);
1649#if EV_ASYNC_ENABLE 1927#if EV_ASYNC_ENABLE
1650 array_free (async, EMPTY); 1928 array_free (async, EMPTY);
1651#endif 1929#endif
1652 1930
1653 backend = 0; 1931 backend = 0;
1932
1933#if EV_MULTIPLICITY
1934 if (ev_is_default_loop (EV_A))
1935#endif
1936 ev_default_loop_ptr = 0;
1937#if EV_MULTIPLICITY
1938 else
1939 ev_free (EV_A);
1940#endif
1654} 1941}
1655 1942
1656#if EV_USE_INOTIFY 1943#if EV_USE_INOTIFY
1657inline_size void infy_fork (EV_P); 1944inline_size void infy_fork (EV_P);
1658#endif 1945#endif
… …
1675 1962
1676 if (ev_is_active (&pipe_w)) 1963 if (ev_is_active (&pipe_w))
1677 { 1964 {
1678 /* this "locks" the handlers against writing to the pipe */ 1965 /* this "locks" the handlers against writing to the pipe */
1679 /* while we modify the fd vars */ 1966 /* while we modify the fd vars */
1680 gotsig = 1; 1967 sig_pending = 1;
1681#if EV_ASYNC_ENABLE 1968#if EV_ASYNC_ENABLE
1682 gotasync = 1; 1969 async_pending = 1;
1683#endif 1970#endif
1684 1971
1685 ev_ref (EV_A); 1972 ev_ref (EV_A);
1686 ev_io_stop (EV_A_ &pipe_w); 1973 ev_io_stop (EV_A_ &pipe_w);
1687 1974
… …
1690 close (evfd); 1977 close (evfd);
1691#endif 1978#endif
1692 1979
1693 if (evpipe [0] >= 0) 1980 if (evpipe [0] >= 0)
1694 { 1981 {
1695 close (evpipe [0]); 1982 EV_WIN32_CLOSE_FD (evpipe [0]);
1696 close (evpipe [1]); 1983 EV_WIN32_CLOSE_FD (evpipe [1]);
1697 } 1984 }
1698 1985
1986#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1699 evpipe_init (EV_A); 1987 evpipe_init (EV_A);
1700 /* now iterate over everything, in case we missed something */ 1988 /* now iterate over everything, in case we missed something */
1701 pipecb (EV_A_ &pipe_w, EV_READ); 1989 pipecb (EV_A_ &pipe_w, EV_READ);
1990#endif
1702 } 1991 }
1703 1992
1704 postfork = 0; 1993 postfork = 0;
1705} 1994}
1706 1995
1707#if EV_MULTIPLICITY 1996#if EV_MULTIPLICITY
1708 1997
1709struct ev_loop * 1998struct ev_loop *
1710ev_loop_new (unsigned int flags) 1999ev_loop_new (unsigned int flags)
1711{ 2000{
1712 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2001 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1713 2002
1714 memset (loop, 0, sizeof (struct ev_loop)); 2003 memset (EV_A, 0, sizeof (struct ev_loop));
1715 loop_init (EV_A_ flags); 2004 loop_init (EV_A_ flags);
1716 2005
1717 if (ev_backend (EV_A)) 2006 if (ev_backend (EV_A))
1718 return loop; 2007 return EV_A;
1719 2008
2009 ev_free (EV_A);
1720 return 0; 2010 return 0;
1721} 2011}
1722 2012
1723void
1724ev_loop_destroy (EV_P)
1725{
1726 loop_destroy (EV_A);
1727 ev_free (loop);
1728}
1729
1730void
1731ev_loop_fork (EV_P)
1732{
1733 postfork = 1; /* must be in line with ev_default_fork */
1734}
1735#endif /* multiplicity */ 2013#endif /* multiplicity */
1736 2014
1737#if EV_VERIFY 2015#if EV_VERIFY
1738static void noinline 2016static void noinline
1739verify_watcher (EV_P_ W w) 2017verify_watcher (EV_P_ W w)
… …
1768 verify_watcher (EV_A_ ws [cnt]); 2046 verify_watcher (EV_A_ ws [cnt]);
1769 } 2047 }
1770} 2048}
1771#endif 2049#endif
1772 2050
1773#if EV_MINIMAL < 2 2051#if EV_FEATURE_API
1774void 2052void
1775ev_loop_verify (EV_P) 2053ev_verify (EV_P)
1776{ 2054{
1777#if EV_VERIFY 2055#if EV_VERIFY
1778 int i; 2056 int i;
1779 WL w; 2057 WL w;
1780 2058
… …
1814#if EV_FORK_ENABLE 2092#if EV_FORK_ENABLE
1815 assert (forkmax >= forkcnt); 2093 assert (forkmax >= forkcnt);
1816 array_verify (EV_A_ (W *)forks, forkcnt); 2094 array_verify (EV_A_ (W *)forks, forkcnt);
1817#endif 2095#endif
1818 2096
2097#if EV_CLEANUP_ENABLE
2098 assert (cleanupmax >= cleanupcnt);
2099 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2100#endif
2101
1819#if EV_ASYNC_ENABLE 2102#if EV_ASYNC_ENABLE
1820 assert (asyncmax >= asynccnt); 2103 assert (asyncmax >= asynccnt);
1821 array_verify (EV_A_ (W *)asyncs, asynccnt); 2104 array_verify (EV_A_ (W *)asyncs, asynccnt);
1822#endif 2105#endif
1823 2106
2107#if EV_PREPARE_ENABLE
1824 assert (preparemax >= preparecnt); 2108 assert (preparemax >= preparecnt);
1825 array_verify (EV_A_ (W *)prepares, preparecnt); 2109 array_verify (EV_A_ (W *)prepares, preparecnt);
2110#endif
1826 2111
2112#if EV_CHECK_ENABLE
1827 assert (checkmax >= checkcnt); 2113 assert (checkmax >= checkcnt);
1828 array_verify (EV_A_ (W *)checks, checkcnt); 2114 array_verify (EV_A_ (W *)checks, checkcnt);
2115#endif
1829 2116
1830# if 0 2117# if 0
2118#if EV_CHILD_ENABLE
1831 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2119 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1832 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 2120 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2121#endif
1833# endif 2122# endif
1834#endif 2123#endif
1835} 2124}
1836#endif 2125#endif
1837 2126
1838#if EV_MULTIPLICITY 2127#if EV_MULTIPLICITY
1839struct ev_loop * 2128struct ev_loop *
1840ev_default_loop_init (unsigned int flags)
1841#else 2129#else
1842int 2130int
2131#endif
1843ev_default_loop (unsigned int flags) 2132ev_default_loop (unsigned int flags)
1844#endif
1845{ 2133{
1846 if (!ev_default_loop_ptr) 2134 if (!ev_default_loop_ptr)
1847 { 2135 {
1848#if EV_MULTIPLICITY 2136#if EV_MULTIPLICITY
1849 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 2137 EV_P = ev_default_loop_ptr = &default_loop_struct;
1850#else 2138#else
1851 ev_default_loop_ptr = 1; 2139 ev_default_loop_ptr = 1;
1852#endif 2140#endif
1853 2141
1854 loop_init (EV_A_ flags); 2142 loop_init (EV_A_ flags);
1855 2143
1856 if (ev_backend (EV_A)) 2144 if (ev_backend (EV_A))
1857 { 2145 {
1858#ifndef _WIN32 2146#if EV_CHILD_ENABLE
1859 ev_signal_init (&childev, childcb, SIGCHLD); 2147 ev_signal_init (&childev, childcb, SIGCHLD);
1860 ev_set_priority (&childev, EV_MAXPRI); 2148 ev_set_priority (&childev, EV_MAXPRI);
1861 ev_signal_start (EV_A_ &childev); 2149 ev_signal_start (EV_A_ &childev);
1862 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2150 ev_unref (EV_A); /* child watcher should not keep loop alive */
1863#endif 2151#endif
… …
1868 2156
1869 return ev_default_loop_ptr; 2157 return ev_default_loop_ptr;
1870} 2158}
1871 2159
1872void 2160void
1873ev_default_destroy (void) 2161ev_loop_fork (EV_P)
1874{ 2162{
1875#if EV_MULTIPLICITY
1876 struct ev_loop *loop = ev_default_loop_ptr;
1877#endif
1878
1879 ev_default_loop_ptr = 0;
1880
1881#ifndef _WIN32
1882 ev_ref (EV_A); /* child watcher */
1883 ev_signal_stop (EV_A_ &childev);
1884#endif
1885
1886 loop_destroy (EV_A);
1887}
1888
1889void
1890ev_default_fork (void)
1891{
1892#if EV_MULTIPLICITY
1893 struct ev_loop *loop = ev_default_loop_ptr;
1894#endif
1895
1896 postfork = 1; /* must be in line with ev_loop_fork */ 2163 postfork = 1; /* must be in line with ev_default_fork */
1897} 2164}
1898 2165
1899/*****************************************************************************/ 2166/*****************************************************************************/
1900 2167
1901void 2168void
… …
1923 2190
1924 for (pri = NUMPRI; pri--; ) 2191 for (pri = NUMPRI; pri--; )
1925 while (pendingcnt [pri]) 2192 while (pendingcnt [pri])
1926 { 2193 {
1927 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2194 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1928
1929 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1930 /* ^ this is no longer true, as pending_w could be here */
1931 2195
1932 p->w->pending = 0; 2196 p->w->pending = 0;
1933 EV_CB_INVOKE (p->w, p->events); 2197 EV_CB_INVOKE (p->w, p->events);
1934 EV_FREQUENT_CHECK; 2198 EV_FREQUENT_CHECK;
1935 } 2199 }
… …
1992 EV_FREQUENT_CHECK; 2256 EV_FREQUENT_CHECK;
1993 feed_reverse (EV_A_ (W)w); 2257 feed_reverse (EV_A_ (W)w);
1994 } 2258 }
1995 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2259 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1996 2260
1997 feed_reverse_done (EV_A_ EV_TIMEOUT); 2261 feed_reverse_done (EV_A_ EV_TIMER);
1998 } 2262 }
1999} 2263}
2000 2264
2001#if EV_PERIODIC_ENABLE 2265#if EV_PERIODIC_ENABLE
2266
2267static void noinline
2268periodic_recalc (EV_P_ ev_periodic *w)
2269{
2270 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2271 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2272
2273 /* the above almost always errs on the low side */
2274 while (at <= ev_rt_now)
2275 {
2276 ev_tstamp nat = at + w->interval;
2277
2278 /* when resolution fails us, we use ev_rt_now */
2279 if (expect_false (nat == at))
2280 {
2281 at = ev_rt_now;
2282 break;
2283 }
2284
2285 at = nat;
2286 }
2287
2288 ev_at (w) = at;
2289}
2290
2002/* make periodics pending */ 2291/* make periodics pending */
2003inline_size void 2292inline_size void
2004periodics_reify (EV_P) 2293periodics_reify (EV_P)
2005{ 2294{
2006 EV_FREQUENT_CHECK; 2295 EV_FREQUENT_CHECK;
… …
2025 ANHE_at_cache (periodics [HEAP0]); 2314 ANHE_at_cache (periodics [HEAP0]);
2026 downheap (periodics, periodiccnt, HEAP0); 2315 downheap (periodics, periodiccnt, HEAP0);
2027 } 2316 }
2028 else if (w->interval) 2317 else if (w->interval)
2029 { 2318 {
2030 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2319 periodic_recalc (EV_A_ w);
2031 /* if next trigger time is not sufficiently in the future, put it there */
2032 /* this might happen because of floating point inexactness */
2033 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2034 {
2035 ev_at (w) += w->interval;
2036
2037 /* if interval is unreasonably low we might still have a time in the past */
2038 /* so correct this. this will make the periodic very inexact, but the user */
2039 /* has effectively asked to get triggered more often than possible */
2040 if (ev_at (w) < ev_rt_now)
2041 ev_at (w) = ev_rt_now;
2042 }
2043
2044 ANHE_at_cache (periodics [HEAP0]); 2320 ANHE_at_cache (periodics [HEAP0]);
2045 downheap (periodics, periodiccnt, HEAP0); 2321 downheap (periodics, periodiccnt, HEAP0);
2046 } 2322 }
2047 else 2323 else
2048 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2324 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2055 feed_reverse_done (EV_A_ EV_PERIODIC); 2331 feed_reverse_done (EV_A_ EV_PERIODIC);
2056 } 2332 }
2057} 2333}
2058 2334
2059/* simply recalculate all periodics */ 2335/* simply recalculate all periodics */
2060/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2336/* TODO: maybe ensure that at least one event happens when jumping forward? */
2061static void noinline 2337static void noinline
2062periodics_reschedule (EV_P) 2338periodics_reschedule (EV_P)
2063{ 2339{
2064 int i; 2340 int i;
2065 2341
… …
2069 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2345 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2070 2346
2071 if (w->reschedule_cb) 2347 if (w->reschedule_cb)
2072 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2348 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2073 else if (w->interval) 2349 else if (w->interval)
2074 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2350 periodic_recalc (EV_A_ w);
2075 2351
2076 ANHE_at_cache (periodics [i]); 2352 ANHE_at_cache (periodics [i]);
2077 } 2353 }
2078 2354
2079 reheap (periodics, periodiccnt); 2355 reheap (periodics, periodiccnt);
… …
2093 ANHE_at_cache (*he); 2369 ANHE_at_cache (*he);
2094 } 2370 }
2095} 2371}
2096 2372
2097/* fetch new monotonic and realtime times from the kernel */ 2373/* fetch new monotonic and realtime times from the kernel */
2098/* also detetc if there was a timejump, and act accordingly */ 2374/* also detect if there was a timejump, and act accordingly */
2099inline_speed void 2375inline_speed void
2100time_update (EV_P_ ev_tstamp max_block) 2376time_update (EV_P_ ev_tstamp max_block)
2101{ 2377{
2102#if EV_USE_MONOTONIC 2378#if EV_USE_MONOTONIC
2103 if (expect_true (have_monotonic)) 2379 if (expect_true (have_monotonic))
… …
2126 * doesn't hurt either as we only do this on time-jumps or 2402 * doesn't hurt either as we only do this on time-jumps or
2127 * in the unlikely event of having been preempted here. 2403 * in the unlikely event of having been preempted here.
2128 */ 2404 */
2129 for (i = 4; --i; ) 2405 for (i = 4; --i; )
2130 { 2406 {
2407 ev_tstamp diff;
2131 rtmn_diff = ev_rt_now - mn_now; 2408 rtmn_diff = ev_rt_now - mn_now;
2132 2409
2410 diff = odiff - rtmn_diff;
2411
2133 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2412 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2134 return; /* all is well */ 2413 return; /* all is well */
2135 2414
2136 ev_rt_now = ev_time (); 2415 ev_rt_now = ev_time ();
2137 mn_now = get_clock (); 2416 mn_now = get_clock ();
2138 now_floor = mn_now; 2417 now_floor = mn_now;
… …
2161 mn_now = ev_rt_now; 2440 mn_now = ev_rt_now;
2162 } 2441 }
2163} 2442}
2164 2443
2165void 2444void
2166ev_loop (EV_P_ int flags) 2445ev_run (EV_P_ int flags)
2167{ 2446{
2168#if EV_MINIMAL < 2 2447#if EV_FEATURE_API
2169 ++loop_depth; 2448 ++loop_depth;
2170#endif 2449#endif
2171 2450
2172 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2451 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2173 2452
2174 loop_done = EVUNLOOP_CANCEL; 2453 loop_done = EVBREAK_CANCEL;
2175 2454
2176 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2455 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2177 2456
2178 do 2457 do
2179 { 2458 {
2180#if EV_VERIFY >= 2 2459#if EV_VERIFY >= 2
2181 ev_loop_verify (EV_A); 2460 ev_verify (EV_A);
2182#endif 2461#endif
2183 2462
2184#ifndef _WIN32 2463#ifndef _WIN32
2185 if (expect_false (curpid)) /* penalise the forking check even more */ 2464 if (expect_false (curpid)) /* penalise the forking check even more */
2186 if (expect_false (getpid () != curpid)) 2465 if (expect_false (getpid () != curpid))
… …
2198 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2477 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2199 EV_INVOKE_PENDING; 2478 EV_INVOKE_PENDING;
2200 } 2479 }
2201#endif 2480#endif
2202 2481
2482#if EV_PREPARE_ENABLE
2203 /* queue prepare watchers (and execute them) */ 2483 /* queue prepare watchers (and execute them) */
2204 if (expect_false (preparecnt)) 2484 if (expect_false (preparecnt))
2205 { 2485 {
2206 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2486 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2207 EV_INVOKE_PENDING; 2487 EV_INVOKE_PENDING;
2208 } 2488 }
2489#endif
2209 2490
2210 if (expect_false (loop_done)) 2491 if (expect_false (loop_done))
2211 break; 2492 break;
2212 2493
2213 /* we might have forked, so reify kernel state if necessary */ 2494 /* we might have forked, so reify kernel state if necessary */
… …
2220 /* calculate blocking time */ 2501 /* calculate blocking time */
2221 { 2502 {
2222 ev_tstamp waittime = 0.; 2503 ev_tstamp waittime = 0.;
2223 ev_tstamp sleeptime = 0.; 2504 ev_tstamp sleeptime = 0.;
2224 2505
2506 /* remember old timestamp for io_blocktime calculation */
2507 ev_tstamp prev_mn_now = mn_now;
2508
2509 /* update time to cancel out callback processing overhead */
2510 time_update (EV_A_ 1e100);
2511
2225 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2512 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2226 { 2513 {
2227 /* remember old timestamp for io_blocktime calculation */
2228 ev_tstamp prev_mn_now = mn_now;
2229
2230 /* update time to cancel out callback processing overhead */
2231 time_update (EV_A_ 1e100);
2232
2233 waittime = MAX_BLOCKTIME; 2514 waittime = MAX_BLOCKTIME;
2234 2515
2235 if (timercnt) 2516 if (timercnt)
2236 { 2517 {
2237 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2518 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2264 waittime -= sleeptime; 2545 waittime -= sleeptime;
2265 } 2546 }
2266 } 2547 }
2267 } 2548 }
2268 2549
2269#if EV_MINIMAL < 2 2550#if EV_FEATURE_API
2270 ++loop_count; 2551 ++loop_count;
2271#endif 2552#endif
2272 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2553 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2273 backend_poll (EV_A_ waittime); 2554 backend_poll (EV_A_ waittime);
2274 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2555 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2275 2556
2276 /* update ev_rt_now, do magic */ 2557 /* update ev_rt_now, do magic */
2277 time_update (EV_A_ waittime + sleeptime); 2558 time_update (EV_A_ waittime + sleeptime);
2278 } 2559 }
2279 2560
… …
2286#if EV_IDLE_ENABLE 2567#if EV_IDLE_ENABLE
2287 /* queue idle watchers unless other events are pending */ 2568 /* queue idle watchers unless other events are pending */
2288 idle_reify (EV_A); 2569 idle_reify (EV_A);
2289#endif 2570#endif
2290 2571
2572#if EV_CHECK_ENABLE
2291 /* queue check watchers, to be executed first */ 2573 /* queue check watchers, to be executed first */
2292 if (expect_false (checkcnt)) 2574 if (expect_false (checkcnt))
2293 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2575 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2576#endif
2294 2577
2295 EV_INVOKE_PENDING; 2578 EV_INVOKE_PENDING;
2296 } 2579 }
2297 while (expect_true ( 2580 while (expect_true (
2298 activecnt 2581 activecnt
2299 && !loop_done 2582 && !loop_done
2300 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2583 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2301 )); 2584 ));
2302 2585
2303 if (loop_done == EVUNLOOP_ONE) 2586 if (loop_done == EVBREAK_ONE)
2304 loop_done = EVUNLOOP_CANCEL; 2587 loop_done = EVBREAK_CANCEL;
2305 2588
2306#if EV_MINIMAL < 2 2589#if EV_FEATURE_API
2307 --loop_depth; 2590 --loop_depth;
2308#endif 2591#endif
2309} 2592}
2310 2593
2311void 2594void
2312ev_unloop (EV_P_ int how) 2595ev_break (EV_P_ int how)
2313{ 2596{
2314 loop_done = how; 2597 loop_done = how;
2315} 2598}
2316 2599
2317void 2600void
… …
2364inline_size void 2647inline_size void
2365wlist_del (WL *head, WL elem) 2648wlist_del (WL *head, WL elem)
2366{ 2649{
2367 while (*head) 2650 while (*head)
2368 { 2651 {
2369 if (*head == elem) 2652 if (expect_true (*head == elem))
2370 { 2653 {
2371 *head = elem->next; 2654 *head = elem->next;
2372 return; 2655 break;
2373 } 2656 }
2374 2657
2375 head = &(*head)->next; 2658 head = &(*head)->next;
2376 } 2659 }
2377} 2660}
… …
2437 2720
2438 if (expect_false (ev_is_active (w))) 2721 if (expect_false (ev_is_active (w)))
2439 return; 2722 return;
2440 2723
2441 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2724 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2442 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2725 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2443 2726
2444 EV_FREQUENT_CHECK; 2727 EV_FREQUENT_CHECK;
2445 2728
2446 ev_start (EV_A_ (W)w, 1); 2729 ev_start (EV_A_ (W)w, 1);
2447 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2730 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2465 EV_FREQUENT_CHECK; 2748 EV_FREQUENT_CHECK;
2466 2749
2467 wlist_del (&anfds[w->fd].head, (WL)w); 2750 wlist_del (&anfds[w->fd].head, (WL)w);
2468 ev_stop (EV_A_ (W)w); 2751 ev_stop (EV_A_ (W)w);
2469 2752
2470 fd_change (EV_A_ w->fd, 1); 2753 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2471 2754
2472 EV_FREQUENT_CHECK; 2755 EV_FREQUENT_CHECK;
2473} 2756}
2474 2757
2475void noinline 2758void noinline
… …
2517 timers [active] = timers [timercnt + HEAP0]; 2800 timers [active] = timers [timercnt + HEAP0];
2518 adjustheap (timers, timercnt, active); 2801 adjustheap (timers, timercnt, active);
2519 } 2802 }
2520 } 2803 }
2521 2804
2522 EV_FREQUENT_CHECK;
2523
2524 ev_at (w) -= mn_now; 2805 ev_at (w) -= mn_now;
2525 2806
2526 ev_stop (EV_A_ (W)w); 2807 ev_stop (EV_A_ (W)w);
2808
2809 EV_FREQUENT_CHECK;
2527} 2810}
2528 2811
2529void noinline 2812void noinline
2530ev_timer_again (EV_P_ ev_timer *w) 2813ev_timer_again (EV_P_ ev_timer *w)
2531{ 2814{
… …
2567 if (w->reschedule_cb) 2850 if (w->reschedule_cb)
2568 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2851 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2569 else if (w->interval) 2852 else if (w->interval)
2570 { 2853 {
2571 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2854 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2572 /* this formula differs from the one in periodic_reify because we do not always round up */ 2855 periodic_recalc (EV_A_ w);
2573 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2574 } 2856 }
2575 else 2857 else
2576 ev_at (w) = w->offset; 2858 ev_at (w) = w->offset;
2577 2859
2578 EV_FREQUENT_CHECK; 2860 EV_FREQUENT_CHECK;
… …
2610 periodics [active] = periodics [periodiccnt + HEAP0]; 2892 periodics [active] = periodics [periodiccnt + HEAP0];
2611 adjustheap (periodics, periodiccnt, active); 2893 adjustheap (periodics, periodiccnt, active);
2612 } 2894 }
2613 } 2895 }
2614 2896
2615 EV_FREQUENT_CHECK;
2616
2617 ev_stop (EV_A_ (W)w); 2897 ev_stop (EV_A_ (W)w);
2898
2899 EV_FREQUENT_CHECK;
2618} 2900}
2619 2901
2620void noinline 2902void noinline
2621ev_periodic_again (EV_P_ ev_periodic *w) 2903ev_periodic_again (EV_P_ ev_periodic *w)
2622{ 2904{
… …
2628 2910
2629#ifndef SA_RESTART 2911#ifndef SA_RESTART
2630# define SA_RESTART 0 2912# define SA_RESTART 0
2631#endif 2913#endif
2632 2914
2915#if EV_SIGNAL_ENABLE
2916
2633void noinline 2917void noinline
2634ev_signal_start (EV_P_ ev_signal *w) 2918ev_signal_start (EV_P_ ev_signal *w)
2635{ 2919{
2636#if EV_MULTIPLICITY
2637 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2638#endif
2639 if (expect_false (ev_is_active (w))) 2920 if (expect_false (ev_is_active (w)))
2640 return; 2921 return;
2641 2922
2642 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2923 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2924
2925#if EV_MULTIPLICITY
2926 assert (("libev: a signal must not be attached to two different loops",
2927 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2928
2929 signals [w->signum - 1].loop = EV_A;
2930#endif
2643 2931
2644 EV_FREQUENT_CHECK; 2932 EV_FREQUENT_CHECK;
2645 2933
2646#if EV_USE_SIGNALFD 2934#if EV_USE_SIGNALFD
2647 if (sigfd == -2) 2935 if (sigfd == -2)
… …
2669 sigaddset (&sigfd_set, w->signum); 2957 sigaddset (&sigfd_set, w->signum);
2670 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2958 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2671 2959
2672 signalfd (sigfd, &sigfd_set, 0); 2960 signalfd (sigfd, &sigfd_set, 0);
2673 } 2961 }
2674 else
2675#endif
2676 evpipe_init (EV_A);
2677
2678 {
2679#ifndef _WIN32
2680 sigset_t full, prev;
2681 sigfillset (&full);
2682 sigprocmask (SIG_SETMASK, &full, &prev);
2683#endif
2684
2685 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2686
2687#ifndef _WIN32
2688# if EV_USE_SIGNALFD
2689 if (sigfd < 0)/*TODO*/
2690# endif 2962#endif
2691 sigdelset (&prev, w->signum);
2692 sigprocmask (SIG_SETMASK, &prev, 0);
2693#endif
2694 }
2695 2963
2696 ev_start (EV_A_ (W)w, 1); 2964 ev_start (EV_A_ (W)w, 1);
2697 wlist_add (&signals [w->signum - 1].head, (WL)w); 2965 wlist_add (&signals [w->signum - 1].head, (WL)w);
2698 2966
2699 if (!((WL)w)->next) 2967 if (!((WL)w)->next)
2700 {
2701#if _WIN32
2702 signal (w->signum, ev_sighandler);
2703#else
2704# if EV_USE_SIGNALFD 2968# if EV_USE_SIGNALFD
2705 if (sigfd < 0) /*TODO*/ 2969 if (sigfd < 0) /*TODO*/
2706# endif 2970# endif
2707 { 2971 {
2972# ifdef _WIN32
2973 evpipe_init (EV_A);
2974
2975 signal (w->signum, ev_sighandler);
2976# else
2708 struct sigaction sa = { }; 2977 struct sigaction sa;
2978
2979 evpipe_init (EV_A);
2980
2709 sa.sa_handler = ev_sighandler; 2981 sa.sa_handler = ev_sighandler;
2710 sigfillset (&sa.sa_mask); 2982 sigfillset (&sa.sa_mask);
2711 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2983 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2712 sigaction (w->signum, &sa, 0); 2984 sigaction (w->signum, &sa, 0);
2985
2986 if (origflags & EVFLAG_NOSIGMASK)
2987 {
2988 sigemptyset (&sa.sa_mask);
2989 sigaddset (&sa.sa_mask, w->signum);
2990 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2713 } 2991 }
2714#endif 2992#endif
2715 } 2993 }
2716 2994
2717 EV_FREQUENT_CHECK; 2995 EV_FREQUENT_CHECK;
2718} 2996}
2719 2997
2720void noinline 2998void noinline
… …
2728 3006
2729 wlist_del (&signals [w->signum - 1].head, (WL)w); 3007 wlist_del (&signals [w->signum - 1].head, (WL)w);
2730 ev_stop (EV_A_ (W)w); 3008 ev_stop (EV_A_ (W)w);
2731 3009
2732 if (!signals [w->signum - 1].head) 3010 if (!signals [w->signum - 1].head)
3011 {
3012#if EV_MULTIPLICITY
3013 signals [w->signum - 1].loop = 0; /* unattach from signal */
3014#endif
2733#if EV_USE_SIGNALFD 3015#if EV_USE_SIGNALFD
2734 if (sigfd >= 0) 3016 if (sigfd >= 0)
2735 { 3017 {
2736 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 3018 sigset_t ss;
3019
3020 sigemptyset (&ss);
3021 sigaddset (&ss, w->signum);
2737 sigdelset (&sigfd_set, w->signum); 3022 sigdelset (&sigfd_set, w->signum);
3023
2738 signalfd (sigfd, &sigfd_set, 0); 3024 signalfd (sigfd, &sigfd_set, 0);
2739 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 3025 sigprocmask (SIG_UNBLOCK, &ss, 0);
2740 /*TODO: maybe unblock signal? */
2741 } 3026 }
2742 else 3027 else
2743#endif 3028#endif
2744 signal (w->signum, SIG_DFL); 3029 signal (w->signum, SIG_DFL);
3030 }
2745 3031
2746 EV_FREQUENT_CHECK; 3032 EV_FREQUENT_CHECK;
2747} 3033}
3034
3035#endif
3036
3037#if EV_CHILD_ENABLE
2748 3038
2749void 3039void
2750ev_child_start (EV_P_ ev_child *w) 3040ev_child_start (EV_P_ ev_child *w)
2751{ 3041{
2752#if EV_MULTIPLICITY 3042#if EV_MULTIPLICITY
… …
2756 return; 3046 return;
2757 3047
2758 EV_FREQUENT_CHECK; 3048 EV_FREQUENT_CHECK;
2759 3049
2760 ev_start (EV_A_ (W)w, 1); 3050 ev_start (EV_A_ (W)w, 1);
2761 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3051 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2762 3052
2763 EV_FREQUENT_CHECK; 3053 EV_FREQUENT_CHECK;
2764} 3054}
2765 3055
2766void 3056void
… …
2770 if (expect_false (!ev_is_active (w))) 3060 if (expect_false (!ev_is_active (w)))
2771 return; 3061 return;
2772 3062
2773 EV_FREQUENT_CHECK; 3063 EV_FREQUENT_CHECK;
2774 3064
2775 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3065 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2776 ev_stop (EV_A_ (W)w); 3066 ev_stop (EV_A_ (W)w);
2777 3067
2778 EV_FREQUENT_CHECK; 3068 EV_FREQUENT_CHECK;
2779} 3069}
3070
3071#endif
2780 3072
2781#if EV_STAT_ENABLE 3073#if EV_STAT_ENABLE
2782 3074
2783# ifdef _WIN32 3075# ifdef _WIN32
2784# undef lstat 3076# undef lstat
… …
2790#define MIN_STAT_INTERVAL 0.1074891 3082#define MIN_STAT_INTERVAL 0.1074891
2791 3083
2792static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 3084static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2793 3085
2794#if EV_USE_INOTIFY 3086#if EV_USE_INOTIFY
2795# define EV_INOTIFY_BUFSIZE 8192 3087
3088/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
3089# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2796 3090
2797static void noinline 3091static void noinline
2798infy_add (EV_P_ ev_stat *w) 3092infy_add (EV_P_ ev_stat *w)
2799{ 3093{
2800 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 3094 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2801 3095
2802 if (w->wd < 0) 3096 if (w->wd >= 0)
3097 {
3098 struct statfs sfs;
3099
3100 /* now local changes will be tracked by inotify, but remote changes won't */
3101 /* unless the filesystem is known to be local, we therefore still poll */
3102 /* also do poll on <2.6.25, but with normal frequency */
3103
3104 if (!fs_2625)
3105 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3106 else if (!statfs (w->path, &sfs)
3107 && (sfs.f_type == 0x1373 /* devfs */
3108 || sfs.f_type == 0xEF53 /* ext2/3 */
3109 || sfs.f_type == 0x3153464a /* jfs */
3110 || sfs.f_type == 0x52654973 /* reiser3 */
3111 || sfs.f_type == 0x01021994 /* tempfs */
3112 || sfs.f_type == 0x58465342 /* xfs */))
3113 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3114 else
3115 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2803 { 3116 }
3117 else
3118 {
3119 /* can't use inotify, continue to stat */
2804 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3120 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2805 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2806 3121
2807 /* monitor some parent directory for speedup hints */ 3122 /* if path is not there, monitor some parent directory for speedup hints */
2808 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3123 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2809 /* but an efficiency issue only */ 3124 /* but an efficiency issue only */
2810 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3125 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2811 { 3126 {
2812 char path [4096]; 3127 char path [4096];
… …
2822 if (!pend || pend == path) 3137 if (!pend || pend == path)
2823 break; 3138 break;
2824 3139
2825 *pend = 0; 3140 *pend = 0;
2826 w->wd = inotify_add_watch (fs_fd, path, mask); 3141 w->wd = inotify_add_watch (fs_fd, path, mask);
2827 } 3142 }
2828 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3143 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2829 } 3144 }
2830 } 3145 }
2831 3146
2832 if (w->wd >= 0) 3147 if (w->wd >= 0)
2833 {
2834 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3148 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2835 3149
2836 /* now local changes will be tracked by inotify, but remote changes won't */ 3150 /* now re-arm timer, if required */
2837 /* unless the filesystem it known to be local, we therefore still poll */ 3151 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2838 /* also do poll on <2.6.25, but with normal frequency */
2839 struct statfs sfs;
2840
2841 if (fs_2625 && !statfs (w->path, &sfs))
2842 if (sfs.f_type == 0x1373 /* devfs */
2843 || sfs.f_type == 0xEF53 /* ext2/3 */
2844 || sfs.f_type == 0x3153464a /* jfs */
2845 || sfs.f_type == 0x52654973 /* reiser3 */
2846 || sfs.f_type == 0x01021994 /* tempfs */
2847 || sfs.f_type == 0x58465342 /* xfs */)
2848 return;
2849
2850 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2851 ev_timer_again (EV_A_ &w->timer); 3152 ev_timer_again (EV_A_ &w->timer);
2852 } 3153 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2853} 3154}
2854 3155
2855static void noinline 3156static void noinline
2856infy_del (EV_P_ ev_stat *w) 3157infy_del (EV_P_ ev_stat *w)
2857{ 3158{
… …
2860 3161
2861 if (wd < 0) 3162 if (wd < 0)
2862 return; 3163 return;
2863 3164
2864 w->wd = -2; 3165 w->wd = -2;
2865 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3166 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2866 wlist_del (&fs_hash [slot].head, (WL)w); 3167 wlist_del (&fs_hash [slot].head, (WL)w);
2867 3168
2868 /* remove this watcher, if others are watching it, they will rearm */ 3169 /* remove this watcher, if others are watching it, they will rearm */
2869 inotify_rm_watch (fs_fd, wd); 3170 inotify_rm_watch (fs_fd, wd);
2870} 3171}
… …
2872static void noinline 3173static void noinline
2873infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3174infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2874{ 3175{
2875 if (slot < 0) 3176 if (slot < 0)
2876 /* overflow, need to check for all hash slots */ 3177 /* overflow, need to check for all hash slots */
2877 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3178 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2878 infy_wd (EV_A_ slot, wd, ev); 3179 infy_wd (EV_A_ slot, wd, ev);
2879 else 3180 else
2880 { 3181 {
2881 WL w_; 3182 WL w_;
2882 3183
2883 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3184 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2884 { 3185 {
2885 ev_stat *w = (ev_stat *)w_; 3186 ev_stat *w = (ev_stat *)w_;
2886 w_ = w_->next; /* lets us remove this watcher and all before it */ 3187 w_ = w_->next; /* lets us remove this watcher and all before it */
2887 3188
2888 if (w->wd == wd || wd == -1) 3189 if (w->wd == wd || wd == -1)
2889 { 3190 {
2890 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3191 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2891 { 3192 {
2892 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3193 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2893 w->wd = -1; 3194 w->wd = -1;
2894 infy_add (EV_A_ w); /* re-add, no matter what */ 3195 infy_add (EV_A_ w); /* re-add, no matter what */
2895 } 3196 }
2896 3197
2897 stat_timer_cb (EV_A_ &w->timer, 0); 3198 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2902 3203
2903static void 3204static void
2904infy_cb (EV_P_ ev_io *w, int revents) 3205infy_cb (EV_P_ ev_io *w, int revents)
2905{ 3206{
2906 char buf [EV_INOTIFY_BUFSIZE]; 3207 char buf [EV_INOTIFY_BUFSIZE];
2907 struct inotify_event *ev = (struct inotify_event *)buf;
2908 int ofs; 3208 int ofs;
2909 int len = read (fs_fd, buf, sizeof (buf)); 3209 int len = read (fs_fd, buf, sizeof (buf));
2910 3210
2911 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3211 for (ofs = 0; ofs < len; )
3212 {
3213 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2912 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3214 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3215 ofs += sizeof (struct inotify_event) + ev->len;
3216 }
2913} 3217}
2914 3218
2915inline_size void 3219inline_size void
2916check_2625 (EV_P) 3220ev_check_2625 (EV_P)
2917{ 3221{
2918 /* kernels < 2.6.25 are borked 3222 /* kernels < 2.6.25 are borked
2919 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3223 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2920 */ 3224 */
2921 struct utsname buf; 3225 if (ev_linux_version () < 0x020619)
2922 int major, minor, micro;
2923
2924 if (uname (&buf))
2925 return; 3226 return;
2926 3227
2927 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2928 return;
2929
2930 if (major < 2
2931 || (major == 2 && minor < 6)
2932 || (major == 2 && minor == 6 && micro < 25))
2933 return;
2934
2935 fs_2625 = 1; 3228 fs_2625 = 1;
3229}
3230
3231inline_size int
3232infy_newfd (void)
3233{
3234#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3235 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3236 if (fd >= 0)
3237 return fd;
3238#endif
3239 return inotify_init ();
2936} 3240}
2937 3241
2938inline_size void 3242inline_size void
2939infy_init (EV_P) 3243infy_init (EV_P)
2940{ 3244{
2941 if (fs_fd != -2) 3245 if (fs_fd != -2)
2942 return; 3246 return;
2943 3247
2944 fs_fd = -1; 3248 fs_fd = -1;
2945 3249
2946 check_2625 (EV_A); 3250 ev_check_2625 (EV_A);
2947 3251
2948 fs_fd = inotify_init (); 3252 fs_fd = infy_newfd ();
2949 3253
2950 if (fs_fd >= 0) 3254 if (fs_fd >= 0)
2951 { 3255 {
3256 fd_intern (fs_fd);
2952 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3257 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2953 ev_set_priority (&fs_w, EV_MAXPRI); 3258 ev_set_priority (&fs_w, EV_MAXPRI);
2954 ev_io_start (EV_A_ &fs_w); 3259 ev_io_start (EV_A_ &fs_w);
3260 ev_unref (EV_A);
2955 } 3261 }
2956} 3262}
2957 3263
2958inline_size void 3264inline_size void
2959infy_fork (EV_P) 3265infy_fork (EV_P)
… …
2961 int slot; 3267 int slot;
2962 3268
2963 if (fs_fd < 0) 3269 if (fs_fd < 0)
2964 return; 3270 return;
2965 3271
3272 ev_ref (EV_A);
3273 ev_io_stop (EV_A_ &fs_w);
2966 close (fs_fd); 3274 close (fs_fd);
2967 fs_fd = inotify_init (); 3275 fs_fd = infy_newfd ();
2968 3276
3277 if (fs_fd >= 0)
3278 {
3279 fd_intern (fs_fd);
3280 ev_io_set (&fs_w, fs_fd, EV_READ);
3281 ev_io_start (EV_A_ &fs_w);
3282 ev_unref (EV_A);
3283 }
3284
2969 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3285 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2970 { 3286 {
2971 WL w_ = fs_hash [slot].head; 3287 WL w_ = fs_hash [slot].head;
2972 fs_hash [slot].head = 0; 3288 fs_hash [slot].head = 0;
2973 3289
2974 while (w_) 3290 while (w_)
… …
2979 w->wd = -1; 3295 w->wd = -1;
2980 3296
2981 if (fs_fd >= 0) 3297 if (fs_fd >= 0)
2982 infy_add (EV_A_ w); /* re-add, no matter what */ 3298 infy_add (EV_A_ w); /* re-add, no matter what */
2983 else 3299 else
3300 {
3301 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3302 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2984 ev_timer_again (EV_A_ &w->timer); 3303 ev_timer_again (EV_A_ &w->timer);
3304 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3305 }
2985 } 3306 }
2986 } 3307 }
2987} 3308}
2988 3309
2989#endif 3310#endif
… …
3006static void noinline 3327static void noinline
3007stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3328stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3008{ 3329{
3009 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3330 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3010 3331
3011 /* we copy this here each the time so that */ 3332 ev_statdata prev = w->attr;
3012 /* prev has the old value when the callback gets invoked */
3013 w->prev = w->attr;
3014 ev_stat_stat (EV_A_ w); 3333 ev_stat_stat (EV_A_ w);
3015 3334
3016 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3335 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3017 if ( 3336 if (
3018 w->prev.st_dev != w->attr.st_dev 3337 prev.st_dev != w->attr.st_dev
3019 || w->prev.st_ino != w->attr.st_ino 3338 || prev.st_ino != w->attr.st_ino
3020 || w->prev.st_mode != w->attr.st_mode 3339 || prev.st_mode != w->attr.st_mode
3021 || w->prev.st_nlink != w->attr.st_nlink 3340 || prev.st_nlink != w->attr.st_nlink
3022 || w->prev.st_uid != w->attr.st_uid 3341 || prev.st_uid != w->attr.st_uid
3023 || w->prev.st_gid != w->attr.st_gid 3342 || prev.st_gid != w->attr.st_gid
3024 || w->prev.st_rdev != w->attr.st_rdev 3343 || prev.st_rdev != w->attr.st_rdev
3025 || w->prev.st_size != w->attr.st_size 3344 || prev.st_size != w->attr.st_size
3026 || w->prev.st_atime != w->attr.st_atime 3345 || prev.st_atime != w->attr.st_atime
3027 || w->prev.st_mtime != w->attr.st_mtime 3346 || prev.st_mtime != w->attr.st_mtime
3028 || w->prev.st_ctime != w->attr.st_ctime 3347 || prev.st_ctime != w->attr.st_ctime
3029 ) { 3348 ) {
3349 /* we only update w->prev on actual differences */
3350 /* in case we test more often than invoke the callback, */
3351 /* to ensure that prev is always different to attr */
3352 w->prev = prev;
3353
3030 #if EV_USE_INOTIFY 3354 #if EV_USE_INOTIFY
3031 if (fs_fd >= 0) 3355 if (fs_fd >= 0)
3032 { 3356 {
3033 infy_del (EV_A_ w); 3357 infy_del (EV_A_ w);
3034 infy_add (EV_A_ w); 3358 infy_add (EV_A_ w);
… …
3059 3383
3060 if (fs_fd >= 0) 3384 if (fs_fd >= 0)
3061 infy_add (EV_A_ w); 3385 infy_add (EV_A_ w);
3062 else 3386 else
3063#endif 3387#endif
3388 {
3064 ev_timer_again (EV_A_ &w->timer); 3389 ev_timer_again (EV_A_ &w->timer);
3390 ev_unref (EV_A);
3391 }
3065 3392
3066 ev_start (EV_A_ (W)w, 1); 3393 ev_start (EV_A_ (W)w, 1);
3067 3394
3068 EV_FREQUENT_CHECK; 3395 EV_FREQUENT_CHECK;
3069} 3396}
… …
3078 EV_FREQUENT_CHECK; 3405 EV_FREQUENT_CHECK;
3079 3406
3080#if EV_USE_INOTIFY 3407#if EV_USE_INOTIFY
3081 infy_del (EV_A_ w); 3408 infy_del (EV_A_ w);
3082#endif 3409#endif
3410
3411 if (ev_is_active (&w->timer))
3412 {
3413 ev_ref (EV_A);
3083 ev_timer_stop (EV_A_ &w->timer); 3414 ev_timer_stop (EV_A_ &w->timer);
3415 }
3084 3416
3085 ev_stop (EV_A_ (W)w); 3417 ev_stop (EV_A_ (W)w);
3086 3418
3087 EV_FREQUENT_CHECK; 3419 EV_FREQUENT_CHECK;
3088} 3420}
… …
3133 3465
3134 EV_FREQUENT_CHECK; 3466 EV_FREQUENT_CHECK;
3135} 3467}
3136#endif 3468#endif
3137 3469
3470#if EV_PREPARE_ENABLE
3138void 3471void
3139ev_prepare_start (EV_P_ ev_prepare *w) 3472ev_prepare_start (EV_P_ ev_prepare *w)
3140{ 3473{
3141 if (expect_false (ev_is_active (w))) 3474 if (expect_false (ev_is_active (w)))
3142 return; 3475 return;
… …
3168 3501
3169 ev_stop (EV_A_ (W)w); 3502 ev_stop (EV_A_ (W)w);
3170 3503
3171 EV_FREQUENT_CHECK; 3504 EV_FREQUENT_CHECK;
3172} 3505}
3506#endif
3173 3507
3508#if EV_CHECK_ENABLE
3174void 3509void
3175ev_check_start (EV_P_ ev_check *w) 3510ev_check_start (EV_P_ ev_check *w)
3176{ 3511{
3177 if (expect_false (ev_is_active (w))) 3512 if (expect_false (ev_is_active (w)))
3178 return; 3513 return;
… …
3204 3539
3205 ev_stop (EV_A_ (W)w); 3540 ev_stop (EV_A_ (W)w);
3206 3541
3207 EV_FREQUENT_CHECK; 3542 EV_FREQUENT_CHECK;
3208} 3543}
3544#endif
3209 3545
3210#if EV_EMBED_ENABLE 3546#if EV_EMBED_ENABLE
3211void noinline 3547void noinline
3212ev_embed_sweep (EV_P_ ev_embed *w) 3548ev_embed_sweep (EV_P_ ev_embed *w)
3213{ 3549{
3214 ev_loop (w->other, EVLOOP_NONBLOCK); 3550 ev_run (w->other, EVRUN_NOWAIT);
3215} 3551}
3216 3552
3217static void 3553static void
3218embed_io_cb (EV_P_ ev_io *io, int revents) 3554embed_io_cb (EV_P_ ev_io *io, int revents)
3219{ 3555{
3220 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3556 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3221 3557
3222 if (ev_cb (w)) 3558 if (ev_cb (w))
3223 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3559 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3224 else 3560 else
3225 ev_loop (w->other, EVLOOP_NONBLOCK); 3561 ev_run (w->other, EVRUN_NOWAIT);
3226} 3562}
3227 3563
3228static void 3564static void
3229embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3565embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3230{ 3566{
3231 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3567 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3232 3568
3233 { 3569 {
3234 struct ev_loop *loop = w->other; 3570 EV_P = w->other;
3235 3571
3236 while (fdchangecnt) 3572 while (fdchangecnt)
3237 { 3573 {
3238 fd_reify (EV_A); 3574 fd_reify (EV_A);
3239 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3575 ev_run (EV_A_ EVRUN_NOWAIT);
3240 } 3576 }
3241 } 3577 }
3242} 3578}
3243 3579
3244static void 3580static void
… …
3247 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3583 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3248 3584
3249 ev_embed_stop (EV_A_ w); 3585 ev_embed_stop (EV_A_ w);
3250 3586
3251 { 3587 {
3252 struct ev_loop *loop = w->other; 3588 EV_P = w->other;
3253 3589
3254 ev_loop_fork (EV_A); 3590 ev_loop_fork (EV_A);
3255 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3591 ev_run (EV_A_ EVRUN_NOWAIT);
3256 } 3592 }
3257 3593
3258 ev_embed_start (EV_A_ w); 3594 ev_embed_start (EV_A_ w);
3259} 3595}
3260 3596
… …
3271{ 3607{
3272 if (expect_false (ev_is_active (w))) 3608 if (expect_false (ev_is_active (w)))
3273 return; 3609 return;
3274 3610
3275 { 3611 {
3276 struct ev_loop *loop = w->other; 3612 EV_P = w->other;
3277 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3613 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3278 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3614 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3279 } 3615 }
3280 3616
3281 EV_FREQUENT_CHECK; 3617 EV_FREQUENT_CHECK;
… …
3308 3644
3309 ev_io_stop (EV_A_ &w->io); 3645 ev_io_stop (EV_A_ &w->io);
3310 ev_prepare_stop (EV_A_ &w->prepare); 3646 ev_prepare_stop (EV_A_ &w->prepare);
3311 ev_fork_stop (EV_A_ &w->fork); 3647 ev_fork_stop (EV_A_ &w->fork);
3312 3648
3649 ev_stop (EV_A_ (W)w);
3650
3313 EV_FREQUENT_CHECK; 3651 EV_FREQUENT_CHECK;
3314} 3652}
3315#endif 3653#endif
3316 3654
3317#if EV_FORK_ENABLE 3655#if EV_FORK_ENABLE
… …
3350 3688
3351 EV_FREQUENT_CHECK; 3689 EV_FREQUENT_CHECK;
3352} 3690}
3353#endif 3691#endif
3354 3692
3355#if EV_ASYNC_ENABLE 3693#if EV_CLEANUP_ENABLE
3356void 3694void
3357ev_async_start (EV_P_ ev_async *w) 3695ev_cleanup_start (EV_P_ ev_cleanup *w)
3358{ 3696{
3359 if (expect_false (ev_is_active (w))) 3697 if (expect_false (ev_is_active (w)))
3360 return; 3698 return;
3699
3700 EV_FREQUENT_CHECK;
3701
3702 ev_start (EV_A_ (W)w, ++cleanupcnt);
3703 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3704 cleanups [cleanupcnt - 1] = w;
3705
3706 /* cleanup watchers should never keep a refcount on the loop */
3707 ev_unref (EV_A);
3708 EV_FREQUENT_CHECK;
3709}
3710
3711void
3712ev_cleanup_stop (EV_P_ ev_cleanup *w)
3713{
3714 clear_pending (EV_A_ (W)w);
3715 if (expect_false (!ev_is_active (w)))
3716 return;
3717
3718 EV_FREQUENT_CHECK;
3719 ev_ref (EV_A);
3720
3721 {
3722 int active = ev_active (w);
3723
3724 cleanups [active - 1] = cleanups [--cleanupcnt];
3725 ev_active (cleanups [active - 1]) = active;
3726 }
3727
3728 ev_stop (EV_A_ (W)w);
3729
3730 EV_FREQUENT_CHECK;
3731}
3732#endif
3733
3734#if EV_ASYNC_ENABLE
3735void
3736ev_async_start (EV_P_ ev_async *w)
3737{
3738 if (expect_false (ev_is_active (w)))
3739 return;
3740
3741 w->sent = 0;
3361 3742
3362 evpipe_init (EV_A); 3743 evpipe_init (EV_A);
3363 3744
3364 EV_FREQUENT_CHECK; 3745 EV_FREQUENT_CHECK;
3365 3746
… …
3393 3774
3394void 3775void
3395ev_async_send (EV_P_ ev_async *w) 3776ev_async_send (EV_P_ ev_async *w)
3396{ 3777{
3397 w->sent = 1; 3778 w->sent = 1;
3398 evpipe_write (EV_A_ &gotasync); 3779 evpipe_write (EV_A_ &async_pending);
3399} 3780}
3400#endif 3781#endif
3401 3782
3402/*****************************************************************************/ 3783/*****************************************************************************/
3403 3784
… …
3443{ 3824{
3444 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3825 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3445 3826
3446 if (expect_false (!once)) 3827 if (expect_false (!once))
3447 { 3828 {
3448 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3829 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3449 return; 3830 return;
3450 } 3831 }
3451 3832
3452 once->cb = cb; 3833 once->cb = cb;
3453 once->arg = arg; 3834 once->arg = arg;
… …
3540 if (types & EV_ASYNC) 3921 if (types & EV_ASYNC)
3541 for (i = asynccnt; i--; ) 3922 for (i = asynccnt; i--; )
3542 cb (EV_A_ EV_ASYNC, asyncs [i]); 3923 cb (EV_A_ EV_ASYNC, asyncs [i]);
3543#endif 3924#endif
3544 3925
3926#if EV_PREPARE_ENABLE
3545 if (types & EV_PREPARE) 3927 if (types & EV_PREPARE)
3546 for (i = preparecnt; i--; ) 3928 for (i = preparecnt; i--; )
3547#if EV_EMBED_ENABLE 3929# if EV_EMBED_ENABLE
3548 if (ev_cb (prepares [i]) != embed_prepare_cb) 3930 if (ev_cb (prepares [i]) != embed_prepare_cb)
3549#endif 3931# endif
3550 cb (EV_A_ EV_PREPARE, prepares [i]); 3932 cb (EV_A_ EV_PREPARE, prepares [i]);
3933#endif
3551 3934
3935#if EV_CHECK_ENABLE
3552 if (types & EV_CHECK) 3936 if (types & EV_CHECK)
3553 for (i = checkcnt; i--; ) 3937 for (i = checkcnt; i--; )
3554 cb (EV_A_ EV_CHECK, checks [i]); 3938 cb (EV_A_ EV_CHECK, checks [i]);
3939#endif
3555 3940
3941#if EV_SIGNAL_ENABLE
3556 if (types & EV_SIGNAL) 3942 if (types & EV_SIGNAL)
3557 for (i = 0; i < signalmax; ++i) 3943 for (i = 0; i < EV_NSIG - 1; ++i)
3558 for (wl = signals [i].head; wl; ) 3944 for (wl = signals [i].head; wl; )
3559 { 3945 {
3560 wn = wl->next; 3946 wn = wl->next;
3561 cb (EV_A_ EV_SIGNAL, wl); 3947 cb (EV_A_ EV_SIGNAL, wl);
3562 wl = wn; 3948 wl = wn;
3563 } 3949 }
3950#endif
3564 3951
3952#if EV_CHILD_ENABLE
3565 if (types & EV_CHILD) 3953 if (types & EV_CHILD)
3566 for (i = EV_PID_HASHSIZE; i--; ) 3954 for (i = (EV_PID_HASHSIZE); i--; )
3567 for (wl = childs [i]; wl; ) 3955 for (wl = childs [i]; wl; )
3568 { 3956 {
3569 wn = wl->next; 3957 wn = wl->next;
3570 cb (EV_A_ EV_CHILD, wl); 3958 cb (EV_A_ EV_CHILD, wl);
3571 wl = wn; 3959 wl = wn;
3572 } 3960 }
3961#endif
3573/* EV_STAT 0x00001000 /* stat data changed */ 3962/* EV_STAT 0x00001000 /* stat data changed */
3574/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3963/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3575} 3964}
3576#endif 3965#endif
3577 3966
3578#if EV_MULTIPLICITY 3967#if EV_MULTIPLICITY
3579 #include "ev_wrap.h" 3968 #include "ev_wrap.h"
3580#endif 3969#endif
3581 3970
3582#ifdef __cplusplus 3971EV_CPP(})
3583}
3584#endif
3585 3972

Diff Legend

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