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

Comparing libev/ev.c (file contents):
Revision 1.295 by root, Wed Jul 8 04:29:31 2009 UTC vs.
Revision 1.338 by root, Tue Mar 16 00:20:17 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 *
110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD 147# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
141# else 149# else
142# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
145 153
146#endif 154#endif
147 155
148#include <math.h> 156#include <math.h>
149#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
150#include <fcntl.h> 159#include <fcntl.h>
151#include <stddef.h> 160#include <stddef.h>
152 161
153#include <stdio.h> 162#include <stdio.h>
154 163
155#include <assert.h> 164#include <assert.h>
156#include <errno.h> 165#include <errno.h>
157#include <sys/types.h> 166#include <sys/types.h>
158#include <time.h> 167#include <time.h>
168#include <limits.h>
159 169
160#include <signal.h> 170#include <signal.h>
161 171
162#ifdef EV_H 172#ifdef EV_H
163# include EV_H 173# include EV_H
174# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
175# include <windows.h> 185# include <windows.h>
176# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
177# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
178# endif 188# endif
189# undef EV_AVOID_STDIO
179#endif 190#endif
180 191
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 192/* this block tries to deduce configuration from header-defined symbols and defaults */
193
194/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG)
196/* use what's provided */
197#elif defined (NSIG)
198# define EV_NSIG (NSIG)
199#elif defined(_NSIG)
200# define EV_NSIG (_NSIG)
201#elif defined (SIGMAX)
202# define EV_NSIG (SIGMAX+1)
203#elif defined (SIG_MAX)
204# define EV_NSIG (SIG_MAX+1)
205#elif defined (_SIG_MAX)
206# define EV_NSIG (_SIG_MAX+1)
207#elif defined (MAXSIG)
208# define EV_NSIG (MAXSIG+1)
209#elif defined (MAX_SIG)
210# define EV_NSIG (MAX_SIG+1)
211#elif defined (SIGARRAYSIZE)
212# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
213#elif defined (_sys_nsig)
214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
215#else
216# error "unable to find value for NSIG, please report"
217/* to make it compile regardless, just remove the above line, */
218/* but consider reporting it, too! :) */
219# define EV_NSIG 65
220#endif
182 221
183#ifndef EV_USE_CLOCK_SYSCALL 222#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 223# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 224# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
186# else 225# else
187# define EV_USE_CLOCK_SYSCALL 0 226# define EV_USE_CLOCK_SYSCALL 0
188# endif 227# endif
189#endif 228#endif
190 229
191#ifndef EV_USE_MONOTONIC 230#ifndef EV_USE_MONOTONIC
192# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 231# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
193# define EV_USE_MONOTONIC 1 232# define EV_USE_MONOTONIC EV_FEATURE_OS
194# else 233# else
195# define EV_USE_MONOTONIC 0 234# define EV_USE_MONOTONIC 0
196# endif 235# endif
197#endif 236#endif
198 237
200# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 239# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
201#endif 240#endif
202 241
203#ifndef EV_USE_NANOSLEEP 242#ifndef EV_USE_NANOSLEEP
204# if _POSIX_C_SOURCE >= 199309L 243# if _POSIX_C_SOURCE >= 199309L
205# define EV_USE_NANOSLEEP 1 244# define EV_USE_NANOSLEEP EV_FEATURE_OS
206# else 245# else
207# define EV_USE_NANOSLEEP 0 246# define EV_USE_NANOSLEEP 0
208# endif 247# endif
209#endif 248#endif
210 249
211#ifndef EV_USE_SELECT 250#ifndef EV_USE_SELECT
212# define EV_USE_SELECT 1 251# define EV_USE_SELECT EV_FEATURE_BACKENDS
213#endif 252#endif
214 253
215#ifndef EV_USE_POLL 254#ifndef EV_USE_POLL
216# ifdef _WIN32 255# ifdef _WIN32
217# define EV_USE_POLL 0 256# define EV_USE_POLL 0
218# else 257# else
219# define EV_USE_POLL 1 258# define EV_USE_POLL EV_FEATURE_BACKENDS
220# endif 259# endif
221#endif 260#endif
222 261
223#ifndef EV_USE_EPOLL 262#ifndef EV_USE_EPOLL
224# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 263# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
225# define EV_USE_EPOLL 1 264# define EV_USE_EPOLL EV_FEATURE_BACKENDS
226# else 265# else
227# define EV_USE_EPOLL 0 266# define EV_USE_EPOLL 0
228# endif 267# endif
229#endif 268#endif
230 269
236# define EV_USE_PORT 0 275# define EV_USE_PORT 0
237#endif 276#endif
238 277
239#ifndef EV_USE_INOTIFY 278#ifndef EV_USE_INOTIFY
240# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 279# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
241# define EV_USE_INOTIFY 1 280# define EV_USE_INOTIFY EV_FEATURE_OS
242# else 281# else
243# define EV_USE_INOTIFY 0 282# define EV_USE_INOTIFY 0
244# endif 283# endif
245#endif 284#endif
246 285
247#ifndef EV_PID_HASHSIZE 286#ifndef EV_PID_HASHSIZE
248# if EV_MINIMAL 287# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
249# define EV_PID_HASHSIZE 1
250# else
251# define EV_PID_HASHSIZE 16
252# endif
253#endif 288#endif
254 289
255#ifndef EV_INOTIFY_HASHSIZE 290#ifndef EV_INOTIFY_HASHSIZE
256# if EV_MINIMAL 291# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
257# define EV_INOTIFY_HASHSIZE 1
258# else
259# define EV_INOTIFY_HASHSIZE 16
260# endif
261#endif 292#endif
262 293
263#ifndef EV_USE_EVENTFD 294#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 295# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 296# define EV_USE_EVENTFD EV_FEATURE_OS
266# else 297# else
267# define EV_USE_EVENTFD 0 298# define EV_USE_EVENTFD 0
299# endif
300#endif
301
302#ifndef EV_USE_SIGNALFD
303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
304# define EV_USE_SIGNALFD EV_FEATURE_OS
305# else
306# define EV_USE_SIGNALFD 0
268# endif 307# endif
269#endif 308#endif
270 309
271#if 0 /* debugging */ 310#if 0 /* debugging */
272# define EV_VERIFY 3 311# define EV_VERIFY 3
273# define EV_USE_4HEAP 1 312# define EV_USE_4HEAP 1
274# define EV_HEAP_CACHE_AT 1 313# define EV_HEAP_CACHE_AT 1
275#endif 314#endif
276 315
277#ifndef EV_VERIFY 316#ifndef EV_VERIFY
278# define EV_VERIFY !EV_MINIMAL 317# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
279#endif 318#endif
280 319
281#ifndef EV_USE_4HEAP 320#ifndef EV_USE_4HEAP
282# define EV_USE_4HEAP !EV_MINIMAL 321# define EV_USE_4HEAP EV_FEATURE_DATA
283#endif 322#endif
284 323
285#ifndef EV_HEAP_CACHE_AT 324#ifndef EV_HEAP_CACHE_AT
286# define EV_HEAP_CACHE_AT !EV_MINIMAL 325# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
287#endif 326#endif
288 327
289/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 328/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
290/* which makes programs even slower. might work on other unices, too. */ 329/* which makes programs even slower. might work on other unices, too. */
291#if EV_USE_CLOCK_SYSCALL 330#if EV_USE_CLOCK_SYSCALL
300# endif 339# endif
301#endif 340#endif
302 341
303/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 342/* this block fixes any misconfiguration where we know we run into trouble otherwise */
304 343
344#ifdef _AIX
345/* AIX has a completely broken poll.h header */
346# undef EV_USE_POLL
347# define EV_USE_POLL 0
348#endif
349
305#ifndef CLOCK_MONOTONIC 350#ifndef CLOCK_MONOTONIC
306# undef EV_USE_MONOTONIC 351# undef EV_USE_MONOTONIC
307# define EV_USE_MONOTONIC 0 352# define EV_USE_MONOTONIC 0
308#endif 353#endif
309 354
339#endif 384#endif
340 385
341#if EV_USE_EVENTFD 386#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 387/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 388# include <stdint.h>
389# ifndef EFD_NONBLOCK
390# define EFD_NONBLOCK O_NONBLOCK
391# endif
392# ifndef EFD_CLOEXEC
393# ifdef O_CLOEXEC
394# define EFD_CLOEXEC O_CLOEXEC
395# else
396# define EFD_CLOEXEC 02000000
397# endif
398# endif
344# ifdef __cplusplus 399# ifdef __cplusplus
345extern "C" { 400extern "C" {
346# endif 401# endif
347int eventfd (unsigned int initval, int flags); 402int (eventfd) (unsigned int initval, int flags);
348# ifdef __cplusplus 403# ifdef __cplusplus
349} 404}
350# endif 405# endif
351#endif 406#endif
407
408#if EV_USE_SIGNALFD
409/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
410# include <stdint.h>
411# ifndef SFD_NONBLOCK
412# define SFD_NONBLOCK O_NONBLOCK
413# endif
414# ifndef SFD_CLOEXEC
415# ifdef O_CLOEXEC
416# define SFD_CLOEXEC O_CLOEXEC
417# else
418# define SFD_CLOEXEC 02000000
419# endif
420# endif
421# ifdef __cplusplus
422extern "C" {
423# endif
424int signalfd (int fd, const sigset_t *mask, int flags);
425
426struct signalfd_siginfo
427{
428 uint32_t ssi_signo;
429 char pad[128 - sizeof (uint32_t)];
430};
431# ifdef __cplusplus
432}
433# endif
434#endif
435
352 436
353/**/ 437/**/
354 438
355#if EV_VERIFY >= 3 439#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 440# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
368 */ 452 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 453#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 454
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 455#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
372#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 456#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
373/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
374 457
375#if __GNUC__ >= 4 458#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 459# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 460# define noinline __attribute__ ((noinline))
378#else 461#else
385 468
386#define expect_false(expr) expect ((expr) != 0, 0) 469#define expect_false(expr) expect ((expr) != 0, 0)
387#define expect_true(expr) expect ((expr) != 0, 1) 470#define expect_true(expr) expect ((expr) != 0, 1)
388#define inline_size static inline 471#define inline_size static inline
389 472
390#if EV_MINIMAL 473#if EV_FEATURE_CODE
474# define inline_speed static inline
475#else
391# define inline_speed static noinline 476# define inline_speed static noinline
392#else
393# define inline_speed static inline
394#endif 477#endif
395 478
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 479#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
397 480
398#if EV_MINPRI == EV_MAXPRI 481#if EV_MINPRI == EV_MAXPRI
419 502
420#if EV_USE_MONOTONIC 503#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 504static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
422#endif 505#endif
423 506
507#ifndef EV_FD_TO_WIN32_HANDLE
508# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
509#endif
510#ifndef EV_WIN32_HANDLE_TO_FD
511# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
512#endif
513#ifndef EV_WIN32_CLOSE_FD
514# define EV_WIN32_CLOSE_FD(fd) close (fd)
515#endif
516
424#ifdef _WIN32 517#ifdef _WIN32
425# include "ev_win32.c" 518# include "ev_win32.c"
426#endif 519#endif
427 520
428/*****************************************************************************/ 521/*****************************************************************************/
522
523#if EV_AVOID_STDIO
524static void noinline
525ev_printerr (const char *msg)
526{
527 write (STDERR_FILENO, msg, strlen (msg));
528}
529#endif
429 530
430static void (*syserr_cb)(const char *msg); 531static void (*syserr_cb)(const char *msg);
431 532
432void 533void
433ev_set_syserr_cb (void (*cb)(const char *msg)) 534ev_set_syserr_cb (void (*cb)(const char *msg))
443 544
444 if (syserr_cb) 545 if (syserr_cb)
445 syserr_cb (msg); 546 syserr_cb (msg);
446 else 547 else
447 { 548 {
549#if EV_AVOID_STDIO
550 const char *err = strerror (errno);
551
552 ev_printerr (msg);
553 ev_printerr (": ");
554 ev_printerr (err);
555 ev_printerr ("\n");
556#else
448 perror (msg); 557 perror (msg);
558#endif
449 abort (); 559 abort ();
450 } 560 }
451} 561}
452 562
453static void * 563static void *
454ev_realloc_emul (void *ptr, long size) 564ev_realloc_emul (void *ptr, long size)
455{ 565{
566#if __GLIBC__
567 return realloc (ptr, size);
568#else
456 /* some systems, notably openbsd and darwin, fail to properly 569 /* some systems, notably openbsd and darwin, fail to properly
457 * implement realloc (x, 0) (as required by both ansi c-98 and 570 * implement realloc (x, 0) (as required by both ansi c-89 and
458 * the single unix specification, so work around them here. 571 * the single unix specification, so work around them here.
459 */ 572 */
460 573
461 if (size) 574 if (size)
462 return realloc (ptr, size); 575 return realloc (ptr, size);
463 576
464 free (ptr); 577 free (ptr);
465 return 0; 578 return 0;
579#endif
466} 580}
467 581
468static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 582static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
469 583
470void 584void
478{ 592{
479 ptr = alloc (ptr, size); 593 ptr = alloc (ptr, size);
480 594
481 if (!ptr && size) 595 if (!ptr && size)
482 { 596 {
597#if EV_AVOID_STDIO
598 ev_printerr ("libev: memory allocation failed, aborting.\n");
599#else
483 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 600 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
601#endif
484 abort (); 602 abort ();
485 } 603 }
486 604
487 return ptr; 605 return ptr;
488} 606}
490#define ev_malloc(size) ev_realloc (0, (size)) 608#define ev_malloc(size) ev_realloc (0, (size))
491#define ev_free(ptr) ev_realloc ((ptr), 0) 609#define ev_free(ptr) ev_realloc ((ptr), 0)
492 610
493/*****************************************************************************/ 611/*****************************************************************************/
494 612
613/* set in reify when reification needed */
614#define EV_ANFD_REIFY 1
615
495/* file descriptor info structure */ 616/* file descriptor info structure */
496typedef struct 617typedef struct
497{ 618{
498 WL head; 619 WL head;
499 unsigned char events; /* the events watched for */ 620 unsigned char events; /* the events watched for */
500 unsigned char reify; /* flag set when this ANFD needs reification */ 621 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
501 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 622 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
502 unsigned char unused; 623 unsigned char unused;
503#if EV_USE_EPOLL 624#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */ 625 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif 626#endif
567 688
568 static int ev_default_loop_ptr; 689 static int ev_default_loop_ptr;
569 690
570#endif 691#endif
571 692
693#if EV_FEATURE_API
694# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
695# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
696# define EV_INVOKE_PENDING invoke_cb (EV_A)
697#else
698# define EV_RELEASE_CB (void)0
699# define EV_ACQUIRE_CB (void)0
700# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
701#endif
702
703#define EVUNLOOP_RECURSE 0x80
704
572/*****************************************************************************/ 705/*****************************************************************************/
573 706
574#ifndef EV_HAVE_EV_TIME 707#ifndef EV_HAVE_EV_TIME
575ev_tstamp 708ev_tstamp
576ev_time (void) 709ev_time (void)
632 765
633 tv.tv_sec = (time_t)delay; 766 tv.tv_sec = (time_t)delay;
634 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 767 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
635 768
636 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 769 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
637 /* somehting not guaranteed by newer posix versions, but guaranteed */ 770 /* something not guaranteed by newer posix versions, but guaranteed */
638 /* by older ones */ 771 /* by older ones */
639 select (0, 0, 0, 0, &tv); 772 select (0, 0, 0, 0, &tv);
640#endif 773#endif
641 } 774 }
642} 775}
750} 883}
751 884
752/*****************************************************************************/ 885/*****************************************************************************/
753 886
754inline_speed void 887inline_speed void
755fd_event (EV_P_ int fd, int revents) 888fd_event_nocheck (EV_P_ int fd, int revents)
756{ 889{
757 ANFD *anfd = anfds + fd; 890 ANFD *anfd = anfds + fd;
758 ev_io *w; 891 ev_io *w;
759 892
760 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 893 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
764 if (ev) 897 if (ev)
765 ev_feed_event (EV_A_ (W)w, ev); 898 ev_feed_event (EV_A_ (W)w, ev);
766 } 899 }
767} 900}
768 901
902/* do not submit kernel events for fds that have reify set */
903/* because that means they changed while we were polling for new events */
904inline_speed void
905fd_event (EV_P_ int fd, int revents)
906{
907 ANFD *anfd = anfds + fd;
908
909 if (expect_true (!anfd->reify))
910 fd_event_nocheck (EV_A_ fd, revents);
911}
912
769void 913void
770ev_feed_fd_event (EV_P_ int fd, int revents) 914ev_feed_fd_event (EV_P_ int fd, int revents)
771{ 915{
772 if (fd >= 0 && fd < anfdmax) 916 if (fd >= 0 && fd < anfdmax)
773 fd_event (EV_A_ fd, revents); 917 fd_event_nocheck (EV_A_ fd, revents);
774} 918}
775 919
776/* make sure the external fd watch events are in-sync */ 920/* make sure the external fd watch events are in-sync */
777/* with the kernel/libev internal state */ 921/* with the kernel/libev internal state */
778inline_size void 922inline_size void
793 937
794#if EV_SELECT_IS_WINSOCKET 938#if EV_SELECT_IS_WINSOCKET
795 if (events) 939 if (events)
796 { 940 {
797 unsigned long arg; 941 unsigned long arg;
798 #ifdef EV_FD_TO_WIN32_HANDLE
799 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 942 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
800 #else
801 anfd->handle = _get_osfhandle (fd);
802 #endif
803 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 943 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
804 } 944 }
805#endif 945#endif
806 946
807 { 947 {
845 ev_io_stop (EV_A_ w); 985 ev_io_stop (EV_A_ w);
846 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 986 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
847 } 987 }
848} 988}
849 989
850/* check whether the given fd is atcually valid, for error recovery */ 990/* check whether the given fd is actually valid, for error recovery */
851inline_size int 991inline_size int
852fd_valid (int fd) 992fd_valid (int fd)
853{ 993{
854#ifdef _WIN32 994#ifdef _WIN32
855 return _get_osfhandle (fd) != -1; 995 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
856#else 996#else
857 return fcntl (fd, F_GETFD) != -1; 997 return fcntl (fd, F_GETFD) != -1;
858#endif 998#endif
859} 999}
860 1000
878 1018
879 for (fd = anfdmax; fd--; ) 1019 for (fd = anfdmax; fd--; )
880 if (anfds [fd].events) 1020 if (anfds [fd].events)
881 { 1021 {
882 fd_kill (EV_A_ fd); 1022 fd_kill (EV_A_ fd);
883 return; 1023 break;
884 } 1024 }
885} 1025}
886 1026
887/* usually called after fork if backend needs to re-arm all fds from scratch */ 1027/* usually called after fork if backend needs to re-arm all fds from scratch */
888static void noinline 1028static void noinline
893 for (fd = 0; fd < anfdmax; ++fd) 1033 for (fd = 0; fd < anfdmax; ++fd)
894 if (anfds [fd].events) 1034 if (anfds [fd].events)
895 { 1035 {
896 anfds [fd].events = 0; 1036 anfds [fd].events = 0;
897 anfds [fd].emask = 0; 1037 anfds [fd].emask = 0;
898 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1038 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
899 } 1039 }
1040}
1041
1042/* used to prepare libev internal fd's */
1043/* this is not fork-safe */
1044inline_speed void
1045fd_intern (int fd)
1046{
1047#ifdef _WIN32
1048 unsigned long arg = 1;
1049 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1050#else
1051 fcntl (fd, F_SETFD, FD_CLOEXEC);
1052 fcntl (fd, F_SETFL, O_NONBLOCK);
1053#endif
900} 1054}
901 1055
902/*****************************************************************************/ 1056/*****************************************************************************/
903 1057
904/* 1058/*
978 1132
979 for (;;) 1133 for (;;)
980 { 1134 {
981 int c = k << 1; 1135 int c = k << 1;
982 1136
983 if (c > N + HEAP0 - 1) 1137 if (c >= N + HEAP0)
984 break; 1138 break;
985 1139
986 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1140 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
987 ? 1 : 0; 1141 ? 1 : 0;
988 1142
1024 1178
1025/* move an element suitably so it is in a correct place */ 1179/* move an element suitably so it is in a correct place */
1026inline_size void 1180inline_size void
1027adjustheap (ANHE *heap, int N, int k) 1181adjustheap (ANHE *heap, int N, int k)
1028{ 1182{
1029 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1183 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1030 upheap (heap, k); 1184 upheap (heap, k);
1031 else 1185 else
1032 downheap (heap, N, k); 1186 downheap (heap, N, k);
1033} 1187}
1034 1188
1047/*****************************************************************************/ 1201/*****************************************************************************/
1048 1202
1049/* associate signal watchers to a signal signal */ 1203/* associate signal watchers to a signal signal */
1050typedef struct 1204typedef struct
1051{ 1205{
1206 EV_ATOMIC_T pending;
1207#if EV_MULTIPLICITY
1208 EV_P;
1209#endif
1052 WL head; 1210 WL head;
1053 EV_ATOMIC_T gotsig;
1054} ANSIG; 1211} ANSIG;
1055 1212
1056static ANSIG *signals; 1213static ANSIG signals [EV_NSIG - 1];
1057static int signalmax;
1058
1059static EV_ATOMIC_T gotsig;
1060 1214
1061/*****************************************************************************/ 1215/*****************************************************************************/
1062 1216
1063/* used to prepare libev internal fd's */ 1217#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1064/* this is not fork-safe */
1065inline_speed void
1066fd_intern (int fd)
1067{
1068#ifdef _WIN32
1069 unsigned long arg = 1;
1070 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1071#else
1072 fcntl (fd, F_SETFD, FD_CLOEXEC);
1073 fcntl (fd, F_SETFL, O_NONBLOCK);
1074#endif
1075}
1076 1218
1077static void noinline 1219static void noinline
1078evpipe_init (EV_P) 1220evpipe_init (EV_P)
1079{ 1221{
1080 if (!ev_is_active (&pipe_w)) 1222 if (!ev_is_active (&pipe_w))
1081 { 1223 {
1082#if EV_USE_EVENTFD 1224# if EV_USE_EVENTFD
1225 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1226 if (evfd < 0 && errno == EINVAL)
1083 if ((evfd = eventfd (0, 0)) >= 0) 1227 evfd = eventfd (0, 0);
1228
1229 if (evfd >= 0)
1084 { 1230 {
1085 evpipe [0] = -1; 1231 evpipe [0] = -1;
1086 fd_intern (evfd); 1232 fd_intern (evfd); /* doing it twice doesn't hurt */
1087 ev_io_set (&pipe_w, evfd, EV_READ); 1233 ev_io_set (&pipe_w, evfd, EV_READ);
1088 } 1234 }
1089 else 1235 else
1090#endif 1236# endif
1091 { 1237 {
1092 while (pipe (evpipe)) 1238 while (pipe (evpipe))
1093 ev_syserr ("(libev) error creating signal/async pipe"); 1239 ev_syserr ("(libev) error creating signal/async pipe");
1094 1240
1095 fd_intern (evpipe [0]); 1241 fd_intern (evpipe [0]);
1106evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1252evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1107{ 1253{
1108 if (!*flag) 1254 if (!*flag)
1109 { 1255 {
1110 int old_errno = errno; /* save errno because write might clobber it */ 1256 int old_errno = errno; /* save errno because write might clobber it */
1257 char dummy;
1111 1258
1112 *flag = 1; 1259 *flag = 1;
1113 1260
1114#if EV_USE_EVENTFD 1261#if EV_USE_EVENTFD
1115 if (evfd >= 0) 1262 if (evfd >= 0)
1117 uint64_t counter = 1; 1264 uint64_t counter = 1;
1118 write (evfd, &counter, sizeof (uint64_t)); 1265 write (evfd, &counter, sizeof (uint64_t));
1119 } 1266 }
1120 else 1267 else
1121#endif 1268#endif
1122 write (evpipe [1], &old_errno, 1); 1269 write (evpipe [1], &dummy, 1);
1123 1270
1124 errno = old_errno; 1271 errno = old_errno;
1125 } 1272 }
1126} 1273}
1127 1274
1128/* called whenever the libev signal pipe */ 1275/* called whenever the libev signal pipe */
1129/* got some events (signal, async) */ 1276/* got some events (signal, async) */
1130static void 1277static void
1131pipecb (EV_P_ ev_io *iow, int revents) 1278pipecb (EV_P_ ev_io *iow, int revents)
1132{ 1279{
1280 int i;
1281
1133#if EV_USE_EVENTFD 1282#if EV_USE_EVENTFD
1134 if (evfd >= 0) 1283 if (evfd >= 0)
1135 { 1284 {
1136 uint64_t counter; 1285 uint64_t counter;
1137 read (evfd, &counter, sizeof (uint64_t)); 1286 read (evfd, &counter, sizeof (uint64_t));
1141 { 1290 {
1142 char dummy; 1291 char dummy;
1143 read (evpipe [0], &dummy, 1); 1292 read (evpipe [0], &dummy, 1);
1144 } 1293 }
1145 1294
1146 if (gotsig && ev_is_default_loop (EV_A)) 1295 if (sig_pending)
1147 { 1296 {
1148 int signum; 1297 sig_pending = 0;
1149 gotsig = 0;
1150 1298
1151 for (signum = signalmax; signum--; ) 1299 for (i = EV_NSIG - 1; i--; )
1152 if (signals [signum].gotsig) 1300 if (expect_false (signals [i].pending))
1153 ev_feed_signal_event (EV_A_ signum + 1); 1301 ev_feed_signal_event (EV_A_ i + 1);
1154 } 1302 }
1155 1303
1156#if EV_ASYNC_ENABLE 1304#if EV_ASYNC_ENABLE
1157 if (gotasync) 1305 if (async_pending)
1158 { 1306 {
1159 int i; 1307 async_pending = 0;
1160 gotasync = 0;
1161 1308
1162 for (i = asynccnt; i--; ) 1309 for (i = asynccnt; i--; )
1163 if (asyncs [i]->sent) 1310 if (asyncs [i]->sent)
1164 { 1311 {
1165 asyncs [i]->sent = 0; 1312 asyncs [i]->sent = 0;
1173 1320
1174static void 1321static void
1175ev_sighandler (int signum) 1322ev_sighandler (int signum)
1176{ 1323{
1177#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1178 struct ev_loop *loop = &default_loop_struct; 1325 EV_P = signals [signum - 1].loop;
1179#endif 1326#endif
1180 1327
1181#if _WIN32 1328#ifdef _WIN32
1182 signal (signum, ev_sighandler); 1329 signal (signum, ev_sighandler);
1183#endif 1330#endif
1184 1331
1185 signals [signum - 1].gotsig = 1; 1332 signals [signum - 1].pending = 1;
1186 evpipe_write (EV_A_ &gotsig); 1333 evpipe_write (EV_A_ &sig_pending);
1187} 1334}
1188 1335
1189void noinline 1336void noinline
1190ev_feed_signal_event (EV_P_ int signum) 1337ev_feed_signal_event (EV_P_ int signum)
1191{ 1338{
1192 WL w; 1339 WL w;
1193 1340
1341 if (expect_false (signum <= 0 || signum > EV_NSIG))
1342 return;
1343
1344 --signum;
1345
1194#if EV_MULTIPLICITY 1346#if EV_MULTIPLICITY
1195 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1347 /* it is permissible to try to feed a signal to the wrong loop */
1196#endif 1348 /* or, likely more useful, feeding a signal nobody is waiting for */
1197 1349
1198 --signum; 1350 if (expect_false (signals [signum].loop != EV_A))
1199
1200 if (signum < 0 || signum >= signalmax)
1201 return; 1351 return;
1352#endif
1202 1353
1203 signals [signum].gotsig = 0; 1354 signals [signum].pending = 0;
1204 1355
1205 for (w = signals [signum].head; w; w = w->next) 1356 for (w = signals [signum].head; w; w = w->next)
1206 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1357 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1207} 1358}
1208 1359
1360#if EV_USE_SIGNALFD
1361static void
1362sigfdcb (EV_P_ ev_io *iow, int revents)
1363{
1364 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1365
1366 for (;;)
1367 {
1368 ssize_t res = read (sigfd, si, sizeof (si));
1369
1370 /* not ISO-C, as res might be -1, but works with SuS */
1371 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1372 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1373
1374 if (res < (ssize_t)sizeof (si))
1375 break;
1376 }
1377}
1378#endif
1379
1380#endif
1381
1209/*****************************************************************************/ 1382/*****************************************************************************/
1210 1383
1384#if EV_CHILD_ENABLE
1211static WL childs [EV_PID_HASHSIZE]; 1385static WL childs [EV_PID_HASHSIZE];
1212
1213#ifndef _WIN32
1214 1386
1215static ev_signal childev; 1387static ev_signal childev;
1216 1388
1217#ifndef WIFCONTINUED 1389#ifndef WIFCONTINUED
1218# define WIFCONTINUED(status) 0 1390# define WIFCONTINUED(status) 0
1223child_reap (EV_P_ int chain, int pid, int status) 1395child_reap (EV_P_ int chain, int pid, int status)
1224{ 1396{
1225 ev_child *w; 1397 ev_child *w;
1226 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1398 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1227 1399
1228 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1400 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1229 { 1401 {
1230 if ((w->pid == pid || !w->pid) 1402 if ((w->pid == pid || !w->pid)
1231 && (!traced || (w->flags & 1))) 1403 && (!traced || (w->flags & 1)))
1232 { 1404 {
1233 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1405 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
1258 /* make sure we are called again until all children have been reaped */ 1430 /* make sure we are called again until all children have been reaped */
1259 /* we need to do it this way so that the callback gets called before we continue */ 1431 /* we need to do it this way so that the callback gets called before we continue */
1260 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1432 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1261 1433
1262 child_reap (EV_A_ pid, pid, status); 1434 child_reap (EV_A_ pid, pid, status);
1263 if (EV_PID_HASHSIZE > 1) 1435 if ((EV_PID_HASHSIZE) > 1)
1264 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1436 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1265} 1437}
1266 1438
1267#endif 1439#endif
1268 1440
1357ev_backend (EV_P) 1529ev_backend (EV_P)
1358{ 1530{
1359 return backend; 1531 return backend;
1360} 1532}
1361 1533
1534#if EV_FEATURE_API
1362unsigned int 1535unsigned int
1363ev_loop_count (EV_P) 1536ev_loop_count (EV_P)
1364{ 1537{
1365 return loop_count; 1538 return loop_count;
1366} 1539}
1380void 1553void
1381ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1554ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1382{ 1555{
1383 timeout_blocktime = interval; 1556 timeout_blocktime = interval;
1384} 1557}
1558
1559void
1560ev_set_userdata (EV_P_ void *data)
1561{
1562 userdata = data;
1563}
1564
1565void *
1566ev_userdata (EV_P)
1567{
1568 return userdata;
1569}
1570
1571void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1572{
1573 invoke_cb = invoke_pending_cb;
1574}
1575
1576void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1577{
1578 release_cb = release;
1579 acquire_cb = acquire;
1580}
1581#endif
1385 1582
1386/* initialise a loop structure, must be zero-initialised */ 1583/* initialise a loop structure, must be zero-initialised */
1387static void noinline 1584static void noinline
1388loop_init (EV_P_ unsigned int flags) 1585loop_init (EV_P_ unsigned int flags)
1389{ 1586{
1407 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1604 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1408 have_monotonic = 1; 1605 have_monotonic = 1;
1409 } 1606 }
1410#endif 1607#endif
1411 1608
1609 /* pid check not overridable via env */
1610#ifndef _WIN32
1611 if (flags & EVFLAG_FORKCHECK)
1612 curpid = getpid ();
1613#endif
1614
1615 if (!(flags & EVFLAG_NOENV)
1616 && !enable_secure ()
1617 && getenv ("LIBEV_FLAGS"))
1618 flags = atoi (getenv ("LIBEV_FLAGS"));
1619
1412 ev_rt_now = ev_time (); 1620 ev_rt_now = ev_time ();
1413 mn_now = get_clock (); 1621 mn_now = get_clock ();
1414 now_floor = mn_now; 1622 now_floor = mn_now;
1415 rtmn_diff = ev_rt_now - mn_now; 1623 rtmn_diff = ev_rt_now - mn_now;
1624#if EV_FEATURE_API
1625 invoke_cb = ev_invoke_pending;
1626#endif
1416 1627
1417 io_blocktime = 0.; 1628 io_blocktime = 0.;
1418 timeout_blocktime = 0.; 1629 timeout_blocktime = 0.;
1419 backend = 0; 1630 backend = 0;
1420 backend_fd = -1; 1631 backend_fd = -1;
1421 gotasync = 0; 1632 sig_pending = 0;
1633#if EV_ASYNC_ENABLE
1634 async_pending = 0;
1635#endif
1422#if EV_USE_INOTIFY 1636#if EV_USE_INOTIFY
1423 fs_fd = -2; 1637 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1424#endif 1638#endif
1425 1639#if EV_USE_SIGNALFD
1426 /* pid check not overridable via env */ 1640 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1427#ifndef _WIN32
1428 if (flags & EVFLAG_FORKCHECK)
1429 curpid = getpid ();
1430#endif 1641#endif
1431
1432 if (!(flags & EVFLAG_NOENV)
1433 && !enable_secure ()
1434 && getenv ("LIBEV_FLAGS"))
1435 flags = atoi (getenv ("LIBEV_FLAGS"));
1436 1642
1437 if (!(flags & 0x0000ffffU)) 1643 if (!(flags & 0x0000ffffU))
1438 flags |= ev_recommended_backends (); 1644 flags |= ev_recommended_backends ();
1439 1645
1440#if EV_USE_PORT 1646#if EV_USE_PORT
1453 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1659 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1454#endif 1660#endif
1455 1661
1456 ev_prepare_init (&pending_w, pendingcb); 1662 ev_prepare_init (&pending_w, pendingcb);
1457 1663
1664#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1458 ev_init (&pipe_w, pipecb); 1665 ev_init (&pipe_w, pipecb);
1459 ev_set_priority (&pipe_w, EV_MAXPRI); 1666 ev_set_priority (&pipe_w, EV_MAXPRI);
1667#endif
1460 } 1668 }
1461} 1669}
1462 1670
1463/* free up a loop structure */ 1671/* free up a loop structure */
1464static void noinline 1672static void noinline
1466{ 1674{
1467 int i; 1675 int i;
1468 1676
1469 if (ev_is_active (&pipe_w)) 1677 if (ev_is_active (&pipe_w))
1470 { 1678 {
1471 ev_ref (EV_A); /* signal watcher */ 1679 /*ev_ref (EV_A);*/
1472 ev_io_stop (EV_A_ &pipe_w); 1680 /*ev_io_stop (EV_A_ &pipe_w);*/
1473 1681
1474#if EV_USE_EVENTFD 1682#if EV_USE_EVENTFD
1475 if (evfd >= 0) 1683 if (evfd >= 0)
1476 close (evfd); 1684 close (evfd);
1477#endif 1685#endif
1478 1686
1479 if (evpipe [0] >= 0) 1687 if (evpipe [0] >= 0)
1480 { 1688 {
1481 close (evpipe [0]); 1689 EV_WIN32_CLOSE_FD (evpipe [0]);
1482 close (evpipe [1]); 1690 EV_WIN32_CLOSE_FD (evpipe [1]);
1483 } 1691 }
1484 } 1692 }
1693
1694#if EV_USE_SIGNALFD
1695 if (ev_is_active (&sigfd_w))
1696 close (sigfd);
1697#endif
1485 1698
1486#if EV_USE_INOTIFY 1699#if EV_USE_INOTIFY
1487 if (fs_fd >= 0) 1700 if (fs_fd >= 0)
1488 close (fs_fd); 1701 close (fs_fd);
1489#endif 1702#endif
1513#if EV_IDLE_ENABLE 1726#if EV_IDLE_ENABLE
1514 array_free (idle, [i]); 1727 array_free (idle, [i]);
1515#endif 1728#endif
1516 } 1729 }
1517 1730
1518 ev_free (anfds); anfdmax = 0; 1731 ev_free (anfds); anfds = 0; anfdmax = 0;
1519 1732
1520 /* have to use the microsoft-never-gets-it-right macro */ 1733 /* have to use the microsoft-never-gets-it-right macro */
1521 array_free (rfeed, EMPTY); 1734 array_free (rfeed, EMPTY);
1522 array_free (fdchange, EMPTY); 1735 array_free (fdchange, EMPTY);
1523 array_free (timer, EMPTY); 1736 array_free (timer, EMPTY);
1558 1771
1559 if (ev_is_active (&pipe_w)) 1772 if (ev_is_active (&pipe_w))
1560 { 1773 {
1561 /* this "locks" the handlers against writing to the pipe */ 1774 /* this "locks" the handlers against writing to the pipe */
1562 /* while we modify the fd vars */ 1775 /* while we modify the fd vars */
1563 gotsig = 1; 1776 sig_pending = 1;
1564#if EV_ASYNC_ENABLE 1777#if EV_ASYNC_ENABLE
1565 gotasync = 1; 1778 async_pending = 1;
1566#endif 1779#endif
1567 1780
1568 ev_ref (EV_A); 1781 ev_ref (EV_A);
1569 ev_io_stop (EV_A_ &pipe_w); 1782 ev_io_stop (EV_A_ &pipe_w);
1570 1783
1573 close (evfd); 1786 close (evfd);
1574#endif 1787#endif
1575 1788
1576 if (evpipe [0] >= 0) 1789 if (evpipe [0] >= 0)
1577 { 1790 {
1578 close (evpipe [0]); 1791 EV_WIN32_CLOSE_FD (evpipe [0]);
1579 close (evpipe [1]); 1792 EV_WIN32_CLOSE_FD (evpipe [1]);
1580 } 1793 }
1581 1794
1795#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1582 evpipe_init (EV_A); 1796 evpipe_init (EV_A);
1583 /* now iterate over everything, in case we missed something */ 1797 /* now iterate over everything, in case we missed something */
1584 pipecb (EV_A_ &pipe_w, EV_READ); 1798 pipecb (EV_A_ &pipe_w, EV_READ);
1799#endif
1585 } 1800 }
1586 1801
1587 postfork = 0; 1802 postfork = 0;
1588} 1803}
1589 1804
1590#if EV_MULTIPLICITY 1805#if EV_MULTIPLICITY
1591 1806
1592struct ev_loop * 1807struct ev_loop *
1593ev_loop_new (unsigned int flags) 1808ev_loop_new (unsigned int flags)
1594{ 1809{
1595 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1810 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1596 1811
1597 memset (loop, 0, sizeof (struct ev_loop)); 1812 memset (EV_A, 0, sizeof (struct ev_loop));
1598
1599 loop_init (EV_A_ flags); 1813 loop_init (EV_A_ flags);
1600 1814
1601 if (ev_backend (EV_A)) 1815 if (ev_backend (EV_A))
1602 return loop; 1816 return EV_A;
1603 1817
1604 return 0; 1818 return 0;
1605} 1819}
1606 1820
1607void 1821void
1614void 1828void
1615ev_loop_fork (EV_P) 1829ev_loop_fork (EV_P)
1616{ 1830{
1617 postfork = 1; /* must be in line with ev_default_fork */ 1831 postfork = 1; /* must be in line with ev_default_fork */
1618} 1832}
1833#endif /* multiplicity */
1619 1834
1620#if EV_VERIFY 1835#if EV_VERIFY
1621static void noinline 1836static void noinline
1622verify_watcher (EV_P_ W w) 1837verify_watcher (EV_P_ W w)
1623{ 1838{
1651 verify_watcher (EV_A_ ws [cnt]); 1866 verify_watcher (EV_A_ ws [cnt]);
1652 } 1867 }
1653} 1868}
1654#endif 1869#endif
1655 1870
1871#if EV_FEATURE_API
1656void 1872void
1657ev_loop_verify (EV_P) 1873ev_loop_verify (EV_P)
1658{ 1874{
1659#if EV_VERIFY 1875#if EV_VERIFY
1660 int i; 1876 int i;
1701#if EV_ASYNC_ENABLE 1917#if EV_ASYNC_ENABLE
1702 assert (asyncmax >= asynccnt); 1918 assert (asyncmax >= asynccnt);
1703 array_verify (EV_A_ (W *)asyncs, asynccnt); 1919 array_verify (EV_A_ (W *)asyncs, asynccnt);
1704#endif 1920#endif
1705 1921
1922#if EV_PREPARE_ENABLE
1706 assert (preparemax >= preparecnt); 1923 assert (preparemax >= preparecnt);
1707 array_verify (EV_A_ (W *)prepares, preparecnt); 1924 array_verify (EV_A_ (W *)prepares, preparecnt);
1925#endif
1708 1926
1927#if EV_CHECK_ENABLE
1709 assert (checkmax >= checkcnt); 1928 assert (checkmax >= checkcnt);
1710 array_verify (EV_A_ (W *)checks, checkcnt); 1929 array_verify (EV_A_ (W *)checks, checkcnt);
1930#endif
1711 1931
1712# if 0 1932# if 0
1933#if EV_CHILD_ENABLE
1713 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1934 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1714 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1935 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1715# endif 1936#endif
1716#endif 1937# endif
1938#endif
1717} 1939}
1718 1940#endif
1719#endif /* multiplicity */
1720 1941
1721#if EV_MULTIPLICITY 1942#if EV_MULTIPLICITY
1722struct ev_loop * 1943struct ev_loop *
1723ev_default_loop_init (unsigned int flags) 1944ev_default_loop_init (unsigned int flags)
1724#else 1945#else
1727#endif 1948#endif
1728{ 1949{
1729 if (!ev_default_loop_ptr) 1950 if (!ev_default_loop_ptr)
1730 { 1951 {
1731#if EV_MULTIPLICITY 1952#if EV_MULTIPLICITY
1732 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1953 EV_P = ev_default_loop_ptr = &default_loop_struct;
1733#else 1954#else
1734 ev_default_loop_ptr = 1; 1955 ev_default_loop_ptr = 1;
1735#endif 1956#endif
1736 1957
1737 loop_init (EV_A_ flags); 1958 loop_init (EV_A_ flags);
1738 1959
1739 if (ev_backend (EV_A)) 1960 if (ev_backend (EV_A))
1740 { 1961 {
1741#ifndef _WIN32 1962#if EV_CHILD_ENABLE
1742 ev_signal_init (&childev, childcb, SIGCHLD); 1963 ev_signal_init (&childev, childcb, SIGCHLD);
1743 ev_set_priority (&childev, EV_MAXPRI); 1964 ev_set_priority (&childev, EV_MAXPRI);
1744 ev_signal_start (EV_A_ &childev); 1965 ev_signal_start (EV_A_ &childev);
1745 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1966 ev_unref (EV_A); /* child watcher should not keep loop alive */
1746#endif 1967#endif
1754 1975
1755void 1976void
1756ev_default_destroy (void) 1977ev_default_destroy (void)
1757{ 1978{
1758#if EV_MULTIPLICITY 1979#if EV_MULTIPLICITY
1759 struct ev_loop *loop = ev_default_loop_ptr; 1980 EV_P = ev_default_loop_ptr;
1760#endif 1981#endif
1761 1982
1762 ev_default_loop_ptr = 0; 1983 ev_default_loop_ptr = 0;
1763 1984
1764#ifndef _WIN32 1985#if EV_CHILD_ENABLE
1765 ev_ref (EV_A); /* child watcher */ 1986 ev_ref (EV_A); /* child watcher */
1766 ev_signal_stop (EV_A_ &childev); 1987 ev_signal_stop (EV_A_ &childev);
1767#endif 1988#endif
1768 1989
1769 loop_destroy (EV_A); 1990 loop_destroy (EV_A);
1771 1992
1772void 1993void
1773ev_default_fork (void) 1994ev_default_fork (void)
1774{ 1995{
1775#if EV_MULTIPLICITY 1996#if EV_MULTIPLICITY
1776 struct ev_loop *loop = ev_default_loop_ptr; 1997 EV_P = ev_default_loop_ptr;
1777#endif 1998#endif
1778 1999
1779 postfork = 1; /* must be in line with ev_loop_fork */ 2000 postfork = 1; /* must be in line with ev_loop_fork */
1780} 2001}
1781 2002
1785ev_invoke (EV_P_ void *w, int revents) 2006ev_invoke (EV_P_ void *w, int revents)
1786{ 2007{
1787 EV_CB_INVOKE ((W)w, revents); 2008 EV_CB_INVOKE ((W)w, revents);
1788} 2009}
1789 2010
1790inline_speed void 2011unsigned int
1791call_pending (EV_P) 2012ev_pending_count (EV_P)
2013{
2014 int pri;
2015 unsigned int count = 0;
2016
2017 for (pri = NUMPRI; pri--; )
2018 count += pendingcnt [pri];
2019
2020 return count;
2021}
2022
2023void noinline
2024ev_invoke_pending (EV_P)
1792{ 2025{
1793 int pri; 2026 int pri;
1794 2027
1795 for (pri = NUMPRI; pri--; ) 2028 for (pri = NUMPRI; pri--; )
1796 while (pendingcnt [pri]) 2029 while (pendingcnt [pri])
1964 ANHE_at_cache (*he); 2197 ANHE_at_cache (*he);
1965 } 2198 }
1966} 2199}
1967 2200
1968/* fetch new monotonic and realtime times from the kernel */ 2201/* fetch new monotonic and realtime times from the kernel */
1969/* also detetc if there was a timejump, and act accordingly */ 2202/* also detect if there was a timejump, and act accordingly */
1970inline_speed void 2203inline_speed void
1971time_update (EV_P_ ev_tstamp max_block) 2204time_update (EV_P_ ev_tstamp max_block)
1972{ 2205{
1973#if EV_USE_MONOTONIC 2206#if EV_USE_MONOTONIC
1974 if (expect_true (have_monotonic)) 2207 if (expect_true (have_monotonic))
2034} 2267}
2035 2268
2036void 2269void
2037ev_loop (EV_P_ int flags) 2270ev_loop (EV_P_ int flags)
2038{ 2271{
2272#if EV_FEATURE_API
2039 ++loop_depth; 2273 ++loop_depth;
2274#endif
2275
2276 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2040 2277
2041 loop_done = EVUNLOOP_CANCEL; 2278 loop_done = EVUNLOOP_CANCEL;
2042 2279
2043 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2280 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2044 2281
2045 do 2282 do
2046 { 2283 {
2047#if EV_VERIFY >= 2 2284#if EV_VERIFY >= 2
2048 ev_loop_verify (EV_A); 2285 ev_loop_verify (EV_A);
2061 /* we might have forked, so queue fork handlers */ 2298 /* we might have forked, so queue fork handlers */
2062 if (expect_false (postfork)) 2299 if (expect_false (postfork))
2063 if (forkcnt) 2300 if (forkcnt)
2064 { 2301 {
2065 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2302 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2066 call_pending (EV_A); 2303 EV_INVOKE_PENDING;
2067 } 2304 }
2068#endif 2305#endif
2069 2306
2307#if EV_PREPARE_ENABLE
2070 /* queue prepare watchers (and execute them) */ 2308 /* queue prepare watchers (and execute them) */
2071 if (expect_false (preparecnt)) 2309 if (expect_false (preparecnt))
2072 { 2310 {
2073 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2311 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2074 call_pending (EV_A); 2312 EV_INVOKE_PENDING;
2075 } 2313 }
2314#endif
2315
2316 if (expect_false (loop_done))
2317 break;
2076 2318
2077 /* we might have forked, so reify kernel state if necessary */ 2319 /* we might have forked, so reify kernel state if necessary */
2078 if (expect_false (postfork)) 2320 if (expect_false (postfork))
2079 loop_fork (EV_A); 2321 loop_fork (EV_A);
2080 2322
2128 waittime -= sleeptime; 2370 waittime -= sleeptime;
2129 } 2371 }
2130 } 2372 }
2131 } 2373 }
2132 2374
2375#if EV_FEATURE_API
2133 ++loop_count; 2376 ++loop_count;
2377#endif
2378 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2134 backend_poll (EV_A_ waittime); 2379 backend_poll (EV_A_ waittime);
2380 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2135 2381
2136 /* update ev_rt_now, do magic */ 2382 /* update ev_rt_now, do magic */
2137 time_update (EV_A_ waittime + sleeptime); 2383 time_update (EV_A_ waittime + sleeptime);
2138 } 2384 }
2139 2385
2146#if EV_IDLE_ENABLE 2392#if EV_IDLE_ENABLE
2147 /* queue idle watchers unless other events are pending */ 2393 /* queue idle watchers unless other events are pending */
2148 idle_reify (EV_A); 2394 idle_reify (EV_A);
2149#endif 2395#endif
2150 2396
2397#if EV_CHECK_ENABLE
2151 /* queue check watchers, to be executed first */ 2398 /* queue check watchers, to be executed first */
2152 if (expect_false (checkcnt)) 2399 if (expect_false (checkcnt))
2153 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2400 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2401#endif
2154 2402
2155 call_pending (EV_A); 2403 EV_INVOKE_PENDING;
2156 } 2404 }
2157 while (expect_true ( 2405 while (expect_true (
2158 activecnt 2406 activecnt
2159 && !loop_done 2407 && !loop_done
2160 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2408 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2161 )); 2409 ));
2162 2410
2163 if (loop_done == EVUNLOOP_ONE) 2411 if (loop_done == EVUNLOOP_ONE)
2164 loop_done = EVUNLOOP_CANCEL; 2412 loop_done = EVUNLOOP_CANCEL;
2165 2413
2414#if EV_FEATURE_API
2166 --loop_depth; 2415 --loop_depth;
2416#endif
2167} 2417}
2168 2418
2169void 2419void
2170ev_unloop (EV_P_ int how) 2420ev_unloop (EV_P_ int how)
2171{ 2421{
2222inline_size void 2472inline_size void
2223wlist_del (WL *head, WL elem) 2473wlist_del (WL *head, WL elem)
2224{ 2474{
2225 while (*head) 2475 while (*head)
2226 { 2476 {
2227 if (*head == elem) 2477 if (expect_true (*head == elem))
2228 { 2478 {
2229 *head = elem->next; 2479 *head = elem->next;
2230 return; 2480 break;
2231 } 2481 }
2232 2482
2233 head = &(*head)->next; 2483 head = &(*head)->next;
2234 } 2484 }
2235} 2485}
2295 2545
2296 if (expect_false (ev_is_active (w))) 2546 if (expect_false (ev_is_active (w)))
2297 return; 2547 return;
2298 2548
2299 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2549 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2300 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2550 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2301 2551
2302 EV_FREQUENT_CHECK; 2552 EV_FREQUENT_CHECK;
2303 2553
2304 ev_start (EV_A_ (W)w, 1); 2554 ev_start (EV_A_ (W)w, 1);
2305 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2555 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2306 wlist_add (&anfds[fd].head, (WL)w); 2556 wlist_add (&anfds[fd].head, (WL)w);
2307 2557
2308 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2558 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2309 w->events &= ~EV__IOFDSET; 2559 w->events &= ~EV__IOFDSET;
2310 2560
2311 EV_FREQUENT_CHECK; 2561 EV_FREQUENT_CHECK;
2312} 2562}
2313 2563
2375 timers [active] = timers [timercnt + HEAP0]; 2625 timers [active] = timers [timercnt + HEAP0];
2376 adjustheap (timers, timercnt, active); 2626 adjustheap (timers, timercnt, active);
2377 } 2627 }
2378 } 2628 }
2379 2629
2380 EV_FREQUENT_CHECK;
2381
2382 ev_at (w) -= mn_now; 2630 ev_at (w) -= mn_now;
2383 2631
2384 ev_stop (EV_A_ (W)w); 2632 ev_stop (EV_A_ (W)w);
2633
2634 EV_FREQUENT_CHECK;
2385} 2635}
2386 2636
2387void noinline 2637void noinline
2388ev_timer_again (EV_P_ ev_timer *w) 2638ev_timer_again (EV_P_ ev_timer *w)
2389{ 2639{
2407 } 2657 }
2408 2658
2409 EV_FREQUENT_CHECK; 2659 EV_FREQUENT_CHECK;
2410} 2660}
2411 2661
2662ev_tstamp
2663ev_timer_remaining (EV_P_ ev_timer *w)
2664{
2665 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2666}
2667
2412#if EV_PERIODIC_ENABLE 2668#if EV_PERIODIC_ENABLE
2413void noinline 2669void noinline
2414ev_periodic_start (EV_P_ ev_periodic *w) 2670ev_periodic_start (EV_P_ ev_periodic *w)
2415{ 2671{
2416 if (expect_false (ev_is_active (w))) 2672 if (expect_false (ev_is_active (w)))
2462 periodics [active] = periodics [periodiccnt + HEAP0]; 2718 periodics [active] = periodics [periodiccnt + HEAP0];
2463 adjustheap (periodics, periodiccnt, active); 2719 adjustheap (periodics, periodiccnt, active);
2464 } 2720 }
2465 } 2721 }
2466 2722
2467 EV_FREQUENT_CHECK;
2468
2469 ev_stop (EV_A_ (W)w); 2723 ev_stop (EV_A_ (W)w);
2724
2725 EV_FREQUENT_CHECK;
2470} 2726}
2471 2727
2472void noinline 2728void noinline
2473ev_periodic_again (EV_P_ ev_periodic *w) 2729ev_periodic_again (EV_P_ ev_periodic *w)
2474{ 2730{
2480 2736
2481#ifndef SA_RESTART 2737#ifndef SA_RESTART
2482# define SA_RESTART 0 2738# define SA_RESTART 0
2483#endif 2739#endif
2484 2740
2741#if EV_SIGNAL_ENABLE
2742
2485void noinline 2743void noinline
2486ev_signal_start (EV_P_ ev_signal *w) 2744ev_signal_start (EV_P_ ev_signal *w)
2487{ 2745{
2488#if EV_MULTIPLICITY
2489 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2490#endif
2491 if (expect_false (ev_is_active (w))) 2746 if (expect_false (ev_is_active (w)))
2492 return; 2747 return;
2493 2748
2494 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2749 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2495 2750
2496 evpipe_init (EV_A); 2751#if EV_MULTIPLICITY
2752 assert (("libev: a signal must not be attached to two different loops",
2753 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2497 2754
2498 EV_FREQUENT_CHECK; 2755 signals [w->signum - 1].loop = EV_A;
2756#endif
2499 2757
2758 EV_FREQUENT_CHECK;
2759
2760#if EV_USE_SIGNALFD
2761 if (sigfd == -2)
2500 { 2762 {
2501#ifndef _WIN32 2763 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2502 sigset_t full, prev; 2764 if (sigfd < 0 && errno == EINVAL)
2503 sigfillset (&full); 2765 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2504 sigprocmask (SIG_SETMASK, &full, &prev);
2505#endif
2506 2766
2507 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2767 if (sigfd >= 0)
2768 {
2769 fd_intern (sigfd); /* doing it twice will not hurt */
2508 2770
2509#ifndef _WIN32 2771 sigemptyset (&sigfd_set);
2510 sigprocmask (SIG_SETMASK, &prev, 0); 2772
2511#endif 2773 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2774 ev_set_priority (&sigfd_w, EV_MAXPRI);
2775 ev_io_start (EV_A_ &sigfd_w);
2776 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2777 }
2512 } 2778 }
2779
2780 if (sigfd >= 0)
2781 {
2782 /* TODO: check .head */
2783 sigaddset (&sigfd_set, w->signum);
2784 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2785
2786 signalfd (sigfd, &sigfd_set, 0);
2787 }
2788#endif
2513 2789
2514 ev_start (EV_A_ (W)w, 1); 2790 ev_start (EV_A_ (W)w, 1);
2515 wlist_add (&signals [w->signum - 1].head, (WL)w); 2791 wlist_add (&signals [w->signum - 1].head, (WL)w);
2516 2792
2517 if (!((WL)w)->next) 2793 if (!((WL)w)->next)
2794# if EV_USE_SIGNALFD
2795 if (sigfd < 0) /*TODO*/
2796# endif
2518 { 2797 {
2519#if _WIN32 2798# ifdef _WIN32
2799 evpipe_init (EV_A);
2800
2520 signal (w->signum, ev_sighandler); 2801 signal (w->signum, ev_sighandler);
2521#else 2802# else
2522 struct sigaction sa; 2803 struct sigaction sa;
2804
2805 evpipe_init (EV_A);
2806
2523 sa.sa_handler = ev_sighandler; 2807 sa.sa_handler = ev_sighandler;
2524 sigfillset (&sa.sa_mask); 2808 sigfillset (&sa.sa_mask);
2525 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2809 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2526 sigaction (w->signum, &sa, 0); 2810 sigaction (w->signum, &sa, 0);
2811
2812 sigemptyset (&sa.sa_mask);
2813 sigaddset (&sa.sa_mask, w->signum);
2814 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2527#endif 2815#endif
2528 } 2816 }
2529 2817
2530 EV_FREQUENT_CHECK; 2818 EV_FREQUENT_CHECK;
2531} 2819}
2532 2820
2533void noinline 2821void noinline
2541 2829
2542 wlist_del (&signals [w->signum - 1].head, (WL)w); 2830 wlist_del (&signals [w->signum - 1].head, (WL)w);
2543 ev_stop (EV_A_ (W)w); 2831 ev_stop (EV_A_ (W)w);
2544 2832
2545 if (!signals [w->signum - 1].head) 2833 if (!signals [w->signum - 1].head)
2834 {
2835#if EV_MULTIPLICITY
2836 signals [w->signum - 1].loop = 0; /* unattach from signal */
2837#endif
2838#if EV_USE_SIGNALFD
2839 if (sigfd >= 0)
2840 {
2841 sigset_t ss;
2842
2843 sigemptyset (&ss);
2844 sigaddset (&ss, w->signum);
2845 sigdelset (&sigfd_set, w->signum);
2846
2847 signalfd (sigfd, &sigfd_set, 0);
2848 sigprocmask (SIG_UNBLOCK, &ss, 0);
2849 }
2850 else
2851#endif
2546 signal (w->signum, SIG_DFL); 2852 signal (w->signum, SIG_DFL);
2853 }
2547 2854
2548 EV_FREQUENT_CHECK; 2855 EV_FREQUENT_CHECK;
2549} 2856}
2857
2858#endif
2859
2860#if EV_CHILD_ENABLE
2550 2861
2551void 2862void
2552ev_child_start (EV_P_ ev_child *w) 2863ev_child_start (EV_P_ ev_child *w)
2553{ 2864{
2554#if EV_MULTIPLICITY 2865#if EV_MULTIPLICITY
2558 return; 2869 return;
2559 2870
2560 EV_FREQUENT_CHECK; 2871 EV_FREQUENT_CHECK;
2561 2872
2562 ev_start (EV_A_ (W)w, 1); 2873 ev_start (EV_A_ (W)w, 1);
2563 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2874 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2564 2875
2565 EV_FREQUENT_CHECK; 2876 EV_FREQUENT_CHECK;
2566} 2877}
2567 2878
2568void 2879void
2572 if (expect_false (!ev_is_active (w))) 2883 if (expect_false (!ev_is_active (w)))
2573 return; 2884 return;
2574 2885
2575 EV_FREQUENT_CHECK; 2886 EV_FREQUENT_CHECK;
2576 2887
2577 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2888 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2578 ev_stop (EV_A_ (W)w); 2889 ev_stop (EV_A_ (W)w);
2579 2890
2580 EV_FREQUENT_CHECK; 2891 EV_FREQUENT_CHECK;
2581} 2892}
2893
2894#endif
2582 2895
2583#if EV_STAT_ENABLE 2896#if EV_STAT_ENABLE
2584 2897
2585# ifdef _WIN32 2898# ifdef _WIN32
2586# undef lstat 2899# undef lstat
2592#define MIN_STAT_INTERVAL 0.1074891 2905#define MIN_STAT_INTERVAL 0.1074891
2593 2906
2594static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2907static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2595 2908
2596#if EV_USE_INOTIFY 2909#if EV_USE_INOTIFY
2597# define EV_INOTIFY_BUFSIZE 8192 2910
2911/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2912# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2598 2913
2599static void noinline 2914static void noinline
2600infy_add (EV_P_ ev_stat *w) 2915infy_add (EV_P_ ev_stat *w)
2601{ 2916{
2602 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); 2917 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);
2603 2918
2604 if (w->wd < 0) 2919 if (w->wd >= 0)
2920 {
2921 struct statfs sfs;
2922
2923 /* now local changes will be tracked by inotify, but remote changes won't */
2924 /* unless the filesystem is known to be local, we therefore still poll */
2925 /* also do poll on <2.6.25, but with normal frequency */
2926
2927 if (!fs_2625)
2928 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2929 else if (!statfs (w->path, &sfs)
2930 && (sfs.f_type == 0x1373 /* devfs */
2931 || sfs.f_type == 0xEF53 /* ext2/3 */
2932 || sfs.f_type == 0x3153464a /* jfs */
2933 || sfs.f_type == 0x52654973 /* reiser3 */
2934 || sfs.f_type == 0x01021994 /* tempfs */
2935 || sfs.f_type == 0x58465342 /* xfs */))
2936 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2937 else
2938 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2605 { 2939 }
2940 else
2941 {
2942 /* can't use inotify, continue to stat */
2606 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2943 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2607 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2608 2944
2609 /* monitor some parent directory for speedup hints */ 2945 /* if path is not there, monitor some parent directory for speedup hints */
2610 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2946 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2611 /* but an efficiency issue only */ 2947 /* but an efficiency issue only */
2612 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2948 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2613 { 2949 {
2614 char path [4096]; 2950 char path [4096];
2630 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2966 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2631 } 2967 }
2632 } 2968 }
2633 2969
2634 if (w->wd >= 0) 2970 if (w->wd >= 0)
2635 {
2636 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2971 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2637 2972
2638 /* now local changes will be tracked by inotify, but remote changes won't */ 2973 /* now re-arm timer, if required */
2639 /* unless the filesystem it known to be local, we therefore still poll */ 2974 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2640 /* also do poll on <2.6.25, but with normal frequency */
2641 struct statfs sfs;
2642
2643 if (fs_2625 && !statfs (w->path, &sfs))
2644 if (sfs.f_type == 0x1373 /* devfs */
2645 || sfs.f_type == 0xEF53 /* ext2/3 */
2646 || sfs.f_type == 0x3153464a /* jfs */
2647 || sfs.f_type == 0x52654973 /* reiser3 */
2648 || sfs.f_type == 0x01021994 /* tempfs */
2649 || sfs.f_type == 0x58465342 /* xfs */)
2650 return;
2651
2652 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2653 ev_timer_again (EV_A_ &w->timer); 2975 ev_timer_again (EV_A_ &w->timer);
2654 } 2976 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2655} 2977}
2656 2978
2657static void noinline 2979static void noinline
2658infy_del (EV_P_ ev_stat *w) 2980infy_del (EV_P_ ev_stat *w)
2659{ 2981{
2662 2984
2663 if (wd < 0) 2985 if (wd < 0)
2664 return; 2986 return;
2665 2987
2666 w->wd = -2; 2988 w->wd = -2;
2667 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 2989 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2668 wlist_del (&fs_hash [slot].head, (WL)w); 2990 wlist_del (&fs_hash [slot].head, (WL)w);
2669 2991
2670 /* remove this watcher, if others are watching it, they will rearm */ 2992 /* remove this watcher, if others are watching it, they will rearm */
2671 inotify_rm_watch (fs_fd, wd); 2993 inotify_rm_watch (fs_fd, wd);
2672} 2994}
2674static void noinline 2996static void noinline
2675infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2997infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2676{ 2998{
2677 if (slot < 0) 2999 if (slot < 0)
2678 /* overflow, need to check for all hash slots */ 3000 /* overflow, need to check for all hash slots */
2679 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3001 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2680 infy_wd (EV_A_ slot, wd, ev); 3002 infy_wd (EV_A_ slot, wd, ev);
2681 else 3003 else
2682 { 3004 {
2683 WL w_; 3005 WL w_;
2684 3006
2685 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3007 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2686 { 3008 {
2687 ev_stat *w = (ev_stat *)w_; 3009 ev_stat *w = (ev_stat *)w_;
2688 w_ = w_->next; /* lets us remove this watcher and all before it */ 3010 w_ = w_->next; /* lets us remove this watcher and all before it */
2689 3011
2690 if (w->wd == wd || wd == -1) 3012 if (w->wd == wd || wd == -1)
2691 { 3013 {
2692 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3014 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2693 { 3015 {
2694 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3016 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2695 w->wd = -1; 3017 w->wd = -1;
2696 infy_add (EV_A_ w); /* re-add, no matter what */ 3018 infy_add (EV_A_ w); /* re-add, no matter what */
2697 } 3019 }
2698 3020
2699 stat_timer_cb (EV_A_ &w->timer, 0); 3021 stat_timer_cb (EV_A_ &w->timer, 0);
2704 3026
2705static void 3027static void
2706infy_cb (EV_P_ ev_io *w, int revents) 3028infy_cb (EV_P_ ev_io *w, int revents)
2707{ 3029{
2708 char buf [EV_INOTIFY_BUFSIZE]; 3030 char buf [EV_INOTIFY_BUFSIZE];
2709 struct inotify_event *ev = (struct inotify_event *)buf;
2710 int ofs; 3031 int ofs;
2711 int len = read (fs_fd, buf, sizeof (buf)); 3032 int len = read (fs_fd, buf, sizeof (buf));
2712 3033
2713 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3034 for (ofs = 0; ofs < len; )
3035 {
3036 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2714 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3037 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3038 ofs += sizeof (struct inotify_event) + ev->len;
3039 }
3040}
3041
3042inline_size unsigned int
3043ev_linux_version (void)
3044{
3045 struct utsname buf;
3046 unsigned int v;
3047 int i;
3048 char *p = buf.release;
3049
3050 if (uname (&buf))
3051 return 0;
3052
3053 for (i = 3+1; --i; )
3054 {
3055 unsigned int c = 0;
3056
3057 for (;;)
3058 {
3059 if (*p >= '0' && *p <= '9')
3060 c = c * 10 + *p++ - '0';
3061 else
3062 {
3063 p += *p == '.';
3064 break;
3065 }
3066 }
3067
3068 v = (v << 8) | c;
3069 }
3070
3071 return v;
2715} 3072}
2716 3073
2717inline_size void 3074inline_size void
2718check_2625 (EV_P) 3075ev_check_2625 (EV_P)
2719{ 3076{
2720 /* kernels < 2.6.25 are borked 3077 /* kernels < 2.6.25 are borked
2721 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3078 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2722 */ 3079 */
2723 struct utsname buf; 3080 if (ev_linux_version () < 0x020619)
2724 int major, minor, micro;
2725
2726 if (uname (&buf))
2727 return; 3081 return;
2728 3082
2729 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2730 return;
2731
2732 if (major < 2
2733 || (major == 2 && minor < 6)
2734 || (major == 2 && minor == 6 && micro < 25))
2735 return;
2736
2737 fs_2625 = 1; 3083 fs_2625 = 1;
3084}
3085
3086inline_size int
3087infy_newfd (void)
3088{
3089#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3090 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3091 if (fd >= 0)
3092 return fd;
3093#endif
3094 return inotify_init ();
2738} 3095}
2739 3096
2740inline_size void 3097inline_size void
2741infy_init (EV_P) 3098infy_init (EV_P)
2742{ 3099{
2743 if (fs_fd != -2) 3100 if (fs_fd != -2)
2744 return; 3101 return;
2745 3102
2746 fs_fd = -1; 3103 fs_fd = -1;
2747 3104
2748 check_2625 (EV_A); 3105 ev_check_2625 (EV_A);
2749 3106
2750 fs_fd = inotify_init (); 3107 fs_fd = infy_newfd ();
2751 3108
2752 if (fs_fd >= 0) 3109 if (fs_fd >= 0)
2753 { 3110 {
3111 fd_intern (fs_fd);
2754 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3112 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2755 ev_set_priority (&fs_w, EV_MAXPRI); 3113 ev_set_priority (&fs_w, EV_MAXPRI);
2756 ev_io_start (EV_A_ &fs_w); 3114 ev_io_start (EV_A_ &fs_w);
3115 ev_unref (EV_A);
2757 } 3116 }
2758} 3117}
2759 3118
2760inline_size void 3119inline_size void
2761infy_fork (EV_P) 3120infy_fork (EV_P)
2763 int slot; 3122 int slot;
2764 3123
2765 if (fs_fd < 0) 3124 if (fs_fd < 0)
2766 return; 3125 return;
2767 3126
3127 ev_ref (EV_A);
3128 ev_io_stop (EV_A_ &fs_w);
2768 close (fs_fd); 3129 close (fs_fd);
2769 fs_fd = inotify_init (); 3130 fs_fd = infy_newfd ();
2770 3131
3132 if (fs_fd >= 0)
3133 {
3134 fd_intern (fs_fd);
3135 ev_io_set (&fs_w, fs_fd, EV_READ);
3136 ev_io_start (EV_A_ &fs_w);
3137 ev_unref (EV_A);
3138 }
3139
2771 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3140 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2772 { 3141 {
2773 WL w_ = fs_hash [slot].head; 3142 WL w_ = fs_hash [slot].head;
2774 fs_hash [slot].head = 0; 3143 fs_hash [slot].head = 0;
2775 3144
2776 while (w_) 3145 while (w_)
2781 w->wd = -1; 3150 w->wd = -1;
2782 3151
2783 if (fs_fd >= 0) 3152 if (fs_fd >= 0)
2784 infy_add (EV_A_ w); /* re-add, no matter what */ 3153 infy_add (EV_A_ w); /* re-add, no matter what */
2785 else 3154 else
3155 {
3156 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3157 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2786 ev_timer_again (EV_A_ &w->timer); 3158 ev_timer_again (EV_A_ &w->timer);
3159 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3160 }
2787 } 3161 }
2788 } 3162 }
2789} 3163}
2790 3164
2791#endif 3165#endif
2808static void noinline 3182static void noinline
2809stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3183stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2810{ 3184{
2811 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3185 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2812 3186
2813 /* we copy this here each the time so that */ 3187 ev_statdata prev = w->attr;
2814 /* prev has the old value when the callback gets invoked */
2815 w->prev = w->attr;
2816 ev_stat_stat (EV_A_ w); 3188 ev_stat_stat (EV_A_ w);
2817 3189
2818 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3190 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2819 if ( 3191 if (
2820 w->prev.st_dev != w->attr.st_dev 3192 prev.st_dev != w->attr.st_dev
2821 || w->prev.st_ino != w->attr.st_ino 3193 || prev.st_ino != w->attr.st_ino
2822 || w->prev.st_mode != w->attr.st_mode 3194 || prev.st_mode != w->attr.st_mode
2823 || w->prev.st_nlink != w->attr.st_nlink 3195 || prev.st_nlink != w->attr.st_nlink
2824 || w->prev.st_uid != w->attr.st_uid 3196 || prev.st_uid != w->attr.st_uid
2825 || w->prev.st_gid != w->attr.st_gid 3197 || prev.st_gid != w->attr.st_gid
2826 || w->prev.st_rdev != w->attr.st_rdev 3198 || prev.st_rdev != w->attr.st_rdev
2827 || w->prev.st_size != w->attr.st_size 3199 || prev.st_size != w->attr.st_size
2828 || w->prev.st_atime != w->attr.st_atime 3200 || prev.st_atime != w->attr.st_atime
2829 || w->prev.st_mtime != w->attr.st_mtime 3201 || prev.st_mtime != w->attr.st_mtime
2830 || w->prev.st_ctime != w->attr.st_ctime 3202 || prev.st_ctime != w->attr.st_ctime
2831 ) { 3203 ) {
3204 /* we only update w->prev on actual differences */
3205 /* in case we test more often than invoke the callback, */
3206 /* to ensure that prev is always different to attr */
3207 w->prev = prev;
3208
2832 #if EV_USE_INOTIFY 3209 #if EV_USE_INOTIFY
2833 if (fs_fd >= 0) 3210 if (fs_fd >= 0)
2834 { 3211 {
2835 infy_del (EV_A_ w); 3212 infy_del (EV_A_ w);
2836 infy_add (EV_A_ w); 3213 infy_add (EV_A_ w);
2861 3238
2862 if (fs_fd >= 0) 3239 if (fs_fd >= 0)
2863 infy_add (EV_A_ w); 3240 infy_add (EV_A_ w);
2864 else 3241 else
2865#endif 3242#endif
3243 {
2866 ev_timer_again (EV_A_ &w->timer); 3244 ev_timer_again (EV_A_ &w->timer);
3245 ev_unref (EV_A);
3246 }
2867 3247
2868 ev_start (EV_A_ (W)w, 1); 3248 ev_start (EV_A_ (W)w, 1);
2869 3249
2870 EV_FREQUENT_CHECK; 3250 EV_FREQUENT_CHECK;
2871} 3251}
2880 EV_FREQUENT_CHECK; 3260 EV_FREQUENT_CHECK;
2881 3261
2882#if EV_USE_INOTIFY 3262#if EV_USE_INOTIFY
2883 infy_del (EV_A_ w); 3263 infy_del (EV_A_ w);
2884#endif 3264#endif
3265
3266 if (ev_is_active (&w->timer))
3267 {
3268 ev_ref (EV_A);
2885 ev_timer_stop (EV_A_ &w->timer); 3269 ev_timer_stop (EV_A_ &w->timer);
3270 }
2886 3271
2887 ev_stop (EV_A_ (W)w); 3272 ev_stop (EV_A_ (W)w);
2888 3273
2889 EV_FREQUENT_CHECK; 3274 EV_FREQUENT_CHECK;
2890} 3275}
2935 3320
2936 EV_FREQUENT_CHECK; 3321 EV_FREQUENT_CHECK;
2937} 3322}
2938#endif 3323#endif
2939 3324
3325#if EV_PREPARE_ENABLE
2940void 3326void
2941ev_prepare_start (EV_P_ ev_prepare *w) 3327ev_prepare_start (EV_P_ ev_prepare *w)
2942{ 3328{
2943 if (expect_false (ev_is_active (w))) 3329 if (expect_false (ev_is_active (w)))
2944 return; 3330 return;
2970 3356
2971 ev_stop (EV_A_ (W)w); 3357 ev_stop (EV_A_ (W)w);
2972 3358
2973 EV_FREQUENT_CHECK; 3359 EV_FREQUENT_CHECK;
2974} 3360}
3361#endif
2975 3362
3363#if EV_CHECK_ENABLE
2976void 3364void
2977ev_check_start (EV_P_ ev_check *w) 3365ev_check_start (EV_P_ ev_check *w)
2978{ 3366{
2979 if (expect_false (ev_is_active (w))) 3367 if (expect_false (ev_is_active (w)))
2980 return; 3368 return;
3006 3394
3007 ev_stop (EV_A_ (W)w); 3395 ev_stop (EV_A_ (W)w);
3008 3396
3009 EV_FREQUENT_CHECK; 3397 EV_FREQUENT_CHECK;
3010} 3398}
3399#endif
3011 3400
3012#if EV_EMBED_ENABLE 3401#if EV_EMBED_ENABLE
3013void noinline 3402void noinline
3014ev_embed_sweep (EV_P_ ev_embed *w) 3403ev_embed_sweep (EV_P_ ev_embed *w)
3015{ 3404{
3031embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3420embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3032{ 3421{
3033 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3422 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3034 3423
3035 { 3424 {
3036 struct ev_loop *loop = w->other; 3425 EV_P = w->other;
3037 3426
3038 while (fdchangecnt) 3427 while (fdchangecnt)
3039 { 3428 {
3040 fd_reify (EV_A); 3429 fd_reify (EV_A);
3041 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3430 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3049 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3438 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3050 3439
3051 ev_embed_stop (EV_A_ w); 3440 ev_embed_stop (EV_A_ w);
3052 3441
3053 { 3442 {
3054 struct ev_loop *loop = w->other; 3443 EV_P = w->other;
3055 3444
3056 ev_loop_fork (EV_A); 3445 ev_loop_fork (EV_A);
3057 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3446 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3058 } 3447 }
3059 3448
3073{ 3462{
3074 if (expect_false (ev_is_active (w))) 3463 if (expect_false (ev_is_active (w)))
3075 return; 3464 return;
3076 3465
3077 { 3466 {
3078 struct ev_loop *loop = w->other; 3467 EV_P = w->other;
3079 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3468 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3080 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3469 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3081 } 3470 }
3082 3471
3083 EV_FREQUENT_CHECK; 3472 EV_FREQUENT_CHECK;
3110 3499
3111 ev_io_stop (EV_A_ &w->io); 3500 ev_io_stop (EV_A_ &w->io);
3112 ev_prepare_stop (EV_A_ &w->prepare); 3501 ev_prepare_stop (EV_A_ &w->prepare);
3113 ev_fork_stop (EV_A_ &w->fork); 3502 ev_fork_stop (EV_A_ &w->fork);
3114 3503
3504 ev_stop (EV_A_ (W)w);
3505
3115 EV_FREQUENT_CHECK; 3506 EV_FREQUENT_CHECK;
3116} 3507}
3117#endif 3508#endif
3118 3509
3119#if EV_FORK_ENABLE 3510#if EV_FORK_ENABLE
3195 3586
3196void 3587void
3197ev_async_send (EV_P_ ev_async *w) 3588ev_async_send (EV_P_ ev_async *w)
3198{ 3589{
3199 w->sent = 1; 3590 w->sent = 1;
3200 evpipe_write (EV_A_ &gotasync); 3591 evpipe_write (EV_A_ &async_pending);
3201} 3592}
3202#endif 3593#endif
3203 3594
3204/*****************************************************************************/ 3595/*****************************************************************************/
3205 3596
3342 if (types & EV_ASYNC) 3733 if (types & EV_ASYNC)
3343 for (i = asynccnt; i--; ) 3734 for (i = asynccnt; i--; )
3344 cb (EV_A_ EV_ASYNC, asyncs [i]); 3735 cb (EV_A_ EV_ASYNC, asyncs [i]);
3345#endif 3736#endif
3346 3737
3738#if EV_PREPARE_ENABLE
3347 if (types & EV_PREPARE) 3739 if (types & EV_PREPARE)
3348 for (i = preparecnt; i--; ) 3740 for (i = preparecnt; i--; )
3349#if EV_EMBED_ENABLE 3741# if EV_EMBED_ENABLE
3350 if (ev_cb (prepares [i]) != embed_prepare_cb) 3742 if (ev_cb (prepares [i]) != embed_prepare_cb)
3351#endif 3743# endif
3352 cb (EV_A_ EV_PREPARE, prepares [i]); 3744 cb (EV_A_ EV_PREPARE, prepares [i]);
3745#endif
3353 3746
3747#if EV_CHECK_ENABLE
3354 if (types & EV_CHECK) 3748 if (types & EV_CHECK)
3355 for (i = checkcnt; i--; ) 3749 for (i = checkcnt; i--; )
3356 cb (EV_A_ EV_CHECK, checks [i]); 3750 cb (EV_A_ EV_CHECK, checks [i]);
3751#endif
3357 3752
3753#if EV_SIGNAL_ENABLE
3358 if (types & EV_SIGNAL) 3754 if (types & EV_SIGNAL)
3359 for (i = 0; i < signalmax; ++i) 3755 for (i = 0; i < EV_NSIG - 1; ++i)
3360 for (wl = signals [i].head; wl; ) 3756 for (wl = signals [i].head; wl; )
3361 { 3757 {
3362 wn = wl->next; 3758 wn = wl->next;
3363 cb (EV_A_ EV_SIGNAL, wl); 3759 cb (EV_A_ EV_SIGNAL, wl);
3364 wl = wn; 3760 wl = wn;
3365 } 3761 }
3762#endif
3366 3763
3764#if EV_CHILD_ENABLE
3367 if (types & EV_CHILD) 3765 if (types & EV_CHILD)
3368 for (i = EV_PID_HASHSIZE; i--; ) 3766 for (i = (EV_PID_HASHSIZE); i--; )
3369 for (wl = childs [i]; wl; ) 3767 for (wl = childs [i]; wl; )
3370 { 3768 {
3371 wn = wl->next; 3769 wn = wl->next;
3372 cb (EV_A_ EV_CHILD, wl); 3770 cb (EV_A_ EV_CHILD, wl);
3373 wl = wn; 3771 wl = wn;
3374 } 3772 }
3773#endif
3375/* EV_STAT 0x00001000 /* stat data changed */ 3774/* EV_STAT 0x00001000 /* stat data changed */
3376/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3775/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3377} 3776}
3378#endif 3777#endif
3379 3778

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines