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

Comparing libev/ev.c (file contents):
Revision 1.273 by root, Mon Nov 3 14:27:06 2008 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 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 *
… …
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
64# endif
65
52# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
55# endif 69# endif
56# ifndef EV_USE_REALTIME 70# ifndef EV_USE_REALTIME
57# define EV_USE_REALTIME 1 71# define EV_USE_REALTIME 0
58# endif 72# endif
59# else 73# else
60# ifndef EV_USE_MONOTONIC 74# ifndef EV_USE_MONOTONIC
61# define EV_USE_MONOTONIC 0 75# define EV_USE_MONOTONIC 0
62# endif 76# endif
63# ifndef EV_USE_REALTIME 77# ifndef EV_USE_REALTIME
64# define EV_USE_REALTIME 0 78# define EV_USE_REALTIME 0
65# endif 79# endif
66# endif 80# endif
67 81
82# if HAVE_NANOSLEEP
68# ifndef EV_USE_NANOSLEEP 83# ifndef EV_USE_NANOSLEEP
69# if HAVE_NANOSLEEP
70# define EV_USE_NANOSLEEP 1 84# define EV_USE_NANOSLEEP EV_FEATURE_OS
85# endif
71# else 86# else
87# undef EV_USE_NANOSLEEP
72# 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
73# endif 94# endif
95# else
96# undef EV_USE_SELECT
97# define EV_USE_SELECT 0
74# endif 98# endif
75 99
100# if HAVE_POLL && HAVE_POLL_H
76# ifndef EV_USE_SELECT 101# ifndef EV_USE_POLL
77# if HAVE_SELECT && HAVE_SYS_SELECT_H 102# define EV_USE_POLL EV_FEATURE_BACKENDS
78# define EV_USE_SELECT 1
79# else
80# define EV_USE_SELECT 0
81# endif 103# endif
82# endif
83
84# ifndef EV_USE_POLL
85# if HAVE_POLL && HAVE_POLL_H
86# define EV_USE_POLL 1
87# else 104# else
105# undef EV_USE_POLL
88# define EV_USE_POLL 0 106# define EV_USE_POLL 0
89# endif
90# endif 107# endif
91 108
92# ifndef EV_USE_EPOLL
93# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 109# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
94# define EV_USE_EPOLL 1 110# ifndef EV_USE_EPOLL
95# else 111# define EV_USE_EPOLL EV_FEATURE_BACKENDS
96# define EV_USE_EPOLL 0
97# endif 112# endif
113# else
114# undef EV_USE_EPOLL
115# define EV_USE_EPOLL 0
98# endif 116# endif
99 117
118# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
100# ifndef EV_USE_KQUEUE 119# ifndef EV_USE_KQUEUE
101# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 120# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
102# define EV_USE_KQUEUE 1
103# else
104# define EV_USE_KQUEUE 0
105# endif 121# endif
122# else
123# undef EV_USE_KQUEUE
124# define EV_USE_KQUEUE 0
106# endif 125# endif
107 126
108# ifndef EV_USE_PORT
109# if HAVE_PORT_H && HAVE_PORT_CREATE 127# if HAVE_PORT_H && HAVE_PORT_CREATE
110# define EV_USE_PORT 1 128# ifndef EV_USE_PORT
111# else 129# define EV_USE_PORT EV_FEATURE_BACKENDS
112# define EV_USE_PORT 0
113# endif 130# endif
131# else
132# undef EV_USE_PORT
133# define EV_USE_PORT 0
114# endif 134# endif
115 135
116# ifndef EV_USE_INOTIFY
117# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 136# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
118# define EV_USE_INOTIFY 1 137# ifndef EV_USE_INOTIFY
119# else
120# define EV_USE_INOTIFY 0 138# define EV_USE_INOTIFY EV_FEATURE_OS
121# endif 139# endif
140# else
141# undef EV_USE_INOTIFY
142# define EV_USE_INOTIFY 0
122# endif 143# endif
123 144
145# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
124# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_SIGNALFD
125# if HAVE_EVENTFD 147# define EV_USE_SIGNALFD EV_FEATURE_OS
126# define EV_USE_EVENTFD 1
127# else
128# define EV_USE_EVENTFD 0
129# 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
130# endif 161# endif
131 162
132#endif 163#endif
133 164
134#include <math.h> 165#include <math.h>
135#include <stdlib.h> 166#include <stdlib.h>
167#include <string.h>
136#include <fcntl.h> 168#include <fcntl.h>
137#include <stddef.h> 169#include <stddef.h>
138 170
139#include <stdio.h> 171#include <stdio.h>
140 172
141#include <assert.h> 173#include <assert.h>
142#include <errno.h> 174#include <errno.h>
143#include <sys/types.h> 175#include <sys/types.h>
144#include <time.h> 176#include <time.h>
177#include <limits.h>
145 178
146#include <signal.h> 179#include <signal.h>
147 180
148#ifdef EV_H 181#ifdef EV_H
149# include EV_H 182# include EV_H
… …
160# define WIN32_LEAN_AND_MEAN 193# define WIN32_LEAN_AND_MEAN
161# include <windows.h> 194# include <windows.h>
162# ifndef EV_SELECT_IS_WINSOCKET 195# ifndef EV_SELECT_IS_WINSOCKET
163# define EV_SELECT_IS_WINSOCKET 1 196# define EV_SELECT_IS_WINSOCKET 1
164# endif 197# endif
198# undef EV_AVOID_STDIO
165#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
166 208
167/* 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
238
239#ifndef EV_USE_CLOCK_SYSCALL
240# if __linux && __GLIBC__ >= 2
241# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
242# else
243# define EV_USE_CLOCK_SYSCALL 0
244# endif
245#endif
168 246
169#ifndef EV_USE_MONOTONIC 247#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 248# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 249# define EV_USE_MONOTONIC EV_FEATURE_OS
172# else 250# else
173# define EV_USE_MONOTONIC 0 251# define EV_USE_MONOTONIC 0
174# endif 252# endif
175#endif 253#endif
176 254
177#ifndef EV_USE_REALTIME 255#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 256# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 257#endif
180 258
181#ifndef EV_USE_NANOSLEEP 259#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 260# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 261# define EV_USE_NANOSLEEP EV_FEATURE_OS
184# else 262# else
185# define EV_USE_NANOSLEEP 0 263# define EV_USE_NANOSLEEP 0
186# endif 264# endif
187#endif 265#endif
188 266
189#ifndef EV_USE_SELECT 267#ifndef EV_USE_SELECT
190# define EV_USE_SELECT 1 268# define EV_USE_SELECT EV_FEATURE_BACKENDS
191#endif 269#endif
192 270
193#ifndef EV_USE_POLL 271#ifndef EV_USE_POLL
194# ifdef _WIN32 272# ifdef _WIN32
195# define EV_USE_POLL 0 273# define EV_USE_POLL 0
196# else 274# else
197# define EV_USE_POLL 1 275# define EV_USE_POLL EV_FEATURE_BACKENDS
198# endif 276# endif
199#endif 277#endif
200 278
201#ifndef EV_USE_EPOLL 279#ifndef EV_USE_EPOLL
202# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
203# define EV_USE_EPOLL 1 281# define EV_USE_EPOLL EV_FEATURE_BACKENDS
204# else 282# else
205# define EV_USE_EPOLL 0 283# define EV_USE_EPOLL 0
206# endif 284# endif
207#endif 285#endif
208 286
… …
214# define EV_USE_PORT 0 292# define EV_USE_PORT 0
215#endif 293#endif
216 294
217#ifndef EV_USE_INOTIFY 295#ifndef EV_USE_INOTIFY
218# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 296# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
219# define EV_USE_INOTIFY 1 297# define EV_USE_INOTIFY EV_FEATURE_OS
220# else 298# else
221# define EV_USE_INOTIFY 0 299# define EV_USE_INOTIFY 0
222# endif 300# endif
223#endif 301#endif
224 302
225#ifndef EV_PID_HASHSIZE 303#ifndef EV_PID_HASHSIZE
226# if EV_MINIMAL 304# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
227# define EV_PID_HASHSIZE 1
228# else
229# define EV_PID_HASHSIZE 16
230# endif
231#endif 305#endif
232 306
233#ifndef EV_INOTIFY_HASHSIZE 307#ifndef EV_INOTIFY_HASHSIZE
234# if EV_MINIMAL 308# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
235# define EV_INOTIFY_HASHSIZE 1
236# else
237# define EV_INOTIFY_HASHSIZE 16
238# endif
239#endif 309#endif
240 310
241#ifndef EV_USE_EVENTFD 311#ifndef EV_USE_EVENTFD
242# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
243# define EV_USE_EVENTFD 1 313# define EV_USE_EVENTFD EV_FEATURE_OS
244# else 314# else
245# 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
246# endif 324# endif
247#endif 325#endif
248 326
249#if 0 /* debugging */ 327#if 0 /* debugging */
250# define EV_VERIFY 3 328# define EV_VERIFY 3
251# define EV_USE_4HEAP 1 329# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1 330# define EV_HEAP_CACHE_AT 1
253#endif 331#endif
254 332
255#ifndef EV_VERIFY 333#ifndef EV_VERIFY
256# define EV_VERIFY !EV_MINIMAL 334# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
257#endif 335#endif
258 336
259#ifndef EV_USE_4HEAP 337#ifndef EV_USE_4HEAP
260# define EV_USE_4HEAP !EV_MINIMAL 338# define EV_USE_4HEAP EV_FEATURE_DATA
261#endif 339#endif
262 340
263#ifndef EV_HEAP_CACHE_AT 341#ifndef EV_HEAP_CACHE_AT
264# 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
265#endif 357#endif
266 358
267/* 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
268 366
269#ifndef CLOCK_MONOTONIC 367#ifndef CLOCK_MONOTONIC
270# undef EV_USE_MONOTONIC 368# undef EV_USE_MONOTONIC
271# define EV_USE_MONOTONIC 0 369# define EV_USE_MONOTONIC 0
272#endif 370#endif
… …
303#endif 401#endif
304 402
305#if EV_USE_EVENTFD 403#if EV_USE_EVENTFD
306/* 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 */
307# 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
308# ifdef __cplusplus 416# ifdef __cplusplus
309extern "C" { 417extern "C" {
310# endif 418# endif
311int eventfd (unsigned int initval, int flags); 419int (eventfd) (unsigned int initval, int flags);
312# ifdef __cplusplus 420# ifdef __cplusplus
313} 421}
314# endif 422# endif
315#endif 423#endif
316 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
317/**/ 454/**/
318 455
319#if EV_VERIFY >= 3 456#if EV_VERIFY >= 3
320# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 457# define EV_FREQUENT_CHECK ev_verify (EV_A)
321#else 458#else
322# define EV_FREQUENT_CHECK do { } while (0) 459# define EV_FREQUENT_CHECK do { } while (0)
323#endif 460#endif
324 461
325/* 462/*
… …
332 */ 469 */
333#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 470#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
334 471
335#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) */
336#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) */
337/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
338 474
339#if __GNUC__ >= 4 475#if __GNUC__ >= 4
340# define expect(expr,value) __builtin_expect ((expr),(value)) 476# define expect(expr,value) __builtin_expect ((expr),(value))
341# define noinline __attribute__ ((noinline)) 477# define noinline __attribute__ ((noinline))
342#else 478#else
… …
349 485
350#define expect_false(expr) expect ((expr) != 0, 0) 486#define expect_false(expr) expect ((expr) != 0, 0)
351#define expect_true(expr) expect ((expr) != 0, 1) 487#define expect_true(expr) expect ((expr) != 0, 1)
352#define inline_size static inline 488#define inline_size static inline
353 489
354#if EV_MINIMAL 490#if EV_FEATURE_CODE
491# define inline_speed static inline
492#else
355# 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)
356#else 500#else
357# define inline_speed static inline
358#endif
359
360#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
361#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 501# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
502#endif
362 503
363#define EMPTY /* required for microsofts broken pseudo-c compiler */ 504#define EMPTY /* required for microsofts broken pseudo-c compiler */
364#define EMPTY2(a,b) /* used to suppress some warnings */ 505#define EMPTY2(a,b) /* used to suppress some warnings */
365 506
366typedef ev_watcher *W; 507typedef ev_watcher *W;
… …
368typedef ev_watcher_time *WT; 509typedef ev_watcher_time *WT;
369 510
370#define ev_active(w) ((W)(w))->active 511#define ev_active(w) ((W)(w))->active
371#define ev_at(w) ((WT)(w))->at 512#define ev_at(w) ((WT)(w))->at
372 513
514#if EV_USE_REALTIME
515/* sig_atomic_t is used to avoid per-thread variables or locking but still */
516/* giving it a reasonably high chance of working on typical architectures */
517static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
518#endif
519
373#if EV_USE_MONOTONIC 520#if EV_USE_MONOTONIC
374/* sig_atomic_t is used to avoid per-thread variables or locking but still */
375/* giving it a reasonably high chance of working on typical architetcures */
376static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 521static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
522#endif
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)
377#endif 532#endif
378 533
379#ifdef _WIN32 534#ifdef _WIN32
380# include "ev_win32.c" 535# include "ev_win32.c"
381#endif 536#endif
382 537
383/*****************************************************************************/ 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
384 547
385static void (*syserr_cb)(const char *msg); 548static void (*syserr_cb)(const char *msg);
386 549
387void 550void
388ev_set_syserr_cb (void (*cb)(const char *msg)) 551ev_set_syserr_cb (void (*cb)(const char *msg))
… …
398 561
399 if (syserr_cb) 562 if (syserr_cb)
400 syserr_cb (msg); 563 syserr_cb (msg);
401 else 564 else
402 { 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
403 perror (msg); 574 perror (msg);
575#endif
404 abort (); 576 abort ();
405 } 577 }
406} 578}
407 579
408static void * 580static void *
409ev_realloc_emul (void *ptr, long size) 581ev_realloc_emul (void *ptr, long size)
410{ 582{
583#if __GLIBC__
584 return realloc (ptr, size);
585#else
411 /* some systems, notably openbsd and darwin, fail to properly 586 /* some systems, notably openbsd and darwin, fail to properly
412 * 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
413 * the single unix specification, so work around them here. 588 * the single unix specification, so work around them here.
414 */ 589 */
415 590
416 if (size) 591 if (size)
417 return realloc (ptr, size); 592 return realloc (ptr, size);
418 593
419 free (ptr); 594 free (ptr);
420 return 0; 595 return 0;
596#endif
421} 597}
422 598
423static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 599static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
424 600
425void 601void
… …
433{ 609{
434 ptr = alloc (ptr, size); 610 ptr = alloc (ptr, size);
435 611
436 if (!ptr && size) 612 if (!ptr && size)
437 { 613 {
614#if EV_AVOID_STDIO
615 ev_printerr ("libev: memory allocation failed, aborting.\n");
616#else
438 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 617 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
618#endif
439 abort (); 619 abort ();
440 } 620 }
441 621
442 return ptr; 622 return ptr;
443} 623}
… …
445#define ev_malloc(size) ev_realloc (0, (size)) 625#define ev_malloc(size) ev_realloc (0, (size))
446#define ev_free(ptr) ev_realloc ((ptr), 0) 626#define ev_free(ptr) ev_realloc ((ptr), 0)
447 627
448/*****************************************************************************/ 628/*****************************************************************************/
449 629
630/* set in reify when reification needed */
631#define EV_ANFD_REIFY 1
632
633/* file descriptor info structure */
450typedef struct 634typedef struct
451{ 635{
452 WL head; 636 WL head;
453 unsigned char events; 637 unsigned char events; /* the events watched for */
454 unsigned char reify; 638 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
455 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 */
456 unsigned char unused; 640 unsigned char unused;
457#if EV_USE_EPOLL 641#if EV_USE_EPOLL
458 unsigned int egen; /* generation counter to counter epoll bugs */ 642 unsigned int egen; /* generation counter to counter epoll bugs */
459#endif 643#endif
460#if EV_SELECT_IS_WINSOCKET 644#if EV_SELECT_IS_WINSOCKET
461 SOCKET handle; 645 SOCKET handle;
462#endif 646#endif
463} ANFD; 647} ANFD;
464 648
649/* stores the pending event set for a given watcher */
465typedef struct 650typedef struct
466{ 651{
467 W w; 652 W w;
468 int events; 653 int events; /* the pending event set for the given watcher */
469} ANPENDING; 654} ANPENDING;
470 655
471#if EV_USE_INOTIFY 656#if EV_USE_INOTIFY
472/* hash table entry per inotify-id */ 657/* hash table entry per inotify-id */
473typedef struct 658typedef struct
… …
476} ANFS; 661} ANFS;
477#endif 662#endif
478 663
479/* Heap Entry */ 664/* Heap Entry */
480#if EV_HEAP_CACHE_AT 665#if EV_HEAP_CACHE_AT
666 /* a heap element */
481 typedef struct { 667 typedef struct {
482 ev_tstamp at; 668 ev_tstamp at;
483 WT w; 669 WT w;
484 } ANHE; 670 } ANHE;
485 671
486 #define ANHE_w(he) (he).w /* access watcher, read-write */ 672 #define ANHE_w(he) (he).w /* access watcher, read-write */
487 #define ANHE_at(he) (he).at /* access cached at, read-only */ 673 #define ANHE_at(he) (he).at /* access cached at, read-only */
488 #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 */
489#else 675#else
676 /* a heap element */
490 typedef WT ANHE; 677 typedef WT ANHE;
491 678
492 #define ANHE_w(he) (he) 679 #define ANHE_w(he) (he)
493 #define ANHE_at(he) (he)->at 680 #define ANHE_at(he) (he)->at
494 #define ANHE_at_cache(he) 681 #define ANHE_at_cache(he)
… …
518 705
519 static int ev_default_loop_ptr; 706 static int ev_default_loop_ptr;
520 707
521#endif 708#endif
522 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
523/*****************************************************************************/ 722/*****************************************************************************/
524 723
724#ifndef EV_HAVE_EV_TIME
525ev_tstamp 725ev_tstamp
526ev_time (void) 726ev_time (void)
527{ 727{
528#if EV_USE_REALTIME 728#if EV_USE_REALTIME
729 if (expect_true (have_realtime))
730 {
529 struct timespec ts; 731 struct timespec ts;
530 clock_gettime (CLOCK_REALTIME, &ts); 732 clock_gettime (CLOCK_REALTIME, &ts);
531 return ts.tv_sec + ts.tv_nsec * 1e-9; 733 return ts.tv_sec + ts.tv_nsec * 1e-9;
532#else 734 }
735#endif
736
533 struct timeval tv; 737 struct timeval tv;
534 gettimeofday (&tv, 0); 738 gettimeofday (&tv, 0);
535 return tv.tv_sec + tv.tv_usec * 1e-6; 739 return tv.tv_sec + tv.tv_usec * 1e-6;
536#endif
537} 740}
741#endif
538 742
539ev_tstamp inline_size 743inline_size ev_tstamp
540get_clock (void) 744get_clock (void)
541{ 745{
542#if EV_USE_MONOTONIC 746#if EV_USE_MONOTONIC
543 if (expect_true (have_monotonic)) 747 if (expect_true (have_monotonic))
544 { 748 {
… …
578 782
579 tv.tv_sec = (time_t)delay; 783 tv.tv_sec = (time_t)delay;
580 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 784 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
581 785
582 /* 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 */
583 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 787 /* something not guaranteed by newer posix versions, but guaranteed */
584 /* by older ones */ 788 /* by older ones */
585 select (0, 0, 0, 0, &tv); 789 select (0, 0, 0, 0, &tv);
586#endif 790#endif
587 } 791 }
588} 792}
589 793
590/*****************************************************************************/ 794/*****************************************************************************/
591 795
592#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 */
593 797
594int inline_size 798/* find a suitable new size for the given array, */
799/* hopefully by rounding to a nice-to-malloc size */
800inline_size int
595array_nextsize (int elem, int cur, int cnt) 801array_nextsize (int elem, int cur, int cnt)
596{ 802{
597 int ncur = cur + 1; 803 int ncur = cur + 1;
598 804
599 do 805 do
… …
640 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 846 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
641 } 847 }
642#endif 848#endif
643 849
644#define array_free(stem, idx) \ 850#define array_free(stem, idx) \
645 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 851 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
646 852
647/*****************************************************************************/ 853/*****************************************************************************/
854
855/* dummy callback for pending events */
856static void noinline
857pendingcb (EV_P_ ev_prepare *w, int revents)
858{
859}
648 860
649void noinline 861void noinline
650ev_feed_event (EV_P_ void *w, int revents) 862ev_feed_event (EV_P_ void *w, int revents)
651{ 863{
652 W w_ = (W)w; 864 W w_ = (W)w;
… …
661 pendings [pri][w_->pending - 1].w = w_; 873 pendings [pri][w_->pending - 1].w = w_;
662 pendings [pri][w_->pending - 1].events = revents; 874 pendings [pri][w_->pending - 1].events = revents;
663 } 875 }
664} 876}
665 877
666void inline_speed 878inline_speed void
879feed_reverse (EV_P_ W w)
880{
881 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
882 rfeeds [rfeedcnt++] = w;
883}
884
885inline_size void
886feed_reverse_done (EV_P_ int revents)
887{
888 do
889 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
890 while (rfeedcnt);
891}
892
893inline_speed void
667queue_events (EV_P_ W *events, int eventcnt, int type) 894queue_events (EV_P_ W *events, int eventcnt, int type)
668{ 895{
669 int i; 896 int i;
670 897
671 for (i = 0; i < eventcnt; ++i) 898 for (i = 0; i < eventcnt; ++i)
672 ev_feed_event (EV_A_ events [i], type); 899 ev_feed_event (EV_A_ events [i], type);
673} 900}
674 901
675/*****************************************************************************/ 902/*****************************************************************************/
676 903
677void inline_speed 904inline_speed void
678fd_event (EV_P_ int fd, int revents) 905fd_event_nocheck (EV_P_ int fd, int revents)
679{ 906{
680 ANFD *anfd = anfds + fd; 907 ANFD *anfd = anfds + fd;
681 ev_io *w; 908 ev_io *w;
682 909
683 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)
… …
687 if (ev) 914 if (ev)
688 ev_feed_event (EV_A_ (W)w, ev); 915 ev_feed_event (EV_A_ (W)w, ev);
689 } 916 }
690} 917}
691 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
692void 930void
693ev_feed_fd_event (EV_P_ int fd, int revents) 931ev_feed_fd_event (EV_P_ int fd, int revents)
694{ 932{
695 if (fd >= 0 && fd < anfdmax) 933 if (fd >= 0 && fd < anfdmax)
696 fd_event (EV_A_ fd, revents); 934 fd_event_nocheck (EV_A_ fd, revents);
697} 935}
698 936
699void inline_size 937/* make sure the external fd watch events are in-sync */
938/* with the kernel/libev internal state */
939inline_size void
700fd_reify (EV_P) 940fd_reify (EV_P)
701{ 941{
702 int i; 942 int i;
703 943
704 for (i = 0; i < fdchangecnt; ++i) 944 for (i = 0; i < fdchangecnt; ++i)
… …
714 954
715#if EV_SELECT_IS_WINSOCKET 955#if EV_SELECT_IS_WINSOCKET
716 if (events) 956 if (events)
717 { 957 {
718 unsigned long arg; 958 unsigned long arg;
719 #ifdef EV_FD_TO_WIN32_HANDLE
720 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 959 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
721 #else
722 anfd->handle = _get_osfhandle (fd);
723 #endif
724 assert (("libev only supports socket fds 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));
725 } 961 }
726#endif 962#endif
727 963
728 { 964 {
729 unsigned char o_events = anfd->events; 965 unsigned char o_events = anfd->events;
730 unsigned char o_reify = anfd->reify; 966 unsigned char o_reify = anfd->reify;
731 967
732 anfd->reify = 0; 968 anfd->reify = 0;
733 anfd->events = events; 969 anfd->events = events;
734 970
735 if (o_events != events || o_reify & EV_IOFDSET) 971 if (o_events != events || o_reify & EV__IOFDSET)
736 backend_modify (EV_A_ fd, o_events, events); 972 backend_modify (EV_A_ fd, o_events, events);
737 } 973 }
738 } 974 }
739 975
740 fdchangecnt = 0; 976 fdchangecnt = 0;
741} 977}
742 978
743void inline_size 979/* something about the given fd changed */
980inline_size void
744fd_change (EV_P_ int fd, int flags) 981fd_change (EV_P_ int fd, int flags)
745{ 982{
746 unsigned char reify = anfds [fd].reify; 983 unsigned char reify = anfds [fd].reify;
747 anfds [fd].reify |= flags; 984 anfds [fd].reify |= flags;
748 985
… …
752 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 989 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
753 fdchanges [fdchangecnt - 1] = fd; 990 fdchanges [fdchangecnt - 1] = fd;
754 } 991 }
755} 992}
756 993
757void inline_speed 994/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
995inline_speed void
758fd_kill (EV_P_ int fd) 996fd_kill (EV_P_ int fd)
759{ 997{
760 ev_io *w; 998 ev_io *w;
761 999
762 while ((w = (ev_io *)anfds [fd].head)) 1000 while ((w = (ev_io *)anfds [fd].head))
… …
764 ev_io_stop (EV_A_ w); 1002 ev_io_stop (EV_A_ w);
765 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);
766 } 1004 }
767} 1005}
768 1006
769int inline_size 1007/* check whether the given fd is actually valid, for error recovery */
1008inline_size int
770fd_valid (int fd) 1009fd_valid (int fd)
771{ 1010{
772#ifdef _WIN32 1011#ifdef _WIN32
773 return _get_osfhandle (fd) != -1; 1012 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
774#else 1013#else
775 return fcntl (fd, F_GETFD) != -1; 1014 return fcntl (fd, F_GETFD) != -1;
776#endif 1015#endif
777} 1016}
778 1017
… …
796 1035
797 for (fd = anfdmax; fd--; ) 1036 for (fd = anfdmax; fd--; )
798 if (anfds [fd].events) 1037 if (anfds [fd].events)
799 { 1038 {
800 fd_kill (EV_A_ fd); 1039 fd_kill (EV_A_ fd);
801 return; 1040 break;
802 } 1041 }
803} 1042}
804 1043
805/* 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 */
806static void noinline 1045static void noinline
… …
811 for (fd = 0; fd < anfdmax; ++fd) 1050 for (fd = 0; fd < anfdmax; ++fd)
812 if (anfds [fd].events) 1051 if (anfds [fd].events)
813 { 1052 {
814 anfds [fd].events = 0; 1053 anfds [fd].events = 0;
815 anfds [fd].emask = 0; 1054 anfds [fd].emask = 0;
816 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1055 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
817 } 1056 }
818} 1057}
819 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
820/*****************************************************************************/ 1073/*****************************************************************************/
821 1074
822/* 1075/*
823 * 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
824 * 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
825 * the branching factor of the d-tree. 1078 * the branching factor of the d-tree.
826 */ 1079 */
827 1080
828/* 1081/*
… …
837#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1090#define HEAP0 (DHEAP - 1) /* index of first element in heap */
838#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1091#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
839#define UPHEAP_DONE(p,k) ((p) == (k)) 1092#define UPHEAP_DONE(p,k) ((p) == (k))
840 1093
841/* away from the root */ 1094/* away from the root */
842void inline_speed 1095inline_speed void
843downheap (ANHE *heap, int N, int k) 1096downheap (ANHE *heap, int N, int k)
844{ 1097{
845 ANHE he = heap [k]; 1098 ANHE he = heap [k];
846 ANHE *E = heap + N + HEAP0; 1099 ANHE *E = heap + N + HEAP0;
847 1100
… …
887#define HEAP0 1 1140#define HEAP0 1
888#define HPARENT(k) ((k) >> 1) 1141#define HPARENT(k) ((k) >> 1)
889#define UPHEAP_DONE(p,k) (!(p)) 1142#define UPHEAP_DONE(p,k) (!(p))
890 1143
891/* away from the root */ 1144/* away from the root */
892void inline_speed 1145inline_speed void
893downheap (ANHE *heap, int N, int k) 1146downheap (ANHE *heap, int N, int k)
894{ 1147{
895 ANHE he = heap [k]; 1148 ANHE he = heap [k];
896 1149
897 for (;;) 1150 for (;;)
898 { 1151 {
899 int c = k << 1; 1152 int c = k << 1;
900 1153
901 if (c > N + HEAP0 - 1) 1154 if (c >= N + HEAP0)
902 break; 1155 break;
903 1156
904 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])
905 ? 1 : 0; 1158 ? 1 : 0;
906 1159
… …
917 ev_active (ANHE_w (he)) = k; 1170 ev_active (ANHE_w (he)) = k;
918} 1171}
919#endif 1172#endif
920 1173
921/* towards the root */ 1174/* towards the root */
922void inline_speed 1175inline_speed void
923upheap (ANHE *heap, int k) 1176upheap (ANHE *heap, int k)
924{ 1177{
925 ANHE he = heap [k]; 1178 ANHE he = heap [k];
926 1179
927 for (;;) 1180 for (;;)
… …
938 1191
939 heap [k] = he; 1192 heap [k] = he;
940 ev_active (ANHE_w (he)) = k; 1193 ev_active (ANHE_w (he)) = k;
941} 1194}
942 1195
943void inline_size 1196/* move an element suitably so it is in a correct place */
1197inline_size void
944adjustheap (ANHE *heap, int N, int k) 1198adjustheap (ANHE *heap, int N, int k)
945{ 1199{
946 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)]))
947 upheap (heap, k); 1201 upheap (heap, k);
948 else 1202 else
949 downheap (heap, N, k); 1203 downheap (heap, N, k);
950} 1204}
951 1205
952/* rebuild the heap: this function is used only once and executed rarely */ 1206/* rebuild the heap: this function is used only once and executed rarely */
953void inline_size 1207inline_size void
954reheap (ANHE *heap, int N) 1208reheap (ANHE *heap, int N)
955{ 1209{
956 int i; 1210 int i;
957 1211
958 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1212 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
961 upheap (heap, i + HEAP0); 1215 upheap (heap, i + HEAP0);
962} 1216}
963 1217
964/*****************************************************************************/ 1218/*****************************************************************************/
965 1219
1220/* associate signal watchers to a signal signal */
966typedef struct 1221typedef struct
967{ 1222{
1223 EV_ATOMIC_T pending;
1224#if EV_MULTIPLICITY
1225 EV_P;
1226#endif
968 WL head; 1227 WL head;
969 EV_ATOMIC_T gotsig;
970} ANSIG; 1228} ANSIG;
971 1229
972static ANSIG *signals; 1230static ANSIG signals [EV_NSIG - 1];
973static int signalmax;
974
975static EV_ATOMIC_T gotsig;
976 1231
977/*****************************************************************************/ 1232/*****************************************************************************/
978 1233
979void inline_speed 1234#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
980fd_intern (int fd)
981{
982#ifdef _WIN32
983 unsigned long arg = 1;
984 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
985#else
986 fcntl (fd, F_SETFD, FD_CLOEXEC);
987 fcntl (fd, F_SETFL, O_NONBLOCK);
988#endif
989}
990 1235
991static void noinline 1236static void noinline
992evpipe_init (EV_P) 1237evpipe_init (EV_P)
993{ 1238{
994 if (!ev_is_active (&pipeev)) 1239 if (!ev_is_active (&pipe_w))
995 { 1240 {
996#if EV_USE_EVENTFD 1241# if EV_USE_EVENTFD
1242 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1243 if (evfd < 0 && errno == EINVAL)
997 if ((evfd = eventfd (0, 0)) >= 0) 1244 evfd = eventfd (0, 0);
1245
1246 if (evfd >= 0)
998 { 1247 {
999 evpipe [0] = -1; 1248 evpipe [0] = -1;
1000 fd_intern (evfd); 1249 fd_intern (evfd); /* doing it twice doesn't hurt */
1001 ev_io_set (&pipeev, evfd, EV_READ); 1250 ev_io_set (&pipe_w, evfd, EV_READ);
1002 } 1251 }
1003 else 1252 else
1004#endif 1253# endif
1005 { 1254 {
1006 while (pipe (evpipe)) 1255 while (pipe (evpipe))
1007 ev_syserr ("(libev) error creating signal/async pipe"); 1256 ev_syserr ("(libev) error creating signal/async pipe");
1008 1257
1009 fd_intern (evpipe [0]); 1258 fd_intern (evpipe [0]);
1010 fd_intern (evpipe [1]); 1259 fd_intern (evpipe [1]);
1011 ev_io_set (&pipeev, evpipe [0], EV_READ); 1260 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1012 } 1261 }
1013 1262
1014 ev_io_start (EV_A_ &pipeev); 1263 ev_io_start (EV_A_ &pipe_w);
1015 ev_unref (EV_A); /* watcher should not keep loop alive */ 1264 ev_unref (EV_A); /* watcher should not keep loop alive */
1016 } 1265 }
1017} 1266}
1018 1267
1019void inline_size 1268inline_size void
1020evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1269evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1021{ 1270{
1022 if (!*flag) 1271 if (!*flag)
1023 { 1272 {
1024 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;
1025 1275
1026 *flag = 1; 1276 *flag = 1;
1027 1277
1028#if EV_USE_EVENTFD 1278#if EV_USE_EVENTFD
1029 if (evfd >= 0) 1279 if (evfd >= 0)
… …
1031 uint64_t counter = 1; 1281 uint64_t counter = 1;
1032 write (evfd, &counter, sizeof (uint64_t)); 1282 write (evfd, &counter, sizeof (uint64_t));
1033 } 1283 }
1034 else 1284 else
1035#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. */
1036 write (evpipe [1], &old_errno, 1); 1291 write (evpipe [1], &dummy, 1);
1037 1292
1038 errno = old_errno; 1293 errno = old_errno;
1039 } 1294 }
1040} 1295}
1041 1296
1297/* called whenever the libev signal pipe */
1298/* got some events (signal, async) */
1042static void 1299static void
1043pipecb (EV_P_ ev_io *iow, int revents) 1300pipecb (EV_P_ ev_io *iow, int revents)
1044{ 1301{
1302 int i;
1303
1045#if EV_USE_EVENTFD 1304#if EV_USE_EVENTFD
1046 if (evfd >= 0) 1305 if (evfd >= 0)
1047 { 1306 {
1048 uint64_t counter; 1307 uint64_t counter;
1049 read (evfd, &counter, sizeof (uint64_t)); 1308 read (evfd, &counter, sizeof (uint64_t));
1050 } 1309 }
1051 else 1310 else
1052#endif 1311#endif
1053 { 1312 {
1054 char dummy; 1313 char dummy;
1314 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1055 read (evpipe [0], &dummy, 1); 1315 read (evpipe [0], &dummy, 1);
1056 } 1316 }
1057 1317
1058 if (gotsig && ev_is_default_loop (EV_A)) 1318 if (sig_pending)
1059 { 1319 {
1060 int signum; 1320 sig_pending = 0;
1061 gotsig = 0;
1062 1321
1063 for (signum = signalmax; signum--; ) 1322 for (i = EV_NSIG - 1; i--; )
1064 if (signals [signum].gotsig) 1323 if (expect_false (signals [i].pending))
1065 ev_feed_signal_event (EV_A_ signum + 1); 1324 ev_feed_signal_event (EV_A_ i + 1);
1066 } 1325 }
1067 1326
1068#if EV_ASYNC_ENABLE 1327#if EV_ASYNC_ENABLE
1069 if (gotasync) 1328 if (async_pending)
1070 { 1329 {
1071 int i; 1330 async_pending = 0;
1072 gotasync = 0;
1073 1331
1074 for (i = asynccnt; i--; ) 1332 for (i = asynccnt; i--; )
1075 if (asyncs [i]->sent) 1333 if (asyncs [i]->sent)
1076 { 1334 {
1077 asyncs [i]->sent = 0; 1335 asyncs [i]->sent = 0;
… …
1085 1343
1086static void 1344static void
1087ev_sighandler (int signum) 1345ev_sighandler (int signum)
1088{ 1346{
1089#if EV_MULTIPLICITY 1347#if EV_MULTIPLICITY
1090 struct ev_loop *loop = &default_loop_struct; 1348 EV_P = signals [signum - 1].loop;
1091#endif 1349#endif
1092 1350
1093#if _WIN32 1351#ifdef _WIN32
1094 signal (signum, ev_sighandler); 1352 signal (signum, ev_sighandler);
1095#endif 1353#endif
1096 1354
1097 signals [signum - 1].gotsig = 1; 1355 signals [signum - 1].pending = 1;
1098 evpipe_write (EV_A_ &gotsig); 1356 evpipe_write (EV_A_ &sig_pending);
1099} 1357}
1100 1358
1101void noinline 1359void noinline
1102ev_feed_signal_event (EV_P_ int signum) 1360ev_feed_signal_event (EV_P_ int signum)
1103{ 1361{
1104 WL w; 1362 WL w;
1105 1363
1364 if (expect_false (signum <= 0 || signum > EV_NSIG))
1365 return;
1366
1367 --signum;
1368
1106#if EV_MULTIPLICITY 1369#if EV_MULTIPLICITY
1107 assert (("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 */
1108#endif 1371 /* or, likely more useful, feeding a signal nobody is waiting for */
1109 1372
1110 --signum; 1373 if (expect_false (signals [signum].loop != EV_A))
1111
1112 if (signum < 0 || signum >= signalmax)
1113 return; 1374 return;
1375#endif
1114 1376
1115 signals [signum].gotsig = 0; 1377 signals [signum].pending = 0;
1116 1378
1117 for (w = signals [signum].head; w; w = w->next) 1379 for (w = signals [signum].head; w; w = w->next)
1118 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1380 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1119} 1381}
1120 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
1121/*****************************************************************************/ 1405/*****************************************************************************/
1122 1406
1407#if EV_CHILD_ENABLE
1123static WL childs [EV_PID_HASHSIZE]; 1408static WL childs [EV_PID_HASHSIZE];
1124
1125#ifndef _WIN32
1126 1409
1127static ev_signal childev; 1410static ev_signal childev;
1128 1411
1129#ifndef WIFCONTINUED 1412#ifndef WIFCONTINUED
1130# define WIFCONTINUED(status) 0 1413# define WIFCONTINUED(status) 0
1131#endif 1414#endif
1132 1415
1133void inline_speed 1416/* handle a single child status event */
1417inline_speed void
1134child_reap (EV_P_ int chain, int pid, int status) 1418child_reap (EV_P_ int chain, int pid, int status)
1135{ 1419{
1136 ev_child *w; 1420 ev_child *w;
1137 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1421 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1138 1422
1139 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)
1140 { 1424 {
1141 if ((w->pid == pid || !w->pid) 1425 if ((w->pid == pid || !w->pid)
1142 && (!traced || (w->flags & 1))) 1426 && (!traced || (w->flags & 1)))
1143 { 1427 {
1144 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 */
… …
1151 1435
1152#ifndef WCONTINUED 1436#ifndef WCONTINUED
1153# define WCONTINUED 0 1437# define WCONTINUED 0
1154#endif 1438#endif
1155 1439
1440/* called on sigchld etc., calls waitpid */
1156static void 1441static void
1157childcb (EV_P_ ev_signal *sw, int revents) 1442childcb (EV_P_ ev_signal *sw, int revents)
1158{ 1443{
1159 int pid, status; 1444 int pid, status;
1160 1445
… …
1168 /* 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 */
1169 /* 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 */
1170 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1455 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1171 1456
1172 child_reap (EV_A_ pid, pid, status); 1457 child_reap (EV_A_ pid, pid, status);
1173 if (EV_PID_HASHSIZE > 1) 1458 if ((EV_PID_HASHSIZE) > 1)
1174 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 */
1175} 1460}
1176 1461
1177#endif 1462#endif
1178 1463
… …
1241 /* kqueue is borked on everything but netbsd apparently */ 1526 /* kqueue is borked on everything but netbsd apparently */
1242 /* it usually doesn't work correctly on anything but sockets and pipes */ 1527 /* it usually doesn't work correctly on anything but sockets and pipes */
1243 flags &= ~EVBACKEND_KQUEUE; 1528 flags &= ~EVBACKEND_KQUEUE;
1244#endif 1529#endif
1245#ifdef __APPLE__ 1530#ifdef __APPLE__
1246 // flags &= ~EVBACKEND_KQUEUE; for documentation 1531 /* only select works correctly on that "unix-certified" platform */
1247 flags &= ~EVBACKEND_POLL; 1532 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1533 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1534#endif
1535#ifdef __FreeBSD__
1536 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1248#endif 1537#endif
1249 1538
1250 return flags; 1539 return flags;
1251} 1540}
1252 1541
… …
1266ev_backend (EV_P) 1555ev_backend (EV_P)
1267{ 1556{
1268 return backend; 1557 return backend;
1269} 1558}
1270 1559
1560#if EV_FEATURE_API
1271unsigned int 1561unsigned int
1272ev_loop_count (EV_P) 1562ev_iteration (EV_P)
1273{ 1563{
1274 return loop_count; 1564 return loop_count;
1275} 1565}
1276 1566
1567unsigned int
1568ev_depth (EV_P)
1569{
1570 return loop_depth;
1571}
1572
1277void 1573void
1278ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1574ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1279{ 1575{
1280 io_blocktime = interval; 1576 io_blocktime = interval;
1281} 1577}
… …
1284ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1580ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1285{ 1581{
1286 timeout_blocktime = interval; 1582 timeout_blocktime = interval;
1287} 1583}
1288 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 */
1289static void noinline 1610static void noinline
1290loop_init (EV_P_ unsigned int flags) 1611loop_init (EV_P_ unsigned int flags)
1291{ 1612{
1292 if (!backend) 1613 if (!backend)
1293 { 1614 {
1615#if EV_USE_REALTIME
1616 if (!have_realtime)
1617 {
1618 struct timespec ts;
1619
1620 if (!clock_gettime (CLOCK_REALTIME, &ts))
1621 have_realtime = 1;
1622 }
1623#endif
1624
1294#if EV_USE_MONOTONIC 1625#if EV_USE_MONOTONIC
1626 if (!have_monotonic)
1295 { 1627 {
1296 struct timespec ts; 1628 struct timespec ts;
1629
1297 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1630 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1298 have_monotonic = 1; 1631 have_monotonic = 1;
1299 } 1632 }
1300#endif 1633#endif
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"));
1301 1645
1302 ev_rt_now = ev_time (); 1646 ev_rt_now = ev_time ();
1303 mn_now = get_clock (); 1647 mn_now = get_clock ();
1304 now_floor = mn_now; 1648 now_floor = mn_now;
1305 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
1306 1653
1307 io_blocktime = 0.; 1654 io_blocktime = 0.;
1308 timeout_blocktime = 0.; 1655 timeout_blocktime = 0.;
1309 backend = 0; 1656 backend = 0;
1310 backend_fd = -1; 1657 backend_fd = -1;
1311 gotasync = 0; 1658 sig_pending = 0;
1659#if EV_ASYNC_ENABLE
1660 async_pending = 0;
1661#endif
1312#if EV_USE_INOTIFY 1662#if EV_USE_INOTIFY
1313 fs_fd = -2; 1663 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1314#endif 1664#endif
1315 1665#if EV_USE_SIGNALFD
1316 /* pid check not overridable via env */ 1666 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1317#ifndef _WIN32
1318 if (flags & EVFLAG_FORKCHECK)
1319 curpid = getpid ();
1320#endif 1667#endif
1321
1322 if (!(flags & EVFLAG_NOENV)
1323 && !enable_secure ()
1324 && getenv ("LIBEV_FLAGS"))
1325 flags = atoi (getenv ("LIBEV_FLAGS"));
1326 1668
1327 if (!(flags & 0x0000ffffU)) 1669 if (!(flags & 0x0000ffffU))
1328 flags |= ev_recommended_backends (); 1670 flags |= ev_recommended_backends ();
1329 1671
1330#if EV_USE_PORT 1672#if EV_USE_PORT
… …
1341#endif 1683#endif
1342#if EV_USE_SELECT 1684#if EV_USE_SELECT
1343 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1685 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1344#endif 1686#endif
1345 1687
1688 ev_prepare_init (&pending_w, pendingcb);
1689
1690#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1346 ev_init (&pipeev, pipecb); 1691 ev_init (&pipe_w, pipecb);
1347 ev_set_priority (&pipeev, EV_MAXPRI); 1692 ev_set_priority (&pipe_w, EV_MAXPRI);
1693#endif
1348 } 1694 }
1349} 1695}
1350 1696
1697/* free up a loop structure */
1351static void noinline 1698static void noinline
1352loop_destroy (EV_P) 1699loop_destroy (EV_P)
1353{ 1700{
1354 int i; 1701 int i;
1355 1702
1356 if (ev_is_active (&pipeev)) 1703 if (ev_is_active (&pipe_w))
1357 { 1704 {
1358 ev_ref (EV_A); /* signal watcher */ 1705 /*ev_ref (EV_A);*/
1359 ev_io_stop (EV_A_ &pipeev); 1706 /*ev_io_stop (EV_A_ &pipe_w);*/
1360 1707
1361#if EV_USE_EVENTFD 1708#if EV_USE_EVENTFD
1362 if (evfd >= 0) 1709 if (evfd >= 0)
1363 close (evfd); 1710 close (evfd);
1364#endif 1711#endif
1365 1712
1366 if (evpipe [0] >= 0) 1713 if (evpipe [0] >= 0)
1367 { 1714 {
1368 close (evpipe [0]); 1715 EV_WIN32_CLOSE_FD (evpipe [0]);
1369 close (evpipe [1]); 1716 EV_WIN32_CLOSE_FD (evpipe [1]);
1370 } 1717 }
1371 } 1718 }
1719
1720#if EV_USE_SIGNALFD
1721 if (ev_is_active (&sigfd_w))
1722 close (sigfd);
1723#endif
1372 1724
1373#if EV_USE_INOTIFY 1725#if EV_USE_INOTIFY
1374 if (fs_fd >= 0) 1726 if (fs_fd >= 0)
1375 close (fs_fd); 1727 close (fs_fd);
1376#endif 1728#endif
… …
1400#if EV_IDLE_ENABLE 1752#if EV_IDLE_ENABLE
1401 array_free (idle, [i]); 1753 array_free (idle, [i]);
1402#endif 1754#endif
1403 } 1755 }
1404 1756
1405 ev_free (anfds); anfdmax = 0; 1757 ev_free (anfds); anfds = 0; anfdmax = 0;
1406 1758
1407 /* have to use the microsoft-never-gets-it-right macro */ 1759 /* have to use the microsoft-never-gets-it-right macro */
1760 array_free (rfeed, EMPTY);
1408 array_free (fdchange, EMPTY); 1761 array_free (fdchange, EMPTY);
1409 array_free (timer, EMPTY); 1762 array_free (timer, EMPTY);
1410#if EV_PERIODIC_ENABLE 1763#if EV_PERIODIC_ENABLE
1411 array_free (periodic, EMPTY); 1764 array_free (periodic, EMPTY);
1412#endif 1765#endif
… …
1421 1774
1422 backend = 0; 1775 backend = 0;
1423} 1776}
1424 1777
1425#if EV_USE_INOTIFY 1778#if EV_USE_INOTIFY
1426void inline_size infy_fork (EV_P); 1779inline_size void infy_fork (EV_P);
1427#endif 1780#endif
1428 1781
1429void inline_size 1782inline_size void
1430loop_fork (EV_P) 1783loop_fork (EV_P)
1431{ 1784{
1432#if EV_USE_PORT 1785#if EV_USE_PORT
1433 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1786 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1434#endif 1787#endif
… …
1440#endif 1793#endif
1441#if EV_USE_INOTIFY 1794#if EV_USE_INOTIFY
1442 infy_fork (EV_A); 1795 infy_fork (EV_A);
1443#endif 1796#endif
1444 1797
1445 if (ev_is_active (&pipeev)) 1798 if (ev_is_active (&pipe_w))
1446 { 1799 {
1447 /* this "locks" the handlers against writing to the pipe */ 1800 /* this "locks" the handlers against writing to the pipe */
1448 /* while we modify the fd vars */ 1801 /* while we modify the fd vars */
1449 gotsig = 1; 1802 sig_pending = 1;
1450#if EV_ASYNC_ENABLE 1803#if EV_ASYNC_ENABLE
1451 gotasync = 1; 1804 async_pending = 1;
1452#endif 1805#endif
1453 1806
1454 ev_ref (EV_A); 1807 ev_ref (EV_A);
1455 ev_io_stop (EV_A_ &pipeev); 1808 ev_io_stop (EV_A_ &pipe_w);
1456 1809
1457#if EV_USE_EVENTFD 1810#if EV_USE_EVENTFD
1458 if (evfd >= 0) 1811 if (evfd >= 0)
1459 close (evfd); 1812 close (evfd);
1460#endif 1813#endif
1461 1814
1462 if (evpipe [0] >= 0) 1815 if (evpipe [0] >= 0)
1463 { 1816 {
1464 close (evpipe [0]); 1817 EV_WIN32_CLOSE_FD (evpipe [0]);
1465 close (evpipe [1]); 1818 EV_WIN32_CLOSE_FD (evpipe [1]);
1466 } 1819 }
1467 1820
1821#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1468 evpipe_init (EV_A); 1822 evpipe_init (EV_A);
1469 /* now iterate over everything, in case we missed something */ 1823 /* now iterate over everything, in case we missed something */
1470 pipecb (EV_A_ &pipeev, EV_READ); 1824 pipecb (EV_A_ &pipe_w, EV_READ);
1825#endif
1471 } 1826 }
1472 1827
1473 postfork = 0; 1828 postfork = 0;
1474} 1829}
1475 1830
1476#if EV_MULTIPLICITY 1831#if EV_MULTIPLICITY
1477 1832
1478struct ev_loop * 1833struct ev_loop *
1479ev_loop_new (unsigned int flags) 1834ev_loop_new (unsigned int flags)
1480{ 1835{
1481 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));
1482 1837
1483 memset (loop, 0, sizeof (struct ev_loop)); 1838 memset (EV_A, 0, sizeof (struct ev_loop));
1484
1485 loop_init (EV_A_ flags); 1839 loop_init (EV_A_ flags);
1486 1840
1487 if (ev_backend (EV_A)) 1841 if (ev_backend (EV_A))
1488 return loop; 1842 return EV_A;
1489 1843
1490 return 0; 1844 return 0;
1491} 1845}
1492 1846
1493void 1847void
… …
1500void 1854void
1501ev_loop_fork (EV_P) 1855ev_loop_fork (EV_P)
1502{ 1856{
1503 postfork = 1; /* must be in line with ev_default_fork */ 1857 postfork = 1; /* must be in line with ev_default_fork */
1504} 1858}
1859#endif /* multiplicity */
1505 1860
1506#if EV_VERIFY 1861#if EV_VERIFY
1507static void noinline 1862static void noinline
1508verify_watcher (EV_P_ W w) 1863verify_watcher (EV_P_ W w)
1509{ 1864{
1510 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1865 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1511 1866
1512 if (w->pending) 1867 if (w->pending)
1513 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1868 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1514} 1869}
1515 1870
1516static void noinline 1871static void noinline
1517verify_heap (EV_P_ ANHE *heap, int N) 1872verify_heap (EV_P_ ANHE *heap, int N)
1518{ 1873{
1519 int i; 1874 int i;
1520 1875
1521 for (i = HEAP0; i < N + HEAP0; ++i) 1876 for (i = HEAP0; i < N + HEAP0; ++i)
1522 { 1877 {
1523 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1878 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1524 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1879 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1525 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1880 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1526 1881
1527 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1882 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1528 } 1883 }
1529} 1884}
1530 1885
1531static void noinline 1886static void noinline
1532array_verify (EV_P_ W *ws, int cnt) 1887array_verify (EV_P_ W *ws, int cnt)
1533{ 1888{
1534 while (cnt--) 1889 while (cnt--)
1535 { 1890 {
1536 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1891 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1537 verify_watcher (EV_A_ ws [cnt]); 1892 verify_watcher (EV_A_ ws [cnt]);
1538 } 1893 }
1539} 1894}
1540#endif 1895#endif
1541 1896
1897#if EV_FEATURE_API
1542void 1898void
1543ev_loop_verify (EV_P) 1899ev_verify (EV_P)
1544{ 1900{
1545#if EV_VERIFY 1901#if EV_VERIFY
1546 int i; 1902 int i;
1547 WL w; 1903 WL w;
1548 1904
1549 assert (activecnt >= -1); 1905 assert (activecnt >= -1);
1550 1906
1551 assert (fdchangemax >= fdchangecnt); 1907 assert (fdchangemax >= fdchangecnt);
1552 for (i = 0; i < fdchangecnt; ++i) 1908 for (i = 0; i < fdchangecnt; ++i)
1553 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1909 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1554 1910
1555 assert (anfdmax >= 0); 1911 assert (anfdmax >= 0);
1556 for (i = 0; i < anfdmax; ++i) 1912 for (i = 0; i < anfdmax; ++i)
1557 for (w = anfds [i].head; w; w = w->next) 1913 for (w = anfds [i].head; w; w = w->next)
1558 { 1914 {
1559 verify_watcher (EV_A_ (W)w); 1915 verify_watcher (EV_A_ (W)w);
1560 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1916 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1561 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1917 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1562 } 1918 }
1563 1919
1564 assert (timermax >= timercnt); 1920 assert (timermax >= timercnt);
1565 verify_heap (EV_A_ timers, timercnt); 1921 verify_heap (EV_A_ timers, timercnt);
1566 1922
… …
1587#if EV_ASYNC_ENABLE 1943#if EV_ASYNC_ENABLE
1588 assert (asyncmax >= asynccnt); 1944 assert (asyncmax >= asynccnt);
1589 array_verify (EV_A_ (W *)asyncs, asynccnt); 1945 array_verify (EV_A_ (W *)asyncs, asynccnt);
1590#endif 1946#endif
1591 1947
1948#if EV_PREPARE_ENABLE
1592 assert (preparemax >= preparecnt); 1949 assert (preparemax >= preparecnt);
1593 array_verify (EV_A_ (W *)prepares, preparecnt); 1950 array_verify (EV_A_ (W *)prepares, preparecnt);
1951#endif
1594 1952
1953#if EV_CHECK_ENABLE
1595 assert (checkmax >= checkcnt); 1954 assert (checkmax >= checkcnt);
1596 array_verify (EV_A_ (W *)checks, checkcnt); 1955 array_verify (EV_A_ (W *)checks, checkcnt);
1956#endif
1597 1957
1598# if 0 1958# if 0
1959#if EV_CHILD_ENABLE
1599 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)
1600 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1961 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1962#endif
1601# endif 1963# endif
1602#endif 1964#endif
1603} 1965}
1604 1966#endif
1605#endif /* multiplicity */
1606 1967
1607#if EV_MULTIPLICITY 1968#if EV_MULTIPLICITY
1608struct ev_loop * 1969struct ev_loop *
1609ev_default_loop_init (unsigned int flags) 1970ev_default_loop_init (unsigned int flags)
1610#else 1971#else
… …
1613#endif 1974#endif
1614{ 1975{
1615 if (!ev_default_loop_ptr) 1976 if (!ev_default_loop_ptr)
1616 { 1977 {
1617#if EV_MULTIPLICITY 1978#if EV_MULTIPLICITY
1618 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1979 EV_P = ev_default_loop_ptr = &default_loop_struct;
1619#else 1980#else
1620 ev_default_loop_ptr = 1; 1981 ev_default_loop_ptr = 1;
1621#endif 1982#endif
1622 1983
1623 loop_init (EV_A_ flags); 1984 loop_init (EV_A_ flags);
1624 1985
1625 if (ev_backend (EV_A)) 1986 if (ev_backend (EV_A))
1626 { 1987 {
1627#ifndef _WIN32 1988#if EV_CHILD_ENABLE
1628 ev_signal_init (&childev, childcb, SIGCHLD); 1989 ev_signal_init (&childev, childcb, SIGCHLD);
1629 ev_set_priority (&childev, EV_MAXPRI); 1990 ev_set_priority (&childev, EV_MAXPRI);
1630 ev_signal_start (EV_A_ &childev); 1991 ev_signal_start (EV_A_ &childev);
1631 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1992 ev_unref (EV_A); /* child watcher should not keep loop alive */
1632#endif 1993#endif
… …
1640 2001
1641void 2002void
1642ev_default_destroy (void) 2003ev_default_destroy (void)
1643{ 2004{
1644#if EV_MULTIPLICITY 2005#if EV_MULTIPLICITY
1645 struct ev_loop *loop = ev_default_loop_ptr; 2006 EV_P = ev_default_loop_ptr;
1646#endif 2007#endif
1647 2008
1648 ev_default_loop_ptr = 0; 2009 ev_default_loop_ptr = 0;
1649 2010
1650#ifndef _WIN32 2011#if EV_CHILD_ENABLE
1651 ev_ref (EV_A); /* child watcher */ 2012 ev_ref (EV_A); /* child watcher */
1652 ev_signal_stop (EV_A_ &childev); 2013 ev_signal_stop (EV_A_ &childev);
1653#endif 2014#endif
1654 2015
1655 loop_destroy (EV_A); 2016 loop_destroy (EV_A);
… …
1657 2018
1658void 2019void
1659ev_default_fork (void) 2020ev_default_fork (void)
1660{ 2021{
1661#if EV_MULTIPLICITY 2022#if EV_MULTIPLICITY
1662 struct ev_loop *loop = ev_default_loop_ptr; 2023 EV_P = ev_default_loop_ptr;
1663#endif 2024#endif
1664 2025
1665 postfork = 1; /* must be in line with ev_loop_fork */ 2026 postfork = 1; /* must be in line with ev_loop_fork */
1666} 2027}
1667 2028
… …
1671ev_invoke (EV_P_ void *w, int revents) 2032ev_invoke (EV_P_ void *w, int revents)
1672{ 2033{
1673 EV_CB_INVOKE ((W)w, revents); 2034 EV_CB_INVOKE ((W)w, revents);
1674} 2035}
1675 2036
1676void inline_speed 2037unsigned int
1677call_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)
1678{ 2051{
1679 int pri; 2052 int pri;
1680 2053
1681 for (pri = NUMPRI; pri--; ) 2054 for (pri = NUMPRI; pri--; )
1682 while (pendingcnt [pri]) 2055 while (pendingcnt [pri])
1683 { 2056 {
1684 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2057 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1685 2058
1686 if (expect_true (p->w))
1687 {
1688 /*assert (("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 */
1689 2061
1690 p->w->pending = 0; 2062 p->w->pending = 0;
1691 EV_CB_INVOKE (p->w, p->events); 2063 EV_CB_INVOKE (p->w, p->events);
1692 EV_FREQUENT_CHECK; 2064 EV_FREQUENT_CHECK;
1693 }
1694 } 2065 }
1695} 2066}
1696 2067
1697#if EV_IDLE_ENABLE 2068#if EV_IDLE_ENABLE
1698void inline_size 2069/* make idle watchers pending. this handles the "call-idle */
2070/* only when higher priorities are idle" logic */
2071inline_size void
1699idle_reify (EV_P) 2072idle_reify (EV_P)
1700{ 2073{
1701 if (expect_false (idleall)) 2074 if (expect_false (idleall))
1702 { 2075 {
1703 int pri; 2076 int pri;
… …
1715 } 2088 }
1716 } 2089 }
1717} 2090}
1718#endif 2091#endif
1719 2092
1720void inline_size 2093/* make timers pending */
2094inline_size void
1721timers_reify (EV_P) 2095timers_reify (EV_P)
1722{ 2096{
1723 EV_FREQUENT_CHECK; 2097 EV_FREQUENT_CHECK;
1724 2098
1725 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2099 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1726 { 2100 {
1727 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2101 do
1728
1729 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1730
1731 /* first reschedule or stop timer */
1732 if (w->repeat)
1733 { 2102 {
2103 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2104
2105 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2106
2107 /* first reschedule or stop timer */
2108 if (w->repeat)
2109 {
1734 ev_at (w) += w->repeat; 2110 ev_at (w) += w->repeat;
1735 if (ev_at (w) < mn_now) 2111 if (ev_at (w) < mn_now)
1736 ev_at (w) = mn_now; 2112 ev_at (w) = mn_now;
1737 2113
1738 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2114 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1739 2115
1740 ANHE_at_cache (timers [HEAP0]); 2116 ANHE_at_cache (timers [HEAP0]);
1741 downheap (timers, timercnt, HEAP0); 2117 downheap (timers, timercnt, HEAP0);
2118 }
2119 else
2120 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2121
2122 EV_FREQUENT_CHECK;
2123 feed_reverse (EV_A_ (W)w);
1742 } 2124 }
1743 else 2125 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1744 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1745 2126
1746 EV_FREQUENT_CHECK; 2127 feed_reverse_done (EV_A_ EV_TIMER);
1747 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1748 } 2128 }
1749} 2129}
1750 2130
1751#if EV_PERIODIC_ENABLE 2131#if EV_PERIODIC_ENABLE
1752void inline_size 2132/* make periodics pending */
2133inline_size void
1753periodics_reify (EV_P) 2134periodics_reify (EV_P)
1754{ 2135{
1755 EV_FREQUENT_CHECK; 2136 EV_FREQUENT_CHECK;
1756 2137
1757 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2138 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1758 { 2139 {
1759 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2140 int feed_count = 0;
1760 2141
1761 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2142 do
1762
1763 /* first reschedule or stop timer */
1764 if (w->reschedule_cb)
1765 { 2143 {
2144 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2145
2146 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2147
2148 /* first reschedule or stop timer */
2149 if (w->reschedule_cb)
2150 {
1766 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2151 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1767 2152
1768 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2153 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1769 2154
1770 ANHE_at_cache (periodics [HEAP0]); 2155 ANHE_at_cache (periodics [HEAP0]);
1771 downheap (periodics, periodiccnt, HEAP0); 2156 downheap (periodics, periodiccnt, HEAP0);
2157 }
2158 else if (w->interval)
2159 {
2160 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2161 /* if next trigger time is not sufficiently in the future, put it there */
2162 /* this might happen because of floating point inexactness */
2163 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2164 {
2165 ev_at (w) += w->interval;
2166
2167 /* if interval is unreasonably low we might still have a time in the past */
2168 /* so correct this. this will make the periodic very inexact, but the user */
2169 /* has effectively asked to get triggered more often than possible */
2170 if (ev_at (w) < ev_rt_now)
2171 ev_at (w) = ev_rt_now;
2172 }
2173
2174 ANHE_at_cache (periodics [HEAP0]);
2175 downheap (periodics, periodiccnt, HEAP0);
2176 }
2177 else
2178 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2179
2180 EV_FREQUENT_CHECK;
2181 feed_reverse (EV_A_ (W)w);
1772 } 2182 }
1773 else if (w->interval) 2183 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1774 {
1775 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1776 /* if next trigger time is not sufficiently in the future, put it there */
1777 /* this might happen because of floating point inexactness */
1778 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1779 {
1780 ev_at (w) += w->interval;
1781 2184
1782 /* if interval is unreasonably low we might still have a time in the past */
1783 /* so correct this. this will make the periodic very inexact, but the user */
1784 /* has effectively asked to get triggered more often than possible */
1785 if (ev_at (w) < ev_rt_now)
1786 ev_at (w) = ev_rt_now;
1787 }
1788
1789 ANHE_at_cache (periodics [HEAP0]);
1790 downheap (periodics, periodiccnt, HEAP0);
1791 }
1792 else
1793 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1794
1795 EV_FREQUENT_CHECK;
1796 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2185 feed_reverse_done (EV_A_ EV_PERIODIC);
1797 } 2186 }
1798} 2187}
1799 2188
2189/* simply recalculate all periodics */
2190/* TODO: maybe ensure that at least one event happens when jumping forward? */
1800static void noinline 2191static void noinline
1801periodics_reschedule (EV_P) 2192periodics_reschedule (EV_P)
1802{ 2193{
1803 int i; 2194 int i;
1804 2195
… …
1817 2208
1818 reheap (periodics, periodiccnt); 2209 reheap (periodics, periodiccnt);
1819} 2210}
1820#endif 2211#endif
1821 2212
1822void inline_speed 2213/* adjust all timers by a given offset */
2214static void noinline
2215timers_reschedule (EV_P_ ev_tstamp adjust)
2216{
2217 int i;
2218
2219 for (i = 0; i < timercnt; ++i)
2220 {
2221 ANHE *he = timers + i + HEAP0;
2222 ANHE_w (*he)->at += adjust;
2223 ANHE_at_cache (*he);
2224 }
2225}
2226
2227/* fetch new monotonic and realtime times from the kernel */
2228/* also detect if there was a timejump, and act accordingly */
2229inline_speed void
1823time_update (EV_P_ ev_tstamp max_block) 2230time_update (EV_P_ ev_tstamp max_block)
1824{ 2231{
1825 int i;
1826
1827#if EV_USE_MONOTONIC 2232#if EV_USE_MONOTONIC
1828 if (expect_true (have_monotonic)) 2233 if (expect_true (have_monotonic))
1829 { 2234 {
2235 int i;
1830 ev_tstamp odiff = rtmn_diff; 2236 ev_tstamp odiff = rtmn_diff;
1831 2237
1832 mn_now = get_clock (); 2238 mn_now = get_clock ();
1833 2239
1834 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2240 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1860 ev_rt_now = ev_time (); 2266 ev_rt_now = ev_time ();
1861 mn_now = get_clock (); 2267 mn_now = get_clock ();
1862 now_floor = mn_now; 2268 now_floor = mn_now;
1863 } 2269 }
1864 2270
2271 /* no timer adjustment, as the monotonic clock doesn't jump */
2272 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1865# if EV_PERIODIC_ENABLE 2273# if EV_PERIODIC_ENABLE
1866 periodics_reschedule (EV_A); 2274 periodics_reschedule (EV_A);
1867# endif 2275# endif
1868 /* no timer adjustment, as the monotonic clock doesn't jump */
1869 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1870 } 2276 }
1871 else 2277 else
1872#endif 2278#endif
1873 { 2279 {
1874 ev_rt_now = ev_time (); 2280 ev_rt_now = ev_time ();
1875 2281
1876 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2282 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1877 { 2283 {
2284 /* adjust timers. this is easy, as the offset is the same for all of them */
2285 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1878#if EV_PERIODIC_ENABLE 2286#if EV_PERIODIC_ENABLE
1879 periodics_reschedule (EV_A); 2287 periodics_reschedule (EV_A);
1880#endif 2288#endif
1881 /* adjust timers. this is easy, as the offset is the same for all of them */
1882 for (i = 0; i < timercnt; ++i)
1883 {
1884 ANHE *he = timers + i + HEAP0;
1885 ANHE_w (*he)->at += ev_rt_now - mn_now;
1886 ANHE_at_cache (*he);
1887 }
1888 } 2289 }
1889 2290
1890 mn_now = ev_rt_now; 2291 mn_now = ev_rt_now;
1891 } 2292 }
1892} 2293}
1893 2294
1894void 2295void
1895ev_ref (EV_P)
1896{
1897 ++activecnt;
1898}
1899
1900void
1901ev_unref (EV_P)
1902{
1903 --activecnt;
1904}
1905
1906void
1907ev_now_update (EV_P)
1908{
1909 time_update (EV_A_ 1e100);
1910}
1911
1912static int loop_done;
1913
1914void
1915ev_loop (EV_P_ int flags) 2296ev_loop (EV_P_ int flags)
1916{ 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
1917 loop_done = EVUNLOOP_CANCEL; 2304 loop_done = EVUNLOOP_CANCEL;
1918 2305
1919 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 */
1920 2307
1921 do 2308 do
1922 { 2309 {
1923#if EV_VERIFY >= 2 2310#if EV_VERIFY >= 2
1924 ev_loop_verify (EV_A); 2311 ev_verify (EV_A);
1925#endif 2312#endif
1926 2313
1927#ifndef _WIN32 2314#ifndef _WIN32
1928 if (expect_false (curpid)) /* penalise the forking check even more */ 2315 if (expect_false (curpid)) /* penalise the forking check even more */
1929 if (expect_false (getpid () != curpid)) 2316 if (expect_false (getpid () != curpid))
… …
1937 /* we might have forked, so queue fork handlers */ 2324 /* we might have forked, so queue fork handlers */
1938 if (expect_false (postfork)) 2325 if (expect_false (postfork))
1939 if (forkcnt) 2326 if (forkcnt)
1940 { 2327 {
1941 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2328 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1942 call_pending (EV_A); 2329 EV_INVOKE_PENDING;
1943 } 2330 }
1944#endif 2331#endif
1945 2332
2333#if EV_PREPARE_ENABLE
1946 /* queue prepare watchers (and execute them) */ 2334 /* queue prepare watchers (and execute them) */
1947 if (expect_false (preparecnt)) 2335 if (expect_false (preparecnt))
1948 { 2336 {
1949 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2337 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1950 call_pending (EV_A); 2338 EV_INVOKE_PENDING;
1951 } 2339 }
2340#endif
1952 2341
1953 if (expect_false (!activecnt)) 2342 if (expect_false (loop_done))
1954 break; 2343 break;
1955 2344
1956 /* we might have forked, so reify kernel state if necessary */ 2345 /* we might have forked, so reify kernel state if necessary */
1957 if (expect_false (postfork)) 2346 if (expect_false (postfork))
1958 loop_fork (EV_A); 2347 loop_fork (EV_A);
… …
1965 ev_tstamp waittime = 0.; 2354 ev_tstamp waittime = 0.;
1966 ev_tstamp sleeptime = 0.; 2355 ev_tstamp sleeptime = 0.;
1967 2356
1968 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2357 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1969 { 2358 {
2359 /* remember old timestamp for io_blocktime calculation */
2360 ev_tstamp prev_mn_now = mn_now;
2361
1970 /* update time to cancel out callback processing overhead */ 2362 /* update time to cancel out callback processing overhead */
1971 time_update (EV_A_ 1e100); 2363 time_update (EV_A_ 1e100);
1972 2364
1973 waittime = MAX_BLOCKTIME; 2365 waittime = MAX_BLOCKTIME;
1974 2366
… …
1984 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;
1985 if (waittime > to) waittime = to; 2377 if (waittime > to) waittime = to;
1986 } 2378 }
1987#endif 2379#endif
1988 2380
2381 /* don't let timeouts decrease the waittime below timeout_blocktime */
1989 if (expect_false (waittime < timeout_blocktime)) 2382 if (expect_false (waittime < timeout_blocktime))
1990 waittime = timeout_blocktime; 2383 waittime = timeout_blocktime;
1991 2384
1992 sleeptime = waittime - backend_fudge; 2385 /* extra check because io_blocktime is commonly 0 */
1993
1994 if (expect_true (sleeptime > io_blocktime)) 2386 if (expect_false (io_blocktime))
1995 sleeptime = io_blocktime;
1996
1997 if (sleeptime)
1998 { 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 {
1999 ev_sleep (sleeptime); 2395 ev_sleep (sleeptime);
2000 waittime -= sleeptime; 2396 waittime -= sleeptime;
2397 }
2001 } 2398 }
2002 } 2399 }
2003 2400
2401#if EV_FEATURE_API
2004 ++loop_count; 2402 ++loop_count;
2403#endif
2404 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2005 backend_poll (EV_A_ waittime); 2405 backend_poll (EV_A_ waittime);
2406 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2006 2407
2007 /* update ev_rt_now, do magic */ 2408 /* update ev_rt_now, do magic */
2008 time_update (EV_A_ waittime + sleeptime); 2409 time_update (EV_A_ waittime + sleeptime);
2009 } 2410 }
2010 2411
… …
2017#if EV_IDLE_ENABLE 2418#if EV_IDLE_ENABLE
2018 /* queue idle watchers unless other events are pending */ 2419 /* queue idle watchers unless other events are pending */
2019 idle_reify (EV_A); 2420 idle_reify (EV_A);
2020#endif 2421#endif
2021 2422
2423#if EV_CHECK_ENABLE
2022 /* queue check watchers, to be executed first */ 2424 /* queue check watchers, to be executed first */
2023 if (expect_false (checkcnt)) 2425 if (expect_false (checkcnt))
2024 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2426 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2427#endif
2025 2428
2026 call_pending (EV_A); 2429 EV_INVOKE_PENDING;
2027 } 2430 }
2028 while (expect_true ( 2431 while (expect_true (
2029 activecnt 2432 activecnt
2030 && !loop_done 2433 && !loop_done
2031 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2434 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2032 )); 2435 ));
2033 2436
2034 if (loop_done == EVUNLOOP_ONE) 2437 if (loop_done == EVUNLOOP_ONE)
2035 loop_done = EVUNLOOP_CANCEL; 2438 loop_done = EVUNLOOP_CANCEL;
2439
2440#if EV_FEATURE_API
2441 --loop_depth;
2442#endif
2036} 2443}
2037 2444
2038void 2445void
2039ev_unloop (EV_P_ int how) 2446ev_unloop (EV_P_ int how)
2040{ 2447{
2041 loop_done = how; 2448 loop_done = how;
2042} 2449}
2043 2450
2451void
2452ev_ref (EV_P)
2453{
2454 ++activecnt;
2455}
2456
2457void
2458ev_unref (EV_P)
2459{
2460 --activecnt;
2461}
2462
2463void
2464ev_now_update (EV_P)
2465{
2466 time_update (EV_A_ 1e100);
2467}
2468
2469void
2470ev_suspend (EV_P)
2471{
2472 ev_now_update (EV_A);
2473}
2474
2475void
2476ev_resume (EV_P)
2477{
2478 ev_tstamp mn_prev = mn_now;
2479
2480 ev_now_update (EV_A);
2481 timers_reschedule (EV_A_ mn_now - mn_prev);
2482#if EV_PERIODIC_ENABLE
2483 /* TODO: really do this? */
2484 periodics_reschedule (EV_A);
2485#endif
2486}
2487
2044/*****************************************************************************/ 2488/*****************************************************************************/
2489/* singly-linked list management, used when the expected list length is short */
2045 2490
2046void inline_size 2491inline_size void
2047wlist_add (WL *head, WL elem) 2492wlist_add (WL *head, WL elem)
2048{ 2493{
2049 elem->next = *head; 2494 elem->next = *head;
2050 *head = elem; 2495 *head = elem;
2051} 2496}
2052 2497
2053void inline_size 2498inline_size void
2054wlist_del (WL *head, WL elem) 2499wlist_del (WL *head, WL elem)
2055{ 2500{
2056 while (*head) 2501 while (*head)
2057 { 2502 {
2058 if (*head == elem) 2503 if (expect_true (*head == elem))
2059 { 2504 {
2060 *head = elem->next; 2505 *head = elem->next;
2061 return; 2506 break;
2062 } 2507 }
2063 2508
2064 head = &(*head)->next; 2509 head = &(*head)->next;
2065 } 2510 }
2066} 2511}
2067 2512
2068void inline_speed 2513/* internal, faster, version of ev_clear_pending */
2514inline_speed void
2069clear_pending (EV_P_ W w) 2515clear_pending (EV_P_ W w)
2070{ 2516{
2071 if (w->pending) 2517 if (w->pending)
2072 { 2518 {
2073 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2519 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2074 w->pending = 0; 2520 w->pending = 0;
2075 } 2521 }
2076} 2522}
2077 2523
2078int 2524int
… …
2082 int pending = w_->pending; 2528 int pending = w_->pending;
2083 2529
2084 if (expect_true (pending)) 2530 if (expect_true (pending))
2085 { 2531 {
2086 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2532 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2533 p->w = (W)&pending_w;
2087 w_->pending = 0; 2534 w_->pending = 0;
2088 p->w = 0;
2089 return p->events; 2535 return p->events;
2090 } 2536 }
2091 else 2537 else
2092 return 0; 2538 return 0;
2093} 2539}
2094 2540
2095void inline_size 2541inline_size void
2096pri_adjust (EV_P_ W w) 2542pri_adjust (EV_P_ W w)
2097{ 2543{
2098 int pri = w->priority; 2544 int pri = ev_priority (w);
2099 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2545 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2100 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2546 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2101 w->priority = pri; 2547 ev_set_priority (w, pri);
2102} 2548}
2103 2549
2104void inline_speed 2550inline_speed void
2105ev_start (EV_P_ W w, int active) 2551ev_start (EV_P_ W w, int active)
2106{ 2552{
2107 pri_adjust (EV_A_ w); 2553 pri_adjust (EV_A_ w);
2108 w->active = active; 2554 w->active = active;
2109 ev_ref (EV_A); 2555 ev_ref (EV_A);
2110} 2556}
2111 2557
2112void inline_size 2558inline_size void
2113ev_stop (EV_P_ W w) 2559ev_stop (EV_P_ W w)
2114{ 2560{
2115 ev_unref (EV_A); 2561 ev_unref (EV_A);
2116 w->active = 0; 2562 w->active = 0;
2117} 2563}
… …
2124 int fd = w->fd; 2570 int fd = w->fd;
2125 2571
2126 if (expect_false (ev_is_active (w))) 2572 if (expect_false (ev_is_active (w)))
2127 return; 2573 return;
2128 2574
2129 assert (("ev_io_start called with negative fd", fd >= 0)); 2575 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2130 assert (("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))));
2131 2577
2132 EV_FREQUENT_CHECK; 2578 EV_FREQUENT_CHECK;
2133 2579
2134 ev_start (EV_A_ (W)w, 1); 2580 ev_start (EV_A_ (W)w, 1);
2135 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2581 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2136 wlist_add (&anfds[fd].head, (WL)w); 2582 wlist_add (&anfds[fd].head, (WL)w);
2137 2583
2138 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2584 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2139 w->events &= ~EV_IOFDSET; 2585 w->events &= ~EV__IOFDSET;
2140 2586
2141 EV_FREQUENT_CHECK; 2587 EV_FREQUENT_CHECK;
2142} 2588}
2143 2589
2144void noinline 2590void noinline
… …
2146{ 2592{
2147 clear_pending (EV_A_ (W)w); 2593 clear_pending (EV_A_ (W)w);
2148 if (expect_false (!ev_is_active (w))) 2594 if (expect_false (!ev_is_active (w)))
2149 return; 2595 return;
2150 2596
2151 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2597 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2152 2598
2153 EV_FREQUENT_CHECK; 2599 EV_FREQUENT_CHECK;
2154 2600
2155 wlist_del (&anfds[w->fd].head, (WL)w); 2601 wlist_del (&anfds[w->fd].head, (WL)w);
2156 ev_stop (EV_A_ (W)w); 2602 ev_stop (EV_A_ (W)w);
… …
2166 if (expect_false (ev_is_active (w))) 2612 if (expect_false (ev_is_active (w)))
2167 return; 2613 return;
2168 2614
2169 ev_at (w) += mn_now; 2615 ev_at (w) += mn_now;
2170 2616
2171 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2617 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2172 2618
2173 EV_FREQUENT_CHECK; 2619 EV_FREQUENT_CHECK;
2174 2620
2175 ++timercnt; 2621 ++timercnt;
2176 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2622 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2179 ANHE_at_cache (timers [ev_active (w)]); 2625 ANHE_at_cache (timers [ev_active (w)]);
2180 upheap (timers, ev_active (w)); 2626 upheap (timers, ev_active (w));
2181 2627
2182 EV_FREQUENT_CHECK; 2628 EV_FREQUENT_CHECK;
2183 2629
2184 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2630 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2185} 2631}
2186 2632
2187void noinline 2633void noinline
2188ev_timer_stop (EV_P_ ev_timer *w) 2634ev_timer_stop (EV_P_ ev_timer *w)
2189{ 2635{
… …
2194 EV_FREQUENT_CHECK; 2640 EV_FREQUENT_CHECK;
2195 2641
2196 { 2642 {
2197 int active = ev_active (w); 2643 int active = ev_active (w);
2198 2644
2199 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2645 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2200 2646
2201 --timercnt; 2647 --timercnt;
2202 2648
2203 if (expect_true (active < timercnt + HEAP0)) 2649 if (expect_true (active < timercnt + HEAP0))
2204 { 2650 {
2205 timers [active] = timers [timercnt + HEAP0]; 2651 timers [active] = timers [timercnt + HEAP0];
2206 adjustheap (timers, timercnt, active); 2652 adjustheap (timers, timercnt, active);
2207 } 2653 }
2208 } 2654 }
2209 2655
2210 EV_FREQUENT_CHECK;
2211
2212 ev_at (w) -= mn_now; 2656 ev_at (w) -= mn_now;
2213 2657
2214 ev_stop (EV_A_ (W)w); 2658 ev_stop (EV_A_ (W)w);
2659
2660 EV_FREQUENT_CHECK;
2215} 2661}
2216 2662
2217void noinline 2663void noinline
2218ev_timer_again (EV_P_ ev_timer *w) 2664ev_timer_again (EV_P_ ev_timer *w)
2219{ 2665{
… …
2237 } 2683 }
2238 2684
2239 EV_FREQUENT_CHECK; 2685 EV_FREQUENT_CHECK;
2240} 2686}
2241 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
2242#if EV_PERIODIC_ENABLE 2694#if EV_PERIODIC_ENABLE
2243void noinline 2695void noinline
2244ev_periodic_start (EV_P_ ev_periodic *w) 2696ev_periodic_start (EV_P_ ev_periodic *w)
2245{ 2697{
2246 if (expect_false (ev_is_active (w))) 2698 if (expect_false (ev_is_active (w)))
… …
2248 2700
2249 if (w->reschedule_cb) 2701 if (w->reschedule_cb)
2250 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2702 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2251 else if (w->interval) 2703 else if (w->interval)
2252 { 2704 {
2253 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2705 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2254 /* this formula differs from the one in periodic_reify because we do not always round up */ 2706 /* this formula differs from the one in periodic_reify because we do not always round up */
2255 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2707 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2256 } 2708 }
2257 else 2709 else
2258 ev_at (w) = w->offset; 2710 ev_at (w) = w->offset;
… …
2266 ANHE_at_cache (periodics [ev_active (w)]); 2718 ANHE_at_cache (periodics [ev_active (w)]);
2267 upheap (periodics, ev_active (w)); 2719 upheap (periodics, ev_active (w));
2268 2720
2269 EV_FREQUENT_CHECK; 2721 EV_FREQUENT_CHECK;
2270 2722
2271 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2723 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2272} 2724}
2273 2725
2274void noinline 2726void noinline
2275ev_periodic_stop (EV_P_ ev_periodic *w) 2727ev_periodic_stop (EV_P_ ev_periodic *w)
2276{ 2728{
… …
2281 EV_FREQUENT_CHECK; 2733 EV_FREQUENT_CHECK;
2282 2734
2283 { 2735 {
2284 int active = ev_active (w); 2736 int active = ev_active (w);
2285 2737
2286 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2738 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2287 2739
2288 --periodiccnt; 2740 --periodiccnt;
2289 2741
2290 if (expect_true (active < periodiccnt + HEAP0)) 2742 if (expect_true (active < periodiccnt + HEAP0))
2291 { 2743 {
2292 periodics [active] = periodics [periodiccnt + HEAP0]; 2744 periodics [active] = periodics [periodiccnt + HEAP0];
2293 adjustheap (periodics, periodiccnt, active); 2745 adjustheap (periodics, periodiccnt, active);
2294 } 2746 }
2295 } 2747 }
2296 2748
2297 EV_FREQUENT_CHECK;
2298
2299 ev_stop (EV_A_ (W)w); 2749 ev_stop (EV_A_ (W)w);
2750
2751 EV_FREQUENT_CHECK;
2300} 2752}
2301 2753
2302void noinline 2754void noinline
2303ev_periodic_again (EV_P_ ev_periodic *w) 2755ev_periodic_again (EV_P_ ev_periodic *w)
2304{ 2756{
… …
2310 2762
2311#ifndef SA_RESTART 2763#ifndef SA_RESTART
2312# define SA_RESTART 0 2764# define SA_RESTART 0
2313#endif 2765#endif
2314 2766
2767#if EV_SIGNAL_ENABLE
2768
2315void noinline 2769void noinline
2316ev_signal_start (EV_P_ ev_signal *w) 2770ev_signal_start (EV_P_ ev_signal *w)
2317{ 2771{
2318#if EV_MULTIPLICITY
2319 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2320#endif
2321 if (expect_false (ev_is_active (w))) 2772 if (expect_false (ev_is_active (w)))
2322 return; 2773 return;
2323 2774
2324 assert (("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));
2325 2776
2326 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));
2327 2780
2328 EV_FREQUENT_CHECK; 2781 signals [w->signum - 1].loop = EV_A;
2782#endif
2329 2783
2784 EV_FREQUENT_CHECK;
2785
2786#if EV_USE_SIGNALFD
2787 if (sigfd == -2)
2330 { 2788 {
2331#ifndef _WIN32 2789 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2332 sigset_t full, prev; 2790 if (sigfd < 0 && errno == EINVAL)
2333 sigfillset (&full); 2791 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2334 sigprocmask (SIG_SETMASK, &full, &prev);
2335#endif
2336 2792
2337 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 */
2338 2796
2339#ifndef _WIN32 2797 sigemptyset (&sigfd_set);
2340 sigprocmask (SIG_SETMASK, &prev, 0); 2798
2341#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 }
2342 } 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
2343 2815
2344 ev_start (EV_A_ (W)w, 1); 2816 ev_start (EV_A_ (W)w, 1);
2345 wlist_add (&signals [w->signum - 1].head, (WL)w); 2817 wlist_add (&signals [w->signum - 1].head, (WL)w);
2346 2818
2347 if (!((WL)w)->next) 2819 if (!((WL)w)->next)
2820# if EV_USE_SIGNALFD
2821 if (sigfd < 0) /*TODO*/
2822# endif
2348 { 2823 {
2349#if _WIN32 2824# ifdef _WIN32
2825 evpipe_init (EV_A);
2826
2350 signal (w->signum, ev_sighandler); 2827 signal (w->signum, ev_sighandler);
2351#else 2828# else
2352 struct sigaction sa; 2829 struct sigaction sa;
2830
2831 evpipe_init (EV_A);
2832
2353 sa.sa_handler = ev_sighandler; 2833 sa.sa_handler = ev_sighandler;
2354 sigfillset (&sa.sa_mask); 2834 sigfillset (&sa.sa_mask);
2355 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 */
2356 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);
2357#endif 2841#endif
2358 } 2842 }
2359 2843
2360 EV_FREQUENT_CHECK; 2844 EV_FREQUENT_CHECK;
2361} 2845}
2362 2846
2363void noinline 2847void noinline
… …
2371 2855
2372 wlist_del (&signals [w->signum - 1].head, (WL)w); 2856 wlist_del (&signals [w->signum - 1].head, (WL)w);
2373 ev_stop (EV_A_ (W)w); 2857 ev_stop (EV_A_ (W)w);
2374 2858
2375 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
2376 signal (w->signum, SIG_DFL); 2878 signal (w->signum, SIG_DFL);
2879 }
2377 2880
2378 EV_FREQUENT_CHECK; 2881 EV_FREQUENT_CHECK;
2379} 2882}
2883
2884#endif
2885
2886#if EV_CHILD_ENABLE
2380 2887
2381void 2888void
2382ev_child_start (EV_P_ ev_child *w) 2889ev_child_start (EV_P_ ev_child *w)
2383{ 2890{
2384#if EV_MULTIPLICITY 2891#if EV_MULTIPLICITY
2385 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2892 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2386#endif 2893#endif
2387 if (expect_false (ev_is_active (w))) 2894 if (expect_false (ev_is_active (w)))
2388 return; 2895 return;
2389 2896
2390 EV_FREQUENT_CHECK; 2897 EV_FREQUENT_CHECK;
2391 2898
2392 ev_start (EV_A_ (W)w, 1); 2899 ev_start (EV_A_ (W)w, 1);
2393 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2900 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2394 2901
2395 EV_FREQUENT_CHECK; 2902 EV_FREQUENT_CHECK;
2396} 2903}
2397 2904
2398void 2905void
… …
2402 if (expect_false (!ev_is_active (w))) 2909 if (expect_false (!ev_is_active (w)))
2403 return; 2910 return;
2404 2911
2405 EV_FREQUENT_CHECK; 2912 EV_FREQUENT_CHECK;
2406 2913
2407 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2914 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2408 ev_stop (EV_A_ (W)w); 2915 ev_stop (EV_A_ (W)w);
2409 2916
2410 EV_FREQUENT_CHECK; 2917 EV_FREQUENT_CHECK;
2411} 2918}
2919
2920#endif
2412 2921
2413#if EV_STAT_ENABLE 2922#if EV_STAT_ENABLE
2414 2923
2415# ifdef _WIN32 2924# ifdef _WIN32
2416# undef lstat 2925# undef lstat
… …
2422#define MIN_STAT_INTERVAL 0.1074891 2931#define MIN_STAT_INTERVAL 0.1074891
2423 2932
2424static 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);
2425 2934
2426#if EV_USE_INOTIFY 2935#if EV_USE_INOTIFY
2427# 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)
2428 2939
2429static void noinline 2940static void noinline
2430infy_add (EV_P_ ev_stat *w) 2941infy_add (EV_P_ ev_stat *w)
2431{ 2942{
2432 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);
2433 2944
2434 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 */
2435 { 2965 }
2966 else
2967 {
2968 /* can't use inotify, continue to stat */
2436 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2969 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2437 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2438 2970
2439 /* monitor some parent directory for speedup hints */ 2971 /* if path is not there, monitor some parent directory for speedup hints */
2440 /* 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, */
2441 /* but an efficiency issue only */ 2973 /* but an efficiency issue only */
2442 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2974 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2443 { 2975 {
2444 char path [4096]; 2976 char path [4096];
… …
2449 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2981 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2450 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2982 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2451 2983
2452 char *pend = strrchr (path, '/'); 2984 char *pend = strrchr (path, '/');
2453 2985
2454 if (!pend) 2986 if (!pend || pend == path)
2455 break; /* whoops, no '/', complain to your admin */ 2987 break;
2456 2988
2457 *pend = 0; 2989 *pend = 0;
2458 w->wd = inotify_add_watch (fs_fd, path, mask); 2990 w->wd = inotify_add_watch (fs_fd, path, mask);
2459 } 2991 }
2460 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2992 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2461 } 2993 }
2462 } 2994 }
2463 else 2995
2464 { 2996 if (w->wd >= 0)
2465 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);
2466 2998
2467 /* now local changes will be tracked by inotify, but remote changes won't */ 2999 /* now re-arm timer, if required */
2468 /* unless the filesystem it known to be local, we therefore still poll */ 3000 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2469 /* also do poll on <2.6.25, but with normal frequency */
2470 struct statfs sfs;
2471
2472 if (fs_2625 && !statfs (w->path, &sfs))
2473 if (sfs.f_type == 0x1373 /* devfs */
2474 || sfs.f_type == 0xEF53 /* ext2/3 */
2475 || sfs.f_type == 0x3153464a /* jfs */
2476 || sfs.f_type == 0x52654973 /* reiser3 */
2477 || sfs.f_type == 0x01021994 /* tempfs */
2478 || sfs.f_type == 0x58465342 /* xfs */)
2479 return;
2480
2481 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2482 ev_timer_again (EV_A_ &w->timer); 3001 ev_timer_again (EV_A_ &w->timer);
2483 } 3002 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2484} 3003}
2485 3004
2486static void noinline 3005static void noinline
2487infy_del (EV_P_ ev_stat *w) 3006infy_del (EV_P_ ev_stat *w)
2488{ 3007{
… …
2491 3010
2492 if (wd < 0) 3011 if (wd < 0)
2493 return; 3012 return;
2494 3013
2495 w->wd = -2; 3014 w->wd = -2;
2496 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3015 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2497 wlist_del (&fs_hash [slot].head, (WL)w); 3016 wlist_del (&fs_hash [slot].head, (WL)w);
2498 3017
2499 /* remove this watcher, if others are watching it, they will rearm */ 3018 /* remove this watcher, if others are watching it, they will rearm */
2500 inotify_rm_watch (fs_fd, wd); 3019 inotify_rm_watch (fs_fd, wd);
2501} 3020}
… …
2503static void noinline 3022static void noinline
2504infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3023infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2505{ 3024{
2506 if (slot < 0) 3025 if (slot < 0)
2507 /* overflow, need to check for all hash slots */ 3026 /* overflow, need to check for all hash slots */
2508 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3027 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2509 infy_wd (EV_A_ slot, wd, ev); 3028 infy_wd (EV_A_ slot, wd, ev);
2510 else 3029 else
2511 { 3030 {
2512 WL w_; 3031 WL w_;
2513 3032
2514 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3033 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2515 { 3034 {
2516 ev_stat *w = (ev_stat *)w_; 3035 ev_stat *w = (ev_stat *)w_;
2517 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 */
2518 3037
2519 if (w->wd == wd || wd == -1) 3038 if (w->wd == wd || wd == -1)
2520 { 3039 {
2521 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3040 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2522 { 3041 {
3042 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2523 w->wd = -1; 3043 w->wd = -1;
2524 infy_add (EV_A_ w); /* re-add, no matter what */ 3044 infy_add (EV_A_ w); /* re-add, no matter what */
2525 } 3045 }
2526 3046
2527 stat_timer_cb (EV_A_ &w->timer, 0); 3047 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2532 3052
2533static void 3053static void
2534infy_cb (EV_P_ ev_io *w, int revents) 3054infy_cb (EV_P_ ev_io *w, int revents)
2535{ 3055{
2536 char buf [EV_INOTIFY_BUFSIZE]; 3056 char buf [EV_INOTIFY_BUFSIZE];
2537 struct inotify_event *ev = (struct inotify_event *)buf;
2538 int ofs; 3057 int ofs;
2539 int len = read (fs_fd, buf, sizeof (buf)); 3058 int len = read (fs_fd, buf, sizeof (buf));
2540 3059
2541 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);
2542 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 }
2543} 3066}
2544 3067
2545void inline_size 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;
3098}
3099
3100inline_size void
2546check_2625 (EV_P) 3101ev_check_2625 (EV_P)
2547{ 3102{
2548 /* kernels < 2.6.25 are borked 3103 /* kernels < 2.6.25 are borked
2549 * 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
2550 */ 3105 */
2551 struct utsname buf; 3106 if (ev_linux_version () < 0x020619)
2552 int major, minor, micro;
2553
2554 if (uname (&buf))
2555 return; 3107 return;
2556 3108
2557 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2558 return;
2559
2560 if (major < 2
2561 || (major == 2 && minor < 6)
2562 || (major == 2 && minor == 6 && micro < 25))
2563 return;
2564
2565 fs_2625 = 1; 3109 fs_2625 = 1;
2566} 3110}
2567 3111
2568void inline_size 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 ();
3121}
3122
3123inline_size void
2569infy_init (EV_P) 3124infy_init (EV_P)
2570{ 3125{
2571 if (fs_fd != -2) 3126 if (fs_fd != -2)
2572 return; 3127 return;
2573 3128
2574 fs_fd = -1; 3129 fs_fd = -1;
2575 3130
2576 check_2625 (EV_A); 3131 ev_check_2625 (EV_A);
2577 3132
2578 fs_fd = inotify_init (); 3133 fs_fd = infy_newfd ();
2579 3134
2580 if (fs_fd >= 0) 3135 if (fs_fd >= 0)
2581 { 3136 {
3137 fd_intern (fs_fd);
2582 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3138 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2583 ev_set_priority (&fs_w, EV_MAXPRI); 3139 ev_set_priority (&fs_w, EV_MAXPRI);
2584 ev_io_start (EV_A_ &fs_w); 3140 ev_io_start (EV_A_ &fs_w);
3141 ev_unref (EV_A);
2585 } 3142 }
2586} 3143}
2587 3144
2588void inline_size 3145inline_size void
2589infy_fork (EV_P) 3146infy_fork (EV_P)
2590{ 3147{
2591 int slot; 3148 int slot;
2592 3149
2593 if (fs_fd < 0) 3150 if (fs_fd < 0)
2594 return; 3151 return;
2595 3152
3153 ev_ref (EV_A);
3154 ev_io_stop (EV_A_ &fs_w);
2596 close (fs_fd); 3155 close (fs_fd);
2597 fs_fd = inotify_init (); 3156 fs_fd = infy_newfd ();
2598 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
2599 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3166 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2600 { 3167 {
2601 WL w_ = fs_hash [slot].head; 3168 WL w_ = fs_hash [slot].head;
2602 fs_hash [slot].head = 0; 3169 fs_hash [slot].head = 0;
2603 3170
2604 while (w_) 3171 while (w_)
… …
2609 w->wd = -1; 3176 w->wd = -1;
2610 3177
2611 if (fs_fd >= 0) 3178 if (fs_fd >= 0)
2612 infy_add (EV_A_ w); /* re-add, no matter what */ 3179 infy_add (EV_A_ w); /* re-add, no matter what */
2613 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);
2614 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 }
2615 } 3187 }
2616 } 3188 }
2617} 3189}
2618 3190
2619#endif 3191#endif
… …
2636static void noinline 3208static void noinline
2637stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3209stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2638{ 3210{
2639 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3211 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2640 3212
2641 /* we copy this here each the time so that */ 3213 ev_statdata prev = w->attr;
2642 /* prev has the old value when the callback gets invoked */
2643 w->prev = w->attr;
2644 ev_stat_stat (EV_A_ w); 3214 ev_stat_stat (EV_A_ w);
2645 3215
2646 /* 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 */
2647 if ( 3217 if (
2648 w->prev.st_dev != w->attr.st_dev 3218 prev.st_dev != w->attr.st_dev
2649 || w->prev.st_ino != w->attr.st_ino 3219 || prev.st_ino != w->attr.st_ino
2650 || w->prev.st_mode != w->attr.st_mode 3220 || prev.st_mode != w->attr.st_mode
2651 || w->prev.st_nlink != w->attr.st_nlink 3221 || prev.st_nlink != w->attr.st_nlink
2652 || w->prev.st_uid != w->attr.st_uid 3222 || prev.st_uid != w->attr.st_uid
2653 || w->prev.st_gid != w->attr.st_gid 3223 || prev.st_gid != w->attr.st_gid
2654 || w->prev.st_rdev != w->attr.st_rdev 3224 || prev.st_rdev != w->attr.st_rdev
2655 || w->prev.st_size != w->attr.st_size 3225 || prev.st_size != w->attr.st_size
2656 || w->prev.st_atime != w->attr.st_atime 3226 || prev.st_atime != w->attr.st_atime
2657 || w->prev.st_mtime != w->attr.st_mtime 3227 || prev.st_mtime != w->attr.st_mtime
2658 || w->prev.st_ctime != w->attr.st_ctime 3228 || prev.st_ctime != w->attr.st_ctime
2659 ) { 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
2660 #if EV_USE_INOTIFY 3235 #if EV_USE_INOTIFY
2661 if (fs_fd >= 0) 3236 if (fs_fd >= 0)
2662 { 3237 {
2663 infy_del (EV_A_ w); 3238 infy_del (EV_A_ w);
2664 infy_add (EV_A_ w); 3239 infy_add (EV_A_ w);
… …
2689 3264
2690 if (fs_fd >= 0) 3265 if (fs_fd >= 0)
2691 infy_add (EV_A_ w); 3266 infy_add (EV_A_ w);
2692 else 3267 else
2693#endif 3268#endif
3269 {
2694 ev_timer_again (EV_A_ &w->timer); 3270 ev_timer_again (EV_A_ &w->timer);
3271 ev_unref (EV_A);
3272 }
2695 3273
2696 ev_start (EV_A_ (W)w, 1); 3274 ev_start (EV_A_ (W)w, 1);
2697 3275
2698 EV_FREQUENT_CHECK; 3276 EV_FREQUENT_CHECK;
2699} 3277}
… …
2708 EV_FREQUENT_CHECK; 3286 EV_FREQUENT_CHECK;
2709 3287
2710#if EV_USE_INOTIFY 3288#if EV_USE_INOTIFY
2711 infy_del (EV_A_ w); 3289 infy_del (EV_A_ w);
2712#endif 3290#endif
3291
3292 if (ev_is_active (&w->timer))
3293 {
3294 ev_ref (EV_A);
2713 ev_timer_stop (EV_A_ &w->timer); 3295 ev_timer_stop (EV_A_ &w->timer);
3296 }
2714 3297
2715 ev_stop (EV_A_ (W)w); 3298 ev_stop (EV_A_ (W)w);
2716 3299
2717 EV_FREQUENT_CHECK; 3300 EV_FREQUENT_CHECK;
2718} 3301}
… …
2763 3346
2764 EV_FREQUENT_CHECK; 3347 EV_FREQUENT_CHECK;
2765} 3348}
2766#endif 3349#endif
2767 3350
3351#if EV_PREPARE_ENABLE
2768void 3352void
2769ev_prepare_start (EV_P_ ev_prepare *w) 3353ev_prepare_start (EV_P_ ev_prepare *w)
2770{ 3354{
2771 if (expect_false (ev_is_active (w))) 3355 if (expect_false (ev_is_active (w)))
2772 return; 3356 return;
… …
2798 3382
2799 ev_stop (EV_A_ (W)w); 3383 ev_stop (EV_A_ (W)w);
2800 3384
2801 EV_FREQUENT_CHECK; 3385 EV_FREQUENT_CHECK;
2802} 3386}
3387#endif
2803 3388
3389#if EV_CHECK_ENABLE
2804void 3390void
2805ev_check_start (EV_P_ ev_check *w) 3391ev_check_start (EV_P_ ev_check *w)
2806{ 3392{
2807 if (expect_false (ev_is_active (w))) 3393 if (expect_false (ev_is_active (w)))
2808 return; 3394 return;
… …
2834 3420
2835 ev_stop (EV_A_ (W)w); 3421 ev_stop (EV_A_ (W)w);
2836 3422
2837 EV_FREQUENT_CHECK; 3423 EV_FREQUENT_CHECK;
2838} 3424}
3425#endif
2839 3426
2840#if EV_EMBED_ENABLE 3427#if EV_EMBED_ENABLE
2841void noinline 3428void noinline
2842ev_embed_sweep (EV_P_ ev_embed *w) 3429ev_embed_sweep (EV_P_ ev_embed *w)
2843{ 3430{
… …
2859embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3446embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2860{ 3447{
2861 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3448 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2862 3449
2863 { 3450 {
2864 struct ev_loop *loop = w->other; 3451 EV_P = w->other;
2865 3452
2866 while (fdchangecnt) 3453 while (fdchangecnt)
2867 { 3454 {
2868 fd_reify (EV_A); 3455 fd_reify (EV_A);
2869 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3456 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2874static void 3461static void
2875embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3462embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2876{ 3463{
2877 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));
2878 3465
3466 ev_embed_stop (EV_A_ w);
3467
2879 { 3468 {
2880 struct ev_loop *loop = w->other; 3469 EV_P = w->other;
2881 3470
2882 ev_loop_fork (EV_A); 3471 ev_loop_fork (EV_A);
3472 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2883 } 3473 }
3474
3475 ev_embed_start (EV_A_ w);
2884} 3476}
2885 3477
2886#if 0 3478#if 0
2887static void 3479static void
2888embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3480embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2896{ 3488{
2897 if (expect_false (ev_is_active (w))) 3489 if (expect_false (ev_is_active (w)))
2898 return; 3490 return;
2899 3491
2900 { 3492 {
2901 struct ev_loop *loop = w->other; 3493 EV_P = w->other;
2902 assert (("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 ()));
2903 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);
2904 } 3496 }
2905 3497
2906 EV_FREQUENT_CHECK; 3498 EV_FREQUENT_CHECK;
2907 3499
… …
2933 3525
2934 ev_io_stop (EV_A_ &w->io); 3526 ev_io_stop (EV_A_ &w->io);
2935 ev_prepare_stop (EV_A_ &w->prepare); 3527 ev_prepare_stop (EV_A_ &w->prepare);
2936 ev_fork_stop (EV_A_ &w->fork); 3528 ev_fork_stop (EV_A_ &w->fork);
2937 3529
3530 ev_stop (EV_A_ (W)w);
3531
2938 EV_FREQUENT_CHECK; 3532 EV_FREQUENT_CHECK;
2939} 3533}
2940#endif 3534#endif
2941 3535
2942#if EV_FORK_ENABLE 3536#if EV_FORK_ENABLE
… …
3018 3612
3019void 3613void
3020ev_async_send (EV_P_ ev_async *w) 3614ev_async_send (EV_P_ ev_async *w)
3021{ 3615{
3022 w->sent = 1; 3616 w->sent = 1;
3023 evpipe_write (EV_A_ &gotasync); 3617 evpipe_write (EV_A_ &async_pending);
3024} 3618}
3025#endif 3619#endif
3026 3620
3027/*****************************************************************************/ 3621/*****************************************************************************/
3028 3622
… …
3068{ 3662{
3069 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));
3070 3664
3071 if (expect_false (!once)) 3665 if (expect_false (!once))
3072 { 3666 {
3073 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3667 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3074 return; 3668 return;
3075 } 3669 }
3076 3670
3077 once->cb = cb; 3671 once->cb = cb;
3078 once->arg = arg; 3672 once->arg = arg;
… …
3090 ev_timer_set (&once->to, timeout, 0.); 3684 ev_timer_set (&once->to, timeout, 0.);
3091 ev_timer_start (EV_A_ &once->to); 3685 ev_timer_start (EV_A_ &once->to);
3092 } 3686 }
3093} 3687}
3094 3688
3689/*****************************************************************************/
3690
3691#if EV_WALK_ENABLE
3692void
3693ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3694{
3695 int i, j;
3696 ev_watcher_list *wl, *wn;
3697
3698 if (types & (EV_IO | EV_EMBED))
3699 for (i = 0; i < anfdmax; ++i)
3700 for (wl = anfds [i].head; wl; )
3701 {
3702 wn = wl->next;
3703
3704#if EV_EMBED_ENABLE
3705 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3706 {
3707 if (types & EV_EMBED)
3708 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3709 }
3710 else
3711#endif
3712#if EV_USE_INOTIFY
3713 if (ev_cb ((ev_io *)wl) == infy_cb)
3714 ;
3715 else
3716#endif
3717 if ((ev_io *)wl != &pipe_w)
3718 if (types & EV_IO)
3719 cb (EV_A_ EV_IO, wl);
3720
3721 wl = wn;
3722 }
3723
3724 if (types & (EV_TIMER | EV_STAT))
3725 for (i = timercnt + HEAP0; i-- > HEAP0; )
3726#if EV_STAT_ENABLE
3727 /*TODO: timer is not always active*/
3728 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3729 {
3730 if (types & EV_STAT)
3731 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3732 }
3733 else
3734#endif
3735 if (types & EV_TIMER)
3736 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3737
3738#if EV_PERIODIC_ENABLE
3739 if (types & EV_PERIODIC)
3740 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3741 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3742#endif
3743
3744#if EV_IDLE_ENABLE
3745 if (types & EV_IDLE)
3746 for (j = NUMPRI; i--; )
3747 for (i = idlecnt [j]; i--; )
3748 cb (EV_A_ EV_IDLE, idles [j][i]);
3749#endif
3750
3751#if EV_FORK_ENABLE
3752 if (types & EV_FORK)
3753 for (i = forkcnt; i--; )
3754 if (ev_cb (forks [i]) != embed_fork_cb)
3755 cb (EV_A_ EV_FORK, forks [i]);
3756#endif
3757
3758#if EV_ASYNC_ENABLE
3759 if (types & EV_ASYNC)
3760 for (i = asynccnt; i--; )
3761 cb (EV_A_ EV_ASYNC, asyncs [i]);
3762#endif
3763
3764#if EV_PREPARE_ENABLE
3765 if (types & EV_PREPARE)
3766 for (i = preparecnt; i--; )
3767# if EV_EMBED_ENABLE
3768 if (ev_cb (prepares [i]) != embed_prepare_cb)
3769# endif
3770 cb (EV_A_ EV_PREPARE, prepares [i]);
3771#endif
3772
3773#if EV_CHECK_ENABLE
3774 if (types & EV_CHECK)
3775 for (i = checkcnt; i--; )
3776 cb (EV_A_ EV_CHECK, checks [i]);
3777#endif
3778
3779#if EV_SIGNAL_ENABLE
3780 if (types & EV_SIGNAL)
3781 for (i = 0; i < EV_NSIG - 1; ++i)
3782 for (wl = signals [i].head; wl; )
3783 {
3784 wn = wl->next;
3785 cb (EV_A_ EV_SIGNAL, wl);
3786 wl = wn;
3787 }
3788#endif
3789
3790#if EV_CHILD_ENABLE
3791 if (types & EV_CHILD)
3792 for (i = (EV_PID_HASHSIZE); i--; )
3793 for (wl = childs [i]; wl; )
3794 {
3795 wn = wl->next;
3796 cb (EV_A_ EV_CHILD, wl);
3797 wl = wn;
3798 }
3799#endif
3800/* EV_STAT 0x00001000 /* stat data changed */
3801/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3802}
3803#endif
3804
3095#if EV_MULTIPLICITY 3805#if EV_MULTIPLICITY
3096 #include "ev_wrap.h" 3806 #include "ev_wrap.h"
3097#endif 3807#endif
3098 3808
3099#ifdef __cplusplus 3809#ifdef __cplusplus

Diff Legend

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