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

Comparing libev/ev.c (file contents):
Revision 1.243 by root, Fri May 9 15:52:13 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
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 unused; /* currently unused padding */
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
… …
802 */ 828 */
803#if EV_USE_4HEAP 829#if EV_USE_4HEAP
804 830
805#define DHEAP 4 831#define DHEAP 4
806#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 832#define HEAP0 (DHEAP - 1) /* index of first element in heap */
807 833#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
808/* towards the root */ 834#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 835
830/* away from the root */ 836/* away from the root */
831void inline_speed 837void inline_speed
832downheap (ANHE *heap, int N, int k) 838downheap (ANHE *heap, int N, int k)
833{ 839{
… …
836 842
837 for (;;) 843 for (;;)
838 { 844 {
839 ev_tstamp minat; 845 ev_tstamp minat;
840 ANHE *minpos; 846 ANHE *minpos;
841 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0; 847 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
842 848
843 // find minimum child 849 /* find minimum child */
844 if (expect_true (pos + DHEAP - 1 < E)) 850 if (expect_true (pos + DHEAP - 1 < E))
845 { 851 {
846 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 852 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
847 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));
848 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));
849 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));
850 } 856 }
851 else if (pos < E) 857 else if (pos < E)
852 { 858 {
853 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 859 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
854 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));
… …
859 break; 865 break;
860 866
861 if (ANHE_at (he) <= minat) 867 if (ANHE_at (he) <= minat)
862 break; 868 break;
863 869
870 heap [k] = *minpos;
864 ev_active (ANHE_w (*minpos)) = k; 871 ev_active (ANHE_w (*minpos)) = k;
865 heap [k] = *minpos;
866 872
867 k = minpos - heap; 873 k = minpos - heap;
868 } 874 }
869 875
876 heap [k] = he;
870 ev_active (ANHE_w (he)) = k; 877 ev_active (ANHE_w (he)) = k;
871 heap [k] = he;
872} 878}
873 879
874#else // 4HEAP 880#else /* 4HEAP */
875 881
876#define HEAP0 1 882#define HEAP0 1
877 883#define HPARENT(k) ((k) >> 1)
878/* towards the root */ 884#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 885
901/* away from the root */ 886/* away from the root */
902void inline_speed 887void inline_speed
903downheap (ANHE *heap, int N, int k) 888downheap (ANHE *heap, int N, int k)
904{ 889{
… …
906 891
907 for (;;) 892 for (;;)
908 { 893 {
909 int c = k << 1; 894 int c = k << 1;
910 895
911 if (c > N) 896 if (c > N + HEAP0 - 1)
912 break; 897 break;
913 898
914 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])
915 ? 1 : 0; 900 ? 1 : 0;
916 901
917 if (ANHE_at (he) <= ANHE_at (heap [c])) 902 if (ANHE_at (he) <= ANHE_at (heap [c]))
918 break; 903 break;
919 904
… …
926 heap [k] = he; 911 heap [k] = he;
927 ev_active (ANHE_w (he)) = k; 912 ev_active (ANHE_w (he)) = k;
928} 913}
929#endif 914#endif
930 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
931void inline_size 938void inline_size
932adjustheap (ANHE *heap, int N, int k) 939adjustheap (ANHE *heap, int N, int k)
933{ 940{
941 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
934 upheap (heap, k); 942 upheap (heap, k);
943 else
935 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);
936} 957}
937 958
938/*****************************************************************************/ 959/*****************************************************************************/
939 960
940typedef struct 961typedef struct
… …
946static ANSIG *signals; 967static ANSIG *signals;
947static int signalmax; 968static int signalmax;
948 969
949static EV_ATOMIC_T gotsig; 970static EV_ATOMIC_T gotsig;
950 971
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/*****************************************************************************/ 972/*****************************************************************************/
964 973
965void inline_speed 974void inline_speed
966fd_intern (int fd) 975fd_intern (int fd)
967{ 976{
968#ifdef _WIN32 977#ifdef _WIN32
969 int arg = 1; 978 unsigned long arg = 1;
970 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 979 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
971#else 980#else
972 fcntl (fd, F_SETFD, FD_CLOEXEC); 981 fcntl (fd, F_SETFD, FD_CLOEXEC);
973 fcntl (fd, F_SETFL, O_NONBLOCK); 982 fcntl (fd, F_SETFL, O_NONBLOCK);
974#endif 983#endif
… …
1458 1467
1459 postfork = 0; 1468 postfork = 0;
1460} 1469}
1461 1470
1462#if EV_MULTIPLICITY 1471#if EV_MULTIPLICITY
1472
1463struct ev_loop * 1473struct ev_loop *
1464ev_loop_new (unsigned int flags) 1474ev_loop_new (unsigned int flags)
1465{ 1475{
1466 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));
1467 1477
… …
1485void 1495void
1486ev_loop_fork (EV_P) 1496ev_loop_fork (EV_P)
1487{ 1497{
1488 postfork = 1; /* must be in line with ev_default_fork */ 1498 postfork = 1; /* must be in line with ev_default_fork */
1489} 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)
1490#endif 1596# endif
1597#endif
1598}
1599
1600#endif /* multiplicity */
1491 1601
1492#if EV_MULTIPLICITY 1602#if EV_MULTIPLICITY
1493struct ev_loop * 1603struct ev_loop *
1494ev_default_loop_init (unsigned int flags) 1604ev_default_loop_init (unsigned int flags)
1495#else 1605#else
… …
1571 { 1681 {
1572 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1682 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1573 1683
1574 p->w->pending = 0; 1684 p->w->pending = 0;
1575 EV_CB_INVOKE (p->w, p->events); 1685 EV_CB_INVOKE (p->w, p->events);
1686 EV_FREQUENT_CHECK;
1576 } 1687 }
1577 } 1688 }
1578} 1689}
1579 1690
1580#if EV_IDLE_ENABLE 1691#if EV_IDLE_ENABLE
… …
1601#endif 1712#endif
1602 1713
1603void inline_size 1714void inline_size
1604timers_reify (EV_P) 1715timers_reify (EV_P)
1605{ 1716{
1717 EV_FREQUENT_CHECK;
1718
1606 while (timercnt && ANHE_at (timers [HEAP0]) <= mn_now) 1719 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1607 { 1720 {
1608 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1721 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1609 1722
1610 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1723 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1611 1724
… …
1616 if (ev_at (w) < mn_now) 1729 if (ev_at (w) < mn_now)
1617 ev_at (w) = mn_now; 1730 ev_at (w) = mn_now;
1618 1731
1619 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1732 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1620 1733
1621 ANHE_at_set (timers [HEAP0]); 1734 ANHE_at_cache (timers [HEAP0]);
1622 downheap (timers, timercnt, HEAP0); 1735 downheap (timers, timercnt, HEAP0);
1623 } 1736 }
1624 else 1737 else
1625 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1738 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1626 1739
1740 EV_FREQUENT_CHECK;
1627 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1741 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1628 } 1742 }
1629} 1743}
1630 1744
1631#if EV_PERIODIC_ENABLE 1745#if EV_PERIODIC_ENABLE
1632void inline_size 1746void inline_size
1633periodics_reify (EV_P) 1747periodics_reify (EV_P)
1634{ 1748{
1749 EV_FREQUENT_CHECK;
1750
1635 while (periodiccnt && ANHE_at (periodics [HEAP0]) <= ev_rt_now) 1751 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1636 { 1752 {
1637 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1753 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1638 1754
1639 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1755 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1640 1756
1641 /* first reschedule or stop timer */ 1757 /* first reschedule or stop timer */
1642 if (w->reschedule_cb) 1758 if (w->reschedule_cb)
1643 { 1759 {
1644 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1760 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1645 1761
1646 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));
1647 1763
1648 ANHE_at_set (periodics [HEAP0]); 1764 ANHE_at_cache (periodics [HEAP0]);
1649 downheap (periodics, periodiccnt, HEAP0); 1765 downheap (periodics, periodiccnt, HEAP0);
1650 } 1766 }
1651 else if (w->interval) 1767 else if (w->interval)
1652 { 1768 {
1653 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 */
1654 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval; 1772 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1773 {
1774 ev_at (w) += w->interval;
1655 1775
1656 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now)); 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 }
1657 1782
1658 ANHE_at_set (periodics [HEAP0]); 1783 ANHE_at_cache (periodics [HEAP0]);
1659 downheap (periodics, periodiccnt, HEAP0); 1784 downheap (periodics, periodiccnt, HEAP0);
1660 } 1785 }
1661 else 1786 else
1662 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1787 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1663 1788
1789 EV_FREQUENT_CHECK;
1664 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1790 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1665 } 1791 }
1666} 1792}
1667 1793
1668static void noinline 1794static void noinline
… …
1678 if (w->reschedule_cb) 1804 if (w->reschedule_cb)
1679 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1805 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1680 else if (w->interval) 1806 else if (w->interval)
1681 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;
1682 1808
1683 ANHE_at_set (periodics [i]); 1809 ANHE_at_cache (periodics [i]);
1684 } 1810 }
1685 1811
1686 /* we don't use floyds algorithm, uphead is simpler and is more cache-efficient */ 1812 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} 1813}
1691#endif 1814#endif
1692 1815
1693void inline_speed 1816void inline_speed
1694time_update (EV_P_ ev_tstamp max_block) 1817time_update (EV_P_ ev_tstamp max_block)
… …
1752 /* 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 */
1753 for (i = 0; i < timercnt; ++i) 1876 for (i = 0; i < timercnt; ++i)
1754 { 1877 {
1755 ANHE *he = timers + i + HEAP0; 1878 ANHE *he = timers + i + HEAP0;
1756 ANHE_w (*he)->at += ev_rt_now - mn_now; 1879 ANHE_w (*he)->at += ev_rt_now - mn_now;
1757 ANHE_at_set (*he); 1880 ANHE_at_cache (*he);
1758 } 1881 }
1759 } 1882 }
1760 1883
1761 mn_now = ev_rt_now; 1884 mn_now = ev_rt_now;
1762 } 1885 }
… …
1772ev_unref (EV_P) 1895ev_unref (EV_P)
1773{ 1896{
1774 --activecnt; 1897 --activecnt;
1775} 1898}
1776 1899
1900void
1901ev_now_update (EV_P)
1902{
1903 time_update (EV_A_ 1e100);
1904}
1905
1777static int loop_done; 1906static int loop_done;
1778 1907
1779void 1908void
1780ev_loop (EV_P_ int flags) 1909ev_loop (EV_P_ int flags)
1781{ 1910{
… …
1783 1912
1784 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 */
1785 1914
1786 do 1915 do
1787 { 1916 {
1917#if EV_VERIFY >= 2
1918 ev_loop_verify (EV_A);
1919#endif
1920
1788#ifndef _WIN32 1921#ifndef _WIN32
1789 if (expect_false (curpid)) /* penalise the forking check even more */ 1922 if (expect_false (curpid)) /* penalise the forking check even more */
1790 if (expect_false (getpid () != curpid)) 1923 if (expect_false (getpid () != curpid))
1791 { 1924 {
1792 curpid = getpid (); 1925 curpid = getpid ();
… …
1986 2119
1987 if (expect_false (ev_is_active (w))) 2120 if (expect_false (ev_is_active (w)))
1988 return; 2121 return;
1989 2122
1990 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;
1991 2127
1992 ev_start (EV_A_ (W)w, 1); 2128 ev_start (EV_A_ (W)w, 1);
1993 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2129 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
1994 wlist_add (&anfds[fd].head, (WL)w); 2130 wlist_add (&anfds[fd].head, (WL)w);
1995 2131
1996 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2132 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1997 w->events &= ~EV_IOFDSET; 2133 w->events &= ~EV_IOFDSET;
2134
2135 EV_FREQUENT_CHECK;
1998} 2136}
1999 2137
2000void noinline 2138void noinline
2001ev_io_stop (EV_P_ ev_io *w) 2139ev_io_stop (EV_P_ ev_io *w)
2002{ 2140{
… …
2004 if (expect_false (!ev_is_active (w))) 2142 if (expect_false (!ev_is_active (w)))
2005 return; 2143 return;
2006 2144
2007 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));
2008 2146
2147 EV_FREQUENT_CHECK;
2148
2009 wlist_del (&anfds[w->fd].head, (WL)w); 2149 wlist_del (&anfds[w->fd].head, (WL)w);
2010 ev_stop (EV_A_ (W)w); 2150 ev_stop (EV_A_ (W)w);
2011 2151
2012 fd_change (EV_A_ w->fd, 1); 2152 fd_change (EV_A_ w->fd, 1);
2153
2154 EV_FREQUENT_CHECK;
2013} 2155}
2014 2156
2015void noinline 2157void noinline
2016ev_timer_start (EV_P_ ev_timer *w) 2158ev_timer_start (EV_P_ ev_timer *w)
2017{ 2159{
… …
2020 2162
2021 ev_at (w) += mn_now; 2163 ev_at (w) += mn_now;
2022 2164
2023 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.));
2024 2166
2167 EV_FREQUENT_CHECK;
2168
2169 ++timercnt;
2025 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2170 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2026 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2); 2171 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
2027 ANHE_w (timers [ev_active (w)]) = (WT)w; 2172 ANHE_w (timers [ev_active (w)]) = (WT)w;
2028 ANHE_at_set (timers [ev_active (w)]); 2173 ANHE_at_cache (timers [ev_active (w)]);
2029 upheap (timers, ev_active (w)); 2174 upheap (timers, ev_active (w));
2175
2176 EV_FREQUENT_CHECK;
2030 2177
2031 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2178 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2032} 2179}
2033 2180
2034void noinline 2181void noinline
… …
2036{ 2183{
2037 clear_pending (EV_A_ (W)w); 2184 clear_pending (EV_A_ (W)w);
2038 if (expect_false (!ev_is_active (w))) 2185 if (expect_false (!ev_is_active (w)))
2039 return; 2186 return;
2040 2187
2188 EV_FREQUENT_CHECK;
2189
2041 { 2190 {
2042 int active = ev_active (w); 2191 int active = ev_active (w);
2043 2192
2044 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2193 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2045 2194
2195 --timercnt;
2196
2046 if (expect_true (active < timercnt + HEAP0 - 1)) 2197 if (expect_true (active < timercnt + HEAP0))
2047 { 2198 {
2048 timers [active] = timers [timercnt + HEAP0 - 1]; 2199 timers [active] = timers [timercnt + HEAP0];
2049 adjustheap (timers, timercnt, active); 2200 adjustheap (timers, timercnt, active);
2050 } 2201 }
2051
2052 --timercnt;
2053 } 2202 }
2203
2204 EV_FREQUENT_CHECK;
2054 2205
2055 ev_at (w) -= mn_now; 2206 ev_at (w) -= mn_now;
2056 2207
2057 ev_stop (EV_A_ (W)w); 2208 ev_stop (EV_A_ (W)w);
2058} 2209}
2059 2210
2060void noinline 2211void noinline
2061ev_timer_again (EV_P_ ev_timer *w) 2212ev_timer_again (EV_P_ ev_timer *w)
2062{ 2213{
2214 EV_FREQUENT_CHECK;
2215
2063 if (ev_is_active (w)) 2216 if (ev_is_active (w))
2064 { 2217 {
2065 if (w->repeat) 2218 if (w->repeat)
2066 { 2219 {
2067 ev_at (w) = mn_now + w->repeat; 2220 ev_at (w) = mn_now + w->repeat;
2068 ANHE_at_set (timers [ev_active (w)]); 2221 ANHE_at_cache (timers [ev_active (w)]);
2069 adjustheap (timers, timercnt, ev_active (w)); 2222 adjustheap (timers, timercnt, ev_active (w));
2070 } 2223 }
2071 else 2224 else
2072 ev_timer_stop (EV_A_ w); 2225 ev_timer_stop (EV_A_ w);
2073 } 2226 }
2074 else if (w->repeat) 2227 else if (w->repeat)
2075 { 2228 {
2076 ev_at (w) = w->repeat; 2229 ev_at (w) = w->repeat;
2077 ev_timer_start (EV_A_ w); 2230 ev_timer_start (EV_A_ w);
2078 } 2231 }
2232
2233 EV_FREQUENT_CHECK;
2079} 2234}
2080 2235
2081#if EV_PERIODIC_ENABLE 2236#if EV_PERIODIC_ENABLE
2082void noinline 2237void noinline
2083ev_periodic_start (EV_P_ ev_periodic *w) 2238ev_periodic_start (EV_P_ ev_periodic *w)
… …
2094 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;
2095 } 2250 }
2096 else 2251 else
2097 ev_at (w) = w->offset; 2252 ev_at (w) = w->offset;
2098 2253
2254 EV_FREQUENT_CHECK;
2255
2256 ++periodiccnt;
2099 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2257 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2100 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2); 2258 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2101 ANHE_w (periodics [ev_active (w)]) = (WT)w; 2259 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2102 ANHE_at_set (periodics [ev_active (w)]); 2260 ANHE_at_cache (periodics [ev_active (w)]);
2103 upheap (periodics, ev_active (w)); 2261 upheap (periodics, ev_active (w));
2262
2263 EV_FREQUENT_CHECK;
2104 2264
2105 /*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));*/
2106} 2266}
2107 2267
2108void noinline 2268void noinline
… …
2110{ 2270{
2111 clear_pending (EV_A_ (W)w); 2271 clear_pending (EV_A_ (W)w);
2112 if (expect_false (!ev_is_active (w))) 2272 if (expect_false (!ev_is_active (w)))
2113 return; 2273 return;
2114 2274
2275 EV_FREQUENT_CHECK;
2276
2115 { 2277 {
2116 int active = ev_active (w); 2278 int active = ev_active (w);
2117 2279
2118 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2280 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2119 2281
2282 --periodiccnt;
2283
2120 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2284 if (expect_true (active < periodiccnt + HEAP0))
2121 { 2285 {
2122 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2286 periodics [active] = periodics [periodiccnt + HEAP0];
2123 adjustheap (periodics, periodiccnt, active); 2287 adjustheap (periodics, periodiccnt, active);
2124 } 2288 }
2125
2126 --periodiccnt;
2127 } 2289 }
2290
2291 EV_FREQUENT_CHECK;
2128 2292
2129 ev_stop (EV_A_ (W)w); 2293 ev_stop (EV_A_ (W)w);
2130} 2294}
2131 2295
2132void noinline 2296void noinline
… …
2152 return; 2316 return;
2153 2317
2154 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));
2155 2319
2156 evpipe_init (EV_A); 2320 evpipe_init (EV_A);
2321
2322 EV_FREQUENT_CHECK;
2157 2323
2158 { 2324 {
2159#ifndef _WIN32 2325#ifndef _WIN32
2160 sigset_t full, prev; 2326 sigset_t full, prev;
2161 sigfillset (&full); 2327 sigfillset (&full);
2162 sigprocmask (SIG_SETMASK, &full, &prev); 2328 sigprocmask (SIG_SETMASK, &full, &prev);
2163#endif 2329#endif
2164 2330
2165 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2331 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2166 2332
2167#ifndef _WIN32 2333#ifndef _WIN32
2168 sigprocmask (SIG_SETMASK, &prev, 0); 2334 sigprocmask (SIG_SETMASK, &prev, 0);
2169#endif 2335#endif
2170 } 2336 }
… …
2182 sigfillset (&sa.sa_mask); 2348 sigfillset (&sa.sa_mask);
2183 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 */
2184 sigaction (w->signum, &sa, 0); 2350 sigaction (w->signum, &sa, 0);
2185#endif 2351#endif
2186 } 2352 }
2353
2354 EV_FREQUENT_CHECK;
2187} 2355}
2188 2356
2189void noinline 2357void noinline
2190ev_signal_stop (EV_P_ ev_signal *w) 2358ev_signal_stop (EV_P_ ev_signal *w)
2191{ 2359{
2192 clear_pending (EV_A_ (W)w); 2360 clear_pending (EV_A_ (W)w);
2193 if (expect_false (!ev_is_active (w))) 2361 if (expect_false (!ev_is_active (w)))
2194 return; 2362 return;
2195 2363
2364 EV_FREQUENT_CHECK;
2365
2196 wlist_del (&signals [w->signum - 1].head, (WL)w); 2366 wlist_del (&signals [w->signum - 1].head, (WL)w);
2197 ev_stop (EV_A_ (W)w); 2367 ev_stop (EV_A_ (W)w);
2198 2368
2199 if (!signals [w->signum - 1].head) 2369 if (!signals [w->signum - 1].head)
2200 signal (w->signum, SIG_DFL); 2370 signal (w->signum, SIG_DFL);
2371
2372 EV_FREQUENT_CHECK;
2201} 2373}
2202 2374
2203void 2375void
2204ev_child_start (EV_P_ ev_child *w) 2376ev_child_start (EV_P_ ev_child *w)
2205{ 2377{
… …
2207 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));
2208#endif 2380#endif
2209 if (expect_false (ev_is_active (w))) 2381 if (expect_false (ev_is_active (w)))
2210 return; 2382 return;
2211 2383
2384 EV_FREQUENT_CHECK;
2385
2212 ev_start (EV_A_ (W)w, 1); 2386 ev_start (EV_A_ (W)w, 1);
2213 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;
2214} 2390}
2215 2391
2216void 2392void
2217ev_child_stop (EV_P_ ev_child *w) 2393ev_child_stop (EV_P_ ev_child *w)
2218{ 2394{
2219 clear_pending (EV_A_ (W)w); 2395 clear_pending (EV_A_ (W)w);
2220 if (expect_false (!ev_is_active (w))) 2396 if (expect_false (!ev_is_active (w)))
2221 return; 2397 return;
2222 2398
2399 EV_FREQUENT_CHECK;
2400
2223 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2401 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2224 ev_stop (EV_A_ (W)w); 2402 ev_stop (EV_A_ (W)w);
2403
2404 EV_FREQUENT_CHECK;
2225} 2405}
2226 2406
2227#if EV_STAT_ENABLE 2407#if EV_STAT_ENABLE
2228 2408
2229# ifdef _WIN32 2409# ifdef _WIN32
… …
2298 2478
2299static void noinline 2479static void noinline
2300infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2480infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2301{ 2481{
2302 if (slot < 0) 2482 if (slot < 0)
2303 /* overflow, need to check for all hahs slots */ 2483 /* overflow, need to check for all hash slots */
2304 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2484 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2305 infy_wd (EV_A_ slot, wd, ev); 2485 infy_wd (EV_A_ slot, wd, ev);
2306 else 2486 else
2307 { 2487 {
2308 WL w_; 2488 WL w_;
… …
2342infy_init (EV_P) 2522infy_init (EV_P)
2343{ 2523{
2344 if (fs_fd != -2) 2524 if (fs_fd != -2)
2345 return; 2525 return;
2346 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
2347 fs_fd = inotify_init (); 2548 fs_fd = inotify_init ();
2348 2549
2349 if (fs_fd >= 0) 2550 if (fs_fd >= 0)
2350 { 2551 {
2351 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 2552 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
… …
2380 if (fs_fd >= 0) 2581 if (fs_fd >= 0)
2381 infy_add (EV_A_ w); /* re-add, no matter what */ 2582 infy_add (EV_A_ w); /* re-add, no matter what */
2382 else 2583 else
2383 ev_timer_start (EV_A_ &w->timer); 2584 ev_timer_start (EV_A_ &w->timer);
2384 } 2585 }
2385
2386 } 2586 }
2387} 2587}
2388 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)
2389#endif 2595#endif
2390 2596
2391void 2597void
2392ev_stat_stat (EV_P_ ev_stat *w) 2598ev_stat_stat (EV_P_ ev_stat *w)
2393{ 2599{
… …
2420 || w->prev.st_atime != w->attr.st_atime 2626 || w->prev.st_atime != w->attr.st_atime
2421 || w->prev.st_mtime != w->attr.st_mtime 2627 || w->prev.st_mtime != w->attr.st_mtime
2422 || w->prev.st_ctime != w->attr.st_ctime 2628 || w->prev.st_ctime != w->attr.st_ctime
2423 ) { 2629 ) {
2424 #if EV_USE_INOTIFY 2630 #if EV_USE_INOTIFY
2631 if (fs_fd >= 0)
2632 {
2425 infy_del (EV_A_ w); 2633 infy_del (EV_A_ w);
2426 infy_add (EV_A_ w); 2634 infy_add (EV_A_ w);
2427 ev_stat_stat (EV_A_ w); /* avoid race... */ 2635 ev_stat_stat (EV_A_ w); /* avoid race... */
2636 }
2428 #endif 2637 #endif
2429 2638
2430 ev_feed_event (EV_A_ w, EV_STAT); 2639 ev_feed_event (EV_A_ w, EV_STAT);
2431 } 2640 }
2432} 2641}
… …
2457 else 2666 else
2458#endif 2667#endif
2459 ev_timer_start (EV_A_ &w->timer); 2668 ev_timer_start (EV_A_ &w->timer);
2460 2669
2461 ev_start (EV_A_ (W)w, 1); 2670 ev_start (EV_A_ (W)w, 1);
2671
2672 EV_FREQUENT_CHECK;
2462} 2673}
2463 2674
2464void 2675void
2465ev_stat_stop (EV_P_ ev_stat *w) 2676ev_stat_stop (EV_P_ ev_stat *w)
2466{ 2677{
2467 clear_pending (EV_A_ (W)w); 2678 clear_pending (EV_A_ (W)w);
2468 if (expect_false (!ev_is_active (w))) 2679 if (expect_false (!ev_is_active (w)))
2469 return; 2680 return;
2470 2681
2682 EV_FREQUENT_CHECK;
2683
2471#if EV_USE_INOTIFY 2684#if EV_USE_INOTIFY
2472 infy_del (EV_A_ w); 2685 infy_del (EV_A_ w);
2473#endif 2686#endif
2474 ev_timer_stop (EV_A_ &w->timer); 2687 ev_timer_stop (EV_A_ &w->timer);
2475 2688
2476 ev_stop (EV_A_ (W)w); 2689 ev_stop (EV_A_ (W)w);
2690
2691 EV_FREQUENT_CHECK;
2477} 2692}
2478#endif 2693#endif
2479 2694
2480#if EV_IDLE_ENABLE 2695#if EV_IDLE_ENABLE
2481void 2696void
… …
2483{ 2698{
2484 if (expect_false (ev_is_active (w))) 2699 if (expect_false (ev_is_active (w)))
2485 return; 2700 return;
2486 2701
2487 pri_adjust (EV_A_ (W)w); 2702 pri_adjust (EV_A_ (W)w);
2703
2704 EV_FREQUENT_CHECK;
2488 2705
2489 { 2706 {
2490 int active = ++idlecnt [ABSPRI (w)]; 2707 int active = ++idlecnt [ABSPRI (w)];
2491 2708
2492 ++idleall; 2709 ++idleall;
2493 ev_start (EV_A_ (W)w, active); 2710 ev_start (EV_A_ (W)w, active);
2494 2711
2495 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);
2496 idles [ABSPRI (w)][active - 1] = w; 2713 idles [ABSPRI (w)][active - 1] = w;
2497 } 2714 }
2715
2716 EV_FREQUENT_CHECK;
2498} 2717}
2499 2718
2500void 2719void
2501ev_idle_stop (EV_P_ ev_idle *w) 2720ev_idle_stop (EV_P_ ev_idle *w)
2502{ 2721{
2503 clear_pending (EV_A_ (W)w); 2722 clear_pending (EV_A_ (W)w);
2504 if (expect_false (!ev_is_active (w))) 2723 if (expect_false (!ev_is_active (w)))
2505 return; 2724 return;
2506 2725
2726 EV_FREQUENT_CHECK;
2727
2507 { 2728 {
2508 int active = ev_active (w); 2729 int active = ev_active (w);
2509 2730
2510 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2731 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2511 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2732 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2512 2733
2513 ev_stop (EV_A_ (W)w); 2734 ev_stop (EV_A_ (W)w);
2514 --idleall; 2735 --idleall;
2515 } 2736 }
2737
2738 EV_FREQUENT_CHECK;
2516} 2739}
2517#endif 2740#endif
2518 2741
2519void 2742void
2520ev_prepare_start (EV_P_ ev_prepare *w) 2743ev_prepare_start (EV_P_ ev_prepare *w)
2521{ 2744{
2522 if (expect_false (ev_is_active (w))) 2745 if (expect_false (ev_is_active (w)))
2523 return; 2746 return;
2747
2748 EV_FREQUENT_CHECK;
2524 2749
2525 ev_start (EV_A_ (W)w, ++preparecnt); 2750 ev_start (EV_A_ (W)w, ++preparecnt);
2526 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2751 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2527 prepares [preparecnt - 1] = w; 2752 prepares [preparecnt - 1] = w;
2753
2754 EV_FREQUENT_CHECK;
2528} 2755}
2529 2756
2530void 2757void
2531ev_prepare_stop (EV_P_ ev_prepare *w) 2758ev_prepare_stop (EV_P_ ev_prepare *w)
2532{ 2759{
2533 clear_pending (EV_A_ (W)w); 2760 clear_pending (EV_A_ (W)w);
2534 if (expect_false (!ev_is_active (w))) 2761 if (expect_false (!ev_is_active (w)))
2535 return; 2762 return;
2536 2763
2764 EV_FREQUENT_CHECK;
2765
2537 { 2766 {
2538 int active = ev_active (w); 2767 int active = ev_active (w);
2539 2768
2540 prepares [active - 1] = prepares [--preparecnt]; 2769 prepares [active - 1] = prepares [--preparecnt];
2541 ev_active (prepares [active - 1]) = active; 2770 ev_active (prepares [active - 1]) = active;
2542 } 2771 }
2543 2772
2544 ev_stop (EV_A_ (W)w); 2773 ev_stop (EV_A_ (W)w);
2774
2775 EV_FREQUENT_CHECK;
2545} 2776}
2546 2777
2547void 2778void
2548ev_check_start (EV_P_ ev_check *w) 2779ev_check_start (EV_P_ ev_check *w)
2549{ 2780{
2550 if (expect_false (ev_is_active (w))) 2781 if (expect_false (ev_is_active (w)))
2551 return; 2782 return;
2783
2784 EV_FREQUENT_CHECK;
2552 2785
2553 ev_start (EV_A_ (W)w, ++checkcnt); 2786 ev_start (EV_A_ (W)w, ++checkcnt);
2554 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2787 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2555 checks [checkcnt - 1] = w; 2788 checks [checkcnt - 1] = w;
2789
2790 EV_FREQUENT_CHECK;
2556} 2791}
2557 2792
2558void 2793void
2559ev_check_stop (EV_P_ ev_check *w) 2794ev_check_stop (EV_P_ ev_check *w)
2560{ 2795{
2561 clear_pending (EV_A_ (W)w); 2796 clear_pending (EV_A_ (W)w);
2562 if (expect_false (!ev_is_active (w))) 2797 if (expect_false (!ev_is_active (w)))
2563 return; 2798 return;
2564 2799
2800 EV_FREQUENT_CHECK;
2801
2565 { 2802 {
2566 int active = ev_active (w); 2803 int active = ev_active (w);
2567 2804
2568 checks [active - 1] = checks [--checkcnt]; 2805 checks [active - 1] = checks [--checkcnt];
2569 ev_active (checks [active - 1]) = active; 2806 ev_active (checks [active - 1]) = active;
2570 } 2807 }
2571 2808
2572 ev_stop (EV_A_ (W)w); 2809 ev_stop (EV_A_ (W)w);
2810
2811 EV_FREQUENT_CHECK;
2573} 2812}
2574 2813
2575#if EV_EMBED_ENABLE 2814#if EV_EMBED_ENABLE
2576void noinline 2815void noinline
2577ev_embed_sweep (EV_P_ ev_embed *w) 2816ev_embed_sweep (EV_P_ ev_embed *w)
… …
2604 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2843 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2605 } 2844 }
2606 } 2845 }
2607} 2846}
2608 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
2609#if 0 2860#if 0
2610static void 2861static void
2611embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2862embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2612{ 2863{
2613 ev_idle_stop (EV_A_ idle); 2864 ev_idle_stop (EV_A_ idle);
… …
2624 struct ev_loop *loop = w->other; 2875 struct ev_loop *loop = w->other;
2625 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 ()));
2626 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);
2627 } 2878 }
2628 2879
2880 EV_FREQUENT_CHECK;
2881
2629 ev_set_priority (&w->io, ev_priority (w)); 2882 ev_set_priority (&w->io, ev_priority (w));
2630 ev_io_start (EV_A_ &w->io); 2883 ev_io_start (EV_A_ &w->io);
2631 2884
2632 ev_prepare_init (&w->prepare, embed_prepare_cb); 2885 ev_prepare_init (&w->prepare, embed_prepare_cb);
2633 ev_set_priority (&w->prepare, EV_MINPRI); 2886 ev_set_priority (&w->prepare, EV_MINPRI);
2634 ev_prepare_start (EV_A_ &w->prepare); 2887 ev_prepare_start (EV_A_ &w->prepare);
2635 2888
2889 ev_fork_init (&w->fork, embed_fork_cb);
2890 ev_fork_start (EV_A_ &w->fork);
2891
2636 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2892 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2637 2893
2638 ev_start (EV_A_ (W)w, 1); 2894 ev_start (EV_A_ (W)w, 1);
2895
2896 EV_FREQUENT_CHECK;
2639} 2897}
2640 2898
2641void 2899void
2642ev_embed_stop (EV_P_ ev_embed *w) 2900ev_embed_stop (EV_P_ ev_embed *w)
2643{ 2901{
2644 clear_pending (EV_A_ (W)w); 2902 clear_pending (EV_A_ (W)w);
2645 if (expect_false (!ev_is_active (w))) 2903 if (expect_false (!ev_is_active (w)))
2646 return; 2904 return;
2647 2905
2906 EV_FREQUENT_CHECK;
2907
2648 ev_io_stop (EV_A_ &w->io); 2908 ev_io_stop (EV_A_ &w->io);
2649 ev_prepare_stop (EV_A_ &w->prepare); 2909 ev_prepare_stop (EV_A_ &w->prepare);
2910 ev_fork_stop (EV_A_ &w->fork);
2650 2911
2651 ev_stop (EV_A_ (W)w); 2912 EV_FREQUENT_CHECK;
2652} 2913}
2653#endif 2914#endif
2654 2915
2655#if EV_FORK_ENABLE 2916#if EV_FORK_ENABLE
2656void 2917void
2657ev_fork_start (EV_P_ ev_fork *w) 2918ev_fork_start (EV_P_ ev_fork *w)
2658{ 2919{
2659 if (expect_false (ev_is_active (w))) 2920 if (expect_false (ev_is_active (w)))
2660 return; 2921 return;
2922
2923 EV_FREQUENT_CHECK;
2661 2924
2662 ev_start (EV_A_ (W)w, ++forkcnt); 2925 ev_start (EV_A_ (W)w, ++forkcnt);
2663 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2926 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2664 forks [forkcnt - 1] = w; 2927 forks [forkcnt - 1] = w;
2928
2929 EV_FREQUENT_CHECK;
2665} 2930}
2666 2931
2667void 2932void
2668ev_fork_stop (EV_P_ ev_fork *w) 2933ev_fork_stop (EV_P_ ev_fork *w)
2669{ 2934{
2670 clear_pending (EV_A_ (W)w); 2935 clear_pending (EV_A_ (W)w);
2671 if (expect_false (!ev_is_active (w))) 2936 if (expect_false (!ev_is_active (w)))
2672 return; 2937 return;
2673 2938
2939 EV_FREQUENT_CHECK;
2940
2674 { 2941 {
2675 int active = ev_active (w); 2942 int active = ev_active (w);
2676 2943
2677 forks [active - 1] = forks [--forkcnt]; 2944 forks [active - 1] = forks [--forkcnt];
2678 ev_active (forks [active - 1]) = active; 2945 ev_active (forks [active - 1]) = active;
2679 } 2946 }
2680 2947
2681 ev_stop (EV_A_ (W)w); 2948 ev_stop (EV_A_ (W)w);
2949
2950 EV_FREQUENT_CHECK;
2682} 2951}
2683#endif 2952#endif
2684 2953
2685#if EV_ASYNC_ENABLE 2954#if EV_ASYNC_ENABLE
2686void 2955void
… …
2688{ 2957{
2689 if (expect_false (ev_is_active (w))) 2958 if (expect_false (ev_is_active (w)))
2690 return; 2959 return;
2691 2960
2692 evpipe_init (EV_A); 2961 evpipe_init (EV_A);
2962
2963 EV_FREQUENT_CHECK;
2693 2964
2694 ev_start (EV_A_ (W)w, ++asynccnt); 2965 ev_start (EV_A_ (W)w, ++asynccnt);
2695 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2966 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2696 asyncs [asynccnt - 1] = w; 2967 asyncs [asynccnt - 1] = w;
2968
2969 EV_FREQUENT_CHECK;
2697} 2970}
2698 2971
2699void 2972void
2700ev_async_stop (EV_P_ ev_async *w) 2973ev_async_stop (EV_P_ ev_async *w)
2701{ 2974{
2702 clear_pending (EV_A_ (W)w); 2975 clear_pending (EV_A_ (W)w);
2703 if (expect_false (!ev_is_active (w))) 2976 if (expect_false (!ev_is_active (w)))
2704 return; 2977 return;
2705 2978
2979 EV_FREQUENT_CHECK;
2980
2706 { 2981 {
2707 int active = ev_active (w); 2982 int active = ev_active (w);
2708 2983
2709 asyncs [active - 1] = asyncs [--asynccnt]; 2984 asyncs [active - 1] = asyncs [--asynccnt];
2710 ev_active (asyncs [active - 1]) = active; 2985 ev_active (asyncs [active - 1]) = active;
2711 } 2986 }
2712 2987
2713 ev_stop (EV_A_ (W)w); 2988 ev_stop (EV_A_ (W)w);
2989
2990 EV_FREQUENT_CHECK;
2714} 2991}
2715 2992
2716void 2993void
2717ev_async_send (EV_P_ ev_async *w) 2994ev_async_send (EV_P_ ev_async *w)
2718{ 2995{
… …
2735once_cb (EV_P_ struct ev_once *once, int revents) 3012once_cb (EV_P_ struct ev_once *once, int revents)
2736{ 3013{
2737 void (*cb)(int revents, void *arg) = once->cb; 3014 void (*cb)(int revents, void *arg) = once->cb;
2738 void *arg = once->arg; 3015 void *arg = once->arg;
2739 3016
2740 ev_io_stop (EV_A_ &once->io); 3017 ev_io_stop (EV_A_ &once->io);
2741 ev_timer_stop (EV_A_ &once->to); 3018 ev_timer_stop (EV_A_ &once->to);
2742 ev_free (once); 3019 ev_free (once);
2743 3020
2744 cb (revents, arg); 3021 cb (revents, arg);
2745} 3022}
2746 3023
2747static void 3024static void
2748once_cb_io (EV_P_ ev_io *w, int revents) 3025once_cb_io (EV_P_ ev_io *w, int revents)
2749{ 3026{
2750 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));
2751} 3030}
2752 3031
2753static void 3032static void
2754once_cb_to (EV_P_ ev_timer *w, int revents) 3033once_cb_to (EV_P_ ev_timer *w, int revents)
2755{ 3034{
2756 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));
2757} 3038}
2758 3039
2759void 3040void
2760ev_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)
2761{ 3042{

Diff Legend

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