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

Comparing libev/ev.c (file contents):
Revision 1.220 by root, Sun Apr 6 09:53:17 2008 UTC vs.
Revision 1.235 by root, Wed May 7 14:45:17 2008 UTC

… …
268# include <winsock.h> 268# include <winsock.h>
269#endif 269#endif
270 270
271#if EV_USE_EVENTFD 271#if EV_USE_EVENTFD
272/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 272/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
273# include <stdint.h>
274# ifdef __cplusplus
275extern "C" {
276# endif
273int eventfd (unsigned int initval, int flags); 277int eventfd (unsigned int initval, int flags);
278# ifdef __cplusplus
279}
280# endif
274#endif 281#endif
275 282
276/**/ 283/**/
277 284
278/* 285/*
… …
293# define expect(expr,value) __builtin_expect ((expr),(value)) 300# define expect(expr,value) __builtin_expect ((expr),(value))
294# define noinline __attribute__ ((noinline)) 301# define noinline __attribute__ ((noinline))
295#else 302#else
296# define expect(expr,value) (expr) 303# define expect(expr,value) (expr)
297# define noinline 304# define noinline
298# if __STDC_VERSION__ < 199901L 305# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
299# define inline 306# define inline
300# endif 307# endif
301#endif 308#endif
302 309
303#define expect_false(expr) expect ((expr) != 0, 0) 310#define expect_false(expr) expect ((expr) != 0, 0)
… …
318 325
319typedef ev_watcher *W; 326typedef ev_watcher *W;
320typedef ev_watcher_list *WL; 327typedef ev_watcher_list *WL;
321typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
322 329
330#define ev_active(w) ((W)(w))->active
331#define ev_at(w) ((WT)(w))->at
332
323#if EV_USE_MONOTONIC 333#if EV_USE_MONOTONIC
324/* 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 */
325/* giving it a reasonably high chance of working on typical architetcures */ 335/* giving it a reasonably high chance of working on typical architetcures */
326static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 336static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
327#endif 337#endif
… …
353 perror (msg); 363 perror (msg);
354 abort (); 364 abort ();
355 } 365 }
356} 366}
357 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
358static void *(*alloc)(void *ptr, long size); 383static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
359 384
360void 385void
361ev_set_allocator (void *(*cb)(void *ptr, long size)) 386ev_set_allocator (void *(*cb)(void *ptr, long size))
362{ 387{
363 alloc = cb; 388 alloc = cb;
364} 389}
365 390
366inline_speed void * 391inline_speed void *
367ev_realloc (void *ptr, long size) 392ev_realloc (void *ptr, long size)
368{ 393{
369 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 394 ptr = alloc (ptr, size);
370 395
371 if (!ptr && size) 396 if (!ptr && size)
372 { 397 {
373 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 398 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
374 abort (); 399 abort ();
… …
495 } 520 }
496} 521}
497 522
498/*****************************************************************************/ 523/*****************************************************************************/
499 524
525#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
526
500int inline_size 527int inline_size
501array_nextsize (int elem, int cur, int cnt) 528array_nextsize (int elem, int cur, int cnt)
502{ 529{
503 int ncur = cur + 1; 530 int ncur = cur + 1;
504 531
505 do 532 do
506 ncur <<= 1; 533 ncur <<= 1;
507 while (cnt > ncur); 534 while (cnt > ncur);
508 535
509 /* 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 */
510 if (elem * ncur > 4096) 537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
511 { 538 {
512 ncur *= elem; 539 ncur *= elem;
513 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
514 ncur = ncur - sizeof (void *) * 4; 541 ncur = ncur - sizeof (void *) * 4;
515 ncur /= elem; 542 ncur /= elem;
516 } 543 }
517 544
518 return ncur; 545 return ncur;
… …
732 } 759 }
733} 760}
734 761
735/*****************************************************************************/ 762/*****************************************************************************/
736 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 HEAP0 3 /* index of first element in heap */
774
775/* towards the root */
737void inline_speed 776void inline_speed
738upheap (WT *heap, int k) 777upheap (WT *heap, int k)
739{ 778{
740 WT w = heap [k]; 779 WT w = heap [k];
741 780
742 while (k) 781 for (;;)
743 { 782 {
744 int p = (k - 1) >> 1; 783 int p = ((k - HEAP0 - 1) / 4) + HEAP0;
745 784
746 if (heap [p]->at <= w->at) 785 if (p >= HEAP0 || heap [p]->at <= w->at)
747 break; 786 break;
748 787
749 heap [k] = heap [p]; 788 heap [k] = heap [p];
750 ((W)heap [k])->active = k + 1; 789 ev_active (heap [k]) = k;
751 k = p; 790 k = p;
752 } 791 }
753 792
754 heap [k] = w; 793 heap [k] = w;
755 ((W)heap [k])->active = k + 1; 794 ev_active (heap [k]) = k;
756} 795}
757 796
797/* away from the root */
758void inline_speed 798void inline_speed
759downheap (WT *heap, int N, int k) 799downheap (WT *heap, int N, int k)
760{ 800{
761 WT w = heap [k]; 801 WT w = heap [k];
802 WT *E = heap + N + HEAP0;
762 803
763 for (;;) 804 for (;;)
764 { 805 {
806 ev_tstamp minat;
807 WT *minpos;
808 WT *pos = heap + 4 * (k - HEAP0) + HEAP0;
809
810 // find minimum child
811 if (expect_true (pos +3 < E))
812 {
813 (minpos = pos + 0), (minat = (*minpos)->at);
814 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
815 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
816 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
817 }
818 else
819 {
820 if (pos >= E)
821 break;
822
823 (minpos = pos + 0), (minat = (*minpos)->at);
824 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
825 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
826 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
827 }
828
829 if (w->at <= minat)
830 break;
831
832 ev_active (*minpos) = k;
833 heap [k] = *minpos;
834
835 k = minpos - heap;
836 }
837
838 heap [k] = w;
839 ev_active (heap [k]) = k;
840}
841
842#else // 4HEAP
843
844#define HEAP0 1
845
846/* towards the root */
847void inline_speed
848upheap (WT *heap, int k)
849{
850 WT w = heap [k];
851
852 for (;;)
853 {
854 int p = k >> 1;
855
856 /* maybe we could use a dummy element at heap [0]? */
857 if (!p || heap [p]->at <= w->at)
858 break;
859
860 heap [k] = heap [p];
861 ev_active (heap [k]) = k;
862 k = p;
863 }
864
865 heap [k] = w;
866 ev_active (heap [k]) = k;
867}
868
869/* away from the root */
870void inline_speed
871downheap (WT *heap, int N, int k)
872{
873 WT w = heap [k];
874
875 for (;;)
876 {
765 int c = (k << 1) + 1; 877 int c = k << 1;
766 878
767 if (c >= N) 879 if (c > N)
768 break; 880 break;
769 881
770 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 882 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
771 ? 1 : 0; 883 ? 1 : 0;
772 884
773 if (w->at <= heap [c]->at) 885 if (w->at <= heap [c]->at)
774 break; 886 break;
775 887
776 heap [k] = heap [c]; 888 heap [k] = heap [c];
777 ((W)heap [k])->active = k + 1; 889 ((W)heap [k])->active = k;
778 890
779 k = c; 891 k = c;
780 } 892 }
781 893
782 heap [k] = w; 894 heap [k] = w;
783 ((W)heap [k])->active = k + 1; 895 ev_active (heap [k]) = k;
784} 896}
897#endif
785 898
786void inline_size 899void inline_size
787adjustheap (WT *heap, int N, int k) 900adjustheap (WT *heap, int N, int k)
788{ 901{
789 upheap (heap, k); 902 upheap (heap, k);
… …
884pipecb (EV_P_ ev_io *iow, int revents) 997pipecb (EV_P_ ev_io *iow, int revents)
885{ 998{
886#if EV_USE_EVENTFD 999#if EV_USE_EVENTFD
887 if (evfd >= 0) 1000 if (evfd >= 0)
888 { 1001 {
889 uint64_t counter = 1; 1002 uint64_t counter;
890 read (evfd, &counter, sizeof (uint64_t)); 1003 read (evfd, &counter, sizeof (uint64_t));
891 } 1004 }
892 else 1005 else
893#endif 1006#endif
894 { 1007 {
… …
1163 if (!(flags & EVFLAG_NOENV) 1276 if (!(flags & EVFLAG_NOENV)
1164 && !enable_secure () 1277 && !enable_secure ()
1165 && getenv ("LIBEV_FLAGS")) 1278 && getenv ("LIBEV_FLAGS"))
1166 flags = atoi (getenv ("LIBEV_FLAGS")); 1279 flags = atoi (getenv ("LIBEV_FLAGS"));
1167 1280
1168 if (!(flags & 0x0000ffffUL)) 1281 if (!(flags & 0x0000ffffU))
1169 flags |= ev_recommended_backends (); 1282 flags |= ev_recommended_backends ();
1170 1283
1171#if EV_USE_PORT 1284#if EV_USE_PORT
1172 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1285 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1173#endif 1286#endif
… …
1261#endif 1374#endif
1262 1375
1263 backend = 0; 1376 backend = 0;
1264} 1377}
1265 1378
1379#if EV_USE_INOTIFY
1266void inline_size infy_fork (EV_P); 1380void inline_size infy_fork (EV_P);
1381#endif
1267 1382
1268void inline_size 1383void inline_size
1269loop_fork (EV_P) 1384loop_fork (EV_P)
1270{ 1385{
1271#if EV_USE_PORT 1386#if EV_USE_PORT
… …
1338void 1453void
1339ev_loop_fork (EV_P) 1454ev_loop_fork (EV_P)
1340{ 1455{
1341 postfork = 1; /* must be in line with ev_default_fork */ 1456 postfork = 1; /* must be in line with ev_default_fork */
1342} 1457}
1343
1344#endif 1458#endif
1345 1459
1346#if EV_MULTIPLICITY 1460#if EV_MULTIPLICITY
1347struct ev_loop * 1461struct ev_loop *
1348ev_default_loop_init (unsigned int flags) 1462ev_default_loop_init (unsigned int flags)
… …
1429 EV_CB_INVOKE (p->w, p->events); 1543 EV_CB_INVOKE (p->w, p->events);
1430 } 1544 }
1431 } 1545 }
1432} 1546}
1433 1547
1434void inline_size
1435timers_reify (EV_P)
1436{
1437 while (timercnt && ((WT)timers [0])->at <= mn_now)
1438 {
1439 ev_timer *w = (ev_timer *)timers [0];
1440
1441 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1442
1443 /* first reschedule or stop timer */
1444 if (w->repeat)
1445 {
1446 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1447
1448 ((WT)w)->at += w->repeat;
1449 if (((WT)w)->at < mn_now)
1450 ((WT)w)->at = mn_now;
1451
1452 downheap (timers, timercnt, 0);
1453 }
1454 else
1455 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1456
1457 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1458 }
1459}
1460
1461#if EV_PERIODIC_ENABLE
1462void inline_size
1463periodics_reify (EV_P)
1464{
1465 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1466 {
1467 ev_periodic *w = (ev_periodic *)periodics [0];
1468
1469 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1470
1471 /* first reschedule or stop timer */
1472 if (w->reschedule_cb)
1473 {
1474 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1475 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1476 downheap (periodics, periodiccnt, 0);
1477 }
1478 else if (w->interval)
1479 {
1480 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1481 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1482 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1483 downheap (periodics, periodiccnt, 0);
1484 }
1485 else
1486 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1487
1488 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1489 }
1490}
1491
1492static void noinline
1493periodics_reschedule (EV_P)
1494{
1495 int i;
1496
1497 /* adjust periodics after time jump */
1498 for (i = 0; i < periodiccnt; ++i)
1499 {
1500 ev_periodic *w = (ev_periodic *)periodics [i];
1501
1502 if (w->reschedule_cb)
1503 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1504 else if (w->interval)
1505 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1506 }
1507
1508 /* now rebuild the heap */
1509 for (i = periodiccnt >> 1; i--; )
1510 downheap (periodics, periodiccnt, i);
1511}
1512#endif
1513
1514#if EV_IDLE_ENABLE 1548#if EV_IDLE_ENABLE
1515void inline_size 1549void inline_size
1516idle_reify (EV_P) 1550idle_reify (EV_P)
1517{ 1551{
1518 if (expect_false (idleall)) 1552 if (expect_false (idleall))
… …
1529 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1563 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1530 break; 1564 break;
1531 } 1565 }
1532 } 1566 }
1533 } 1567 }
1568}
1569#endif
1570
1571void inline_size
1572timers_reify (EV_P)
1573{
1574 while (timercnt && ev_at (timers [HEAP0]) <= mn_now)
1575 {
1576 ev_timer *w = (ev_timer *)timers [HEAP0];
1577
1578 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1579
1580 /* first reschedule or stop timer */
1581 if (w->repeat)
1582 {
1583 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1584
1585 ev_at (w) += w->repeat;
1586 if (ev_at (w) < mn_now)
1587 ev_at (w) = mn_now;
1588
1589 downheap (timers, timercnt, HEAP0);
1590 }
1591 else
1592 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1593
1594 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1595 }
1596}
1597
1598#if EV_PERIODIC_ENABLE
1599void inline_size
1600periodics_reify (EV_P)
1601{
1602 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now)
1603 {
1604 ev_periodic *w = (ev_periodic *)periodics [HEAP0];
1605
1606 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1607
1608 /* first reschedule or stop timer */
1609 if (w->reschedule_cb)
1610 {
1611 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1612 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1613 downheap (periodics, periodiccnt, 1);
1614 }
1615 else if (w->interval)
1616 {
1617 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1618 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1619 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1620 downheap (periodics, periodiccnt, HEAP0);
1621 }
1622 else
1623 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1624
1625 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1626 }
1627}
1628
1629static void noinline
1630periodics_reschedule (EV_P)
1631{
1632 int i;
1633
1634 /* adjust periodics after time jump */
1635 for (i = 1; i <= periodiccnt; ++i)
1636 {
1637 ev_periodic *w = (ev_periodic *)periodics [i];
1638
1639 if (w->reschedule_cb)
1640 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1641 else if (w->interval)
1642 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1643 }
1644
1645 /* now rebuild the heap */
1646 for (i = periodiccnt >> 1; --i; )
1647 downheap (periodics, periodiccnt, i + HEAP0);
1534} 1648}
1535#endif 1649#endif
1536 1650
1537void inline_speed 1651void inline_speed
1538time_update (EV_P_ ev_tstamp max_block) 1652time_update (EV_P_ ev_tstamp max_block)
… …
1567 */ 1681 */
1568 for (i = 4; --i; ) 1682 for (i = 4; --i; )
1569 { 1683 {
1570 rtmn_diff = ev_rt_now - mn_now; 1684 rtmn_diff = ev_rt_now - mn_now;
1571 1685
1572 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1686 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1573 return; /* all is well */ 1687 return; /* all is well */
1574 1688
1575 ev_rt_now = ev_time (); 1689 ev_rt_now = ev_time ();
1576 mn_now = get_clock (); 1690 mn_now = get_clock ();
1577 now_floor = mn_now; 1691 now_floor = mn_now;
… …
1592 { 1706 {
1593#if EV_PERIODIC_ENABLE 1707#if EV_PERIODIC_ENABLE
1594 periodics_reschedule (EV_A); 1708 periodics_reschedule (EV_A);
1595#endif 1709#endif
1596 /* adjust timers. this is easy, as the offset is the same for all of them */ 1710 /* adjust timers. this is easy, as the offset is the same for all of them */
1597 for (i = 0; i < timercnt; ++i) 1711 for (i = 1; i <= timercnt; ++i)
1598 ((WT)timers [i])->at += ev_rt_now - mn_now; 1712 ev_at (timers [i]) += ev_rt_now - mn_now;
1599 } 1713 }
1600 1714
1601 mn_now = ev_rt_now; 1715 mn_now = ev_rt_now;
1602 } 1716 }
1603} 1717}
… …
1673 1787
1674 waittime = MAX_BLOCKTIME; 1788 waittime = MAX_BLOCKTIME;
1675 1789
1676 if (timercnt) 1790 if (timercnt)
1677 { 1791 {
1678 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1792 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1679 if (waittime > to) waittime = to; 1793 if (waittime > to) waittime = to;
1680 } 1794 }
1681 1795
1682#if EV_PERIODIC_ENABLE 1796#if EV_PERIODIC_ENABLE
1683 if (periodiccnt) 1797 if (periodiccnt)
1684 { 1798 {
1685 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1799 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1686 if (waittime > to) waittime = to; 1800 if (waittime > to) waittime = to;
1687 } 1801 }
1688#endif 1802#endif
1689 1803
1690 if (expect_false (waittime < timeout_blocktime)) 1804 if (expect_false (waittime < timeout_blocktime))
… …
1856ev_timer_start (EV_P_ ev_timer *w) 1970ev_timer_start (EV_P_ ev_timer *w)
1857{ 1971{
1858 if (expect_false (ev_is_active (w))) 1972 if (expect_false (ev_is_active (w)))
1859 return; 1973 return;
1860 1974
1861 ((WT)w)->at += mn_now; 1975 ev_at (w) += mn_now;
1862 1976
1863 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1977 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1864 1978
1865 ev_start (EV_A_ (W)w, ++timercnt); 1979 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1866 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1980 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1867 timers [timercnt - 1] = (WT)w; 1981 timers [ev_active (w)] = (WT)w;
1868 upheap (timers, timercnt - 1); 1982 upheap (timers, ev_active (w));
1869 1983
1870 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1984 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1871} 1985}
1872 1986
1873void noinline 1987void noinline
1874ev_timer_stop (EV_P_ ev_timer *w) 1988ev_timer_stop (EV_P_ ev_timer *w)
1875{ 1989{
1876 clear_pending (EV_A_ (W)w); 1990 clear_pending (EV_A_ (W)w);
1877 if (expect_false (!ev_is_active (w))) 1991 if (expect_false (!ev_is_active (w)))
1878 return; 1992 return;
1879 1993
1880 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1881
1882 { 1994 {
1883 int active = ((W)w)->active; 1995 int active = ev_active (w);
1884 1996
1997 assert (("internal timer heap corruption", timers [active] == (WT)w));
1998
1885 if (expect_true (--active < --timercnt)) 1999 if (expect_true (active < timercnt + HEAP0 - 1))
1886 { 2000 {
1887 timers [active] = timers [timercnt]; 2001 timers [active] = timers [timercnt + HEAP0 - 1];
1888 adjustheap (timers, timercnt, active); 2002 adjustheap (timers, timercnt, active);
1889 } 2003 }
2004
2005 --timercnt;
1890 } 2006 }
1891 2007
1892 ((WT)w)->at -= mn_now; 2008 ev_at (w) -= mn_now;
1893 2009
1894 ev_stop (EV_A_ (W)w); 2010 ev_stop (EV_A_ (W)w);
1895} 2011}
1896 2012
1897void noinline 2013void noinline
… …
1899{ 2015{
1900 if (ev_is_active (w)) 2016 if (ev_is_active (w))
1901 { 2017 {
1902 if (w->repeat) 2018 if (w->repeat)
1903 { 2019 {
1904 ((WT)w)->at = mn_now + w->repeat; 2020 ev_at (w) = mn_now + w->repeat;
1905 adjustheap (timers, timercnt, ((W)w)->active - 1); 2021 adjustheap (timers, timercnt, ev_active (w));
1906 } 2022 }
1907 else 2023 else
1908 ev_timer_stop (EV_A_ w); 2024 ev_timer_stop (EV_A_ w);
1909 } 2025 }
1910 else if (w->repeat) 2026 else if (w->repeat)
1911 { 2027 {
1912 w->at = w->repeat; 2028 ev_at (w) = w->repeat;
1913 ev_timer_start (EV_A_ w); 2029 ev_timer_start (EV_A_ w);
1914 } 2030 }
1915} 2031}
1916 2032
1917#if EV_PERIODIC_ENABLE 2033#if EV_PERIODIC_ENABLE
… …
1920{ 2036{
1921 if (expect_false (ev_is_active (w))) 2037 if (expect_false (ev_is_active (w)))
1922 return; 2038 return;
1923 2039
1924 if (w->reschedule_cb) 2040 if (w->reschedule_cb)
1925 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2041 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1926 else if (w->interval) 2042 else if (w->interval)
1927 { 2043 {
1928 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2044 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1929 /* this formula differs from the one in periodic_reify because we do not always round up */ 2045 /* this formula differs from the one in periodic_reify because we do not always round up */
1930 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2046 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1931 } 2047 }
1932 else 2048 else
1933 ((WT)w)->at = w->offset; 2049 ev_at (w) = w->offset;
1934 2050
1935 ev_start (EV_A_ (W)w, ++periodiccnt); 2051 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1936 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2052 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1937 periodics [periodiccnt - 1] = (WT)w; 2053 periodics [ev_active (w)] = (WT)w;
1938 upheap (periodics, periodiccnt - 1); 2054 upheap (periodics, ev_active (w));
1939 2055
1940 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2056 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1941} 2057}
1942 2058
1943void noinline 2059void noinline
1944ev_periodic_stop (EV_P_ ev_periodic *w) 2060ev_periodic_stop (EV_P_ ev_periodic *w)
1945{ 2061{
1946 clear_pending (EV_A_ (W)w); 2062 clear_pending (EV_A_ (W)w);
1947 if (expect_false (!ev_is_active (w))) 2063 if (expect_false (!ev_is_active (w)))
1948 return; 2064 return;
1949 2065
1950 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1951
1952 { 2066 {
1953 int active = ((W)w)->active; 2067 int active = ev_active (w);
1954 2068
2069 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
2070
1955 if (expect_true (--active < --periodiccnt)) 2071 if (expect_true (active < periodiccnt + HEAP0 - 1))
1956 { 2072 {
1957 periodics [active] = periodics [periodiccnt]; 2073 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1958 adjustheap (periodics, periodiccnt, active); 2074 adjustheap (periodics, periodiccnt, active);
1959 } 2075 }
2076
2077 --periodiccnt;
1960 } 2078 }
1961 2079
1962 ev_stop (EV_A_ (W)w); 2080 ev_stop (EV_A_ (W)w);
1963} 2081}
1964 2082
… …
2080 if (w->wd < 0) 2198 if (w->wd < 0)
2081 { 2199 {
2082 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2200 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2083 2201
2084 /* monitor some parent directory for speedup hints */ 2202 /* monitor some parent directory for speedup hints */
2203 /* note that exceeding the hardcoded limit is not a correctness issue, */
2204 /* but an efficiency issue only */
2085 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2205 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2086 { 2206 {
2087 char path [4096]; 2207 char path [4096];
2088 strcpy (path, w->path); 2208 strcpy (path, w->path);
2089 2209
… …
2334 clear_pending (EV_A_ (W)w); 2454 clear_pending (EV_A_ (W)w);
2335 if (expect_false (!ev_is_active (w))) 2455 if (expect_false (!ev_is_active (w)))
2336 return; 2456 return;
2337 2457
2338 { 2458 {
2339 int active = ((W)w)->active; 2459 int active = ev_active (w);
2340 2460
2341 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2461 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2342 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2462 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2343 2463
2344 ev_stop (EV_A_ (W)w); 2464 ev_stop (EV_A_ (W)w);
2345 --idleall; 2465 --idleall;
2346 } 2466 }
2347} 2467}
… …
2364 clear_pending (EV_A_ (W)w); 2484 clear_pending (EV_A_ (W)w);
2365 if (expect_false (!ev_is_active (w))) 2485 if (expect_false (!ev_is_active (w)))
2366 return; 2486 return;
2367 2487
2368 { 2488 {
2369 int active = ((W)w)->active; 2489 int active = ev_active (w);
2490
2370 prepares [active - 1] = prepares [--preparecnt]; 2491 prepares [active - 1] = prepares [--preparecnt];
2371 ((W)prepares [active - 1])->active = active; 2492 ev_active (prepares [active - 1]) = active;
2372 } 2493 }
2373 2494
2374 ev_stop (EV_A_ (W)w); 2495 ev_stop (EV_A_ (W)w);
2375} 2496}
2376 2497
… …
2391 clear_pending (EV_A_ (W)w); 2512 clear_pending (EV_A_ (W)w);
2392 if (expect_false (!ev_is_active (w))) 2513 if (expect_false (!ev_is_active (w)))
2393 return; 2514 return;
2394 2515
2395 { 2516 {
2396 int active = ((W)w)->active; 2517 int active = ev_active (w);
2518
2397 checks [active - 1] = checks [--checkcnt]; 2519 checks [active - 1] = checks [--checkcnt];
2398 ((W)checks [active - 1])->active = active; 2520 ev_active (checks [active - 1]) = active;
2399 } 2521 }
2400 2522
2401 ev_stop (EV_A_ (W)w); 2523 ev_stop (EV_A_ (W)w);
2402} 2524}
2403 2525
… …
2499 clear_pending (EV_A_ (W)w); 2621 clear_pending (EV_A_ (W)w);
2500 if (expect_false (!ev_is_active (w))) 2622 if (expect_false (!ev_is_active (w)))
2501 return; 2623 return;
2502 2624
2503 { 2625 {
2504 int active = ((W)w)->active; 2626 int active = ev_active (w);
2627
2505 forks [active - 1] = forks [--forkcnt]; 2628 forks [active - 1] = forks [--forkcnt];
2506 ((W)forks [active - 1])->active = active; 2629 ev_active (forks [active - 1]) = active;
2507 } 2630 }
2508 2631
2509 ev_stop (EV_A_ (W)w); 2632 ev_stop (EV_A_ (W)w);
2510} 2633}
2511#endif 2634#endif
… …
2530 clear_pending (EV_A_ (W)w); 2653 clear_pending (EV_A_ (W)w);
2531 if (expect_false (!ev_is_active (w))) 2654 if (expect_false (!ev_is_active (w)))
2532 return; 2655 return;
2533 2656
2534 { 2657 {
2535 int active = ((W)w)->active; 2658 int active = ev_active (w);
2659
2536 asyncs [active - 1] = asyncs [--asynccnt]; 2660 asyncs [active - 1] = asyncs [--asynccnt];
2537 ((W)asyncs [active - 1])->active = active; 2661 ev_active (asyncs [active - 1]) = active;
2538 } 2662 }
2539 2663
2540 ev_stop (EV_A_ (W)w); 2664 ev_stop (EV_A_ (W)w);
2541} 2665}
2542 2666

Diff Legend

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