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

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

Diff Legend

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