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

Comparing libev/ev.c (file contents):
Revision 1.285 by root, Wed Apr 15 19:35:53 2009 UTC vs.
Revision 1.336 by root, Wed Mar 10 08:19:38 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
172# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
173# include <windows.h> 185# include <windows.h>
174# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
175# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
176# endif 188# endif
189# undef EV_AVOID_STDIO
177#endif 190#endif
178 191
179/* 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
180 221
181#ifndef EV_USE_CLOCK_SYSCALL 222#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 223# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 224# define EV_USE_CLOCK_SYSCALL 1
184# else 225# else
264# else 305# else
265# define EV_USE_EVENTFD 0 306# define EV_USE_EVENTFD 0
266# endif 307# endif
267#endif 308#endif
268 309
310#ifndef EV_USE_SIGNALFD
311# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
312# define EV_USE_SIGNALFD 1
313# else
314# define EV_USE_SIGNALFD 0
315# endif
316#endif
317
269#if 0 /* debugging */ 318#if 0 /* debugging */
270# define EV_VERIFY 3 319# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 320# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 321# define EV_HEAP_CACHE_AT 1
273#endif 322#endif
282 331
283#ifndef EV_HEAP_CACHE_AT 332#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 333# define EV_HEAP_CACHE_AT !EV_MINIMAL
285#endif 334#endif
286 335
336/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
337/* which makes programs even slower. might work on other unices, too. */
338#if EV_USE_CLOCK_SYSCALL
339# include <syscall.h>
340# ifdef SYS_clock_gettime
341# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
342# undef EV_USE_MONOTONIC
343# define EV_USE_MONOTONIC 1
344# else
345# undef EV_USE_CLOCK_SYSCALL
346# define EV_USE_CLOCK_SYSCALL 0
347# endif
348#endif
349
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 350/* this block fixes any misconfiguration where we know we run into trouble otherwise */
351
352#ifdef _AIX
353/* AIX has a completely broken poll.h header */
354# undef EV_USE_POLL
355# define EV_USE_POLL 0
356#endif
288 357
289#ifndef CLOCK_MONOTONIC 358#ifndef CLOCK_MONOTONIC
290# undef EV_USE_MONOTONIC 359# undef EV_USE_MONOTONIC
291# define EV_USE_MONOTONIC 0 360# define EV_USE_MONOTONIC 0
292#endif 361#endif
320 389
321#if EV_SELECT_IS_WINSOCKET 390#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 391# include <winsock.h>
323#endif 392#endif
324 393
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 394#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 395/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 396# include <stdint.h>
397# ifndef EFD_NONBLOCK
398# define EFD_NONBLOCK O_NONBLOCK
399# endif
400# ifndef EFD_CLOEXEC
401# ifdef O_CLOEXEC
402# define EFD_CLOEXEC O_CLOEXEC
403# else
404# define EFD_CLOEXEC 02000000
405# endif
406# endif
337# ifdef __cplusplus 407# ifdef __cplusplus
338extern "C" { 408extern "C" {
339# endif 409# endif
340int eventfd (unsigned int initval, int flags); 410int (eventfd) (unsigned int initval, int flags);
341# ifdef __cplusplus 411# ifdef __cplusplus
342} 412}
343# endif 413# endif
344#endif 414#endif
415
416#if EV_USE_SIGNALFD
417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
418# include <stdint.h>
419# ifndef SFD_NONBLOCK
420# define SFD_NONBLOCK O_NONBLOCK
421# endif
422# ifndef SFD_CLOEXEC
423# ifdef O_CLOEXEC
424# define SFD_CLOEXEC O_CLOEXEC
425# else
426# define SFD_CLOEXEC 02000000
427# endif
428# endif
429# ifdef __cplusplus
430extern "C" {
431# endif
432int signalfd (int fd, const sigset_t *mask, int flags);
433
434struct signalfd_siginfo
435{
436 uint32_t ssi_signo;
437 char pad[128 - sizeof (uint32_t)];
438};
439# ifdef __cplusplus
440}
441# endif
442#endif
443
345 444
346/**/ 445/**/
347 446
348#if EV_VERIFY >= 3 447#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 448# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
361 */ 460 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 461#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 462
364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 463#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) */ 464#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 465
368#if __GNUC__ >= 4 466#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 467# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 468# define noinline __attribute__ ((noinline))
371#else 469#else
384# define inline_speed static noinline 482# define inline_speed static noinline
385#else 483#else
386# define inline_speed static inline 484# define inline_speed static inline
387#endif 485#endif
388 486
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 487#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
488
489#if EV_MINPRI == EV_MAXPRI
490# define ABSPRI(w) (((W)w), 0)
491#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 492# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
493#endif
391 494
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 495#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 496#define EMPTY2(a,b) /* used to suppress some warnings */
394 497
395typedef ev_watcher *W; 498typedef ev_watcher *W;
407 510
408#if EV_USE_MONOTONIC 511#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 512static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 513#endif
411 514
515#ifndef EV_FD_TO_WIN32_HANDLE
516# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
517#endif
518#ifndef EV_WIN32_HANDLE_TO_FD
519# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
520#endif
521#ifndef EV_WIN32_CLOSE_FD
522# define EV_WIN32_CLOSE_FD(fd) close (fd)
523#endif
524
412#ifdef _WIN32 525#ifdef _WIN32
413# include "ev_win32.c" 526# include "ev_win32.c"
414#endif 527#endif
415 528
416/*****************************************************************************/ 529/*****************************************************************************/
530
531#if EV_AVOID_STDIO
532static void noinline
533ev_printerr (const char *msg)
534{
535 write (STDERR_FILENO, msg, strlen (msg));
536}
537#endif
417 538
418static void (*syserr_cb)(const char *msg); 539static void (*syserr_cb)(const char *msg);
419 540
420void 541void
421ev_set_syserr_cb (void (*cb)(const char *msg)) 542ev_set_syserr_cb (void (*cb)(const char *msg))
431 552
432 if (syserr_cb) 553 if (syserr_cb)
433 syserr_cb (msg); 554 syserr_cb (msg);
434 else 555 else
435 { 556 {
557#if EV_AVOID_STDIO
558 const char *err = strerror (errno);
559
560 ev_printerr (msg);
561 ev_printerr (": ");
562 ev_printerr (err);
563 ev_printerr ("\n");
564#else
436 perror (msg); 565 perror (msg);
566#endif
437 abort (); 567 abort ();
438 } 568 }
439} 569}
440 570
441static void * 571static void *
442ev_realloc_emul (void *ptr, long size) 572ev_realloc_emul (void *ptr, long size)
443{ 573{
574#if __GLIBC__
575 return realloc (ptr, size);
576#else
444 /* some systems, notably openbsd and darwin, fail to properly 577 /* some systems, notably openbsd and darwin, fail to properly
445 * implement realloc (x, 0) (as required by both ansi c-98 and 578 * implement realloc (x, 0) (as required by both ansi c-89 and
446 * the single unix specification, so work around them here. 579 * the single unix specification, so work around them here.
447 */ 580 */
448 581
449 if (size) 582 if (size)
450 return realloc (ptr, size); 583 return realloc (ptr, size);
451 584
452 free (ptr); 585 free (ptr);
453 return 0; 586 return 0;
587#endif
454} 588}
455 589
456static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 590static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
457 591
458void 592void
466{ 600{
467 ptr = alloc (ptr, size); 601 ptr = alloc (ptr, size);
468 602
469 if (!ptr && size) 603 if (!ptr && size)
470 { 604 {
605#if EV_AVOID_STDIO
606 ev_printerr ("libev: memory allocation failed, aborting.\n");
607#else
471 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 608 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
609#endif
472 abort (); 610 abort ();
473 } 611 }
474 612
475 return ptr; 613 return ptr;
476} 614}
478#define ev_malloc(size) ev_realloc (0, (size)) 616#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 617#define ev_free(ptr) ev_realloc ((ptr), 0)
480 618
481/*****************************************************************************/ 619/*****************************************************************************/
482 620
621/* set in reify when reification needed */
622#define EV_ANFD_REIFY 1
623
624/* file descriptor info structure */
483typedef struct 625typedef struct
484{ 626{
485 WL head; 627 WL head;
486 unsigned char events; 628 unsigned char events; /* the events watched for */
487 unsigned char reify; 629 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 */ 630 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 631 unsigned char unused;
490#if EV_USE_EPOLL 632#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 633 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 634#endif
493#if EV_SELECT_IS_WINSOCKET 635#if EV_SELECT_IS_WINSOCKET
494 SOCKET handle; 636 SOCKET handle;
495#endif 637#endif
496} ANFD; 638} ANFD;
497 639
640/* stores the pending event set for a given watcher */
498typedef struct 641typedef struct
499{ 642{
500 W w; 643 W w;
501 int events; 644 int events; /* the pending event set for the given watcher */
502} ANPENDING; 645} ANPENDING;
503 646
504#if EV_USE_INOTIFY 647#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 648/* hash table entry per inotify-id */
506typedef struct 649typedef struct
509} ANFS; 652} ANFS;
510#endif 653#endif
511 654
512/* Heap Entry */ 655/* Heap Entry */
513#if EV_HEAP_CACHE_AT 656#if EV_HEAP_CACHE_AT
657 /* a heap element */
514 typedef struct { 658 typedef struct {
515 ev_tstamp at; 659 ev_tstamp at;
516 WT w; 660 WT w;
517 } ANHE; 661 } ANHE;
518 662
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 663 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 664 #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 */ 665 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 666#else
667 /* a heap element */
523 typedef WT ANHE; 668 typedef WT ANHE;
524 669
525 #define ANHE_w(he) (he) 670 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 671 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 672 #define ANHE_at_cache(he)
551 696
552 static int ev_default_loop_ptr; 697 static int ev_default_loop_ptr;
553 698
554#endif 699#endif
555 700
701#if EV_MINIMAL < 2
702# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
703# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
704# define EV_INVOKE_PENDING invoke_cb (EV_A)
705#else
706# define EV_RELEASE_CB (void)0
707# define EV_ACQUIRE_CB (void)0
708# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
709#endif
710
711#define EVUNLOOP_RECURSE 0x80
712
556/*****************************************************************************/ 713/*****************************************************************************/
557 714
715#ifndef EV_HAVE_EV_TIME
558ev_tstamp 716ev_tstamp
559ev_time (void) 717ev_time (void)
560{ 718{
561#if EV_USE_REALTIME 719#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 720 if (expect_true (have_realtime))
569 727
570 struct timeval tv; 728 struct timeval tv;
571 gettimeofday (&tv, 0); 729 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 730 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 731}
732#endif
574 733
575inline_size ev_tstamp 734inline_size ev_tstamp
576get_clock (void) 735get_clock (void)
577{ 736{
578#if EV_USE_MONOTONIC 737#if EV_USE_MONOTONIC
614 773
615 tv.tv_sec = (time_t)delay; 774 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 775 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617 776
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 777 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 778 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 779 /* by older ones */
621 select (0, 0, 0, 0, &tv); 780 select (0, 0, 0, 0, &tv);
622#endif 781#endif
623 } 782 }
624} 783}
625 784
626/*****************************************************************************/ 785/*****************************************************************************/
627 786
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 787#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 788
789/* find a suitable new size for the given array, */
790/* hopefully by rounding to a ncie-to-malloc size */
630inline_size int 791inline_size int
631array_nextsize (int elem, int cur, int cnt) 792array_nextsize (int elem, int cur, int cnt)
632{ 793{
633 int ncur = cur + 1; 794 int ncur = cur + 1;
634 795
680#define array_free(stem, idx) \ 841#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 842 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 843
683/*****************************************************************************/ 844/*****************************************************************************/
684 845
846/* dummy callback for pending events */
847static void noinline
848pendingcb (EV_P_ ev_prepare *w, int revents)
849{
850}
851
685void noinline 852void noinline
686ev_feed_event (EV_P_ void *w, int revents) 853ev_feed_event (EV_P_ void *w, int revents)
687{ 854{
688 W w_ = (W)w; 855 W w_ = (W)w;
689 int pri = ABSPRI (w_); 856 int pri = ABSPRI (w_);
724} 891}
725 892
726/*****************************************************************************/ 893/*****************************************************************************/
727 894
728inline_speed void 895inline_speed void
729fd_event (EV_P_ int fd, int revents) 896fd_event_nc (EV_P_ int fd, int revents)
730{ 897{
731 ANFD *anfd = anfds + fd; 898 ANFD *anfd = anfds + fd;
732 ev_io *w; 899 ev_io *w;
733 900
734 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 901 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
738 if (ev) 905 if (ev)
739 ev_feed_event (EV_A_ (W)w, ev); 906 ev_feed_event (EV_A_ (W)w, ev);
740 } 907 }
741} 908}
742 909
910/* do not submit kernel events for fds that have reify set */
911/* because that means they changed while we were polling for new events */
912inline_speed void
913fd_event (EV_P_ int fd, int revents)
914{
915 ANFD *anfd = anfds + fd;
916
917 if (expect_true (!anfd->reify))
918 fd_event_nc (EV_A_ fd, revents);
919}
920
743void 921void
744ev_feed_fd_event (EV_P_ int fd, int revents) 922ev_feed_fd_event (EV_P_ int fd, int revents)
745{ 923{
746 if (fd >= 0 && fd < anfdmax) 924 if (fd >= 0 && fd < anfdmax)
747 fd_event (EV_A_ fd, revents); 925 fd_event_nc (EV_A_ fd, revents);
748} 926}
749 927
928/* make sure the external fd watch events are in-sync */
929/* with the kernel/libev internal state */
750inline_size void 930inline_size void
751fd_reify (EV_P) 931fd_reify (EV_P)
752{ 932{
753 int i; 933 int i;
754 934
765 945
766#if EV_SELECT_IS_WINSOCKET 946#if EV_SELECT_IS_WINSOCKET
767 if (events) 947 if (events)
768 { 948 {
769 unsigned long arg; 949 unsigned long arg;
770 #ifdef EV_FD_TO_WIN32_HANDLE
771 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 950 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)); 951 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
776 } 952 }
777#endif 953#endif
778 954
779 { 955 {
789 } 965 }
790 966
791 fdchangecnt = 0; 967 fdchangecnt = 0;
792} 968}
793 969
970/* something about the given fd changed */
794inline_size void 971inline_size void
795fd_change (EV_P_ int fd, int flags) 972fd_change (EV_P_ int fd, int flags)
796{ 973{
797 unsigned char reify = anfds [fd].reify; 974 unsigned char reify = anfds [fd].reify;
798 anfds [fd].reify |= flags; 975 anfds [fd].reify |= flags;
803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 980 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
804 fdchanges [fdchangecnt - 1] = fd; 981 fdchanges [fdchangecnt - 1] = fd;
805 } 982 }
806} 983}
807 984
985/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
808inline_speed void 986inline_speed void
809fd_kill (EV_P_ int fd) 987fd_kill (EV_P_ int fd)
810{ 988{
811 ev_io *w; 989 ev_io *w;
812 990
815 ev_io_stop (EV_A_ w); 993 ev_io_stop (EV_A_ w);
816 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 994 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
817 } 995 }
818} 996}
819 997
998/* check whether the given fd is actually valid, for error recovery */
820inline_size int 999inline_size int
821fd_valid (int fd) 1000fd_valid (int fd)
822{ 1001{
823#ifdef _WIN32 1002#ifdef _WIN32
824 return _get_osfhandle (fd) != -1; 1003 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
825#else 1004#else
826 return fcntl (fd, F_GETFD) != -1; 1005 return fcntl (fd, F_GETFD) != -1;
827#endif 1006#endif
828} 1007}
829 1008
847 1026
848 for (fd = anfdmax; fd--; ) 1027 for (fd = anfdmax; fd--; )
849 if (anfds [fd].events) 1028 if (anfds [fd].events)
850 { 1029 {
851 fd_kill (EV_A_ fd); 1030 fd_kill (EV_A_ fd);
852 return; 1031 break;
853 } 1032 }
854} 1033}
855 1034
856/* usually called after fork if backend needs to re-arm all fds from scratch */ 1035/* usually called after fork if backend needs to re-arm all fds from scratch */
857static void noinline 1036static void noinline
862 for (fd = 0; fd < anfdmax; ++fd) 1041 for (fd = 0; fd < anfdmax; ++fd)
863 if (anfds [fd].events) 1042 if (anfds [fd].events)
864 { 1043 {
865 anfds [fd].events = 0; 1044 anfds [fd].events = 0;
866 anfds [fd].emask = 0; 1045 anfds [fd].emask = 0;
867 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1046 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
868 } 1047 }
1048}
1049
1050/* used to prepare libev internal fd's */
1051/* this is not fork-safe */
1052inline_speed void
1053fd_intern (int fd)
1054{
1055#ifdef _WIN32
1056 unsigned long arg = 1;
1057 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1058#else
1059 fcntl (fd, F_SETFD, FD_CLOEXEC);
1060 fcntl (fd, F_SETFL, O_NONBLOCK);
1061#endif
869} 1062}
870 1063
871/*****************************************************************************/ 1064/*****************************************************************************/
872 1065
873/* 1066/*
947 1140
948 for (;;) 1141 for (;;)
949 { 1142 {
950 int c = k << 1; 1143 int c = k << 1;
951 1144
952 if (c > N + HEAP0 - 1) 1145 if (c >= N + HEAP0)
953 break; 1146 break;
954 1147
955 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1148 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
956 ? 1 : 0; 1149 ? 1 : 0;
957 1150
989 1182
990 heap [k] = he; 1183 heap [k] = he;
991 ev_active (ANHE_w (he)) = k; 1184 ev_active (ANHE_w (he)) = k;
992} 1185}
993 1186
1187/* move an element suitably so it is in a correct place */
994inline_size void 1188inline_size void
995adjustheap (ANHE *heap, int N, int k) 1189adjustheap (ANHE *heap, int N, int k)
996{ 1190{
997 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1191 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
998 upheap (heap, k); 1192 upheap (heap, k);
999 else 1193 else
1000 downheap (heap, N, k); 1194 downheap (heap, N, k);
1001} 1195}
1002 1196
1012 upheap (heap, i + HEAP0); 1206 upheap (heap, i + HEAP0);
1013} 1207}
1014 1208
1015/*****************************************************************************/ 1209/*****************************************************************************/
1016 1210
1211/* associate signal watchers to a signal signal */
1017typedef struct 1212typedef struct
1018{ 1213{
1214 EV_ATOMIC_T pending;
1215#if EV_MULTIPLICITY
1216 EV_P;
1217#endif
1019 WL head; 1218 WL head;
1020 EV_ATOMIC_T gotsig;
1021} ANSIG; 1219} ANSIG;
1022 1220
1023static ANSIG *signals; 1221static ANSIG signals [EV_NSIG - 1];
1024static int signalmax;
1025
1026static EV_ATOMIC_T gotsig;
1027 1222
1028/*****************************************************************************/ 1223/*****************************************************************************/
1029 1224
1030inline_speed void 1225#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1031fd_intern (int fd)
1032{
1033#ifdef _WIN32
1034 unsigned long arg = 1;
1035 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1036#else
1037 fcntl (fd, F_SETFD, FD_CLOEXEC);
1038 fcntl (fd, F_SETFL, O_NONBLOCK);
1039#endif
1040}
1041 1226
1042static void noinline 1227static void noinline
1043evpipe_init (EV_P) 1228evpipe_init (EV_P)
1044{ 1229{
1045 if (!ev_is_active (&pipeev)) 1230 if (!ev_is_active (&pipe_w))
1046 { 1231 {
1047#if EV_USE_EVENTFD 1232# if EV_USE_EVENTFD
1233 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1234 if (evfd < 0 && errno == EINVAL)
1048 if ((evfd = eventfd (0, 0)) >= 0) 1235 evfd = eventfd (0, 0);
1236
1237 if (evfd >= 0)
1049 { 1238 {
1050 evpipe [0] = -1; 1239 evpipe [0] = -1;
1051 fd_intern (evfd); 1240 fd_intern (evfd); /* doing it twice doesn't hurt */
1052 ev_io_set (&pipeev, evfd, EV_READ); 1241 ev_io_set (&pipe_w, evfd, EV_READ);
1053 } 1242 }
1054 else 1243 else
1055#endif 1244# endif
1056 { 1245 {
1057 while (pipe (evpipe)) 1246 while (pipe (evpipe))
1058 ev_syserr ("(libev) error creating signal/async pipe"); 1247 ev_syserr ("(libev) error creating signal/async pipe");
1059 1248
1060 fd_intern (evpipe [0]); 1249 fd_intern (evpipe [0]);
1061 fd_intern (evpipe [1]); 1250 fd_intern (evpipe [1]);
1062 ev_io_set (&pipeev, evpipe [0], EV_READ); 1251 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1063 } 1252 }
1064 1253
1065 ev_io_start (EV_A_ &pipeev); 1254 ev_io_start (EV_A_ &pipe_w);
1066 ev_unref (EV_A); /* watcher should not keep loop alive */ 1255 ev_unref (EV_A); /* watcher should not keep loop alive */
1067 } 1256 }
1068} 1257}
1069 1258
1070inline_size void 1259inline_size void
1071evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1260evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1072{ 1261{
1073 if (!*flag) 1262 if (!*flag)
1074 { 1263 {
1075 int old_errno = errno; /* save errno because write might clobber it */ 1264 int old_errno = errno; /* save errno because write might clobber it */
1265 char dummy;
1076 1266
1077 *flag = 1; 1267 *flag = 1;
1078 1268
1079#if EV_USE_EVENTFD 1269#if EV_USE_EVENTFD
1080 if (evfd >= 0) 1270 if (evfd >= 0)
1082 uint64_t counter = 1; 1272 uint64_t counter = 1;
1083 write (evfd, &counter, sizeof (uint64_t)); 1273 write (evfd, &counter, sizeof (uint64_t));
1084 } 1274 }
1085 else 1275 else
1086#endif 1276#endif
1087 write (evpipe [1], &old_errno, 1); 1277 write (evpipe [1], &dummy, 1);
1088 1278
1089 errno = old_errno; 1279 errno = old_errno;
1090 } 1280 }
1091} 1281}
1092 1282
1283/* called whenever the libev signal pipe */
1284/* got some events (signal, async) */
1093static void 1285static void
1094pipecb (EV_P_ ev_io *iow, int revents) 1286pipecb (EV_P_ ev_io *iow, int revents)
1095{ 1287{
1288 int i;
1289
1096#if EV_USE_EVENTFD 1290#if EV_USE_EVENTFD
1097 if (evfd >= 0) 1291 if (evfd >= 0)
1098 { 1292 {
1099 uint64_t counter; 1293 uint64_t counter;
1100 read (evfd, &counter, sizeof (uint64_t)); 1294 read (evfd, &counter, sizeof (uint64_t));
1104 { 1298 {
1105 char dummy; 1299 char dummy;
1106 read (evpipe [0], &dummy, 1); 1300 read (evpipe [0], &dummy, 1);
1107 } 1301 }
1108 1302
1109 if (gotsig && ev_is_default_loop (EV_A)) 1303 if (sig_pending)
1110 { 1304 {
1111 int signum; 1305 sig_pending = 0;
1112 gotsig = 0;
1113 1306
1114 for (signum = signalmax; signum--; ) 1307 for (i = EV_NSIG - 1; i--; )
1115 if (signals [signum].gotsig) 1308 if (expect_false (signals [i].pending))
1116 ev_feed_signal_event (EV_A_ signum + 1); 1309 ev_feed_signal_event (EV_A_ i + 1);
1117 } 1310 }
1118 1311
1119#if EV_ASYNC_ENABLE 1312#if EV_ASYNC_ENABLE
1120 if (gotasync) 1313 if (async_pending)
1121 { 1314 {
1122 int i; 1315 async_pending = 0;
1123 gotasync = 0;
1124 1316
1125 for (i = asynccnt; i--; ) 1317 for (i = asynccnt; i--; )
1126 if (asyncs [i]->sent) 1318 if (asyncs [i]->sent)
1127 { 1319 {
1128 asyncs [i]->sent = 0; 1320 asyncs [i]->sent = 0;
1136 1328
1137static void 1329static void
1138ev_sighandler (int signum) 1330ev_sighandler (int signum)
1139{ 1331{
1140#if EV_MULTIPLICITY 1332#if EV_MULTIPLICITY
1141 struct ev_loop *loop = &default_loop_struct; 1333 EV_P = signals [signum - 1].loop;
1142#endif 1334#endif
1143 1335
1144#if _WIN32 1336#ifdef _WIN32
1145 signal (signum, ev_sighandler); 1337 signal (signum, ev_sighandler);
1146#endif 1338#endif
1147 1339
1148 signals [signum - 1].gotsig = 1; 1340 signals [signum - 1].pending = 1;
1149 evpipe_write (EV_A_ &gotsig); 1341 evpipe_write (EV_A_ &sig_pending);
1150} 1342}
1151 1343
1152void noinline 1344void noinline
1153ev_feed_signal_event (EV_P_ int signum) 1345ev_feed_signal_event (EV_P_ int signum)
1154{ 1346{
1155 WL w; 1347 WL w;
1156 1348
1349 if (expect_false (signum <= 0 || signum > EV_NSIG))
1350 return;
1351
1352 --signum;
1353
1157#if EV_MULTIPLICITY 1354#if EV_MULTIPLICITY
1158 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1355 /* it is permissible to try to feed a signal to the wrong loop */
1159#endif 1356 /* or, likely more useful, feeding a signal nobody is waiting for */
1160 1357
1161 --signum; 1358 if (expect_false (signals [signum].loop != EV_A))
1162
1163 if (signum < 0 || signum >= signalmax)
1164 return; 1359 return;
1360#endif
1165 1361
1166 signals [signum].gotsig = 0; 1362 signals [signum].pending = 0;
1167 1363
1168 for (w = signals [signum].head; w; w = w->next) 1364 for (w = signals [signum].head; w; w = w->next)
1169 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1365 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1170} 1366}
1171 1367
1368#if EV_USE_SIGNALFD
1369static void
1370sigfdcb (EV_P_ ev_io *iow, int revents)
1371{
1372 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1373
1374 for (;;)
1375 {
1376 ssize_t res = read (sigfd, si, sizeof (si));
1377
1378 /* not ISO-C, as res might be -1, but works with SuS */
1379 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1380 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1381
1382 if (res < (ssize_t)sizeof (si))
1383 break;
1384 }
1385}
1386#endif
1387
1388#endif
1389
1172/*****************************************************************************/ 1390/*****************************************************************************/
1173 1391
1392#if EV_CHILD_ENABLE
1174static WL childs [EV_PID_HASHSIZE]; 1393static WL childs [EV_PID_HASHSIZE];
1175
1176#ifndef _WIN32
1177 1394
1178static ev_signal childev; 1395static ev_signal childev;
1179 1396
1180#ifndef WIFCONTINUED 1397#ifndef WIFCONTINUED
1181# define WIFCONTINUED(status) 0 1398# define WIFCONTINUED(status) 0
1182#endif 1399#endif
1183 1400
1401/* handle a single child status event */
1184inline_speed void 1402inline_speed void
1185child_reap (EV_P_ int chain, int pid, int status) 1403child_reap (EV_P_ int chain, int pid, int status)
1186{ 1404{
1187 ev_child *w; 1405 ev_child *w;
1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1406 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1202 1420
1203#ifndef WCONTINUED 1421#ifndef WCONTINUED
1204# define WCONTINUED 0 1422# define WCONTINUED 0
1205#endif 1423#endif
1206 1424
1425/* called on sigchld etc., calls waitpid */
1207static void 1426static void
1208childcb (EV_P_ ev_signal *sw, int revents) 1427childcb (EV_P_ ev_signal *sw, int revents)
1209{ 1428{
1210 int pid, status; 1429 int pid, status;
1211 1430
1318ev_backend (EV_P) 1537ev_backend (EV_P)
1319{ 1538{
1320 return backend; 1539 return backend;
1321} 1540}
1322 1541
1542#if EV_MINIMAL < 2
1323unsigned int 1543unsigned int
1324ev_loop_count (EV_P) 1544ev_loop_count (EV_P)
1325{ 1545{
1326 return loop_count; 1546 return loop_count;
1327} 1547}
1328 1548
1549unsigned int
1550ev_loop_depth (EV_P)
1551{
1552 return loop_depth;
1553}
1554
1329void 1555void
1330ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1556ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1331{ 1557{
1332 io_blocktime = interval; 1558 io_blocktime = interval;
1333} 1559}
1336ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1562ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1337{ 1563{
1338 timeout_blocktime = interval; 1564 timeout_blocktime = interval;
1339} 1565}
1340 1566
1567void
1568ev_set_userdata (EV_P_ void *data)
1569{
1570 userdata = data;
1571}
1572
1573void *
1574ev_userdata (EV_P)
1575{
1576 return userdata;
1577}
1578
1579void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1580{
1581 invoke_cb = invoke_pending_cb;
1582}
1583
1584void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1585{
1586 release_cb = release;
1587 acquire_cb = acquire;
1588}
1589#endif
1590
1591/* initialise a loop structure, must be zero-initialised */
1341static void noinline 1592static void noinline
1342loop_init (EV_P_ unsigned int flags) 1593loop_init (EV_P_ unsigned int flags)
1343{ 1594{
1344 if (!backend) 1595 if (!backend)
1345 { 1596 {
1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1612 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1362 have_monotonic = 1; 1613 have_monotonic = 1;
1363 } 1614 }
1364#endif 1615#endif
1365 1616
1617 /* pid check not overridable via env */
1618#ifndef _WIN32
1619 if (flags & EVFLAG_FORKCHECK)
1620 curpid = getpid ();
1621#endif
1622
1623 if (!(flags & EVFLAG_NOENV)
1624 && !enable_secure ()
1625 && getenv ("LIBEV_FLAGS"))
1626 flags = atoi (getenv ("LIBEV_FLAGS"));
1627
1366 ev_rt_now = ev_time (); 1628 ev_rt_now = ev_time ();
1367 mn_now = get_clock (); 1629 mn_now = get_clock ();
1368 now_floor = mn_now; 1630 now_floor = mn_now;
1369 rtmn_diff = ev_rt_now - mn_now; 1631 rtmn_diff = ev_rt_now - mn_now;
1632#if EV_MINIMAL < 2
1633 invoke_cb = ev_invoke_pending;
1634#endif
1370 1635
1371 io_blocktime = 0.; 1636 io_blocktime = 0.;
1372 timeout_blocktime = 0.; 1637 timeout_blocktime = 0.;
1373 backend = 0; 1638 backend = 0;
1374 backend_fd = -1; 1639 backend_fd = -1;
1375 gotasync = 0; 1640 sig_pending = 0;
1641#if EV_ASYNC_ENABLE
1642 async_pending = 0;
1643#endif
1376#if EV_USE_INOTIFY 1644#if EV_USE_INOTIFY
1377 fs_fd = -2; 1645 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1378#endif 1646#endif
1379 1647#if EV_USE_SIGNALFD
1380 /* pid check not overridable via env */ 1648 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1381#ifndef _WIN32
1382 if (flags & EVFLAG_FORKCHECK)
1383 curpid = getpid ();
1384#endif 1649#endif
1385
1386 if (!(flags & EVFLAG_NOENV)
1387 && !enable_secure ()
1388 && getenv ("LIBEV_FLAGS"))
1389 flags = atoi (getenv ("LIBEV_FLAGS"));
1390 1650
1391 if (!(flags & 0x0000ffffU)) 1651 if (!(flags & 0x0000ffffU))
1392 flags |= ev_recommended_backends (); 1652 flags |= ev_recommended_backends ();
1393 1653
1394#if EV_USE_PORT 1654#if EV_USE_PORT
1405#endif 1665#endif
1406#if EV_USE_SELECT 1666#if EV_USE_SELECT
1407 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1667 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1408#endif 1668#endif
1409 1669
1670 ev_prepare_init (&pending_w, pendingcb);
1671
1672#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1410 ev_init (&pipeev, pipecb); 1673 ev_init (&pipe_w, pipecb);
1411 ev_set_priority (&pipeev, EV_MAXPRI); 1674 ev_set_priority (&pipe_w, EV_MAXPRI);
1675#endif
1412 } 1676 }
1413} 1677}
1414 1678
1679/* free up a loop structure */
1415static void noinline 1680static void noinline
1416loop_destroy (EV_P) 1681loop_destroy (EV_P)
1417{ 1682{
1418 int i; 1683 int i;
1419 1684
1420 if (ev_is_active (&pipeev)) 1685 if (ev_is_active (&pipe_w))
1421 { 1686 {
1422 ev_ref (EV_A); /* signal watcher */ 1687 /*ev_ref (EV_A);*/
1423 ev_io_stop (EV_A_ &pipeev); 1688 /*ev_io_stop (EV_A_ &pipe_w);*/
1424 1689
1425#if EV_USE_EVENTFD 1690#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1691 if (evfd >= 0)
1427 close (evfd); 1692 close (evfd);
1428#endif 1693#endif
1429 1694
1430 if (evpipe [0] >= 0) 1695 if (evpipe [0] >= 0)
1431 { 1696 {
1432 close (evpipe [0]); 1697 EV_WIN32_CLOSE_FD (evpipe [0]);
1433 close (evpipe [1]); 1698 EV_WIN32_CLOSE_FD (evpipe [1]);
1434 } 1699 }
1435 } 1700 }
1701
1702#if EV_USE_SIGNALFD
1703 if (ev_is_active (&sigfd_w))
1704 close (sigfd);
1705#endif
1436 1706
1437#if EV_USE_INOTIFY 1707#if EV_USE_INOTIFY
1438 if (fs_fd >= 0) 1708 if (fs_fd >= 0)
1439 close (fs_fd); 1709 close (fs_fd);
1440#endif 1710#endif
1464#if EV_IDLE_ENABLE 1734#if EV_IDLE_ENABLE
1465 array_free (idle, [i]); 1735 array_free (idle, [i]);
1466#endif 1736#endif
1467 } 1737 }
1468 1738
1469 ev_free (anfds); anfdmax = 0; 1739 ev_free (anfds); anfds = 0; anfdmax = 0;
1470 1740
1471 /* have to use the microsoft-never-gets-it-right macro */ 1741 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY); 1742 array_free (rfeed, EMPTY);
1473 array_free (fdchange, EMPTY); 1743 array_free (fdchange, EMPTY);
1474 array_free (timer, EMPTY); 1744 array_free (timer, EMPTY);
1505#endif 1775#endif
1506#if EV_USE_INOTIFY 1776#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1777 infy_fork (EV_A);
1508#endif 1778#endif
1509 1779
1510 if (ev_is_active (&pipeev)) 1780 if (ev_is_active (&pipe_w))
1511 { 1781 {
1512 /* this "locks" the handlers against writing to the pipe */ 1782 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1783 /* while we modify the fd vars */
1514 gotsig = 1; 1784 sig_pending = 1;
1515#if EV_ASYNC_ENABLE 1785#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1786 async_pending = 1;
1517#endif 1787#endif
1518 1788
1519 ev_ref (EV_A); 1789 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1790 ev_io_stop (EV_A_ &pipe_w);
1521 1791
1522#if EV_USE_EVENTFD 1792#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1793 if (evfd >= 0)
1524 close (evfd); 1794 close (evfd);
1525#endif 1795#endif
1526 1796
1527 if (evpipe [0] >= 0) 1797 if (evpipe [0] >= 0)
1528 { 1798 {
1529 close (evpipe [0]); 1799 EV_WIN32_CLOSE_FD (evpipe [0]);
1530 close (evpipe [1]); 1800 EV_WIN32_CLOSE_FD (evpipe [1]);
1531 } 1801 }
1532 1802
1533 evpipe_init (EV_A); 1803 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1804 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1805 pipecb (EV_A_ &pipe_w, EV_READ);
1536 } 1806 }
1537 1807
1538 postfork = 0; 1808 postfork = 0;
1539} 1809}
1540 1810
1541#if EV_MULTIPLICITY 1811#if EV_MULTIPLICITY
1542 1812
1543struct ev_loop * 1813struct ev_loop *
1544ev_loop_new (unsigned int flags) 1814ev_loop_new (unsigned int flags)
1545{ 1815{
1546 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1816 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1547 1817
1548 memset (loop, 0, sizeof (struct ev_loop)); 1818 memset (EV_A, 0, sizeof (struct ev_loop));
1549
1550 loop_init (EV_A_ flags); 1819 loop_init (EV_A_ flags);
1551 1820
1552 if (ev_backend (EV_A)) 1821 if (ev_backend (EV_A))
1553 return loop; 1822 return EV_A;
1554 1823
1555 return 0; 1824 return 0;
1556} 1825}
1557 1826
1558void 1827void
1565void 1834void
1566ev_loop_fork (EV_P) 1835ev_loop_fork (EV_P)
1567{ 1836{
1568 postfork = 1; /* must be in line with ev_default_fork */ 1837 postfork = 1; /* must be in line with ev_default_fork */
1569} 1838}
1839#endif /* multiplicity */
1570 1840
1571#if EV_VERIFY 1841#if EV_VERIFY
1572static void noinline 1842static void noinline
1573verify_watcher (EV_P_ W w) 1843verify_watcher (EV_P_ W w)
1574{ 1844{
1602 verify_watcher (EV_A_ ws [cnt]); 1872 verify_watcher (EV_A_ ws [cnt]);
1603 } 1873 }
1604} 1874}
1605#endif 1875#endif
1606 1876
1877#if EV_MINIMAL < 2
1607void 1878void
1608ev_loop_verify (EV_P) 1879ev_loop_verify (EV_P)
1609{ 1880{
1610#if EV_VERIFY 1881#if EV_VERIFY
1611 int i; 1882 int i;
1659 1930
1660 assert (checkmax >= checkcnt); 1931 assert (checkmax >= checkcnt);
1661 array_verify (EV_A_ (W *)checks, checkcnt); 1932 array_verify (EV_A_ (W *)checks, checkcnt);
1662 1933
1663# if 0 1934# if 0
1935#if EV_CHILD_ENABLE
1664 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1936 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) 1937 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1666# endif 1938#endif
1667#endif 1939# endif
1940#endif
1668} 1941}
1669 1942#endif
1670#endif /* multiplicity */
1671 1943
1672#if EV_MULTIPLICITY 1944#if EV_MULTIPLICITY
1673struct ev_loop * 1945struct ev_loop *
1674ev_default_loop_init (unsigned int flags) 1946ev_default_loop_init (unsigned int flags)
1675#else 1947#else
1678#endif 1950#endif
1679{ 1951{
1680 if (!ev_default_loop_ptr) 1952 if (!ev_default_loop_ptr)
1681 { 1953 {
1682#if EV_MULTIPLICITY 1954#if EV_MULTIPLICITY
1683 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1955 EV_P = ev_default_loop_ptr = &default_loop_struct;
1684#else 1956#else
1685 ev_default_loop_ptr = 1; 1957 ev_default_loop_ptr = 1;
1686#endif 1958#endif
1687 1959
1688 loop_init (EV_A_ flags); 1960 loop_init (EV_A_ flags);
1689 1961
1690 if (ev_backend (EV_A)) 1962 if (ev_backend (EV_A))
1691 { 1963 {
1692#ifndef _WIN32 1964#if EV_CHILD_ENABLE
1693 ev_signal_init (&childev, childcb, SIGCHLD); 1965 ev_signal_init (&childev, childcb, SIGCHLD);
1694 ev_set_priority (&childev, EV_MAXPRI); 1966 ev_set_priority (&childev, EV_MAXPRI);
1695 ev_signal_start (EV_A_ &childev); 1967 ev_signal_start (EV_A_ &childev);
1696 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1968 ev_unref (EV_A); /* child watcher should not keep loop alive */
1697#endif 1969#endif
1705 1977
1706void 1978void
1707ev_default_destroy (void) 1979ev_default_destroy (void)
1708{ 1980{
1709#if EV_MULTIPLICITY 1981#if EV_MULTIPLICITY
1710 struct ev_loop *loop = ev_default_loop_ptr; 1982 EV_P = ev_default_loop_ptr;
1711#endif 1983#endif
1712 1984
1713 ev_default_loop_ptr = 0; 1985 ev_default_loop_ptr = 0;
1714 1986
1715#ifndef _WIN32 1987#if EV_CHILD_ENABLE
1716 ev_ref (EV_A); /* child watcher */ 1988 ev_ref (EV_A); /* child watcher */
1717 ev_signal_stop (EV_A_ &childev); 1989 ev_signal_stop (EV_A_ &childev);
1718#endif 1990#endif
1719 1991
1720 loop_destroy (EV_A); 1992 loop_destroy (EV_A);
1722 1994
1723void 1995void
1724ev_default_fork (void) 1996ev_default_fork (void)
1725{ 1997{
1726#if EV_MULTIPLICITY 1998#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr; 1999 EV_P = ev_default_loop_ptr;
1728#endif 2000#endif
1729 2001
1730 postfork = 1; /* must be in line with ev_loop_fork */ 2002 postfork = 1; /* must be in line with ev_loop_fork */
1731} 2003}
1732 2004
1736ev_invoke (EV_P_ void *w, int revents) 2008ev_invoke (EV_P_ void *w, int revents)
1737{ 2009{
1738 EV_CB_INVOKE ((W)w, revents); 2010 EV_CB_INVOKE ((W)w, revents);
1739} 2011}
1740 2012
1741inline_speed void 2013unsigned int
1742call_pending (EV_P) 2014ev_pending_count (EV_P)
2015{
2016 int pri;
2017 unsigned int count = 0;
2018
2019 for (pri = NUMPRI; pri--; )
2020 count += pendingcnt [pri];
2021
2022 return count;
2023}
2024
2025void noinline
2026ev_invoke_pending (EV_P)
1743{ 2027{
1744 int pri; 2028 int pri;
1745 2029
1746 for (pri = NUMPRI; pri--; ) 2030 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 2031 while (pendingcnt [pri])
1748 { 2032 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2033 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 2034
1751 if (expect_true (p->w))
1752 {
1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 2035 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2036 /* ^ this is no longer true, as pending_w could be here */
1754 2037
1755 p->w->pending = 0; 2038 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 2039 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 2040 EV_FREQUENT_CHECK;
1758 }
1759 } 2041 }
1760} 2042}
1761 2043
1762#if EV_IDLE_ENABLE 2044#if EV_IDLE_ENABLE
2045/* make idle watchers pending. this handles the "call-idle */
2046/* only when higher priorities are idle" logic */
1763inline_size void 2047inline_size void
1764idle_reify (EV_P) 2048idle_reify (EV_P)
1765{ 2049{
1766 if (expect_false (idleall)) 2050 if (expect_false (idleall))
1767 { 2051 {
1780 } 2064 }
1781 } 2065 }
1782} 2066}
1783#endif 2067#endif
1784 2068
2069/* make timers pending */
1785inline_size void 2070inline_size void
1786timers_reify (EV_P) 2071timers_reify (EV_P)
1787{ 2072{
1788 EV_FREQUENT_CHECK; 2073 EV_FREQUENT_CHECK;
1789 2074
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 2103 feed_reverse_done (EV_A_ EV_TIMEOUT);
1819 } 2104 }
1820} 2105}
1821 2106
1822#if EV_PERIODIC_ENABLE 2107#if EV_PERIODIC_ENABLE
2108/* make periodics pending */
1823inline_size void 2109inline_size void
1824periodics_reify (EV_P) 2110periodics_reify (EV_P)
1825{ 2111{
1826 EV_FREQUENT_CHECK; 2112 EV_FREQUENT_CHECK;
1827 2113
1874 2160
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 2161 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 2162 }
1877} 2163}
1878 2164
2165/* simply recalculate all periodics */
2166/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1879static void noinline 2167static void noinline
1880periodics_reschedule (EV_P) 2168periodics_reschedule (EV_P)
1881{ 2169{
1882 int i; 2170 int i;
1883 2171
1896 2184
1897 reheap (periodics, periodiccnt); 2185 reheap (periodics, periodiccnt);
1898} 2186}
1899#endif 2187#endif
1900 2188
2189/* adjust all timers by a given offset */
1901static void noinline 2190static void noinline
1902timers_reschedule (EV_P_ ev_tstamp adjust) 2191timers_reschedule (EV_P_ ev_tstamp adjust)
1903{ 2192{
1904 int i; 2193 int i;
1905 2194
1909 ANHE_w (*he)->at += adjust; 2198 ANHE_w (*he)->at += adjust;
1910 ANHE_at_cache (*he); 2199 ANHE_at_cache (*he);
1911 } 2200 }
1912} 2201}
1913 2202
2203/* fetch new monotonic and realtime times from the kernel */
2204/* also detect if there was a timejump, and act accordingly */
1914inline_speed void 2205inline_speed void
1915time_update (EV_P_ ev_tstamp max_block) 2206time_update (EV_P_ ev_tstamp max_block)
1916{ 2207{
1917 int i;
1918
1919#if EV_USE_MONOTONIC 2208#if EV_USE_MONOTONIC
1920 if (expect_true (have_monotonic)) 2209 if (expect_true (have_monotonic))
1921 { 2210 {
2211 int i;
1922 ev_tstamp odiff = rtmn_diff; 2212 ev_tstamp odiff = rtmn_diff;
1923 2213
1924 mn_now = get_clock (); 2214 mn_now = get_clock ();
1925 2215
1926 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2216 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1976 2266
1977 mn_now = ev_rt_now; 2267 mn_now = ev_rt_now;
1978 } 2268 }
1979} 2269}
1980 2270
1981static int loop_done;
1982
1983void 2271void
1984ev_loop (EV_P_ int flags) 2272ev_loop (EV_P_ int flags)
1985{ 2273{
2274#if EV_MINIMAL < 2
2275 ++loop_depth;
2276#endif
2277
2278 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2279
1986 loop_done = EVUNLOOP_CANCEL; 2280 loop_done = EVUNLOOP_CANCEL;
1987 2281
1988 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2282 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1989 2283
1990 do 2284 do
1991 { 2285 {
1992#if EV_VERIFY >= 2 2286#if EV_VERIFY >= 2
1993 ev_loop_verify (EV_A); 2287 ev_loop_verify (EV_A);
2006 /* we might have forked, so queue fork handlers */ 2300 /* we might have forked, so queue fork handlers */
2007 if (expect_false (postfork)) 2301 if (expect_false (postfork))
2008 if (forkcnt) 2302 if (forkcnt)
2009 { 2303 {
2010 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2304 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2011 call_pending (EV_A); 2305 EV_INVOKE_PENDING;
2012 } 2306 }
2013#endif 2307#endif
2014 2308
2015 /* queue prepare watchers (and execute them) */ 2309 /* queue prepare watchers (and execute them) */
2016 if (expect_false (preparecnt)) 2310 if (expect_false (preparecnt))
2017 { 2311 {
2018 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2312 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2019 call_pending (EV_A); 2313 EV_INVOKE_PENDING;
2020 } 2314 }
2315
2316 if (expect_false (loop_done))
2317 break;
2021 2318
2022 /* we might have forked, so reify kernel state if necessary */ 2319 /* we might have forked, so reify kernel state if necessary */
2023 if (expect_false (postfork)) 2320 if (expect_false (postfork))
2024 loop_fork (EV_A); 2321 loop_fork (EV_A);
2025 2322
2031 ev_tstamp waittime = 0.; 2328 ev_tstamp waittime = 0.;
2032 ev_tstamp sleeptime = 0.; 2329 ev_tstamp sleeptime = 0.;
2033 2330
2034 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2331 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2035 { 2332 {
2333 /* remember old timestamp for io_blocktime calculation */
2334 ev_tstamp prev_mn_now = mn_now;
2335
2036 /* update time to cancel out callback processing overhead */ 2336 /* update time to cancel out callback processing overhead */
2037 time_update (EV_A_ 1e100); 2337 time_update (EV_A_ 1e100);
2338
2339 waittime = MAX_BLOCKTIME;
2038 2340
2039 if (timercnt) 2341 if (timercnt)
2040 { 2342 {
2041 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2343 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2042 if (waittime > to) waittime = to; 2344 if (waittime > to) waittime = to;
2048 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2350 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2049 if (waittime > to) waittime = to; 2351 if (waittime > to) waittime = to;
2050 } 2352 }
2051#endif 2353#endif
2052 2354
2355 /* don't let timeouts decrease the waittime below timeout_blocktime */
2053 if (expect_false (waittime < timeout_blocktime)) 2356 if (expect_false (waittime < timeout_blocktime))
2054 waittime = timeout_blocktime; 2357 waittime = timeout_blocktime;
2055 2358
2056 sleeptime = waittime - backend_fudge; 2359 /* extra check because io_blocktime is commonly 0 */
2057
2058 if (expect_true (sleeptime > io_blocktime)) 2360 if (expect_false (io_blocktime))
2059 sleeptime = io_blocktime;
2060
2061 if (sleeptime)
2062 { 2361 {
2362 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2363
2364 if (sleeptime > waittime - backend_fudge)
2365 sleeptime = waittime - backend_fudge;
2366
2367 if (expect_true (sleeptime > 0.))
2368 {
2063 ev_sleep (sleeptime); 2369 ev_sleep (sleeptime);
2064 waittime -= sleeptime; 2370 waittime -= sleeptime;
2371 }
2065 } 2372 }
2066 } 2373 }
2067 2374
2375#if EV_MINIMAL < 2
2068 ++loop_count; 2376 ++loop_count;
2377#endif
2378 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2069 backend_poll (EV_A_ waittime); 2379 backend_poll (EV_A_ waittime);
2380 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2070 2381
2071 /* update ev_rt_now, do magic */ 2382 /* update ev_rt_now, do magic */
2072 time_update (EV_A_ waittime + sleeptime); 2383 time_update (EV_A_ waittime + sleeptime);
2073 } 2384 }
2074 2385
2085 2396
2086 /* queue check watchers, to be executed first */ 2397 /* queue check watchers, to be executed first */
2087 if (expect_false (checkcnt)) 2398 if (expect_false (checkcnt))
2088 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2399 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2089 2400
2090 call_pending (EV_A); 2401 EV_INVOKE_PENDING;
2091 } 2402 }
2092 while (expect_true ( 2403 while (expect_true (
2093 activecnt 2404 activecnt
2094 && !loop_done 2405 && !loop_done
2095 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2406 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2096 )); 2407 ));
2097 2408
2098 if (loop_done == EVUNLOOP_ONE) 2409 if (loop_done == EVUNLOOP_ONE)
2099 loop_done = EVUNLOOP_CANCEL; 2410 loop_done = EVUNLOOP_CANCEL;
2411
2412#if EV_MINIMAL < 2
2413 --loop_depth;
2414#endif
2100} 2415}
2101 2416
2102void 2417void
2103ev_unloop (EV_P_ int how) 2418ev_unloop (EV_P_ int how)
2104{ 2419{
2133ev_resume (EV_P) 2448ev_resume (EV_P)
2134{ 2449{
2135 ev_tstamp mn_prev = mn_now; 2450 ev_tstamp mn_prev = mn_now;
2136 2451
2137 ev_now_update (EV_A); 2452 ev_now_update (EV_A);
2138 printf ("update %f\n", mn_now - mn_prev);//D
2139 timers_reschedule (EV_A_ mn_now - mn_prev); 2453 timers_reschedule (EV_A_ mn_now - mn_prev);
2454#if EV_PERIODIC_ENABLE
2455 /* TODO: really do this? */
2140 periodics_reschedule (EV_A); 2456 periodics_reschedule (EV_A);
2457#endif
2141} 2458}
2142 2459
2143/*****************************************************************************/ 2460/*****************************************************************************/
2461/* singly-linked list management, used when the expected list length is short */
2144 2462
2145inline_size void 2463inline_size void
2146wlist_add (WL *head, WL elem) 2464wlist_add (WL *head, WL elem)
2147{ 2465{
2148 elem->next = *head; 2466 elem->next = *head;
2152inline_size void 2470inline_size void
2153wlist_del (WL *head, WL elem) 2471wlist_del (WL *head, WL elem)
2154{ 2472{
2155 while (*head) 2473 while (*head)
2156 { 2474 {
2157 if (*head == elem) 2475 if (expect_true (*head == elem))
2158 { 2476 {
2159 *head = elem->next; 2477 *head = elem->next;
2160 return; 2478 break;
2161 } 2479 }
2162 2480
2163 head = &(*head)->next; 2481 head = &(*head)->next;
2164 } 2482 }
2165} 2483}
2166 2484
2485/* internal, faster, version of ev_clear_pending */
2167inline_speed void 2486inline_speed void
2168clear_pending (EV_P_ W w) 2487clear_pending (EV_P_ W w)
2169{ 2488{
2170 if (w->pending) 2489 if (w->pending)
2171 { 2490 {
2172 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2491 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2173 w->pending = 0; 2492 w->pending = 0;
2174 } 2493 }
2175} 2494}
2176 2495
2177int 2496int
2181 int pending = w_->pending; 2500 int pending = w_->pending;
2182 2501
2183 if (expect_true (pending)) 2502 if (expect_true (pending))
2184 { 2503 {
2185 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2504 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2505 p->w = (W)&pending_w;
2186 w_->pending = 0; 2506 w_->pending = 0;
2187 p->w = 0;
2188 return p->events; 2507 return p->events;
2189 } 2508 }
2190 else 2509 else
2191 return 0; 2510 return 0;
2192} 2511}
2193 2512
2194inline_size void 2513inline_size void
2195pri_adjust (EV_P_ W w) 2514pri_adjust (EV_P_ W w)
2196{ 2515{
2197 int pri = w->priority; 2516 int pri = ev_priority (w);
2198 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2517 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2199 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2518 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2200 w->priority = pri; 2519 ev_set_priority (w, pri);
2201} 2520}
2202 2521
2203inline_speed void 2522inline_speed void
2204ev_start (EV_P_ W w, int active) 2523ev_start (EV_P_ W w, int active)
2205{ 2524{
2224 2543
2225 if (expect_false (ev_is_active (w))) 2544 if (expect_false (ev_is_active (w)))
2226 return; 2545 return;
2227 2546
2228 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2547 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2229 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2548 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2230 2549
2231 EV_FREQUENT_CHECK; 2550 EV_FREQUENT_CHECK;
2232 2551
2233 ev_start (EV_A_ (W)w, 1); 2552 ev_start (EV_A_ (W)w, 1);
2234 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2553 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2235 wlist_add (&anfds[fd].head, (WL)w); 2554 wlist_add (&anfds[fd].head, (WL)w);
2236 2555
2237 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2556 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2238 w->events &= ~EV__IOFDSET; 2557 w->events &= ~EV__IOFDSET;
2239 2558
2240 EV_FREQUENT_CHECK; 2559 EV_FREQUENT_CHECK;
2241} 2560}
2242 2561
2304 timers [active] = timers [timercnt + HEAP0]; 2623 timers [active] = timers [timercnt + HEAP0];
2305 adjustheap (timers, timercnt, active); 2624 adjustheap (timers, timercnt, active);
2306 } 2625 }
2307 } 2626 }
2308 2627
2309 EV_FREQUENT_CHECK;
2310
2311 ev_at (w) -= mn_now; 2628 ev_at (w) -= mn_now;
2312 2629
2313 ev_stop (EV_A_ (W)w); 2630 ev_stop (EV_A_ (W)w);
2631
2632 EV_FREQUENT_CHECK;
2314} 2633}
2315 2634
2316void noinline 2635void noinline
2317ev_timer_again (EV_P_ ev_timer *w) 2636ev_timer_again (EV_P_ ev_timer *w)
2318{ 2637{
2336 } 2655 }
2337 2656
2338 EV_FREQUENT_CHECK; 2657 EV_FREQUENT_CHECK;
2339} 2658}
2340 2659
2660ev_tstamp
2661ev_timer_remaining (EV_P_ ev_timer *w)
2662{
2663 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2664}
2665
2341#if EV_PERIODIC_ENABLE 2666#if EV_PERIODIC_ENABLE
2342void noinline 2667void noinline
2343ev_periodic_start (EV_P_ ev_periodic *w) 2668ev_periodic_start (EV_P_ ev_periodic *w)
2344{ 2669{
2345 if (expect_false (ev_is_active (w))) 2670 if (expect_false (ev_is_active (w)))
2391 periodics [active] = periodics [periodiccnt + HEAP0]; 2716 periodics [active] = periodics [periodiccnt + HEAP0];
2392 adjustheap (periodics, periodiccnt, active); 2717 adjustheap (periodics, periodiccnt, active);
2393 } 2718 }
2394 } 2719 }
2395 2720
2396 EV_FREQUENT_CHECK;
2397
2398 ev_stop (EV_A_ (W)w); 2721 ev_stop (EV_A_ (W)w);
2722
2723 EV_FREQUENT_CHECK;
2399} 2724}
2400 2725
2401void noinline 2726void noinline
2402ev_periodic_again (EV_P_ ev_periodic *w) 2727ev_periodic_again (EV_P_ ev_periodic *w)
2403{ 2728{
2409 2734
2410#ifndef SA_RESTART 2735#ifndef SA_RESTART
2411# define SA_RESTART 0 2736# define SA_RESTART 0
2412#endif 2737#endif
2413 2738
2739#if EV_SIGNAL_ENABLE
2740
2414void noinline 2741void noinline
2415ev_signal_start (EV_P_ ev_signal *w) 2742ev_signal_start (EV_P_ ev_signal *w)
2416{ 2743{
2417#if EV_MULTIPLICITY
2418 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2419#endif
2420 if (expect_false (ev_is_active (w))) 2744 if (expect_false (ev_is_active (w)))
2421 return; 2745 return;
2422 2746
2423 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2747 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2424 2748
2425 evpipe_init (EV_A); 2749#if EV_MULTIPLICITY
2750 assert (("libev: a signal must not be attached to two different loops",
2751 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2426 2752
2427 EV_FREQUENT_CHECK; 2753 signals [w->signum - 1].loop = EV_A;
2754#endif
2428 2755
2756 EV_FREQUENT_CHECK;
2757
2758#if EV_USE_SIGNALFD
2759 if (sigfd == -2)
2429 { 2760 {
2430#ifndef _WIN32 2761 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2431 sigset_t full, prev; 2762 if (sigfd < 0 && errno == EINVAL)
2432 sigfillset (&full); 2763 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2433 sigprocmask (SIG_SETMASK, &full, &prev);
2434#endif
2435 2764
2436 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2765 if (sigfd >= 0)
2766 {
2767 fd_intern (sigfd); /* doing it twice will not hurt */
2437 2768
2438#ifndef _WIN32 2769 sigemptyset (&sigfd_set);
2439 sigprocmask (SIG_SETMASK, &prev, 0); 2770
2440#endif 2771 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2772 ev_set_priority (&sigfd_w, EV_MAXPRI);
2773 ev_io_start (EV_A_ &sigfd_w);
2774 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2775 }
2441 } 2776 }
2777
2778 if (sigfd >= 0)
2779 {
2780 /* TODO: check .head */
2781 sigaddset (&sigfd_set, w->signum);
2782 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2783
2784 signalfd (sigfd, &sigfd_set, 0);
2785 }
2786#endif
2442 2787
2443 ev_start (EV_A_ (W)w, 1); 2788 ev_start (EV_A_ (W)w, 1);
2444 wlist_add (&signals [w->signum - 1].head, (WL)w); 2789 wlist_add (&signals [w->signum - 1].head, (WL)w);
2445 2790
2446 if (!((WL)w)->next) 2791 if (!((WL)w)->next)
2792# if EV_USE_SIGNALFD
2793 if (sigfd < 0) /*TODO*/
2794# endif
2447 { 2795 {
2448#if _WIN32 2796# ifdef _WIN32
2797 evpipe_init (EV_A);
2798
2449 signal (w->signum, ev_sighandler); 2799 signal (w->signum, ev_sighandler);
2450#else 2800# else
2451 struct sigaction sa; 2801 struct sigaction sa;
2802
2803 evpipe_init (EV_A);
2804
2452 sa.sa_handler = ev_sighandler; 2805 sa.sa_handler = ev_sighandler;
2453 sigfillset (&sa.sa_mask); 2806 sigfillset (&sa.sa_mask);
2454 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2807 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2455 sigaction (w->signum, &sa, 0); 2808 sigaction (w->signum, &sa, 0);
2809
2810 sigemptyset (&sa.sa_mask);
2811 sigaddset (&sa.sa_mask, w->signum);
2812 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2456#endif 2813#endif
2457 } 2814 }
2458 2815
2459 EV_FREQUENT_CHECK; 2816 EV_FREQUENT_CHECK;
2460} 2817}
2461 2818
2462void noinline 2819void noinline
2470 2827
2471 wlist_del (&signals [w->signum - 1].head, (WL)w); 2828 wlist_del (&signals [w->signum - 1].head, (WL)w);
2472 ev_stop (EV_A_ (W)w); 2829 ev_stop (EV_A_ (W)w);
2473 2830
2474 if (!signals [w->signum - 1].head) 2831 if (!signals [w->signum - 1].head)
2832 {
2833#if EV_MULTIPLICITY
2834 signals [w->signum - 1].loop = 0; /* unattach from signal */
2835#endif
2836#if EV_USE_SIGNALFD
2837 if (sigfd >= 0)
2838 {
2839 sigset_t ss;
2840
2841 sigemptyset (&ss);
2842 sigaddset (&ss, w->signum);
2843 sigdelset (&sigfd_set, w->signum);
2844
2845 signalfd (sigfd, &sigfd_set, 0);
2846 sigprocmask (SIG_UNBLOCK, &ss, 0);
2847 }
2848 else
2849#endif
2475 signal (w->signum, SIG_DFL); 2850 signal (w->signum, SIG_DFL);
2851 }
2476 2852
2477 EV_FREQUENT_CHECK; 2853 EV_FREQUENT_CHECK;
2478} 2854}
2855
2856#endif
2857
2858#if EV_CHILD_ENABLE
2479 2859
2480void 2860void
2481ev_child_start (EV_P_ ev_child *w) 2861ev_child_start (EV_P_ ev_child *w)
2482{ 2862{
2483#if EV_MULTIPLICITY 2863#if EV_MULTIPLICITY
2507 ev_stop (EV_A_ (W)w); 2887 ev_stop (EV_A_ (W)w);
2508 2888
2509 EV_FREQUENT_CHECK; 2889 EV_FREQUENT_CHECK;
2510} 2890}
2511 2891
2892#endif
2893
2512#if EV_STAT_ENABLE 2894#if EV_STAT_ENABLE
2513 2895
2514# ifdef _WIN32 2896# ifdef _WIN32
2515# undef lstat 2897# undef lstat
2516# define lstat(a,b) _stati64 (a,b) 2898# define lstat(a,b) _stati64 (a,b)
2521#define MIN_STAT_INTERVAL 0.1074891 2903#define MIN_STAT_INTERVAL 0.1074891
2522 2904
2523static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2905static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2524 2906
2525#if EV_USE_INOTIFY 2907#if EV_USE_INOTIFY
2526# define EV_INOTIFY_BUFSIZE 8192 2908
2909/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2910# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2527 2911
2528static void noinline 2912static void noinline
2529infy_add (EV_P_ ev_stat *w) 2913infy_add (EV_P_ ev_stat *w)
2530{ 2914{
2531 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); 2915 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);
2532 2916
2533 if (w->wd < 0) 2917 if (w->wd >= 0)
2918 {
2919 struct statfs sfs;
2920
2921 /* now local changes will be tracked by inotify, but remote changes won't */
2922 /* unless the filesystem is known to be local, we therefore still poll */
2923 /* also do poll on <2.6.25, but with normal frequency */
2924
2925 if (!fs_2625)
2926 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2927 else if (!statfs (w->path, &sfs)
2928 && (sfs.f_type == 0x1373 /* devfs */
2929 || sfs.f_type == 0xEF53 /* ext2/3 */
2930 || sfs.f_type == 0x3153464a /* jfs */
2931 || sfs.f_type == 0x52654973 /* reiser3 */
2932 || sfs.f_type == 0x01021994 /* tempfs */
2933 || sfs.f_type == 0x58465342 /* xfs */))
2934 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2935 else
2936 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2534 { 2937 }
2938 else
2939 {
2940 /* can't use inotify, continue to stat */
2535 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2941 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2536 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2537 2942
2538 /* monitor some parent directory for speedup hints */ 2943 /* if path is not there, monitor some parent directory for speedup hints */
2539 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2944 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2540 /* but an efficiency issue only */ 2945 /* but an efficiency issue only */
2541 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2946 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2542 { 2947 {
2543 char path [4096]; 2948 char path [4096];
2559 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2964 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2560 } 2965 }
2561 } 2966 }
2562 2967
2563 if (w->wd >= 0) 2968 if (w->wd >= 0)
2564 {
2565 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2969 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2566 2970
2567 /* now local changes will be tracked by inotify, but remote changes won't */ 2971 /* now re-arm timer, if required */
2568 /* unless the filesystem it known to be local, we therefore still poll */ 2972 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2569 /* also do poll on <2.6.25, but with normal frequency */
2570 struct statfs sfs;
2571
2572 if (fs_2625 && !statfs (w->path, &sfs))
2573 if (sfs.f_type == 0x1373 /* devfs */
2574 || sfs.f_type == 0xEF53 /* ext2/3 */
2575 || sfs.f_type == 0x3153464a /* jfs */
2576 || sfs.f_type == 0x52654973 /* reiser3 */
2577 || sfs.f_type == 0x01021994 /* tempfs */
2578 || sfs.f_type == 0x58465342 /* xfs */)
2579 return;
2580
2581 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2582 ev_timer_again (EV_A_ &w->timer); 2973 ev_timer_again (EV_A_ &w->timer);
2583 } 2974 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2584} 2975}
2585 2976
2586static void noinline 2977static void noinline
2587infy_del (EV_P_ ev_stat *w) 2978infy_del (EV_P_ ev_stat *w)
2588{ 2979{
2633 3024
2634static void 3025static void
2635infy_cb (EV_P_ ev_io *w, int revents) 3026infy_cb (EV_P_ ev_io *w, int revents)
2636{ 3027{
2637 char buf [EV_INOTIFY_BUFSIZE]; 3028 char buf [EV_INOTIFY_BUFSIZE];
2638 struct inotify_event *ev = (struct inotify_event *)buf;
2639 int ofs; 3029 int ofs;
2640 int len = read (fs_fd, buf, sizeof (buf)); 3030 int len = read (fs_fd, buf, sizeof (buf));
2641 3031
2642 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3032 for (ofs = 0; ofs < len; )
3033 {
3034 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2643 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3035 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3036 ofs += sizeof (struct inotify_event) + ev->len;
3037 }
3038}
3039
3040inline_size unsigned int
3041ev_linux_version (void)
3042{
3043 struct utsname buf;
3044 unsigned int v;
3045 int i;
3046 char *p = buf.release;
3047
3048 if (uname (&buf))
3049 return 0;
3050
3051 for (i = 3+1; --i; )
3052 {
3053 unsigned int c = 0;
3054
3055 for (;;)
3056 {
3057 if (*p >= '0' && *p <= '9')
3058 c = c * 10 + *p++ - '0';
3059 else
3060 {
3061 p += *p == '.';
3062 break;
3063 }
3064 }
3065
3066 v = (v << 8) | c;
3067 }
3068
3069 return v;
2644} 3070}
2645 3071
2646inline_size void 3072inline_size void
2647check_2625 (EV_P) 3073ev_check_2625 (EV_P)
2648{ 3074{
2649 /* kernels < 2.6.25 are borked 3075 /* kernels < 2.6.25 are borked
2650 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3076 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2651 */ 3077 */
2652 struct utsname buf; 3078 if (ev_linux_version () < 0x020619)
2653 int major, minor, micro;
2654
2655 if (uname (&buf))
2656 return; 3079 return;
2657 3080
2658 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2659 return;
2660
2661 if (major < 2
2662 || (major == 2 && minor < 6)
2663 || (major == 2 && minor == 6 && micro < 25))
2664 return;
2665
2666 fs_2625 = 1; 3081 fs_2625 = 1;
3082}
3083
3084inline_size int
3085infy_newfd (void)
3086{
3087#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3088 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3089 if (fd >= 0)
3090 return fd;
3091#endif
3092 return inotify_init ();
2667} 3093}
2668 3094
2669inline_size void 3095inline_size void
2670infy_init (EV_P) 3096infy_init (EV_P)
2671{ 3097{
2672 if (fs_fd != -2) 3098 if (fs_fd != -2)
2673 return; 3099 return;
2674 3100
2675 fs_fd = -1; 3101 fs_fd = -1;
2676 3102
2677 check_2625 (EV_A); 3103 ev_check_2625 (EV_A);
2678 3104
2679 fs_fd = inotify_init (); 3105 fs_fd = infy_newfd ();
2680 3106
2681 if (fs_fd >= 0) 3107 if (fs_fd >= 0)
2682 { 3108 {
3109 fd_intern (fs_fd);
2683 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3110 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2684 ev_set_priority (&fs_w, EV_MAXPRI); 3111 ev_set_priority (&fs_w, EV_MAXPRI);
2685 ev_io_start (EV_A_ &fs_w); 3112 ev_io_start (EV_A_ &fs_w);
3113 ev_unref (EV_A);
2686 } 3114 }
2687} 3115}
2688 3116
2689inline_size void 3117inline_size void
2690infy_fork (EV_P) 3118infy_fork (EV_P)
2692 int slot; 3120 int slot;
2693 3121
2694 if (fs_fd < 0) 3122 if (fs_fd < 0)
2695 return; 3123 return;
2696 3124
3125 ev_ref (EV_A);
3126 ev_io_stop (EV_A_ &fs_w);
2697 close (fs_fd); 3127 close (fs_fd);
2698 fs_fd = inotify_init (); 3128 fs_fd = infy_newfd ();
3129
3130 if (fs_fd >= 0)
3131 {
3132 fd_intern (fs_fd);
3133 ev_io_set (&fs_w, fs_fd, EV_READ);
3134 ev_io_start (EV_A_ &fs_w);
3135 ev_unref (EV_A);
3136 }
2699 3137
2700 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3138 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2701 { 3139 {
2702 WL w_ = fs_hash [slot].head; 3140 WL w_ = fs_hash [slot].head;
2703 fs_hash [slot].head = 0; 3141 fs_hash [slot].head = 0;
2710 w->wd = -1; 3148 w->wd = -1;
2711 3149
2712 if (fs_fd >= 0) 3150 if (fs_fd >= 0)
2713 infy_add (EV_A_ w); /* re-add, no matter what */ 3151 infy_add (EV_A_ w); /* re-add, no matter what */
2714 else 3152 else
3153 {
3154 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3155 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2715 ev_timer_again (EV_A_ &w->timer); 3156 ev_timer_again (EV_A_ &w->timer);
3157 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3158 }
2716 } 3159 }
2717 } 3160 }
2718} 3161}
2719 3162
2720#endif 3163#endif
2737static void noinline 3180static void noinline
2738stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3181stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2739{ 3182{
2740 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3183 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2741 3184
2742 /* we copy this here each the time so that */ 3185 ev_statdata prev = w->attr;
2743 /* prev has the old value when the callback gets invoked */
2744 w->prev = w->attr;
2745 ev_stat_stat (EV_A_ w); 3186 ev_stat_stat (EV_A_ w);
2746 3187
2747 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3188 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2748 if ( 3189 if (
2749 w->prev.st_dev != w->attr.st_dev 3190 prev.st_dev != w->attr.st_dev
2750 || w->prev.st_ino != w->attr.st_ino 3191 || prev.st_ino != w->attr.st_ino
2751 || w->prev.st_mode != w->attr.st_mode 3192 || prev.st_mode != w->attr.st_mode
2752 || w->prev.st_nlink != w->attr.st_nlink 3193 || prev.st_nlink != w->attr.st_nlink
2753 || w->prev.st_uid != w->attr.st_uid 3194 || prev.st_uid != w->attr.st_uid
2754 || w->prev.st_gid != w->attr.st_gid 3195 || prev.st_gid != w->attr.st_gid
2755 || w->prev.st_rdev != w->attr.st_rdev 3196 || prev.st_rdev != w->attr.st_rdev
2756 || w->prev.st_size != w->attr.st_size 3197 || prev.st_size != w->attr.st_size
2757 || w->prev.st_atime != w->attr.st_atime 3198 || prev.st_atime != w->attr.st_atime
2758 || w->prev.st_mtime != w->attr.st_mtime 3199 || prev.st_mtime != w->attr.st_mtime
2759 || w->prev.st_ctime != w->attr.st_ctime 3200 || prev.st_ctime != w->attr.st_ctime
2760 ) { 3201 ) {
3202 /* we only update w->prev on actual differences */
3203 /* in case we test more often than invoke the callback, */
3204 /* to ensure that prev is always different to attr */
3205 w->prev = prev;
3206
2761 #if EV_USE_INOTIFY 3207 #if EV_USE_INOTIFY
2762 if (fs_fd >= 0) 3208 if (fs_fd >= 0)
2763 { 3209 {
2764 infy_del (EV_A_ w); 3210 infy_del (EV_A_ w);
2765 infy_add (EV_A_ w); 3211 infy_add (EV_A_ w);
2790 3236
2791 if (fs_fd >= 0) 3237 if (fs_fd >= 0)
2792 infy_add (EV_A_ w); 3238 infy_add (EV_A_ w);
2793 else 3239 else
2794#endif 3240#endif
3241 {
2795 ev_timer_again (EV_A_ &w->timer); 3242 ev_timer_again (EV_A_ &w->timer);
3243 ev_unref (EV_A);
3244 }
2796 3245
2797 ev_start (EV_A_ (W)w, 1); 3246 ev_start (EV_A_ (W)w, 1);
2798 3247
2799 EV_FREQUENT_CHECK; 3248 EV_FREQUENT_CHECK;
2800} 3249}
2809 EV_FREQUENT_CHECK; 3258 EV_FREQUENT_CHECK;
2810 3259
2811#if EV_USE_INOTIFY 3260#if EV_USE_INOTIFY
2812 infy_del (EV_A_ w); 3261 infy_del (EV_A_ w);
2813#endif 3262#endif
3263
3264 if (ev_is_active (&w->timer))
3265 {
3266 ev_ref (EV_A);
2814 ev_timer_stop (EV_A_ &w->timer); 3267 ev_timer_stop (EV_A_ &w->timer);
3268 }
2815 3269
2816 ev_stop (EV_A_ (W)w); 3270 ev_stop (EV_A_ (W)w);
2817 3271
2818 EV_FREQUENT_CHECK; 3272 EV_FREQUENT_CHECK;
2819} 3273}
2960embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3414embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2961{ 3415{
2962 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3416 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2963 3417
2964 { 3418 {
2965 struct ev_loop *loop = w->other; 3419 EV_P = w->other;
2966 3420
2967 while (fdchangecnt) 3421 while (fdchangecnt)
2968 { 3422 {
2969 fd_reify (EV_A); 3423 fd_reify (EV_A);
2970 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3424 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2978 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3432 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2979 3433
2980 ev_embed_stop (EV_A_ w); 3434 ev_embed_stop (EV_A_ w);
2981 3435
2982 { 3436 {
2983 struct ev_loop *loop = w->other; 3437 EV_P = w->other;
2984 3438
2985 ev_loop_fork (EV_A); 3439 ev_loop_fork (EV_A);
2986 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3440 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2987 } 3441 }
2988 3442
3002{ 3456{
3003 if (expect_false (ev_is_active (w))) 3457 if (expect_false (ev_is_active (w)))
3004 return; 3458 return;
3005 3459
3006 { 3460 {
3007 struct ev_loop *loop = w->other; 3461 EV_P = w->other;
3008 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3462 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3009 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3463 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3010 } 3464 }
3011 3465
3012 EV_FREQUENT_CHECK; 3466 EV_FREQUENT_CHECK;
3039 3493
3040 ev_io_stop (EV_A_ &w->io); 3494 ev_io_stop (EV_A_ &w->io);
3041 ev_prepare_stop (EV_A_ &w->prepare); 3495 ev_prepare_stop (EV_A_ &w->prepare);
3042 ev_fork_stop (EV_A_ &w->fork); 3496 ev_fork_stop (EV_A_ &w->fork);
3043 3497
3498 ev_stop (EV_A_ (W)w);
3499
3044 EV_FREQUENT_CHECK; 3500 EV_FREQUENT_CHECK;
3045} 3501}
3046#endif 3502#endif
3047 3503
3048#if EV_FORK_ENABLE 3504#if EV_FORK_ENABLE
3124 3580
3125void 3581void
3126ev_async_send (EV_P_ ev_async *w) 3582ev_async_send (EV_P_ ev_async *w)
3127{ 3583{
3128 w->sent = 1; 3584 w->sent = 1;
3129 evpipe_write (EV_A_ &gotasync); 3585 evpipe_write (EV_A_ &async_pending);
3130} 3586}
3131#endif 3587#endif
3132 3588
3133/*****************************************************************************/ 3589/*****************************************************************************/
3134 3590
3198 } 3654 }
3199} 3655}
3200 3656
3201/*****************************************************************************/ 3657/*****************************************************************************/
3202 3658
3203#if 0 3659#if EV_WALK_ENABLE
3204void 3660void
3205ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3661ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3206{ 3662{
3207 int i, j; 3663 int i, j;
3208 ev_watcher_list *wl, *wn; 3664 ev_watcher_list *wl, *wn;
3224#if EV_USE_INOTIFY 3680#if EV_USE_INOTIFY
3225 if (ev_cb ((ev_io *)wl) == infy_cb) 3681 if (ev_cb ((ev_io *)wl) == infy_cb)
3226 ; 3682 ;
3227 else 3683 else
3228#endif 3684#endif
3229 if ((ev_io *)wl != &pipeev) 3685 if ((ev_io *)wl != &pipe_w)
3230 if (types & EV_IO) 3686 if (types & EV_IO)
3231 cb (EV_A_ EV_IO, wl); 3687 cb (EV_A_ EV_IO, wl);
3232 3688
3233 wl = wn; 3689 wl = wn;
3234 } 3690 }
3283 if (types & EV_CHECK) 3739 if (types & EV_CHECK)
3284 for (i = checkcnt; i--; ) 3740 for (i = checkcnt; i--; )
3285 cb (EV_A_ EV_CHECK, checks [i]); 3741 cb (EV_A_ EV_CHECK, checks [i]);
3286 3742
3287 if (types & EV_SIGNAL) 3743 if (types & EV_SIGNAL)
3288 for (i = 0; i < signalmax; ++i) 3744 for (i = 0; i < EV_NSIG - 1; ++i)
3289 for (wl = signals [i].head; wl; ) 3745 for (wl = signals [i].head; wl; )
3290 { 3746 {
3291 wn = wl->next; 3747 wn = wl->next;
3292 cb (EV_A_ EV_SIGNAL, wl); 3748 cb (EV_A_ EV_SIGNAL, wl);
3293 wl = wn; 3749 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines