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

Comparing libev/ev.c (file contents):
Revision 1.316 by root, Fri Sep 18 21:02:12 2009 UTC vs.
Revision 1.370 by root, Sun Jan 30 19:05:41 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 *
… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
… …
77# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
79# endif 75# endif
80# endif 76# endif
81 77
78# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
85# else 82# else
83# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 84# define EV_USE_NANOSLEEP 0
85# endif
86
87# if HAVE_SELECT && HAVE_SYS_SELECT_H
88# ifndef EV_USE_SELECT
89# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
88# endif 94# endif
89 95
96# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 98# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 99# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 100# else
101# undef EV_USE_POLL
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif
104# endif 103# endif
105 104
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 106# ifndef EV_USE_EPOLL
109# else 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
112# endif 112# endif
113 113
114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# ifndef EV_USE_KQUEUE 115# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
116# define EV_USE_KQUEUE 1
117# else
118# define EV_USE_KQUEUE 0
119# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
120# endif 121# endif
121 122
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 124# ifndef EV_USE_PORT
125# else 125# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
128# endif 130# endif
129 131
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 133# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
136# endif 139# endif
137 140
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 142# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 143# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
144# endif 148# endif
145 149
150# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 151# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 152# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
152# endif 157# endif
153 158
154#endif 159#endif
155 160
156#include <math.h> 161#include <math.h>
157#include <stdlib.h> 162#include <stdlib.h>
163#include <string.h>
158#include <fcntl.h> 164#include <fcntl.h>
159#include <stddef.h> 165#include <stddef.h>
160 166
161#include <stdio.h> 167#include <stdio.h>
162 168
163#include <assert.h> 169#include <assert.h>
164#include <errno.h> 170#include <errno.h>
165#include <sys/types.h> 171#include <sys/types.h>
166#include <time.h> 172#include <time.h>
173#include <limits.h>
167 174
168#include <signal.h> 175#include <signal.h>
169 176
170#ifdef EV_H 177#ifdef EV_H
171# include EV_H 178# include EV_H
172#else 179#else
173# include "ev.h" 180# include "ev.h"
174#endif 181#endif
182
183EV_CPP(extern "C" {)
175 184
176#ifndef _WIN32 185#ifndef _WIN32
177# include <sys/time.h> 186# include <sys/time.h>
178# include <sys/wait.h> 187# include <sys/wait.h>
179# include <unistd.h> 188# include <unistd.h>
… …
182# define WIN32_LEAN_AND_MEAN 191# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 192# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
186# endif 195# endif
196# undef EV_AVOID_STDIO
187#endif 197#endif
198
199/* OS X, in its infinite idiocy, actually HARDCODES
200 * a limit of 1024 into their select. Where people have brains,
201 * OS X engineers apparently have a vacuum. Or maybe they were
202 * ordered to have a vacuum, or they do anything for money.
203 * This might help. Or not.
204 */
205#define _DARWIN_UNLIMITED_SELECT 1
188 206
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 207/* this block tries to deduce configuration from header-defined symbols and defaults */
190 208
191/* try to deduce the maximum number of signals on this platform */ 209/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG) 210#if defined (EV_NSIG)
… …
204#elif defined (MAXSIG) 222#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 223# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 224#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 225# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 226#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 228#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 230#else
213# error "unable to find value for NSIG, please report" 231# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 232/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */
215# define EV_NSIG 65 234# define EV_NSIG 65
216#endif 235#endif
217 236
218#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
220# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
221# else 240# else
222# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
223# endif 242# endif
224#endif 243#endif
225 244
226#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
227# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
228# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
229# else 248# else
230# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
231# endif 250# endif
232#endif 251#endif
233 252
… …
235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
236#endif 255#endif
237 256
238#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
239# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
240# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
241# else 260# else
242# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
243# endif 262# endif
244#endif 263#endif
245 264
246#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
247# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
248#endif 267#endif
249 268
250#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
251# ifdef _WIN32 270# ifdef _WIN32
252# define EV_USE_POLL 0 271# define EV_USE_POLL 0
253# else 272# else
254# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
255# endif 274# endif
256#endif 275#endif
257 276
258#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
259# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
260# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
261# else 280# else
262# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
263# endif 282# endif
264#endif 283#endif
265 284
… …
271# define EV_USE_PORT 0 290# define EV_USE_PORT 0
272#endif 291#endif
273 292
274#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
275# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
276# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
277# else 296# else
278# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
279# endif 298# endif
280#endif 299#endif
281 300
282#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
283# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
284# define EV_PID_HASHSIZE 1
285# else
286# define EV_PID_HASHSIZE 16
287# endif
288#endif 303#endif
289 304
290#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
291# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
292# define EV_INOTIFY_HASHSIZE 1
293# else
294# define EV_INOTIFY_HASHSIZE 16
295# endif
296#endif 307#endif
297 308
298#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
299# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
300# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
301# else 312# else
302# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
303# endif 314# endif
304#endif 315#endif
305 316
306#ifndef EV_USE_SIGNALFD 317#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1 319# define EV_USE_SIGNALFD EV_FEATURE_OS
309# else 320# else
310# define EV_USE_SIGNALFD 0 321# define EV_USE_SIGNALFD 0
311# endif 322# endif
312#endif 323#endif
313 324
… …
316# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
317# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
318#endif 329#endif
319 330
320#ifndef EV_VERIFY 331#ifndef EV_VERIFY
321# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
322#endif 333#endif
323 334
324#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
325# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
326#endif 337#endif
327 338
328#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
329# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
330#endif 341#endif
331 342
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 343/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
333/* which makes programs even slower. might work on other unices, too. */ 344/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL 345#if EV_USE_CLOCK_SYSCALL
… …
343# endif 354# endif
344#endif 355#endif
345 356
346/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 357/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347 358
359#ifdef _AIX
360/* AIX has a completely broken poll.h header */
361# undef EV_USE_POLL
362# define EV_USE_POLL 0
363#endif
364
348#ifndef CLOCK_MONOTONIC 365#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 366# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 367# define EV_USE_MONOTONIC 0
351#endif 368#endif
352 369
… …
359# undef EV_USE_INOTIFY 376# undef EV_USE_INOTIFY
360# define EV_USE_INOTIFY 0 377# define EV_USE_INOTIFY 0
361#endif 378#endif
362 379
363#if !EV_USE_NANOSLEEP 380#if !EV_USE_NANOSLEEP
364# ifndef _WIN32 381/* hp-ux has it in sys/time.h, which we unconditionally include above */
382# if !defined(_WIN32) && !defined(__hpux)
365# include <sys/select.h> 383# include <sys/select.h>
366# endif 384# endif
367#endif 385#endif
368 386
369#if EV_USE_INOTIFY 387#if EV_USE_INOTIFY
370# include <sys/utsname.h>
371# include <sys/statfs.h> 388# include <sys/statfs.h>
372# include <sys/inotify.h> 389# include <sys/inotify.h>
373/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 390/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
374# ifndef IN_DONT_FOLLOW 391# ifndef IN_DONT_FOLLOW
375# undef EV_USE_INOTIFY 392# undef EV_USE_INOTIFY
… …
392# define EFD_CLOEXEC O_CLOEXEC 409# define EFD_CLOEXEC O_CLOEXEC
393# else 410# else
394# define EFD_CLOEXEC 02000000 411# define EFD_CLOEXEC 02000000
395# endif 412# endif
396# endif 413# endif
397# ifdef __cplusplus
398extern "C" {
399# endif
400int eventfd (unsigned int initval, int flags); 414EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
401# ifdef __cplusplus
402}
403# endif
404#endif 415#endif
405 416
406#if EV_USE_SIGNALFD 417#if EV_USE_SIGNALFD
407/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 418/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
408# include <stdint.h> 419# include <stdint.h>
… …
414# define SFD_CLOEXEC O_CLOEXEC 425# define SFD_CLOEXEC O_CLOEXEC
415# else 426# else
416# define SFD_CLOEXEC 02000000 427# define SFD_CLOEXEC 02000000
417# endif 428# endif
418# endif 429# endif
419# ifdef __cplusplus
420extern "C" {
421# endif
422int signalfd (int fd, const sigset_t *mask, int flags); 430EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
423 431
424struct signalfd_siginfo 432struct signalfd_siginfo
425{ 433{
426 uint32_t ssi_signo; 434 uint32_t ssi_signo;
427 char pad[128 - sizeof (uint32_t)]; 435 char pad[128 - sizeof (uint32_t)];
428}; 436};
429# ifdef __cplusplus
430}
431# endif 437#endif
432#endif
433
434 438
435/**/ 439/**/
436 440
437#if EV_VERIFY >= 3 441#if EV_VERIFY >= 3
438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 442# define EV_FREQUENT_CHECK ev_verify (EV_A)
439#else 443#else
440# define EV_FREQUENT_CHECK do { } while (0) 444# define EV_FREQUENT_CHECK do { } while (0)
441#endif 445#endif
442 446
443/* 447/*
… …
451#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 455#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
452 456
453#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 457#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
454#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 458#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
455 459
460#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
461#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
462
456#if __GNUC__ >= 4 463#if __GNUC__ >= 4
457# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
458# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
459#else 466#else
460# define expect(expr,value) (expr) 467# define expect(expr,value) (expr)
… …
466 473
467#define expect_false(expr) expect ((expr) != 0, 0) 474#define expect_false(expr) expect ((expr) != 0, 0)
468#define expect_true(expr) expect ((expr) != 0, 1) 475#define expect_true(expr) expect ((expr) != 0, 1)
469#define inline_size static inline 476#define inline_size static inline
470 477
471#if EV_MINIMAL 478#if EV_FEATURE_CODE
479# define inline_speed static inline
480#else
472# define inline_speed static noinline 481# define inline_speed static noinline
473#else
474# define inline_speed static inline
475#endif 482#endif
476 483
477#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
478 485
479#if EV_MINPRI == EV_MAXPRI 486#if EV_MINPRI == EV_MAXPRI
… …
492#define ev_active(w) ((W)(w))->active 499#define ev_active(w) ((W)(w))->active
493#define ev_at(w) ((WT)(w))->at 500#define ev_at(w) ((WT)(w))->at
494 501
495#if EV_USE_REALTIME 502#if EV_USE_REALTIME
496/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 503/* sig_atomic_t is used to avoid per-thread variables or locking but still */
497/* giving it a reasonably high chance of working on typical architetcures */ 504/* giving it a reasonably high chance of working on typical architectures */
498static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
499#endif 506#endif
500 507
501#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
502static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
504 511
505#ifndef EV_FD_TO_WIN32_HANDLE 512#ifndef EV_FD_TO_WIN32_HANDLE
506# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 513# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
507#endif 514#endif
508#ifndef EV_WIN32_HANDLE_TO_FD 515#ifndef EV_WIN32_HANDLE_TO_FD
509# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 516# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
510#endif 517#endif
511#ifndef EV_WIN32_CLOSE_FD 518#ifndef EV_WIN32_CLOSE_FD
512# define EV_WIN32_CLOSE_FD(fd) close (fd) 519# define EV_WIN32_CLOSE_FD(fd) close (fd)
513#endif 520#endif
514 521
515#ifdef _WIN32 522#ifdef _WIN32
516# include "ev_win32.c" 523# include "ev_win32.c"
517#endif 524#endif
518 525
519/*****************************************************************************/ 526/*****************************************************************************/
527
528#ifdef __linux
529# include <sys/utsname.h>
530#endif
531
532static unsigned int noinline
533ev_linux_version (void)
534{
535#ifdef __linux
536 unsigned int v = 0;
537 struct utsname buf;
538 int i;
539 char *p = buf.release;
540
541 if (uname (&buf))
542 return 0;
543
544 for (i = 3+1; --i; )
545 {
546 unsigned int c = 0;
547
548 for (;;)
549 {
550 if (*p >= '0' && *p <= '9')
551 c = c * 10 + *p++ - '0';
552 else
553 {
554 p += *p == '.';
555 break;
556 }
557 }
558
559 v = (v << 8) | c;
560 }
561
562 return v;
563#else
564 return 0;
565#endif
566}
567
568/*****************************************************************************/
569
570#if EV_AVOID_STDIO
571static void noinline
572ev_printerr (const char *msg)
573{
574 write (STDERR_FILENO, msg, strlen (msg));
575}
576#endif
520 577
521static void (*syserr_cb)(const char *msg); 578static void (*syserr_cb)(const char *msg);
522 579
523void 580void
524ev_set_syserr_cb (void (*cb)(const char *msg)) 581ev_set_syserr_cb (void (*cb)(const char *msg))
… …
534 591
535 if (syserr_cb) 592 if (syserr_cb)
536 syserr_cb (msg); 593 syserr_cb (msg);
537 else 594 else
538 { 595 {
596#if EV_AVOID_STDIO
597 ev_printerr (msg);
598 ev_printerr (": ");
599 ev_printerr (strerror (errno));
600 ev_printerr ("\n");
601#else
539 perror (msg); 602 perror (msg);
603#endif
540 abort (); 604 abort ();
541 } 605 }
542} 606}
543 607
544static void * 608static void *
545ev_realloc_emul (void *ptr, long size) 609ev_realloc_emul (void *ptr, long size)
546{ 610{
611#if __GLIBC__
612 return realloc (ptr, size);
613#else
547 /* some systems, notably openbsd and darwin, fail to properly 614 /* some systems, notably openbsd and darwin, fail to properly
548 * implement realloc (x, 0) (as required by both ansi c-98 and 615 * implement realloc (x, 0) (as required by both ansi c-89 and
549 * the single unix specification, so work around them here. 616 * the single unix specification, so work around them here.
550 */ 617 */
551 618
552 if (size) 619 if (size)
553 return realloc (ptr, size); 620 return realloc (ptr, size);
554 621
555 free (ptr); 622 free (ptr);
556 return 0; 623 return 0;
624#endif
557} 625}
558 626
559static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 627static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
560 628
561void 629void
… …
569{ 637{
570 ptr = alloc (ptr, size); 638 ptr = alloc (ptr, size);
571 639
572 if (!ptr && size) 640 if (!ptr && size)
573 { 641 {
642#if EV_AVOID_STDIO
643 ev_printerr ("(libev) memory allocation failed, aborting.\n");
644#else
574 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 645 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
646#endif
575 abort (); 647 abort ();
576 } 648 }
577 649
578 return ptr; 650 return ptr;
579} 651}
… …
595 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 667 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
596 unsigned char unused; 668 unsigned char unused;
597#if EV_USE_EPOLL 669#if EV_USE_EPOLL
598 unsigned int egen; /* generation counter to counter epoll bugs */ 670 unsigned int egen; /* generation counter to counter epoll bugs */
599#endif 671#endif
600#if EV_SELECT_IS_WINSOCKET 672#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
601 SOCKET handle; 673 SOCKET handle;
674#endif
675#if EV_USE_IOCP
676 OVERLAPPED or, ow;
602#endif 677#endif
603} ANFD; 678} ANFD;
604 679
605/* stores the pending event set for a given watcher */ 680/* stores the pending event set for a given watcher */
606typedef struct 681typedef struct
… …
661 736
662 static int ev_default_loop_ptr; 737 static int ev_default_loop_ptr;
663 738
664#endif 739#endif
665 740
666#if EV_MINIMAL < 2 741#if EV_FEATURE_API
667# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 742# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
668# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 743# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
669# define EV_INVOKE_PENDING invoke_cb (EV_A) 744# define EV_INVOKE_PENDING invoke_cb (EV_A)
670#else 745#else
671# define EV_RELEASE_CB (void)0 746# define EV_RELEASE_CB (void)0
672# define EV_ACQUIRE_CB (void)0 747# define EV_ACQUIRE_CB (void)0
673# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 748# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
674#endif 749#endif
675 750
676#define EVUNLOOP_RECURSE 0x80 751#define EVBREAK_RECURSE 0x80
677 752
678/*****************************************************************************/ 753/*****************************************************************************/
679 754
680#ifndef EV_HAVE_EV_TIME 755#ifndef EV_HAVE_EV_TIME
681ev_tstamp 756ev_tstamp
… …
725 if (delay > 0.) 800 if (delay > 0.)
726 { 801 {
727#if EV_USE_NANOSLEEP 802#if EV_USE_NANOSLEEP
728 struct timespec ts; 803 struct timespec ts;
729 804
730 ts.tv_sec = (time_t)delay; 805 EV_TS_SET (ts, delay);
731 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
732
733 nanosleep (&ts, 0); 806 nanosleep (&ts, 0);
734#elif defined(_WIN32) 807#elif defined(_WIN32)
735 Sleep ((unsigned long)(delay * 1e3)); 808 Sleep ((unsigned long)(delay * 1e3));
736#else 809#else
737 struct timeval tv; 810 struct timeval tv;
738 811
739 tv.tv_sec = (time_t)delay;
740 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
741
742 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 812 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
743 /* something not guaranteed by newer posix versions, but guaranteed */ 813 /* something not guaranteed by newer posix versions, but guaranteed */
744 /* by older ones */ 814 /* by older ones */
815 EV_TV_SET (tv, delay);
745 select (0, 0, 0, 0, &tv); 816 select (0, 0, 0, 0, &tv);
746#endif 817#endif
747 } 818 }
748} 819}
749 820
821inline_speed int
822ev_timeout_to_ms (ev_tstamp timeout)
823{
824 int ms = timeout * 1000. + .999999;
825
826 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
827}
828
750/*****************************************************************************/ 829/*****************************************************************************/
751 830
752#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 831#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
753 832
754/* find a suitable new size for the given array, */ 833/* find a suitable new size for the given array, */
755/* hopefully by rounding to a ncie-to-malloc size */ 834/* hopefully by rounding to a nice-to-malloc size */
756inline_size int 835inline_size int
757array_nextsize (int elem, int cur, int cnt) 836array_nextsize (int elem, int cur, int cnt)
758{ 837{
759 int ncur = cur + 1; 838 int ncur = cur + 1;
760 839
… …
856} 935}
857 936
858/*****************************************************************************/ 937/*****************************************************************************/
859 938
860inline_speed void 939inline_speed void
861fd_event_nc (EV_P_ int fd, int revents) 940fd_event_nocheck (EV_P_ int fd, int revents)
862{ 941{
863 ANFD *anfd = anfds + fd; 942 ANFD *anfd = anfds + fd;
864 ev_io *w; 943 ev_io *w;
865 944
866 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 945 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
878fd_event (EV_P_ int fd, int revents) 957fd_event (EV_P_ int fd, int revents)
879{ 958{
880 ANFD *anfd = anfds + fd; 959 ANFD *anfd = anfds + fd;
881 960
882 if (expect_true (!anfd->reify)) 961 if (expect_true (!anfd->reify))
883 fd_event_nc (EV_A_ fd, revents); 962 fd_event_nocheck (EV_A_ fd, revents);
884} 963}
885 964
886void 965void
887ev_feed_fd_event (EV_P_ int fd, int revents) 966ev_feed_fd_event (EV_P_ int fd, int revents)
888{ 967{
889 if (fd >= 0 && fd < anfdmax) 968 if (fd >= 0 && fd < anfdmax)
890 fd_event_nc (EV_A_ fd, revents); 969 fd_event_nocheck (EV_A_ fd, revents);
891} 970}
892 971
893/* make sure the external fd watch events are in-sync */ 972/* make sure the external fd watch events are in-sync */
894/* with the kernel/libev internal state */ 973/* with the kernel/libev internal state */
895inline_size void 974inline_size void
… …
901 { 980 {
902 int fd = fdchanges [i]; 981 int fd = fdchanges [i];
903 ANFD *anfd = anfds + fd; 982 ANFD *anfd = anfds + fd;
904 ev_io *w; 983 ev_io *w;
905 984
906 unsigned char events = 0; 985 unsigned char o_events = anfd->events;
986 unsigned char o_reify = anfd->reify;
907 987
908 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 988 anfd->reify = 0;
909 events |= (unsigned char)w->events;
910 989
911#if EV_SELECT_IS_WINSOCKET 990#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
912 if (events) 991 if (o_reify & EV__IOFDSET)
913 { 992 {
914 unsigned long arg; 993 unsigned long arg;
915 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 994 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
916 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 995 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
996 printf ("oi %d %x\n", fd, anfd->handle);//D
917 } 997 }
918#endif 998#endif
919 999
1000 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
920 { 1001 {
921 unsigned char o_events = anfd->events;
922 unsigned char o_reify = anfd->reify;
923
924 anfd->reify = 0;
925 anfd->events = events; 1002 anfd->events = 0;
926 1003
927 if (o_events != events || o_reify & EV__IOFDSET) 1004 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1005 anfd->events |= (unsigned char)w->events;
1006
1007 if (o_events != anfd->events)
1008 o_reify = EV__IOFDSET; /* actually |= */
1009 }
1010
1011 if (o_reify & EV__IOFDSET)
928 backend_modify (EV_A_ fd, o_events, events); 1012 backend_modify (EV_A_ fd, o_events, anfd->events);
929 }
930 } 1013 }
931 1014
932 fdchangecnt = 0; 1015 fdchangecnt = 0;
933} 1016}
934 1017
… …
958 ev_io_stop (EV_A_ w); 1041 ev_io_stop (EV_A_ w);
959 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1042 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
960 } 1043 }
961} 1044}
962 1045
963/* check whether the given fd is atcually valid, for error recovery */ 1046/* check whether the given fd is actually valid, for error recovery */
964inline_size int 1047inline_size int
965fd_valid (int fd) 1048fd_valid (int fd)
966{ 1049{
967#ifdef _WIN32 1050#ifdef _WIN32
968 return _get_osfhandle (fd) != -1; 1051 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
969#else 1052#else
970 return fcntl (fd, F_GETFD) != -1; 1053 return fcntl (fd, F_GETFD) != -1;
971#endif 1054#endif
972} 1055}
973 1056
… …
1010 anfds [fd].emask = 0; 1093 anfds [fd].emask = 0;
1011 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1094 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1012 } 1095 }
1013} 1096}
1014 1097
1098/* used to prepare libev internal fd's */
1099/* this is not fork-safe */
1100inline_speed void
1101fd_intern (int fd)
1102{
1103#ifdef _WIN32
1104 unsigned long arg = 1;
1105 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1106#else
1107 fcntl (fd, F_SETFD, FD_CLOEXEC);
1108 fcntl (fd, F_SETFL, O_NONBLOCK);
1109#endif
1110}
1111
1015/*****************************************************************************/ 1112/*****************************************************************************/
1016 1113
1017/* 1114/*
1018 * the heap functions want a real array index. array index 0 uis guaranteed to not 1115 * the heap functions want a real array index. array index 0 is guaranteed to not
1019 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1116 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1020 * the branching factor of the d-tree. 1117 * the branching factor of the d-tree.
1021 */ 1118 */
1022 1119
1023/* 1120/*
… …
1171 1268
1172static ANSIG signals [EV_NSIG - 1]; 1269static ANSIG signals [EV_NSIG - 1];
1173 1270
1174/*****************************************************************************/ 1271/*****************************************************************************/
1175 1272
1176/* used to prepare libev internal fd's */ 1273#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1177/* this is not fork-safe */
1178inline_speed void
1179fd_intern (int fd)
1180{
1181#ifdef _WIN32
1182 unsigned long arg = 1;
1183 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1184#else
1185 fcntl (fd, F_SETFD, FD_CLOEXEC);
1186 fcntl (fd, F_SETFL, O_NONBLOCK);
1187#endif
1188}
1189 1274
1190static void noinline 1275static void noinline
1191evpipe_init (EV_P) 1276evpipe_init (EV_P)
1192{ 1277{
1193 if (!ev_is_active (&pipe_w)) 1278 if (!ev_is_active (&pipe_w))
1194 { 1279 {
1195#if EV_USE_EVENTFD 1280# if EV_USE_EVENTFD
1196 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1281 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1197 if (evfd < 0 && errno == EINVAL) 1282 if (evfd < 0 && errno == EINVAL)
1198 evfd = eventfd (0, 0); 1283 evfd = eventfd (0, 0);
1199 1284
1200 if (evfd >= 0) 1285 if (evfd >= 0)
… …
1202 evpipe [0] = -1; 1287 evpipe [0] = -1;
1203 fd_intern (evfd); /* doing it twice doesn't hurt */ 1288 fd_intern (evfd); /* doing it twice doesn't hurt */
1204 ev_io_set (&pipe_w, evfd, EV_READ); 1289 ev_io_set (&pipe_w, evfd, EV_READ);
1205 } 1290 }
1206 else 1291 else
1207#endif 1292# endif
1208 { 1293 {
1209 while (pipe (evpipe)) 1294 while (pipe (evpipe))
1210 ev_syserr ("(libev) error creating signal/async pipe"); 1295 ev_syserr ("(libev) error creating signal/async pipe");
1211 1296
1212 fd_intern (evpipe [0]); 1297 fd_intern (evpipe [0]);
… …
1223evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1308evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1224{ 1309{
1225 if (!*flag) 1310 if (!*flag)
1226 { 1311 {
1227 int old_errno = errno; /* save errno because write might clobber it */ 1312 int old_errno = errno; /* save errno because write might clobber it */
1313 char dummy;
1228 1314
1229 *flag = 1; 1315 *flag = 1;
1230 1316
1231#if EV_USE_EVENTFD 1317#if EV_USE_EVENTFD
1232 if (evfd >= 0) 1318 if (evfd >= 0)
… …
1234 uint64_t counter = 1; 1320 uint64_t counter = 1;
1235 write (evfd, &counter, sizeof (uint64_t)); 1321 write (evfd, &counter, sizeof (uint64_t));
1236 } 1322 }
1237 else 1323 else
1238#endif 1324#endif
1325 /* win32 people keep sending patches that change this write() to send() */
1326 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1327 /* so when you think this write should be a send instead, please find out */
1328 /* where your send() is from - it's definitely not the microsoft send, and */
1329 /* tell me. thank you. */
1239 write (evpipe [1], &old_errno, 1); 1330 write (evpipe [1], &dummy, 1);
1240 1331
1241 errno = old_errno; 1332 errno = old_errno;
1242 } 1333 }
1243} 1334}
1244 1335
… …
1257 } 1348 }
1258 else 1349 else
1259#endif 1350#endif
1260 { 1351 {
1261 char dummy; 1352 char dummy;
1353 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1262 read (evpipe [0], &dummy, 1); 1354 read (evpipe [0], &dummy, 1);
1263 } 1355 }
1264 1356
1357#if EV_SIGNAL_ENABLE
1265 if (sig_pending) 1358 if (sig_pending)
1266 { 1359 {
1267 sig_pending = 0; 1360 sig_pending = 0;
1268 1361
1269 for (i = EV_NSIG - 1; i--; ) 1362 for (i = EV_NSIG - 1; i--; )
1270 if (expect_false (signals [i].pending)) 1363 if (expect_false (signals [i].pending))
1271 ev_feed_signal_event (EV_A_ i + 1); 1364 ev_feed_signal_event (EV_A_ i + 1);
1272 } 1365 }
1366#endif
1273 1367
1274#if EV_ASYNC_ENABLE 1368#if EV_ASYNC_ENABLE
1275 if (async_pending) 1369 if (async_pending)
1276 { 1370 {
1277 async_pending = 0; 1371 async_pending = 0;
… …
1286#endif 1380#endif
1287} 1381}
1288 1382
1289/*****************************************************************************/ 1383/*****************************************************************************/
1290 1384
1385void
1386ev_feed_signal (int signum)
1387{
1388#if EV_MULTIPLICITY
1389 EV_P = signals [signum - 1].loop;
1390
1391 if (!EV_A)
1392 return;
1393#endif
1394
1395 signals [signum - 1].pending = 1;
1396 evpipe_write (EV_A_ &sig_pending);
1397}
1398
1291static void 1399static void
1292ev_sighandler (int signum) 1400ev_sighandler (int signum)
1293{ 1401{
1294#if EV_MULTIPLICITY
1295 EV_P = signals [signum - 1].loop;
1296#endif
1297
1298#if _WIN32 1402#ifdef _WIN32
1299 signal (signum, ev_sighandler); 1403 signal (signum, ev_sighandler);
1300#endif 1404#endif
1301 1405
1302 signals [signum - 1].pending = 1; 1406 ev_feed_signal (signum);
1303 evpipe_write (EV_A_ &sig_pending);
1304} 1407}
1305 1408
1306void noinline 1409void noinline
1307ev_feed_signal_event (EV_P_ int signum) 1410ev_feed_signal_event (EV_P_ int signum)
1308{ 1411{
… …
1345 break; 1448 break;
1346 } 1449 }
1347} 1450}
1348#endif 1451#endif
1349 1452
1453#endif
1454
1350/*****************************************************************************/ 1455/*****************************************************************************/
1351 1456
1457#if EV_CHILD_ENABLE
1352static WL childs [EV_PID_HASHSIZE]; 1458static WL childs [EV_PID_HASHSIZE];
1353
1354#ifndef _WIN32
1355 1459
1356static ev_signal childev; 1460static ev_signal childev;
1357 1461
1358#ifndef WIFCONTINUED 1462#ifndef WIFCONTINUED
1359# define WIFCONTINUED(status) 0 1463# define WIFCONTINUED(status) 0
… …
1364child_reap (EV_P_ int chain, int pid, int status) 1468child_reap (EV_P_ int chain, int pid, int status)
1365{ 1469{
1366 ev_child *w; 1470 ev_child *w;
1367 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1471 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1368 1472
1369 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1473 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1370 { 1474 {
1371 if ((w->pid == pid || !w->pid) 1475 if ((w->pid == pid || !w->pid)
1372 && (!traced || (w->flags & 1))) 1476 && (!traced || (w->flags & 1)))
1373 { 1477 {
1374 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1478 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1399 /* make sure we are called again until all children have been reaped */ 1503 /* make sure we are called again until all children have been reaped */
1400 /* we need to do it this way so that the callback gets called before we continue */ 1504 /* we need to do it this way so that the callback gets called before we continue */
1401 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1505 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1402 1506
1403 child_reap (EV_A_ pid, pid, status); 1507 child_reap (EV_A_ pid, pid, status);
1404 if (EV_PID_HASHSIZE > 1) 1508 if ((EV_PID_HASHSIZE) > 1)
1405 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1509 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1406} 1510}
1407 1511
1408#endif 1512#endif
1409 1513
1410/*****************************************************************************/ 1514/*****************************************************************************/
1411 1515
1516#if EV_USE_IOCP
1517# include "ev_iocp.c"
1518#endif
1412#if EV_USE_PORT 1519#if EV_USE_PORT
1413# include "ev_port.c" 1520# include "ev_port.c"
1414#endif 1521#endif
1415#if EV_USE_KQUEUE 1522#if EV_USE_KQUEUE
1416# include "ev_kqueue.c" 1523# include "ev_kqueue.c"
… …
1476#ifdef __APPLE__ 1583#ifdef __APPLE__
1477 /* only select works correctly on that "unix-certified" platform */ 1584 /* only select works correctly on that "unix-certified" platform */
1478 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1585 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1479 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1586 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1480#endif 1587#endif
1588#ifdef __FreeBSD__
1589 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1590#endif
1481 1591
1482 return flags; 1592 return flags;
1483} 1593}
1484 1594
1485unsigned int 1595unsigned int
1486ev_embeddable_backends (void) 1596ev_embeddable_backends (void)
1487{ 1597{
1488 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1598 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1489 1599
1490 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1600 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1491 /* please fix it and tell me how to detect the fix */ 1601 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1492 flags &= ~EVBACKEND_EPOLL; 1602 flags &= ~EVBACKEND_EPOLL;
1493 1603
1494 return flags; 1604 return flags;
1495} 1605}
1496 1606
1497unsigned int 1607unsigned int
1498ev_backend (EV_P) 1608ev_backend (EV_P)
1499{ 1609{
1500 return backend; 1610 return backend;
1501} 1611}
1502 1612
1503#if EV_MINIMAL < 2 1613#if EV_FEATURE_API
1504unsigned int 1614unsigned int
1505ev_loop_count (EV_P) 1615ev_iteration (EV_P)
1506{ 1616{
1507 return loop_count; 1617 return loop_count;
1508} 1618}
1509 1619
1510unsigned int 1620unsigned int
1511ev_loop_depth (EV_P) 1621ev_depth (EV_P)
1512{ 1622{
1513 return loop_depth; 1623 return loop_depth;
1514} 1624}
1515 1625
1516void 1626void
… …
1553static void noinline 1663static void noinline
1554loop_init (EV_P_ unsigned int flags) 1664loop_init (EV_P_ unsigned int flags)
1555{ 1665{
1556 if (!backend) 1666 if (!backend)
1557 { 1667 {
1668 origflags = flags;
1669
1558#if EV_USE_REALTIME 1670#if EV_USE_REALTIME
1559 if (!have_realtime) 1671 if (!have_realtime)
1560 { 1672 {
1561 struct timespec ts; 1673 struct timespec ts;
1562 1674
… …
1588 1700
1589 ev_rt_now = ev_time (); 1701 ev_rt_now = ev_time ();
1590 mn_now = get_clock (); 1702 mn_now = get_clock ();
1591 now_floor = mn_now; 1703 now_floor = mn_now;
1592 rtmn_diff = ev_rt_now - mn_now; 1704 rtmn_diff = ev_rt_now - mn_now;
1593#if EV_MINIMAL < 2 1705#if EV_FEATURE_API
1594 invoke_cb = ev_invoke_pending; 1706 invoke_cb = ev_invoke_pending;
1595#endif 1707#endif
1596 1708
1597 io_blocktime = 0.; 1709 io_blocktime = 0.;
1598 timeout_blocktime = 0.; 1710 timeout_blocktime = 0.;
… …
1604#endif 1716#endif
1605#if EV_USE_INOTIFY 1717#if EV_USE_INOTIFY
1606 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1718 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1607#endif 1719#endif
1608#if EV_USE_SIGNALFD 1720#if EV_USE_SIGNALFD
1609 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1721 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1610#endif 1722#endif
1611 1723
1612 if (!(flags & 0x0000ffffU)) 1724 if (!(flags & EVBACKEND_MASK))
1613 flags |= ev_recommended_backends (); 1725 flags |= ev_recommended_backends ();
1614 1726
1727#if EV_USE_IOCP
1728 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1729#endif
1615#if EV_USE_PORT 1730#if EV_USE_PORT
1616 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1731 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1617#endif 1732#endif
1618#if EV_USE_KQUEUE 1733#if EV_USE_KQUEUE
1619 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1734 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1628 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1743 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1629#endif 1744#endif
1630 1745
1631 ev_prepare_init (&pending_w, pendingcb); 1746 ev_prepare_init (&pending_w, pendingcb);
1632 1747
1748#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1633 ev_init (&pipe_w, pipecb); 1749 ev_init (&pipe_w, pipecb);
1634 ev_set_priority (&pipe_w, EV_MAXPRI); 1750 ev_set_priority (&pipe_w, EV_MAXPRI);
1751#endif
1635 } 1752 }
1636} 1753}
1637 1754
1638/* free up a loop structure */ 1755/* free up a loop structure */
1639static void noinline 1756void
1640loop_destroy (EV_P) 1757ev_loop_destroy (EV_P)
1641{ 1758{
1642 int i; 1759 int i;
1760
1761#if EV_MULTIPLICITY
1762 /* mimic free (0) */
1763 if (!EV_A)
1764 return;
1765#endif
1766
1767#if EV_CLEANUP_ENABLE
1768 /* queue cleanup watchers (and execute them) */
1769 if (expect_false (cleanupcnt))
1770 {
1771 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1772 EV_INVOKE_PENDING;
1773 }
1774#endif
1775
1776#if EV_CHILD_ENABLE
1777 if (ev_is_active (&childev))
1778 {
1779 ev_ref (EV_A); /* child watcher */
1780 ev_signal_stop (EV_A_ &childev);
1781 }
1782#endif
1643 1783
1644 if (ev_is_active (&pipe_w)) 1784 if (ev_is_active (&pipe_w))
1645 { 1785 {
1646 /*ev_ref (EV_A);*/ 1786 /*ev_ref (EV_A);*/
1647 /*ev_io_stop (EV_A_ &pipe_w);*/ 1787 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1658 } 1798 }
1659 } 1799 }
1660 1800
1661#if EV_USE_SIGNALFD 1801#if EV_USE_SIGNALFD
1662 if (ev_is_active (&sigfd_w)) 1802 if (ev_is_active (&sigfd_w))
1663 {
1664 /*ev_ref (EV_A);*/
1665 /*ev_io_stop (EV_A_ &sigfd_w);*/
1666
1667 close (sigfd); 1803 close (sigfd);
1668 }
1669#endif 1804#endif
1670 1805
1671#if EV_USE_INOTIFY 1806#if EV_USE_INOTIFY
1672 if (fs_fd >= 0) 1807 if (fs_fd >= 0)
1673 close (fs_fd); 1808 close (fs_fd);
1674#endif 1809#endif
1675 1810
1676 if (backend_fd >= 0) 1811 if (backend_fd >= 0)
1677 close (backend_fd); 1812 close (backend_fd);
1678 1813
1814#if EV_USE_IOCP
1815 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1816#endif
1679#if EV_USE_PORT 1817#if EV_USE_PORT
1680 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1818 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1681#endif 1819#endif
1682#if EV_USE_KQUEUE 1820#if EV_USE_KQUEUE
1683 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1821 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1710 array_free (periodic, EMPTY); 1848 array_free (periodic, EMPTY);
1711#endif 1849#endif
1712#if EV_FORK_ENABLE 1850#if EV_FORK_ENABLE
1713 array_free (fork, EMPTY); 1851 array_free (fork, EMPTY);
1714#endif 1852#endif
1853#if EV_CLEANUP_ENABLE
1854 array_free (cleanup, EMPTY);
1855#endif
1715 array_free (prepare, EMPTY); 1856 array_free (prepare, EMPTY);
1716 array_free (check, EMPTY); 1857 array_free (check, EMPTY);
1717#if EV_ASYNC_ENABLE 1858#if EV_ASYNC_ENABLE
1718 array_free (async, EMPTY); 1859 array_free (async, EMPTY);
1719#endif 1860#endif
1720 1861
1721 backend = 0; 1862 backend = 0;
1863
1864#if EV_MULTIPLICITY
1865 if (ev_is_default_loop (EV_A))
1866#endif
1867 ev_default_loop_ptr = 0;
1868#if EV_MULTIPLICITY
1869 else
1870 ev_free (EV_A);
1871#endif
1722} 1872}
1723 1873
1724#if EV_USE_INOTIFY 1874#if EV_USE_INOTIFY
1725inline_size void infy_fork (EV_P); 1875inline_size void infy_fork (EV_P);
1726#endif 1876#endif
… …
1762 { 1912 {
1763 EV_WIN32_CLOSE_FD (evpipe [0]); 1913 EV_WIN32_CLOSE_FD (evpipe [0]);
1764 EV_WIN32_CLOSE_FD (evpipe [1]); 1914 EV_WIN32_CLOSE_FD (evpipe [1]);
1765 } 1915 }
1766 1916
1917#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1767 evpipe_init (EV_A); 1918 evpipe_init (EV_A);
1768 /* now iterate over everything, in case we missed something */ 1919 /* now iterate over everything, in case we missed something */
1769 pipecb (EV_A_ &pipe_w, EV_READ); 1920 pipecb (EV_A_ &pipe_w, EV_READ);
1921#endif
1770 } 1922 }
1771 1923
1772 postfork = 0; 1924 postfork = 0;
1773} 1925}
1774 1926
… …
1783 loop_init (EV_A_ flags); 1935 loop_init (EV_A_ flags);
1784 1936
1785 if (ev_backend (EV_A)) 1937 if (ev_backend (EV_A))
1786 return EV_A; 1938 return EV_A;
1787 1939
1940 ev_free (EV_A);
1788 return 0; 1941 return 0;
1789} 1942}
1790 1943
1791void
1792ev_loop_destroy (EV_P)
1793{
1794 loop_destroy (EV_A);
1795 ev_free (loop);
1796}
1797
1798void
1799ev_loop_fork (EV_P)
1800{
1801 postfork = 1; /* must be in line with ev_default_fork */
1802}
1803#endif /* multiplicity */ 1944#endif /* multiplicity */
1804 1945
1805#if EV_VERIFY 1946#if EV_VERIFY
1806static void noinline 1947static void noinline
1807verify_watcher (EV_P_ W w) 1948verify_watcher (EV_P_ W w)
… …
1836 verify_watcher (EV_A_ ws [cnt]); 1977 verify_watcher (EV_A_ ws [cnt]);
1837 } 1978 }
1838} 1979}
1839#endif 1980#endif
1840 1981
1841#if EV_MINIMAL < 2 1982#if EV_FEATURE_API
1842void 1983void
1843ev_loop_verify (EV_P) 1984ev_verify (EV_P)
1844{ 1985{
1845#if EV_VERIFY 1986#if EV_VERIFY
1846 int i; 1987 int i;
1847 WL w; 1988 WL w;
1848 1989
… …
1882#if EV_FORK_ENABLE 2023#if EV_FORK_ENABLE
1883 assert (forkmax >= forkcnt); 2024 assert (forkmax >= forkcnt);
1884 array_verify (EV_A_ (W *)forks, forkcnt); 2025 array_verify (EV_A_ (W *)forks, forkcnt);
1885#endif 2026#endif
1886 2027
2028#if EV_CLEANUP_ENABLE
2029 assert (cleanupmax >= cleanupcnt);
2030 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2031#endif
2032
1887#if EV_ASYNC_ENABLE 2033#if EV_ASYNC_ENABLE
1888 assert (asyncmax >= asynccnt); 2034 assert (asyncmax >= asynccnt);
1889 array_verify (EV_A_ (W *)asyncs, asynccnt); 2035 array_verify (EV_A_ (W *)asyncs, asynccnt);
1890#endif 2036#endif
1891 2037
2038#if EV_PREPARE_ENABLE
1892 assert (preparemax >= preparecnt); 2039 assert (preparemax >= preparecnt);
1893 array_verify (EV_A_ (W *)prepares, preparecnt); 2040 array_verify (EV_A_ (W *)prepares, preparecnt);
2041#endif
1894 2042
2043#if EV_CHECK_ENABLE
1895 assert (checkmax >= checkcnt); 2044 assert (checkmax >= checkcnt);
1896 array_verify (EV_A_ (W *)checks, checkcnt); 2045 array_verify (EV_A_ (W *)checks, checkcnt);
2046#endif
1897 2047
1898# if 0 2048# if 0
2049#if EV_CHILD_ENABLE
1899 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2050 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1900 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 2051 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2052#endif
1901# endif 2053# endif
1902#endif 2054#endif
1903} 2055}
1904#endif 2056#endif
1905 2057
1906#if EV_MULTIPLICITY 2058#if EV_MULTIPLICITY
1907struct ev_loop * 2059struct ev_loop *
1908ev_default_loop_init (unsigned int flags)
1909#else 2060#else
1910int 2061int
2062#endif
1911ev_default_loop (unsigned int flags) 2063ev_default_loop (unsigned int flags)
1912#endif
1913{ 2064{
1914 if (!ev_default_loop_ptr) 2065 if (!ev_default_loop_ptr)
1915 { 2066 {
1916#if EV_MULTIPLICITY 2067#if EV_MULTIPLICITY
1917 EV_P = ev_default_loop_ptr = &default_loop_struct; 2068 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1921 2072
1922 loop_init (EV_A_ flags); 2073 loop_init (EV_A_ flags);
1923 2074
1924 if (ev_backend (EV_A)) 2075 if (ev_backend (EV_A))
1925 { 2076 {
1926#ifndef _WIN32 2077#if EV_CHILD_ENABLE
1927 ev_signal_init (&childev, childcb, SIGCHLD); 2078 ev_signal_init (&childev, childcb, SIGCHLD);
1928 ev_set_priority (&childev, EV_MAXPRI); 2079 ev_set_priority (&childev, EV_MAXPRI);
1929 ev_signal_start (EV_A_ &childev); 2080 ev_signal_start (EV_A_ &childev);
1930 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2081 ev_unref (EV_A); /* child watcher should not keep loop alive */
1931#endif 2082#endif
… …
1936 2087
1937 return ev_default_loop_ptr; 2088 return ev_default_loop_ptr;
1938} 2089}
1939 2090
1940void 2091void
1941ev_default_destroy (void) 2092ev_loop_fork (EV_P)
1942{ 2093{
1943#if EV_MULTIPLICITY
1944 EV_P = ev_default_loop_ptr;
1945#endif
1946
1947 ev_default_loop_ptr = 0;
1948
1949#ifndef _WIN32
1950 ev_ref (EV_A); /* child watcher */
1951 ev_signal_stop (EV_A_ &childev);
1952#endif
1953
1954 loop_destroy (EV_A);
1955}
1956
1957void
1958ev_default_fork (void)
1959{
1960#if EV_MULTIPLICITY
1961 EV_P = ev_default_loop_ptr;
1962#endif
1963
1964 postfork = 1; /* must be in line with ev_loop_fork */ 2094 postfork = 1; /* must be in line with ev_default_fork */
1965} 2095}
1966 2096
1967/*****************************************************************************/ 2097/*****************************************************************************/
1968 2098
1969void 2099void
… …
1991 2121
1992 for (pri = NUMPRI; pri--; ) 2122 for (pri = NUMPRI; pri--; )
1993 while (pendingcnt [pri]) 2123 while (pendingcnt [pri])
1994 { 2124 {
1995 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2125 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1996
1997 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1998 /* ^ this is no longer true, as pending_w could be here */
1999 2126
2000 p->w->pending = 0; 2127 p->w->pending = 0;
2001 EV_CB_INVOKE (p->w, p->events); 2128 EV_CB_INVOKE (p->w, p->events);
2002 EV_FREQUENT_CHECK; 2129 EV_FREQUENT_CHECK;
2003 } 2130 }
… …
2060 EV_FREQUENT_CHECK; 2187 EV_FREQUENT_CHECK;
2061 feed_reverse (EV_A_ (W)w); 2188 feed_reverse (EV_A_ (W)w);
2062 } 2189 }
2063 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2190 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2064 2191
2065 feed_reverse_done (EV_A_ EV_TIMEOUT); 2192 feed_reverse_done (EV_A_ EV_TIMER);
2066 } 2193 }
2067} 2194}
2068 2195
2069#if EV_PERIODIC_ENABLE 2196#if EV_PERIODIC_ENABLE
2197
2198inline_speed
2199periodic_recalc (EV_P_ ev_periodic *w)
2200{
2201 /* TODO: use slow but potentially more correct incremental algo, */
2202 /* also do not rely on ceil */
2203 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2204}
2205
2070/* make periodics pending */ 2206/* make periodics pending */
2071inline_size void 2207inline_size void
2072periodics_reify (EV_P) 2208periodics_reify (EV_P)
2073{ 2209{
2074 EV_FREQUENT_CHECK; 2210 EV_FREQUENT_CHECK;
… …
2093 ANHE_at_cache (periodics [HEAP0]); 2229 ANHE_at_cache (periodics [HEAP0]);
2094 downheap (periodics, periodiccnt, HEAP0); 2230 downheap (periodics, periodiccnt, HEAP0);
2095 } 2231 }
2096 else if (w->interval) 2232 else if (w->interval)
2097 { 2233 {
2098 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2234 periodic_recalc (EV_A_ w);
2235
2099 /* if next trigger time is not sufficiently in the future, put it there */ 2236 /* if next trigger time is not sufficiently in the future, put it there */
2100 /* this might happen because of floating point inexactness */ 2237 /* this might happen because of floating point inexactness */
2101 if (ev_at (w) - ev_rt_now < TIME_EPSILON) 2238 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2102 { 2239 {
2103 ev_at (w) += w->interval; 2240 ev_at (w) += w->interval;
… …
2123 feed_reverse_done (EV_A_ EV_PERIODIC); 2260 feed_reverse_done (EV_A_ EV_PERIODIC);
2124 } 2261 }
2125} 2262}
2126 2263
2127/* simply recalculate all periodics */ 2264/* simply recalculate all periodics */
2128/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2265/* TODO: maybe ensure that at least one event happens when jumping forward? */
2129static void noinline 2266static void noinline
2130periodics_reschedule (EV_P) 2267periodics_reschedule (EV_P)
2131{ 2268{
2132 int i; 2269 int i;
2133 2270
… …
2137 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2274 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2138 2275
2139 if (w->reschedule_cb) 2276 if (w->reschedule_cb)
2140 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2277 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2141 else if (w->interval) 2278 else if (w->interval)
2142 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2279 periodic_recalc (EV_A_ w);
2143 2280
2144 ANHE_at_cache (periodics [i]); 2281 ANHE_at_cache (periodics [i]);
2145 } 2282 }
2146 2283
2147 reheap (periodics, periodiccnt); 2284 reheap (periodics, periodiccnt);
… …
2161 ANHE_at_cache (*he); 2298 ANHE_at_cache (*he);
2162 } 2299 }
2163} 2300}
2164 2301
2165/* fetch new monotonic and realtime times from the kernel */ 2302/* fetch new monotonic and realtime times from the kernel */
2166/* also detetc if there was a timejump, and act accordingly */ 2303/* also detect if there was a timejump, and act accordingly */
2167inline_speed void 2304inline_speed void
2168time_update (EV_P_ ev_tstamp max_block) 2305time_update (EV_P_ ev_tstamp max_block)
2169{ 2306{
2170#if EV_USE_MONOTONIC 2307#if EV_USE_MONOTONIC
2171 if (expect_true (have_monotonic)) 2308 if (expect_true (have_monotonic))
… …
2229 mn_now = ev_rt_now; 2366 mn_now = ev_rt_now;
2230 } 2367 }
2231} 2368}
2232 2369
2233void 2370void
2234ev_loop (EV_P_ int flags) 2371ev_run (EV_P_ int flags)
2235{ 2372{
2236#if EV_MINIMAL < 2 2373#if EV_FEATURE_API
2237 ++loop_depth; 2374 ++loop_depth;
2238#endif 2375#endif
2239 2376
2240 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2377 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2241 2378
2242 loop_done = EVUNLOOP_CANCEL; 2379 loop_done = EVBREAK_CANCEL;
2243 2380
2244 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2381 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2245 2382
2246 do 2383 do
2247 { 2384 {
2248#if EV_VERIFY >= 2 2385#if EV_VERIFY >= 2
2249 ev_loop_verify (EV_A); 2386 ev_verify (EV_A);
2250#endif 2387#endif
2251 2388
2252#ifndef _WIN32 2389#ifndef _WIN32
2253 if (expect_false (curpid)) /* penalise the forking check even more */ 2390 if (expect_false (curpid)) /* penalise the forking check even more */
2254 if (expect_false (getpid () != curpid)) 2391 if (expect_false (getpid () != curpid))
… …
2266 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2403 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2267 EV_INVOKE_PENDING; 2404 EV_INVOKE_PENDING;
2268 } 2405 }
2269#endif 2406#endif
2270 2407
2408#if EV_PREPARE_ENABLE
2271 /* queue prepare watchers (and execute them) */ 2409 /* queue prepare watchers (and execute them) */
2272 if (expect_false (preparecnt)) 2410 if (expect_false (preparecnt))
2273 { 2411 {
2274 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2412 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2275 EV_INVOKE_PENDING; 2413 EV_INVOKE_PENDING;
2276 } 2414 }
2415#endif
2277 2416
2278 if (expect_false (loop_done)) 2417 if (expect_false (loop_done))
2279 break; 2418 break;
2280 2419
2281 /* we might have forked, so reify kernel state if necessary */ 2420 /* we might have forked, so reify kernel state if necessary */
… …
2288 /* calculate blocking time */ 2427 /* calculate blocking time */
2289 { 2428 {
2290 ev_tstamp waittime = 0.; 2429 ev_tstamp waittime = 0.;
2291 ev_tstamp sleeptime = 0.; 2430 ev_tstamp sleeptime = 0.;
2292 2431
2432 /* remember old timestamp for io_blocktime calculation */
2433 ev_tstamp prev_mn_now = mn_now;
2434
2435 /* update time to cancel out callback processing overhead */
2436 time_update (EV_A_ 1e100);
2437
2293 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2438 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2294 { 2439 {
2295 /* remember old timestamp for io_blocktime calculation */
2296 ev_tstamp prev_mn_now = mn_now;
2297
2298 /* update time to cancel out callback processing overhead */
2299 time_update (EV_A_ 1e100);
2300
2301 waittime = MAX_BLOCKTIME; 2440 waittime = MAX_BLOCKTIME;
2302 2441
2303 if (timercnt) 2442 if (timercnt)
2304 { 2443 {
2305 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2444 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2332 waittime -= sleeptime; 2471 waittime -= sleeptime;
2333 } 2472 }
2334 } 2473 }
2335 } 2474 }
2336 2475
2337#if EV_MINIMAL < 2 2476#if EV_FEATURE_API
2338 ++loop_count; 2477 ++loop_count;
2339#endif 2478#endif
2340 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2479 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2341 backend_poll (EV_A_ waittime); 2480 backend_poll (EV_A_ waittime);
2342 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2481 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2343 2482
2344 /* update ev_rt_now, do magic */ 2483 /* update ev_rt_now, do magic */
2345 time_update (EV_A_ waittime + sleeptime); 2484 time_update (EV_A_ waittime + sleeptime);
2346 } 2485 }
2347 2486
… …
2354#if EV_IDLE_ENABLE 2493#if EV_IDLE_ENABLE
2355 /* queue idle watchers unless other events are pending */ 2494 /* queue idle watchers unless other events are pending */
2356 idle_reify (EV_A); 2495 idle_reify (EV_A);
2357#endif 2496#endif
2358 2497
2498#if EV_CHECK_ENABLE
2359 /* queue check watchers, to be executed first */ 2499 /* queue check watchers, to be executed first */
2360 if (expect_false (checkcnt)) 2500 if (expect_false (checkcnt))
2361 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2501 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2502#endif
2362 2503
2363 EV_INVOKE_PENDING; 2504 EV_INVOKE_PENDING;
2364 } 2505 }
2365 while (expect_true ( 2506 while (expect_true (
2366 activecnt 2507 activecnt
2367 && !loop_done 2508 && !loop_done
2368 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2509 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2369 )); 2510 ));
2370 2511
2371 if (loop_done == EVUNLOOP_ONE) 2512 if (loop_done == EVBREAK_ONE)
2372 loop_done = EVUNLOOP_CANCEL; 2513 loop_done = EVBREAK_CANCEL;
2373 2514
2374#if EV_MINIMAL < 2 2515#if EV_FEATURE_API
2375 --loop_depth; 2516 --loop_depth;
2376#endif 2517#endif
2377} 2518}
2378 2519
2379void 2520void
2380ev_unloop (EV_P_ int how) 2521ev_break (EV_P_ int how)
2381{ 2522{
2382 loop_done = how; 2523 loop_done = how;
2383} 2524}
2384 2525
2385void 2526void
… …
2505 2646
2506 if (expect_false (ev_is_active (w))) 2647 if (expect_false (ev_is_active (w)))
2507 return; 2648 return;
2508 2649
2509 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2650 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2510 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2651 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2511 2652
2512 EV_FREQUENT_CHECK; 2653 EV_FREQUENT_CHECK;
2513 2654
2514 ev_start (EV_A_ (W)w, 1); 2655 ev_start (EV_A_ (W)w, 1);
2515 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2656 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2533 EV_FREQUENT_CHECK; 2674 EV_FREQUENT_CHECK;
2534 2675
2535 wlist_del (&anfds[w->fd].head, (WL)w); 2676 wlist_del (&anfds[w->fd].head, (WL)w);
2536 ev_stop (EV_A_ (W)w); 2677 ev_stop (EV_A_ (W)w);
2537 2678
2538 fd_change (EV_A_ w->fd, 1); 2679 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2539 2680
2540 EV_FREQUENT_CHECK; 2681 EV_FREQUENT_CHECK;
2541} 2682}
2542 2683
2543void noinline 2684void noinline
… …
2585 timers [active] = timers [timercnt + HEAP0]; 2726 timers [active] = timers [timercnt + HEAP0];
2586 adjustheap (timers, timercnt, active); 2727 adjustheap (timers, timercnt, active);
2587 } 2728 }
2588 } 2729 }
2589 2730
2590 EV_FREQUENT_CHECK;
2591
2592 ev_at (w) -= mn_now; 2731 ev_at (w) -= mn_now;
2593 2732
2594 ev_stop (EV_A_ (W)w); 2733 ev_stop (EV_A_ (W)w);
2734
2735 EV_FREQUENT_CHECK;
2595} 2736}
2596 2737
2597void noinline 2738void noinline
2598ev_timer_again (EV_P_ ev_timer *w) 2739ev_timer_again (EV_P_ ev_timer *w)
2599{ 2740{
… …
2635 if (w->reschedule_cb) 2776 if (w->reschedule_cb)
2636 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2777 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2637 else if (w->interval) 2778 else if (w->interval)
2638 { 2779 {
2639 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2780 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2640 /* this formula differs from the one in periodic_reify because we do not always round up */ 2781 periodic_recalc (EV_A_ w);
2641 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2642 } 2782 }
2643 else 2783 else
2644 ev_at (w) = w->offset; 2784 ev_at (w) = w->offset;
2645 2785
2646 EV_FREQUENT_CHECK; 2786 EV_FREQUENT_CHECK;
… …
2678 periodics [active] = periodics [periodiccnt + HEAP0]; 2818 periodics [active] = periodics [periodiccnt + HEAP0];
2679 adjustheap (periodics, periodiccnt, active); 2819 adjustheap (periodics, periodiccnt, active);
2680 } 2820 }
2681 } 2821 }
2682 2822
2683 EV_FREQUENT_CHECK;
2684
2685 ev_stop (EV_A_ (W)w); 2823 ev_stop (EV_A_ (W)w);
2824
2825 EV_FREQUENT_CHECK;
2686} 2826}
2687 2827
2688void noinline 2828void noinline
2689ev_periodic_again (EV_P_ ev_periodic *w) 2829ev_periodic_again (EV_P_ ev_periodic *w)
2690{ 2830{
… …
2695#endif 2835#endif
2696 2836
2697#ifndef SA_RESTART 2837#ifndef SA_RESTART
2698# define SA_RESTART 0 2838# define SA_RESTART 0
2699#endif 2839#endif
2840
2841#if EV_SIGNAL_ENABLE
2700 2842
2701void noinline 2843void noinline
2702ev_signal_start (EV_P_ ev_signal *w) 2844ev_signal_start (EV_P_ ev_signal *w)
2703{ 2845{
2704 if (expect_false (ev_is_active (w))) 2846 if (expect_false (ev_is_active (w)))
… …
2751 if (!((WL)w)->next) 2893 if (!((WL)w)->next)
2752# if EV_USE_SIGNALFD 2894# if EV_USE_SIGNALFD
2753 if (sigfd < 0) /*TODO*/ 2895 if (sigfd < 0) /*TODO*/
2754# endif 2896# endif
2755 { 2897 {
2756# if _WIN32 2898# ifdef _WIN32
2899 evpipe_init (EV_A);
2900
2757 signal (w->signum, ev_sighandler); 2901 signal (w->signum, ev_sighandler);
2758# else 2902# else
2759 struct sigaction sa; 2903 struct sigaction sa;
2760 2904
2761 evpipe_init (EV_A); 2905 evpipe_init (EV_A);
… …
2763 sa.sa_handler = ev_sighandler; 2907 sa.sa_handler = ev_sighandler;
2764 sigfillset (&sa.sa_mask); 2908 sigfillset (&sa.sa_mask);
2765 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2909 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2766 sigaction (w->signum, &sa, 0); 2910 sigaction (w->signum, &sa, 0);
2767 2911
2912 if (origflags & EVFLAG_NOSIGMASK)
2913 {
2768 sigemptyset (&sa.sa_mask); 2914 sigemptyset (&sa.sa_mask);
2769 sigaddset (&sa.sa_mask, w->signum); 2915 sigaddset (&sa.sa_mask, w->signum);
2770 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2916 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2917 }
2771#endif 2918#endif
2772 } 2919 }
2773 2920
2774 EV_FREQUENT_CHECK; 2921 EV_FREQUENT_CHECK;
2775} 2922}
… …
2792 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2939 signals [w->signum - 1].loop = 0; /* unattach from signal */
2793#endif 2940#endif
2794#if EV_USE_SIGNALFD 2941#if EV_USE_SIGNALFD
2795 if (sigfd >= 0) 2942 if (sigfd >= 0)
2796 { 2943 {
2797 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2944 sigset_t ss;
2945
2946 sigemptyset (&ss);
2947 sigaddset (&ss, w->signum);
2798 sigdelset (&sigfd_set, w->signum); 2948 sigdelset (&sigfd_set, w->signum);
2949
2799 signalfd (sigfd, &sigfd_set, 0); 2950 signalfd (sigfd, &sigfd_set, 0);
2800 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2951 sigprocmask (SIG_UNBLOCK, &ss, 0);
2801 /*TODO: maybe unblock signal? */
2802 } 2952 }
2803 else 2953 else
2804#endif 2954#endif
2805 signal (w->signum, SIG_DFL); 2955 signal (w->signum, SIG_DFL);
2806 } 2956 }
2807 2957
2808 EV_FREQUENT_CHECK; 2958 EV_FREQUENT_CHECK;
2809} 2959}
2810 2960
2961#endif
2962
2963#if EV_CHILD_ENABLE
2964
2811void 2965void
2812ev_child_start (EV_P_ ev_child *w) 2966ev_child_start (EV_P_ ev_child *w)
2813{ 2967{
2814#if EV_MULTIPLICITY 2968#if EV_MULTIPLICITY
2815 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2969 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2818 return; 2972 return;
2819 2973
2820 EV_FREQUENT_CHECK; 2974 EV_FREQUENT_CHECK;
2821 2975
2822 ev_start (EV_A_ (W)w, 1); 2976 ev_start (EV_A_ (W)w, 1);
2823 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2977 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2824 2978
2825 EV_FREQUENT_CHECK; 2979 EV_FREQUENT_CHECK;
2826} 2980}
2827 2981
2828void 2982void
… …
2832 if (expect_false (!ev_is_active (w))) 2986 if (expect_false (!ev_is_active (w)))
2833 return; 2987 return;
2834 2988
2835 EV_FREQUENT_CHECK; 2989 EV_FREQUENT_CHECK;
2836 2990
2837 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2991 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2838 ev_stop (EV_A_ (W)w); 2992 ev_stop (EV_A_ (W)w);
2839 2993
2840 EV_FREQUENT_CHECK; 2994 EV_FREQUENT_CHECK;
2841} 2995}
2996
2997#endif
2842 2998
2843#if EV_STAT_ENABLE 2999#if EV_STAT_ENABLE
2844 3000
2845# ifdef _WIN32 3001# ifdef _WIN32
2846# undef lstat 3002# undef lstat
… …
2852#define MIN_STAT_INTERVAL 0.1074891 3008#define MIN_STAT_INTERVAL 0.1074891
2853 3009
2854static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 3010static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2855 3011
2856#if EV_USE_INOTIFY 3012#if EV_USE_INOTIFY
2857# define EV_INOTIFY_BUFSIZE 8192 3013
3014/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
3015# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2858 3016
2859static void noinline 3017static void noinline
2860infy_add (EV_P_ ev_stat *w) 3018infy_add (EV_P_ ev_stat *w)
2861{ 3019{
2862 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); 3020 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);
2863 3021
2864 if (w->wd < 0) 3022 if (w->wd >= 0)
3023 {
3024 struct statfs sfs;
3025
3026 /* now local changes will be tracked by inotify, but remote changes won't */
3027 /* unless the filesystem is known to be local, we therefore still poll */
3028 /* also do poll on <2.6.25, but with normal frequency */
3029
3030 if (!fs_2625)
3031 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3032 else if (!statfs (w->path, &sfs)
3033 && (sfs.f_type == 0x1373 /* devfs */
3034 || sfs.f_type == 0xEF53 /* ext2/3 */
3035 || sfs.f_type == 0x3153464a /* jfs */
3036 || sfs.f_type == 0x52654973 /* reiser3 */
3037 || sfs.f_type == 0x01021994 /* tempfs */
3038 || sfs.f_type == 0x58465342 /* xfs */))
3039 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3040 else
3041 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2865 { 3042 }
3043 else
3044 {
3045 /* can't use inotify, continue to stat */
2866 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3046 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2867 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2868 3047
2869 /* monitor some parent directory for speedup hints */ 3048 /* if path is not there, monitor some parent directory for speedup hints */
2870 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 3049 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2871 /* but an efficiency issue only */ 3050 /* but an efficiency issue only */
2872 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 3051 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2873 { 3052 {
2874 char path [4096]; 3053 char path [4096];
… …
2890 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3069 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2891 } 3070 }
2892 } 3071 }
2893 3072
2894 if (w->wd >= 0) 3073 if (w->wd >= 0)
2895 {
2896 struct statfs sfs;
2897
2898 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3074 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2899 3075
2900 /* now local changes will be tracked by inotify, but remote changes won't */ 3076 /* now re-arm timer, if required */
2901 /* unless the filesystem it known to be local, we therefore still poll */ 3077 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2902 /* also do poll on <2.6.25, but with normal frequency */
2903
2904 if (fs_2625 && !statfs (w->path, &sfs))
2905 if (sfs.f_type == 0x1373 /* devfs */
2906 || sfs.f_type == 0xEF53 /* ext2/3 */
2907 || sfs.f_type == 0x3153464a /* jfs */
2908 || sfs.f_type == 0x52654973 /* reiser3 */
2909 || sfs.f_type == 0x01021994 /* tempfs */
2910 || sfs.f_type == 0x58465342 /* xfs */)
2911 return;
2912
2913 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2914 ev_timer_again (EV_A_ &w->timer); 3078 ev_timer_again (EV_A_ &w->timer);
2915 } 3079 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2916} 3080}
2917 3081
2918static void noinline 3082static void noinline
2919infy_del (EV_P_ ev_stat *w) 3083infy_del (EV_P_ ev_stat *w)
2920{ 3084{
… …
2923 3087
2924 if (wd < 0) 3088 if (wd < 0)
2925 return; 3089 return;
2926 3090
2927 w->wd = -2; 3091 w->wd = -2;
2928 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3092 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2929 wlist_del (&fs_hash [slot].head, (WL)w); 3093 wlist_del (&fs_hash [slot].head, (WL)w);
2930 3094
2931 /* remove this watcher, if others are watching it, they will rearm */ 3095 /* remove this watcher, if others are watching it, they will rearm */
2932 inotify_rm_watch (fs_fd, wd); 3096 inotify_rm_watch (fs_fd, wd);
2933} 3097}
… …
2935static void noinline 3099static void noinline
2936infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3100infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2937{ 3101{
2938 if (slot < 0) 3102 if (slot < 0)
2939 /* overflow, need to check for all hash slots */ 3103 /* overflow, need to check for all hash slots */
2940 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3104 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2941 infy_wd (EV_A_ slot, wd, ev); 3105 infy_wd (EV_A_ slot, wd, ev);
2942 else 3106 else
2943 { 3107 {
2944 WL w_; 3108 WL w_;
2945 3109
2946 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3110 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2947 { 3111 {
2948 ev_stat *w = (ev_stat *)w_; 3112 ev_stat *w = (ev_stat *)w_;
2949 w_ = w_->next; /* lets us remove this watcher and all before it */ 3113 w_ = w_->next; /* lets us remove this watcher and all before it */
2950 3114
2951 if (w->wd == wd || wd == -1) 3115 if (w->wd == wd || wd == -1)
2952 { 3116 {
2953 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3117 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2954 { 3118 {
2955 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3119 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2956 w->wd = -1; 3120 w->wd = -1;
2957 infy_add (EV_A_ w); /* re-add, no matter what */ 3121 infy_add (EV_A_ w); /* re-add, no matter what */
2958 } 3122 }
2959 3123
2960 stat_timer_cb (EV_A_ &w->timer, 0); 3124 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2965 3129
2966static void 3130static void
2967infy_cb (EV_P_ ev_io *w, int revents) 3131infy_cb (EV_P_ ev_io *w, int revents)
2968{ 3132{
2969 char buf [EV_INOTIFY_BUFSIZE]; 3133 char buf [EV_INOTIFY_BUFSIZE];
2970 struct inotify_event *ev = (struct inotify_event *)buf;
2971 int ofs; 3134 int ofs;
2972 int len = read (fs_fd, buf, sizeof (buf)); 3135 int len = read (fs_fd, buf, sizeof (buf));
2973 3136
2974 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3137 for (ofs = 0; ofs < len; )
3138 {
3139 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2975 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3140 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3141 ofs += sizeof (struct inotify_event) + ev->len;
3142 }
2976} 3143}
2977 3144
2978inline_size void 3145inline_size void
2979check_2625 (EV_P) 3146ev_check_2625 (EV_P)
2980{ 3147{
2981 /* kernels < 2.6.25 are borked 3148 /* kernels < 2.6.25 are borked
2982 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3149 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2983 */ 3150 */
2984 struct utsname buf; 3151 if (ev_linux_version () < 0x020619)
2985 int major, minor, micro;
2986
2987 if (uname (&buf))
2988 return;
2989
2990 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2991 return;
2992
2993 if (major < 2
2994 || (major == 2 && minor < 6)
2995 || (major == 2 && minor == 6 && micro < 25))
2996 return; 3152 return;
2997 3153
2998 fs_2625 = 1; 3154 fs_2625 = 1;
2999} 3155}
3000 3156
… …
3015 if (fs_fd != -2) 3171 if (fs_fd != -2)
3016 return; 3172 return;
3017 3173
3018 fs_fd = -1; 3174 fs_fd = -1;
3019 3175
3020 check_2625 (EV_A); 3176 ev_check_2625 (EV_A);
3021 3177
3022 fs_fd = infy_newfd (); 3178 fs_fd = infy_newfd ();
3023 3179
3024 if (fs_fd >= 0) 3180 if (fs_fd >= 0)
3025 { 3181 {
3026 fd_intern (fs_fd); 3182 fd_intern (fs_fd);
3027 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3183 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
3028 ev_set_priority (&fs_w, EV_MAXPRI); 3184 ev_set_priority (&fs_w, EV_MAXPRI);
3029 ev_io_start (EV_A_ &fs_w); 3185 ev_io_start (EV_A_ &fs_w);
3186 ev_unref (EV_A);
3030 } 3187 }
3031} 3188}
3032 3189
3033inline_size void 3190inline_size void
3034infy_fork (EV_P) 3191infy_fork (EV_P)
… …
3036 int slot; 3193 int slot;
3037 3194
3038 if (fs_fd < 0) 3195 if (fs_fd < 0)
3039 return; 3196 return;
3040 3197
3198 ev_ref (EV_A);
3041 ev_io_stop (EV_A_ &fs_w); 3199 ev_io_stop (EV_A_ &fs_w);
3042 close (fs_fd); 3200 close (fs_fd);
3043 fs_fd = infy_newfd (); 3201 fs_fd = infy_newfd ();
3044 3202
3045 if (fs_fd >= 0) 3203 if (fs_fd >= 0)
3046 { 3204 {
3047 fd_intern (fs_fd); 3205 fd_intern (fs_fd);
3048 ev_io_set (&fs_w, fs_fd, EV_READ); 3206 ev_io_set (&fs_w, fs_fd, EV_READ);
3049 ev_io_start (EV_A_ &fs_w); 3207 ev_io_start (EV_A_ &fs_w);
3208 ev_unref (EV_A);
3050 } 3209 }
3051 3210
3052 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3211 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3053 { 3212 {
3054 WL w_ = fs_hash [slot].head; 3213 WL w_ = fs_hash [slot].head;
3055 fs_hash [slot].head = 0; 3214 fs_hash [slot].head = 0;
3056 3215
3057 while (w_) 3216 while (w_)
… …
3062 w->wd = -1; 3221 w->wd = -1;
3063 3222
3064 if (fs_fd >= 0) 3223 if (fs_fd >= 0)
3065 infy_add (EV_A_ w); /* re-add, no matter what */ 3224 infy_add (EV_A_ w); /* re-add, no matter what */
3066 else 3225 else
3226 {
3227 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3228 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3067 ev_timer_again (EV_A_ &w->timer); 3229 ev_timer_again (EV_A_ &w->timer);
3230 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3231 }
3068 } 3232 }
3069 } 3233 }
3070} 3234}
3071 3235
3072#endif 3236#endif
… …
3089static void noinline 3253static void noinline
3090stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3254stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3091{ 3255{
3092 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3256 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3093 3257
3094 /* we copy this here each the time so that */ 3258 ev_statdata prev = w->attr;
3095 /* prev has the old value when the callback gets invoked */
3096 w->prev = w->attr;
3097 ev_stat_stat (EV_A_ w); 3259 ev_stat_stat (EV_A_ w);
3098 3260
3099 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3261 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3100 if ( 3262 if (
3101 w->prev.st_dev != w->attr.st_dev 3263 prev.st_dev != w->attr.st_dev
3102 || w->prev.st_ino != w->attr.st_ino 3264 || prev.st_ino != w->attr.st_ino
3103 || w->prev.st_mode != w->attr.st_mode 3265 || prev.st_mode != w->attr.st_mode
3104 || w->prev.st_nlink != w->attr.st_nlink 3266 || prev.st_nlink != w->attr.st_nlink
3105 || w->prev.st_uid != w->attr.st_uid 3267 || prev.st_uid != w->attr.st_uid
3106 || w->prev.st_gid != w->attr.st_gid 3268 || prev.st_gid != w->attr.st_gid
3107 || w->prev.st_rdev != w->attr.st_rdev 3269 || prev.st_rdev != w->attr.st_rdev
3108 || w->prev.st_size != w->attr.st_size 3270 || prev.st_size != w->attr.st_size
3109 || w->prev.st_atime != w->attr.st_atime 3271 || prev.st_atime != w->attr.st_atime
3110 || w->prev.st_mtime != w->attr.st_mtime 3272 || prev.st_mtime != w->attr.st_mtime
3111 || w->prev.st_ctime != w->attr.st_ctime 3273 || prev.st_ctime != w->attr.st_ctime
3112 ) { 3274 ) {
3275 /* we only update w->prev on actual differences */
3276 /* in case we test more often than invoke the callback, */
3277 /* to ensure that prev is always different to attr */
3278 w->prev = prev;
3279
3113 #if EV_USE_INOTIFY 3280 #if EV_USE_INOTIFY
3114 if (fs_fd >= 0) 3281 if (fs_fd >= 0)
3115 { 3282 {
3116 infy_del (EV_A_ w); 3283 infy_del (EV_A_ w);
3117 infy_add (EV_A_ w); 3284 infy_add (EV_A_ w);
… …
3142 3309
3143 if (fs_fd >= 0) 3310 if (fs_fd >= 0)
3144 infy_add (EV_A_ w); 3311 infy_add (EV_A_ w);
3145 else 3312 else
3146#endif 3313#endif
3314 {
3147 ev_timer_again (EV_A_ &w->timer); 3315 ev_timer_again (EV_A_ &w->timer);
3316 ev_unref (EV_A);
3317 }
3148 3318
3149 ev_start (EV_A_ (W)w, 1); 3319 ev_start (EV_A_ (W)w, 1);
3150 3320
3151 EV_FREQUENT_CHECK; 3321 EV_FREQUENT_CHECK;
3152} 3322}
… …
3161 EV_FREQUENT_CHECK; 3331 EV_FREQUENT_CHECK;
3162 3332
3163#if EV_USE_INOTIFY 3333#if EV_USE_INOTIFY
3164 infy_del (EV_A_ w); 3334 infy_del (EV_A_ w);
3165#endif 3335#endif
3336
3337 if (ev_is_active (&w->timer))
3338 {
3339 ev_ref (EV_A);
3166 ev_timer_stop (EV_A_ &w->timer); 3340 ev_timer_stop (EV_A_ &w->timer);
3341 }
3167 3342
3168 ev_stop (EV_A_ (W)w); 3343 ev_stop (EV_A_ (W)w);
3169 3344
3170 EV_FREQUENT_CHECK; 3345 EV_FREQUENT_CHECK;
3171} 3346}
… …
3216 3391
3217 EV_FREQUENT_CHECK; 3392 EV_FREQUENT_CHECK;
3218} 3393}
3219#endif 3394#endif
3220 3395
3396#if EV_PREPARE_ENABLE
3221void 3397void
3222ev_prepare_start (EV_P_ ev_prepare *w) 3398ev_prepare_start (EV_P_ ev_prepare *w)
3223{ 3399{
3224 if (expect_false (ev_is_active (w))) 3400 if (expect_false (ev_is_active (w)))
3225 return; 3401 return;
… …
3251 3427
3252 ev_stop (EV_A_ (W)w); 3428 ev_stop (EV_A_ (W)w);
3253 3429
3254 EV_FREQUENT_CHECK; 3430 EV_FREQUENT_CHECK;
3255} 3431}
3432#endif
3256 3433
3434#if EV_CHECK_ENABLE
3257void 3435void
3258ev_check_start (EV_P_ ev_check *w) 3436ev_check_start (EV_P_ ev_check *w)
3259{ 3437{
3260 if (expect_false (ev_is_active (w))) 3438 if (expect_false (ev_is_active (w)))
3261 return; 3439 return;
… …
3287 3465
3288 ev_stop (EV_A_ (W)w); 3466 ev_stop (EV_A_ (W)w);
3289 3467
3290 EV_FREQUENT_CHECK; 3468 EV_FREQUENT_CHECK;
3291} 3469}
3470#endif
3292 3471
3293#if EV_EMBED_ENABLE 3472#if EV_EMBED_ENABLE
3294void noinline 3473void noinline
3295ev_embed_sweep (EV_P_ ev_embed *w) 3474ev_embed_sweep (EV_P_ ev_embed *w)
3296{ 3475{
3297 ev_loop (w->other, EVLOOP_NONBLOCK); 3476 ev_run (w->other, EVRUN_NOWAIT);
3298} 3477}
3299 3478
3300static void 3479static void
3301embed_io_cb (EV_P_ ev_io *io, int revents) 3480embed_io_cb (EV_P_ ev_io *io, int revents)
3302{ 3481{
3303 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3482 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3304 3483
3305 if (ev_cb (w)) 3484 if (ev_cb (w))
3306 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3485 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3307 else 3486 else
3308 ev_loop (w->other, EVLOOP_NONBLOCK); 3487 ev_run (w->other, EVRUN_NOWAIT);
3309} 3488}
3310 3489
3311static void 3490static void
3312embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3491embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3313{ 3492{
… …
3317 EV_P = w->other; 3496 EV_P = w->other;
3318 3497
3319 while (fdchangecnt) 3498 while (fdchangecnt)
3320 { 3499 {
3321 fd_reify (EV_A); 3500 fd_reify (EV_A);
3322 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3501 ev_run (EV_A_ EVRUN_NOWAIT);
3323 } 3502 }
3324 } 3503 }
3325} 3504}
3326 3505
3327static void 3506static void
… …
3333 3512
3334 { 3513 {
3335 EV_P = w->other; 3514 EV_P = w->other;
3336 3515
3337 ev_loop_fork (EV_A); 3516 ev_loop_fork (EV_A);
3338 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3517 ev_run (EV_A_ EVRUN_NOWAIT);
3339 } 3518 }
3340 3519
3341 ev_embed_start (EV_A_ w); 3520 ev_embed_start (EV_A_ w);
3342} 3521}
3343 3522
… …
3391 3570
3392 ev_io_stop (EV_A_ &w->io); 3571 ev_io_stop (EV_A_ &w->io);
3393 ev_prepare_stop (EV_A_ &w->prepare); 3572 ev_prepare_stop (EV_A_ &w->prepare);
3394 ev_fork_stop (EV_A_ &w->fork); 3573 ev_fork_stop (EV_A_ &w->fork);
3395 3574
3575 ev_stop (EV_A_ (W)w);
3576
3396 EV_FREQUENT_CHECK; 3577 EV_FREQUENT_CHECK;
3397} 3578}
3398#endif 3579#endif
3399 3580
3400#if EV_FORK_ENABLE 3581#if EV_FORK_ENABLE
… …
3433 3614
3434 EV_FREQUENT_CHECK; 3615 EV_FREQUENT_CHECK;
3435} 3616}
3436#endif 3617#endif
3437 3618
3438#if EV_ASYNC_ENABLE 3619#if EV_CLEANUP_ENABLE
3439void 3620void
3440ev_async_start (EV_P_ ev_async *w) 3621ev_cleanup_start (EV_P_ ev_cleanup *w)
3441{ 3622{
3442 if (expect_false (ev_is_active (w))) 3623 if (expect_false (ev_is_active (w)))
3443 return; 3624 return;
3625
3626 EV_FREQUENT_CHECK;
3627
3628 ev_start (EV_A_ (W)w, ++cleanupcnt);
3629 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3630 cleanups [cleanupcnt - 1] = w;
3631
3632 /* cleanup watchers should never keep a refcount on the loop */
3633 ev_unref (EV_A);
3634 EV_FREQUENT_CHECK;
3635}
3636
3637void
3638ev_cleanup_stop (EV_P_ ev_cleanup *w)
3639{
3640 clear_pending (EV_A_ (W)w);
3641 if (expect_false (!ev_is_active (w)))
3642 return;
3643
3644 EV_FREQUENT_CHECK;
3645 ev_ref (EV_A);
3646
3647 {
3648 int active = ev_active (w);
3649
3650 cleanups [active - 1] = cleanups [--cleanupcnt];
3651 ev_active (cleanups [active - 1]) = active;
3652 }
3653
3654 ev_stop (EV_A_ (W)w);
3655
3656 EV_FREQUENT_CHECK;
3657}
3658#endif
3659
3660#if EV_ASYNC_ENABLE
3661void
3662ev_async_start (EV_P_ ev_async *w)
3663{
3664 if (expect_false (ev_is_active (w)))
3665 return;
3666
3667 w->sent = 0;
3444 3668
3445 evpipe_init (EV_A); 3669 evpipe_init (EV_A);
3446 3670
3447 EV_FREQUENT_CHECK; 3671 EV_FREQUENT_CHECK;
3448 3672
… …
3526{ 3750{
3527 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3751 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3528 3752
3529 if (expect_false (!once)) 3753 if (expect_false (!once))
3530 { 3754 {
3531 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3755 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3532 return; 3756 return;
3533 } 3757 }
3534 3758
3535 once->cb = cb; 3759 once->cb = cb;
3536 once->arg = arg; 3760 once->arg = arg;
… …
3623 if (types & EV_ASYNC) 3847 if (types & EV_ASYNC)
3624 for (i = asynccnt; i--; ) 3848 for (i = asynccnt; i--; )
3625 cb (EV_A_ EV_ASYNC, asyncs [i]); 3849 cb (EV_A_ EV_ASYNC, asyncs [i]);
3626#endif 3850#endif
3627 3851
3852#if EV_PREPARE_ENABLE
3628 if (types & EV_PREPARE) 3853 if (types & EV_PREPARE)
3629 for (i = preparecnt; i--; ) 3854 for (i = preparecnt; i--; )
3630#if EV_EMBED_ENABLE 3855# if EV_EMBED_ENABLE
3631 if (ev_cb (prepares [i]) != embed_prepare_cb) 3856 if (ev_cb (prepares [i]) != embed_prepare_cb)
3632#endif 3857# endif
3633 cb (EV_A_ EV_PREPARE, prepares [i]); 3858 cb (EV_A_ EV_PREPARE, prepares [i]);
3859#endif
3634 3860
3861#if EV_CHECK_ENABLE
3635 if (types & EV_CHECK) 3862 if (types & EV_CHECK)
3636 for (i = checkcnt; i--; ) 3863 for (i = checkcnt; i--; )
3637 cb (EV_A_ EV_CHECK, checks [i]); 3864 cb (EV_A_ EV_CHECK, checks [i]);
3865#endif
3638 3866
3867#if EV_SIGNAL_ENABLE
3639 if (types & EV_SIGNAL) 3868 if (types & EV_SIGNAL)
3640 for (i = 0; i < EV_NSIG - 1; ++i) 3869 for (i = 0; i < EV_NSIG - 1; ++i)
3641 for (wl = signals [i].head; wl; ) 3870 for (wl = signals [i].head; wl; )
3642 { 3871 {
3643 wn = wl->next; 3872 wn = wl->next;
3644 cb (EV_A_ EV_SIGNAL, wl); 3873 cb (EV_A_ EV_SIGNAL, wl);
3645 wl = wn; 3874 wl = wn;
3646 } 3875 }
3876#endif
3647 3877
3878#if EV_CHILD_ENABLE
3648 if (types & EV_CHILD) 3879 if (types & EV_CHILD)
3649 for (i = EV_PID_HASHSIZE; i--; ) 3880 for (i = (EV_PID_HASHSIZE); i--; )
3650 for (wl = childs [i]; wl; ) 3881 for (wl = childs [i]; wl; )
3651 { 3882 {
3652 wn = wl->next; 3883 wn = wl->next;
3653 cb (EV_A_ EV_CHILD, wl); 3884 cb (EV_A_ EV_CHILD, wl);
3654 wl = wn; 3885 wl = wn;
3655 } 3886 }
3887#endif
3656/* EV_STAT 0x00001000 /* stat data changed */ 3888/* EV_STAT 0x00001000 /* stat data changed */
3657/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3889/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3658} 3890}
3659#endif 3891#endif
3660 3892
3661#if EV_MULTIPLICITY 3893#if EV_MULTIPLICITY
3662 #include "ev_wrap.h" 3894 #include "ev_wrap.h"
3663#endif 3895#endif
3664 3896
3665#ifdef __cplusplus 3897EV_CPP(})
3666}
3667#endif
3668 3898

Diff Legend

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