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

Comparing libev/ev.c (file contents):
Revision 1.285 by root, Wed Apr 15 19:35:53 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
633/* file descriptor info structure */
483typedef struct 634typedef struct
484{ 635{
485 WL head; 636 WL head;
486 unsigned char events; 637 unsigned char events; /* the events watched for */
487 unsigned char reify; 638 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
488 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 */
489 unsigned char unused; 640 unsigned char unused;
490#if EV_USE_EPOLL 641#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 642 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 643#endif
493#if EV_SELECT_IS_WINSOCKET 644#if EV_SELECT_IS_WINSOCKET
494 SOCKET handle; 645 SOCKET handle;
495#endif 646#endif
496} ANFD; 647} ANFD;
497 648
649/* stores the pending event set for a given watcher */
498typedef struct 650typedef struct
499{ 651{
500 W w; 652 W w;
501 int events; 653 int events; /* the pending event set for the given watcher */
502} ANPENDING; 654} ANPENDING;
503 655
504#if EV_USE_INOTIFY 656#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 657/* hash table entry per inotify-id */
506typedef struct 658typedef struct
… …
509} ANFS; 661} ANFS;
510#endif 662#endif
511 663
512/* Heap Entry */ 664/* Heap Entry */
513#if EV_HEAP_CACHE_AT 665#if EV_HEAP_CACHE_AT
666 /* a heap element */
514 typedef struct { 667 typedef struct {
515 ev_tstamp at; 668 ev_tstamp at;
516 WT w; 669 WT w;
517 } ANHE; 670 } ANHE;
518 671
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 672 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 673 #define ANHE_at(he) (he).at /* access cached at, read-only */
521 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 674 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 675#else
676 /* a heap element */
523 typedef WT ANHE; 677 typedef WT ANHE;
524 678
525 #define ANHE_w(he) (he) 679 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 680 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 681 #define ANHE_at_cache(he)
… …
551 705
552 static int ev_default_loop_ptr; 706 static int ev_default_loop_ptr;
553 707
554#endif 708#endif
555 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
556/*****************************************************************************/ 722/*****************************************************************************/
557 723
724#ifndef EV_HAVE_EV_TIME
558ev_tstamp 725ev_tstamp
559ev_time (void) 726ev_time (void)
560{ 727{
561#if EV_USE_REALTIME 728#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 729 if (expect_true (have_realtime))
… …
569 736
570 struct timeval tv; 737 struct timeval tv;
571 gettimeofday (&tv, 0); 738 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 739 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 740}
741#endif
574 742
575inline_size ev_tstamp 743inline_size ev_tstamp
576get_clock (void) 744get_clock (void)
577{ 745{
578#if EV_USE_MONOTONIC 746#if EV_USE_MONOTONIC
… …
614 782
615 tv.tv_sec = (time_t)delay; 783 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 784 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617 785
618 /* 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 */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 787 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 788 /* by older ones */
621 select (0, 0, 0, 0, &tv); 789 select (0, 0, 0, 0, &tv);
622#endif 790#endif
623 } 791 }
624} 792}
625 793
626/*****************************************************************************/ 794/*****************************************************************************/
627 795
628#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 */
629 797
798/* find a suitable new size for the given array, */
799/* hopefully by rounding to a nice-to-malloc size */
630inline_size int 800inline_size int
631array_nextsize (int elem, int cur, int cnt) 801array_nextsize (int elem, int cur, int cnt)
632{ 802{
633 int ncur = cur + 1; 803 int ncur = cur + 1;
634 804
… …
680#define array_free(stem, idx) \ 850#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 851 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 852
683/*****************************************************************************/ 853/*****************************************************************************/
684 854
855/* dummy callback for pending events */
856static void noinline
857pendingcb (EV_P_ ev_prepare *w, int revents)
858{
859}
860
685void noinline 861void noinline
686ev_feed_event (EV_P_ void *w, int revents) 862ev_feed_event (EV_P_ void *w, int revents)
687{ 863{
688 W w_ = (W)w; 864 W w_ = (W)w;
689 int pri = ABSPRI (w_); 865 int pri = ABSPRI (w_);
… …
724} 900}
725 901
726/*****************************************************************************/ 902/*****************************************************************************/
727 903
728inline_speed void 904inline_speed void
729fd_event (EV_P_ int fd, int revents) 905fd_event_nocheck (EV_P_ int fd, int revents)
730{ 906{
731 ANFD *anfd = anfds + fd; 907 ANFD *anfd = anfds + fd;
732 ev_io *w; 908 ev_io *w;
733 909
734 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)
… …
738 if (ev) 914 if (ev)
739 ev_feed_event (EV_A_ (W)w, ev); 915 ev_feed_event (EV_A_ (W)w, ev);
740 } 916 }
741} 917}
742 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
743void 930void
744ev_feed_fd_event (EV_P_ int fd, int revents) 931ev_feed_fd_event (EV_P_ int fd, int revents)
745{ 932{
746 if (fd >= 0 && fd < anfdmax) 933 if (fd >= 0 && fd < anfdmax)
747 fd_event (EV_A_ fd, revents); 934 fd_event_nocheck (EV_A_ fd, revents);
748} 935}
749 936
937/* make sure the external fd watch events are in-sync */
938/* with the kernel/libev internal state */
750inline_size void 939inline_size void
751fd_reify (EV_P) 940fd_reify (EV_P)
752{ 941{
753 int i; 942 int i;
754 943
… …
765 954
766#if EV_SELECT_IS_WINSOCKET 955#if EV_SELECT_IS_WINSOCKET
767 if (events) 956 if (events)
768 { 957 {
769 unsigned long arg; 958 unsigned long arg;
770 #ifdef EV_FD_TO_WIN32_HANDLE
771 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 959 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
772 #else
773 anfd->handle = _get_osfhandle (fd);
774 #endif
775 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));
776 } 961 }
777#endif 962#endif
778 963
779 { 964 {
… …
789 } 974 }
790 975
791 fdchangecnt = 0; 976 fdchangecnt = 0;
792} 977}
793 978
979/* something about the given fd changed */
794inline_size void 980inline_size void
795fd_change (EV_P_ int fd, int flags) 981fd_change (EV_P_ int fd, int flags)
796{ 982{
797 unsigned char reify = anfds [fd].reify; 983 unsigned char reify = anfds [fd].reify;
798 anfds [fd].reify |= flags; 984 anfds [fd].reify |= flags;
… …
803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 989 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
804 fdchanges [fdchangecnt - 1] = fd; 990 fdchanges [fdchangecnt - 1] = fd;
805 } 991 }
806} 992}
807 993
994/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
808inline_speed void 995inline_speed void
809fd_kill (EV_P_ int fd) 996fd_kill (EV_P_ int fd)
810{ 997{
811 ev_io *w; 998 ev_io *w;
812 999
… …
815 ev_io_stop (EV_A_ w); 1002 ev_io_stop (EV_A_ w);
816 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);
817 } 1004 }
818} 1005}
819 1006
1007/* check whether the given fd is actually valid, for error recovery */
820inline_size int 1008inline_size int
821fd_valid (int fd) 1009fd_valid (int fd)
822{ 1010{
823#ifdef _WIN32 1011#ifdef _WIN32
824 return _get_osfhandle (fd) != -1; 1012 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
825#else 1013#else
826 return fcntl (fd, F_GETFD) != -1; 1014 return fcntl (fd, F_GETFD) != -1;
827#endif 1015#endif
828} 1016}
829 1017
… …
847 1035
848 for (fd = anfdmax; fd--; ) 1036 for (fd = anfdmax; fd--; )
849 if (anfds [fd].events) 1037 if (anfds [fd].events)
850 { 1038 {
851 fd_kill (EV_A_ fd); 1039 fd_kill (EV_A_ fd);
852 return; 1040 break;
853 } 1041 }
854} 1042}
855 1043
856/* 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 */
857static void noinline 1045static void noinline
… …
862 for (fd = 0; fd < anfdmax; ++fd) 1050 for (fd = 0; fd < anfdmax; ++fd)
863 if (anfds [fd].events) 1051 if (anfds [fd].events)
864 { 1052 {
865 anfds [fd].events = 0; 1053 anfds [fd].events = 0;
866 anfds [fd].emask = 0; 1054 anfds [fd].emask = 0;
867 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1055 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
868 } 1056 }
869} 1057}
870 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
871/*****************************************************************************/ 1073/*****************************************************************************/
872 1074
873/* 1075/*
874 * 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
875 * 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
876 * the branching factor of the d-tree. 1078 * the branching factor of the d-tree.
877 */ 1079 */
878 1080
879/* 1081/*
… …
947 1149
948 for (;;) 1150 for (;;)
949 { 1151 {
950 int c = k << 1; 1152 int c = k << 1;
951 1153
952 if (c > N + HEAP0 - 1) 1154 if (c >= N + HEAP0)
953 break; 1155 break;
954 1156
955 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])
956 ? 1 : 0; 1158 ? 1 : 0;
957 1159
… …
989 1191
990 heap [k] = he; 1192 heap [k] = he;
991 ev_active (ANHE_w (he)) = k; 1193 ev_active (ANHE_w (he)) = k;
992} 1194}
993 1195
1196/* move an element suitably so it is in a correct place */
994inline_size void 1197inline_size void
995adjustheap (ANHE *heap, int N, int k) 1198adjustheap (ANHE *heap, int N, int k)
996{ 1199{
997 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)]))
998 upheap (heap, k); 1201 upheap (heap, k);
999 else 1202 else
1000 downheap (heap, N, k); 1203 downheap (heap, N, k);
1001} 1204}
1002 1205
… …
1012 upheap (heap, i + HEAP0); 1215 upheap (heap, i + HEAP0);
1013} 1216}
1014 1217
1015/*****************************************************************************/ 1218/*****************************************************************************/
1016 1219
1220/* associate signal watchers to a signal signal */
1017typedef struct 1221typedef struct
1018{ 1222{
1223 EV_ATOMIC_T pending;
1224#if EV_MULTIPLICITY
1225 EV_P;
1226#endif
1019 WL head; 1227 WL head;
1020 EV_ATOMIC_T gotsig;
1021} ANSIG; 1228} ANSIG;
1022 1229
1023static ANSIG *signals; 1230static ANSIG signals [EV_NSIG - 1];
1024static int signalmax;
1025
1026static EV_ATOMIC_T gotsig;
1027 1231
1028/*****************************************************************************/ 1232/*****************************************************************************/
1029 1233
1030inline_speed void 1234#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1031fd_intern (int fd)
1032{
1033#ifdef _WIN32
1034 unsigned long arg = 1;
1035 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1036#else
1037 fcntl (fd, F_SETFD, FD_CLOEXEC);
1038 fcntl (fd, F_SETFL, O_NONBLOCK);
1039#endif
1040}
1041 1235
1042static void noinline 1236static void noinline
1043evpipe_init (EV_P) 1237evpipe_init (EV_P)
1044{ 1238{
1045 if (!ev_is_active (&pipeev)) 1239 if (!ev_is_active (&pipe_w))
1046 { 1240 {
1047#if EV_USE_EVENTFD 1241# if EV_USE_EVENTFD
1242 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1243 if (evfd < 0 && errno == EINVAL)
1048 if ((evfd = eventfd (0, 0)) >= 0) 1244 evfd = eventfd (0, 0);
1245
1246 if (evfd >= 0)
1049 { 1247 {
1050 evpipe [0] = -1; 1248 evpipe [0] = -1;
1051 fd_intern (evfd); 1249 fd_intern (evfd); /* doing it twice doesn't hurt */
1052 ev_io_set (&pipeev, evfd, EV_READ); 1250 ev_io_set (&pipe_w, evfd, EV_READ);
1053 } 1251 }
1054 else 1252 else
1055#endif 1253# endif
1056 { 1254 {
1057 while (pipe (evpipe)) 1255 while (pipe (evpipe))
1058 ev_syserr ("(libev) error creating signal/async pipe"); 1256 ev_syserr ("(libev) error creating signal/async pipe");
1059 1257
1060 fd_intern (evpipe [0]); 1258 fd_intern (evpipe [0]);
1061 fd_intern (evpipe [1]); 1259 fd_intern (evpipe [1]);
1062 ev_io_set (&pipeev, evpipe [0], EV_READ); 1260 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1063 } 1261 }
1064 1262
1065 ev_io_start (EV_A_ &pipeev); 1263 ev_io_start (EV_A_ &pipe_w);
1066 ev_unref (EV_A); /* watcher should not keep loop alive */ 1264 ev_unref (EV_A); /* watcher should not keep loop alive */
1067 } 1265 }
1068} 1266}
1069 1267
1070inline_size void 1268inline_size void
1071evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1269evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1072{ 1270{
1073 if (!*flag) 1271 if (!*flag)
1074 { 1272 {
1075 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;
1076 1275
1077 *flag = 1; 1276 *flag = 1;
1078 1277
1079#if EV_USE_EVENTFD 1278#if EV_USE_EVENTFD
1080 if (evfd >= 0) 1279 if (evfd >= 0)
… …
1082 uint64_t counter = 1; 1281 uint64_t counter = 1;
1083 write (evfd, &counter, sizeof (uint64_t)); 1282 write (evfd, &counter, sizeof (uint64_t));
1084 } 1283 }
1085 else 1284 else
1086#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. */
1087 write (evpipe [1], &old_errno, 1); 1291 write (evpipe [1], &dummy, 1);
1088 1292
1089 errno = old_errno; 1293 errno = old_errno;
1090 } 1294 }
1091} 1295}
1092 1296
1297/* called whenever the libev signal pipe */
1298/* got some events (signal, async) */
1093static void 1299static void
1094pipecb (EV_P_ ev_io *iow, int revents) 1300pipecb (EV_P_ ev_io *iow, int revents)
1095{ 1301{
1302 int i;
1303
1096#if EV_USE_EVENTFD 1304#if EV_USE_EVENTFD
1097 if (evfd >= 0) 1305 if (evfd >= 0)
1098 { 1306 {
1099 uint64_t counter; 1307 uint64_t counter;
1100 read (evfd, &counter, sizeof (uint64_t)); 1308 read (evfd, &counter, sizeof (uint64_t));
1101 } 1309 }
1102 else 1310 else
1103#endif 1311#endif
1104 { 1312 {
1105 char dummy; 1313 char dummy;
1314 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1106 read (evpipe [0], &dummy, 1); 1315 read (evpipe [0], &dummy, 1);
1107 } 1316 }
1108 1317
1109 if (gotsig && ev_is_default_loop (EV_A)) 1318 if (sig_pending)
1110 { 1319 {
1111 int signum; 1320 sig_pending = 0;
1112 gotsig = 0;
1113 1321
1114 for (signum = signalmax; signum--; ) 1322 for (i = EV_NSIG - 1; i--; )
1115 if (signals [signum].gotsig) 1323 if (expect_false (signals [i].pending))
1116 ev_feed_signal_event (EV_A_ signum + 1); 1324 ev_feed_signal_event (EV_A_ i + 1);
1117 } 1325 }
1118 1326
1119#if EV_ASYNC_ENABLE 1327#if EV_ASYNC_ENABLE
1120 if (gotasync) 1328 if (async_pending)
1121 { 1329 {
1122 int i; 1330 async_pending = 0;
1123 gotasync = 0;
1124 1331
1125 for (i = asynccnt; i--; ) 1332 for (i = asynccnt; i--; )
1126 if (asyncs [i]->sent) 1333 if (asyncs [i]->sent)
1127 { 1334 {
1128 asyncs [i]->sent = 0; 1335 asyncs [i]->sent = 0;
… …
1136 1343
1137static void 1344static void
1138ev_sighandler (int signum) 1345ev_sighandler (int signum)
1139{ 1346{
1140#if EV_MULTIPLICITY 1347#if EV_MULTIPLICITY
1141 struct ev_loop *loop = &default_loop_struct; 1348 EV_P = signals [signum - 1].loop;
1142#endif 1349#endif
1143 1350
1144#if _WIN32 1351#ifdef _WIN32
1145 signal (signum, ev_sighandler); 1352 signal (signum, ev_sighandler);
1146#endif 1353#endif
1147 1354
1148 signals [signum - 1].gotsig = 1; 1355 signals [signum - 1].pending = 1;
1149 evpipe_write (EV_A_ &gotsig); 1356 evpipe_write (EV_A_ &sig_pending);
1150} 1357}
1151 1358
1152void noinline 1359void noinline
1153ev_feed_signal_event (EV_P_ int signum) 1360ev_feed_signal_event (EV_P_ int signum)
1154{ 1361{
1155 WL w; 1362 WL w;
1156 1363
1364 if (expect_false (signum <= 0 || signum > EV_NSIG))
1365 return;
1366
1367 --signum;
1368
1157#if EV_MULTIPLICITY 1369#if EV_MULTIPLICITY
1158 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 */
1159#endif 1371 /* or, likely more useful, feeding a signal nobody is waiting for */
1160 1372
1161 --signum; 1373 if (expect_false (signals [signum].loop != EV_A))
1162
1163 if (signum < 0 || signum >= signalmax)
1164 return; 1374 return;
1375#endif
1165 1376
1166 signals [signum].gotsig = 0; 1377 signals [signum].pending = 0;
1167 1378
1168 for (w = signals [signum].head; w; w = w->next) 1379 for (w = signals [signum].head; w; w = w->next)
1169 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1380 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1170} 1381}
1171 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
1172/*****************************************************************************/ 1405/*****************************************************************************/
1173 1406
1407#if EV_CHILD_ENABLE
1174static WL childs [EV_PID_HASHSIZE]; 1408static WL childs [EV_PID_HASHSIZE];
1175
1176#ifndef _WIN32
1177 1409
1178static ev_signal childev; 1410static ev_signal childev;
1179 1411
1180#ifndef WIFCONTINUED 1412#ifndef WIFCONTINUED
1181# define WIFCONTINUED(status) 0 1413# define WIFCONTINUED(status) 0
1182#endif 1414#endif
1183 1415
1416/* handle a single child status event */
1184inline_speed void 1417inline_speed void
1185child_reap (EV_P_ int chain, int pid, int status) 1418child_reap (EV_P_ int chain, int pid, int status)
1186{ 1419{
1187 ev_child *w; 1420 ev_child *w;
1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1421 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1189 1422
1190 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)
1191 { 1424 {
1192 if ((w->pid == pid || !w->pid) 1425 if ((w->pid == pid || !w->pid)
1193 && (!traced || (w->flags & 1))) 1426 && (!traced || (w->flags & 1)))
1194 { 1427 {
1195 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 */
… …
1202 1435
1203#ifndef WCONTINUED 1436#ifndef WCONTINUED
1204# define WCONTINUED 0 1437# define WCONTINUED 0
1205#endif 1438#endif
1206 1439
1440/* called on sigchld etc., calls waitpid */
1207static void 1441static void
1208childcb (EV_P_ ev_signal *sw, int revents) 1442childcb (EV_P_ ev_signal *sw, int revents)
1209{ 1443{
1210 int pid, status; 1444 int pid, status;
1211 1445
… …
1219 /* 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 */
1220 /* 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 */
1221 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1455 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1222 1456
1223 child_reap (EV_A_ pid, pid, status); 1457 child_reap (EV_A_ pid, pid, status);
1224 if (EV_PID_HASHSIZE > 1) 1458 if ((EV_PID_HASHSIZE) > 1)
1225 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 */
1226} 1460}
1227 1461
1228#endif 1462#endif
1229 1463
… …
1296#ifdef __APPLE__ 1530#ifdef __APPLE__
1297 /* only select works correctly on that "unix-certified" platform */ 1531 /* only select works correctly on that "unix-certified" platform */
1298 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1532 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1299 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 */
1300#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
1301 1538
1302 return flags; 1539 return flags;
1303} 1540}
1304 1541
1305unsigned int 1542unsigned int
… …
1318ev_backend (EV_P) 1555ev_backend (EV_P)
1319{ 1556{
1320 return backend; 1557 return backend;
1321} 1558}
1322 1559
1560#if EV_FEATURE_API
1323unsigned int 1561unsigned int
1324ev_loop_count (EV_P) 1562ev_iteration (EV_P)
1325{ 1563{
1326 return loop_count; 1564 return loop_count;
1327} 1565}
1328 1566
1567unsigned int
1568ev_depth (EV_P)
1569{
1570 return loop_depth;
1571}
1572
1329void 1573void
1330ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1574ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1331{ 1575{
1332 io_blocktime = interval; 1576 io_blocktime = interval;
1333} 1577}
… …
1336ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1580ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1337{ 1581{
1338 timeout_blocktime = interval; 1582 timeout_blocktime = interval;
1339} 1583}
1340 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
1608
1609/* initialise a loop structure, must be zero-initialised */
1341static void noinline 1610static void noinline
1342loop_init (EV_P_ unsigned int flags) 1611loop_init (EV_P_ unsigned int flags)
1343{ 1612{
1344 if (!backend) 1613 if (!backend)
1345 { 1614 {
… …
1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1630 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1362 have_monotonic = 1; 1631 have_monotonic = 1;
1363 } 1632 }
1364#endif 1633#endif
1365 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
1366 ev_rt_now = ev_time (); 1646 ev_rt_now = ev_time ();
1367 mn_now = get_clock (); 1647 mn_now = get_clock ();
1368 now_floor = mn_now; 1648 now_floor = mn_now;
1369 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
1370 1653
1371 io_blocktime = 0.; 1654 io_blocktime = 0.;
1372 timeout_blocktime = 0.; 1655 timeout_blocktime = 0.;
1373 backend = 0; 1656 backend = 0;
1374 backend_fd = -1; 1657 backend_fd = -1;
1375 gotasync = 0; 1658 sig_pending = 0;
1659#if EV_ASYNC_ENABLE
1660 async_pending = 0;
1661#endif
1376#if EV_USE_INOTIFY 1662#if EV_USE_INOTIFY
1377 fs_fd = -2; 1663 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1378#endif 1664#endif
1379 1665#if EV_USE_SIGNALFD
1380 /* pid check not overridable via env */ 1666 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1381#ifndef _WIN32
1382 if (flags & EVFLAG_FORKCHECK)
1383 curpid = getpid ();
1384#endif 1667#endif
1385
1386 if (!(flags & EVFLAG_NOENV)
1387 && !enable_secure ()
1388 && getenv ("LIBEV_FLAGS"))
1389 flags = atoi (getenv ("LIBEV_FLAGS"));
1390 1668
1391 if (!(flags & 0x0000ffffU)) 1669 if (!(flags & 0x0000ffffU))
1392 flags |= ev_recommended_backends (); 1670 flags |= ev_recommended_backends ();
1393 1671
1394#if EV_USE_PORT 1672#if EV_USE_PORT
… …
1405#endif 1683#endif
1406#if EV_USE_SELECT 1684#if EV_USE_SELECT
1407 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1685 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1408#endif 1686#endif
1409 1687
1688 ev_prepare_init (&pending_w, pendingcb);
1689
1690#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1410 ev_init (&pipeev, pipecb); 1691 ev_init (&pipe_w, pipecb);
1411 ev_set_priority (&pipeev, EV_MAXPRI); 1692 ev_set_priority (&pipe_w, EV_MAXPRI);
1693#endif
1412 } 1694 }
1413} 1695}
1414 1696
1697/* free up a loop structure */
1415static void noinline 1698static void noinline
1416loop_destroy (EV_P) 1699loop_destroy (EV_P)
1417{ 1700{
1418 int i; 1701 int i;
1419 1702
1420 if (ev_is_active (&pipeev)) 1703 if (ev_is_active (&pipe_w))
1421 { 1704 {
1422 ev_ref (EV_A); /* signal watcher */ 1705 /*ev_ref (EV_A);*/
1423 ev_io_stop (EV_A_ &pipeev); 1706 /*ev_io_stop (EV_A_ &pipe_w);*/
1424 1707
1425#if EV_USE_EVENTFD 1708#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1709 if (evfd >= 0)
1427 close (evfd); 1710 close (evfd);
1428#endif 1711#endif
1429 1712
1430 if (evpipe [0] >= 0) 1713 if (evpipe [0] >= 0)
1431 { 1714 {
1432 close (evpipe [0]); 1715 EV_WIN32_CLOSE_FD (evpipe [0]);
1433 close (evpipe [1]); 1716 EV_WIN32_CLOSE_FD (evpipe [1]);
1434 } 1717 }
1435 } 1718 }
1719
1720#if EV_USE_SIGNALFD
1721 if (ev_is_active (&sigfd_w))
1722 close (sigfd);
1723#endif
1436 1724
1437#if EV_USE_INOTIFY 1725#if EV_USE_INOTIFY
1438 if (fs_fd >= 0) 1726 if (fs_fd >= 0)
1439 close (fs_fd); 1727 close (fs_fd);
1440#endif 1728#endif
… …
1464#if EV_IDLE_ENABLE 1752#if EV_IDLE_ENABLE
1465 array_free (idle, [i]); 1753 array_free (idle, [i]);
1466#endif 1754#endif
1467 } 1755 }
1468 1756
1469 ev_free (anfds); anfdmax = 0; 1757 ev_free (anfds); anfds = 0; anfdmax = 0;
1470 1758
1471 /* have to use the microsoft-never-gets-it-right macro */ 1759 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY); 1760 array_free (rfeed, EMPTY);
1473 array_free (fdchange, EMPTY); 1761 array_free (fdchange, EMPTY);
1474 array_free (timer, EMPTY); 1762 array_free (timer, EMPTY);
… …
1505#endif 1793#endif
1506#if EV_USE_INOTIFY 1794#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1795 infy_fork (EV_A);
1508#endif 1796#endif
1509 1797
1510 if (ev_is_active (&pipeev)) 1798 if (ev_is_active (&pipe_w))
1511 { 1799 {
1512 /* this "locks" the handlers against writing to the pipe */ 1800 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1801 /* while we modify the fd vars */
1514 gotsig = 1; 1802 sig_pending = 1;
1515#if EV_ASYNC_ENABLE 1803#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1804 async_pending = 1;
1517#endif 1805#endif
1518 1806
1519 ev_ref (EV_A); 1807 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1808 ev_io_stop (EV_A_ &pipe_w);
1521 1809
1522#if EV_USE_EVENTFD 1810#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1811 if (evfd >= 0)
1524 close (evfd); 1812 close (evfd);
1525#endif 1813#endif
1526 1814
1527 if (evpipe [0] >= 0) 1815 if (evpipe [0] >= 0)
1528 { 1816 {
1529 close (evpipe [0]); 1817 EV_WIN32_CLOSE_FD (evpipe [0]);
1530 close (evpipe [1]); 1818 EV_WIN32_CLOSE_FD (evpipe [1]);
1531 } 1819 }
1532 1820
1821#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1533 evpipe_init (EV_A); 1822 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1823 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1824 pipecb (EV_A_ &pipe_w, EV_READ);
1825#endif
1536 } 1826 }
1537 1827
1538 postfork = 0; 1828 postfork = 0;
1539} 1829}
1540 1830
1541#if EV_MULTIPLICITY 1831#if EV_MULTIPLICITY
1542 1832
1543struct ev_loop * 1833struct ev_loop *
1544ev_loop_new (unsigned int flags) 1834ev_loop_new (unsigned int flags)
1545{ 1835{
1546 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));
1547 1837
1548 memset (loop, 0, sizeof (struct ev_loop)); 1838 memset (EV_A, 0, sizeof (struct ev_loop));
1549
1550 loop_init (EV_A_ flags); 1839 loop_init (EV_A_ flags);
1551 1840
1552 if (ev_backend (EV_A)) 1841 if (ev_backend (EV_A))
1553 return loop; 1842 return EV_A;
1554 1843
1555 return 0; 1844 return 0;
1556} 1845}
1557 1846
1558void 1847void
… …
1565void 1854void
1566ev_loop_fork (EV_P) 1855ev_loop_fork (EV_P)
1567{ 1856{
1568 postfork = 1; /* must be in line with ev_default_fork */ 1857 postfork = 1; /* must be in line with ev_default_fork */
1569} 1858}
1859#endif /* multiplicity */
1570 1860
1571#if EV_VERIFY 1861#if EV_VERIFY
1572static void noinline 1862static void noinline
1573verify_watcher (EV_P_ W w) 1863verify_watcher (EV_P_ W w)
1574{ 1864{
… …
1602 verify_watcher (EV_A_ ws [cnt]); 1892 verify_watcher (EV_A_ ws [cnt]);
1603 } 1893 }
1604} 1894}
1605#endif 1895#endif
1606 1896
1897#if EV_FEATURE_API
1607void 1898void
1608ev_loop_verify (EV_P) 1899ev_verify (EV_P)
1609{ 1900{
1610#if EV_VERIFY 1901#if EV_VERIFY
1611 int i; 1902 int i;
1612 WL w; 1903 WL w;
1613 1904
… …
1652#if EV_ASYNC_ENABLE 1943#if EV_ASYNC_ENABLE
1653 assert (asyncmax >= asynccnt); 1944 assert (asyncmax >= asynccnt);
1654 array_verify (EV_A_ (W *)asyncs, asynccnt); 1945 array_verify (EV_A_ (W *)asyncs, asynccnt);
1655#endif 1946#endif
1656 1947
1948#if EV_PREPARE_ENABLE
1657 assert (preparemax >= preparecnt); 1949 assert (preparemax >= preparecnt);
1658 array_verify (EV_A_ (W *)prepares, preparecnt); 1950 array_verify (EV_A_ (W *)prepares, preparecnt);
1951#endif
1659 1952
1953#if EV_CHECK_ENABLE
1660 assert (checkmax >= checkcnt); 1954 assert (checkmax >= checkcnt);
1661 array_verify (EV_A_ (W *)checks, checkcnt); 1955 array_verify (EV_A_ (W *)checks, checkcnt);
1956#endif
1662 1957
1663# if 0 1958# if 0
1959#if EV_CHILD_ENABLE
1664 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)
1665 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1961 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1962#endif
1666# endif 1963# endif
1667#endif 1964#endif
1668} 1965}
1669 1966#endif
1670#endif /* multiplicity */
1671 1967
1672#if EV_MULTIPLICITY 1968#if EV_MULTIPLICITY
1673struct ev_loop * 1969struct ev_loop *
1674ev_default_loop_init (unsigned int flags) 1970ev_default_loop_init (unsigned int flags)
1675#else 1971#else
… …
1678#endif 1974#endif
1679{ 1975{
1680 if (!ev_default_loop_ptr) 1976 if (!ev_default_loop_ptr)
1681 { 1977 {
1682#if EV_MULTIPLICITY 1978#if EV_MULTIPLICITY
1683 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1979 EV_P = ev_default_loop_ptr = &default_loop_struct;
1684#else 1980#else
1685 ev_default_loop_ptr = 1; 1981 ev_default_loop_ptr = 1;
1686#endif 1982#endif
1687 1983
1688 loop_init (EV_A_ flags); 1984 loop_init (EV_A_ flags);
1689 1985
1690 if (ev_backend (EV_A)) 1986 if (ev_backend (EV_A))
1691 { 1987 {
1692#ifndef _WIN32 1988#if EV_CHILD_ENABLE
1693 ev_signal_init (&childev, childcb, SIGCHLD); 1989 ev_signal_init (&childev, childcb, SIGCHLD);
1694 ev_set_priority (&childev, EV_MAXPRI); 1990 ev_set_priority (&childev, EV_MAXPRI);
1695 ev_signal_start (EV_A_ &childev); 1991 ev_signal_start (EV_A_ &childev);
1696 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1992 ev_unref (EV_A); /* child watcher should not keep loop alive */
1697#endif 1993#endif
… …
1705 2001
1706void 2002void
1707ev_default_destroy (void) 2003ev_default_destroy (void)
1708{ 2004{
1709#if EV_MULTIPLICITY 2005#if EV_MULTIPLICITY
1710 struct ev_loop *loop = ev_default_loop_ptr; 2006 EV_P = ev_default_loop_ptr;
1711#endif 2007#endif
1712 2008
1713 ev_default_loop_ptr = 0; 2009 ev_default_loop_ptr = 0;
1714 2010
1715#ifndef _WIN32 2011#if EV_CHILD_ENABLE
1716 ev_ref (EV_A); /* child watcher */ 2012 ev_ref (EV_A); /* child watcher */
1717 ev_signal_stop (EV_A_ &childev); 2013 ev_signal_stop (EV_A_ &childev);
1718#endif 2014#endif
1719 2015
1720 loop_destroy (EV_A); 2016 loop_destroy (EV_A);
… …
1722 2018
1723void 2019void
1724ev_default_fork (void) 2020ev_default_fork (void)
1725{ 2021{
1726#if EV_MULTIPLICITY 2022#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr; 2023 EV_P = ev_default_loop_ptr;
1728#endif 2024#endif
1729 2025
1730 postfork = 1; /* must be in line with ev_loop_fork */ 2026 postfork = 1; /* must be in line with ev_loop_fork */
1731} 2027}
1732 2028
… …
1736ev_invoke (EV_P_ void *w, int revents) 2032ev_invoke (EV_P_ void *w, int revents)
1737{ 2033{
1738 EV_CB_INVOKE ((W)w, revents); 2034 EV_CB_INVOKE ((W)w, revents);
1739} 2035}
1740 2036
1741inline_speed void 2037unsigned int
1742call_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)
1743{ 2051{
1744 int pri; 2052 int pri;
1745 2053
1746 for (pri = NUMPRI; pri--; ) 2054 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 2055 while (pendingcnt [pri])
1748 { 2056 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2057 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 2058
1751 if (expect_true (p->w))
1752 {
1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 2059 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2060 /* ^ this is no longer true, as pending_w could be here */
1754 2061
1755 p->w->pending = 0; 2062 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 2063 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 2064 EV_FREQUENT_CHECK;
1758 }
1759 } 2065 }
1760} 2066}
1761 2067
1762#if EV_IDLE_ENABLE 2068#if EV_IDLE_ENABLE
2069/* make idle watchers pending. this handles the "call-idle */
2070/* only when higher priorities are idle" logic */
1763inline_size void 2071inline_size void
1764idle_reify (EV_P) 2072idle_reify (EV_P)
1765{ 2073{
1766 if (expect_false (idleall)) 2074 if (expect_false (idleall))
1767 { 2075 {
… …
1780 } 2088 }
1781 } 2089 }
1782} 2090}
1783#endif 2091#endif
1784 2092
2093/* make timers pending */
1785inline_size void 2094inline_size void
1786timers_reify (EV_P) 2095timers_reify (EV_P)
1787{ 2096{
1788 EV_FREQUENT_CHECK; 2097 EV_FREQUENT_CHECK;
1789 2098
… …
1813 EV_FREQUENT_CHECK; 2122 EV_FREQUENT_CHECK;
1814 feed_reverse (EV_A_ (W)w); 2123 feed_reverse (EV_A_ (W)w);
1815 } 2124 }
1816 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2125 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1817 2126
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 2127 feed_reverse_done (EV_A_ EV_TIMER);
1819 } 2128 }
1820} 2129}
1821 2130
1822#if EV_PERIODIC_ENABLE 2131#if EV_PERIODIC_ENABLE
2132/* make periodics pending */
1823inline_size void 2133inline_size void
1824periodics_reify (EV_P) 2134periodics_reify (EV_P)
1825{ 2135{
1826 EV_FREQUENT_CHECK; 2136 EV_FREQUENT_CHECK;
1827 2137
… …
1874 2184
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 2185 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 2186 }
1877} 2187}
1878 2188
2189/* simply recalculate all periodics */
2190/* TODO: maybe ensure that at least one event happens when jumping forward? */
1879static void noinline 2191static void noinline
1880periodics_reschedule (EV_P) 2192periodics_reschedule (EV_P)
1881{ 2193{
1882 int i; 2194 int i;
1883 2195
… …
1896 2208
1897 reheap (periodics, periodiccnt); 2209 reheap (periodics, periodiccnt);
1898} 2210}
1899#endif 2211#endif
1900 2212
2213/* adjust all timers by a given offset */
1901static void noinline 2214static void noinline
1902timers_reschedule (EV_P_ ev_tstamp adjust) 2215timers_reschedule (EV_P_ ev_tstamp adjust)
1903{ 2216{
1904 int i; 2217 int i;
1905 2218
… …
1909 ANHE_w (*he)->at += adjust; 2222 ANHE_w (*he)->at += adjust;
1910 ANHE_at_cache (*he); 2223 ANHE_at_cache (*he);
1911 } 2224 }
1912} 2225}
1913 2226
2227/* fetch new monotonic and realtime times from the kernel */
2228/* also detect if there was a timejump, and act accordingly */
1914inline_speed void 2229inline_speed void
1915time_update (EV_P_ ev_tstamp max_block) 2230time_update (EV_P_ ev_tstamp max_block)
1916{ 2231{
1917 int i;
1918
1919#if EV_USE_MONOTONIC 2232#if EV_USE_MONOTONIC
1920 if (expect_true (have_monotonic)) 2233 if (expect_true (have_monotonic))
1921 { 2234 {
2235 int i;
1922 ev_tstamp odiff = rtmn_diff; 2236 ev_tstamp odiff = rtmn_diff;
1923 2237
1924 mn_now = get_clock (); 2238 mn_now = get_clock ();
1925 2239
1926 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2240 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1976 2290
1977 mn_now = ev_rt_now; 2291 mn_now = ev_rt_now;
1978 } 2292 }
1979} 2293}
1980 2294
1981static int loop_done;
1982
1983void 2295void
1984ev_loop (EV_P_ int flags) 2296ev_loop (EV_P_ int flags)
1985{ 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
1986 loop_done = EVUNLOOP_CANCEL; 2304 loop_done = EVUNLOOP_CANCEL;
1987 2305
1988 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 */
1989 2307
1990 do 2308 do
1991 { 2309 {
1992#if EV_VERIFY >= 2 2310#if EV_VERIFY >= 2
1993 ev_loop_verify (EV_A); 2311 ev_verify (EV_A);
1994#endif 2312#endif
1995 2313
1996#ifndef _WIN32 2314#ifndef _WIN32
1997 if (expect_false (curpid)) /* penalise the forking check even more */ 2315 if (expect_false (curpid)) /* penalise the forking check even more */
1998 if (expect_false (getpid () != curpid)) 2316 if (expect_false (getpid () != curpid))
… …
2006 /* we might have forked, so queue fork handlers */ 2324 /* we might have forked, so queue fork handlers */
2007 if (expect_false (postfork)) 2325 if (expect_false (postfork))
2008 if (forkcnt) 2326 if (forkcnt)
2009 { 2327 {
2010 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2328 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2011 call_pending (EV_A); 2329 EV_INVOKE_PENDING;
2012 } 2330 }
2013#endif 2331#endif
2014 2332
2333#if EV_PREPARE_ENABLE
2015 /* queue prepare watchers (and execute them) */ 2334 /* queue prepare watchers (and execute them) */
2016 if (expect_false (preparecnt)) 2335 if (expect_false (preparecnt))
2017 { 2336 {
2018 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2337 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2019 call_pending (EV_A); 2338 EV_INVOKE_PENDING;
2020 } 2339 }
2340#endif
2341
2342 if (expect_false (loop_done))
2343 break;
2021 2344
2022 /* we might have forked, so reify kernel state if necessary */ 2345 /* we might have forked, so reify kernel state if necessary */
2023 if (expect_false (postfork)) 2346 if (expect_false (postfork))
2024 loop_fork (EV_A); 2347 loop_fork (EV_A);
2025 2348
… …
2031 ev_tstamp waittime = 0.; 2354 ev_tstamp waittime = 0.;
2032 ev_tstamp sleeptime = 0.; 2355 ev_tstamp sleeptime = 0.;
2033 2356
2034 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2357 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2035 { 2358 {
2359 /* remember old timestamp for io_blocktime calculation */
2360 ev_tstamp prev_mn_now = mn_now;
2361
2036 /* update time to cancel out callback processing overhead */ 2362 /* update time to cancel out callback processing overhead */
2037 time_update (EV_A_ 1e100); 2363 time_update (EV_A_ 1e100);
2364
2365 waittime = MAX_BLOCKTIME;
2038 2366
2039 if (timercnt) 2367 if (timercnt)
2040 { 2368 {
2041 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2369 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2042 if (waittime > to) waittime = to; 2370 if (waittime > to) waittime = to;
… …
2048 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;
2049 if (waittime > to) waittime = to; 2377 if (waittime > to) waittime = to;
2050 } 2378 }
2051#endif 2379#endif
2052 2380
2381 /* don't let timeouts decrease the waittime below timeout_blocktime */
2053 if (expect_false (waittime < timeout_blocktime)) 2382 if (expect_false (waittime < timeout_blocktime))
2054 waittime = timeout_blocktime; 2383 waittime = timeout_blocktime;
2055 2384
2056 sleeptime = waittime - backend_fudge; 2385 /* extra check because io_blocktime is commonly 0 */
2057
2058 if (expect_true (sleeptime > io_blocktime)) 2386 if (expect_false (io_blocktime))
2059 sleeptime = io_blocktime;
2060
2061 if (sleeptime)
2062 { 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 {
2063 ev_sleep (sleeptime); 2395 ev_sleep (sleeptime);
2064 waittime -= sleeptime; 2396 waittime -= sleeptime;
2397 }
2065 } 2398 }
2066 } 2399 }
2067 2400
2401#if EV_FEATURE_API
2068 ++loop_count; 2402 ++loop_count;
2403#endif
2404 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2069 backend_poll (EV_A_ waittime); 2405 backend_poll (EV_A_ waittime);
2406 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2070 2407
2071 /* update ev_rt_now, do magic */ 2408 /* update ev_rt_now, do magic */
2072 time_update (EV_A_ waittime + sleeptime); 2409 time_update (EV_A_ waittime + sleeptime);
2073 } 2410 }
2074 2411
… …
2081#if EV_IDLE_ENABLE 2418#if EV_IDLE_ENABLE
2082 /* queue idle watchers unless other events are pending */ 2419 /* queue idle watchers unless other events are pending */
2083 idle_reify (EV_A); 2420 idle_reify (EV_A);
2084#endif 2421#endif
2085 2422
2423#if EV_CHECK_ENABLE
2086 /* queue check watchers, to be executed first */ 2424 /* queue check watchers, to be executed first */
2087 if (expect_false (checkcnt)) 2425 if (expect_false (checkcnt))
2088 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2426 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2427#endif
2089 2428
2090 call_pending (EV_A); 2429 EV_INVOKE_PENDING;
2091 } 2430 }
2092 while (expect_true ( 2431 while (expect_true (
2093 activecnt 2432 activecnt
2094 && !loop_done 2433 && !loop_done
2095 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2434 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2096 )); 2435 ));
2097 2436
2098 if (loop_done == EVUNLOOP_ONE) 2437 if (loop_done == EVUNLOOP_ONE)
2099 loop_done = EVUNLOOP_CANCEL; 2438 loop_done = EVUNLOOP_CANCEL;
2439
2440#if EV_FEATURE_API
2441 --loop_depth;
2442#endif
2100} 2443}
2101 2444
2102void 2445void
2103ev_unloop (EV_P_ int how) 2446ev_unloop (EV_P_ int how)
2104{ 2447{
… …
2133ev_resume (EV_P) 2476ev_resume (EV_P)
2134{ 2477{
2135 ev_tstamp mn_prev = mn_now; 2478 ev_tstamp mn_prev = mn_now;
2136 2479
2137 ev_now_update (EV_A); 2480 ev_now_update (EV_A);
2138 printf ("update %f\n", mn_now - mn_prev);//D
2139 timers_reschedule (EV_A_ mn_now - mn_prev); 2481 timers_reschedule (EV_A_ mn_now - mn_prev);
2482#if EV_PERIODIC_ENABLE
2483 /* TODO: really do this? */
2140 periodics_reschedule (EV_A); 2484 periodics_reschedule (EV_A);
2485#endif
2141} 2486}
2142 2487
2143/*****************************************************************************/ 2488/*****************************************************************************/
2489/* singly-linked list management, used when the expected list length is short */
2144 2490
2145inline_size void 2491inline_size void
2146wlist_add (WL *head, WL elem) 2492wlist_add (WL *head, WL elem)
2147{ 2493{
2148 elem->next = *head; 2494 elem->next = *head;
… …
2152inline_size void 2498inline_size void
2153wlist_del (WL *head, WL elem) 2499wlist_del (WL *head, WL elem)
2154{ 2500{
2155 while (*head) 2501 while (*head)
2156 { 2502 {
2157 if (*head == elem) 2503 if (expect_true (*head == elem))
2158 { 2504 {
2159 *head = elem->next; 2505 *head = elem->next;
2160 return; 2506 break;
2161 } 2507 }
2162 2508
2163 head = &(*head)->next; 2509 head = &(*head)->next;
2164 } 2510 }
2165} 2511}
2166 2512
2513/* internal, faster, version of ev_clear_pending */
2167inline_speed void 2514inline_speed void
2168clear_pending (EV_P_ W w) 2515clear_pending (EV_P_ W w)
2169{ 2516{
2170 if (w->pending) 2517 if (w->pending)
2171 { 2518 {
2172 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2519 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2173 w->pending = 0; 2520 w->pending = 0;
2174 } 2521 }
2175} 2522}
2176 2523
2177int 2524int
… …
2181 int pending = w_->pending; 2528 int pending = w_->pending;
2182 2529
2183 if (expect_true (pending)) 2530 if (expect_true (pending))
2184 { 2531 {
2185 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2532 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2533 p->w = (W)&pending_w;
2186 w_->pending = 0; 2534 w_->pending = 0;
2187 p->w = 0;
2188 return p->events; 2535 return p->events;
2189 } 2536 }
2190 else 2537 else
2191 return 0; 2538 return 0;
2192} 2539}
2193 2540
2194inline_size void 2541inline_size void
2195pri_adjust (EV_P_ W w) 2542pri_adjust (EV_P_ W w)
2196{ 2543{
2197 int pri = w->priority; 2544 int pri = ev_priority (w);
2198 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2545 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2199 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2546 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2200 w->priority = pri; 2547 ev_set_priority (w, pri);
2201} 2548}
2202 2549
2203inline_speed void 2550inline_speed void
2204ev_start (EV_P_ W w, int active) 2551ev_start (EV_P_ W w, int active)
2205{ 2552{
… …
2224 2571
2225 if (expect_false (ev_is_active (w))) 2572 if (expect_false (ev_is_active (w)))
2226 return; 2573 return;
2227 2574
2228 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2575 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2229 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))));
2230 2577
2231 EV_FREQUENT_CHECK; 2578 EV_FREQUENT_CHECK;
2232 2579
2233 ev_start (EV_A_ (W)w, 1); 2580 ev_start (EV_A_ (W)w, 1);
2234 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2581 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2235 wlist_add (&anfds[fd].head, (WL)w); 2582 wlist_add (&anfds[fd].head, (WL)w);
2236 2583
2237 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2584 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2238 w->events &= ~EV__IOFDSET; 2585 w->events &= ~EV__IOFDSET;
2239 2586
2240 EV_FREQUENT_CHECK; 2587 EV_FREQUENT_CHECK;
2241} 2588}
2242 2589
… …
2304 timers [active] = timers [timercnt + HEAP0]; 2651 timers [active] = timers [timercnt + HEAP0];
2305 adjustheap (timers, timercnt, active); 2652 adjustheap (timers, timercnt, active);
2306 } 2653 }
2307 } 2654 }
2308 2655
2309 EV_FREQUENT_CHECK;
2310
2311 ev_at (w) -= mn_now; 2656 ev_at (w) -= mn_now;
2312 2657
2313 ev_stop (EV_A_ (W)w); 2658 ev_stop (EV_A_ (W)w);
2659
2660 EV_FREQUENT_CHECK;
2314} 2661}
2315 2662
2316void noinline 2663void noinline
2317ev_timer_again (EV_P_ ev_timer *w) 2664ev_timer_again (EV_P_ ev_timer *w)
2318{ 2665{
… …
2336 } 2683 }
2337 2684
2338 EV_FREQUENT_CHECK; 2685 EV_FREQUENT_CHECK;
2339} 2686}
2340 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
2341#if EV_PERIODIC_ENABLE 2694#if EV_PERIODIC_ENABLE
2342void noinline 2695void noinline
2343ev_periodic_start (EV_P_ ev_periodic *w) 2696ev_periodic_start (EV_P_ ev_periodic *w)
2344{ 2697{
2345 if (expect_false (ev_is_active (w))) 2698 if (expect_false (ev_is_active (w)))
… …
2391 periodics [active] = periodics [periodiccnt + HEAP0]; 2744 periodics [active] = periodics [periodiccnt + HEAP0];
2392 adjustheap (periodics, periodiccnt, active); 2745 adjustheap (periodics, periodiccnt, active);
2393 } 2746 }
2394 } 2747 }
2395 2748
2396 EV_FREQUENT_CHECK;
2397
2398 ev_stop (EV_A_ (W)w); 2749 ev_stop (EV_A_ (W)w);
2750
2751 EV_FREQUENT_CHECK;
2399} 2752}
2400 2753
2401void noinline 2754void noinline
2402ev_periodic_again (EV_P_ ev_periodic *w) 2755ev_periodic_again (EV_P_ ev_periodic *w)
2403{ 2756{
… …
2409 2762
2410#ifndef SA_RESTART 2763#ifndef SA_RESTART
2411# define SA_RESTART 0 2764# define SA_RESTART 0
2412#endif 2765#endif
2413 2766
2767#if EV_SIGNAL_ENABLE
2768
2414void noinline 2769void noinline
2415ev_signal_start (EV_P_ ev_signal *w) 2770ev_signal_start (EV_P_ ev_signal *w)
2416{ 2771{
2417#if EV_MULTIPLICITY
2418 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2419#endif
2420 if (expect_false (ev_is_active (w))) 2772 if (expect_false (ev_is_active (w)))
2421 return; 2773 return;
2422 2774
2423 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));
2424 2776
2425 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));
2426 2780
2427 EV_FREQUENT_CHECK; 2781 signals [w->signum - 1].loop = EV_A;
2782#endif
2428 2783
2784 EV_FREQUENT_CHECK;
2785
2786#if EV_USE_SIGNALFD
2787 if (sigfd == -2)
2429 { 2788 {
2430#ifndef _WIN32 2789 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2431 sigset_t full, prev; 2790 if (sigfd < 0 && errno == EINVAL)
2432 sigfillset (&full); 2791 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2433 sigprocmask (SIG_SETMASK, &full, &prev);
2434#endif
2435 2792
2436 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 */
2437 2796
2438#ifndef _WIN32 2797 sigemptyset (&sigfd_set);
2439 sigprocmask (SIG_SETMASK, &prev, 0); 2798
2440#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 }
2441 } 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
2442 2815
2443 ev_start (EV_A_ (W)w, 1); 2816 ev_start (EV_A_ (W)w, 1);
2444 wlist_add (&signals [w->signum - 1].head, (WL)w); 2817 wlist_add (&signals [w->signum - 1].head, (WL)w);
2445 2818
2446 if (!((WL)w)->next) 2819 if (!((WL)w)->next)
2820# if EV_USE_SIGNALFD
2821 if (sigfd < 0) /*TODO*/
2822# endif
2447 { 2823 {
2448#if _WIN32 2824# ifdef _WIN32
2825 evpipe_init (EV_A);
2826
2449 signal (w->signum, ev_sighandler); 2827 signal (w->signum, ev_sighandler);
2450#else 2828# else
2451 struct sigaction sa; 2829 struct sigaction sa;
2830
2831 evpipe_init (EV_A);
2832
2452 sa.sa_handler = ev_sighandler; 2833 sa.sa_handler = ev_sighandler;
2453 sigfillset (&sa.sa_mask); 2834 sigfillset (&sa.sa_mask);
2454 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 */
2455 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);
2456#endif 2841#endif
2457 } 2842 }
2458 2843
2459 EV_FREQUENT_CHECK; 2844 EV_FREQUENT_CHECK;
2460} 2845}
2461 2846
2462void noinline 2847void noinline
… …
2470 2855
2471 wlist_del (&signals [w->signum - 1].head, (WL)w); 2856 wlist_del (&signals [w->signum - 1].head, (WL)w);
2472 ev_stop (EV_A_ (W)w); 2857 ev_stop (EV_A_ (W)w);
2473 2858
2474 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
2475 signal (w->signum, SIG_DFL); 2878 signal (w->signum, SIG_DFL);
2879 }
2476 2880
2477 EV_FREQUENT_CHECK; 2881 EV_FREQUENT_CHECK;
2478} 2882}
2883
2884#endif
2885
2886#if EV_CHILD_ENABLE
2479 2887
2480void 2888void
2481ev_child_start (EV_P_ ev_child *w) 2889ev_child_start (EV_P_ ev_child *w)
2482{ 2890{
2483#if EV_MULTIPLICITY 2891#if EV_MULTIPLICITY
… …
2487 return; 2895 return;
2488 2896
2489 EV_FREQUENT_CHECK; 2897 EV_FREQUENT_CHECK;
2490 2898
2491 ev_start (EV_A_ (W)w, 1); 2899 ev_start (EV_A_ (W)w, 1);
2492 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2900 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2493 2901
2494 EV_FREQUENT_CHECK; 2902 EV_FREQUENT_CHECK;
2495} 2903}
2496 2904
2497void 2905void
… …
2501 if (expect_false (!ev_is_active (w))) 2909 if (expect_false (!ev_is_active (w)))
2502 return; 2910 return;
2503 2911
2504 EV_FREQUENT_CHECK; 2912 EV_FREQUENT_CHECK;
2505 2913
2506 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2914 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2507 ev_stop (EV_A_ (W)w); 2915 ev_stop (EV_A_ (W)w);
2508 2916
2509 EV_FREQUENT_CHECK; 2917 EV_FREQUENT_CHECK;
2510} 2918}
2919
2920#endif
2511 2921
2512#if EV_STAT_ENABLE 2922#if EV_STAT_ENABLE
2513 2923
2514# ifdef _WIN32 2924# ifdef _WIN32
2515# undef lstat 2925# undef lstat
… …
2521#define MIN_STAT_INTERVAL 0.1074891 2931#define MIN_STAT_INTERVAL 0.1074891
2522 2932
2523static 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);
2524 2934
2525#if EV_USE_INOTIFY 2935#if EV_USE_INOTIFY
2526# 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)
2527 2939
2528static void noinline 2940static void noinline
2529infy_add (EV_P_ ev_stat *w) 2941infy_add (EV_P_ ev_stat *w)
2530{ 2942{
2531 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);
2532 2944
2533 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 */
2534 { 2965 }
2966 else
2967 {
2968 /* can't use inotify, continue to stat */
2535 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2969 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2536 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2537 2970
2538 /* monitor some parent directory for speedup hints */ 2971 /* if path is not there, monitor some parent directory for speedup hints */
2539 /* 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, */
2540 /* but an efficiency issue only */ 2973 /* but an efficiency issue only */
2541 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2974 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2542 { 2975 {
2543 char path [4096]; 2976 char path [4096];
… …
2559 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2992 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2560 } 2993 }
2561 } 2994 }
2562 2995
2563 if (w->wd >= 0) 2996 if (w->wd >= 0)
2564 {
2565 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);
2566 2998
2567 /* now local changes will be tracked by inotify, but remote changes won't */ 2999 /* now re-arm timer, if required */
2568 /* unless the filesystem it known to be local, we therefore still poll */ 3000 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2569 /* also do poll on <2.6.25, but with normal frequency */
2570 struct statfs sfs;
2571
2572 if (fs_2625 && !statfs (w->path, &sfs))
2573 if (sfs.f_type == 0x1373 /* devfs */
2574 || sfs.f_type == 0xEF53 /* ext2/3 */
2575 || sfs.f_type == 0x3153464a /* jfs */
2576 || sfs.f_type == 0x52654973 /* reiser3 */
2577 || sfs.f_type == 0x01021994 /* tempfs */
2578 || sfs.f_type == 0x58465342 /* xfs */)
2579 return;
2580
2581 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2582 ev_timer_again (EV_A_ &w->timer); 3001 ev_timer_again (EV_A_ &w->timer);
2583 } 3002 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2584} 3003}
2585 3004
2586static void noinline 3005static void noinline
2587infy_del (EV_P_ ev_stat *w) 3006infy_del (EV_P_ ev_stat *w)
2588{ 3007{
… …
2591 3010
2592 if (wd < 0) 3011 if (wd < 0)
2593 return; 3012 return;
2594 3013
2595 w->wd = -2; 3014 w->wd = -2;
2596 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3015 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2597 wlist_del (&fs_hash [slot].head, (WL)w); 3016 wlist_del (&fs_hash [slot].head, (WL)w);
2598 3017
2599 /* remove this watcher, if others are watching it, they will rearm */ 3018 /* remove this watcher, if others are watching it, they will rearm */
2600 inotify_rm_watch (fs_fd, wd); 3019 inotify_rm_watch (fs_fd, wd);
2601} 3020}
… …
2603static void noinline 3022static void noinline
2604infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3023infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2605{ 3024{
2606 if (slot < 0) 3025 if (slot < 0)
2607 /* overflow, need to check for all hash slots */ 3026 /* overflow, need to check for all hash slots */
2608 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3027 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2609 infy_wd (EV_A_ slot, wd, ev); 3028 infy_wd (EV_A_ slot, wd, ev);
2610 else 3029 else
2611 { 3030 {
2612 WL w_; 3031 WL w_;
2613 3032
2614 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3033 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2615 { 3034 {
2616 ev_stat *w = (ev_stat *)w_; 3035 ev_stat *w = (ev_stat *)w_;
2617 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 */
2618 3037
2619 if (w->wd == wd || wd == -1) 3038 if (w->wd == wd || wd == -1)
2620 { 3039 {
2621 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3040 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2622 { 3041 {
2623 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);
2624 w->wd = -1; 3043 w->wd = -1;
2625 infy_add (EV_A_ w); /* re-add, no matter what */ 3044 infy_add (EV_A_ w); /* re-add, no matter what */
2626 } 3045 }
2627 3046
2628 stat_timer_cb (EV_A_ &w->timer, 0); 3047 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2633 3052
2634static void 3053static void
2635infy_cb (EV_P_ ev_io *w, int revents) 3054infy_cb (EV_P_ ev_io *w, int revents)
2636{ 3055{
2637 char buf [EV_INOTIFY_BUFSIZE]; 3056 char buf [EV_INOTIFY_BUFSIZE];
2638 struct inotify_event *ev = (struct inotify_event *)buf;
2639 int ofs; 3057 int ofs;
2640 int len = read (fs_fd, buf, sizeof (buf)); 3058 int len = read (fs_fd, buf, sizeof (buf));
2641 3059
2642 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);
2643 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;
2644} 3098}
2645 3099
2646inline_size void 3100inline_size void
2647check_2625 (EV_P) 3101ev_check_2625 (EV_P)
2648{ 3102{
2649 /* kernels < 2.6.25 are borked 3103 /* kernels < 2.6.25 are borked
2650 * 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
2651 */ 3105 */
2652 struct utsname buf; 3106 if (ev_linux_version () < 0x020619)
2653 int major, minor, micro;
2654
2655 if (uname (&buf))
2656 return; 3107 return;
2657 3108
2658 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2659 return;
2660
2661 if (major < 2
2662 || (major == 2 && minor < 6)
2663 || (major == 2 && minor == 6 && micro < 25))
2664 return;
2665
2666 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 ();
2667} 3121}
2668 3122
2669inline_size void 3123inline_size void
2670infy_init (EV_P) 3124infy_init (EV_P)
2671{ 3125{
2672 if (fs_fd != -2) 3126 if (fs_fd != -2)
2673 return; 3127 return;
2674 3128
2675 fs_fd = -1; 3129 fs_fd = -1;
2676 3130
2677 check_2625 (EV_A); 3131 ev_check_2625 (EV_A);
2678 3132
2679 fs_fd = inotify_init (); 3133 fs_fd = infy_newfd ();
2680 3134
2681 if (fs_fd >= 0) 3135 if (fs_fd >= 0)
2682 { 3136 {
3137 fd_intern (fs_fd);
2683 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3138 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2684 ev_set_priority (&fs_w, EV_MAXPRI); 3139 ev_set_priority (&fs_w, EV_MAXPRI);
2685 ev_io_start (EV_A_ &fs_w); 3140 ev_io_start (EV_A_ &fs_w);
3141 ev_unref (EV_A);
2686 } 3142 }
2687} 3143}
2688 3144
2689inline_size void 3145inline_size void
2690infy_fork (EV_P) 3146infy_fork (EV_P)
… …
2692 int slot; 3148 int slot;
2693 3149
2694 if (fs_fd < 0) 3150 if (fs_fd < 0)
2695 return; 3151 return;
2696 3152
3153 ev_ref (EV_A);
3154 ev_io_stop (EV_A_ &fs_w);
2697 close (fs_fd); 3155 close (fs_fd);
2698 fs_fd = inotify_init (); 3156 fs_fd = infy_newfd ();
2699 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
2700 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3166 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2701 { 3167 {
2702 WL w_ = fs_hash [slot].head; 3168 WL w_ = fs_hash [slot].head;
2703 fs_hash [slot].head = 0; 3169 fs_hash [slot].head = 0;
2704 3170
2705 while (w_) 3171 while (w_)
… …
2710 w->wd = -1; 3176 w->wd = -1;
2711 3177
2712 if (fs_fd >= 0) 3178 if (fs_fd >= 0)
2713 infy_add (EV_A_ w); /* re-add, no matter what */ 3179 infy_add (EV_A_ w); /* re-add, no matter what */
2714 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);
2715 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 }
2716 } 3187 }
2717 } 3188 }
2718} 3189}
2719 3190
2720#endif 3191#endif
… …
2737static void noinline 3208static void noinline
2738stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3209stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2739{ 3210{
2740 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3211 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2741 3212
2742 /* we copy this here each the time so that */ 3213 ev_statdata prev = w->attr;
2743 /* prev has the old value when the callback gets invoked */
2744 w->prev = w->attr;
2745 ev_stat_stat (EV_A_ w); 3214 ev_stat_stat (EV_A_ w);
2746 3215
2747 /* 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 */
2748 if ( 3217 if (
2749 w->prev.st_dev != w->attr.st_dev 3218 prev.st_dev != w->attr.st_dev
2750 || w->prev.st_ino != w->attr.st_ino 3219 || prev.st_ino != w->attr.st_ino
2751 || w->prev.st_mode != w->attr.st_mode 3220 || prev.st_mode != w->attr.st_mode
2752 || w->prev.st_nlink != w->attr.st_nlink 3221 || prev.st_nlink != w->attr.st_nlink
2753 || w->prev.st_uid != w->attr.st_uid 3222 || prev.st_uid != w->attr.st_uid
2754 || w->prev.st_gid != w->attr.st_gid 3223 || prev.st_gid != w->attr.st_gid
2755 || w->prev.st_rdev != w->attr.st_rdev 3224 || prev.st_rdev != w->attr.st_rdev
2756 || w->prev.st_size != w->attr.st_size 3225 || prev.st_size != w->attr.st_size
2757 || w->prev.st_atime != w->attr.st_atime 3226 || prev.st_atime != w->attr.st_atime
2758 || w->prev.st_mtime != w->attr.st_mtime 3227 || prev.st_mtime != w->attr.st_mtime
2759 || w->prev.st_ctime != w->attr.st_ctime 3228 || prev.st_ctime != w->attr.st_ctime
2760 ) { 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
2761 #if EV_USE_INOTIFY 3235 #if EV_USE_INOTIFY
2762 if (fs_fd >= 0) 3236 if (fs_fd >= 0)
2763 { 3237 {
2764 infy_del (EV_A_ w); 3238 infy_del (EV_A_ w);
2765 infy_add (EV_A_ w); 3239 infy_add (EV_A_ w);
… …
2790 3264
2791 if (fs_fd >= 0) 3265 if (fs_fd >= 0)
2792 infy_add (EV_A_ w); 3266 infy_add (EV_A_ w);
2793 else 3267 else
2794#endif 3268#endif
3269 {
2795 ev_timer_again (EV_A_ &w->timer); 3270 ev_timer_again (EV_A_ &w->timer);
3271 ev_unref (EV_A);
3272 }
2796 3273
2797 ev_start (EV_A_ (W)w, 1); 3274 ev_start (EV_A_ (W)w, 1);
2798 3275
2799 EV_FREQUENT_CHECK; 3276 EV_FREQUENT_CHECK;
2800} 3277}
… …
2809 EV_FREQUENT_CHECK; 3286 EV_FREQUENT_CHECK;
2810 3287
2811#if EV_USE_INOTIFY 3288#if EV_USE_INOTIFY
2812 infy_del (EV_A_ w); 3289 infy_del (EV_A_ w);
2813#endif 3290#endif
3291
3292 if (ev_is_active (&w->timer))
3293 {
3294 ev_ref (EV_A);
2814 ev_timer_stop (EV_A_ &w->timer); 3295 ev_timer_stop (EV_A_ &w->timer);
3296 }
2815 3297
2816 ev_stop (EV_A_ (W)w); 3298 ev_stop (EV_A_ (W)w);
2817 3299
2818 EV_FREQUENT_CHECK; 3300 EV_FREQUENT_CHECK;
2819} 3301}
… …
2864 3346
2865 EV_FREQUENT_CHECK; 3347 EV_FREQUENT_CHECK;
2866} 3348}
2867#endif 3349#endif
2868 3350
3351#if EV_PREPARE_ENABLE
2869void 3352void
2870ev_prepare_start (EV_P_ ev_prepare *w) 3353ev_prepare_start (EV_P_ ev_prepare *w)
2871{ 3354{
2872 if (expect_false (ev_is_active (w))) 3355 if (expect_false (ev_is_active (w)))
2873 return; 3356 return;
… …
2899 3382
2900 ev_stop (EV_A_ (W)w); 3383 ev_stop (EV_A_ (W)w);
2901 3384
2902 EV_FREQUENT_CHECK; 3385 EV_FREQUENT_CHECK;
2903} 3386}
3387#endif
2904 3388
3389#if EV_CHECK_ENABLE
2905void 3390void
2906ev_check_start (EV_P_ ev_check *w) 3391ev_check_start (EV_P_ ev_check *w)
2907{ 3392{
2908 if (expect_false (ev_is_active (w))) 3393 if (expect_false (ev_is_active (w)))
2909 return; 3394 return;
… …
2935 3420
2936 ev_stop (EV_A_ (W)w); 3421 ev_stop (EV_A_ (W)w);
2937 3422
2938 EV_FREQUENT_CHECK; 3423 EV_FREQUENT_CHECK;
2939} 3424}
3425#endif
2940 3426
2941#if EV_EMBED_ENABLE 3427#if EV_EMBED_ENABLE
2942void noinline 3428void noinline
2943ev_embed_sweep (EV_P_ ev_embed *w) 3429ev_embed_sweep (EV_P_ ev_embed *w)
2944{ 3430{
… …
2960embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3446embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2961{ 3447{
2962 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3448 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2963 3449
2964 { 3450 {
2965 struct ev_loop *loop = w->other; 3451 EV_P = w->other;
2966 3452
2967 while (fdchangecnt) 3453 while (fdchangecnt)
2968 { 3454 {
2969 fd_reify (EV_A); 3455 fd_reify (EV_A);
2970 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3456 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2978 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));
2979 3465
2980 ev_embed_stop (EV_A_ w); 3466 ev_embed_stop (EV_A_ w);
2981 3467
2982 { 3468 {
2983 struct ev_loop *loop = w->other; 3469 EV_P = w->other;
2984 3470
2985 ev_loop_fork (EV_A); 3471 ev_loop_fork (EV_A);
2986 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3472 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2987 } 3473 }
2988 3474
… …
3002{ 3488{
3003 if (expect_false (ev_is_active (w))) 3489 if (expect_false (ev_is_active (w)))
3004 return; 3490 return;
3005 3491
3006 { 3492 {
3007 struct ev_loop *loop = w->other; 3493 EV_P = w->other;
3008 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 ()));
3009 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);
3010 } 3496 }
3011 3497
3012 EV_FREQUENT_CHECK; 3498 EV_FREQUENT_CHECK;
… …
3039 3525
3040 ev_io_stop (EV_A_ &w->io); 3526 ev_io_stop (EV_A_ &w->io);
3041 ev_prepare_stop (EV_A_ &w->prepare); 3527 ev_prepare_stop (EV_A_ &w->prepare);
3042 ev_fork_stop (EV_A_ &w->fork); 3528 ev_fork_stop (EV_A_ &w->fork);
3043 3529
3530 ev_stop (EV_A_ (W)w);
3531
3044 EV_FREQUENT_CHECK; 3532 EV_FREQUENT_CHECK;
3045} 3533}
3046#endif 3534#endif
3047 3535
3048#if EV_FORK_ENABLE 3536#if EV_FORK_ENABLE
… …
3124 3612
3125void 3613void
3126ev_async_send (EV_P_ ev_async *w) 3614ev_async_send (EV_P_ ev_async *w)
3127{ 3615{
3128 w->sent = 1; 3616 w->sent = 1;
3129 evpipe_write (EV_A_ &gotasync); 3617 evpipe_write (EV_A_ &async_pending);
3130} 3618}
3131#endif 3619#endif
3132 3620
3133/*****************************************************************************/ 3621/*****************************************************************************/
3134 3622
… …
3174{ 3662{
3175 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));
3176 3664
3177 if (expect_false (!once)) 3665 if (expect_false (!once))
3178 { 3666 {
3179 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3667 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3180 return; 3668 return;
3181 } 3669 }
3182 3670
3183 once->cb = cb; 3671 once->cb = cb;
3184 once->arg = arg; 3672 once->arg = arg;
… …
3198 } 3686 }
3199} 3687}
3200 3688
3201/*****************************************************************************/ 3689/*****************************************************************************/
3202 3690
3203#if 0 3691#if EV_WALK_ENABLE
3204void 3692void
3205ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3693ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3206{ 3694{
3207 int i, j; 3695 int i, j;
3208 ev_watcher_list *wl, *wn; 3696 ev_watcher_list *wl, *wn;
… …
3224#if EV_USE_INOTIFY 3712#if EV_USE_INOTIFY
3225 if (ev_cb ((ev_io *)wl) == infy_cb) 3713 if (ev_cb ((ev_io *)wl) == infy_cb)
3226 ; 3714 ;
3227 else 3715 else
3228#endif 3716#endif
3229 if ((ev_io *)wl != &pipeev) 3717 if ((ev_io *)wl != &pipe_w)
3230 if (types & EV_IO) 3718 if (types & EV_IO)
3231 cb (EV_A_ EV_IO, wl); 3719 cb (EV_A_ EV_IO, wl);
3232 3720
3233 wl = wn; 3721 wl = wn;
3234 } 3722 }
… …
3271 if (types & EV_ASYNC) 3759 if (types & EV_ASYNC)
3272 for (i = asynccnt; i--; ) 3760 for (i = asynccnt; i--; )
3273 cb (EV_A_ EV_ASYNC, asyncs [i]); 3761 cb (EV_A_ EV_ASYNC, asyncs [i]);
3274#endif 3762#endif
3275 3763
3764#if EV_PREPARE_ENABLE
3276 if (types & EV_PREPARE) 3765 if (types & EV_PREPARE)
3277 for (i = preparecnt; i--; ) 3766 for (i = preparecnt; i--; )
3278#if EV_EMBED_ENABLE 3767# if EV_EMBED_ENABLE
3279 if (ev_cb (prepares [i]) != embed_prepare_cb) 3768 if (ev_cb (prepares [i]) != embed_prepare_cb)
3280#endif 3769# endif
3281 cb (EV_A_ EV_PREPARE, prepares [i]); 3770 cb (EV_A_ EV_PREPARE, prepares [i]);
3771#endif
3282 3772
3773#if EV_CHECK_ENABLE
3283 if (types & EV_CHECK) 3774 if (types & EV_CHECK)
3284 for (i = checkcnt; i--; ) 3775 for (i = checkcnt; i--; )
3285 cb (EV_A_ EV_CHECK, checks [i]); 3776 cb (EV_A_ EV_CHECK, checks [i]);
3777#endif
3286 3778
3779#if EV_SIGNAL_ENABLE
3287 if (types & EV_SIGNAL) 3780 if (types & EV_SIGNAL)
3288 for (i = 0; i < signalmax; ++i) 3781 for (i = 0; i < EV_NSIG - 1; ++i)
3289 for (wl = signals [i].head; wl; ) 3782 for (wl = signals [i].head; wl; )
3290 { 3783 {
3291 wn = wl->next; 3784 wn = wl->next;
3292 cb (EV_A_ EV_SIGNAL, wl); 3785 cb (EV_A_ EV_SIGNAL, wl);
3293 wl = wn; 3786 wl = wn;
3294 } 3787 }
3788#endif
3295 3789
3790#if EV_CHILD_ENABLE
3296 if (types & EV_CHILD) 3791 if (types & EV_CHILD)
3297 for (i = EV_PID_HASHSIZE; i--; ) 3792 for (i = (EV_PID_HASHSIZE); i--; )
3298 for (wl = childs [i]; wl; ) 3793 for (wl = childs [i]; wl; )
3299 { 3794 {
3300 wn = wl->next; 3795 wn = wl->next;
3301 cb (EV_A_ EV_CHILD, wl); 3796 cb (EV_A_ EV_CHILD, wl);
3302 wl = wn; 3797 wl = wn;
3303 } 3798 }
3799#endif
3304/* EV_STAT 0x00001000 /* stat data changed */ 3800/* EV_STAT 0x00001000 /* stat data changed */
3305/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3801/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3306} 3802}
3307#endif 3803#endif
3308 3804

Diff Legend

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