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

Comparing libev/ev.c (file contents):
Revision 1.273 by root, Mon Nov 3 14:27:06 2008 UTC vs.
Revision 1.315 by root, Wed Aug 26 17:46:22 2009 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 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 *
… …
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
64# endif
65
52# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
55# endif 69# endif
56# ifndef EV_USE_REALTIME 70# ifndef EV_USE_REALTIME
57# define EV_USE_REALTIME 1 71# define EV_USE_REALTIME 0
58# endif 72# endif
59# else 73# else
60# ifndef EV_USE_MONOTONIC 74# ifndef EV_USE_MONOTONIC
61# define EV_USE_MONOTONIC 0 75# define EV_USE_MONOTONIC 0
62# endif 76# endif
… …
116# ifndef EV_USE_INOTIFY 130# ifndef EV_USE_INOTIFY
117# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
118# define EV_USE_INOTIFY 1 132# define EV_USE_INOTIFY 1
119# else 133# else
120# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif
136# endif
137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
121# endif 143# endif
122# endif 144# endif
123 145
124# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD 147# if HAVE_EVENTFD
… …
164# endif 186# endif
165#endif 187#endif
166 188
167/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
168 190
191/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG)
193/* use what's provided */
194#elif defined (NSIG)
195# define EV_NSIG (NSIG)
196#elif defined(_NSIG)
197# define EV_NSIG (_NSIG)
198#elif defined (SIGMAX)
199# define EV_NSIG (SIGMAX+1)
200#elif defined (SIG_MAX)
201# define EV_NSIG (SIG_MAX+1)
202#elif defined (_SIG_MAX)
203# define EV_NSIG (_SIG_MAX+1)
204#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else
213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 65
216#endif
217
218#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2
220# define EV_USE_CLOCK_SYSCALL 1
221# else
222# define EV_USE_CLOCK_SYSCALL 0
223# endif
224#endif
225
169#ifndef EV_USE_MONOTONIC 226#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 227# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 228# define EV_USE_MONOTONIC 1
172# else 229# else
173# define EV_USE_MONOTONIC 0 230# define EV_USE_MONOTONIC 0
174# endif 231# endif
175#endif 232#endif
176 233
177#ifndef EV_USE_REALTIME 234#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 236#endif
180 237
181#ifndef EV_USE_NANOSLEEP 238#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 239# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 240# define EV_USE_NANOSLEEP 1
… …
244# else 301# else
245# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
246# endif 303# endif
247#endif 304#endif
248 305
306#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1
309# else
310# define EV_USE_SIGNALFD 0
311# endif
312#endif
313
249#if 0 /* debugging */ 314#if 0 /* debugging */
250# define EV_VERIFY 3 315# define EV_VERIFY 3
251# define EV_USE_4HEAP 1 316# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1 317# define EV_HEAP_CACHE_AT 1
253#endif 318#endif
… …
260# define EV_USE_4HEAP !EV_MINIMAL 325# define EV_USE_4HEAP !EV_MINIMAL
261#endif 326#endif
262 327
263#ifndef EV_HEAP_CACHE_AT 328#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL 329# define EV_HEAP_CACHE_AT !EV_MINIMAL
330#endif
331
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
333/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL
335# include <syscall.h>
336# ifdef SYS_clock_gettime
337# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
338# undef EV_USE_MONOTONIC
339# define EV_USE_MONOTONIC 1
340# else
341# undef EV_USE_CLOCK_SYSCALL
342# define EV_USE_CLOCK_SYSCALL 0
343# endif
265#endif 344#endif
266 345
267/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 346/* this block fixes any misconfiguration where we know we run into trouble otherwise */
268 347
269#ifndef CLOCK_MONOTONIC 348#ifndef CLOCK_MONOTONIC
… …
303#endif 382#endif
304 383
305#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
306/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 385/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
307# include <stdint.h> 386# include <stdint.h>
387# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK
389# endif
390# ifndef EFD_CLOEXEC
391# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC
393# else
394# define EFD_CLOEXEC 02000000
395# endif
396# endif
308# ifdef __cplusplus 397# ifdef __cplusplus
309extern "C" { 398extern "C" {
310# endif 399# endif
311int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
312# ifdef __cplusplus 401# ifdef __cplusplus
313} 402}
314# endif 403# endif
315#endif 404#endif
405
406#if EV_USE_SIGNALFD
407/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
408# include <stdint.h>
409# ifndef SFD_NONBLOCK
410# define SFD_NONBLOCK O_NONBLOCK
411# endif
412# ifndef SFD_CLOEXEC
413# ifdef O_CLOEXEC
414# define SFD_CLOEXEC O_CLOEXEC
415# else
416# define SFD_CLOEXEC 02000000
417# endif
418# endif
419# ifdef __cplusplus
420extern "C" {
421# endif
422int signalfd (int fd, const sigset_t *mask, int flags);
423
424struct signalfd_siginfo
425{
426 uint32_t ssi_signo;
427 char pad[128 - sizeof (uint32_t)];
428};
429# ifdef __cplusplus
430}
431# endif
432#endif
433
316 434
317/**/ 435/**/
318 436
319#if EV_VERIFY >= 3 437#if EV_VERIFY >= 3
320# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
355# define inline_speed static noinline 473# define inline_speed static noinline
356#else 474#else
357# define inline_speed static inline 475# define inline_speed static inline
358#endif 476#endif
359 477
360#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 478#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
479
480#if EV_MINPRI == EV_MAXPRI
481# define ABSPRI(w) (((W)w), 0)
482#else
361#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 483# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
484#endif
362 485
363#define EMPTY /* required for microsofts broken pseudo-c compiler */ 486#define EMPTY /* required for microsofts broken pseudo-c compiler */
364#define EMPTY2(a,b) /* used to suppress some warnings */ 487#define EMPTY2(a,b) /* used to suppress some warnings */
365 488
366typedef ev_watcher *W; 489typedef ev_watcher *W;
… …
368typedef ev_watcher_time *WT; 491typedef ev_watcher_time *WT;
369 492
370#define ev_active(w) ((W)(w))->active 493#define ev_active(w) ((W)(w))->active
371#define ev_at(w) ((WT)(w))->at 494#define ev_at(w) ((WT)(w))->at
372 495
373#if EV_USE_MONOTONIC 496#if EV_USE_REALTIME
374/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 497/* sig_atomic_t is used to avoid per-thread variables or locking but still */
375/* giving it a reasonably high chance of working on typical architetcures */ 498/* giving it a reasonably high chance of working on typical architetcures */
499static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
500#endif
501
502#if EV_USE_MONOTONIC
376static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
504#endif
505
506#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif
509#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
511#endif
512#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd)
377#endif 514#endif
378 515
379#ifdef _WIN32 516#ifdef _WIN32
380# include "ev_win32.c" 517# include "ev_win32.c"
381#endif 518#endif
… …
445#define ev_malloc(size) ev_realloc (0, (size)) 582#define ev_malloc(size) ev_realloc (0, (size))
446#define ev_free(ptr) ev_realloc ((ptr), 0) 583#define ev_free(ptr) ev_realloc ((ptr), 0)
447 584
448/*****************************************************************************/ 585/*****************************************************************************/
449 586
587/* set in reify when reification needed */
588#define EV_ANFD_REIFY 1
589
590/* file descriptor info structure */
450typedef struct 591typedef struct
451{ 592{
452 WL head; 593 WL head;
453 unsigned char events; 594 unsigned char events; /* the events watched for */
454 unsigned char reify; 595 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
455 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 596 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
456 unsigned char unused; 597 unsigned char unused;
457#if EV_USE_EPOLL 598#if EV_USE_EPOLL
458 unsigned int egen; /* generation counter to counter epoll bugs */ 599 unsigned int egen; /* generation counter to counter epoll bugs */
459#endif 600#endif
460#if EV_SELECT_IS_WINSOCKET 601#if EV_SELECT_IS_WINSOCKET
461 SOCKET handle; 602 SOCKET handle;
462#endif 603#endif
463} ANFD; 604} ANFD;
464 605
606/* stores the pending event set for a given watcher */
465typedef struct 607typedef struct
466{ 608{
467 W w; 609 W w;
468 int events; 610 int events; /* the pending event set for the given watcher */
469} ANPENDING; 611} ANPENDING;
470 612
471#if EV_USE_INOTIFY 613#if EV_USE_INOTIFY
472/* hash table entry per inotify-id */ 614/* hash table entry per inotify-id */
473typedef struct 615typedef struct
… …
476} ANFS; 618} ANFS;
477#endif 619#endif
478 620
479/* Heap Entry */ 621/* Heap Entry */
480#if EV_HEAP_CACHE_AT 622#if EV_HEAP_CACHE_AT
623 /* a heap element */
481 typedef struct { 624 typedef struct {
482 ev_tstamp at; 625 ev_tstamp at;
483 WT w; 626 WT w;
484 } ANHE; 627 } ANHE;
485 628
486 #define ANHE_w(he) (he).w /* access watcher, read-write */ 629 #define ANHE_w(he) (he).w /* access watcher, read-write */
487 #define ANHE_at(he) (he).at /* access cached at, read-only */ 630 #define ANHE_at(he) (he).at /* access cached at, read-only */
488 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 631 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
489#else 632#else
633 /* a heap element */
490 typedef WT ANHE; 634 typedef WT ANHE;
491 635
492 #define ANHE_w(he) (he) 636 #define ANHE_w(he) (he)
493 #define ANHE_at(he) (he)->at 637 #define ANHE_at(he) (he)->at
494 #define ANHE_at_cache(he) 638 #define ANHE_at_cache(he)
… …
518 662
519 static int ev_default_loop_ptr; 663 static int ev_default_loop_ptr;
520 664
521#endif 665#endif
522 666
667#if EV_MINIMAL < 2
668# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
669# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
670# define EV_INVOKE_PENDING invoke_cb (EV_A)
671#else
672# define EV_RELEASE_CB (void)0
673# define EV_ACQUIRE_CB (void)0
674# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
675#endif
676
677#define EVUNLOOP_RECURSE 0x80
678
523/*****************************************************************************/ 679/*****************************************************************************/
524 680
681#ifndef EV_HAVE_EV_TIME
525ev_tstamp 682ev_tstamp
526ev_time (void) 683ev_time (void)
527{ 684{
528#if EV_USE_REALTIME 685#if EV_USE_REALTIME
686 if (expect_true (have_realtime))
687 {
529 struct timespec ts; 688 struct timespec ts;
530 clock_gettime (CLOCK_REALTIME, &ts); 689 clock_gettime (CLOCK_REALTIME, &ts);
531 return ts.tv_sec + ts.tv_nsec * 1e-9; 690 return ts.tv_sec + ts.tv_nsec * 1e-9;
532#else 691 }
692#endif
693
533 struct timeval tv; 694 struct timeval tv;
534 gettimeofday (&tv, 0); 695 gettimeofday (&tv, 0);
535 return tv.tv_sec + tv.tv_usec * 1e-6; 696 return tv.tv_sec + tv.tv_usec * 1e-6;
536#endif
537} 697}
698#endif
538 699
539ev_tstamp inline_size 700inline_size ev_tstamp
540get_clock (void) 701get_clock (void)
541{ 702{
542#if EV_USE_MONOTONIC 703#if EV_USE_MONOTONIC
543 if (expect_true (have_monotonic)) 704 if (expect_true (have_monotonic))
544 { 705 {
… …
578 739
579 tv.tv_sec = (time_t)delay; 740 tv.tv_sec = (time_t)delay;
580 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 741 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
581 742
582 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 743 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
583 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 744 /* something not guaranteed by newer posix versions, but guaranteed */
584 /* by older ones */ 745 /* by older ones */
585 select (0, 0, 0, 0, &tv); 746 select (0, 0, 0, 0, &tv);
586#endif 747#endif
587 } 748 }
588} 749}
589 750
590/*****************************************************************************/ 751/*****************************************************************************/
591 752
592#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 753#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
593 754
594int inline_size 755/* find a suitable new size for the given array, */
756/* hopefully by rounding to a ncie-to-malloc size */
757inline_size int
595array_nextsize (int elem, int cur, int cnt) 758array_nextsize (int elem, int cur, int cnt)
596{ 759{
597 int ncur = cur + 1; 760 int ncur = cur + 1;
598 761
599 do 762 do
… …
640 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 803 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
641 } 804 }
642#endif 805#endif
643 806
644#define array_free(stem, idx) \ 807#define array_free(stem, idx) \
645 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 808 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
646 809
647/*****************************************************************************/ 810/*****************************************************************************/
811
812/* dummy callback for pending events */
813static void noinline
814pendingcb (EV_P_ ev_prepare *w, int revents)
815{
816}
648 817
649void noinline 818void noinline
650ev_feed_event (EV_P_ void *w, int revents) 819ev_feed_event (EV_P_ void *w, int revents)
651{ 820{
652 W w_ = (W)w; 821 W w_ = (W)w;
… …
661 pendings [pri][w_->pending - 1].w = w_; 830 pendings [pri][w_->pending - 1].w = w_;
662 pendings [pri][w_->pending - 1].events = revents; 831 pendings [pri][w_->pending - 1].events = revents;
663 } 832 }
664} 833}
665 834
666void inline_speed 835inline_speed void
836feed_reverse (EV_P_ W w)
837{
838 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
839 rfeeds [rfeedcnt++] = w;
840}
841
842inline_size void
843feed_reverse_done (EV_P_ int revents)
844{
845 do
846 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
847 while (rfeedcnt);
848}
849
850inline_speed void
667queue_events (EV_P_ W *events, int eventcnt, int type) 851queue_events (EV_P_ W *events, int eventcnt, int type)
668{ 852{
669 int i; 853 int i;
670 854
671 for (i = 0; i < eventcnt; ++i) 855 for (i = 0; i < eventcnt; ++i)
672 ev_feed_event (EV_A_ events [i], type); 856 ev_feed_event (EV_A_ events [i], type);
673} 857}
674 858
675/*****************************************************************************/ 859/*****************************************************************************/
676 860
677void inline_speed 861inline_speed void
678fd_event (EV_P_ int fd, int revents) 862fd_event_nc (EV_P_ int fd, int revents)
679{ 863{
680 ANFD *anfd = anfds + fd; 864 ANFD *anfd = anfds + fd;
681 ev_io *w; 865 ev_io *w;
682 866
683 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 867 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
687 if (ev) 871 if (ev)
688 ev_feed_event (EV_A_ (W)w, ev); 872 ev_feed_event (EV_A_ (W)w, ev);
689 } 873 }
690} 874}
691 875
876/* do not submit kernel events for fds that have reify set */
877/* because that means they changed while we were polling for new events */
878inline_speed void
879fd_event (EV_P_ int fd, int revents)
880{
881 ANFD *anfd = anfds + fd;
882
883 if (expect_true (!anfd->reify))
884 fd_event_nc (EV_A_ fd, revents);
885}
886
692void 887void
693ev_feed_fd_event (EV_P_ int fd, int revents) 888ev_feed_fd_event (EV_P_ int fd, int revents)
694{ 889{
695 if (fd >= 0 && fd < anfdmax) 890 if (fd >= 0 && fd < anfdmax)
696 fd_event (EV_A_ fd, revents); 891 fd_event_nc (EV_A_ fd, revents);
697} 892}
698 893
699void inline_size 894/* make sure the external fd watch events are in-sync */
895/* with the kernel/libev internal state */
896inline_size void
700fd_reify (EV_P) 897fd_reify (EV_P)
701{ 898{
702 int i; 899 int i;
703 900
704 for (i = 0; i < fdchangecnt; ++i) 901 for (i = 0; i < fdchangecnt; ++i)
… …
714 911
715#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
716 if (events) 913 if (events)
717 { 914 {
718 unsigned long arg; 915 unsigned long arg;
719 #ifdef EV_FD_TO_WIN32_HANDLE
720 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
721 #else
722 anfd->handle = _get_osfhandle (fd);
723 #endif
724 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 917 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
725 } 918 }
726#endif 919#endif
727 920
728 { 921 {
729 unsigned char o_events = anfd->events; 922 unsigned char o_events = anfd->events;
730 unsigned char o_reify = anfd->reify; 923 unsigned char o_reify = anfd->reify;
731 924
732 anfd->reify = 0; 925 anfd->reify = 0;
733 anfd->events = events; 926 anfd->events = events;
734 927
735 if (o_events != events || o_reify & EV_IOFDSET) 928 if (o_events != events || o_reify & EV__IOFDSET)
736 backend_modify (EV_A_ fd, o_events, events); 929 backend_modify (EV_A_ fd, o_events, events);
737 } 930 }
738 } 931 }
739 932
740 fdchangecnt = 0; 933 fdchangecnt = 0;
741} 934}
742 935
743void inline_size 936/* something about the given fd changed */
937inline_size void
744fd_change (EV_P_ int fd, int flags) 938fd_change (EV_P_ int fd, int flags)
745{ 939{
746 unsigned char reify = anfds [fd].reify; 940 unsigned char reify = anfds [fd].reify;
747 anfds [fd].reify |= flags; 941 anfds [fd].reify |= flags;
748 942
… …
752 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 946 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
753 fdchanges [fdchangecnt - 1] = fd; 947 fdchanges [fdchangecnt - 1] = fd;
754 } 948 }
755} 949}
756 950
757void inline_speed 951/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
952inline_speed void
758fd_kill (EV_P_ int fd) 953fd_kill (EV_P_ int fd)
759{ 954{
760 ev_io *w; 955 ev_io *w;
761 956
762 while ((w = (ev_io *)anfds [fd].head)) 957 while ((w = (ev_io *)anfds [fd].head))
… …
764 ev_io_stop (EV_A_ w); 959 ev_io_stop (EV_A_ w);
765 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 960 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
766 } 961 }
767} 962}
768 963
769int inline_size 964/* check whether the given fd is atcually valid, for error recovery */
965inline_size int
770fd_valid (int fd) 966fd_valid (int fd)
771{ 967{
772#ifdef _WIN32 968#ifdef _WIN32
773 return _get_osfhandle (fd) != -1; 969 return _get_osfhandle (fd) != -1;
774#else 970#else
… …
796 992
797 for (fd = anfdmax; fd--; ) 993 for (fd = anfdmax; fd--; )
798 if (anfds [fd].events) 994 if (anfds [fd].events)
799 { 995 {
800 fd_kill (EV_A_ fd); 996 fd_kill (EV_A_ fd);
801 return; 997 break;
802 } 998 }
803} 999}
804 1000
805/* usually called after fork if backend needs to re-arm all fds from scratch */ 1001/* usually called after fork if backend needs to re-arm all fds from scratch */
806static void noinline 1002static void noinline
… …
811 for (fd = 0; fd < anfdmax; ++fd) 1007 for (fd = 0; fd < anfdmax; ++fd)
812 if (anfds [fd].events) 1008 if (anfds [fd].events)
813 { 1009 {
814 anfds [fd].events = 0; 1010 anfds [fd].events = 0;
815 anfds [fd].emask = 0; 1011 anfds [fd].emask = 0;
816 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
817 } 1013 }
818} 1014}
819 1015
820/*****************************************************************************/ 1016/*****************************************************************************/
821 1017
… …
837#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1033#define HEAP0 (DHEAP - 1) /* index of first element in heap */
838#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1034#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
839#define UPHEAP_DONE(p,k) ((p) == (k)) 1035#define UPHEAP_DONE(p,k) ((p) == (k))
840 1036
841/* away from the root */ 1037/* away from the root */
842void inline_speed 1038inline_speed void
843downheap (ANHE *heap, int N, int k) 1039downheap (ANHE *heap, int N, int k)
844{ 1040{
845 ANHE he = heap [k]; 1041 ANHE he = heap [k];
846 ANHE *E = heap + N + HEAP0; 1042 ANHE *E = heap + N + HEAP0;
847 1043
… …
887#define HEAP0 1 1083#define HEAP0 1
888#define HPARENT(k) ((k) >> 1) 1084#define HPARENT(k) ((k) >> 1)
889#define UPHEAP_DONE(p,k) (!(p)) 1085#define UPHEAP_DONE(p,k) (!(p))
890 1086
891/* away from the root */ 1087/* away from the root */
892void inline_speed 1088inline_speed void
893downheap (ANHE *heap, int N, int k) 1089downheap (ANHE *heap, int N, int k)
894{ 1090{
895 ANHE he = heap [k]; 1091 ANHE he = heap [k];
896 1092
897 for (;;) 1093 for (;;)
898 { 1094 {
899 int c = k << 1; 1095 int c = k << 1;
900 1096
901 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
902 break; 1098 break;
903 1099
904 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1100 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
905 ? 1 : 0; 1101 ? 1 : 0;
906 1102
… …
917 ev_active (ANHE_w (he)) = k; 1113 ev_active (ANHE_w (he)) = k;
918} 1114}
919#endif 1115#endif
920 1116
921/* towards the root */ 1117/* towards the root */
922void inline_speed 1118inline_speed void
923upheap (ANHE *heap, int k) 1119upheap (ANHE *heap, int k)
924{ 1120{
925 ANHE he = heap [k]; 1121 ANHE he = heap [k];
926 1122
927 for (;;) 1123 for (;;)
… …
938 1134
939 heap [k] = he; 1135 heap [k] = he;
940 ev_active (ANHE_w (he)) = k; 1136 ev_active (ANHE_w (he)) = k;
941} 1137}
942 1138
943void inline_size 1139/* move an element suitably so it is in a correct place */
1140inline_size void
944adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
945{ 1142{
946 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1143 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
947 upheap (heap, k); 1144 upheap (heap, k);
948 else 1145 else
949 downheap (heap, N, k); 1146 downheap (heap, N, k);
950} 1147}
951 1148
952/* rebuild the heap: this function is used only once and executed rarely */ 1149/* rebuild the heap: this function is used only once and executed rarely */
953void inline_size 1150inline_size void
954reheap (ANHE *heap, int N) 1151reheap (ANHE *heap, int N)
955{ 1152{
956 int i; 1153 int i;
957 1154
958 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1155 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
961 upheap (heap, i + HEAP0); 1158 upheap (heap, i + HEAP0);
962} 1159}
963 1160
964/*****************************************************************************/ 1161/*****************************************************************************/
965 1162
1163/* associate signal watchers to a signal signal */
966typedef struct 1164typedef struct
967{ 1165{
1166 EV_ATOMIC_T pending;
1167#if EV_MULTIPLICITY
1168 EV_P;
1169#endif
968 WL head; 1170 WL head;
969 EV_ATOMIC_T gotsig;
970} ANSIG; 1171} ANSIG;
971 1172
972static ANSIG *signals; 1173static ANSIG signals [EV_NSIG - 1];
973static int signalmax;
974
975static EV_ATOMIC_T gotsig;
976 1174
977/*****************************************************************************/ 1175/*****************************************************************************/
978 1176
979void inline_speed 1177/* used to prepare libev internal fd's */
1178/* this is not fork-safe */
1179inline_speed void
980fd_intern (int fd) 1180fd_intern (int fd)
981{ 1181{
982#ifdef _WIN32 1182#ifdef _WIN32
983 unsigned long arg = 1; 1183 unsigned long arg = 1;
984 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1184 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
989} 1189}
990 1190
991static void noinline 1191static void noinline
992evpipe_init (EV_P) 1192evpipe_init (EV_P)
993{ 1193{
994 if (!ev_is_active (&pipeev)) 1194 if (!ev_is_active (&pipe_w))
995 { 1195 {
996#if EV_USE_EVENTFD 1196#if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL)
997 if ((evfd = eventfd (0, 0)) >= 0) 1199 evfd = eventfd (0, 0);
1200
1201 if (evfd >= 0)
998 { 1202 {
999 evpipe [0] = -1; 1203 evpipe [0] = -1;
1000 fd_intern (evfd); 1204 fd_intern (evfd); /* doing it twice doesn't hurt */
1001 ev_io_set (&pipeev, evfd, EV_READ); 1205 ev_io_set (&pipe_w, evfd, EV_READ);
1002 } 1206 }
1003 else 1207 else
1004#endif 1208#endif
1005 { 1209 {
1006 while (pipe (evpipe)) 1210 while (pipe (evpipe))
1007 ev_syserr ("(libev) error creating signal/async pipe"); 1211 ev_syserr ("(libev) error creating signal/async pipe");
1008 1212
1009 fd_intern (evpipe [0]); 1213 fd_intern (evpipe [0]);
1010 fd_intern (evpipe [1]); 1214 fd_intern (evpipe [1]);
1011 ev_io_set (&pipeev, evpipe [0], EV_READ); 1215 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1012 } 1216 }
1013 1217
1014 ev_io_start (EV_A_ &pipeev); 1218 ev_io_start (EV_A_ &pipe_w);
1015 ev_unref (EV_A); /* watcher should not keep loop alive */ 1219 ev_unref (EV_A); /* watcher should not keep loop alive */
1016 } 1220 }
1017} 1221}
1018 1222
1019void inline_size 1223inline_size void
1020evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1224evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1021{ 1225{
1022 if (!*flag) 1226 if (!*flag)
1023 { 1227 {
1024 int old_errno = errno; /* save errno because write might clobber it */ 1228 int old_errno = errno; /* save errno because write might clobber it */
… …
1037 1241
1038 errno = old_errno; 1242 errno = old_errno;
1039 } 1243 }
1040} 1244}
1041 1245
1246/* called whenever the libev signal pipe */
1247/* got some events (signal, async) */
1042static void 1248static void
1043pipecb (EV_P_ ev_io *iow, int revents) 1249pipecb (EV_P_ ev_io *iow, int revents)
1044{ 1250{
1251 int i;
1252
1045#if EV_USE_EVENTFD 1253#if EV_USE_EVENTFD
1046 if (evfd >= 0) 1254 if (evfd >= 0)
1047 { 1255 {
1048 uint64_t counter; 1256 uint64_t counter;
1049 read (evfd, &counter, sizeof (uint64_t)); 1257 read (evfd, &counter, sizeof (uint64_t));
… …
1053 { 1261 {
1054 char dummy; 1262 char dummy;
1055 read (evpipe [0], &dummy, 1); 1263 read (evpipe [0], &dummy, 1);
1056 } 1264 }
1057 1265
1058 if (gotsig && ev_is_default_loop (EV_A)) 1266 if (sig_pending)
1059 { 1267 {
1060 int signum; 1268 sig_pending = 0;
1061 gotsig = 0;
1062 1269
1063 for (signum = signalmax; signum--; ) 1270 for (i = EV_NSIG - 1; i--; )
1064 if (signals [signum].gotsig) 1271 if (expect_false (signals [i].pending))
1065 ev_feed_signal_event (EV_A_ signum + 1); 1272 ev_feed_signal_event (EV_A_ i + 1);
1066 } 1273 }
1067 1274
1068#if EV_ASYNC_ENABLE 1275#if EV_ASYNC_ENABLE
1069 if (gotasync) 1276 if (async_pending)
1070 { 1277 {
1071 int i; 1278 async_pending = 0;
1072 gotasync = 0;
1073 1279
1074 for (i = asynccnt; i--; ) 1280 for (i = asynccnt; i--; )
1075 if (asyncs [i]->sent) 1281 if (asyncs [i]->sent)
1076 { 1282 {
1077 asyncs [i]->sent = 0; 1283 asyncs [i]->sent = 0;
… …
1085 1291
1086static void 1292static void
1087ev_sighandler (int signum) 1293ev_sighandler (int signum)
1088{ 1294{
1089#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1090 struct ev_loop *loop = &default_loop_struct; 1296 EV_P = signals [signum - 1].loop;
1091#endif 1297#endif
1092 1298
1093#if _WIN32 1299#if _WIN32
1094 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1095#endif 1301#endif
1096 1302
1097 signals [signum - 1].gotsig = 1; 1303 signals [signum - 1].pending = 1;
1098 evpipe_write (EV_A_ &gotsig); 1304 evpipe_write (EV_A_ &sig_pending);
1099} 1305}
1100 1306
1101void noinline 1307void noinline
1102ev_feed_signal_event (EV_P_ int signum) 1308ev_feed_signal_event (EV_P_ int signum)
1103{ 1309{
1104 WL w; 1310 WL w;
1105 1311
1312 if (expect_false (signum <= 0 || signum > EV_NSIG))
1313 return;
1314
1315 --signum;
1316
1106#if EV_MULTIPLICITY 1317#if EV_MULTIPLICITY
1107 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1318 /* it is permissible to try to feed a signal to the wrong loop */
1108#endif 1319 /* or, likely more useful, feeding a signal nobody is waiting for */
1109 1320
1110 --signum; 1321 if (expect_false (signals [signum].loop != EV_A))
1111
1112 if (signum < 0 || signum >= signalmax)
1113 return; 1322 return;
1323#endif
1114 1324
1115 signals [signum].gotsig = 0; 1325 signals [signum].pending = 0;
1116 1326
1117 for (w = signals [signum].head; w; w = w->next) 1327 for (w = signals [signum].head; w; w = w->next)
1118 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1328 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1119} 1329}
1120 1330
1331#if EV_USE_SIGNALFD
1332static void
1333sigfdcb (EV_P_ ev_io *iow, int revents)
1334{
1335 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1336
1337 for (;;)
1338 {
1339 ssize_t res = read (sigfd, si, sizeof (si));
1340
1341 /* not ISO-C, as res might be -1, but works with SuS */
1342 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1343 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1344
1345 if (res < (ssize_t)sizeof (si))
1346 break;
1347 }
1348}
1349#endif
1350
1121/*****************************************************************************/ 1351/*****************************************************************************/
1122 1352
1123static WL childs [EV_PID_HASHSIZE]; 1353static WL childs [EV_PID_HASHSIZE];
1124 1354
1125#ifndef _WIN32 1355#ifndef _WIN32
… …
1128 1358
1129#ifndef WIFCONTINUED 1359#ifndef WIFCONTINUED
1130# define WIFCONTINUED(status) 0 1360# define WIFCONTINUED(status) 0
1131#endif 1361#endif
1132 1362
1133void inline_speed 1363/* handle a single child status event */
1364inline_speed void
1134child_reap (EV_P_ int chain, int pid, int status) 1365child_reap (EV_P_ int chain, int pid, int status)
1135{ 1366{
1136 ev_child *w; 1367 ev_child *w;
1137 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1368 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1138 1369
… …
1151 1382
1152#ifndef WCONTINUED 1383#ifndef WCONTINUED
1153# define WCONTINUED 0 1384# define WCONTINUED 0
1154#endif 1385#endif
1155 1386
1387/* called on sigchld etc., calls waitpid */
1156static void 1388static void
1157childcb (EV_P_ ev_signal *sw, int revents) 1389childcb (EV_P_ ev_signal *sw, int revents)
1158{ 1390{
1159 int pid, status; 1391 int pid, status;
1160 1392
… …
1241 /* kqueue is borked on everything but netbsd apparently */ 1473 /* kqueue is borked on everything but netbsd apparently */
1242 /* it usually doesn't work correctly on anything but sockets and pipes */ 1474 /* it usually doesn't work correctly on anything but sockets and pipes */
1243 flags &= ~EVBACKEND_KQUEUE; 1475 flags &= ~EVBACKEND_KQUEUE;
1244#endif 1476#endif
1245#ifdef __APPLE__ 1477#ifdef __APPLE__
1246 // flags &= ~EVBACKEND_KQUEUE; for documentation 1478 /* only select works correctly on that "unix-certified" platform */
1247 flags &= ~EVBACKEND_POLL; 1479 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1480 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1248#endif 1481#endif
1249 1482
1250 return flags; 1483 return flags;
1251} 1484}
1252 1485
… …
1266ev_backend (EV_P) 1499ev_backend (EV_P)
1267{ 1500{
1268 return backend; 1501 return backend;
1269} 1502}
1270 1503
1504#if EV_MINIMAL < 2
1271unsigned int 1505unsigned int
1272ev_loop_count (EV_P) 1506ev_loop_count (EV_P)
1273{ 1507{
1274 return loop_count; 1508 return loop_count;
1275} 1509}
1276 1510
1511unsigned int
1512ev_loop_depth (EV_P)
1513{
1514 return loop_depth;
1515}
1516
1277void 1517void
1278ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1518ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1279{ 1519{
1280 io_blocktime = interval; 1520 io_blocktime = interval;
1281} 1521}
… …
1284ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1285{ 1525{
1286 timeout_blocktime = interval; 1526 timeout_blocktime = interval;
1287} 1527}
1288 1528
1529void
1530ev_set_userdata (EV_P_ void *data)
1531{
1532 userdata = data;
1533}
1534
1535void *
1536ev_userdata (EV_P)
1537{
1538 return userdata;
1539}
1540
1541void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1542{
1543 invoke_cb = invoke_pending_cb;
1544}
1545
1546void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1547{
1548 release_cb = release;
1549 acquire_cb = acquire;
1550}
1551#endif
1552
1553/* initialise a loop structure, must be zero-initialised */
1289static void noinline 1554static void noinline
1290loop_init (EV_P_ unsigned int flags) 1555loop_init (EV_P_ unsigned int flags)
1291{ 1556{
1292 if (!backend) 1557 if (!backend)
1293 { 1558 {
1559#if EV_USE_REALTIME
1560 if (!have_realtime)
1561 {
1562 struct timespec ts;
1563
1564 if (!clock_gettime (CLOCK_REALTIME, &ts))
1565 have_realtime = 1;
1566 }
1567#endif
1568
1294#if EV_USE_MONOTONIC 1569#if EV_USE_MONOTONIC
1570 if (!have_monotonic)
1295 { 1571 {
1296 struct timespec ts; 1572 struct timespec ts;
1573
1297 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1574 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1298 have_monotonic = 1; 1575 have_monotonic = 1;
1299 } 1576 }
1300#endif 1577#endif
1578
1579 /* pid check not overridable via env */
1580#ifndef _WIN32
1581 if (flags & EVFLAG_FORKCHECK)
1582 curpid = getpid ();
1583#endif
1584
1585 if (!(flags & EVFLAG_NOENV)
1586 && !enable_secure ()
1587 && getenv ("LIBEV_FLAGS"))
1588 flags = atoi (getenv ("LIBEV_FLAGS"));
1301 1589
1302 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1303 mn_now = get_clock (); 1591 mn_now = get_clock ();
1304 now_floor = mn_now; 1592 now_floor = mn_now;
1305 rtmn_diff = ev_rt_now - mn_now; 1593 rtmn_diff = ev_rt_now - mn_now;
1594#if EV_MINIMAL < 2
1595 invoke_cb = ev_invoke_pending;
1596#endif
1306 1597
1307 io_blocktime = 0.; 1598 io_blocktime = 0.;
1308 timeout_blocktime = 0.; 1599 timeout_blocktime = 0.;
1309 backend = 0; 1600 backend = 0;
1310 backend_fd = -1; 1601 backend_fd = -1;
1311 gotasync = 0; 1602 sig_pending = 0;
1603#if EV_ASYNC_ENABLE
1604 async_pending = 0;
1605#endif
1312#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1313 fs_fd = -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1314#endif 1608#endif
1315 1609#if EV_USE_SIGNALFD
1316 /* pid check not overridable via env */ 1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1317#ifndef _WIN32
1318 if (flags & EVFLAG_FORKCHECK)
1319 curpid = getpid ();
1320#endif 1611#endif
1321
1322 if (!(flags & EVFLAG_NOENV)
1323 && !enable_secure ()
1324 && getenv ("LIBEV_FLAGS"))
1325 flags = atoi (getenv ("LIBEV_FLAGS"));
1326 1612
1327 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1328 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1329 1615
1330#if EV_USE_PORT 1616#if EV_USE_PORT
… …
1341#endif 1627#endif
1342#if EV_USE_SELECT 1628#if EV_USE_SELECT
1343 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1629 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1344#endif 1630#endif
1345 1631
1632 ev_prepare_init (&pending_w, pendingcb);
1633
1346 ev_init (&pipeev, pipecb); 1634 ev_init (&pipe_w, pipecb);
1347 ev_set_priority (&pipeev, EV_MAXPRI); 1635 ev_set_priority (&pipe_w, EV_MAXPRI);
1348 } 1636 }
1349} 1637}
1350 1638
1639/* free up a loop structure */
1351static void noinline 1640static void noinline
1352loop_destroy (EV_P) 1641loop_destroy (EV_P)
1353{ 1642{
1354 int i; 1643 int i;
1355 1644
1356 if (ev_is_active (&pipeev)) 1645 if (ev_is_active (&pipe_w))
1357 { 1646 {
1358 ev_ref (EV_A); /* signal watcher */ 1647 /*ev_ref (EV_A);*/
1359 ev_io_stop (EV_A_ &pipeev); 1648 /*ev_io_stop (EV_A_ &pipe_w);*/
1360 1649
1361#if EV_USE_EVENTFD 1650#if EV_USE_EVENTFD
1362 if (evfd >= 0) 1651 if (evfd >= 0)
1363 close (evfd); 1652 close (evfd);
1364#endif 1653#endif
1365 1654
1366 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1367 { 1656 {
1368 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1369 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1370 } 1659 }
1371 } 1660 }
1661
1662#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w))
1664 {
1665 /*ev_ref (EV_A);*/
1666 /*ev_io_stop (EV_A_ &sigfd_w);*/
1667
1668 close (sigfd);
1669 }
1670#endif
1372 1671
1373#if EV_USE_INOTIFY 1672#if EV_USE_INOTIFY
1374 if (fs_fd >= 0) 1673 if (fs_fd >= 0)
1375 close (fs_fd); 1674 close (fs_fd);
1376#endif 1675#endif
… …
1400#if EV_IDLE_ENABLE 1699#if EV_IDLE_ENABLE
1401 array_free (idle, [i]); 1700 array_free (idle, [i]);
1402#endif 1701#endif
1403 } 1702 }
1404 1703
1405 ev_free (anfds); anfdmax = 0; 1704 ev_free (anfds); anfds = 0; anfdmax = 0;
1406 1705
1407 /* have to use the microsoft-never-gets-it-right macro */ 1706 /* have to use the microsoft-never-gets-it-right macro */
1707 array_free (rfeed, EMPTY);
1408 array_free (fdchange, EMPTY); 1708 array_free (fdchange, EMPTY);
1409 array_free (timer, EMPTY); 1709 array_free (timer, EMPTY);
1410#if EV_PERIODIC_ENABLE 1710#if EV_PERIODIC_ENABLE
1411 array_free (periodic, EMPTY); 1711 array_free (periodic, EMPTY);
1412#endif 1712#endif
… …
1421 1721
1422 backend = 0; 1722 backend = 0;
1423} 1723}
1424 1724
1425#if EV_USE_INOTIFY 1725#if EV_USE_INOTIFY
1426void inline_size infy_fork (EV_P); 1726inline_size void infy_fork (EV_P);
1427#endif 1727#endif
1428 1728
1429void inline_size 1729inline_size void
1430loop_fork (EV_P) 1730loop_fork (EV_P)
1431{ 1731{
1432#if EV_USE_PORT 1732#if EV_USE_PORT
1433 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1733 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1434#endif 1734#endif
… …
1440#endif 1740#endif
1441#if EV_USE_INOTIFY 1741#if EV_USE_INOTIFY
1442 infy_fork (EV_A); 1742 infy_fork (EV_A);
1443#endif 1743#endif
1444 1744
1445 if (ev_is_active (&pipeev)) 1745 if (ev_is_active (&pipe_w))
1446 { 1746 {
1447 /* this "locks" the handlers against writing to the pipe */ 1747 /* this "locks" the handlers against writing to the pipe */
1448 /* while we modify the fd vars */ 1748 /* while we modify the fd vars */
1449 gotsig = 1; 1749 sig_pending = 1;
1450#if EV_ASYNC_ENABLE 1750#if EV_ASYNC_ENABLE
1451 gotasync = 1; 1751 async_pending = 1;
1452#endif 1752#endif
1453 1753
1454 ev_ref (EV_A); 1754 ev_ref (EV_A);
1455 ev_io_stop (EV_A_ &pipeev); 1755 ev_io_stop (EV_A_ &pipe_w);
1456 1756
1457#if EV_USE_EVENTFD 1757#if EV_USE_EVENTFD
1458 if (evfd >= 0) 1758 if (evfd >= 0)
1459 close (evfd); 1759 close (evfd);
1460#endif 1760#endif
1461 1761
1462 if (evpipe [0] >= 0) 1762 if (evpipe [0] >= 0)
1463 { 1763 {
1464 close (evpipe [0]); 1764 EV_WIN32_CLOSE_FD (evpipe [0]);
1465 close (evpipe [1]); 1765 EV_WIN32_CLOSE_FD (evpipe [1]);
1466 } 1766 }
1467 1767
1468 evpipe_init (EV_A); 1768 evpipe_init (EV_A);
1469 /* now iterate over everything, in case we missed something */ 1769 /* now iterate over everything, in case we missed something */
1470 pipecb (EV_A_ &pipeev, EV_READ); 1770 pipecb (EV_A_ &pipe_w, EV_READ);
1471 } 1771 }
1472 1772
1473 postfork = 0; 1773 postfork = 0;
1474} 1774}
1475 1775
1476#if EV_MULTIPLICITY 1776#if EV_MULTIPLICITY
1477 1777
1478struct ev_loop * 1778struct ev_loop *
1479ev_loop_new (unsigned int flags) 1779ev_loop_new (unsigned int flags)
1480{ 1780{
1481 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1781 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1482 1782
1483 memset (loop, 0, sizeof (struct ev_loop)); 1783 memset (EV_A, 0, sizeof (struct ev_loop));
1484
1485 loop_init (EV_A_ flags); 1784 loop_init (EV_A_ flags);
1486 1785
1487 if (ev_backend (EV_A)) 1786 if (ev_backend (EV_A))
1488 return loop; 1787 return EV_A;
1489 1788
1490 return 0; 1789 return 0;
1491} 1790}
1492 1791
1493void 1792void
… …
1500void 1799void
1501ev_loop_fork (EV_P) 1800ev_loop_fork (EV_P)
1502{ 1801{
1503 postfork = 1; /* must be in line with ev_default_fork */ 1802 postfork = 1; /* must be in line with ev_default_fork */
1504} 1803}
1804#endif /* multiplicity */
1505 1805
1506#if EV_VERIFY 1806#if EV_VERIFY
1507static void noinline 1807static void noinline
1508verify_watcher (EV_P_ W w) 1808verify_watcher (EV_P_ W w)
1509{ 1809{
1510 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1810 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1511 1811
1512 if (w->pending) 1812 if (w->pending)
1513 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1813 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1514} 1814}
1515 1815
1516static void noinline 1816static void noinline
1517verify_heap (EV_P_ ANHE *heap, int N) 1817verify_heap (EV_P_ ANHE *heap, int N)
1518{ 1818{
1519 int i; 1819 int i;
1520 1820
1521 for (i = HEAP0; i < N + HEAP0; ++i) 1821 for (i = HEAP0; i < N + HEAP0; ++i)
1522 { 1822 {
1523 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1823 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1524 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1824 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1525 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1825 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1526 1826
1527 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1827 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1528 } 1828 }
1529} 1829}
1530 1830
1531static void noinline 1831static void noinline
1532array_verify (EV_P_ W *ws, int cnt) 1832array_verify (EV_P_ W *ws, int cnt)
1533{ 1833{
1534 while (cnt--) 1834 while (cnt--)
1535 { 1835 {
1536 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1836 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1537 verify_watcher (EV_A_ ws [cnt]); 1837 verify_watcher (EV_A_ ws [cnt]);
1538 } 1838 }
1539} 1839}
1540#endif 1840#endif
1541 1841
1842#if EV_MINIMAL < 2
1542void 1843void
1543ev_loop_verify (EV_P) 1844ev_loop_verify (EV_P)
1544{ 1845{
1545#if EV_VERIFY 1846#if EV_VERIFY
1546 int i; 1847 int i;
… …
1548 1849
1549 assert (activecnt >= -1); 1850 assert (activecnt >= -1);
1550 1851
1551 assert (fdchangemax >= fdchangecnt); 1852 assert (fdchangemax >= fdchangecnt);
1552 for (i = 0; i < fdchangecnt; ++i) 1853 for (i = 0; i < fdchangecnt; ++i)
1553 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1854 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1554 1855
1555 assert (anfdmax >= 0); 1856 assert (anfdmax >= 0);
1556 for (i = 0; i < anfdmax; ++i) 1857 for (i = 0; i < anfdmax; ++i)
1557 for (w = anfds [i].head; w; w = w->next) 1858 for (w = anfds [i].head; w; w = w->next)
1558 { 1859 {
1559 verify_watcher (EV_A_ (W)w); 1860 verify_watcher (EV_A_ (W)w);
1560 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1861 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1561 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1862 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1562 } 1863 }
1563 1864
1564 assert (timermax >= timercnt); 1865 assert (timermax >= timercnt);
1565 verify_heap (EV_A_ timers, timercnt); 1866 verify_heap (EV_A_ timers, timercnt);
1566 1867
… …
1595 assert (checkmax >= checkcnt); 1896 assert (checkmax >= checkcnt);
1596 array_verify (EV_A_ (W *)checks, checkcnt); 1897 array_verify (EV_A_ (W *)checks, checkcnt);
1597 1898
1598# if 0 1899# if 0
1599 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1900 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1600 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1901 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1601# endif
1602#endif 1902# endif
1903#endif
1603} 1904}
1604 1905#endif
1605#endif /* multiplicity */
1606 1906
1607#if EV_MULTIPLICITY 1907#if EV_MULTIPLICITY
1608struct ev_loop * 1908struct ev_loop *
1609ev_default_loop_init (unsigned int flags) 1909ev_default_loop_init (unsigned int flags)
1610#else 1910#else
… …
1613#endif 1913#endif
1614{ 1914{
1615 if (!ev_default_loop_ptr) 1915 if (!ev_default_loop_ptr)
1616 { 1916 {
1617#if EV_MULTIPLICITY 1917#if EV_MULTIPLICITY
1618 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1918 EV_P = ev_default_loop_ptr = &default_loop_struct;
1619#else 1919#else
1620 ev_default_loop_ptr = 1; 1920 ev_default_loop_ptr = 1;
1621#endif 1921#endif
1622 1922
1623 loop_init (EV_A_ flags); 1923 loop_init (EV_A_ flags);
… …
1640 1940
1641void 1941void
1642ev_default_destroy (void) 1942ev_default_destroy (void)
1643{ 1943{
1644#if EV_MULTIPLICITY 1944#if EV_MULTIPLICITY
1645 struct ev_loop *loop = ev_default_loop_ptr; 1945 EV_P = ev_default_loop_ptr;
1646#endif 1946#endif
1647 1947
1648 ev_default_loop_ptr = 0; 1948 ev_default_loop_ptr = 0;
1649 1949
1650#ifndef _WIN32 1950#ifndef _WIN32
… …
1657 1957
1658void 1958void
1659ev_default_fork (void) 1959ev_default_fork (void)
1660{ 1960{
1661#if EV_MULTIPLICITY 1961#if EV_MULTIPLICITY
1662 struct ev_loop *loop = ev_default_loop_ptr; 1962 EV_P = ev_default_loop_ptr;
1663#endif 1963#endif
1664 1964
1665 postfork = 1; /* must be in line with ev_loop_fork */ 1965 postfork = 1; /* must be in line with ev_loop_fork */
1666} 1966}
1667 1967
… …
1671ev_invoke (EV_P_ void *w, int revents) 1971ev_invoke (EV_P_ void *w, int revents)
1672{ 1972{
1673 EV_CB_INVOKE ((W)w, revents); 1973 EV_CB_INVOKE ((W)w, revents);
1674} 1974}
1675 1975
1676void inline_speed 1976unsigned int
1677call_pending (EV_P) 1977ev_pending_count (EV_P)
1978{
1979 int pri;
1980 unsigned int count = 0;
1981
1982 for (pri = NUMPRI; pri--; )
1983 count += pendingcnt [pri];
1984
1985 return count;
1986}
1987
1988void noinline
1989ev_invoke_pending (EV_P)
1678{ 1990{
1679 int pri; 1991 int pri;
1680 1992
1681 for (pri = NUMPRI; pri--; ) 1993 for (pri = NUMPRI; pri--; )
1682 while (pendingcnt [pri]) 1994 while (pendingcnt [pri])
1683 { 1995 {
1684 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1996 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1685 1997
1686 if (expect_true (p->w))
1687 {
1688 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1998 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1999 /* ^ this is no longer true, as pending_w could be here */
1689 2000
1690 p->w->pending = 0; 2001 p->w->pending = 0;
1691 EV_CB_INVOKE (p->w, p->events); 2002 EV_CB_INVOKE (p->w, p->events);
1692 EV_FREQUENT_CHECK; 2003 EV_FREQUENT_CHECK;
1693 }
1694 } 2004 }
1695} 2005}
1696 2006
1697#if EV_IDLE_ENABLE 2007#if EV_IDLE_ENABLE
1698void inline_size 2008/* make idle watchers pending. this handles the "call-idle */
2009/* only when higher priorities are idle" logic */
2010inline_size void
1699idle_reify (EV_P) 2011idle_reify (EV_P)
1700{ 2012{
1701 if (expect_false (idleall)) 2013 if (expect_false (idleall))
1702 { 2014 {
1703 int pri; 2015 int pri;
… …
1715 } 2027 }
1716 } 2028 }
1717} 2029}
1718#endif 2030#endif
1719 2031
1720void inline_size 2032/* make timers pending */
2033inline_size void
1721timers_reify (EV_P) 2034timers_reify (EV_P)
1722{ 2035{
1723 EV_FREQUENT_CHECK; 2036 EV_FREQUENT_CHECK;
1724 2037
1725 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2038 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1726 { 2039 {
1727 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2040 do
1728
1729 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1730
1731 /* first reschedule or stop timer */
1732 if (w->repeat)
1733 { 2041 {
2042 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2043
2044 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2045
2046 /* first reschedule or stop timer */
2047 if (w->repeat)
2048 {
1734 ev_at (w) += w->repeat; 2049 ev_at (w) += w->repeat;
1735 if (ev_at (w) < mn_now) 2050 if (ev_at (w) < mn_now)
1736 ev_at (w) = mn_now; 2051 ev_at (w) = mn_now;
1737 2052
1738 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2053 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1739 2054
1740 ANHE_at_cache (timers [HEAP0]); 2055 ANHE_at_cache (timers [HEAP0]);
1741 downheap (timers, timercnt, HEAP0); 2056 downheap (timers, timercnt, HEAP0);
2057 }
2058 else
2059 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2060
2061 EV_FREQUENT_CHECK;
2062 feed_reverse (EV_A_ (W)w);
1742 } 2063 }
1743 else 2064 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1744 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1745 2065
1746 EV_FREQUENT_CHECK;
1747 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2066 feed_reverse_done (EV_A_ EV_TIMEOUT);
1748 } 2067 }
1749} 2068}
1750 2069
1751#if EV_PERIODIC_ENABLE 2070#if EV_PERIODIC_ENABLE
1752void inline_size 2071/* make periodics pending */
2072inline_size void
1753periodics_reify (EV_P) 2073periodics_reify (EV_P)
1754{ 2074{
1755 EV_FREQUENT_CHECK; 2075 EV_FREQUENT_CHECK;
1756 2076
1757 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2077 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1758 { 2078 {
1759 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2079 int feed_count = 0;
1760 2080
1761 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2081 do
1762
1763 /* first reschedule or stop timer */
1764 if (w->reschedule_cb)
1765 { 2082 {
2083 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2084
2085 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2086
2087 /* first reschedule or stop timer */
2088 if (w->reschedule_cb)
2089 {
1766 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2090 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1767 2091
1768 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2092 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1769 2093
1770 ANHE_at_cache (periodics [HEAP0]); 2094 ANHE_at_cache (periodics [HEAP0]);
1771 downheap (periodics, periodiccnt, HEAP0); 2095 downheap (periodics, periodiccnt, HEAP0);
2096 }
2097 else if (w->interval)
2098 {
2099 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2100 /* if next trigger time is not sufficiently in the future, put it there */
2101 /* this might happen because of floating point inexactness */
2102 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2103 {
2104 ev_at (w) += w->interval;
2105
2106 /* if interval is unreasonably low we might still have a time in the past */
2107 /* so correct this. this will make the periodic very inexact, but the user */
2108 /* has effectively asked to get triggered more often than possible */
2109 if (ev_at (w) < ev_rt_now)
2110 ev_at (w) = ev_rt_now;
2111 }
2112
2113 ANHE_at_cache (periodics [HEAP0]);
2114 downheap (periodics, periodiccnt, HEAP0);
2115 }
2116 else
2117 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2118
2119 EV_FREQUENT_CHECK;
2120 feed_reverse (EV_A_ (W)w);
1772 } 2121 }
1773 else if (w->interval) 2122 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1774 {
1775 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1776 /* if next trigger time is not sufficiently in the future, put it there */
1777 /* this might happen because of floating point inexactness */
1778 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1779 {
1780 ev_at (w) += w->interval;
1781 2123
1782 /* if interval is unreasonably low we might still have a time in the past */
1783 /* so correct this. this will make the periodic very inexact, but the user */
1784 /* has effectively asked to get triggered more often than possible */
1785 if (ev_at (w) < ev_rt_now)
1786 ev_at (w) = ev_rt_now;
1787 }
1788
1789 ANHE_at_cache (periodics [HEAP0]);
1790 downheap (periodics, periodiccnt, HEAP0);
1791 }
1792 else
1793 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1794
1795 EV_FREQUENT_CHECK;
1796 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2124 feed_reverse_done (EV_A_ EV_PERIODIC);
1797 } 2125 }
1798} 2126}
1799 2127
2128/* simply recalculate all periodics */
2129/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1800static void noinline 2130static void noinline
1801periodics_reschedule (EV_P) 2131periodics_reschedule (EV_P)
1802{ 2132{
1803 int i; 2133 int i;
1804 2134
… …
1817 2147
1818 reheap (periodics, periodiccnt); 2148 reheap (periodics, periodiccnt);
1819} 2149}
1820#endif 2150#endif
1821 2151
1822void inline_speed 2152/* adjust all timers by a given offset */
2153static void noinline
2154timers_reschedule (EV_P_ ev_tstamp adjust)
2155{
2156 int i;
2157
2158 for (i = 0; i < timercnt; ++i)
2159 {
2160 ANHE *he = timers + i + HEAP0;
2161 ANHE_w (*he)->at += adjust;
2162 ANHE_at_cache (*he);
2163 }
2164}
2165
2166/* fetch new monotonic and realtime times from the kernel */
2167/* also detetc if there was a timejump, and act accordingly */
2168inline_speed void
1823time_update (EV_P_ ev_tstamp max_block) 2169time_update (EV_P_ ev_tstamp max_block)
1824{ 2170{
1825 int i;
1826
1827#if EV_USE_MONOTONIC 2171#if EV_USE_MONOTONIC
1828 if (expect_true (have_monotonic)) 2172 if (expect_true (have_monotonic))
1829 { 2173 {
2174 int i;
1830 ev_tstamp odiff = rtmn_diff; 2175 ev_tstamp odiff = rtmn_diff;
1831 2176
1832 mn_now = get_clock (); 2177 mn_now = get_clock ();
1833 2178
1834 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2179 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1860 ev_rt_now = ev_time (); 2205 ev_rt_now = ev_time ();
1861 mn_now = get_clock (); 2206 mn_now = get_clock ();
1862 now_floor = mn_now; 2207 now_floor = mn_now;
1863 } 2208 }
1864 2209
2210 /* no timer adjustment, as the monotonic clock doesn't jump */
2211 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1865# if EV_PERIODIC_ENABLE 2212# if EV_PERIODIC_ENABLE
1866 periodics_reschedule (EV_A); 2213 periodics_reschedule (EV_A);
1867# endif 2214# endif
1868 /* no timer adjustment, as the monotonic clock doesn't jump */
1869 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1870 } 2215 }
1871 else 2216 else
1872#endif 2217#endif
1873 { 2218 {
1874 ev_rt_now = ev_time (); 2219 ev_rt_now = ev_time ();
1875 2220
1876 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2221 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1877 { 2222 {
2223 /* adjust timers. this is easy, as the offset is the same for all of them */
2224 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1878#if EV_PERIODIC_ENABLE 2225#if EV_PERIODIC_ENABLE
1879 periodics_reschedule (EV_A); 2226 periodics_reschedule (EV_A);
1880#endif 2227#endif
1881 /* adjust timers. this is easy, as the offset is the same for all of them */
1882 for (i = 0; i < timercnt; ++i)
1883 {
1884 ANHE *he = timers + i + HEAP0;
1885 ANHE_w (*he)->at += ev_rt_now - mn_now;
1886 ANHE_at_cache (*he);
1887 }
1888 } 2228 }
1889 2229
1890 mn_now = ev_rt_now; 2230 mn_now = ev_rt_now;
1891 } 2231 }
1892} 2232}
1893 2233
1894void 2234void
1895ev_ref (EV_P)
1896{
1897 ++activecnt;
1898}
1899
1900void
1901ev_unref (EV_P)
1902{
1903 --activecnt;
1904}
1905
1906void
1907ev_now_update (EV_P)
1908{
1909 time_update (EV_A_ 1e100);
1910}
1911
1912static int loop_done;
1913
1914void
1915ev_loop (EV_P_ int flags) 2235ev_loop (EV_P_ int flags)
1916{ 2236{
2237#if EV_MINIMAL < 2
2238 ++loop_depth;
2239#endif
2240
2241 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2242
1917 loop_done = EVUNLOOP_CANCEL; 2243 loop_done = EVUNLOOP_CANCEL;
1918 2244
1919 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2245 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1920 2246
1921 do 2247 do
1922 { 2248 {
1923#if EV_VERIFY >= 2 2249#if EV_VERIFY >= 2
1924 ev_loop_verify (EV_A); 2250 ev_loop_verify (EV_A);
… …
1937 /* we might have forked, so queue fork handlers */ 2263 /* we might have forked, so queue fork handlers */
1938 if (expect_false (postfork)) 2264 if (expect_false (postfork))
1939 if (forkcnt) 2265 if (forkcnt)
1940 { 2266 {
1941 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2267 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1942 call_pending (EV_A); 2268 EV_INVOKE_PENDING;
1943 } 2269 }
1944#endif 2270#endif
1945 2271
1946 /* queue prepare watchers (and execute them) */ 2272 /* queue prepare watchers (and execute them) */
1947 if (expect_false (preparecnt)) 2273 if (expect_false (preparecnt))
1948 { 2274 {
1949 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2275 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1950 call_pending (EV_A); 2276 EV_INVOKE_PENDING;
1951 } 2277 }
1952 2278
1953 if (expect_false (!activecnt)) 2279 if (expect_false (loop_done))
1954 break; 2280 break;
1955 2281
1956 /* we might have forked, so reify kernel state if necessary */ 2282 /* we might have forked, so reify kernel state if necessary */
1957 if (expect_false (postfork)) 2283 if (expect_false (postfork))
1958 loop_fork (EV_A); 2284 loop_fork (EV_A);
… …
1965 ev_tstamp waittime = 0.; 2291 ev_tstamp waittime = 0.;
1966 ev_tstamp sleeptime = 0.; 2292 ev_tstamp sleeptime = 0.;
1967 2293
1968 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2294 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1969 { 2295 {
2296 /* remember old timestamp for io_blocktime calculation */
2297 ev_tstamp prev_mn_now = mn_now;
2298
1970 /* update time to cancel out callback processing overhead */ 2299 /* update time to cancel out callback processing overhead */
1971 time_update (EV_A_ 1e100); 2300 time_update (EV_A_ 1e100);
1972 2301
1973 waittime = MAX_BLOCKTIME; 2302 waittime = MAX_BLOCKTIME;
1974 2303
… …
1984 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2313 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1985 if (waittime > to) waittime = to; 2314 if (waittime > to) waittime = to;
1986 } 2315 }
1987#endif 2316#endif
1988 2317
2318 /* don't let timeouts decrease the waittime below timeout_blocktime */
1989 if (expect_false (waittime < timeout_blocktime)) 2319 if (expect_false (waittime < timeout_blocktime))
1990 waittime = timeout_blocktime; 2320 waittime = timeout_blocktime;
1991 2321
1992 sleeptime = waittime - backend_fudge; 2322 /* extra check because io_blocktime is commonly 0 */
1993
1994 if (expect_true (sleeptime > io_blocktime)) 2323 if (expect_false (io_blocktime))
1995 sleeptime = io_blocktime;
1996
1997 if (sleeptime)
1998 { 2324 {
2325 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2326
2327 if (sleeptime > waittime - backend_fudge)
2328 sleeptime = waittime - backend_fudge;
2329
2330 if (expect_true (sleeptime > 0.))
2331 {
1999 ev_sleep (sleeptime); 2332 ev_sleep (sleeptime);
2000 waittime -= sleeptime; 2333 waittime -= sleeptime;
2334 }
2001 } 2335 }
2002 } 2336 }
2003 2337
2338#if EV_MINIMAL < 2
2004 ++loop_count; 2339 ++loop_count;
2340#endif
2341 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2005 backend_poll (EV_A_ waittime); 2342 backend_poll (EV_A_ waittime);
2343 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2006 2344
2007 /* update ev_rt_now, do magic */ 2345 /* update ev_rt_now, do magic */
2008 time_update (EV_A_ waittime + sleeptime); 2346 time_update (EV_A_ waittime + sleeptime);
2009 } 2347 }
2010 2348
… …
2021 2359
2022 /* queue check watchers, to be executed first */ 2360 /* queue check watchers, to be executed first */
2023 if (expect_false (checkcnt)) 2361 if (expect_false (checkcnt))
2024 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2362 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2025 2363
2026 call_pending (EV_A); 2364 EV_INVOKE_PENDING;
2027 } 2365 }
2028 while (expect_true ( 2366 while (expect_true (
2029 activecnt 2367 activecnt
2030 && !loop_done 2368 && !loop_done
2031 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2369 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2032 )); 2370 ));
2033 2371
2034 if (loop_done == EVUNLOOP_ONE) 2372 if (loop_done == EVUNLOOP_ONE)
2035 loop_done = EVUNLOOP_CANCEL; 2373 loop_done = EVUNLOOP_CANCEL;
2374
2375#if EV_MINIMAL < 2
2376 --loop_depth;
2377#endif
2036} 2378}
2037 2379
2038void 2380void
2039ev_unloop (EV_P_ int how) 2381ev_unloop (EV_P_ int how)
2040{ 2382{
2041 loop_done = how; 2383 loop_done = how;
2042} 2384}
2043 2385
2386void
2387ev_ref (EV_P)
2388{
2389 ++activecnt;
2390}
2391
2392void
2393ev_unref (EV_P)
2394{
2395 --activecnt;
2396}
2397
2398void
2399ev_now_update (EV_P)
2400{
2401 time_update (EV_A_ 1e100);
2402}
2403
2404void
2405ev_suspend (EV_P)
2406{
2407 ev_now_update (EV_A);
2408}
2409
2410void
2411ev_resume (EV_P)
2412{
2413 ev_tstamp mn_prev = mn_now;
2414
2415 ev_now_update (EV_A);
2416 timers_reschedule (EV_A_ mn_now - mn_prev);
2417#if EV_PERIODIC_ENABLE
2418 /* TODO: really do this? */
2419 periodics_reschedule (EV_A);
2420#endif
2421}
2422
2044/*****************************************************************************/ 2423/*****************************************************************************/
2424/* singly-linked list management, used when the expected list length is short */
2045 2425
2046void inline_size 2426inline_size void
2047wlist_add (WL *head, WL elem) 2427wlist_add (WL *head, WL elem)
2048{ 2428{
2049 elem->next = *head; 2429 elem->next = *head;
2050 *head = elem; 2430 *head = elem;
2051} 2431}
2052 2432
2053void inline_size 2433inline_size void
2054wlist_del (WL *head, WL elem) 2434wlist_del (WL *head, WL elem)
2055{ 2435{
2056 while (*head) 2436 while (*head)
2057 { 2437 {
2058 if (*head == elem) 2438 if (expect_true (*head == elem))
2059 { 2439 {
2060 *head = elem->next; 2440 *head = elem->next;
2061 return; 2441 break;
2062 } 2442 }
2063 2443
2064 head = &(*head)->next; 2444 head = &(*head)->next;
2065 } 2445 }
2066} 2446}
2067 2447
2068void inline_speed 2448/* internal, faster, version of ev_clear_pending */
2449inline_speed void
2069clear_pending (EV_P_ W w) 2450clear_pending (EV_P_ W w)
2070{ 2451{
2071 if (w->pending) 2452 if (w->pending)
2072 { 2453 {
2073 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2454 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2074 w->pending = 0; 2455 w->pending = 0;
2075 } 2456 }
2076} 2457}
2077 2458
2078int 2459int
… …
2082 int pending = w_->pending; 2463 int pending = w_->pending;
2083 2464
2084 if (expect_true (pending)) 2465 if (expect_true (pending))
2085 { 2466 {
2086 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2467 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2468 p->w = (W)&pending_w;
2087 w_->pending = 0; 2469 w_->pending = 0;
2088 p->w = 0;
2089 return p->events; 2470 return p->events;
2090 } 2471 }
2091 else 2472 else
2092 return 0; 2473 return 0;
2093} 2474}
2094 2475
2095void inline_size 2476inline_size void
2096pri_adjust (EV_P_ W w) 2477pri_adjust (EV_P_ W w)
2097{ 2478{
2098 int pri = w->priority; 2479 int pri = ev_priority (w);
2099 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2480 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2100 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2481 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2101 w->priority = pri; 2482 ev_set_priority (w, pri);
2102} 2483}
2103 2484
2104void inline_speed 2485inline_speed void
2105ev_start (EV_P_ W w, int active) 2486ev_start (EV_P_ W w, int active)
2106{ 2487{
2107 pri_adjust (EV_A_ w); 2488 pri_adjust (EV_A_ w);
2108 w->active = active; 2489 w->active = active;
2109 ev_ref (EV_A); 2490 ev_ref (EV_A);
2110} 2491}
2111 2492
2112void inline_size 2493inline_size void
2113ev_stop (EV_P_ W w) 2494ev_stop (EV_P_ W w)
2114{ 2495{
2115 ev_unref (EV_A); 2496 ev_unref (EV_A);
2116 w->active = 0; 2497 w->active = 0;
2117} 2498}
… …
2124 int fd = w->fd; 2505 int fd = w->fd;
2125 2506
2126 if (expect_false (ev_is_active (w))) 2507 if (expect_false (ev_is_active (w)))
2127 return; 2508 return;
2128 2509
2129 assert (("ev_io_start called with negative fd", fd >= 0)); 2510 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2130 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE)))); 2511 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2131 2512
2132 EV_FREQUENT_CHECK; 2513 EV_FREQUENT_CHECK;
2133 2514
2134 ev_start (EV_A_ (W)w, 1); 2515 ev_start (EV_A_ (W)w, 1);
2135 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2516 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2136 wlist_add (&anfds[fd].head, (WL)w); 2517 wlist_add (&anfds[fd].head, (WL)w);
2137 2518
2138 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2519 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2139 w->events &= ~EV_IOFDSET; 2520 w->events &= ~EV__IOFDSET;
2140 2521
2141 EV_FREQUENT_CHECK; 2522 EV_FREQUENT_CHECK;
2142} 2523}
2143 2524
2144void noinline 2525void noinline
… …
2146{ 2527{
2147 clear_pending (EV_A_ (W)w); 2528 clear_pending (EV_A_ (W)w);
2148 if (expect_false (!ev_is_active (w))) 2529 if (expect_false (!ev_is_active (w)))
2149 return; 2530 return;
2150 2531
2151 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2532 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2152 2533
2153 EV_FREQUENT_CHECK; 2534 EV_FREQUENT_CHECK;
2154 2535
2155 wlist_del (&anfds[w->fd].head, (WL)w); 2536 wlist_del (&anfds[w->fd].head, (WL)w);
2156 ev_stop (EV_A_ (W)w); 2537 ev_stop (EV_A_ (W)w);
… …
2166 if (expect_false (ev_is_active (w))) 2547 if (expect_false (ev_is_active (w)))
2167 return; 2548 return;
2168 2549
2169 ev_at (w) += mn_now; 2550 ev_at (w) += mn_now;
2170 2551
2171 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2552 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2172 2553
2173 EV_FREQUENT_CHECK; 2554 EV_FREQUENT_CHECK;
2174 2555
2175 ++timercnt; 2556 ++timercnt;
2176 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2557 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2179 ANHE_at_cache (timers [ev_active (w)]); 2560 ANHE_at_cache (timers [ev_active (w)]);
2180 upheap (timers, ev_active (w)); 2561 upheap (timers, ev_active (w));
2181 2562
2182 EV_FREQUENT_CHECK; 2563 EV_FREQUENT_CHECK;
2183 2564
2184 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2565 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2185} 2566}
2186 2567
2187void noinline 2568void noinline
2188ev_timer_stop (EV_P_ ev_timer *w) 2569ev_timer_stop (EV_P_ ev_timer *w)
2189{ 2570{
… …
2194 EV_FREQUENT_CHECK; 2575 EV_FREQUENT_CHECK;
2195 2576
2196 { 2577 {
2197 int active = ev_active (w); 2578 int active = ev_active (w);
2198 2579
2199 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2580 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2200 2581
2201 --timercnt; 2582 --timercnt;
2202 2583
2203 if (expect_true (active < timercnt + HEAP0)) 2584 if (expect_true (active < timercnt + HEAP0))
2204 { 2585 {
… …
2237 } 2618 }
2238 2619
2239 EV_FREQUENT_CHECK; 2620 EV_FREQUENT_CHECK;
2240} 2621}
2241 2622
2623ev_tstamp
2624ev_timer_remaining (EV_P_ ev_timer *w)
2625{
2626 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2627}
2628
2242#if EV_PERIODIC_ENABLE 2629#if EV_PERIODIC_ENABLE
2243void noinline 2630void noinline
2244ev_periodic_start (EV_P_ ev_periodic *w) 2631ev_periodic_start (EV_P_ ev_periodic *w)
2245{ 2632{
2246 if (expect_false (ev_is_active (w))) 2633 if (expect_false (ev_is_active (w)))
… …
2248 2635
2249 if (w->reschedule_cb) 2636 if (w->reschedule_cb)
2250 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2637 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2251 else if (w->interval) 2638 else if (w->interval)
2252 { 2639 {
2253 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2640 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2254 /* this formula differs from the one in periodic_reify because we do not always round up */ 2641 /* this formula differs from the one in periodic_reify because we do not always round up */
2255 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2642 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2256 } 2643 }
2257 else 2644 else
2258 ev_at (w) = w->offset; 2645 ev_at (w) = w->offset;
… …
2266 ANHE_at_cache (periodics [ev_active (w)]); 2653 ANHE_at_cache (periodics [ev_active (w)]);
2267 upheap (periodics, ev_active (w)); 2654 upheap (periodics, ev_active (w));
2268 2655
2269 EV_FREQUENT_CHECK; 2656 EV_FREQUENT_CHECK;
2270 2657
2271 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2658 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2272} 2659}
2273 2660
2274void noinline 2661void noinline
2275ev_periodic_stop (EV_P_ ev_periodic *w) 2662ev_periodic_stop (EV_P_ ev_periodic *w)
2276{ 2663{
… …
2281 EV_FREQUENT_CHECK; 2668 EV_FREQUENT_CHECK;
2282 2669
2283 { 2670 {
2284 int active = ev_active (w); 2671 int active = ev_active (w);
2285 2672
2286 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2673 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2287 2674
2288 --periodiccnt; 2675 --periodiccnt;
2289 2676
2290 if (expect_true (active < periodiccnt + HEAP0)) 2677 if (expect_true (active < periodiccnt + HEAP0))
2291 { 2678 {
… …
2313#endif 2700#endif
2314 2701
2315void noinline 2702void noinline
2316ev_signal_start (EV_P_ ev_signal *w) 2703ev_signal_start (EV_P_ ev_signal *w)
2317{ 2704{
2318#if EV_MULTIPLICITY
2319 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2320#endif
2321 if (expect_false (ev_is_active (w))) 2705 if (expect_false (ev_is_active (w)))
2322 return; 2706 return;
2323 2707
2324 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2708 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2325 2709
2326 evpipe_init (EV_A); 2710#if EV_MULTIPLICITY
2711 assert (("libev: a signal must not be attached to two different loops",
2712 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2327 2713
2328 EV_FREQUENT_CHECK; 2714 signals [w->signum - 1].loop = EV_A;
2715#endif
2329 2716
2717 EV_FREQUENT_CHECK;
2718
2719#if EV_USE_SIGNALFD
2720 if (sigfd == -2)
2330 { 2721 {
2331#ifndef _WIN32 2722 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2332 sigset_t full, prev; 2723 if (sigfd < 0 && errno == EINVAL)
2333 sigfillset (&full); 2724 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2334 sigprocmask (SIG_SETMASK, &full, &prev);
2335#endif
2336 2725
2337 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2726 if (sigfd >= 0)
2727 {
2728 fd_intern (sigfd); /* doing it twice will not hurt */
2338 2729
2339#ifndef _WIN32 2730 sigemptyset (&sigfd_set);
2340 sigprocmask (SIG_SETMASK, &prev, 0); 2731
2341#endif 2732 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2733 ev_set_priority (&sigfd_w, EV_MAXPRI);
2734 ev_io_start (EV_A_ &sigfd_w);
2735 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2736 }
2342 } 2737 }
2738
2739 if (sigfd >= 0)
2740 {
2741 /* TODO: check .head */
2742 sigaddset (&sigfd_set, w->signum);
2743 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2744
2745 signalfd (sigfd, &sigfd_set, 0);
2746 }
2747#endif
2343 2748
2344 ev_start (EV_A_ (W)w, 1); 2749 ev_start (EV_A_ (W)w, 1);
2345 wlist_add (&signals [w->signum - 1].head, (WL)w); 2750 wlist_add (&signals [w->signum - 1].head, (WL)w);
2346 2751
2347 if (!((WL)w)->next) 2752 if (!((WL)w)->next)
2753# if EV_USE_SIGNALFD
2754 if (sigfd < 0) /*TODO*/
2755# endif
2348 { 2756 {
2349#if _WIN32 2757# if _WIN32
2350 signal (w->signum, ev_sighandler); 2758 signal (w->signum, ev_sighandler);
2351#else 2759# else
2352 struct sigaction sa; 2760 struct sigaction sa;
2761
2762 evpipe_init (EV_A);
2763
2353 sa.sa_handler = ev_sighandler; 2764 sa.sa_handler = ev_sighandler;
2354 sigfillset (&sa.sa_mask); 2765 sigfillset (&sa.sa_mask);
2355 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2766 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2356 sigaction (w->signum, &sa, 0); 2767 sigaction (w->signum, &sa, 0);
2768
2769 sigemptyset (&sa.sa_mask);
2770 sigaddset (&sa.sa_mask, w->signum);
2771 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2357#endif 2772#endif
2358 } 2773 }
2359 2774
2360 EV_FREQUENT_CHECK; 2775 EV_FREQUENT_CHECK;
2361} 2776}
2362 2777
2363void noinline 2778void noinline
… …
2371 2786
2372 wlist_del (&signals [w->signum - 1].head, (WL)w); 2787 wlist_del (&signals [w->signum - 1].head, (WL)w);
2373 ev_stop (EV_A_ (W)w); 2788 ev_stop (EV_A_ (W)w);
2374 2789
2375 if (!signals [w->signum - 1].head) 2790 if (!signals [w->signum - 1].head)
2791 {
2792#if EV_MULTIPLICITY
2793 signals [w->signum - 1].loop = 0; /* unattach from signal */
2794#endif
2795#if EV_USE_SIGNALFD
2796 if (sigfd >= 0)
2797 {
2798 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2799 sigdelset (&sigfd_set, w->signum);
2800 signalfd (sigfd, &sigfd_set, 0);
2801 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2802 /*TODO: maybe unblock signal? */
2803 }
2804 else
2805#endif
2376 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2807 }
2377 2808
2378 EV_FREQUENT_CHECK; 2809 EV_FREQUENT_CHECK;
2379} 2810}
2380 2811
2381void 2812void
2382ev_child_start (EV_P_ ev_child *w) 2813ev_child_start (EV_P_ ev_child *w)
2383{ 2814{
2384#if EV_MULTIPLICITY 2815#if EV_MULTIPLICITY
2385 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2816 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2386#endif 2817#endif
2387 if (expect_false (ev_is_active (w))) 2818 if (expect_false (ev_is_active (w)))
2388 return; 2819 return;
2389 2820
2390 EV_FREQUENT_CHECK; 2821 EV_FREQUENT_CHECK;
… …
2449 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2880 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2450 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2881 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2451 2882
2452 char *pend = strrchr (path, '/'); 2883 char *pend = strrchr (path, '/');
2453 2884
2454 if (!pend) 2885 if (!pend || pend == path)
2455 break; /* whoops, no '/', complain to your admin */ 2886 break;
2456 2887
2457 *pend = 0; 2888 *pend = 0;
2458 w->wd = inotify_add_watch (fs_fd, path, mask); 2889 w->wd = inotify_add_watch (fs_fd, path, mask);
2459 } 2890 }
2460 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2891 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2461 } 2892 }
2462 } 2893 }
2463 else 2894
2895 if (w->wd >= 0)
2464 { 2896 {
2897 struct statfs sfs;
2898
2465 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2899 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2466 2900
2467 /* now local changes will be tracked by inotify, but remote changes won't */ 2901 /* now local changes will be tracked by inotify, but remote changes won't */
2468 /* unless the filesystem it known to be local, we therefore still poll */ 2902 /* unless the filesystem it known to be local, we therefore still poll */
2469 /* also do poll on <2.6.25, but with normal frequency */ 2903 /* also do poll on <2.6.25, but with normal frequency */
2470 struct statfs sfs;
2471 2904
2472 if (fs_2625 && !statfs (w->path, &sfs)) 2905 if (fs_2625 && !statfs (w->path, &sfs))
2473 if (sfs.f_type == 0x1373 /* devfs */ 2906 if (sfs.f_type == 0x1373 /* devfs */
2474 || sfs.f_type == 0xEF53 /* ext2/3 */ 2907 || sfs.f_type == 0xEF53 /* ext2/3 */
2475 || sfs.f_type == 0x3153464a /* jfs */ 2908 || sfs.f_type == 0x3153464a /* jfs */
… …
2518 2951
2519 if (w->wd == wd || wd == -1) 2952 if (w->wd == wd || wd == -1)
2520 { 2953 {
2521 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2954 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2522 { 2955 {
2956 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2523 w->wd = -1; 2957 w->wd = -1;
2524 infy_add (EV_A_ w); /* re-add, no matter what */ 2958 infy_add (EV_A_ w); /* re-add, no matter what */
2525 } 2959 }
2526 2960
2527 stat_timer_cb (EV_A_ &w->timer, 0); 2961 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2540 2974
2541 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2975 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2542 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2976 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2543} 2977}
2544 2978
2545void inline_size 2979inline_size void
2546check_2625 (EV_P) 2980check_2625 (EV_P)
2547{ 2981{
2548 /* kernels < 2.6.25 are borked 2982 /* kernels < 2.6.25 are borked
2549 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2983 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2550 */ 2984 */
… …
2563 return; 2997 return;
2564 2998
2565 fs_2625 = 1; 2999 fs_2625 = 1;
2566} 3000}
2567 3001
2568void inline_size 3002inline_size int
3003infy_newfd (void)
3004{
3005#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3006 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3007 if (fd >= 0)
3008 return fd;
3009#endif
3010 return inotify_init ();
3011}
3012
3013inline_size void
2569infy_init (EV_P) 3014infy_init (EV_P)
2570{ 3015{
2571 if (fs_fd != -2) 3016 if (fs_fd != -2)
2572 return; 3017 return;
2573 3018
2574 fs_fd = -1; 3019 fs_fd = -1;
2575 3020
2576 check_2625 (EV_A); 3021 check_2625 (EV_A);
2577 3022
2578 fs_fd = inotify_init (); 3023 fs_fd = infy_newfd ();
2579 3024
2580 if (fs_fd >= 0) 3025 if (fs_fd >= 0)
2581 { 3026 {
3027 fd_intern (fs_fd);
2582 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3028 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2583 ev_set_priority (&fs_w, EV_MAXPRI); 3029 ev_set_priority (&fs_w, EV_MAXPRI);
2584 ev_io_start (EV_A_ &fs_w); 3030 ev_io_start (EV_A_ &fs_w);
2585 } 3031 }
2586} 3032}
2587 3033
2588void inline_size 3034inline_size void
2589infy_fork (EV_P) 3035infy_fork (EV_P)
2590{ 3036{
2591 int slot; 3037 int slot;
2592 3038
2593 if (fs_fd < 0) 3039 if (fs_fd < 0)
2594 return; 3040 return;
2595 3041
3042 ev_io_stop (EV_A_ &fs_w);
2596 close (fs_fd); 3043 close (fs_fd);
2597 fs_fd = inotify_init (); 3044 fs_fd = infy_newfd ();
3045
3046 if (fs_fd >= 0)
3047 {
3048 fd_intern (fs_fd);
3049 ev_io_set (&fs_w, fs_fd, EV_READ);
3050 ev_io_start (EV_A_ &fs_w);
3051 }
2598 3052
2599 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3053 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2600 { 3054 {
2601 WL w_ = fs_hash [slot].head; 3055 WL w_ = fs_hash [slot].head;
2602 fs_hash [slot].head = 0; 3056 fs_hash [slot].head = 0;
… …
2859embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3313embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2860{ 3314{
2861 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3315 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2862 3316
2863 { 3317 {
2864 struct ev_loop *loop = w->other; 3318 EV_P = w->other;
2865 3319
2866 while (fdchangecnt) 3320 while (fdchangecnt)
2867 { 3321 {
2868 fd_reify (EV_A); 3322 fd_reify (EV_A);
2869 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3323 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2874static void 3328static void
2875embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3329embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2876{ 3330{
2877 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3331 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2878 3332
3333 ev_embed_stop (EV_A_ w);
3334
2879 { 3335 {
2880 struct ev_loop *loop = w->other; 3336 EV_P = w->other;
2881 3337
2882 ev_loop_fork (EV_A); 3338 ev_loop_fork (EV_A);
3339 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2883 } 3340 }
3341
3342 ev_embed_start (EV_A_ w);
2884} 3343}
2885 3344
2886#if 0 3345#if 0
2887static void 3346static void
2888embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3347embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2896{ 3355{
2897 if (expect_false (ev_is_active (w))) 3356 if (expect_false (ev_is_active (w)))
2898 return; 3357 return;
2899 3358
2900 { 3359 {
2901 struct ev_loop *loop = w->other; 3360 EV_P = w->other;
2902 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3361 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2903 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3362 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2904 } 3363 }
2905 3364
2906 EV_FREQUENT_CHECK; 3365 EV_FREQUENT_CHECK;
2907 3366
… …
3018 3477
3019void 3478void
3020ev_async_send (EV_P_ ev_async *w) 3479ev_async_send (EV_P_ ev_async *w)
3021{ 3480{
3022 w->sent = 1; 3481 w->sent = 1;
3023 evpipe_write (EV_A_ &gotasync); 3482 evpipe_write (EV_A_ &async_pending);
3024} 3483}
3025#endif 3484#endif
3026 3485
3027/*****************************************************************************/ 3486/*****************************************************************************/
3028 3487
… …
3090 ev_timer_set (&once->to, timeout, 0.); 3549 ev_timer_set (&once->to, timeout, 0.);
3091 ev_timer_start (EV_A_ &once->to); 3550 ev_timer_start (EV_A_ &once->to);
3092 } 3551 }
3093} 3552}
3094 3553
3554/*****************************************************************************/
3555
3556#if EV_WALK_ENABLE
3557void
3558ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3559{
3560 int i, j;
3561 ev_watcher_list *wl, *wn;
3562
3563 if (types & (EV_IO | EV_EMBED))
3564 for (i = 0; i < anfdmax; ++i)
3565 for (wl = anfds [i].head; wl; )
3566 {
3567 wn = wl->next;
3568
3569#if EV_EMBED_ENABLE
3570 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3571 {
3572 if (types & EV_EMBED)
3573 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3574 }
3575 else
3576#endif
3577#if EV_USE_INOTIFY
3578 if (ev_cb ((ev_io *)wl) == infy_cb)
3579 ;
3580 else
3581#endif
3582 if ((ev_io *)wl != &pipe_w)
3583 if (types & EV_IO)
3584 cb (EV_A_ EV_IO, wl);
3585
3586 wl = wn;
3587 }
3588
3589 if (types & (EV_TIMER | EV_STAT))
3590 for (i = timercnt + HEAP0; i-- > HEAP0; )
3591#if EV_STAT_ENABLE
3592 /*TODO: timer is not always active*/
3593 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3594 {
3595 if (types & EV_STAT)
3596 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3597 }
3598 else
3599#endif
3600 if (types & EV_TIMER)
3601 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3602
3603#if EV_PERIODIC_ENABLE
3604 if (types & EV_PERIODIC)
3605 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3606 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3607#endif
3608
3609#if EV_IDLE_ENABLE
3610 if (types & EV_IDLE)
3611 for (j = NUMPRI; i--; )
3612 for (i = idlecnt [j]; i--; )
3613 cb (EV_A_ EV_IDLE, idles [j][i]);
3614#endif
3615
3616#if EV_FORK_ENABLE
3617 if (types & EV_FORK)
3618 for (i = forkcnt; i--; )
3619 if (ev_cb (forks [i]) != embed_fork_cb)
3620 cb (EV_A_ EV_FORK, forks [i]);
3621#endif
3622
3623#if EV_ASYNC_ENABLE
3624 if (types & EV_ASYNC)
3625 for (i = asynccnt; i--; )
3626 cb (EV_A_ EV_ASYNC, asyncs [i]);
3627#endif
3628
3629 if (types & EV_PREPARE)
3630 for (i = preparecnt; i--; )
3631#if EV_EMBED_ENABLE
3632 if (ev_cb (prepares [i]) != embed_prepare_cb)
3633#endif
3634 cb (EV_A_ EV_PREPARE, prepares [i]);
3635
3636 if (types & EV_CHECK)
3637 for (i = checkcnt; i--; )
3638 cb (EV_A_ EV_CHECK, checks [i]);
3639
3640 if (types & EV_SIGNAL)
3641 for (i = 0; i < EV_NSIG - 1; ++i)
3642 for (wl = signals [i].head; wl; )
3643 {
3644 wn = wl->next;
3645 cb (EV_A_ EV_SIGNAL, wl);
3646 wl = wn;
3647 }
3648
3649 if (types & EV_CHILD)
3650 for (i = EV_PID_HASHSIZE; i--; )
3651 for (wl = childs [i]; wl; )
3652 {
3653 wn = wl->next;
3654 cb (EV_A_ EV_CHILD, wl);
3655 wl = wn;
3656 }
3657/* EV_STAT 0x00001000 /* stat data changed */
3658/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3659}
3660#endif
3661
3095#if EV_MULTIPLICITY 3662#if EV_MULTIPLICITY
3096 #include "ev_wrap.h" 3663 #include "ev_wrap.h"
3097#endif 3664#endif
3098 3665
3099#ifdef __cplusplus 3666#ifdef __cplusplus

Diff Legend

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