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.295 by root, Wed Jul 8 04:29:31 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
164# endif 178# endif
165#endif 179#endif
166 180
167/* this block tries to deduce configuration from header-defined symbols and defaults */ 181/* this block tries to deduce configuration from header-defined symbols and defaults */
168 182
183#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1
186# else
187# define EV_USE_CLOCK_SYSCALL 0
188# endif
189#endif
190
169#ifndef EV_USE_MONOTONIC 191#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 192# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 193# define EV_USE_MONOTONIC 1
172# else 194# else
173# define EV_USE_MONOTONIC 0 195# define EV_USE_MONOTONIC 0
174# endif 196# endif
175#endif 197#endif
176 198
177#ifndef EV_USE_REALTIME 199#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 200# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 201#endif
180 202
181#ifndef EV_USE_NANOSLEEP 203#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 204# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 205# define EV_USE_NANOSLEEP 1
260# define EV_USE_4HEAP !EV_MINIMAL 282# define EV_USE_4HEAP !EV_MINIMAL
261#endif 283#endif
262 284
263#ifndef EV_HEAP_CACHE_AT 285#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL 286# define EV_HEAP_CACHE_AT !EV_MINIMAL
287#endif
288
289/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
290/* which makes programs even slower. might work on other unices, too. */
291#if EV_USE_CLOCK_SYSCALL
292# include <syscall.h>
293# ifdef SYS_clock_gettime
294# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
295# undef EV_USE_MONOTONIC
296# define EV_USE_MONOTONIC 1
297# else
298# undef EV_USE_CLOCK_SYSCALL
299# define EV_USE_CLOCK_SYSCALL 0
300# endif
265#endif 301#endif
266 302
267/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 303/* this block fixes any misconfiguration where we know we run into trouble otherwise */
268 304
269#ifndef CLOCK_MONOTONIC 305#ifndef CLOCK_MONOTONIC
355# define inline_speed static noinline 391# define inline_speed static noinline
356#else 392#else
357# define inline_speed static inline 393# define inline_speed static inline
358#endif 394#endif
359 395
360#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
397
398#if EV_MINPRI == EV_MAXPRI
399# define ABSPRI(w) (((W)w), 0)
400#else
361#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 401# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
402#endif
362 403
363#define EMPTY /* required for microsofts broken pseudo-c compiler */ 404#define EMPTY /* required for microsofts broken pseudo-c compiler */
364#define EMPTY2(a,b) /* used to suppress some warnings */ 405#define EMPTY2(a,b) /* used to suppress some warnings */
365 406
366typedef ev_watcher *W; 407typedef ev_watcher *W;
368typedef ev_watcher_time *WT; 409typedef ev_watcher_time *WT;
369 410
370#define ev_active(w) ((W)(w))->active 411#define ev_active(w) ((W)(w))->active
371#define ev_at(w) ((WT)(w))->at 412#define ev_at(w) ((WT)(w))->at
372 413
373#if EV_USE_MONOTONIC 414#if EV_USE_REALTIME
374/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 415/* 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 */ 416/* giving it a reasonably high chance of working on typical architetcures */
417static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
418#endif
419
420#if EV_USE_MONOTONIC
376static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
377#endif 422#endif
378 423
379#ifdef _WIN32 424#ifdef _WIN32
380# include "ev_win32.c" 425# include "ev_win32.c"
445#define ev_malloc(size) ev_realloc (0, (size)) 490#define ev_malloc(size) ev_realloc (0, (size))
446#define ev_free(ptr) ev_realloc ((ptr), 0) 491#define ev_free(ptr) ev_realloc ((ptr), 0)
447 492
448/*****************************************************************************/ 493/*****************************************************************************/
449 494
495/* file descriptor info structure */
450typedef struct 496typedef struct
451{ 497{
452 WL head; 498 WL head;
453 unsigned char events; 499 unsigned char events; /* the events watched for */
454 unsigned char reify; 500 unsigned char reify; /* flag set when this ANFD needs reification */
455 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 501 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
456 unsigned char unused; 502 unsigned char unused;
457#if EV_USE_EPOLL 503#if EV_USE_EPOLL
458 unsigned int egen; /* generation counter to counter epoll bugs */ 504 unsigned int egen; /* generation counter to counter epoll bugs */
459#endif 505#endif
460#if EV_SELECT_IS_WINSOCKET 506#if EV_SELECT_IS_WINSOCKET
461 SOCKET handle; 507 SOCKET handle;
462#endif 508#endif
463} ANFD; 509} ANFD;
464 510
511/* stores the pending event set for a given watcher */
465typedef struct 512typedef struct
466{ 513{
467 W w; 514 W w;
468 int events; 515 int events; /* the pending event set for the given watcher */
469} ANPENDING; 516} ANPENDING;
470 517
471#if EV_USE_INOTIFY 518#if EV_USE_INOTIFY
472/* hash table entry per inotify-id */ 519/* hash table entry per inotify-id */
473typedef struct 520typedef struct
476} ANFS; 523} ANFS;
477#endif 524#endif
478 525
479/* Heap Entry */ 526/* Heap Entry */
480#if EV_HEAP_CACHE_AT 527#if EV_HEAP_CACHE_AT
528 /* a heap element */
481 typedef struct { 529 typedef struct {
482 ev_tstamp at; 530 ev_tstamp at;
483 WT w; 531 WT w;
484 } ANHE; 532 } ANHE;
485 533
486 #define ANHE_w(he) (he).w /* access watcher, read-write */ 534 #define ANHE_w(he) (he).w /* access watcher, read-write */
487 #define ANHE_at(he) (he).at /* access cached at, read-only */ 535 #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 */ 536 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
489#else 537#else
538 /* a heap element */
490 typedef WT ANHE; 539 typedef WT ANHE;
491 540
492 #define ANHE_w(he) (he) 541 #define ANHE_w(he) (he)
493 #define ANHE_at(he) (he)->at 542 #define ANHE_at(he) (he)->at
494 #define ANHE_at_cache(he) 543 #define ANHE_at_cache(he)
520 569
521#endif 570#endif
522 571
523/*****************************************************************************/ 572/*****************************************************************************/
524 573
574#ifndef EV_HAVE_EV_TIME
525ev_tstamp 575ev_tstamp
526ev_time (void) 576ev_time (void)
527{ 577{
528#if EV_USE_REALTIME 578#if EV_USE_REALTIME
579 if (expect_true (have_realtime))
580 {
529 struct timespec ts; 581 struct timespec ts;
530 clock_gettime (CLOCK_REALTIME, &ts); 582 clock_gettime (CLOCK_REALTIME, &ts);
531 return ts.tv_sec + ts.tv_nsec * 1e-9; 583 return ts.tv_sec + ts.tv_nsec * 1e-9;
532#else 584 }
585#endif
586
533 struct timeval tv; 587 struct timeval tv;
534 gettimeofday (&tv, 0); 588 gettimeofday (&tv, 0);
535 return tv.tv_sec + tv.tv_usec * 1e-6; 589 return tv.tv_sec + tv.tv_usec * 1e-6;
536#endif
537} 590}
591#endif
538 592
539ev_tstamp inline_size 593inline_size ev_tstamp
540get_clock (void) 594get_clock (void)
541{ 595{
542#if EV_USE_MONOTONIC 596#if EV_USE_MONOTONIC
543 if (expect_true (have_monotonic)) 597 if (expect_true (have_monotonic))
544 { 598 {
578 632
579 tv.tv_sec = (time_t)delay; 633 tv.tv_sec = (time_t)delay;
580 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 634 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
581 635
582 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 636 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
583 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 637 /* somehting not guaranteed by newer posix versions, but guaranteed */
584 /* by older ones */ 638 /* by older ones */
585 select (0, 0, 0, 0, &tv); 639 select (0, 0, 0, 0, &tv);
586#endif 640#endif
587 } 641 }
588} 642}
589 643
590/*****************************************************************************/ 644/*****************************************************************************/
591 645
592#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 646#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
593 647
594int inline_size 648/* find a suitable new size for the given array, */
649/* hopefully by rounding to a ncie-to-malloc size */
650inline_size int
595array_nextsize (int elem, int cur, int cnt) 651array_nextsize (int elem, int cur, int cnt)
596{ 652{
597 int ncur = cur + 1; 653 int ncur = cur + 1;
598 654
599 do 655 do
640 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 696 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
641 } 697 }
642#endif 698#endif
643 699
644#define array_free(stem, idx) \ 700#define array_free(stem, idx) \
645 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 701 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
646 702
647/*****************************************************************************/ 703/*****************************************************************************/
704
705/* dummy callback for pending events */
706static void noinline
707pendingcb (EV_P_ ev_prepare *w, int revents)
708{
709}
648 710
649void noinline 711void noinline
650ev_feed_event (EV_P_ void *w, int revents) 712ev_feed_event (EV_P_ void *w, int revents)
651{ 713{
652 W w_ = (W)w; 714 W w_ = (W)w;
661 pendings [pri][w_->pending - 1].w = w_; 723 pendings [pri][w_->pending - 1].w = w_;
662 pendings [pri][w_->pending - 1].events = revents; 724 pendings [pri][w_->pending - 1].events = revents;
663 } 725 }
664} 726}
665 727
666void inline_speed 728inline_speed void
729feed_reverse (EV_P_ W w)
730{
731 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
732 rfeeds [rfeedcnt++] = w;
733}
734
735inline_size void
736feed_reverse_done (EV_P_ int revents)
737{
738 do
739 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
740 while (rfeedcnt);
741}
742
743inline_speed void
667queue_events (EV_P_ W *events, int eventcnt, int type) 744queue_events (EV_P_ W *events, int eventcnt, int type)
668{ 745{
669 int i; 746 int i;
670 747
671 for (i = 0; i < eventcnt; ++i) 748 for (i = 0; i < eventcnt; ++i)
672 ev_feed_event (EV_A_ events [i], type); 749 ev_feed_event (EV_A_ events [i], type);
673} 750}
674 751
675/*****************************************************************************/ 752/*****************************************************************************/
676 753
677void inline_speed 754inline_speed void
678fd_event (EV_P_ int fd, int revents) 755fd_event (EV_P_ int fd, int revents)
679{ 756{
680 ANFD *anfd = anfds + fd; 757 ANFD *anfd = anfds + fd;
681 ev_io *w; 758 ev_io *w;
682 759
694{ 771{
695 if (fd >= 0 && fd < anfdmax) 772 if (fd >= 0 && fd < anfdmax)
696 fd_event (EV_A_ fd, revents); 773 fd_event (EV_A_ fd, revents);
697} 774}
698 775
699void inline_size 776/* make sure the external fd watch events are in-sync */
777/* with the kernel/libev internal state */
778inline_size void
700fd_reify (EV_P) 779fd_reify (EV_P)
701{ 780{
702 int i; 781 int i;
703 782
704 for (i = 0; i < fdchangecnt; ++i) 783 for (i = 0; i < fdchangecnt; ++i)
719 #ifdef EV_FD_TO_WIN32_HANDLE 798 #ifdef EV_FD_TO_WIN32_HANDLE
720 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 799 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
721 #else 800 #else
722 anfd->handle = _get_osfhandle (fd); 801 anfd->handle = _get_osfhandle (fd);
723 #endif 802 #endif
724 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 803 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
725 } 804 }
726#endif 805#endif
727 806
728 { 807 {
729 unsigned char o_events = anfd->events; 808 unsigned char o_events = anfd->events;
730 unsigned char o_reify = anfd->reify; 809 unsigned char o_reify = anfd->reify;
731 810
732 anfd->reify = 0; 811 anfd->reify = 0;
733 anfd->events = events; 812 anfd->events = events;
734 813
735 if (o_events != events || o_reify & EV_IOFDSET) 814 if (o_events != events || o_reify & EV__IOFDSET)
736 backend_modify (EV_A_ fd, o_events, events); 815 backend_modify (EV_A_ fd, o_events, events);
737 } 816 }
738 } 817 }
739 818
740 fdchangecnt = 0; 819 fdchangecnt = 0;
741} 820}
742 821
743void inline_size 822/* something about the given fd changed */
823inline_size void
744fd_change (EV_P_ int fd, int flags) 824fd_change (EV_P_ int fd, int flags)
745{ 825{
746 unsigned char reify = anfds [fd].reify; 826 unsigned char reify = anfds [fd].reify;
747 anfds [fd].reify |= flags; 827 anfds [fd].reify |= flags;
748 828
752 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 832 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
753 fdchanges [fdchangecnt - 1] = fd; 833 fdchanges [fdchangecnt - 1] = fd;
754 } 834 }
755} 835}
756 836
757void inline_speed 837/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
838inline_speed void
758fd_kill (EV_P_ int fd) 839fd_kill (EV_P_ int fd)
759{ 840{
760 ev_io *w; 841 ev_io *w;
761 842
762 while ((w = (ev_io *)anfds [fd].head)) 843 while ((w = (ev_io *)anfds [fd].head))
764 ev_io_stop (EV_A_ w); 845 ev_io_stop (EV_A_ w);
765 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 846 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
766 } 847 }
767} 848}
768 849
769int inline_size 850/* check whether the given fd is atcually valid, for error recovery */
851inline_size int
770fd_valid (int fd) 852fd_valid (int fd)
771{ 853{
772#ifdef _WIN32 854#ifdef _WIN32
773 return _get_osfhandle (fd) != -1; 855 return _get_osfhandle (fd) != -1;
774#else 856#else
811 for (fd = 0; fd < anfdmax; ++fd) 893 for (fd = 0; fd < anfdmax; ++fd)
812 if (anfds [fd].events) 894 if (anfds [fd].events)
813 { 895 {
814 anfds [fd].events = 0; 896 anfds [fd].events = 0;
815 anfds [fd].emask = 0; 897 anfds [fd].emask = 0;
816 fd_change (EV_A_ fd, EV_IOFDSET | 1); 898 fd_change (EV_A_ fd, EV__IOFDSET | 1);
817 } 899 }
818} 900}
819 901
820/*****************************************************************************/ 902/*****************************************************************************/
821 903
837#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 919#define HEAP0 (DHEAP - 1) /* index of first element in heap */
838#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 920#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
839#define UPHEAP_DONE(p,k) ((p) == (k)) 921#define UPHEAP_DONE(p,k) ((p) == (k))
840 922
841/* away from the root */ 923/* away from the root */
842void inline_speed 924inline_speed void
843downheap (ANHE *heap, int N, int k) 925downheap (ANHE *heap, int N, int k)
844{ 926{
845 ANHE he = heap [k]; 927 ANHE he = heap [k];
846 ANHE *E = heap + N + HEAP0; 928 ANHE *E = heap + N + HEAP0;
847 929
887#define HEAP0 1 969#define HEAP0 1
888#define HPARENT(k) ((k) >> 1) 970#define HPARENT(k) ((k) >> 1)
889#define UPHEAP_DONE(p,k) (!(p)) 971#define UPHEAP_DONE(p,k) (!(p))
890 972
891/* away from the root */ 973/* away from the root */
892void inline_speed 974inline_speed void
893downheap (ANHE *heap, int N, int k) 975downheap (ANHE *heap, int N, int k)
894{ 976{
895 ANHE he = heap [k]; 977 ANHE he = heap [k];
896 978
897 for (;;) 979 for (;;)
917 ev_active (ANHE_w (he)) = k; 999 ev_active (ANHE_w (he)) = k;
918} 1000}
919#endif 1001#endif
920 1002
921/* towards the root */ 1003/* towards the root */
922void inline_speed 1004inline_speed void
923upheap (ANHE *heap, int k) 1005upheap (ANHE *heap, int k)
924{ 1006{
925 ANHE he = heap [k]; 1007 ANHE he = heap [k];
926 1008
927 for (;;) 1009 for (;;)
938 1020
939 heap [k] = he; 1021 heap [k] = he;
940 ev_active (ANHE_w (he)) = k; 1022 ev_active (ANHE_w (he)) = k;
941} 1023}
942 1024
943void inline_size 1025/* move an element suitably so it is in a correct place */
1026inline_size void
944adjustheap (ANHE *heap, int N, int k) 1027adjustheap (ANHE *heap, int N, int k)
945{ 1028{
946 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1029 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
947 upheap (heap, k); 1030 upheap (heap, k);
948 else 1031 else
949 downheap (heap, N, k); 1032 downheap (heap, N, k);
950} 1033}
951 1034
952/* rebuild the heap: this function is used only once and executed rarely */ 1035/* rebuild the heap: this function is used only once and executed rarely */
953void inline_size 1036inline_size void
954reheap (ANHE *heap, int N) 1037reheap (ANHE *heap, int N)
955{ 1038{
956 int i; 1039 int i;
957 1040
958 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1041 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
961 upheap (heap, i + HEAP0); 1044 upheap (heap, i + HEAP0);
962} 1045}
963 1046
964/*****************************************************************************/ 1047/*****************************************************************************/
965 1048
1049/* associate signal watchers to a signal signal */
966typedef struct 1050typedef struct
967{ 1051{
968 WL head; 1052 WL head;
969 EV_ATOMIC_T gotsig; 1053 EV_ATOMIC_T gotsig;
970} ANSIG; 1054} ANSIG;
974 1058
975static EV_ATOMIC_T gotsig; 1059static EV_ATOMIC_T gotsig;
976 1060
977/*****************************************************************************/ 1061/*****************************************************************************/
978 1062
979void inline_speed 1063/* used to prepare libev internal fd's */
1064/* this is not fork-safe */
1065inline_speed void
980fd_intern (int fd) 1066fd_intern (int fd)
981{ 1067{
982#ifdef _WIN32 1068#ifdef _WIN32
983 unsigned long arg = 1; 1069 unsigned long arg = 1;
984 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1070 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
989} 1075}
990 1076
991static void noinline 1077static void noinline
992evpipe_init (EV_P) 1078evpipe_init (EV_P)
993{ 1079{
994 if (!ev_is_active (&pipeev)) 1080 if (!ev_is_active (&pipe_w))
995 { 1081 {
996#if EV_USE_EVENTFD 1082#if EV_USE_EVENTFD
997 if ((evfd = eventfd (0, 0)) >= 0) 1083 if ((evfd = eventfd (0, 0)) >= 0)
998 { 1084 {
999 evpipe [0] = -1; 1085 evpipe [0] = -1;
1000 fd_intern (evfd); 1086 fd_intern (evfd);
1001 ev_io_set (&pipeev, evfd, EV_READ); 1087 ev_io_set (&pipe_w, evfd, EV_READ);
1002 } 1088 }
1003 else 1089 else
1004#endif 1090#endif
1005 { 1091 {
1006 while (pipe (evpipe)) 1092 while (pipe (evpipe))
1007 ev_syserr ("(libev) error creating signal/async pipe"); 1093 ev_syserr ("(libev) error creating signal/async pipe");
1008 1094
1009 fd_intern (evpipe [0]); 1095 fd_intern (evpipe [0]);
1010 fd_intern (evpipe [1]); 1096 fd_intern (evpipe [1]);
1011 ev_io_set (&pipeev, evpipe [0], EV_READ); 1097 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1012 } 1098 }
1013 1099
1014 ev_io_start (EV_A_ &pipeev); 1100 ev_io_start (EV_A_ &pipe_w);
1015 ev_unref (EV_A); /* watcher should not keep loop alive */ 1101 ev_unref (EV_A); /* watcher should not keep loop alive */
1016 } 1102 }
1017} 1103}
1018 1104
1019void inline_size 1105inline_size void
1020evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1106evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1021{ 1107{
1022 if (!*flag) 1108 if (!*flag)
1023 { 1109 {
1024 int old_errno = errno; /* save errno because write might clobber it */ 1110 int old_errno = errno; /* save errno because write might clobber it */
1037 1123
1038 errno = old_errno; 1124 errno = old_errno;
1039 } 1125 }
1040} 1126}
1041 1127
1128/* called whenever the libev signal pipe */
1129/* got some events (signal, async) */
1042static void 1130static void
1043pipecb (EV_P_ ev_io *iow, int revents) 1131pipecb (EV_P_ ev_io *iow, int revents)
1044{ 1132{
1045#if EV_USE_EVENTFD 1133#if EV_USE_EVENTFD
1046 if (evfd >= 0) 1134 if (evfd >= 0)
1102ev_feed_signal_event (EV_P_ int signum) 1190ev_feed_signal_event (EV_P_ int signum)
1103{ 1191{
1104 WL w; 1192 WL w;
1105 1193
1106#if EV_MULTIPLICITY 1194#if EV_MULTIPLICITY
1107 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1195 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1108#endif 1196#endif
1109 1197
1110 --signum; 1198 --signum;
1111 1199
1112 if (signum < 0 || signum >= signalmax) 1200 if (signum < 0 || signum >= signalmax)
1128 1216
1129#ifndef WIFCONTINUED 1217#ifndef WIFCONTINUED
1130# define WIFCONTINUED(status) 0 1218# define WIFCONTINUED(status) 0
1131#endif 1219#endif
1132 1220
1133void inline_speed 1221/* handle a single child status event */
1222inline_speed void
1134child_reap (EV_P_ int chain, int pid, int status) 1223child_reap (EV_P_ int chain, int pid, int status)
1135{ 1224{
1136 ev_child *w; 1225 ev_child *w;
1137 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1226 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1138 1227
1151 1240
1152#ifndef WCONTINUED 1241#ifndef WCONTINUED
1153# define WCONTINUED 0 1242# define WCONTINUED 0
1154#endif 1243#endif
1155 1244
1245/* called on sigchld etc., calls waitpid */
1156static void 1246static void
1157childcb (EV_P_ ev_signal *sw, int revents) 1247childcb (EV_P_ ev_signal *sw, int revents)
1158{ 1248{
1159 int pid, status; 1249 int pid, status;
1160 1250
1241 /* kqueue is borked on everything but netbsd apparently */ 1331 /* kqueue is borked on everything but netbsd apparently */
1242 /* it usually doesn't work correctly on anything but sockets and pipes */ 1332 /* it usually doesn't work correctly on anything but sockets and pipes */
1243 flags &= ~EVBACKEND_KQUEUE; 1333 flags &= ~EVBACKEND_KQUEUE;
1244#endif 1334#endif
1245#ifdef __APPLE__ 1335#ifdef __APPLE__
1246 // flags &= ~EVBACKEND_KQUEUE; for documentation 1336 /* only select works correctly on that "unix-certified" platform */
1247 flags &= ~EVBACKEND_POLL; 1337 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1338 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1248#endif 1339#endif
1249 1340
1250 return flags; 1341 return flags;
1251} 1342}
1252 1343
1272ev_loop_count (EV_P) 1363ev_loop_count (EV_P)
1273{ 1364{
1274 return loop_count; 1365 return loop_count;
1275} 1366}
1276 1367
1368unsigned int
1369ev_loop_depth (EV_P)
1370{
1371 return loop_depth;
1372}
1373
1277void 1374void
1278ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1375ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1279{ 1376{
1280 io_blocktime = interval; 1377 io_blocktime = interval;
1281} 1378}
1284ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1381ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1285{ 1382{
1286 timeout_blocktime = interval; 1383 timeout_blocktime = interval;
1287} 1384}
1288 1385
1386/* initialise a loop structure, must be zero-initialised */
1289static void noinline 1387static void noinline
1290loop_init (EV_P_ unsigned int flags) 1388loop_init (EV_P_ unsigned int flags)
1291{ 1389{
1292 if (!backend) 1390 if (!backend)
1293 { 1391 {
1392#if EV_USE_REALTIME
1393 if (!have_realtime)
1394 {
1395 struct timespec ts;
1396
1397 if (!clock_gettime (CLOCK_REALTIME, &ts))
1398 have_realtime = 1;
1399 }
1400#endif
1401
1294#if EV_USE_MONOTONIC 1402#if EV_USE_MONOTONIC
1403 if (!have_monotonic)
1295 { 1404 {
1296 struct timespec ts; 1405 struct timespec ts;
1406
1297 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1407 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1298 have_monotonic = 1; 1408 have_monotonic = 1;
1299 } 1409 }
1300#endif 1410#endif
1301 1411
1302 ev_rt_now = ev_time (); 1412 ev_rt_now = ev_time ();
1303 mn_now = get_clock (); 1413 mn_now = get_clock ();
1304 now_floor = mn_now; 1414 now_floor = mn_now;
1341#endif 1451#endif
1342#if EV_USE_SELECT 1452#if EV_USE_SELECT
1343 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1453 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1344#endif 1454#endif
1345 1455
1456 ev_prepare_init (&pending_w, pendingcb);
1457
1346 ev_init (&pipeev, pipecb); 1458 ev_init (&pipe_w, pipecb);
1347 ev_set_priority (&pipeev, EV_MAXPRI); 1459 ev_set_priority (&pipe_w, EV_MAXPRI);
1348 } 1460 }
1349} 1461}
1350 1462
1463/* free up a loop structure */
1351static void noinline 1464static void noinline
1352loop_destroy (EV_P) 1465loop_destroy (EV_P)
1353{ 1466{
1354 int i; 1467 int i;
1355 1468
1356 if (ev_is_active (&pipeev)) 1469 if (ev_is_active (&pipe_w))
1357 { 1470 {
1358 ev_ref (EV_A); /* signal watcher */ 1471 ev_ref (EV_A); /* signal watcher */
1359 ev_io_stop (EV_A_ &pipeev); 1472 ev_io_stop (EV_A_ &pipe_w);
1360 1473
1361#if EV_USE_EVENTFD 1474#if EV_USE_EVENTFD
1362 if (evfd >= 0) 1475 if (evfd >= 0)
1363 close (evfd); 1476 close (evfd);
1364#endif 1477#endif
1403 } 1516 }
1404 1517
1405 ev_free (anfds); anfdmax = 0; 1518 ev_free (anfds); anfdmax = 0;
1406 1519
1407 /* have to use the microsoft-never-gets-it-right macro */ 1520 /* have to use the microsoft-never-gets-it-right macro */
1521 array_free (rfeed, EMPTY);
1408 array_free (fdchange, EMPTY); 1522 array_free (fdchange, EMPTY);
1409 array_free (timer, EMPTY); 1523 array_free (timer, EMPTY);
1410#if EV_PERIODIC_ENABLE 1524#if EV_PERIODIC_ENABLE
1411 array_free (periodic, EMPTY); 1525 array_free (periodic, EMPTY);
1412#endif 1526#endif
1421 1535
1422 backend = 0; 1536 backend = 0;
1423} 1537}
1424 1538
1425#if EV_USE_INOTIFY 1539#if EV_USE_INOTIFY
1426void inline_size infy_fork (EV_P); 1540inline_size void infy_fork (EV_P);
1427#endif 1541#endif
1428 1542
1429void inline_size 1543inline_size void
1430loop_fork (EV_P) 1544loop_fork (EV_P)
1431{ 1545{
1432#if EV_USE_PORT 1546#if EV_USE_PORT
1433 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1547 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1434#endif 1548#endif
1440#endif 1554#endif
1441#if EV_USE_INOTIFY 1555#if EV_USE_INOTIFY
1442 infy_fork (EV_A); 1556 infy_fork (EV_A);
1443#endif 1557#endif
1444 1558
1445 if (ev_is_active (&pipeev)) 1559 if (ev_is_active (&pipe_w))
1446 { 1560 {
1447 /* this "locks" the handlers against writing to the pipe */ 1561 /* this "locks" the handlers against writing to the pipe */
1448 /* while we modify the fd vars */ 1562 /* while we modify the fd vars */
1449 gotsig = 1; 1563 gotsig = 1;
1450#if EV_ASYNC_ENABLE 1564#if EV_ASYNC_ENABLE
1451 gotasync = 1; 1565 gotasync = 1;
1452#endif 1566#endif
1453 1567
1454 ev_ref (EV_A); 1568 ev_ref (EV_A);
1455 ev_io_stop (EV_A_ &pipeev); 1569 ev_io_stop (EV_A_ &pipe_w);
1456 1570
1457#if EV_USE_EVENTFD 1571#if EV_USE_EVENTFD
1458 if (evfd >= 0) 1572 if (evfd >= 0)
1459 close (evfd); 1573 close (evfd);
1460#endif 1574#endif
1465 close (evpipe [1]); 1579 close (evpipe [1]);
1466 } 1580 }
1467 1581
1468 evpipe_init (EV_A); 1582 evpipe_init (EV_A);
1469 /* now iterate over everything, in case we missed something */ 1583 /* now iterate over everything, in case we missed something */
1470 pipecb (EV_A_ &pipeev, EV_READ); 1584 pipecb (EV_A_ &pipe_w, EV_READ);
1471 } 1585 }
1472 1586
1473 postfork = 0; 1587 postfork = 0;
1474} 1588}
1475 1589
1505 1619
1506#if EV_VERIFY 1620#if EV_VERIFY
1507static void noinline 1621static void noinline
1508verify_watcher (EV_P_ W w) 1622verify_watcher (EV_P_ W w)
1509{ 1623{
1510 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1624 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1511 1625
1512 if (w->pending) 1626 if (w->pending)
1513 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1627 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1514} 1628}
1515 1629
1516static void noinline 1630static void noinline
1517verify_heap (EV_P_ ANHE *heap, int N) 1631verify_heap (EV_P_ ANHE *heap, int N)
1518{ 1632{
1519 int i; 1633 int i;
1520 1634
1521 for (i = HEAP0; i < N + HEAP0; ++i) 1635 for (i = HEAP0; i < N + HEAP0; ++i)
1522 { 1636 {
1523 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1637 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]))); 1638 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])))); 1639 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1526 1640
1527 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1641 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1528 } 1642 }
1529} 1643}
1530 1644
1531static void noinline 1645static void noinline
1532array_verify (EV_P_ W *ws, int cnt) 1646array_verify (EV_P_ W *ws, int cnt)
1533{ 1647{
1534 while (cnt--) 1648 while (cnt--)
1535 { 1649 {
1536 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1650 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1537 verify_watcher (EV_A_ ws [cnt]); 1651 verify_watcher (EV_A_ ws [cnt]);
1538 } 1652 }
1539} 1653}
1540#endif 1654#endif
1541 1655
1548 1662
1549 assert (activecnt >= -1); 1663 assert (activecnt >= -1);
1550 1664
1551 assert (fdchangemax >= fdchangecnt); 1665 assert (fdchangemax >= fdchangecnt);
1552 for (i = 0; i < fdchangecnt; ++i) 1666 for (i = 0; i < fdchangecnt; ++i)
1553 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1667 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1554 1668
1555 assert (anfdmax >= 0); 1669 assert (anfdmax >= 0);
1556 for (i = 0; i < anfdmax; ++i) 1670 for (i = 0; i < anfdmax; ++i)
1557 for (w = anfds [i].head; w; w = w->next) 1671 for (w = anfds [i].head; w; w = w->next)
1558 { 1672 {
1559 verify_watcher (EV_A_ (W)w); 1673 verify_watcher (EV_A_ (W)w);
1560 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1674 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)); 1675 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1562 } 1676 }
1563 1677
1564 assert (timermax >= timercnt); 1678 assert (timermax >= timercnt);
1565 verify_heap (EV_A_ timers, timercnt); 1679 verify_heap (EV_A_ timers, timercnt);
1566 1680
1671ev_invoke (EV_P_ void *w, int revents) 1785ev_invoke (EV_P_ void *w, int revents)
1672{ 1786{
1673 EV_CB_INVOKE ((W)w, revents); 1787 EV_CB_INVOKE ((W)w, revents);
1674} 1788}
1675 1789
1676void inline_speed 1790inline_speed void
1677call_pending (EV_P) 1791call_pending (EV_P)
1678{ 1792{
1679 int pri; 1793 int pri;
1680 1794
1681 for (pri = NUMPRI; pri--; ) 1795 for (pri = NUMPRI; pri--; )
1682 while (pendingcnt [pri]) 1796 while (pendingcnt [pri])
1683 { 1797 {
1684 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1798 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1685 1799
1686 if (expect_true (p->w))
1687 {
1688 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1800 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1801 /* ^ this is no longer true, as pending_w could be here */
1689 1802
1690 p->w->pending = 0; 1803 p->w->pending = 0;
1691 EV_CB_INVOKE (p->w, p->events); 1804 EV_CB_INVOKE (p->w, p->events);
1692 EV_FREQUENT_CHECK; 1805 EV_FREQUENT_CHECK;
1693 }
1694 } 1806 }
1695} 1807}
1696 1808
1697#if EV_IDLE_ENABLE 1809#if EV_IDLE_ENABLE
1698void inline_size 1810/* make idle watchers pending. this handles the "call-idle */
1811/* only when higher priorities are idle" logic */
1812inline_size void
1699idle_reify (EV_P) 1813idle_reify (EV_P)
1700{ 1814{
1701 if (expect_false (idleall)) 1815 if (expect_false (idleall))
1702 { 1816 {
1703 int pri; 1817 int pri;
1715 } 1829 }
1716 } 1830 }
1717} 1831}
1718#endif 1832#endif
1719 1833
1720void inline_size 1834/* make timers pending */
1835inline_size void
1721timers_reify (EV_P) 1836timers_reify (EV_P)
1722{ 1837{
1723 EV_FREQUENT_CHECK; 1838 EV_FREQUENT_CHECK;
1724 1839
1725 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1840 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1726 { 1841 {
1727 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1842 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 { 1843 {
1844 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1845
1846 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1847
1848 /* first reschedule or stop timer */
1849 if (w->repeat)
1850 {
1734 ev_at (w) += w->repeat; 1851 ev_at (w) += w->repeat;
1735 if (ev_at (w) < mn_now) 1852 if (ev_at (w) < mn_now)
1736 ev_at (w) = mn_now; 1853 ev_at (w) = mn_now;
1737 1854
1738 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1855 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1739 1856
1740 ANHE_at_cache (timers [HEAP0]); 1857 ANHE_at_cache (timers [HEAP0]);
1741 downheap (timers, timercnt, HEAP0); 1858 downheap (timers, timercnt, HEAP0);
1859 }
1860 else
1861 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1862
1863 EV_FREQUENT_CHECK;
1864 feed_reverse (EV_A_ (W)w);
1742 } 1865 }
1743 else 1866 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1744 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1745 1867
1746 EV_FREQUENT_CHECK;
1747 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1868 feed_reverse_done (EV_A_ EV_TIMEOUT);
1748 } 1869 }
1749} 1870}
1750 1871
1751#if EV_PERIODIC_ENABLE 1872#if EV_PERIODIC_ENABLE
1752void inline_size 1873/* make periodics pending */
1874inline_size void
1753periodics_reify (EV_P) 1875periodics_reify (EV_P)
1754{ 1876{
1755 EV_FREQUENT_CHECK; 1877 EV_FREQUENT_CHECK;
1756 1878
1757 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1879 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1758 { 1880 {
1759 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1881 int feed_count = 0;
1760 1882
1761 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1883 do
1762
1763 /* first reschedule or stop timer */
1764 if (w->reschedule_cb)
1765 { 1884 {
1885 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1886
1887 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1888
1889 /* first reschedule or stop timer */
1890 if (w->reschedule_cb)
1891 {
1766 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1892 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1767 1893
1768 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1894 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1769 1895
1770 ANHE_at_cache (periodics [HEAP0]); 1896 ANHE_at_cache (periodics [HEAP0]);
1771 downheap (periodics, periodiccnt, HEAP0); 1897 downheap (periodics, periodiccnt, HEAP0);
1898 }
1899 else if (w->interval)
1900 {
1901 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1902 /* if next trigger time is not sufficiently in the future, put it there */
1903 /* this might happen because of floating point inexactness */
1904 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1905 {
1906 ev_at (w) += w->interval;
1907
1908 /* if interval is unreasonably low we might still have a time in the past */
1909 /* so correct this. this will make the periodic very inexact, but the user */
1910 /* has effectively asked to get triggered more often than possible */
1911 if (ev_at (w) < ev_rt_now)
1912 ev_at (w) = ev_rt_now;
1913 }
1914
1915 ANHE_at_cache (periodics [HEAP0]);
1916 downheap (periodics, periodiccnt, HEAP0);
1917 }
1918 else
1919 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1920
1921 EV_FREQUENT_CHECK;
1922 feed_reverse (EV_A_ (W)w);
1772 } 1923 }
1773 else if (w->interval) 1924 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 1925
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); 1926 feed_reverse_done (EV_A_ EV_PERIODIC);
1797 } 1927 }
1798} 1928}
1799 1929
1930/* simply recalculate all periodics */
1931/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1800static void noinline 1932static void noinline
1801periodics_reschedule (EV_P) 1933periodics_reschedule (EV_P)
1802{ 1934{
1803 int i; 1935 int i;
1804 1936
1817 1949
1818 reheap (periodics, periodiccnt); 1950 reheap (periodics, periodiccnt);
1819} 1951}
1820#endif 1952#endif
1821 1953
1822void inline_speed 1954/* adjust all timers by a given offset */
1955static void noinline
1956timers_reschedule (EV_P_ ev_tstamp adjust)
1957{
1958 int i;
1959
1960 for (i = 0; i < timercnt; ++i)
1961 {
1962 ANHE *he = timers + i + HEAP0;
1963 ANHE_w (*he)->at += adjust;
1964 ANHE_at_cache (*he);
1965 }
1966}
1967
1968/* fetch new monotonic and realtime times from the kernel */
1969/* also detetc if there was a timejump, and act accordingly */
1970inline_speed void
1823time_update (EV_P_ ev_tstamp max_block) 1971time_update (EV_P_ ev_tstamp max_block)
1824{ 1972{
1825 int i;
1826
1827#if EV_USE_MONOTONIC 1973#if EV_USE_MONOTONIC
1828 if (expect_true (have_monotonic)) 1974 if (expect_true (have_monotonic))
1829 { 1975 {
1976 int i;
1830 ev_tstamp odiff = rtmn_diff; 1977 ev_tstamp odiff = rtmn_diff;
1831 1978
1832 mn_now = get_clock (); 1979 mn_now = get_clock ();
1833 1980
1834 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 1981 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1860 ev_rt_now = ev_time (); 2007 ev_rt_now = ev_time ();
1861 mn_now = get_clock (); 2008 mn_now = get_clock ();
1862 now_floor = mn_now; 2009 now_floor = mn_now;
1863 } 2010 }
1864 2011
2012 /* no timer adjustment, as the monotonic clock doesn't jump */
2013 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1865# if EV_PERIODIC_ENABLE 2014# if EV_PERIODIC_ENABLE
1866 periodics_reschedule (EV_A); 2015 periodics_reschedule (EV_A);
1867# endif 2016# endif
1868 /* no timer adjustment, as the monotonic clock doesn't jump */
1869 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1870 } 2017 }
1871 else 2018 else
1872#endif 2019#endif
1873 { 2020 {
1874 ev_rt_now = ev_time (); 2021 ev_rt_now = ev_time ();
1875 2022
1876 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2023 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1877 { 2024 {
2025 /* adjust timers. this is easy, as the offset is the same for all of them */
2026 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1878#if EV_PERIODIC_ENABLE 2027#if EV_PERIODIC_ENABLE
1879 periodics_reschedule (EV_A); 2028 periodics_reschedule (EV_A);
1880#endif 2029#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 } 2030 }
1889 2031
1890 mn_now = ev_rt_now; 2032 mn_now = ev_rt_now;
1891 } 2033 }
1892} 2034}
1893 2035
1894void 2036void
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) 2037ev_loop (EV_P_ int flags)
1916{ 2038{
2039 ++loop_depth;
2040
1917 loop_done = EVUNLOOP_CANCEL; 2041 loop_done = EVUNLOOP_CANCEL;
1918 2042
1919 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2043 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1920 2044
1921 do 2045 do
1948 { 2072 {
1949 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2073 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1950 call_pending (EV_A); 2074 call_pending (EV_A);
1951 } 2075 }
1952 2076
1953 if (expect_false (!activecnt))
1954 break;
1955
1956 /* we might have forked, so reify kernel state if necessary */ 2077 /* we might have forked, so reify kernel state if necessary */
1957 if (expect_false (postfork)) 2078 if (expect_false (postfork))
1958 loop_fork (EV_A); 2079 loop_fork (EV_A);
1959 2080
1960 /* update fd-related kernel structures */ 2081 /* update fd-related kernel structures */
1965 ev_tstamp waittime = 0.; 2086 ev_tstamp waittime = 0.;
1966 ev_tstamp sleeptime = 0.; 2087 ev_tstamp sleeptime = 0.;
1967 2088
1968 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2089 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1969 { 2090 {
2091 /* remember old timestamp for io_blocktime calculation */
2092 ev_tstamp prev_mn_now = mn_now;
2093
1970 /* update time to cancel out callback processing overhead */ 2094 /* update time to cancel out callback processing overhead */
1971 time_update (EV_A_ 1e100); 2095 time_update (EV_A_ 1e100);
1972 2096
1973 waittime = MAX_BLOCKTIME; 2097 waittime = MAX_BLOCKTIME;
1974 2098
1984 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2108 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1985 if (waittime > to) waittime = to; 2109 if (waittime > to) waittime = to;
1986 } 2110 }
1987#endif 2111#endif
1988 2112
2113 /* don't let timeouts decrease the waittime below timeout_blocktime */
1989 if (expect_false (waittime < timeout_blocktime)) 2114 if (expect_false (waittime < timeout_blocktime))
1990 waittime = timeout_blocktime; 2115 waittime = timeout_blocktime;
1991 2116
1992 sleeptime = waittime - backend_fudge; 2117 /* extra check because io_blocktime is commonly 0 */
1993
1994 if (expect_true (sleeptime > io_blocktime)) 2118 if (expect_false (io_blocktime))
1995 sleeptime = io_blocktime;
1996
1997 if (sleeptime)
1998 { 2119 {
2120 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2121
2122 if (sleeptime > waittime - backend_fudge)
2123 sleeptime = waittime - backend_fudge;
2124
2125 if (expect_true (sleeptime > 0.))
2126 {
1999 ev_sleep (sleeptime); 2127 ev_sleep (sleeptime);
2000 waittime -= sleeptime; 2128 waittime -= sleeptime;
2129 }
2001 } 2130 }
2002 } 2131 }
2003 2132
2004 ++loop_count; 2133 ++loop_count;
2005 backend_poll (EV_A_ waittime); 2134 backend_poll (EV_A_ waittime);
2031 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2160 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2032 )); 2161 ));
2033 2162
2034 if (loop_done == EVUNLOOP_ONE) 2163 if (loop_done == EVUNLOOP_ONE)
2035 loop_done = EVUNLOOP_CANCEL; 2164 loop_done = EVUNLOOP_CANCEL;
2165
2166 --loop_depth;
2036} 2167}
2037 2168
2038void 2169void
2039ev_unloop (EV_P_ int how) 2170ev_unloop (EV_P_ int how)
2040{ 2171{
2041 loop_done = how; 2172 loop_done = how;
2042} 2173}
2043 2174
2175void
2176ev_ref (EV_P)
2177{
2178 ++activecnt;
2179}
2180
2181void
2182ev_unref (EV_P)
2183{
2184 --activecnt;
2185}
2186
2187void
2188ev_now_update (EV_P)
2189{
2190 time_update (EV_A_ 1e100);
2191}
2192
2193void
2194ev_suspend (EV_P)
2195{
2196 ev_now_update (EV_A);
2197}
2198
2199void
2200ev_resume (EV_P)
2201{
2202 ev_tstamp mn_prev = mn_now;
2203
2204 ev_now_update (EV_A);
2205 timers_reschedule (EV_A_ mn_now - mn_prev);
2206#if EV_PERIODIC_ENABLE
2207 /* TODO: really do this? */
2208 periodics_reschedule (EV_A);
2209#endif
2210}
2211
2044/*****************************************************************************/ 2212/*****************************************************************************/
2213/* singly-linked list management, used when the expected list length is short */
2045 2214
2046void inline_size 2215inline_size void
2047wlist_add (WL *head, WL elem) 2216wlist_add (WL *head, WL elem)
2048{ 2217{
2049 elem->next = *head; 2218 elem->next = *head;
2050 *head = elem; 2219 *head = elem;
2051} 2220}
2052 2221
2053void inline_size 2222inline_size void
2054wlist_del (WL *head, WL elem) 2223wlist_del (WL *head, WL elem)
2055{ 2224{
2056 while (*head) 2225 while (*head)
2057 { 2226 {
2058 if (*head == elem) 2227 if (*head == elem)
2063 2232
2064 head = &(*head)->next; 2233 head = &(*head)->next;
2065 } 2234 }
2066} 2235}
2067 2236
2068void inline_speed 2237/* internal, faster, version of ev_clear_pending */
2238inline_speed void
2069clear_pending (EV_P_ W w) 2239clear_pending (EV_P_ W w)
2070{ 2240{
2071 if (w->pending) 2241 if (w->pending)
2072 { 2242 {
2073 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2243 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2074 w->pending = 0; 2244 w->pending = 0;
2075 } 2245 }
2076} 2246}
2077 2247
2078int 2248int
2082 int pending = w_->pending; 2252 int pending = w_->pending;
2083 2253
2084 if (expect_true (pending)) 2254 if (expect_true (pending))
2085 { 2255 {
2086 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2256 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2257 p->w = (W)&pending_w;
2087 w_->pending = 0; 2258 w_->pending = 0;
2088 p->w = 0;
2089 return p->events; 2259 return p->events;
2090 } 2260 }
2091 else 2261 else
2092 return 0; 2262 return 0;
2093} 2263}
2094 2264
2095void inline_size 2265inline_size void
2096pri_adjust (EV_P_ W w) 2266pri_adjust (EV_P_ W w)
2097{ 2267{
2098 int pri = w->priority; 2268 int pri = ev_priority (w);
2099 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2269 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2100 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2270 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2101 w->priority = pri; 2271 ev_set_priority (w, pri);
2102} 2272}
2103 2273
2104void inline_speed 2274inline_speed void
2105ev_start (EV_P_ W w, int active) 2275ev_start (EV_P_ W w, int active)
2106{ 2276{
2107 pri_adjust (EV_A_ w); 2277 pri_adjust (EV_A_ w);
2108 w->active = active; 2278 w->active = active;
2109 ev_ref (EV_A); 2279 ev_ref (EV_A);
2110} 2280}
2111 2281
2112void inline_size 2282inline_size void
2113ev_stop (EV_P_ W w) 2283ev_stop (EV_P_ W w)
2114{ 2284{
2115 ev_unref (EV_A); 2285 ev_unref (EV_A);
2116 w->active = 0; 2286 w->active = 0;
2117} 2287}
2124 int fd = w->fd; 2294 int fd = w->fd;
2125 2295
2126 if (expect_false (ev_is_active (w))) 2296 if (expect_false (ev_is_active (w)))
2127 return; 2297 return;
2128 2298
2129 assert (("ev_io_start called with negative fd", fd >= 0)); 2299 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)))); 2300 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2131 2301
2132 EV_FREQUENT_CHECK; 2302 EV_FREQUENT_CHECK;
2133 2303
2134 ev_start (EV_A_ (W)w, 1); 2304 ev_start (EV_A_ (W)w, 1);
2135 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2305 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2136 wlist_add (&anfds[fd].head, (WL)w); 2306 wlist_add (&anfds[fd].head, (WL)w);
2137 2307
2138 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2308 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1);
2139 w->events &= ~EV_IOFDSET; 2309 w->events &= ~EV__IOFDSET;
2140 2310
2141 EV_FREQUENT_CHECK; 2311 EV_FREQUENT_CHECK;
2142} 2312}
2143 2313
2144void noinline 2314void noinline
2146{ 2316{
2147 clear_pending (EV_A_ (W)w); 2317 clear_pending (EV_A_ (W)w);
2148 if (expect_false (!ev_is_active (w))) 2318 if (expect_false (!ev_is_active (w)))
2149 return; 2319 return;
2150 2320
2151 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2321 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2152 2322
2153 EV_FREQUENT_CHECK; 2323 EV_FREQUENT_CHECK;
2154 2324
2155 wlist_del (&anfds[w->fd].head, (WL)w); 2325 wlist_del (&anfds[w->fd].head, (WL)w);
2156 ev_stop (EV_A_ (W)w); 2326 ev_stop (EV_A_ (W)w);
2166 if (expect_false (ev_is_active (w))) 2336 if (expect_false (ev_is_active (w)))
2167 return; 2337 return;
2168 2338
2169 ev_at (w) += mn_now; 2339 ev_at (w) += mn_now;
2170 2340
2171 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2341 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2172 2342
2173 EV_FREQUENT_CHECK; 2343 EV_FREQUENT_CHECK;
2174 2344
2175 ++timercnt; 2345 ++timercnt;
2176 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2346 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2179 ANHE_at_cache (timers [ev_active (w)]); 2349 ANHE_at_cache (timers [ev_active (w)]);
2180 upheap (timers, ev_active (w)); 2350 upheap (timers, ev_active (w));
2181 2351
2182 EV_FREQUENT_CHECK; 2352 EV_FREQUENT_CHECK;
2183 2353
2184 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2354 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2185} 2355}
2186 2356
2187void noinline 2357void noinline
2188ev_timer_stop (EV_P_ ev_timer *w) 2358ev_timer_stop (EV_P_ ev_timer *w)
2189{ 2359{
2194 EV_FREQUENT_CHECK; 2364 EV_FREQUENT_CHECK;
2195 2365
2196 { 2366 {
2197 int active = ev_active (w); 2367 int active = ev_active (w);
2198 2368
2199 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2369 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2200 2370
2201 --timercnt; 2371 --timercnt;
2202 2372
2203 if (expect_true (active < timercnt + HEAP0)) 2373 if (expect_true (active < timercnt + HEAP0))
2204 { 2374 {
2248 2418
2249 if (w->reschedule_cb) 2419 if (w->reschedule_cb)
2250 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2420 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2251 else if (w->interval) 2421 else if (w->interval)
2252 { 2422 {
2253 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2423 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 */ 2424 /* 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; 2425 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2256 } 2426 }
2257 else 2427 else
2258 ev_at (w) = w->offset; 2428 ev_at (w) = w->offset;
2266 ANHE_at_cache (periodics [ev_active (w)]); 2436 ANHE_at_cache (periodics [ev_active (w)]);
2267 upheap (periodics, ev_active (w)); 2437 upheap (periodics, ev_active (w));
2268 2438
2269 EV_FREQUENT_CHECK; 2439 EV_FREQUENT_CHECK;
2270 2440
2271 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2441 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2272} 2442}
2273 2443
2274void noinline 2444void noinline
2275ev_periodic_stop (EV_P_ ev_periodic *w) 2445ev_periodic_stop (EV_P_ ev_periodic *w)
2276{ 2446{
2281 EV_FREQUENT_CHECK; 2451 EV_FREQUENT_CHECK;
2282 2452
2283 { 2453 {
2284 int active = ev_active (w); 2454 int active = ev_active (w);
2285 2455
2286 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2456 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2287 2457
2288 --periodiccnt; 2458 --periodiccnt;
2289 2459
2290 if (expect_true (active < periodiccnt + HEAP0)) 2460 if (expect_true (active < periodiccnt + HEAP0))
2291 { 2461 {
2314 2484
2315void noinline 2485void noinline
2316ev_signal_start (EV_P_ ev_signal *w) 2486ev_signal_start (EV_P_ ev_signal *w)
2317{ 2487{
2318#if EV_MULTIPLICITY 2488#if EV_MULTIPLICITY
2319 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2489 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2320#endif 2490#endif
2321 if (expect_false (ev_is_active (w))) 2491 if (expect_false (ev_is_active (w)))
2322 return; 2492 return;
2323 2493
2324 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2494 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2325 2495
2326 evpipe_init (EV_A); 2496 evpipe_init (EV_A);
2327 2497
2328 EV_FREQUENT_CHECK; 2498 EV_FREQUENT_CHECK;
2329 2499
2380 2550
2381void 2551void
2382ev_child_start (EV_P_ ev_child *w) 2552ev_child_start (EV_P_ ev_child *w)
2383{ 2553{
2384#if EV_MULTIPLICITY 2554#if EV_MULTIPLICITY
2385 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2555 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2386#endif 2556#endif
2387 if (expect_false (ev_is_active (w))) 2557 if (expect_false (ev_is_active (w)))
2388 return; 2558 return;
2389 2559
2390 EV_FREQUENT_CHECK; 2560 EV_FREQUENT_CHECK;
2449 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2619 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2450 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2620 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2451 2621
2452 char *pend = strrchr (path, '/'); 2622 char *pend = strrchr (path, '/');
2453 2623
2454 if (!pend) 2624 if (!pend || pend == path)
2455 break; /* whoops, no '/', complain to your admin */ 2625 break;
2456 2626
2457 *pend = 0; 2627 *pend = 0;
2458 w->wd = inotify_add_watch (fs_fd, path, mask); 2628 w->wd = inotify_add_watch (fs_fd, path, mask);
2459 } 2629 }
2460 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2630 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2461 } 2631 }
2462 } 2632 }
2463 else 2633
2634 if (w->wd >= 0)
2464 { 2635 {
2465 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2636 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2466 2637
2467 /* now local changes will be tracked by inotify, but remote changes won't */ 2638 /* 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 */ 2639 /* unless the filesystem it known to be local, we therefore still poll */
2518 2689
2519 if (w->wd == wd || wd == -1) 2690 if (w->wd == wd || wd == -1)
2520 { 2691 {
2521 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2692 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2522 { 2693 {
2694 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2523 w->wd = -1; 2695 w->wd = -1;
2524 infy_add (EV_A_ w); /* re-add, no matter what */ 2696 infy_add (EV_A_ w); /* re-add, no matter what */
2525 } 2697 }
2526 2698
2527 stat_timer_cb (EV_A_ &w->timer, 0); 2699 stat_timer_cb (EV_A_ &w->timer, 0);
2540 2712
2541 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2713 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2542 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2714 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2543} 2715}
2544 2716
2545void inline_size 2717inline_size void
2546check_2625 (EV_P) 2718check_2625 (EV_P)
2547{ 2719{
2548 /* kernels < 2.6.25 are borked 2720 /* kernels < 2.6.25 are borked
2549 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2721 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2550 */ 2722 */
2563 return; 2735 return;
2564 2736
2565 fs_2625 = 1; 2737 fs_2625 = 1;
2566} 2738}
2567 2739
2568void inline_size 2740inline_size void
2569infy_init (EV_P) 2741infy_init (EV_P)
2570{ 2742{
2571 if (fs_fd != -2) 2743 if (fs_fd != -2)
2572 return; 2744 return;
2573 2745
2583 ev_set_priority (&fs_w, EV_MAXPRI); 2755 ev_set_priority (&fs_w, EV_MAXPRI);
2584 ev_io_start (EV_A_ &fs_w); 2756 ev_io_start (EV_A_ &fs_w);
2585 } 2757 }
2586} 2758}
2587 2759
2588void inline_size 2760inline_size void
2589infy_fork (EV_P) 2761infy_fork (EV_P)
2590{ 2762{
2591 int slot; 2763 int slot;
2592 2764
2593 if (fs_fd < 0) 2765 if (fs_fd < 0)
2874static void 3046static void
2875embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3047embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2876{ 3048{
2877 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3049 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2878 3050
3051 ev_embed_stop (EV_A_ w);
3052
2879 { 3053 {
2880 struct ev_loop *loop = w->other; 3054 struct ev_loop *loop = w->other;
2881 3055
2882 ev_loop_fork (EV_A); 3056 ev_loop_fork (EV_A);
3057 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2883 } 3058 }
3059
3060 ev_embed_start (EV_A_ w);
2884} 3061}
2885 3062
2886#if 0 3063#if 0
2887static void 3064static void
2888embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3065embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2897 if (expect_false (ev_is_active (w))) 3074 if (expect_false (ev_is_active (w)))
2898 return; 3075 return;
2899 3076
2900 { 3077 {
2901 struct ev_loop *loop = w->other; 3078 struct ev_loop *loop = w->other;
2902 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3079 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); 3080 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2904 } 3081 }
2905 3082
2906 EV_FREQUENT_CHECK; 3083 EV_FREQUENT_CHECK;
2907 3084
3090 ev_timer_set (&once->to, timeout, 0.); 3267 ev_timer_set (&once->to, timeout, 0.);
3091 ev_timer_start (EV_A_ &once->to); 3268 ev_timer_start (EV_A_ &once->to);
3092 } 3269 }
3093} 3270}
3094 3271
3272/*****************************************************************************/
3273
3274#if EV_WALK_ENABLE
3275void
3276ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3277{
3278 int i, j;
3279 ev_watcher_list *wl, *wn;
3280
3281 if (types & (EV_IO | EV_EMBED))
3282 for (i = 0; i < anfdmax; ++i)
3283 for (wl = anfds [i].head; wl; )
3284 {
3285 wn = wl->next;
3286
3287#if EV_EMBED_ENABLE
3288 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3289 {
3290 if (types & EV_EMBED)
3291 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3292 }
3293 else
3294#endif
3295#if EV_USE_INOTIFY
3296 if (ev_cb ((ev_io *)wl) == infy_cb)
3297 ;
3298 else
3299#endif
3300 if ((ev_io *)wl != &pipe_w)
3301 if (types & EV_IO)
3302 cb (EV_A_ EV_IO, wl);
3303
3304 wl = wn;
3305 }
3306
3307 if (types & (EV_TIMER | EV_STAT))
3308 for (i = timercnt + HEAP0; i-- > HEAP0; )
3309#if EV_STAT_ENABLE
3310 /*TODO: timer is not always active*/
3311 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3312 {
3313 if (types & EV_STAT)
3314 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3315 }
3316 else
3317#endif
3318 if (types & EV_TIMER)
3319 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3320
3321#if EV_PERIODIC_ENABLE
3322 if (types & EV_PERIODIC)
3323 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3324 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3325#endif
3326
3327#if EV_IDLE_ENABLE
3328 if (types & EV_IDLE)
3329 for (j = NUMPRI; i--; )
3330 for (i = idlecnt [j]; i--; )
3331 cb (EV_A_ EV_IDLE, idles [j][i]);
3332#endif
3333
3334#if EV_FORK_ENABLE
3335 if (types & EV_FORK)
3336 for (i = forkcnt; i--; )
3337 if (ev_cb (forks [i]) != embed_fork_cb)
3338 cb (EV_A_ EV_FORK, forks [i]);
3339#endif
3340
3341#if EV_ASYNC_ENABLE
3342 if (types & EV_ASYNC)
3343 for (i = asynccnt; i--; )
3344 cb (EV_A_ EV_ASYNC, asyncs [i]);
3345#endif
3346
3347 if (types & EV_PREPARE)
3348 for (i = preparecnt; i--; )
3349#if EV_EMBED_ENABLE
3350 if (ev_cb (prepares [i]) != embed_prepare_cb)
3351#endif
3352 cb (EV_A_ EV_PREPARE, prepares [i]);
3353
3354 if (types & EV_CHECK)
3355 for (i = checkcnt; i--; )
3356 cb (EV_A_ EV_CHECK, checks [i]);
3357
3358 if (types & EV_SIGNAL)
3359 for (i = 0; i < signalmax; ++i)
3360 for (wl = signals [i].head; wl; )
3361 {
3362 wn = wl->next;
3363 cb (EV_A_ EV_SIGNAL, wl);
3364 wl = wn;
3365 }
3366
3367 if (types & EV_CHILD)
3368 for (i = EV_PID_HASHSIZE; i--; )
3369 for (wl = childs [i]; wl; )
3370 {
3371 wn = wl->next;
3372 cb (EV_A_ EV_CHILD, wl);
3373 wl = wn;
3374 }
3375/* EV_STAT 0x00001000 /* stat data changed */
3376/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3377}
3378#endif
3379
3095#if EV_MULTIPLICITY 3380#if EV_MULTIPLICITY
3096 #include "ev_wrap.h" 3381 #include "ev_wrap.h"
3097#endif 3382#endif
3098 3383
3099#ifdef __cplusplus 3384#ifdef __cplusplus

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines