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

Comparing libev/ev.c (file contents):
Revision 1.264 by root, Mon Oct 13 23:20:12 2008 UTC vs.
Revision 1.306 by root, Sun Jul 19 06:35:25 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
… …
119# else 133# else
120# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
121# endif 135# endif
122# endif 136# endif
123 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
124# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD 147# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
127# else 149# else
128# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
… …
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/* one some platforms, NSIG is one too large. we do not bother */
193#if defined (EV_NSIG)
194/* use what's provided */
195#elif defined (NSIG)
196# define EV_NSIG (NSIG)
197#elif defined(_NSIG)
198# define EV_NSIG (_NSIG)
199#elif defined (SIGMAX)
200# define EV_NSIG (SIGMAX+1)
201#elif defined (SIG_MAX)
202# define EV_NSIG (SIG_MAX+1)
203#elif defined (_SIG_MAX)
204# define EV_NSIG (_SIG_MAX+1)
205#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else
214# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */
216# define EV_NSIG 65
217#endif
218
219#ifndef EV_USE_CLOCK_SYSCALL
220# if __linux && __GLIBC__ >= 2
221# define EV_USE_CLOCK_SYSCALL 1
222# else
223# define EV_USE_CLOCK_SYSCALL 0
224# endif
225#endif
226
169#ifndef EV_USE_MONOTONIC 227#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 228# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 229# define EV_USE_MONOTONIC 1
172# else 230# else
173# define EV_USE_MONOTONIC 0 231# define EV_USE_MONOTONIC 0
174# endif 232# endif
175#endif 233#endif
176 234
177#ifndef EV_USE_REALTIME 235#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 236# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 237#endif
180 238
181#ifndef EV_USE_NANOSLEEP 239#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 240# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 241# define EV_USE_NANOSLEEP 1
… …
244# else 302# else
245# define EV_USE_EVENTFD 0 303# define EV_USE_EVENTFD 0
246# endif 304# endif
247#endif 305#endif
248 306
307#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))
309# define EV_USE_SIGNALFD 1
310# else
311# define EV_USE_SIGNALFD 0
312# endif
313#endif
314
249#if 0 /* debugging */ 315#if 0 /* debugging */
250# define EV_VERIFY 3 316# define EV_VERIFY 3
251# define EV_USE_4HEAP 1 317# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1 318# define EV_HEAP_CACHE_AT 1
253#endif 319#endif
… …
262 328
263#ifndef EV_HEAP_CACHE_AT 329#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL 330# define EV_HEAP_CACHE_AT !EV_MINIMAL
265#endif 331#endif
266 332
333/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
334/* which makes programs even slower. might work on other unices, too. */
335#if EV_USE_CLOCK_SYSCALL
336# include <syscall.h>
337# ifdef SYS_clock_gettime
338# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
339# undef EV_USE_MONOTONIC
340# define EV_USE_MONOTONIC 1
341# else
342# undef EV_USE_CLOCK_SYSCALL
343# define EV_USE_CLOCK_SYSCALL 0
344# endif
345#endif
346
267/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 347/* this block fixes any misconfiguration where we know we run into trouble otherwise */
268 348
269#ifndef CLOCK_MONOTONIC 349#ifndef CLOCK_MONOTONIC
270# undef EV_USE_MONOTONIC 350# undef EV_USE_MONOTONIC
271# define EV_USE_MONOTONIC 0 351# define EV_USE_MONOTONIC 0
… …
287# endif 367# endif
288#endif 368#endif
289 369
290#if EV_USE_INOTIFY 370#if EV_USE_INOTIFY
291# include <sys/utsname.h> 371# include <sys/utsname.h>
372# include <sys/statfs.h>
292# include <sys/inotify.h> 373# include <sys/inotify.h>
293/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 374/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
294# ifndef IN_DONT_FOLLOW 375# ifndef IN_DONT_FOLLOW
295# undef EV_USE_INOTIFY 376# undef EV_USE_INOTIFY
296# define EV_USE_INOTIFY 0 377# define EV_USE_INOTIFY 0
… …
302#endif 383#endif
303 384
304#if EV_USE_EVENTFD 385#if EV_USE_EVENTFD
305/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 386/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
306# include <stdint.h> 387# include <stdint.h>
388# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK
390# endif
391# ifndef EFD_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC
393# endif
307# ifdef __cplusplus 394# ifdef __cplusplus
308extern "C" { 395extern "C" {
309# endif 396# endif
310int eventfd (unsigned int initval, int flags); 397int eventfd (unsigned int initval, int flags);
311# ifdef __cplusplus 398# ifdef __cplusplus
312} 399}
313# endif 400# endif
401#endif
402
403#if EV_USE_SIGNALFD
404# include <sys/signalfd.h>
314#endif 405#endif
315 406
316/**/ 407/**/
317 408
318#if EV_VERIFY >= 3 409#if EV_VERIFY >= 3
… …
354# define inline_speed static noinline 445# define inline_speed static noinline
355#else 446#else
356# define inline_speed static inline 447# define inline_speed static inline
357#endif 448#endif
358 449
359#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 450#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
451
452#if EV_MINPRI == EV_MAXPRI
453# define ABSPRI(w) (((W)w), 0)
454#else
360#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 455# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
456#endif
361 457
362#define EMPTY /* required for microsofts broken pseudo-c compiler */ 458#define EMPTY /* required for microsofts broken pseudo-c compiler */
363#define EMPTY2(a,b) /* used to suppress some warnings */ 459#define EMPTY2(a,b) /* used to suppress some warnings */
364 460
365typedef ev_watcher *W; 461typedef ev_watcher *W;
… …
367typedef ev_watcher_time *WT; 463typedef ev_watcher_time *WT;
368 464
369#define ev_active(w) ((W)(w))->active 465#define ev_active(w) ((W)(w))->active
370#define ev_at(w) ((WT)(w))->at 466#define ev_at(w) ((WT)(w))->at
371 467
372#if EV_USE_MONOTONIC 468#if EV_USE_REALTIME
373/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 469/* sig_atomic_t is used to avoid per-thread variables or locking but still */
374/* giving it a reasonably high chance of working on typical architetcures */ 470/* giving it a reasonably high chance of working on typical architetcures */
471static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
472#endif
473
474#if EV_USE_MONOTONIC
375static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 475static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
376#endif 476#endif
377 477
378#ifdef _WIN32 478#ifdef _WIN32
379# include "ev_win32.c" 479# include "ev_win32.c"
… …
388{ 488{
389 syserr_cb = cb; 489 syserr_cb = cb;
390} 490}
391 491
392static void noinline 492static void noinline
393syserr (const char *msg) 493ev_syserr (const char *msg)
394{ 494{
395 if (!msg) 495 if (!msg)
396 msg = "(libev) system error"; 496 msg = "(libev) system error";
397 497
398 if (syserr_cb) 498 if (syserr_cb)
… …
444#define ev_malloc(size) ev_realloc (0, (size)) 544#define ev_malloc(size) ev_realloc (0, (size))
445#define ev_free(ptr) ev_realloc ((ptr), 0) 545#define ev_free(ptr) ev_realloc ((ptr), 0)
446 546
447/*****************************************************************************/ 547/*****************************************************************************/
448 548
549/* set in reify when reification needed */
550#define EV_ANFD_REIFY 1
551
552/* file descriptor info structure */
449typedef struct 553typedef struct
450{ 554{
451 WL head; 555 WL head;
452 unsigned char events; 556 unsigned char events; /* the events watched for */
557 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
558 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
453 unsigned char reify; 559 unsigned char unused;
560#if EV_USE_EPOLL
561 unsigned int egen; /* generation counter to counter epoll bugs */
562#endif
454#if EV_SELECT_IS_WINSOCKET 563#if EV_SELECT_IS_WINSOCKET
455 SOCKET handle; 564 SOCKET handle;
456#endif 565#endif
457} ANFD; 566} ANFD;
458 567
568/* stores the pending event set for a given watcher */
459typedef struct 569typedef struct
460{ 570{
461 W w; 571 W w;
462 int events; 572 int events; /* the pending event set for the given watcher */
463} ANPENDING; 573} ANPENDING;
464 574
465#if EV_USE_INOTIFY 575#if EV_USE_INOTIFY
466/* hash table entry per inotify-id */ 576/* hash table entry per inotify-id */
467typedef struct 577typedef struct
… …
470} ANFS; 580} ANFS;
471#endif 581#endif
472 582
473/* Heap Entry */ 583/* Heap Entry */
474#if EV_HEAP_CACHE_AT 584#if EV_HEAP_CACHE_AT
585 /* a heap element */
475 typedef struct { 586 typedef struct {
476 ev_tstamp at; 587 ev_tstamp at;
477 WT w; 588 WT w;
478 } ANHE; 589 } ANHE;
479 590
480 #define ANHE_w(he) (he).w /* access watcher, read-write */ 591 #define ANHE_w(he) (he).w /* access watcher, read-write */
481 #define ANHE_at(he) (he).at /* access cached at, read-only */ 592 #define ANHE_at(he) (he).at /* access cached at, read-only */
482 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 593 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
483#else 594#else
595 /* a heap element */
484 typedef WT ANHE; 596 typedef WT ANHE;
485 597
486 #define ANHE_w(he) (he) 598 #define ANHE_w(he) (he)
487 #define ANHE_at(he) (he)->at 599 #define ANHE_at(he) (he)->at
488 #define ANHE_at_cache(he) 600 #define ANHE_at_cache(he)
… …
512 624
513 static int ev_default_loop_ptr; 625 static int ev_default_loop_ptr;
514 626
515#endif 627#endif
516 628
629#if EV_MINIMAL < 2
630# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
631# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
632# define EV_INVOKE_PENDING invoke_cb (EV_A)
633#else
634# define EV_RELEASE_CB (void)0
635# define EV_ACQUIRE_CB (void)0
636# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
637#endif
638
639#define EVUNLOOP_RECURSE 0x80
640
517/*****************************************************************************/ 641/*****************************************************************************/
518 642
643#ifndef EV_HAVE_EV_TIME
519ev_tstamp 644ev_tstamp
520ev_time (void) 645ev_time (void)
521{ 646{
522#if EV_USE_REALTIME 647#if EV_USE_REALTIME
648 if (expect_true (have_realtime))
649 {
523 struct timespec ts; 650 struct timespec ts;
524 clock_gettime (CLOCK_REALTIME, &ts); 651 clock_gettime (CLOCK_REALTIME, &ts);
525 return ts.tv_sec + ts.tv_nsec * 1e-9; 652 return ts.tv_sec + ts.tv_nsec * 1e-9;
526#else 653 }
654#endif
655
527 struct timeval tv; 656 struct timeval tv;
528 gettimeofday (&tv, 0); 657 gettimeofday (&tv, 0);
529 return tv.tv_sec + tv.tv_usec * 1e-6; 658 return tv.tv_sec + tv.tv_usec * 1e-6;
530#endif
531} 659}
660#endif
532 661
533ev_tstamp inline_size 662inline_size ev_tstamp
534get_clock (void) 663get_clock (void)
535{ 664{
536#if EV_USE_MONOTONIC 665#if EV_USE_MONOTONIC
537 if (expect_true (have_monotonic)) 666 if (expect_true (have_monotonic))
538 { 667 {
… …
572 701
573 tv.tv_sec = (time_t)delay; 702 tv.tv_sec = (time_t)delay;
574 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 703 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
575 704
576 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 705 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
577 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 706 /* something not guaranteed by newer posix versions, but guaranteed */
578 /* by older ones */ 707 /* by older ones */
579 select (0, 0, 0, 0, &tv); 708 select (0, 0, 0, 0, &tv);
580#endif 709#endif
581 } 710 }
582} 711}
583 712
584/*****************************************************************************/ 713/*****************************************************************************/
585 714
586#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 715#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
587 716
588int inline_size 717/* find a suitable new size for the given array, */
718/* hopefully by rounding to a ncie-to-malloc size */
719inline_size int
589array_nextsize (int elem, int cur, int cnt) 720array_nextsize (int elem, int cur, int cnt)
590{ 721{
591 int ncur = cur + 1; 722 int ncur = cur + 1;
592 723
593 do 724 do
… …
610array_realloc (int elem, void *base, int *cur, int cnt) 741array_realloc (int elem, void *base, int *cur, int cnt)
611{ 742{
612 *cur = array_nextsize (elem, *cur, cnt); 743 *cur = array_nextsize (elem, *cur, cnt);
613 return ev_realloc (base, elem * *cur); 744 return ev_realloc (base, elem * *cur);
614} 745}
746
747#define array_init_zero(base,count) \
748 memset ((void *)(base), 0, sizeof (*(base)) * (count))
615 749
616#define array_needsize(type,base,cur,cnt,init) \ 750#define array_needsize(type,base,cur,cnt,init) \
617 if (expect_false ((cnt) > (cur))) \ 751 if (expect_false ((cnt) > (cur))) \
618 { \ 752 { \
619 int ocur_ = (cur); \ 753 int ocur_ = (cur); \
… …
631 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 765 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
632 } 766 }
633#endif 767#endif
634 768
635#define array_free(stem, idx) \ 769#define array_free(stem, idx) \
636 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 770 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
637 771
638/*****************************************************************************/ 772/*****************************************************************************/
773
774/* dummy callback for pending events */
775static void noinline
776pendingcb (EV_P_ ev_prepare *w, int revents)
777{
778}
639 779
640void noinline 780void noinline
641ev_feed_event (EV_P_ void *w, int revents) 781ev_feed_event (EV_P_ void *w, int revents)
642{ 782{
643 W w_ = (W)w; 783 W w_ = (W)w;
… …
652 pendings [pri][w_->pending - 1].w = w_; 792 pendings [pri][w_->pending - 1].w = w_;
653 pendings [pri][w_->pending - 1].events = revents; 793 pendings [pri][w_->pending - 1].events = revents;
654 } 794 }
655} 795}
656 796
657void inline_speed 797inline_speed void
798feed_reverse (EV_P_ W w)
799{
800 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
801 rfeeds [rfeedcnt++] = w;
802}
803
804inline_size void
805feed_reverse_done (EV_P_ int revents)
806{
807 do
808 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
809 while (rfeedcnt);
810}
811
812inline_speed void
658queue_events (EV_P_ W *events, int eventcnt, int type) 813queue_events (EV_P_ W *events, int eventcnt, int type)
659{ 814{
660 int i; 815 int i;
661 816
662 for (i = 0; i < eventcnt; ++i) 817 for (i = 0; i < eventcnt; ++i)
663 ev_feed_event (EV_A_ events [i], type); 818 ev_feed_event (EV_A_ events [i], type);
664} 819}
665 820
666/*****************************************************************************/ 821/*****************************************************************************/
667 822
668void inline_size 823inline_speed void
669anfds_init (ANFD *base, int count)
670{
671 while (count--)
672 {
673 base->head = 0;
674 base->events = EV_NONE;
675 base->reify = 0;
676
677 ++base;
678 }
679}
680
681void inline_speed
682fd_event (EV_P_ int fd, int revents) 824fd_event_nc (EV_P_ int fd, int revents)
683{ 825{
684 ANFD *anfd = anfds + fd; 826 ANFD *anfd = anfds + fd;
685 ev_io *w; 827 ev_io *w;
686 828
687 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 829 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
691 if (ev) 833 if (ev)
692 ev_feed_event (EV_A_ (W)w, ev); 834 ev_feed_event (EV_A_ (W)w, ev);
693 } 835 }
694} 836}
695 837
838/* do not submit kernel events for fds that have reify set */
839/* because that means they changed while we were polling for new events */
840inline_speed void
841fd_event (EV_P_ int fd, int revents)
842{
843 ANFD *anfd = anfds + fd;
844
845 if (expect_true (!anfd->reify))
846 fd_event_nc (EV_A_ fd, revents);
847}
848
696void 849void
697ev_feed_fd_event (EV_P_ int fd, int revents) 850ev_feed_fd_event (EV_P_ int fd, int revents)
698{ 851{
699 if (fd >= 0 && fd < anfdmax) 852 if (fd >= 0 && fd < anfdmax)
700 fd_event (EV_A_ fd, revents); 853 fd_event_nc (EV_A_ fd, revents);
701} 854}
702 855
703void inline_size 856/* make sure the external fd watch events are in-sync */
857/* with the kernel/libev internal state */
858inline_size void
704fd_reify (EV_P) 859fd_reify (EV_P)
705{ 860{
706 int i; 861 int i;
707 862
708 for (i = 0; i < fdchangecnt; ++i) 863 for (i = 0; i < fdchangecnt; ++i)
… …
723 #ifdef EV_FD_TO_WIN32_HANDLE 878 #ifdef EV_FD_TO_WIN32_HANDLE
724 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 879 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
725 #else 880 #else
726 anfd->handle = _get_osfhandle (fd); 881 anfd->handle = _get_osfhandle (fd);
727 #endif 882 #endif
728 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 883 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
729 } 884 }
730#endif 885#endif
731 886
732 { 887 {
733 unsigned char o_events = anfd->events; 888 unsigned char o_events = anfd->events;
734 unsigned char o_reify = anfd->reify; 889 unsigned char o_reify = anfd->reify;
735 890
736 anfd->reify = 0; 891 anfd->reify = 0;
737 anfd->events = events; 892 anfd->events = events;
738 893
739 if (o_events != events || o_reify & EV_IOFDSET) 894 if (o_events != events || o_reify & EV__IOFDSET)
740 backend_modify (EV_A_ fd, o_events, events); 895 backend_modify (EV_A_ fd, o_events, events);
741 } 896 }
742 } 897 }
743 898
744 fdchangecnt = 0; 899 fdchangecnt = 0;
745} 900}
746 901
747void inline_size 902/* something about the given fd changed */
903inline_size void
748fd_change (EV_P_ int fd, int flags) 904fd_change (EV_P_ int fd, int flags)
749{ 905{
750 unsigned char reify = anfds [fd].reify; 906 unsigned char reify = anfds [fd].reify;
751 anfds [fd].reify |= flags; 907 anfds [fd].reify |= flags;
752 908
… …
756 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 912 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
757 fdchanges [fdchangecnt - 1] = fd; 913 fdchanges [fdchangecnt - 1] = fd;
758 } 914 }
759} 915}
760 916
761void inline_speed 917/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
918inline_speed void
762fd_kill (EV_P_ int fd) 919fd_kill (EV_P_ int fd)
763{ 920{
764 ev_io *w; 921 ev_io *w;
765 922
766 while ((w = (ev_io *)anfds [fd].head)) 923 while ((w = (ev_io *)anfds [fd].head))
… …
768 ev_io_stop (EV_A_ w); 925 ev_io_stop (EV_A_ w);
769 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 926 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
770 } 927 }
771} 928}
772 929
773int inline_size 930/* check whether the given fd is atcually valid, for error recovery */
931inline_size int
774fd_valid (int fd) 932fd_valid (int fd)
775{ 933{
776#ifdef _WIN32 934#ifdef _WIN32
777 return _get_osfhandle (fd) != -1; 935 return _get_osfhandle (fd) != -1;
778#else 936#else
… …
814 972
815 for (fd = 0; fd < anfdmax; ++fd) 973 for (fd = 0; fd < anfdmax; ++fd)
816 if (anfds [fd].events) 974 if (anfds [fd].events)
817 { 975 {
818 anfds [fd].events = 0; 976 anfds [fd].events = 0;
977 anfds [fd].emask = 0;
819 fd_change (EV_A_ fd, EV_IOFDSET | 1); 978 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
820 } 979 }
821} 980}
822 981
823/*****************************************************************************/ 982/*****************************************************************************/
824 983
… …
840#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 999#define HEAP0 (DHEAP - 1) /* index of first element in heap */
841#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1000#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
842#define UPHEAP_DONE(p,k) ((p) == (k)) 1001#define UPHEAP_DONE(p,k) ((p) == (k))
843 1002
844/* away from the root */ 1003/* away from the root */
845void inline_speed 1004inline_speed void
846downheap (ANHE *heap, int N, int k) 1005downheap (ANHE *heap, int N, int k)
847{ 1006{
848 ANHE he = heap [k]; 1007 ANHE he = heap [k];
849 ANHE *E = heap + N + HEAP0; 1008 ANHE *E = heap + N + HEAP0;
850 1009
… …
890#define HEAP0 1 1049#define HEAP0 1
891#define HPARENT(k) ((k) >> 1) 1050#define HPARENT(k) ((k) >> 1)
892#define UPHEAP_DONE(p,k) (!(p)) 1051#define UPHEAP_DONE(p,k) (!(p))
893 1052
894/* away from the root */ 1053/* away from the root */
895void inline_speed 1054inline_speed void
896downheap (ANHE *heap, int N, int k) 1055downheap (ANHE *heap, int N, int k)
897{ 1056{
898 ANHE he = heap [k]; 1057 ANHE he = heap [k];
899 1058
900 for (;;) 1059 for (;;)
… …
920 ev_active (ANHE_w (he)) = k; 1079 ev_active (ANHE_w (he)) = k;
921} 1080}
922#endif 1081#endif
923 1082
924/* towards the root */ 1083/* towards the root */
925void inline_speed 1084inline_speed void
926upheap (ANHE *heap, int k) 1085upheap (ANHE *heap, int k)
927{ 1086{
928 ANHE he = heap [k]; 1087 ANHE he = heap [k];
929 1088
930 for (;;) 1089 for (;;)
… …
941 1100
942 heap [k] = he; 1101 heap [k] = he;
943 ev_active (ANHE_w (he)) = k; 1102 ev_active (ANHE_w (he)) = k;
944} 1103}
945 1104
946void inline_size 1105/* move an element suitably so it is in a correct place */
1106inline_size void
947adjustheap (ANHE *heap, int N, int k) 1107adjustheap (ANHE *heap, int N, int k)
948{ 1108{
949 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1109 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
950 upheap (heap, k); 1110 upheap (heap, k);
951 else 1111 else
952 downheap (heap, N, k); 1112 downheap (heap, N, k);
953} 1113}
954 1114
955/* rebuild the heap: this function is used only once and executed rarely */ 1115/* rebuild the heap: this function is used only once and executed rarely */
956void inline_size 1116inline_size void
957reheap (ANHE *heap, int N) 1117reheap (ANHE *heap, int N)
958{ 1118{
959 int i; 1119 int i;
960 1120
961 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1121 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
964 upheap (heap, i + HEAP0); 1124 upheap (heap, i + HEAP0);
965} 1125}
966 1126
967/*****************************************************************************/ 1127/*****************************************************************************/
968 1128
1129/* associate signal watchers to a signal signal */
969typedef struct 1130typedef struct
970{ 1131{
1132#if EV_MULTIPLICITY
1133 EV_P;
1134#endif
971 WL head; 1135 WL head;
972 EV_ATOMIC_T gotsig; 1136 EV_ATOMIC_T gotsig;
973} ANSIG; 1137} ANSIG;
974 1138
975static ANSIG *signals; 1139static ANSIG signals [EV_NSIG - 1];
976static int signalmax;
977
978static EV_ATOMIC_T gotsig; 1140static EV_ATOMIC_T gotsig;
979 1141
980void inline_size
981signals_init (ANSIG *base, int count)
982{
983 while (count--)
984 {
985 base->head = 0;
986 base->gotsig = 0;
987
988 ++base;
989 }
990}
991
992/*****************************************************************************/ 1142/*****************************************************************************/
993 1143
994void inline_speed 1144/* used to prepare libev internal fd's */
1145/* this is not fork-safe */
1146inline_speed void
995fd_intern (int fd) 1147fd_intern (int fd)
996{ 1148{
997#ifdef _WIN32 1149#ifdef _WIN32
998 unsigned long arg = 1; 1150 unsigned long arg = 1;
999 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1151 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
1004} 1156}
1005 1157
1006static void noinline 1158static void noinline
1007evpipe_init (EV_P) 1159evpipe_init (EV_P)
1008{ 1160{
1009 if (!ev_is_active (&pipeev)) 1161 if (!ev_is_active (&pipe_w))
1010 { 1162 {
1011#if EV_USE_EVENTFD 1163#if EV_USE_EVENTFD
1164 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1165 if (evfd < 0 && errno == EINVAL)
1012 if ((evfd = eventfd (0, 0)) >= 0) 1166 evfd = eventfd (0, 0);
1167
1168 if (evfd >= 0)
1013 { 1169 {
1014 evpipe [0] = -1; 1170 evpipe [0] = -1;
1015 fd_intern (evfd); 1171 fd_intern (evfd); /* doing it twice doesn't hurt */
1016 ev_io_set (&pipeev, evfd, EV_READ); 1172 ev_io_set (&pipe_w, evfd, EV_READ);
1017 } 1173 }
1018 else 1174 else
1019#endif 1175#endif
1020 { 1176 {
1021 while (pipe (evpipe)) 1177 while (pipe (evpipe))
1022 syserr ("(libev) error creating signal/async pipe"); 1178 ev_syserr ("(libev) error creating signal/async pipe");
1023 1179
1024 fd_intern (evpipe [0]); 1180 fd_intern (evpipe [0]);
1025 fd_intern (evpipe [1]); 1181 fd_intern (evpipe [1]);
1026 ev_io_set (&pipeev, evpipe [0], EV_READ); 1182 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1027 } 1183 }
1028 1184
1029 ev_io_start (EV_A_ &pipeev); 1185 ev_io_start (EV_A_ &pipe_w);
1030 ev_unref (EV_A); /* watcher should not keep loop alive */ 1186 ev_unref (EV_A); /* watcher should not keep loop alive */
1031 } 1187 }
1032} 1188}
1033 1189
1034void inline_size 1190inline_size void
1035evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1191evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1036{ 1192{
1037 if (!*flag) 1193 if (!*flag)
1038 { 1194 {
1039 int old_errno = errno; /* save errno because write might clobber it */ 1195 int old_errno = errno; /* save errno because write might clobber it */
… …
1052 1208
1053 errno = old_errno; 1209 errno = old_errno;
1054 } 1210 }
1055} 1211}
1056 1212
1213/* called whenever the libev signal pipe */
1214/* got some events (signal, async) */
1057static void 1215static void
1058pipecb (EV_P_ ev_io *iow, int revents) 1216pipecb (EV_P_ ev_io *iow, int revents)
1059{ 1217{
1060#if EV_USE_EVENTFD 1218#if EV_USE_EVENTFD
1061 if (evfd >= 0) 1219 if (evfd >= 0)
… …
1073 if (gotsig && ev_is_default_loop (EV_A)) 1231 if (gotsig && ev_is_default_loop (EV_A))
1074 { 1232 {
1075 int signum; 1233 int signum;
1076 gotsig = 0; 1234 gotsig = 0;
1077 1235
1078 for (signum = signalmax; signum--; ) 1236 for (signum = EV_NSIG - 1; signum--; )
1079 if (signals [signum].gotsig) 1237 if (signals [signum].gotsig)
1080 ev_feed_signal_event (EV_A_ signum + 1); 1238 ev_feed_signal_event (EV_A_ signum + 1);
1081 } 1239 }
1082 1240
1083#if EV_ASYNC_ENABLE 1241#if EV_ASYNC_ENABLE
… …
1100 1258
1101static void 1259static void
1102ev_sighandler (int signum) 1260ev_sighandler (int signum)
1103{ 1261{
1104#if EV_MULTIPLICITY 1262#if EV_MULTIPLICITY
1105 struct ev_loop *loop = &default_loop_struct; 1263 EV_P = signals [signum - 1].loop;
1106#endif 1264#endif
1107 1265
1108#if _WIN32 1266#if _WIN32
1109 signal (signum, ev_sighandler); 1267 signal (signum, ev_sighandler);
1110#endif 1268#endif
… …
1117ev_feed_signal_event (EV_P_ int signum) 1275ev_feed_signal_event (EV_P_ int signum)
1118{ 1276{
1119 WL w; 1277 WL w;
1120 1278
1121#if EV_MULTIPLICITY 1279#if EV_MULTIPLICITY
1122 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1280 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1123#endif 1281#endif
1282
1283 if (signum <= 0 || signum > EV_NSIG)
1284 return;
1124 1285
1125 --signum; 1286 --signum;
1126
1127 if (signum < 0 || signum >= signalmax)
1128 return;
1129 1287
1130 signals [signum].gotsig = 0; 1288 signals [signum].gotsig = 0;
1131 1289
1132 for (w = signals [signum].head; w; w = w->next) 1290 for (w = signals [signum].head; w; w = w->next)
1133 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1291 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1134} 1292}
1135 1293
1294#if EV_USE_SIGNALFD
1295static void
1296sigfdcb (EV_P_ ev_io *iow, int revents)
1297{
1298 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1299
1300 for (;;)
1301 {
1302 ssize_t res = read (sigfd, si, sizeof (si));
1303
1304 /* not ISO-C, as res might be -1, but works with SuS */
1305 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1306 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1307
1308 if (res < (ssize_t)sizeof (si))
1309 break;
1310 }
1311}
1312#endif
1313
1136/*****************************************************************************/ 1314/*****************************************************************************/
1137 1315
1138static WL childs [EV_PID_HASHSIZE]; 1316static WL childs [EV_PID_HASHSIZE];
1139 1317
1140#ifndef _WIN32 1318#ifndef _WIN32
… …
1143 1321
1144#ifndef WIFCONTINUED 1322#ifndef WIFCONTINUED
1145# define WIFCONTINUED(status) 0 1323# define WIFCONTINUED(status) 0
1146#endif 1324#endif
1147 1325
1148void inline_speed 1326/* handle a single child status event */
1327inline_speed void
1149child_reap (EV_P_ int chain, int pid, int status) 1328child_reap (EV_P_ int chain, int pid, int status)
1150{ 1329{
1151 ev_child *w; 1330 ev_child *w;
1152 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1331 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1153 1332
… …
1166 1345
1167#ifndef WCONTINUED 1346#ifndef WCONTINUED
1168# define WCONTINUED 0 1347# define WCONTINUED 0
1169#endif 1348#endif
1170 1349
1350/* called on sigchld etc., calls waitpid */
1171static void 1351static void
1172childcb (EV_P_ ev_signal *sw, int revents) 1352childcb (EV_P_ ev_signal *sw, int revents)
1173{ 1353{
1174 int pid, status; 1354 int pid, status;
1175 1355
… …
1256 /* kqueue is borked on everything but netbsd apparently */ 1436 /* kqueue is borked on everything but netbsd apparently */
1257 /* it usually doesn't work correctly on anything but sockets and pipes */ 1437 /* it usually doesn't work correctly on anything but sockets and pipes */
1258 flags &= ~EVBACKEND_KQUEUE; 1438 flags &= ~EVBACKEND_KQUEUE;
1259#endif 1439#endif
1260#ifdef __APPLE__ 1440#ifdef __APPLE__
1261 // flags &= ~EVBACKEND_KQUEUE; for documentation 1441 /* only select works correctly on that "unix-certified" platform */
1262 flags &= ~EVBACKEND_POLL; 1442 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1443 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1263#endif 1444#endif
1264 1445
1265 return flags; 1446 return flags;
1266} 1447}
1267 1448
… …
1281ev_backend (EV_P) 1462ev_backend (EV_P)
1282{ 1463{
1283 return backend; 1464 return backend;
1284} 1465}
1285 1466
1467#if EV_MINIMAL < 2
1286unsigned int 1468unsigned int
1287ev_loop_count (EV_P) 1469ev_loop_count (EV_P)
1288{ 1470{
1289 return loop_count; 1471 return loop_count;
1290} 1472}
1291 1473
1474unsigned int
1475ev_loop_depth (EV_P)
1476{
1477 return loop_depth;
1478}
1479
1292void 1480void
1293ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1481ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1294{ 1482{
1295 io_blocktime = interval; 1483 io_blocktime = interval;
1296} 1484}
… …
1299ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1487ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1300{ 1488{
1301 timeout_blocktime = interval; 1489 timeout_blocktime = interval;
1302} 1490}
1303 1491
1492void
1493ev_set_userdata (EV_P_ void *data)
1494{
1495 userdata = data;
1496}
1497
1498void *
1499ev_userdata (EV_P)
1500{
1501 return userdata;
1502}
1503
1504void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1505{
1506 invoke_cb = invoke_pending_cb;
1507}
1508
1509void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1510{
1511 release_cb = release;
1512 acquire_cb = acquire;
1513}
1514#endif
1515
1516/* initialise a loop structure, must be zero-initialised */
1304static void noinline 1517static void noinline
1305loop_init (EV_P_ unsigned int flags) 1518loop_init (EV_P_ unsigned int flags)
1306{ 1519{
1307 if (!backend) 1520 if (!backend)
1308 { 1521 {
1522#if EV_USE_REALTIME
1523 if (!have_realtime)
1524 {
1525 struct timespec ts;
1526
1527 if (!clock_gettime (CLOCK_REALTIME, &ts))
1528 have_realtime = 1;
1529 }
1530#endif
1531
1309#if EV_USE_MONOTONIC 1532#if EV_USE_MONOTONIC
1533 if (!have_monotonic)
1310 { 1534 {
1311 struct timespec ts; 1535 struct timespec ts;
1536
1312 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1537 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1313 have_monotonic = 1; 1538 have_monotonic = 1;
1314 } 1539 }
1315#endif 1540#endif
1541
1542 /* pid check not overridable via env */
1543#ifndef _WIN32
1544 if (flags & EVFLAG_FORKCHECK)
1545 curpid = getpid ();
1546#endif
1547
1548 if (!(flags & EVFLAG_NOENV)
1549 && !enable_secure ()
1550 && getenv ("LIBEV_FLAGS"))
1551 flags = atoi (getenv ("LIBEV_FLAGS"));
1316 1552
1317 ev_rt_now = ev_time (); 1553 ev_rt_now = ev_time ();
1318 mn_now = get_clock (); 1554 mn_now = get_clock ();
1319 now_floor = mn_now; 1555 now_floor = mn_now;
1320 rtmn_diff = ev_rt_now - mn_now; 1556 rtmn_diff = ev_rt_now - mn_now;
1557#if EV_MINIMAL < 2
1558 invoke_cb = ev_invoke_pending;
1559#endif
1321 1560
1322 io_blocktime = 0.; 1561 io_blocktime = 0.;
1323 timeout_blocktime = 0.; 1562 timeout_blocktime = 0.;
1324 backend = 0; 1563 backend = 0;
1325 backend_fd = -1; 1564 backend_fd = -1;
1326 gotasync = 0; 1565 gotasync = 0;
1327#if EV_USE_INOTIFY 1566#if EV_USE_INOTIFY
1328 fs_fd = -2; 1567 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1329#endif 1568#endif
1330 1569#if EV_USE_SIGNALFD
1331 /* pid check not overridable via env */ 1570 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1332#ifndef _WIN32
1333 if (flags & EVFLAG_FORKCHECK)
1334 curpid = getpid ();
1335#endif 1571#endif
1336
1337 if (!(flags & EVFLAG_NOENV)
1338 && !enable_secure ()
1339 && getenv ("LIBEV_FLAGS"))
1340 flags = atoi (getenv ("LIBEV_FLAGS"));
1341 1572
1342 if (!(flags & 0x0000ffffU)) 1573 if (!(flags & 0x0000ffffU))
1343 flags |= ev_recommended_backends (); 1574 flags |= ev_recommended_backends ();
1344 1575
1345#if EV_USE_PORT 1576#if EV_USE_PORT
… …
1356#endif 1587#endif
1357#if EV_USE_SELECT 1588#if EV_USE_SELECT
1358 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1589 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1359#endif 1590#endif
1360 1591
1592 ev_prepare_init (&pending_w, pendingcb);
1593
1361 ev_init (&pipeev, pipecb); 1594 ev_init (&pipe_w, pipecb);
1362 ev_set_priority (&pipeev, EV_MAXPRI); 1595 ev_set_priority (&pipe_w, EV_MAXPRI);
1363 } 1596 }
1364} 1597}
1365 1598
1599/* free up a loop structure */
1366static void noinline 1600static void noinline
1367loop_destroy (EV_P) 1601loop_destroy (EV_P)
1368{ 1602{
1369 int i; 1603 int i;
1370 1604
1371 if (ev_is_active (&pipeev)) 1605 if (ev_is_active (&pipe_w))
1372 { 1606 {
1373 ev_ref (EV_A); /* signal watcher */ 1607 /*ev_ref (EV_A);*/
1374 ev_io_stop (EV_A_ &pipeev); 1608 /*ev_io_stop (EV_A_ &pipe_w);*/
1375 1609
1376#if EV_USE_EVENTFD 1610#if EV_USE_EVENTFD
1377 if (evfd >= 0) 1611 if (evfd >= 0)
1378 close (evfd); 1612 close (evfd);
1379#endif 1613#endif
… …
1383 close (evpipe [0]); 1617 close (evpipe [0]);
1384 close (evpipe [1]); 1618 close (evpipe [1]);
1385 } 1619 }
1386 } 1620 }
1387 1621
1622#if EV_USE_SIGNALFD
1623 if (ev_is_active (&sigfd_w))
1624 {
1625 /*ev_ref (EV_A);*/
1626 /*ev_io_stop (EV_A_ &sigfd_w);*/
1627
1628 close (sigfd);
1629 }
1630#endif
1631
1388#if EV_USE_INOTIFY 1632#if EV_USE_INOTIFY
1389 if (fs_fd >= 0) 1633 if (fs_fd >= 0)
1390 close (fs_fd); 1634 close (fs_fd);
1391#endif 1635#endif
1392 1636
… …
1415#if EV_IDLE_ENABLE 1659#if EV_IDLE_ENABLE
1416 array_free (idle, [i]); 1660 array_free (idle, [i]);
1417#endif 1661#endif
1418 } 1662 }
1419 1663
1420 ev_free (anfds); anfdmax = 0; 1664 ev_free (anfds); anfds = 0; anfdmax = 0;
1421 1665
1422 /* have to use the microsoft-never-gets-it-right macro */ 1666 /* have to use the microsoft-never-gets-it-right macro */
1667 array_free (rfeed, EMPTY);
1423 array_free (fdchange, EMPTY); 1668 array_free (fdchange, EMPTY);
1424 array_free (timer, EMPTY); 1669 array_free (timer, EMPTY);
1425#if EV_PERIODIC_ENABLE 1670#if EV_PERIODIC_ENABLE
1426 array_free (periodic, EMPTY); 1671 array_free (periodic, EMPTY);
1427#endif 1672#endif
… …
1436 1681
1437 backend = 0; 1682 backend = 0;
1438} 1683}
1439 1684
1440#if EV_USE_INOTIFY 1685#if EV_USE_INOTIFY
1441void inline_size infy_fork (EV_P); 1686inline_size void infy_fork (EV_P);
1442#endif 1687#endif
1443 1688
1444void inline_size 1689inline_size void
1445loop_fork (EV_P) 1690loop_fork (EV_P)
1446{ 1691{
1447#if EV_USE_PORT 1692#if EV_USE_PORT
1448 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1693 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1449#endif 1694#endif
… …
1455#endif 1700#endif
1456#if EV_USE_INOTIFY 1701#if EV_USE_INOTIFY
1457 infy_fork (EV_A); 1702 infy_fork (EV_A);
1458#endif 1703#endif
1459 1704
1460 if (ev_is_active (&pipeev)) 1705 if (ev_is_active (&pipe_w))
1461 { 1706 {
1462 /* this "locks" the handlers against writing to the pipe */ 1707 /* this "locks" the handlers against writing to the pipe */
1463 /* while we modify the fd vars */ 1708 /* while we modify the fd vars */
1464 gotsig = 1; 1709 gotsig = 1;
1465#if EV_ASYNC_ENABLE 1710#if EV_ASYNC_ENABLE
1466 gotasync = 1; 1711 gotasync = 1;
1467#endif 1712#endif
1468 1713
1469 ev_ref (EV_A); 1714 ev_ref (EV_A);
1470 ev_io_stop (EV_A_ &pipeev); 1715 ev_io_stop (EV_A_ &pipe_w);
1471 1716
1472#if EV_USE_EVENTFD 1717#if EV_USE_EVENTFD
1473 if (evfd >= 0) 1718 if (evfd >= 0)
1474 close (evfd); 1719 close (evfd);
1475#endif 1720#endif
… …
1480 close (evpipe [1]); 1725 close (evpipe [1]);
1481 } 1726 }
1482 1727
1483 evpipe_init (EV_A); 1728 evpipe_init (EV_A);
1484 /* now iterate over everything, in case we missed something */ 1729 /* now iterate over everything, in case we missed something */
1485 pipecb (EV_A_ &pipeev, EV_READ); 1730 pipecb (EV_A_ &pipe_w, EV_READ);
1486 } 1731 }
1487 1732
1488 postfork = 0; 1733 postfork = 0;
1489} 1734}
1490 1735
1491#if EV_MULTIPLICITY 1736#if EV_MULTIPLICITY
1492 1737
1493struct ev_loop * 1738struct ev_loop *
1494ev_loop_new (unsigned int flags) 1739ev_loop_new (unsigned int flags)
1495{ 1740{
1496 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1741 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1497 1742
1498 memset (loop, 0, sizeof (struct ev_loop)); 1743 memset (EV_A, 0, sizeof (struct ev_loop));
1499
1500 loop_init (EV_A_ flags); 1744 loop_init (EV_A_ flags);
1501 1745
1502 if (ev_backend (EV_A)) 1746 if (ev_backend (EV_A))
1503 return loop; 1747 return EV_A;
1504 1748
1505 return 0; 1749 return 0;
1506} 1750}
1507 1751
1508void 1752void
… …
1515void 1759void
1516ev_loop_fork (EV_P) 1760ev_loop_fork (EV_P)
1517{ 1761{
1518 postfork = 1; /* must be in line with ev_default_fork */ 1762 postfork = 1; /* must be in line with ev_default_fork */
1519} 1763}
1764#endif /* multiplicity */
1520 1765
1521#if EV_VERIFY 1766#if EV_VERIFY
1522static void noinline 1767static void noinline
1523verify_watcher (EV_P_ W w) 1768verify_watcher (EV_P_ W w)
1524{ 1769{
1525 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1770 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1526 1771
1527 if (w->pending) 1772 if (w->pending)
1528 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1773 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1529} 1774}
1530 1775
1531static void noinline 1776static void noinline
1532verify_heap (EV_P_ ANHE *heap, int N) 1777verify_heap (EV_P_ ANHE *heap, int N)
1533{ 1778{
1534 int i; 1779 int i;
1535 1780
1536 for (i = HEAP0; i < N + HEAP0; ++i) 1781 for (i = HEAP0; i < N + HEAP0; ++i)
1537 { 1782 {
1538 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1783 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1539 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1784 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1540 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1785 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1541 1786
1542 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1787 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1543 } 1788 }
1544} 1789}
1545 1790
1546static void noinline 1791static void noinline
1547array_verify (EV_P_ W *ws, int cnt) 1792array_verify (EV_P_ W *ws, int cnt)
1548{ 1793{
1549 while (cnt--) 1794 while (cnt--)
1550 { 1795 {
1551 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1796 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1552 verify_watcher (EV_A_ ws [cnt]); 1797 verify_watcher (EV_A_ ws [cnt]);
1553 } 1798 }
1554} 1799}
1555#endif 1800#endif
1556 1801
1802#if EV_MINIMAL < 2
1557void 1803void
1558ev_loop_verify (EV_P) 1804ev_loop_verify (EV_P)
1559{ 1805{
1560#if EV_VERIFY 1806#if EV_VERIFY
1561 int i; 1807 int i;
… …
1563 1809
1564 assert (activecnt >= -1); 1810 assert (activecnt >= -1);
1565 1811
1566 assert (fdchangemax >= fdchangecnt); 1812 assert (fdchangemax >= fdchangecnt);
1567 for (i = 0; i < fdchangecnt; ++i) 1813 for (i = 0; i < fdchangecnt; ++i)
1568 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1814 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1569 1815
1570 assert (anfdmax >= 0); 1816 assert (anfdmax >= 0);
1571 for (i = 0; i < anfdmax; ++i) 1817 for (i = 0; i < anfdmax; ++i)
1572 for (w = anfds [i].head; w; w = w->next) 1818 for (w = anfds [i].head; w; w = w->next)
1573 { 1819 {
1574 verify_watcher (EV_A_ (W)w); 1820 verify_watcher (EV_A_ (W)w);
1575 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1821 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1576 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1822 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1577 } 1823 }
1578 1824
1579 assert (timermax >= timercnt); 1825 assert (timermax >= timercnt);
1580 verify_heap (EV_A_ timers, timercnt); 1826 verify_heap (EV_A_ timers, timercnt);
1581 1827
… …
1610 assert (checkmax >= checkcnt); 1856 assert (checkmax >= checkcnt);
1611 array_verify (EV_A_ (W *)checks, checkcnt); 1857 array_verify (EV_A_ (W *)checks, checkcnt);
1612 1858
1613# if 0 1859# if 0
1614 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1860 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1615 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1861 for (signum = EV_NSIG; signum--; ) if (signals [signum].gotsig)
1616# endif 1862# endif
1617#endif 1863#endif
1618} 1864}
1619 1865#endif
1620#endif /* multiplicity */
1621 1866
1622#if EV_MULTIPLICITY 1867#if EV_MULTIPLICITY
1623struct ev_loop * 1868struct ev_loop *
1624ev_default_loop_init (unsigned int flags) 1869ev_default_loop_init (unsigned int flags)
1625#else 1870#else
… …
1628#endif 1873#endif
1629{ 1874{
1630 if (!ev_default_loop_ptr) 1875 if (!ev_default_loop_ptr)
1631 { 1876 {
1632#if EV_MULTIPLICITY 1877#if EV_MULTIPLICITY
1633 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1878 EV_P = ev_default_loop_ptr = &default_loop_struct;
1634#else 1879#else
1635 ev_default_loop_ptr = 1; 1880 ev_default_loop_ptr = 1;
1636#endif 1881#endif
1637 1882
1638 loop_init (EV_A_ flags); 1883 loop_init (EV_A_ flags);
… …
1655 1900
1656void 1901void
1657ev_default_destroy (void) 1902ev_default_destroy (void)
1658{ 1903{
1659#if EV_MULTIPLICITY 1904#if EV_MULTIPLICITY
1660 struct ev_loop *loop = ev_default_loop_ptr; 1905 EV_P = ev_default_loop_ptr;
1661#endif 1906#endif
1907
1908 ev_default_loop_ptr = 0;
1662 1909
1663#ifndef _WIN32 1910#ifndef _WIN32
1664 ev_ref (EV_A); /* child watcher */ 1911 ev_ref (EV_A); /* child watcher */
1665 ev_signal_stop (EV_A_ &childev); 1912 ev_signal_stop (EV_A_ &childev);
1666#endif 1913#endif
… …
1670 1917
1671void 1918void
1672ev_default_fork (void) 1919ev_default_fork (void)
1673{ 1920{
1674#if EV_MULTIPLICITY 1921#if EV_MULTIPLICITY
1675 struct ev_loop *loop = ev_default_loop_ptr; 1922 EV_P = ev_default_loop_ptr;
1676#endif 1923#endif
1677 1924
1678 if (backend)
1679 postfork = 1; /* must be in line with ev_loop_fork */ 1925 postfork = 1; /* must be in line with ev_loop_fork */
1680} 1926}
1681 1927
1682/*****************************************************************************/ 1928/*****************************************************************************/
1683 1929
1684void 1930void
1685ev_invoke (EV_P_ void *w, int revents) 1931ev_invoke (EV_P_ void *w, int revents)
1686{ 1932{
1687 EV_CB_INVOKE ((W)w, revents); 1933 EV_CB_INVOKE ((W)w, revents);
1688} 1934}
1689 1935
1690void inline_speed 1936unsigned int
1691call_pending (EV_P) 1937ev_pending_count (EV_P)
1938{
1939 int pri;
1940 unsigned int count = 0;
1941
1942 for (pri = NUMPRI; pri--; )
1943 count += pendingcnt [pri];
1944
1945 return count;
1946}
1947
1948void noinline
1949ev_invoke_pending (EV_P)
1692{ 1950{
1693 int pri; 1951 int pri;
1694 1952
1695 for (pri = NUMPRI; pri--; ) 1953 for (pri = NUMPRI; pri--; )
1696 while (pendingcnt [pri]) 1954 while (pendingcnt [pri])
1697 { 1955 {
1698 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1956 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1699 1957
1700 if (expect_true (p->w))
1701 {
1702 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1958 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1959 /* ^ this is no longer true, as pending_w could be here */
1703 1960
1704 p->w->pending = 0; 1961 p->w->pending = 0;
1705 EV_CB_INVOKE (p->w, p->events); 1962 EV_CB_INVOKE (p->w, p->events);
1706 EV_FREQUENT_CHECK; 1963 EV_FREQUENT_CHECK;
1707 }
1708 } 1964 }
1709} 1965}
1710 1966
1711#if EV_IDLE_ENABLE 1967#if EV_IDLE_ENABLE
1712void inline_size 1968/* make idle watchers pending. this handles the "call-idle */
1969/* only when higher priorities are idle" logic */
1970inline_size void
1713idle_reify (EV_P) 1971idle_reify (EV_P)
1714{ 1972{
1715 if (expect_false (idleall)) 1973 if (expect_false (idleall))
1716 { 1974 {
1717 int pri; 1975 int pri;
… …
1729 } 1987 }
1730 } 1988 }
1731} 1989}
1732#endif 1990#endif
1733 1991
1734void inline_size 1992/* make timers pending */
1993inline_size void
1735timers_reify (EV_P) 1994timers_reify (EV_P)
1736{ 1995{
1737 EV_FREQUENT_CHECK; 1996 EV_FREQUENT_CHECK;
1738 1997
1739 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1998 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1740 { 1999 {
1741 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2000 do
1742
1743 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1744
1745 /* first reschedule or stop timer */
1746 if (w->repeat)
1747 { 2001 {
2002 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2003
2004 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2005
2006 /* first reschedule or stop timer */
2007 if (w->repeat)
2008 {
1748 ev_at (w) += w->repeat; 2009 ev_at (w) += w->repeat;
1749 if (ev_at (w) < mn_now) 2010 if (ev_at (w) < mn_now)
1750 ev_at (w) = mn_now; 2011 ev_at (w) = mn_now;
1751 2012
1752 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2013 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1753 2014
1754 ANHE_at_cache (timers [HEAP0]); 2015 ANHE_at_cache (timers [HEAP0]);
1755 downheap (timers, timercnt, HEAP0); 2016 downheap (timers, timercnt, HEAP0);
2017 }
2018 else
2019 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2020
2021 EV_FREQUENT_CHECK;
2022 feed_reverse (EV_A_ (W)w);
1756 } 2023 }
1757 else 2024 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1758 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1759 2025
1760 EV_FREQUENT_CHECK;
1761 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2026 feed_reverse_done (EV_A_ EV_TIMEOUT);
1762 } 2027 }
1763} 2028}
1764 2029
1765#if EV_PERIODIC_ENABLE 2030#if EV_PERIODIC_ENABLE
1766void inline_size 2031/* make periodics pending */
2032inline_size void
1767periodics_reify (EV_P) 2033periodics_reify (EV_P)
1768{ 2034{
1769 EV_FREQUENT_CHECK; 2035 EV_FREQUENT_CHECK;
1770 2036
1771 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2037 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1772 { 2038 {
1773 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2039 int feed_count = 0;
1774 2040
1775 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2041 do
1776
1777 /* first reschedule or stop timer */
1778 if (w->reschedule_cb)
1779 { 2042 {
2043 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2044
2045 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2046
2047 /* first reschedule or stop timer */
2048 if (w->reschedule_cb)
2049 {
1780 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2050 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1781 2051
1782 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2052 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1783 2053
1784 ANHE_at_cache (periodics [HEAP0]); 2054 ANHE_at_cache (periodics [HEAP0]);
1785 downheap (periodics, periodiccnt, HEAP0); 2055 downheap (periodics, periodiccnt, HEAP0);
2056 }
2057 else if (w->interval)
2058 {
2059 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2060 /* if next trigger time is not sufficiently in the future, put it there */
2061 /* this might happen because of floating point inexactness */
2062 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2063 {
2064 ev_at (w) += w->interval;
2065
2066 /* if interval is unreasonably low we might still have a time in the past */
2067 /* so correct this. this will make the periodic very inexact, but the user */
2068 /* has effectively asked to get triggered more often than possible */
2069 if (ev_at (w) < ev_rt_now)
2070 ev_at (w) = ev_rt_now;
2071 }
2072
2073 ANHE_at_cache (periodics [HEAP0]);
2074 downheap (periodics, periodiccnt, HEAP0);
2075 }
2076 else
2077 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2078
2079 EV_FREQUENT_CHECK;
2080 feed_reverse (EV_A_ (W)w);
1786 } 2081 }
1787 else if (w->interval) 2082 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1788 {
1789 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1790 /* if next trigger time is not sufficiently in the future, put it there */
1791 /* this might happen because of floating point inexactness */
1792 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1793 {
1794 ev_at (w) += w->interval;
1795 2083
1796 /* if interval is unreasonably low we might still have a time in the past */
1797 /* so correct this. this will make the periodic very inexact, but the user */
1798 /* has effectively asked to get triggered more often than possible */
1799 if (ev_at (w) < ev_rt_now)
1800 ev_at (w) = ev_rt_now;
1801 }
1802
1803 ANHE_at_cache (periodics [HEAP0]);
1804 downheap (periodics, periodiccnt, HEAP0);
1805 }
1806 else
1807 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1808
1809 EV_FREQUENT_CHECK;
1810 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2084 feed_reverse_done (EV_A_ EV_PERIODIC);
1811 } 2085 }
1812} 2086}
1813 2087
2088/* simply recalculate all periodics */
2089/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1814static void noinline 2090static void noinline
1815periodics_reschedule (EV_P) 2091periodics_reschedule (EV_P)
1816{ 2092{
1817 int i; 2093 int i;
1818 2094
… …
1831 2107
1832 reheap (periodics, periodiccnt); 2108 reheap (periodics, periodiccnt);
1833} 2109}
1834#endif 2110#endif
1835 2111
1836void inline_speed 2112/* adjust all timers by a given offset */
2113static void noinline
2114timers_reschedule (EV_P_ ev_tstamp adjust)
2115{
2116 int i;
2117
2118 for (i = 0; i < timercnt; ++i)
2119 {
2120 ANHE *he = timers + i + HEAP0;
2121 ANHE_w (*he)->at += adjust;
2122 ANHE_at_cache (*he);
2123 }
2124}
2125
2126/* fetch new monotonic and realtime times from the kernel */
2127/* also detetc if there was a timejump, and act accordingly */
2128inline_speed void
1837time_update (EV_P_ ev_tstamp max_block) 2129time_update (EV_P_ ev_tstamp max_block)
1838{ 2130{
1839 int i;
1840
1841#if EV_USE_MONOTONIC 2131#if EV_USE_MONOTONIC
1842 if (expect_true (have_monotonic)) 2132 if (expect_true (have_monotonic))
1843 { 2133 {
2134 int i;
1844 ev_tstamp odiff = rtmn_diff; 2135 ev_tstamp odiff = rtmn_diff;
1845 2136
1846 mn_now = get_clock (); 2137 mn_now = get_clock ();
1847 2138
1848 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2139 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1874 ev_rt_now = ev_time (); 2165 ev_rt_now = ev_time ();
1875 mn_now = get_clock (); 2166 mn_now = get_clock ();
1876 now_floor = mn_now; 2167 now_floor = mn_now;
1877 } 2168 }
1878 2169
2170 /* no timer adjustment, as the monotonic clock doesn't jump */
2171 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1879# if EV_PERIODIC_ENABLE 2172# if EV_PERIODIC_ENABLE
1880 periodics_reschedule (EV_A); 2173 periodics_reschedule (EV_A);
1881# endif 2174# endif
1882 /* no timer adjustment, as the monotonic clock doesn't jump */
1883 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1884 } 2175 }
1885 else 2176 else
1886#endif 2177#endif
1887 { 2178 {
1888 ev_rt_now = ev_time (); 2179 ev_rt_now = ev_time ();
1889 2180
1890 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2181 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1891 { 2182 {
2183 /* adjust timers. this is easy, as the offset is the same for all of them */
2184 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1892#if EV_PERIODIC_ENABLE 2185#if EV_PERIODIC_ENABLE
1893 periodics_reschedule (EV_A); 2186 periodics_reschedule (EV_A);
1894#endif 2187#endif
1895 /* adjust timers. this is easy, as the offset is the same for all of them */
1896 for (i = 0; i < timercnt; ++i)
1897 {
1898 ANHE *he = timers + i + HEAP0;
1899 ANHE_w (*he)->at += ev_rt_now - mn_now;
1900 ANHE_at_cache (*he);
1901 }
1902 } 2188 }
1903 2189
1904 mn_now = ev_rt_now; 2190 mn_now = ev_rt_now;
1905 } 2191 }
1906} 2192}
1907 2193
1908void 2194void
1909ev_ref (EV_P)
1910{
1911 ++activecnt;
1912}
1913
1914void
1915ev_unref (EV_P)
1916{
1917 --activecnt;
1918}
1919
1920void
1921ev_now_update (EV_P)
1922{
1923 time_update (EV_A_ 1e100);
1924}
1925
1926static int loop_done;
1927
1928void
1929ev_loop (EV_P_ int flags) 2195ev_loop (EV_P_ int flags)
1930{ 2196{
2197#if EV_MINIMAL < 2
2198 ++loop_depth;
2199#endif
2200
2201 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2202
1931 loop_done = EVUNLOOP_CANCEL; 2203 loop_done = EVUNLOOP_CANCEL;
1932 2204
1933 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2205 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1934 2206
1935 do 2207 do
1936 { 2208 {
1937#if EV_VERIFY >= 2 2209#if EV_VERIFY >= 2
1938 ev_loop_verify (EV_A); 2210 ev_loop_verify (EV_A);
… …
1951 /* we might have forked, so queue fork handlers */ 2223 /* we might have forked, so queue fork handlers */
1952 if (expect_false (postfork)) 2224 if (expect_false (postfork))
1953 if (forkcnt) 2225 if (forkcnt)
1954 { 2226 {
1955 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2227 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1956 call_pending (EV_A); 2228 EV_INVOKE_PENDING;
1957 } 2229 }
1958#endif 2230#endif
1959 2231
1960 /* queue prepare watchers (and execute them) */ 2232 /* queue prepare watchers (and execute them) */
1961 if (expect_false (preparecnt)) 2233 if (expect_false (preparecnt))
1962 { 2234 {
1963 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2235 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1964 call_pending (EV_A); 2236 EV_INVOKE_PENDING;
1965 } 2237 }
1966 2238
1967 if (expect_false (!activecnt)) 2239 if (expect_false (loop_done))
1968 break; 2240 break;
1969 2241
1970 /* we might have forked, so reify kernel state if necessary */ 2242 /* we might have forked, so reify kernel state if necessary */
1971 if (expect_false (postfork)) 2243 if (expect_false (postfork))
1972 loop_fork (EV_A); 2244 loop_fork (EV_A);
… …
1979 ev_tstamp waittime = 0.; 2251 ev_tstamp waittime = 0.;
1980 ev_tstamp sleeptime = 0.; 2252 ev_tstamp sleeptime = 0.;
1981 2253
1982 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2254 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1983 { 2255 {
2256 /* remember old timestamp for io_blocktime calculation */
2257 ev_tstamp prev_mn_now = mn_now;
2258
1984 /* update time to cancel out callback processing overhead */ 2259 /* update time to cancel out callback processing overhead */
1985 time_update (EV_A_ 1e100); 2260 time_update (EV_A_ 1e100);
1986 2261
1987 waittime = MAX_BLOCKTIME; 2262 waittime = MAX_BLOCKTIME;
1988 2263
… …
1998 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2273 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1999 if (waittime > to) waittime = to; 2274 if (waittime > to) waittime = to;
2000 } 2275 }
2001#endif 2276#endif
2002 2277
2278 /* don't let timeouts decrease the waittime below timeout_blocktime */
2003 if (expect_false (waittime < timeout_blocktime)) 2279 if (expect_false (waittime < timeout_blocktime))
2004 waittime = timeout_blocktime; 2280 waittime = timeout_blocktime;
2005 2281
2006 sleeptime = waittime - backend_fudge; 2282 /* extra check because io_blocktime is commonly 0 */
2007
2008 if (expect_true (sleeptime > io_blocktime)) 2283 if (expect_false (io_blocktime))
2009 sleeptime = io_blocktime;
2010
2011 if (sleeptime)
2012 { 2284 {
2285 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2286
2287 if (sleeptime > waittime - backend_fudge)
2288 sleeptime = waittime - backend_fudge;
2289
2290 if (expect_true (sleeptime > 0.))
2291 {
2013 ev_sleep (sleeptime); 2292 ev_sleep (sleeptime);
2014 waittime -= sleeptime; 2293 waittime -= sleeptime;
2294 }
2015 } 2295 }
2016 } 2296 }
2017 2297
2298#if EV_MINIMAL < 2
2018 ++loop_count; 2299 ++loop_count;
2300#endif
2301 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2019 backend_poll (EV_A_ waittime); 2302 backend_poll (EV_A_ waittime);
2303 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2020 2304
2021 /* update ev_rt_now, do magic */ 2305 /* update ev_rt_now, do magic */
2022 time_update (EV_A_ waittime + sleeptime); 2306 time_update (EV_A_ waittime + sleeptime);
2023 } 2307 }
2024 2308
… …
2035 2319
2036 /* queue check watchers, to be executed first */ 2320 /* queue check watchers, to be executed first */
2037 if (expect_false (checkcnt)) 2321 if (expect_false (checkcnt))
2038 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2322 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2039 2323
2040 call_pending (EV_A); 2324 EV_INVOKE_PENDING;
2041 } 2325 }
2042 while (expect_true ( 2326 while (expect_true (
2043 activecnt 2327 activecnt
2044 && !loop_done 2328 && !loop_done
2045 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2329 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2046 )); 2330 ));
2047 2331
2048 if (loop_done == EVUNLOOP_ONE) 2332 if (loop_done == EVUNLOOP_ONE)
2049 loop_done = EVUNLOOP_CANCEL; 2333 loop_done = EVUNLOOP_CANCEL;
2334
2335#if EV_MINIMAL < 2
2336 --loop_depth;
2337#endif
2050} 2338}
2051 2339
2052void 2340void
2053ev_unloop (EV_P_ int how) 2341ev_unloop (EV_P_ int how)
2054{ 2342{
2055 loop_done = how; 2343 loop_done = how;
2056} 2344}
2057 2345
2346void
2347ev_ref (EV_P)
2348{
2349 ++activecnt;
2350}
2351
2352void
2353ev_unref (EV_P)
2354{
2355 --activecnt;
2356}
2357
2358void
2359ev_now_update (EV_P)
2360{
2361 time_update (EV_A_ 1e100);
2362}
2363
2364void
2365ev_suspend (EV_P)
2366{
2367 ev_now_update (EV_A);
2368}
2369
2370void
2371ev_resume (EV_P)
2372{
2373 ev_tstamp mn_prev = mn_now;
2374
2375 ev_now_update (EV_A);
2376 timers_reschedule (EV_A_ mn_now - mn_prev);
2377#if EV_PERIODIC_ENABLE
2378 /* TODO: really do this? */
2379 periodics_reschedule (EV_A);
2380#endif
2381}
2382
2058/*****************************************************************************/ 2383/*****************************************************************************/
2384/* singly-linked list management, used when the expected list length is short */
2059 2385
2060void inline_size 2386inline_size void
2061wlist_add (WL *head, WL elem) 2387wlist_add (WL *head, WL elem)
2062{ 2388{
2063 elem->next = *head; 2389 elem->next = *head;
2064 *head = elem; 2390 *head = elem;
2065} 2391}
2066 2392
2067void inline_size 2393inline_size void
2068wlist_del (WL *head, WL elem) 2394wlist_del (WL *head, WL elem)
2069{ 2395{
2070 while (*head) 2396 while (*head)
2071 { 2397 {
2072 if (*head == elem) 2398 if (*head == elem)
… …
2077 2403
2078 head = &(*head)->next; 2404 head = &(*head)->next;
2079 } 2405 }
2080} 2406}
2081 2407
2082void inline_speed 2408/* internal, faster, version of ev_clear_pending */
2409inline_speed void
2083clear_pending (EV_P_ W w) 2410clear_pending (EV_P_ W w)
2084{ 2411{
2085 if (w->pending) 2412 if (w->pending)
2086 { 2413 {
2087 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2414 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2088 w->pending = 0; 2415 w->pending = 0;
2089 } 2416 }
2090} 2417}
2091 2418
2092int 2419int
… …
2096 int pending = w_->pending; 2423 int pending = w_->pending;
2097 2424
2098 if (expect_true (pending)) 2425 if (expect_true (pending))
2099 { 2426 {
2100 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2427 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2428 p->w = (W)&pending_w;
2101 w_->pending = 0; 2429 w_->pending = 0;
2102 p->w = 0;
2103 return p->events; 2430 return p->events;
2104 } 2431 }
2105 else 2432 else
2106 return 0; 2433 return 0;
2107} 2434}
2108 2435
2109void inline_size 2436inline_size void
2110pri_adjust (EV_P_ W w) 2437pri_adjust (EV_P_ W w)
2111{ 2438{
2112 int pri = w->priority; 2439 int pri = ev_priority (w);
2113 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2440 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2114 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2441 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2115 w->priority = pri; 2442 ev_set_priority (w, pri);
2116} 2443}
2117 2444
2118void inline_speed 2445inline_speed void
2119ev_start (EV_P_ W w, int active) 2446ev_start (EV_P_ W w, int active)
2120{ 2447{
2121 pri_adjust (EV_A_ w); 2448 pri_adjust (EV_A_ w);
2122 w->active = active; 2449 w->active = active;
2123 ev_ref (EV_A); 2450 ev_ref (EV_A);
2124} 2451}
2125 2452
2126void inline_size 2453inline_size void
2127ev_stop (EV_P_ W w) 2454ev_stop (EV_P_ W w)
2128{ 2455{
2129 ev_unref (EV_A); 2456 ev_unref (EV_A);
2130 w->active = 0; 2457 w->active = 0;
2131} 2458}
… …
2138 int fd = w->fd; 2465 int fd = w->fd;
2139 2466
2140 if (expect_false (ev_is_active (w))) 2467 if (expect_false (ev_is_active (w)))
2141 return; 2468 return;
2142 2469
2143 assert (("ev_io_start called with negative fd", fd >= 0)); 2470 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2471 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2144 2472
2145 EV_FREQUENT_CHECK; 2473 EV_FREQUENT_CHECK;
2146 2474
2147 ev_start (EV_A_ (W)w, 1); 2475 ev_start (EV_A_ (W)w, 1);
2148 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2476 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2149 wlist_add (&anfds[fd].head, (WL)w); 2477 wlist_add (&anfds[fd].head, (WL)w);
2150 2478
2151 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2479 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2152 w->events &= ~EV_IOFDSET; 2480 w->events &= ~EV__IOFDSET;
2153 2481
2154 EV_FREQUENT_CHECK; 2482 EV_FREQUENT_CHECK;
2155} 2483}
2156 2484
2157void noinline 2485void noinline
… …
2159{ 2487{
2160 clear_pending (EV_A_ (W)w); 2488 clear_pending (EV_A_ (W)w);
2161 if (expect_false (!ev_is_active (w))) 2489 if (expect_false (!ev_is_active (w)))
2162 return; 2490 return;
2163 2491
2164 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2492 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2165 2493
2166 EV_FREQUENT_CHECK; 2494 EV_FREQUENT_CHECK;
2167 2495
2168 wlist_del (&anfds[w->fd].head, (WL)w); 2496 wlist_del (&anfds[w->fd].head, (WL)w);
2169 ev_stop (EV_A_ (W)w); 2497 ev_stop (EV_A_ (W)w);
… …
2179 if (expect_false (ev_is_active (w))) 2507 if (expect_false (ev_is_active (w)))
2180 return; 2508 return;
2181 2509
2182 ev_at (w) += mn_now; 2510 ev_at (w) += mn_now;
2183 2511
2184 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2512 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2185 2513
2186 EV_FREQUENT_CHECK; 2514 EV_FREQUENT_CHECK;
2187 2515
2188 ++timercnt; 2516 ++timercnt;
2189 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2517 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2192 ANHE_at_cache (timers [ev_active (w)]); 2520 ANHE_at_cache (timers [ev_active (w)]);
2193 upheap (timers, ev_active (w)); 2521 upheap (timers, ev_active (w));
2194 2522
2195 EV_FREQUENT_CHECK; 2523 EV_FREQUENT_CHECK;
2196 2524
2197 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2525 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2198} 2526}
2199 2527
2200void noinline 2528void noinline
2201ev_timer_stop (EV_P_ ev_timer *w) 2529ev_timer_stop (EV_P_ ev_timer *w)
2202{ 2530{
… …
2207 EV_FREQUENT_CHECK; 2535 EV_FREQUENT_CHECK;
2208 2536
2209 { 2537 {
2210 int active = ev_active (w); 2538 int active = ev_active (w);
2211 2539
2212 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2540 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2213 2541
2214 --timercnt; 2542 --timercnt;
2215 2543
2216 if (expect_true (active < timercnt + HEAP0)) 2544 if (expect_true (active < timercnt + HEAP0))
2217 { 2545 {
… …
2250 } 2578 }
2251 2579
2252 EV_FREQUENT_CHECK; 2580 EV_FREQUENT_CHECK;
2253} 2581}
2254 2582
2583ev_tstamp
2584ev_timer_remaining (EV_P_ ev_timer *w)
2585{
2586 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2587}
2588
2255#if EV_PERIODIC_ENABLE 2589#if EV_PERIODIC_ENABLE
2256void noinline 2590void noinline
2257ev_periodic_start (EV_P_ ev_periodic *w) 2591ev_periodic_start (EV_P_ ev_periodic *w)
2258{ 2592{
2259 if (expect_false (ev_is_active (w))) 2593 if (expect_false (ev_is_active (w)))
… …
2261 2595
2262 if (w->reschedule_cb) 2596 if (w->reschedule_cb)
2263 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2597 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2264 else if (w->interval) 2598 else if (w->interval)
2265 { 2599 {
2266 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2600 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2267 /* this formula differs from the one in periodic_reify because we do not always round up */ 2601 /* this formula differs from the one in periodic_reify because we do not always round up */
2268 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2602 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2269 } 2603 }
2270 else 2604 else
2271 ev_at (w) = w->offset; 2605 ev_at (w) = w->offset;
… …
2279 ANHE_at_cache (periodics [ev_active (w)]); 2613 ANHE_at_cache (periodics [ev_active (w)]);
2280 upheap (periodics, ev_active (w)); 2614 upheap (periodics, ev_active (w));
2281 2615
2282 EV_FREQUENT_CHECK; 2616 EV_FREQUENT_CHECK;
2283 2617
2284 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2618 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2285} 2619}
2286 2620
2287void noinline 2621void noinline
2288ev_periodic_stop (EV_P_ ev_periodic *w) 2622ev_periodic_stop (EV_P_ ev_periodic *w)
2289{ 2623{
… …
2294 EV_FREQUENT_CHECK; 2628 EV_FREQUENT_CHECK;
2295 2629
2296 { 2630 {
2297 int active = ev_active (w); 2631 int active = ev_active (w);
2298 2632
2299 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2633 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2300 2634
2301 --periodiccnt; 2635 --periodiccnt;
2302 2636
2303 if (expect_true (active < periodiccnt + HEAP0)) 2637 if (expect_true (active < periodiccnt + HEAP0))
2304 { 2638 {
… …
2326#endif 2660#endif
2327 2661
2328void noinline 2662void noinline
2329ev_signal_start (EV_P_ ev_signal *w) 2663ev_signal_start (EV_P_ ev_signal *w)
2330{ 2664{
2331#if EV_MULTIPLICITY
2332 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2333#endif
2334 if (expect_false (ev_is_active (w))) 2665 if (expect_false (ev_is_active (w)))
2335 return; 2666 return;
2336 2667
2337 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2668 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2338 2669
2339 evpipe_init (EV_A); 2670#if EV_MULTIPLICITY
2671 assert (("libev: tried to attach to a signal from two different loops",
2672 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2340 2673
2341 EV_FREQUENT_CHECK; 2674 signals [w->signum - 1].loop = EV_A;
2675#endif
2342 2676
2677 EV_FREQUENT_CHECK;
2678
2679#if EV_USE_SIGNALFD
2680 if (sigfd == -2)
2343 { 2681 {
2344#ifndef _WIN32 2682 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2345 sigset_t full, prev; 2683 if (sigfd < 0 && errno == EINVAL)
2346 sigfillset (&full); 2684 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2347 sigprocmask (SIG_SETMASK, &full, &prev);
2348#endif
2349 2685
2350 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2686 if (sigfd >= 0)
2687 {
2688 fd_intern (sigfd); /* doing it twice will not hurt */
2351 2689
2352#ifndef _WIN32 2690 sigemptyset (&sigfd_set);
2353 sigprocmask (SIG_SETMASK, &prev, 0); 2691
2354#endif 2692 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2693 ev_set_priority (&sigfd_w, EV_MAXPRI);
2694 ev_io_start (EV_A_ &sigfd_w);
2695 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2696 }
2355 } 2697 }
2698
2699 if (sigfd >= 0)
2700 {
2701 /* TODO: check .head */
2702 sigaddset (&sigfd_set, w->signum);
2703 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2704
2705 signalfd (sigfd, &sigfd_set, 0);
2706 }
2707#endif
2356 2708
2357 ev_start (EV_A_ (W)w, 1); 2709 ev_start (EV_A_ (W)w, 1);
2358 wlist_add (&signals [w->signum - 1].head, (WL)w); 2710 wlist_add (&signals [w->signum - 1].head, (WL)w);
2359 2711
2360 if (!((WL)w)->next) 2712 if (!((WL)w)->next)
2713# if EV_USE_SIGNALFD
2714 if (sigfd < 0) /*TODO*/
2715# endif
2361 { 2716 {
2362#if _WIN32 2717# if _WIN32
2363 signal (w->signum, ev_sighandler); 2718 signal (w->signum, ev_sighandler);
2364#else 2719# else
2365 struct sigaction sa; 2720 struct sigaction sa;
2721
2722 evpipe_init (EV_A);
2723
2366 sa.sa_handler = ev_sighandler; 2724 sa.sa_handler = ev_sighandler;
2367 sigfillset (&sa.sa_mask); 2725 sigfillset (&sa.sa_mask);
2368 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2726 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2369 sigaction (w->signum, &sa, 0); 2727 sigaction (w->signum, &sa, 0);
2728
2729 sigemptyset (&sa.sa_mask);
2730 sigaddset (&sa.sa_mask, w->signum);
2731 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2370#endif 2732#endif
2371 } 2733 }
2372 2734
2373 EV_FREQUENT_CHECK; 2735 EV_FREQUENT_CHECK;
2374} 2736}
2375 2737
2376void noinline 2738void noinline
… …
2384 2746
2385 wlist_del (&signals [w->signum - 1].head, (WL)w); 2747 wlist_del (&signals [w->signum - 1].head, (WL)w);
2386 ev_stop (EV_A_ (W)w); 2748 ev_stop (EV_A_ (W)w);
2387 2749
2388 if (!signals [w->signum - 1].head) 2750 if (!signals [w->signum - 1].head)
2751 {
2752 #if EV_MULTIPLICITY
2753 signals [w->signum - 1].loop = 0; /* unattach from signal */
2754 #endif
2755 #if EV_USE_SIGNALFD
2756 if (sigfd >= 0)
2757 {
2758 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2759 sigdelset (&sigfd_set, w->signum);
2760 signalfd (sigfd, &sigfd_set, 0);
2761 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2762 /*TODO: maybe unblock signal? */
2763 }
2764 else
2765 #endif
2389 signal (w->signum, SIG_DFL); 2766 signal (w->signum, SIG_DFL);
2767 }
2390 2768
2391 EV_FREQUENT_CHECK; 2769 EV_FREQUENT_CHECK;
2392} 2770}
2393 2771
2394void 2772void
2395ev_child_start (EV_P_ ev_child *w) 2773ev_child_start (EV_P_ ev_child *w)
2396{ 2774{
2397#if EV_MULTIPLICITY 2775#if EV_MULTIPLICITY
2398 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2776 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2399#endif 2777#endif
2400 if (expect_false (ev_is_active (w))) 2778 if (expect_false (ev_is_active (w)))
2401 return; 2779 return;
2402 2780
2403 EV_FREQUENT_CHECK; 2781 EV_FREQUENT_CHECK;
… …
2428# ifdef _WIN32 2806# ifdef _WIN32
2429# undef lstat 2807# undef lstat
2430# define lstat(a,b) _stati64 (a,b) 2808# define lstat(a,b) _stati64 (a,b)
2431# endif 2809# endif
2432 2810
2433#define DEF_STAT_INTERVAL 5.0074891 2811#define DEF_STAT_INTERVAL 5.0074891
2812#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2434#define MIN_STAT_INTERVAL 0.1074891 2813#define MIN_STAT_INTERVAL 0.1074891
2435 2814
2436static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2815static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2437 2816
2438#if EV_USE_INOTIFY 2817#if EV_USE_INOTIFY
2439# define EV_INOTIFY_BUFSIZE 8192 2818# define EV_INOTIFY_BUFSIZE 8192
… …
2443{ 2822{
2444 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); 2823 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);
2445 2824
2446 if (w->wd < 0) 2825 if (w->wd < 0)
2447 { 2826 {
2827 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2448 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2828 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2449 2829
2450 /* monitor some parent directory for speedup hints */ 2830 /* monitor some parent directory for speedup hints */
2451 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2831 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2452 /* but an efficiency issue only */ 2832 /* but an efficiency issue only */
2453 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2833 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2454 { 2834 {
2455 char path [4096]; 2835 char path [4096];
2456 strcpy (path, w->path); 2836 strcpy (path, w->path);
… …
2460 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2840 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2461 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2841 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2462 2842
2463 char *pend = strrchr (path, '/'); 2843 char *pend = strrchr (path, '/');
2464 2844
2465 if (!pend) 2845 if (!pend || pend == path)
2466 break; /* whoops, no '/', complain to your admin */ 2846 break;
2467 2847
2468 *pend = 0; 2848 *pend = 0;
2469 w->wd = inotify_add_watch (fs_fd, path, mask); 2849 w->wd = inotify_add_watch (fs_fd, path, mask);
2470 } 2850 }
2471 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2851 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2472 } 2852 }
2473 } 2853 }
2474 else
2475 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2476 2854
2477 if (w->wd >= 0) 2855 if (w->wd >= 0)
2856 {
2478 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2857 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2858
2859 /* now local changes will be tracked by inotify, but remote changes won't */
2860 /* unless the filesystem it known to be local, we therefore still poll */
2861 /* also do poll on <2.6.25, but with normal frequency */
2862 struct statfs sfs;
2863
2864 if (fs_2625 && !statfs (w->path, &sfs))
2865 if (sfs.f_type == 0x1373 /* devfs */
2866 || sfs.f_type == 0xEF53 /* ext2/3 */
2867 || sfs.f_type == 0x3153464a /* jfs */
2868 || sfs.f_type == 0x52654973 /* reiser3 */
2869 || sfs.f_type == 0x01021994 /* tempfs */
2870 || sfs.f_type == 0x58465342 /* xfs */)
2871 return;
2872
2873 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2874 ev_timer_again (EV_A_ &w->timer);
2875 }
2479} 2876}
2480 2877
2481static void noinline 2878static void noinline
2482infy_del (EV_P_ ev_stat *w) 2879infy_del (EV_P_ ev_stat *w)
2483{ 2880{
… …
2513 2910
2514 if (w->wd == wd || wd == -1) 2911 if (w->wd == wd || wd == -1)
2515 { 2912 {
2516 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2913 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2517 { 2914 {
2915 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2518 w->wd = -1; 2916 w->wd = -1;
2519 infy_add (EV_A_ w); /* re-add, no matter what */ 2917 infy_add (EV_A_ w); /* re-add, no matter what */
2520 } 2918 }
2521 2919
2522 stat_timer_cb (EV_A_ &w->timer, 0); 2920 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2535 2933
2536 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2934 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2537 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2935 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2538} 2936}
2539 2937
2540void inline_size 2938inline_size void
2541infy_init (EV_P) 2939check_2625 (EV_P)
2542{ 2940{
2543 if (fs_fd != -2)
2544 return;
2545
2546 /* kernels < 2.6.25 are borked 2941 /* kernels < 2.6.25 are borked
2547 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2942 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2548 */ 2943 */
2549 {
2550 struct utsname buf; 2944 struct utsname buf;
2551 int major, minor, micro; 2945 int major, minor, micro;
2552 2946
2553 fs_fd = -1;
2554
2555 if (uname (&buf)) 2947 if (uname (&buf))
2556 return; 2948 return;
2557 2949
2558 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3) 2950 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2559 return; 2951 return;
2560 2952
2561 if (major < 2 2953 if (major < 2
2562 || (major == 2 && minor < 6) 2954 || (major == 2 && minor < 6)
2563 || (major == 2 && minor == 6 && micro < 25)) 2955 || (major == 2 && minor == 6 && micro < 25))
2564 return; 2956 return;
2565 } 2957
2958 fs_2625 = 1;
2959}
2960
2961inline_size void
2962infy_init (EV_P)
2963{
2964 if (fs_fd != -2)
2965 return;
2966
2967 fs_fd = -1;
2968
2969 check_2625 (EV_A);
2566 2970
2567 fs_fd = inotify_init (); 2971 fs_fd = inotify_init ();
2568 2972
2569 if (fs_fd >= 0) 2973 if (fs_fd >= 0)
2570 { 2974 {
… …
2572 ev_set_priority (&fs_w, EV_MAXPRI); 2976 ev_set_priority (&fs_w, EV_MAXPRI);
2573 ev_io_start (EV_A_ &fs_w); 2977 ev_io_start (EV_A_ &fs_w);
2574 } 2978 }
2575} 2979}
2576 2980
2577void inline_size 2981inline_size void
2578infy_fork (EV_P) 2982infy_fork (EV_P)
2579{ 2983{
2580 int slot; 2984 int slot;
2581 2985
2582 if (fs_fd < 0) 2986 if (fs_fd < 0)
… …
2598 w->wd = -1; 3002 w->wd = -1;
2599 3003
2600 if (fs_fd >= 0) 3004 if (fs_fd >= 0)
2601 infy_add (EV_A_ w); /* re-add, no matter what */ 3005 infy_add (EV_A_ w); /* re-add, no matter what */
2602 else 3006 else
2603 ev_timer_start (EV_A_ &w->timer); 3007 ev_timer_again (EV_A_ &w->timer);
2604 } 3008 }
2605 } 3009 }
2606} 3010}
2607 3011
2608#endif 3012#endif
… …
2663ev_stat_start (EV_P_ ev_stat *w) 3067ev_stat_start (EV_P_ ev_stat *w)
2664{ 3068{
2665 if (expect_false (ev_is_active (w))) 3069 if (expect_false (ev_is_active (w)))
2666 return; 3070 return;
2667 3071
2668 /* since we use memcmp, we need to clear any padding data etc. */
2669 memset (&w->prev, 0, sizeof (ev_statdata));
2670 memset (&w->attr, 0, sizeof (ev_statdata));
2671
2672 ev_stat_stat (EV_A_ w); 3072 ev_stat_stat (EV_A_ w);
2673 3073
3074 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2674 if (w->interval < MIN_STAT_INTERVAL) 3075 w->interval = MIN_STAT_INTERVAL;
2675 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2676 3076
2677 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3077 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2678 ev_set_priority (&w->timer, ev_priority (w)); 3078 ev_set_priority (&w->timer, ev_priority (w));
2679 3079
2680#if EV_USE_INOTIFY 3080#if EV_USE_INOTIFY
2681 infy_init (EV_A); 3081 infy_init (EV_A);
2682 3082
2683 if (fs_fd >= 0) 3083 if (fs_fd >= 0)
2684 infy_add (EV_A_ w); 3084 infy_add (EV_A_ w);
2685 else 3085 else
2686#endif 3086#endif
2687 ev_timer_start (EV_A_ &w->timer); 3087 ev_timer_again (EV_A_ &w->timer);
2688 3088
2689 ev_start (EV_A_ (W)w, 1); 3089 ev_start (EV_A_ (W)w, 1);
2690 3090
2691 EV_FREQUENT_CHECK; 3091 EV_FREQUENT_CHECK;
2692} 3092}
… …
2852embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3252embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2853{ 3253{
2854 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3254 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2855 3255
2856 { 3256 {
2857 struct ev_loop *loop = w->other; 3257 EV_P = w->other;
2858 3258
2859 while (fdchangecnt) 3259 while (fdchangecnt)
2860 { 3260 {
2861 fd_reify (EV_A); 3261 fd_reify (EV_A);
2862 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3262 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2867static void 3267static void
2868embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3268embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2869{ 3269{
2870 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3270 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2871 3271
3272 ev_embed_stop (EV_A_ w);
3273
2872 { 3274 {
2873 struct ev_loop *loop = w->other; 3275 EV_P = w->other;
2874 3276
2875 ev_loop_fork (EV_A); 3277 ev_loop_fork (EV_A);
3278 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2876 } 3279 }
3280
3281 ev_embed_start (EV_A_ w);
2877} 3282}
2878 3283
2879#if 0 3284#if 0
2880static void 3285static void
2881embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3286embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2889{ 3294{
2890 if (expect_false (ev_is_active (w))) 3295 if (expect_false (ev_is_active (w)))
2891 return; 3296 return;
2892 3297
2893 { 3298 {
2894 struct ev_loop *loop = w->other; 3299 EV_P = w->other;
2895 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3300 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2896 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3301 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2897 } 3302 }
2898 3303
2899 EV_FREQUENT_CHECK; 3304 EV_FREQUENT_CHECK;
2900 3305
… …
3083 ev_timer_set (&once->to, timeout, 0.); 3488 ev_timer_set (&once->to, timeout, 0.);
3084 ev_timer_start (EV_A_ &once->to); 3489 ev_timer_start (EV_A_ &once->to);
3085 } 3490 }
3086} 3491}
3087 3492
3493/*****************************************************************************/
3494
3495#if EV_WALK_ENABLE
3496void
3497ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3498{
3499 int i, j;
3500 ev_watcher_list *wl, *wn;
3501
3502 if (types & (EV_IO | EV_EMBED))
3503 for (i = 0; i < anfdmax; ++i)
3504 for (wl = anfds [i].head; wl; )
3505 {
3506 wn = wl->next;
3507
3508#if EV_EMBED_ENABLE
3509 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3510 {
3511 if (types & EV_EMBED)
3512 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3513 }
3514 else
3515#endif
3516#if EV_USE_INOTIFY
3517 if (ev_cb ((ev_io *)wl) == infy_cb)
3518 ;
3519 else
3520#endif
3521 if ((ev_io *)wl != &pipe_w)
3522 if (types & EV_IO)
3523 cb (EV_A_ EV_IO, wl);
3524
3525 wl = wn;
3526 }
3527
3528 if (types & (EV_TIMER | EV_STAT))
3529 for (i = timercnt + HEAP0; i-- > HEAP0; )
3530#if EV_STAT_ENABLE
3531 /*TODO: timer is not always active*/
3532 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3533 {
3534 if (types & EV_STAT)
3535 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3536 }
3537 else
3538#endif
3539 if (types & EV_TIMER)
3540 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3541
3542#if EV_PERIODIC_ENABLE
3543 if (types & EV_PERIODIC)
3544 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3545 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3546#endif
3547
3548#if EV_IDLE_ENABLE
3549 if (types & EV_IDLE)
3550 for (j = NUMPRI; i--; )
3551 for (i = idlecnt [j]; i--; )
3552 cb (EV_A_ EV_IDLE, idles [j][i]);
3553#endif
3554
3555#if EV_FORK_ENABLE
3556 if (types & EV_FORK)
3557 for (i = forkcnt; i--; )
3558 if (ev_cb (forks [i]) != embed_fork_cb)
3559 cb (EV_A_ EV_FORK, forks [i]);
3560#endif
3561
3562#if EV_ASYNC_ENABLE
3563 if (types & EV_ASYNC)
3564 for (i = asynccnt; i--; )
3565 cb (EV_A_ EV_ASYNC, asyncs [i]);
3566#endif
3567
3568 if (types & EV_PREPARE)
3569 for (i = preparecnt; i--; )
3570#if EV_EMBED_ENABLE
3571 if (ev_cb (prepares [i]) != embed_prepare_cb)
3572#endif
3573 cb (EV_A_ EV_PREPARE, prepares [i]);
3574
3575 if (types & EV_CHECK)
3576 for (i = checkcnt; i--; )
3577 cb (EV_A_ EV_CHECK, checks [i]);
3578
3579 if (types & EV_SIGNAL)
3580 for (i = 0; i < EV_NSIG - 1; ++i)
3581 for (wl = signals [i].head; wl; )
3582 {
3583 wn = wl->next;
3584 cb (EV_A_ EV_SIGNAL, wl);
3585 wl = wn;
3586 }
3587
3588 if (types & EV_CHILD)
3589 for (i = EV_PID_HASHSIZE; i--; )
3590 for (wl = childs [i]; wl; )
3591 {
3592 wn = wl->next;
3593 cb (EV_A_ EV_CHILD, wl);
3594 wl = wn;
3595 }
3596/* EV_STAT 0x00001000 /* stat data changed */
3597/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3598}
3599#endif
3600
3088#if EV_MULTIPLICITY 3601#if EV_MULTIPLICITY
3089 #include "ev_wrap.h" 3602 #include "ev_wrap.h"
3090#endif 3603#endif
3091 3604
3092#ifdef __cplusplus 3605#ifdef __cplusplus

Diff Legend

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