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

Comparing libev/ev.c (file contents):
Revision 1.289 by root, Sat Jun 6 11:13:16 2009 UTC vs.
Revision 1.346 by root, Thu Oct 14 05:07:04 2010 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 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 *
… …
57# endif 57# endif
58# ifndef EV_USE_MONOTONIC 58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 59# define EV_USE_MONOTONIC 1
60# endif 60# endif
61# endif 61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
62# endif 64# endif
63 65
64# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
… …
75# ifndef EV_USE_REALTIME 77# ifndef EV_USE_REALTIME
76# define EV_USE_REALTIME 0 78# define EV_USE_REALTIME 0
77# endif 79# endif
78# endif 80# endif
79 81
82# if HAVE_NANOSLEEP
80# ifndef EV_USE_NANOSLEEP 83# ifndef EV_USE_NANOSLEEP
81# if HAVE_NANOSLEEP
82# define EV_USE_NANOSLEEP 1 84# define EV_USE_NANOSLEEP EV_FEATURE_OS
85# endif
83# else 86# else
87# undef EV_USE_NANOSLEEP
84# define EV_USE_NANOSLEEP 0 88# define EV_USE_NANOSLEEP 0
89# endif
90
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# ifndef EV_USE_SELECT
93# define EV_USE_SELECT EV_FEATURE_BACKENDS
85# endif 94# endif
95# else
96# undef EV_USE_SELECT
97# define EV_USE_SELECT 0
86# endif 98# endif
87 99
100# if HAVE_POLL && HAVE_POLL_H
88# ifndef EV_USE_SELECT 101# ifndef EV_USE_POLL
89# if HAVE_SELECT && HAVE_SYS_SELECT_H 102# define EV_USE_POLL EV_FEATURE_BACKENDS
90# define EV_USE_SELECT 1
91# else
92# define EV_USE_SELECT 0
93# endif 103# endif
94# endif
95
96# ifndef EV_USE_POLL
97# if HAVE_POLL && HAVE_POLL_H
98# define EV_USE_POLL 1
99# else 104# else
105# undef EV_USE_POLL
100# define EV_USE_POLL 0 106# define EV_USE_POLL 0
101# endif
102# endif 107# endif
103 108
104# ifndef EV_USE_EPOLL
105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 109# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
106# define EV_USE_EPOLL 1 110# ifndef EV_USE_EPOLL
107# else 111# define EV_USE_EPOLL EV_FEATURE_BACKENDS
108# define EV_USE_EPOLL 0
109# endif 112# endif
113# else
114# undef EV_USE_EPOLL
115# define EV_USE_EPOLL 0
110# endif 116# endif
111 117
118# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
112# ifndef EV_USE_KQUEUE 119# ifndef EV_USE_KQUEUE
113# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 120# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
114# define EV_USE_KQUEUE 1
115# else
116# define EV_USE_KQUEUE 0
117# endif 121# endif
122# else
123# undef EV_USE_KQUEUE
124# define EV_USE_KQUEUE 0
118# endif 125# endif
119 126
120# ifndef EV_USE_PORT
121# if HAVE_PORT_H && HAVE_PORT_CREATE 127# if HAVE_PORT_H && HAVE_PORT_CREATE
122# define EV_USE_PORT 1 128# ifndef EV_USE_PORT
123# else 129# define EV_USE_PORT EV_FEATURE_BACKENDS
124# define EV_USE_PORT 0
125# endif 130# endif
131# else
132# undef EV_USE_PORT
133# define EV_USE_PORT 0
126# endif 134# endif
127 135
128# ifndef EV_USE_INOTIFY
129# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 136# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
130# define EV_USE_INOTIFY 1 137# ifndef EV_USE_INOTIFY
131# else
132# define EV_USE_INOTIFY 0 138# define EV_USE_INOTIFY EV_FEATURE_OS
133# endif 139# endif
140# else
141# undef EV_USE_INOTIFY
142# define EV_USE_INOTIFY 0
134# endif 143# endif
135 144
145# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
136# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_SIGNALFD
137# if HAVE_EVENTFD 147# define EV_USE_SIGNALFD EV_FEATURE_OS
138# define EV_USE_EVENTFD 1
139# else
140# define EV_USE_EVENTFD 0
141# endif 148# endif
149# else
150# undef EV_USE_SIGNALFD
151# define EV_USE_SIGNALFD 0
152# endif
153
154# if HAVE_EVENTFD
155# ifndef EV_USE_EVENTFD
156# define EV_USE_EVENTFD EV_FEATURE_OS
157# endif
158# else
159# undef EV_USE_EVENTFD
160# define EV_USE_EVENTFD 0
142# endif 161# endif
143 162
144#endif 163#endif
145 164
146#include <math.h> 165#include <math.h>
147#include <stdlib.h> 166#include <stdlib.h>
167#include <string.h>
148#include <fcntl.h> 168#include <fcntl.h>
149#include <stddef.h> 169#include <stddef.h>
150 170
151#include <stdio.h> 171#include <stdio.h>
152 172
153#include <assert.h> 173#include <assert.h>
154#include <errno.h> 174#include <errno.h>
155#include <sys/types.h> 175#include <sys/types.h>
156#include <time.h> 176#include <time.h>
177#include <limits.h>
157 178
158#include <signal.h> 179#include <signal.h>
159 180
160#ifdef EV_H 181#ifdef EV_H
161# include EV_H 182# include EV_H
… …
172# define WIN32_LEAN_AND_MEAN 193# define WIN32_LEAN_AND_MEAN
173# include <windows.h> 194# include <windows.h>
174# ifndef EV_SELECT_IS_WINSOCKET 195# ifndef EV_SELECT_IS_WINSOCKET
175# define EV_SELECT_IS_WINSOCKET 1 196# define EV_SELECT_IS_WINSOCKET 1
176# endif 197# endif
198# undef EV_AVOID_STDIO
177#endif 199#endif
200
201/* OS X, in its infinite idiocy, actually HARDCODES
202 * a limit of 1024 into their select. Where people have brains,
203 * OS X engineers apparently have a vacuum. Or maybe they were
204 * ordered to have a vacuum, or they do anything for money.
205 * This might help. Or not.
206 */
207#define _DARWIN_UNLIMITED_SELECT 1
178 208
179/* this block tries to deduce configuration from header-defined symbols and defaults */ 209/* this block tries to deduce configuration from header-defined symbols and defaults */
210
211/* try to deduce the maximum number of signals on this platform */
212#if defined (EV_NSIG)
213/* use what's provided */
214#elif defined (NSIG)
215# define EV_NSIG (NSIG)
216#elif defined(_NSIG)
217# define EV_NSIG (_NSIG)
218#elif defined (SIGMAX)
219# define EV_NSIG (SIGMAX+1)
220#elif defined (SIG_MAX)
221# define EV_NSIG (SIG_MAX+1)
222#elif defined (_SIG_MAX)
223# define EV_NSIG (_SIG_MAX+1)
224#elif defined (MAXSIG)
225# define EV_NSIG (MAXSIG+1)
226#elif defined (MAX_SIG)
227# define EV_NSIG (MAX_SIG+1)
228#elif defined (SIGARRAYSIZE)
229# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
230#elif defined (_sys_nsig)
231# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
232#else
233# error "unable to find value for NSIG, please report"
234/* to make it compile regardless, just remove the above line, */
235/* but consider reporting it, too! :) */
236# define EV_NSIG 65
237#endif
180 238
181#ifndef EV_USE_CLOCK_SYSCALL 239#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 240# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 241# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
184# else 242# else
185# define EV_USE_CLOCK_SYSCALL 0 243# define EV_USE_CLOCK_SYSCALL 0
186# endif 244# endif
187#endif 245#endif
188 246
189#ifndef EV_USE_MONOTONIC 247#ifndef EV_USE_MONOTONIC
190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 248# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
191# define EV_USE_MONOTONIC 1 249# define EV_USE_MONOTONIC EV_FEATURE_OS
192# else 250# else
193# define EV_USE_MONOTONIC 0 251# define EV_USE_MONOTONIC 0
194# endif 252# endif
195#endif 253#endif
196 254
… …
198# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 256# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
199#endif 257#endif
200 258
201#ifndef EV_USE_NANOSLEEP 259#ifndef EV_USE_NANOSLEEP
202# if _POSIX_C_SOURCE >= 199309L 260# if _POSIX_C_SOURCE >= 199309L
203# define EV_USE_NANOSLEEP 1 261# define EV_USE_NANOSLEEP EV_FEATURE_OS
204# else 262# else
205# define EV_USE_NANOSLEEP 0 263# define EV_USE_NANOSLEEP 0
206# endif 264# endif
207#endif 265#endif
208 266
209#ifndef EV_USE_SELECT 267#ifndef EV_USE_SELECT
210# define EV_USE_SELECT 1 268# define EV_USE_SELECT EV_FEATURE_BACKENDS
211#endif 269#endif
212 270
213#ifndef EV_USE_POLL 271#ifndef EV_USE_POLL
214# ifdef _WIN32 272# ifdef _WIN32
215# define EV_USE_POLL 0 273# define EV_USE_POLL 0
216# else 274# else
217# define EV_USE_POLL 1 275# define EV_USE_POLL EV_FEATURE_BACKENDS
218# endif 276# endif
219#endif 277#endif
220 278
221#ifndef EV_USE_EPOLL 279#ifndef EV_USE_EPOLL
222# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
223# define EV_USE_EPOLL 1 281# define EV_USE_EPOLL EV_FEATURE_BACKENDS
224# else 282# else
225# define EV_USE_EPOLL 0 283# define EV_USE_EPOLL 0
226# endif 284# endif
227#endif 285#endif
228 286
… …
234# define EV_USE_PORT 0 292# define EV_USE_PORT 0
235#endif 293#endif
236 294
237#ifndef EV_USE_INOTIFY 295#ifndef EV_USE_INOTIFY
238# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 296# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
239# define EV_USE_INOTIFY 1 297# define EV_USE_INOTIFY EV_FEATURE_OS
240# else 298# else
241# define EV_USE_INOTIFY 0 299# define EV_USE_INOTIFY 0
242# endif 300# endif
243#endif 301#endif
244 302
245#ifndef EV_PID_HASHSIZE 303#ifndef EV_PID_HASHSIZE
246# if EV_MINIMAL 304# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
247# define EV_PID_HASHSIZE 1
248# else
249# define EV_PID_HASHSIZE 16
250# endif
251#endif 305#endif
252 306
253#ifndef EV_INOTIFY_HASHSIZE 307#ifndef EV_INOTIFY_HASHSIZE
254# if EV_MINIMAL 308# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
255# define EV_INOTIFY_HASHSIZE 1
256# else
257# define EV_INOTIFY_HASHSIZE 16
258# endif
259#endif 309#endif
260 310
261#ifndef EV_USE_EVENTFD 311#ifndef EV_USE_EVENTFD
262# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
263# define EV_USE_EVENTFD 1 313# define EV_USE_EVENTFD EV_FEATURE_OS
264# else 314# else
265# define EV_USE_EVENTFD 0 315# define EV_USE_EVENTFD 0
316# endif
317#endif
318
319#ifndef EV_USE_SIGNALFD
320# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
321# define EV_USE_SIGNALFD EV_FEATURE_OS
322# else
323# define EV_USE_SIGNALFD 0
266# endif 324# endif
267#endif 325#endif
268 326
269#if 0 /* debugging */ 327#if 0 /* debugging */
270# define EV_VERIFY 3 328# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 329# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 330# define EV_HEAP_CACHE_AT 1
273#endif 331#endif
274 332
275#ifndef EV_VERIFY 333#ifndef EV_VERIFY
276# define EV_VERIFY !EV_MINIMAL 334# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
277#endif 335#endif
278 336
279#ifndef EV_USE_4HEAP 337#ifndef EV_USE_4HEAP
280# define EV_USE_4HEAP !EV_MINIMAL 338# define EV_USE_4HEAP EV_FEATURE_DATA
281#endif 339#endif
282 340
283#ifndef EV_HEAP_CACHE_AT 341#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 342# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
343#endif
344
345/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
346/* which makes programs even slower. might work on other unices, too. */
347#if EV_USE_CLOCK_SYSCALL
348# include <syscall.h>
349# ifdef SYS_clock_gettime
350# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
351# undef EV_USE_MONOTONIC
352# define EV_USE_MONOTONIC 1
353# else
354# undef EV_USE_CLOCK_SYSCALL
355# define EV_USE_CLOCK_SYSCALL 0
356# endif
285#endif 357#endif
286 358
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 359/* this block fixes any misconfiguration where we know we run into trouble otherwise */
360
361#ifdef _AIX
362/* AIX has a completely broken poll.h header */
363# undef EV_USE_POLL
364# define EV_USE_POLL 0
365#endif
288 366
289#ifndef CLOCK_MONOTONIC 367#ifndef CLOCK_MONOTONIC
290# undef EV_USE_MONOTONIC 368# undef EV_USE_MONOTONIC
291# define EV_USE_MONOTONIC 0 369# define EV_USE_MONOTONIC 0
292#endif 370#endif
… …
320 398
321#if EV_SELECT_IS_WINSOCKET 399#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 400# include <winsock.h>
323#endif 401#endif
324 402
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 403#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 404/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 405# include <stdint.h>
406# ifndef EFD_NONBLOCK
407# define EFD_NONBLOCK O_NONBLOCK
408# endif
409# ifndef EFD_CLOEXEC
410# ifdef O_CLOEXEC
411# define EFD_CLOEXEC O_CLOEXEC
412# else
413# define EFD_CLOEXEC 02000000
414# endif
415# endif
337# ifdef __cplusplus 416# ifdef __cplusplus
338extern "C" { 417extern "C" {
339# endif 418# endif
340int eventfd (unsigned int initval, int flags); 419int (eventfd) (unsigned int initval, int flags);
341# ifdef __cplusplus 420# ifdef __cplusplus
342} 421}
343# endif 422# endif
344#endif 423#endif
345 424
425#if EV_USE_SIGNALFD
426/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
427# include <stdint.h>
428# ifndef SFD_NONBLOCK
429# define SFD_NONBLOCK O_NONBLOCK
430# endif
431# ifndef SFD_CLOEXEC
432# ifdef O_CLOEXEC
433# define SFD_CLOEXEC O_CLOEXEC
434# else
435# define SFD_CLOEXEC 02000000
436# endif
437# endif
438# ifdef __cplusplus
439extern "C" {
440# endif
441int signalfd (int fd, const sigset_t *mask, int flags);
442
443struct signalfd_siginfo
444{
445 uint32_t ssi_signo;
446 char pad[128 - sizeof (uint32_t)];
447};
448# ifdef __cplusplus
449}
450# endif
451#endif
452
453
346/**/ 454/**/
347 455
348#if EV_VERIFY >= 3 456#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 457# define EV_FREQUENT_CHECK ev_verify (EV_A)
350#else 458#else
351# define EV_FREQUENT_CHECK do { } while (0) 459# define EV_FREQUENT_CHECK do { } while (0)
352#endif 460#endif
353 461
354/* 462/*
… …
361 */ 469 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 470#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 471
364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 472#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
365#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 473#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
366/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
367 474
368#if __GNUC__ >= 4 475#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 476# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 477# define noinline __attribute__ ((noinline))
371#else 478#else
… …
378 485
379#define expect_false(expr) expect ((expr) != 0, 0) 486#define expect_false(expr) expect ((expr) != 0, 0)
380#define expect_true(expr) expect ((expr) != 0, 1) 487#define expect_true(expr) expect ((expr) != 0, 1)
381#define inline_size static inline 488#define inline_size static inline
382 489
383#if EV_MINIMAL 490#if EV_FEATURE_CODE
491# define inline_speed static inline
492#else
384# define inline_speed static noinline 493# define inline_speed static noinline
494#endif
495
496#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
497
498#if EV_MINPRI == EV_MAXPRI
499# define ABSPRI(w) (((W)w), 0)
385#else 500#else
386# define inline_speed static inline
387#endif
388
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 501# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
502#endif
391 503
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 504#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 505#define EMPTY2(a,b) /* used to suppress some warnings */
394 506
395typedef ev_watcher *W; 507typedef ev_watcher *W;
… …
399#define ev_active(w) ((W)(w))->active 511#define ev_active(w) ((W)(w))->active
400#define ev_at(w) ((WT)(w))->at 512#define ev_at(w) ((WT)(w))->at
401 513
402#if EV_USE_REALTIME 514#if EV_USE_REALTIME
403/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 515/* sig_atomic_t is used to avoid per-thread variables or locking but still */
404/* giving it a reasonably high chance of working on typical architetcures */ 516/* giving it a reasonably high chance of working on typical architectures */
405static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 517static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
406#endif 518#endif
407 519
408#if EV_USE_MONOTONIC 520#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 521static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 522#endif
411 523
524#ifndef EV_FD_TO_WIN32_HANDLE
525# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
526#endif
527#ifndef EV_WIN32_HANDLE_TO_FD
528# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
529#endif
530#ifndef EV_WIN32_CLOSE_FD
531# define EV_WIN32_CLOSE_FD(fd) close (fd)
532#endif
533
412#ifdef _WIN32 534#ifdef _WIN32
413# include "ev_win32.c" 535# include "ev_win32.c"
414#endif 536#endif
415 537
416/*****************************************************************************/ 538/*****************************************************************************/
539
540#if EV_AVOID_STDIO
541static void noinline
542ev_printerr (const char *msg)
543{
544 write (STDERR_FILENO, msg, strlen (msg));
545}
546#endif
417 547
418static void (*syserr_cb)(const char *msg); 548static void (*syserr_cb)(const char *msg);
419 549
420void 550void
421ev_set_syserr_cb (void (*cb)(const char *msg)) 551ev_set_syserr_cb (void (*cb)(const char *msg))
… …
431 561
432 if (syserr_cb) 562 if (syserr_cb)
433 syserr_cb (msg); 563 syserr_cb (msg);
434 else 564 else
435 { 565 {
566#if EV_AVOID_STDIO
567 const char *err = strerror (errno);
568
569 ev_printerr (msg);
570 ev_printerr (": ");
571 ev_printerr (err);
572 ev_printerr ("\n");
573#else
436 perror (msg); 574 perror (msg);
575#endif
437 abort (); 576 abort ();
438 } 577 }
439} 578}
440 579
441static void * 580static void *
442ev_realloc_emul (void *ptr, long size) 581ev_realloc_emul (void *ptr, long size)
443{ 582{
583#if __GLIBC__
584 return realloc (ptr, size);
585#else
444 /* some systems, notably openbsd and darwin, fail to properly 586 /* some systems, notably openbsd and darwin, fail to properly
445 * implement realloc (x, 0) (as required by both ansi c-98 and 587 * implement realloc (x, 0) (as required by both ansi c-89 and
446 * the single unix specification, so work around them here. 588 * the single unix specification, so work around them here.
447 */ 589 */
448 590
449 if (size) 591 if (size)
450 return realloc (ptr, size); 592 return realloc (ptr, size);
451 593
452 free (ptr); 594 free (ptr);
453 return 0; 595 return 0;
596#endif
454} 597}
455 598
456static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 599static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
457 600
458void 601void
… …
466{ 609{
467 ptr = alloc (ptr, size); 610 ptr = alloc (ptr, size);
468 611
469 if (!ptr && size) 612 if (!ptr && size)
470 { 613 {
614#if EV_AVOID_STDIO
615 ev_printerr ("libev: memory allocation failed, aborting.\n");
616#else
471 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 617 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
618#endif
472 abort (); 619 abort ();
473 } 620 }
474 621
475 return ptr; 622 return ptr;
476} 623}
… …
478#define ev_malloc(size) ev_realloc (0, (size)) 625#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 626#define ev_free(ptr) ev_realloc ((ptr), 0)
480 627
481/*****************************************************************************/ 628/*****************************************************************************/
482 629
630/* set in reify when reification needed */
631#define EV_ANFD_REIFY 1
632
483/* file descriptor info structure */ 633/* file descriptor info structure */
484typedef struct 634typedef struct
485{ 635{
486 WL head; 636 WL head;
487 unsigned char events; /* the events watched for */ 637 unsigned char events; /* the events watched for */
488 unsigned char reify; /* flag set when this ANFD needs reification */ 638 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
489 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 639 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
490 unsigned char unused; 640 unsigned char unused;
491#if EV_USE_EPOLL 641#if EV_USE_EPOLL
492 unsigned int egen; /* generation counter to counter epoll bugs */ 642 unsigned int egen; /* generation counter to counter epoll bugs */
493#endif 643#endif
… …
555 705
556 static int ev_default_loop_ptr; 706 static int ev_default_loop_ptr;
557 707
558#endif 708#endif
559 709
710#if EV_FEATURE_API
711# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
712# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
713# define EV_INVOKE_PENDING invoke_cb (EV_A)
714#else
715# define EV_RELEASE_CB (void)0
716# define EV_ACQUIRE_CB (void)0
717# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
718#endif
719
720#define EVUNLOOP_RECURSE 0x80
721
560/*****************************************************************************/ 722/*****************************************************************************/
561 723
724#ifndef EV_HAVE_EV_TIME
562ev_tstamp 725ev_tstamp
563ev_time (void) 726ev_time (void)
564{ 727{
565#if EV_USE_REALTIME 728#if EV_USE_REALTIME
566 if (expect_true (have_realtime)) 729 if (expect_true (have_realtime))
… …
573 736
574 struct timeval tv; 737 struct timeval tv;
575 gettimeofday (&tv, 0); 738 gettimeofday (&tv, 0);
576 return tv.tv_sec + tv.tv_usec * 1e-6; 739 return tv.tv_sec + tv.tv_usec * 1e-6;
577} 740}
741#endif
578 742
579inline_size ev_tstamp 743inline_size ev_tstamp
580get_clock (void) 744get_clock (void)
581{ 745{
582#if EV_USE_MONOTONIC 746#if EV_USE_MONOTONIC
… …
618 782
619 tv.tv_sec = (time_t)delay; 783 tv.tv_sec = (time_t)delay;
620 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 784 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
621 785
622 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 786 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
623 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 787 /* something not guaranteed by newer posix versions, but guaranteed */
624 /* by older ones */ 788 /* by older ones */
625 select (0, 0, 0, 0, &tv); 789 select (0, 0, 0, 0, &tv);
626#endif 790#endif
627 } 791 }
628} 792}
… …
630/*****************************************************************************/ 794/*****************************************************************************/
631 795
632#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 796#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
633 797
634/* find a suitable new size for the given array, */ 798/* find a suitable new size for the given array, */
635/* hopefully by rounding to a ncie-to-malloc size */ 799/* hopefully by rounding to a nice-to-malloc size */
636inline_size int 800inline_size int
637array_nextsize (int elem, int cur, int cnt) 801array_nextsize (int elem, int cur, int cnt)
638{ 802{
639 int ncur = cur + 1; 803 int ncur = cur + 1;
640 804
… …
736} 900}
737 901
738/*****************************************************************************/ 902/*****************************************************************************/
739 903
740inline_speed void 904inline_speed void
741fd_event (EV_P_ int fd, int revents) 905fd_event_nocheck (EV_P_ int fd, int revents)
742{ 906{
743 ANFD *anfd = anfds + fd; 907 ANFD *anfd = anfds + fd;
744 ev_io *w; 908 ev_io *w;
745 909
746 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 910 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
750 if (ev) 914 if (ev)
751 ev_feed_event (EV_A_ (W)w, ev); 915 ev_feed_event (EV_A_ (W)w, ev);
752 } 916 }
753} 917}
754 918
919/* do not submit kernel events for fds that have reify set */
920/* because that means they changed while we were polling for new events */
921inline_speed void
922fd_event (EV_P_ int fd, int revents)
923{
924 ANFD *anfd = anfds + fd;
925
926 if (expect_true (!anfd->reify))
927 fd_event_nocheck (EV_A_ fd, revents);
928}
929
755void 930void
756ev_feed_fd_event (EV_P_ int fd, int revents) 931ev_feed_fd_event (EV_P_ int fd, int revents)
757{ 932{
758 if (fd >= 0 && fd < anfdmax) 933 if (fd >= 0 && fd < anfdmax)
759 fd_event (EV_A_ fd, revents); 934 fd_event_nocheck (EV_A_ fd, revents);
760} 935}
761 936
762/* make sure the external fd watch events are in-sync */ 937/* make sure the external fd watch events are in-sync */
763/* with the kernel/libev internal state */ 938/* with the kernel/libev internal state */
764inline_size void 939inline_size void
… …
779 954
780#if EV_SELECT_IS_WINSOCKET 955#if EV_SELECT_IS_WINSOCKET
781 if (events) 956 if (events)
782 { 957 {
783 unsigned long arg; 958 unsigned long arg;
784 #ifdef EV_FD_TO_WIN32_HANDLE
785 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 959 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
786 #else
787 anfd->handle = _get_osfhandle (fd);
788 #endif
789 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 960 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
790 } 961 }
791#endif 962#endif
792 963
793 { 964 {
… …
831 ev_io_stop (EV_A_ w); 1002 ev_io_stop (EV_A_ w);
832 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1003 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
833 } 1004 }
834} 1005}
835 1006
836/* check whether the given fd is atcually valid, for error recovery */ 1007/* check whether the given fd is actually valid, for error recovery */
837inline_size int 1008inline_size int
838fd_valid (int fd) 1009fd_valid (int fd)
839{ 1010{
840#ifdef _WIN32 1011#ifdef _WIN32
841 return _get_osfhandle (fd) != -1; 1012 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
842#else 1013#else
843 return fcntl (fd, F_GETFD) != -1; 1014 return fcntl (fd, F_GETFD) != -1;
844#endif 1015#endif
845} 1016}
846 1017
… …
864 1035
865 for (fd = anfdmax; fd--; ) 1036 for (fd = anfdmax; fd--; )
866 if (anfds [fd].events) 1037 if (anfds [fd].events)
867 { 1038 {
868 fd_kill (EV_A_ fd); 1039 fd_kill (EV_A_ fd);
869 return; 1040 break;
870 } 1041 }
871} 1042}
872 1043
873/* usually called after fork if backend needs to re-arm all fds from scratch */ 1044/* usually called after fork if backend needs to re-arm all fds from scratch */
874static void noinline 1045static void noinline
… …
879 for (fd = 0; fd < anfdmax; ++fd) 1050 for (fd = 0; fd < anfdmax; ++fd)
880 if (anfds [fd].events) 1051 if (anfds [fd].events)
881 { 1052 {
882 anfds [fd].events = 0; 1053 anfds [fd].events = 0;
883 anfds [fd].emask = 0; 1054 anfds [fd].emask = 0;
884 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1055 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
885 } 1056 }
886} 1057}
887 1058
1059/* used to prepare libev internal fd's */
1060/* this is not fork-safe */
1061inline_speed void
1062fd_intern (int fd)
1063{
1064#ifdef _WIN32
1065 unsigned long arg = 1;
1066 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1067#else
1068 fcntl (fd, F_SETFD, FD_CLOEXEC);
1069 fcntl (fd, F_SETFL, O_NONBLOCK);
1070#endif
1071}
1072
888/*****************************************************************************/ 1073/*****************************************************************************/
889 1074
890/* 1075/*
891 * the heap functions want a real array index. array index 0 uis guaranteed to not 1076 * the heap functions want a real array index. array index 0 is guaranteed to not
892 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1077 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
893 * the branching factor of the d-tree. 1078 * the branching factor of the d-tree.
894 */ 1079 */
895 1080
896/* 1081/*
… …
964 1149
965 for (;;) 1150 for (;;)
966 { 1151 {
967 int c = k << 1; 1152 int c = k << 1;
968 1153
969 if (c > N + HEAP0 - 1) 1154 if (c >= N + HEAP0)
970 break; 1155 break;
971 1156
972 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1157 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
973 ? 1 : 0; 1158 ? 1 : 0;
974 1159
… …
1010 1195
1011/* move an element suitably so it is in a correct place */ 1196/* move an element suitably so it is in a correct place */
1012inline_size void 1197inline_size void
1013adjustheap (ANHE *heap, int N, int k) 1198adjustheap (ANHE *heap, int N, int k)
1014{ 1199{
1015 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1200 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1016 upheap (heap, k); 1201 upheap (heap, k);
1017 else 1202 else
1018 downheap (heap, N, k); 1203 downheap (heap, N, k);
1019} 1204}
1020 1205
… …
1033/*****************************************************************************/ 1218/*****************************************************************************/
1034 1219
1035/* associate signal watchers to a signal signal */ 1220/* associate signal watchers to a signal signal */
1036typedef struct 1221typedef struct
1037{ 1222{
1223 EV_ATOMIC_T pending;
1224#if EV_MULTIPLICITY
1225 EV_P;
1226#endif
1038 WL head; 1227 WL head;
1039 EV_ATOMIC_T gotsig;
1040} ANSIG; 1228} ANSIG;
1041 1229
1042static ANSIG *signals; 1230static ANSIG signals [EV_NSIG - 1];
1043static int signalmax;
1044
1045static EV_ATOMIC_T gotsig;
1046 1231
1047/*****************************************************************************/ 1232/*****************************************************************************/
1048 1233
1049/* used to prepare libev internal fd's */ 1234#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1050/* this is not fork-safe */
1051inline_speed void
1052fd_intern (int fd)
1053{
1054#ifdef _WIN32
1055 unsigned long arg = 1;
1056 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1057#else
1058 fcntl (fd, F_SETFD, FD_CLOEXEC);
1059 fcntl (fd, F_SETFL, O_NONBLOCK);
1060#endif
1061}
1062 1235
1063static void noinline 1236static void noinline
1064evpipe_init (EV_P) 1237evpipe_init (EV_P)
1065{ 1238{
1066 if (!ev_is_active (&pipe_w)) 1239 if (!ev_is_active (&pipe_w))
1067 { 1240 {
1068#if EV_USE_EVENTFD 1241# if EV_USE_EVENTFD
1242 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1243 if (evfd < 0 && errno == EINVAL)
1069 if ((evfd = eventfd (0, 0)) >= 0) 1244 evfd = eventfd (0, 0);
1245
1246 if (evfd >= 0)
1070 { 1247 {
1071 evpipe [0] = -1; 1248 evpipe [0] = -1;
1072 fd_intern (evfd); 1249 fd_intern (evfd); /* doing it twice doesn't hurt */
1073 ev_io_set (&pipe_w, evfd, EV_READ); 1250 ev_io_set (&pipe_w, evfd, EV_READ);
1074 } 1251 }
1075 else 1252 else
1076#endif 1253# endif
1077 { 1254 {
1078 while (pipe (evpipe)) 1255 while (pipe (evpipe))
1079 ev_syserr ("(libev) error creating signal/async pipe"); 1256 ev_syserr ("(libev) error creating signal/async pipe");
1080 1257
1081 fd_intern (evpipe [0]); 1258 fd_intern (evpipe [0]);
… …
1092evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1269evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1093{ 1270{
1094 if (!*flag) 1271 if (!*flag)
1095 { 1272 {
1096 int old_errno = errno; /* save errno because write might clobber it */ 1273 int old_errno = errno; /* save errno because write might clobber it */
1274 char dummy;
1097 1275
1098 *flag = 1; 1276 *flag = 1;
1099 1277
1100#if EV_USE_EVENTFD 1278#if EV_USE_EVENTFD
1101 if (evfd >= 0) 1279 if (evfd >= 0)
… …
1103 uint64_t counter = 1; 1281 uint64_t counter = 1;
1104 write (evfd, &counter, sizeof (uint64_t)); 1282 write (evfd, &counter, sizeof (uint64_t));
1105 } 1283 }
1106 else 1284 else
1107#endif 1285#endif
1286 /* win32 people keep sending patches that change this write() to send() */
1287 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1288 /* so when you think this write should be a send instead, please find out */
1289 /* where your send() is from - it's definitely not the microsoft send, and */
1290 /* tell me. thank you. */
1108 write (evpipe [1], &old_errno, 1); 1291 write (evpipe [1], &dummy, 1);
1109 1292
1110 errno = old_errno; 1293 errno = old_errno;
1111 } 1294 }
1112} 1295}
1113 1296
1114/* called whenever the libev signal pipe */ 1297/* called whenever the libev signal pipe */
1115/* got some events (signal, async) */ 1298/* got some events (signal, async) */
1116static void 1299static void
1117pipecb (EV_P_ ev_io *iow, int revents) 1300pipecb (EV_P_ ev_io *iow, int revents)
1118{ 1301{
1302 int i;
1303
1119#if EV_USE_EVENTFD 1304#if EV_USE_EVENTFD
1120 if (evfd >= 0) 1305 if (evfd >= 0)
1121 { 1306 {
1122 uint64_t counter; 1307 uint64_t counter;
1123 read (evfd, &counter, sizeof (uint64_t)); 1308 read (evfd, &counter, sizeof (uint64_t));
1124 } 1309 }
1125 else 1310 else
1126#endif 1311#endif
1127 { 1312 {
1128 char dummy; 1313 char dummy;
1314 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1129 read (evpipe [0], &dummy, 1); 1315 read (evpipe [0], &dummy, 1);
1130 } 1316 }
1131 1317
1132 if (gotsig && ev_is_default_loop (EV_A)) 1318 if (sig_pending)
1133 { 1319 {
1134 int signum; 1320 sig_pending = 0;
1135 gotsig = 0;
1136 1321
1137 for (signum = signalmax; signum--; ) 1322 for (i = EV_NSIG - 1; i--; )
1138 if (signals [signum].gotsig) 1323 if (expect_false (signals [i].pending))
1139 ev_feed_signal_event (EV_A_ signum + 1); 1324 ev_feed_signal_event (EV_A_ i + 1);
1140 } 1325 }
1141 1326
1142#if EV_ASYNC_ENABLE 1327#if EV_ASYNC_ENABLE
1143 if (gotasync) 1328 if (async_pending)
1144 { 1329 {
1145 int i; 1330 async_pending = 0;
1146 gotasync = 0;
1147 1331
1148 for (i = asynccnt; i--; ) 1332 for (i = asynccnt; i--; )
1149 if (asyncs [i]->sent) 1333 if (asyncs [i]->sent)
1150 { 1334 {
1151 asyncs [i]->sent = 0; 1335 asyncs [i]->sent = 0;
… …
1159 1343
1160static void 1344static void
1161ev_sighandler (int signum) 1345ev_sighandler (int signum)
1162{ 1346{
1163#if EV_MULTIPLICITY 1347#if EV_MULTIPLICITY
1164 struct ev_loop *loop = &default_loop_struct; 1348 EV_P = signals [signum - 1].loop;
1165#endif 1349#endif
1166 1350
1167#if _WIN32 1351#ifdef _WIN32
1168 signal (signum, ev_sighandler); 1352 signal (signum, ev_sighandler);
1169#endif 1353#endif
1170 1354
1171 signals [signum - 1].gotsig = 1; 1355 signals [signum - 1].pending = 1;
1172 evpipe_write (EV_A_ &gotsig); 1356 evpipe_write (EV_A_ &sig_pending);
1173} 1357}
1174 1358
1175void noinline 1359void noinline
1176ev_feed_signal_event (EV_P_ int signum) 1360ev_feed_signal_event (EV_P_ int signum)
1177{ 1361{
1178 WL w; 1362 WL w;
1179 1363
1364 if (expect_false (signum <= 0 || signum > EV_NSIG))
1365 return;
1366
1367 --signum;
1368
1180#if EV_MULTIPLICITY 1369#if EV_MULTIPLICITY
1181 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1370 /* it is permissible to try to feed a signal to the wrong loop */
1182#endif 1371 /* or, likely more useful, feeding a signal nobody is waiting for */
1183 1372
1184 --signum; 1373 if (expect_false (signals [signum].loop != EV_A))
1185
1186 if (signum < 0 || signum >= signalmax)
1187 return; 1374 return;
1375#endif
1188 1376
1189 signals [signum].gotsig = 0; 1377 signals [signum].pending = 0;
1190 1378
1191 for (w = signals [signum].head; w; w = w->next) 1379 for (w = signals [signum].head; w; w = w->next)
1192 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1380 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1193} 1381}
1194 1382
1383#if EV_USE_SIGNALFD
1384static void
1385sigfdcb (EV_P_ ev_io *iow, int revents)
1386{
1387 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1388
1389 for (;;)
1390 {
1391 ssize_t res = read (sigfd, si, sizeof (si));
1392
1393 /* not ISO-C, as res might be -1, but works with SuS */
1394 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1395 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1396
1397 if (res < (ssize_t)sizeof (si))
1398 break;
1399 }
1400}
1401#endif
1402
1403#endif
1404
1195/*****************************************************************************/ 1405/*****************************************************************************/
1196 1406
1407#if EV_CHILD_ENABLE
1197static WL childs [EV_PID_HASHSIZE]; 1408static WL childs [EV_PID_HASHSIZE];
1198
1199#ifndef _WIN32
1200 1409
1201static ev_signal childev; 1410static ev_signal childev;
1202 1411
1203#ifndef WIFCONTINUED 1412#ifndef WIFCONTINUED
1204# define WIFCONTINUED(status) 0 1413# define WIFCONTINUED(status) 0
… …
1209child_reap (EV_P_ int chain, int pid, int status) 1418child_reap (EV_P_ int chain, int pid, int status)
1210{ 1419{
1211 ev_child *w; 1420 ev_child *w;
1212 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1421 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1213 1422
1214 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1423 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1215 { 1424 {
1216 if ((w->pid == pid || !w->pid) 1425 if ((w->pid == pid || !w->pid)
1217 && (!traced || (w->flags & 1))) 1426 && (!traced || (w->flags & 1)))
1218 { 1427 {
1219 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1428 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1244 /* make sure we are called again until all children have been reaped */ 1453 /* make sure we are called again until all children have been reaped */
1245 /* we need to do it this way so that the callback gets called before we continue */ 1454 /* we need to do it this way so that the callback gets called before we continue */
1246 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1455 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1247 1456
1248 child_reap (EV_A_ pid, pid, status); 1457 child_reap (EV_A_ pid, pid, status);
1249 if (EV_PID_HASHSIZE > 1) 1458 if ((EV_PID_HASHSIZE) > 1)
1250 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1459 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1251} 1460}
1252 1461
1253#endif 1462#endif
1254 1463
… …
1321#ifdef __APPLE__ 1530#ifdef __APPLE__
1322 /* only select works correctly on that "unix-certified" platform */ 1531 /* only select works correctly on that "unix-certified" platform */
1323 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1532 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1324 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1533 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1325#endif 1534#endif
1535#ifdef __FreeBSD__
1536 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1537#endif
1326 1538
1327 return flags; 1539 return flags;
1328} 1540}
1329 1541
1330unsigned int 1542unsigned int
… …
1343ev_backend (EV_P) 1555ev_backend (EV_P)
1344{ 1556{
1345 return backend; 1557 return backend;
1346} 1558}
1347 1559
1560#if EV_FEATURE_API
1348unsigned int 1561unsigned int
1349ev_loop_count (EV_P) 1562ev_iteration (EV_P)
1350{ 1563{
1351 return loop_count; 1564 return loop_count;
1352} 1565}
1353 1566
1567unsigned int
1568ev_depth (EV_P)
1569{
1570 return loop_depth;
1571}
1572
1354void 1573void
1355ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1574ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1356{ 1575{
1357 io_blocktime = interval; 1576 io_blocktime = interval;
1358} 1577}
… …
1360void 1579void
1361ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1580ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1362{ 1581{
1363 timeout_blocktime = interval; 1582 timeout_blocktime = interval;
1364} 1583}
1584
1585void
1586ev_set_userdata (EV_P_ void *data)
1587{
1588 userdata = data;
1589}
1590
1591void *
1592ev_userdata (EV_P)
1593{
1594 return userdata;
1595}
1596
1597void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1598{
1599 invoke_cb = invoke_pending_cb;
1600}
1601
1602void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1603{
1604 release_cb = release;
1605 acquire_cb = acquire;
1606}
1607#endif
1365 1608
1366/* initialise a loop structure, must be zero-initialised */ 1609/* initialise a loop structure, must be zero-initialised */
1367static void noinline 1610static void noinline
1368loop_init (EV_P_ unsigned int flags) 1611loop_init (EV_P_ unsigned int flags)
1369{ 1612{
… …
1387 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1630 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1388 have_monotonic = 1; 1631 have_monotonic = 1;
1389 } 1632 }
1390#endif 1633#endif
1391 1634
1635 /* pid check not overridable via env */
1636#ifndef _WIN32
1637 if (flags & EVFLAG_FORKCHECK)
1638 curpid = getpid ();
1639#endif
1640
1641 if (!(flags & EVFLAG_NOENV)
1642 && !enable_secure ()
1643 && getenv ("LIBEV_FLAGS"))
1644 flags = atoi (getenv ("LIBEV_FLAGS"));
1645
1392 ev_rt_now = ev_time (); 1646 ev_rt_now = ev_time ();
1393 mn_now = get_clock (); 1647 mn_now = get_clock ();
1394 now_floor = mn_now; 1648 now_floor = mn_now;
1395 rtmn_diff = ev_rt_now - mn_now; 1649 rtmn_diff = ev_rt_now - mn_now;
1650#if EV_FEATURE_API
1651 invoke_cb = ev_invoke_pending;
1652#endif
1396 1653
1397 io_blocktime = 0.; 1654 io_blocktime = 0.;
1398 timeout_blocktime = 0.; 1655 timeout_blocktime = 0.;
1399 backend = 0; 1656 backend = 0;
1400 backend_fd = -1; 1657 backend_fd = -1;
1401 gotasync = 0; 1658 sig_pending = 0;
1659#if EV_ASYNC_ENABLE
1660 async_pending = 0;
1661#endif
1402#if EV_USE_INOTIFY 1662#if EV_USE_INOTIFY
1403 fs_fd = -2; 1663 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1404#endif 1664#endif
1405 1665#if EV_USE_SIGNALFD
1406 /* pid check not overridable via env */ 1666 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1407#ifndef _WIN32
1408 if (flags & EVFLAG_FORKCHECK)
1409 curpid = getpid ();
1410#endif 1667#endif
1411
1412 if (!(flags & EVFLAG_NOENV)
1413 && !enable_secure ()
1414 && getenv ("LIBEV_FLAGS"))
1415 flags = atoi (getenv ("LIBEV_FLAGS"));
1416 1668
1417 if (!(flags & 0x0000ffffU)) 1669 if (!(flags & 0x0000ffffU))
1418 flags |= ev_recommended_backends (); 1670 flags |= ev_recommended_backends ();
1419 1671
1420#if EV_USE_PORT 1672#if EV_USE_PORT
… …
1433 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1685 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1434#endif 1686#endif
1435 1687
1436 ev_prepare_init (&pending_w, pendingcb); 1688 ev_prepare_init (&pending_w, pendingcb);
1437 1689
1690#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1438 ev_init (&pipe_w, pipecb); 1691 ev_init (&pipe_w, pipecb);
1439 ev_set_priority (&pipe_w, EV_MAXPRI); 1692 ev_set_priority (&pipe_w, EV_MAXPRI);
1693#endif
1440 } 1694 }
1441} 1695}
1442 1696
1443/* free up a loop structure */ 1697/* free up a loop structure */
1444static void noinline 1698static void noinline
… …
1446{ 1700{
1447 int i; 1701 int i;
1448 1702
1449 if (ev_is_active (&pipe_w)) 1703 if (ev_is_active (&pipe_w))
1450 { 1704 {
1451 ev_ref (EV_A); /* signal watcher */ 1705 /*ev_ref (EV_A);*/
1452 ev_io_stop (EV_A_ &pipe_w); 1706 /*ev_io_stop (EV_A_ &pipe_w);*/
1453 1707
1454#if EV_USE_EVENTFD 1708#if EV_USE_EVENTFD
1455 if (evfd >= 0) 1709 if (evfd >= 0)
1456 close (evfd); 1710 close (evfd);
1457#endif 1711#endif
1458 1712
1459 if (evpipe [0] >= 0) 1713 if (evpipe [0] >= 0)
1460 { 1714 {
1461 close (evpipe [0]); 1715 EV_WIN32_CLOSE_FD (evpipe [0]);
1462 close (evpipe [1]); 1716 EV_WIN32_CLOSE_FD (evpipe [1]);
1463 } 1717 }
1464 } 1718 }
1719
1720#if EV_USE_SIGNALFD
1721 if (ev_is_active (&sigfd_w))
1722 close (sigfd);
1723#endif
1465 1724
1466#if EV_USE_INOTIFY 1725#if EV_USE_INOTIFY
1467 if (fs_fd >= 0) 1726 if (fs_fd >= 0)
1468 close (fs_fd); 1727 close (fs_fd);
1469#endif 1728#endif
… …
1493#if EV_IDLE_ENABLE 1752#if EV_IDLE_ENABLE
1494 array_free (idle, [i]); 1753 array_free (idle, [i]);
1495#endif 1754#endif
1496 } 1755 }
1497 1756
1498 ev_free (anfds); anfdmax = 0; 1757 ev_free (anfds); anfds = 0; anfdmax = 0;
1499 1758
1500 /* have to use the microsoft-never-gets-it-right macro */ 1759 /* have to use the microsoft-never-gets-it-right macro */
1501 array_free (rfeed, EMPTY); 1760 array_free (rfeed, EMPTY);
1502 array_free (fdchange, EMPTY); 1761 array_free (fdchange, EMPTY);
1503 array_free (timer, EMPTY); 1762 array_free (timer, EMPTY);
… …
1538 1797
1539 if (ev_is_active (&pipe_w)) 1798 if (ev_is_active (&pipe_w))
1540 { 1799 {
1541 /* this "locks" the handlers against writing to the pipe */ 1800 /* this "locks" the handlers against writing to the pipe */
1542 /* while we modify the fd vars */ 1801 /* while we modify the fd vars */
1543 gotsig = 1; 1802 sig_pending = 1;
1544#if EV_ASYNC_ENABLE 1803#if EV_ASYNC_ENABLE
1545 gotasync = 1; 1804 async_pending = 1;
1546#endif 1805#endif
1547 1806
1548 ev_ref (EV_A); 1807 ev_ref (EV_A);
1549 ev_io_stop (EV_A_ &pipe_w); 1808 ev_io_stop (EV_A_ &pipe_w);
1550 1809
… …
1553 close (evfd); 1812 close (evfd);
1554#endif 1813#endif
1555 1814
1556 if (evpipe [0] >= 0) 1815 if (evpipe [0] >= 0)
1557 { 1816 {
1558 close (evpipe [0]); 1817 EV_WIN32_CLOSE_FD (evpipe [0]);
1559 close (evpipe [1]); 1818 EV_WIN32_CLOSE_FD (evpipe [1]);
1560 } 1819 }
1561 1820
1821#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1562 evpipe_init (EV_A); 1822 evpipe_init (EV_A);
1563 /* now iterate over everything, in case we missed something */ 1823 /* now iterate over everything, in case we missed something */
1564 pipecb (EV_A_ &pipe_w, EV_READ); 1824 pipecb (EV_A_ &pipe_w, EV_READ);
1825#endif
1565 } 1826 }
1566 1827
1567 postfork = 0; 1828 postfork = 0;
1568} 1829}
1569 1830
1570#if EV_MULTIPLICITY 1831#if EV_MULTIPLICITY
1571 1832
1572struct ev_loop * 1833struct ev_loop *
1573ev_loop_new (unsigned int flags) 1834ev_loop_new (unsigned int flags)
1574{ 1835{
1575 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1836 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1576 1837
1577 memset (loop, 0, sizeof (struct ev_loop)); 1838 memset (EV_A, 0, sizeof (struct ev_loop));
1578
1579 loop_init (EV_A_ flags); 1839 loop_init (EV_A_ flags);
1580 1840
1581 if (ev_backend (EV_A)) 1841 if (ev_backend (EV_A))
1582 return loop; 1842 return EV_A;
1583 1843
1584 return 0; 1844 return 0;
1585} 1845}
1586 1846
1587void 1847void
… …
1594void 1854void
1595ev_loop_fork (EV_P) 1855ev_loop_fork (EV_P)
1596{ 1856{
1597 postfork = 1; /* must be in line with ev_default_fork */ 1857 postfork = 1; /* must be in line with ev_default_fork */
1598} 1858}
1859#endif /* multiplicity */
1599 1860
1600#if EV_VERIFY 1861#if EV_VERIFY
1601static void noinline 1862static void noinline
1602verify_watcher (EV_P_ W w) 1863verify_watcher (EV_P_ W w)
1603{ 1864{
… …
1631 verify_watcher (EV_A_ ws [cnt]); 1892 verify_watcher (EV_A_ ws [cnt]);
1632 } 1893 }
1633} 1894}
1634#endif 1895#endif
1635 1896
1897#if EV_FEATURE_API
1636void 1898void
1637ev_loop_verify (EV_P) 1899ev_verify (EV_P)
1638{ 1900{
1639#if EV_VERIFY 1901#if EV_VERIFY
1640 int i; 1902 int i;
1641 WL w; 1903 WL w;
1642 1904
… …
1681#if EV_ASYNC_ENABLE 1943#if EV_ASYNC_ENABLE
1682 assert (asyncmax >= asynccnt); 1944 assert (asyncmax >= asynccnt);
1683 array_verify (EV_A_ (W *)asyncs, asynccnt); 1945 array_verify (EV_A_ (W *)asyncs, asynccnt);
1684#endif 1946#endif
1685 1947
1948#if EV_PREPARE_ENABLE
1686 assert (preparemax >= preparecnt); 1949 assert (preparemax >= preparecnt);
1687 array_verify (EV_A_ (W *)prepares, preparecnt); 1950 array_verify (EV_A_ (W *)prepares, preparecnt);
1951#endif
1688 1952
1953#if EV_CHECK_ENABLE
1689 assert (checkmax >= checkcnt); 1954 assert (checkmax >= checkcnt);
1690 array_verify (EV_A_ (W *)checks, checkcnt); 1955 array_verify (EV_A_ (W *)checks, checkcnt);
1956#endif
1691 1957
1692# if 0 1958# if 0
1959#if EV_CHILD_ENABLE
1693 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1960 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1694 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1961 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1962#endif
1695# endif 1963# endif
1696#endif 1964#endif
1697} 1965}
1698 1966#endif
1699#endif /* multiplicity */
1700 1967
1701#if EV_MULTIPLICITY 1968#if EV_MULTIPLICITY
1702struct ev_loop * 1969struct ev_loop *
1703ev_default_loop_init (unsigned int flags) 1970ev_default_loop_init (unsigned int flags)
1704#else 1971#else
… …
1707#endif 1974#endif
1708{ 1975{
1709 if (!ev_default_loop_ptr) 1976 if (!ev_default_loop_ptr)
1710 { 1977 {
1711#if EV_MULTIPLICITY 1978#if EV_MULTIPLICITY
1712 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1979 EV_P = ev_default_loop_ptr = &default_loop_struct;
1713#else 1980#else
1714 ev_default_loop_ptr = 1; 1981 ev_default_loop_ptr = 1;
1715#endif 1982#endif
1716 1983
1717 loop_init (EV_A_ flags); 1984 loop_init (EV_A_ flags);
1718 1985
1719 if (ev_backend (EV_A)) 1986 if (ev_backend (EV_A))
1720 { 1987 {
1721#ifndef _WIN32 1988#if EV_CHILD_ENABLE
1722 ev_signal_init (&childev, childcb, SIGCHLD); 1989 ev_signal_init (&childev, childcb, SIGCHLD);
1723 ev_set_priority (&childev, EV_MAXPRI); 1990 ev_set_priority (&childev, EV_MAXPRI);
1724 ev_signal_start (EV_A_ &childev); 1991 ev_signal_start (EV_A_ &childev);
1725 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1992 ev_unref (EV_A); /* child watcher should not keep loop alive */
1726#endif 1993#endif
… …
1734 2001
1735void 2002void
1736ev_default_destroy (void) 2003ev_default_destroy (void)
1737{ 2004{
1738#if EV_MULTIPLICITY 2005#if EV_MULTIPLICITY
1739 struct ev_loop *loop = ev_default_loop_ptr; 2006 EV_P = ev_default_loop_ptr;
1740#endif 2007#endif
1741 2008
1742 ev_default_loop_ptr = 0; 2009 ev_default_loop_ptr = 0;
1743 2010
1744#ifndef _WIN32 2011#if EV_CHILD_ENABLE
1745 ev_ref (EV_A); /* child watcher */ 2012 ev_ref (EV_A); /* child watcher */
1746 ev_signal_stop (EV_A_ &childev); 2013 ev_signal_stop (EV_A_ &childev);
1747#endif 2014#endif
1748 2015
1749 loop_destroy (EV_A); 2016 loop_destroy (EV_A);
… …
1751 2018
1752void 2019void
1753ev_default_fork (void) 2020ev_default_fork (void)
1754{ 2021{
1755#if EV_MULTIPLICITY 2022#if EV_MULTIPLICITY
1756 struct ev_loop *loop = ev_default_loop_ptr; 2023 EV_P = ev_default_loop_ptr;
1757#endif 2024#endif
1758 2025
1759 postfork = 1; /* must be in line with ev_loop_fork */ 2026 postfork = 1; /* must be in line with ev_loop_fork */
1760} 2027}
1761 2028
… …
1765ev_invoke (EV_P_ void *w, int revents) 2032ev_invoke (EV_P_ void *w, int revents)
1766{ 2033{
1767 EV_CB_INVOKE ((W)w, revents); 2034 EV_CB_INVOKE ((W)w, revents);
1768} 2035}
1769 2036
1770inline_speed void 2037unsigned int
1771call_pending (EV_P) 2038ev_pending_count (EV_P)
2039{
2040 int pri;
2041 unsigned int count = 0;
2042
2043 for (pri = NUMPRI; pri--; )
2044 count += pendingcnt [pri];
2045
2046 return count;
2047}
2048
2049void noinline
2050ev_invoke_pending (EV_P)
1772{ 2051{
1773 int pri; 2052 int pri;
1774 2053
1775 for (pri = NUMPRI; pri--; ) 2054 for (pri = NUMPRI; pri--; )
1776 while (pendingcnt [pri]) 2055 while (pendingcnt [pri])
… …
1843 EV_FREQUENT_CHECK; 2122 EV_FREQUENT_CHECK;
1844 feed_reverse (EV_A_ (W)w); 2123 feed_reverse (EV_A_ (W)w);
1845 } 2124 }
1846 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2125 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1847 2126
1848 feed_reverse_done (EV_A_ EV_TIMEOUT); 2127 feed_reverse_done (EV_A_ EV_TIMER);
1849 } 2128 }
1850} 2129}
1851 2130
1852#if EV_PERIODIC_ENABLE 2131#if EV_PERIODIC_ENABLE
1853/* make periodics pending */ 2132/* make periodics pending */
… …
1906 feed_reverse_done (EV_A_ EV_PERIODIC); 2185 feed_reverse_done (EV_A_ EV_PERIODIC);
1907 } 2186 }
1908} 2187}
1909 2188
1910/* simply recalculate all periodics */ 2189/* simply recalculate all periodics */
1911/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2190/* TODO: maybe ensure that at least one event happens when jumping forward? */
1912static void noinline 2191static void noinline
1913periodics_reschedule (EV_P) 2192periodics_reschedule (EV_P)
1914{ 2193{
1915 int i; 2194 int i;
1916 2195
… …
1944 ANHE_at_cache (*he); 2223 ANHE_at_cache (*he);
1945 } 2224 }
1946} 2225}
1947 2226
1948/* fetch new monotonic and realtime times from the kernel */ 2227/* fetch new monotonic and realtime times from the kernel */
1949/* also detetc if there was a timejump, and act accordingly */ 2228/* also detect if there was a timejump, and act accordingly */
1950inline_speed void 2229inline_speed void
1951time_update (EV_P_ ev_tstamp max_block) 2230time_update (EV_P_ ev_tstamp max_block)
1952{ 2231{
1953#if EV_USE_MONOTONIC 2232#if EV_USE_MONOTONIC
1954 if (expect_true (have_monotonic)) 2233 if (expect_true (have_monotonic))
… …
2011 2290
2012 mn_now = ev_rt_now; 2291 mn_now = ev_rt_now;
2013 } 2292 }
2014} 2293}
2015 2294
2016static int loop_done;
2017
2018void 2295void
2019ev_loop (EV_P_ int flags) 2296ev_loop (EV_P_ int flags)
2020{ 2297{
2298#if EV_FEATURE_API
2299 ++loop_depth;
2300#endif
2301
2302 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2303
2021 loop_done = EVUNLOOP_CANCEL; 2304 loop_done = EVUNLOOP_CANCEL;
2022 2305
2023 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2306 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2024 2307
2025 do 2308 do
2026 { 2309 {
2027#if EV_VERIFY >= 2 2310#if EV_VERIFY >= 2
2028 ev_loop_verify (EV_A); 2311 ev_verify (EV_A);
2029#endif 2312#endif
2030 2313
2031#ifndef _WIN32 2314#ifndef _WIN32
2032 if (expect_false (curpid)) /* penalise the forking check even more */ 2315 if (expect_false (curpid)) /* penalise the forking check even more */
2033 if (expect_false (getpid () != curpid)) 2316 if (expect_false (getpid () != curpid))
… …
2041 /* we might have forked, so queue fork handlers */ 2324 /* we might have forked, so queue fork handlers */
2042 if (expect_false (postfork)) 2325 if (expect_false (postfork))
2043 if (forkcnt) 2326 if (forkcnt)
2044 { 2327 {
2045 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2328 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2046 call_pending (EV_A); 2329 EV_INVOKE_PENDING;
2047 } 2330 }
2048#endif 2331#endif
2049 2332
2333#if EV_PREPARE_ENABLE
2050 /* queue prepare watchers (and execute them) */ 2334 /* queue prepare watchers (and execute them) */
2051 if (expect_false (preparecnt)) 2335 if (expect_false (preparecnt))
2052 { 2336 {
2053 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2337 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2054 call_pending (EV_A); 2338 EV_INVOKE_PENDING;
2055 } 2339 }
2340#endif
2341
2342 if (expect_false (loop_done))
2343 break;
2056 2344
2057 /* we might have forked, so reify kernel state if necessary */ 2345 /* we might have forked, so reify kernel state if necessary */
2058 if (expect_false (postfork)) 2346 if (expect_false (postfork))
2059 loop_fork (EV_A); 2347 loop_fork (EV_A);
2060 2348
… …
2066 ev_tstamp waittime = 0.; 2354 ev_tstamp waittime = 0.;
2067 ev_tstamp sleeptime = 0.; 2355 ev_tstamp sleeptime = 0.;
2068 2356
2069 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2357 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2070 { 2358 {
2359 /* remember old timestamp for io_blocktime calculation */
2360 ev_tstamp prev_mn_now = mn_now;
2361
2071 /* update time to cancel out callback processing overhead */ 2362 /* update time to cancel out callback processing overhead */
2072 time_update (EV_A_ 1e100); 2363 time_update (EV_A_ 1e100);
2073 2364
2074 waittime = MAX_BLOCKTIME; 2365 waittime = MAX_BLOCKTIME;
2075 2366
… …
2085 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2376 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2086 if (waittime > to) waittime = to; 2377 if (waittime > to) waittime = to;
2087 } 2378 }
2088#endif 2379#endif
2089 2380
2381 /* don't let timeouts decrease the waittime below timeout_blocktime */
2090 if (expect_false (waittime < timeout_blocktime)) 2382 if (expect_false (waittime < timeout_blocktime))
2091 waittime = timeout_blocktime; 2383 waittime = timeout_blocktime;
2092 2384
2093 sleeptime = waittime - backend_fudge; 2385 /* extra check because io_blocktime is commonly 0 */
2094
2095 if (expect_true (sleeptime > io_blocktime)) 2386 if (expect_false (io_blocktime))
2096 sleeptime = io_blocktime;
2097
2098 if (sleeptime)
2099 { 2387 {
2388 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2389
2390 if (sleeptime > waittime - backend_fudge)
2391 sleeptime = waittime - backend_fudge;
2392
2393 if (expect_true (sleeptime > 0.))
2394 {
2100 ev_sleep (sleeptime); 2395 ev_sleep (sleeptime);
2101 waittime -= sleeptime; 2396 waittime -= sleeptime;
2397 }
2102 } 2398 }
2103 } 2399 }
2104 2400
2401#if EV_FEATURE_API
2105 ++loop_count; 2402 ++loop_count;
2403#endif
2404 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2106 backend_poll (EV_A_ waittime); 2405 backend_poll (EV_A_ waittime);
2406 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2107 2407
2108 /* update ev_rt_now, do magic */ 2408 /* update ev_rt_now, do magic */
2109 time_update (EV_A_ waittime + sleeptime); 2409 time_update (EV_A_ waittime + sleeptime);
2110 } 2410 }
2111 2411
… …
2118#if EV_IDLE_ENABLE 2418#if EV_IDLE_ENABLE
2119 /* queue idle watchers unless other events are pending */ 2419 /* queue idle watchers unless other events are pending */
2120 idle_reify (EV_A); 2420 idle_reify (EV_A);
2121#endif 2421#endif
2122 2422
2423#if EV_CHECK_ENABLE
2123 /* queue check watchers, to be executed first */ 2424 /* queue check watchers, to be executed first */
2124 if (expect_false (checkcnt)) 2425 if (expect_false (checkcnt))
2125 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2426 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2427#endif
2126 2428
2127 call_pending (EV_A); 2429 EV_INVOKE_PENDING;
2128 } 2430 }
2129 while (expect_true ( 2431 while (expect_true (
2130 activecnt 2432 activecnt
2131 && !loop_done 2433 && !loop_done
2132 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2434 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2133 )); 2435 ));
2134 2436
2135 if (loop_done == EVUNLOOP_ONE) 2437 if (loop_done == EVUNLOOP_ONE)
2136 loop_done = EVUNLOOP_CANCEL; 2438 loop_done = EVUNLOOP_CANCEL;
2439
2440#if EV_FEATURE_API
2441 --loop_depth;
2442#endif
2137} 2443}
2138 2444
2139void 2445void
2140ev_unloop (EV_P_ int how) 2446ev_unloop (EV_P_ int how)
2141{ 2447{
… …
2192inline_size void 2498inline_size void
2193wlist_del (WL *head, WL elem) 2499wlist_del (WL *head, WL elem)
2194{ 2500{
2195 while (*head) 2501 while (*head)
2196 { 2502 {
2197 if (*head == elem) 2503 if (expect_true (*head == elem))
2198 { 2504 {
2199 *head = elem->next; 2505 *head = elem->next;
2200 return; 2506 break;
2201 } 2507 }
2202 2508
2203 head = &(*head)->next; 2509 head = &(*head)->next;
2204 } 2510 }
2205} 2511}
… …
2233} 2539}
2234 2540
2235inline_size void 2541inline_size void
2236pri_adjust (EV_P_ W w) 2542pri_adjust (EV_P_ W w)
2237{ 2543{
2238 int pri = w->priority; 2544 int pri = ev_priority (w);
2239 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2545 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2240 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2546 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2241 w->priority = pri; 2547 ev_set_priority (w, pri);
2242} 2548}
2243 2549
2244inline_speed void 2550inline_speed void
2245ev_start (EV_P_ W w, int active) 2551ev_start (EV_P_ W w, int active)
2246{ 2552{
… …
2265 2571
2266 if (expect_false (ev_is_active (w))) 2572 if (expect_false (ev_is_active (w)))
2267 return; 2573 return;
2268 2574
2269 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2575 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2270 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2576 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2271 2577
2272 EV_FREQUENT_CHECK; 2578 EV_FREQUENT_CHECK;
2273 2579
2274 ev_start (EV_A_ (W)w, 1); 2580 ev_start (EV_A_ (W)w, 1);
2275 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2581 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2276 wlist_add (&anfds[fd].head, (WL)w); 2582 wlist_add (&anfds[fd].head, (WL)w);
2277 2583
2278 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2584 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2279 w->events &= ~EV__IOFDSET; 2585 w->events &= ~EV__IOFDSET;
2280 2586
2281 EV_FREQUENT_CHECK; 2587 EV_FREQUENT_CHECK;
2282} 2588}
2283 2589
… …
2345 timers [active] = timers [timercnt + HEAP0]; 2651 timers [active] = timers [timercnt + HEAP0];
2346 adjustheap (timers, timercnt, active); 2652 adjustheap (timers, timercnt, active);
2347 } 2653 }
2348 } 2654 }
2349 2655
2350 EV_FREQUENT_CHECK;
2351
2352 ev_at (w) -= mn_now; 2656 ev_at (w) -= mn_now;
2353 2657
2354 ev_stop (EV_A_ (W)w); 2658 ev_stop (EV_A_ (W)w);
2659
2660 EV_FREQUENT_CHECK;
2355} 2661}
2356 2662
2357void noinline 2663void noinline
2358ev_timer_again (EV_P_ ev_timer *w) 2664ev_timer_again (EV_P_ ev_timer *w)
2359{ 2665{
… …
2377 } 2683 }
2378 2684
2379 EV_FREQUENT_CHECK; 2685 EV_FREQUENT_CHECK;
2380} 2686}
2381 2687
2688ev_tstamp
2689ev_timer_remaining (EV_P_ ev_timer *w)
2690{
2691 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2692}
2693
2382#if EV_PERIODIC_ENABLE 2694#if EV_PERIODIC_ENABLE
2383void noinline 2695void noinline
2384ev_periodic_start (EV_P_ ev_periodic *w) 2696ev_periodic_start (EV_P_ ev_periodic *w)
2385{ 2697{
2386 if (expect_false (ev_is_active (w))) 2698 if (expect_false (ev_is_active (w)))
… …
2432 periodics [active] = periodics [periodiccnt + HEAP0]; 2744 periodics [active] = periodics [periodiccnt + HEAP0];
2433 adjustheap (periodics, periodiccnt, active); 2745 adjustheap (periodics, periodiccnt, active);
2434 } 2746 }
2435 } 2747 }
2436 2748
2437 EV_FREQUENT_CHECK;
2438
2439 ev_stop (EV_A_ (W)w); 2749 ev_stop (EV_A_ (W)w);
2750
2751 EV_FREQUENT_CHECK;
2440} 2752}
2441 2753
2442void noinline 2754void noinline
2443ev_periodic_again (EV_P_ ev_periodic *w) 2755ev_periodic_again (EV_P_ ev_periodic *w)
2444{ 2756{
… …
2450 2762
2451#ifndef SA_RESTART 2763#ifndef SA_RESTART
2452# define SA_RESTART 0 2764# define SA_RESTART 0
2453#endif 2765#endif
2454 2766
2767#if EV_SIGNAL_ENABLE
2768
2455void noinline 2769void noinline
2456ev_signal_start (EV_P_ ev_signal *w) 2770ev_signal_start (EV_P_ ev_signal *w)
2457{ 2771{
2458#if EV_MULTIPLICITY
2459 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2460#endif
2461 if (expect_false (ev_is_active (w))) 2772 if (expect_false (ev_is_active (w)))
2462 return; 2773 return;
2463 2774
2464 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2775 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2465 2776
2466 evpipe_init (EV_A); 2777#if EV_MULTIPLICITY
2778 assert (("libev: a signal must not be attached to two different loops",
2779 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2467 2780
2468 EV_FREQUENT_CHECK; 2781 signals [w->signum - 1].loop = EV_A;
2782#endif
2469 2783
2784 EV_FREQUENT_CHECK;
2785
2786#if EV_USE_SIGNALFD
2787 if (sigfd == -2)
2470 { 2788 {
2471#ifndef _WIN32 2789 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2472 sigset_t full, prev; 2790 if (sigfd < 0 && errno == EINVAL)
2473 sigfillset (&full); 2791 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2474 sigprocmask (SIG_SETMASK, &full, &prev);
2475#endif
2476 2792
2477 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2793 if (sigfd >= 0)
2794 {
2795 fd_intern (sigfd); /* doing it twice will not hurt */
2478 2796
2479#ifndef _WIN32 2797 sigemptyset (&sigfd_set);
2480 sigprocmask (SIG_SETMASK, &prev, 0); 2798
2481#endif 2799 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2800 ev_set_priority (&sigfd_w, EV_MAXPRI);
2801 ev_io_start (EV_A_ &sigfd_w);
2802 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2803 }
2482 } 2804 }
2805
2806 if (sigfd >= 0)
2807 {
2808 /* TODO: check .head */
2809 sigaddset (&sigfd_set, w->signum);
2810 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2811
2812 signalfd (sigfd, &sigfd_set, 0);
2813 }
2814#endif
2483 2815
2484 ev_start (EV_A_ (W)w, 1); 2816 ev_start (EV_A_ (W)w, 1);
2485 wlist_add (&signals [w->signum - 1].head, (WL)w); 2817 wlist_add (&signals [w->signum - 1].head, (WL)w);
2486 2818
2487 if (!((WL)w)->next) 2819 if (!((WL)w)->next)
2820# if EV_USE_SIGNALFD
2821 if (sigfd < 0) /*TODO*/
2822# endif
2488 { 2823 {
2489#if _WIN32 2824# ifdef _WIN32
2825 evpipe_init (EV_A);
2826
2490 signal (w->signum, ev_sighandler); 2827 signal (w->signum, ev_sighandler);
2491#else 2828# else
2492 struct sigaction sa; 2829 struct sigaction sa;
2830
2831 evpipe_init (EV_A);
2832
2493 sa.sa_handler = ev_sighandler; 2833 sa.sa_handler = ev_sighandler;
2494 sigfillset (&sa.sa_mask); 2834 sigfillset (&sa.sa_mask);
2495 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2835 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2496 sigaction (w->signum, &sa, 0); 2836 sigaction (w->signum, &sa, 0);
2837
2838 sigemptyset (&sa.sa_mask);
2839 sigaddset (&sa.sa_mask, w->signum);
2840 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2497#endif 2841#endif
2498 } 2842 }
2499 2843
2500 EV_FREQUENT_CHECK; 2844 EV_FREQUENT_CHECK;
2501} 2845}
2502 2846
2503void noinline 2847void noinline
… …
2511 2855
2512 wlist_del (&signals [w->signum - 1].head, (WL)w); 2856 wlist_del (&signals [w->signum - 1].head, (WL)w);
2513 ev_stop (EV_A_ (W)w); 2857 ev_stop (EV_A_ (W)w);
2514 2858
2515 if (!signals [w->signum - 1].head) 2859 if (!signals [w->signum - 1].head)
2860 {
2861#if EV_MULTIPLICITY
2862 signals [w->signum - 1].loop = 0; /* unattach from signal */
2863#endif
2864#if EV_USE_SIGNALFD
2865 if (sigfd >= 0)
2866 {
2867 sigset_t ss;
2868
2869 sigemptyset (&ss);
2870 sigaddset (&ss, w->signum);
2871 sigdelset (&sigfd_set, w->signum);
2872
2873 signalfd (sigfd, &sigfd_set, 0);
2874 sigprocmask (SIG_UNBLOCK, &ss, 0);
2875 }
2876 else
2877#endif
2516 signal (w->signum, SIG_DFL); 2878 signal (w->signum, SIG_DFL);
2879 }
2517 2880
2518 EV_FREQUENT_CHECK; 2881 EV_FREQUENT_CHECK;
2519} 2882}
2883
2884#endif
2885
2886#if EV_CHILD_ENABLE
2520 2887
2521void 2888void
2522ev_child_start (EV_P_ ev_child *w) 2889ev_child_start (EV_P_ ev_child *w)
2523{ 2890{
2524#if EV_MULTIPLICITY 2891#if EV_MULTIPLICITY
… …
2528 return; 2895 return;
2529 2896
2530 EV_FREQUENT_CHECK; 2897 EV_FREQUENT_CHECK;
2531 2898
2532 ev_start (EV_A_ (W)w, 1); 2899 ev_start (EV_A_ (W)w, 1);
2533 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2900 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2534 2901
2535 EV_FREQUENT_CHECK; 2902 EV_FREQUENT_CHECK;
2536} 2903}
2537 2904
2538void 2905void
… …
2542 if (expect_false (!ev_is_active (w))) 2909 if (expect_false (!ev_is_active (w)))
2543 return; 2910 return;
2544 2911
2545 EV_FREQUENT_CHECK; 2912 EV_FREQUENT_CHECK;
2546 2913
2547 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2914 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2548 ev_stop (EV_A_ (W)w); 2915 ev_stop (EV_A_ (W)w);
2549 2916
2550 EV_FREQUENT_CHECK; 2917 EV_FREQUENT_CHECK;
2551} 2918}
2919
2920#endif
2552 2921
2553#if EV_STAT_ENABLE 2922#if EV_STAT_ENABLE
2554 2923
2555# ifdef _WIN32 2924# ifdef _WIN32
2556# undef lstat 2925# undef lstat
… …
2562#define MIN_STAT_INTERVAL 0.1074891 2931#define MIN_STAT_INTERVAL 0.1074891
2563 2932
2564static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2933static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2565 2934
2566#if EV_USE_INOTIFY 2935#if EV_USE_INOTIFY
2567# define EV_INOTIFY_BUFSIZE 8192 2936
2937/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2938# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2568 2939
2569static void noinline 2940static void noinline
2570infy_add (EV_P_ ev_stat *w) 2941infy_add (EV_P_ ev_stat *w)
2571{ 2942{
2572 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); 2943 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);
2573 2944
2574 if (w->wd < 0) 2945 if (w->wd >= 0)
2946 {
2947 struct statfs sfs;
2948
2949 /* now local changes will be tracked by inotify, but remote changes won't */
2950 /* unless the filesystem is known to be local, we therefore still poll */
2951 /* also do poll on <2.6.25, but with normal frequency */
2952
2953 if (!fs_2625)
2954 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2955 else if (!statfs (w->path, &sfs)
2956 && (sfs.f_type == 0x1373 /* devfs */
2957 || sfs.f_type == 0xEF53 /* ext2/3 */
2958 || sfs.f_type == 0x3153464a /* jfs */
2959 || sfs.f_type == 0x52654973 /* reiser3 */
2960 || sfs.f_type == 0x01021994 /* tempfs */
2961 || sfs.f_type == 0x58465342 /* xfs */))
2962 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2963 else
2964 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2575 { 2965 }
2966 else
2967 {
2968 /* can't use inotify, continue to stat */
2576 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2969 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2577 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2578 2970
2579 /* monitor some parent directory for speedup hints */ 2971 /* if path is not there, monitor some parent directory for speedup hints */
2580 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2972 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2581 /* but an efficiency issue only */ 2973 /* but an efficiency issue only */
2582 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2974 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2583 { 2975 {
2584 char path [4096]; 2976 char path [4096];
… …
2600 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2992 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2601 } 2993 }
2602 } 2994 }
2603 2995
2604 if (w->wd >= 0) 2996 if (w->wd >= 0)
2605 {
2606 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2997 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2607 2998
2608 /* now local changes will be tracked by inotify, but remote changes won't */ 2999 /* now re-arm timer, if required */
2609 /* unless the filesystem it known to be local, we therefore still poll */ 3000 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2610 /* also do poll on <2.6.25, but with normal frequency */
2611 struct statfs sfs;
2612
2613 if (fs_2625 && !statfs (w->path, &sfs))
2614 if (sfs.f_type == 0x1373 /* devfs */
2615 || sfs.f_type == 0xEF53 /* ext2/3 */
2616 || sfs.f_type == 0x3153464a /* jfs */
2617 || sfs.f_type == 0x52654973 /* reiser3 */
2618 || sfs.f_type == 0x01021994 /* tempfs */
2619 || sfs.f_type == 0x58465342 /* xfs */)
2620 return;
2621
2622 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2623 ev_timer_again (EV_A_ &w->timer); 3001 ev_timer_again (EV_A_ &w->timer);
2624 } 3002 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2625} 3003}
2626 3004
2627static void noinline 3005static void noinline
2628infy_del (EV_P_ ev_stat *w) 3006infy_del (EV_P_ ev_stat *w)
2629{ 3007{
… …
2632 3010
2633 if (wd < 0) 3011 if (wd < 0)
2634 return; 3012 return;
2635 3013
2636 w->wd = -2; 3014 w->wd = -2;
2637 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3015 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2638 wlist_del (&fs_hash [slot].head, (WL)w); 3016 wlist_del (&fs_hash [slot].head, (WL)w);
2639 3017
2640 /* remove this watcher, if others are watching it, they will rearm */ 3018 /* remove this watcher, if others are watching it, they will rearm */
2641 inotify_rm_watch (fs_fd, wd); 3019 inotify_rm_watch (fs_fd, wd);
2642} 3020}
… …
2644static void noinline 3022static void noinline
2645infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3023infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2646{ 3024{
2647 if (slot < 0) 3025 if (slot < 0)
2648 /* overflow, need to check for all hash slots */ 3026 /* overflow, need to check for all hash slots */
2649 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3027 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2650 infy_wd (EV_A_ slot, wd, ev); 3028 infy_wd (EV_A_ slot, wd, ev);
2651 else 3029 else
2652 { 3030 {
2653 WL w_; 3031 WL w_;
2654 3032
2655 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3033 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2656 { 3034 {
2657 ev_stat *w = (ev_stat *)w_; 3035 ev_stat *w = (ev_stat *)w_;
2658 w_ = w_->next; /* lets us remove this watcher and all before it */ 3036 w_ = w_->next; /* lets us remove this watcher and all before it */
2659 3037
2660 if (w->wd == wd || wd == -1) 3038 if (w->wd == wd || wd == -1)
2661 { 3039 {
2662 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3040 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2663 { 3041 {
2664 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3042 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2665 w->wd = -1; 3043 w->wd = -1;
2666 infy_add (EV_A_ w); /* re-add, no matter what */ 3044 infy_add (EV_A_ w); /* re-add, no matter what */
2667 } 3045 }
2668 3046
2669 stat_timer_cb (EV_A_ &w->timer, 0); 3047 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2674 3052
2675static void 3053static void
2676infy_cb (EV_P_ ev_io *w, int revents) 3054infy_cb (EV_P_ ev_io *w, int revents)
2677{ 3055{
2678 char buf [EV_INOTIFY_BUFSIZE]; 3056 char buf [EV_INOTIFY_BUFSIZE];
2679 struct inotify_event *ev = (struct inotify_event *)buf;
2680 int ofs; 3057 int ofs;
2681 int len = read (fs_fd, buf, sizeof (buf)); 3058 int len = read (fs_fd, buf, sizeof (buf));
2682 3059
2683 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3060 for (ofs = 0; ofs < len; )
3061 {
3062 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2684 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3063 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3064 ofs += sizeof (struct inotify_event) + ev->len;
3065 }
3066}
3067
3068inline_size unsigned int
3069ev_linux_version (void)
3070{
3071 struct utsname buf;
3072 unsigned int v;
3073 int i;
3074 char *p = buf.release;
3075
3076 if (uname (&buf))
3077 return 0;
3078
3079 for (i = 3+1; --i; )
3080 {
3081 unsigned int c = 0;
3082
3083 for (;;)
3084 {
3085 if (*p >= '0' && *p <= '9')
3086 c = c * 10 + *p++ - '0';
3087 else
3088 {
3089 p += *p == '.';
3090 break;
3091 }
3092 }
3093
3094 v = (v << 8) | c;
3095 }
3096
3097 return v;
2685} 3098}
2686 3099
2687inline_size void 3100inline_size void
2688check_2625 (EV_P) 3101ev_check_2625 (EV_P)
2689{ 3102{
2690 /* kernels < 2.6.25 are borked 3103 /* kernels < 2.6.25 are borked
2691 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3104 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2692 */ 3105 */
2693 struct utsname buf; 3106 if (ev_linux_version () < 0x020619)
2694 int major, minor, micro;
2695
2696 if (uname (&buf))
2697 return; 3107 return;
2698 3108
2699 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2700 return;
2701
2702 if (major < 2
2703 || (major == 2 && minor < 6)
2704 || (major == 2 && minor == 6 && micro < 25))
2705 return;
2706
2707 fs_2625 = 1; 3109 fs_2625 = 1;
3110}
3111
3112inline_size int
3113infy_newfd (void)
3114{
3115#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3116 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3117 if (fd >= 0)
3118 return fd;
3119#endif
3120 return inotify_init ();
2708} 3121}
2709 3122
2710inline_size void 3123inline_size void
2711infy_init (EV_P) 3124infy_init (EV_P)
2712{ 3125{
2713 if (fs_fd != -2) 3126 if (fs_fd != -2)
2714 return; 3127 return;
2715 3128
2716 fs_fd = -1; 3129 fs_fd = -1;
2717 3130
2718 check_2625 (EV_A); 3131 ev_check_2625 (EV_A);
2719 3132
2720 fs_fd = inotify_init (); 3133 fs_fd = infy_newfd ();
2721 3134
2722 if (fs_fd >= 0) 3135 if (fs_fd >= 0)
2723 { 3136 {
3137 fd_intern (fs_fd);
2724 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3138 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2725 ev_set_priority (&fs_w, EV_MAXPRI); 3139 ev_set_priority (&fs_w, EV_MAXPRI);
2726 ev_io_start (EV_A_ &fs_w); 3140 ev_io_start (EV_A_ &fs_w);
3141 ev_unref (EV_A);
2727 } 3142 }
2728} 3143}
2729 3144
2730inline_size void 3145inline_size void
2731infy_fork (EV_P) 3146infy_fork (EV_P)
… …
2733 int slot; 3148 int slot;
2734 3149
2735 if (fs_fd < 0) 3150 if (fs_fd < 0)
2736 return; 3151 return;
2737 3152
3153 ev_ref (EV_A);
3154 ev_io_stop (EV_A_ &fs_w);
2738 close (fs_fd); 3155 close (fs_fd);
2739 fs_fd = inotify_init (); 3156 fs_fd = infy_newfd ();
2740 3157
3158 if (fs_fd >= 0)
3159 {
3160 fd_intern (fs_fd);
3161 ev_io_set (&fs_w, fs_fd, EV_READ);
3162 ev_io_start (EV_A_ &fs_w);
3163 ev_unref (EV_A);
3164 }
3165
2741 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3166 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2742 { 3167 {
2743 WL w_ = fs_hash [slot].head; 3168 WL w_ = fs_hash [slot].head;
2744 fs_hash [slot].head = 0; 3169 fs_hash [slot].head = 0;
2745 3170
2746 while (w_) 3171 while (w_)
… …
2751 w->wd = -1; 3176 w->wd = -1;
2752 3177
2753 if (fs_fd >= 0) 3178 if (fs_fd >= 0)
2754 infy_add (EV_A_ w); /* re-add, no matter what */ 3179 infy_add (EV_A_ w); /* re-add, no matter what */
2755 else 3180 else
3181 {
3182 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3183 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2756 ev_timer_again (EV_A_ &w->timer); 3184 ev_timer_again (EV_A_ &w->timer);
3185 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3186 }
2757 } 3187 }
2758 } 3188 }
2759} 3189}
2760 3190
2761#endif 3191#endif
… …
2778static void noinline 3208static void noinline
2779stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3209stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2780{ 3210{
2781 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3211 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2782 3212
2783 /* we copy this here each the time so that */ 3213 ev_statdata prev = w->attr;
2784 /* prev has the old value when the callback gets invoked */
2785 w->prev = w->attr;
2786 ev_stat_stat (EV_A_ w); 3214 ev_stat_stat (EV_A_ w);
2787 3215
2788 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3216 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2789 if ( 3217 if (
2790 w->prev.st_dev != w->attr.st_dev 3218 prev.st_dev != w->attr.st_dev
2791 || w->prev.st_ino != w->attr.st_ino 3219 || prev.st_ino != w->attr.st_ino
2792 || w->prev.st_mode != w->attr.st_mode 3220 || prev.st_mode != w->attr.st_mode
2793 || w->prev.st_nlink != w->attr.st_nlink 3221 || prev.st_nlink != w->attr.st_nlink
2794 || w->prev.st_uid != w->attr.st_uid 3222 || prev.st_uid != w->attr.st_uid
2795 || w->prev.st_gid != w->attr.st_gid 3223 || prev.st_gid != w->attr.st_gid
2796 || w->prev.st_rdev != w->attr.st_rdev 3224 || prev.st_rdev != w->attr.st_rdev
2797 || w->prev.st_size != w->attr.st_size 3225 || prev.st_size != w->attr.st_size
2798 || w->prev.st_atime != w->attr.st_atime 3226 || prev.st_atime != w->attr.st_atime
2799 || w->prev.st_mtime != w->attr.st_mtime 3227 || prev.st_mtime != w->attr.st_mtime
2800 || w->prev.st_ctime != w->attr.st_ctime 3228 || prev.st_ctime != w->attr.st_ctime
2801 ) { 3229 ) {
3230 /* we only update w->prev on actual differences */
3231 /* in case we test more often than invoke the callback, */
3232 /* to ensure that prev is always different to attr */
3233 w->prev = prev;
3234
2802 #if EV_USE_INOTIFY 3235 #if EV_USE_INOTIFY
2803 if (fs_fd >= 0) 3236 if (fs_fd >= 0)
2804 { 3237 {
2805 infy_del (EV_A_ w); 3238 infy_del (EV_A_ w);
2806 infy_add (EV_A_ w); 3239 infy_add (EV_A_ w);
… …
2831 3264
2832 if (fs_fd >= 0) 3265 if (fs_fd >= 0)
2833 infy_add (EV_A_ w); 3266 infy_add (EV_A_ w);
2834 else 3267 else
2835#endif 3268#endif
3269 {
2836 ev_timer_again (EV_A_ &w->timer); 3270 ev_timer_again (EV_A_ &w->timer);
3271 ev_unref (EV_A);
3272 }
2837 3273
2838 ev_start (EV_A_ (W)w, 1); 3274 ev_start (EV_A_ (W)w, 1);
2839 3275
2840 EV_FREQUENT_CHECK; 3276 EV_FREQUENT_CHECK;
2841} 3277}
… …
2850 EV_FREQUENT_CHECK; 3286 EV_FREQUENT_CHECK;
2851 3287
2852#if EV_USE_INOTIFY 3288#if EV_USE_INOTIFY
2853 infy_del (EV_A_ w); 3289 infy_del (EV_A_ w);
2854#endif 3290#endif
3291
3292 if (ev_is_active (&w->timer))
3293 {
3294 ev_ref (EV_A);
2855 ev_timer_stop (EV_A_ &w->timer); 3295 ev_timer_stop (EV_A_ &w->timer);
3296 }
2856 3297
2857 ev_stop (EV_A_ (W)w); 3298 ev_stop (EV_A_ (W)w);
2858 3299
2859 EV_FREQUENT_CHECK; 3300 EV_FREQUENT_CHECK;
2860} 3301}
… …
2905 3346
2906 EV_FREQUENT_CHECK; 3347 EV_FREQUENT_CHECK;
2907} 3348}
2908#endif 3349#endif
2909 3350
3351#if EV_PREPARE_ENABLE
2910void 3352void
2911ev_prepare_start (EV_P_ ev_prepare *w) 3353ev_prepare_start (EV_P_ ev_prepare *w)
2912{ 3354{
2913 if (expect_false (ev_is_active (w))) 3355 if (expect_false (ev_is_active (w)))
2914 return; 3356 return;
… …
2940 3382
2941 ev_stop (EV_A_ (W)w); 3383 ev_stop (EV_A_ (W)w);
2942 3384
2943 EV_FREQUENT_CHECK; 3385 EV_FREQUENT_CHECK;
2944} 3386}
3387#endif
2945 3388
3389#if EV_CHECK_ENABLE
2946void 3390void
2947ev_check_start (EV_P_ ev_check *w) 3391ev_check_start (EV_P_ ev_check *w)
2948{ 3392{
2949 if (expect_false (ev_is_active (w))) 3393 if (expect_false (ev_is_active (w)))
2950 return; 3394 return;
… …
2976 3420
2977 ev_stop (EV_A_ (W)w); 3421 ev_stop (EV_A_ (W)w);
2978 3422
2979 EV_FREQUENT_CHECK; 3423 EV_FREQUENT_CHECK;
2980} 3424}
3425#endif
2981 3426
2982#if EV_EMBED_ENABLE 3427#if EV_EMBED_ENABLE
2983void noinline 3428void noinline
2984ev_embed_sweep (EV_P_ ev_embed *w) 3429ev_embed_sweep (EV_P_ ev_embed *w)
2985{ 3430{
… …
3001embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3446embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3002{ 3447{
3003 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3448 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3004 3449
3005 { 3450 {
3006 struct ev_loop *loop = w->other; 3451 EV_P = w->other;
3007 3452
3008 while (fdchangecnt) 3453 while (fdchangecnt)
3009 { 3454 {
3010 fd_reify (EV_A); 3455 fd_reify (EV_A);
3011 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3456 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3019 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3464 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3020 3465
3021 ev_embed_stop (EV_A_ w); 3466 ev_embed_stop (EV_A_ w);
3022 3467
3023 { 3468 {
3024 struct ev_loop *loop = w->other; 3469 EV_P = w->other;
3025 3470
3026 ev_loop_fork (EV_A); 3471 ev_loop_fork (EV_A);
3027 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3472 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3028 } 3473 }
3029 3474
… …
3043{ 3488{
3044 if (expect_false (ev_is_active (w))) 3489 if (expect_false (ev_is_active (w)))
3045 return; 3490 return;
3046 3491
3047 { 3492 {
3048 struct ev_loop *loop = w->other; 3493 EV_P = w->other;
3049 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3494 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3050 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3495 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3051 } 3496 }
3052 3497
3053 EV_FREQUENT_CHECK; 3498 EV_FREQUENT_CHECK;
… …
3080 3525
3081 ev_io_stop (EV_A_ &w->io); 3526 ev_io_stop (EV_A_ &w->io);
3082 ev_prepare_stop (EV_A_ &w->prepare); 3527 ev_prepare_stop (EV_A_ &w->prepare);
3083 ev_fork_stop (EV_A_ &w->fork); 3528 ev_fork_stop (EV_A_ &w->fork);
3084 3529
3530 ev_stop (EV_A_ (W)w);
3531
3085 EV_FREQUENT_CHECK; 3532 EV_FREQUENT_CHECK;
3086} 3533}
3087#endif 3534#endif
3088 3535
3089#if EV_FORK_ENABLE 3536#if EV_FORK_ENABLE
… …
3165 3612
3166void 3613void
3167ev_async_send (EV_P_ ev_async *w) 3614ev_async_send (EV_P_ ev_async *w)
3168{ 3615{
3169 w->sent = 1; 3616 w->sent = 1;
3170 evpipe_write (EV_A_ &gotasync); 3617 evpipe_write (EV_A_ &async_pending);
3171} 3618}
3172#endif 3619#endif
3173 3620
3174/*****************************************************************************/ 3621/*****************************************************************************/
3175 3622
… …
3215{ 3662{
3216 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3663 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3217 3664
3218 if (expect_false (!once)) 3665 if (expect_false (!once))
3219 { 3666 {
3220 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3667 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3221 return; 3668 return;
3222 } 3669 }
3223 3670
3224 once->cb = cb; 3671 once->cb = cb;
3225 once->arg = arg; 3672 once->arg = arg;
… …
3312 if (types & EV_ASYNC) 3759 if (types & EV_ASYNC)
3313 for (i = asynccnt; i--; ) 3760 for (i = asynccnt; i--; )
3314 cb (EV_A_ EV_ASYNC, asyncs [i]); 3761 cb (EV_A_ EV_ASYNC, asyncs [i]);
3315#endif 3762#endif
3316 3763
3764#if EV_PREPARE_ENABLE
3317 if (types & EV_PREPARE) 3765 if (types & EV_PREPARE)
3318 for (i = preparecnt; i--; ) 3766 for (i = preparecnt; i--; )
3319#if EV_EMBED_ENABLE 3767# if EV_EMBED_ENABLE
3320 if (ev_cb (prepares [i]) != embed_prepare_cb) 3768 if (ev_cb (prepares [i]) != embed_prepare_cb)
3321#endif 3769# endif
3322 cb (EV_A_ EV_PREPARE, prepares [i]); 3770 cb (EV_A_ EV_PREPARE, prepares [i]);
3771#endif
3323 3772
3773#if EV_CHECK_ENABLE
3324 if (types & EV_CHECK) 3774 if (types & EV_CHECK)
3325 for (i = checkcnt; i--; ) 3775 for (i = checkcnt; i--; )
3326 cb (EV_A_ EV_CHECK, checks [i]); 3776 cb (EV_A_ EV_CHECK, checks [i]);
3777#endif
3327 3778
3779#if EV_SIGNAL_ENABLE
3328 if (types & EV_SIGNAL) 3780 if (types & EV_SIGNAL)
3329 for (i = 0; i < signalmax; ++i) 3781 for (i = 0; i < EV_NSIG - 1; ++i)
3330 for (wl = signals [i].head; wl; ) 3782 for (wl = signals [i].head; wl; )
3331 { 3783 {
3332 wn = wl->next; 3784 wn = wl->next;
3333 cb (EV_A_ EV_SIGNAL, wl); 3785 cb (EV_A_ EV_SIGNAL, wl);
3334 wl = wn; 3786 wl = wn;
3335 } 3787 }
3788#endif
3336 3789
3790#if EV_CHILD_ENABLE
3337 if (types & EV_CHILD) 3791 if (types & EV_CHILD)
3338 for (i = EV_PID_HASHSIZE; i--; ) 3792 for (i = (EV_PID_HASHSIZE); i--; )
3339 for (wl = childs [i]; wl; ) 3793 for (wl = childs [i]; wl; )
3340 { 3794 {
3341 wn = wl->next; 3795 wn = wl->next;
3342 cb (EV_A_ EV_CHILD, wl); 3796 cb (EV_A_ EV_CHILD, wl);
3343 wl = wn; 3797 wl = wn;
3344 } 3798 }
3799#endif
3345/* EV_STAT 0x00001000 /* stat data changed */ 3800/* EV_STAT 0x00001000 /* stat data changed */
3346/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3801/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3347} 3802}
3348#endif 3803#endif
3349 3804

Diff Legend

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