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

Comparing libev/ev.c (file contents):
Revision 1.304 by root, Sun Jul 19 03:12:28 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 *
77# ifndef EV_USE_REALTIME 77# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 78# define EV_USE_REALTIME 0
79# endif 79# endif
80# endif 80# endif
81 81
82# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 83# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 84# define EV_USE_NANOSLEEP EV_FEATURE_OS
85# endif
85# else 86# else
87# undef EV_USE_NANOSLEEP
86# 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
87# endif 94# endif
88# endif
89
90# ifndef EV_USE_SELECT
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# define EV_USE_SELECT 1
93# else 95# else
96# undef EV_USE_SELECT
94# 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
95# endif 103# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 104# else
105# undef EV_USE_POLL
102# 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
103# endif 112# endif
113# else
114# undef EV_USE_EPOLL
115# define EV_USE_EPOLL 0
104# endif 116# endif
105 117
118# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
106# ifndef EV_USE_EPOLL 119# ifndef EV_USE_KQUEUE
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 120# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
108# define EV_USE_EPOLL 1
109# else
110# define EV_USE_EPOLL 0
111# endif 121# endif
122# else
123# undef EV_USE_KQUEUE
124# define EV_USE_KQUEUE 0
112# endif 125# endif
113 126
114# ifndef EV_USE_KQUEUE 127# if HAVE_PORT_H && HAVE_PORT_CREATE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 128# ifndef EV_USE_PORT
116# define EV_USE_KQUEUE 1 129# define EV_USE_PORT EV_FEATURE_BACKENDS
117# else
118# define EV_USE_KQUEUE 0
119# endif 130# endif
120# endif
121
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1
125# else 131# else
132# undef EV_USE_PORT
126# 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
127# endif 139# endif
128# endif
129
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1
133# else 140# else
141# undef EV_USE_INOTIFY
134# 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
135# endif 148# endif
136# endif
137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else 149# else
150# undef EV_USE_SIGNALFD
142# define EV_USE_SIGNALFD 0 151# define EV_USE_SIGNALFD 0
152# endif
153
154# if HAVE_EVENTFD
155# ifndef EV_USE_EVENTFD
156# define EV_USE_EVENTFD EV_FEATURE_OS
143# endif 157# endif
144# endif
145
146# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1
149# else 158# else
159# undef EV_USE_EVENTFD
150# define EV_USE_EVENTFD 0 160# define EV_USE_EVENTFD 0
151# endif
152# endif 161# endif
153 162
154#endif 163#endif
155 164
156#include <math.h> 165#include <math.h>
157#include <stdlib.h> 166#include <stdlib.h>
167#include <string.h>
158#include <fcntl.h> 168#include <fcntl.h>
159#include <stddef.h> 169#include <stddef.h>
160 170
161#include <stdio.h> 171#include <stdio.h>
162 172
163#include <assert.h> 173#include <assert.h>
164#include <errno.h> 174#include <errno.h>
165#include <sys/types.h> 175#include <sys/types.h>
166#include <time.h> 176#include <time.h>
177#include <limits.h>
167 178
168#include <signal.h> 179#include <signal.h>
169 180
170#ifdef EV_H 181#ifdef EV_H
171# include EV_H 182# include EV_H
182# define WIN32_LEAN_AND_MEAN 193# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 194# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 195# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 196# define EV_SELECT_IS_WINSOCKET 1
186# endif 197# endif
198# undef EV_AVOID_STDIO
187#endif 199#endif
188 200
189/* 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
190 230
191#ifndef EV_USE_CLOCK_SYSCALL 231#ifndef EV_USE_CLOCK_SYSCALL
192# if __linux && __GLIBC__ >= 2 232# if __linux && __GLIBC__ >= 2
193# define EV_USE_CLOCK_SYSCALL 1 233# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
194# else 234# else
195# define EV_USE_CLOCK_SYSCALL 0 235# define EV_USE_CLOCK_SYSCALL 0
196# endif 236# endif
197#endif 237#endif
198 238
199#ifndef EV_USE_MONOTONIC 239#ifndef EV_USE_MONOTONIC
200# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 240# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
201# define EV_USE_MONOTONIC 1 241# define EV_USE_MONOTONIC EV_FEATURE_OS
202# else 242# else
203# define EV_USE_MONOTONIC 0 243# define EV_USE_MONOTONIC 0
204# endif 244# endif
205#endif 245#endif
206 246
208# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 248# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
209#endif 249#endif
210 250
211#ifndef EV_USE_NANOSLEEP 251#ifndef EV_USE_NANOSLEEP
212# if _POSIX_C_SOURCE >= 199309L 252# if _POSIX_C_SOURCE >= 199309L
213# define EV_USE_NANOSLEEP 1 253# define EV_USE_NANOSLEEP EV_FEATURE_OS
214# else 254# else
215# define EV_USE_NANOSLEEP 0 255# define EV_USE_NANOSLEEP 0
216# endif 256# endif
217#endif 257#endif
218 258
219#ifndef EV_USE_SELECT 259#ifndef EV_USE_SELECT
220# define EV_USE_SELECT 1 260# define EV_USE_SELECT EV_FEATURE_BACKENDS
221#endif 261#endif
222 262
223#ifndef EV_USE_POLL 263#ifndef EV_USE_POLL
224# ifdef _WIN32 264# ifdef _WIN32
225# define EV_USE_POLL 0 265# define EV_USE_POLL 0
226# else 266# else
227# define EV_USE_POLL 1 267# define EV_USE_POLL EV_FEATURE_BACKENDS
228# endif 268# endif
229#endif 269#endif
230 270
231#ifndef EV_USE_EPOLL 271#ifndef EV_USE_EPOLL
232# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 272# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
233# define EV_USE_EPOLL 1 273# define EV_USE_EPOLL EV_FEATURE_BACKENDS
234# else 274# else
235# define EV_USE_EPOLL 0 275# define EV_USE_EPOLL 0
236# endif 276# endif
237#endif 277#endif
238 278
244# define EV_USE_PORT 0 284# define EV_USE_PORT 0
245#endif 285#endif
246 286
247#ifndef EV_USE_INOTIFY 287#ifndef EV_USE_INOTIFY
248# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 288# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
249# define EV_USE_INOTIFY 1 289# define EV_USE_INOTIFY EV_FEATURE_OS
250# else 290# else
251# define EV_USE_INOTIFY 0 291# define EV_USE_INOTIFY 0
252# endif 292# endif
253#endif 293#endif
254 294
255#ifndef EV_PID_HASHSIZE 295#ifndef EV_PID_HASHSIZE
256# if EV_MINIMAL 296# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
257# define EV_PID_HASHSIZE 1
258# else
259# define EV_PID_HASHSIZE 16
260# endif
261#endif 297#endif
262 298
263#ifndef EV_INOTIFY_HASHSIZE 299#ifndef EV_INOTIFY_HASHSIZE
264# if EV_MINIMAL 300# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
265# define EV_INOTIFY_HASHSIZE 1
266# else
267# define EV_INOTIFY_HASHSIZE 16
268# endif
269#endif 301#endif
270 302
271#ifndef EV_USE_EVENTFD 303#ifndef EV_USE_EVENTFD
272# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 304# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
273# define EV_USE_EVENTFD 1 305# define EV_USE_EVENTFD EV_FEATURE_OS
274# else 306# else
275# define EV_USE_EVENTFD 0 307# define EV_USE_EVENTFD 0
276# endif 308# endif
277#endif 309#endif
278 310
279#ifndef EV_USE_SIGNALFD 311#ifndef EV_USE_SIGNALFD
280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
281# define EV_USE_SIGNALFD 1 313# define EV_USE_SIGNALFD EV_FEATURE_OS
282# else 314# else
283# define EV_USE_SIGNALFD 0 315# define EV_USE_SIGNALFD 0
284# endif 316# endif
285#endif 317#endif
286 318
289# define EV_USE_4HEAP 1 321# define EV_USE_4HEAP 1
290# define EV_HEAP_CACHE_AT 1 322# define EV_HEAP_CACHE_AT 1
291#endif 323#endif
292 324
293#ifndef EV_VERIFY 325#ifndef EV_VERIFY
294# define EV_VERIFY !EV_MINIMAL 326# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
295#endif 327#endif
296 328
297#ifndef EV_USE_4HEAP 329#ifndef EV_USE_4HEAP
298# define EV_USE_4HEAP !EV_MINIMAL 330# define EV_USE_4HEAP EV_FEATURE_DATA
299#endif 331#endif
300 332
301#ifndef EV_HEAP_CACHE_AT 333#ifndef EV_HEAP_CACHE_AT
302# define EV_HEAP_CACHE_AT !EV_MINIMAL 334# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
303#endif 335#endif
304 336
305/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 337/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
306/* which makes programs even slower. might work on other unices, too. */ 338/* which makes programs even slower. might work on other unices, too. */
307#if EV_USE_CLOCK_SYSCALL 339#if EV_USE_CLOCK_SYSCALL
316# endif 348# endif
317#endif 349#endif
318 350
319/* 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 */
320 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
358
321#ifndef CLOCK_MONOTONIC 359#ifndef CLOCK_MONOTONIC
322# undef EV_USE_MONOTONIC 360# undef EV_USE_MONOTONIC
323# define EV_USE_MONOTONIC 0 361# define EV_USE_MONOTONIC 0
324#endif 362#endif
325 363
359# include <stdint.h> 397# include <stdint.h>
360# ifndef EFD_NONBLOCK 398# ifndef EFD_NONBLOCK
361# define EFD_NONBLOCK O_NONBLOCK 399# define EFD_NONBLOCK O_NONBLOCK
362# endif 400# endif
363# ifndef EFD_CLOEXEC 401# ifndef EFD_CLOEXEC
402# ifdef O_CLOEXEC
364# define EFD_CLOEXEC O_CLOEXEC 403# define EFD_CLOEXEC O_CLOEXEC
404# else
405# define EFD_CLOEXEC 02000000
406# endif
365# endif 407# endif
366# ifdef __cplusplus 408# ifdef __cplusplus
367extern "C" { 409extern "C" {
368# endif 410# endif
369int eventfd (unsigned int initval, int flags); 411int (eventfd) (unsigned int initval, int flags);
370# ifdef __cplusplus 412# ifdef __cplusplus
371} 413}
372# endif 414# endif
373#endif 415#endif
374 416
375#if EV_USE_SIGNALFD 417#if EV_USE_SIGNALFD
376# include <sys/signalfd.h> 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
377#endif 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
378 445
379/**/ 446/**/
380 447
381#if EV_VERIFY >= 3 448#if EV_VERIFY >= 3
382# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 449# define EV_FREQUENT_CHECK ev_verify (EV_A)
383#else 450#else
384# define EV_FREQUENT_CHECK do { } while (0) 451# define EV_FREQUENT_CHECK do { } while (0)
385#endif 452#endif
386 453
387/* 454/*
394 */ 461 */
395#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 462#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
396 463
397#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) */
398#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) */
399/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
400 466
401#if __GNUC__ >= 4 467#if __GNUC__ >= 4
402# define expect(expr,value) __builtin_expect ((expr),(value)) 468# define expect(expr,value) __builtin_expect ((expr),(value))
403# define noinline __attribute__ ((noinline)) 469# define noinline __attribute__ ((noinline))
404#else 470#else
411 477
412#define expect_false(expr) expect ((expr) != 0, 0) 478#define expect_false(expr) expect ((expr) != 0, 0)
413#define expect_true(expr) expect ((expr) != 0, 1) 479#define expect_true(expr) expect ((expr) != 0, 1)
414#define inline_size static inline 480#define inline_size static inline
415 481
416#if EV_MINIMAL 482#if EV_FEATURE_CODE
483# define inline_speed static inline
484#else
417# define inline_speed static noinline 485# define inline_speed static noinline
418#else
419# define inline_speed static inline
420#endif 486#endif
421 487
422#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 488#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
423 489
424#if EV_MINPRI == EV_MAXPRI 490#if EV_MINPRI == EV_MAXPRI
445 511
446#if EV_USE_MONOTONIC 512#if EV_USE_MONOTONIC
447static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 513static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
448#endif 514#endif
449 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
450#ifdef _WIN32 526#ifdef _WIN32
451# include "ev_win32.c" 527# include "ev_win32.c"
452#endif 528#endif
453 529
454/*****************************************************************************/ 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
455 539
456static void (*syserr_cb)(const char *msg); 540static void (*syserr_cb)(const char *msg);
457 541
458void 542void
459ev_set_syserr_cb (void (*cb)(const char *msg)) 543ev_set_syserr_cb (void (*cb)(const char *msg))
469 553
470 if (syserr_cb) 554 if (syserr_cb)
471 syserr_cb (msg); 555 syserr_cb (msg);
472 else 556 else
473 { 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
474 perror (msg); 566 perror (msg);
567#endif
475 abort (); 568 abort ();
476 } 569 }
477} 570}
478 571
479static void * 572static void *
480ev_realloc_emul (void *ptr, long size) 573ev_realloc_emul (void *ptr, long size)
481{ 574{
575#if __GLIBC__
576 return realloc (ptr, size);
577#else
482 /* some systems, notably openbsd and darwin, fail to properly 578 /* some systems, notably openbsd and darwin, fail to properly
483 * 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
484 * the single unix specification, so work around them here. 580 * the single unix specification, so work around them here.
485 */ 581 */
486 582
487 if (size) 583 if (size)
488 return realloc (ptr, size); 584 return realloc (ptr, size);
489 585
490 free (ptr); 586 free (ptr);
491 return 0; 587 return 0;
588#endif
492} 589}
493 590
494static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 591static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
495 592
496void 593void
504{ 601{
505 ptr = alloc (ptr, size); 602 ptr = alloc (ptr, size);
506 603
507 if (!ptr && size) 604 if (!ptr && size)
508 { 605 {
606#if EV_AVOID_STDIO
607 ev_printerr ("libev: memory allocation failed, aborting.\n");
608#else
509 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 609 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
610#endif
510 abort (); 611 abort ();
511 } 612 }
512 613
513 return ptr; 614 return ptr;
514} 615}
596 697
597 static int ev_default_loop_ptr; 698 static int ev_default_loop_ptr;
598 699
599#endif 700#endif
600 701
601#if EV_MINIMAL < 2 702#if EV_FEATURE_API
602# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 703# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
603# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 704# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
604# define EV_INVOKE_PENDING invoke_cb (EV_A) 705# define EV_INVOKE_PENDING invoke_cb (EV_A)
605#else 706#else
606# define EV_RELEASE_CB (void)0 707# define EV_RELEASE_CB (void)0
791} 892}
792 893
793/*****************************************************************************/ 894/*****************************************************************************/
794 895
795inline_speed void 896inline_speed void
796fd_event_nc (EV_P_ int fd, int revents) 897fd_event_nocheck (EV_P_ int fd, int revents)
797{ 898{
798 ANFD *anfd = anfds + fd; 899 ANFD *anfd = anfds + fd;
799 ev_io *w; 900 ev_io *w;
800 901
801 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)
813fd_event (EV_P_ int fd, int revents) 914fd_event (EV_P_ int fd, int revents)
814{ 915{
815 ANFD *anfd = anfds + fd; 916 ANFD *anfd = anfds + fd;
816 917
817 if (expect_true (!anfd->reify)) 918 if (expect_true (!anfd->reify))
818 fd_event_nc (EV_A_ fd, revents); 919 fd_event_nocheck (EV_A_ fd, revents);
819} 920}
820 921
821void 922void
822ev_feed_fd_event (EV_P_ int fd, int revents) 923ev_feed_fd_event (EV_P_ int fd, int revents)
823{ 924{
824 if (fd >= 0 && fd < anfdmax) 925 if (fd >= 0 && fd < anfdmax)
825 fd_event_nc (EV_A_ fd, revents); 926 fd_event_nocheck (EV_A_ fd, revents);
826} 927}
827 928
828/* make sure the external fd watch events are in-sync */ 929/* make sure the external fd watch events are in-sync */
829/* with the kernel/libev internal state */ 930/* with the kernel/libev internal state */
830inline_size void 931inline_size void
845 946
846#if EV_SELECT_IS_WINSOCKET 947#if EV_SELECT_IS_WINSOCKET
847 if (events) 948 if (events)
848 { 949 {
849 unsigned long arg; 950 unsigned long arg;
850 #ifdef EV_FD_TO_WIN32_HANDLE
851 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 951 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
852 #else
853 anfd->handle = _get_osfhandle (fd);
854 #endif
855 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));
856 } 953 }
857#endif 954#endif
858 955
859 { 956 {
897 ev_io_stop (EV_A_ w); 994 ev_io_stop (EV_A_ w);
898 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);
899 } 996 }
900} 997}
901 998
902/* check whether the given fd is atcually valid, for error recovery */ 999/* check whether the given fd is actually valid, for error recovery */
903inline_size int 1000inline_size int
904fd_valid (int fd) 1001fd_valid (int fd)
905{ 1002{
906#ifdef _WIN32 1003#ifdef _WIN32
907 return _get_osfhandle (fd) != -1; 1004 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
908#else 1005#else
909 return fcntl (fd, F_GETFD) != -1; 1006 return fcntl (fd, F_GETFD) != -1;
910#endif 1007#endif
911} 1008}
912 1009
930 1027
931 for (fd = anfdmax; fd--; ) 1028 for (fd = anfdmax; fd--; )
932 if (anfds [fd].events) 1029 if (anfds [fd].events)
933 { 1030 {
934 fd_kill (EV_A_ fd); 1031 fd_kill (EV_A_ fd);
935 return; 1032 break;
936 } 1033 }
937} 1034}
938 1035
939/* 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 */
940static void noinline 1037static void noinline
947 { 1044 {
948 anfds [fd].events = 0; 1045 anfds [fd].events = 0;
949 anfds [fd].emask = 0; 1046 anfds [fd].emask = 0;
950 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1047 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
951 } 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
952} 1063}
953 1064
954/*****************************************************************************/ 1065/*****************************************************************************/
955 1066
956/* 1067/*
1030 1141
1031 for (;;) 1142 for (;;)
1032 { 1143 {
1033 int c = k << 1; 1144 int c = k << 1;
1034 1145
1035 if (c > N + HEAP0 - 1) 1146 if (c >= N + HEAP0)
1036 break; 1147 break;
1037 1148
1038 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])
1039 ? 1 : 0; 1150 ? 1 : 0;
1040 1151
1076 1187
1077/* move an element suitably so it is in a correct place */ 1188/* move an element suitably so it is in a correct place */
1078inline_size void 1189inline_size void
1079adjustheap (ANHE *heap, int N, int k) 1190adjustheap (ANHE *heap, int N, int k)
1080{ 1191{
1081 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)]))
1082 upheap (heap, k); 1193 upheap (heap, k);
1083 else 1194 else
1084 downheap (heap, N, k); 1195 downheap (heap, N, k);
1085} 1196}
1086 1197
1099/*****************************************************************************/ 1210/*****************************************************************************/
1100 1211
1101/* associate signal watchers to a signal signal */ 1212/* associate signal watchers to a signal signal */
1102typedef struct 1213typedef struct
1103{ 1214{
1215 EV_ATOMIC_T pending;
1216#if EV_MULTIPLICITY
1217 EV_P;
1218#endif
1104 WL head; 1219 WL head;
1105 EV_ATOMIC_T gotsig;
1106} ANSIG; 1220} ANSIG;
1107 1221
1108static ANSIG *signals; 1222static ANSIG signals [EV_NSIG - 1];
1109static int signalmax;
1110
1111static EV_ATOMIC_T gotsig;
1112 1223
1113/*****************************************************************************/ 1224/*****************************************************************************/
1114 1225
1115/* used to prepare libev internal fd's */ 1226#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1116/* this is not fork-safe */
1117inline_speed void
1118fd_intern (int fd)
1119{
1120#ifdef _WIN32
1121 unsigned long arg = 1;
1122 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1123#else
1124 fcntl (fd, F_SETFD, FD_CLOEXEC);
1125 fcntl (fd, F_SETFL, O_NONBLOCK);
1126#endif
1127}
1128 1227
1129static void noinline 1228static void noinline
1130evpipe_init (EV_P) 1229evpipe_init (EV_P)
1131{ 1230{
1132 if (!ev_is_active (&pipe_w)) 1231 if (!ev_is_active (&pipe_w))
1133 { 1232 {
1134#if EV_USE_EVENTFD 1233# if EV_USE_EVENTFD
1135 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1234 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1136 if (evfd < 0 && errno == EINVAL) 1235 if (evfd < 0 && errno == EINVAL)
1137 evfd = eventfd (0, 0); 1236 evfd = eventfd (0, 0);
1138 1237
1139 if (evfd >= 0) 1238 if (evfd >= 0)
1141 evpipe [0] = -1; 1240 evpipe [0] = -1;
1142 fd_intern (evfd); /* doing it twice doesn't hurt */ 1241 fd_intern (evfd); /* doing it twice doesn't hurt */
1143 ev_io_set (&pipe_w, evfd, EV_READ); 1242 ev_io_set (&pipe_w, evfd, EV_READ);
1144 } 1243 }
1145 else 1244 else
1146#endif 1245# endif
1147 { 1246 {
1148 while (pipe (evpipe)) 1247 while (pipe (evpipe))
1149 ev_syserr ("(libev) error creating signal/async pipe"); 1248 ev_syserr ("(libev) error creating signal/async pipe");
1150 1249
1151 fd_intern (evpipe [0]); 1250 fd_intern (evpipe [0]);
1162evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1261evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1163{ 1262{
1164 if (!*flag) 1263 if (!*flag)
1165 { 1264 {
1166 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;
1167 1267
1168 *flag = 1; 1268 *flag = 1;
1169 1269
1170#if EV_USE_EVENTFD 1270#if EV_USE_EVENTFD
1171 if (evfd >= 0) 1271 if (evfd >= 0)
1173 uint64_t counter = 1; 1273 uint64_t counter = 1;
1174 write (evfd, &counter, sizeof (uint64_t)); 1274 write (evfd, &counter, sizeof (uint64_t));
1175 } 1275 }
1176 else 1276 else
1177#endif 1277#endif
1178 write (evpipe [1], &old_errno, 1); 1278 write (evpipe [1], &dummy, 1);
1179 1279
1180 errno = old_errno; 1280 errno = old_errno;
1181 } 1281 }
1182} 1282}
1183 1283
1184/* called whenever the libev signal pipe */ 1284/* called whenever the libev signal pipe */
1185/* got some events (signal, async) */ 1285/* got some events (signal, async) */
1186static void 1286static void
1187pipecb (EV_P_ ev_io *iow, int revents) 1287pipecb (EV_P_ ev_io *iow, int revents)
1188{ 1288{
1289 int i;
1290
1189#if EV_USE_EVENTFD 1291#if EV_USE_EVENTFD
1190 if (evfd >= 0) 1292 if (evfd >= 0)
1191 { 1293 {
1192 uint64_t counter; 1294 uint64_t counter;
1193 read (evfd, &counter, sizeof (uint64_t)); 1295 read (evfd, &counter, sizeof (uint64_t));
1197 { 1299 {
1198 char dummy; 1300 char dummy;
1199 read (evpipe [0], &dummy, 1); 1301 read (evpipe [0], &dummy, 1);
1200 } 1302 }
1201 1303
1202 if (gotsig && ev_is_default_loop (EV_A)) 1304 if (sig_pending)
1203 { 1305 {
1204 int signum; 1306 sig_pending = 0;
1205 gotsig = 0;
1206 1307
1207 for (signum = signalmax; signum--; ) 1308 for (i = EV_NSIG - 1; i--; )
1208 if (signals [signum].gotsig) 1309 if (expect_false (signals [i].pending))
1209 ev_feed_signal_event (EV_A_ signum + 1); 1310 ev_feed_signal_event (EV_A_ i + 1);
1210 } 1311 }
1211 1312
1212#if EV_ASYNC_ENABLE 1313#if EV_ASYNC_ENABLE
1213 if (gotasync) 1314 if (async_pending)
1214 { 1315 {
1215 int i; 1316 async_pending = 0;
1216 gotasync = 0;
1217 1317
1218 for (i = asynccnt; i--; ) 1318 for (i = asynccnt; i--; )
1219 if (asyncs [i]->sent) 1319 if (asyncs [i]->sent)
1220 { 1320 {
1221 asyncs [i]->sent = 0; 1321 asyncs [i]->sent = 0;
1229 1329
1230static void 1330static void
1231ev_sighandler (int signum) 1331ev_sighandler (int signum)
1232{ 1332{
1233#if EV_MULTIPLICITY 1333#if EV_MULTIPLICITY
1234 struct ev_loop *loop = &default_loop_struct; 1334 EV_P = signals [signum - 1].loop;
1235#endif 1335#endif
1236 1336
1237#if _WIN32 1337#ifdef _WIN32
1238 signal (signum, ev_sighandler); 1338 signal (signum, ev_sighandler);
1239#endif 1339#endif
1240 1340
1241 signals [signum - 1].gotsig = 1; 1341 signals [signum - 1].pending = 1;
1242 evpipe_write (EV_A_ &gotsig); 1342 evpipe_write (EV_A_ &sig_pending);
1243} 1343}
1244 1344
1245void noinline 1345void noinline
1246ev_feed_signal_event (EV_P_ int signum) 1346ev_feed_signal_event (EV_P_ int signum)
1247{ 1347{
1248 WL w; 1348 WL w;
1249 1349
1350 if (expect_false (signum <= 0 || signum > EV_NSIG))
1351 return;
1352
1353 --signum;
1354
1250#if EV_MULTIPLICITY 1355#if EV_MULTIPLICITY
1251 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 */
1252#endif 1357 /* or, likely more useful, feeding a signal nobody is waiting for */
1253 1358
1254 --signum; 1359 if (expect_false (signals [signum].loop != EV_A))
1255
1256 if (signum < 0 || signum >= signalmax)
1257 return; 1360 return;
1361#endif
1258 1362
1259 signals [signum].gotsig = 0; 1363 signals [signum].pending = 0;
1260 1364
1261 for (w = signals [signum].head; w; w = w->next) 1365 for (w = signals [signum].head; w; w = w->next)
1262 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1366 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1263} 1367}
1264 1368
1265#if EV_USE_SIGNALFD 1369#if EV_USE_SIGNALFD
1266static void 1370static void
1267sigfdcb (EV_P_ ev_io *iow, int revents) 1371sigfdcb (EV_P_ ev_io *iow, int revents)
1268{ 1372{
1269 struct signalfd_siginfo si[4], *sip; 1373 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1270 1374
1271 for (;;) 1375 for (;;)
1272 { 1376 {
1273 ssize_t res = read (sigfd, si, sizeof (si)); 1377 ssize_t res = read (sigfd, si, sizeof (si));
1274 1378
1280 break; 1384 break;
1281 } 1385 }
1282} 1386}
1283#endif 1387#endif
1284 1388
1389#endif
1390
1285/*****************************************************************************/ 1391/*****************************************************************************/
1286 1392
1393#if EV_CHILD_ENABLE
1287static WL childs [EV_PID_HASHSIZE]; 1394static WL childs [EV_PID_HASHSIZE];
1288
1289#ifndef _WIN32
1290 1395
1291static ev_signal childev; 1396static ev_signal childev;
1292 1397
1293#ifndef WIFCONTINUED 1398#ifndef WIFCONTINUED
1294# define WIFCONTINUED(status) 0 1399# define WIFCONTINUED(status) 0
1299child_reap (EV_P_ int chain, int pid, int status) 1404child_reap (EV_P_ int chain, int pid, int status)
1300{ 1405{
1301 ev_child *w; 1406 ev_child *w;
1302 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1407 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1303 1408
1304 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)
1305 { 1410 {
1306 if ((w->pid == pid || !w->pid) 1411 if ((w->pid == pid || !w->pid)
1307 && (!traced || (w->flags & 1))) 1412 && (!traced || (w->flags & 1)))
1308 { 1413 {
1309 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 */
1334 /* 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 */
1335 /* 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 */
1336 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1441 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1337 1442
1338 child_reap (EV_A_ pid, pid, status); 1443 child_reap (EV_A_ pid, pid, status);
1339 if (EV_PID_HASHSIZE > 1) 1444 if ((EV_PID_HASHSIZE) > 1)
1340 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 */
1341} 1446}
1342 1447
1343#endif 1448#endif
1344 1449
1411#ifdef __APPLE__ 1516#ifdef __APPLE__
1412 /* only select works correctly on that "unix-certified" platform */ 1517 /* only select works correctly on that "unix-certified" platform */
1413 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1518 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1414 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 */
1415#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
1416 1524
1417 return flags; 1525 return flags;
1418} 1526}
1419 1527
1420unsigned int 1528unsigned int
1433ev_backend (EV_P) 1541ev_backend (EV_P)
1434{ 1542{
1435 return backend; 1543 return backend;
1436} 1544}
1437 1545
1438#if EV_MINIMAL < 2 1546#if EV_FEATURE_API
1439unsigned int 1547unsigned int
1440ev_loop_count (EV_P) 1548ev_iteration (EV_P)
1441{ 1549{
1442 return loop_count; 1550 return loop_count;
1443} 1551}
1444 1552
1445unsigned int 1553unsigned int
1446ev_loop_depth (EV_P) 1554ev_depth (EV_P)
1447{ 1555{
1448 return loop_depth; 1556 return loop_depth;
1449} 1557}
1450 1558
1451void 1559void
1508 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1616 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1509 have_monotonic = 1; 1617 have_monotonic = 1;
1510 } 1618 }
1511#endif 1619#endif
1512 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
1513 ev_rt_now = ev_time (); 1632 ev_rt_now = ev_time ();
1514 mn_now = get_clock (); 1633 mn_now = get_clock ();
1515 now_floor = mn_now; 1634 now_floor = mn_now;
1516 rtmn_diff = ev_rt_now - mn_now; 1635 rtmn_diff = ev_rt_now - mn_now;
1517#if EV_MINIMAL < 2 1636#if EV_FEATURE_API
1518 invoke_cb = ev_invoke_pending; 1637 invoke_cb = ev_invoke_pending;
1519#endif 1638#endif
1520 1639
1521 io_blocktime = 0.; 1640 io_blocktime = 0.;
1522 timeout_blocktime = 0.; 1641 timeout_blocktime = 0.;
1523 backend = 0; 1642 backend = 0;
1524 backend_fd = -1; 1643 backend_fd = -1;
1525 gotasync = 0; 1644 sig_pending = 0;
1645#if EV_ASYNC_ENABLE
1646 async_pending = 0;
1647#endif
1526#if EV_USE_INOTIFY 1648#if EV_USE_INOTIFY
1527 fs_fd = -2; 1649 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1528#endif 1650#endif
1529#if EV_USE_SIGNALFD 1651#if EV_USE_SIGNALFD
1530 sigfd = -2; 1652 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1531#endif 1653#endif
1532
1533 /* pid check not overridable via env */
1534#ifndef _WIN32
1535 if (flags & EVFLAG_FORKCHECK)
1536 curpid = getpid ();
1537#endif
1538
1539 if (!(flags & EVFLAG_NOENV)
1540 && !enable_secure ()
1541 && getenv ("LIBEV_FLAGS"))
1542 flags = atoi (getenv ("LIBEV_FLAGS"));
1543 1654
1544 if (!(flags & 0x0000ffffU)) 1655 if (!(flags & 0x0000ffffU))
1545 flags |= ev_recommended_backends (); 1656 flags |= ev_recommended_backends ();
1546 1657
1547#if EV_USE_PORT 1658#if EV_USE_PORT
1560 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1671 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1561#endif 1672#endif
1562 1673
1563 ev_prepare_init (&pending_w, pendingcb); 1674 ev_prepare_init (&pending_w, pendingcb);
1564 1675
1676#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1565 ev_init (&pipe_w, pipecb); 1677 ev_init (&pipe_w, pipecb);
1566 ev_set_priority (&pipe_w, EV_MAXPRI); 1678 ev_set_priority (&pipe_w, EV_MAXPRI);
1679#endif
1567 } 1680 }
1568} 1681}
1569 1682
1570/* free up a loop structure */ 1683/* free up a loop structure */
1571static void noinline 1684static void noinline
1583 close (evfd); 1696 close (evfd);
1584#endif 1697#endif
1585 1698
1586 if (evpipe [0] >= 0) 1699 if (evpipe [0] >= 0)
1587 { 1700 {
1588 close (evpipe [0]); 1701 EV_WIN32_CLOSE_FD (evpipe [0]);
1589 close (evpipe [1]); 1702 EV_WIN32_CLOSE_FD (evpipe [1]);
1590 } 1703 }
1591 } 1704 }
1592 1705
1593#if EV_USE_SIGNALFD 1706#if EV_USE_SIGNALFD
1594 if (ev_is_active (&sigfd_w)) 1707 if (ev_is_active (&sigfd_w))
1595 {
1596 /*ev_ref (EV_A);*/
1597 /*ev_io_stop (EV_A_ &sigfd_w);*/
1598
1599 close (sigfd); 1708 close (sigfd);
1600 }
1601#endif 1709#endif
1602 1710
1603#if EV_USE_INOTIFY 1711#if EV_USE_INOTIFY
1604 if (fs_fd >= 0) 1712 if (fs_fd >= 0)
1605 close (fs_fd); 1713 close (fs_fd);
1630#if EV_IDLE_ENABLE 1738#if EV_IDLE_ENABLE
1631 array_free (idle, [i]); 1739 array_free (idle, [i]);
1632#endif 1740#endif
1633 } 1741 }
1634 1742
1635 ev_free (anfds); anfdmax = 0; 1743 ev_free (anfds); anfds = 0; anfdmax = 0;
1636 1744
1637 /* have to use the microsoft-never-gets-it-right macro */ 1745 /* have to use the microsoft-never-gets-it-right macro */
1638 array_free (rfeed, EMPTY); 1746 array_free (rfeed, EMPTY);
1639 array_free (fdchange, EMPTY); 1747 array_free (fdchange, EMPTY);
1640 array_free (timer, EMPTY); 1748 array_free (timer, EMPTY);
1675 1783
1676 if (ev_is_active (&pipe_w)) 1784 if (ev_is_active (&pipe_w))
1677 { 1785 {
1678 /* this "locks" the handlers against writing to the pipe */ 1786 /* this "locks" the handlers against writing to the pipe */
1679 /* while we modify the fd vars */ 1787 /* while we modify the fd vars */
1680 gotsig = 1; 1788 sig_pending = 1;
1681#if EV_ASYNC_ENABLE 1789#if EV_ASYNC_ENABLE
1682 gotasync = 1; 1790 async_pending = 1;
1683#endif 1791#endif
1684 1792
1685 ev_ref (EV_A); 1793 ev_ref (EV_A);
1686 ev_io_stop (EV_A_ &pipe_w); 1794 ev_io_stop (EV_A_ &pipe_w);
1687 1795
1690 close (evfd); 1798 close (evfd);
1691#endif 1799#endif
1692 1800
1693 if (evpipe [0] >= 0) 1801 if (evpipe [0] >= 0)
1694 { 1802 {
1695 close (evpipe [0]); 1803 EV_WIN32_CLOSE_FD (evpipe [0]);
1696 close (evpipe [1]); 1804 EV_WIN32_CLOSE_FD (evpipe [1]);
1697 } 1805 }
1698 1806
1807#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1699 evpipe_init (EV_A); 1808 evpipe_init (EV_A);
1700 /* now iterate over everything, in case we missed something */ 1809 /* now iterate over everything, in case we missed something */
1701 pipecb (EV_A_ &pipe_w, EV_READ); 1810 pipecb (EV_A_ &pipe_w, EV_READ);
1811#endif
1702 } 1812 }
1703 1813
1704 postfork = 0; 1814 postfork = 0;
1705} 1815}
1706 1816
1707#if EV_MULTIPLICITY 1817#if EV_MULTIPLICITY
1708 1818
1709struct ev_loop * 1819struct ev_loop *
1710ev_loop_new (unsigned int flags) 1820ev_loop_new (unsigned int flags)
1711{ 1821{
1712 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));
1713 1823
1714 memset (loop, 0, sizeof (struct ev_loop)); 1824 memset (EV_A, 0, sizeof (struct ev_loop));
1715 loop_init (EV_A_ flags); 1825 loop_init (EV_A_ flags);
1716 1826
1717 if (ev_backend (EV_A)) 1827 if (ev_backend (EV_A))
1718 return loop; 1828 return EV_A;
1719 1829
1720 return 0; 1830 return 0;
1721} 1831}
1722 1832
1723void 1833void
1768 verify_watcher (EV_A_ ws [cnt]); 1878 verify_watcher (EV_A_ ws [cnt]);
1769 } 1879 }
1770} 1880}
1771#endif 1881#endif
1772 1882
1773#if EV_MINIMAL < 2 1883#if EV_FEATURE_API
1774void 1884void
1775ev_loop_verify (EV_P) 1885ev_verify (EV_P)
1776{ 1886{
1777#if EV_VERIFY 1887#if EV_VERIFY
1778 int i; 1888 int i;
1779 WL w; 1889 WL w;
1780 1890
1819#if EV_ASYNC_ENABLE 1929#if EV_ASYNC_ENABLE
1820 assert (asyncmax >= asynccnt); 1930 assert (asyncmax >= asynccnt);
1821 array_verify (EV_A_ (W *)asyncs, asynccnt); 1931 array_verify (EV_A_ (W *)asyncs, asynccnt);
1822#endif 1932#endif
1823 1933
1934#if EV_PREPARE_ENABLE
1824 assert (preparemax >= preparecnt); 1935 assert (preparemax >= preparecnt);
1825 array_verify (EV_A_ (W *)prepares, preparecnt); 1936 array_verify (EV_A_ (W *)prepares, preparecnt);
1937#endif
1826 1938
1939#if EV_CHECK_ENABLE
1827 assert (checkmax >= checkcnt); 1940 assert (checkmax >= checkcnt);
1828 array_verify (EV_A_ (W *)checks, checkcnt); 1941 array_verify (EV_A_ (W *)checks, checkcnt);
1942#endif
1829 1943
1830# if 0 1944# if 0
1945#if EV_CHILD_ENABLE
1831 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)
1832 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1947 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1948#endif
1833# endif 1949# endif
1834#endif 1950#endif
1835} 1951}
1836#endif 1952#endif
1837 1953
1844#endif 1960#endif
1845{ 1961{
1846 if (!ev_default_loop_ptr) 1962 if (!ev_default_loop_ptr)
1847 { 1963 {
1848#if EV_MULTIPLICITY 1964#if EV_MULTIPLICITY
1849 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1965 EV_P = ev_default_loop_ptr = &default_loop_struct;
1850#else 1966#else
1851 ev_default_loop_ptr = 1; 1967 ev_default_loop_ptr = 1;
1852#endif 1968#endif
1853 1969
1854 loop_init (EV_A_ flags); 1970 loop_init (EV_A_ flags);
1855 1971
1856 if (ev_backend (EV_A)) 1972 if (ev_backend (EV_A))
1857 { 1973 {
1858#ifndef _WIN32 1974#if EV_CHILD_ENABLE
1859 ev_signal_init (&childev, childcb, SIGCHLD); 1975 ev_signal_init (&childev, childcb, SIGCHLD);
1860 ev_set_priority (&childev, EV_MAXPRI); 1976 ev_set_priority (&childev, EV_MAXPRI);
1861 ev_signal_start (EV_A_ &childev); 1977 ev_signal_start (EV_A_ &childev);
1862 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1978 ev_unref (EV_A); /* child watcher should not keep loop alive */
1863#endif 1979#endif
1871 1987
1872void 1988void
1873ev_default_destroy (void) 1989ev_default_destroy (void)
1874{ 1990{
1875#if EV_MULTIPLICITY 1991#if EV_MULTIPLICITY
1876 struct ev_loop *loop = ev_default_loop_ptr; 1992 EV_P = ev_default_loop_ptr;
1877#endif 1993#endif
1878 1994
1879 ev_default_loop_ptr = 0; 1995 ev_default_loop_ptr = 0;
1880 1996
1881#ifndef _WIN32 1997#if EV_CHILD_ENABLE
1882 ev_ref (EV_A); /* child watcher */ 1998 ev_ref (EV_A); /* child watcher */
1883 ev_signal_stop (EV_A_ &childev); 1999 ev_signal_stop (EV_A_ &childev);
1884#endif 2000#endif
1885 2001
1886 loop_destroy (EV_A); 2002 loop_destroy (EV_A);
1888 2004
1889void 2005void
1890ev_default_fork (void) 2006ev_default_fork (void)
1891{ 2007{
1892#if EV_MULTIPLICITY 2008#if EV_MULTIPLICITY
1893 struct ev_loop *loop = ev_default_loop_ptr; 2009 EV_P = ev_default_loop_ptr;
1894#endif 2010#endif
1895 2011
1896 postfork = 1; /* must be in line with ev_loop_fork */ 2012 postfork = 1; /* must be in line with ev_loop_fork */
1897} 2013}
1898 2014
1992 EV_FREQUENT_CHECK; 2108 EV_FREQUENT_CHECK;
1993 feed_reverse (EV_A_ (W)w); 2109 feed_reverse (EV_A_ (W)w);
1994 } 2110 }
1995 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2111 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1996 2112
1997 feed_reverse_done (EV_A_ EV_TIMEOUT); 2113 feed_reverse_done (EV_A_ EV_TIMER);
1998 } 2114 }
1999} 2115}
2000 2116
2001#if EV_PERIODIC_ENABLE 2117#if EV_PERIODIC_ENABLE
2002/* make periodics pending */ 2118/* make periodics pending */
2093 ANHE_at_cache (*he); 2209 ANHE_at_cache (*he);
2094 } 2210 }
2095} 2211}
2096 2212
2097/* fetch new monotonic and realtime times from the kernel */ 2213/* fetch new monotonic and realtime times from the kernel */
2098/* also detetc if there was a timejump, and act accordingly */ 2214/* also detect if there was a timejump, and act accordingly */
2099inline_speed void 2215inline_speed void
2100time_update (EV_P_ ev_tstamp max_block) 2216time_update (EV_P_ ev_tstamp max_block)
2101{ 2217{
2102#if EV_USE_MONOTONIC 2218#if EV_USE_MONOTONIC
2103 if (expect_true (have_monotonic)) 2219 if (expect_true (have_monotonic))
2163} 2279}
2164 2280
2165void 2281void
2166ev_loop (EV_P_ int flags) 2282ev_loop (EV_P_ int flags)
2167{ 2283{
2168#if EV_MINIMAL < 2 2284#if EV_FEATURE_API
2169 ++loop_depth; 2285 ++loop_depth;
2170#endif 2286#endif
2171 2287
2172 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2288 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2173 2289
2176 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2292 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2177 2293
2178 do 2294 do
2179 { 2295 {
2180#if EV_VERIFY >= 2 2296#if EV_VERIFY >= 2
2181 ev_loop_verify (EV_A); 2297 ev_verify (EV_A);
2182#endif 2298#endif
2183 2299
2184#ifndef _WIN32 2300#ifndef _WIN32
2185 if (expect_false (curpid)) /* penalise the forking check even more */ 2301 if (expect_false (curpid)) /* penalise the forking check even more */
2186 if (expect_false (getpid () != curpid)) 2302 if (expect_false (getpid () != curpid))
2198 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2314 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2199 EV_INVOKE_PENDING; 2315 EV_INVOKE_PENDING;
2200 } 2316 }
2201#endif 2317#endif
2202 2318
2319#if EV_PREPARE_ENABLE
2203 /* queue prepare watchers (and execute them) */ 2320 /* queue prepare watchers (and execute them) */
2204 if (expect_false (preparecnt)) 2321 if (expect_false (preparecnt))
2205 { 2322 {
2206 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2323 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2207 EV_INVOKE_PENDING; 2324 EV_INVOKE_PENDING;
2208 } 2325 }
2326#endif
2209 2327
2210 if (expect_false (loop_done)) 2328 if (expect_false (loop_done))
2211 break; 2329 break;
2212 2330
2213 /* we might have forked, so reify kernel state if necessary */ 2331 /* we might have forked, so reify kernel state if necessary */
2264 waittime -= sleeptime; 2382 waittime -= sleeptime;
2265 } 2383 }
2266 } 2384 }
2267 } 2385 }
2268 2386
2269#if EV_MINIMAL < 2 2387#if EV_FEATURE_API
2270 ++loop_count; 2388 ++loop_count;
2271#endif 2389#endif
2272 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2390 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2273 backend_poll (EV_A_ waittime); 2391 backend_poll (EV_A_ waittime);
2274 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2392 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2286#if EV_IDLE_ENABLE 2404#if EV_IDLE_ENABLE
2287 /* queue idle watchers unless other events are pending */ 2405 /* queue idle watchers unless other events are pending */
2288 idle_reify (EV_A); 2406 idle_reify (EV_A);
2289#endif 2407#endif
2290 2408
2409#if EV_CHECK_ENABLE
2291 /* queue check watchers, to be executed first */ 2410 /* queue check watchers, to be executed first */
2292 if (expect_false (checkcnt)) 2411 if (expect_false (checkcnt))
2293 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2412 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2413#endif
2294 2414
2295 EV_INVOKE_PENDING; 2415 EV_INVOKE_PENDING;
2296 } 2416 }
2297 while (expect_true ( 2417 while (expect_true (
2298 activecnt 2418 activecnt
2301 )); 2421 ));
2302 2422
2303 if (loop_done == EVUNLOOP_ONE) 2423 if (loop_done == EVUNLOOP_ONE)
2304 loop_done = EVUNLOOP_CANCEL; 2424 loop_done = EVUNLOOP_CANCEL;
2305 2425
2306#if EV_MINIMAL < 2 2426#if EV_FEATURE_API
2307 --loop_depth; 2427 --loop_depth;
2308#endif 2428#endif
2309} 2429}
2310 2430
2311void 2431void
2364inline_size void 2484inline_size void
2365wlist_del (WL *head, WL elem) 2485wlist_del (WL *head, WL elem)
2366{ 2486{
2367 while (*head) 2487 while (*head)
2368 { 2488 {
2369 if (*head == elem) 2489 if (expect_true (*head == elem))
2370 { 2490 {
2371 *head = elem->next; 2491 *head = elem->next;
2372 return; 2492 break;
2373 } 2493 }
2374 2494
2375 head = &(*head)->next; 2495 head = &(*head)->next;
2376 } 2496 }
2377} 2497}
2437 2557
2438 if (expect_false (ev_is_active (w))) 2558 if (expect_false (ev_is_active (w)))
2439 return; 2559 return;
2440 2560
2441 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2561 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2442 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))));
2443 2563
2444 EV_FREQUENT_CHECK; 2564 EV_FREQUENT_CHECK;
2445 2565
2446 ev_start (EV_A_ (W)w, 1); 2566 ev_start (EV_A_ (W)w, 1);
2447 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2567 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2517 timers [active] = timers [timercnt + HEAP0]; 2637 timers [active] = timers [timercnt + HEAP0];
2518 adjustheap (timers, timercnt, active); 2638 adjustheap (timers, timercnt, active);
2519 } 2639 }
2520 } 2640 }
2521 2641
2522 EV_FREQUENT_CHECK;
2523
2524 ev_at (w) -= mn_now; 2642 ev_at (w) -= mn_now;
2525 2643
2526 ev_stop (EV_A_ (W)w); 2644 ev_stop (EV_A_ (W)w);
2645
2646 EV_FREQUENT_CHECK;
2527} 2647}
2528 2648
2529void noinline 2649void noinline
2530ev_timer_again (EV_P_ ev_timer *w) 2650ev_timer_again (EV_P_ ev_timer *w)
2531{ 2651{
2610 periodics [active] = periodics [periodiccnt + HEAP0]; 2730 periodics [active] = periodics [periodiccnt + HEAP0];
2611 adjustheap (periodics, periodiccnt, active); 2731 adjustheap (periodics, periodiccnt, active);
2612 } 2732 }
2613 } 2733 }
2614 2734
2615 EV_FREQUENT_CHECK;
2616
2617 ev_stop (EV_A_ (W)w); 2735 ev_stop (EV_A_ (W)w);
2736
2737 EV_FREQUENT_CHECK;
2618} 2738}
2619 2739
2620void noinline 2740void noinline
2621ev_periodic_again (EV_P_ ev_periodic *w) 2741ev_periodic_again (EV_P_ ev_periodic *w)
2622{ 2742{
2628 2748
2629#ifndef SA_RESTART 2749#ifndef SA_RESTART
2630# define SA_RESTART 0 2750# define SA_RESTART 0
2631#endif 2751#endif
2632 2752
2753#if EV_SIGNAL_ENABLE
2754
2633void noinline 2755void noinline
2634ev_signal_start (EV_P_ ev_signal *w) 2756ev_signal_start (EV_P_ ev_signal *w)
2635{ 2757{
2636#if EV_MULTIPLICITY
2637 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2638#endif
2639 if (expect_false (ev_is_active (w))) 2758 if (expect_false (ev_is_active (w)))
2640 return; 2759 return;
2641 2760
2642 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));
2762
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));
2766
2767 signals [w->signum - 1].loop = EV_A;
2768#endif
2643 2769
2644 EV_FREQUENT_CHECK; 2770 EV_FREQUENT_CHECK;
2645 2771
2646#if EV_USE_SIGNALFD 2772#if EV_USE_SIGNALFD
2647 if (sigfd == -2) 2773 if (sigfd == -2)
2669 sigaddset (&sigfd_set, w->signum); 2795 sigaddset (&sigfd_set, w->signum);
2670 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2796 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2671 2797
2672 signalfd (sigfd, &sigfd_set, 0); 2798 signalfd (sigfd, &sigfd_set, 0);
2673 } 2799 }
2674 else
2675#endif
2676 evpipe_init (EV_A);
2677
2678 {
2679#ifndef _WIN32
2680 sigset_t full, prev;
2681 sigfillset (&full);
2682 sigprocmask (SIG_SETMASK, &full, &prev);
2683#endif
2684
2685 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2686
2687#ifndef _WIN32
2688# if EV_USE_SIGNALFD
2689 if (sigfd < 0)/*TODO*/
2690# endif 2800#endif
2691 sigdelset (&prev, w->signum);
2692 sigprocmask (SIG_SETMASK, &prev, 0);
2693#endif
2694 }
2695 2801
2696 ev_start (EV_A_ (W)w, 1); 2802 ev_start (EV_A_ (W)w, 1);
2697 wlist_add (&signals [w->signum - 1].head, (WL)w); 2803 wlist_add (&signals [w->signum - 1].head, (WL)w);
2698 2804
2699 if (!((WL)w)->next) 2805 if (!((WL)w)->next)
2700 {
2701#if _WIN32
2702 signal (w->signum, ev_sighandler);
2703#else
2704# if EV_USE_SIGNALFD 2806# if EV_USE_SIGNALFD
2705 if (sigfd < 0) /*TODO*/ 2807 if (sigfd < 0) /*TODO*/
2706# endif 2808# endif
2707 { 2809 {
2810# ifdef _WIN32
2811 evpipe_init (EV_A);
2812
2813 signal (w->signum, ev_sighandler);
2814# else
2708 struct sigaction sa = { }; 2815 struct sigaction sa;
2816
2817 evpipe_init (EV_A);
2818
2709 sa.sa_handler = ev_sighandler; 2819 sa.sa_handler = ev_sighandler;
2710 sigfillset (&sa.sa_mask); 2820 sigfillset (&sa.sa_mask);
2711 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 */
2712 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);
2827#endif
2713 } 2828 }
2714#endif
2715 }
2716 2829
2717 EV_FREQUENT_CHECK; 2830 EV_FREQUENT_CHECK;
2718} 2831}
2719 2832
2720void noinline 2833void noinline
2728 2841
2729 wlist_del (&signals [w->signum - 1].head, (WL)w); 2842 wlist_del (&signals [w->signum - 1].head, (WL)w);
2730 ev_stop (EV_A_ (W)w); 2843 ev_stop (EV_A_ (W)w);
2731 2844
2732 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
2733#if EV_USE_SIGNALFD 2850#if EV_USE_SIGNALFD
2734 if (sigfd >= 0) 2851 if (sigfd >= 0)
2735 { 2852 {
2736 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2853 sigset_t ss;
2854
2855 sigemptyset (&ss);
2856 sigaddset (&ss, w->signum);
2737 sigdelset (&sigfd_set, w->signum); 2857 sigdelset (&sigfd_set, w->signum);
2858
2738 signalfd (sigfd, &sigfd_set, 0); 2859 signalfd (sigfd, &sigfd_set, 0);
2739 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2860 sigprocmask (SIG_UNBLOCK, &ss, 0);
2740 /*TODO: maybe unblock signal? */
2741 } 2861 }
2742 else 2862 else
2743#endif 2863#endif
2744 signal (w->signum, SIG_DFL); 2864 signal (w->signum, SIG_DFL);
2865 }
2745 2866
2746 EV_FREQUENT_CHECK; 2867 EV_FREQUENT_CHECK;
2747} 2868}
2869
2870#endif
2871
2872#if EV_CHILD_ENABLE
2748 2873
2749void 2874void
2750ev_child_start (EV_P_ ev_child *w) 2875ev_child_start (EV_P_ ev_child *w)
2751{ 2876{
2752#if EV_MULTIPLICITY 2877#if EV_MULTIPLICITY
2756 return; 2881 return;
2757 2882
2758 EV_FREQUENT_CHECK; 2883 EV_FREQUENT_CHECK;
2759 2884
2760 ev_start (EV_A_ (W)w, 1); 2885 ev_start (EV_A_ (W)w, 1);
2761 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2886 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2762 2887
2763 EV_FREQUENT_CHECK; 2888 EV_FREQUENT_CHECK;
2764} 2889}
2765 2890
2766void 2891void
2770 if (expect_false (!ev_is_active (w))) 2895 if (expect_false (!ev_is_active (w)))
2771 return; 2896 return;
2772 2897
2773 EV_FREQUENT_CHECK; 2898 EV_FREQUENT_CHECK;
2774 2899
2775 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2900 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2776 ev_stop (EV_A_ (W)w); 2901 ev_stop (EV_A_ (W)w);
2777 2902
2778 EV_FREQUENT_CHECK; 2903 EV_FREQUENT_CHECK;
2779} 2904}
2905
2906#endif
2780 2907
2781#if EV_STAT_ENABLE 2908#if EV_STAT_ENABLE
2782 2909
2783# ifdef _WIN32 2910# ifdef _WIN32
2784# undef lstat 2911# undef lstat
2790#define MIN_STAT_INTERVAL 0.1074891 2917#define MIN_STAT_INTERVAL 0.1074891
2791 2918
2792static 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);
2793 2920
2794#if EV_USE_INOTIFY 2921#if EV_USE_INOTIFY
2795# 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)
2796 2925
2797static void noinline 2926static void noinline
2798infy_add (EV_P_ ev_stat *w) 2927infy_add (EV_P_ ev_stat *w)
2799{ 2928{
2800 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);
2801 2930
2802 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 */
2803 { 2951 }
2952 else
2953 {
2954 /* can't use inotify, continue to stat */
2804 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2955 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2805 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2806 2956
2807 /* monitor some parent directory for speedup hints */ 2957 /* if path is not there, monitor some parent directory for speedup hints */
2808 /* 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, */
2809 /* but an efficiency issue only */ 2959 /* but an efficiency issue only */
2810 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2960 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2811 { 2961 {
2812 char path [4096]; 2962 char path [4096];
2828 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2978 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2829 } 2979 }
2830 } 2980 }
2831 2981
2832 if (w->wd >= 0) 2982 if (w->wd >= 0)
2833 {
2834 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);
2835 2984
2836 /* now local changes will be tracked by inotify, but remote changes won't */ 2985 /* now re-arm timer, if required */
2837 /* unless the filesystem it known to be local, we therefore still poll */ 2986 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2838 /* also do poll on <2.6.25, but with normal frequency */
2839 struct statfs sfs;
2840
2841 if (fs_2625 && !statfs (w->path, &sfs))
2842 if (sfs.f_type == 0x1373 /* devfs */
2843 || sfs.f_type == 0xEF53 /* ext2/3 */
2844 || sfs.f_type == 0x3153464a /* jfs */
2845 || sfs.f_type == 0x52654973 /* reiser3 */
2846 || sfs.f_type == 0x01021994 /* tempfs */
2847 || sfs.f_type == 0x58465342 /* xfs */)
2848 return;
2849
2850 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2851 ev_timer_again (EV_A_ &w->timer); 2987 ev_timer_again (EV_A_ &w->timer);
2852 } 2988 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2853} 2989}
2854 2990
2855static void noinline 2991static void noinline
2856infy_del (EV_P_ ev_stat *w) 2992infy_del (EV_P_ ev_stat *w)
2857{ 2993{
2860 2996
2861 if (wd < 0) 2997 if (wd < 0)
2862 return; 2998 return;
2863 2999
2864 w->wd = -2; 3000 w->wd = -2;
2865 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3001 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2866 wlist_del (&fs_hash [slot].head, (WL)w); 3002 wlist_del (&fs_hash [slot].head, (WL)w);
2867 3003
2868 /* remove this watcher, if others are watching it, they will rearm */ 3004 /* remove this watcher, if others are watching it, they will rearm */
2869 inotify_rm_watch (fs_fd, wd); 3005 inotify_rm_watch (fs_fd, wd);
2870} 3006}
2872static void noinline 3008static void noinline
2873infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3009infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2874{ 3010{
2875 if (slot < 0) 3011 if (slot < 0)
2876 /* overflow, need to check for all hash slots */ 3012 /* overflow, need to check for all hash slots */
2877 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3013 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2878 infy_wd (EV_A_ slot, wd, ev); 3014 infy_wd (EV_A_ slot, wd, ev);
2879 else 3015 else
2880 { 3016 {
2881 WL w_; 3017 WL w_;
2882 3018
2883 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3019 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2884 { 3020 {
2885 ev_stat *w = (ev_stat *)w_; 3021 ev_stat *w = (ev_stat *)w_;
2886 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 */
2887 3023
2888 if (w->wd == wd || wd == -1) 3024 if (w->wd == wd || wd == -1)
2889 { 3025 {
2890 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3026 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2891 { 3027 {
2892 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);
2893 w->wd = -1; 3029 w->wd = -1;
2894 infy_add (EV_A_ w); /* re-add, no matter what */ 3030 infy_add (EV_A_ w); /* re-add, no matter what */
2895 } 3031 }
2896 3032
2897 stat_timer_cb (EV_A_ &w->timer, 0); 3033 stat_timer_cb (EV_A_ &w->timer, 0);
2902 3038
2903static void 3039static void
2904infy_cb (EV_P_ ev_io *w, int revents) 3040infy_cb (EV_P_ ev_io *w, int revents)
2905{ 3041{
2906 char buf [EV_INOTIFY_BUFSIZE]; 3042 char buf [EV_INOTIFY_BUFSIZE];
2907 struct inotify_event *ev = (struct inotify_event *)buf;
2908 int ofs; 3043 int ofs;
2909 int len = read (fs_fd, buf, sizeof (buf)); 3044 int len = read (fs_fd, buf, sizeof (buf));
2910 3045
2911 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);
2912 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;
2913} 3084}
2914 3085
2915inline_size void 3086inline_size void
2916check_2625 (EV_P) 3087ev_check_2625 (EV_P)
2917{ 3088{
2918 /* kernels < 2.6.25 are borked 3089 /* kernels < 2.6.25 are borked
2919 * 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
2920 */ 3091 */
2921 struct utsname buf; 3092 if (ev_linux_version () < 0x020619)
2922 int major, minor, micro;
2923
2924 if (uname (&buf))
2925 return; 3093 return;
2926 3094
2927 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2928 return;
2929
2930 if (major < 2
2931 || (major == 2 && minor < 6)
2932 || (major == 2 && minor == 6 && micro < 25))
2933 return;
2934
2935 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 ();
2936} 3107}
2937 3108
2938inline_size void 3109inline_size void
2939infy_init (EV_P) 3110infy_init (EV_P)
2940{ 3111{
2941 if (fs_fd != -2) 3112 if (fs_fd != -2)
2942 return; 3113 return;
2943 3114
2944 fs_fd = -1; 3115 fs_fd = -1;
2945 3116
2946 check_2625 (EV_A); 3117 ev_check_2625 (EV_A);
2947 3118
2948 fs_fd = inotify_init (); 3119 fs_fd = infy_newfd ();
2949 3120
2950 if (fs_fd >= 0) 3121 if (fs_fd >= 0)
2951 { 3122 {
3123 fd_intern (fs_fd);
2952 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3124 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2953 ev_set_priority (&fs_w, EV_MAXPRI); 3125 ev_set_priority (&fs_w, EV_MAXPRI);
2954 ev_io_start (EV_A_ &fs_w); 3126 ev_io_start (EV_A_ &fs_w);
3127 ev_unref (EV_A);
2955 } 3128 }
2956} 3129}
2957 3130
2958inline_size void 3131inline_size void
2959infy_fork (EV_P) 3132infy_fork (EV_P)
2961 int slot; 3134 int slot;
2962 3135
2963 if (fs_fd < 0) 3136 if (fs_fd < 0)
2964 return; 3137 return;
2965 3138
3139 ev_ref (EV_A);
3140 ev_io_stop (EV_A_ &fs_w);
2966 close (fs_fd); 3141 close (fs_fd);
2967 fs_fd = inotify_init (); 3142 fs_fd = infy_newfd ();
2968 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
2969 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3152 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2970 { 3153 {
2971 WL w_ = fs_hash [slot].head; 3154 WL w_ = fs_hash [slot].head;
2972 fs_hash [slot].head = 0; 3155 fs_hash [slot].head = 0;
2973 3156
2974 while (w_) 3157 while (w_)
2979 w->wd = -1; 3162 w->wd = -1;
2980 3163
2981 if (fs_fd >= 0) 3164 if (fs_fd >= 0)
2982 infy_add (EV_A_ w); /* re-add, no matter what */ 3165 infy_add (EV_A_ w); /* re-add, no matter what */
2983 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);
2984 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 }
2985 } 3173 }
2986 } 3174 }
2987} 3175}
2988 3176
2989#endif 3177#endif
3006static void noinline 3194static void noinline
3007stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3195stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3008{ 3196{
3009 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3197 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3010 3198
3011 /* we copy this here each the time so that */ 3199 ev_statdata prev = w->attr;
3012 /* prev has the old value when the callback gets invoked */
3013 w->prev = w->attr;
3014 ev_stat_stat (EV_A_ w); 3200 ev_stat_stat (EV_A_ w);
3015 3201
3016 /* 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 */
3017 if ( 3203 if (
3018 w->prev.st_dev != w->attr.st_dev 3204 prev.st_dev != w->attr.st_dev
3019 || w->prev.st_ino != w->attr.st_ino 3205 || prev.st_ino != w->attr.st_ino
3020 || w->prev.st_mode != w->attr.st_mode 3206 || prev.st_mode != w->attr.st_mode
3021 || w->prev.st_nlink != w->attr.st_nlink 3207 || prev.st_nlink != w->attr.st_nlink
3022 || w->prev.st_uid != w->attr.st_uid 3208 || prev.st_uid != w->attr.st_uid
3023 || w->prev.st_gid != w->attr.st_gid 3209 || prev.st_gid != w->attr.st_gid
3024 || w->prev.st_rdev != w->attr.st_rdev 3210 || prev.st_rdev != w->attr.st_rdev
3025 || w->prev.st_size != w->attr.st_size 3211 || prev.st_size != w->attr.st_size
3026 || w->prev.st_atime != w->attr.st_atime 3212 || prev.st_atime != w->attr.st_atime
3027 || w->prev.st_mtime != w->attr.st_mtime 3213 || prev.st_mtime != w->attr.st_mtime
3028 || w->prev.st_ctime != w->attr.st_ctime 3214 || prev.st_ctime != w->attr.st_ctime
3029 ) { 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
3030 #if EV_USE_INOTIFY 3221 #if EV_USE_INOTIFY
3031 if (fs_fd >= 0) 3222 if (fs_fd >= 0)
3032 { 3223 {
3033 infy_del (EV_A_ w); 3224 infy_del (EV_A_ w);
3034 infy_add (EV_A_ w); 3225 infy_add (EV_A_ w);
3059 3250
3060 if (fs_fd >= 0) 3251 if (fs_fd >= 0)
3061 infy_add (EV_A_ w); 3252 infy_add (EV_A_ w);
3062 else 3253 else
3063#endif 3254#endif
3255 {
3064 ev_timer_again (EV_A_ &w->timer); 3256 ev_timer_again (EV_A_ &w->timer);
3257 ev_unref (EV_A);
3258 }
3065 3259
3066 ev_start (EV_A_ (W)w, 1); 3260 ev_start (EV_A_ (W)w, 1);
3067 3261
3068 EV_FREQUENT_CHECK; 3262 EV_FREQUENT_CHECK;
3069} 3263}
3078 EV_FREQUENT_CHECK; 3272 EV_FREQUENT_CHECK;
3079 3273
3080#if EV_USE_INOTIFY 3274#if EV_USE_INOTIFY
3081 infy_del (EV_A_ w); 3275 infy_del (EV_A_ w);
3082#endif 3276#endif
3277
3278 if (ev_is_active (&w->timer))
3279 {
3280 ev_ref (EV_A);
3083 ev_timer_stop (EV_A_ &w->timer); 3281 ev_timer_stop (EV_A_ &w->timer);
3282 }
3084 3283
3085 ev_stop (EV_A_ (W)w); 3284 ev_stop (EV_A_ (W)w);
3086 3285
3087 EV_FREQUENT_CHECK; 3286 EV_FREQUENT_CHECK;
3088} 3287}
3133 3332
3134 EV_FREQUENT_CHECK; 3333 EV_FREQUENT_CHECK;
3135} 3334}
3136#endif 3335#endif
3137 3336
3337#if EV_PREPARE_ENABLE
3138void 3338void
3139ev_prepare_start (EV_P_ ev_prepare *w) 3339ev_prepare_start (EV_P_ ev_prepare *w)
3140{ 3340{
3141 if (expect_false (ev_is_active (w))) 3341 if (expect_false (ev_is_active (w)))
3142 return; 3342 return;
3168 3368
3169 ev_stop (EV_A_ (W)w); 3369 ev_stop (EV_A_ (W)w);
3170 3370
3171 EV_FREQUENT_CHECK; 3371 EV_FREQUENT_CHECK;
3172} 3372}
3373#endif
3173 3374
3375#if EV_CHECK_ENABLE
3174void 3376void
3175ev_check_start (EV_P_ ev_check *w) 3377ev_check_start (EV_P_ ev_check *w)
3176{ 3378{
3177 if (expect_false (ev_is_active (w))) 3379 if (expect_false (ev_is_active (w)))
3178 return; 3380 return;
3204 3406
3205 ev_stop (EV_A_ (W)w); 3407 ev_stop (EV_A_ (W)w);
3206 3408
3207 EV_FREQUENT_CHECK; 3409 EV_FREQUENT_CHECK;
3208} 3410}
3411#endif
3209 3412
3210#if EV_EMBED_ENABLE 3413#if EV_EMBED_ENABLE
3211void noinline 3414void noinline
3212ev_embed_sweep (EV_P_ ev_embed *w) 3415ev_embed_sweep (EV_P_ ev_embed *w)
3213{ 3416{
3229embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3432embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3230{ 3433{
3231 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3434 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3232 3435
3233 { 3436 {
3234 struct ev_loop *loop = w->other; 3437 EV_P = w->other;
3235 3438
3236 while (fdchangecnt) 3439 while (fdchangecnt)
3237 { 3440 {
3238 fd_reify (EV_A); 3441 fd_reify (EV_A);
3239 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3442 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3247 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));
3248 3451
3249 ev_embed_stop (EV_A_ w); 3452 ev_embed_stop (EV_A_ w);
3250 3453
3251 { 3454 {
3252 struct ev_loop *loop = w->other; 3455 EV_P = w->other;
3253 3456
3254 ev_loop_fork (EV_A); 3457 ev_loop_fork (EV_A);
3255 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3458 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3256 } 3459 }
3257 3460
3271{ 3474{
3272 if (expect_false (ev_is_active (w))) 3475 if (expect_false (ev_is_active (w)))
3273 return; 3476 return;
3274 3477
3275 { 3478 {
3276 struct ev_loop *loop = w->other; 3479 EV_P = w->other;
3277 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 ()));
3278 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);
3279 } 3482 }
3280 3483
3281 EV_FREQUENT_CHECK; 3484 EV_FREQUENT_CHECK;
3308 3511
3309 ev_io_stop (EV_A_ &w->io); 3512 ev_io_stop (EV_A_ &w->io);
3310 ev_prepare_stop (EV_A_ &w->prepare); 3513 ev_prepare_stop (EV_A_ &w->prepare);
3311 ev_fork_stop (EV_A_ &w->fork); 3514 ev_fork_stop (EV_A_ &w->fork);
3312 3515
3516 ev_stop (EV_A_ (W)w);
3517
3313 EV_FREQUENT_CHECK; 3518 EV_FREQUENT_CHECK;
3314} 3519}
3315#endif 3520#endif
3316 3521
3317#if EV_FORK_ENABLE 3522#if EV_FORK_ENABLE
3393 3598
3394void 3599void
3395ev_async_send (EV_P_ ev_async *w) 3600ev_async_send (EV_P_ ev_async *w)
3396{ 3601{
3397 w->sent = 1; 3602 w->sent = 1;
3398 evpipe_write (EV_A_ &gotasync); 3603 evpipe_write (EV_A_ &async_pending);
3399} 3604}
3400#endif 3605#endif
3401 3606
3402/*****************************************************************************/ 3607/*****************************************************************************/
3403 3608
3443{ 3648{
3444 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));
3445 3650
3446 if (expect_false (!once)) 3651 if (expect_false (!once))
3447 { 3652 {
3448 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3653 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3449 return; 3654 return;
3450 } 3655 }
3451 3656
3452 once->cb = cb; 3657 once->cb = cb;
3453 once->arg = arg; 3658 once->arg = arg;
3540 if (types & EV_ASYNC) 3745 if (types & EV_ASYNC)
3541 for (i = asynccnt; i--; ) 3746 for (i = asynccnt; i--; )
3542 cb (EV_A_ EV_ASYNC, asyncs [i]); 3747 cb (EV_A_ EV_ASYNC, asyncs [i]);
3543#endif 3748#endif
3544 3749
3750#if EV_PREPARE_ENABLE
3545 if (types & EV_PREPARE) 3751 if (types & EV_PREPARE)
3546 for (i = preparecnt; i--; ) 3752 for (i = preparecnt; i--; )
3547#if EV_EMBED_ENABLE 3753# if EV_EMBED_ENABLE
3548 if (ev_cb (prepares [i]) != embed_prepare_cb) 3754 if (ev_cb (prepares [i]) != embed_prepare_cb)
3549#endif 3755# endif
3550 cb (EV_A_ EV_PREPARE, prepares [i]); 3756 cb (EV_A_ EV_PREPARE, prepares [i]);
3757#endif
3551 3758
3759#if EV_CHECK_ENABLE
3552 if (types & EV_CHECK) 3760 if (types & EV_CHECK)
3553 for (i = checkcnt; i--; ) 3761 for (i = checkcnt; i--; )
3554 cb (EV_A_ EV_CHECK, checks [i]); 3762 cb (EV_A_ EV_CHECK, checks [i]);
3763#endif
3555 3764
3765#if EV_SIGNAL_ENABLE
3556 if (types & EV_SIGNAL) 3766 if (types & EV_SIGNAL)
3557 for (i = 0; i < signalmax; ++i) 3767 for (i = 0; i < EV_NSIG - 1; ++i)
3558 for (wl = signals [i].head; wl; ) 3768 for (wl = signals [i].head; wl; )
3559 { 3769 {
3560 wn = wl->next; 3770 wn = wl->next;
3561 cb (EV_A_ EV_SIGNAL, wl); 3771 cb (EV_A_ EV_SIGNAL, wl);
3562 wl = wn; 3772 wl = wn;
3563 } 3773 }
3774#endif
3564 3775
3776#if EV_CHILD_ENABLE
3565 if (types & EV_CHILD) 3777 if (types & EV_CHILD)
3566 for (i = EV_PID_HASHSIZE; i--; ) 3778 for (i = (EV_PID_HASHSIZE); i--; )
3567 for (wl = childs [i]; wl; ) 3779 for (wl = childs [i]; wl; )
3568 { 3780 {
3569 wn = wl->next; 3781 wn = wl->next;
3570 cb (EV_A_ EV_CHILD, wl); 3782 cb (EV_A_ EV_CHILD, wl);
3571 wl = wn; 3783 wl = wn;
3572 } 3784 }
3785#endif
3573/* EV_STAT 0x00001000 /* stat data changed */ 3786/* EV_STAT 0x00001000 /* stat data changed */
3574/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3787/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3575} 3788}
3576#endif 3789#endif
3577 3790

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines