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

Comparing libev/ev.c (file contents):
Revision 1.287 by root, Mon Apr 20 19:45:58 2009 UTC vs.
Revision 1.349 by sf-exg, Fri Oct 15 22:59:59 2010 UTC

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

Diff Legend

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