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

Comparing libev/ev.c (file contents):
Revision 1.242 by root, Fri May 9 14:07:19 2008 UTC vs.
Revision 1.265 by root, Thu Oct 23 04:56:49 2008 UTC

… …
126# define EV_USE_EVENTFD 1 126# define EV_USE_EVENTFD 1
127# else 127# else
128# define EV_USE_EVENTFD 0 128# define EV_USE_EVENTFD 0
129# endif 129# endif
130# endif 130# endif
131 131
132#endif 132#endif
133 133
134#include <math.h> 134#include <math.h>
135#include <stdlib.h> 135#include <stdlib.h>
136#include <fcntl.h> 136#include <fcntl.h>
… …
154#ifndef _WIN32 154#ifndef _WIN32
155# include <sys/time.h> 155# include <sys/time.h>
156# include <sys/wait.h> 156# include <sys/wait.h>
157# include <unistd.h> 157# include <unistd.h>
158#else 158#else
159# include <io.h>
159# define WIN32_LEAN_AND_MEAN 160# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 161# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 162# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 163# define EV_SELECT_IS_WINSOCKET 1
163# endif 164# endif
164#endif 165#endif
165 166
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 167/* this block tries to deduce configuration from header-defined symbols and defaults */
167 168
168#ifndef EV_USE_MONOTONIC 169#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1
172# else
169# define EV_USE_MONOTONIC 0 173# define EV_USE_MONOTONIC 0
174# endif
170#endif 175#endif
171 176
172#ifndef EV_USE_REALTIME 177#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 178# define EV_USE_REALTIME 0
174#endif 179#endif
175 180
176#ifndef EV_USE_NANOSLEEP 181#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1
184# else
177# define EV_USE_NANOSLEEP 0 185# define EV_USE_NANOSLEEP 0
186# endif
178#endif 187#endif
179 188
180#ifndef EV_USE_SELECT 189#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 190# define EV_USE_SELECT 1
182#endif 191#endif
… …
235# else 244# else
236# define EV_USE_EVENTFD 0 245# define EV_USE_EVENTFD 0
237# endif 246# endif
238#endif 247#endif
239 248
249#if 0 /* debugging */
250# define EV_VERIFY 3
251# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1
253#endif
254
255#ifndef EV_VERIFY
256# define EV_VERIFY !EV_MINIMAL
257#endif
258
259#ifndef EV_USE_4HEAP
260# define EV_USE_4HEAP !EV_MINIMAL
261#endif
262
263#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL
265#endif
266
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 267/* this block fixes any misconfiguration where we know we run into trouble otherwise */
241 268
242#ifndef CLOCK_MONOTONIC 269#ifndef CLOCK_MONOTONIC
243# undef EV_USE_MONOTONIC 270# undef EV_USE_MONOTONIC
244# define EV_USE_MONOTONIC 0 271# define EV_USE_MONOTONIC 0
… …
259# include <sys/select.h> 286# include <sys/select.h>
260# endif 287# endif
261#endif 288#endif
262 289
263#if EV_USE_INOTIFY 290#if EV_USE_INOTIFY
291# include <sys/utsname.h>
264# include <sys/inotify.h> 292# include <sys/inotify.h>
293/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
294# ifndef IN_DONT_FOLLOW
295# undef EV_USE_INOTIFY
296# define EV_USE_INOTIFY 0
297# endif
265#endif 298#endif
266 299
267#if EV_SELECT_IS_WINSOCKET 300#if EV_SELECT_IS_WINSOCKET
268# include <winsock.h> 301# include <winsock.h>
269#endif 302#endif
… …
279} 312}
280# endif 313# endif
281#endif 314#endif
282 315
283/**/ 316/**/
317
318#if EV_VERIFY >= 3
319# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
320#else
321# define EV_FREQUENT_CHECK do { } while (0)
322#endif
284 323
285/* 324/*
286 * This is used to avoid floating point rounding problems. 325 * This is used to avoid floating point rounding problems.
287 * It is added to ev_rt_now when scheduling periodics 326 * It is added to ev_rt_now when scheduling periodics
288 * to ensure progress, time-wise, even when rounding 327 * to ensure progress, time-wise, even when rounding
… …
410typedef struct 449typedef struct
411{ 450{
412 WL head; 451 WL head;
413 unsigned char events; 452 unsigned char events;
414 unsigned char reify; 453 unsigned char reify;
454 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
455 unsigned char unused; /* currently unused padding */
415#if EV_SELECT_IS_WINSOCKET 456#if EV_SELECT_IS_WINSOCKET
416 SOCKET handle; 457 SOCKET handle;
417#endif 458#endif
418} ANFD; 459} ANFD;
419 460
… …
430 WL head; 471 WL head;
431} ANFS; 472} ANFS;
432#endif 473#endif
433 474
434/* Heap Entry */ 475/* Heap Entry */
435#define EV_HEAP_CACHE_AT 0
436#if EV_HEAP_CACHE_AT 476#if EV_HEAP_CACHE_AT
437 typedef struct { 477 typedef struct {
478 ev_tstamp at;
438 WT w; 479 WT w;
439 ev_tstamp at;
440 } ANHE; 480 } ANHE;
441 481
442 #define ANHE_w(he) (he).w /* access watcher, read-write */ 482 #define ANHE_w(he) (he).w /* access watcher, read-write */
443 #define ANHE_at(he) (he).at /* access cached at, read-only */ 483 #define ANHE_at(he) (he).at /* access cached at, read-only */
444 #define ANHE_at_set(he) (he).at = (he).w->at /* update at from watcher */ 484 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
445#else 485#else
446 typedef WT ANHE; 486 typedef WT ANHE;
447 487
448 #define ANHE_w(he) (he) 488 #define ANHE_w(he) (he)
449 #define ANHE_at(he) (he)->at 489 #define ANHE_at(he) (he)->at
450 #define ANHE_at_set(he) 490 #define ANHE_at_cache(he)
451#endif 491#endif
452 492
453#if EV_MULTIPLICITY 493#if EV_MULTIPLICITY
454 494
455 struct ev_loop 495 struct ev_loop
… …
533 struct timeval tv; 573 struct timeval tv;
534 574
535 tv.tv_sec = (time_t)delay; 575 tv.tv_sec = (time_t)delay;
536 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 576 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
537 577
578 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
579 /* somehting nto guaranteed by newer posix versions, but guaranteed */
580 /* by older ones */
538 select (0, 0, 0, 0, &tv); 581 select (0, 0, 0, 0, &tv);
539#endif 582#endif
540 } 583 }
541} 584}
542 585
… …
569array_realloc (int elem, void *base, int *cur, int cnt) 612array_realloc (int elem, void *base, int *cur, int cnt)
570{ 613{
571 *cur = array_nextsize (elem, *cur, cnt); 614 *cur = array_nextsize (elem, *cur, cnt);
572 return ev_realloc (base, elem * *cur); 615 return ev_realloc (base, elem * *cur);
573} 616}
617
618#define array_init_zero(base,count) \
619 memset ((void *)(base), 0, sizeof (*(base)) * (count))
574 620
575#define array_needsize(type,base,cur,cnt,init) \ 621#define array_needsize(type,base,cur,cnt,init) \
576 if (expect_false ((cnt) > (cur))) \ 622 if (expect_false ((cnt) > (cur))) \
577 { \ 623 { \
578 int ocur_ = (cur); \ 624 int ocur_ = (cur); \
… …
622 ev_feed_event (EV_A_ events [i], type); 668 ev_feed_event (EV_A_ events [i], type);
623} 669}
624 670
625/*****************************************************************************/ 671/*****************************************************************************/
626 672
627void inline_size
628anfds_init (ANFD *base, int count)
629{
630 while (count--)
631 {
632 base->head = 0;
633 base->events = EV_NONE;
634 base->reify = 0;
635
636 ++base;
637 }
638}
639
640void inline_speed 673void inline_speed
641fd_event (EV_P_ int fd, int revents) 674fd_event (EV_P_ int fd, int revents)
642{ 675{
643 ANFD *anfd = anfds + fd; 676 ANFD *anfd = anfds + fd;
644 ev_io *w; 677 ev_io *w;
… …
676 events |= (unsigned char)w->events; 709 events |= (unsigned char)w->events;
677 710
678#if EV_SELECT_IS_WINSOCKET 711#if EV_SELECT_IS_WINSOCKET
679 if (events) 712 if (events)
680 { 713 {
681 unsigned long argp; 714 unsigned long arg;
682 #ifdef EV_FD_TO_WIN32_HANDLE 715 #ifdef EV_FD_TO_WIN32_HANDLE
683 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 716 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
684 #else 717 #else
685 anfd->handle = _get_osfhandle (fd); 718 anfd->handle = _get_osfhandle (fd);
686 #endif 719 #endif
687 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 720 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
688 } 721 }
689#endif 722#endif
690 723
691 { 724 {
692 unsigned char o_events = anfd->events; 725 unsigned char o_events = anfd->events;
… …
745{ 778{
746 int fd; 779 int fd;
747 780
748 for (fd = 0; fd < anfdmax; ++fd) 781 for (fd = 0; fd < anfdmax; ++fd)
749 if (anfds [fd].events) 782 if (anfds [fd].events)
750 if (!fd_valid (fd) == -1 && errno == EBADF) 783 if (!fd_valid (fd) && errno == EBADF)
751 fd_kill (EV_A_ fd); 784 fd_kill (EV_A_ fd);
752} 785}
753 786
754/* called on ENOMEM in select/poll to kill some fds and retry */ 787/* called on ENOMEM in select/poll to kill some fds and retry */
755static void noinline 788static void noinline
… …
791 * at the moment we allow libev the luxury of two heaps, 824 * at the moment we allow libev the luxury of two heaps,
792 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap 825 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
793 * which is more cache-efficient. 826 * which is more cache-efficient.
794 * the difference is about 5% with 50000+ watchers. 827 * the difference is about 5% with 50000+ watchers.
795 */ 828 */
796#define EV_USE_4HEAP !EV_MINIMAL
797#if EV_USE_4HEAP 829#if EV_USE_4HEAP
798 830
799#define DHEAP 4 831#define DHEAP 4
800#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 832#define HEAP0 (DHEAP - 1) /* index of first element in heap */
801 833#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
802/* towards the root */ 834#define UPHEAP_DONE(p,k) ((p) == (k))
803void inline_speed
804upheap (ANHE *heap, int k)
805{
806 ANHE he = heap [k];
807
808 for (;;)
809 {
810 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
811
812 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
813 break;
814
815 heap [k] = heap [p];
816 ev_active (ANHE_w (heap [k])) = k;
817 k = p;
818 }
819
820 ev_active (ANHE_w (he)) = k;
821 heap [k] = he;
822}
823 835
824/* away from the root */ 836/* away from the root */
825void inline_speed 837void inline_speed
826downheap (ANHE *heap, int N, int k) 838downheap (ANHE *heap, int N, int k)
827{ 839{
… …
830 842
831 for (;;) 843 for (;;)
832 { 844 {
833 ev_tstamp minat; 845 ev_tstamp minat;
834 ANHE *minpos; 846 ANHE *minpos;
835 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0; 847 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
836 848
837 // find minimum child 849 /* find minimum child */
838 if (expect_true (pos + DHEAP - 1 < E)) 850 if (expect_true (pos + DHEAP - 1 < E))
839 { 851 {
840 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 852 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
841 if (ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos)); 853 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
842 if (ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos)); 854 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
843 if (ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos)); 855 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
844 } 856 }
845 else if (pos < E) 857 else if (pos < E)
846 { 858 {
847 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 859 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
848 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos)); 860 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
… …
853 break; 865 break;
854 866
855 if (ANHE_at (he) <= minat) 867 if (ANHE_at (he) <= minat)
856 break; 868 break;
857 869
870 heap [k] = *minpos;
858 ev_active (ANHE_w (*minpos)) = k; 871 ev_active (ANHE_w (*minpos)) = k;
859 heap [k] = *minpos;
860 872
861 k = minpos - heap; 873 k = minpos - heap;
862 } 874 }
863 875
876 heap [k] = he;
864 ev_active (ANHE_w (he)) = k; 877 ev_active (ANHE_w (he)) = k;
865 heap [k] = he;
866} 878}
867 879
868#else // 4HEAP 880#else /* 4HEAP */
869 881
870#define HEAP0 1 882#define HEAP0 1
871 883#define HPARENT(k) ((k) >> 1)
872/* towards the root */ 884#define UPHEAP_DONE(p,k) (!(p))
873void inline_speed
874upheap (ANHE *heap, int k)
875{
876 ANHE he = heap [k];
877
878 for (;;)
879 {
880 int p = k >> 1;
881
882 /* maybe we could use a dummy element at heap [0]? */
883 if (!p || ANHE_at (heap [p]) <= ANHE_at (he))
884 break;
885
886 heap [k] = heap [p];
887 ev_active (ANHE_w (heap [k])) = k;
888 k = p;
889 }
890
891 heap [k] = w;
892 ev_active (ANHE_w (heap [k])) = k;
893}
894 885
895/* away from the root */ 886/* away from the root */
896void inline_speed 887void inline_speed
897downheap (ANHE *heap, int N, int k) 888downheap (ANHE *heap, int N, int k)
898{ 889{
… …
900 891
901 for (;;) 892 for (;;)
902 { 893 {
903 int c = k << 1; 894 int c = k << 1;
904 895
905 if (c > N) 896 if (c > N + HEAP0 - 1)
906 break; 897 break;
907 898
908 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 899 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
909 ? 1 : 0; 900 ? 1 : 0;
910 901
911 if (w->at <= ANHE_at (heap [c])) 902 if (ANHE_at (he) <= ANHE_at (heap [c]))
912 break; 903 break;
913 904
914 heap [k] = heap [c]; 905 heap [k] = heap [c];
915 ev_active (ANHE_w (heap [k])) = k; 906 ev_active (ANHE_w (heap [k])) = k;
916 907
… …
920 heap [k] = he; 911 heap [k] = he;
921 ev_active (ANHE_w (he)) = k; 912 ev_active (ANHE_w (he)) = k;
922} 913}
923#endif 914#endif
924 915
916/* towards the root */
917void inline_speed
918upheap (ANHE *heap, int k)
919{
920 ANHE he = heap [k];
921
922 for (;;)
923 {
924 int p = HPARENT (k);
925
926 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
927 break;
928
929 heap [k] = heap [p];
930 ev_active (ANHE_w (heap [k])) = k;
931 k = p;
932 }
933
934 heap [k] = he;
935 ev_active (ANHE_w (he)) = k;
936}
937
925void inline_size 938void inline_size
926adjustheap (ANHE *heap, int N, int k) 939adjustheap (ANHE *heap, int N, int k)
927{ 940{
941 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
928 upheap (heap, k); 942 upheap (heap, k);
943 else
929 downheap (heap, N, k); 944 downheap (heap, N, k);
945}
946
947/* rebuild the heap: this function is used only once and executed rarely */
948void inline_size
949reheap (ANHE *heap, int N)
950{
951 int i;
952
953 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
954 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
955 for (i = 0; i < N; ++i)
956 upheap (heap, i + HEAP0);
930} 957}
931 958
932/*****************************************************************************/ 959/*****************************************************************************/
933 960
934typedef struct 961typedef struct
… …
940static ANSIG *signals; 967static ANSIG *signals;
941static int signalmax; 968static int signalmax;
942 969
943static EV_ATOMIC_T gotsig; 970static EV_ATOMIC_T gotsig;
944 971
945void inline_size
946signals_init (ANSIG *base, int count)
947{
948 while (count--)
949 {
950 base->head = 0;
951 base->gotsig = 0;
952
953 ++base;
954 }
955}
956
957/*****************************************************************************/ 972/*****************************************************************************/
958 973
959void inline_speed 974void inline_speed
960fd_intern (int fd) 975fd_intern (int fd)
961{ 976{
962#ifdef _WIN32 977#ifdef _WIN32
963 int arg = 1; 978 unsigned long arg = 1;
964 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 979 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
965#else 980#else
966 fcntl (fd, F_SETFD, FD_CLOEXEC); 981 fcntl (fd, F_SETFD, FD_CLOEXEC);
967 fcntl (fd, F_SETFL, O_NONBLOCK); 982 fcntl (fd, F_SETFL, O_NONBLOCK);
968#endif 983#endif
… …
1452 1467
1453 postfork = 0; 1468 postfork = 0;
1454} 1469}
1455 1470
1456#if EV_MULTIPLICITY 1471#if EV_MULTIPLICITY
1472
1457struct ev_loop * 1473struct ev_loop *
1458ev_loop_new (unsigned int flags) 1474ev_loop_new (unsigned int flags)
1459{ 1475{
1460 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1476 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1461 1477
… …
1479void 1495void
1480ev_loop_fork (EV_P) 1496ev_loop_fork (EV_P)
1481{ 1497{
1482 postfork = 1; /* must be in line with ev_default_fork */ 1498 postfork = 1; /* must be in line with ev_default_fork */
1483} 1499}
1500
1501#if EV_VERIFY
1502static void noinline
1503verify_watcher (EV_P_ W w)
1504{
1505 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1506
1507 if (w->pending)
1508 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1509}
1510
1511static void noinline
1512verify_heap (EV_P_ ANHE *heap, int N)
1513{
1514 int i;
1515
1516 for (i = HEAP0; i < N + HEAP0; ++i)
1517 {
1518 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1519 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1520 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1521
1522 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1523 }
1524}
1525
1526static void noinline
1527array_verify (EV_P_ W *ws, int cnt)
1528{
1529 while (cnt--)
1530 {
1531 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1532 verify_watcher (EV_A_ ws [cnt]);
1533 }
1534}
1535#endif
1536
1537void
1538ev_loop_verify (EV_P)
1539{
1540#if EV_VERIFY
1541 int i;
1542 WL w;
1543
1544 assert (activecnt >= -1);
1545
1546 assert (fdchangemax >= fdchangecnt);
1547 for (i = 0; i < fdchangecnt; ++i)
1548 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1549
1550 assert (anfdmax >= 0);
1551 for (i = 0; i < anfdmax; ++i)
1552 for (w = anfds [i].head; w; w = w->next)
1553 {
1554 verify_watcher (EV_A_ (W)w);
1555 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1556 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1557 }
1558
1559 assert (timermax >= timercnt);
1560 verify_heap (EV_A_ timers, timercnt);
1561
1562#if EV_PERIODIC_ENABLE
1563 assert (periodicmax >= periodiccnt);
1564 verify_heap (EV_A_ periodics, periodiccnt);
1565#endif
1566
1567 for (i = NUMPRI; i--; )
1568 {
1569 assert (pendingmax [i] >= pendingcnt [i]);
1570#if EV_IDLE_ENABLE
1571 assert (idleall >= 0);
1572 assert (idlemax [i] >= idlecnt [i]);
1573 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1574#endif
1575 }
1576
1577#if EV_FORK_ENABLE
1578 assert (forkmax >= forkcnt);
1579 array_verify (EV_A_ (W *)forks, forkcnt);
1580#endif
1581
1582#if EV_ASYNC_ENABLE
1583 assert (asyncmax >= asynccnt);
1584 array_verify (EV_A_ (W *)asyncs, asynccnt);
1585#endif
1586
1587 assert (preparemax >= preparecnt);
1588 array_verify (EV_A_ (W *)prepares, preparecnt);
1589
1590 assert (checkmax >= checkcnt);
1591 array_verify (EV_A_ (W *)checks, checkcnt);
1592
1593# if 0
1594 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1595 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1484#endif 1596# endif
1597#endif
1598}
1599
1600#endif /* multiplicity */
1485 1601
1486#if EV_MULTIPLICITY 1602#if EV_MULTIPLICITY
1487struct ev_loop * 1603struct ev_loop *
1488ev_default_loop_init (unsigned int flags) 1604ev_default_loop_init (unsigned int flags)
1489#else 1605#else
… …
1565 { 1681 {
1566 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1682 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1567 1683
1568 p->w->pending = 0; 1684 p->w->pending = 0;
1569 EV_CB_INVOKE (p->w, p->events); 1685 EV_CB_INVOKE (p->w, p->events);
1686 EV_FREQUENT_CHECK;
1570 } 1687 }
1571 } 1688 }
1572} 1689}
1573 1690
1574#if EV_IDLE_ENABLE 1691#if EV_IDLE_ENABLE
… …
1595#endif 1712#endif
1596 1713
1597void inline_size 1714void inline_size
1598timers_reify (EV_P) 1715timers_reify (EV_P)
1599{ 1716{
1717 EV_FREQUENT_CHECK;
1718
1600 while (timercnt && ANHE_at (timers [HEAP0]) <= mn_now) 1719 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1601 { 1720 {
1602 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1721 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1603 1722
1604 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1723 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1605 1724
1606 /* first reschedule or stop timer */ 1725 /* first reschedule or stop timer */
1607 if (w->repeat) 1726 if (w->repeat)
1608 { 1727 {
1609 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1610
1611 ev_at (w) += w->repeat; 1728 ev_at (w) += w->repeat;
1612 if (ev_at (w) < mn_now) 1729 if (ev_at (w) < mn_now)
1613 ev_at (w) = mn_now; 1730 ev_at (w) = mn_now;
1614 1731
1732 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1733
1615 ANHE_at_set (timers [HEAP0]); 1734 ANHE_at_cache (timers [HEAP0]);
1616 downheap (timers, timercnt, HEAP0); 1735 downheap (timers, timercnt, HEAP0);
1617 } 1736 }
1618 else 1737 else
1619 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1738 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1620 1739
1740 EV_FREQUENT_CHECK;
1621 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1741 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1622 } 1742 }
1623} 1743}
1624 1744
1625#if EV_PERIODIC_ENABLE 1745#if EV_PERIODIC_ENABLE
1626void inline_size 1746void inline_size
1627periodics_reify (EV_P) 1747periodics_reify (EV_P)
1628{ 1748{
1749 EV_FREQUENT_CHECK;
1750
1629 while (periodiccnt && ANHE_at (periodics [HEAP0]) <= ev_rt_now) 1751 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1630 { 1752 {
1631 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1753 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1632 1754
1633 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1755 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1634 1756
1635 /* first reschedule or stop timer */ 1757 /* first reschedule or stop timer */
1636 if (w->reschedule_cb) 1758 if (w->reschedule_cb)
1637 { 1759 {
1638 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1760 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1761
1639 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now)); 1762 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1763
1640 ANHE_at_set (periodics [HEAP0]); 1764 ANHE_at_cache (periodics [HEAP0]);
1641 downheap (periodics, periodiccnt, HEAP0); 1765 downheap (periodics, periodiccnt, HEAP0);
1642 } 1766 }
1643 else if (w->interval) 1767 else if (w->interval)
1644 { 1768 {
1645 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1769 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1770 /* if next trigger time is not sufficiently in the future, put it there */
1771 /* this might happen because of floating point inexactness */
1646 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval; 1772 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1647 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now)); 1773 {
1774 ev_at (w) += w->interval;
1775
1776 /* if interval is unreasonably low we might still have a time in the past */
1777 /* so correct this. this will make the periodic very inexact, but the user */
1778 /* has effectively asked to get triggered more often than possible */
1779 if (ev_at (w) < ev_rt_now)
1780 ev_at (w) = ev_rt_now;
1781 }
1782
1648 ANHE_at_set (periodics [HEAP0]); 1783 ANHE_at_cache (periodics [HEAP0]);
1649 downheap (periodics, periodiccnt, HEAP0); 1784 downheap (periodics, periodiccnt, HEAP0);
1650 } 1785 }
1651 else 1786 else
1652 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1787 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1653 1788
1789 EV_FREQUENT_CHECK;
1654 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1790 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1655 } 1791 }
1656} 1792}
1657 1793
1658static void noinline 1794static void noinline
… …
1668 if (w->reschedule_cb) 1804 if (w->reschedule_cb)
1669 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1805 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1670 else if (w->interval) 1806 else if (w->interval)
1671 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1807 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1672 1808
1673 ANHE_at_set (periodics [i]); 1809 ANHE_at_cache (periodics [i]);
1674 } 1810 }
1675 1811
1676 /* now rebuild the heap, this for the 2-heap, inefficient for the 4-heap, but correct */
1677 for (i = periodiccnt >> 1; --i; )
1678 downheap (periodics, periodiccnt, i + HEAP0); 1812 reheap (periodics, periodiccnt);
1679} 1813}
1680#endif 1814#endif
1681 1815
1682void inline_speed 1816void inline_speed
1683time_update (EV_P_ ev_tstamp max_block) 1817time_update (EV_P_ ev_tstamp max_block)
… …
1741 /* adjust timers. this is easy, as the offset is the same for all of them */ 1875 /* adjust timers. this is easy, as the offset is the same for all of them */
1742 for (i = 0; i < timercnt; ++i) 1876 for (i = 0; i < timercnt; ++i)
1743 { 1877 {
1744 ANHE *he = timers + i + HEAP0; 1878 ANHE *he = timers + i + HEAP0;
1745 ANHE_w (*he)->at += ev_rt_now - mn_now; 1879 ANHE_w (*he)->at += ev_rt_now - mn_now;
1746 ANHE_at_set (*he); 1880 ANHE_at_cache (*he);
1747 } 1881 }
1748 } 1882 }
1749 1883
1750 mn_now = ev_rt_now; 1884 mn_now = ev_rt_now;
1751 } 1885 }
… …
1761ev_unref (EV_P) 1895ev_unref (EV_P)
1762{ 1896{
1763 --activecnt; 1897 --activecnt;
1764} 1898}
1765 1899
1900void
1901ev_now_update (EV_P)
1902{
1903 time_update (EV_A_ 1e100);
1904}
1905
1766static int loop_done; 1906static int loop_done;
1767 1907
1768void 1908void
1769ev_loop (EV_P_ int flags) 1909ev_loop (EV_P_ int flags)
1770{ 1910{
… …
1772 1912
1773 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1913 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1774 1914
1775 do 1915 do
1776 { 1916 {
1917#if EV_VERIFY >= 2
1918 ev_loop_verify (EV_A);
1919#endif
1920
1777#ifndef _WIN32 1921#ifndef _WIN32
1778 if (expect_false (curpid)) /* penalise the forking check even more */ 1922 if (expect_false (curpid)) /* penalise the forking check even more */
1779 if (expect_false (getpid () != curpid)) 1923 if (expect_false (getpid () != curpid))
1780 { 1924 {
1781 curpid = getpid (); 1925 curpid = getpid ();
… …
1975 2119
1976 if (expect_false (ev_is_active (w))) 2120 if (expect_false (ev_is_active (w)))
1977 return; 2121 return;
1978 2122
1979 assert (("ev_io_start called with negative fd", fd >= 0)); 2123 assert (("ev_io_start called with negative fd", fd >= 0));
2124 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2125
2126 EV_FREQUENT_CHECK;
1980 2127
1981 ev_start (EV_A_ (W)w, 1); 2128 ev_start (EV_A_ (W)w, 1);
1982 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2129 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
1983 wlist_add (&anfds[fd].head, (WL)w); 2130 wlist_add (&anfds[fd].head, (WL)w);
1984 2131
1985 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2132 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1986 w->events &= ~EV_IOFDSET; 2133 w->events &= ~EV_IOFDSET;
2134
2135 EV_FREQUENT_CHECK;
1987} 2136}
1988 2137
1989void noinline 2138void noinline
1990ev_io_stop (EV_P_ ev_io *w) 2139ev_io_stop (EV_P_ ev_io *w)
1991{ 2140{
… …
1993 if (expect_false (!ev_is_active (w))) 2142 if (expect_false (!ev_is_active (w)))
1994 return; 2143 return;
1995 2144
1996 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2145 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1997 2146
2147 EV_FREQUENT_CHECK;
2148
1998 wlist_del (&anfds[w->fd].head, (WL)w); 2149 wlist_del (&anfds[w->fd].head, (WL)w);
1999 ev_stop (EV_A_ (W)w); 2150 ev_stop (EV_A_ (W)w);
2000 2151
2001 fd_change (EV_A_ w->fd, 1); 2152 fd_change (EV_A_ w->fd, 1);
2153
2154 EV_FREQUENT_CHECK;
2002} 2155}
2003 2156
2004void noinline 2157void noinline
2005ev_timer_start (EV_P_ ev_timer *w) 2158ev_timer_start (EV_P_ ev_timer *w)
2006{ 2159{
… …
2009 2162
2010 ev_at (w) += mn_now; 2163 ev_at (w) += mn_now;
2011 2164
2012 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2165 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2013 2166
2167 EV_FREQUENT_CHECK;
2168
2169 ++timercnt;
2014 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2170 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2015 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2); 2171 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
2016 ANHE_w (timers [ev_active (w)]) = (WT)w; 2172 ANHE_w (timers [ev_active (w)]) = (WT)w;
2017 ANHE_at_set (timers [ev_active (w)]); 2173 ANHE_at_cache (timers [ev_active (w)]);
2018 upheap (timers, ev_active (w)); 2174 upheap (timers, ev_active (w));
2175
2176 EV_FREQUENT_CHECK;
2019 2177
2020 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2178 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2021} 2179}
2022 2180
2023void noinline 2181void noinline
… …
2025{ 2183{
2026 clear_pending (EV_A_ (W)w); 2184 clear_pending (EV_A_ (W)w);
2027 if (expect_false (!ev_is_active (w))) 2185 if (expect_false (!ev_is_active (w)))
2028 return; 2186 return;
2029 2187
2188 EV_FREQUENT_CHECK;
2189
2030 { 2190 {
2031 int active = ev_active (w); 2191 int active = ev_active (w);
2032 2192
2033 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2193 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2034 2194
2195 --timercnt;
2196
2035 if (expect_true (active < timercnt + HEAP0 - 1)) 2197 if (expect_true (active < timercnt + HEAP0))
2036 { 2198 {
2037 timers [active] = timers [timercnt + HEAP0 - 1]; 2199 timers [active] = timers [timercnt + HEAP0];
2038 adjustheap (timers, timercnt, active); 2200 adjustheap (timers, timercnt, active);
2039 } 2201 }
2040
2041 --timercnt;
2042 } 2202 }
2203
2204 EV_FREQUENT_CHECK;
2043 2205
2044 ev_at (w) -= mn_now; 2206 ev_at (w) -= mn_now;
2045 2207
2046 ev_stop (EV_A_ (W)w); 2208 ev_stop (EV_A_ (W)w);
2047} 2209}
2048 2210
2049void noinline 2211void noinline
2050ev_timer_again (EV_P_ ev_timer *w) 2212ev_timer_again (EV_P_ ev_timer *w)
2051{ 2213{
2214 EV_FREQUENT_CHECK;
2215
2052 if (ev_is_active (w)) 2216 if (ev_is_active (w))
2053 { 2217 {
2054 if (w->repeat) 2218 if (w->repeat)
2055 { 2219 {
2056 ev_at (w) = mn_now + w->repeat; 2220 ev_at (w) = mn_now + w->repeat;
2057 ANHE_at_set (timers [ev_active (w)]); 2221 ANHE_at_cache (timers [ev_active (w)]);
2058 adjustheap (timers, timercnt, ev_active (w)); 2222 adjustheap (timers, timercnt, ev_active (w));
2059 } 2223 }
2060 else 2224 else
2061 ev_timer_stop (EV_A_ w); 2225 ev_timer_stop (EV_A_ w);
2062 } 2226 }
2063 else if (w->repeat) 2227 else if (w->repeat)
2064 { 2228 {
2065 ev_at (w) = w->repeat; 2229 ev_at (w) = w->repeat;
2066 ev_timer_start (EV_A_ w); 2230 ev_timer_start (EV_A_ w);
2067 } 2231 }
2232
2233 EV_FREQUENT_CHECK;
2068} 2234}
2069 2235
2070#if EV_PERIODIC_ENABLE 2236#if EV_PERIODIC_ENABLE
2071void noinline 2237void noinline
2072ev_periodic_start (EV_P_ ev_periodic *w) 2238ev_periodic_start (EV_P_ ev_periodic *w)
… …
2083 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2249 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2084 } 2250 }
2085 else 2251 else
2086 ev_at (w) = w->offset; 2252 ev_at (w) = w->offset;
2087 2253
2254 EV_FREQUENT_CHECK;
2255
2256 ++periodiccnt;
2088 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2257 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2089 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2); 2258 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2090 ANHE_w (periodics [ev_active (w)]) = (WT)w; 2259 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2260 ANHE_at_cache (periodics [ev_active (w)]);
2091 upheap (periodics, ev_active (w)); 2261 upheap (periodics, ev_active (w));
2262
2263 EV_FREQUENT_CHECK;
2092 2264
2093 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2265 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2094} 2266}
2095 2267
2096void noinline 2268void noinline
… …
2098{ 2270{
2099 clear_pending (EV_A_ (W)w); 2271 clear_pending (EV_A_ (W)w);
2100 if (expect_false (!ev_is_active (w))) 2272 if (expect_false (!ev_is_active (w)))
2101 return; 2273 return;
2102 2274
2275 EV_FREQUENT_CHECK;
2276
2103 { 2277 {
2104 int active = ev_active (w); 2278 int active = ev_active (w);
2105 2279
2106 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2280 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2107 2281
2282 --periodiccnt;
2283
2108 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2284 if (expect_true (active < periodiccnt + HEAP0))
2109 { 2285 {
2110 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2286 periodics [active] = periodics [periodiccnt + HEAP0];
2111 adjustheap (periodics, periodiccnt, active); 2287 adjustheap (periodics, periodiccnt, active);
2112 } 2288 }
2113
2114 --periodiccnt;
2115 } 2289 }
2290
2291 EV_FREQUENT_CHECK;
2116 2292
2117 ev_stop (EV_A_ (W)w); 2293 ev_stop (EV_A_ (W)w);
2118} 2294}
2119 2295
2120void noinline 2296void noinline
… …
2140 return; 2316 return;
2141 2317
2142 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2318 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2143 2319
2144 evpipe_init (EV_A); 2320 evpipe_init (EV_A);
2321
2322 EV_FREQUENT_CHECK;
2145 2323
2146 { 2324 {
2147#ifndef _WIN32 2325#ifndef _WIN32
2148 sigset_t full, prev; 2326 sigset_t full, prev;
2149 sigfillset (&full); 2327 sigfillset (&full);
2150 sigprocmask (SIG_SETMASK, &full, &prev); 2328 sigprocmask (SIG_SETMASK, &full, &prev);
2151#endif 2329#endif
2152 2330
2153 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2331 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2154 2332
2155#ifndef _WIN32 2333#ifndef _WIN32
2156 sigprocmask (SIG_SETMASK, &prev, 0); 2334 sigprocmask (SIG_SETMASK, &prev, 0);
2157#endif 2335#endif
2158 } 2336 }
… …
2170 sigfillset (&sa.sa_mask); 2348 sigfillset (&sa.sa_mask);
2171 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2349 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2172 sigaction (w->signum, &sa, 0); 2350 sigaction (w->signum, &sa, 0);
2173#endif 2351#endif
2174 } 2352 }
2353
2354 EV_FREQUENT_CHECK;
2175} 2355}
2176 2356
2177void noinline 2357void noinline
2178ev_signal_stop (EV_P_ ev_signal *w) 2358ev_signal_stop (EV_P_ ev_signal *w)
2179{ 2359{
2180 clear_pending (EV_A_ (W)w); 2360 clear_pending (EV_A_ (W)w);
2181 if (expect_false (!ev_is_active (w))) 2361 if (expect_false (!ev_is_active (w)))
2182 return; 2362 return;
2183 2363
2364 EV_FREQUENT_CHECK;
2365
2184 wlist_del (&signals [w->signum - 1].head, (WL)w); 2366 wlist_del (&signals [w->signum - 1].head, (WL)w);
2185 ev_stop (EV_A_ (W)w); 2367 ev_stop (EV_A_ (W)w);
2186 2368
2187 if (!signals [w->signum - 1].head) 2369 if (!signals [w->signum - 1].head)
2188 signal (w->signum, SIG_DFL); 2370 signal (w->signum, SIG_DFL);
2371
2372 EV_FREQUENT_CHECK;
2189} 2373}
2190 2374
2191void 2375void
2192ev_child_start (EV_P_ ev_child *w) 2376ev_child_start (EV_P_ ev_child *w)
2193{ 2377{
… …
2195 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2379 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2196#endif 2380#endif
2197 if (expect_false (ev_is_active (w))) 2381 if (expect_false (ev_is_active (w)))
2198 return; 2382 return;
2199 2383
2384 EV_FREQUENT_CHECK;
2385
2200 ev_start (EV_A_ (W)w, 1); 2386 ev_start (EV_A_ (W)w, 1);
2201 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2387 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2388
2389 EV_FREQUENT_CHECK;
2202} 2390}
2203 2391
2204void 2392void
2205ev_child_stop (EV_P_ ev_child *w) 2393ev_child_stop (EV_P_ ev_child *w)
2206{ 2394{
2207 clear_pending (EV_A_ (W)w); 2395 clear_pending (EV_A_ (W)w);
2208 if (expect_false (!ev_is_active (w))) 2396 if (expect_false (!ev_is_active (w)))
2209 return; 2397 return;
2210 2398
2399 EV_FREQUENT_CHECK;
2400
2211 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2401 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2212 ev_stop (EV_A_ (W)w); 2402 ev_stop (EV_A_ (W)w);
2403
2404 EV_FREQUENT_CHECK;
2213} 2405}
2214 2406
2215#if EV_STAT_ENABLE 2407#if EV_STAT_ENABLE
2216 2408
2217# ifdef _WIN32 2409# ifdef _WIN32
… …
2286 2478
2287static void noinline 2479static void noinline
2288infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2480infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2289{ 2481{
2290 if (slot < 0) 2482 if (slot < 0)
2291 /* overflow, need to check for all hahs slots */ 2483 /* overflow, need to check for all hash slots */
2292 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2484 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2293 infy_wd (EV_A_ slot, wd, ev); 2485 infy_wd (EV_A_ slot, wd, ev);
2294 else 2486 else
2295 { 2487 {
2296 WL w_; 2488 WL w_;
… …
2330infy_init (EV_P) 2522infy_init (EV_P)
2331{ 2523{
2332 if (fs_fd != -2) 2524 if (fs_fd != -2)
2333 return; 2525 return;
2334 2526
2527 /* kernels < 2.6.25 are borked
2528 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2529 */
2530 {
2531 struct utsname buf;
2532 int major, minor, micro;
2533
2534 fs_fd = -1;
2535
2536 if (uname (&buf))
2537 return;
2538
2539 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2540 return;
2541
2542 if (major < 2
2543 || (major == 2 && minor < 6)
2544 || (major == 2 && minor == 6 && micro < 25))
2545 return;
2546 }
2547
2335 fs_fd = inotify_init (); 2548 fs_fd = inotify_init ();
2336 2549
2337 if (fs_fd >= 0) 2550 if (fs_fd >= 0)
2338 { 2551 {
2339 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 2552 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
… …
2368 if (fs_fd >= 0) 2581 if (fs_fd >= 0)
2369 infy_add (EV_A_ w); /* re-add, no matter what */ 2582 infy_add (EV_A_ w); /* re-add, no matter what */
2370 else 2583 else
2371 ev_timer_start (EV_A_ &w->timer); 2584 ev_timer_start (EV_A_ &w->timer);
2372 } 2585 }
2373
2374 } 2586 }
2375} 2587}
2376 2588
2589#endif
2590
2591#ifdef _WIN32
2592# define EV_LSTAT(p,b) _stati64 (p, b)
2593#else
2594# define EV_LSTAT(p,b) lstat (p, b)
2377#endif 2595#endif
2378 2596
2379void 2597void
2380ev_stat_stat (EV_P_ ev_stat *w) 2598ev_stat_stat (EV_P_ ev_stat *w)
2381{ 2599{
… …
2408 || w->prev.st_atime != w->attr.st_atime 2626 || w->prev.st_atime != w->attr.st_atime
2409 || w->prev.st_mtime != w->attr.st_mtime 2627 || w->prev.st_mtime != w->attr.st_mtime
2410 || w->prev.st_ctime != w->attr.st_ctime 2628 || w->prev.st_ctime != w->attr.st_ctime
2411 ) { 2629 ) {
2412 #if EV_USE_INOTIFY 2630 #if EV_USE_INOTIFY
2631 if (fs_fd >= 0)
2632 {
2413 infy_del (EV_A_ w); 2633 infy_del (EV_A_ w);
2414 infy_add (EV_A_ w); 2634 infy_add (EV_A_ w);
2415 ev_stat_stat (EV_A_ w); /* avoid race... */ 2635 ev_stat_stat (EV_A_ w); /* avoid race... */
2636 }
2416 #endif 2637 #endif
2417 2638
2418 ev_feed_event (EV_A_ w, EV_STAT); 2639 ev_feed_event (EV_A_ w, EV_STAT);
2419 } 2640 }
2420} 2641}
… …
2445 else 2666 else
2446#endif 2667#endif
2447 ev_timer_start (EV_A_ &w->timer); 2668 ev_timer_start (EV_A_ &w->timer);
2448 2669
2449 ev_start (EV_A_ (W)w, 1); 2670 ev_start (EV_A_ (W)w, 1);
2671
2672 EV_FREQUENT_CHECK;
2450} 2673}
2451 2674
2452void 2675void
2453ev_stat_stop (EV_P_ ev_stat *w) 2676ev_stat_stop (EV_P_ ev_stat *w)
2454{ 2677{
2455 clear_pending (EV_A_ (W)w); 2678 clear_pending (EV_A_ (W)w);
2456 if (expect_false (!ev_is_active (w))) 2679 if (expect_false (!ev_is_active (w)))
2457 return; 2680 return;
2458 2681
2682 EV_FREQUENT_CHECK;
2683
2459#if EV_USE_INOTIFY 2684#if EV_USE_INOTIFY
2460 infy_del (EV_A_ w); 2685 infy_del (EV_A_ w);
2461#endif 2686#endif
2462 ev_timer_stop (EV_A_ &w->timer); 2687 ev_timer_stop (EV_A_ &w->timer);
2463 2688
2464 ev_stop (EV_A_ (W)w); 2689 ev_stop (EV_A_ (W)w);
2690
2691 EV_FREQUENT_CHECK;
2465} 2692}
2466#endif 2693#endif
2467 2694
2468#if EV_IDLE_ENABLE 2695#if EV_IDLE_ENABLE
2469void 2696void
… …
2471{ 2698{
2472 if (expect_false (ev_is_active (w))) 2699 if (expect_false (ev_is_active (w)))
2473 return; 2700 return;
2474 2701
2475 pri_adjust (EV_A_ (W)w); 2702 pri_adjust (EV_A_ (W)w);
2703
2704 EV_FREQUENT_CHECK;
2476 2705
2477 { 2706 {
2478 int active = ++idlecnt [ABSPRI (w)]; 2707 int active = ++idlecnt [ABSPRI (w)];
2479 2708
2480 ++idleall; 2709 ++idleall;
2481 ev_start (EV_A_ (W)w, active); 2710 ev_start (EV_A_ (W)w, active);
2482 2711
2483 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 2712 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2484 idles [ABSPRI (w)][active - 1] = w; 2713 idles [ABSPRI (w)][active - 1] = w;
2485 } 2714 }
2715
2716 EV_FREQUENT_CHECK;
2486} 2717}
2487 2718
2488void 2719void
2489ev_idle_stop (EV_P_ ev_idle *w) 2720ev_idle_stop (EV_P_ ev_idle *w)
2490{ 2721{
2491 clear_pending (EV_A_ (W)w); 2722 clear_pending (EV_A_ (W)w);
2492 if (expect_false (!ev_is_active (w))) 2723 if (expect_false (!ev_is_active (w)))
2493 return; 2724 return;
2494 2725
2726 EV_FREQUENT_CHECK;
2727
2495 { 2728 {
2496 int active = ev_active (w); 2729 int active = ev_active (w);
2497 2730
2498 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2731 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2499 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2732 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2500 2733
2501 ev_stop (EV_A_ (W)w); 2734 ev_stop (EV_A_ (W)w);
2502 --idleall; 2735 --idleall;
2503 } 2736 }
2737
2738 EV_FREQUENT_CHECK;
2504} 2739}
2505#endif 2740#endif
2506 2741
2507void 2742void
2508ev_prepare_start (EV_P_ ev_prepare *w) 2743ev_prepare_start (EV_P_ ev_prepare *w)
2509{ 2744{
2510 if (expect_false (ev_is_active (w))) 2745 if (expect_false (ev_is_active (w)))
2511 return; 2746 return;
2747
2748 EV_FREQUENT_CHECK;
2512 2749
2513 ev_start (EV_A_ (W)w, ++preparecnt); 2750 ev_start (EV_A_ (W)w, ++preparecnt);
2514 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2751 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2515 prepares [preparecnt - 1] = w; 2752 prepares [preparecnt - 1] = w;
2753
2754 EV_FREQUENT_CHECK;
2516} 2755}
2517 2756
2518void 2757void
2519ev_prepare_stop (EV_P_ ev_prepare *w) 2758ev_prepare_stop (EV_P_ ev_prepare *w)
2520{ 2759{
2521 clear_pending (EV_A_ (W)w); 2760 clear_pending (EV_A_ (W)w);
2522 if (expect_false (!ev_is_active (w))) 2761 if (expect_false (!ev_is_active (w)))
2523 return; 2762 return;
2524 2763
2764 EV_FREQUENT_CHECK;
2765
2525 { 2766 {
2526 int active = ev_active (w); 2767 int active = ev_active (w);
2527 2768
2528 prepares [active - 1] = prepares [--preparecnt]; 2769 prepares [active - 1] = prepares [--preparecnt];
2529 ev_active (prepares [active - 1]) = active; 2770 ev_active (prepares [active - 1]) = active;
2530 } 2771 }
2531 2772
2532 ev_stop (EV_A_ (W)w); 2773 ev_stop (EV_A_ (W)w);
2774
2775 EV_FREQUENT_CHECK;
2533} 2776}
2534 2777
2535void 2778void
2536ev_check_start (EV_P_ ev_check *w) 2779ev_check_start (EV_P_ ev_check *w)
2537{ 2780{
2538 if (expect_false (ev_is_active (w))) 2781 if (expect_false (ev_is_active (w)))
2539 return; 2782 return;
2783
2784 EV_FREQUENT_CHECK;
2540 2785
2541 ev_start (EV_A_ (W)w, ++checkcnt); 2786 ev_start (EV_A_ (W)w, ++checkcnt);
2542 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2787 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2543 checks [checkcnt - 1] = w; 2788 checks [checkcnt - 1] = w;
2789
2790 EV_FREQUENT_CHECK;
2544} 2791}
2545 2792
2546void 2793void
2547ev_check_stop (EV_P_ ev_check *w) 2794ev_check_stop (EV_P_ ev_check *w)
2548{ 2795{
2549 clear_pending (EV_A_ (W)w); 2796 clear_pending (EV_A_ (W)w);
2550 if (expect_false (!ev_is_active (w))) 2797 if (expect_false (!ev_is_active (w)))
2551 return; 2798 return;
2552 2799
2800 EV_FREQUENT_CHECK;
2801
2553 { 2802 {
2554 int active = ev_active (w); 2803 int active = ev_active (w);
2555 2804
2556 checks [active - 1] = checks [--checkcnt]; 2805 checks [active - 1] = checks [--checkcnt];
2557 ev_active (checks [active - 1]) = active; 2806 ev_active (checks [active - 1]) = active;
2558 } 2807 }
2559 2808
2560 ev_stop (EV_A_ (W)w); 2809 ev_stop (EV_A_ (W)w);
2810
2811 EV_FREQUENT_CHECK;
2561} 2812}
2562 2813
2563#if EV_EMBED_ENABLE 2814#if EV_EMBED_ENABLE
2564void noinline 2815void noinline
2565ev_embed_sweep (EV_P_ ev_embed *w) 2816ev_embed_sweep (EV_P_ ev_embed *w)
… …
2592 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2843 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2593 } 2844 }
2594 } 2845 }
2595} 2846}
2596 2847
2848static void
2849embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2850{
2851 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2852
2853 {
2854 struct ev_loop *loop = w->other;
2855
2856 ev_loop_fork (EV_A);
2857 }
2858}
2859
2597#if 0 2860#if 0
2598static void 2861static void
2599embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2862embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2600{ 2863{
2601 ev_idle_stop (EV_A_ idle); 2864 ev_idle_stop (EV_A_ idle);
… …
2612 struct ev_loop *loop = w->other; 2875 struct ev_loop *loop = w->other;
2613 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2876 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2614 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2877 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2615 } 2878 }
2616 2879
2880 EV_FREQUENT_CHECK;
2881
2617 ev_set_priority (&w->io, ev_priority (w)); 2882 ev_set_priority (&w->io, ev_priority (w));
2618 ev_io_start (EV_A_ &w->io); 2883 ev_io_start (EV_A_ &w->io);
2619 2884
2620 ev_prepare_init (&w->prepare, embed_prepare_cb); 2885 ev_prepare_init (&w->prepare, embed_prepare_cb);
2621 ev_set_priority (&w->prepare, EV_MINPRI); 2886 ev_set_priority (&w->prepare, EV_MINPRI);
2622 ev_prepare_start (EV_A_ &w->prepare); 2887 ev_prepare_start (EV_A_ &w->prepare);
2623 2888
2889 ev_fork_init (&w->fork, embed_fork_cb);
2890 ev_fork_start (EV_A_ &w->fork);
2891
2624 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2892 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2625 2893
2626 ev_start (EV_A_ (W)w, 1); 2894 ev_start (EV_A_ (W)w, 1);
2895
2896 EV_FREQUENT_CHECK;
2627} 2897}
2628 2898
2629void 2899void
2630ev_embed_stop (EV_P_ ev_embed *w) 2900ev_embed_stop (EV_P_ ev_embed *w)
2631{ 2901{
2632 clear_pending (EV_A_ (W)w); 2902 clear_pending (EV_A_ (W)w);
2633 if (expect_false (!ev_is_active (w))) 2903 if (expect_false (!ev_is_active (w)))
2634 return; 2904 return;
2635 2905
2906 EV_FREQUENT_CHECK;
2907
2636 ev_io_stop (EV_A_ &w->io); 2908 ev_io_stop (EV_A_ &w->io);
2637 ev_prepare_stop (EV_A_ &w->prepare); 2909 ev_prepare_stop (EV_A_ &w->prepare);
2910 ev_fork_stop (EV_A_ &w->fork);
2638 2911
2639 ev_stop (EV_A_ (W)w); 2912 EV_FREQUENT_CHECK;
2640} 2913}
2641#endif 2914#endif
2642 2915
2643#if EV_FORK_ENABLE 2916#if EV_FORK_ENABLE
2644void 2917void
2645ev_fork_start (EV_P_ ev_fork *w) 2918ev_fork_start (EV_P_ ev_fork *w)
2646{ 2919{
2647 if (expect_false (ev_is_active (w))) 2920 if (expect_false (ev_is_active (w)))
2648 return; 2921 return;
2922
2923 EV_FREQUENT_CHECK;
2649 2924
2650 ev_start (EV_A_ (W)w, ++forkcnt); 2925 ev_start (EV_A_ (W)w, ++forkcnt);
2651 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2926 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2652 forks [forkcnt - 1] = w; 2927 forks [forkcnt - 1] = w;
2928
2929 EV_FREQUENT_CHECK;
2653} 2930}
2654 2931
2655void 2932void
2656ev_fork_stop (EV_P_ ev_fork *w) 2933ev_fork_stop (EV_P_ ev_fork *w)
2657{ 2934{
2658 clear_pending (EV_A_ (W)w); 2935 clear_pending (EV_A_ (W)w);
2659 if (expect_false (!ev_is_active (w))) 2936 if (expect_false (!ev_is_active (w)))
2660 return; 2937 return;
2661 2938
2939 EV_FREQUENT_CHECK;
2940
2662 { 2941 {
2663 int active = ev_active (w); 2942 int active = ev_active (w);
2664 2943
2665 forks [active - 1] = forks [--forkcnt]; 2944 forks [active - 1] = forks [--forkcnt];
2666 ev_active (forks [active - 1]) = active; 2945 ev_active (forks [active - 1]) = active;
2667 } 2946 }
2668 2947
2669 ev_stop (EV_A_ (W)w); 2948 ev_stop (EV_A_ (W)w);
2949
2950 EV_FREQUENT_CHECK;
2670} 2951}
2671#endif 2952#endif
2672 2953
2673#if EV_ASYNC_ENABLE 2954#if EV_ASYNC_ENABLE
2674void 2955void
… …
2676{ 2957{
2677 if (expect_false (ev_is_active (w))) 2958 if (expect_false (ev_is_active (w)))
2678 return; 2959 return;
2679 2960
2680 evpipe_init (EV_A); 2961 evpipe_init (EV_A);
2962
2963 EV_FREQUENT_CHECK;
2681 2964
2682 ev_start (EV_A_ (W)w, ++asynccnt); 2965 ev_start (EV_A_ (W)w, ++asynccnt);
2683 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2966 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2684 asyncs [asynccnt - 1] = w; 2967 asyncs [asynccnt - 1] = w;
2968
2969 EV_FREQUENT_CHECK;
2685} 2970}
2686 2971
2687void 2972void
2688ev_async_stop (EV_P_ ev_async *w) 2973ev_async_stop (EV_P_ ev_async *w)
2689{ 2974{
2690 clear_pending (EV_A_ (W)w); 2975 clear_pending (EV_A_ (W)w);
2691 if (expect_false (!ev_is_active (w))) 2976 if (expect_false (!ev_is_active (w)))
2692 return; 2977 return;
2693 2978
2979 EV_FREQUENT_CHECK;
2980
2694 { 2981 {
2695 int active = ev_active (w); 2982 int active = ev_active (w);
2696 2983
2697 asyncs [active - 1] = asyncs [--asynccnt]; 2984 asyncs [active - 1] = asyncs [--asynccnt];
2698 ev_active (asyncs [active - 1]) = active; 2985 ev_active (asyncs [active - 1]) = active;
2699 } 2986 }
2700 2987
2701 ev_stop (EV_A_ (W)w); 2988 ev_stop (EV_A_ (W)w);
2989
2990 EV_FREQUENT_CHECK;
2702} 2991}
2703 2992
2704void 2993void
2705ev_async_send (EV_P_ ev_async *w) 2994ev_async_send (EV_P_ ev_async *w)
2706{ 2995{
… …
2723once_cb (EV_P_ struct ev_once *once, int revents) 3012once_cb (EV_P_ struct ev_once *once, int revents)
2724{ 3013{
2725 void (*cb)(int revents, void *arg) = once->cb; 3014 void (*cb)(int revents, void *arg) = once->cb;
2726 void *arg = once->arg; 3015 void *arg = once->arg;
2727 3016
2728 ev_io_stop (EV_A_ &once->io); 3017 ev_io_stop (EV_A_ &once->io);
2729 ev_timer_stop (EV_A_ &once->to); 3018 ev_timer_stop (EV_A_ &once->to);
2730 ev_free (once); 3019 ev_free (once);
2731 3020
2732 cb (revents, arg); 3021 cb (revents, arg);
2733} 3022}
2734 3023
2735static void 3024static void
2736once_cb_io (EV_P_ ev_io *w, int revents) 3025once_cb_io (EV_P_ ev_io *w, int revents)
2737{ 3026{
2738 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3027 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3028
3029 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2739} 3030}
2740 3031
2741static void 3032static void
2742once_cb_to (EV_P_ ev_timer *w, int revents) 3033once_cb_to (EV_P_ ev_timer *w, int revents)
2743{ 3034{
2744 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3035 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3036
3037 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2745} 3038}
2746 3039
2747void 3040void
2748ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3041ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2749{ 3042{

Diff Legend

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