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

Comparing libev/ev.c (file contents):
Revision 1.284 by root, Wed Apr 15 17:49:26 2009 UTC vs.
Revision 1.330 by root, Tue Mar 9 08:46: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 *
57# endif 57# endif
58# ifndef EV_USE_MONOTONIC 58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 59# define EV_USE_MONOTONIC 1
60# endif 60# endif
61# endif 61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
62# endif 64# endif
63 65
64# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
108# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
109# endif 111# endif
110# endif 112# endif
111 113
112# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
113# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
115# else 117# else
116# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
117# endif 119# endif
118# endif 120# endif
131# else 133# else
132# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
133# endif 135# endif
134# endif 136# endif
135 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
136# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
137# if HAVE_EVENTFD 147# if HAVE_EVENTFD
138# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
139# else 149# else
140# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
143 153
144#endif 154#endif
145 155
146#include <math.h> 156#include <math.h>
147#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
148#include <fcntl.h> 159#include <fcntl.h>
149#include <stddef.h> 160#include <stddef.h>
150 161
151#include <stdio.h> 162#include <stdio.h>
152 163
153#include <assert.h> 164#include <assert.h>
154#include <errno.h> 165#include <errno.h>
155#include <sys/types.h> 166#include <sys/types.h>
156#include <time.h> 167#include <time.h>
168#include <limits.h>
157 169
158#include <signal.h> 170#include <signal.h>
159 171
160#ifdef EV_H 172#ifdef EV_H
161# include EV_H 173# include EV_H
176# endif 188# endif
177#endif 189#endif
178 190
179/* this block tries to deduce configuration from header-defined symbols and defaults */ 191/* this block tries to deduce configuration from header-defined symbols and defaults */
180 192
193/* try to deduce the maximum number of signals on this platform */
194#if defined (EV_NSIG)
195/* use what's provided */
196#elif defined (NSIG)
197# define EV_NSIG (NSIG)
198#elif defined(_NSIG)
199# define EV_NSIG (_NSIG)
200#elif defined (SIGMAX)
201# define EV_NSIG (SIGMAX+1)
202#elif defined (SIG_MAX)
203# define EV_NSIG (SIG_MAX+1)
204#elif defined (_SIG_MAX)
205# define EV_NSIG (_SIG_MAX+1)
206#elif defined (MAXSIG)
207# define EV_NSIG (MAXSIG+1)
208#elif defined (MAX_SIG)
209# define EV_NSIG (MAX_SIG+1)
210#elif defined (SIGARRAYSIZE)
211# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
212#elif defined (_sys_nsig)
213# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
214#else
215# error "unable to find value for NSIG, please report"
216/* to make it compile regardless, just remove the above line */
217# define EV_NSIG 65
218#endif
219
181#ifndef EV_USE_CLOCK_SYSCALL 220#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 221# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 222# define EV_USE_CLOCK_SYSCALL 1
184# else 223# else
185# define EV_USE_CLOCK_SYSCALL 0 224# define EV_USE_CLOCK_SYSCALL 0
264# else 303# else
265# define EV_USE_EVENTFD 0 304# define EV_USE_EVENTFD 0
266# endif 305# endif
267#endif 306#endif
268 307
308#ifndef EV_USE_SIGNALFD
309# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
310# define EV_USE_SIGNALFD 1
311# else
312# define EV_USE_SIGNALFD 0
313# endif
314#endif
315
269#if 0 /* debugging */ 316#if 0 /* debugging */
270# define EV_VERIFY 3 317# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 318# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 319# define EV_HEAP_CACHE_AT 1
273#endif 320#endif
282 329
283#ifndef EV_HEAP_CACHE_AT 330#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 331# define EV_HEAP_CACHE_AT !EV_MINIMAL
285#endif 332#endif
286 333
334/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
335/* which makes programs even slower. might work on other unices, too. */
336#if EV_USE_CLOCK_SYSCALL
337# include <syscall.h>
338# ifdef SYS_clock_gettime
339# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
340# undef EV_USE_MONOTONIC
341# define EV_USE_MONOTONIC 1
342# else
343# undef EV_USE_CLOCK_SYSCALL
344# define EV_USE_CLOCK_SYSCALL 0
345# endif
346#endif
347
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 348/* this block fixes any misconfiguration where we know we run into trouble otherwise */
349
350#ifdef _AIX
351/* AIX has a completely broken poll.h header */
352# undef EV_USE_POLL
353# define EV_USE_POLL 0
354#endif
288 355
289#ifndef CLOCK_MONOTONIC 356#ifndef CLOCK_MONOTONIC
290# undef EV_USE_MONOTONIC 357# undef EV_USE_MONOTONIC
291# define EV_USE_MONOTONIC 0 358# define EV_USE_MONOTONIC 0
292#endif 359#endif
320 387
321#if EV_SELECT_IS_WINSOCKET 388#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 389# include <winsock.h>
323#endif 390#endif
324 391
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 392#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 393/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 394# include <stdint.h>
395# ifndef EFD_NONBLOCK
396# define EFD_NONBLOCK O_NONBLOCK
397# endif
398# ifndef EFD_CLOEXEC
399# ifdef O_CLOEXEC
400# define EFD_CLOEXEC O_CLOEXEC
401# else
402# define EFD_CLOEXEC 02000000
403# endif
404# endif
337# ifdef __cplusplus 405# ifdef __cplusplus
338extern "C" { 406extern "C" {
339# endif 407# endif
340int eventfd (unsigned int initval, int flags); 408int (eventfd) (unsigned int initval, int flags);
341# ifdef __cplusplus 409# ifdef __cplusplus
342} 410}
343# endif 411# endif
344#endif 412#endif
413
414#if EV_USE_SIGNALFD
415/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
416# include <stdint.h>
417# ifndef SFD_NONBLOCK
418# define SFD_NONBLOCK O_NONBLOCK
419# endif
420# ifndef SFD_CLOEXEC
421# ifdef O_CLOEXEC
422# define SFD_CLOEXEC O_CLOEXEC
423# else
424# define SFD_CLOEXEC 02000000
425# endif
426# endif
427# ifdef __cplusplus
428extern "C" {
429# endif
430int signalfd (int fd, const sigset_t *mask, int flags);
431
432struct signalfd_siginfo
433{
434 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)];
436};
437# ifdef __cplusplus
438}
439# endif
440#endif
441
345 442
346/**/ 443/**/
347 444
348#if EV_VERIFY >= 3 445#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 446# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
361 */ 458 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 459#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 460
364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 461#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
365#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 462#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
366/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
367 463
368#if __GNUC__ >= 4 464#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 465# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 466# define noinline __attribute__ ((noinline))
371#else 467#else
384# define inline_speed static noinline 480# define inline_speed static noinline
385#else 481#else
386# define inline_speed static inline 482# define inline_speed static inline
387#endif 483#endif
388 484
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 485#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
486
487#if EV_MINPRI == EV_MAXPRI
488# define ABSPRI(w) (((W)w), 0)
489#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 490# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
491#endif
391 492
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 493#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 494#define EMPTY2(a,b) /* used to suppress some warnings */
394 495
395typedef ev_watcher *W; 496typedef ev_watcher *W;
407 508
408#if EV_USE_MONOTONIC 509#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 510static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 511#endif
411 512
513#ifndef EV_FD_TO_WIN32_HANDLE
514# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
515#endif
516#ifndef EV_WIN32_HANDLE_TO_FD
517# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
518#endif
519#ifndef EV_WIN32_CLOSE_FD
520# define EV_WIN32_CLOSE_FD(fd) close (fd)
521#endif
522
412#ifdef _WIN32 523#ifdef _WIN32
413# include "ev_win32.c" 524# include "ev_win32.c"
414#endif 525#endif
415 526
416/*****************************************************************************/ 527/*****************************************************************************/
431 542
432 if (syserr_cb) 543 if (syserr_cb)
433 syserr_cb (msg); 544 syserr_cb (msg);
434 else 545 else
435 { 546 {
547#if EV_AVOID_STDIO
548 write (STDERR_FILENO, msg, strlen (msg));
549 write (STDERR_FILENO, ": ", 2);
550 msg = strerror (errno);
551 write (STDERR_FILENO, msg, strlen (msg));
552 write (STDERR_FILENO, "\n", 1);
553#else
436 perror (msg); 554 perror (msg);
555#endif
437 abort (); 556 abort ();
438 } 557 }
439} 558}
440 559
441static void * 560static void *
466{ 585{
467 ptr = alloc (ptr, size); 586 ptr = alloc (ptr, size);
468 587
469 if (!ptr && size) 588 if (!ptr && size)
470 { 589 {
590#if EV_AVOID_STDIO
591 write (STDERR_FILENO, "libev: memory allocation failed, aborting.",
592 sizeof ("libev: memory allocation failed, aborting.") - 1);
593#else
471 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 594 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
595#endif
472 abort (); 596 abort ();
473 } 597 }
474 598
475 return ptr; 599 return ptr;
476} 600}
478#define ev_malloc(size) ev_realloc (0, (size)) 602#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 603#define ev_free(ptr) ev_realloc ((ptr), 0)
480 604
481/*****************************************************************************/ 605/*****************************************************************************/
482 606
607/* set in reify when reification needed */
608#define EV_ANFD_REIFY 1
609
610/* file descriptor info structure */
483typedef struct 611typedef struct
484{ 612{
485 WL head; 613 WL head;
486 unsigned char events; 614 unsigned char events; /* the events watched for */
487 unsigned char reify; 615 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
488 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 616 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 617 unsigned char unused;
490#if EV_USE_EPOLL 618#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 619 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 620#endif
493#if EV_SELECT_IS_WINSOCKET 621#if EV_SELECT_IS_WINSOCKET
494 SOCKET handle; 622 SOCKET handle;
495#endif 623#endif
496} ANFD; 624} ANFD;
497 625
626/* stores the pending event set for a given watcher */
498typedef struct 627typedef struct
499{ 628{
500 W w; 629 W w;
501 int events; 630 int events; /* the pending event set for the given watcher */
502} ANPENDING; 631} ANPENDING;
503 632
504#if EV_USE_INOTIFY 633#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 634/* hash table entry per inotify-id */
506typedef struct 635typedef struct
509} ANFS; 638} ANFS;
510#endif 639#endif
511 640
512/* Heap Entry */ 641/* Heap Entry */
513#if EV_HEAP_CACHE_AT 642#if EV_HEAP_CACHE_AT
643 /* a heap element */
514 typedef struct { 644 typedef struct {
515 ev_tstamp at; 645 ev_tstamp at;
516 WT w; 646 WT w;
517 } ANHE; 647 } ANHE;
518 648
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 649 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 650 #define ANHE_at(he) (he).at /* access cached at, read-only */
521 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 651 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 652#else
653 /* a heap element */
523 typedef WT ANHE; 654 typedef WT ANHE;
524 655
525 #define ANHE_w(he) (he) 656 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 657 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 658 #define ANHE_at_cache(he)
551 682
552 static int ev_default_loop_ptr; 683 static int ev_default_loop_ptr;
553 684
554#endif 685#endif
555 686
687#if EV_MINIMAL < 2
688# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
689# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
690# define EV_INVOKE_PENDING invoke_cb (EV_A)
691#else
692# define EV_RELEASE_CB (void)0
693# define EV_ACQUIRE_CB (void)0
694# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
695#endif
696
697#define EVUNLOOP_RECURSE 0x80
698
556/*****************************************************************************/ 699/*****************************************************************************/
557 700
701#ifndef EV_HAVE_EV_TIME
558ev_tstamp 702ev_tstamp
559ev_time (void) 703ev_time (void)
560{ 704{
561#if EV_USE_REALTIME 705#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 706 if (expect_true (have_realtime))
569 713
570 struct timeval tv; 714 struct timeval tv;
571 gettimeofday (&tv, 0); 715 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 716 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 717}
718#endif
574 719
575inline_size ev_tstamp 720inline_size ev_tstamp
576get_clock (void) 721get_clock (void)
577{ 722{
578#if EV_USE_MONOTONIC 723#if EV_USE_MONOTONIC
614 759
615 tv.tv_sec = (time_t)delay; 760 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 761 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617 762
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 763 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 764 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 765 /* by older ones */
621 select (0, 0, 0, 0, &tv); 766 select (0, 0, 0, 0, &tv);
622#endif 767#endif
623 } 768 }
624} 769}
625 770
626/*****************************************************************************/ 771/*****************************************************************************/
627 772
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 773#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 774
775/* find a suitable new size for the given array, */
776/* hopefully by rounding to a ncie-to-malloc size */
630inline_size int 777inline_size int
631array_nextsize (int elem, int cur, int cnt) 778array_nextsize (int elem, int cur, int cnt)
632{ 779{
633 int ncur = cur + 1; 780 int ncur = cur + 1;
634 781
680#define array_free(stem, idx) \ 827#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 828 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 829
683/*****************************************************************************/ 830/*****************************************************************************/
684 831
832/* dummy callback for pending events */
833static void noinline
834pendingcb (EV_P_ ev_prepare *w, int revents)
835{
836}
837
685void noinline 838void noinline
686ev_feed_event (EV_P_ void *w, int revents) 839ev_feed_event (EV_P_ void *w, int revents)
687{ 840{
688 W w_ = (W)w; 841 W w_ = (W)w;
689 int pri = ABSPRI (w_); 842 int pri = ABSPRI (w_);
724} 877}
725 878
726/*****************************************************************************/ 879/*****************************************************************************/
727 880
728inline_speed void 881inline_speed void
729fd_event (EV_P_ int fd, int revents) 882fd_event_nc (EV_P_ int fd, int revents)
730{ 883{
731 ANFD *anfd = anfds + fd; 884 ANFD *anfd = anfds + fd;
732 ev_io *w; 885 ev_io *w;
733 886
734 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 887 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
738 if (ev) 891 if (ev)
739 ev_feed_event (EV_A_ (W)w, ev); 892 ev_feed_event (EV_A_ (W)w, ev);
740 } 893 }
741} 894}
742 895
896/* do not submit kernel events for fds that have reify set */
897/* because that means they changed while we were polling for new events */
898inline_speed void
899fd_event (EV_P_ int fd, int revents)
900{
901 ANFD *anfd = anfds + fd;
902
903 if (expect_true (!anfd->reify))
904 fd_event_nc (EV_A_ fd, revents);
905}
906
743void 907void
744ev_feed_fd_event (EV_P_ int fd, int revents) 908ev_feed_fd_event (EV_P_ int fd, int revents)
745{ 909{
746 if (fd >= 0 && fd < anfdmax) 910 if (fd >= 0 && fd < anfdmax)
747 fd_event (EV_A_ fd, revents); 911 fd_event_nc (EV_A_ fd, revents);
748} 912}
749 913
914/* make sure the external fd watch events are in-sync */
915/* with the kernel/libev internal state */
750inline_size void 916inline_size void
751fd_reify (EV_P) 917fd_reify (EV_P)
752{ 918{
753 int i; 919 int i;
754 920
765 931
766#if EV_SELECT_IS_WINSOCKET 932#if EV_SELECT_IS_WINSOCKET
767 if (events) 933 if (events)
768 { 934 {
769 unsigned long arg; 935 unsigned long arg;
770 #ifdef EV_FD_TO_WIN32_HANDLE
771 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 936 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
772 #else
773 anfd->handle = _get_osfhandle (fd);
774 #endif
775 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 937 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
776 } 938 }
777#endif 939#endif
778 940
779 { 941 {
789 } 951 }
790 952
791 fdchangecnt = 0; 953 fdchangecnt = 0;
792} 954}
793 955
956/* something about the given fd changed */
794inline_size void 957inline_size void
795fd_change (EV_P_ int fd, int flags) 958fd_change (EV_P_ int fd, int flags)
796{ 959{
797 unsigned char reify = anfds [fd].reify; 960 unsigned char reify = anfds [fd].reify;
798 anfds [fd].reify |= flags; 961 anfds [fd].reify |= flags;
803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 966 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
804 fdchanges [fdchangecnt - 1] = fd; 967 fdchanges [fdchangecnt - 1] = fd;
805 } 968 }
806} 969}
807 970
971/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
808inline_speed void 972inline_speed void
809fd_kill (EV_P_ int fd) 973fd_kill (EV_P_ int fd)
810{ 974{
811 ev_io *w; 975 ev_io *w;
812 976
815 ev_io_stop (EV_A_ w); 979 ev_io_stop (EV_A_ w);
816 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 980 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
817 } 981 }
818} 982}
819 983
984/* check whether the given fd is atcually valid, for error recovery */
820inline_size int 985inline_size int
821fd_valid (int fd) 986fd_valid (int fd)
822{ 987{
823#ifdef _WIN32 988#ifdef _WIN32
824 return _get_osfhandle (fd) != -1; 989 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
825#else 990#else
826 return fcntl (fd, F_GETFD) != -1; 991 return fcntl (fd, F_GETFD) != -1;
827#endif 992#endif
828} 993}
829 994
847 1012
848 for (fd = anfdmax; fd--; ) 1013 for (fd = anfdmax; fd--; )
849 if (anfds [fd].events) 1014 if (anfds [fd].events)
850 { 1015 {
851 fd_kill (EV_A_ fd); 1016 fd_kill (EV_A_ fd);
852 return; 1017 break;
853 } 1018 }
854} 1019}
855 1020
856/* usually called after fork if backend needs to re-arm all fds from scratch */ 1021/* usually called after fork if backend needs to re-arm all fds from scratch */
857static void noinline 1022static void noinline
862 for (fd = 0; fd < anfdmax; ++fd) 1027 for (fd = 0; fd < anfdmax; ++fd)
863 if (anfds [fd].events) 1028 if (anfds [fd].events)
864 { 1029 {
865 anfds [fd].events = 0; 1030 anfds [fd].events = 0;
866 anfds [fd].emask = 0; 1031 anfds [fd].emask = 0;
867 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1032 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
868 } 1033 }
869} 1034}
870 1035
871/*****************************************************************************/ 1036/*****************************************************************************/
872 1037
947 1112
948 for (;;) 1113 for (;;)
949 { 1114 {
950 int c = k << 1; 1115 int c = k << 1;
951 1116
952 if (c > N + HEAP0 - 1) 1117 if (c >= N + HEAP0)
953 break; 1118 break;
954 1119
955 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1120 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
956 ? 1 : 0; 1121 ? 1 : 0;
957 1122
989 1154
990 heap [k] = he; 1155 heap [k] = he;
991 ev_active (ANHE_w (he)) = k; 1156 ev_active (ANHE_w (he)) = k;
992} 1157}
993 1158
1159/* move an element suitably so it is in a correct place */
994inline_size void 1160inline_size void
995adjustheap (ANHE *heap, int N, int k) 1161adjustheap (ANHE *heap, int N, int k)
996{ 1162{
997 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1163 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
998 upheap (heap, k); 1164 upheap (heap, k);
999 else 1165 else
1000 downheap (heap, N, k); 1166 downheap (heap, N, k);
1001} 1167}
1002 1168
1012 upheap (heap, i + HEAP0); 1178 upheap (heap, i + HEAP0);
1013} 1179}
1014 1180
1015/*****************************************************************************/ 1181/*****************************************************************************/
1016 1182
1183/* associate signal watchers to a signal signal */
1017typedef struct 1184typedef struct
1018{ 1185{
1186 EV_ATOMIC_T pending;
1187#if EV_MULTIPLICITY
1188 EV_P;
1189#endif
1019 WL head; 1190 WL head;
1020 EV_ATOMIC_T gotsig;
1021} ANSIG; 1191} ANSIG;
1022 1192
1023static ANSIG *signals; 1193static ANSIG signals [EV_NSIG - 1];
1024static int signalmax;
1025
1026static EV_ATOMIC_T gotsig;
1027 1194
1028/*****************************************************************************/ 1195/*****************************************************************************/
1029 1196
1197/* used to prepare libev internal fd's */
1198/* this is not fork-safe */
1030inline_speed void 1199inline_speed void
1031fd_intern (int fd) 1200fd_intern (int fd)
1032{ 1201{
1033#ifdef _WIN32 1202#ifdef _WIN32
1034 unsigned long arg = 1; 1203 unsigned long arg = 1;
1035 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1204 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1036#else 1205#else
1037 fcntl (fd, F_SETFD, FD_CLOEXEC); 1206 fcntl (fd, F_SETFD, FD_CLOEXEC);
1038 fcntl (fd, F_SETFL, O_NONBLOCK); 1207 fcntl (fd, F_SETFL, O_NONBLOCK);
1039#endif 1208#endif
1040} 1209}
1041 1210
1042static void noinline 1211static void noinline
1043evpipe_init (EV_P) 1212evpipe_init (EV_P)
1044{ 1213{
1045 if (!ev_is_active (&pipeev)) 1214 if (!ev_is_active (&pipe_w))
1046 { 1215 {
1047#if EV_USE_EVENTFD 1216#if EV_USE_EVENTFD
1217 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1218 if (evfd < 0 && errno == EINVAL)
1048 if ((evfd = eventfd (0, 0)) >= 0) 1219 evfd = eventfd (0, 0);
1220
1221 if (evfd >= 0)
1049 { 1222 {
1050 evpipe [0] = -1; 1223 evpipe [0] = -1;
1051 fd_intern (evfd); 1224 fd_intern (evfd); /* doing it twice doesn't hurt */
1052 ev_io_set (&pipeev, evfd, EV_READ); 1225 ev_io_set (&pipe_w, evfd, EV_READ);
1053 } 1226 }
1054 else 1227 else
1055#endif 1228#endif
1056 { 1229 {
1057 while (pipe (evpipe)) 1230 while (pipe (evpipe))
1058 ev_syserr ("(libev) error creating signal/async pipe"); 1231 ev_syserr ("(libev) error creating signal/async pipe");
1059 1232
1060 fd_intern (evpipe [0]); 1233 fd_intern (evpipe [0]);
1061 fd_intern (evpipe [1]); 1234 fd_intern (evpipe [1]);
1062 ev_io_set (&pipeev, evpipe [0], EV_READ); 1235 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1063 } 1236 }
1064 1237
1065 ev_io_start (EV_A_ &pipeev); 1238 ev_io_start (EV_A_ &pipe_w);
1066 ev_unref (EV_A); /* watcher should not keep loop alive */ 1239 ev_unref (EV_A); /* watcher should not keep loop alive */
1067 } 1240 }
1068} 1241}
1069 1242
1070inline_size void 1243inline_size void
1088 1261
1089 errno = old_errno; 1262 errno = old_errno;
1090 } 1263 }
1091} 1264}
1092 1265
1266/* called whenever the libev signal pipe */
1267/* got some events (signal, async) */
1093static void 1268static void
1094pipecb (EV_P_ ev_io *iow, int revents) 1269pipecb (EV_P_ ev_io *iow, int revents)
1095{ 1270{
1271 int i;
1272
1096#if EV_USE_EVENTFD 1273#if EV_USE_EVENTFD
1097 if (evfd >= 0) 1274 if (evfd >= 0)
1098 { 1275 {
1099 uint64_t counter; 1276 uint64_t counter;
1100 read (evfd, &counter, sizeof (uint64_t)); 1277 read (evfd, &counter, sizeof (uint64_t));
1104 { 1281 {
1105 char dummy; 1282 char dummy;
1106 read (evpipe [0], &dummy, 1); 1283 read (evpipe [0], &dummy, 1);
1107 } 1284 }
1108 1285
1109 if (gotsig && ev_is_default_loop (EV_A)) 1286 if (sig_pending)
1110 { 1287 {
1111 int signum; 1288 sig_pending = 0;
1112 gotsig = 0;
1113 1289
1114 for (signum = signalmax; signum--; ) 1290 for (i = EV_NSIG - 1; i--; )
1115 if (signals [signum].gotsig) 1291 if (expect_false (signals [i].pending))
1116 ev_feed_signal_event (EV_A_ signum + 1); 1292 ev_feed_signal_event (EV_A_ i + 1);
1117 } 1293 }
1118 1294
1119#if EV_ASYNC_ENABLE 1295#if EV_ASYNC_ENABLE
1120 if (gotasync) 1296 if (async_pending)
1121 { 1297 {
1122 int i; 1298 async_pending = 0;
1123 gotasync = 0;
1124 1299
1125 for (i = asynccnt; i--; ) 1300 for (i = asynccnt; i--; )
1126 if (asyncs [i]->sent) 1301 if (asyncs [i]->sent)
1127 { 1302 {
1128 asyncs [i]->sent = 0; 1303 asyncs [i]->sent = 0;
1136 1311
1137static void 1312static void
1138ev_sighandler (int signum) 1313ev_sighandler (int signum)
1139{ 1314{
1140#if EV_MULTIPLICITY 1315#if EV_MULTIPLICITY
1141 struct ev_loop *loop = &default_loop_struct; 1316 EV_P = signals [signum - 1].loop;
1142#endif 1317#endif
1143 1318
1144#if _WIN32 1319#ifdef _WIN32
1145 signal (signum, ev_sighandler); 1320 signal (signum, ev_sighandler);
1146#endif 1321#endif
1147 1322
1148 signals [signum - 1].gotsig = 1; 1323 signals [signum - 1].pending = 1;
1149 evpipe_write (EV_A_ &gotsig); 1324 evpipe_write (EV_A_ &sig_pending);
1150} 1325}
1151 1326
1152void noinline 1327void noinline
1153ev_feed_signal_event (EV_P_ int signum) 1328ev_feed_signal_event (EV_P_ int signum)
1154{ 1329{
1155 WL w; 1330 WL w;
1156 1331
1332 if (expect_false (signum <= 0 || signum > EV_NSIG))
1333 return;
1334
1335 --signum;
1336
1157#if EV_MULTIPLICITY 1337#if EV_MULTIPLICITY
1158 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1338 /* it is permissible to try to feed a signal to the wrong loop */
1159#endif 1339 /* or, likely more useful, feeding a signal nobody is waiting for */
1160 1340
1161 --signum; 1341 if (expect_false (signals [signum].loop != EV_A))
1162
1163 if (signum < 0 || signum >= signalmax)
1164 return; 1342 return;
1343#endif
1165 1344
1166 signals [signum].gotsig = 0; 1345 signals [signum].pending = 0;
1167 1346
1168 for (w = signals [signum].head; w; w = w->next) 1347 for (w = signals [signum].head; w; w = w->next)
1169 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1348 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1170} 1349}
1171 1350
1351#if EV_USE_SIGNALFD
1352static void
1353sigfdcb (EV_P_ ev_io *iow, int revents)
1354{
1355 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1356
1357 for (;;)
1358 {
1359 ssize_t res = read (sigfd, si, sizeof (si));
1360
1361 /* not ISO-C, as res might be -1, but works with SuS */
1362 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1363 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1364
1365 if (res < (ssize_t)sizeof (si))
1366 break;
1367 }
1368}
1369#endif
1370
1172/*****************************************************************************/ 1371/*****************************************************************************/
1173 1372
1174static WL childs [EV_PID_HASHSIZE]; 1373static WL childs [EV_PID_HASHSIZE];
1175 1374
1176#ifndef _WIN32 1375#ifndef _WIN32
1179 1378
1180#ifndef WIFCONTINUED 1379#ifndef WIFCONTINUED
1181# define WIFCONTINUED(status) 0 1380# define WIFCONTINUED(status) 0
1182#endif 1381#endif
1183 1382
1383/* handle a single child status event */
1184inline_speed void 1384inline_speed void
1185child_reap (EV_P_ int chain, int pid, int status) 1385child_reap (EV_P_ int chain, int pid, int status)
1186{ 1386{
1187 ev_child *w; 1387 ev_child *w;
1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1388 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1202 1402
1203#ifndef WCONTINUED 1403#ifndef WCONTINUED
1204# define WCONTINUED 0 1404# define WCONTINUED 0
1205#endif 1405#endif
1206 1406
1407/* called on sigchld etc., calls waitpid */
1207static void 1408static void
1208childcb (EV_P_ ev_signal *sw, int revents) 1409childcb (EV_P_ ev_signal *sw, int revents)
1209{ 1410{
1210 int pid, status; 1411 int pid, status;
1211 1412
1318ev_backend (EV_P) 1519ev_backend (EV_P)
1319{ 1520{
1320 return backend; 1521 return backend;
1321} 1522}
1322 1523
1524#if EV_MINIMAL < 2
1323unsigned int 1525unsigned int
1324ev_loop_count (EV_P) 1526ev_loop_count (EV_P)
1325{ 1527{
1326 return loop_count; 1528 return loop_count;
1327} 1529}
1328 1530
1531unsigned int
1532ev_loop_depth (EV_P)
1533{
1534 return loop_depth;
1535}
1536
1329void 1537void
1330ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1538ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1331{ 1539{
1332 io_blocktime = interval; 1540 io_blocktime = interval;
1333} 1541}
1336ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1544ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1337{ 1545{
1338 timeout_blocktime = interval; 1546 timeout_blocktime = interval;
1339} 1547}
1340 1548
1549void
1550ev_set_userdata (EV_P_ void *data)
1551{
1552 userdata = data;
1553}
1554
1555void *
1556ev_userdata (EV_P)
1557{
1558 return userdata;
1559}
1560
1561void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1562{
1563 invoke_cb = invoke_pending_cb;
1564}
1565
1566void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1567{
1568 release_cb = release;
1569 acquire_cb = acquire;
1570}
1571#endif
1572
1573/* initialise a loop structure, must be zero-initialised */
1341static void noinline 1574static void noinline
1342loop_init (EV_P_ unsigned int flags) 1575loop_init (EV_P_ unsigned int flags)
1343{ 1576{
1344 if (!backend) 1577 if (!backend)
1345 { 1578 {
1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1594 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1362 have_monotonic = 1; 1595 have_monotonic = 1;
1363 } 1596 }
1364#endif 1597#endif
1365 1598
1599 /* pid check not overridable via env */
1600#ifndef _WIN32
1601 if (flags & EVFLAG_FORKCHECK)
1602 curpid = getpid ();
1603#endif
1604
1605 if (!(flags & EVFLAG_NOENV)
1606 && !enable_secure ()
1607 && getenv ("LIBEV_FLAGS"))
1608 flags = atoi (getenv ("LIBEV_FLAGS"));
1609
1366 ev_rt_now = ev_time (); 1610 ev_rt_now = ev_time ();
1367 mn_now = get_clock (); 1611 mn_now = get_clock ();
1368 now_floor = mn_now; 1612 now_floor = mn_now;
1369 rtmn_diff = ev_rt_now - mn_now; 1613 rtmn_diff = ev_rt_now - mn_now;
1614#if EV_MINIMAL < 2
1615 invoke_cb = ev_invoke_pending;
1616#endif
1370 1617
1371 io_blocktime = 0.; 1618 io_blocktime = 0.;
1372 timeout_blocktime = 0.; 1619 timeout_blocktime = 0.;
1373 backend = 0; 1620 backend = 0;
1374 backend_fd = -1; 1621 backend_fd = -1;
1375 gotasync = 0; 1622 sig_pending = 0;
1623#if EV_ASYNC_ENABLE
1624 async_pending = 0;
1625#endif
1376#if EV_USE_INOTIFY 1626#if EV_USE_INOTIFY
1377 fs_fd = -2; 1627 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1378#endif 1628#endif
1379 1629#if EV_USE_SIGNALFD
1380 /* pid check not overridable via env */ 1630 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1381#ifndef _WIN32
1382 if (flags & EVFLAG_FORKCHECK)
1383 curpid = getpid ();
1384#endif 1631#endif
1385
1386 if (!(flags & EVFLAG_NOENV)
1387 && !enable_secure ()
1388 && getenv ("LIBEV_FLAGS"))
1389 flags = atoi (getenv ("LIBEV_FLAGS"));
1390 1632
1391 if (!(flags & 0x0000ffffU)) 1633 if (!(flags & 0x0000ffffU))
1392 flags |= ev_recommended_backends (); 1634 flags |= ev_recommended_backends ();
1393 1635
1394#if EV_USE_PORT 1636#if EV_USE_PORT
1405#endif 1647#endif
1406#if EV_USE_SELECT 1648#if EV_USE_SELECT
1407 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1649 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1408#endif 1650#endif
1409 1651
1652 ev_prepare_init (&pending_w, pendingcb);
1653
1410 ev_init (&pipeev, pipecb); 1654 ev_init (&pipe_w, pipecb);
1411 ev_set_priority (&pipeev, EV_MAXPRI); 1655 ev_set_priority (&pipe_w, EV_MAXPRI);
1412 } 1656 }
1413} 1657}
1414 1658
1659/* free up a loop structure */
1415static void noinline 1660static void noinline
1416loop_destroy (EV_P) 1661loop_destroy (EV_P)
1417{ 1662{
1418 int i; 1663 int i;
1419 1664
1420 if (ev_is_active (&pipeev)) 1665 if (ev_is_active (&pipe_w))
1421 { 1666 {
1422 ev_ref (EV_A); /* signal watcher */ 1667 /*ev_ref (EV_A);*/
1423 ev_io_stop (EV_A_ &pipeev); 1668 /*ev_io_stop (EV_A_ &pipe_w);*/
1424 1669
1425#if EV_USE_EVENTFD 1670#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1671 if (evfd >= 0)
1427 close (evfd); 1672 close (evfd);
1428#endif 1673#endif
1429 1674
1430 if (evpipe [0] >= 0) 1675 if (evpipe [0] >= 0)
1431 { 1676 {
1432 close (evpipe [0]); 1677 EV_WIN32_CLOSE_FD (evpipe [0]);
1433 close (evpipe [1]); 1678 EV_WIN32_CLOSE_FD (evpipe [1]);
1434 } 1679 }
1435 } 1680 }
1681
1682#if EV_USE_SIGNALFD
1683 if (ev_is_active (&sigfd_w))
1684 close (sigfd);
1685#endif
1436 1686
1437#if EV_USE_INOTIFY 1687#if EV_USE_INOTIFY
1438 if (fs_fd >= 0) 1688 if (fs_fd >= 0)
1439 close (fs_fd); 1689 close (fs_fd);
1440#endif 1690#endif
1464#if EV_IDLE_ENABLE 1714#if EV_IDLE_ENABLE
1465 array_free (idle, [i]); 1715 array_free (idle, [i]);
1466#endif 1716#endif
1467 } 1717 }
1468 1718
1469 ev_free (anfds); anfdmax = 0; 1719 ev_free (anfds); anfds = 0; anfdmax = 0;
1470 1720
1471 /* have to use the microsoft-never-gets-it-right macro */ 1721 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY); 1722 array_free (rfeed, EMPTY);
1473 array_free (fdchange, EMPTY); 1723 array_free (fdchange, EMPTY);
1474 array_free (timer, EMPTY); 1724 array_free (timer, EMPTY);
1505#endif 1755#endif
1506#if EV_USE_INOTIFY 1756#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1757 infy_fork (EV_A);
1508#endif 1758#endif
1509 1759
1510 if (ev_is_active (&pipeev)) 1760 if (ev_is_active (&pipe_w))
1511 { 1761 {
1512 /* this "locks" the handlers against writing to the pipe */ 1762 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1763 /* while we modify the fd vars */
1514 gotsig = 1; 1764 sig_pending = 1;
1515#if EV_ASYNC_ENABLE 1765#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1766 async_pending = 1;
1517#endif 1767#endif
1518 1768
1519 ev_ref (EV_A); 1769 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1770 ev_io_stop (EV_A_ &pipe_w);
1521 1771
1522#if EV_USE_EVENTFD 1772#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1773 if (evfd >= 0)
1524 close (evfd); 1774 close (evfd);
1525#endif 1775#endif
1526 1776
1527 if (evpipe [0] >= 0) 1777 if (evpipe [0] >= 0)
1528 { 1778 {
1529 close (evpipe [0]); 1779 EV_WIN32_CLOSE_FD (evpipe [0]);
1530 close (evpipe [1]); 1780 EV_WIN32_CLOSE_FD (evpipe [1]);
1531 } 1781 }
1532 1782
1533 evpipe_init (EV_A); 1783 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1784 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1785 pipecb (EV_A_ &pipe_w, EV_READ);
1536 } 1786 }
1537 1787
1538 postfork = 0; 1788 postfork = 0;
1539} 1789}
1540 1790
1541#if EV_MULTIPLICITY 1791#if EV_MULTIPLICITY
1542 1792
1543struct ev_loop * 1793struct ev_loop *
1544ev_loop_new (unsigned int flags) 1794ev_loop_new (unsigned int flags)
1545{ 1795{
1546 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1796 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1547 1797
1548 memset (loop, 0, sizeof (struct ev_loop)); 1798 memset (EV_A, 0, sizeof (struct ev_loop));
1549
1550 loop_init (EV_A_ flags); 1799 loop_init (EV_A_ flags);
1551 1800
1552 if (ev_backend (EV_A)) 1801 if (ev_backend (EV_A))
1553 return loop; 1802 return EV_A;
1554 1803
1555 return 0; 1804 return 0;
1556} 1805}
1557 1806
1558void 1807void
1565void 1814void
1566ev_loop_fork (EV_P) 1815ev_loop_fork (EV_P)
1567{ 1816{
1568 postfork = 1; /* must be in line with ev_default_fork */ 1817 postfork = 1; /* must be in line with ev_default_fork */
1569} 1818}
1819#endif /* multiplicity */
1570 1820
1571#if EV_VERIFY 1821#if EV_VERIFY
1572static void noinline 1822static void noinline
1573verify_watcher (EV_P_ W w) 1823verify_watcher (EV_P_ W w)
1574{ 1824{
1602 verify_watcher (EV_A_ ws [cnt]); 1852 verify_watcher (EV_A_ ws [cnt]);
1603 } 1853 }
1604} 1854}
1605#endif 1855#endif
1606 1856
1857#if EV_MINIMAL < 2
1607void 1858void
1608ev_loop_verify (EV_P) 1859ev_loop_verify (EV_P)
1609{ 1860{
1610#if EV_VERIFY 1861#if EV_VERIFY
1611 int i; 1862 int i;
1660 assert (checkmax >= checkcnt); 1911 assert (checkmax >= checkcnt);
1661 array_verify (EV_A_ (W *)checks, checkcnt); 1912 array_verify (EV_A_ (W *)checks, checkcnt);
1662 1913
1663# if 0 1914# if 0
1664 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1915 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1665 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1916 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1666# endif
1667#endif 1917# endif
1918#endif
1668} 1919}
1669 1920#endif
1670#endif /* multiplicity */
1671 1921
1672#if EV_MULTIPLICITY 1922#if EV_MULTIPLICITY
1673struct ev_loop * 1923struct ev_loop *
1674ev_default_loop_init (unsigned int flags) 1924ev_default_loop_init (unsigned int flags)
1675#else 1925#else
1678#endif 1928#endif
1679{ 1929{
1680 if (!ev_default_loop_ptr) 1930 if (!ev_default_loop_ptr)
1681 { 1931 {
1682#if EV_MULTIPLICITY 1932#if EV_MULTIPLICITY
1683 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1933 EV_P = ev_default_loop_ptr = &default_loop_struct;
1684#else 1934#else
1685 ev_default_loop_ptr = 1; 1935 ev_default_loop_ptr = 1;
1686#endif 1936#endif
1687 1937
1688 loop_init (EV_A_ flags); 1938 loop_init (EV_A_ flags);
1705 1955
1706void 1956void
1707ev_default_destroy (void) 1957ev_default_destroy (void)
1708{ 1958{
1709#if EV_MULTIPLICITY 1959#if EV_MULTIPLICITY
1710 struct ev_loop *loop = ev_default_loop_ptr; 1960 EV_P = ev_default_loop_ptr;
1711#endif 1961#endif
1712 1962
1713 ev_default_loop_ptr = 0; 1963 ev_default_loop_ptr = 0;
1714 1964
1715#ifndef _WIN32 1965#ifndef _WIN32
1722 1972
1723void 1973void
1724ev_default_fork (void) 1974ev_default_fork (void)
1725{ 1975{
1726#if EV_MULTIPLICITY 1976#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr; 1977 EV_P = ev_default_loop_ptr;
1728#endif 1978#endif
1729 1979
1730 postfork = 1; /* must be in line with ev_loop_fork */ 1980 postfork = 1; /* must be in line with ev_loop_fork */
1731} 1981}
1732 1982
1736ev_invoke (EV_P_ void *w, int revents) 1986ev_invoke (EV_P_ void *w, int revents)
1737{ 1987{
1738 EV_CB_INVOKE ((W)w, revents); 1988 EV_CB_INVOKE ((W)w, revents);
1739} 1989}
1740 1990
1741inline_speed void 1991unsigned int
1742call_pending (EV_P) 1992ev_pending_count (EV_P)
1993{
1994 int pri;
1995 unsigned int count = 0;
1996
1997 for (pri = NUMPRI; pri--; )
1998 count += pendingcnt [pri];
1999
2000 return count;
2001}
2002
2003void noinline
2004ev_invoke_pending (EV_P)
1743{ 2005{
1744 int pri; 2006 int pri;
1745 2007
1746 for (pri = NUMPRI; pri--; ) 2008 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 2009 while (pendingcnt [pri])
1748 { 2010 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2011 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 2012
1751 if (expect_true (p->w))
1752 {
1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 2013 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2014 /* ^ this is no longer true, as pending_w could be here */
1754 2015
1755 p->w->pending = 0; 2016 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 2017 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 2018 EV_FREQUENT_CHECK;
1758 }
1759 } 2019 }
1760} 2020}
1761 2021
1762#if EV_IDLE_ENABLE 2022#if EV_IDLE_ENABLE
2023/* make idle watchers pending. this handles the "call-idle */
2024/* only when higher priorities are idle" logic */
1763inline_size void 2025inline_size void
1764idle_reify (EV_P) 2026idle_reify (EV_P)
1765{ 2027{
1766 if (expect_false (idleall)) 2028 if (expect_false (idleall))
1767 { 2029 {
1780 } 2042 }
1781 } 2043 }
1782} 2044}
1783#endif 2045#endif
1784 2046
2047/* make timers pending */
1785inline_size void 2048inline_size void
1786timers_reify (EV_P) 2049timers_reify (EV_P)
1787{ 2050{
1788 EV_FREQUENT_CHECK; 2051 EV_FREQUENT_CHECK;
1789 2052
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 2081 feed_reverse_done (EV_A_ EV_TIMEOUT);
1819 } 2082 }
1820} 2083}
1821 2084
1822#if EV_PERIODIC_ENABLE 2085#if EV_PERIODIC_ENABLE
2086/* make periodics pending */
1823inline_size void 2087inline_size void
1824periodics_reify (EV_P) 2088periodics_reify (EV_P)
1825{ 2089{
1826 EV_FREQUENT_CHECK; 2090 EV_FREQUENT_CHECK;
1827 2091
1874 2138
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 2139 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 2140 }
1877} 2141}
1878 2142
2143/* simply recalculate all periodics */
2144/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1879static void noinline 2145static void noinline
1880periodics_reschedule (EV_P) 2146periodics_reschedule (EV_P)
1881{ 2147{
1882 int i; 2148 int i;
1883 2149
1896 2162
1897 reheap (periodics, periodiccnt); 2163 reheap (periodics, periodiccnt);
1898} 2164}
1899#endif 2165#endif
1900 2166
2167/* adjust all timers by a given offset */
2168static void noinline
2169timers_reschedule (EV_P_ ev_tstamp adjust)
2170{
2171 int i;
2172
2173 for (i = 0; i < timercnt; ++i)
2174 {
2175 ANHE *he = timers + i + HEAP0;
2176 ANHE_w (*he)->at += adjust;
2177 ANHE_at_cache (*he);
2178 }
2179}
2180
2181/* fetch new monotonic and realtime times from the kernel */
2182/* also detect if there was a timejump, and act accordingly */
1901inline_speed void 2183inline_speed void
1902time_update (EV_P_ ev_tstamp max_block) 2184time_update (EV_P_ ev_tstamp max_block)
1903{ 2185{
1904 int i;
1905
1906#if EV_USE_MONOTONIC 2186#if EV_USE_MONOTONIC
1907 if (expect_true (have_monotonic)) 2187 if (expect_true (have_monotonic))
1908 { 2188 {
2189 int i;
1909 ev_tstamp odiff = rtmn_diff; 2190 ev_tstamp odiff = rtmn_diff;
1910 2191
1911 mn_now = get_clock (); 2192 mn_now = get_clock ();
1912 2193
1913 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2194 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1939 ev_rt_now = ev_time (); 2220 ev_rt_now = ev_time ();
1940 mn_now = get_clock (); 2221 mn_now = get_clock ();
1941 now_floor = mn_now; 2222 now_floor = mn_now;
1942 } 2223 }
1943 2224
2225 /* no timer adjustment, as the monotonic clock doesn't jump */
2226 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1944# if EV_PERIODIC_ENABLE 2227# if EV_PERIODIC_ENABLE
1945 periodics_reschedule (EV_A); 2228 periodics_reschedule (EV_A);
1946# endif 2229# endif
1947 /* no timer adjustment, as the monotonic clock doesn't jump */
1948 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1949 } 2230 }
1950 else 2231 else
1951#endif 2232#endif
1952 { 2233 {
1953 ev_rt_now = ev_time (); 2234 ev_rt_now = ev_time ();
1954 2235
1955 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2236 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1956 { 2237 {
2238 /* adjust timers. this is easy, as the offset is the same for all of them */
2239 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1957#if EV_PERIODIC_ENABLE 2240#if EV_PERIODIC_ENABLE
1958 periodics_reschedule (EV_A); 2241 periodics_reschedule (EV_A);
1959#endif 2242#endif
1960 /* adjust timers. this is easy, as the offset is the same for all of them */
1961 for (i = 0; i < timercnt; ++i)
1962 {
1963 ANHE *he = timers + i + HEAP0;
1964 ANHE_w (*he)->at += ev_rt_now - mn_now;
1965 ANHE_at_cache (*he);
1966 }
1967 } 2243 }
1968 2244
1969 mn_now = ev_rt_now; 2245 mn_now = ev_rt_now;
1970 } 2246 }
1971} 2247}
1972 2248
1973void 2249void
1974ev_ref (EV_P)
1975{
1976 ++activecnt;
1977}
1978
1979void
1980ev_unref (EV_P)
1981{
1982 --activecnt;
1983}
1984
1985void
1986ev_now_update (EV_P)
1987{
1988 time_update (EV_A_ 1e100);
1989}
1990
1991static int loop_done;
1992
1993void
1994ev_loop (EV_P_ int flags) 2250ev_loop (EV_P_ int flags)
1995{ 2251{
2252#if EV_MINIMAL < 2
2253 ++loop_depth;
2254#endif
2255
2256 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2257
1996 loop_done = EVUNLOOP_CANCEL; 2258 loop_done = EVUNLOOP_CANCEL;
1997 2259
1998 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2260 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1999 2261
2000 do 2262 do
2001 { 2263 {
2002#if EV_VERIFY >= 2 2264#if EV_VERIFY >= 2
2003 ev_loop_verify (EV_A); 2265 ev_loop_verify (EV_A);
2016 /* we might have forked, so queue fork handlers */ 2278 /* we might have forked, so queue fork handlers */
2017 if (expect_false (postfork)) 2279 if (expect_false (postfork))
2018 if (forkcnt) 2280 if (forkcnt)
2019 { 2281 {
2020 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2282 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2021 call_pending (EV_A); 2283 EV_INVOKE_PENDING;
2022 } 2284 }
2023#endif 2285#endif
2024 2286
2025 /* queue prepare watchers (and execute them) */ 2287 /* queue prepare watchers (and execute them) */
2026 if (expect_false (preparecnt)) 2288 if (expect_false (preparecnt))
2027 { 2289 {
2028 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2290 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2029 call_pending (EV_A); 2291 EV_INVOKE_PENDING;
2030 } 2292 }
2293
2294 if (expect_false (loop_done))
2295 break;
2031 2296
2032 /* we might have forked, so reify kernel state if necessary */ 2297 /* we might have forked, so reify kernel state if necessary */
2033 if (expect_false (postfork)) 2298 if (expect_false (postfork))
2034 loop_fork (EV_A); 2299 loop_fork (EV_A);
2035 2300
2041 ev_tstamp waittime = 0.; 2306 ev_tstamp waittime = 0.;
2042 ev_tstamp sleeptime = 0.; 2307 ev_tstamp sleeptime = 0.;
2043 2308
2044 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2309 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2045 { 2310 {
2311 /* remember old timestamp for io_blocktime calculation */
2312 ev_tstamp prev_mn_now = mn_now;
2313
2046 /* update time to cancel out callback processing overhead */ 2314 /* update time to cancel out callback processing overhead */
2047 time_update (EV_A_ 1e100); 2315 time_update (EV_A_ 1e100);
2316
2317 waittime = MAX_BLOCKTIME;
2048 2318
2049 if (timercnt) 2319 if (timercnt)
2050 { 2320 {
2051 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2321 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2052 if (waittime > to) waittime = to; 2322 if (waittime > to) waittime = to;
2058 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2328 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2059 if (waittime > to) waittime = to; 2329 if (waittime > to) waittime = to;
2060 } 2330 }
2061#endif 2331#endif
2062 2332
2333 /* don't let timeouts decrease the waittime below timeout_blocktime */
2063 if (expect_false (waittime < timeout_blocktime)) 2334 if (expect_false (waittime < timeout_blocktime))
2064 waittime = timeout_blocktime; 2335 waittime = timeout_blocktime;
2065 2336
2066 sleeptime = waittime - backend_fudge; 2337 /* extra check because io_blocktime is commonly 0 */
2067
2068 if (expect_true (sleeptime > io_blocktime)) 2338 if (expect_false (io_blocktime))
2069 sleeptime = io_blocktime;
2070
2071 if (sleeptime)
2072 { 2339 {
2340 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2341
2342 if (sleeptime > waittime - backend_fudge)
2343 sleeptime = waittime - backend_fudge;
2344
2345 if (expect_true (sleeptime > 0.))
2346 {
2073 ev_sleep (sleeptime); 2347 ev_sleep (sleeptime);
2074 waittime -= sleeptime; 2348 waittime -= sleeptime;
2349 }
2075 } 2350 }
2076 } 2351 }
2077 2352
2353#if EV_MINIMAL < 2
2078 ++loop_count; 2354 ++loop_count;
2355#endif
2356 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2079 backend_poll (EV_A_ waittime); 2357 backend_poll (EV_A_ waittime);
2358 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2080 2359
2081 /* update ev_rt_now, do magic */ 2360 /* update ev_rt_now, do magic */
2082 time_update (EV_A_ waittime + sleeptime); 2361 time_update (EV_A_ waittime + sleeptime);
2083 } 2362 }
2084 2363
2095 2374
2096 /* queue check watchers, to be executed first */ 2375 /* queue check watchers, to be executed first */
2097 if (expect_false (checkcnt)) 2376 if (expect_false (checkcnt))
2098 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2377 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2099 2378
2100 call_pending (EV_A); 2379 EV_INVOKE_PENDING;
2101 } 2380 }
2102 while (expect_true ( 2381 while (expect_true (
2103 activecnt 2382 activecnt
2104 && !loop_done 2383 && !loop_done
2105 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2384 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2106 )); 2385 ));
2107 2386
2108 if (loop_done == EVUNLOOP_ONE) 2387 if (loop_done == EVUNLOOP_ONE)
2109 loop_done = EVUNLOOP_CANCEL; 2388 loop_done = EVUNLOOP_CANCEL;
2389
2390#if EV_MINIMAL < 2
2391 --loop_depth;
2392#endif
2110} 2393}
2111 2394
2112void 2395void
2113ev_unloop (EV_P_ int how) 2396ev_unloop (EV_P_ int how)
2114{ 2397{
2115 loop_done = how; 2398 loop_done = how;
2116} 2399}
2117 2400
2401void
2402ev_ref (EV_P)
2403{
2404 ++activecnt;
2405}
2406
2407void
2408ev_unref (EV_P)
2409{
2410 --activecnt;
2411}
2412
2413void
2414ev_now_update (EV_P)
2415{
2416 time_update (EV_A_ 1e100);
2417}
2418
2419void
2420ev_suspend (EV_P)
2421{
2422 ev_now_update (EV_A);
2423}
2424
2425void
2426ev_resume (EV_P)
2427{
2428 ev_tstamp mn_prev = mn_now;
2429
2430 ev_now_update (EV_A);
2431 timers_reschedule (EV_A_ mn_now - mn_prev);
2432#if EV_PERIODIC_ENABLE
2433 /* TODO: really do this? */
2434 periodics_reschedule (EV_A);
2435#endif
2436}
2437
2118/*****************************************************************************/ 2438/*****************************************************************************/
2439/* singly-linked list management, used when the expected list length is short */
2119 2440
2120inline_size void 2441inline_size void
2121wlist_add (WL *head, WL elem) 2442wlist_add (WL *head, WL elem)
2122{ 2443{
2123 elem->next = *head; 2444 elem->next = *head;
2127inline_size void 2448inline_size void
2128wlist_del (WL *head, WL elem) 2449wlist_del (WL *head, WL elem)
2129{ 2450{
2130 while (*head) 2451 while (*head)
2131 { 2452 {
2132 if (*head == elem) 2453 if (expect_true (*head == elem))
2133 { 2454 {
2134 *head = elem->next; 2455 *head = elem->next;
2135 return; 2456 break;
2136 } 2457 }
2137 2458
2138 head = &(*head)->next; 2459 head = &(*head)->next;
2139 } 2460 }
2140} 2461}
2141 2462
2463/* internal, faster, version of ev_clear_pending */
2142inline_speed void 2464inline_speed void
2143clear_pending (EV_P_ W w) 2465clear_pending (EV_P_ W w)
2144{ 2466{
2145 if (w->pending) 2467 if (w->pending)
2146 { 2468 {
2147 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2469 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2148 w->pending = 0; 2470 w->pending = 0;
2149 } 2471 }
2150} 2472}
2151 2473
2152int 2474int
2156 int pending = w_->pending; 2478 int pending = w_->pending;
2157 2479
2158 if (expect_true (pending)) 2480 if (expect_true (pending))
2159 { 2481 {
2160 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2482 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2483 p->w = (W)&pending_w;
2161 w_->pending = 0; 2484 w_->pending = 0;
2162 p->w = 0;
2163 return p->events; 2485 return p->events;
2164 } 2486 }
2165 else 2487 else
2166 return 0; 2488 return 0;
2167} 2489}
2168 2490
2169inline_size void 2491inline_size void
2170pri_adjust (EV_P_ W w) 2492pri_adjust (EV_P_ W w)
2171{ 2493{
2172 int pri = w->priority; 2494 int pri = ev_priority (w);
2173 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2495 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2174 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2496 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2175 w->priority = pri; 2497 ev_set_priority (w, pri);
2176} 2498}
2177 2499
2178inline_speed void 2500inline_speed void
2179ev_start (EV_P_ W w, int active) 2501ev_start (EV_P_ W w, int active)
2180{ 2502{
2199 2521
2200 if (expect_false (ev_is_active (w))) 2522 if (expect_false (ev_is_active (w)))
2201 return; 2523 return;
2202 2524
2203 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2525 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2204 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2526 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2205 2527
2206 EV_FREQUENT_CHECK; 2528 EV_FREQUENT_CHECK;
2207 2529
2208 ev_start (EV_A_ (W)w, 1); 2530 ev_start (EV_A_ (W)w, 1);
2209 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2531 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2210 wlist_add (&anfds[fd].head, (WL)w); 2532 wlist_add (&anfds[fd].head, (WL)w);
2211 2533
2212 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2534 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2213 w->events &= ~EV__IOFDSET; 2535 w->events &= ~EV__IOFDSET;
2214 2536
2215 EV_FREQUENT_CHECK; 2537 EV_FREQUENT_CHECK;
2216} 2538}
2217 2539
2279 timers [active] = timers [timercnt + HEAP0]; 2601 timers [active] = timers [timercnt + HEAP0];
2280 adjustheap (timers, timercnt, active); 2602 adjustheap (timers, timercnt, active);
2281 } 2603 }
2282 } 2604 }
2283 2605
2284 EV_FREQUENT_CHECK;
2285
2286 ev_at (w) -= mn_now; 2606 ev_at (w) -= mn_now;
2287 2607
2288 ev_stop (EV_A_ (W)w); 2608 ev_stop (EV_A_ (W)w);
2609
2610 EV_FREQUENT_CHECK;
2289} 2611}
2290 2612
2291void noinline 2613void noinline
2292ev_timer_again (EV_P_ ev_timer *w) 2614ev_timer_again (EV_P_ ev_timer *w)
2293{ 2615{
2311 } 2633 }
2312 2634
2313 EV_FREQUENT_CHECK; 2635 EV_FREQUENT_CHECK;
2314} 2636}
2315 2637
2638ev_tstamp
2639ev_timer_remaining (EV_P_ ev_timer *w)
2640{
2641 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2642}
2643
2316#if EV_PERIODIC_ENABLE 2644#if EV_PERIODIC_ENABLE
2317void noinline 2645void noinline
2318ev_periodic_start (EV_P_ ev_periodic *w) 2646ev_periodic_start (EV_P_ ev_periodic *w)
2319{ 2647{
2320 if (expect_false (ev_is_active (w))) 2648 if (expect_false (ev_is_active (w)))
2366 periodics [active] = periodics [periodiccnt + HEAP0]; 2694 periodics [active] = periodics [periodiccnt + HEAP0];
2367 adjustheap (periodics, periodiccnt, active); 2695 adjustheap (periodics, periodiccnt, active);
2368 } 2696 }
2369 } 2697 }
2370 2698
2371 EV_FREQUENT_CHECK;
2372
2373 ev_stop (EV_A_ (W)w); 2699 ev_stop (EV_A_ (W)w);
2700
2701 EV_FREQUENT_CHECK;
2374} 2702}
2375 2703
2376void noinline 2704void noinline
2377ev_periodic_again (EV_P_ ev_periodic *w) 2705ev_periodic_again (EV_P_ ev_periodic *w)
2378{ 2706{
2387#endif 2715#endif
2388 2716
2389void noinline 2717void noinline
2390ev_signal_start (EV_P_ ev_signal *w) 2718ev_signal_start (EV_P_ ev_signal *w)
2391{ 2719{
2392#if EV_MULTIPLICITY
2393 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2394#endif
2395 if (expect_false (ev_is_active (w))) 2720 if (expect_false (ev_is_active (w)))
2396 return; 2721 return;
2397 2722
2398 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2723 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2399 2724
2400 evpipe_init (EV_A); 2725#if EV_MULTIPLICITY
2726 assert (("libev: a signal must not be attached to two different loops",
2727 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2401 2728
2402 EV_FREQUENT_CHECK; 2729 signals [w->signum - 1].loop = EV_A;
2730#endif
2403 2731
2732 EV_FREQUENT_CHECK;
2733
2734#if EV_USE_SIGNALFD
2735 if (sigfd == -2)
2404 { 2736 {
2405#ifndef _WIN32 2737 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2406 sigset_t full, prev; 2738 if (sigfd < 0 && errno == EINVAL)
2407 sigfillset (&full); 2739 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2408 sigprocmask (SIG_SETMASK, &full, &prev);
2409#endif
2410 2740
2411 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2741 if (sigfd >= 0)
2742 {
2743 fd_intern (sigfd); /* doing it twice will not hurt */
2412 2744
2413#ifndef _WIN32 2745 sigemptyset (&sigfd_set);
2414 sigprocmask (SIG_SETMASK, &prev, 0); 2746
2415#endif 2747 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2748 ev_set_priority (&sigfd_w, EV_MAXPRI);
2749 ev_io_start (EV_A_ &sigfd_w);
2750 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2751 }
2416 } 2752 }
2753
2754 if (sigfd >= 0)
2755 {
2756 /* TODO: check .head */
2757 sigaddset (&sigfd_set, w->signum);
2758 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2759
2760 signalfd (sigfd, &sigfd_set, 0);
2761 }
2762#endif
2417 2763
2418 ev_start (EV_A_ (W)w, 1); 2764 ev_start (EV_A_ (W)w, 1);
2419 wlist_add (&signals [w->signum - 1].head, (WL)w); 2765 wlist_add (&signals [w->signum - 1].head, (WL)w);
2420 2766
2421 if (!((WL)w)->next) 2767 if (!((WL)w)->next)
2768# if EV_USE_SIGNALFD
2769 if (sigfd < 0) /*TODO*/
2770# endif
2422 { 2771 {
2423#if _WIN32 2772# ifdef _WIN32
2773 evpipe_init (EV_A);
2774
2424 signal (w->signum, ev_sighandler); 2775 signal (w->signum, ev_sighandler);
2425#else 2776# else
2426 struct sigaction sa; 2777 struct sigaction sa;
2778
2779 evpipe_init (EV_A);
2780
2427 sa.sa_handler = ev_sighandler; 2781 sa.sa_handler = ev_sighandler;
2428 sigfillset (&sa.sa_mask); 2782 sigfillset (&sa.sa_mask);
2429 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2783 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2430 sigaction (w->signum, &sa, 0); 2784 sigaction (w->signum, &sa, 0);
2785
2786 sigemptyset (&sa.sa_mask);
2787 sigaddset (&sa.sa_mask, w->signum);
2788 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2431#endif 2789#endif
2432 } 2790 }
2433 2791
2434 EV_FREQUENT_CHECK; 2792 EV_FREQUENT_CHECK;
2435} 2793}
2436 2794
2437void noinline 2795void noinline
2445 2803
2446 wlist_del (&signals [w->signum - 1].head, (WL)w); 2804 wlist_del (&signals [w->signum - 1].head, (WL)w);
2447 ev_stop (EV_A_ (W)w); 2805 ev_stop (EV_A_ (W)w);
2448 2806
2449 if (!signals [w->signum - 1].head) 2807 if (!signals [w->signum - 1].head)
2808 {
2809#if EV_MULTIPLICITY
2810 signals [w->signum - 1].loop = 0; /* unattach from signal */
2811#endif
2812#if EV_USE_SIGNALFD
2813 if (sigfd >= 0)
2814 {
2815 sigset_t ss;
2816
2817 sigemptyset (&ss);
2818 sigaddset (&ss, w->signum);
2819 sigdelset (&sigfd_set, w->signum);
2820
2821 signalfd (sigfd, &sigfd_set, 0);
2822 sigprocmask (SIG_UNBLOCK, &ss, 0);
2823 }
2824 else
2825#endif
2450 signal (w->signum, SIG_DFL); 2826 signal (w->signum, SIG_DFL);
2827 }
2451 2828
2452 EV_FREQUENT_CHECK; 2829 EV_FREQUENT_CHECK;
2453} 2830}
2454 2831
2455void 2832void
2496#define MIN_STAT_INTERVAL 0.1074891 2873#define MIN_STAT_INTERVAL 0.1074891
2497 2874
2498static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2875static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2499 2876
2500#if EV_USE_INOTIFY 2877#if EV_USE_INOTIFY
2501# define EV_INOTIFY_BUFSIZE 8192 2878
2879/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2880# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2502 2881
2503static void noinline 2882static void noinline
2504infy_add (EV_P_ ev_stat *w) 2883infy_add (EV_P_ ev_stat *w)
2505{ 2884{
2506 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2885 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2507 2886
2508 if (w->wd < 0) 2887 if (w->wd >= 0)
2888 {
2889 struct statfs sfs;
2890
2891 /* now local changes will be tracked by inotify, but remote changes won't */
2892 /* unless the filesystem is known to be local, we therefore still poll */
2893 /* also do poll on <2.6.25, but with normal frequency */
2894
2895 if (!fs_2625)
2896 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2897 else if (!statfs (w->path, &sfs)
2898 && (sfs.f_type == 0x1373 /* devfs */
2899 || sfs.f_type == 0xEF53 /* ext2/3 */
2900 || sfs.f_type == 0x3153464a /* jfs */
2901 || sfs.f_type == 0x52654973 /* reiser3 */
2902 || sfs.f_type == 0x01021994 /* tempfs */
2903 || sfs.f_type == 0x58465342 /* xfs */))
2904 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2905 else
2906 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2509 { 2907 }
2908 else
2909 {
2910 /* can't use inotify, continue to stat */
2510 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2911 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2511 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2512 2912
2513 /* monitor some parent directory for speedup hints */ 2913 /* if path is not there, monitor some parent directory for speedup hints */
2514 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2914 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2515 /* but an efficiency issue only */ 2915 /* but an efficiency issue only */
2516 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2916 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2517 { 2917 {
2518 char path [4096]; 2918 char path [4096];
2534 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2934 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2535 } 2935 }
2536 } 2936 }
2537 2937
2538 if (w->wd >= 0) 2938 if (w->wd >= 0)
2539 {
2540 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2939 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2541 2940
2542 /* now local changes will be tracked by inotify, but remote changes won't */ 2941 /* now re-arm timer, if required */
2543 /* unless the filesystem it known to be local, we therefore still poll */ 2942 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2544 /* also do poll on <2.6.25, but with normal frequency */
2545 struct statfs sfs;
2546
2547 if (fs_2625 && !statfs (w->path, &sfs))
2548 if (sfs.f_type == 0x1373 /* devfs */
2549 || sfs.f_type == 0xEF53 /* ext2/3 */
2550 || sfs.f_type == 0x3153464a /* jfs */
2551 || sfs.f_type == 0x52654973 /* reiser3 */
2552 || sfs.f_type == 0x01021994 /* tempfs */
2553 || sfs.f_type == 0x58465342 /* xfs */)
2554 return;
2555
2556 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2557 ev_timer_again (EV_A_ &w->timer); 2943 ev_timer_again (EV_A_ &w->timer);
2558 } 2944 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2559} 2945}
2560 2946
2561static void noinline 2947static void noinline
2562infy_del (EV_P_ ev_stat *w) 2948infy_del (EV_P_ ev_stat *w)
2563{ 2949{
2608 2994
2609static void 2995static void
2610infy_cb (EV_P_ ev_io *w, int revents) 2996infy_cb (EV_P_ ev_io *w, int revents)
2611{ 2997{
2612 char buf [EV_INOTIFY_BUFSIZE]; 2998 char buf [EV_INOTIFY_BUFSIZE];
2613 struct inotify_event *ev = (struct inotify_event *)buf;
2614 int ofs; 2999 int ofs;
2615 int len = read (fs_fd, buf, sizeof (buf)); 3000 int len = read (fs_fd, buf, sizeof (buf));
2616 3001
2617 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3002 for (ofs = 0; ofs < len; )
3003 {
3004 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2618 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3005 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3006 ofs += sizeof (struct inotify_event) + ev->len;
3007 }
3008}
3009
3010inline_size unsigned int
3011ev_linux_version (void)
3012{
3013 struct utsname buf;
3014 unsigned int v;
3015 int i;
3016 char *p = buf.release;
3017
3018 if (uname (&buf))
3019 return 0;
3020
3021 for (i = 3+1; --i; )
3022 {
3023 unsigned int c = 0;
3024
3025 for (;;)
3026 {
3027 if (*p >= '0' && *p <= '9')
3028 c = c * 10 + *p++ - '0';
3029 else
3030 {
3031 p += *p == '.';
3032 break;
3033 }
3034 }
3035
3036 v = (v << 8) | c;
3037 }
3038
3039 return v;
2619} 3040}
2620 3041
2621inline_size void 3042inline_size void
2622check_2625 (EV_P) 3043ev_check_2625 (EV_P)
2623{ 3044{
2624 /* kernels < 2.6.25 are borked 3045 /* kernels < 2.6.25 are borked
2625 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3046 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2626 */ 3047 */
2627 struct utsname buf; 3048 if (ev_linux_version () < 0x020619)
2628 int major, minor, micro;
2629
2630 if (uname (&buf))
2631 return; 3049 return;
2632 3050
2633 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2634 return;
2635
2636 if (major < 2
2637 || (major == 2 && minor < 6)
2638 || (major == 2 && minor == 6 && micro < 25))
2639 return;
2640
2641 fs_2625 = 1; 3051 fs_2625 = 1;
3052}
3053
3054inline_size int
3055infy_newfd (void)
3056{
3057#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3058 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3059 if (fd >= 0)
3060 return fd;
3061#endif
3062 return inotify_init ();
2642} 3063}
2643 3064
2644inline_size void 3065inline_size void
2645infy_init (EV_P) 3066infy_init (EV_P)
2646{ 3067{
2647 if (fs_fd != -2) 3068 if (fs_fd != -2)
2648 return; 3069 return;
2649 3070
2650 fs_fd = -1; 3071 fs_fd = -1;
2651 3072
2652 check_2625 (EV_A); 3073 ev_check_2625 (EV_A);
2653 3074
2654 fs_fd = inotify_init (); 3075 fs_fd = infy_newfd ();
2655 3076
2656 if (fs_fd >= 0) 3077 if (fs_fd >= 0)
2657 { 3078 {
3079 fd_intern (fs_fd);
2658 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3080 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2659 ev_set_priority (&fs_w, EV_MAXPRI); 3081 ev_set_priority (&fs_w, EV_MAXPRI);
2660 ev_io_start (EV_A_ &fs_w); 3082 ev_io_start (EV_A_ &fs_w);
3083 ev_unref (EV_A);
2661 } 3084 }
2662} 3085}
2663 3086
2664inline_size void 3087inline_size void
2665infy_fork (EV_P) 3088infy_fork (EV_P)
2667 int slot; 3090 int slot;
2668 3091
2669 if (fs_fd < 0) 3092 if (fs_fd < 0)
2670 return; 3093 return;
2671 3094
3095 ev_ref (EV_A);
3096 ev_io_stop (EV_A_ &fs_w);
2672 close (fs_fd); 3097 close (fs_fd);
2673 fs_fd = inotify_init (); 3098 fs_fd = infy_newfd ();
3099
3100 if (fs_fd >= 0)
3101 {
3102 fd_intern (fs_fd);
3103 ev_io_set (&fs_w, fs_fd, EV_READ);
3104 ev_io_start (EV_A_ &fs_w);
3105 ev_unref (EV_A);
3106 }
2674 3107
2675 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3108 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2676 { 3109 {
2677 WL w_ = fs_hash [slot].head; 3110 WL w_ = fs_hash [slot].head;
2678 fs_hash [slot].head = 0; 3111 fs_hash [slot].head = 0;
2685 w->wd = -1; 3118 w->wd = -1;
2686 3119
2687 if (fs_fd >= 0) 3120 if (fs_fd >= 0)
2688 infy_add (EV_A_ w); /* re-add, no matter what */ 3121 infy_add (EV_A_ w); /* re-add, no matter what */
2689 else 3122 else
3123 {
3124 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3125 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2690 ev_timer_again (EV_A_ &w->timer); 3126 ev_timer_again (EV_A_ &w->timer);
3127 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3128 }
2691 } 3129 }
2692 } 3130 }
2693} 3131}
2694 3132
2695#endif 3133#endif
2712static void noinline 3150static void noinline
2713stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3151stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2714{ 3152{
2715 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3153 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2716 3154
2717 /* we copy this here each the time so that */ 3155 ev_statdata prev = w->attr;
2718 /* prev has the old value when the callback gets invoked */
2719 w->prev = w->attr;
2720 ev_stat_stat (EV_A_ w); 3156 ev_stat_stat (EV_A_ w);
2721 3157
2722 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3158 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2723 if ( 3159 if (
2724 w->prev.st_dev != w->attr.st_dev 3160 prev.st_dev != w->attr.st_dev
2725 || w->prev.st_ino != w->attr.st_ino 3161 || prev.st_ino != w->attr.st_ino
2726 || w->prev.st_mode != w->attr.st_mode 3162 || prev.st_mode != w->attr.st_mode
2727 || w->prev.st_nlink != w->attr.st_nlink 3163 || prev.st_nlink != w->attr.st_nlink
2728 || w->prev.st_uid != w->attr.st_uid 3164 || prev.st_uid != w->attr.st_uid
2729 || w->prev.st_gid != w->attr.st_gid 3165 || prev.st_gid != w->attr.st_gid
2730 || w->prev.st_rdev != w->attr.st_rdev 3166 || prev.st_rdev != w->attr.st_rdev
2731 || w->prev.st_size != w->attr.st_size 3167 || prev.st_size != w->attr.st_size
2732 || w->prev.st_atime != w->attr.st_atime 3168 || prev.st_atime != w->attr.st_atime
2733 || w->prev.st_mtime != w->attr.st_mtime 3169 || prev.st_mtime != w->attr.st_mtime
2734 || w->prev.st_ctime != w->attr.st_ctime 3170 || prev.st_ctime != w->attr.st_ctime
2735 ) { 3171 ) {
3172 /* we only update w->prev on actual differences */
3173 /* in case we test more often than invoke the callback, */
3174 /* to ensure that prev is always different to attr */
3175 w->prev = prev;
3176
2736 #if EV_USE_INOTIFY 3177 #if EV_USE_INOTIFY
2737 if (fs_fd >= 0) 3178 if (fs_fd >= 0)
2738 { 3179 {
2739 infy_del (EV_A_ w); 3180 infy_del (EV_A_ w);
2740 infy_add (EV_A_ w); 3181 infy_add (EV_A_ w);
2765 3206
2766 if (fs_fd >= 0) 3207 if (fs_fd >= 0)
2767 infy_add (EV_A_ w); 3208 infy_add (EV_A_ w);
2768 else 3209 else
2769#endif 3210#endif
3211 {
2770 ev_timer_again (EV_A_ &w->timer); 3212 ev_timer_again (EV_A_ &w->timer);
3213 ev_unref (EV_A);
3214 }
2771 3215
2772 ev_start (EV_A_ (W)w, 1); 3216 ev_start (EV_A_ (W)w, 1);
2773 3217
2774 EV_FREQUENT_CHECK; 3218 EV_FREQUENT_CHECK;
2775} 3219}
2784 EV_FREQUENT_CHECK; 3228 EV_FREQUENT_CHECK;
2785 3229
2786#if EV_USE_INOTIFY 3230#if EV_USE_INOTIFY
2787 infy_del (EV_A_ w); 3231 infy_del (EV_A_ w);
2788#endif 3232#endif
3233
3234 if (ev_is_active (&w->timer))
3235 {
3236 ev_ref (EV_A);
2789 ev_timer_stop (EV_A_ &w->timer); 3237 ev_timer_stop (EV_A_ &w->timer);
3238 }
2790 3239
2791 ev_stop (EV_A_ (W)w); 3240 ev_stop (EV_A_ (W)w);
2792 3241
2793 EV_FREQUENT_CHECK; 3242 EV_FREQUENT_CHECK;
2794} 3243}
2935embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3384embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2936{ 3385{
2937 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3386 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2938 3387
2939 { 3388 {
2940 struct ev_loop *loop = w->other; 3389 EV_P = w->other;
2941 3390
2942 while (fdchangecnt) 3391 while (fdchangecnt)
2943 { 3392 {
2944 fd_reify (EV_A); 3393 fd_reify (EV_A);
2945 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3394 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2953 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3402 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2954 3403
2955 ev_embed_stop (EV_A_ w); 3404 ev_embed_stop (EV_A_ w);
2956 3405
2957 { 3406 {
2958 struct ev_loop *loop = w->other; 3407 EV_P = w->other;
2959 3408
2960 ev_loop_fork (EV_A); 3409 ev_loop_fork (EV_A);
2961 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3410 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2962 } 3411 }
2963 3412
2977{ 3426{
2978 if (expect_false (ev_is_active (w))) 3427 if (expect_false (ev_is_active (w)))
2979 return; 3428 return;
2980 3429
2981 { 3430 {
2982 struct ev_loop *loop = w->other; 3431 EV_P = w->other;
2983 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3432 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2984 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3433 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2985 } 3434 }
2986 3435
2987 EV_FREQUENT_CHECK; 3436 EV_FREQUENT_CHECK;
3014 3463
3015 ev_io_stop (EV_A_ &w->io); 3464 ev_io_stop (EV_A_ &w->io);
3016 ev_prepare_stop (EV_A_ &w->prepare); 3465 ev_prepare_stop (EV_A_ &w->prepare);
3017 ev_fork_stop (EV_A_ &w->fork); 3466 ev_fork_stop (EV_A_ &w->fork);
3018 3467
3468 ev_stop (EV_A_ (W)w);
3469
3019 EV_FREQUENT_CHECK; 3470 EV_FREQUENT_CHECK;
3020} 3471}
3021#endif 3472#endif
3022 3473
3023#if EV_FORK_ENABLE 3474#if EV_FORK_ENABLE
3099 3550
3100void 3551void
3101ev_async_send (EV_P_ ev_async *w) 3552ev_async_send (EV_P_ ev_async *w)
3102{ 3553{
3103 w->sent = 1; 3554 w->sent = 1;
3104 evpipe_write (EV_A_ &gotasync); 3555 evpipe_write (EV_A_ &async_pending);
3105} 3556}
3106#endif 3557#endif
3107 3558
3108/*****************************************************************************/ 3559/*****************************************************************************/
3109 3560
3173 } 3624 }
3174} 3625}
3175 3626
3176/*****************************************************************************/ 3627/*****************************************************************************/
3177 3628
3178#if 0 3629#if EV_WALK_ENABLE
3179void 3630void
3180ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3631ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3181{ 3632{
3182 int i, j; 3633 int i, j;
3183 ev_watcher_list *wl, *wn; 3634 ev_watcher_list *wl, *wn;
3199#if EV_USE_INOTIFY 3650#if EV_USE_INOTIFY
3200 if (ev_cb ((ev_io *)wl) == infy_cb) 3651 if (ev_cb ((ev_io *)wl) == infy_cb)
3201 ; 3652 ;
3202 else 3653 else
3203#endif 3654#endif
3204 if ((ev_io *)wl != &pipeev) 3655 if ((ev_io *)wl != &pipe_w)
3205 if (types & EV_IO) 3656 if (types & EV_IO)
3206 cb (EV_A_ EV_IO, wl); 3657 cb (EV_A_ EV_IO, wl);
3207 3658
3208 wl = wn; 3659 wl = wn;
3209 } 3660 }
3258 if (types & EV_CHECK) 3709 if (types & EV_CHECK)
3259 for (i = checkcnt; i--; ) 3710 for (i = checkcnt; i--; )
3260 cb (EV_A_ EV_CHECK, checks [i]); 3711 cb (EV_A_ EV_CHECK, checks [i]);
3261 3712
3262 if (types & EV_SIGNAL) 3713 if (types & EV_SIGNAL)
3263 for (i = 0; i < signalmax; ++i) 3714 for (i = 0; i < EV_NSIG - 1; ++i)
3264 for (wl = signals [i].head; wl; ) 3715 for (wl = signals [i].head; wl; )
3265 { 3716 {
3266 wn = wl->next; 3717 wn = wl->next;
3267 cb (EV_A_ EV_SIGNAL, wl); 3718 cb (EV_A_ EV_SIGNAL, wl);
3268 wl = wn; 3719 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines