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

Comparing libev/ev.c (file contents):
Revision 1.245 by root, Wed May 21 00:26:01 2008 UTC vs.
Revision 1.268 by root, Mon Oct 27 13:39:18 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
240#ifndef EV_USE_4HEAP 259#ifndef EV_USE_4HEAP
241# define EV_USE_4HEAP !EV_MINIMAL 260# define EV_USE_4HEAP !EV_MINIMAL
242#endif 261#endif
243 262
244#ifndef EV_HEAP_CACHE_AT 263#ifndef EV_HEAP_CACHE_AT
… …
267# include <sys/select.h> 286# include <sys/select.h>
268# endif 287# endif
269#endif 288#endif
270 289
271#if EV_USE_INOTIFY 290#if EV_USE_INOTIFY
291# include <sys/utsname.h>
272# 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
273#endif 298#endif
274 299
275#if EV_SELECT_IS_WINSOCKET 300#if EV_SELECT_IS_WINSOCKET
276# include <winsock.h> 301# include <winsock.h>
277#endif 302#endif
… …
287} 312}
288# endif 313# endif
289#endif 314#endif
290 315
291/**/ 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
292 323
293/* 324/*
294 * This is used to avoid floating point rounding problems. 325 * This is used to avoid floating point rounding problems.
295 * It is added to ev_rt_now when scheduling periodics 326 * It is added to ev_rt_now when scheduling periodics
296 * to ensure progress, time-wise, even when rounding 327 * to ensure progress, time-wise, even when rounding
… …
418typedef struct 449typedef struct
419{ 450{
420 WL head; 451 WL head;
421 unsigned char events; 452 unsigned char events;
422 unsigned char reify; 453 unsigned char reify;
454 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
455 unsigned char egen; /* generation counter to counter epoll bugs */
423#if EV_SELECT_IS_WINSOCKET 456#if EV_SELECT_IS_WINSOCKET
424 SOCKET handle; 457 SOCKET handle;
425#endif 458#endif
426} ANFD; 459} ANFD;
427 460
… …
444 typedef struct { 477 typedef struct {
445 ev_tstamp at; 478 ev_tstamp at;
446 WT w; 479 WT w;
447 } ANHE; 480 } ANHE;
448 481
449 #define ANHE_w(he) (he).w /* access watcher, read-write */ 482 #define ANHE_w(he) (he).w /* access watcher, read-write */
450 #define ANHE_at(he) (he).at /* access cached at, read-only */ 483 #define ANHE_at(he) (he).at /* access cached at, read-only */
451 #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 */
452#else 485#else
453 typedef WT ANHE; 486 typedef WT ANHE;
454 487
455 #define ANHE_w(he) (he) 488 #define ANHE_w(he) (he)
456 #define ANHE_at(he) (he)->at 489 #define ANHE_at(he) (he)->at
457 #define ANHE_at_set(he) 490 #define ANHE_at_cache(he)
458#endif 491#endif
459 492
460#if EV_MULTIPLICITY 493#if EV_MULTIPLICITY
461 494
462 struct ev_loop 495 struct ev_loop
… …
540 struct timeval tv; 573 struct timeval tv;
541 574
542 tv.tv_sec = (time_t)delay; 575 tv.tv_sec = (time_t)delay;
543 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 576 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
544 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 */
545 select (0, 0, 0, 0, &tv); 581 select (0, 0, 0, 0, &tv);
546#endif 582#endif
547 } 583 }
548} 584}
549 585
… …
576array_realloc (int elem, void *base, int *cur, int cnt) 612array_realloc (int elem, void *base, int *cur, int cnt)
577{ 613{
578 *cur = array_nextsize (elem, *cur, cnt); 614 *cur = array_nextsize (elem, *cur, cnt);
579 return ev_realloc (base, elem * *cur); 615 return ev_realloc (base, elem * *cur);
580} 616}
617
618#define array_init_zero(base,count) \
619 memset ((void *)(base), 0, sizeof (*(base)) * (count))
581 620
582#define array_needsize(type,base,cur,cnt,init) \ 621#define array_needsize(type,base,cur,cnt,init) \
583 if (expect_false ((cnt) > (cur))) \ 622 if (expect_false ((cnt) > (cur))) \
584 { \ 623 { \
585 int ocur_ = (cur); \ 624 int ocur_ = (cur); \
… …
629 ev_feed_event (EV_A_ events [i], type); 668 ev_feed_event (EV_A_ events [i], type);
630} 669}
631 670
632/*****************************************************************************/ 671/*****************************************************************************/
633 672
634void inline_size
635anfds_init (ANFD *base, int count)
636{
637 while (count--)
638 {
639 base->head = 0;
640 base->events = EV_NONE;
641 base->reify = 0;
642
643 ++base;
644 }
645}
646
647void inline_speed 673void inline_speed
648fd_event (EV_P_ int fd, int revents) 674fd_event (EV_P_ int fd, int revents)
649{ 675{
650 ANFD *anfd = anfds + fd; 676 ANFD *anfd = anfds + fd;
651 ev_io *w; 677 ev_io *w;
… …
683 events |= (unsigned char)w->events; 709 events |= (unsigned char)w->events;
684 710
685#if EV_SELECT_IS_WINSOCKET 711#if EV_SELECT_IS_WINSOCKET
686 if (events) 712 if (events)
687 { 713 {
688 unsigned long argp; 714 unsigned long arg;
689 #ifdef EV_FD_TO_WIN32_HANDLE 715 #ifdef EV_FD_TO_WIN32_HANDLE
690 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 716 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
691 #else 717 #else
692 anfd->handle = _get_osfhandle (fd); 718 anfd->handle = _get_osfhandle (fd);
693 #endif 719 #endif
694 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));
695 } 721 }
696#endif 722#endif
697 723
698 { 724 {
699 unsigned char o_events = anfd->events; 725 unsigned char o_events = anfd->events;
… …
752{ 778{
753 int fd; 779 int fd;
754 780
755 for (fd = 0; fd < anfdmax; ++fd) 781 for (fd = 0; fd < anfdmax; ++fd)
756 if (anfds [fd].events) 782 if (anfds [fd].events)
757 if (!fd_valid (fd) == -1 && errno == EBADF) 783 if (!fd_valid (fd) && errno == EBADF)
758 fd_kill (EV_A_ fd); 784 fd_kill (EV_A_ fd);
759} 785}
760 786
761/* 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 */
762static void noinline 788static void noinline
… …
780 806
781 for (fd = 0; fd < anfdmax; ++fd) 807 for (fd = 0; fd < anfdmax; ++fd)
782 if (anfds [fd].events) 808 if (anfds [fd].events)
783 { 809 {
784 anfds [fd].events = 0; 810 anfds [fd].events = 0;
811 anfds [fd].emask = 0;
785 fd_change (EV_A_ fd, EV_IOFDSET | 1); 812 fd_change (EV_A_ fd, EV_IOFDSET | 1);
786 } 813 }
787} 814}
788 815
789/*****************************************************************************/ 816/*****************************************************************************/
… …
802 */ 829 */
803#if EV_USE_4HEAP 830#if EV_USE_4HEAP
804 831
805#define DHEAP 4 832#define DHEAP 4
806#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 833#define HEAP0 (DHEAP - 1) /* index of first element in heap */
807 834#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
808/* towards the root */ 835#define UPHEAP_DONE(p,k) ((p) == (k))
809void inline_speed
810upheap (ANHE *heap, int k)
811{
812 ANHE he = heap [k];
813
814 for (;;)
815 {
816 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
817
818 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
819 break;
820
821 heap [k] = heap [p];
822 ev_active (ANHE_w (heap [k])) = k;
823 k = p;
824 }
825
826 ev_active (ANHE_w (he)) = k;
827 heap [k] = he;
828}
829 836
830/* away from the root */ 837/* away from the root */
831void inline_speed 838void inline_speed
832downheap (ANHE *heap, int N, int k) 839downheap (ANHE *heap, int N, int k)
833{ 840{
… …
836 843
837 for (;;) 844 for (;;)
838 { 845 {
839 ev_tstamp minat; 846 ev_tstamp minat;
840 ANHE *minpos; 847 ANHE *minpos;
841 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0; 848 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
842 849
843 // find minimum child 850 /* find minimum child */
844 if (expect_true (pos + DHEAP - 1 < E)) 851 if (expect_true (pos + DHEAP - 1 < E))
845 { 852 {
846 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 853 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
847 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos)); 854 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
848 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos)); 855 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
… …
859 break; 866 break;
860 867
861 if (ANHE_at (he) <= minat) 868 if (ANHE_at (he) <= minat)
862 break; 869 break;
863 870
871 heap [k] = *minpos;
864 ev_active (ANHE_w (*minpos)) = k; 872 ev_active (ANHE_w (*minpos)) = k;
865 heap [k] = *minpos;
866 873
867 k = minpos - heap; 874 k = minpos - heap;
868 } 875 }
869 876
877 heap [k] = he;
870 ev_active (ANHE_w (he)) = k; 878 ev_active (ANHE_w (he)) = k;
871 heap [k] = he;
872} 879}
873 880
874#else // 4HEAP 881#else /* 4HEAP */
875 882
876#define HEAP0 1 883#define HEAP0 1
877 884#define HPARENT(k) ((k) >> 1)
878/* towards the root */ 885#define UPHEAP_DONE(p,k) (!(p))
879void inline_speed
880upheap (ANHE *heap, int k)
881{
882 ANHE he = heap [k];
883
884 for (;;)
885 {
886 int p = k >> 1;
887
888 /* maybe we could use a dummy element at heap [0]? */
889 if (!p || ANHE_at (heap [p]) <= ANHE_at (he))
890 break;
891
892 heap [k] = heap [p];
893 ev_active (ANHE_w (heap [k])) = k;
894 k = p;
895 }
896
897 heap [k] = he;
898 ev_active (ANHE_w (heap [k])) = k;
899}
900 886
901/* away from the root */ 887/* away from the root */
902void inline_speed 888void inline_speed
903downheap (ANHE *heap, int N, int k) 889downheap (ANHE *heap, int N, int k)
904{ 890{
… …
906 892
907 for (;;) 893 for (;;)
908 { 894 {
909 int c = k << 1; 895 int c = k << 1;
910 896
911 if (c > N) 897 if (c > N + HEAP0 - 1)
912 break; 898 break;
913 899
914 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 900 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
915 ? 1 : 0; 901 ? 1 : 0;
916 902
917 if (ANHE_at (he) <= ANHE_at (heap [c])) 903 if (ANHE_at (he) <= ANHE_at (heap [c]))
918 break; 904 break;
919 905
… …
926 heap [k] = he; 912 heap [k] = he;
927 ev_active (ANHE_w (he)) = k; 913 ev_active (ANHE_w (he)) = k;
928} 914}
929#endif 915#endif
930 916
917/* towards the root */
918void inline_speed
919upheap (ANHE *heap, int k)
920{
921 ANHE he = heap [k];
922
923 for (;;)
924 {
925 int p = HPARENT (k);
926
927 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
928 break;
929
930 heap [k] = heap [p];
931 ev_active (ANHE_w (heap [k])) = k;
932 k = p;
933 }
934
935 heap [k] = he;
936 ev_active (ANHE_w (he)) = k;
937}
938
931void inline_size 939void inline_size
932adjustheap (ANHE *heap, int N, int k) 940adjustheap (ANHE *heap, int N, int k)
933{ 941{
942 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
934 upheap (heap, k); 943 upheap (heap, k);
944 else
935 downheap (heap, N, k); 945 downheap (heap, N, k);
946}
947
948/* rebuild the heap: this function is used only once and executed rarely */
949void inline_size
950reheap (ANHE *heap, int N)
951{
952 int i;
953
954 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
955 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
956 for (i = 0; i < N; ++i)
957 upheap (heap, i + HEAP0);
936} 958}
937 959
938/*****************************************************************************/ 960/*****************************************************************************/
939 961
940typedef struct 962typedef struct
… …
946static ANSIG *signals; 968static ANSIG *signals;
947static int signalmax; 969static int signalmax;
948 970
949static EV_ATOMIC_T gotsig; 971static EV_ATOMIC_T gotsig;
950 972
951void inline_size
952signals_init (ANSIG *base, int count)
953{
954 while (count--)
955 {
956 base->head = 0;
957 base->gotsig = 0;
958
959 ++base;
960 }
961}
962
963/*****************************************************************************/ 973/*****************************************************************************/
964 974
965void inline_speed 975void inline_speed
966fd_intern (int fd) 976fd_intern (int fd)
967{ 977{
968#ifdef _WIN32 978#ifdef _WIN32
969 int arg = 1; 979 unsigned long arg = 1;
970 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 980 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
971#else 981#else
972 fcntl (fd, F_SETFD, FD_CLOEXEC); 982 fcntl (fd, F_SETFD, FD_CLOEXEC);
973 fcntl (fd, F_SETFL, O_NONBLOCK); 983 fcntl (fd, F_SETFL, O_NONBLOCK);
974#endif 984#endif
… …
1458 1468
1459 postfork = 0; 1469 postfork = 0;
1460} 1470}
1461 1471
1462#if EV_MULTIPLICITY 1472#if EV_MULTIPLICITY
1473
1463struct ev_loop * 1474struct ev_loop *
1464ev_loop_new (unsigned int flags) 1475ev_loop_new (unsigned int flags)
1465{ 1476{
1466 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1477 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1467 1478
… …
1485void 1496void
1486ev_loop_fork (EV_P) 1497ev_loop_fork (EV_P)
1487{ 1498{
1488 postfork = 1; /* must be in line with ev_default_fork */ 1499 postfork = 1; /* must be in line with ev_default_fork */
1489} 1500}
1501
1502#if EV_VERIFY
1503static void noinline
1504verify_watcher (EV_P_ W w)
1505{
1506 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1507
1508 if (w->pending)
1509 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1510}
1511
1512static void noinline
1513verify_heap (EV_P_ ANHE *heap, int N)
1514{
1515 int i;
1516
1517 for (i = HEAP0; i < N + HEAP0; ++i)
1518 {
1519 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1520 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1521 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1522
1523 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1524 }
1525}
1526
1527static void noinline
1528array_verify (EV_P_ W *ws, int cnt)
1529{
1530 while (cnt--)
1531 {
1532 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1533 verify_watcher (EV_A_ ws [cnt]);
1534 }
1535}
1536#endif
1537
1538void
1539ev_loop_verify (EV_P)
1540{
1541#if EV_VERIFY
1542 int i;
1543 WL w;
1544
1545 assert (activecnt >= -1);
1546
1547 assert (fdchangemax >= fdchangecnt);
1548 for (i = 0; i < fdchangecnt; ++i)
1549 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1550
1551 assert (anfdmax >= 0);
1552 for (i = 0; i < anfdmax; ++i)
1553 for (w = anfds [i].head; w; w = w->next)
1554 {
1555 verify_watcher (EV_A_ (W)w);
1556 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1557 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1558 }
1559
1560 assert (timermax >= timercnt);
1561 verify_heap (EV_A_ timers, timercnt);
1562
1563#if EV_PERIODIC_ENABLE
1564 assert (periodicmax >= periodiccnt);
1565 verify_heap (EV_A_ periodics, periodiccnt);
1566#endif
1567
1568 for (i = NUMPRI; i--; )
1569 {
1570 assert (pendingmax [i] >= pendingcnt [i]);
1571#if EV_IDLE_ENABLE
1572 assert (idleall >= 0);
1573 assert (idlemax [i] >= idlecnt [i]);
1574 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1575#endif
1576 }
1577
1578#if EV_FORK_ENABLE
1579 assert (forkmax >= forkcnt);
1580 array_verify (EV_A_ (W *)forks, forkcnt);
1581#endif
1582
1583#if EV_ASYNC_ENABLE
1584 assert (asyncmax >= asynccnt);
1585 array_verify (EV_A_ (W *)asyncs, asynccnt);
1586#endif
1587
1588 assert (preparemax >= preparecnt);
1589 array_verify (EV_A_ (W *)prepares, preparecnt);
1590
1591 assert (checkmax >= checkcnt);
1592 array_verify (EV_A_ (W *)checks, checkcnt);
1593
1594# if 0
1595 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1596 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1490#endif 1597# endif
1598#endif
1599}
1600
1601#endif /* multiplicity */
1491 1602
1492#if EV_MULTIPLICITY 1603#if EV_MULTIPLICITY
1493struct ev_loop * 1604struct ev_loop *
1494ev_default_loop_init (unsigned int flags) 1605ev_default_loop_init (unsigned int flags)
1495#else 1606#else
… …
1528{ 1639{
1529#if EV_MULTIPLICITY 1640#if EV_MULTIPLICITY
1530 struct ev_loop *loop = ev_default_loop_ptr; 1641 struct ev_loop *loop = ev_default_loop_ptr;
1531#endif 1642#endif
1532 1643
1644 ev_default_loop_ptr = 0;
1645
1533#ifndef _WIN32 1646#ifndef _WIN32
1534 ev_ref (EV_A); /* child watcher */ 1647 ev_ref (EV_A); /* child watcher */
1535 ev_signal_stop (EV_A_ &childev); 1648 ev_signal_stop (EV_A_ &childev);
1536#endif 1649#endif
1537 1650
… …
1571 { 1684 {
1572 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1685 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1573 1686
1574 p->w->pending = 0; 1687 p->w->pending = 0;
1575 EV_CB_INVOKE (p->w, p->events); 1688 EV_CB_INVOKE (p->w, p->events);
1689 EV_FREQUENT_CHECK;
1576 } 1690 }
1577 } 1691 }
1578} 1692}
1579 1693
1580#if EV_IDLE_ENABLE 1694#if EV_IDLE_ENABLE
… …
1601#endif 1715#endif
1602 1716
1603void inline_size 1717void inline_size
1604timers_reify (EV_P) 1718timers_reify (EV_P)
1605{ 1719{
1720 EV_FREQUENT_CHECK;
1721
1606 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1722 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1607 { 1723 {
1608 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1724 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1609 1725
1610 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1726 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
… …
1616 if (ev_at (w) < mn_now) 1732 if (ev_at (w) < mn_now)
1617 ev_at (w) = mn_now; 1733 ev_at (w) = mn_now;
1618 1734
1619 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1735 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1620 1736
1621 ANHE_at_set (timers [HEAP0]); 1737 ANHE_at_cache (timers [HEAP0]);
1622 downheap (timers, timercnt, HEAP0); 1738 downheap (timers, timercnt, HEAP0);
1623 } 1739 }
1624 else 1740 else
1625 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1741 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1626 1742
1743 EV_FREQUENT_CHECK;
1627 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1744 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1628 } 1745 }
1629} 1746}
1630 1747
1631#if EV_PERIODIC_ENABLE 1748#if EV_PERIODIC_ENABLE
1632void inline_size 1749void inline_size
1633periodics_reify (EV_P) 1750periodics_reify (EV_P)
1634{ 1751{
1752 EV_FREQUENT_CHECK;
1753
1635 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1754 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1636 { 1755 {
1637 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1756 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1638 1757
1639 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1758 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
… …
1643 { 1762 {
1644 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1763 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1645 1764
1646 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1765 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1647 1766
1648 ANHE_at_set (periodics [HEAP0]); 1767 ANHE_at_cache (periodics [HEAP0]);
1649 downheap (periodics, periodiccnt, HEAP0); 1768 downheap (periodics, periodiccnt, HEAP0);
1650 } 1769 }
1651 else if (w->interval) 1770 else if (w->interval)
1652 { 1771 {
1653 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1772 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1773 /* if next trigger time is not sufficiently in the future, put it there */
1774 /* this might happen because of floating point inexactness */
1654 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval; 1775 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1776 {
1777 ev_at (w) += w->interval;
1655 1778
1656 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) >= ev_rt_now)); 1779 /* if interval is unreasonably low we might still have a time in the past */
1780 /* so correct this. this will make the periodic very inexact, but the user */
1781 /* has effectively asked to get triggered more often than possible */
1782 if (ev_at (w) < ev_rt_now)
1783 ev_at (w) = ev_rt_now;
1784 }
1657 1785
1658 ANHE_at_set (periodics [HEAP0]); 1786 ANHE_at_cache (periodics [HEAP0]);
1659 downheap (periodics, periodiccnt, HEAP0); 1787 downheap (periodics, periodiccnt, HEAP0);
1660 } 1788 }
1661 else 1789 else
1662 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1790 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1663 1791
1792 EV_FREQUENT_CHECK;
1664 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1793 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1665 } 1794 }
1666} 1795}
1667 1796
1668static void noinline 1797static void noinline
… …
1678 if (w->reschedule_cb) 1807 if (w->reschedule_cb)
1679 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1808 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1680 else if (w->interval) 1809 else if (w->interval)
1681 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1810 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1682 1811
1683 ANHE_at_set (periodics [i]); 1812 ANHE_at_cache (periodics [i]);
1684 } 1813 }
1685 1814
1686 /* we don't use floyds algorithm, uphead is simpler and is more cache-efficient */ 1815 reheap (periodics, periodiccnt);
1687 /* also, this is easy and corretc for both 2-heaps and 4-heaps */
1688 for (i = 0; i < periodiccnt; ++i)
1689 upheap (periodics, i + HEAP0);
1690} 1816}
1691#endif 1817#endif
1692 1818
1693void inline_speed 1819void inline_speed
1694time_update (EV_P_ ev_tstamp max_block) 1820time_update (EV_P_ ev_tstamp max_block)
… …
1752 /* adjust timers. this is easy, as the offset is the same for all of them */ 1878 /* adjust timers. this is easy, as the offset is the same for all of them */
1753 for (i = 0; i < timercnt; ++i) 1879 for (i = 0; i < timercnt; ++i)
1754 { 1880 {
1755 ANHE *he = timers + i + HEAP0; 1881 ANHE *he = timers + i + HEAP0;
1756 ANHE_w (*he)->at += ev_rt_now - mn_now; 1882 ANHE_w (*he)->at += ev_rt_now - mn_now;
1757 ANHE_at_set (*he); 1883 ANHE_at_cache (*he);
1758 } 1884 }
1759 } 1885 }
1760 1886
1761 mn_now = ev_rt_now; 1887 mn_now = ev_rt_now;
1762 } 1888 }
… …
1772ev_unref (EV_P) 1898ev_unref (EV_P)
1773{ 1899{
1774 --activecnt; 1900 --activecnt;
1775} 1901}
1776 1902
1903void
1904ev_now_update (EV_P)
1905{
1906 time_update (EV_A_ 1e100);
1907}
1908
1777static int loop_done; 1909static int loop_done;
1778 1910
1779void 1911void
1780ev_loop (EV_P_ int flags) 1912ev_loop (EV_P_ int flags)
1781{ 1913{
… …
1783 1915
1784 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1916 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1785 1917
1786 do 1918 do
1787 { 1919 {
1920#if EV_VERIFY >= 2
1921 ev_loop_verify (EV_A);
1922#endif
1923
1788#ifndef _WIN32 1924#ifndef _WIN32
1789 if (expect_false (curpid)) /* penalise the forking check even more */ 1925 if (expect_false (curpid)) /* penalise the forking check even more */
1790 if (expect_false (getpid () != curpid)) 1926 if (expect_false (getpid () != curpid))
1791 { 1927 {
1792 curpid = getpid (); 1928 curpid = getpid ();
… …
1986 2122
1987 if (expect_false (ev_is_active (w))) 2123 if (expect_false (ev_is_active (w)))
1988 return; 2124 return;
1989 2125
1990 assert (("ev_io_start called with negative fd", fd >= 0)); 2126 assert (("ev_io_start called with negative fd", fd >= 0));
2127 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2128
2129 EV_FREQUENT_CHECK;
1991 2130
1992 ev_start (EV_A_ (W)w, 1); 2131 ev_start (EV_A_ (W)w, 1);
1993 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2132 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
1994 wlist_add (&anfds[fd].head, (WL)w); 2133 wlist_add (&anfds[fd].head, (WL)w);
1995 2134
1996 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2135 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1997 w->events &= ~EV_IOFDSET; 2136 w->events &= ~EV_IOFDSET;
2137
2138 EV_FREQUENT_CHECK;
1998} 2139}
1999 2140
2000void noinline 2141void noinline
2001ev_io_stop (EV_P_ ev_io *w) 2142ev_io_stop (EV_P_ ev_io *w)
2002{ 2143{
… …
2004 if (expect_false (!ev_is_active (w))) 2145 if (expect_false (!ev_is_active (w)))
2005 return; 2146 return;
2006 2147
2007 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2148 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2008 2149
2150 EV_FREQUENT_CHECK;
2151
2009 wlist_del (&anfds[w->fd].head, (WL)w); 2152 wlist_del (&anfds[w->fd].head, (WL)w);
2010 ev_stop (EV_A_ (W)w); 2153 ev_stop (EV_A_ (W)w);
2011 2154
2012 fd_change (EV_A_ w->fd, 1); 2155 fd_change (EV_A_ w->fd, 1);
2156
2157 EV_FREQUENT_CHECK;
2013} 2158}
2014 2159
2015void noinline 2160void noinline
2016ev_timer_start (EV_P_ ev_timer *w) 2161ev_timer_start (EV_P_ ev_timer *w)
2017{ 2162{
… …
2020 2165
2021 ev_at (w) += mn_now; 2166 ev_at (w) += mn_now;
2022 2167
2023 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2168 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2024 2169
2170 EV_FREQUENT_CHECK;
2171
2172 ++timercnt;
2025 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2173 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2026 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2); 2174 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
2027 ANHE_w (timers [ev_active (w)]) = (WT)w; 2175 ANHE_w (timers [ev_active (w)]) = (WT)w;
2028 ANHE_at_set (timers [ev_active (w)]); 2176 ANHE_at_cache (timers [ev_active (w)]);
2029 upheap (timers, ev_active (w)); 2177 upheap (timers, ev_active (w));
2178
2179 EV_FREQUENT_CHECK;
2030 2180
2031 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2181 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2032} 2182}
2033 2183
2034void noinline 2184void noinline
… …
2036{ 2186{
2037 clear_pending (EV_A_ (W)w); 2187 clear_pending (EV_A_ (W)w);
2038 if (expect_false (!ev_is_active (w))) 2188 if (expect_false (!ev_is_active (w)))
2039 return; 2189 return;
2040 2190
2191 EV_FREQUENT_CHECK;
2192
2041 { 2193 {
2042 int active = ev_active (w); 2194 int active = ev_active (w);
2043 2195
2044 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2196 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2045 2197
2198 --timercnt;
2199
2046 if (expect_true (active < timercnt + HEAP0 - 1)) 2200 if (expect_true (active < timercnt + HEAP0))
2047 { 2201 {
2048 timers [active] = timers [timercnt + HEAP0 - 1]; 2202 timers [active] = timers [timercnt + HEAP0];
2049 adjustheap (timers, timercnt, active); 2203 adjustheap (timers, timercnt, active);
2050 } 2204 }
2051
2052 --timercnt;
2053 } 2205 }
2206
2207 EV_FREQUENT_CHECK;
2054 2208
2055 ev_at (w) -= mn_now; 2209 ev_at (w) -= mn_now;
2056 2210
2057 ev_stop (EV_A_ (W)w); 2211 ev_stop (EV_A_ (W)w);
2058} 2212}
2059 2213
2060void noinline 2214void noinline
2061ev_timer_again (EV_P_ ev_timer *w) 2215ev_timer_again (EV_P_ ev_timer *w)
2062{ 2216{
2217 EV_FREQUENT_CHECK;
2218
2063 if (ev_is_active (w)) 2219 if (ev_is_active (w))
2064 { 2220 {
2065 if (w->repeat) 2221 if (w->repeat)
2066 { 2222 {
2067 ev_at (w) = mn_now + w->repeat; 2223 ev_at (w) = mn_now + w->repeat;
2068 ANHE_at_set (timers [ev_active (w)]); 2224 ANHE_at_cache (timers [ev_active (w)]);
2069 adjustheap (timers, timercnt, ev_active (w)); 2225 adjustheap (timers, timercnt, ev_active (w));
2070 } 2226 }
2071 else 2227 else
2072 ev_timer_stop (EV_A_ w); 2228 ev_timer_stop (EV_A_ w);
2073 } 2229 }
2074 else if (w->repeat) 2230 else if (w->repeat)
2075 { 2231 {
2076 ev_at (w) = w->repeat; 2232 ev_at (w) = w->repeat;
2077 ev_timer_start (EV_A_ w); 2233 ev_timer_start (EV_A_ w);
2078 } 2234 }
2235
2236 EV_FREQUENT_CHECK;
2079} 2237}
2080 2238
2081#if EV_PERIODIC_ENABLE 2239#if EV_PERIODIC_ENABLE
2082void noinline 2240void noinline
2083ev_periodic_start (EV_P_ ev_periodic *w) 2241ev_periodic_start (EV_P_ ev_periodic *w)
… …
2094 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2252 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2095 } 2253 }
2096 else 2254 else
2097 ev_at (w) = w->offset; 2255 ev_at (w) = w->offset;
2098 2256
2257 EV_FREQUENT_CHECK;
2258
2259 ++periodiccnt;
2099 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2260 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2100 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2); 2261 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2101 ANHE_w (periodics [ev_active (w)]) = (WT)w; 2262 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2102 ANHE_at_set (periodics [ev_active (w)]); 2263 ANHE_at_cache (periodics [ev_active (w)]);
2103 upheap (periodics, ev_active (w)); 2264 upheap (periodics, ev_active (w));
2265
2266 EV_FREQUENT_CHECK;
2104 2267
2105 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2268 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2106} 2269}
2107 2270
2108void noinline 2271void noinline
… …
2110{ 2273{
2111 clear_pending (EV_A_ (W)w); 2274 clear_pending (EV_A_ (W)w);
2112 if (expect_false (!ev_is_active (w))) 2275 if (expect_false (!ev_is_active (w)))
2113 return; 2276 return;
2114 2277
2278 EV_FREQUENT_CHECK;
2279
2115 { 2280 {
2116 int active = ev_active (w); 2281 int active = ev_active (w);
2117 2282
2118 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2283 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2119 2284
2285 --periodiccnt;
2286
2120 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2287 if (expect_true (active < periodiccnt + HEAP0))
2121 { 2288 {
2122 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2289 periodics [active] = periodics [periodiccnt + HEAP0];
2123 adjustheap (periodics, periodiccnt, active); 2290 adjustheap (periodics, periodiccnt, active);
2124 } 2291 }
2125
2126 --periodiccnt;
2127 } 2292 }
2293
2294 EV_FREQUENT_CHECK;
2128 2295
2129 ev_stop (EV_A_ (W)w); 2296 ev_stop (EV_A_ (W)w);
2130} 2297}
2131 2298
2132void noinline 2299void noinline
… …
2152 return; 2319 return;
2153 2320
2154 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2321 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2155 2322
2156 evpipe_init (EV_A); 2323 evpipe_init (EV_A);
2324
2325 EV_FREQUENT_CHECK;
2157 2326
2158 { 2327 {
2159#ifndef _WIN32 2328#ifndef _WIN32
2160 sigset_t full, prev; 2329 sigset_t full, prev;
2161 sigfillset (&full); 2330 sigfillset (&full);
2162 sigprocmask (SIG_SETMASK, &full, &prev); 2331 sigprocmask (SIG_SETMASK, &full, &prev);
2163#endif 2332#endif
2164 2333
2165 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2334 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2166 2335
2167#ifndef _WIN32 2336#ifndef _WIN32
2168 sigprocmask (SIG_SETMASK, &prev, 0); 2337 sigprocmask (SIG_SETMASK, &prev, 0);
2169#endif 2338#endif
2170 } 2339 }
… …
2182 sigfillset (&sa.sa_mask); 2351 sigfillset (&sa.sa_mask);
2183 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2352 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2184 sigaction (w->signum, &sa, 0); 2353 sigaction (w->signum, &sa, 0);
2185#endif 2354#endif
2186 } 2355 }
2356
2357 EV_FREQUENT_CHECK;
2187} 2358}
2188 2359
2189void noinline 2360void noinline
2190ev_signal_stop (EV_P_ ev_signal *w) 2361ev_signal_stop (EV_P_ ev_signal *w)
2191{ 2362{
2192 clear_pending (EV_A_ (W)w); 2363 clear_pending (EV_A_ (W)w);
2193 if (expect_false (!ev_is_active (w))) 2364 if (expect_false (!ev_is_active (w)))
2194 return; 2365 return;
2195 2366
2367 EV_FREQUENT_CHECK;
2368
2196 wlist_del (&signals [w->signum - 1].head, (WL)w); 2369 wlist_del (&signals [w->signum - 1].head, (WL)w);
2197 ev_stop (EV_A_ (W)w); 2370 ev_stop (EV_A_ (W)w);
2198 2371
2199 if (!signals [w->signum - 1].head) 2372 if (!signals [w->signum - 1].head)
2200 signal (w->signum, SIG_DFL); 2373 signal (w->signum, SIG_DFL);
2374
2375 EV_FREQUENT_CHECK;
2201} 2376}
2202 2377
2203void 2378void
2204ev_child_start (EV_P_ ev_child *w) 2379ev_child_start (EV_P_ ev_child *w)
2205{ 2380{
… …
2207 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2382 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2208#endif 2383#endif
2209 if (expect_false (ev_is_active (w))) 2384 if (expect_false (ev_is_active (w)))
2210 return; 2385 return;
2211 2386
2387 EV_FREQUENT_CHECK;
2388
2212 ev_start (EV_A_ (W)w, 1); 2389 ev_start (EV_A_ (W)w, 1);
2213 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2390 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2391
2392 EV_FREQUENT_CHECK;
2214} 2393}
2215 2394
2216void 2395void
2217ev_child_stop (EV_P_ ev_child *w) 2396ev_child_stop (EV_P_ ev_child *w)
2218{ 2397{
2219 clear_pending (EV_A_ (W)w); 2398 clear_pending (EV_A_ (W)w);
2220 if (expect_false (!ev_is_active (w))) 2399 if (expect_false (!ev_is_active (w)))
2221 return; 2400 return;
2222 2401
2402 EV_FREQUENT_CHECK;
2403
2223 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2404 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2224 ev_stop (EV_A_ (W)w); 2405 ev_stop (EV_A_ (W)w);
2406
2407 EV_FREQUENT_CHECK;
2225} 2408}
2226 2409
2227#if EV_STAT_ENABLE 2410#if EV_STAT_ENABLE
2228 2411
2229# ifdef _WIN32 2412# ifdef _WIN32
… …
2298 2481
2299static void noinline 2482static void noinline
2300infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2483infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2301{ 2484{
2302 if (slot < 0) 2485 if (slot < 0)
2303 /* overflow, need to check for all hahs slots */ 2486 /* overflow, need to check for all hash slots */
2304 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2487 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2305 infy_wd (EV_A_ slot, wd, ev); 2488 infy_wd (EV_A_ slot, wd, ev);
2306 else 2489 else
2307 { 2490 {
2308 WL w_; 2491 WL w_;
… …
2342infy_init (EV_P) 2525infy_init (EV_P)
2343{ 2526{
2344 if (fs_fd != -2) 2527 if (fs_fd != -2)
2345 return; 2528 return;
2346 2529
2530 /* kernels < 2.6.25 are borked
2531 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2532 */
2533 {
2534 struct utsname buf;
2535 int major, minor, micro;
2536
2537 fs_fd = -1;
2538
2539 if (uname (&buf))
2540 return;
2541
2542 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2543 return;
2544
2545 if (major < 2
2546 || (major == 2 && minor < 6)
2547 || (major == 2 && minor == 6 && micro < 25))
2548 return;
2549 }
2550
2347 fs_fd = inotify_init (); 2551 fs_fd = inotify_init ();
2348 2552
2349 if (fs_fd >= 0) 2553 if (fs_fd >= 0)
2350 { 2554 {
2351 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 2555 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
… …
2380 if (fs_fd >= 0) 2584 if (fs_fd >= 0)
2381 infy_add (EV_A_ w); /* re-add, no matter what */ 2585 infy_add (EV_A_ w); /* re-add, no matter what */
2382 else 2586 else
2383 ev_timer_start (EV_A_ &w->timer); 2587 ev_timer_start (EV_A_ &w->timer);
2384 } 2588 }
2385
2386 } 2589 }
2387} 2590}
2388 2591
2592#endif
2593
2594#ifdef _WIN32
2595# define EV_LSTAT(p,b) _stati64 (p, b)
2596#else
2597# define EV_LSTAT(p,b) lstat (p, b)
2389#endif 2598#endif
2390 2599
2391void 2600void
2392ev_stat_stat (EV_P_ ev_stat *w) 2601ev_stat_stat (EV_P_ ev_stat *w)
2393{ 2602{
… …
2420 || w->prev.st_atime != w->attr.st_atime 2629 || w->prev.st_atime != w->attr.st_atime
2421 || w->prev.st_mtime != w->attr.st_mtime 2630 || w->prev.st_mtime != w->attr.st_mtime
2422 || w->prev.st_ctime != w->attr.st_ctime 2631 || w->prev.st_ctime != w->attr.st_ctime
2423 ) { 2632 ) {
2424 #if EV_USE_INOTIFY 2633 #if EV_USE_INOTIFY
2634 if (fs_fd >= 0)
2635 {
2425 infy_del (EV_A_ w); 2636 infy_del (EV_A_ w);
2426 infy_add (EV_A_ w); 2637 infy_add (EV_A_ w);
2427 ev_stat_stat (EV_A_ w); /* avoid race... */ 2638 ev_stat_stat (EV_A_ w); /* avoid race... */
2639 }
2428 #endif 2640 #endif
2429 2641
2430 ev_feed_event (EV_A_ w, EV_STAT); 2642 ev_feed_event (EV_A_ w, EV_STAT);
2431 } 2643 }
2432} 2644}
… …
2457 else 2669 else
2458#endif 2670#endif
2459 ev_timer_start (EV_A_ &w->timer); 2671 ev_timer_start (EV_A_ &w->timer);
2460 2672
2461 ev_start (EV_A_ (W)w, 1); 2673 ev_start (EV_A_ (W)w, 1);
2674
2675 EV_FREQUENT_CHECK;
2462} 2676}
2463 2677
2464void 2678void
2465ev_stat_stop (EV_P_ ev_stat *w) 2679ev_stat_stop (EV_P_ ev_stat *w)
2466{ 2680{
2467 clear_pending (EV_A_ (W)w); 2681 clear_pending (EV_A_ (W)w);
2468 if (expect_false (!ev_is_active (w))) 2682 if (expect_false (!ev_is_active (w)))
2469 return; 2683 return;
2470 2684
2685 EV_FREQUENT_CHECK;
2686
2471#if EV_USE_INOTIFY 2687#if EV_USE_INOTIFY
2472 infy_del (EV_A_ w); 2688 infy_del (EV_A_ w);
2473#endif 2689#endif
2474 ev_timer_stop (EV_A_ &w->timer); 2690 ev_timer_stop (EV_A_ &w->timer);
2475 2691
2476 ev_stop (EV_A_ (W)w); 2692 ev_stop (EV_A_ (W)w);
2693
2694 EV_FREQUENT_CHECK;
2477} 2695}
2478#endif 2696#endif
2479 2697
2480#if EV_IDLE_ENABLE 2698#if EV_IDLE_ENABLE
2481void 2699void
… …
2483{ 2701{
2484 if (expect_false (ev_is_active (w))) 2702 if (expect_false (ev_is_active (w)))
2485 return; 2703 return;
2486 2704
2487 pri_adjust (EV_A_ (W)w); 2705 pri_adjust (EV_A_ (W)w);
2706
2707 EV_FREQUENT_CHECK;
2488 2708
2489 { 2709 {
2490 int active = ++idlecnt [ABSPRI (w)]; 2710 int active = ++idlecnt [ABSPRI (w)];
2491 2711
2492 ++idleall; 2712 ++idleall;
2493 ev_start (EV_A_ (W)w, active); 2713 ev_start (EV_A_ (W)w, active);
2494 2714
2495 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 2715 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2496 idles [ABSPRI (w)][active - 1] = w; 2716 idles [ABSPRI (w)][active - 1] = w;
2497 } 2717 }
2718
2719 EV_FREQUENT_CHECK;
2498} 2720}
2499 2721
2500void 2722void
2501ev_idle_stop (EV_P_ ev_idle *w) 2723ev_idle_stop (EV_P_ ev_idle *w)
2502{ 2724{
2503 clear_pending (EV_A_ (W)w); 2725 clear_pending (EV_A_ (W)w);
2504 if (expect_false (!ev_is_active (w))) 2726 if (expect_false (!ev_is_active (w)))
2505 return; 2727 return;
2506 2728
2729 EV_FREQUENT_CHECK;
2730
2507 { 2731 {
2508 int active = ev_active (w); 2732 int active = ev_active (w);
2509 2733
2510 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2734 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2511 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2735 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2512 2736
2513 ev_stop (EV_A_ (W)w); 2737 ev_stop (EV_A_ (W)w);
2514 --idleall; 2738 --idleall;
2515 } 2739 }
2740
2741 EV_FREQUENT_CHECK;
2516} 2742}
2517#endif 2743#endif
2518 2744
2519void 2745void
2520ev_prepare_start (EV_P_ ev_prepare *w) 2746ev_prepare_start (EV_P_ ev_prepare *w)
2521{ 2747{
2522 if (expect_false (ev_is_active (w))) 2748 if (expect_false (ev_is_active (w)))
2523 return; 2749 return;
2750
2751 EV_FREQUENT_CHECK;
2524 2752
2525 ev_start (EV_A_ (W)w, ++preparecnt); 2753 ev_start (EV_A_ (W)w, ++preparecnt);
2526 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2754 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2527 prepares [preparecnt - 1] = w; 2755 prepares [preparecnt - 1] = w;
2756
2757 EV_FREQUENT_CHECK;
2528} 2758}
2529 2759
2530void 2760void
2531ev_prepare_stop (EV_P_ ev_prepare *w) 2761ev_prepare_stop (EV_P_ ev_prepare *w)
2532{ 2762{
2533 clear_pending (EV_A_ (W)w); 2763 clear_pending (EV_A_ (W)w);
2534 if (expect_false (!ev_is_active (w))) 2764 if (expect_false (!ev_is_active (w)))
2535 return; 2765 return;
2536 2766
2767 EV_FREQUENT_CHECK;
2768
2537 { 2769 {
2538 int active = ev_active (w); 2770 int active = ev_active (w);
2539 2771
2540 prepares [active - 1] = prepares [--preparecnt]; 2772 prepares [active - 1] = prepares [--preparecnt];
2541 ev_active (prepares [active - 1]) = active; 2773 ev_active (prepares [active - 1]) = active;
2542 } 2774 }
2543 2775
2544 ev_stop (EV_A_ (W)w); 2776 ev_stop (EV_A_ (W)w);
2777
2778 EV_FREQUENT_CHECK;
2545} 2779}
2546 2780
2547void 2781void
2548ev_check_start (EV_P_ ev_check *w) 2782ev_check_start (EV_P_ ev_check *w)
2549{ 2783{
2550 if (expect_false (ev_is_active (w))) 2784 if (expect_false (ev_is_active (w)))
2551 return; 2785 return;
2786
2787 EV_FREQUENT_CHECK;
2552 2788
2553 ev_start (EV_A_ (W)w, ++checkcnt); 2789 ev_start (EV_A_ (W)w, ++checkcnt);
2554 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2790 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2555 checks [checkcnt - 1] = w; 2791 checks [checkcnt - 1] = w;
2792
2793 EV_FREQUENT_CHECK;
2556} 2794}
2557 2795
2558void 2796void
2559ev_check_stop (EV_P_ ev_check *w) 2797ev_check_stop (EV_P_ ev_check *w)
2560{ 2798{
2561 clear_pending (EV_A_ (W)w); 2799 clear_pending (EV_A_ (W)w);
2562 if (expect_false (!ev_is_active (w))) 2800 if (expect_false (!ev_is_active (w)))
2563 return; 2801 return;
2564 2802
2803 EV_FREQUENT_CHECK;
2804
2565 { 2805 {
2566 int active = ev_active (w); 2806 int active = ev_active (w);
2567 2807
2568 checks [active - 1] = checks [--checkcnt]; 2808 checks [active - 1] = checks [--checkcnt];
2569 ev_active (checks [active - 1]) = active; 2809 ev_active (checks [active - 1]) = active;
2570 } 2810 }
2571 2811
2572 ev_stop (EV_A_ (W)w); 2812 ev_stop (EV_A_ (W)w);
2813
2814 EV_FREQUENT_CHECK;
2573} 2815}
2574 2816
2575#if EV_EMBED_ENABLE 2817#if EV_EMBED_ENABLE
2576void noinline 2818void noinline
2577ev_embed_sweep (EV_P_ ev_embed *w) 2819ev_embed_sweep (EV_P_ ev_embed *w)
… …
2604 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2846 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2605 } 2847 }
2606 } 2848 }
2607} 2849}
2608 2850
2851static void
2852embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2853{
2854 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2855
2856 {
2857 struct ev_loop *loop = w->other;
2858
2859 ev_loop_fork (EV_A);
2860 }
2861}
2862
2609#if 0 2863#if 0
2610static void 2864static void
2611embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2865embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2612{ 2866{
2613 ev_idle_stop (EV_A_ idle); 2867 ev_idle_stop (EV_A_ idle);
… …
2624 struct ev_loop *loop = w->other; 2878 struct ev_loop *loop = w->other;
2625 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2879 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2626 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2880 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2627 } 2881 }
2628 2882
2883 EV_FREQUENT_CHECK;
2884
2629 ev_set_priority (&w->io, ev_priority (w)); 2885 ev_set_priority (&w->io, ev_priority (w));
2630 ev_io_start (EV_A_ &w->io); 2886 ev_io_start (EV_A_ &w->io);
2631 2887
2632 ev_prepare_init (&w->prepare, embed_prepare_cb); 2888 ev_prepare_init (&w->prepare, embed_prepare_cb);
2633 ev_set_priority (&w->prepare, EV_MINPRI); 2889 ev_set_priority (&w->prepare, EV_MINPRI);
2634 ev_prepare_start (EV_A_ &w->prepare); 2890 ev_prepare_start (EV_A_ &w->prepare);
2635 2891
2892 ev_fork_init (&w->fork, embed_fork_cb);
2893 ev_fork_start (EV_A_ &w->fork);
2894
2636 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2895 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2637 2896
2638 ev_start (EV_A_ (W)w, 1); 2897 ev_start (EV_A_ (W)w, 1);
2898
2899 EV_FREQUENT_CHECK;
2639} 2900}
2640 2901
2641void 2902void
2642ev_embed_stop (EV_P_ ev_embed *w) 2903ev_embed_stop (EV_P_ ev_embed *w)
2643{ 2904{
2644 clear_pending (EV_A_ (W)w); 2905 clear_pending (EV_A_ (W)w);
2645 if (expect_false (!ev_is_active (w))) 2906 if (expect_false (!ev_is_active (w)))
2646 return; 2907 return;
2647 2908
2909 EV_FREQUENT_CHECK;
2910
2648 ev_io_stop (EV_A_ &w->io); 2911 ev_io_stop (EV_A_ &w->io);
2649 ev_prepare_stop (EV_A_ &w->prepare); 2912 ev_prepare_stop (EV_A_ &w->prepare);
2913 ev_fork_stop (EV_A_ &w->fork);
2650 2914
2651 ev_stop (EV_A_ (W)w); 2915 EV_FREQUENT_CHECK;
2652} 2916}
2653#endif 2917#endif
2654 2918
2655#if EV_FORK_ENABLE 2919#if EV_FORK_ENABLE
2656void 2920void
2657ev_fork_start (EV_P_ ev_fork *w) 2921ev_fork_start (EV_P_ ev_fork *w)
2658{ 2922{
2659 if (expect_false (ev_is_active (w))) 2923 if (expect_false (ev_is_active (w)))
2660 return; 2924 return;
2925
2926 EV_FREQUENT_CHECK;
2661 2927
2662 ev_start (EV_A_ (W)w, ++forkcnt); 2928 ev_start (EV_A_ (W)w, ++forkcnt);
2663 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2929 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2664 forks [forkcnt - 1] = w; 2930 forks [forkcnt - 1] = w;
2931
2932 EV_FREQUENT_CHECK;
2665} 2933}
2666 2934
2667void 2935void
2668ev_fork_stop (EV_P_ ev_fork *w) 2936ev_fork_stop (EV_P_ ev_fork *w)
2669{ 2937{
2670 clear_pending (EV_A_ (W)w); 2938 clear_pending (EV_A_ (W)w);
2671 if (expect_false (!ev_is_active (w))) 2939 if (expect_false (!ev_is_active (w)))
2672 return; 2940 return;
2673 2941
2942 EV_FREQUENT_CHECK;
2943
2674 { 2944 {
2675 int active = ev_active (w); 2945 int active = ev_active (w);
2676 2946
2677 forks [active - 1] = forks [--forkcnt]; 2947 forks [active - 1] = forks [--forkcnt];
2678 ev_active (forks [active - 1]) = active; 2948 ev_active (forks [active - 1]) = active;
2679 } 2949 }
2680 2950
2681 ev_stop (EV_A_ (W)w); 2951 ev_stop (EV_A_ (W)w);
2952
2953 EV_FREQUENT_CHECK;
2682} 2954}
2683#endif 2955#endif
2684 2956
2685#if EV_ASYNC_ENABLE 2957#if EV_ASYNC_ENABLE
2686void 2958void
… …
2688{ 2960{
2689 if (expect_false (ev_is_active (w))) 2961 if (expect_false (ev_is_active (w)))
2690 return; 2962 return;
2691 2963
2692 evpipe_init (EV_A); 2964 evpipe_init (EV_A);
2965
2966 EV_FREQUENT_CHECK;
2693 2967
2694 ev_start (EV_A_ (W)w, ++asynccnt); 2968 ev_start (EV_A_ (W)w, ++asynccnt);
2695 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2969 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2696 asyncs [asynccnt - 1] = w; 2970 asyncs [asynccnt - 1] = w;
2971
2972 EV_FREQUENT_CHECK;
2697} 2973}
2698 2974
2699void 2975void
2700ev_async_stop (EV_P_ ev_async *w) 2976ev_async_stop (EV_P_ ev_async *w)
2701{ 2977{
2702 clear_pending (EV_A_ (W)w); 2978 clear_pending (EV_A_ (W)w);
2703 if (expect_false (!ev_is_active (w))) 2979 if (expect_false (!ev_is_active (w)))
2704 return; 2980 return;
2705 2981
2982 EV_FREQUENT_CHECK;
2983
2706 { 2984 {
2707 int active = ev_active (w); 2985 int active = ev_active (w);
2708 2986
2709 asyncs [active - 1] = asyncs [--asynccnt]; 2987 asyncs [active - 1] = asyncs [--asynccnt];
2710 ev_active (asyncs [active - 1]) = active; 2988 ev_active (asyncs [active - 1]) = active;
2711 } 2989 }
2712 2990
2713 ev_stop (EV_A_ (W)w); 2991 ev_stop (EV_A_ (W)w);
2992
2993 EV_FREQUENT_CHECK;
2714} 2994}
2715 2995
2716void 2996void
2717ev_async_send (EV_P_ ev_async *w) 2997ev_async_send (EV_P_ ev_async *w)
2718{ 2998{
… …
2735once_cb (EV_P_ struct ev_once *once, int revents) 3015once_cb (EV_P_ struct ev_once *once, int revents)
2736{ 3016{
2737 void (*cb)(int revents, void *arg) = once->cb; 3017 void (*cb)(int revents, void *arg) = once->cb;
2738 void *arg = once->arg; 3018 void *arg = once->arg;
2739 3019
2740 ev_io_stop (EV_A_ &once->io); 3020 ev_io_stop (EV_A_ &once->io);
2741 ev_timer_stop (EV_A_ &once->to); 3021 ev_timer_stop (EV_A_ &once->to);
2742 ev_free (once); 3022 ev_free (once);
2743 3023
2744 cb (revents, arg); 3024 cb (revents, arg);
2745} 3025}
2746 3026
2747static void 3027static void
2748once_cb_io (EV_P_ ev_io *w, int revents) 3028once_cb_io (EV_P_ ev_io *w, int revents)
2749{ 3029{
2750 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3030 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3031
3032 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2751} 3033}
2752 3034
2753static void 3035static void
2754once_cb_to (EV_P_ ev_timer *w, int revents) 3036once_cb_to (EV_P_ ev_timer *w, int revents)
2755{ 3037{
2756 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3038 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3039
3040 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2757} 3041}
2758 3042
2759void 3043void
2760ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3044ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2761{ 3045{

Diff Legend

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