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

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

Diff Legend

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