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

Comparing libev/ev.c (file contents):
Revision 1.325 by root, Sun Jan 24 12:31:55 2010 UTC vs.
Revision 1.373 by root, Sun Feb 20 02:56:23 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
114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H 120# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 121# ifndef EV_USE_KQUEUE
117# else 122# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
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>
158#include <string.h> 168#include <string.h>
159#include <fcntl.h> 169#include <fcntl.h>
160#include <stddef.h> 170#include <stddef.h>
161 171
… …
163 173
164#include <assert.h> 174#include <assert.h>
165#include <errno.h> 175#include <errno.h>
166#include <sys/types.h> 176#include <sys/types.h>
167#include <time.h> 177#include <time.h>
178#include <limits.h>
168 179
169#include <signal.h> 180#include <signal.h>
170 181
171#ifdef EV_H 182#ifdef EV_H
172# include EV_H 183# include EV_H
173#else 184#else
174# include "ev.h" 185# include "ev.h"
175#endif 186#endif
187
188EV_CPP(extern "C" {)
176 189
177#ifndef _WIN32 190#ifndef _WIN32
178# include <sys/time.h> 191# include <sys/time.h>
179# include <sys/wait.h> 192# include <sys/wait.h>
180# include <unistd.h> 193# include <unistd.h>
… …
183# define WIN32_LEAN_AND_MEAN 196# define WIN32_LEAN_AND_MEAN
184# include <windows.h> 197# include <windows.h>
185# ifndef EV_SELECT_IS_WINSOCKET 198# ifndef EV_SELECT_IS_WINSOCKET
186# define EV_SELECT_IS_WINSOCKET 1 199# define EV_SELECT_IS_WINSOCKET 1
187# endif 200# endif
201# undef EV_AVOID_STDIO
188#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
189 211
190/* 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 */
191 213
192/* try to deduce the maximum number of signals on this platform */ 214/* try to deduce the maximum number of signals on this platform */
193#if defined (EV_NSIG) 215#if defined (EV_NSIG)
… …
205#elif defined (MAXSIG) 227#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1) 228# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG) 229#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1) 230# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE) 231#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 232# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig) 233#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 234# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else 235#else
214# error "unable to find value for NSIG, please report" 236# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */ 237/* to make it compile regardless, just remove the above line, */
238/* but consider reporting it, too! :) */
216# define EV_NSIG 65 239# define EV_NSIG 65
240#endif
241
242#ifndef EV_USE_FLOOR
243# define EV_USE_FLOOR 0
217#endif 244#endif
218 245
219#ifndef EV_USE_CLOCK_SYSCALL 246#ifndef EV_USE_CLOCK_SYSCALL
220# if __linux && __GLIBC__ >= 2 247# if __linux && __GLIBC__ >= 2
221# define EV_USE_CLOCK_SYSCALL 1 248# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
222# else 249# else
223# define EV_USE_CLOCK_SYSCALL 0 250# define EV_USE_CLOCK_SYSCALL 0
224# endif 251# endif
225#endif 252#endif
226 253
227#ifndef EV_USE_MONOTONIC 254#ifndef EV_USE_MONOTONIC
228# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 255# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
229# define EV_USE_MONOTONIC 1 256# define EV_USE_MONOTONIC EV_FEATURE_OS
230# else 257# else
231# define EV_USE_MONOTONIC 0 258# define EV_USE_MONOTONIC 0
232# endif 259# endif
233#endif 260#endif
234 261
… …
236# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 263# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
237#endif 264#endif
238 265
239#ifndef EV_USE_NANOSLEEP 266#ifndef EV_USE_NANOSLEEP
240# if _POSIX_C_SOURCE >= 199309L 267# if _POSIX_C_SOURCE >= 199309L
241# define EV_USE_NANOSLEEP 1 268# define EV_USE_NANOSLEEP EV_FEATURE_OS
242# else 269# else
243# define EV_USE_NANOSLEEP 0 270# define EV_USE_NANOSLEEP 0
244# endif 271# endif
245#endif 272#endif
246 273
247#ifndef EV_USE_SELECT 274#ifndef EV_USE_SELECT
248# define EV_USE_SELECT 1 275# define EV_USE_SELECT EV_FEATURE_BACKENDS
249#endif 276#endif
250 277
251#ifndef EV_USE_POLL 278#ifndef EV_USE_POLL
252# ifdef _WIN32 279# ifdef _WIN32
253# define EV_USE_POLL 0 280# define EV_USE_POLL 0
254# else 281# else
255# define EV_USE_POLL 1 282# define EV_USE_POLL EV_FEATURE_BACKENDS
256# endif 283# endif
257#endif 284#endif
258 285
259#ifndef EV_USE_EPOLL 286#ifndef EV_USE_EPOLL
260# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 287# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
261# define EV_USE_EPOLL 1 288# define EV_USE_EPOLL EV_FEATURE_BACKENDS
262# else 289# else
263# define EV_USE_EPOLL 0 290# define EV_USE_EPOLL 0
264# endif 291# endif
265#endif 292#endif
266 293
… …
272# define EV_USE_PORT 0 299# define EV_USE_PORT 0
273#endif 300#endif
274 301
275#ifndef EV_USE_INOTIFY 302#ifndef EV_USE_INOTIFY
276# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
277# define EV_USE_INOTIFY 1 304# define EV_USE_INOTIFY EV_FEATURE_OS
278# else 305# else
279# define EV_USE_INOTIFY 0 306# define EV_USE_INOTIFY 0
280# endif 307# endif
281#endif 308#endif
282 309
283#ifndef EV_PID_HASHSIZE 310#ifndef EV_PID_HASHSIZE
284# if EV_MINIMAL 311# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
285# define EV_PID_HASHSIZE 1
286# else
287# define EV_PID_HASHSIZE 16
288# endif
289#endif 312#endif
290 313
291#ifndef EV_INOTIFY_HASHSIZE 314#ifndef EV_INOTIFY_HASHSIZE
292# if EV_MINIMAL 315# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
293# define EV_INOTIFY_HASHSIZE 1
294# else
295# define EV_INOTIFY_HASHSIZE 16
296# endif
297#endif 316#endif
298 317
299#ifndef EV_USE_EVENTFD 318#ifndef EV_USE_EVENTFD
300# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 319# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
301# define EV_USE_EVENTFD 1 320# define EV_USE_EVENTFD EV_FEATURE_OS
302# else 321# else
303# define EV_USE_EVENTFD 0 322# define EV_USE_EVENTFD 0
304# endif 323# endif
305#endif 324#endif
306 325
307#ifndef EV_USE_SIGNALFD 326#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 327# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1 328# define EV_USE_SIGNALFD EV_FEATURE_OS
310# else 329# else
311# define EV_USE_SIGNALFD 0 330# define EV_USE_SIGNALFD 0
312# endif 331# endif
313#endif 332#endif
314 333
… …
317# define EV_USE_4HEAP 1 336# define EV_USE_4HEAP 1
318# define EV_HEAP_CACHE_AT 1 337# define EV_HEAP_CACHE_AT 1
319#endif 338#endif
320 339
321#ifndef EV_VERIFY 340#ifndef EV_VERIFY
322# define EV_VERIFY !EV_MINIMAL 341# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
323#endif 342#endif
324 343
325#ifndef EV_USE_4HEAP 344#ifndef EV_USE_4HEAP
326# define EV_USE_4HEAP !EV_MINIMAL 345# define EV_USE_4HEAP EV_FEATURE_DATA
327#endif 346#endif
328 347
329#ifndef EV_HEAP_CACHE_AT 348#ifndef EV_HEAP_CACHE_AT
330# define EV_HEAP_CACHE_AT !EV_MINIMAL 349# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
331#endif 350#endif
332 351
333/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 352/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
334/* which makes programs even slower. might work on other unices, too. */ 353/* which makes programs even slower. might work on other unices, too. */
335#if EV_USE_CLOCK_SYSCALL 354#if EV_USE_CLOCK_SYSCALL
… …
366# undef EV_USE_INOTIFY 385# undef EV_USE_INOTIFY
367# define EV_USE_INOTIFY 0 386# define EV_USE_INOTIFY 0
368#endif 387#endif
369 388
370#if !EV_USE_NANOSLEEP 389#if !EV_USE_NANOSLEEP
371# ifndef _WIN32 390/* hp-ux has it in sys/time.h, which we unconditionally include above */
391# if !defined(_WIN32) && !defined(__hpux)
372# include <sys/select.h> 392# include <sys/select.h>
373# endif 393# endif
374#endif 394#endif
375 395
376#if EV_USE_INOTIFY 396#if EV_USE_INOTIFY
377# include <sys/utsname.h>
378# include <sys/statfs.h> 397# include <sys/statfs.h>
379# include <sys/inotify.h> 398# include <sys/inotify.h>
380/* 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 */
381# ifndef IN_DONT_FOLLOW 400# ifndef IN_DONT_FOLLOW
382# undef EV_USE_INOTIFY 401# undef EV_USE_INOTIFY
… …
399# define EFD_CLOEXEC O_CLOEXEC 418# define EFD_CLOEXEC O_CLOEXEC
400# else 419# else
401# define EFD_CLOEXEC 02000000 420# define EFD_CLOEXEC 02000000
402# endif 421# endif
403# endif 422# endif
404# ifdef __cplusplus
405extern "C" {
406# endif
407int eventfd (unsigned int initval, int flags); 423EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
408# ifdef __cplusplus
409}
410# endif
411#endif 424#endif
412 425
413#if EV_USE_SIGNALFD 426#if EV_USE_SIGNALFD
414/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 427/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
415# include <stdint.h> 428# include <stdint.h>
… …
421# define SFD_CLOEXEC O_CLOEXEC 434# define SFD_CLOEXEC O_CLOEXEC
422# else 435# else
423# define SFD_CLOEXEC 02000000 436# define SFD_CLOEXEC 02000000
424# endif 437# endif
425# endif 438# endif
426# ifdef __cplusplus
427extern "C" {
428# endif
429int signalfd (int fd, const sigset_t *mask, int flags); 439EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
430 440
431struct signalfd_siginfo 441struct signalfd_siginfo
432{ 442{
433 uint32_t ssi_signo; 443 uint32_t ssi_signo;
434 char pad[128 - sizeof (uint32_t)]; 444 char pad[128 - sizeof (uint32_t)];
435}; 445};
436# ifdef __cplusplus
437}
438# endif 446#endif
439#endif
440
441 447
442/**/ 448/**/
443 449
444#if EV_VERIFY >= 3 450#if EV_VERIFY >= 3
445# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 451# define EV_FREQUENT_CHECK ev_verify (EV_A)
446#else 452#else
447# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
448#endif 454#endif
449 455
450/* 456/*
451 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
452 * It is added to ev_rt_now when scheduling periodics
453 * to ensure progress, time-wise, even when rounding
454 * errors are against us.
455 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
456 * Better solutions welcome.
457 */ 459 */
458#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 */
459 462
460#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) */
461#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) */
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)
462 468
463#if __GNUC__ >= 4 469#if __GNUC__ >= 4
464# define expect(expr,value) __builtin_expect ((expr),(value)) 470# define expect(expr,value) __builtin_expect ((expr),(value))
465# define noinline __attribute__ ((noinline)) 471# define noinline __attribute__ ((noinline))
466#else 472#else
… …
473 479
474#define expect_false(expr) expect ((expr) != 0, 0) 480#define expect_false(expr) expect ((expr) != 0, 0)
475#define expect_true(expr) expect ((expr) != 0, 1) 481#define expect_true(expr) expect ((expr) != 0, 1)
476#define inline_size static inline 482#define inline_size static inline
477 483
478#if EV_MINIMAL 484#if EV_FEATURE_CODE
485# define inline_speed static inline
486#else
479# define inline_speed static noinline 487# define inline_speed static noinline
480#else
481# define inline_speed static inline
482#endif 488#endif
483 489
484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 490#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
485 491
486#if EV_MINPRI == EV_MAXPRI 492#if EV_MINPRI == EV_MAXPRI
… …
499#define ev_active(w) ((W)(w))->active 505#define ev_active(w) ((W)(w))->active
500#define ev_at(w) ((WT)(w))->at 506#define ev_at(w) ((WT)(w))->at
501 507
502#if EV_USE_REALTIME 508#if EV_USE_REALTIME
503/* 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 */
504/* giving it a reasonably high chance of working on typical architetcures */ 510/* giving it a reasonably high chance of working on typical architectures */
505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 511static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
506#endif 512#endif
507 513
508#if EV_USE_MONOTONIC 514#if EV_USE_MONOTONIC
509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 515static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
522#ifdef _WIN32 528#ifdef _WIN32
523# include "ev_win32.c" 529# include "ev_win32.c"
524#endif 530#endif
525 531
526/*****************************************************************************/ 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
527 631
528static void (*syserr_cb)(const char *msg); 632static void (*syserr_cb)(const char *msg);
529 633
530void 634void
531ev_set_syserr_cb (void (*cb)(const char *msg)) 635ev_set_syserr_cb (void (*cb)(const char *msg))
… …
541 645
542 if (syserr_cb) 646 if (syserr_cb)
543 syserr_cb (msg); 647 syserr_cb (msg);
544 else 648 else
545 { 649 {
650#if EV_AVOID_STDIO
651 ev_printerr (msg);
652 ev_printerr (": ");
653 ev_printerr (strerror (errno));
654 ev_printerr ("\n");
655#else
546 perror (msg); 656 perror (msg);
657#endif
547 abort (); 658 abort ();
548 } 659 }
549} 660}
550 661
551static void * 662static void *
552ev_realloc_emul (void *ptr, long size) 663ev_realloc_emul (void *ptr, long size)
553{ 664{
665#if __GLIBC__
666 return realloc (ptr, size);
667#else
554 /* some systems, notably openbsd and darwin, fail to properly 668 /* some systems, notably openbsd and darwin, fail to properly
555 * 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
556 * the single unix specification, so work around them here. 670 * the single unix specification, so work around them here.
557 */ 671 */
558 672
559 if (size) 673 if (size)
560 return realloc (ptr, size); 674 return realloc (ptr, size);
561 675
562 free (ptr); 676 free (ptr);
563 return 0; 677 return 0;
678#endif
564} 679}
565 680
566static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 681static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
567 682
568void 683void
… …
576{ 691{
577 ptr = alloc (ptr, size); 692 ptr = alloc (ptr, size);
578 693
579 if (!ptr && size) 694 if (!ptr && size)
580 { 695 {
696#if EV_AVOID_STDIO
697 ev_printerr ("(libev) memory allocation failed, aborting.\n");
698#else
581 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 699 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
700#endif
582 abort (); 701 abort ();
583 } 702 }
584 703
585 return ptr; 704 return ptr;
586} 705}
… …
602 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 */
603 unsigned char unused; 722 unsigned char unused;
604#if EV_USE_EPOLL 723#if EV_USE_EPOLL
605 unsigned int egen; /* generation counter to counter epoll bugs */ 724 unsigned int egen; /* generation counter to counter epoll bugs */
606#endif 725#endif
607#if EV_SELECT_IS_WINSOCKET 726#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
608 SOCKET handle; 727 SOCKET handle;
728#endif
729#if EV_USE_IOCP
730 OVERLAPPED or, ow;
609#endif 731#endif
610} ANFD; 732} ANFD;
611 733
612/* stores the pending event set for a given watcher */ 734/* stores the pending event set for a given watcher */
613typedef struct 735typedef struct
… …
668 790
669 static int ev_default_loop_ptr; 791 static int ev_default_loop_ptr;
670 792
671#endif 793#endif
672 794
673#if EV_MINIMAL < 2 795#if EV_FEATURE_API
674# 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)
675# 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)
676# define EV_INVOKE_PENDING invoke_cb (EV_A) 798# define EV_INVOKE_PENDING invoke_cb (EV_A)
677#else 799#else
678# define EV_RELEASE_CB (void)0 800# define EV_RELEASE_CB (void)0
679# define EV_ACQUIRE_CB (void)0 801# define EV_ACQUIRE_CB (void)0
680# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 802# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
681#endif 803#endif
682 804
683#define EVUNLOOP_RECURSE 0x80 805#define EVBREAK_RECURSE 0x80
684 806
685/*****************************************************************************/ 807/*****************************************************************************/
686 808
687#ifndef EV_HAVE_EV_TIME 809#ifndef EV_HAVE_EV_TIME
688ev_tstamp 810ev_tstamp
… …
732 if (delay > 0.) 854 if (delay > 0.)
733 { 855 {
734#if EV_USE_NANOSLEEP 856#if EV_USE_NANOSLEEP
735 struct timespec ts; 857 struct timespec ts;
736 858
737 ts.tv_sec = (time_t)delay; 859 EV_TS_SET (ts, delay);
738 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
739
740 nanosleep (&ts, 0); 860 nanosleep (&ts, 0);
741#elif defined(_WIN32) 861#elif defined(_WIN32)
742 Sleep ((unsigned long)(delay * 1e3)); 862 Sleep ((unsigned long)(delay * 1e3));
743#else 863#else
744 struct timeval tv; 864 struct timeval tv;
745 865
746 tv.tv_sec = (time_t)delay;
747 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
748
749 /* 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 */
750 /* something not guaranteed by newer posix versions, but guaranteed */ 867 /* something not guaranteed by newer posix versions, but guaranteed */
751 /* by older ones */ 868 /* by older ones */
869 EV_TV_SET (tv, delay);
752 select (0, 0, 0, 0, &tv); 870 select (0, 0, 0, 0, &tv);
753#endif 871#endif
754 } 872 }
755} 873}
756 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
757/*****************************************************************************/ 883/*****************************************************************************/
758 884
759#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 */
760 886
761/* find a suitable new size for the given array, */ 887/* find a suitable new size for the given array, */
762/* hopefully by rounding to a ncie-to-malloc size */ 888/* hopefully by rounding to a nice-to-malloc size */
763inline_size int 889inline_size int
764array_nextsize (int elem, int cur, int cnt) 890array_nextsize (int elem, int cur, int cnt)
765{ 891{
766 int ncur = cur + 1; 892 int ncur = cur + 1;
767 893
… …
863} 989}
864 990
865/*****************************************************************************/ 991/*****************************************************************************/
866 992
867inline_speed void 993inline_speed void
868fd_event_nc (EV_P_ int fd, int revents) 994fd_event_nocheck (EV_P_ int fd, int revents)
869{ 995{
870 ANFD *anfd = anfds + fd; 996 ANFD *anfd = anfds + fd;
871 ev_io *w; 997 ev_io *w;
872 998
873 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)
… …
885fd_event (EV_P_ int fd, int revents) 1011fd_event (EV_P_ int fd, int revents)
886{ 1012{
887 ANFD *anfd = anfds + fd; 1013 ANFD *anfd = anfds + fd;
888 1014
889 if (expect_true (!anfd->reify)) 1015 if (expect_true (!anfd->reify))
890 fd_event_nc (EV_A_ fd, revents); 1016 fd_event_nocheck (EV_A_ fd, revents);
891} 1017}
892 1018
893void 1019void
894ev_feed_fd_event (EV_P_ int fd, int revents) 1020ev_feed_fd_event (EV_P_ int fd, int revents)
895{ 1021{
896 if (fd >= 0 && fd < anfdmax) 1022 if (fd >= 0 && fd < anfdmax)
897 fd_event_nc (EV_A_ fd, revents); 1023 fd_event_nocheck (EV_A_ fd, revents);
898} 1024}
899 1025
900/* make sure the external fd watch events are in-sync */ 1026/* make sure the external fd watch events are in-sync */
901/* with the kernel/libev internal state */ 1027/* with the kernel/libev internal state */
902inline_size void 1028inline_size void
903fd_reify (EV_P) 1029fd_reify (EV_P)
904{ 1030{
905 int i; 1031 int i;
906 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)
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
907 for (i = 0; i < fdchangecnt; ++i) 1058 for (i = 0; i < fdchangecnt; ++i)
908 { 1059 {
909 int fd = fdchanges [i]; 1060 int fd = fdchanges [i];
910 ANFD *anfd = anfds + fd; 1061 ANFD *anfd = anfds + fd;
911 ev_io *w; 1062 ev_io *w;
912 1063
913 unsigned char events = 0; 1064 unsigned char o_events = anfd->events;
1065 unsigned char o_reify = anfd->reify;
914 1066
915 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1067 anfd->reify = 0;
916 events |= (unsigned char)w->events;
917 1068
918#if EV_SELECT_IS_WINSOCKET 1069 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
919 if (events)
920 { 1070 {
921 unsigned long arg; 1071 anfd->events = 0;
922 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 1072
923 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 1073 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1074 anfd->events |= (unsigned char)w->events;
1075
1076 if (o_events != anfd->events)
1077 o_reify = EV__IOFDSET; /* actually |= */
924 } 1078 }
925#endif
926 1079
927 { 1080 if (o_reify & EV__IOFDSET)
928 unsigned char o_events = anfd->events;
929 unsigned char o_reify = anfd->reify;
930
931 anfd->reify = 0;
932 anfd->events = events;
933
934 if (o_events != events || o_reify & EV__IOFDSET)
935 backend_modify (EV_A_ fd, o_events, events); 1081 backend_modify (EV_A_ fd, o_events, anfd->events);
936 }
937 } 1082 }
938 1083
939 fdchangecnt = 0; 1084 fdchangecnt = 0;
940} 1085}
941 1086
… …
965 ev_io_stop (EV_A_ w); 1110 ev_io_stop (EV_A_ w);
966 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);
967 } 1112 }
968} 1113}
969 1114
970/* check whether the given fd is atcually valid, for error recovery */ 1115/* check whether the given fd is actually valid, for error recovery */
971inline_size int 1116inline_size int
972fd_valid (int fd) 1117fd_valid (int fd)
973{ 1118{
974#ifdef _WIN32 1119#ifdef _WIN32
975 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1120 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
… …
1017 anfds [fd].emask = 0; 1162 anfds [fd].emask = 0;
1018 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1163 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1019 } 1164 }
1020} 1165}
1021 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
1022/*****************************************************************************/ 1181/*****************************************************************************/
1023 1182
1024/* 1183/*
1025 * 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
1026 * 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
1027 * the branching factor of the d-tree. 1186 * the branching factor of the d-tree.
1028 */ 1187 */
1029 1188
1030/* 1189/*
… …
1178 1337
1179static ANSIG signals [EV_NSIG - 1]; 1338static ANSIG signals [EV_NSIG - 1];
1180 1339
1181/*****************************************************************************/ 1340/*****************************************************************************/
1182 1341
1183/* used to prepare libev internal fd's */ 1342#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1184/* this is not fork-safe */
1185inline_speed void
1186fd_intern (int fd)
1187{
1188#ifdef _WIN32
1189 unsigned long arg = 1;
1190 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1191#else
1192 fcntl (fd, F_SETFD, FD_CLOEXEC);
1193 fcntl (fd, F_SETFL, O_NONBLOCK);
1194#endif
1195}
1196 1343
1197static void noinline 1344static void noinline
1198evpipe_init (EV_P) 1345evpipe_init (EV_P)
1199{ 1346{
1200 if (!ev_is_active (&pipe_w)) 1347 if (!ev_is_active (&pipe_w))
1201 { 1348 {
1202#if EV_USE_EVENTFD 1349# if EV_USE_EVENTFD
1203 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1350 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1204 if (evfd < 0 && errno == EINVAL) 1351 if (evfd < 0 && errno == EINVAL)
1205 evfd = eventfd (0, 0); 1352 evfd = eventfd (0, 0);
1206 1353
1207 if (evfd >= 0) 1354 if (evfd >= 0)
… …
1209 evpipe [0] = -1; 1356 evpipe [0] = -1;
1210 fd_intern (evfd); /* doing it twice doesn't hurt */ 1357 fd_intern (evfd); /* doing it twice doesn't hurt */
1211 ev_io_set (&pipe_w, evfd, EV_READ); 1358 ev_io_set (&pipe_w, evfd, EV_READ);
1212 } 1359 }
1213 else 1360 else
1214#endif 1361# endif
1215 { 1362 {
1216 while (pipe (evpipe)) 1363 while (pipe (evpipe))
1217 ev_syserr ("(libev) error creating signal/async pipe"); 1364 ev_syserr ("(libev) error creating signal/async pipe");
1218 1365
1219 fd_intern (evpipe [0]); 1366 fd_intern (evpipe [0]);
… …
1230evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1377evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1231{ 1378{
1232 if (!*flag) 1379 if (!*flag)
1233 { 1380 {
1234 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;
1235 1383
1236 *flag = 1; 1384 *flag = 1;
1237 1385
1238#if EV_USE_EVENTFD 1386#if EV_USE_EVENTFD
1239 if (evfd >= 0) 1387 if (evfd >= 0)
… …
1241 uint64_t counter = 1; 1389 uint64_t counter = 1;
1242 write (evfd, &counter, sizeof (uint64_t)); 1390 write (evfd, &counter, sizeof (uint64_t));
1243 } 1391 }
1244 else 1392 else
1245#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. */
1246 write (evpipe [1], &old_errno, 1); 1399 write (evpipe [1], &dummy, 1);
1247 1400
1248 errno = old_errno; 1401 errno = old_errno;
1249 } 1402 }
1250} 1403}
1251 1404
… …
1264 } 1417 }
1265 else 1418 else
1266#endif 1419#endif
1267 { 1420 {
1268 char dummy; 1421 char dummy;
1422 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1269 read (evpipe [0], &dummy, 1); 1423 read (evpipe [0], &dummy, 1);
1270 } 1424 }
1271 1425
1426#if EV_SIGNAL_ENABLE
1272 if (sig_pending) 1427 if (sig_pending)
1273 { 1428 {
1274 sig_pending = 0; 1429 sig_pending = 0;
1275 1430
1276 for (i = EV_NSIG - 1; i--; ) 1431 for (i = EV_NSIG - 1; i--; )
1277 if (expect_false (signals [i].pending)) 1432 if (expect_false (signals [i].pending))
1278 ev_feed_signal_event (EV_A_ i + 1); 1433 ev_feed_signal_event (EV_A_ i + 1);
1279 } 1434 }
1435#endif
1280 1436
1281#if EV_ASYNC_ENABLE 1437#if EV_ASYNC_ENABLE
1282 if (async_pending) 1438 if (async_pending)
1283 { 1439 {
1284 async_pending = 0; 1440 async_pending = 0;
… …
1293#endif 1449#endif
1294} 1450}
1295 1451
1296/*****************************************************************************/ 1452/*****************************************************************************/
1297 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
1298static void 1468static void
1299ev_sighandler (int signum) 1469ev_sighandler (int signum)
1300{ 1470{
1301#if EV_MULTIPLICITY
1302 EV_P = signals [signum - 1].loop;
1303#endif
1304
1305#ifdef _WIN32 1471#ifdef _WIN32
1306 signal (signum, ev_sighandler); 1472 signal (signum, ev_sighandler);
1307#endif 1473#endif
1308 1474
1309 signals [signum - 1].pending = 1; 1475 ev_feed_signal (signum);
1310 evpipe_write (EV_A_ &sig_pending);
1311} 1476}
1312 1477
1313void noinline 1478void noinline
1314ev_feed_signal_event (EV_P_ int signum) 1479ev_feed_signal_event (EV_P_ int signum)
1315{ 1480{
… …
1352 break; 1517 break;
1353 } 1518 }
1354} 1519}
1355#endif 1520#endif
1356 1521
1522#endif
1523
1357/*****************************************************************************/ 1524/*****************************************************************************/
1358 1525
1526#if EV_CHILD_ENABLE
1359static WL childs [EV_PID_HASHSIZE]; 1527static WL childs [EV_PID_HASHSIZE];
1360
1361#ifndef _WIN32
1362 1528
1363static ev_signal childev; 1529static ev_signal childev;
1364 1530
1365#ifndef WIFCONTINUED 1531#ifndef WIFCONTINUED
1366# define WIFCONTINUED(status) 0 1532# define WIFCONTINUED(status) 0
… …
1371child_reap (EV_P_ int chain, int pid, int status) 1537child_reap (EV_P_ int chain, int pid, int status)
1372{ 1538{
1373 ev_child *w; 1539 ev_child *w;
1374 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1540 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1375 1541
1376 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)
1377 { 1543 {
1378 if ((w->pid == pid || !w->pid) 1544 if ((w->pid == pid || !w->pid)
1379 && (!traced || (w->flags & 1))) 1545 && (!traced || (w->flags & 1)))
1380 { 1546 {
1381 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 */
… …
1406 /* 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 */
1407 /* 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 */
1408 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1574 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1409 1575
1410 child_reap (EV_A_ pid, pid, status); 1576 child_reap (EV_A_ pid, pid, status);
1411 if (EV_PID_HASHSIZE > 1) 1577 if ((EV_PID_HASHSIZE) > 1)
1412 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 */
1413} 1579}
1414 1580
1415#endif 1581#endif
1416 1582
1417/*****************************************************************************/ 1583/*****************************************************************************/
1418 1584
1585#if EV_USE_IOCP
1586# include "ev_iocp.c"
1587#endif
1419#if EV_USE_PORT 1588#if EV_USE_PORT
1420# include "ev_port.c" 1589# include "ev_port.c"
1421#endif 1590#endif
1422#if EV_USE_KQUEUE 1591#if EV_USE_KQUEUE
1423# include "ev_kqueue.c" 1592# include "ev_kqueue.c"
… …
1483#ifdef __APPLE__ 1652#ifdef __APPLE__
1484 /* only select works correctly on that "unix-certified" platform */ 1653 /* only select works correctly on that "unix-certified" platform */
1485 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1654 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1486 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 */
1487#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
1488 1660
1489 return flags; 1661 return flags;
1490} 1662}
1491 1663
1492unsigned int 1664unsigned int
1493ev_embeddable_backends (void) 1665ev_embeddable_backends (void)
1494{ 1666{
1495 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1667 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1496 1668
1497 /* 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 */
1498 /* please fix it and tell me how to detect the fix */ 1670 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1499 flags &= ~EVBACKEND_EPOLL; 1671 flags &= ~EVBACKEND_EPOLL;
1500 1672
1501 return flags; 1673 return flags;
1502} 1674}
1503 1675
1504unsigned int 1676unsigned int
1505ev_backend (EV_P) 1677ev_backend (EV_P)
1506{ 1678{
1507 return backend; 1679 return backend;
1508} 1680}
1509 1681
1510#if EV_MINIMAL < 2 1682#if EV_FEATURE_API
1511unsigned int 1683unsigned int
1512ev_loop_count (EV_P) 1684ev_iteration (EV_P)
1513{ 1685{
1514 return loop_count; 1686 return loop_count;
1515} 1687}
1516 1688
1517unsigned int 1689unsigned int
1518ev_loop_depth (EV_P) 1690ev_depth (EV_P)
1519{ 1691{
1520 return loop_depth; 1692 return loop_depth;
1521} 1693}
1522 1694
1523void 1695void
… …
1560static void noinline 1732static void noinline
1561loop_init (EV_P_ unsigned int flags) 1733loop_init (EV_P_ unsigned int flags)
1562{ 1734{
1563 if (!backend) 1735 if (!backend)
1564 { 1736 {
1737 origflags = flags;
1738
1565#if EV_USE_REALTIME 1739#if EV_USE_REALTIME
1566 if (!have_realtime) 1740 if (!have_realtime)
1567 { 1741 {
1568 struct timespec ts; 1742 struct timespec ts;
1569 1743
… …
1595 1769
1596 ev_rt_now = ev_time (); 1770 ev_rt_now = ev_time ();
1597 mn_now = get_clock (); 1771 mn_now = get_clock ();
1598 now_floor = mn_now; 1772 now_floor = mn_now;
1599 rtmn_diff = ev_rt_now - mn_now; 1773 rtmn_diff = ev_rt_now - mn_now;
1600#if EV_MINIMAL < 2 1774#if EV_FEATURE_API
1601 invoke_cb = ev_invoke_pending; 1775 invoke_cb = ev_invoke_pending;
1602#endif 1776#endif
1603 1777
1604 io_blocktime = 0.; 1778 io_blocktime = 0.;
1605 timeout_blocktime = 0.; 1779 timeout_blocktime = 0.;
… …
1614#endif 1788#endif
1615#if EV_USE_SIGNALFD 1789#if EV_USE_SIGNALFD
1616 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1790 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1617#endif 1791#endif
1618 1792
1619 if (!(flags & 0x0000ffffU)) 1793 if (!(flags & EVBACKEND_MASK))
1620 flags |= ev_recommended_backends (); 1794 flags |= ev_recommended_backends ();
1621 1795
1796#if EV_USE_IOCP
1797 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1798#endif
1622#if EV_USE_PORT 1799#if EV_USE_PORT
1623 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1800 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1624#endif 1801#endif
1625#if EV_USE_KQUEUE 1802#if EV_USE_KQUEUE
1626 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1803 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1635 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1812 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1636#endif 1813#endif
1637 1814
1638 ev_prepare_init (&pending_w, pendingcb); 1815 ev_prepare_init (&pending_w, pendingcb);
1639 1816
1817#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1640 ev_init (&pipe_w, pipecb); 1818 ev_init (&pipe_w, pipecb);
1641 ev_set_priority (&pipe_w, EV_MAXPRI); 1819 ev_set_priority (&pipe_w, EV_MAXPRI);
1820#endif
1642 } 1821 }
1643} 1822}
1644 1823
1645/* free up a loop structure */ 1824/* free up a loop structure */
1646static void noinline 1825void
1647loop_destroy (EV_P) 1826ev_loop_destroy (EV_P)
1648{ 1827{
1649 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
1650 1852
1651 if (ev_is_active (&pipe_w)) 1853 if (ev_is_active (&pipe_w))
1652 { 1854 {
1653 /*ev_ref (EV_A);*/ 1855 /*ev_ref (EV_A);*/
1654 /*ev_io_stop (EV_A_ &pipe_w);*/ 1856 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1676#endif 1878#endif
1677 1879
1678 if (backend_fd >= 0) 1880 if (backend_fd >= 0)
1679 close (backend_fd); 1881 close (backend_fd);
1680 1882
1883#if EV_USE_IOCP
1884 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1885#endif
1681#if EV_USE_PORT 1886#if EV_USE_PORT
1682 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1887 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1683#endif 1888#endif
1684#if EV_USE_KQUEUE 1889#if EV_USE_KQUEUE
1685 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1890 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1712 array_free (periodic, EMPTY); 1917 array_free (periodic, EMPTY);
1713#endif 1918#endif
1714#if EV_FORK_ENABLE 1919#if EV_FORK_ENABLE
1715 array_free (fork, EMPTY); 1920 array_free (fork, EMPTY);
1716#endif 1921#endif
1922#if EV_CLEANUP_ENABLE
1923 array_free (cleanup, EMPTY);
1924#endif
1717 array_free (prepare, EMPTY); 1925 array_free (prepare, EMPTY);
1718 array_free (check, EMPTY); 1926 array_free (check, EMPTY);
1719#if EV_ASYNC_ENABLE 1927#if EV_ASYNC_ENABLE
1720 array_free (async, EMPTY); 1928 array_free (async, EMPTY);
1721#endif 1929#endif
1722 1930
1723 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
1724} 1941}
1725 1942
1726#if EV_USE_INOTIFY 1943#if EV_USE_INOTIFY
1727inline_size void infy_fork (EV_P); 1944inline_size void infy_fork (EV_P);
1728#endif 1945#endif
… …
1764 { 1981 {
1765 EV_WIN32_CLOSE_FD (evpipe [0]); 1982 EV_WIN32_CLOSE_FD (evpipe [0]);
1766 EV_WIN32_CLOSE_FD (evpipe [1]); 1983 EV_WIN32_CLOSE_FD (evpipe [1]);
1767 } 1984 }
1768 1985
1986#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1769 evpipe_init (EV_A); 1987 evpipe_init (EV_A);
1770 /* now iterate over everything, in case we missed something */ 1988 /* now iterate over everything, in case we missed something */
1771 pipecb (EV_A_ &pipe_w, EV_READ); 1989 pipecb (EV_A_ &pipe_w, EV_READ);
1990#endif
1772 } 1991 }
1773 1992
1774 postfork = 0; 1993 postfork = 0;
1775} 1994}
1776 1995
… …
1785 loop_init (EV_A_ flags); 2004 loop_init (EV_A_ flags);
1786 2005
1787 if (ev_backend (EV_A)) 2006 if (ev_backend (EV_A))
1788 return EV_A; 2007 return EV_A;
1789 2008
2009 ev_free (EV_A);
1790 return 0; 2010 return 0;
1791} 2011}
1792 2012
1793void
1794ev_loop_destroy (EV_P)
1795{
1796 loop_destroy (EV_A);
1797 ev_free (loop);
1798}
1799
1800void
1801ev_loop_fork (EV_P)
1802{
1803 postfork = 1; /* must be in line with ev_default_fork */
1804}
1805#endif /* multiplicity */ 2013#endif /* multiplicity */
1806 2014
1807#if EV_VERIFY 2015#if EV_VERIFY
1808static void noinline 2016static void noinline
1809verify_watcher (EV_P_ W w) 2017verify_watcher (EV_P_ W w)
… …
1838 verify_watcher (EV_A_ ws [cnt]); 2046 verify_watcher (EV_A_ ws [cnt]);
1839 } 2047 }
1840} 2048}
1841#endif 2049#endif
1842 2050
1843#if EV_MINIMAL < 2 2051#if EV_FEATURE_API
1844void 2052void
1845ev_loop_verify (EV_P) 2053ev_verify (EV_P)
1846{ 2054{
1847#if EV_VERIFY 2055#if EV_VERIFY
1848 int i; 2056 int i;
1849 WL w; 2057 WL w;
1850 2058
… …
1884#if EV_FORK_ENABLE 2092#if EV_FORK_ENABLE
1885 assert (forkmax >= forkcnt); 2093 assert (forkmax >= forkcnt);
1886 array_verify (EV_A_ (W *)forks, forkcnt); 2094 array_verify (EV_A_ (W *)forks, forkcnt);
1887#endif 2095#endif
1888 2096
2097#if EV_CLEANUP_ENABLE
2098 assert (cleanupmax >= cleanupcnt);
2099 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2100#endif
2101
1889#if EV_ASYNC_ENABLE 2102#if EV_ASYNC_ENABLE
1890 assert (asyncmax >= asynccnt); 2103 assert (asyncmax >= asynccnt);
1891 array_verify (EV_A_ (W *)asyncs, asynccnt); 2104 array_verify (EV_A_ (W *)asyncs, asynccnt);
1892#endif 2105#endif
1893 2106
2107#if EV_PREPARE_ENABLE
1894 assert (preparemax >= preparecnt); 2108 assert (preparemax >= preparecnt);
1895 array_verify (EV_A_ (W *)prepares, preparecnt); 2109 array_verify (EV_A_ (W *)prepares, preparecnt);
2110#endif
1896 2111
2112#if EV_CHECK_ENABLE
1897 assert (checkmax >= checkcnt); 2113 assert (checkmax >= checkcnt);
1898 array_verify (EV_A_ (W *)checks, checkcnt); 2114 array_verify (EV_A_ (W *)checks, checkcnt);
2115#endif
1899 2116
1900# if 0 2117# if 0
2118#if EV_CHILD_ENABLE
1901 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)
1902 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 2120 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2121#endif
1903# endif 2122# endif
1904#endif 2123#endif
1905} 2124}
1906#endif 2125#endif
1907 2126
1908#if EV_MULTIPLICITY 2127#if EV_MULTIPLICITY
1909struct ev_loop * 2128struct ev_loop *
1910ev_default_loop_init (unsigned int flags)
1911#else 2129#else
1912int 2130int
2131#endif
1913ev_default_loop (unsigned int flags) 2132ev_default_loop (unsigned int flags)
1914#endif
1915{ 2133{
1916 if (!ev_default_loop_ptr) 2134 if (!ev_default_loop_ptr)
1917 { 2135 {
1918#if EV_MULTIPLICITY 2136#if EV_MULTIPLICITY
1919 EV_P = ev_default_loop_ptr = &default_loop_struct; 2137 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1923 2141
1924 loop_init (EV_A_ flags); 2142 loop_init (EV_A_ flags);
1925 2143
1926 if (ev_backend (EV_A)) 2144 if (ev_backend (EV_A))
1927 { 2145 {
1928#ifndef _WIN32 2146#if EV_CHILD_ENABLE
1929 ev_signal_init (&childev, childcb, SIGCHLD); 2147 ev_signal_init (&childev, childcb, SIGCHLD);
1930 ev_set_priority (&childev, EV_MAXPRI); 2148 ev_set_priority (&childev, EV_MAXPRI);
1931 ev_signal_start (EV_A_ &childev); 2149 ev_signal_start (EV_A_ &childev);
1932 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2150 ev_unref (EV_A); /* child watcher should not keep loop alive */
1933#endif 2151#endif
… …
1938 2156
1939 return ev_default_loop_ptr; 2157 return ev_default_loop_ptr;
1940} 2158}
1941 2159
1942void 2160void
1943ev_default_destroy (void) 2161ev_loop_fork (EV_P)
1944{ 2162{
1945#if EV_MULTIPLICITY
1946 EV_P = ev_default_loop_ptr;
1947#endif
1948
1949 ev_default_loop_ptr = 0;
1950
1951#ifndef _WIN32
1952 ev_ref (EV_A); /* child watcher */
1953 ev_signal_stop (EV_A_ &childev);
1954#endif
1955
1956 loop_destroy (EV_A);
1957}
1958
1959void
1960ev_default_fork (void)
1961{
1962#if EV_MULTIPLICITY
1963 EV_P = ev_default_loop_ptr;
1964#endif
1965
1966 postfork = 1; /* must be in line with ev_loop_fork */ 2163 postfork = 1; /* must be in line with ev_default_fork */
1967} 2164}
1968 2165
1969/*****************************************************************************/ 2166/*****************************************************************************/
1970 2167
1971void 2168void
… …
1993 2190
1994 for (pri = NUMPRI; pri--; ) 2191 for (pri = NUMPRI; pri--; )
1995 while (pendingcnt [pri]) 2192 while (pendingcnt [pri])
1996 { 2193 {
1997 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2194 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1998
1999 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2000 /* ^ this is no longer true, as pending_w could be here */
2001 2195
2002 p->w->pending = 0; 2196 p->w->pending = 0;
2003 EV_CB_INVOKE (p->w, p->events); 2197 EV_CB_INVOKE (p->w, p->events);
2004 EV_FREQUENT_CHECK; 2198 EV_FREQUENT_CHECK;
2005 } 2199 }
… …
2062 EV_FREQUENT_CHECK; 2256 EV_FREQUENT_CHECK;
2063 feed_reverse (EV_A_ (W)w); 2257 feed_reverse (EV_A_ (W)w);
2064 } 2258 }
2065 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2259 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2066 2260
2067 feed_reverse_done (EV_A_ EV_TIMEOUT); 2261 feed_reverse_done (EV_A_ EV_TIMER);
2068 } 2262 }
2069} 2263}
2070 2264
2071#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
2072/* make periodics pending */ 2291/* make periodics pending */
2073inline_size void 2292inline_size void
2074periodics_reify (EV_P) 2293periodics_reify (EV_P)
2075{ 2294{
2076 EV_FREQUENT_CHECK; 2295 EV_FREQUENT_CHECK;
… …
2095 ANHE_at_cache (periodics [HEAP0]); 2314 ANHE_at_cache (periodics [HEAP0]);
2096 downheap (periodics, periodiccnt, HEAP0); 2315 downheap (periodics, periodiccnt, HEAP0);
2097 } 2316 }
2098 else if (w->interval) 2317 else if (w->interval)
2099 { 2318 {
2100 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2319 periodic_recalc (EV_A_ w);
2101 /* if next trigger time is not sufficiently in the future, put it there */
2102 /* this might happen because of floating point inexactness */
2103 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2104 {
2105 ev_at (w) += w->interval;
2106
2107 /* if interval is unreasonably low we might still have a time in the past */
2108 /* so correct this. this will make the periodic very inexact, but the user */
2109 /* has effectively asked to get triggered more often than possible */
2110 if (ev_at (w) < ev_rt_now)
2111 ev_at (w) = ev_rt_now;
2112 }
2113
2114 ANHE_at_cache (periodics [HEAP0]); 2320 ANHE_at_cache (periodics [HEAP0]);
2115 downheap (periodics, periodiccnt, HEAP0); 2321 downheap (periodics, periodiccnt, HEAP0);
2116 } 2322 }
2117 else 2323 else
2118 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2324 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2125 feed_reverse_done (EV_A_ EV_PERIODIC); 2331 feed_reverse_done (EV_A_ EV_PERIODIC);
2126 } 2332 }
2127} 2333}
2128 2334
2129/* simply recalculate all periodics */ 2335/* simply recalculate all periodics */
2130/* 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? */
2131static void noinline 2337static void noinline
2132periodics_reschedule (EV_P) 2338periodics_reschedule (EV_P)
2133{ 2339{
2134 int i; 2340 int i;
2135 2341
… …
2139 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2345 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2140 2346
2141 if (w->reschedule_cb) 2347 if (w->reschedule_cb)
2142 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2348 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2143 else if (w->interval) 2349 else if (w->interval)
2144 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2350 periodic_recalc (EV_A_ w);
2145 2351
2146 ANHE_at_cache (periodics [i]); 2352 ANHE_at_cache (periodics [i]);
2147 } 2353 }
2148 2354
2149 reheap (periodics, periodiccnt); 2355 reheap (periodics, periodiccnt);
… …
2196 * 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
2197 * in the unlikely event of having been preempted here. 2403 * in the unlikely event of having been preempted here.
2198 */ 2404 */
2199 for (i = 4; --i; ) 2405 for (i = 4; --i; )
2200 { 2406 {
2407 ev_tstamp diff;
2201 rtmn_diff = ev_rt_now - mn_now; 2408 rtmn_diff = ev_rt_now - mn_now;
2202 2409
2410 diff = odiff - rtmn_diff;
2411
2203 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2412 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2204 return; /* all is well */ 2413 return; /* all is well */
2205 2414
2206 ev_rt_now = ev_time (); 2415 ev_rt_now = ev_time ();
2207 mn_now = get_clock (); 2416 mn_now = get_clock ();
2208 now_floor = mn_now; 2417 now_floor = mn_now;
… …
2231 mn_now = ev_rt_now; 2440 mn_now = ev_rt_now;
2232 } 2441 }
2233} 2442}
2234 2443
2235void 2444void
2236ev_loop (EV_P_ int flags) 2445ev_run (EV_P_ int flags)
2237{ 2446{
2238#if EV_MINIMAL < 2 2447#if EV_FEATURE_API
2239 ++loop_depth; 2448 ++loop_depth;
2240#endif 2449#endif
2241 2450
2242 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));
2243 2452
2244 loop_done = EVUNLOOP_CANCEL; 2453 loop_done = EVBREAK_CANCEL;
2245 2454
2246 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 */
2247 2456
2248 do 2457 do
2249 { 2458 {
2250#if EV_VERIFY >= 2 2459#if EV_VERIFY >= 2
2251 ev_loop_verify (EV_A); 2460 ev_verify (EV_A);
2252#endif 2461#endif
2253 2462
2254#ifndef _WIN32 2463#ifndef _WIN32
2255 if (expect_false (curpid)) /* penalise the forking check even more */ 2464 if (expect_false (curpid)) /* penalise the forking check even more */
2256 if (expect_false (getpid () != curpid)) 2465 if (expect_false (getpid () != curpid))
… …
2268 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2477 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2269 EV_INVOKE_PENDING; 2478 EV_INVOKE_PENDING;
2270 } 2479 }
2271#endif 2480#endif
2272 2481
2482#if EV_PREPARE_ENABLE
2273 /* queue prepare watchers (and execute them) */ 2483 /* queue prepare watchers (and execute them) */
2274 if (expect_false (preparecnt)) 2484 if (expect_false (preparecnt))
2275 { 2485 {
2276 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2486 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2277 EV_INVOKE_PENDING; 2487 EV_INVOKE_PENDING;
2278 } 2488 }
2489#endif
2279 2490
2280 if (expect_false (loop_done)) 2491 if (expect_false (loop_done))
2281 break; 2492 break;
2282 2493
2283 /* we might have forked, so reify kernel state if necessary */ 2494 /* we might have forked, so reify kernel state if necessary */
… …
2290 /* calculate blocking time */ 2501 /* calculate blocking time */
2291 { 2502 {
2292 ev_tstamp waittime = 0.; 2503 ev_tstamp waittime = 0.;
2293 ev_tstamp sleeptime = 0.; 2504 ev_tstamp sleeptime = 0.;
2294 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
2295 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2512 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2296 { 2513 {
2297 /* remember old timestamp for io_blocktime calculation */
2298 ev_tstamp prev_mn_now = mn_now;
2299
2300 /* update time to cancel out callback processing overhead */
2301 time_update (EV_A_ 1e100);
2302
2303 waittime = MAX_BLOCKTIME; 2514 waittime = MAX_BLOCKTIME;
2304 2515
2305 if (timercnt) 2516 if (timercnt)
2306 { 2517 {
2307 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2518 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2334 waittime -= sleeptime; 2545 waittime -= sleeptime;
2335 } 2546 }
2336 } 2547 }
2337 } 2548 }
2338 2549
2339#if EV_MINIMAL < 2 2550#if EV_FEATURE_API
2340 ++loop_count; 2551 ++loop_count;
2341#endif 2552#endif
2342 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2553 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2343 backend_poll (EV_A_ waittime); 2554 backend_poll (EV_A_ waittime);
2344 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2555 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2345 2556
2346 /* update ev_rt_now, do magic */ 2557 /* update ev_rt_now, do magic */
2347 time_update (EV_A_ waittime + sleeptime); 2558 time_update (EV_A_ waittime + sleeptime);
2348 } 2559 }
2349 2560
… …
2356#if EV_IDLE_ENABLE 2567#if EV_IDLE_ENABLE
2357 /* queue idle watchers unless other events are pending */ 2568 /* queue idle watchers unless other events are pending */
2358 idle_reify (EV_A); 2569 idle_reify (EV_A);
2359#endif 2570#endif
2360 2571
2572#if EV_CHECK_ENABLE
2361 /* queue check watchers, to be executed first */ 2573 /* queue check watchers, to be executed first */
2362 if (expect_false (checkcnt)) 2574 if (expect_false (checkcnt))
2363 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2575 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2576#endif
2364 2577
2365 EV_INVOKE_PENDING; 2578 EV_INVOKE_PENDING;
2366 } 2579 }
2367 while (expect_true ( 2580 while (expect_true (
2368 activecnt 2581 activecnt
2369 && !loop_done 2582 && !loop_done
2370 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2583 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2371 )); 2584 ));
2372 2585
2373 if (loop_done == EVUNLOOP_ONE) 2586 if (loop_done == EVBREAK_ONE)
2374 loop_done = EVUNLOOP_CANCEL; 2587 loop_done = EVBREAK_CANCEL;
2375 2588
2376#if EV_MINIMAL < 2 2589#if EV_FEATURE_API
2377 --loop_depth; 2590 --loop_depth;
2378#endif 2591#endif
2379} 2592}
2380 2593
2381void 2594void
2382ev_unloop (EV_P_ int how) 2595ev_break (EV_P_ int how)
2383{ 2596{
2384 loop_done = how; 2597 loop_done = how;
2385} 2598}
2386 2599
2387void 2600void
… …
2507 2720
2508 if (expect_false (ev_is_active (w))) 2721 if (expect_false (ev_is_active (w)))
2509 return; 2722 return;
2510 2723
2511 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2724 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2512 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))));
2513 2726
2514 EV_FREQUENT_CHECK; 2727 EV_FREQUENT_CHECK;
2515 2728
2516 ev_start (EV_A_ (W)w, 1); 2729 ev_start (EV_A_ (W)w, 1);
2517 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2730 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2535 EV_FREQUENT_CHECK; 2748 EV_FREQUENT_CHECK;
2536 2749
2537 wlist_del (&anfds[w->fd].head, (WL)w); 2750 wlist_del (&anfds[w->fd].head, (WL)w);
2538 ev_stop (EV_A_ (W)w); 2751 ev_stop (EV_A_ (W)w);
2539 2752
2540 fd_change (EV_A_ w->fd, 1); 2753 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2541 2754
2542 EV_FREQUENT_CHECK; 2755 EV_FREQUENT_CHECK;
2543} 2756}
2544 2757
2545void noinline 2758void noinline
… …
2587 timers [active] = timers [timercnt + HEAP0]; 2800 timers [active] = timers [timercnt + HEAP0];
2588 adjustheap (timers, timercnt, active); 2801 adjustheap (timers, timercnt, active);
2589 } 2802 }
2590 } 2803 }
2591 2804
2592 EV_FREQUENT_CHECK;
2593
2594 ev_at (w) -= mn_now; 2805 ev_at (w) -= mn_now;
2595 2806
2596 ev_stop (EV_A_ (W)w); 2807 ev_stop (EV_A_ (W)w);
2808
2809 EV_FREQUENT_CHECK;
2597} 2810}
2598 2811
2599void noinline 2812void noinline
2600ev_timer_again (EV_P_ ev_timer *w) 2813ev_timer_again (EV_P_ ev_timer *w)
2601{ 2814{
… …
2637 if (w->reschedule_cb) 2850 if (w->reschedule_cb)
2638 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2851 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2639 else if (w->interval) 2852 else if (w->interval)
2640 { 2853 {
2641 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.));
2642 /* this formula differs from the one in periodic_reify because we do not always round up */ 2855 periodic_recalc (EV_A_ w);
2643 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2644 } 2856 }
2645 else 2857 else
2646 ev_at (w) = w->offset; 2858 ev_at (w) = w->offset;
2647 2859
2648 EV_FREQUENT_CHECK; 2860 EV_FREQUENT_CHECK;
… …
2680 periodics [active] = periodics [periodiccnt + HEAP0]; 2892 periodics [active] = periodics [periodiccnt + HEAP0];
2681 adjustheap (periodics, periodiccnt, active); 2893 adjustheap (periodics, periodiccnt, active);
2682 } 2894 }
2683 } 2895 }
2684 2896
2685 EV_FREQUENT_CHECK;
2686
2687 ev_stop (EV_A_ (W)w); 2897 ev_stop (EV_A_ (W)w);
2898
2899 EV_FREQUENT_CHECK;
2688} 2900}
2689 2901
2690void noinline 2902void noinline
2691ev_periodic_again (EV_P_ ev_periodic *w) 2903ev_periodic_again (EV_P_ ev_periodic *w)
2692{ 2904{
… …
2697#endif 2909#endif
2698 2910
2699#ifndef SA_RESTART 2911#ifndef SA_RESTART
2700# define SA_RESTART 0 2912# define SA_RESTART 0
2701#endif 2913#endif
2914
2915#if EV_SIGNAL_ENABLE
2702 2916
2703void noinline 2917void noinline
2704ev_signal_start (EV_P_ ev_signal *w) 2918ev_signal_start (EV_P_ ev_signal *w)
2705{ 2919{
2706 if (expect_false (ev_is_active (w))) 2920 if (expect_false (ev_is_active (w)))
… …
2767 sa.sa_handler = ev_sighandler; 2981 sa.sa_handler = ev_sighandler;
2768 sigfillset (&sa.sa_mask); 2982 sigfillset (&sa.sa_mask);
2769 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 */
2770 sigaction (w->signum, &sa, 0); 2984 sigaction (w->signum, &sa, 0);
2771 2985
2986 if (origflags & EVFLAG_NOSIGMASK)
2987 {
2772 sigemptyset (&sa.sa_mask); 2988 sigemptyset (&sa.sa_mask);
2773 sigaddset (&sa.sa_mask, w->signum); 2989 sigaddset (&sa.sa_mask, w->signum);
2774 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2990 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2991 }
2775#endif 2992#endif
2776 } 2993 }
2777 2994
2778 EV_FREQUENT_CHECK; 2995 EV_FREQUENT_CHECK;
2779} 2996}
… …
2813 } 3030 }
2814 3031
2815 EV_FREQUENT_CHECK; 3032 EV_FREQUENT_CHECK;
2816} 3033}
2817 3034
3035#endif
3036
3037#if EV_CHILD_ENABLE
3038
2818void 3039void
2819ev_child_start (EV_P_ ev_child *w) 3040ev_child_start (EV_P_ ev_child *w)
2820{ 3041{
2821#if EV_MULTIPLICITY 3042#if EV_MULTIPLICITY
2822 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 3043 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2825 return; 3046 return;
2826 3047
2827 EV_FREQUENT_CHECK; 3048 EV_FREQUENT_CHECK;
2828 3049
2829 ev_start (EV_A_ (W)w, 1); 3050 ev_start (EV_A_ (W)w, 1);
2830 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3051 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2831 3052
2832 EV_FREQUENT_CHECK; 3053 EV_FREQUENT_CHECK;
2833} 3054}
2834 3055
2835void 3056void
… …
2839 if (expect_false (!ev_is_active (w))) 3060 if (expect_false (!ev_is_active (w)))
2840 return; 3061 return;
2841 3062
2842 EV_FREQUENT_CHECK; 3063 EV_FREQUENT_CHECK;
2843 3064
2844 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 3065 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2845 ev_stop (EV_A_ (W)w); 3066 ev_stop (EV_A_ (W)w);
2846 3067
2847 EV_FREQUENT_CHECK; 3068 EV_FREQUENT_CHECK;
2848} 3069}
3070
3071#endif
2849 3072
2850#if EV_STAT_ENABLE 3073#if EV_STAT_ENABLE
2851 3074
2852# ifdef _WIN32 3075# ifdef _WIN32
2853# undef lstat 3076# undef lstat
… …
2859#define MIN_STAT_INTERVAL 0.1074891 3082#define MIN_STAT_INTERVAL 0.1074891
2860 3083
2861static 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);
2862 3085
2863#if EV_USE_INOTIFY 3086#if EV_USE_INOTIFY
2864# 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)
2865 3090
2866static void noinline 3091static void noinline
2867infy_add (EV_P_ ev_stat *w) 3092infy_add (EV_P_ ev_stat *w)
2868{ 3093{
2869 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);
… …
2912 if (!pend || pend == path) 3137 if (!pend || pend == path)
2913 break; 3138 break;
2914 3139
2915 *pend = 0; 3140 *pend = 0;
2916 w->wd = inotify_add_watch (fs_fd, path, mask); 3141 w->wd = inotify_add_watch (fs_fd, path, mask);
2917 } 3142 }
2918 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3143 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2919 } 3144 }
2920 } 3145 }
2921 3146
2922 if (w->wd >= 0) 3147 if (w->wd >= 0)
2923 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);
2924 3149
2925 /* now re-arm timer, if required */ 3150 /* now re-arm timer, if required */
2926 if (ev_is_active (&w->timer)) ev_ref (EV_A); 3151 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2927 ev_timer_again (EV_A_ &w->timer); 3152 ev_timer_again (EV_A_ &w->timer);
2928 if (ev_is_active (&w->timer)) ev_unref (EV_A); 3153 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2936 3161
2937 if (wd < 0) 3162 if (wd < 0)
2938 return; 3163 return;
2939 3164
2940 w->wd = -2; 3165 w->wd = -2;
2941 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3166 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2942 wlist_del (&fs_hash [slot].head, (WL)w); 3167 wlist_del (&fs_hash [slot].head, (WL)w);
2943 3168
2944 /* remove this watcher, if others are watching it, they will rearm */ 3169 /* remove this watcher, if others are watching it, they will rearm */
2945 inotify_rm_watch (fs_fd, wd); 3170 inotify_rm_watch (fs_fd, wd);
2946} 3171}
… …
2948static void noinline 3173static void noinline
2949infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3174infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2950{ 3175{
2951 if (slot < 0) 3176 if (slot < 0)
2952 /* overflow, need to check for all hash slots */ 3177 /* overflow, need to check for all hash slots */
2953 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3178 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2954 infy_wd (EV_A_ slot, wd, ev); 3179 infy_wd (EV_A_ slot, wd, ev);
2955 else 3180 else
2956 { 3181 {
2957 WL w_; 3182 WL w_;
2958 3183
2959 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3184 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2960 { 3185 {
2961 ev_stat *w = (ev_stat *)w_; 3186 ev_stat *w = (ev_stat *)w_;
2962 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 */
2963 3188
2964 if (w->wd == wd || wd == -1) 3189 if (w->wd == wd || wd == -1)
2965 { 3190 {
2966 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3191 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2967 { 3192 {
2968 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);
2969 w->wd = -1; 3194 w->wd = -1;
2970 infy_add (EV_A_ w); /* re-add, no matter what */ 3195 infy_add (EV_A_ w); /* re-add, no matter what */
2971 } 3196 }
2972 3197
2973 stat_timer_cb (EV_A_ &w->timer, 0); 3198 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2978 3203
2979static void 3204static void
2980infy_cb (EV_P_ ev_io *w, int revents) 3205infy_cb (EV_P_ ev_io *w, int revents)
2981{ 3206{
2982 char buf [EV_INOTIFY_BUFSIZE]; 3207 char buf [EV_INOTIFY_BUFSIZE];
2983 struct inotify_event *ev = (struct inotify_event *)buf;
2984 int ofs; 3208 int ofs;
2985 int len = read (fs_fd, buf, sizeof (buf)); 3209 int len = read (fs_fd, buf, sizeof (buf));
2986 3210
2987 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);
2988 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 }
2989} 3217}
2990 3218
2991inline_size void 3219inline_size void
2992check_2625 (EV_P) 3220ev_check_2625 (EV_P)
2993{ 3221{
2994 /* kernels < 2.6.25 are borked 3222 /* kernels < 2.6.25 are borked
2995 * 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
2996 */ 3224 */
2997 struct utsname buf; 3225 if (ev_linux_version () < 0x020619)
2998 int major, minor, micro;
2999
3000 if (uname (&buf))
3001 return;
3002
3003 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
3004 return;
3005
3006 if (major < 2
3007 || (major == 2 && minor < 6)
3008 || (major == 2 && minor == 6 && micro < 25))
3009 return; 3226 return;
3010 3227
3011 fs_2625 = 1; 3228 fs_2625 = 1;
3012} 3229}
3013 3230
… …
3028 if (fs_fd != -2) 3245 if (fs_fd != -2)
3029 return; 3246 return;
3030 3247
3031 fs_fd = -1; 3248 fs_fd = -1;
3032 3249
3033 check_2625 (EV_A); 3250 ev_check_2625 (EV_A);
3034 3251
3035 fs_fd = infy_newfd (); 3252 fs_fd = infy_newfd ();
3036 3253
3037 if (fs_fd >= 0) 3254 if (fs_fd >= 0)
3038 { 3255 {
… …
3063 ev_io_set (&fs_w, fs_fd, EV_READ); 3280 ev_io_set (&fs_w, fs_fd, EV_READ);
3064 ev_io_start (EV_A_ &fs_w); 3281 ev_io_start (EV_A_ &fs_w);
3065 ev_unref (EV_A); 3282 ev_unref (EV_A);
3066 } 3283 }
3067 3284
3068 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3285 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3069 { 3286 {
3070 WL w_ = fs_hash [slot].head; 3287 WL w_ = fs_hash [slot].head;
3071 fs_hash [slot].head = 0; 3288 fs_hash [slot].head = 0;
3072 3289
3073 while (w_) 3290 while (w_)
… …
3248 3465
3249 EV_FREQUENT_CHECK; 3466 EV_FREQUENT_CHECK;
3250} 3467}
3251#endif 3468#endif
3252 3469
3470#if EV_PREPARE_ENABLE
3253void 3471void
3254ev_prepare_start (EV_P_ ev_prepare *w) 3472ev_prepare_start (EV_P_ ev_prepare *w)
3255{ 3473{
3256 if (expect_false (ev_is_active (w))) 3474 if (expect_false (ev_is_active (w)))
3257 return; 3475 return;
… …
3283 3501
3284 ev_stop (EV_A_ (W)w); 3502 ev_stop (EV_A_ (W)w);
3285 3503
3286 EV_FREQUENT_CHECK; 3504 EV_FREQUENT_CHECK;
3287} 3505}
3506#endif
3288 3507
3508#if EV_CHECK_ENABLE
3289void 3509void
3290ev_check_start (EV_P_ ev_check *w) 3510ev_check_start (EV_P_ ev_check *w)
3291{ 3511{
3292 if (expect_false (ev_is_active (w))) 3512 if (expect_false (ev_is_active (w)))
3293 return; 3513 return;
… …
3319 3539
3320 ev_stop (EV_A_ (W)w); 3540 ev_stop (EV_A_ (W)w);
3321 3541
3322 EV_FREQUENT_CHECK; 3542 EV_FREQUENT_CHECK;
3323} 3543}
3544#endif
3324 3545
3325#if EV_EMBED_ENABLE 3546#if EV_EMBED_ENABLE
3326void noinline 3547void noinline
3327ev_embed_sweep (EV_P_ ev_embed *w) 3548ev_embed_sweep (EV_P_ ev_embed *w)
3328{ 3549{
3329 ev_loop (w->other, EVLOOP_NONBLOCK); 3550 ev_run (w->other, EVRUN_NOWAIT);
3330} 3551}
3331 3552
3332static void 3553static void
3333embed_io_cb (EV_P_ ev_io *io, int revents) 3554embed_io_cb (EV_P_ ev_io *io, int revents)
3334{ 3555{
3335 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3556 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3336 3557
3337 if (ev_cb (w)) 3558 if (ev_cb (w))
3338 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3559 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3339 else 3560 else
3340 ev_loop (w->other, EVLOOP_NONBLOCK); 3561 ev_run (w->other, EVRUN_NOWAIT);
3341} 3562}
3342 3563
3343static void 3564static void
3344embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3565embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3345{ 3566{
… …
3349 EV_P = w->other; 3570 EV_P = w->other;
3350 3571
3351 while (fdchangecnt) 3572 while (fdchangecnt)
3352 { 3573 {
3353 fd_reify (EV_A); 3574 fd_reify (EV_A);
3354 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3575 ev_run (EV_A_ EVRUN_NOWAIT);
3355 } 3576 }
3356 } 3577 }
3357} 3578}
3358 3579
3359static void 3580static void
… …
3365 3586
3366 { 3587 {
3367 EV_P = w->other; 3588 EV_P = w->other;
3368 3589
3369 ev_loop_fork (EV_A); 3590 ev_loop_fork (EV_A);
3370 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3591 ev_run (EV_A_ EVRUN_NOWAIT);
3371 } 3592 }
3372 3593
3373 ev_embed_start (EV_A_ w); 3594 ev_embed_start (EV_A_ w);
3374} 3595}
3375 3596
… …
3423 3644
3424 ev_io_stop (EV_A_ &w->io); 3645 ev_io_stop (EV_A_ &w->io);
3425 ev_prepare_stop (EV_A_ &w->prepare); 3646 ev_prepare_stop (EV_A_ &w->prepare);
3426 ev_fork_stop (EV_A_ &w->fork); 3647 ev_fork_stop (EV_A_ &w->fork);
3427 3648
3649 ev_stop (EV_A_ (W)w);
3650
3428 EV_FREQUENT_CHECK; 3651 EV_FREQUENT_CHECK;
3429} 3652}
3430#endif 3653#endif
3431 3654
3432#if EV_FORK_ENABLE 3655#if EV_FORK_ENABLE
… …
3465 3688
3466 EV_FREQUENT_CHECK; 3689 EV_FREQUENT_CHECK;
3467} 3690}
3468#endif 3691#endif
3469 3692
3470#if EV_ASYNC_ENABLE 3693#if EV_CLEANUP_ENABLE
3471void 3694void
3472ev_async_start (EV_P_ ev_async *w) 3695ev_cleanup_start (EV_P_ ev_cleanup *w)
3473{ 3696{
3474 if (expect_false (ev_is_active (w))) 3697 if (expect_false (ev_is_active (w)))
3475 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;
3476 3742
3477 evpipe_init (EV_A); 3743 evpipe_init (EV_A);
3478 3744
3479 EV_FREQUENT_CHECK; 3745 EV_FREQUENT_CHECK;
3480 3746
… …
3558{ 3824{
3559 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));
3560 3826
3561 if (expect_false (!once)) 3827 if (expect_false (!once))
3562 { 3828 {
3563 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3829 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3564 return; 3830 return;
3565 } 3831 }
3566 3832
3567 once->cb = cb; 3833 once->cb = cb;
3568 once->arg = arg; 3834 once->arg = arg;
… …
3655 if (types & EV_ASYNC) 3921 if (types & EV_ASYNC)
3656 for (i = asynccnt; i--; ) 3922 for (i = asynccnt; i--; )
3657 cb (EV_A_ EV_ASYNC, asyncs [i]); 3923 cb (EV_A_ EV_ASYNC, asyncs [i]);
3658#endif 3924#endif
3659 3925
3926#if EV_PREPARE_ENABLE
3660 if (types & EV_PREPARE) 3927 if (types & EV_PREPARE)
3661 for (i = preparecnt; i--; ) 3928 for (i = preparecnt; i--; )
3662#if EV_EMBED_ENABLE 3929# if EV_EMBED_ENABLE
3663 if (ev_cb (prepares [i]) != embed_prepare_cb) 3930 if (ev_cb (prepares [i]) != embed_prepare_cb)
3664#endif 3931# endif
3665 cb (EV_A_ EV_PREPARE, prepares [i]); 3932 cb (EV_A_ EV_PREPARE, prepares [i]);
3933#endif
3666 3934
3935#if EV_CHECK_ENABLE
3667 if (types & EV_CHECK) 3936 if (types & EV_CHECK)
3668 for (i = checkcnt; i--; ) 3937 for (i = checkcnt; i--; )
3669 cb (EV_A_ EV_CHECK, checks [i]); 3938 cb (EV_A_ EV_CHECK, checks [i]);
3939#endif
3670 3940
3941#if EV_SIGNAL_ENABLE
3671 if (types & EV_SIGNAL) 3942 if (types & EV_SIGNAL)
3672 for (i = 0; i < EV_NSIG - 1; ++i) 3943 for (i = 0; i < EV_NSIG - 1; ++i)
3673 for (wl = signals [i].head; wl; ) 3944 for (wl = signals [i].head; wl; )
3674 { 3945 {
3675 wn = wl->next; 3946 wn = wl->next;
3676 cb (EV_A_ EV_SIGNAL, wl); 3947 cb (EV_A_ EV_SIGNAL, wl);
3677 wl = wn; 3948 wl = wn;
3678 } 3949 }
3950#endif
3679 3951
3952#if EV_CHILD_ENABLE
3680 if (types & EV_CHILD) 3953 if (types & EV_CHILD)
3681 for (i = EV_PID_HASHSIZE; i--; ) 3954 for (i = (EV_PID_HASHSIZE); i--; )
3682 for (wl = childs [i]; wl; ) 3955 for (wl = childs [i]; wl; )
3683 { 3956 {
3684 wn = wl->next; 3957 wn = wl->next;
3685 cb (EV_A_ EV_CHILD, wl); 3958 cb (EV_A_ EV_CHILD, wl);
3686 wl = wn; 3959 wl = wn;
3687 } 3960 }
3961#endif
3688/* EV_STAT 0x00001000 /* stat data changed */ 3962/* EV_STAT 0x00001000 /* stat data changed */
3689/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3963/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3690} 3964}
3691#endif 3965#endif
3692 3966
3693#if EV_MULTIPLICITY 3967#if EV_MULTIPLICITY
3694 #include "ev_wrap.h" 3968 #include "ev_wrap.h"
3695#endif 3969#endif
3696 3970
3697#ifdef __cplusplus 3971EV_CPP(})
3698}
3699#endif
3700 3972

Diff Legend

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