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.238 by root, Thu May 8 20:49:12 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#define USE_4HEAP 1/* they do not work corretcly */
772#if USE_4HEAP
773
774#define DHEAP 4
775#define HEAP0 (DHEAP - 1) /* index of first element in heap */
776
777/* towards the root */
737void inline_speed 778void inline_speed
738upheap (WT *heap, int k) 779upheap (WT *heap, int k)
739{ 780{
740 WT w = heap [k]; 781 WT w = heap [k];
741 782
742 while (k) 783 for (;;)
743 { 784 {
744 int p = (k - 1) >> 1; 785 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
745 786
746 if (heap [p]->at <= w->at) 787 if (p == k || heap [p]->at <= w->at)
747 break; 788 break;
748 789
749 heap [k] = heap [p]; 790 heap [k] = heap [p];
750 ((W)heap [k])->active = k + 1; 791 ev_active (heap [k]) = k;
751 k = p; 792 k = p;
752 } 793 }
753 794
754 heap [k] = w; 795 heap [k] = w;
755 ((W)heap [k])->active = k + 1; 796 ev_active (heap [k]) = k;
756} 797}
757 798
799/* away from the root */
758void inline_speed 800void inline_speed
759downheap (WT *heap, int N, int k) 801downheap (WT *heap, int N, int k)
760{ 802{
761 WT w = heap [k]; 803 WT w = heap [k];
804 WT *E = heap + N + HEAP0;
762 805
763 for (;;) 806 for (;;)
764 { 807 {
808 ev_tstamp minat;
809 WT *minpos;
810 WT *pos = heap + DHEAP * (k - HEAP0) + HEAP0;
811
812 // find minimum child
813 if (expect_true (pos + DHEAP - 1 < E))
814 {
815 /* fast path */
816 (minpos = pos + 0), (minat = (*minpos)->at);
817 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
818 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
819 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
820 }
821 else
822 {
823 /* slow path */
824 if (pos >= E)
825 break;
826 (minpos = pos + 0), (minat = (*minpos)->at);
827 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
828 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
829 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
830 }
831
832 if (w->at <= minat)
833 break;
834
835 ev_active (*minpos) = k;
836 heap [k] = *minpos;
837
838 k = minpos - heap;
839 }
840
841 heap [k] = w;
842 ev_active (heap [k]) = k;
843}
844
845#else // 4HEAP
846
847#define HEAP0 1
848
849/* towards the root */
850void inline_speed
851upheap (WT *heap, int k)
852{
853 WT w = heap [k];
854
855 for (;;)
856 {
857 int p = k >> 1;
858
859 /* maybe we could use a dummy element at heap [0]? */
860 if (!p || heap [p]->at <= w->at)
861 break;
862
863 heap [k] = heap [p];
864 ev_active (heap [k]) = k;
865 k = p;
866 }
867
868 heap [k] = w;
869 ev_active (heap [k]) = k;
870}
871
872/* away from the root */
873void inline_speed
874downheap (WT *heap, int N, int k)
875{
876 WT w = heap [k];
877
878 for (;;)
879 {
765 int c = (k << 1) + 1; 880 int c = k << 1;
766 881
767 if (c >= N) 882 if (c > N)
768 break; 883 break;
769 884
770 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 885 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
771 ? 1 : 0; 886 ? 1 : 0;
772 887
773 if (w->at <= heap [c]->at) 888 if (w->at <= heap [c]->at)
774 break; 889 break;
775 890
776 heap [k] = heap [c]; 891 heap [k] = heap [c];
777 ((W)heap [k])->active = k + 1; 892 ((W)heap [k])->active = k;
778 893
779 k = c; 894 k = c;
780 } 895 }
781 896
782 heap [k] = w; 897 heap [k] = w;
783 ((W)heap [k])->active = k + 1; 898 ev_active (heap [k]) = k;
784} 899}
900#endif
785 901
786void inline_size 902void inline_size
787adjustheap (WT *heap, int N, int k) 903adjustheap (WT *heap, int N, int k)
788{ 904{
789 upheap (heap, k); 905 upheap (heap, k);
… …
884pipecb (EV_P_ ev_io *iow, int revents) 1000pipecb (EV_P_ ev_io *iow, int revents)
885{ 1001{
886#if EV_USE_EVENTFD 1002#if EV_USE_EVENTFD
887 if (evfd >= 0) 1003 if (evfd >= 0)
888 { 1004 {
889 uint64_t counter = 1; 1005 uint64_t counter;
890 read (evfd, &counter, sizeof (uint64_t)); 1006 read (evfd, &counter, sizeof (uint64_t));
891 } 1007 }
892 else 1008 else
893#endif 1009#endif
894 { 1010 {
… …
1163 if (!(flags & EVFLAG_NOENV) 1279 if (!(flags & EVFLAG_NOENV)
1164 && !enable_secure () 1280 && !enable_secure ()
1165 && getenv ("LIBEV_FLAGS")) 1281 && getenv ("LIBEV_FLAGS"))
1166 flags = atoi (getenv ("LIBEV_FLAGS")); 1282 flags = atoi (getenv ("LIBEV_FLAGS"));
1167 1283
1168 if (!(flags & 0x0000ffffUL)) 1284 if (!(flags & 0x0000ffffU))
1169 flags |= ev_recommended_backends (); 1285 flags |= ev_recommended_backends ();
1170 1286
1171#if EV_USE_PORT 1287#if EV_USE_PORT
1172 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1288 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1173#endif 1289#endif
… …
1261#endif 1377#endif
1262 1378
1263 backend = 0; 1379 backend = 0;
1264} 1380}
1265 1381
1382#if EV_USE_INOTIFY
1266void inline_size infy_fork (EV_P); 1383void inline_size infy_fork (EV_P);
1384#endif
1267 1385
1268void inline_size 1386void inline_size
1269loop_fork (EV_P) 1387loop_fork (EV_P)
1270{ 1388{
1271#if EV_USE_PORT 1389#if EV_USE_PORT
… …
1338void 1456void
1339ev_loop_fork (EV_P) 1457ev_loop_fork (EV_P)
1340{ 1458{
1341 postfork = 1; /* must be in line with ev_default_fork */ 1459 postfork = 1; /* must be in line with ev_default_fork */
1342} 1460}
1343
1344#endif 1461#endif
1345 1462
1346#if EV_MULTIPLICITY 1463#if EV_MULTIPLICITY
1347struct ev_loop * 1464struct ev_loop *
1348ev_default_loop_init (unsigned int flags) 1465ev_default_loop_init (unsigned int flags)
… …
1429 EV_CB_INVOKE (p->w, p->events); 1546 EV_CB_INVOKE (p->w, p->events);
1430 } 1547 }
1431 } 1548 }
1432} 1549}
1433 1550
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 1551#if EV_IDLE_ENABLE
1515void inline_size 1552void inline_size
1516idle_reify (EV_P) 1553idle_reify (EV_P)
1517{ 1554{
1518 if (expect_false (idleall)) 1555 if (expect_false (idleall))
… …
1529 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1566 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1530 break; 1567 break;
1531 } 1568 }
1532 } 1569 }
1533 } 1570 }
1571}
1572#endif
1573
1574void inline_size
1575timers_reify (EV_P)
1576{
1577 while (timercnt && ev_at (timers [HEAP0]) <= mn_now)
1578 {
1579 ev_timer *w = (ev_timer *)timers [HEAP0];
1580
1581 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1582
1583 /* first reschedule or stop timer */
1584 if (w->repeat)
1585 {
1586 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1587
1588 ev_at (w) += w->repeat;
1589 if (ev_at (w) < mn_now)
1590 ev_at (w) = mn_now;
1591
1592 downheap (timers, timercnt, HEAP0);
1593 }
1594 else
1595 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1596
1597 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1598 }
1599}
1600
1601#if EV_PERIODIC_ENABLE
1602void inline_size
1603periodics_reify (EV_P)
1604{
1605 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now)
1606 {
1607 ev_periodic *w = (ev_periodic *)periodics [HEAP0];
1608
1609 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1610
1611 /* first reschedule or stop timer */
1612 if (w->reschedule_cb)
1613 {
1614 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1615 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1616 downheap (periodics, periodiccnt, 1);
1617 }
1618 else if (w->interval)
1619 {
1620 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1621 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1622 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1623 downheap (periodics, periodiccnt, HEAP0);
1624 }
1625 else
1626 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1627
1628 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1629 }
1630}
1631
1632static void noinline
1633periodics_reschedule (EV_P)
1634{
1635 int i;
1636
1637 /* adjust periodics after time jump */
1638 for (i = 1; i <= periodiccnt; ++i)
1639 {
1640 ev_periodic *w = (ev_periodic *)periodics [i];
1641
1642 if (w->reschedule_cb)
1643 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1644 else if (w->interval)
1645 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1646 }
1647
1648 /* now rebuild the heap */
1649 for (i = periodiccnt >> 1; --i; )
1650 downheap (periodics, periodiccnt, i + HEAP0);
1534} 1651}
1535#endif 1652#endif
1536 1653
1537void inline_speed 1654void inline_speed
1538time_update (EV_P_ ev_tstamp max_block) 1655time_update (EV_P_ ev_tstamp max_block)
… …
1567 */ 1684 */
1568 for (i = 4; --i; ) 1685 for (i = 4; --i; )
1569 { 1686 {
1570 rtmn_diff = ev_rt_now - mn_now; 1687 rtmn_diff = ev_rt_now - mn_now;
1571 1688
1572 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1689 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1573 return; /* all is well */ 1690 return; /* all is well */
1574 1691
1575 ev_rt_now = ev_time (); 1692 ev_rt_now = ev_time ();
1576 mn_now = get_clock (); 1693 mn_now = get_clock ();
1577 now_floor = mn_now; 1694 now_floor = mn_now;
… …
1592 { 1709 {
1593#if EV_PERIODIC_ENABLE 1710#if EV_PERIODIC_ENABLE
1594 periodics_reschedule (EV_A); 1711 periodics_reschedule (EV_A);
1595#endif 1712#endif
1596 /* adjust timers. this is easy, as the offset is the same for all of them */ 1713 /* adjust timers. this is easy, as the offset is the same for all of them */
1597 for (i = 0; i < timercnt; ++i) 1714 for (i = 1; i <= timercnt; ++i)
1598 ((WT)timers [i])->at += ev_rt_now - mn_now; 1715 ev_at (timers [i]) += ev_rt_now - mn_now;
1599 } 1716 }
1600 1717
1601 mn_now = ev_rt_now; 1718 mn_now = ev_rt_now;
1602 } 1719 }
1603} 1720}
… …
1673 1790
1674 waittime = MAX_BLOCKTIME; 1791 waittime = MAX_BLOCKTIME;
1675 1792
1676 if (timercnt) 1793 if (timercnt)
1677 { 1794 {
1678 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1795 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1679 if (waittime > to) waittime = to; 1796 if (waittime > to) waittime = to;
1680 } 1797 }
1681 1798
1682#if EV_PERIODIC_ENABLE 1799#if EV_PERIODIC_ENABLE
1683 if (periodiccnt) 1800 if (periodiccnt)
1684 { 1801 {
1685 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1802 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1686 if (waittime > to) waittime = to; 1803 if (waittime > to) waittime = to;
1687 } 1804 }
1688#endif 1805#endif
1689 1806
1690 if (expect_false (waittime < timeout_blocktime)) 1807 if (expect_false (waittime < timeout_blocktime))
… …
1856ev_timer_start (EV_P_ ev_timer *w) 1973ev_timer_start (EV_P_ ev_timer *w)
1857{ 1974{
1858 if (expect_false (ev_is_active (w))) 1975 if (expect_false (ev_is_active (w)))
1859 return; 1976 return;
1860 1977
1861 ((WT)w)->at += mn_now; 1978 ev_at (w) += mn_now;
1862 1979
1863 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1980 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1864 1981
1865 ev_start (EV_A_ (W)w, ++timercnt); 1982 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1866 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1983 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1867 timers [timercnt - 1] = (WT)w; 1984 timers [ev_active (w)] = (WT)w;
1868 upheap (timers, timercnt - 1); 1985 upheap (timers, ev_active (w));
1869 1986
1870 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1987 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1871} 1988}
1872 1989
1873void noinline 1990void noinline
1874ev_timer_stop (EV_P_ ev_timer *w) 1991ev_timer_stop (EV_P_ ev_timer *w)
1875{ 1992{
1876 clear_pending (EV_A_ (W)w); 1993 clear_pending (EV_A_ (W)w);
1877 if (expect_false (!ev_is_active (w))) 1994 if (expect_false (!ev_is_active (w)))
1878 return; 1995 return;
1879 1996
1880 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1881
1882 { 1997 {
1883 int active = ((W)w)->active; 1998 int active = ev_active (w);
1884 1999
2000 assert (("internal timer heap corruption", timers [active] == (WT)w));
2001
1885 if (expect_true (--active < --timercnt)) 2002 if (expect_true (active < timercnt + HEAP0 - 1))
1886 { 2003 {
1887 timers [active] = timers [timercnt]; 2004 timers [active] = timers [timercnt + HEAP0 - 1];
1888 adjustheap (timers, timercnt, active); 2005 adjustheap (timers, timercnt, active);
1889 } 2006 }
2007
2008 --timercnt;
1890 } 2009 }
1891 2010
1892 ((WT)w)->at -= mn_now; 2011 ev_at (w) -= mn_now;
1893 2012
1894 ev_stop (EV_A_ (W)w); 2013 ev_stop (EV_A_ (W)w);
1895} 2014}
1896 2015
1897void noinline 2016void noinline
… …
1899{ 2018{
1900 if (ev_is_active (w)) 2019 if (ev_is_active (w))
1901 { 2020 {
1902 if (w->repeat) 2021 if (w->repeat)
1903 { 2022 {
1904 ((WT)w)->at = mn_now + w->repeat; 2023 ev_at (w) = mn_now + w->repeat;
1905 adjustheap (timers, timercnt, ((W)w)->active - 1); 2024 adjustheap (timers, timercnt, ev_active (w));
1906 } 2025 }
1907 else 2026 else
1908 ev_timer_stop (EV_A_ w); 2027 ev_timer_stop (EV_A_ w);
1909 } 2028 }
1910 else if (w->repeat) 2029 else if (w->repeat)
1911 { 2030 {
1912 w->at = w->repeat; 2031 ev_at (w) = w->repeat;
1913 ev_timer_start (EV_A_ w); 2032 ev_timer_start (EV_A_ w);
1914 } 2033 }
1915} 2034}
1916 2035
1917#if EV_PERIODIC_ENABLE 2036#if EV_PERIODIC_ENABLE
… …
1920{ 2039{
1921 if (expect_false (ev_is_active (w))) 2040 if (expect_false (ev_is_active (w)))
1922 return; 2041 return;
1923 2042
1924 if (w->reschedule_cb) 2043 if (w->reschedule_cb)
1925 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2044 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1926 else if (w->interval) 2045 else if (w->interval)
1927 { 2046 {
1928 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2047 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 */ 2048 /* 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; 2049 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1931 } 2050 }
1932 else 2051 else
1933 ((WT)w)->at = w->offset; 2052 ev_at (w) = w->offset;
1934 2053
1935 ev_start (EV_A_ (W)w, ++periodiccnt); 2054 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1936 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2055 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1937 periodics [periodiccnt - 1] = (WT)w; 2056 periodics [ev_active (w)] = (WT)w;
1938 upheap (periodics, periodiccnt - 1); 2057 upheap (periodics, ev_active (w));
1939 2058
1940 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2059 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1941} 2060}
1942 2061
1943void noinline 2062void noinline
1944ev_periodic_stop (EV_P_ ev_periodic *w) 2063ev_periodic_stop (EV_P_ ev_periodic *w)
1945{ 2064{
1946 clear_pending (EV_A_ (W)w); 2065 clear_pending (EV_A_ (W)w);
1947 if (expect_false (!ev_is_active (w))) 2066 if (expect_false (!ev_is_active (w)))
1948 return; 2067 return;
1949 2068
1950 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1951
1952 { 2069 {
1953 int active = ((W)w)->active; 2070 int active = ev_active (w);
1954 2071
2072 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
2073
1955 if (expect_true (--active < --periodiccnt)) 2074 if (expect_true (active < periodiccnt + HEAP0 - 1))
1956 { 2075 {
1957 periodics [active] = periodics [periodiccnt]; 2076 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1958 adjustheap (periodics, periodiccnt, active); 2077 adjustheap (periodics, periodiccnt, active);
1959 } 2078 }
2079
2080 --periodiccnt;
1960 } 2081 }
1961 2082
1962 ev_stop (EV_A_ (W)w); 2083 ev_stop (EV_A_ (W)w);
1963} 2084}
1964 2085
… …
2080 if (w->wd < 0) 2201 if (w->wd < 0)
2081 { 2202 {
2082 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2203 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2083 2204
2084 /* monitor some parent directory for speedup hints */ 2205 /* monitor some parent directory for speedup hints */
2206 /* note that exceeding the hardcoded limit is not a correctness issue, */
2207 /* but an efficiency issue only */
2085 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2208 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2086 { 2209 {
2087 char path [4096]; 2210 char path [4096];
2088 strcpy (path, w->path); 2211 strcpy (path, w->path);
2089 2212
… …
2334 clear_pending (EV_A_ (W)w); 2457 clear_pending (EV_A_ (W)w);
2335 if (expect_false (!ev_is_active (w))) 2458 if (expect_false (!ev_is_active (w)))
2336 return; 2459 return;
2337 2460
2338 { 2461 {
2339 int active = ((W)w)->active; 2462 int active = ev_active (w);
2340 2463
2341 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2464 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2342 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2465 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2343 2466
2344 ev_stop (EV_A_ (W)w); 2467 ev_stop (EV_A_ (W)w);
2345 --idleall; 2468 --idleall;
2346 } 2469 }
2347} 2470}
… …
2364 clear_pending (EV_A_ (W)w); 2487 clear_pending (EV_A_ (W)w);
2365 if (expect_false (!ev_is_active (w))) 2488 if (expect_false (!ev_is_active (w)))
2366 return; 2489 return;
2367 2490
2368 { 2491 {
2369 int active = ((W)w)->active; 2492 int active = ev_active (w);
2493
2370 prepares [active - 1] = prepares [--preparecnt]; 2494 prepares [active - 1] = prepares [--preparecnt];
2371 ((W)prepares [active - 1])->active = active; 2495 ev_active (prepares [active - 1]) = active;
2372 } 2496 }
2373 2497
2374 ev_stop (EV_A_ (W)w); 2498 ev_stop (EV_A_ (W)w);
2375} 2499}
2376 2500
… …
2391 clear_pending (EV_A_ (W)w); 2515 clear_pending (EV_A_ (W)w);
2392 if (expect_false (!ev_is_active (w))) 2516 if (expect_false (!ev_is_active (w)))
2393 return; 2517 return;
2394 2518
2395 { 2519 {
2396 int active = ((W)w)->active; 2520 int active = ev_active (w);
2521
2397 checks [active - 1] = checks [--checkcnt]; 2522 checks [active - 1] = checks [--checkcnt];
2398 ((W)checks [active - 1])->active = active; 2523 ev_active (checks [active - 1]) = active;
2399 } 2524 }
2400 2525
2401 ev_stop (EV_A_ (W)w); 2526 ev_stop (EV_A_ (W)w);
2402} 2527}
2403 2528
… …
2499 clear_pending (EV_A_ (W)w); 2624 clear_pending (EV_A_ (W)w);
2500 if (expect_false (!ev_is_active (w))) 2625 if (expect_false (!ev_is_active (w)))
2501 return; 2626 return;
2502 2627
2503 { 2628 {
2504 int active = ((W)w)->active; 2629 int active = ev_active (w);
2630
2505 forks [active - 1] = forks [--forkcnt]; 2631 forks [active - 1] = forks [--forkcnt];
2506 ((W)forks [active - 1])->active = active; 2632 ev_active (forks [active - 1]) = active;
2507 } 2633 }
2508 2634
2509 ev_stop (EV_A_ (W)w); 2635 ev_stop (EV_A_ (W)w);
2510} 2636}
2511#endif 2637#endif
… …
2530 clear_pending (EV_A_ (W)w); 2656 clear_pending (EV_A_ (W)w);
2531 if (expect_false (!ev_is_active (w))) 2657 if (expect_false (!ev_is_active (w)))
2532 return; 2658 return;
2533 2659
2534 { 2660 {
2535 int active = ((W)w)->active; 2661 int active = ev_active (w);
2662
2536 asyncs [active - 1] = asyncs [--asynccnt]; 2663 asyncs [active - 1] = asyncs [--asynccnt];
2537 ((W)asyncs [active - 1])->active = active; 2664 ev_active (asyncs [active - 1]) = active;
2538 } 2665 }
2539 2666
2540 ev_stop (EV_A_ (W)w); 2667 ev_stop (EV_A_ (W)w);
2541} 2668}
2542 2669

Diff Legend

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