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.239 by root, Thu May 8 20:52:13 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 DHEAP 4
774#define HEAP0 (DHEAP - 1) /* index of first element in heap */
775
776/* towards the root */
737void inline_speed 777void inline_speed
738upheap (WT *heap, int k) 778upheap (WT *heap, int k)
739{ 779{
740 WT w = heap [k]; 780 WT w = heap [k];
741 781
742 while (k) 782 for (;;)
743 { 783 {
744 int p = (k - 1) >> 1; 784 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
745 785
746 if (heap [p]->at <= w->at) 786 if (p == k || heap [p]->at <= w->at)
747 break; 787 break;
748 788
749 heap [k] = heap [p]; 789 heap [k] = heap [p];
750 ((W)heap [k])->active = k + 1; 790 ev_active (heap [k]) = k;
751 k = p; 791 k = p;
752 } 792 }
753 793
754 heap [k] = w; 794 heap [k] = w;
755 ((W)heap [k])->active = k + 1; 795 ev_active (heap [k]) = k;
756} 796}
757 797
798/* away from the root */
758void inline_speed 799void inline_speed
759downheap (WT *heap, int N, int k) 800downheap (WT *heap, int N, int k)
760{ 801{
761 WT w = heap [k]; 802 WT w = heap [k];
803 WT *E = heap + N + HEAP0;
762 804
763 for (;;) 805 for (;;)
764 { 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 {
765 int c = (k << 1) + 1; 879 int c = k << 1;
766 880
767 if (c >= N) 881 if (c > N)
768 break; 882 break;
769 883
770 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 884 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
771 ? 1 : 0; 885 ? 1 : 0;
772 886
773 if (w->at <= heap [c]->at) 887 if (w->at <= heap [c]->at)
774 break; 888 break;
775 889
776 heap [k] = heap [c]; 890 heap [k] = heap [c];
777 ((W)heap [k])->active = k + 1; 891 ((W)heap [k])->active = k;
778 892
779 k = c; 893 k = c;
780 } 894 }
781 895
782 heap [k] = w; 896 heap [k] = w;
783 ((W)heap [k])->active = k + 1; 897 ev_active (heap [k]) = k;
784} 898}
899#endif
785 900
786void inline_size 901void inline_size
787adjustheap (WT *heap, int N, int k) 902adjustheap (WT *heap, int N, int k)
788{ 903{
789 upheap (heap, k); 904 upheap (heap, k);
… …
884pipecb (EV_P_ ev_io *iow, int revents) 999pipecb (EV_P_ ev_io *iow, int revents)
885{ 1000{
886#if EV_USE_EVENTFD 1001#if EV_USE_EVENTFD
887 if (evfd >= 0) 1002 if (evfd >= 0)
888 { 1003 {
889 uint64_t counter = 1; 1004 uint64_t counter;
890 read (evfd, &counter, sizeof (uint64_t)); 1005 read (evfd, &counter, sizeof (uint64_t));
891 } 1006 }
892 else 1007 else
893#endif 1008#endif
894 { 1009 {
… …
1163 if (!(flags & EVFLAG_NOENV) 1278 if (!(flags & EVFLAG_NOENV)
1164 && !enable_secure () 1279 && !enable_secure ()
1165 && getenv ("LIBEV_FLAGS")) 1280 && getenv ("LIBEV_FLAGS"))
1166 flags = atoi (getenv ("LIBEV_FLAGS")); 1281 flags = atoi (getenv ("LIBEV_FLAGS"));
1167 1282
1168 if (!(flags & 0x0000ffffUL)) 1283 if (!(flags & 0x0000ffffU))
1169 flags |= ev_recommended_backends (); 1284 flags |= ev_recommended_backends ();
1170 1285
1171#if EV_USE_PORT 1286#if EV_USE_PORT
1172 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1287 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1173#endif 1288#endif
… …
1261#endif 1376#endif
1262 1377
1263 backend = 0; 1378 backend = 0;
1264} 1379}
1265 1380
1381#if EV_USE_INOTIFY
1266void inline_size infy_fork (EV_P); 1382void inline_size infy_fork (EV_P);
1383#endif
1267 1384
1268void inline_size 1385void inline_size
1269loop_fork (EV_P) 1386loop_fork (EV_P)
1270{ 1387{
1271#if EV_USE_PORT 1388#if EV_USE_PORT
… …
1338void 1455void
1339ev_loop_fork (EV_P) 1456ev_loop_fork (EV_P)
1340{ 1457{
1341 postfork = 1; /* must be in line with ev_default_fork */ 1458 postfork = 1; /* must be in line with ev_default_fork */
1342} 1459}
1343
1344#endif 1460#endif
1345 1461
1346#if EV_MULTIPLICITY 1462#if EV_MULTIPLICITY
1347struct ev_loop * 1463struct ev_loop *
1348ev_default_loop_init (unsigned int flags) 1464ev_default_loop_init (unsigned int flags)
… …
1429 EV_CB_INVOKE (p->w, p->events); 1545 EV_CB_INVOKE (p->w, p->events);
1430 } 1546 }
1431 } 1547 }
1432} 1548}
1433 1549
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 1550#if EV_IDLE_ENABLE
1515void inline_size 1551void inline_size
1516idle_reify (EV_P) 1552idle_reify (EV_P)
1517{ 1553{
1518 if (expect_false (idleall)) 1554 if (expect_false (idleall))
… …
1529 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1565 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1530 break; 1566 break;
1531 } 1567 }
1532 } 1568 }
1533 } 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);
1534} 1650}
1535#endif 1651#endif
1536 1652
1537void inline_speed 1653void inline_speed
1538time_update (EV_P_ ev_tstamp max_block) 1654time_update (EV_P_ ev_tstamp max_block)
… …
1567 */ 1683 */
1568 for (i = 4; --i; ) 1684 for (i = 4; --i; )
1569 { 1685 {
1570 rtmn_diff = ev_rt_now - mn_now; 1686 rtmn_diff = ev_rt_now - mn_now;
1571 1687
1572 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1688 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1573 return; /* all is well */ 1689 return; /* all is well */
1574 1690
1575 ev_rt_now = ev_time (); 1691 ev_rt_now = ev_time ();
1576 mn_now = get_clock (); 1692 mn_now = get_clock ();
1577 now_floor = mn_now; 1693 now_floor = mn_now;
… …
1592 { 1708 {
1593#if EV_PERIODIC_ENABLE 1709#if EV_PERIODIC_ENABLE
1594 periodics_reschedule (EV_A); 1710 periodics_reschedule (EV_A);
1595#endif 1711#endif
1596 /* 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 */
1597 for (i = 0; i < timercnt; ++i) 1713 for (i = 1; i <= timercnt; ++i)
1598 ((WT)timers [i])->at += ev_rt_now - mn_now; 1714 ev_at (timers [i]) += ev_rt_now - mn_now;
1599 } 1715 }
1600 1716
1601 mn_now = ev_rt_now; 1717 mn_now = ev_rt_now;
1602 } 1718 }
1603} 1719}
… …
1673 1789
1674 waittime = MAX_BLOCKTIME; 1790 waittime = MAX_BLOCKTIME;
1675 1791
1676 if (timercnt) 1792 if (timercnt)
1677 { 1793 {
1678 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1794 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1679 if (waittime > to) waittime = to; 1795 if (waittime > to) waittime = to;
1680 } 1796 }
1681 1797
1682#if EV_PERIODIC_ENABLE 1798#if EV_PERIODIC_ENABLE
1683 if (periodiccnt) 1799 if (periodiccnt)
1684 { 1800 {
1685 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;
1686 if (waittime > to) waittime = to; 1802 if (waittime > to) waittime = to;
1687 } 1803 }
1688#endif 1804#endif
1689 1805
1690 if (expect_false (waittime < timeout_blocktime)) 1806 if (expect_false (waittime < timeout_blocktime))
… …
1856ev_timer_start (EV_P_ ev_timer *w) 1972ev_timer_start (EV_P_ ev_timer *w)
1857{ 1973{
1858 if (expect_false (ev_is_active (w))) 1974 if (expect_false (ev_is_active (w)))
1859 return; 1975 return;
1860 1976
1861 ((WT)w)->at += mn_now; 1977 ev_at (w) += mn_now;
1862 1978
1863 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.));
1864 1980
1865 ev_start (EV_A_ (W)w, ++timercnt); 1981 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1866 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1982 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1867 timers [timercnt - 1] = (WT)w; 1983 timers [ev_active (w)] = (WT)w;
1868 upheap (timers, timercnt - 1); 1984 upheap (timers, ev_active (w));
1869 1985
1870 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1986 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1871} 1987}
1872 1988
1873void noinline 1989void noinline
1874ev_timer_stop (EV_P_ ev_timer *w) 1990ev_timer_stop (EV_P_ ev_timer *w)
1875{ 1991{
1876 clear_pending (EV_A_ (W)w); 1992 clear_pending (EV_A_ (W)w);
1877 if (expect_false (!ev_is_active (w))) 1993 if (expect_false (!ev_is_active (w)))
1878 return; 1994 return;
1879 1995
1880 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1881
1882 { 1996 {
1883 int active = ((W)w)->active; 1997 int active = ev_active (w);
1884 1998
1999 assert (("internal timer heap corruption", timers [active] == (WT)w));
2000
1885 if (expect_true (--active < --timercnt)) 2001 if (expect_true (active < timercnt + HEAP0 - 1))
1886 { 2002 {
1887 timers [active] = timers [timercnt]; 2003 timers [active] = timers [timercnt + HEAP0 - 1];
1888 adjustheap (timers, timercnt, active); 2004 adjustheap (timers, timercnt, active);
1889 } 2005 }
2006
2007 --timercnt;
1890 } 2008 }
1891 2009
1892 ((WT)w)->at -= mn_now; 2010 ev_at (w) -= mn_now;
1893 2011
1894 ev_stop (EV_A_ (W)w); 2012 ev_stop (EV_A_ (W)w);
1895} 2013}
1896 2014
1897void noinline 2015void noinline
… …
1899{ 2017{
1900 if (ev_is_active (w)) 2018 if (ev_is_active (w))
1901 { 2019 {
1902 if (w->repeat) 2020 if (w->repeat)
1903 { 2021 {
1904 ((WT)w)->at = mn_now + w->repeat; 2022 ev_at (w) = mn_now + w->repeat;
1905 adjustheap (timers, timercnt, ((W)w)->active - 1); 2023 adjustheap (timers, timercnt, ev_active (w));
1906 } 2024 }
1907 else 2025 else
1908 ev_timer_stop (EV_A_ w); 2026 ev_timer_stop (EV_A_ w);
1909 } 2027 }
1910 else if (w->repeat) 2028 else if (w->repeat)
1911 { 2029 {
1912 w->at = w->repeat; 2030 ev_at (w) = w->repeat;
1913 ev_timer_start (EV_A_ w); 2031 ev_timer_start (EV_A_ w);
1914 } 2032 }
1915} 2033}
1916 2034
1917#if EV_PERIODIC_ENABLE 2035#if EV_PERIODIC_ENABLE
… …
1920{ 2038{
1921 if (expect_false (ev_is_active (w))) 2039 if (expect_false (ev_is_active (w)))
1922 return; 2040 return;
1923 2041
1924 if (w->reschedule_cb) 2042 if (w->reschedule_cb)
1925 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2043 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1926 else if (w->interval) 2044 else if (w->interval)
1927 { 2045 {
1928 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.));
1929 /* 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 */
1930 ((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;
1931 } 2049 }
1932 else 2050 else
1933 ((WT)w)->at = w->offset; 2051 ev_at (w) = w->offset;
1934 2052
1935 ev_start (EV_A_ (W)w, ++periodiccnt); 2053 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1936 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2054 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1937 periodics [periodiccnt - 1] = (WT)w; 2055 periodics [ev_active (w)] = (WT)w;
1938 upheap (periodics, periodiccnt - 1); 2056 upheap (periodics, ev_active (w));
1939 2057
1940 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2058 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1941} 2059}
1942 2060
1943void noinline 2061void noinline
1944ev_periodic_stop (EV_P_ ev_periodic *w) 2062ev_periodic_stop (EV_P_ ev_periodic *w)
1945{ 2063{
1946 clear_pending (EV_A_ (W)w); 2064 clear_pending (EV_A_ (W)w);
1947 if (expect_false (!ev_is_active (w))) 2065 if (expect_false (!ev_is_active (w)))
1948 return; 2066 return;
1949 2067
1950 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1951
1952 { 2068 {
1953 int active = ((W)w)->active; 2069 int active = ev_active (w);
1954 2070
2071 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
2072
1955 if (expect_true (--active < --periodiccnt)) 2073 if (expect_true (active < periodiccnt + HEAP0 - 1))
1956 { 2074 {
1957 periodics [active] = periodics [periodiccnt]; 2075 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1958 adjustheap (periodics, periodiccnt, active); 2076 adjustheap (periodics, periodiccnt, active);
1959 } 2077 }
2078
2079 --periodiccnt;
1960 } 2080 }
1961 2081
1962 ev_stop (EV_A_ (W)w); 2082 ev_stop (EV_A_ (W)w);
1963} 2083}
1964 2084
… …
2080 if (w->wd < 0) 2200 if (w->wd < 0)
2081 { 2201 {
2082 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 */
2083 2203
2084 /* 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 */
2085 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2207 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2086 { 2208 {
2087 char path [4096]; 2209 char path [4096];
2088 strcpy (path, w->path); 2210 strcpy (path, w->path);
2089 2211
… …
2334 clear_pending (EV_A_ (W)w); 2456 clear_pending (EV_A_ (W)w);
2335 if (expect_false (!ev_is_active (w))) 2457 if (expect_false (!ev_is_active (w)))
2336 return; 2458 return;
2337 2459
2338 { 2460 {
2339 int active = ((W)w)->active; 2461 int active = ev_active (w);
2340 2462
2341 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2463 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2342 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2464 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2343 2465
2344 ev_stop (EV_A_ (W)w); 2466 ev_stop (EV_A_ (W)w);
2345 --idleall; 2467 --idleall;
2346 } 2468 }
2347} 2469}
… …
2364 clear_pending (EV_A_ (W)w); 2486 clear_pending (EV_A_ (W)w);
2365 if (expect_false (!ev_is_active (w))) 2487 if (expect_false (!ev_is_active (w)))
2366 return; 2488 return;
2367 2489
2368 { 2490 {
2369 int active = ((W)w)->active; 2491 int active = ev_active (w);
2492
2370 prepares [active - 1] = prepares [--preparecnt]; 2493 prepares [active - 1] = prepares [--preparecnt];
2371 ((W)prepares [active - 1])->active = active; 2494 ev_active (prepares [active - 1]) = active;
2372 } 2495 }
2373 2496
2374 ev_stop (EV_A_ (W)w); 2497 ev_stop (EV_A_ (W)w);
2375} 2498}
2376 2499
… …
2391 clear_pending (EV_A_ (W)w); 2514 clear_pending (EV_A_ (W)w);
2392 if (expect_false (!ev_is_active (w))) 2515 if (expect_false (!ev_is_active (w)))
2393 return; 2516 return;
2394 2517
2395 { 2518 {
2396 int active = ((W)w)->active; 2519 int active = ev_active (w);
2520
2397 checks [active - 1] = checks [--checkcnt]; 2521 checks [active - 1] = checks [--checkcnt];
2398 ((W)checks [active - 1])->active = active; 2522 ev_active (checks [active - 1]) = active;
2399 } 2523 }
2400 2524
2401 ev_stop (EV_A_ (W)w); 2525 ev_stop (EV_A_ (W)w);
2402} 2526}
2403 2527
… …
2499 clear_pending (EV_A_ (W)w); 2623 clear_pending (EV_A_ (W)w);
2500 if (expect_false (!ev_is_active (w))) 2624 if (expect_false (!ev_is_active (w)))
2501 return; 2625 return;
2502 2626
2503 { 2627 {
2504 int active = ((W)w)->active; 2628 int active = ev_active (w);
2629
2505 forks [active - 1] = forks [--forkcnt]; 2630 forks [active - 1] = forks [--forkcnt];
2506 ((W)forks [active - 1])->active = active; 2631 ev_active (forks [active - 1]) = active;
2507 } 2632 }
2508 2633
2509 ev_stop (EV_A_ (W)w); 2634 ev_stop (EV_A_ (W)w);
2510} 2635}
2511#endif 2636#endif
… …
2530 clear_pending (EV_A_ (W)w); 2655 clear_pending (EV_A_ (W)w);
2531 if (expect_false (!ev_is_active (w))) 2656 if (expect_false (!ev_is_active (w)))
2532 return; 2657 return;
2533 2658
2534 { 2659 {
2535 int active = ((W)w)->active; 2660 int active = ev_active (w);
2661
2536 asyncs [active - 1] = asyncs [--asynccnt]; 2662 asyncs [active - 1] = asyncs [--asynccnt];
2537 ((W)asyncs [active - 1])->active = active; 2663 ev_active (asyncs [active - 1]) = active;
2538 } 2664 }
2539 2665
2540 ev_stop (EV_A_ (W)w); 2666 ev_stop (EV_A_ (W)w);
2541} 2667}
2542 2668

Diff Legend

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