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

Comparing libev/ev.c (file contents):
Revision 1.226 by root, Fri Apr 18 17:16:44 2008 UTC vs.
Revision 1.253 by root, Sat May 31 03:13:27 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>
… …
164#endif 164#endif
165 165
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 166/* this block tries to deduce configuration from header-defined symbols and defaults */
167 167
168#ifndef EV_USE_MONOTONIC 168#ifndef EV_USE_MONOTONIC
169# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
170# define EV_USE_MONOTONIC 1
171# else
169# define EV_USE_MONOTONIC 0 172# define EV_USE_MONOTONIC 0
173# endif
170#endif 174#endif
171 175
172#ifndef EV_USE_REALTIME 176#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 177# define EV_USE_REALTIME 0
174#endif 178#endif
175 179
176#ifndef EV_USE_NANOSLEEP 180#ifndef EV_USE_NANOSLEEP
181# if _POSIX_C_SOURCE >= 199309L
182# define EV_USE_NANOSLEEP 1
183# else
177# define EV_USE_NANOSLEEP 0 184# define EV_USE_NANOSLEEP 0
185# endif
178#endif 186#endif
179 187
180#ifndef EV_USE_SELECT 188#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 189# define EV_USE_SELECT 1
182#endif 190#endif
… …
233# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 241# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
234# define EV_USE_EVENTFD 1 242# define EV_USE_EVENTFD 1
235# else 243# else
236# define EV_USE_EVENTFD 0 244# define EV_USE_EVENTFD 0
237# endif 245# endif
246#endif
247
248#if 0 /* debugging */
249# define EV_VERIFY 3
250# define EV_USE_4HEAP 1
251# define EV_HEAP_CACHE_AT 1
252#endif
253
254#ifndef EV_VERIFY
255# define EV_VERIFY !EV_MINIMAL
256#endif
257
258#ifndef EV_USE_4HEAP
259# define EV_USE_4HEAP !EV_MINIMAL
260#endif
261
262#ifndef EV_HEAP_CACHE_AT
263# define EV_HEAP_CACHE_AT !EV_MINIMAL
238#endif 264#endif
239 265
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 266/* this block fixes any misconfiguration where we know we run into trouble otherwise */
241 267
242#ifndef CLOCK_MONOTONIC 268#ifndef CLOCK_MONOTONIC
… …
279} 305}
280# endif 306# endif
281#endif 307#endif
282 308
283/**/ 309/**/
310
311#if EV_VERIFY >= 3
312# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
313#else
314# define EV_FREQUENT_CHECK do { } while (0)
315#endif
284 316
285/* 317/*
286 * This is used to avoid floating point rounding problems. 318 * This is used to avoid floating point rounding problems.
287 * It is added to ev_rt_now when scheduling periodics 319 * It is added to ev_rt_now when scheduling periodics
288 * to ensure progress, time-wise, even when rounding 320 * to ensure progress, time-wise, even when rounding
… …
325 357
326typedef ev_watcher *W; 358typedef ev_watcher *W;
327typedef ev_watcher_list *WL; 359typedef ev_watcher_list *WL;
328typedef ev_watcher_time *WT; 360typedef ev_watcher_time *WT;
329 361
362#define ev_active(w) ((W)(w))->active
363#define ev_at(w) ((WT)(w))->at
364
330#if EV_USE_MONOTONIC 365#if EV_USE_MONOTONIC
331/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 366/* sig_atomic_t is used to avoid per-thread variables or locking but still */
332/* giving it a reasonably high chance of working on typical architetcures */ 367/* giving it a reasonably high chance of working on typical architetcures */
333static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 368static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
334#endif 369#endif
… …
419 W w; 454 W w;
420 int events; 455 int events;
421} ANPENDING; 456} ANPENDING;
422 457
423#if EV_USE_INOTIFY 458#if EV_USE_INOTIFY
459/* hash table entry per inotify-id */
424typedef struct 460typedef struct
425{ 461{
426 WL head; 462 WL head;
427} ANFS; 463} ANFS;
464#endif
465
466/* Heap Entry */
467#if EV_HEAP_CACHE_AT
468 typedef struct {
469 ev_tstamp at;
470 WT w;
471 } ANHE;
472
473 #define ANHE_w(he) (he).w /* access watcher, read-write */
474 #define ANHE_at(he) (he).at /* access cached at, read-only */
475 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
476#else
477 typedef WT ANHE;
478
479 #define ANHE_w(he) (he)
480 #define ANHE_at(he) (he)->at
481 #define ANHE_at_cache(he)
428#endif 482#endif
429 483
430#if EV_MULTIPLICITY 484#if EV_MULTIPLICITY
431 485
432 struct ev_loop 486 struct ev_loop
… …
517 } 571 }
518} 572}
519 573
520/*****************************************************************************/ 574/*****************************************************************************/
521 575
576#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
577
522int inline_size 578int inline_size
523array_nextsize (int elem, int cur, int cnt) 579array_nextsize (int elem, int cur, int cnt)
524{ 580{
525 int ncur = cur + 1; 581 int ncur = cur + 1;
526 582
527 do 583 do
528 ncur <<= 1; 584 ncur <<= 1;
529 while (cnt > ncur); 585 while (cnt > ncur);
530 586
531 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 587 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
532 if (elem * ncur > 4096) 588 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
533 { 589 {
534 ncur *= elem; 590 ncur *= elem;
535 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 591 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
536 ncur = ncur - sizeof (void *) * 4; 592 ncur = ncur - sizeof (void *) * 4;
537 ncur /= elem; 593 ncur /= elem;
538 } 594 }
539 595
540 return ncur; 596 return ncur;
… …
754 } 810 }
755} 811}
756 812
757/*****************************************************************************/ 813/*****************************************************************************/
758 814
815/*
816 * the heap functions want a real array index. array index 0 uis guaranteed to not
817 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
818 * the branching factor of the d-tree.
819 */
820
821/*
822 * at the moment we allow libev the luxury of two heaps,
823 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
824 * which is more cache-efficient.
825 * the difference is about 5% with 50000+ watchers.
826 */
827#if EV_USE_4HEAP
828
829#define DHEAP 4
830#define HEAP0 (DHEAP - 1) /* index of first element in heap */
831#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
832#define UPHEAP_DONE(p,k) ((p) == (k))
833
834/* away from the root */
759void inline_speed 835void inline_speed
760upheap (WT *heap, int k) 836downheap (ANHE *heap, int N, int k)
761{ 837{
762 WT w = heap [k]; 838 ANHE he = heap [k];
839 ANHE *E = heap + N + HEAP0;
763 840
764 while (k) 841 for (;;)
765 { 842 {
766 int p = (k - 1) >> 1; 843 ev_tstamp minat;
844 ANHE *minpos;
845 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
767 846
768 if (heap [p]->at <= w->at) 847 /* find minimum child */
848 if (expect_true (pos + DHEAP - 1 < E))
849 {
850 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
851 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
852 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
853 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
854 }
855 else if (pos < E)
856 {
857 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
858 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
859 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
860 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
861 }
862 else
769 break; 863 break;
770 864
865 if (ANHE_at (he) <= minat)
866 break;
867
868 heap [k] = *minpos;
869 ev_active (ANHE_w (*minpos)) = k;
870
871 k = minpos - heap;
872 }
873
874 heap [k] = he;
875 ev_active (ANHE_w (he)) = k;
876}
877
878#else /* 4HEAP */
879
880#define HEAP0 1
881#define HPARENT(k) ((k) >> 1)
882#define UPHEAP_DONE(p,k) (!(p))
883
884/* away from the root */
885void inline_speed
886downheap (ANHE *heap, int N, int k)
887{
888 ANHE he = heap [k];
889
890 for (;;)
891 {
892 int c = k << 1;
893
894 if (c > N + HEAP0 - 1)
895 break;
896
897 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
898 ? 1 : 0;
899
900 if (ANHE_at (he) <= ANHE_at (heap [c]))
901 break;
902
903 heap [k] = heap [c];
904 ev_active (ANHE_w (heap [k])) = k;
905
906 k = c;
907 }
908
909 heap [k] = he;
910 ev_active (ANHE_w (he)) = k;
911}
912#endif
913
914/* towards the root */
915void inline_speed
916upheap (ANHE *heap, int k)
917{
918 ANHE he = heap [k];
919
920 for (;;)
921 {
922 int p = HPARENT (k);
923
924 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
925 break;
926
771 heap [k] = heap [p]; 927 heap [k] = heap [p];
772 ((W)heap [k])->active = k + 1; 928 ev_active (ANHE_w (heap [k])) = k;
773 k = p; 929 k = p;
774 } 930 }
775 931
776 heap [k] = w; 932 heap [k] = he;
777 ((W)heap [k])->active = k + 1; 933 ev_active (ANHE_w (he)) = k;
778}
779
780void inline_speed
781downheap (WT *heap, int N, int k)
782{
783 WT w = heap [k];
784
785 for (;;)
786 {
787 int c = (k << 1) + 1;
788
789 if (c >= N)
790 break;
791
792 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
793 ? 1 : 0;
794
795 if (w->at <= heap [c]->at)
796 break;
797
798 heap [k] = heap [c];
799 ((W)heap [k])->active = k + 1;
800
801 k = c;
802 }
803
804 heap [k] = w;
805 ((W)heap [k])->active = k + 1;
806} 934}
807 935
808void inline_size 936void inline_size
809adjustheap (WT *heap, int N, int k) 937adjustheap (ANHE *heap, int N, int k)
810{ 938{
939 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
811 upheap (heap, k); 940 upheap (heap, k);
941 else
812 downheap (heap, N, k); 942 downheap (heap, N, k);
943}
944
945/* rebuild the heap: this function is used only once and executed rarely */
946void inline_size
947reheap (ANHE *heap, int N)
948{
949 int i;
950
951 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
952 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
953 for (i = 0; i < N; ++i)
954 upheap (heap, i + HEAP0);
813} 955}
814 956
815/*****************************************************************************/ 957/*****************************************************************************/
816 958
817typedef struct 959typedef struct
… …
906pipecb (EV_P_ ev_io *iow, int revents) 1048pipecb (EV_P_ ev_io *iow, int revents)
907{ 1049{
908#if EV_USE_EVENTFD 1050#if EV_USE_EVENTFD
909 if (evfd >= 0) 1051 if (evfd >= 0)
910 { 1052 {
911 uint64_t counter = 1; 1053 uint64_t counter;
912 read (evfd, &counter, sizeof (uint64_t)); 1054 read (evfd, &counter, sizeof (uint64_t));
913 } 1055 }
914 else 1056 else
915#endif 1057#endif
916 { 1058 {
… …
1335 1477
1336 postfork = 0; 1478 postfork = 0;
1337} 1479}
1338 1480
1339#if EV_MULTIPLICITY 1481#if EV_MULTIPLICITY
1482
1340struct ev_loop * 1483struct ev_loop *
1341ev_loop_new (unsigned int flags) 1484ev_loop_new (unsigned int flags)
1342{ 1485{
1343 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1486 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1344 1487
… …
1363ev_loop_fork (EV_P) 1506ev_loop_fork (EV_P)
1364{ 1507{
1365 postfork = 1; /* must be in line with ev_default_fork */ 1508 postfork = 1; /* must be in line with ev_default_fork */
1366} 1509}
1367 1510
1511#if EV_VERIFY
1512void noinline
1513verify_watcher (EV_P_ W w)
1514{
1515 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1516
1517 if (w->pending)
1518 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1519}
1520
1521static void noinline
1522verify_heap (EV_P_ ANHE *heap, int N)
1523{
1524 int i;
1525
1526 for (i = HEAP0; i < N + HEAP0; ++i)
1527 {
1528 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1529 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1530 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1531
1532 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1533 }
1534}
1535
1536static void noinline
1537array_verify (EV_P_ W *ws, int cnt)
1538{
1539 while (cnt--)
1540 {
1541 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1542 verify_watcher (EV_A_ ws [cnt]);
1543 }
1544}
1545#endif
1546
1547void
1548ev_loop_verify (EV_P)
1549{
1550#if EV_VERIFY
1551 int i;
1552 WL w;
1553
1554 assert (activecnt >= -1);
1555
1556 assert (fdchangemax >= fdchangecnt);
1557 for (i = 0; i < fdchangecnt; ++i)
1558 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1559
1560 assert (anfdmax >= 0);
1561 for (i = 0; i < anfdmax; ++i)
1562 for (w = anfds [i].head; w; w = w->next)
1563 {
1564 verify_watcher (EV_A_ (W)w);
1565 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1566 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1567 }
1568
1569 assert (timermax >= timercnt);
1570 verify_heap (EV_A_ timers, timercnt);
1571
1572#if EV_PERIODIC_ENABLE
1573 assert (periodicmax >= periodiccnt);
1574 verify_heap (EV_A_ periodics, periodiccnt);
1575#endif
1576
1577 for (i = NUMPRI; i--; )
1578 {
1579 assert (pendingmax [i] >= pendingcnt [i]);
1580#if EV_IDLE_ENABLE
1581 assert (idleall >= 0);
1582 assert (idlemax [i] >= idlecnt [i]);
1583 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1584#endif
1585 }
1586
1587#if EV_FORK_ENABLE
1588 assert (forkmax >= forkcnt);
1589 array_verify (EV_A_ (W *)forks, forkcnt);
1590#endif
1591
1592#if EV_ASYNC_ENABLE
1593 assert (asyncmax >= asynccnt);
1594 array_verify (EV_A_ (W *)asyncs, asynccnt);
1595#endif
1596
1597 assert (preparemax >= preparecnt);
1598 array_verify (EV_A_ (W *)prepares, preparecnt);
1599
1600 assert (checkmax >= checkcnt);
1601 array_verify (EV_A_ (W *)checks, checkcnt);
1602
1603# if 0
1604 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1605 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1368#endif 1606# endif
1607#endif
1608}
1609
1610#endif /* multiplicity */
1369 1611
1370#if EV_MULTIPLICITY 1612#if EV_MULTIPLICITY
1371struct ev_loop * 1613struct ev_loop *
1372ev_default_loop_init (unsigned int flags) 1614ev_default_loop_init (unsigned int flags)
1373#else 1615#else
… …
1449 { 1691 {
1450 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1692 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1451 1693
1452 p->w->pending = 0; 1694 p->w->pending = 0;
1453 EV_CB_INVOKE (p->w, p->events); 1695 EV_CB_INVOKE (p->w, p->events);
1696 EV_FREQUENT_CHECK;
1454 } 1697 }
1455 } 1698 }
1456} 1699}
1457
1458void inline_size
1459timers_reify (EV_P)
1460{
1461 while (timercnt && ((WT)timers [0])->at <= mn_now)
1462 {
1463 ev_timer *w = (ev_timer *)timers [0];
1464
1465 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1466
1467 /* first reschedule or stop timer */
1468 if (w->repeat)
1469 {
1470 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1471
1472 ((WT)w)->at += w->repeat;
1473 if (((WT)w)->at < mn_now)
1474 ((WT)w)->at = mn_now;
1475
1476 downheap (timers, timercnt, 0);
1477 }
1478 else
1479 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1480
1481 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1482 }
1483}
1484
1485#if EV_PERIODIC_ENABLE
1486void inline_size
1487periodics_reify (EV_P)
1488{
1489 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1490 {
1491 ev_periodic *w = (ev_periodic *)periodics [0];
1492
1493 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1494
1495 /* first reschedule or stop timer */
1496 if (w->reschedule_cb)
1497 {
1498 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1499 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1500 downheap (periodics, periodiccnt, 0);
1501 }
1502 else if (w->interval)
1503 {
1504 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1505 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1506 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1507 downheap (periodics, periodiccnt, 0);
1508 }
1509 else
1510 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1511
1512 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1513 }
1514}
1515
1516static void noinline
1517periodics_reschedule (EV_P)
1518{
1519 int i;
1520
1521 /* adjust periodics after time jump */
1522 for (i = 0; i < periodiccnt; ++i)
1523 {
1524 ev_periodic *w = (ev_periodic *)periodics [i];
1525
1526 if (w->reschedule_cb)
1527 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1528 else if (w->interval)
1529 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1530 }
1531
1532 /* now rebuild the heap */
1533 for (i = periodiccnt >> 1; i--; )
1534 downheap (periodics, periodiccnt, i);
1535}
1536#endif
1537 1700
1538#if EV_IDLE_ENABLE 1701#if EV_IDLE_ENABLE
1539void inline_size 1702void inline_size
1540idle_reify (EV_P) 1703idle_reify (EV_P)
1541{ 1704{
… …
1553 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1716 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1554 break; 1717 break;
1555 } 1718 }
1556 } 1719 }
1557 } 1720 }
1721}
1722#endif
1723
1724void inline_size
1725timers_reify (EV_P)
1726{
1727 EV_FREQUENT_CHECK;
1728
1729 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1730 {
1731 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1732
1733 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1734
1735 /* first reschedule or stop timer */
1736 if (w->repeat)
1737 {
1738 ev_at (w) += w->repeat;
1739 if (ev_at (w) < mn_now)
1740 ev_at (w) = mn_now;
1741
1742 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1743
1744 ANHE_at_cache (timers [HEAP0]);
1745 downheap (timers, timercnt, HEAP0);
1746 }
1747 else
1748 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1749
1750 EV_FREQUENT_CHECK;
1751 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1752 }
1753}
1754
1755#if EV_PERIODIC_ENABLE
1756void inline_size
1757periodics_reify (EV_P)
1758{
1759 EV_FREQUENT_CHECK;
1760
1761 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1762 {
1763 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1764
1765 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1766
1767 /* first reschedule or stop timer */
1768 if (w->reschedule_cb)
1769 {
1770 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1771
1772 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1773
1774 ANHE_at_cache (periodics [HEAP0]);
1775 downheap (periodics, periodiccnt, HEAP0);
1776 }
1777 else if (w->interval)
1778 {
1779 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1780 /* if next trigger time is not sufficiently in the future, put it there */
1781 /* this might happen because of floating point inexactness */
1782 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1783 {
1784 ev_at (w) += w->interval;
1785
1786 /* if interval is unreasonably low we might still have a time in the past */
1787 /* so correct this. this will make the periodic very inexact, but the user */
1788 /* has effectively asked to get triggered more often than possible */
1789 if (ev_at (w) < ev_rt_now)
1790 ev_at (w) = ev_rt_now;
1791 }
1792
1793 ANHE_at_cache (periodics [HEAP0]);
1794 downheap (periodics, periodiccnt, HEAP0);
1795 }
1796 else
1797 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1798
1799 EV_FREQUENT_CHECK;
1800 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1801 }
1802}
1803
1804static void noinline
1805periodics_reschedule (EV_P)
1806{
1807 int i;
1808
1809 /* adjust periodics after time jump */
1810 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1811 {
1812 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1813
1814 if (w->reschedule_cb)
1815 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1816 else if (w->interval)
1817 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1818
1819 ANHE_at_cache (periodics [i]);
1820 }
1821
1822 reheap (periodics, periodiccnt);
1558} 1823}
1559#endif 1824#endif
1560 1825
1561void inline_speed 1826void inline_speed
1562time_update (EV_P_ ev_tstamp max_block) 1827time_update (EV_P_ ev_tstamp max_block)
… …
1591 */ 1856 */
1592 for (i = 4; --i; ) 1857 for (i = 4; --i; )
1593 { 1858 {
1594 rtmn_diff = ev_rt_now - mn_now; 1859 rtmn_diff = ev_rt_now - mn_now;
1595 1860
1596 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1861 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1597 return; /* all is well */ 1862 return; /* all is well */
1598 1863
1599 ev_rt_now = ev_time (); 1864 ev_rt_now = ev_time ();
1600 mn_now = get_clock (); 1865 mn_now = get_clock ();
1601 now_floor = mn_now; 1866 now_floor = mn_now;
… …
1617#if EV_PERIODIC_ENABLE 1882#if EV_PERIODIC_ENABLE
1618 periodics_reschedule (EV_A); 1883 periodics_reschedule (EV_A);
1619#endif 1884#endif
1620 /* adjust timers. this is easy, as the offset is the same for all of them */ 1885 /* adjust timers. this is easy, as the offset is the same for all of them */
1621 for (i = 0; i < timercnt; ++i) 1886 for (i = 0; i < timercnt; ++i)
1887 {
1888 ANHE *he = timers + i + HEAP0;
1622 ((WT)timers [i])->at += ev_rt_now - mn_now; 1889 ANHE_w (*he)->at += ev_rt_now - mn_now;
1890 ANHE_at_cache (*he);
1891 }
1623 } 1892 }
1624 1893
1625 mn_now = ev_rt_now; 1894 mn_now = ev_rt_now;
1626 } 1895 }
1627} 1896}
… …
1647 1916
1648 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1917 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1649 1918
1650 do 1919 do
1651 { 1920 {
1921#if EV_VERIFY >= 2
1922 ev_loop_verify (EV_A);
1923#endif
1924
1652#ifndef _WIN32 1925#ifndef _WIN32
1653 if (expect_false (curpid)) /* penalise the forking check even more */ 1926 if (expect_false (curpid)) /* penalise the forking check even more */
1654 if (expect_false (getpid () != curpid)) 1927 if (expect_false (getpid () != curpid))
1655 { 1928 {
1656 curpid = getpid (); 1929 curpid = getpid ();
… …
1697 1970
1698 waittime = MAX_BLOCKTIME; 1971 waittime = MAX_BLOCKTIME;
1699 1972
1700 if (timercnt) 1973 if (timercnt)
1701 { 1974 {
1702 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1975 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1703 if (waittime > to) waittime = to; 1976 if (waittime > to) waittime = to;
1704 } 1977 }
1705 1978
1706#if EV_PERIODIC_ENABLE 1979#if EV_PERIODIC_ENABLE
1707 if (periodiccnt) 1980 if (periodiccnt)
1708 { 1981 {
1709 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1982 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1710 if (waittime > to) waittime = to; 1983 if (waittime > to) waittime = to;
1711 } 1984 }
1712#endif 1985#endif
1713 1986
1714 if (expect_false (waittime < timeout_blocktime)) 1987 if (expect_false (waittime < timeout_blocktime))
… …
1851 if (expect_false (ev_is_active (w))) 2124 if (expect_false (ev_is_active (w)))
1852 return; 2125 return;
1853 2126
1854 assert (("ev_io_start called with negative fd", fd >= 0)); 2127 assert (("ev_io_start called with negative fd", fd >= 0));
1855 2128
2129 EV_FREQUENT_CHECK;
2130
1856 ev_start (EV_A_ (W)w, 1); 2131 ev_start (EV_A_ (W)w, 1);
1857 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2132 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1858 wlist_add (&anfds[fd].head, (WL)w); 2133 wlist_add (&anfds[fd].head, (WL)w);
1859 2134
1860 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2135 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1861 w->events &= ~EV_IOFDSET; 2136 w->events &= ~EV_IOFDSET;
2137
2138 EV_FREQUENT_CHECK;
1862} 2139}
1863 2140
1864void noinline 2141void noinline
1865ev_io_stop (EV_P_ ev_io *w) 2142ev_io_stop (EV_P_ ev_io *w)
1866{ 2143{
1867 clear_pending (EV_A_ (W)w); 2144 clear_pending (EV_A_ (W)w);
1868 if (expect_false (!ev_is_active (w))) 2145 if (expect_false (!ev_is_active (w)))
1869 return; 2146 return;
1870 2147
1871 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2148 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2149
2150 EV_FREQUENT_CHECK;
1872 2151
1873 wlist_del (&anfds[w->fd].head, (WL)w); 2152 wlist_del (&anfds[w->fd].head, (WL)w);
1874 ev_stop (EV_A_ (W)w); 2153 ev_stop (EV_A_ (W)w);
1875 2154
1876 fd_change (EV_A_ w->fd, 1); 2155 fd_change (EV_A_ w->fd, 1);
2156
2157 EV_FREQUENT_CHECK;
1877} 2158}
1878 2159
1879void noinline 2160void noinline
1880ev_timer_start (EV_P_ ev_timer *w) 2161ev_timer_start (EV_P_ ev_timer *w)
1881{ 2162{
1882 if (expect_false (ev_is_active (w))) 2163 if (expect_false (ev_is_active (w)))
1883 return; 2164 return;
1884 2165
1885 ((WT)w)->at += mn_now; 2166 ev_at (w) += mn_now;
1886 2167
1887 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2168 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1888 2169
2170 EV_FREQUENT_CHECK;
2171
2172 ++timercnt;
1889 ev_start (EV_A_ (W)w, ++timercnt); 2173 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
1890 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 2174 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1891 timers [timercnt - 1] = (WT)w; 2175 ANHE_w (timers [ev_active (w)]) = (WT)w;
1892 upheap (timers, timercnt - 1); 2176 ANHE_at_cache (timers [ev_active (w)]);
2177 upheap (timers, ev_active (w));
1893 2178
2179 EV_FREQUENT_CHECK;
2180
1894 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 2181 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1895} 2182}
1896 2183
1897void noinline 2184void noinline
1898ev_timer_stop (EV_P_ ev_timer *w) 2185ev_timer_stop (EV_P_ ev_timer *w)
1899{ 2186{
1900 clear_pending (EV_A_ (W)w); 2187 clear_pending (EV_A_ (W)w);
1901 if (expect_false (!ev_is_active (w))) 2188 if (expect_false (!ev_is_active (w)))
1902 return; 2189 return;
1903 2190
1904 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w)); 2191 EV_FREQUENT_CHECK;
1905 2192
1906 { 2193 {
1907 int active = ((W)w)->active; 2194 int active = ev_active (w);
1908 2195
2196 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2197
2198 --timercnt;
2199
1909 if (expect_true (--active < --timercnt)) 2200 if (expect_true (active < timercnt + HEAP0))
1910 { 2201 {
1911 timers [active] = timers [timercnt]; 2202 timers [active] = timers [timercnt + HEAP0];
1912 adjustheap (timers, timercnt, active); 2203 adjustheap (timers, timercnt, active);
1913 } 2204 }
1914 } 2205 }
1915 2206
1916 ((WT)w)->at -= mn_now; 2207 EV_FREQUENT_CHECK;
2208
2209 ev_at (w) -= mn_now;
1917 2210
1918 ev_stop (EV_A_ (W)w); 2211 ev_stop (EV_A_ (W)w);
1919} 2212}
1920 2213
1921void noinline 2214void noinline
1922ev_timer_again (EV_P_ ev_timer *w) 2215ev_timer_again (EV_P_ ev_timer *w)
1923{ 2216{
2217 EV_FREQUENT_CHECK;
2218
1924 if (ev_is_active (w)) 2219 if (ev_is_active (w))
1925 { 2220 {
1926 if (w->repeat) 2221 if (w->repeat)
1927 { 2222 {
1928 ((WT)w)->at = mn_now + w->repeat; 2223 ev_at (w) = mn_now + w->repeat;
2224 ANHE_at_cache (timers [ev_active (w)]);
1929 adjustheap (timers, timercnt, ((W)w)->active - 1); 2225 adjustheap (timers, timercnt, ev_active (w));
1930 } 2226 }
1931 else 2227 else
1932 ev_timer_stop (EV_A_ w); 2228 ev_timer_stop (EV_A_ w);
1933 } 2229 }
1934 else if (w->repeat) 2230 else if (w->repeat)
1935 { 2231 {
1936 w->at = w->repeat; 2232 ev_at (w) = w->repeat;
1937 ev_timer_start (EV_A_ w); 2233 ev_timer_start (EV_A_ w);
1938 } 2234 }
2235
2236 EV_FREQUENT_CHECK;
1939} 2237}
1940 2238
1941#if EV_PERIODIC_ENABLE 2239#if EV_PERIODIC_ENABLE
1942void noinline 2240void noinline
1943ev_periodic_start (EV_P_ ev_periodic *w) 2241ev_periodic_start (EV_P_ ev_periodic *w)
1944{ 2242{
1945 if (expect_false (ev_is_active (w))) 2243 if (expect_false (ev_is_active (w)))
1946 return; 2244 return;
1947 2245
1948 if (w->reschedule_cb) 2246 if (w->reschedule_cb)
1949 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2247 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1950 else if (w->interval) 2248 else if (w->interval)
1951 { 2249 {
1952 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2250 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1953 /* this formula differs from the one in periodic_reify because we do not always round up */ 2251 /* this formula differs from the one in periodic_reify because we do not always round up */
1954 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2252 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1955 } 2253 }
1956 else 2254 else
1957 ((WT)w)->at = w->offset; 2255 ev_at (w) = w->offset;
1958 2256
2257 EV_FREQUENT_CHECK;
2258
2259 ++periodiccnt;
1959 ev_start (EV_A_ (W)w, ++periodiccnt); 2260 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
1960 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2261 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1961 periodics [periodiccnt - 1] = (WT)w; 2262 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1962 upheap (periodics, periodiccnt - 1); 2263 ANHE_at_cache (periodics [ev_active (w)]);
2264 upheap (periodics, ev_active (w));
1963 2265
2266 EV_FREQUENT_CHECK;
2267
1964 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2268 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
1965} 2269}
1966 2270
1967void noinline 2271void noinline
1968ev_periodic_stop (EV_P_ ev_periodic *w) 2272ev_periodic_stop (EV_P_ ev_periodic *w)
1969{ 2273{
1970 clear_pending (EV_A_ (W)w); 2274 clear_pending (EV_A_ (W)w);
1971 if (expect_false (!ev_is_active (w))) 2275 if (expect_false (!ev_is_active (w)))
1972 return; 2276 return;
1973 2277
1974 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w)); 2278 EV_FREQUENT_CHECK;
1975 2279
1976 { 2280 {
1977 int active = ((W)w)->active; 2281 int active = ev_active (w);
1978 2282
2283 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2284
2285 --periodiccnt;
2286
1979 if (expect_true (--active < --periodiccnt)) 2287 if (expect_true (active < periodiccnt + HEAP0))
1980 { 2288 {
1981 periodics [active] = periodics [periodiccnt]; 2289 periodics [active] = periodics [periodiccnt + HEAP0];
1982 adjustheap (periodics, periodiccnt, active); 2290 adjustheap (periodics, periodiccnt, active);
1983 } 2291 }
1984 } 2292 }
1985 2293
2294 EV_FREQUENT_CHECK;
2295
1986 ev_stop (EV_A_ (W)w); 2296 ev_stop (EV_A_ (W)w);
1987} 2297}
1988 2298
1989void noinline 2299void noinline
1990ev_periodic_again (EV_P_ ev_periodic *w) 2300ev_periodic_again (EV_P_ ev_periodic *w)
… …
2009 return; 2319 return;
2010 2320
2011 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2321 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2012 2322
2013 evpipe_init (EV_A); 2323 evpipe_init (EV_A);
2324
2325 EV_FREQUENT_CHECK;
2014 2326
2015 { 2327 {
2016#ifndef _WIN32 2328#ifndef _WIN32
2017 sigset_t full, prev; 2329 sigset_t full, prev;
2018 sigfillset (&full); 2330 sigfillset (&full);
… …
2039 sigfillset (&sa.sa_mask); 2351 sigfillset (&sa.sa_mask);
2040 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2352 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2041 sigaction (w->signum, &sa, 0); 2353 sigaction (w->signum, &sa, 0);
2042#endif 2354#endif
2043 } 2355 }
2356
2357 EV_FREQUENT_CHECK;
2044} 2358}
2045 2359
2046void noinline 2360void noinline
2047ev_signal_stop (EV_P_ ev_signal *w) 2361ev_signal_stop (EV_P_ ev_signal *w)
2048{ 2362{
2049 clear_pending (EV_A_ (W)w); 2363 clear_pending (EV_A_ (W)w);
2050 if (expect_false (!ev_is_active (w))) 2364 if (expect_false (!ev_is_active (w)))
2051 return; 2365 return;
2052 2366
2367 EV_FREQUENT_CHECK;
2368
2053 wlist_del (&signals [w->signum - 1].head, (WL)w); 2369 wlist_del (&signals [w->signum - 1].head, (WL)w);
2054 ev_stop (EV_A_ (W)w); 2370 ev_stop (EV_A_ (W)w);
2055 2371
2056 if (!signals [w->signum - 1].head) 2372 if (!signals [w->signum - 1].head)
2057 signal (w->signum, SIG_DFL); 2373 signal (w->signum, SIG_DFL);
2374
2375 EV_FREQUENT_CHECK;
2058} 2376}
2059 2377
2060void 2378void
2061ev_child_start (EV_P_ ev_child *w) 2379ev_child_start (EV_P_ ev_child *w)
2062{ 2380{
… …
2064 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2382 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2065#endif 2383#endif
2066 if (expect_false (ev_is_active (w))) 2384 if (expect_false (ev_is_active (w)))
2067 return; 2385 return;
2068 2386
2387 EV_FREQUENT_CHECK;
2388
2069 ev_start (EV_A_ (W)w, 1); 2389 ev_start (EV_A_ (W)w, 1);
2070 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2390 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2391
2392 EV_FREQUENT_CHECK;
2071} 2393}
2072 2394
2073void 2395void
2074ev_child_stop (EV_P_ ev_child *w) 2396ev_child_stop (EV_P_ ev_child *w)
2075{ 2397{
2076 clear_pending (EV_A_ (W)w); 2398 clear_pending (EV_A_ (W)w);
2077 if (expect_false (!ev_is_active (w))) 2399 if (expect_false (!ev_is_active (w)))
2078 return; 2400 return;
2079 2401
2402 EV_FREQUENT_CHECK;
2403
2080 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2404 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2081 ev_stop (EV_A_ (W)w); 2405 ev_stop (EV_A_ (W)w);
2406
2407 EV_FREQUENT_CHECK;
2082} 2408}
2083 2409
2084#if EV_STAT_ENABLE 2410#if EV_STAT_ENABLE
2085 2411
2086# ifdef _WIN32 2412# ifdef _WIN32
… …
2104 if (w->wd < 0) 2430 if (w->wd < 0)
2105 { 2431 {
2106 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2432 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2107 2433
2108 /* monitor some parent directory for speedup hints */ 2434 /* monitor some parent directory for speedup hints */
2435 /* note that exceeding the hardcoded limit is not a correctness issue, */
2436 /* but an efficiency issue only */
2109 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2437 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2110 { 2438 {
2111 char path [4096]; 2439 char path [4096];
2112 strcpy (path, w->path); 2440 strcpy (path, w->path);
2113 2441
… …
2312 else 2640 else
2313#endif 2641#endif
2314 ev_timer_start (EV_A_ &w->timer); 2642 ev_timer_start (EV_A_ &w->timer);
2315 2643
2316 ev_start (EV_A_ (W)w, 1); 2644 ev_start (EV_A_ (W)w, 1);
2645
2646 EV_FREQUENT_CHECK;
2317} 2647}
2318 2648
2319void 2649void
2320ev_stat_stop (EV_P_ ev_stat *w) 2650ev_stat_stop (EV_P_ ev_stat *w)
2321{ 2651{
2322 clear_pending (EV_A_ (W)w); 2652 clear_pending (EV_A_ (W)w);
2323 if (expect_false (!ev_is_active (w))) 2653 if (expect_false (!ev_is_active (w)))
2324 return; 2654 return;
2325 2655
2656 EV_FREQUENT_CHECK;
2657
2326#if EV_USE_INOTIFY 2658#if EV_USE_INOTIFY
2327 infy_del (EV_A_ w); 2659 infy_del (EV_A_ w);
2328#endif 2660#endif
2329 ev_timer_stop (EV_A_ &w->timer); 2661 ev_timer_stop (EV_A_ &w->timer);
2330 2662
2331 ev_stop (EV_A_ (W)w); 2663 ev_stop (EV_A_ (W)w);
2664
2665 EV_FREQUENT_CHECK;
2332} 2666}
2333#endif 2667#endif
2334 2668
2335#if EV_IDLE_ENABLE 2669#if EV_IDLE_ENABLE
2336void 2670void
… …
2338{ 2672{
2339 if (expect_false (ev_is_active (w))) 2673 if (expect_false (ev_is_active (w)))
2340 return; 2674 return;
2341 2675
2342 pri_adjust (EV_A_ (W)w); 2676 pri_adjust (EV_A_ (W)w);
2677
2678 EV_FREQUENT_CHECK;
2343 2679
2344 { 2680 {
2345 int active = ++idlecnt [ABSPRI (w)]; 2681 int active = ++idlecnt [ABSPRI (w)];
2346 2682
2347 ++idleall; 2683 ++idleall;
2348 ev_start (EV_A_ (W)w, active); 2684 ev_start (EV_A_ (W)w, active);
2349 2685
2350 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 2686 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2351 idles [ABSPRI (w)][active - 1] = w; 2687 idles [ABSPRI (w)][active - 1] = w;
2352 } 2688 }
2689
2690 EV_FREQUENT_CHECK;
2353} 2691}
2354 2692
2355void 2693void
2356ev_idle_stop (EV_P_ ev_idle *w) 2694ev_idle_stop (EV_P_ ev_idle *w)
2357{ 2695{
2358 clear_pending (EV_A_ (W)w); 2696 clear_pending (EV_A_ (W)w);
2359 if (expect_false (!ev_is_active (w))) 2697 if (expect_false (!ev_is_active (w)))
2360 return; 2698 return;
2361 2699
2700 EV_FREQUENT_CHECK;
2701
2362 { 2702 {
2363 int active = ((W)w)->active; 2703 int active = ev_active (w);
2364 2704
2365 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2705 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2366 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2706 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2367 2707
2368 ev_stop (EV_A_ (W)w); 2708 ev_stop (EV_A_ (W)w);
2369 --idleall; 2709 --idleall;
2370 } 2710 }
2711
2712 EV_FREQUENT_CHECK;
2371} 2713}
2372#endif 2714#endif
2373 2715
2374void 2716void
2375ev_prepare_start (EV_P_ ev_prepare *w) 2717ev_prepare_start (EV_P_ ev_prepare *w)
2376{ 2718{
2377 if (expect_false (ev_is_active (w))) 2719 if (expect_false (ev_is_active (w)))
2378 return; 2720 return;
2721
2722 EV_FREQUENT_CHECK;
2379 2723
2380 ev_start (EV_A_ (W)w, ++preparecnt); 2724 ev_start (EV_A_ (W)w, ++preparecnt);
2381 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2725 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2382 prepares [preparecnt - 1] = w; 2726 prepares [preparecnt - 1] = w;
2727
2728 EV_FREQUENT_CHECK;
2383} 2729}
2384 2730
2385void 2731void
2386ev_prepare_stop (EV_P_ ev_prepare *w) 2732ev_prepare_stop (EV_P_ ev_prepare *w)
2387{ 2733{
2388 clear_pending (EV_A_ (W)w); 2734 clear_pending (EV_A_ (W)w);
2389 if (expect_false (!ev_is_active (w))) 2735 if (expect_false (!ev_is_active (w)))
2390 return; 2736 return;
2391 2737
2738 EV_FREQUENT_CHECK;
2739
2392 { 2740 {
2393 int active = ((W)w)->active; 2741 int active = ev_active (w);
2742
2394 prepares [active - 1] = prepares [--preparecnt]; 2743 prepares [active - 1] = prepares [--preparecnt];
2395 ((W)prepares [active - 1])->active = active; 2744 ev_active (prepares [active - 1]) = active;
2396 } 2745 }
2397 2746
2398 ev_stop (EV_A_ (W)w); 2747 ev_stop (EV_A_ (W)w);
2748
2749 EV_FREQUENT_CHECK;
2399} 2750}
2400 2751
2401void 2752void
2402ev_check_start (EV_P_ ev_check *w) 2753ev_check_start (EV_P_ ev_check *w)
2403{ 2754{
2404 if (expect_false (ev_is_active (w))) 2755 if (expect_false (ev_is_active (w)))
2405 return; 2756 return;
2757
2758 EV_FREQUENT_CHECK;
2406 2759
2407 ev_start (EV_A_ (W)w, ++checkcnt); 2760 ev_start (EV_A_ (W)w, ++checkcnt);
2408 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2761 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2409 checks [checkcnt - 1] = w; 2762 checks [checkcnt - 1] = w;
2763
2764 EV_FREQUENT_CHECK;
2410} 2765}
2411 2766
2412void 2767void
2413ev_check_stop (EV_P_ ev_check *w) 2768ev_check_stop (EV_P_ ev_check *w)
2414{ 2769{
2415 clear_pending (EV_A_ (W)w); 2770 clear_pending (EV_A_ (W)w);
2416 if (expect_false (!ev_is_active (w))) 2771 if (expect_false (!ev_is_active (w)))
2417 return; 2772 return;
2418 2773
2774 EV_FREQUENT_CHECK;
2775
2419 { 2776 {
2420 int active = ((W)w)->active; 2777 int active = ev_active (w);
2778
2421 checks [active - 1] = checks [--checkcnt]; 2779 checks [active - 1] = checks [--checkcnt];
2422 ((W)checks [active - 1])->active = active; 2780 ev_active (checks [active - 1]) = active;
2423 } 2781 }
2424 2782
2425 ev_stop (EV_A_ (W)w); 2783 ev_stop (EV_A_ (W)w);
2784
2785 EV_FREQUENT_CHECK;
2426} 2786}
2427 2787
2428#if EV_EMBED_ENABLE 2788#if EV_EMBED_ENABLE
2429void noinline 2789void noinline
2430ev_embed_sweep (EV_P_ ev_embed *w) 2790ev_embed_sweep (EV_P_ ev_embed *w)
… …
2477 struct ev_loop *loop = w->other; 2837 struct ev_loop *loop = w->other;
2478 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2838 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2479 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2839 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2480 } 2840 }
2481 2841
2842 EV_FREQUENT_CHECK;
2843
2482 ev_set_priority (&w->io, ev_priority (w)); 2844 ev_set_priority (&w->io, ev_priority (w));
2483 ev_io_start (EV_A_ &w->io); 2845 ev_io_start (EV_A_ &w->io);
2484 2846
2485 ev_prepare_init (&w->prepare, embed_prepare_cb); 2847 ev_prepare_init (&w->prepare, embed_prepare_cb);
2486 ev_set_priority (&w->prepare, EV_MINPRI); 2848 ev_set_priority (&w->prepare, EV_MINPRI);
2487 ev_prepare_start (EV_A_ &w->prepare); 2849 ev_prepare_start (EV_A_ &w->prepare);
2488 2850
2489 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2851 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2490 2852
2491 ev_start (EV_A_ (W)w, 1); 2853 ev_start (EV_A_ (W)w, 1);
2854
2855 EV_FREQUENT_CHECK;
2492} 2856}
2493 2857
2494void 2858void
2495ev_embed_stop (EV_P_ ev_embed *w) 2859ev_embed_stop (EV_P_ ev_embed *w)
2496{ 2860{
2497 clear_pending (EV_A_ (W)w); 2861 clear_pending (EV_A_ (W)w);
2498 if (expect_false (!ev_is_active (w))) 2862 if (expect_false (!ev_is_active (w)))
2499 return; 2863 return;
2500 2864
2865 EV_FREQUENT_CHECK;
2866
2501 ev_io_stop (EV_A_ &w->io); 2867 ev_io_stop (EV_A_ &w->io);
2502 ev_prepare_stop (EV_A_ &w->prepare); 2868 ev_prepare_stop (EV_A_ &w->prepare);
2503 2869
2504 ev_stop (EV_A_ (W)w); 2870 ev_stop (EV_A_ (W)w);
2871
2872 EV_FREQUENT_CHECK;
2505} 2873}
2506#endif 2874#endif
2507 2875
2508#if EV_FORK_ENABLE 2876#if EV_FORK_ENABLE
2509void 2877void
2510ev_fork_start (EV_P_ ev_fork *w) 2878ev_fork_start (EV_P_ ev_fork *w)
2511{ 2879{
2512 if (expect_false (ev_is_active (w))) 2880 if (expect_false (ev_is_active (w)))
2513 return; 2881 return;
2882
2883 EV_FREQUENT_CHECK;
2514 2884
2515 ev_start (EV_A_ (W)w, ++forkcnt); 2885 ev_start (EV_A_ (W)w, ++forkcnt);
2516 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2886 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2517 forks [forkcnt - 1] = w; 2887 forks [forkcnt - 1] = w;
2888
2889 EV_FREQUENT_CHECK;
2518} 2890}
2519 2891
2520void 2892void
2521ev_fork_stop (EV_P_ ev_fork *w) 2893ev_fork_stop (EV_P_ ev_fork *w)
2522{ 2894{
2523 clear_pending (EV_A_ (W)w); 2895 clear_pending (EV_A_ (W)w);
2524 if (expect_false (!ev_is_active (w))) 2896 if (expect_false (!ev_is_active (w)))
2525 return; 2897 return;
2526 2898
2899 EV_FREQUENT_CHECK;
2900
2527 { 2901 {
2528 int active = ((W)w)->active; 2902 int active = ev_active (w);
2903
2529 forks [active - 1] = forks [--forkcnt]; 2904 forks [active - 1] = forks [--forkcnt];
2530 ((W)forks [active - 1])->active = active; 2905 ev_active (forks [active - 1]) = active;
2531 } 2906 }
2532 2907
2533 ev_stop (EV_A_ (W)w); 2908 ev_stop (EV_A_ (W)w);
2909
2910 EV_FREQUENT_CHECK;
2534} 2911}
2535#endif 2912#endif
2536 2913
2537#if EV_ASYNC_ENABLE 2914#if EV_ASYNC_ENABLE
2538void 2915void
… …
2540{ 2917{
2541 if (expect_false (ev_is_active (w))) 2918 if (expect_false (ev_is_active (w)))
2542 return; 2919 return;
2543 2920
2544 evpipe_init (EV_A); 2921 evpipe_init (EV_A);
2922
2923 EV_FREQUENT_CHECK;
2545 2924
2546 ev_start (EV_A_ (W)w, ++asynccnt); 2925 ev_start (EV_A_ (W)w, ++asynccnt);
2547 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2926 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2548 asyncs [asynccnt - 1] = w; 2927 asyncs [asynccnt - 1] = w;
2928
2929 EV_FREQUENT_CHECK;
2549} 2930}
2550 2931
2551void 2932void
2552ev_async_stop (EV_P_ ev_async *w) 2933ev_async_stop (EV_P_ ev_async *w)
2553{ 2934{
2554 clear_pending (EV_A_ (W)w); 2935 clear_pending (EV_A_ (W)w);
2555 if (expect_false (!ev_is_active (w))) 2936 if (expect_false (!ev_is_active (w)))
2556 return; 2937 return;
2557 2938
2939 EV_FREQUENT_CHECK;
2940
2558 { 2941 {
2559 int active = ((W)w)->active; 2942 int active = ev_active (w);
2943
2560 asyncs [active - 1] = asyncs [--asynccnt]; 2944 asyncs [active - 1] = asyncs [--asynccnt];
2561 ((W)asyncs [active - 1])->active = active; 2945 ev_active (asyncs [active - 1]) = active;
2562 } 2946 }
2563 2947
2564 ev_stop (EV_A_ (W)w); 2948 ev_stop (EV_A_ (W)w);
2949
2950 EV_FREQUENT_CHECK;
2565} 2951}
2566 2952
2567void 2953void
2568ev_async_send (EV_P_ ev_async *w) 2954ev_async_send (EV_P_ ev_async *w)
2569{ 2955{

Diff Legend

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