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

Comparing libev/ev.c (file contents):
Revision 1.284 by root, Wed Apr 15 17:49:26 2009 UTC vs.
Revision 1.343 by root, Fri Apr 2 21:03:46 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
86# endif
87
88# ifndef EV_USE_SELECT
89# if HAVE_SELECT && HAVE_SYS_SELECT_H
90# define EV_USE_SELECT 1
91# else 95# else
96# undef EV_USE_SELECT
92# define EV_USE_SELECT 0 97# define EV_USE_SELECT 0
98# endif
99
100# if HAVE_POLL && HAVE_POLL_H
101# ifndef EV_USE_POLL
102# define EV_USE_POLL EV_FEATURE_BACKENDS
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
107# endif
108
109# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
110# ifndef EV_USE_EPOLL
111# define EV_USE_EPOLL EV_FEATURE_BACKENDS
101# endif 112# endif
113# else
114# undef EV_USE_EPOLL
115# define EV_USE_EPOLL 0
102# endif 116# endif
103 117
118# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
104# ifndef EV_USE_EPOLL 119# ifndef EV_USE_KQUEUE
105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 120# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
106# define EV_USE_EPOLL 1
107# else
108# define EV_USE_EPOLL 0
109# endif 121# endif
122# else
123# undef EV_USE_KQUEUE
124# define EV_USE_KQUEUE 0
110# endif 125# endif
111 126
112# ifndef EV_USE_KQUEUE 127# if HAVE_PORT_H && HAVE_PORT_CREATE
113# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 128# ifndef EV_USE_PORT
114# define EV_USE_KQUEUE 1 129# define EV_USE_PORT EV_FEATURE_BACKENDS
115# else
116# define EV_USE_KQUEUE 0
117# endif 130# endif
118# endif
119
120# ifndef EV_USE_PORT
121# if HAVE_PORT_H && HAVE_PORT_CREATE
122# define EV_USE_PORT 1
123# else 131# else
132# undef EV_USE_PORT
124# define EV_USE_PORT 0 133# define EV_USE_PORT 0
134# endif
135
136# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
137# ifndef EV_USE_INOTIFY
138# define EV_USE_INOTIFY EV_FEATURE_OS
125# endif 139# endif
126# endif
127
128# ifndef EV_USE_INOTIFY
129# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
130# define EV_USE_INOTIFY 1
131# else 140# else
141# undef EV_USE_INOTIFY
132# define EV_USE_INOTIFY 0 142# define EV_USE_INOTIFY 0
143# endif
144
145# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
146# ifndef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD EV_FEATURE_OS
133# endif 148# endif
149# else
150# undef EV_USE_SIGNALFD
151# define EV_USE_SIGNALFD 0
134# endif 152# endif
135 153
154# if HAVE_EVENTFD
136# ifndef EV_USE_EVENTFD 155# ifndef EV_USE_EVENTFD
137# if HAVE_EVENTFD
138# define EV_USE_EVENTFD 1 156# define EV_USE_EVENTFD EV_FEATURE_OS
139# else
140# define EV_USE_EVENTFD 0
141# endif 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
178 200
179/* this block tries to deduce configuration from header-defined symbols and defaults */ 201/* this block tries to deduce configuration from header-defined symbols and defaults */
202
203/* try to deduce the maximum number of signals on this platform */
204#if defined (EV_NSIG)
205/* use what's provided */
206#elif defined (NSIG)
207# define EV_NSIG (NSIG)
208#elif defined(_NSIG)
209# define EV_NSIG (_NSIG)
210#elif defined (SIGMAX)
211# define EV_NSIG (SIGMAX+1)
212#elif defined (SIG_MAX)
213# define EV_NSIG (SIG_MAX+1)
214#elif defined (_SIG_MAX)
215# define EV_NSIG (_SIG_MAX+1)
216#elif defined (MAXSIG)
217# define EV_NSIG (MAXSIG+1)
218#elif defined (MAX_SIG)
219# define EV_NSIG (MAX_SIG+1)
220#elif defined (SIGARRAYSIZE)
221# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
222#elif defined (_sys_nsig)
223# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
224#else
225# error "unable to find value for NSIG, please report"
226/* to make it compile regardless, just remove the above line, */
227/* but consider reporting it, too! :) */
228# define EV_NSIG 65
229#endif
180 230
181#ifndef EV_USE_CLOCK_SYSCALL 231#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 232# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 233# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
184# else 234# else
185# define EV_USE_CLOCK_SYSCALL 0 235# define EV_USE_CLOCK_SYSCALL 0
186# endif 236# endif
187#endif 237#endif
188 238
189#ifndef EV_USE_MONOTONIC 239#ifndef EV_USE_MONOTONIC
190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 240# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
191# define EV_USE_MONOTONIC 1 241# define EV_USE_MONOTONIC EV_FEATURE_OS
192# else 242# else
193# define EV_USE_MONOTONIC 0 243# define EV_USE_MONOTONIC 0
194# endif 244# endif
195#endif 245#endif
196 246
… …
198# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 248# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
199#endif 249#endif
200 250
201#ifndef EV_USE_NANOSLEEP 251#ifndef EV_USE_NANOSLEEP
202# if _POSIX_C_SOURCE >= 199309L 252# if _POSIX_C_SOURCE >= 199309L
203# define EV_USE_NANOSLEEP 1 253# define EV_USE_NANOSLEEP EV_FEATURE_OS
204# else 254# else
205# define EV_USE_NANOSLEEP 0 255# define EV_USE_NANOSLEEP 0
206# endif 256# endif
207#endif 257#endif
208 258
209#ifndef EV_USE_SELECT 259#ifndef EV_USE_SELECT
210# define EV_USE_SELECT 1 260# define EV_USE_SELECT EV_FEATURE_BACKENDS
211#endif 261#endif
212 262
213#ifndef EV_USE_POLL 263#ifndef EV_USE_POLL
214# ifdef _WIN32 264# ifdef _WIN32
215# define EV_USE_POLL 0 265# define EV_USE_POLL 0
216# else 266# else
217# define EV_USE_POLL 1 267# define EV_USE_POLL EV_FEATURE_BACKENDS
218# endif 268# endif
219#endif 269#endif
220 270
221#ifndef EV_USE_EPOLL 271#ifndef EV_USE_EPOLL
222# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 272# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
223# define EV_USE_EPOLL 1 273# define EV_USE_EPOLL EV_FEATURE_BACKENDS
224# else 274# else
225# define EV_USE_EPOLL 0 275# define EV_USE_EPOLL 0
226# endif 276# endif
227#endif 277#endif
228 278
… …
234# define EV_USE_PORT 0 284# define EV_USE_PORT 0
235#endif 285#endif
236 286
237#ifndef EV_USE_INOTIFY 287#ifndef EV_USE_INOTIFY
238# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 288# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
239# define EV_USE_INOTIFY 1 289# define EV_USE_INOTIFY EV_FEATURE_OS
240# else 290# else
241# define EV_USE_INOTIFY 0 291# define EV_USE_INOTIFY 0
242# endif 292# endif
243#endif 293#endif
244 294
245#ifndef EV_PID_HASHSIZE 295#ifndef EV_PID_HASHSIZE
246# if EV_MINIMAL 296# 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 297#endif
252 298
253#ifndef EV_INOTIFY_HASHSIZE 299#ifndef EV_INOTIFY_HASHSIZE
254# if EV_MINIMAL 300# 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 301#endif
260 302
261#ifndef EV_USE_EVENTFD 303#ifndef EV_USE_EVENTFD
262# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 304# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
263# define EV_USE_EVENTFD 1 305# define EV_USE_EVENTFD EV_FEATURE_OS
264# else 306# else
265# define EV_USE_EVENTFD 0 307# define EV_USE_EVENTFD 0
308# endif
309#endif
310
311#ifndef EV_USE_SIGNALFD
312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
313# define EV_USE_SIGNALFD EV_FEATURE_OS
314# else
315# define EV_USE_SIGNALFD 0
266# endif 316# endif
267#endif 317#endif
268 318
269#if 0 /* debugging */ 319#if 0 /* debugging */
270# define EV_VERIFY 3 320# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 321# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 322# define EV_HEAP_CACHE_AT 1
273#endif 323#endif
274 324
275#ifndef EV_VERIFY 325#ifndef EV_VERIFY
276# define EV_VERIFY !EV_MINIMAL 326# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
277#endif 327#endif
278 328
279#ifndef EV_USE_4HEAP 329#ifndef EV_USE_4HEAP
280# define EV_USE_4HEAP !EV_MINIMAL 330# define EV_USE_4HEAP EV_FEATURE_DATA
281#endif 331#endif
282 332
283#ifndef EV_HEAP_CACHE_AT 333#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 334# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
335#endif
336
337/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
338/* which makes programs even slower. might work on other unices, too. */
339#if EV_USE_CLOCK_SYSCALL
340# include <syscall.h>
341# ifdef SYS_clock_gettime
342# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
343# undef EV_USE_MONOTONIC
344# define EV_USE_MONOTONIC 1
345# else
346# undef EV_USE_CLOCK_SYSCALL
347# define EV_USE_CLOCK_SYSCALL 0
348# endif
285#endif 349#endif
286 350
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 351/* this block fixes any misconfiguration where we know we run into trouble otherwise */
352
353#ifdef _AIX
354/* AIX has a completely broken poll.h header */
355# undef EV_USE_POLL
356# define EV_USE_POLL 0
357#endif
288 358
289#ifndef CLOCK_MONOTONIC 359#ifndef CLOCK_MONOTONIC
290# undef EV_USE_MONOTONIC 360# undef EV_USE_MONOTONIC
291# define EV_USE_MONOTONIC 0 361# define EV_USE_MONOTONIC 0
292#endif 362#endif
… …
320 390
321#if EV_SELECT_IS_WINSOCKET 391#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 392# include <winsock.h>
323#endif 393#endif
324 394
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 395#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 396/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 397# include <stdint.h>
398# ifndef EFD_NONBLOCK
399# define EFD_NONBLOCK O_NONBLOCK
400# endif
401# ifndef EFD_CLOEXEC
402# ifdef O_CLOEXEC
403# define EFD_CLOEXEC O_CLOEXEC
404# else
405# define EFD_CLOEXEC 02000000
406# endif
407# endif
337# ifdef __cplusplus 408# ifdef __cplusplus
338extern "C" { 409extern "C" {
339# endif 410# endif
340int eventfd (unsigned int initval, int flags); 411int (eventfd) (unsigned int initval, int flags);
341# ifdef __cplusplus 412# ifdef __cplusplus
342} 413}
343# endif 414# endif
344#endif 415#endif
345 416
417#if EV_USE_SIGNALFD
418/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
419# include <stdint.h>
420# ifndef SFD_NONBLOCK
421# define SFD_NONBLOCK O_NONBLOCK
422# endif
423# ifndef SFD_CLOEXEC
424# ifdef O_CLOEXEC
425# define SFD_CLOEXEC O_CLOEXEC
426# else
427# define SFD_CLOEXEC 02000000
428# endif
429# endif
430# ifdef __cplusplus
431extern "C" {
432# endif
433int signalfd (int fd, const sigset_t *mask, int flags);
434
435struct signalfd_siginfo
436{
437 uint32_t ssi_signo;
438 char pad[128 - sizeof (uint32_t)];
439};
440# ifdef __cplusplus
441}
442# endif
443#endif
444
445
346/**/ 446/**/
347 447
348#if EV_VERIFY >= 3 448#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 449# define EV_FREQUENT_CHECK ev_verify (EV_A)
350#else 450#else
351# define EV_FREQUENT_CHECK do { } while (0) 451# define EV_FREQUENT_CHECK do { } while (0)
352#endif 452#endif
353 453
354/* 454/*
… …
361 */ 461 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 462#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 463
364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 464#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) */ 465#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
366/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
367 466
368#if __GNUC__ >= 4 467#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 468# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 469# define noinline __attribute__ ((noinline))
371#else 470#else
… …
378 477
379#define expect_false(expr) expect ((expr) != 0, 0) 478#define expect_false(expr) expect ((expr) != 0, 0)
380#define expect_true(expr) expect ((expr) != 0, 1) 479#define expect_true(expr) expect ((expr) != 0, 1)
381#define inline_size static inline 480#define inline_size static inline
382 481
383#if EV_MINIMAL 482#if EV_FEATURE_CODE
483# define inline_speed static inline
484#else
384# define inline_speed static noinline 485# define inline_speed static noinline
486#endif
487
488#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
489
490#if EV_MINPRI == EV_MAXPRI
491# define ABSPRI(w) (((W)w), 0)
385#else 492#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) 493# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
494#endif
391 495
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 496#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 497#define EMPTY2(a,b) /* used to suppress some warnings */
394 498
395typedef ev_watcher *W; 499typedef ev_watcher *W;
… …
407 511
408#if EV_USE_MONOTONIC 512#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 513static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 514#endif
411 515
516#ifndef EV_FD_TO_WIN32_HANDLE
517# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
518#endif
519#ifndef EV_WIN32_HANDLE_TO_FD
520# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
521#endif
522#ifndef EV_WIN32_CLOSE_FD
523# define EV_WIN32_CLOSE_FD(fd) close (fd)
524#endif
525
412#ifdef _WIN32 526#ifdef _WIN32
413# include "ev_win32.c" 527# include "ev_win32.c"
414#endif 528#endif
415 529
416/*****************************************************************************/ 530/*****************************************************************************/
531
532#if EV_AVOID_STDIO
533static void noinline
534ev_printerr (const char *msg)
535{
536 write (STDERR_FILENO, msg, strlen (msg));
537}
538#endif
417 539
418static void (*syserr_cb)(const char *msg); 540static void (*syserr_cb)(const char *msg);
419 541
420void 542void
421ev_set_syserr_cb (void (*cb)(const char *msg)) 543ev_set_syserr_cb (void (*cb)(const char *msg))
… …
431 553
432 if (syserr_cb) 554 if (syserr_cb)
433 syserr_cb (msg); 555 syserr_cb (msg);
434 else 556 else
435 { 557 {
558#if EV_AVOID_STDIO
559 const char *err = strerror (errno);
560
561 ev_printerr (msg);
562 ev_printerr (": ");
563 ev_printerr (err);
564 ev_printerr ("\n");
565#else
436 perror (msg); 566 perror (msg);
567#endif
437 abort (); 568 abort ();
438 } 569 }
439} 570}
440 571
441static void * 572static void *
442ev_realloc_emul (void *ptr, long size) 573ev_realloc_emul (void *ptr, long size)
443{ 574{
575#if __GLIBC__
576 return realloc (ptr, size);
577#else
444 /* some systems, notably openbsd and darwin, fail to properly 578 /* some systems, notably openbsd and darwin, fail to properly
445 * implement realloc (x, 0) (as required by both ansi c-98 and 579 * implement realloc (x, 0) (as required by both ansi c-89 and
446 * the single unix specification, so work around them here. 580 * the single unix specification, so work around them here.
447 */ 581 */
448 582
449 if (size) 583 if (size)
450 return realloc (ptr, size); 584 return realloc (ptr, size);
451 585
452 free (ptr); 586 free (ptr);
453 return 0; 587 return 0;
588#endif
454} 589}
455 590
456static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 591static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
457 592
458void 593void
… …
466{ 601{
467 ptr = alloc (ptr, size); 602 ptr = alloc (ptr, size);
468 603
469 if (!ptr && size) 604 if (!ptr && size)
470 { 605 {
606#if EV_AVOID_STDIO
607 ev_printerr ("libev: memory allocation failed, aborting.\n");
608#else
471 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 609 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
610#endif
472 abort (); 611 abort ();
473 } 612 }
474 613
475 return ptr; 614 return ptr;
476} 615}
… …
478#define ev_malloc(size) ev_realloc (0, (size)) 617#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 618#define ev_free(ptr) ev_realloc ((ptr), 0)
480 619
481/*****************************************************************************/ 620/*****************************************************************************/
482 621
622/* set in reify when reification needed */
623#define EV_ANFD_REIFY 1
624
625/* file descriptor info structure */
483typedef struct 626typedef struct
484{ 627{
485 WL head; 628 WL head;
486 unsigned char events; 629 unsigned char events; /* the events watched for */
487 unsigned char reify; 630 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 */ 631 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 632 unsigned char unused;
490#if EV_USE_EPOLL 633#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 634 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 635#endif
493#if EV_SELECT_IS_WINSOCKET 636#if EV_SELECT_IS_WINSOCKET
494 SOCKET handle; 637 SOCKET handle;
495#endif 638#endif
496} ANFD; 639} ANFD;
497 640
641/* stores the pending event set for a given watcher */
498typedef struct 642typedef struct
499{ 643{
500 W w; 644 W w;
501 int events; 645 int events; /* the pending event set for the given watcher */
502} ANPENDING; 646} ANPENDING;
503 647
504#if EV_USE_INOTIFY 648#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 649/* hash table entry per inotify-id */
506typedef struct 650typedef struct
… …
509} ANFS; 653} ANFS;
510#endif 654#endif
511 655
512/* Heap Entry */ 656/* Heap Entry */
513#if EV_HEAP_CACHE_AT 657#if EV_HEAP_CACHE_AT
658 /* a heap element */
514 typedef struct { 659 typedef struct {
515 ev_tstamp at; 660 ev_tstamp at;
516 WT w; 661 WT w;
517 } ANHE; 662 } ANHE;
518 663
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 664 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 665 #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 */ 666 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 667#else
668 /* a heap element */
523 typedef WT ANHE; 669 typedef WT ANHE;
524 670
525 #define ANHE_w(he) (he) 671 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 672 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 673 #define ANHE_at_cache(he)
… …
551 697
552 static int ev_default_loop_ptr; 698 static int ev_default_loop_ptr;
553 699
554#endif 700#endif
555 701
702#if EV_FEATURE_API
703# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
704# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
705# define EV_INVOKE_PENDING invoke_cb (EV_A)
706#else
707# define EV_RELEASE_CB (void)0
708# define EV_ACQUIRE_CB (void)0
709# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
710#endif
711
712#define EVUNLOOP_RECURSE 0x80
713
556/*****************************************************************************/ 714/*****************************************************************************/
557 715
716#ifndef EV_HAVE_EV_TIME
558ev_tstamp 717ev_tstamp
559ev_time (void) 718ev_time (void)
560{ 719{
561#if EV_USE_REALTIME 720#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 721 if (expect_true (have_realtime))
… …
569 728
570 struct timeval tv; 729 struct timeval tv;
571 gettimeofday (&tv, 0); 730 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 731 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 732}
733#endif
574 734
575inline_size ev_tstamp 735inline_size ev_tstamp
576get_clock (void) 736get_clock (void)
577{ 737{
578#if EV_USE_MONOTONIC 738#if EV_USE_MONOTONIC
… …
614 774
615 tv.tv_sec = (time_t)delay; 775 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 776 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617 777
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 778 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 779 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 780 /* by older ones */
621 select (0, 0, 0, 0, &tv); 781 select (0, 0, 0, 0, &tv);
622#endif 782#endif
623 } 783 }
624} 784}
625 785
626/*****************************************************************************/ 786/*****************************************************************************/
627 787
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 788#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 789
790/* find a suitable new size for the given array, */
791/* hopefully by rounding to a ncie-to-malloc size */
630inline_size int 792inline_size int
631array_nextsize (int elem, int cur, int cnt) 793array_nextsize (int elem, int cur, int cnt)
632{ 794{
633 int ncur = cur + 1; 795 int ncur = cur + 1;
634 796
… …
680#define array_free(stem, idx) \ 842#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 843 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 844
683/*****************************************************************************/ 845/*****************************************************************************/
684 846
847/* dummy callback for pending events */
848static void noinline
849pendingcb (EV_P_ ev_prepare *w, int revents)
850{
851}
852
685void noinline 853void noinline
686ev_feed_event (EV_P_ void *w, int revents) 854ev_feed_event (EV_P_ void *w, int revents)
687{ 855{
688 W w_ = (W)w; 856 W w_ = (W)w;
689 int pri = ABSPRI (w_); 857 int pri = ABSPRI (w_);
… …
724} 892}
725 893
726/*****************************************************************************/ 894/*****************************************************************************/
727 895
728inline_speed void 896inline_speed void
729fd_event (EV_P_ int fd, int revents) 897fd_event_nocheck (EV_P_ int fd, int revents)
730{ 898{
731 ANFD *anfd = anfds + fd; 899 ANFD *anfd = anfds + fd;
732 ev_io *w; 900 ev_io *w;
733 901
734 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 902 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
738 if (ev) 906 if (ev)
739 ev_feed_event (EV_A_ (W)w, ev); 907 ev_feed_event (EV_A_ (W)w, ev);
740 } 908 }
741} 909}
742 910
911/* do not submit kernel events for fds that have reify set */
912/* because that means they changed while we were polling for new events */
913inline_speed void
914fd_event (EV_P_ int fd, int revents)
915{
916 ANFD *anfd = anfds + fd;
917
918 if (expect_true (!anfd->reify))
919 fd_event_nocheck (EV_A_ fd, revents);
920}
921
743void 922void
744ev_feed_fd_event (EV_P_ int fd, int revents) 923ev_feed_fd_event (EV_P_ int fd, int revents)
745{ 924{
746 if (fd >= 0 && fd < anfdmax) 925 if (fd >= 0 && fd < anfdmax)
747 fd_event (EV_A_ fd, revents); 926 fd_event_nocheck (EV_A_ fd, revents);
748} 927}
749 928
929/* make sure the external fd watch events are in-sync */
930/* with the kernel/libev internal state */
750inline_size void 931inline_size void
751fd_reify (EV_P) 932fd_reify (EV_P)
752{ 933{
753 int i; 934 int i;
754 935
… …
765 946
766#if EV_SELECT_IS_WINSOCKET 947#if EV_SELECT_IS_WINSOCKET
767 if (events) 948 if (events)
768 { 949 {
769 unsigned long arg; 950 unsigned long arg;
770 #ifdef EV_FD_TO_WIN32_HANDLE
771 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 951 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)); 952 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
776 } 953 }
777#endif 954#endif
778 955
779 { 956 {
… …
789 } 966 }
790 967
791 fdchangecnt = 0; 968 fdchangecnt = 0;
792} 969}
793 970
971/* something about the given fd changed */
794inline_size void 972inline_size void
795fd_change (EV_P_ int fd, int flags) 973fd_change (EV_P_ int fd, int flags)
796{ 974{
797 unsigned char reify = anfds [fd].reify; 975 unsigned char reify = anfds [fd].reify;
798 anfds [fd].reify |= flags; 976 anfds [fd].reify |= flags;
… …
803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 981 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
804 fdchanges [fdchangecnt - 1] = fd; 982 fdchanges [fdchangecnt - 1] = fd;
805 } 983 }
806} 984}
807 985
986/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
808inline_speed void 987inline_speed void
809fd_kill (EV_P_ int fd) 988fd_kill (EV_P_ int fd)
810{ 989{
811 ev_io *w; 990 ev_io *w;
812 991
… …
815 ev_io_stop (EV_A_ w); 994 ev_io_stop (EV_A_ w);
816 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 995 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
817 } 996 }
818} 997}
819 998
999/* check whether the given fd is actually valid, for error recovery */
820inline_size int 1000inline_size int
821fd_valid (int fd) 1001fd_valid (int fd)
822{ 1002{
823#ifdef _WIN32 1003#ifdef _WIN32
824 return _get_osfhandle (fd) != -1; 1004 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
825#else 1005#else
826 return fcntl (fd, F_GETFD) != -1; 1006 return fcntl (fd, F_GETFD) != -1;
827#endif 1007#endif
828} 1008}
829 1009
… …
847 1027
848 for (fd = anfdmax; fd--; ) 1028 for (fd = anfdmax; fd--; )
849 if (anfds [fd].events) 1029 if (anfds [fd].events)
850 { 1030 {
851 fd_kill (EV_A_ fd); 1031 fd_kill (EV_A_ fd);
852 return; 1032 break;
853 } 1033 }
854} 1034}
855 1035
856/* usually called after fork if backend needs to re-arm all fds from scratch */ 1036/* usually called after fork if backend needs to re-arm all fds from scratch */
857static void noinline 1037static void noinline
… …
862 for (fd = 0; fd < anfdmax; ++fd) 1042 for (fd = 0; fd < anfdmax; ++fd)
863 if (anfds [fd].events) 1043 if (anfds [fd].events)
864 { 1044 {
865 anfds [fd].events = 0; 1045 anfds [fd].events = 0;
866 anfds [fd].emask = 0; 1046 anfds [fd].emask = 0;
867 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1047 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
868 } 1048 }
1049}
1050
1051/* used to prepare libev internal fd's */
1052/* this is not fork-safe */
1053inline_speed void
1054fd_intern (int fd)
1055{
1056#ifdef _WIN32
1057 unsigned long arg = 1;
1058 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1059#else
1060 fcntl (fd, F_SETFD, FD_CLOEXEC);
1061 fcntl (fd, F_SETFL, O_NONBLOCK);
1062#endif
869} 1063}
870 1064
871/*****************************************************************************/ 1065/*****************************************************************************/
872 1066
873/* 1067/*
… …
947 1141
948 for (;;) 1142 for (;;)
949 { 1143 {
950 int c = k << 1; 1144 int c = k << 1;
951 1145
952 if (c > N + HEAP0 - 1) 1146 if (c >= N + HEAP0)
953 break; 1147 break;
954 1148
955 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1149 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
956 ? 1 : 0; 1150 ? 1 : 0;
957 1151
… …
989 1183
990 heap [k] = he; 1184 heap [k] = he;
991 ev_active (ANHE_w (he)) = k; 1185 ev_active (ANHE_w (he)) = k;
992} 1186}
993 1187
1188/* move an element suitably so it is in a correct place */
994inline_size void 1189inline_size void
995adjustheap (ANHE *heap, int N, int k) 1190adjustheap (ANHE *heap, int N, int k)
996{ 1191{
997 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1192 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
998 upheap (heap, k); 1193 upheap (heap, k);
999 else 1194 else
1000 downheap (heap, N, k); 1195 downheap (heap, N, k);
1001} 1196}
1002 1197
… …
1012 upheap (heap, i + HEAP0); 1207 upheap (heap, i + HEAP0);
1013} 1208}
1014 1209
1015/*****************************************************************************/ 1210/*****************************************************************************/
1016 1211
1212/* associate signal watchers to a signal signal */
1017typedef struct 1213typedef struct
1018{ 1214{
1215 EV_ATOMIC_T pending;
1216#if EV_MULTIPLICITY
1217 EV_P;
1218#endif
1019 WL head; 1219 WL head;
1020 EV_ATOMIC_T gotsig;
1021} ANSIG; 1220} ANSIG;
1022 1221
1023static ANSIG *signals; 1222static ANSIG signals [EV_NSIG - 1];
1024static int signalmax;
1025
1026static EV_ATOMIC_T gotsig;
1027 1223
1028/*****************************************************************************/ 1224/*****************************************************************************/
1029 1225
1030inline_speed void 1226#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 1227
1042static void noinline 1228static void noinline
1043evpipe_init (EV_P) 1229evpipe_init (EV_P)
1044{ 1230{
1045 if (!ev_is_active (&pipeev)) 1231 if (!ev_is_active (&pipe_w))
1046 { 1232 {
1047#if EV_USE_EVENTFD 1233# if EV_USE_EVENTFD
1234 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1235 if (evfd < 0 && errno == EINVAL)
1048 if ((evfd = eventfd (0, 0)) >= 0) 1236 evfd = eventfd (0, 0);
1237
1238 if (evfd >= 0)
1049 { 1239 {
1050 evpipe [0] = -1; 1240 evpipe [0] = -1;
1051 fd_intern (evfd); 1241 fd_intern (evfd); /* doing it twice doesn't hurt */
1052 ev_io_set (&pipeev, evfd, EV_READ); 1242 ev_io_set (&pipe_w, evfd, EV_READ);
1053 } 1243 }
1054 else 1244 else
1055#endif 1245# endif
1056 { 1246 {
1057 while (pipe (evpipe)) 1247 while (pipe (evpipe))
1058 ev_syserr ("(libev) error creating signal/async pipe"); 1248 ev_syserr ("(libev) error creating signal/async pipe");
1059 1249
1060 fd_intern (evpipe [0]); 1250 fd_intern (evpipe [0]);
1061 fd_intern (evpipe [1]); 1251 fd_intern (evpipe [1]);
1062 ev_io_set (&pipeev, evpipe [0], EV_READ); 1252 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1063 } 1253 }
1064 1254
1065 ev_io_start (EV_A_ &pipeev); 1255 ev_io_start (EV_A_ &pipe_w);
1066 ev_unref (EV_A); /* watcher should not keep loop alive */ 1256 ev_unref (EV_A); /* watcher should not keep loop alive */
1067 } 1257 }
1068} 1258}
1069 1259
1070inline_size void 1260inline_size void
1071evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1261evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1072{ 1262{
1073 if (!*flag) 1263 if (!*flag)
1074 { 1264 {
1075 int old_errno = errno; /* save errno because write might clobber it */ 1265 int old_errno = errno; /* save errno because write might clobber it */
1266 char dummy;
1076 1267
1077 *flag = 1; 1268 *flag = 1;
1078 1269
1079#if EV_USE_EVENTFD 1270#if EV_USE_EVENTFD
1080 if (evfd >= 0) 1271 if (evfd >= 0)
… …
1082 uint64_t counter = 1; 1273 uint64_t counter = 1;
1083 write (evfd, &counter, sizeof (uint64_t)); 1274 write (evfd, &counter, sizeof (uint64_t));
1084 } 1275 }
1085 else 1276 else
1086#endif 1277#endif
1087 write (evpipe [1], &old_errno, 1); 1278 write (evpipe [1], &dummy, 1);
1088 1279
1089 errno = old_errno; 1280 errno = old_errno;
1090 } 1281 }
1091} 1282}
1092 1283
1284/* called whenever the libev signal pipe */
1285/* got some events (signal, async) */
1093static void 1286static void
1094pipecb (EV_P_ ev_io *iow, int revents) 1287pipecb (EV_P_ ev_io *iow, int revents)
1095{ 1288{
1289 int i;
1290
1096#if EV_USE_EVENTFD 1291#if EV_USE_EVENTFD
1097 if (evfd >= 0) 1292 if (evfd >= 0)
1098 { 1293 {
1099 uint64_t counter; 1294 uint64_t counter;
1100 read (evfd, &counter, sizeof (uint64_t)); 1295 read (evfd, &counter, sizeof (uint64_t));
… …
1104 { 1299 {
1105 char dummy; 1300 char dummy;
1106 read (evpipe [0], &dummy, 1); 1301 read (evpipe [0], &dummy, 1);
1107 } 1302 }
1108 1303
1109 if (gotsig && ev_is_default_loop (EV_A)) 1304 if (sig_pending)
1110 { 1305 {
1111 int signum; 1306 sig_pending = 0;
1112 gotsig = 0;
1113 1307
1114 for (signum = signalmax; signum--; ) 1308 for (i = EV_NSIG - 1; i--; )
1115 if (signals [signum].gotsig) 1309 if (expect_false (signals [i].pending))
1116 ev_feed_signal_event (EV_A_ signum + 1); 1310 ev_feed_signal_event (EV_A_ i + 1);
1117 } 1311 }
1118 1312
1119#if EV_ASYNC_ENABLE 1313#if EV_ASYNC_ENABLE
1120 if (gotasync) 1314 if (async_pending)
1121 { 1315 {
1122 int i; 1316 async_pending = 0;
1123 gotasync = 0;
1124 1317
1125 for (i = asynccnt; i--; ) 1318 for (i = asynccnt; i--; )
1126 if (asyncs [i]->sent) 1319 if (asyncs [i]->sent)
1127 { 1320 {
1128 asyncs [i]->sent = 0; 1321 asyncs [i]->sent = 0;
… …
1136 1329
1137static void 1330static void
1138ev_sighandler (int signum) 1331ev_sighandler (int signum)
1139{ 1332{
1140#if EV_MULTIPLICITY 1333#if EV_MULTIPLICITY
1141 struct ev_loop *loop = &default_loop_struct; 1334 EV_P = signals [signum - 1].loop;
1142#endif 1335#endif
1143 1336
1144#if _WIN32 1337#ifdef _WIN32
1145 signal (signum, ev_sighandler); 1338 signal (signum, ev_sighandler);
1146#endif 1339#endif
1147 1340
1148 signals [signum - 1].gotsig = 1; 1341 signals [signum - 1].pending = 1;
1149 evpipe_write (EV_A_ &gotsig); 1342 evpipe_write (EV_A_ &sig_pending);
1150} 1343}
1151 1344
1152void noinline 1345void noinline
1153ev_feed_signal_event (EV_P_ int signum) 1346ev_feed_signal_event (EV_P_ int signum)
1154{ 1347{
1155 WL w; 1348 WL w;
1156 1349
1350 if (expect_false (signum <= 0 || signum > EV_NSIG))
1351 return;
1352
1353 --signum;
1354
1157#if EV_MULTIPLICITY 1355#if EV_MULTIPLICITY
1158 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1356 /* it is permissible to try to feed a signal to the wrong loop */
1159#endif 1357 /* or, likely more useful, feeding a signal nobody is waiting for */
1160 1358
1161 --signum; 1359 if (expect_false (signals [signum].loop != EV_A))
1162
1163 if (signum < 0 || signum >= signalmax)
1164 return; 1360 return;
1361#endif
1165 1362
1166 signals [signum].gotsig = 0; 1363 signals [signum].pending = 0;
1167 1364
1168 for (w = signals [signum].head; w; w = w->next) 1365 for (w = signals [signum].head; w; w = w->next)
1169 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1366 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1170} 1367}
1171 1368
1369#if EV_USE_SIGNALFD
1370static void
1371sigfdcb (EV_P_ ev_io *iow, int revents)
1372{
1373 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1374
1375 for (;;)
1376 {
1377 ssize_t res = read (sigfd, si, sizeof (si));
1378
1379 /* not ISO-C, as res might be -1, but works with SuS */
1380 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1381 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1382
1383 if (res < (ssize_t)sizeof (si))
1384 break;
1385 }
1386}
1387#endif
1388
1389#endif
1390
1172/*****************************************************************************/ 1391/*****************************************************************************/
1173 1392
1393#if EV_CHILD_ENABLE
1174static WL childs [EV_PID_HASHSIZE]; 1394static WL childs [EV_PID_HASHSIZE];
1175
1176#ifndef _WIN32
1177 1395
1178static ev_signal childev; 1396static ev_signal childev;
1179 1397
1180#ifndef WIFCONTINUED 1398#ifndef WIFCONTINUED
1181# define WIFCONTINUED(status) 0 1399# define WIFCONTINUED(status) 0
1182#endif 1400#endif
1183 1401
1402/* handle a single child status event */
1184inline_speed void 1403inline_speed void
1185child_reap (EV_P_ int chain, int pid, int status) 1404child_reap (EV_P_ int chain, int pid, int status)
1186{ 1405{
1187 ev_child *w; 1406 ev_child *w;
1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1407 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1189 1408
1190 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1409 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1191 { 1410 {
1192 if ((w->pid == pid || !w->pid) 1411 if ((w->pid == pid || !w->pid)
1193 && (!traced || (w->flags & 1))) 1412 && (!traced || (w->flags & 1)))
1194 { 1413 {
1195 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1414 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1202 1421
1203#ifndef WCONTINUED 1422#ifndef WCONTINUED
1204# define WCONTINUED 0 1423# define WCONTINUED 0
1205#endif 1424#endif
1206 1425
1426/* called on sigchld etc., calls waitpid */
1207static void 1427static void
1208childcb (EV_P_ ev_signal *sw, int revents) 1428childcb (EV_P_ ev_signal *sw, int revents)
1209{ 1429{
1210 int pid, status; 1430 int pid, status;
1211 1431
… …
1219 /* make sure we are called again until all children have been reaped */ 1439 /* 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 */ 1440 /* 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); 1441 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1222 1442
1223 child_reap (EV_A_ pid, pid, status); 1443 child_reap (EV_A_ pid, pid, status);
1224 if (EV_PID_HASHSIZE > 1) 1444 if ((EV_PID_HASHSIZE) > 1)
1225 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1445 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1226} 1446}
1227 1447
1228#endif 1448#endif
1229 1449
… …
1296#ifdef __APPLE__ 1516#ifdef __APPLE__
1297 /* only select works correctly on that "unix-certified" platform */ 1517 /* only select works correctly on that "unix-certified" platform */
1298 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1518 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1299 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1519 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1300#endif 1520#endif
1521#ifdef __FreeBSD__
1522 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1523#endif
1301 1524
1302 return flags; 1525 return flags;
1303} 1526}
1304 1527
1305unsigned int 1528unsigned int
… …
1318ev_backend (EV_P) 1541ev_backend (EV_P)
1319{ 1542{
1320 return backend; 1543 return backend;
1321} 1544}
1322 1545
1546#if EV_FEATURE_API
1323unsigned int 1547unsigned int
1324ev_loop_count (EV_P) 1548ev_iteration (EV_P)
1325{ 1549{
1326 return loop_count; 1550 return loop_count;
1327} 1551}
1328 1552
1553unsigned int
1554ev_depth (EV_P)
1555{
1556 return loop_depth;
1557}
1558
1329void 1559void
1330ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1560ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1331{ 1561{
1332 io_blocktime = interval; 1562 io_blocktime = interval;
1333} 1563}
… …
1336ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1566ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1337{ 1567{
1338 timeout_blocktime = interval; 1568 timeout_blocktime = interval;
1339} 1569}
1340 1570
1571void
1572ev_set_userdata (EV_P_ void *data)
1573{
1574 userdata = data;
1575}
1576
1577void *
1578ev_userdata (EV_P)
1579{
1580 return userdata;
1581}
1582
1583void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1584{
1585 invoke_cb = invoke_pending_cb;
1586}
1587
1588void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1589{
1590 release_cb = release;
1591 acquire_cb = acquire;
1592}
1593#endif
1594
1595/* initialise a loop structure, must be zero-initialised */
1341static void noinline 1596static void noinline
1342loop_init (EV_P_ unsigned int flags) 1597loop_init (EV_P_ unsigned int flags)
1343{ 1598{
1344 if (!backend) 1599 if (!backend)
1345 { 1600 {
… …
1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1616 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1362 have_monotonic = 1; 1617 have_monotonic = 1;
1363 } 1618 }
1364#endif 1619#endif
1365 1620
1621 /* pid check not overridable via env */
1622#ifndef _WIN32
1623 if (flags & EVFLAG_FORKCHECK)
1624 curpid = getpid ();
1625#endif
1626
1627 if (!(flags & EVFLAG_NOENV)
1628 && !enable_secure ()
1629 && getenv ("LIBEV_FLAGS"))
1630 flags = atoi (getenv ("LIBEV_FLAGS"));
1631
1366 ev_rt_now = ev_time (); 1632 ev_rt_now = ev_time ();
1367 mn_now = get_clock (); 1633 mn_now = get_clock ();
1368 now_floor = mn_now; 1634 now_floor = mn_now;
1369 rtmn_diff = ev_rt_now - mn_now; 1635 rtmn_diff = ev_rt_now - mn_now;
1636#if EV_FEATURE_API
1637 invoke_cb = ev_invoke_pending;
1638#endif
1370 1639
1371 io_blocktime = 0.; 1640 io_blocktime = 0.;
1372 timeout_blocktime = 0.; 1641 timeout_blocktime = 0.;
1373 backend = 0; 1642 backend = 0;
1374 backend_fd = -1; 1643 backend_fd = -1;
1375 gotasync = 0; 1644 sig_pending = 0;
1645#if EV_ASYNC_ENABLE
1646 async_pending = 0;
1647#endif
1376#if EV_USE_INOTIFY 1648#if EV_USE_INOTIFY
1377 fs_fd = -2; 1649 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1378#endif 1650#endif
1379 1651#if EV_USE_SIGNALFD
1380 /* pid check not overridable via env */ 1652 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1381#ifndef _WIN32
1382 if (flags & EVFLAG_FORKCHECK)
1383 curpid = getpid ();
1384#endif 1653#endif
1385
1386 if (!(flags & EVFLAG_NOENV)
1387 && !enable_secure ()
1388 && getenv ("LIBEV_FLAGS"))
1389 flags = atoi (getenv ("LIBEV_FLAGS"));
1390 1654
1391 if (!(flags & 0x0000ffffU)) 1655 if (!(flags & 0x0000ffffU))
1392 flags |= ev_recommended_backends (); 1656 flags |= ev_recommended_backends ();
1393 1657
1394#if EV_USE_PORT 1658#if EV_USE_PORT
… …
1405#endif 1669#endif
1406#if EV_USE_SELECT 1670#if EV_USE_SELECT
1407 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1671 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1408#endif 1672#endif
1409 1673
1674 ev_prepare_init (&pending_w, pendingcb);
1675
1676#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1410 ev_init (&pipeev, pipecb); 1677 ev_init (&pipe_w, pipecb);
1411 ev_set_priority (&pipeev, EV_MAXPRI); 1678 ev_set_priority (&pipe_w, EV_MAXPRI);
1679#endif
1412 } 1680 }
1413} 1681}
1414 1682
1683/* free up a loop structure */
1415static void noinline 1684static void noinline
1416loop_destroy (EV_P) 1685loop_destroy (EV_P)
1417{ 1686{
1418 int i; 1687 int i;
1419 1688
1420 if (ev_is_active (&pipeev)) 1689 if (ev_is_active (&pipe_w))
1421 { 1690 {
1422 ev_ref (EV_A); /* signal watcher */ 1691 /*ev_ref (EV_A);*/
1423 ev_io_stop (EV_A_ &pipeev); 1692 /*ev_io_stop (EV_A_ &pipe_w);*/
1424 1693
1425#if EV_USE_EVENTFD 1694#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1695 if (evfd >= 0)
1427 close (evfd); 1696 close (evfd);
1428#endif 1697#endif
1429 1698
1430 if (evpipe [0] >= 0) 1699 if (evpipe [0] >= 0)
1431 { 1700 {
1432 close (evpipe [0]); 1701 EV_WIN32_CLOSE_FD (evpipe [0]);
1433 close (evpipe [1]); 1702 EV_WIN32_CLOSE_FD (evpipe [1]);
1434 } 1703 }
1435 } 1704 }
1705
1706#if EV_USE_SIGNALFD
1707 if (ev_is_active (&sigfd_w))
1708 close (sigfd);
1709#endif
1436 1710
1437#if EV_USE_INOTIFY 1711#if EV_USE_INOTIFY
1438 if (fs_fd >= 0) 1712 if (fs_fd >= 0)
1439 close (fs_fd); 1713 close (fs_fd);
1440#endif 1714#endif
… …
1464#if EV_IDLE_ENABLE 1738#if EV_IDLE_ENABLE
1465 array_free (idle, [i]); 1739 array_free (idle, [i]);
1466#endif 1740#endif
1467 } 1741 }
1468 1742
1469 ev_free (anfds); anfdmax = 0; 1743 ev_free (anfds); anfds = 0; anfdmax = 0;
1470 1744
1471 /* have to use the microsoft-never-gets-it-right macro */ 1745 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY); 1746 array_free (rfeed, EMPTY);
1473 array_free (fdchange, EMPTY); 1747 array_free (fdchange, EMPTY);
1474 array_free (timer, EMPTY); 1748 array_free (timer, EMPTY);
… …
1505#endif 1779#endif
1506#if EV_USE_INOTIFY 1780#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1781 infy_fork (EV_A);
1508#endif 1782#endif
1509 1783
1510 if (ev_is_active (&pipeev)) 1784 if (ev_is_active (&pipe_w))
1511 { 1785 {
1512 /* this "locks" the handlers against writing to the pipe */ 1786 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1787 /* while we modify the fd vars */
1514 gotsig = 1; 1788 sig_pending = 1;
1515#if EV_ASYNC_ENABLE 1789#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1790 async_pending = 1;
1517#endif 1791#endif
1518 1792
1519 ev_ref (EV_A); 1793 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1794 ev_io_stop (EV_A_ &pipe_w);
1521 1795
1522#if EV_USE_EVENTFD 1796#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1797 if (evfd >= 0)
1524 close (evfd); 1798 close (evfd);
1525#endif 1799#endif
1526 1800
1527 if (evpipe [0] >= 0) 1801 if (evpipe [0] >= 0)
1528 { 1802 {
1529 close (evpipe [0]); 1803 EV_WIN32_CLOSE_FD (evpipe [0]);
1530 close (evpipe [1]); 1804 EV_WIN32_CLOSE_FD (evpipe [1]);
1531 } 1805 }
1532 1806
1807#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1533 evpipe_init (EV_A); 1808 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1809 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1810 pipecb (EV_A_ &pipe_w, EV_READ);
1811#endif
1536 } 1812 }
1537 1813
1538 postfork = 0; 1814 postfork = 0;
1539} 1815}
1540 1816
1541#if EV_MULTIPLICITY 1817#if EV_MULTIPLICITY
1542 1818
1543struct ev_loop * 1819struct ev_loop *
1544ev_loop_new (unsigned int flags) 1820ev_loop_new (unsigned int flags)
1545{ 1821{
1546 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1822 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1547 1823
1548 memset (loop, 0, sizeof (struct ev_loop)); 1824 memset (EV_A, 0, sizeof (struct ev_loop));
1549
1550 loop_init (EV_A_ flags); 1825 loop_init (EV_A_ flags);
1551 1826
1552 if (ev_backend (EV_A)) 1827 if (ev_backend (EV_A))
1553 return loop; 1828 return EV_A;
1554 1829
1555 return 0; 1830 return 0;
1556} 1831}
1557 1832
1558void 1833void
… …
1565void 1840void
1566ev_loop_fork (EV_P) 1841ev_loop_fork (EV_P)
1567{ 1842{
1568 postfork = 1; /* must be in line with ev_default_fork */ 1843 postfork = 1; /* must be in line with ev_default_fork */
1569} 1844}
1845#endif /* multiplicity */
1570 1846
1571#if EV_VERIFY 1847#if EV_VERIFY
1572static void noinline 1848static void noinline
1573verify_watcher (EV_P_ W w) 1849verify_watcher (EV_P_ W w)
1574{ 1850{
… …
1602 verify_watcher (EV_A_ ws [cnt]); 1878 verify_watcher (EV_A_ ws [cnt]);
1603 } 1879 }
1604} 1880}
1605#endif 1881#endif
1606 1882
1883#if EV_FEATURE_API
1607void 1884void
1608ev_loop_verify (EV_P) 1885ev_verify (EV_P)
1609{ 1886{
1610#if EV_VERIFY 1887#if EV_VERIFY
1611 int i; 1888 int i;
1612 WL w; 1889 WL w;
1613 1890
… …
1652#if EV_ASYNC_ENABLE 1929#if EV_ASYNC_ENABLE
1653 assert (asyncmax >= asynccnt); 1930 assert (asyncmax >= asynccnt);
1654 array_verify (EV_A_ (W *)asyncs, asynccnt); 1931 array_verify (EV_A_ (W *)asyncs, asynccnt);
1655#endif 1932#endif
1656 1933
1934#if EV_PREPARE_ENABLE
1657 assert (preparemax >= preparecnt); 1935 assert (preparemax >= preparecnt);
1658 array_verify (EV_A_ (W *)prepares, preparecnt); 1936 array_verify (EV_A_ (W *)prepares, preparecnt);
1937#endif
1659 1938
1939#if EV_CHECK_ENABLE
1660 assert (checkmax >= checkcnt); 1940 assert (checkmax >= checkcnt);
1661 array_verify (EV_A_ (W *)checks, checkcnt); 1941 array_verify (EV_A_ (W *)checks, checkcnt);
1942#endif
1662 1943
1663# if 0 1944# if 0
1945#if EV_CHILD_ENABLE
1664 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1946 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) 1947 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1666# endif 1948#endif
1667#endif 1949# endif
1950#endif
1668} 1951}
1669 1952#endif
1670#endif /* multiplicity */
1671 1953
1672#if EV_MULTIPLICITY 1954#if EV_MULTIPLICITY
1673struct ev_loop * 1955struct ev_loop *
1674ev_default_loop_init (unsigned int flags) 1956ev_default_loop_init (unsigned int flags)
1675#else 1957#else
… …
1678#endif 1960#endif
1679{ 1961{
1680 if (!ev_default_loop_ptr) 1962 if (!ev_default_loop_ptr)
1681 { 1963 {
1682#if EV_MULTIPLICITY 1964#if EV_MULTIPLICITY
1683 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1965 EV_P = ev_default_loop_ptr = &default_loop_struct;
1684#else 1966#else
1685 ev_default_loop_ptr = 1; 1967 ev_default_loop_ptr = 1;
1686#endif 1968#endif
1687 1969
1688 loop_init (EV_A_ flags); 1970 loop_init (EV_A_ flags);
1689 1971
1690 if (ev_backend (EV_A)) 1972 if (ev_backend (EV_A))
1691 { 1973 {
1692#ifndef _WIN32 1974#if EV_CHILD_ENABLE
1693 ev_signal_init (&childev, childcb, SIGCHLD); 1975 ev_signal_init (&childev, childcb, SIGCHLD);
1694 ev_set_priority (&childev, EV_MAXPRI); 1976 ev_set_priority (&childev, EV_MAXPRI);
1695 ev_signal_start (EV_A_ &childev); 1977 ev_signal_start (EV_A_ &childev);
1696 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1978 ev_unref (EV_A); /* child watcher should not keep loop alive */
1697#endif 1979#endif
… …
1705 1987
1706void 1988void
1707ev_default_destroy (void) 1989ev_default_destroy (void)
1708{ 1990{
1709#if EV_MULTIPLICITY 1991#if EV_MULTIPLICITY
1710 struct ev_loop *loop = ev_default_loop_ptr; 1992 EV_P = ev_default_loop_ptr;
1711#endif 1993#endif
1712 1994
1713 ev_default_loop_ptr = 0; 1995 ev_default_loop_ptr = 0;
1714 1996
1715#ifndef _WIN32 1997#if EV_CHILD_ENABLE
1716 ev_ref (EV_A); /* child watcher */ 1998 ev_ref (EV_A); /* child watcher */
1717 ev_signal_stop (EV_A_ &childev); 1999 ev_signal_stop (EV_A_ &childev);
1718#endif 2000#endif
1719 2001
1720 loop_destroy (EV_A); 2002 loop_destroy (EV_A);
… …
1722 2004
1723void 2005void
1724ev_default_fork (void) 2006ev_default_fork (void)
1725{ 2007{
1726#if EV_MULTIPLICITY 2008#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr; 2009 EV_P = ev_default_loop_ptr;
1728#endif 2010#endif
1729 2011
1730 postfork = 1; /* must be in line with ev_loop_fork */ 2012 postfork = 1; /* must be in line with ev_loop_fork */
1731} 2013}
1732 2014
… …
1736ev_invoke (EV_P_ void *w, int revents) 2018ev_invoke (EV_P_ void *w, int revents)
1737{ 2019{
1738 EV_CB_INVOKE ((W)w, revents); 2020 EV_CB_INVOKE ((W)w, revents);
1739} 2021}
1740 2022
1741inline_speed void 2023unsigned int
1742call_pending (EV_P) 2024ev_pending_count (EV_P)
2025{
2026 int pri;
2027 unsigned int count = 0;
2028
2029 for (pri = NUMPRI; pri--; )
2030 count += pendingcnt [pri];
2031
2032 return count;
2033}
2034
2035void noinline
2036ev_invoke_pending (EV_P)
1743{ 2037{
1744 int pri; 2038 int pri;
1745 2039
1746 for (pri = NUMPRI; pri--; ) 2040 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 2041 while (pendingcnt [pri])
1748 { 2042 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2043 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 2044
1751 if (expect_true (p->w))
1752 {
1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 2045 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2046 /* ^ this is no longer true, as pending_w could be here */
1754 2047
1755 p->w->pending = 0; 2048 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 2049 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 2050 EV_FREQUENT_CHECK;
1758 }
1759 } 2051 }
1760} 2052}
1761 2053
1762#if EV_IDLE_ENABLE 2054#if EV_IDLE_ENABLE
2055/* make idle watchers pending. this handles the "call-idle */
2056/* only when higher priorities are idle" logic */
1763inline_size void 2057inline_size void
1764idle_reify (EV_P) 2058idle_reify (EV_P)
1765{ 2059{
1766 if (expect_false (idleall)) 2060 if (expect_false (idleall))
1767 { 2061 {
… …
1780 } 2074 }
1781 } 2075 }
1782} 2076}
1783#endif 2077#endif
1784 2078
2079/* make timers pending */
1785inline_size void 2080inline_size void
1786timers_reify (EV_P) 2081timers_reify (EV_P)
1787{ 2082{
1788 EV_FREQUENT_CHECK; 2083 EV_FREQUENT_CHECK;
1789 2084
… …
1813 EV_FREQUENT_CHECK; 2108 EV_FREQUENT_CHECK;
1814 feed_reverse (EV_A_ (W)w); 2109 feed_reverse (EV_A_ (W)w);
1815 } 2110 }
1816 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2111 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1817 2112
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 2113 feed_reverse_done (EV_A_ EV_TIMER);
1819 } 2114 }
1820} 2115}
1821 2116
1822#if EV_PERIODIC_ENABLE 2117#if EV_PERIODIC_ENABLE
2118/* make periodics pending */
1823inline_size void 2119inline_size void
1824periodics_reify (EV_P) 2120periodics_reify (EV_P)
1825{ 2121{
1826 EV_FREQUENT_CHECK; 2122 EV_FREQUENT_CHECK;
1827 2123
… …
1874 2170
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 2171 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 2172 }
1877} 2173}
1878 2174
2175/* simply recalculate all periodics */
2176/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1879static void noinline 2177static void noinline
1880periodics_reschedule (EV_P) 2178periodics_reschedule (EV_P)
1881{ 2179{
1882 int i; 2180 int i;
1883 2181
… …
1896 2194
1897 reheap (periodics, periodiccnt); 2195 reheap (periodics, periodiccnt);
1898} 2196}
1899#endif 2197#endif
1900 2198
2199/* adjust all timers by a given offset */
2200static void noinline
2201timers_reschedule (EV_P_ ev_tstamp adjust)
2202{
2203 int i;
2204
2205 for (i = 0; i < timercnt; ++i)
2206 {
2207 ANHE *he = timers + i + HEAP0;
2208 ANHE_w (*he)->at += adjust;
2209 ANHE_at_cache (*he);
2210 }
2211}
2212
2213/* fetch new monotonic and realtime times from the kernel */
2214/* also detect if there was a timejump, and act accordingly */
1901inline_speed void 2215inline_speed void
1902time_update (EV_P_ ev_tstamp max_block) 2216time_update (EV_P_ ev_tstamp max_block)
1903{ 2217{
1904 int i;
1905
1906#if EV_USE_MONOTONIC 2218#if EV_USE_MONOTONIC
1907 if (expect_true (have_monotonic)) 2219 if (expect_true (have_monotonic))
1908 { 2220 {
2221 int i;
1909 ev_tstamp odiff = rtmn_diff; 2222 ev_tstamp odiff = rtmn_diff;
1910 2223
1911 mn_now = get_clock (); 2224 mn_now = get_clock ();
1912 2225
1913 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2226 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1939 ev_rt_now = ev_time (); 2252 ev_rt_now = ev_time ();
1940 mn_now = get_clock (); 2253 mn_now = get_clock ();
1941 now_floor = mn_now; 2254 now_floor = mn_now;
1942 } 2255 }
1943 2256
2257 /* no timer adjustment, as the monotonic clock doesn't jump */
2258 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1944# if EV_PERIODIC_ENABLE 2259# if EV_PERIODIC_ENABLE
1945 periodics_reschedule (EV_A); 2260 periodics_reschedule (EV_A);
1946# endif 2261# endif
1947 /* no timer adjustment, as the monotonic clock doesn't jump */
1948 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1949 } 2262 }
1950 else 2263 else
1951#endif 2264#endif
1952 { 2265 {
1953 ev_rt_now = ev_time (); 2266 ev_rt_now = ev_time ();
1954 2267
1955 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2268 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1956 { 2269 {
2270 /* adjust timers. this is easy, as the offset is the same for all of them */
2271 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1957#if EV_PERIODIC_ENABLE 2272#if EV_PERIODIC_ENABLE
1958 periodics_reschedule (EV_A); 2273 periodics_reschedule (EV_A);
1959#endif 2274#endif
1960 /* adjust timers. this is easy, as the offset is the same for all of them */
1961 for (i = 0; i < timercnt; ++i)
1962 {
1963 ANHE *he = timers + i + HEAP0;
1964 ANHE_w (*he)->at += ev_rt_now - mn_now;
1965 ANHE_at_cache (*he);
1966 }
1967 } 2275 }
1968 2276
1969 mn_now = ev_rt_now; 2277 mn_now = ev_rt_now;
1970 } 2278 }
1971} 2279}
1972 2280
1973void 2281void
1974ev_ref (EV_P)
1975{
1976 ++activecnt;
1977}
1978
1979void
1980ev_unref (EV_P)
1981{
1982 --activecnt;
1983}
1984
1985void
1986ev_now_update (EV_P)
1987{
1988 time_update (EV_A_ 1e100);
1989}
1990
1991static int loop_done;
1992
1993void
1994ev_loop (EV_P_ int flags) 2282ev_loop (EV_P_ int flags)
1995{ 2283{
2284#if EV_FEATURE_API
2285 ++loop_depth;
2286#endif
2287
2288 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2289
1996 loop_done = EVUNLOOP_CANCEL; 2290 loop_done = EVUNLOOP_CANCEL;
1997 2291
1998 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2292 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1999 2293
2000 do 2294 do
2001 { 2295 {
2002#if EV_VERIFY >= 2 2296#if EV_VERIFY >= 2
2003 ev_loop_verify (EV_A); 2297 ev_verify (EV_A);
2004#endif 2298#endif
2005 2299
2006#ifndef _WIN32 2300#ifndef _WIN32
2007 if (expect_false (curpid)) /* penalise the forking check even more */ 2301 if (expect_false (curpid)) /* penalise the forking check even more */
2008 if (expect_false (getpid () != curpid)) 2302 if (expect_false (getpid () != curpid))
… …
2016 /* we might have forked, so queue fork handlers */ 2310 /* we might have forked, so queue fork handlers */
2017 if (expect_false (postfork)) 2311 if (expect_false (postfork))
2018 if (forkcnt) 2312 if (forkcnt)
2019 { 2313 {
2020 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2314 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2021 call_pending (EV_A); 2315 EV_INVOKE_PENDING;
2022 } 2316 }
2023#endif 2317#endif
2024 2318
2319#if EV_PREPARE_ENABLE
2025 /* queue prepare watchers (and execute them) */ 2320 /* queue prepare watchers (and execute them) */
2026 if (expect_false (preparecnt)) 2321 if (expect_false (preparecnt))
2027 { 2322 {
2028 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2323 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2029 call_pending (EV_A); 2324 EV_INVOKE_PENDING;
2030 } 2325 }
2326#endif
2327
2328 if (expect_false (loop_done))
2329 break;
2031 2330
2032 /* we might have forked, so reify kernel state if necessary */ 2331 /* we might have forked, so reify kernel state if necessary */
2033 if (expect_false (postfork)) 2332 if (expect_false (postfork))
2034 loop_fork (EV_A); 2333 loop_fork (EV_A);
2035 2334
… …
2041 ev_tstamp waittime = 0.; 2340 ev_tstamp waittime = 0.;
2042 ev_tstamp sleeptime = 0.; 2341 ev_tstamp sleeptime = 0.;
2043 2342
2044 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2343 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2045 { 2344 {
2345 /* remember old timestamp for io_blocktime calculation */
2346 ev_tstamp prev_mn_now = mn_now;
2347
2046 /* update time to cancel out callback processing overhead */ 2348 /* update time to cancel out callback processing overhead */
2047 time_update (EV_A_ 1e100); 2349 time_update (EV_A_ 1e100);
2350
2351 waittime = MAX_BLOCKTIME;
2048 2352
2049 if (timercnt) 2353 if (timercnt)
2050 { 2354 {
2051 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2355 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2052 if (waittime > to) waittime = to; 2356 if (waittime > to) waittime = to;
… …
2058 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2362 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2059 if (waittime > to) waittime = to; 2363 if (waittime > to) waittime = to;
2060 } 2364 }
2061#endif 2365#endif
2062 2366
2367 /* don't let timeouts decrease the waittime below timeout_blocktime */
2063 if (expect_false (waittime < timeout_blocktime)) 2368 if (expect_false (waittime < timeout_blocktime))
2064 waittime = timeout_blocktime; 2369 waittime = timeout_blocktime;
2065 2370
2066 sleeptime = waittime - backend_fudge; 2371 /* extra check because io_blocktime is commonly 0 */
2067
2068 if (expect_true (sleeptime > io_blocktime)) 2372 if (expect_false (io_blocktime))
2069 sleeptime = io_blocktime;
2070
2071 if (sleeptime)
2072 { 2373 {
2374 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2375
2376 if (sleeptime > waittime - backend_fudge)
2377 sleeptime = waittime - backend_fudge;
2378
2379 if (expect_true (sleeptime > 0.))
2380 {
2073 ev_sleep (sleeptime); 2381 ev_sleep (sleeptime);
2074 waittime -= sleeptime; 2382 waittime -= sleeptime;
2383 }
2075 } 2384 }
2076 } 2385 }
2077 2386
2387#if EV_FEATURE_API
2078 ++loop_count; 2388 ++loop_count;
2389#endif
2390 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2079 backend_poll (EV_A_ waittime); 2391 backend_poll (EV_A_ waittime);
2392 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2080 2393
2081 /* update ev_rt_now, do magic */ 2394 /* update ev_rt_now, do magic */
2082 time_update (EV_A_ waittime + sleeptime); 2395 time_update (EV_A_ waittime + sleeptime);
2083 } 2396 }
2084 2397
… …
2091#if EV_IDLE_ENABLE 2404#if EV_IDLE_ENABLE
2092 /* queue idle watchers unless other events are pending */ 2405 /* queue idle watchers unless other events are pending */
2093 idle_reify (EV_A); 2406 idle_reify (EV_A);
2094#endif 2407#endif
2095 2408
2409#if EV_CHECK_ENABLE
2096 /* queue check watchers, to be executed first */ 2410 /* queue check watchers, to be executed first */
2097 if (expect_false (checkcnt)) 2411 if (expect_false (checkcnt))
2098 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2412 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2413#endif
2099 2414
2100 call_pending (EV_A); 2415 EV_INVOKE_PENDING;
2101 } 2416 }
2102 while (expect_true ( 2417 while (expect_true (
2103 activecnt 2418 activecnt
2104 && !loop_done 2419 && !loop_done
2105 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2420 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2106 )); 2421 ));
2107 2422
2108 if (loop_done == EVUNLOOP_ONE) 2423 if (loop_done == EVUNLOOP_ONE)
2109 loop_done = EVUNLOOP_CANCEL; 2424 loop_done = EVUNLOOP_CANCEL;
2425
2426#if EV_FEATURE_API
2427 --loop_depth;
2428#endif
2110} 2429}
2111 2430
2112void 2431void
2113ev_unloop (EV_P_ int how) 2432ev_unloop (EV_P_ int how)
2114{ 2433{
2115 loop_done = how; 2434 loop_done = how;
2116} 2435}
2117 2436
2437void
2438ev_ref (EV_P)
2439{
2440 ++activecnt;
2441}
2442
2443void
2444ev_unref (EV_P)
2445{
2446 --activecnt;
2447}
2448
2449void
2450ev_now_update (EV_P)
2451{
2452 time_update (EV_A_ 1e100);
2453}
2454
2455void
2456ev_suspend (EV_P)
2457{
2458 ev_now_update (EV_A);
2459}
2460
2461void
2462ev_resume (EV_P)
2463{
2464 ev_tstamp mn_prev = mn_now;
2465
2466 ev_now_update (EV_A);
2467 timers_reschedule (EV_A_ mn_now - mn_prev);
2468#if EV_PERIODIC_ENABLE
2469 /* TODO: really do this? */
2470 periodics_reschedule (EV_A);
2471#endif
2472}
2473
2118/*****************************************************************************/ 2474/*****************************************************************************/
2475/* singly-linked list management, used when the expected list length is short */
2119 2476
2120inline_size void 2477inline_size void
2121wlist_add (WL *head, WL elem) 2478wlist_add (WL *head, WL elem)
2122{ 2479{
2123 elem->next = *head; 2480 elem->next = *head;
… …
2127inline_size void 2484inline_size void
2128wlist_del (WL *head, WL elem) 2485wlist_del (WL *head, WL elem)
2129{ 2486{
2130 while (*head) 2487 while (*head)
2131 { 2488 {
2132 if (*head == elem) 2489 if (expect_true (*head == elem))
2133 { 2490 {
2134 *head = elem->next; 2491 *head = elem->next;
2135 return; 2492 break;
2136 } 2493 }
2137 2494
2138 head = &(*head)->next; 2495 head = &(*head)->next;
2139 } 2496 }
2140} 2497}
2141 2498
2499/* internal, faster, version of ev_clear_pending */
2142inline_speed void 2500inline_speed void
2143clear_pending (EV_P_ W w) 2501clear_pending (EV_P_ W w)
2144{ 2502{
2145 if (w->pending) 2503 if (w->pending)
2146 { 2504 {
2147 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2505 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2148 w->pending = 0; 2506 w->pending = 0;
2149 } 2507 }
2150} 2508}
2151 2509
2152int 2510int
… …
2156 int pending = w_->pending; 2514 int pending = w_->pending;
2157 2515
2158 if (expect_true (pending)) 2516 if (expect_true (pending))
2159 { 2517 {
2160 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2518 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2519 p->w = (W)&pending_w;
2161 w_->pending = 0; 2520 w_->pending = 0;
2162 p->w = 0;
2163 return p->events; 2521 return p->events;
2164 } 2522 }
2165 else 2523 else
2166 return 0; 2524 return 0;
2167} 2525}
2168 2526
2169inline_size void 2527inline_size void
2170pri_adjust (EV_P_ W w) 2528pri_adjust (EV_P_ W w)
2171{ 2529{
2172 int pri = w->priority; 2530 int pri = ev_priority (w);
2173 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2531 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2174 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2532 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2175 w->priority = pri; 2533 ev_set_priority (w, pri);
2176} 2534}
2177 2535
2178inline_speed void 2536inline_speed void
2179ev_start (EV_P_ W w, int active) 2537ev_start (EV_P_ W w, int active)
2180{ 2538{
… …
2199 2557
2200 if (expect_false (ev_is_active (w))) 2558 if (expect_false (ev_is_active (w)))
2201 return; 2559 return;
2202 2560
2203 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2561 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2204 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2562 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2205 2563
2206 EV_FREQUENT_CHECK; 2564 EV_FREQUENT_CHECK;
2207 2565
2208 ev_start (EV_A_ (W)w, 1); 2566 ev_start (EV_A_ (W)w, 1);
2209 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2567 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2210 wlist_add (&anfds[fd].head, (WL)w); 2568 wlist_add (&anfds[fd].head, (WL)w);
2211 2569
2212 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2570 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2213 w->events &= ~EV__IOFDSET; 2571 w->events &= ~EV__IOFDSET;
2214 2572
2215 EV_FREQUENT_CHECK; 2573 EV_FREQUENT_CHECK;
2216} 2574}
2217 2575
… …
2279 timers [active] = timers [timercnt + HEAP0]; 2637 timers [active] = timers [timercnt + HEAP0];
2280 adjustheap (timers, timercnt, active); 2638 adjustheap (timers, timercnt, active);
2281 } 2639 }
2282 } 2640 }
2283 2641
2284 EV_FREQUENT_CHECK;
2285
2286 ev_at (w) -= mn_now; 2642 ev_at (w) -= mn_now;
2287 2643
2288 ev_stop (EV_A_ (W)w); 2644 ev_stop (EV_A_ (W)w);
2645
2646 EV_FREQUENT_CHECK;
2289} 2647}
2290 2648
2291void noinline 2649void noinline
2292ev_timer_again (EV_P_ ev_timer *w) 2650ev_timer_again (EV_P_ ev_timer *w)
2293{ 2651{
… …
2311 } 2669 }
2312 2670
2313 EV_FREQUENT_CHECK; 2671 EV_FREQUENT_CHECK;
2314} 2672}
2315 2673
2674ev_tstamp
2675ev_timer_remaining (EV_P_ ev_timer *w)
2676{
2677 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2678}
2679
2316#if EV_PERIODIC_ENABLE 2680#if EV_PERIODIC_ENABLE
2317void noinline 2681void noinline
2318ev_periodic_start (EV_P_ ev_periodic *w) 2682ev_periodic_start (EV_P_ ev_periodic *w)
2319{ 2683{
2320 if (expect_false (ev_is_active (w))) 2684 if (expect_false (ev_is_active (w)))
… …
2366 periodics [active] = periodics [periodiccnt + HEAP0]; 2730 periodics [active] = periodics [periodiccnt + HEAP0];
2367 adjustheap (periodics, periodiccnt, active); 2731 adjustheap (periodics, periodiccnt, active);
2368 } 2732 }
2369 } 2733 }
2370 2734
2371 EV_FREQUENT_CHECK;
2372
2373 ev_stop (EV_A_ (W)w); 2735 ev_stop (EV_A_ (W)w);
2736
2737 EV_FREQUENT_CHECK;
2374} 2738}
2375 2739
2376void noinline 2740void noinline
2377ev_periodic_again (EV_P_ ev_periodic *w) 2741ev_periodic_again (EV_P_ ev_periodic *w)
2378{ 2742{
… …
2384 2748
2385#ifndef SA_RESTART 2749#ifndef SA_RESTART
2386# define SA_RESTART 0 2750# define SA_RESTART 0
2387#endif 2751#endif
2388 2752
2753#if EV_SIGNAL_ENABLE
2754
2389void noinline 2755void noinline
2390ev_signal_start (EV_P_ ev_signal *w) 2756ev_signal_start (EV_P_ ev_signal *w)
2391{ 2757{
2392#if EV_MULTIPLICITY
2393 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2394#endif
2395 if (expect_false (ev_is_active (w))) 2758 if (expect_false (ev_is_active (w)))
2396 return; 2759 return;
2397 2760
2398 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2761 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2399 2762
2400 evpipe_init (EV_A); 2763#if EV_MULTIPLICITY
2764 assert (("libev: a signal must not be attached to two different loops",
2765 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2401 2766
2402 EV_FREQUENT_CHECK; 2767 signals [w->signum - 1].loop = EV_A;
2768#endif
2403 2769
2770 EV_FREQUENT_CHECK;
2771
2772#if EV_USE_SIGNALFD
2773 if (sigfd == -2)
2404 { 2774 {
2405#ifndef _WIN32 2775 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2406 sigset_t full, prev; 2776 if (sigfd < 0 && errno == EINVAL)
2407 sigfillset (&full); 2777 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2408 sigprocmask (SIG_SETMASK, &full, &prev);
2409#endif
2410 2778
2411 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2779 if (sigfd >= 0)
2780 {
2781 fd_intern (sigfd); /* doing it twice will not hurt */
2412 2782
2413#ifndef _WIN32 2783 sigemptyset (&sigfd_set);
2414 sigprocmask (SIG_SETMASK, &prev, 0); 2784
2415#endif 2785 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2786 ev_set_priority (&sigfd_w, EV_MAXPRI);
2787 ev_io_start (EV_A_ &sigfd_w);
2788 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2789 }
2416 } 2790 }
2791
2792 if (sigfd >= 0)
2793 {
2794 /* TODO: check .head */
2795 sigaddset (&sigfd_set, w->signum);
2796 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2797
2798 signalfd (sigfd, &sigfd_set, 0);
2799 }
2800#endif
2417 2801
2418 ev_start (EV_A_ (W)w, 1); 2802 ev_start (EV_A_ (W)w, 1);
2419 wlist_add (&signals [w->signum - 1].head, (WL)w); 2803 wlist_add (&signals [w->signum - 1].head, (WL)w);
2420 2804
2421 if (!((WL)w)->next) 2805 if (!((WL)w)->next)
2806# if EV_USE_SIGNALFD
2807 if (sigfd < 0) /*TODO*/
2808# endif
2422 { 2809 {
2423#if _WIN32 2810# ifdef _WIN32
2811 evpipe_init (EV_A);
2812
2424 signal (w->signum, ev_sighandler); 2813 signal (w->signum, ev_sighandler);
2425#else 2814# else
2426 struct sigaction sa; 2815 struct sigaction sa;
2816
2817 evpipe_init (EV_A);
2818
2427 sa.sa_handler = ev_sighandler; 2819 sa.sa_handler = ev_sighandler;
2428 sigfillset (&sa.sa_mask); 2820 sigfillset (&sa.sa_mask);
2429 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2821 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2430 sigaction (w->signum, &sa, 0); 2822 sigaction (w->signum, &sa, 0);
2823
2824 sigemptyset (&sa.sa_mask);
2825 sigaddset (&sa.sa_mask, w->signum);
2826 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2431#endif 2827#endif
2432 } 2828 }
2433 2829
2434 EV_FREQUENT_CHECK; 2830 EV_FREQUENT_CHECK;
2435} 2831}
2436 2832
2437void noinline 2833void noinline
… …
2445 2841
2446 wlist_del (&signals [w->signum - 1].head, (WL)w); 2842 wlist_del (&signals [w->signum - 1].head, (WL)w);
2447 ev_stop (EV_A_ (W)w); 2843 ev_stop (EV_A_ (W)w);
2448 2844
2449 if (!signals [w->signum - 1].head) 2845 if (!signals [w->signum - 1].head)
2846 {
2847#if EV_MULTIPLICITY
2848 signals [w->signum - 1].loop = 0; /* unattach from signal */
2849#endif
2850#if EV_USE_SIGNALFD
2851 if (sigfd >= 0)
2852 {
2853 sigset_t ss;
2854
2855 sigemptyset (&ss);
2856 sigaddset (&ss, w->signum);
2857 sigdelset (&sigfd_set, w->signum);
2858
2859 signalfd (sigfd, &sigfd_set, 0);
2860 sigprocmask (SIG_UNBLOCK, &ss, 0);
2861 }
2862 else
2863#endif
2450 signal (w->signum, SIG_DFL); 2864 signal (w->signum, SIG_DFL);
2865 }
2451 2866
2452 EV_FREQUENT_CHECK; 2867 EV_FREQUENT_CHECK;
2453} 2868}
2869
2870#endif
2871
2872#if EV_CHILD_ENABLE
2454 2873
2455void 2874void
2456ev_child_start (EV_P_ ev_child *w) 2875ev_child_start (EV_P_ ev_child *w)
2457{ 2876{
2458#if EV_MULTIPLICITY 2877#if EV_MULTIPLICITY
… …
2462 return; 2881 return;
2463 2882
2464 EV_FREQUENT_CHECK; 2883 EV_FREQUENT_CHECK;
2465 2884
2466 ev_start (EV_A_ (W)w, 1); 2885 ev_start (EV_A_ (W)w, 1);
2467 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2886 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2468 2887
2469 EV_FREQUENT_CHECK; 2888 EV_FREQUENT_CHECK;
2470} 2889}
2471 2890
2472void 2891void
… …
2476 if (expect_false (!ev_is_active (w))) 2895 if (expect_false (!ev_is_active (w)))
2477 return; 2896 return;
2478 2897
2479 EV_FREQUENT_CHECK; 2898 EV_FREQUENT_CHECK;
2480 2899
2481 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2900 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2482 ev_stop (EV_A_ (W)w); 2901 ev_stop (EV_A_ (W)w);
2483 2902
2484 EV_FREQUENT_CHECK; 2903 EV_FREQUENT_CHECK;
2485} 2904}
2905
2906#endif
2486 2907
2487#if EV_STAT_ENABLE 2908#if EV_STAT_ENABLE
2488 2909
2489# ifdef _WIN32 2910# ifdef _WIN32
2490# undef lstat 2911# undef lstat
… …
2496#define MIN_STAT_INTERVAL 0.1074891 2917#define MIN_STAT_INTERVAL 0.1074891
2497 2918
2498static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2919static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2499 2920
2500#if EV_USE_INOTIFY 2921#if EV_USE_INOTIFY
2501# define EV_INOTIFY_BUFSIZE 8192 2922
2923/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2924# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2502 2925
2503static void noinline 2926static void noinline
2504infy_add (EV_P_ ev_stat *w) 2927infy_add (EV_P_ ev_stat *w)
2505{ 2928{
2506 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); 2929 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);
2507 2930
2508 if (w->wd < 0) 2931 if (w->wd >= 0)
2932 {
2933 struct statfs sfs;
2934
2935 /* now local changes will be tracked by inotify, but remote changes won't */
2936 /* unless the filesystem is known to be local, we therefore still poll */
2937 /* also do poll on <2.6.25, but with normal frequency */
2938
2939 if (!fs_2625)
2940 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2941 else if (!statfs (w->path, &sfs)
2942 && (sfs.f_type == 0x1373 /* devfs */
2943 || sfs.f_type == 0xEF53 /* ext2/3 */
2944 || sfs.f_type == 0x3153464a /* jfs */
2945 || sfs.f_type == 0x52654973 /* reiser3 */
2946 || sfs.f_type == 0x01021994 /* tempfs */
2947 || sfs.f_type == 0x58465342 /* xfs */))
2948 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2949 else
2950 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2509 { 2951 }
2952 else
2953 {
2954 /* can't use inotify, continue to stat */
2510 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2955 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2511 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2512 2956
2513 /* monitor some parent directory for speedup hints */ 2957 /* if path is not there, monitor some parent directory for speedup hints */
2514 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2958 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2515 /* but an efficiency issue only */ 2959 /* but an efficiency issue only */
2516 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2960 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2517 { 2961 {
2518 char path [4096]; 2962 char path [4096];
… …
2534 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2978 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2535 } 2979 }
2536 } 2980 }
2537 2981
2538 if (w->wd >= 0) 2982 if (w->wd >= 0)
2539 {
2540 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2983 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2541 2984
2542 /* now local changes will be tracked by inotify, but remote changes won't */ 2985 /* now re-arm timer, if required */
2543 /* unless the filesystem it known to be local, we therefore still poll */ 2986 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2544 /* also do poll on <2.6.25, but with normal frequency */
2545 struct statfs sfs;
2546
2547 if (fs_2625 && !statfs (w->path, &sfs))
2548 if (sfs.f_type == 0x1373 /* devfs */
2549 || sfs.f_type == 0xEF53 /* ext2/3 */
2550 || sfs.f_type == 0x3153464a /* jfs */
2551 || sfs.f_type == 0x52654973 /* reiser3 */
2552 || sfs.f_type == 0x01021994 /* tempfs */
2553 || sfs.f_type == 0x58465342 /* xfs */)
2554 return;
2555
2556 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2557 ev_timer_again (EV_A_ &w->timer); 2987 ev_timer_again (EV_A_ &w->timer);
2558 } 2988 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2559} 2989}
2560 2990
2561static void noinline 2991static void noinline
2562infy_del (EV_P_ ev_stat *w) 2992infy_del (EV_P_ ev_stat *w)
2563{ 2993{
… …
2566 2996
2567 if (wd < 0) 2997 if (wd < 0)
2568 return; 2998 return;
2569 2999
2570 w->wd = -2; 3000 w->wd = -2;
2571 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3001 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2572 wlist_del (&fs_hash [slot].head, (WL)w); 3002 wlist_del (&fs_hash [slot].head, (WL)w);
2573 3003
2574 /* remove this watcher, if others are watching it, they will rearm */ 3004 /* remove this watcher, if others are watching it, they will rearm */
2575 inotify_rm_watch (fs_fd, wd); 3005 inotify_rm_watch (fs_fd, wd);
2576} 3006}
… …
2578static void noinline 3008static void noinline
2579infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3009infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2580{ 3010{
2581 if (slot < 0) 3011 if (slot < 0)
2582 /* overflow, need to check for all hash slots */ 3012 /* overflow, need to check for all hash slots */
2583 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3013 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2584 infy_wd (EV_A_ slot, wd, ev); 3014 infy_wd (EV_A_ slot, wd, ev);
2585 else 3015 else
2586 { 3016 {
2587 WL w_; 3017 WL w_;
2588 3018
2589 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3019 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2590 { 3020 {
2591 ev_stat *w = (ev_stat *)w_; 3021 ev_stat *w = (ev_stat *)w_;
2592 w_ = w_->next; /* lets us remove this watcher and all before it */ 3022 w_ = w_->next; /* lets us remove this watcher and all before it */
2593 3023
2594 if (w->wd == wd || wd == -1) 3024 if (w->wd == wd || wd == -1)
2595 { 3025 {
2596 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3026 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2597 { 3027 {
2598 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3028 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2599 w->wd = -1; 3029 w->wd = -1;
2600 infy_add (EV_A_ w); /* re-add, no matter what */ 3030 infy_add (EV_A_ w); /* re-add, no matter what */
2601 } 3031 }
2602 3032
2603 stat_timer_cb (EV_A_ &w->timer, 0); 3033 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2608 3038
2609static void 3039static void
2610infy_cb (EV_P_ ev_io *w, int revents) 3040infy_cb (EV_P_ ev_io *w, int revents)
2611{ 3041{
2612 char buf [EV_INOTIFY_BUFSIZE]; 3042 char buf [EV_INOTIFY_BUFSIZE];
2613 struct inotify_event *ev = (struct inotify_event *)buf;
2614 int ofs; 3043 int ofs;
2615 int len = read (fs_fd, buf, sizeof (buf)); 3044 int len = read (fs_fd, buf, sizeof (buf));
2616 3045
2617 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3046 for (ofs = 0; ofs < len; )
3047 {
3048 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2618 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3049 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3050 ofs += sizeof (struct inotify_event) + ev->len;
3051 }
3052}
3053
3054inline_size unsigned int
3055ev_linux_version (void)
3056{
3057 struct utsname buf;
3058 unsigned int v;
3059 int i;
3060 char *p = buf.release;
3061
3062 if (uname (&buf))
3063 return 0;
3064
3065 for (i = 3+1; --i; )
3066 {
3067 unsigned int c = 0;
3068
3069 for (;;)
3070 {
3071 if (*p >= '0' && *p <= '9')
3072 c = c * 10 + *p++ - '0';
3073 else
3074 {
3075 p += *p == '.';
3076 break;
3077 }
3078 }
3079
3080 v = (v << 8) | c;
3081 }
3082
3083 return v;
2619} 3084}
2620 3085
2621inline_size void 3086inline_size void
2622check_2625 (EV_P) 3087ev_check_2625 (EV_P)
2623{ 3088{
2624 /* kernels < 2.6.25 are borked 3089 /* kernels < 2.6.25 are borked
2625 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3090 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2626 */ 3091 */
2627 struct utsname buf; 3092 if (ev_linux_version () < 0x020619)
2628 int major, minor, micro;
2629
2630 if (uname (&buf))
2631 return; 3093 return;
2632 3094
2633 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2634 return;
2635
2636 if (major < 2
2637 || (major == 2 && minor < 6)
2638 || (major == 2 && minor == 6 && micro < 25))
2639 return;
2640
2641 fs_2625 = 1; 3095 fs_2625 = 1;
3096}
3097
3098inline_size int
3099infy_newfd (void)
3100{
3101#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3102 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3103 if (fd >= 0)
3104 return fd;
3105#endif
3106 return inotify_init ();
2642} 3107}
2643 3108
2644inline_size void 3109inline_size void
2645infy_init (EV_P) 3110infy_init (EV_P)
2646{ 3111{
2647 if (fs_fd != -2) 3112 if (fs_fd != -2)
2648 return; 3113 return;
2649 3114
2650 fs_fd = -1; 3115 fs_fd = -1;
2651 3116
2652 check_2625 (EV_A); 3117 ev_check_2625 (EV_A);
2653 3118
2654 fs_fd = inotify_init (); 3119 fs_fd = infy_newfd ();
2655 3120
2656 if (fs_fd >= 0) 3121 if (fs_fd >= 0)
2657 { 3122 {
3123 fd_intern (fs_fd);
2658 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3124 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2659 ev_set_priority (&fs_w, EV_MAXPRI); 3125 ev_set_priority (&fs_w, EV_MAXPRI);
2660 ev_io_start (EV_A_ &fs_w); 3126 ev_io_start (EV_A_ &fs_w);
3127 ev_unref (EV_A);
2661 } 3128 }
2662} 3129}
2663 3130
2664inline_size void 3131inline_size void
2665infy_fork (EV_P) 3132infy_fork (EV_P)
… …
2667 int slot; 3134 int slot;
2668 3135
2669 if (fs_fd < 0) 3136 if (fs_fd < 0)
2670 return; 3137 return;
2671 3138
3139 ev_ref (EV_A);
3140 ev_io_stop (EV_A_ &fs_w);
2672 close (fs_fd); 3141 close (fs_fd);
2673 fs_fd = inotify_init (); 3142 fs_fd = infy_newfd ();
2674 3143
3144 if (fs_fd >= 0)
3145 {
3146 fd_intern (fs_fd);
3147 ev_io_set (&fs_w, fs_fd, EV_READ);
3148 ev_io_start (EV_A_ &fs_w);
3149 ev_unref (EV_A);
3150 }
3151
2675 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3152 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2676 { 3153 {
2677 WL w_ = fs_hash [slot].head; 3154 WL w_ = fs_hash [slot].head;
2678 fs_hash [slot].head = 0; 3155 fs_hash [slot].head = 0;
2679 3156
2680 while (w_) 3157 while (w_)
… …
2685 w->wd = -1; 3162 w->wd = -1;
2686 3163
2687 if (fs_fd >= 0) 3164 if (fs_fd >= 0)
2688 infy_add (EV_A_ w); /* re-add, no matter what */ 3165 infy_add (EV_A_ w); /* re-add, no matter what */
2689 else 3166 else
3167 {
3168 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3169 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2690 ev_timer_again (EV_A_ &w->timer); 3170 ev_timer_again (EV_A_ &w->timer);
3171 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3172 }
2691 } 3173 }
2692 } 3174 }
2693} 3175}
2694 3176
2695#endif 3177#endif
… …
2712static void noinline 3194static void noinline
2713stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3195stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2714{ 3196{
2715 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3197 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2716 3198
2717 /* we copy this here each the time so that */ 3199 ev_statdata prev = w->attr;
2718 /* prev has the old value when the callback gets invoked */
2719 w->prev = w->attr;
2720 ev_stat_stat (EV_A_ w); 3200 ev_stat_stat (EV_A_ w);
2721 3201
2722 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3202 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2723 if ( 3203 if (
2724 w->prev.st_dev != w->attr.st_dev 3204 prev.st_dev != w->attr.st_dev
2725 || w->prev.st_ino != w->attr.st_ino 3205 || prev.st_ino != w->attr.st_ino
2726 || w->prev.st_mode != w->attr.st_mode 3206 || prev.st_mode != w->attr.st_mode
2727 || w->prev.st_nlink != w->attr.st_nlink 3207 || prev.st_nlink != w->attr.st_nlink
2728 || w->prev.st_uid != w->attr.st_uid 3208 || prev.st_uid != w->attr.st_uid
2729 || w->prev.st_gid != w->attr.st_gid 3209 || prev.st_gid != w->attr.st_gid
2730 || w->prev.st_rdev != w->attr.st_rdev 3210 || prev.st_rdev != w->attr.st_rdev
2731 || w->prev.st_size != w->attr.st_size 3211 || prev.st_size != w->attr.st_size
2732 || w->prev.st_atime != w->attr.st_atime 3212 || prev.st_atime != w->attr.st_atime
2733 || w->prev.st_mtime != w->attr.st_mtime 3213 || prev.st_mtime != w->attr.st_mtime
2734 || w->prev.st_ctime != w->attr.st_ctime 3214 || prev.st_ctime != w->attr.st_ctime
2735 ) { 3215 ) {
3216 /* we only update w->prev on actual differences */
3217 /* in case we test more often than invoke the callback, */
3218 /* to ensure that prev is always different to attr */
3219 w->prev = prev;
3220
2736 #if EV_USE_INOTIFY 3221 #if EV_USE_INOTIFY
2737 if (fs_fd >= 0) 3222 if (fs_fd >= 0)
2738 { 3223 {
2739 infy_del (EV_A_ w); 3224 infy_del (EV_A_ w);
2740 infy_add (EV_A_ w); 3225 infy_add (EV_A_ w);
… …
2765 3250
2766 if (fs_fd >= 0) 3251 if (fs_fd >= 0)
2767 infy_add (EV_A_ w); 3252 infy_add (EV_A_ w);
2768 else 3253 else
2769#endif 3254#endif
3255 {
2770 ev_timer_again (EV_A_ &w->timer); 3256 ev_timer_again (EV_A_ &w->timer);
3257 ev_unref (EV_A);
3258 }
2771 3259
2772 ev_start (EV_A_ (W)w, 1); 3260 ev_start (EV_A_ (W)w, 1);
2773 3261
2774 EV_FREQUENT_CHECK; 3262 EV_FREQUENT_CHECK;
2775} 3263}
… …
2784 EV_FREQUENT_CHECK; 3272 EV_FREQUENT_CHECK;
2785 3273
2786#if EV_USE_INOTIFY 3274#if EV_USE_INOTIFY
2787 infy_del (EV_A_ w); 3275 infy_del (EV_A_ w);
2788#endif 3276#endif
3277
3278 if (ev_is_active (&w->timer))
3279 {
3280 ev_ref (EV_A);
2789 ev_timer_stop (EV_A_ &w->timer); 3281 ev_timer_stop (EV_A_ &w->timer);
3282 }
2790 3283
2791 ev_stop (EV_A_ (W)w); 3284 ev_stop (EV_A_ (W)w);
2792 3285
2793 EV_FREQUENT_CHECK; 3286 EV_FREQUENT_CHECK;
2794} 3287}
… …
2839 3332
2840 EV_FREQUENT_CHECK; 3333 EV_FREQUENT_CHECK;
2841} 3334}
2842#endif 3335#endif
2843 3336
3337#if EV_PREPARE_ENABLE
2844void 3338void
2845ev_prepare_start (EV_P_ ev_prepare *w) 3339ev_prepare_start (EV_P_ ev_prepare *w)
2846{ 3340{
2847 if (expect_false (ev_is_active (w))) 3341 if (expect_false (ev_is_active (w)))
2848 return; 3342 return;
… …
2874 3368
2875 ev_stop (EV_A_ (W)w); 3369 ev_stop (EV_A_ (W)w);
2876 3370
2877 EV_FREQUENT_CHECK; 3371 EV_FREQUENT_CHECK;
2878} 3372}
3373#endif
2879 3374
3375#if EV_CHECK_ENABLE
2880void 3376void
2881ev_check_start (EV_P_ ev_check *w) 3377ev_check_start (EV_P_ ev_check *w)
2882{ 3378{
2883 if (expect_false (ev_is_active (w))) 3379 if (expect_false (ev_is_active (w)))
2884 return; 3380 return;
… …
2910 3406
2911 ev_stop (EV_A_ (W)w); 3407 ev_stop (EV_A_ (W)w);
2912 3408
2913 EV_FREQUENT_CHECK; 3409 EV_FREQUENT_CHECK;
2914} 3410}
3411#endif
2915 3412
2916#if EV_EMBED_ENABLE 3413#if EV_EMBED_ENABLE
2917void noinline 3414void noinline
2918ev_embed_sweep (EV_P_ ev_embed *w) 3415ev_embed_sweep (EV_P_ ev_embed *w)
2919{ 3416{
… …
2935embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3432embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2936{ 3433{
2937 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3434 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2938 3435
2939 { 3436 {
2940 struct ev_loop *loop = w->other; 3437 EV_P = w->other;
2941 3438
2942 while (fdchangecnt) 3439 while (fdchangecnt)
2943 { 3440 {
2944 fd_reify (EV_A); 3441 fd_reify (EV_A);
2945 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3442 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2953 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3450 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2954 3451
2955 ev_embed_stop (EV_A_ w); 3452 ev_embed_stop (EV_A_ w);
2956 3453
2957 { 3454 {
2958 struct ev_loop *loop = w->other; 3455 EV_P = w->other;
2959 3456
2960 ev_loop_fork (EV_A); 3457 ev_loop_fork (EV_A);
2961 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3458 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2962 } 3459 }
2963 3460
… …
2977{ 3474{
2978 if (expect_false (ev_is_active (w))) 3475 if (expect_false (ev_is_active (w)))
2979 return; 3476 return;
2980 3477
2981 { 3478 {
2982 struct ev_loop *loop = w->other; 3479 EV_P = w->other;
2983 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3480 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2984 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3481 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2985 } 3482 }
2986 3483
2987 EV_FREQUENT_CHECK; 3484 EV_FREQUENT_CHECK;
… …
3014 3511
3015 ev_io_stop (EV_A_ &w->io); 3512 ev_io_stop (EV_A_ &w->io);
3016 ev_prepare_stop (EV_A_ &w->prepare); 3513 ev_prepare_stop (EV_A_ &w->prepare);
3017 ev_fork_stop (EV_A_ &w->fork); 3514 ev_fork_stop (EV_A_ &w->fork);
3018 3515
3516 ev_stop (EV_A_ (W)w);
3517
3019 EV_FREQUENT_CHECK; 3518 EV_FREQUENT_CHECK;
3020} 3519}
3021#endif 3520#endif
3022 3521
3023#if EV_FORK_ENABLE 3522#if EV_FORK_ENABLE
… …
3099 3598
3100void 3599void
3101ev_async_send (EV_P_ ev_async *w) 3600ev_async_send (EV_P_ ev_async *w)
3102{ 3601{
3103 w->sent = 1; 3602 w->sent = 1;
3104 evpipe_write (EV_A_ &gotasync); 3603 evpipe_write (EV_A_ &async_pending);
3105} 3604}
3106#endif 3605#endif
3107 3606
3108/*****************************************************************************/ 3607/*****************************************************************************/
3109 3608
… …
3149{ 3648{
3150 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3649 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3151 3650
3152 if (expect_false (!once)) 3651 if (expect_false (!once))
3153 { 3652 {
3154 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3653 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3155 return; 3654 return;
3156 } 3655 }
3157 3656
3158 once->cb = cb; 3657 once->cb = cb;
3159 once->arg = arg; 3658 once->arg = arg;
… …
3173 } 3672 }
3174} 3673}
3175 3674
3176/*****************************************************************************/ 3675/*****************************************************************************/
3177 3676
3178#if 0 3677#if EV_WALK_ENABLE
3179void 3678void
3180ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3679ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3181{ 3680{
3182 int i, j; 3681 int i, j;
3183 ev_watcher_list *wl, *wn; 3682 ev_watcher_list *wl, *wn;
… …
3199#if EV_USE_INOTIFY 3698#if EV_USE_INOTIFY
3200 if (ev_cb ((ev_io *)wl) == infy_cb) 3699 if (ev_cb ((ev_io *)wl) == infy_cb)
3201 ; 3700 ;
3202 else 3701 else
3203#endif 3702#endif
3204 if ((ev_io *)wl != &pipeev) 3703 if ((ev_io *)wl != &pipe_w)
3205 if (types & EV_IO) 3704 if (types & EV_IO)
3206 cb (EV_A_ EV_IO, wl); 3705 cb (EV_A_ EV_IO, wl);
3207 3706
3208 wl = wn; 3707 wl = wn;
3209 } 3708 }
… …
3246 if (types & EV_ASYNC) 3745 if (types & EV_ASYNC)
3247 for (i = asynccnt; i--; ) 3746 for (i = asynccnt; i--; )
3248 cb (EV_A_ EV_ASYNC, asyncs [i]); 3747 cb (EV_A_ EV_ASYNC, asyncs [i]);
3249#endif 3748#endif
3250 3749
3750#if EV_PREPARE_ENABLE
3251 if (types & EV_PREPARE) 3751 if (types & EV_PREPARE)
3252 for (i = preparecnt; i--; ) 3752 for (i = preparecnt; i--; )
3253#if EV_EMBED_ENABLE 3753# if EV_EMBED_ENABLE
3254 if (ev_cb (prepares [i]) != embed_prepare_cb) 3754 if (ev_cb (prepares [i]) != embed_prepare_cb)
3255#endif 3755# endif
3256 cb (EV_A_ EV_PREPARE, prepares [i]); 3756 cb (EV_A_ EV_PREPARE, prepares [i]);
3757#endif
3257 3758
3759#if EV_CHECK_ENABLE
3258 if (types & EV_CHECK) 3760 if (types & EV_CHECK)
3259 for (i = checkcnt; i--; ) 3761 for (i = checkcnt; i--; )
3260 cb (EV_A_ EV_CHECK, checks [i]); 3762 cb (EV_A_ EV_CHECK, checks [i]);
3763#endif
3261 3764
3765#if EV_SIGNAL_ENABLE
3262 if (types & EV_SIGNAL) 3766 if (types & EV_SIGNAL)
3263 for (i = 0; i < signalmax; ++i) 3767 for (i = 0; i < EV_NSIG - 1; ++i)
3264 for (wl = signals [i].head; wl; ) 3768 for (wl = signals [i].head; wl; )
3265 { 3769 {
3266 wn = wl->next; 3770 wn = wl->next;
3267 cb (EV_A_ EV_SIGNAL, wl); 3771 cb (EV_A_ EV_SIGNAL, wl);
3268 wl = wn; 3772 wl = wn;
3269 } 3773 }
3774#endif
3270 3775
3776#if EV_CHILD_ENABLE
3271 if (types & EV_CHILD) 3777 if (types & EV_CHILD)
3272 for (i = EV_PID_HASHSIZE; i--; ) 3778 for (i = (EV_PID_HASHSIZE); i--; )
3273 for (wl = childs [i]; wl; ) 3779 for (wl = childs [i]; wl; )
3274 { 3780 {
3275 wn = wl->next; 3781 wn = wl->next;
3276 cb (EV_A_ EV_CHILD, wl); 3782 cb (EV_A_ EV_CHILD, wl);
3277 wl = wn; 3783 wl = wn;
3278 } 3784 }
3785#endif
3279/* EV_STAT 0x00001000 /* stat data changed */ 3786/* EV_STAT 0x00001000 /* stat data changed */
3280/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3787/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3281} 3788}
3282#endif 3789#endif
3283 3790

Diff Legend

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