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

Comparing libev/ev.c (file contents):
Revision 1.224 by root, Wed Apr 9 22:07:50 2008 UTC vs.
Revision 1.249 by root, Wed May 21 23:30:52 2008 UTC

… …
235# else 235# else
236# define EV_USE_EVENTFD 0 236# define EV_USE_EVENTFD 0
237# endif 237# endif
238#endif 238#endif
239 239
240#if 0 /* debugging */
241# define EV_VERIFY 1
242# define EV_USE_4HEAP 1
243# define EV_HEAP_CACHE_AT 1
244#endif
245
246#ifndef EV_USE_4HEAP
247# define EV_USE_4HEAP !EV_MINIMAL
248#endif
249
250#ifndef EV_HEAP_CACHE_AT
251# define EV_HEAP_CACHE_AT !EV_MINIMAL
252#endif
253
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 254/* this block fixes any misconfiguration where we know we run into trouble otherwise */
241 255
242#ifndef CLOCK_MONOTONIC 256#ifndef CLOCK_MONOTONIC
243# undef EV_USE_MONOTONIC 257# undef EV_USE_MONOTONIC
244# define EV_USE_MONOTONIC 0 258# define EV_USE_MONOTONIC 0
… …
279} 293}
280# endif 294# endif
281#endif 295#endif
282 296
283/**/ 297/**/
298
299/* EV_VERIFY: enable internal consistency checks
300 * undefined or zero: no verification done or available
301 * 1 or higher: ev_loop_verify function available
302 * 2 or higher: ev_loop_verify is called frequently
303 */
304#if EV_VERIFY >= 1
305# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
306#else
307# define EV_FREQUENT_CHECK do { } while (0)
308#endif
284 309
285/* 310/*
286 * This is used to avoid floating point rounding problems. 311 * This is used to avoid floating point rounding problems.
287 * It is added to ev_rt_now when scheduling periodics 312 * It is added to ev_rt_now when scheduling periodics
288 * to ensure progress, time-wise, even when rounding 313 * to ensure progress, time-wise, even when rounding
… …
325 350
326typedef ev_watcher *W; 351typedef ev_watcher *W;
327typedef ev_watcher_list *WL; 352typedef ev_watcher_list *WL;
328typedef ev_watcher_time *WT; 353typedef ev_watcher_time *WT;
329 354
355#define ev_active(w) ((W)(w))->active
356#define ev_at(w) ((WT)(w))->at
357
330#if EV_USE_MONOTONIC 358#if EV_USE_MONOTONIC
331/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 359/* 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 */ 360/* giving it a reasonably high chance of working on typical architetcures */
333static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 361static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
334#endif 362#endif
… …
419 W w; 447 W w;
420 int events; 448 int events;
421} ANPENDING; 449} ANPENDING;
422 450
423#if EV_USE_INOTIFY 451#if EV_USE_INOTIFY
452/* hash table entry per inotify-id */
424typedef struct 453typedef struct
425{ 454{
426 WL head; 455 WL head;
427} ANFS; 456} ANFS;
457#endif
458
459/* Heap Entry */
460#if EV_HEAP_CACHE_AT
461 typedef struct {
462 ev_tstamp at;
463 WT w;
464 } ANHE;
465
466 #define ANHE_w(he) (he).w /* access watcher, read-write */
467 #define ANHE_at(he) (he).at /* access cached at, read-only */
468 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
469#else
470 typedef WT ANHE;
471
472 #define ANHE_w(he) (he)
473 #define ANHE_at(he) (he)->at
474 #define ANHE_at_cache(he)
428#endif 475#endif
429 476
430#if EV_MULTIPLICITY 477#if EV_MULTIPLICITY
431 478
432 struct ev_loop 479 struct ev_loop
… …
517 } 564 }
518} 565}
519 566
520/*****************************************************************************/ 567/*****************************************************************************/
521 568
569#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
570
522int inline_size 571int inline_size
523array_nextsize (int elem, int cur, int cnt) 572array_nextsize (int elem, int cur, int cnt)
524{ 573{
525 int ncur = cur + 1; 574 int ncur = cur + 1;
526 575
527 do 576 do
528 ncur <<= 1; 577 ncur <<= 1;
529 while (cnt > ncur); 578 while (cnt > ncur);
530 579
531 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 580 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
532 if (elem * ncur > 4096) 581 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
533 { 582 {
534 ncur *= elem; 583 ncur *= elem;
535 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 584 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
536 ncur = ncur - sizeof (void *) * 4; 585 ncur = ncur - sizeof (void *) * 4;
537 ncur /= elem; 586 ncur /= elem;
538 } 587 }
539 588
540 return ncur; 589 return ncur;
… …
754 } 803 }
755} 804}
756 805
757/*****************************************************************************/ 806/*****************************************************************************/
758 807
808/*
809 * the heap functions want a real array index. array index 0 uis guaranteed to not
810 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
811 * the branching factor of the d-tree.
812 */
813
814/*
815 * at the moment we allow libev the luxury of two heaps,
816 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
817 * which is more cache-efficient.
818 * the difference is about 5% with 50000+ watchers.
819 */
820#if EV_USE_4HEAP
821
822#define DHEAP 4
823#define HEAP0 (DHEAP - 1) /* index of first element in heap */
824#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
825#define UPHEAP_DONE(p,k) ((p) == (k))
826
827/* away from the root */
759void inline_speed 828void inline_speed
760upheap (WT *heap, int k) 829downheap (ANHE *heap, int N, int k)
761{ 830{
762 WT w = heap [k]; 831 ANHE he = heap [k];
832 ANHE *E = heap + N + HEAP0;
763 833
764 while (k) 834 for (;;)
765 { 835 {
766 int p = (k - 1) >> 1; 836 ev_tstamp minat;
837 ANHE *minpos;
838 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
767 839
768 if (heap [p]->at <= w->at) 840 /* find minimum child */
841 if (expect_true (pos + DHEAP - 1 < E))
842 {
843 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
844 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
845 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
846 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
847 }
848 else if (pos < E)
849 {
850 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
851 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
852 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
853 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
854 }
855 else
769 break; 856 break;
770 857
858 if (ANHE_at (he) <= minat)
859 break;
860
861 heap [k] = *minpos;
862 ev_active (ANHE_w (*minpos)) = k;
863
864 k = minpos - heap;
865 }
866
867 heap [k] = he;
868 ev_active (ANHE_w (he)) = k;
869}
870
871#else /* 4HEAP */
872
873#define HEAP0 1
874#define HPARENT(k) ((k) >> 1)
875#define UPHEAP_DONE(p,k) (!(p))
876
877/* away from the root */
878void inline_speed
879downheap (ANHE *heap, int N, int k)
880{
881 ANHE he = heap [k];
882
883 for (;;)
884 {
885 int c = k << 1;
886
887 if (c > N + HEAP0 - 1)
888 break;
889
890 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
891 ? 1 : 0;
892
893 if (ANHE_at (he) <= ANHE_at (heap [c]))
894 break;
895
896 heap [k] = heap [c];
897 ev_active (ANHE_w (heap [k])) = k;
898
899 k = c;
900 }
901
902 heap [k] = he;
903 ev_active (ANHE_w (he)) = k;
904}
905#endif
906
907/* towards the root */
908void inline_speed
909upheap (ANHE *heap, int k)
910{
911 ANHE he = heap [k];
912
913 for (;;)
914 {
915 int p = HPARENT (k);
916
917 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
918 break;
919
771 heap [k] = heap [p]; 920 heap [k] = heap [p];
772 ((W)heap [k])->active = k + 1; 921 ev_active (ANHE_w (heap [k])) = k;
773 k = p; 922 k = p;
774 } 923 }
775 924
776 heap [k] = w; 925 heap [k] = he;
777 ((W)heap [k])->active = k + 1; 926 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} 927}
807 928
808void inline_size 929void inline_size
809adjustheap (WT *heap, int N, int k) 930adjustheap (ANHE *heap, int N, int k)
810{ 931{
932 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
811 upheap (heap, k); 933 upheap (heap, k);
934 else
812 downheap (heap, N, k); 935 downheap (heap, N, k);
813} 936}
937
938/* rebuild the heap: this function is used only once and executed rarely */
939void inline_size
940reheap (ANHE *heap, int N)
941{
942 int i;
943 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
944 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
945 for (i = 0; i < N; ++i)
946 upheap (heap, i + HEAP0);
947}
948
949#if EV_VERIFY
950static void
951checkheap (ANHE *heap, int N)
952{
953 int i;
954
955 for (i = HEAP0; i < N + HEAP0; ++i)
956 {
957 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
958 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
959 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
960 }
961}
962#endif
814 963
815/*****************************************************************************/ 964/*****************************************************************************/
816 965
817typedef struct 966typedef struct
818{ 967{
… …
906pipecb (EV_P_ ev_io *iow, int revents) 1055pipecb (EV_P_ ev_io *iow, int revents)
907{ 1056{
908#if EV_USE_EVENTFD 1057#if EV_USE_EVENTFD
909 if (evfd >= 0) 1058 if (evfd >= 0)
910 { 1059 {
911 uint64_t counter = 1; 1060 uint64_t counter;
912 read (evfd, &counter, sizeof (uint64_t)); 1061 read (evfd, &counter, sizeof (uint64_t));
913 } 1062 }
914 else 1063 else
915#endif 1064#endif
916 { 1065 {
… …
1185 if (!(flags & EVFLAG_NOENV) 1334 if (!(flags & EVFLAG_NOENV)
1186 && !enable_secure () 1335 && !enable_secure ()
1187 && getenv ("LIBEV_FLAGS")) 1336 && getenv ("LIBEV_FLAGS"))
1188 flags = atoi (getenv ("LIBEV_FLAGS")); 1337 flags = atoi (getenv ("LIBEV_FLAGS"));
1189 1338
1190 if (!(flags & 0x0000ffffUL)) 1339 if (!(flags & 0x0000ffffU))
1191 flags |= ev_recommended_backends (); 1340 flags |= ev_recommended_backends ();
1192 1341
1193#if EV_USE_PORT 1342#if EV_USE_PORT
1194 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1343 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1195#endif 1344#endif
… …
1283#endif 1432#endif
1284 1433
1285 backend = 0; 1434 backend = 0;
1286} 1435}
1287 1436
1437#if EV_USE_INOTIFY
1288void inline_size infy_fork (EV_P); 1438void inline_size infy_fork (EV_P);
1439#endif
1289 1440
1290void inline_size 1441void inline_size
1291loop_fork (EV_P) 1442loop_fork (EV_P)
1292{ 1443{
1293#if EV_USE_PORT 1444#if EV_USE_PORT
… …
1360void 1511void
1361ev_loop_fork (EV_P) 1512ev_loop_fork (EV_P)
1362{ 1513{
1363 postfork = 1; /* must be in line with ev_default_fork */ 1514 postfork = 1; /* must be in line with ev_default_fork */
1364} 1515}
1516
1517#if EV_VERIFY
1518static void
1519array_check (W **ws, int cnt)
1520{
1521 while (cnt--)
1522 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1523}
1524
1525static void
1526ev_loop_verify (EV_P)
1527{
1528 int i;
1529
1530 checkheap (timers, timercnt);
1531#if EV_PERIODIC_ENABLE
1532 checkheap (periodics, periodiccnt);
1533#endif
1534
1535#if EV_IDLE_ENABLE
1536 for (i = NUMPRI; i--; )
1537 array_check ((W **)idles [i], idlecnt [i]);
1538#endif
1539#if EV_FORK_ENABLE
1540 array_check ((W **)forks, forkcnt);
1541#endif
1542 array_check ((W **)prepares, preparecnt);
1543 array_check ((W **)checks, checkcnt);
1544#if EV_ASYNC_ENABLE
1545 array_check ((W **)asyncs, asynccnt);
1546#endif
1547}
1548#endif
1365 1549
1366#endif 1550#endif
1367 1551
1368#if EV_MULTIPLICITY 1552#if EV_MULTIPLICITY
1369struct ev_loop * 1553struct ev_loop *
… …
1436void inline_speed 1620void inline_speed
1437call_pending (EV_P) 1621call_pending (EV_P)
1438{ 1622{
1439 int pri; 1623 int pri;
1440 1624
1625 EV_FREQUENT_CHECK;
1626
1441 for (pri = NUMPRI; pri--; ) 1627 for (pri = NUMPRI; pri--; )
1442 while (pendingcnt [pri]) 1628 while (pendingcnt [pri])
1443 { 1629 {
1444 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1630 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1445 1631
… …
1449 1635
1450 p->w->pending = 0; 1636 p->w->pending = 0;
1451 EV_CB_INVOKE (p->w, p->events); 1637 EV_CB_INVOKE (p->w, p->events);
1452 } 1638 }
1453 } 1639 }
1454}
1455 1640
1456void inline_size 1641 EV_FREQUENT_CHECK;
1457timers_reify (EV_P)
1458{
1459 while (timercnt && ((WT)timers [0])->at <= mn_now)
1460 {
1461 ev_timer *w = (ev_timer *)timers [0];
1462
1463 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1464
1465 /* first reschedule or stop timer */
1466 if (w->repeat)
1467 {
1468 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1469
1470 ((WT)w)->at += w->repeat;
1471 if (((WT)w)->at < mn_now)
1472 ((WT)w)->at = mn_now;
1473
1474 downheap (timers, timercnt, 0);
1475 }
1476 else
1477 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1478
1479 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1480 }
1481} 1642}
1482
1483#if EV_PERIODIC_ENABLE
1484void inline_size
1485periodics_reify (EV_P)
1486{
1487 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1488 {
1489 ev_periodic *w = (ev_periodic *)periodics [0];
1490
1491 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1492
1493 /* first reschedule or stop timer */
1494 if (w->reschedule_cb)
1495 {
1496 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1497 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1498 downheap (periodics, periodiccnt, 0);
1499 }
1500 else if (w->interval)
1501 {
1502 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1503 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1504 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1505 downheap (periodics, periodiccnt, 0);
1506 }
1507 else
1508 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1509
1510 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1511 }
1512}
1513
1514static void noinline
1515periodics_reschedule (EV_P)
1516{
1517 int i;
1518
1519 /* adjust periodics after time jump */
1520 for (i = 0; i < periodiccnt; ++i)
1521 {
1522 ev_periodic *w = (ev_periodic *)periodics [i];
1523
1524 if (w->reschedule_cb)
1525 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1526 else if (w->interval)
1527 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1528 }
1529
1530 /* now rebuild the heap */
1531 for (i = periodiccnt >> 1; i--; )
1532 downheap (periodics, periodiccnt, i);
1533}
1534#endif
1535 1643
1536#if EV_IDLE_ENABLE 1644#if EV_IDLE_ENABLE
1537void inline_size 1645void inline_size
1538idle_reify (EV_P) 1646idle_reify (EV_P)
1539{ 1647{
… …
1551 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1659 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1552 break; 1660 break;
1553 } 1661 }
1554 } 1662 }
1555 } 1663 }
1664}
1665#endif
1666
1667void inline_size
1668timers_reify (EV_P)
1669{
1670 EV_FREQUENT_CHECK;
1671
1672 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1673 {
1674 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1675
1676 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1677
1678 /* first reschedule or stop timer */
1679 if (w->repeat)
1680 {
1681 ev_at (w) += w->repeat;
1682 if (ev_at (w) < mn_now)
1683 ev_at (w) = mn_now;
1684
1685 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1686
1687 ANHE_at_cache (timers [HEAP0]);
1688 downheap (timers, timercnt, HEAP0);
1689 }
1690 else
1691 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1692
1693 EV_FREQUENT_CHECK;
1694 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1695 }
1696}
1697
1698#if EV_PERIODIC_ENABLE
1699void inline_size
1700periodics_reify (EV_P)
1701{
1702 EV_FREQUENT_CHECK;
1703 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1704 {
1705 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1706
1707 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1708
1709 /* first reschedule or stop timer */
1710 if (w->reschedule_cb)
1711 {
1712 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1713
1714 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1715
1716 ANHE_at_cache (periodics [HEAP0]);
1717 downheap (periodics, periodiccnt, HEAP0);
1718 EV_FREQUENT_CHECK;
1719 }
1720 else if (w->interval)
1721 {
1722 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1723 /* if next trigger time is not sufficiently in the future, put it there */
1724 /* this might happen because of floating point inexactness */
1725 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1726 {
1727 ev_at (w) += w->interval;
1728
1729 /* if interval is unreasonably low we might still have a time in the past */
1730 /* so correct this. this will make the periodic very inexact, but the user */
1731 /* has effectively asked to get triggered more often than possible */
1732 if (ev_at (w) < ev_rt_now)
1733 ev_at (w) = ev_rt_now;
1734 }
1735
1736 ANHE_at_cache (periodics [HEAP0]);
1737 downheap (periodics, periodiccnt, HEAP0);
1738 }
1739 else
1740 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1741
1742 EV_FREQUENT_CHECK;
1743 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1744 }
1745}
1746
1747static void noinline
1748periodics_reschedule (EV_P)
1749{
1750 int i;
1751
1752 /* adjust periodics after time jump */
1753 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1754 {
1755 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1756
1757 if (w->reschedule_cb)
1758 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1759 else if (w->interval)
1760 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1761
1762 ANHE_at_cache (periodics [i]);
1763 }
1764
1765 reheap (periodics, periodiccnt);
1556} 1766}
1557#endif 1767#endif
1558 1768
1559void inline_speed 1769void inline_speed
1560time_update (EV_P_ ev_tstamp max_block) 1770time_update (EV_P_ ev_tstamp max_block)
… …
1589 */ 1799 */
1590 for (i = 4; --i; ) 1800 for (i = 4; --i; )
1591 { 1801 {
1592 rtmn_diff = ev_rt_now - mn_now; 1802 rtmn_diff = ev_rt_now - mn_now;
1593 1803
1594 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1804 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1595 return; /* all is well */ 1805 return; /* all is well */
1596 1806
1597 ev_rt_now = ev_time (); 1807 ev_rt_now = ev_time ();
1598 mn_now = get_clock (); 1808 mn_now = get_clock ();
1599 now_floor = mn_now; 1809 now_floor = mn_now;
… …
1615#if EV_PERIODIC_ENABLE 1825#if EV_PERIODIC_ENABLE
1616 periodics_reschedule (EV_A); 1826 periodics_reschedule (EV_A);
1617#endif 1827#endif
1618 /* adjust timers. this is easy, as the offset is the same for all of them */ 1828 /* adjust timers. this is easy, as the offset is the same for all of them */
1619 for (i = 0; i < timercnt; ++i) 1829 for (i = 0; i < timercnt; ++i)
1830 {
1831 ANHE *he = timers + i + HEAP0;
1620 ((WT)timers [i])->at += ev_rt_now - mn_now; 1832 ANHE_w (*he)->at += ev_rt_now - mn_now;
1833 ANHE_at_cache (*he);
1834 }
1621 } 1835 }
1622 1836
1623 mn_now = ev_rt_now; 1837 mn_now = ev_rt_now;
1624 } 1838 }
1625} 1839}
… …
1695 1909
1696 waittime = MAX_BLOCKTIME; 1910 waittime = MAX_BLOCKTIME;
1697 1911
1698 if (timercnt) 1912 if (timercnt)
1699 { 1913 {
1700 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1914 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1701 if (waittime > to) waittime = to; 1915 if (waittime > to) waittime = to;
1702 } 1916 }
1703 1917
1704#if EV_PERIODIC_ENABLE 1918#if EV_PERIODIC_ENABLE
1705 if (periodiccnt) 1919 if (periodiccnt)
1706 { 1920 {
1707 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1921 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1708 if (waittime > to) waittime = to; 1922 if (waittime > to) waittime = to;
1709 } 1923 }
1710#endif 1924#endif
1711 1925
1712 if (expect_false (waittime < timeout_blocktime)) 1926 if (expect_false (waittime < timeout_blocktime))
… …
1849 if (expect_false (ev_is_active (w))) 2063 if (expect_false (ev_is_active (w)))
1850 return; 2064 return;
1851 2065
1852 assert (("ev_io_start called with negative fd", fd >= 0)); 2066 assert (("ev_io_start called with negative fd", fd >= 0));
1853 2067
2068 EV_FREQUENT_CHECK;
2069
1854 ev_start (EV_A_ (W)w, 1); 2070 ev_start (EV_A_ (W)w, 1);
1855 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2071 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1856 wlist_add (&anfds[fd].head, (WL)w); 2072 wlist_add (&anfds[fd].head, (WL)w);
1857 2073
1858 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2074 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1859 w->events &= ~EV_IOFDSET; 2075 w->events &= ~EV_IOFDSET;
2076
2077 EV_FREQUENT_CHECK;
1860} 2078}
1861 2079
1862void noinline 2080void noinline
1863ev_io_stop (EV_P_ ev_io *w) 2081ev_io_stop (EV_P_ ev_io *w)
1864{ 2082{
1865 clear_pending (EV_A_ (W)w); 2083 clear_pending (EV_A_ (W)w);
1866 if (expect_false (!ev_is_active (w))) 2084 if (expect_false (!ev_is_active (w)))
1867 return; 2085 return;
1868 2086
1869 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2087 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2088
2089 EV_FREQUENT_CHECK;
1870 2090
1871 wlist_del (&anfds[w->fd].head, (WL)w); 2091 wlist_del (&anfds[w->fd].head, (WL)w);
1872 ev_stop (EV_A_ (W)w); 2092 ev_stop (EV_A_ (W)w);
1873 2093
1874 fd_change (EV_A_ w->fd, 1); 2094 fd_change (EV_A_ w->fd, 1);
2095
2096 EV_FREQUENT_CHECK;
1875} 2097}
1876 2098
1877void noinline 2099void noinline
1878ev_timer_start (EV_P_ ev_timer *w) 2100ev_timer_start (EV_P_ ev_timer *w)
1879{ 2101{
1880 if (expect_false (ev_is_active (w))) 2102 if (expect_false (ev_is_active (w)))
1881 return; 2103 return;
1882 2104
1883 ((WT)w)->at += mn_now; 2105 ev_at (w) += mn_now;
1884 2106
1885 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2107 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1886 2108
2109 EV_FREQUENT_CHECK;
2110
2111 ++timercnt;
1887 ev_start (EV_A_ (W)w, ++timercnt); 2112 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
1888 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 2113 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1889 timers [timercnt - 1] = (WT)w; 2114 ANHE_w (timers [ev_active (w)]) = (WT)w;
1890 upheap (timers, timercnt - 1); 2115 ANHE_at_cache (timers [ev_active (w)]);
2116 upheap (timers, ev_active (w));
1891 2117
2118 EV_FREQUENT_CHECK;
2119
1892 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 2120 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1893} 2121}
1894 2122
1895void noinline 2123void noinline
1896ev_timer_stop (EV_P_ ev_timer *w) 2124ev_timer_stop (EV_P_ ev_timer *w)
1897{ 2125{
1898 clear_pending (EV_A_ (W)w); 2126 clear_pending (EV_A_ (W)w);
1899 if (expect_false (!ev_is_active (w))) 2127 if (expect_false (!ev_is_active (w)))
1900 return; 2128 return;
1901 2129
1902 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w)); 2130 EV_FREQUENT_CHECK;
1903 2131
1904 { 2132 {
1905 int active = ((W)w)->active; 2133 int active = ev_active (w);
1906 2134
2135 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2136
2137 --timercnt;
2138
1907 if (expect_true (--active < --timercnt)) 2139 if (expect_true (active < timercnt + HEAP0))
1908 { 2140 {
1909 timers [active] = timers [timercnt]; 2141 timers [active] = timers [timercnt + HEAP0];
1910 adjustheap (timers, timercnt, active); 2142 adjustheap (timers, timercnt, active);
1911 } 2143 }
1912 } 2144 }
1913 2145
1914 ((WT)w)->at -= mn_now; 2146 EV_FREQUENT_CHECK;
2147
2148 ev_at (w) -= mn_now;
1915 2149
1916 ev_stop (EV_A_ (W)w); 2150 ev_stop (EV_A_ (W)w);
1917} 2151}
1918 2152
1919void noinline 2153void noinline
1920ev_timer_again (EV_P_ ev_timer *w) 2154ev_timer_again (EV_P_ ev_timer *w)
1921{ 2155{
2156 EV_FREQUENT_CHECK;
2157
1922 if (ev_is_active (w)) 2158 if (ev_is_active (w))
1923 { 2159 {
1924 if (w->repeat) 2160 if (w->repeat)
1925 { 2161 {
1926 ((WT)w)->at = mn_now + w->repeat; 2162 ev_at (w) = mn_now + w->repeat;
2163 ANHE_at_cache (timers [ev_active (w)]);
1927 adjustheap (timers, timercnt, ((W)w)->active - 1); 2164 adjustheap (timers, timercnt, ev_active (w));
1928 } 2165 }
1929 else 2166 else
1930 ev_timer_stop (EV_A_ w); 2167 ev_timer_stop (EV_A_ w);
1931 } 2168 }
1932 else if (w->repeat) 2169 else if (w->repeat)
1933 { 2170 {
1934 w->at = w->repeat; 2171 ev_at (w) = w->repeat;
1935 ev_timer_start (EV_A_ w); 2172 ev_timer_start (EV_A_ w);
1936 } 2173 }
2174
2175 EV_FREQUENT_CHECK;
1937} 2176}
1938 2177
1939#if EV_PERIODIC_ENABLE 2178#if EV_PERIODIC_ENABLE
1940void noinline 2179void noinline
1941ev_periodic_start (EV_P_ ev_periodic *w) 2180ev_periodic_start (EV_P_ ev_periodic *w)
1942{ 2181{
1943 if (expect_false (ev_is_active (w))) 2182 if (expect_false (ev_is_active (w)))
1944 return; 2183 return;
1945 2184
1946 if (w->reschedule_cb) 2185 if (w->reschedule_cb)
1947 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2186 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1948 else if (w->interval) 2187 else if (w->interval)
1949 { 2188 {
1950 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2189 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1951 /* this formula differs from the one in periodic_reify because we do not always round up */ 2190 /* this formula differs from the one in periodic_reify because we do not always round up */
1952 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2191 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1953 } 2192 }
1954 else 2193 else
1955 ((WT)w)->at = w->offset; 2194 ev_at (w) = w->offset;
1956 2195
2196 EV_FREQUENT_CHECK;
2197
2198 ++periodiccnt;
1957 ev_start (EV_A_ (W)w, ++periodiccnt); 2199 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
1958 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2200 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1959 periodics [periodiccnt - 1] = (WT)w; 2201 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1960 upheap (periodics, periodiccnt - 1); 2202 ANHE_at_cache (periodics [ev_active (w)]);
2203 upheap (periodics, ev_active (w));
1961 2204
2205 EV_FREQUENT_CHECK;
2206
1962 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2207 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
1963} 2208}
1964 2209
1965void noinline 2210void noinline
1966ev_periodic_stop (EV_P_ ev_periodic *w) 2211ev_periodic_stop (EV_P_ ev_periodic *w)
1967{ 2212{
1968 clear_pending (EV_A_ (W)w); 2213 clear_pending (EV_A_ (W)w);
1969 if (expect_false (!ev_is_active (w))) 2214 if (expect_false (!ev_is_active (w)))
1970 return; 2215 return;
1971 2216
1972 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w)); 2217 EV_FREQUENT_CHECK;
1973 2218
1974 { 2219 {
1975 int active = ((W)w)->active; 2220 int active = ev_active (w);
1976 2221
2222 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2223
2224 --periodiccnt;
2225
1977 if (expect_true (--active < --periodiccnt)) 2226 if (expect_true (active < periodiccnt + HEAP0))
1978 { 2227 {
1979 periodics [active] = periodics [periodiccnt]; 2228 periodics [active] = periodics [periodiccnt + HEAP0];
1980 adjustheap (periodics, periodiccnt, active); 2229 adjustheap (periodics, periodiccnt, active);
1981 } 2230 }
1982 } 2231 }
1983 2232
2233 EV_FREQUENT_CHECK;
2234
1984 ev_stop (EV_A_ (W)w); 2235 ev_stop (EV_A_ (W)w);
1985} 2236}
1986 2237
1987void noinline 2238void noinline
1988ev_periodic_again (EV_P_ ev_periodic *w) 2239ev_periodic_again (EV_P_ ev_periodic *w)
… …
2007 return; 2258 return;
2008 2259
2009 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2260 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2010 2261
2011 evpipe_init (EV_A); 2262 evpipe_init (EV_A);
2263
2264 EV_FREQUENT_CHECK;
2012 2265
2013 { 2266 {
2014#ifndef _WIN32 2267#ifndef _WIN32
2015 sigset_t full, prev; 2268 sigset_t full, prev;
2016 sigfillset (&full); 2269 sigfillset (&full);
… …
2037 sigfillset (&sa.sa_mask); 2290 sigfillset (&sa.sa_mask);
2038 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2291 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2039 sigaction (w->signum, &sa, 0); 2292 sigaction (w->signum, &sa, 0);
2040#endif 2293#endif
2041 } 2294 }
2295
2296 EV_FREQUENT_CHECK;
2042} 2297}
2043 2298
2044void noinline 2299void noinline
2045ev_signal_stop (EV_P_ ev_signal *w) 2300ev_signal_stop (EV_P_ ev_signal *w)
2046{ 2301{
2047 clear_pending (EV_A_ (W)w); 2302 clear_pending (EV_A_ (W)w);
2048 if (expect_false (!ev_is_active (w))) 2303 if (expect_false (!ev_is_active (w)))
2049 return; 2304 return;
2050 2305
2306 EV_FREQUENT_CHECK;
2307
2051 wlist_del (&signals [w->signum - 1].head, (WL)w); 2308 wlist_del (&signals [w->signum - 1].head, (WL)w);
2052 ev_stop (EV_A_ (W)w); 2309 ev_stop (EV_A_ (W)w);
2053 2310
2054 if (!signals [w->signum - 1].head) 2311 if (!signals [w->signum - 1].head)
2055 signal (w->signum, SIG_DFL); 2312 signal (w->signum, SIG_DFL);
2313
2314 EV_FREQUENT_CHECK;
2056} 2315}
2057 2316
2058void 2317void
2059ev_child_start (EV_P_ ev_child *w) 2318ev_child_start (EV_P_ ev_child *w)
2060{ 2319{
… …
2062 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2321 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2063#endif 2322#endif
2064 if (expect_false (ev_is_active (w))) 2323 if (expect_false (ev_is_active (w)))
2065 return; 2324 return;
2066 2325
2326 EV_FREQUENT_CHECK;
2327
2067 ev_start (EV_A_ (W)w, 1); 2328 ev_start (EV_A_ (W)w, 1);
2068 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2329 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2330
2331 EV_FREQUENT_CHECK;
2069} 2332}
2070 2333
2071void 2334void
2072ev_child_stop (EV_P_ ev_child *w) 2335ev_child_stop (EV_P_ ev_child *w)
2073{ 2336{
2074 clear_pending (EV_A_ (W)w); 2337 clear_pending (EV_A_ (W)w);
2075 if (expect_false (!ev_is_active (w))) 2338 if (expect_false (!ev_is_active (w)))
2076 return; 2339 return;
2077 2340
2341 EV_FREQUENT_CHECK;
2342
2078 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2343 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2079 ev_stop (EV_A_ (W)w); 2344 ev_stop (EV_A_ (W)w);
2345
2346 EV_FREQUENT_CHECK;
2080} 2347}
2081 2348
2082#if EV_STAT_ENABLE 2349#if EV_STAT_ENABLE
2083 2350
2084# ifdef _WIN32 2351# ifdef _WIN32
… …
2102 if (w->wd < 0) 2369 if (w->wd < 0)
2103 { 2370 {
2104 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2371 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2105 2372
2106 /* monitor some parent directory for speedup hints */ 2373 /* monitor some parent directory for speedup hints */
2374 /* note that exceeding the hardcoded limit is not a correctness issue, */
2375 /* but an efficiency issue only */
2107 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2376 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2108 { 2377 {
2109 char path [4096]; 2378 char path [4096];
2110 strcpy (path, w->path); 2379 strcpy (path, w->path);
2111 2380
… …
2310 else 2579 else
2311#endif 2580#endif
2312 ev_timer_start (EV_A_ &w->timer); 2581 ev_timer_start (EV_A_ &w->timer);
2313 2582
2314 ev_start (EV_A_ (W)w, 1); 2583 ev_start (EV_A_ (W)w, 1);
2584
2585 EV_FREQUENT_CHECK;
2315} 2586}
2316 2587
2317void 2588void
2318ev_stat_stop (EV_P_ ev_stat *w) 2589ev_stat_stop (EV_P_ ev_stat *w)
2319{ 2590{
2320 clear_pending (EV_A_ (W)w); 2591 clear_pending (EV_A_ (W)w);
2321 if (expect_false (!ev_is_active (w))) 2592 if (expect_false (!ev_is_active (w)))
2322 return; 2593 return;
2323 2594
2595 EV_FREQUENT_CHECK;
2596
2324#if EV_USE_INOTIFY 2597#if EV_USE_INOTIFY
2325 infy_del (EV_A_ w); 2598 infy_del (EV_A_ w);
2326#endif 2599#endif
2327 ev_timer_stop (EV_A_ &w->timer); 2600 ev_timer_stop (EV_A_ &w->timer);
2328 2601
2329 ev_stop (EV_A_ (W)w); 2602 ev_stop (EV_A_ (W)w);
2603
2604 EV_FREQUENT_CHECK;
2330} 2605}
2331#endif 2606#endif
2332 2607
2333#if EV_IDLE_ENABLE 2608#if EV_IDLE_ENABLE
2334void 2609void
… …
2336{ 2611{
2337 if (expect_false (ev_is_active (w))) 2612 if (expect_false (ev_is_active (w)))
2338 return; 2613 return;
2339 2614
2340 pri_adjust (EV_A_ (W)w); 2615 pri_adjust (EV_A_ (W)w);
2616
2617 EV_FREQUENT_CHECK;
2341 2618
2342 { 2619 {
2343 int active = ++idlecnt [ABSPRI (w)]; 2620 int active = ++idlecnt [ABSPRI (w)];
2344 2621
2345 ++idleall; 2622 ++idleall;
2346 ev_start (EV_A_ (W)w, active); 2623 ev_start (EV_A_ (W)w, active);
2347 2624
2348 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 2625 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2349 idles [ABSPRI (w)][active - 1] = w; 2626 idles [ABSPRI (w)][active - 1] = w;
2350 } 2627 }
2628
2629 EV_FREQUENT_CHECK;
2351} 2630}
2352 2631
2353void 2632void
2354ev_idle_stop (EV_P_ ev_idle *w) 2633ev_idle_stop (EV_P_ ev_idle *w)
2355{ 2634{
2356 clear_pending (EV_A_ (W)w); 2635 clear_pending (EV_A_ (W)w);
2357 if (expect_false (!ev_is_active (w))) 2636 if (expect_false (!ev_is_active (w)))
2358 return; 2637 return;
2359 2638
2639 EV_FREQUENT_CHECK;
2640
2360 { 2641 {
2361 int active = ((W)w)->active; 2642 int active = ev_active (w);
2362 2643
2363 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2644 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2364 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2645 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2365 2646
2366 ev_stop (EV_A_ (W)w); 2647 ev_stop (EV_A_ (W)w);
2367 --idleall; 2648 --idleall;
2368 } 2649 }
2650
2651 EV_FREQUENT_CHECK;
2369} 2652}
2370#endif 2653#endif
2371 2654
2372void 2655void
2373ev_prepare_start (EV_P_ ev_prepare *w) 2656ev_prepare_start (EV_P_ ev_prepare *w)
2374{ 2657{
2375 if (expect_false (ev_is_active (w))) 2658 if (expect_false (ev_is_active (w)))
2376 return; 2659 return;
2660
2661 EV_FREQUENT_CHECK;
2377 2662
2378 ev_start (EV_A_ (W)w, ++preparecnt); 2663 ev_start (EV_A_ (W)w, ++preparecnt);
2379 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2664 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2380 prepares [preparecnt - 1] = w; 2665 prepares [preparecnt - 1] = w;
2666
2667 EV_FREQUENT_CHECK;
2381} 2668}
2382 2669
2383void 2670void
2384ev_prepare_stop (EV_P_ ev_prepare *w) 2671ev_prepare_stop (EV_P_ ev_prepare *w)
2385{ 2672{
2386 clear_pending (EV_A_ (W)w); 2673 clear_pending (EV_A_ (W)w);
2387 if (expect_false (!ev_is_active (w))) 2674 if (expect_false (!ev_is_active (w)))
2388 return; 2675 return;
2389 2676
2677 EV_FREQUENT_CHECK;
2678
2390 { 2679 {
2391 int active = ((W)w)->active; 2680 int active = ev_active (w);
2681
2392 prepares [active - 1] = prepares [--preparecnt]; 2682 prepares [active - 1] = prepares [--preparecnt];
2393 ((W)prepares [active - 1])->active = active; 2683 ev_active (prepares [active - 1]) = active;
2394 } 2684 }
2395 2685
2396 ev_stop (EV_A_ (W)w); 2686 ev_stop (EV_A_ (W)w);
2687
2688 EV_FREQUENT_CHECK;
2397} 2689}
2398 2690
2399void 2691void
2400ev_check_start (EV_P_ ev_check *w) 2692ev_check_start (EV_P_ ev_check *w)
2401{ 2693{
2402 if (expect_false (ev_is_active (w))) 2694 if (expect_false (ev_is_active (w)))
2403 return; 2695 return;
2696
2697 EV_FREQUENT_CHECK;
2404 2698
2405 ev_start (EV_A_ (W)w, ++checkcnt); 2699 ev_start (EV_A_ (W)w, ++checkcnt);
2406 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2700 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2407 checks [checkcnt - 1] = w; 2701 checks [checkcnt - 1] = w;
2702
2703 EV_FREQUENT_CHECK;
2408} 2704}
2409 2705
2410void 2706void
2411ev_check_stop (EV_P_ ev_check *w) 2707ev_check_stop (EV_P_ ev_check *w)
2412{ 2708{
2413 clear_pending (EV_A_ (W)w); 2709 clear_pending (EV_A_ (W)w);
2414 if (expect_false (!ev_is_active (w))) 2710 if (expect_false (!ev_is_active (w)))
2415 return; 2711 return;
2416 2712
2713 EV_FREQUENT_CHECK;
2714
2417 { 2715 {
2418 int active = ((W)w)->active; 2716 int active = ev_active (w);
2717
2419 checks [active - 1] = checks [--checkcnt]; 2718 checks [active - 1] = checks [--checkcnt];
2420 ((W)checks [active - 1])->active = active; 2719 ev_active (checks [active - 1]) = active;
2421 } 2720 }
2422 2721
2423 ev_stop (EV_A_ (W)w); 2722 ev_stop (EV_A_ (W)w);
2723
2724 EV_FREQUENT_CHECK;
2424} 2725}
2425 2726
2426#if EV_EMBED_ENABLE 2727#if EV_EMBED_ENABLE
2427void noinline 2728void noinline
2428ev_embed_sweep (EV_P_ ev_embed *w) 2729ev_embed_sweep (EV_P_ ev_embed *w)
… …
2475 struct ev_loop *loop = w->other; 2776 struct ev_loop *loop = w->other;
2476 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2777 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2477 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2778 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2478 } 2779 }
2479 2780
2781 EV_FREQUENT_CHECK;
2782
2480 ev_set_priority (&w->io, ev_priority (w)); 2783 ev_set_priority (&w->io, ev_priority (w));
2481 ev_io_start (EV_A_ &w->io); 2784 ev_io_start (EV_A_ &w->io);
2482 2785
2483 ev_prepare_init (&w->prepare, embed_prepare_cb); 2786 ev_prepare_init (&w->prepare, embed_prepare_cb);
2484 ev_set_priority (&w->prepare, EV_MINPRI); 2787 ev_set_priority (&w->prepare, EV_MINPRI);
2485 ev_prepare_start (EV_A_ &w->prepare); 2788 ev_prepare_start (EV_A_ &w->prepare);
2486 2789
2487 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2790 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2488 2791
2489 ev_start (EV_A_ (W)w, 1); 2792 ev_start (EV_A_ (W)w, 1);
2793
2794 EV_FREQUENT_CHECK;
2490} 2795}
2491 2796
2492void 2797void
2493ev_embed_stop (EV_P_ ev_embed *w) 2798ev_embed_stop (EV_P_ ev_embed *w)
2494{ 2799{
2495 clear_pending (EV_A_ (W)w); 2800 clear_pending (EV_A_ (W)w);
2496 if (expect_false (!ev_is_active (w))) 2801 if (expect_false (!ev_is_active (w)))
2497 return; 2802 return;
2498 2803
2804 EV_FREQUENT_CHECK;
2805
2499 ev_io_stop (EV_A_ &w->io); 2806 ev_io_stop (EV_A_ &w->io);
2500 ev_prepare_stop (EV_A_ &w->prepare); 2807 ev_prepare_stop (EV_A_ &w->prepare);
2501 2808
2502 ev_stop (EV_A_ (W)w); 2809 ev_stop (EV_A_ (W)w);
2810
2811 EV_FREQUENT_CHECK;
2503} 2812}
2504#endif 2813#endif
2505 2814
2506#if EV_FORK_ENABLE 2815#if EV_FORK_ENABLE
2507void 2816void
2508ev_fork_start (EV_P_ ev_fork *w) 2817ev_fork_start (EV_P_ ev_fork *w)
2509{ 2818{
2510 if (expect_false (ev_is_active (w))) 2819 if (expect_false (ev_is_active (w)))
2511 return; 2820 return;
2821
2822 EV_FREQUENT_CHECK;
2512 2823
2513 ev_start (EV_A_ (W)w, ++forkcnt); 2824 ev_start (EV_A_ (W)w, ++forkcnt);
2514 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2825 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2515 forks [forkcnt - 1] = w; 2826 forks [forkcnt - 1] = w;
2827
2828 EV_FREQUENT_CHECK;
2516} 2829}
2517 2830
2518void 2831void
2519ev_fork_stop (EV_P_ ev_fork *w) 2832ev_fork_stop (EV_P_ ev_fork *w)
2520{ 2833{
2521 clear_pending (EV_A_ (W)w); 2834 clear_pending (EV_A_ (W)w);
2522 if (expect_false (!ev_is_active (w))) 2835 if (expect_false (!ev_is_active (w)))
2523 return; 2836 return;
2524 2837
2838 EV_FREQUENT_CHECK;
2839
2525 { 2840 {
2526 int active = ((W)w)->active; 2841 int active = ev_active (w);
2842
2527 forks [active - 1] = forks [--forkcnt]; 2843 forks [active - 1] = forks [--forkcnt];
2528 ((W)forks [active - 1])->active = active; 2844 ev_active (forks [active - 1]) = active;
2529 } 2845 }
2530 2846
2531 ev_stop (EV_A_ (W)w); 2847 ev_stop (EV_A_ (W)w);
2848
2849 EV_FREQUENT_CHECK;
2532} 2850}
2533#endif 2851#endif
2534 2852
2535#if EV_ASYNC_ENABLE 2853#if EV_ASYNC_ENABLE
2536void 2854void
… …
2538{ 2856{
2539 if (expect_false (ev_is_active (w))) 2857 if (expect_false (ev_is_active (w)))
2540 return; 2858 return;
2541 2859
2542 evpipe_init (EV_A); 2860 evpipe_init (EV_A);
2861
2862 EV_FREQUENT_CHECK;
2543 2863
2544 ev_start (EV_A_ (W)w, ++asynccnt); 2864 ev_start (EV_A_ (W)w, ++asynccnt);
2545 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2865 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2546 asyncs [asynccnt - 1] = w; 2866 asyncs [asynccnt - 1] = w;
2867
2868 EV_FREQUENT_CHECK;
2547} 2869}
2548 2870
2549void 2871void
2550ev_async_stop (EV_P_ ev_async *w) 2872ev_async_stop (EV_P_ ev_async *w)
2551{ 2873{
2552 clear_pending (EV_A_ (W)w); 2874 clear_pending (EV_A_ (W)w);
2553 if (expect_false (!ev_is_active (w))) 2875 if (expect_false (!ev_is_active (w)))
2554 return; 2876 return;
2555 2877
2878 EV_FREQUENT_CHECK;
2879
2556 { 2880 {
2557 int active = ((W)w)->active; 2881 int active = ev_active (w);
2882
2558 asyncs [active - 1] = asyncs [--asynccnt]; 2883 asyncs [active - 1] = asyncs [--asynccnt];
2559 ((W)asyncs [active - 1])->active = active; 2884 ev_active (asyncs [active - 1]) = active;
2560 } 2885 }
2561 2886
2562 ev_stop (EV_A_ (W)w); 2887 ev_stop (EV_A_ (W)w);
2888
2889 EV_FREQUENT_CHECK;
2563} 2890}
2564 2891
2565void 2892void
2566ev_async_send (EV_P_ ev_async *w) 2893ev_async_send (EV_P_ ev_async *w)
2567{ 2894{

Diff Legend

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