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

Comparing libev/ev.c (file contents):
Revision 1.223 by root, Sun Apr 6 14:34:50 2008 UTC vs.
Revision 1.237 by root, Wed May 7 15:16:56 2008 UTC

… …
325 325
326typedef ev_watcher *W; 326typedef ev_watcher *W;
327typedef ev_watcher_list *WL; 327typedef ev_watcher_list *WL;
328typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
329 329
330#define ev_active(w) ((W)(w))->active
331#define ev_at(w) ((WT)(w))->at
332
330#if EV_USE_MONOTONIC 333#if EV_USE_MONOTONIC
331/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 334/* 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 */ 335/* giving it a reasonably high chance of working on typical architetcures */
333static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 336static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
334#endif 337#endif
… …
360 perror (msg); 363 perror (msg);
361 abort (); 364 abort ();
362 } 365 }
363} 366}
364 367
368static void *
369ev_realloc_emul (void *ptr, long size)
370{
371 /* some systems, notably openbsd and darwin, fail to properly
372 * implement realloc (x, 0) (as required by both ansi c-98 and
373 * the single unix specification, so work around them here.
374 */
375
376 if (size)
377 return realloc (ptr, size);
378
379 free (ptr);
380 return 0;
381}
382
365static void *(*alloc)(void *ptr, long size); 383static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
366 384
367void 385void
368ev_set_allocator (void *(*cb)(void *ptr, long size)) 386ev_set_allocator (void *(*cb)(void *ptr, long size))
369{ 387{
370 alloc = cb; 388 alloc = cb;
371} 389}
372 390
373inline_speed void * 391inline_speed void *
374ev_realloc (void *ptr, long size) 392ev_realloc (void *ptr, long size)
375{ 393{
376 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 394 ptr = alloc (ptr, size);
377 395
378 if (!ptr && size) 396 if (!ptr && size)
379 { 397 {
380 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 398 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
381 abort (); 399 abort ();
… …
502 } 520 }
503} 521}
504 522
505/*****************************************************************************/ 523/*****************************************************************************/
506 524
525#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
526
507int inline_size 527int inline_size
508array_nextsize (int elem, int cur, int cnt) 528array_nextsize (int elem, int cur, int cnt)
509{ 529{
510 int ncur = cur + 1; 530 int ncur = cur + 1;
511 531
512 do 532 do
513 ncur <<= 1; 533 ncur <<= 1;
514 while (cnt > ncur); 534 while (cnt > ncur);
515 535
516 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 536 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
517 if (elem * ncur > 4096) 537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
518 { 538 {
519 ncur *= elem; 539 ncur *= elem;
520 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
521 ncur = ncur - sizeof (void *) * 4; 541 ncur = ncur - sizeof (void *) * 4;
522 ncur /= elem; 542 ncur /= elem;
523 } 543 }
524 544
525 return ncur; 545 return ncur;
… …
739 } 759 }
740} 760}
741 761
742/*****************************************************************************/ 762/*****************************************************************************/
743 763
764/*
765 * at the moment we allow libev the luxury of two heaps,
766 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
767 * which is more cache-efficient.
768 * the difference is about 5% with 50000+ watchers.
769 */
770#define USE_4HEAP !EV_MINIMAL
771#if USE_4HEAP
772
773#define DHEAP 4
774#define HEAP0 (DHEAP - 1) /* index of first element in heap */
775
776/* towards the root */
744void inline_speed 777void inline_speed
745upheap (WT *heap, int k) 778upheap (WT *heap, int k)
746{ 779{
747 WT w = heap [k]; 780 WT w = heap [k];
748 781
749 while (k) 782 for (;;)
750 { 783 {
751 int p = (k - 1) >> 1; 784 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
752 785
753 if (heap [p]->at <= w->at) 786 if (p >= HEAP0 || heap [p]->at <= w->at)
754 break; 787 break;
755 788
756 heap [k] = heap [p]; 789 heap [k] = heap [p];
757 ((W)heap [k])->active = k + 1; 790 ev_active (heap [k]) = k;
758 k = p; 791 k = p;
759 } 792 }
760 793
761 heap [k] = w; 794 heap [k] = w;
762 ((W)heap [k])->active = k + 1; 795 ev_active (heap [k]) = k;
763} 796}
764 797
798/* away from the root */
765void inline_speed 799void inline_speed
766downheap (WT *heap, int N, int k) 800downheap (WT *heap, int N, int k)
767{ 801{
768 WT w = heap [k]; 802 WT w = heap [k];
803 WT *E = heap + N + HEAP0;
769 804
770 for (;;) 805 for (;;)
771 { 806 {
807 ev_tstamp minat;
808 WT *minpos;
809 WT *pos = heap + DHEAP * (k - HEAP0) + HEAP0;
810
811 // find minimum child
812 if (expect_true (pos + DHEAP - 1 < E))
813 {
814 /* fast path */
815 (minpos = pos + 0), (minat = (*minpos)->at);
816 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
817 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
818 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
819 }
820 else
821 {
822 /* slow path */
823 if (pos >= E)
824 break;
825 (minpos = pos + 0), (minat = (*minpos)->at);
826 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
827 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
828 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
829 }
830
831 if (w->at <= minat)
832 break;
833
834 ev_active (*minpos) = k;
835 heap [k] = *minpos;
836
837 k = minpos - heap;
838 }
839
840 heap [k] = w;
841 ev_active (heap [k]) = k;
842}
843
844#else // 4HEAP
845
846#define HEAP0 1
847
848/* towards the root */
849void inline_speed
850upheap (WT *heap, int k)
851{
852 WT w = heap [k];
853
854 for (;;)
855 {
856 int p = k >> 1;
857
858 /* maybe we could use a dummy element at heap [0]? */
859 if (!p || heap [p]->at <= w->at)
860 break;
861
862 heap [k] = heap [p];
863 ev_active (heap [k]) = k;
864 k = p;
865 }
866
867 heap [k] = w;
868 ev_active (heap [k]) = k;
869}
870
871/* away from the root */
872void inline_speed
873downheap (WT *heap, int N, int k)
874{
875 WT w = heap [k];
876
877 for (;;)
878 {
772 int c = (k << 1) + 1; 879 int c = k << 1;
773 880
774 if (c >= N) 881 if (c > N)
775 break; 882 break;
776 883
777 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 884 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
778 ? 1 : 0; 885 ? 1 : 0;
779 886
780 if (w->at <= heap [c]->at) 887 if (w->at <= heap [c]->at)
781 break; 888 break;
782 889
783 heap [k] = heap [c]; 890 heap [k] = heap [c];
784 ((W)heap [k])->active = k + 1; 891 ((W)heap [k])->active = k;
785 892
786 k = c; 893 k = c;
787 } 894 }
788 895
789 heap [k] = w; 896 heap [k] = w;
790 ((W)heap [k])->active = k + 1; 897 ev_active (heap [k]) = k;
791} 898}
899#endif
792 900
793void inline_size 901void inline_size
794adjustheap (WT *heap, int N, int k) 902adjustheap (WT *heap, int N, int k)
795{ 903{
796 upheap (heap, k); 904 upheap (heap, k);
… …
891pipecb (EV_P_ ev_io *iow, int revents) 999pipecb (EV_P_ ev_io *iow, int revents)
892{ 1000{
893#if EV_USE_EVENTFD 1001#if EV_USE_EVENTFD
894 if (evfd >= 0) 1002 if (evfd >= 0)
895 { 1003 {
896 uint64_t counter = 1; 1004 uint64_t counter;
897 read (evfd, &counter, sizeof (uint64_t)); 1005 read (evfd, &counter, sizeof (uint64_t));
898 } 1006 }
899 else 1007 else
900#endif 1008#endif
901 { 1009 {
… …
1170 if (!(flags & EVFLAG_NOENV) 1278 if (!(flags & EVFLAG_NOENV)
1171 && !enable_secure () 1279 && !enable_secure ()
1172 && getenv ("LIBEV_FLAGS")) 1280 && getenv ("LIBEV_FLAGS"))
1173 flags = atoi (getenv ("LIBEV_FLAGS")); 1281 flags = atoi (getenv ("LIBEV_FLAGS"));
1174 1282
1175 if (!(flags & 0x0000ffffUL)) 1283 if (!(flags & 0x0000ffffU))
1176 flags |= ev_recommended_backends (); 1284 flags |= ev_recommended_backends ();
1177 1285
1178#if EV_USE_PORT 1286#if EV_USE_PORT
1179 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1287 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1180#endif 1288#endif
… …
1268#endif 1376#endif
1269 1377
1270 backend = 0; 1378 backend = 0;
1271} 1379}
1272 1380
1381#if EV_USE_INOTIFY
1273void inline_size infy_fork (EV_P); 1382void inline_size infy_fork (EV_P);
1383#endif
1274 1384
1275void inline_size 1385void inline_size
1276loop_fork (EV_P) 1386loop_fork (EV_P)
1277{ 1387{
1278#if EV_USE_PORT 1388#if EV_USE_PORT
… …
1345void 1455void
1346ev_loop_fork (EV_P) 1456ev_loop_fork (EV_P)
1347{ 1457{
1348 postfork = 1; /* must be in line with ev_default_fork */ 1458 postfork = 1; /* must be in line with ev_default_fork */
1349} 1459}
1350
1351#endif 1460#endif
1352 1461
1353#if EV_MULTIPLICITY 1462#if EV_MULTIPLICITY
1354struct ev_loop * 1463struct ev_loop *
1355ev_default_loop_init (unsigned int flags) 1464ev_default_loop_init (unsigned int flags)
… …
1436 EV_CB_INVOKE (p->w, p->events); 1545 EV_CB_INVOKE (p->w, p->events);
1437 } 1546 }
1438 } 1547 }
1439} 1548}
1440 1549
1441void inline_size
1442timers_reify (EV_P)
1443{
1444 while (timercnt && ((WT)timers [0])->at <= mn_now)
1445 {
1446 ev_timer *w = (ev_timer *)timers [0];
1447
1448 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1449
1450 /* first reschedule or stop timer */
1451 if (w->repeat)
1452 {
1453 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1454
1455 ((WT)w)->at += w->repeat;
1456 if (((WT)w)->at < mn_now)
1457 ((WT)w)->at = mn_now;
1458
1459 downheap (timers, timercnt, 0);
1460 }
1461 else
1462 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1463
1464 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1465 }
1466}
1467
1468#if EV_PERIODIC_ENABLE
1469void inline_size
1470periodics_reify (EV_P)
1471{
1472 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1473 {
1474 ev_periodic *w = (ev_periodic *)periodics [0];
1475
1476 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1477
1478 /* first reschedule or stop timer */
1479 if (w->reschedule_cb)
1480 {
1481 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1482 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1483 downheap (periodics, periodiccnt, 0);
1484 }
1485 else if (w->interval)
1486 {
1487 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1488 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1489 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1490 downheap (periodics, periodiccnt, 0);
1491 }
1492 else
1493 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1494
1495 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1496 }
1497}
1498
1499static void noinline
1500periodics_reschedule (EV_P)
1501{
1502 int i;
1503
1504 /* adjust periodics after time jump */
1505 for (i = 0; i < periodiccnt; ++i)
1506 {
1507 ev_periodic *w = (ev_periodic *)periodics [i];
1508
1509 if (w->reschedule_cb)
1510 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1511 else if (w->interval)
1512 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1513 }
1514
1515 /* now rebuild the heap */
1516 for (i = periodiccnt >> 1; i--; )
1517 downheap (periodics, periodiccnt, i);
1518}
1519#endif
1520
1521#if EV_IDLE_ENABLE 1550#if EV_IDLE_ENABLE
1522void inline_size 1551void inline_size
1523idle_reify (EV_P) 1552idle_reify (EV_P)
1524{ 1553{
1525 if (expect_false (idleall)) 1554 if (expect_false (idleall))
… …
1536 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1565 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1537 break; 1566 break;
1538 } 1567 }
1539 } 1568 }
1540 } 1569 }
1570}
1571#endif
1572
1573void inline_size
1574timers_reify (EV_P)
1575{
1576 while (timercnt && ev_at (timers [HEAP0]) <= mn_now)
1577 {
1578 ev_timer *w = (ev_timer *)timers [HEAP0];
1579
1580 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1581
1582 /* first reschedule or stop timer */
1583 if (w->repeat)
1584 {
1585 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1586
1587 ev_at (w) += w->repeat;
1588 if (ev_at (w) < mn_now)
1589 ev_at (w) = mn_now;
1590
1591 downheap (timers, timercnt, HEAP0);
1592 }
1593 else
1594 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1595
1596 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1597 }
1598}
1599
1600#if EV_PERIODIC_ENABLE
1601void inline_size
1602periodics_reify (EV_P)
1603{
1604 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now)
1605 {
1606 ev_periodic *w = (ev_periodic *)periodics [HEAP0];
1607
1608 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1609
1610 /* first reschedule or stop timer */
1611 if (w->reschedule_cb)
1612 {
1613 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1614 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1615 downheap (periodics, periodiccnt, 1);
1616 }
1617 else if (w->interval)
1618 {
1619 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1620 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1621 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1622 downheap (periodics, periodiccnt, HEAP0);
1623 }
1624 else
1625 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1626
1627 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1628 }
1629}
1630
1631static void noinline
1632periodics_reschedule (EV_P)
1633{
1634 int i;
1635
1636 /* adjust periodics after time jump */
1637 for (i = 1; i <= periodiccnt; ++i)
1638 {
1639 ev_periodic *w = (ev_periodic *)periodics [i];
1640
1641 if (w->reschedule_cb)
1642 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1643 else if (w->interval)
1644 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1645 }
1646
1647 /* now rebuild the heap */
1648 for (i = periodiccnt >> 1; --i; )
1649 downheap (periodics, periodiccnt, i + HEAP0);
1541} 1650}
1542#endif 1651#endif
1543 1652
1544void inline_speed 1653void inline_speed
1545time_update (EV_P_ ev_tstamp max_block) 1654time_update (EV_P_ ev_tstamp max_block)
… …
1574 */ 1683 */
1575 for (i = 4; --i; ) 1684 for (i = 4; --i; )
1576 { 1685 {
1577 rtmn_diff = ev_rt_now - mn_now; 1686 rtmn_diff = ev_rt_now - mn_now;
1578 1687
1579 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1688 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1580 return; /* all is well */ 1689 return; /* all is well */
1581 1690
1582 ev_rt_now = ev_time (); 1691 ev_rt_now = ev_time ();
1583 mn_now = get_clock (); 1692 mn_now = get_clock ();
1584 now_floor = mn_now; 1693 now_floor = mn_now;
… …
1599 { 1708 {
1600#if EV_PERIODIC_ENABLE 1709#if EV_PERIODIC_ENABLE
1601 periodics_reschedule (EV_A); 1710 periodics_reschedule (EV_A);
1602#endif 1711#endif
1603 /* adjust timers. this is easy, as the offset is the same for all of them */ 1712 /* adjust timers. this is easy, as the offset is the same for all of them */
1604 for (i = 0; i < timercnt; ++i) 1713 for (i = 1; i <= timercnt; ++i)
1605 ((WT)timers [i])->at += ev_rt_now - mn_now; 1714 ev_at (timers [i]) += ev_rt_now - mn_now;
1606 } 1715 }
1607 1716
1608 mn_now = ev_rt_now; 1717 mn_now = ev_rt_now;
1609 } 1718 }
1610} 1719}
… …
1680 1789
1681 waittime = MAX_BLOCKTIME; 1790 waittime = MAX_BLOCKTIME;
1682 1791
1683 if (timercnt) 1792 if (timercnt)
1684 { 1793 {
1685 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1794 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1686 if (waittime > to) waittime = to; 1795 if (waittime > to) waittime = to;
1687 } 1796 }
1688 1797
1689#if EV_PERIODIC_ENABLE 1798#if EV_PERIODIC_ENABLE
1690 if (periodiccnt) 1799 if (periodiccnt)
1691 { 1800 {
1692 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1801 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1693 if (waittime > to) waittime = to; 1802 if (waittime > to) waittime = to;
1694 } 1803 }
1695#endif 1804#endif
1696 1805
1697 if (expect_false (waittime < timeout_blocktime)) 1806 if (expect_false (waittime < timeout_blocktime))
… …
1863ev_timer_start (EV_P_ ev_timer *w) 1972ev_timer_start (EV_P_ ev_timer *w)
1864{ 1973{
1865 if (expect_false (ev_is_active (w))) 1974 if (expect_false (ev_is_active (w)))
1866 return; 1975 return;
1867 1976
1868 ((WT)w)->at += mn_now; 1977 ev_at (w) += mn_now;
1869 1978
1870 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1979 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1871 1980
1872 ev_start (EV_A_ (W)w, ++timercnt); 1981 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1873 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1982 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1874 timers [timercnt - 1] = (WT)w; 1983 timers [ev_active (w)] = (WT)w;
1875 upheap (timers, timercnt - 1); 1984 upheap (timers, ev_active (w));
1876 1985
1877 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1986 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1878} 1987}
1879 1988
1880void noinline 1989void noinline
1881ev_timer_stop (EV_P_ ev_timer *w) 1990ev_timer_stop (EV_P_ ev_timer *w)
1882{ 1991{
1883 clear_pending (EV_A_ (W)w); 1992 clear_pending (EV_A_ (W)w);
1884 if (expect_false (!ev_is_active (w))) 1993 if (expect_false (!ev_is_active (w)))
1885 return; 1994 return;
1886 1995
1887 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1888
1889 { 1996 {
1890 int active = ((W)w)->active; 1997 int active = ev_active (w);
1891 1998
1999 assert (("internal timer heap corruption", timers [active] == (WT)w));
2000
1892 if (expect_true (--active < --timercnt)) 2001 if (expect_true (active < timercnt + HEAP0 - 1))
1893 { 2002 {
1894 timers [active] = timers [timercnt]; 2003 timers [active] = timers [timercnt + HEAP0 - 1];
1895 adjustheap (timers, timercnt, active); 2004 adjustheap (timers, timercnt, active);
1896 } 2005 }
2006
2007 --timercnt;
1897 } 2008 }
1898 2009
1899 ((WT)w)->at -= mn_now; 2010 ev_at (w) -= mn_now;
1900 2011
1901 ev_stop (EV_A_ (W)w); 2012 ev_stop (EV_A_ (W)w);
1902} 2013}
1903 2014
1904void noinline 2015void noinline
… …
1906{ 2017{
1907 if (ev_is_active (w)) 2018 if (ev_is_active (w))
1908 { 2019 {
1909 if (w->repeat) 2020 if (w->repeat)
1910 { 2021 {
1911 ((WT)w)->at = mn_now + w->repeat; 2022 ev_at (w) = mn_now + w->repeat;
1912 adjustheap (timers, timercnt, ((W)w)->active - 1); 2023 adjustheap (timers, timercnt, ev_active (w));
1913 } 2024 }
1914 else 2025 else
1915 ev_timer_stop (EV_A_ w); 2026 ev_timer_stop (EV_A_ w);
1916 } 2027 }
1917 else if (w->repeat) 2028 else if (w->repeat)
1918 { 2029 {
1919 w->at = w->repeat; 2030 ev_at (w) = w->repeat;
1920 ev_timer_start (EV_A_ w); 2031 ev_timer_start (EV_A_ w);
1921 } 2032 }
1922} 2033}
1923 2034
1924#if EV_PERIODIC_ENABLE 2035#if EV_PERIODIC_ENABLE
… …
1927{ 2038{
1928 if (expect_false (ev_is_active (w))) 2039 if (expect_false (ev_is_active (w)))
1929 return; 2040 return;
1930 2041
1931 if (w->reschedule_cb) 2042 if (w->reschedule_cb)
1932 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2043 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1933 else if (w->interval) 2044 else if (w->interval)
1934 { 2045 {
1935 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2046 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1936 /* this formula differs from the one in periodic_reify because we do not always round up */ 2047 /* this formula differs from the one in periodic_reify because we do not always round up */
1937 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2048 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1938 } 2049 }
1939 else 2050 else
1940 ((WT)w)->at = w->offset; 2051 ev_at (w) = w->offset;
1941 2052
1942 ev_start (EV_A_ (W)w, ++periodiccnt); 2053 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1943 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2054 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1944 periodics [periodiccnt - 1] = (WT)w; 2055 periodics [ev_active (w)] = (WT)w;
1945 upheap (periodics, periodiccnt - 1); 2056 upheap (periodics, ev_active (w));
1946 2057
1947 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2058 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1948} 2059}
1949 2060
1950void noinline 2061void noinline
1951ev_periodic_stop (EV_P_ ev_periodic *w) 2062ev_periodic_stop (EV_P_ ev_periodic *w)
1952{ 2063{
1953 clear_pending (EV_A_ (W)w); 2064 clear_pending (EV_A_ (W)w);
1954 if (expect_false (!ev_is_active (w))) 2065 if (expect_false (!ev_is_active (w)))
1955 return; 2066 return;
1956 2067
1957 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1958
1959 { 2068 {
1960 int active = ((W)w)->active; 2069 int active = ev_active (w);
1961 2070
2071 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
2072
1962 if (expect_true (--active < --periodiccnt)) 2073 if (expect_true (active < periodiccnt + HEAP0 - 1))
1963 { 2074 {
1964 periodics [active] = periodics [periodiccnt]; 2075 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1965 adjustheap (periodics, periodiccnt, active); 2076 adjustheap (periodics, periodiccnt, active);
1966 } 2077 }
2078
2079 --periodiccnt;
1967 } 2080 }
1968 2081
1969 ev_stop (EV_A_ (W)w); 2082 ev_stop (EV_A_ (W)w);
1970} 2083}
1971 2084
… …
2087 if (w->wd < 0) 2200 if (w->wd < 0)
2088 { 2201 {
2089 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2202 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2090 2203
2091 /* monitor some parent directory for speedup hints */ 2204 /* monitor some parent directory for speedup hints */
2205 /* note that exceeding the hardcoded limit is not a correctness issue, */
2206 /* but an efficiency issue only */
2092 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2207 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2093 { 2208 {
2094 char path [4096]; 2209 char path [4096];
2095 strcpy (path, w->path); 2210 strcpy (path, w->path);
2096 2211
… …
2341 clear_pending (EV_A_ (W)w); 2456 clear_pending (EV_A_ (W)w);
2342 if (expect_false (!ev_is_active (w))) 2457 if (expect_false (!ev_is_active (w)))
2343 return; 2458 return;
2344 2459
2345 { 2460 {
2346 int active = ((W)w)->active; 2461 int active = ev_active (w);
2347 2462
2348 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2463 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2349 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2464 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2350 2465
2351 ev_stop (EV_A_ (W)w); 2466 ev_stop (EV_A_ (W)w);
2352 --idleall; 2467 --idleall;
2353 } 2468 }
2354} 2469}
… …
2371 clear_pending (EV_A_ (W)w); 2486 clear_pending (EV_A_ (W)w);
2372 if (expect_false (!ev_is_active (w))) 2487 if (expect_false (!ev_is_active (w)))
2373 return; 2488 return;
2374 2489
2375 { 2490 {
2376 int active = ((W)w)->active; 2491 int active = ev_active (w);
2492
2377 prepares [active - 1] = prepares [--preparecnt]; 2493 prepares [active - 1] = prepares [--preparecnt];
2378 ((W)prepares [active - 1])->active = active; 2494 ev_active (prepares [active - 1]) = active;
2379 } 2495 }
2380 2496
2381 ev_stop (EV_A_ (W)w); 2497 ev_stop (EV_A_ (W)w);
2382} 2498}
2383 2499
… …
2398 clear_pending (EV_A_ (W)w); 2514 clear_pending (EV_A_ (W)w);
2399 if (expect_false (!ev_is_active (w))) 2515 if (expect_false (!ev_is_active (w)))
2400 return; 2516 return;
2401 2517
2402 { 2518 {
2403 int active = ((W)w)->active; 2519 int active = ev_active (w);
2520
2404 checks [active - 1] = checks [--checkcnt]; 2521 checks [active - 1] = checks [--checkcnt];
2405 ((W)checks [active - 1])->active = active; 2522 ev_active (checks [active - 1]) = active;
2406 } 2523 }
2407 2524
2408 ev_stop (EV_A_ (W)w); 2525 ev_stop (EV_A_ (W)w);
2409} 2526}
2410 2527
… …
2506 clear_pending (EV_A_ (W)w); 2623 clear_pending (EV_A_ (W)w);
2507 if (expect_false (!ev_is_active (w))) 2624 if (expect_false (!ev_is_active (w)))
2508 return; 2625 return;
2509 2626
2510 { 2627 {
2511 int active = ((W)w)->active; 2628 int active = ev_active (w);
2629
2512 forks [active - 1] = forks [--forkcnt]; 2630 forks [active - 1] = forks [--forkcnt];
2513 ((W)forks [active - 1])->active = active; 2631 ev_active (forks [active - 1]) = active;
2514 } 2632 }
2515 2633
2516 ev_stop (EV_A_ (W)w); 2634 ev_stop (EV_A_ (W)w);
2517} 2635}
2518#endif 2636#endif
… …
2537 clear_pending (EV_A_ (W)w); 2655 clear_pending (EV_A_ (W)w);
2538 if (expect_false (!ev_is_active (w))) 2656 if (expect_false (!ev_is_active (w)))
2539 return; 2657 return;
2540 2658
2541 { 2659 {
2542 int active = ((W)w)->active; 2660 int active = ev_active (w);
2661
2543 asyncs [active - 1] = asyncs [--asynccnt]; 2662 asyncs [active - 1] = asyncs [--asynccnt];
2544 ((W)asyncs [active - 1])->active = active; 2663 ev_active (asyncs [active - 1]) = active;
2545 } 2664 }
2546 2665
2547 ev_stop (EV_A_ (W)w); 2666 ev_stop (EV_A_ (W)w);
2548} 2667}
2549 2668

Diff Legend

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