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

Comparing libev/ev.c (file contents):
Revision 1.221 by root, Sun Apr 6 12:44:49 2008 UTC vs.
Revision 1.238 by root, Thu May 8 20:49:12 2008 UTC

… …
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> 273# include <stdint.h>
274# ifdef __cplusplus
275extern "C" {
276# endif
274int eventfd (unsigned int initval, int flags); 277int eventfd (unsigned int initval, int flags);
278# ifdef __cplusplus
279}
280# endif
275#endif 281#endif
276 282
277/**/ 283/**/
278 284
279/* 285/*
… …
294# define expect(expr,value) __builtin_expect ((expr),(value)) 300# define expect(expr,value) __builtin_expect ((expr),(value))
295# define noinline __attribute__ ((noinline)) 301# define noinline __attribute__ ((noinline))
296#else 302#else
297# define expect(expr,value) (expr) 303# define expect(expr,value) (expr)
298# define noinline 304# define noinline
299# if __STDC_VERSION__ < 199901L 305# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
300# define inline 306# define inline
301# endif 307# endif
302#endif 308#endif
303 309
304#define expect_false(expr) expect ((expr) != 0, 0) 310#define expect_false(expr) expect ((expr) != 0, 0)
… …
319 325
320typedef ev_watcher *W; 326typedef ev_watcher *W;
321typedef ev_watcher_list *WL; 327typedef ev_watcher_list *WL;
322typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
323 329
330#define ev_active(w) ((W)(w))->active
331#define ev_at(w) ((WT)(w))->at
332
324#if EV_USE_MONOTONIC 333#if EV_USE_MONOTONIC
325/* 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 */
326/* giving it a reasonably high chance of working on typical architetcures */ 335/* giving it a reasonably high chance of working on typical architetcures */
327static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 336static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
328#endif 337#endif
… …
354 perror (msg); 363 perror (msg);
355 abort (); 364 abort ();
356 } 365 }
357} 366}
358 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
359static void *(*alloc)(void *ptr, long size); 383static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
360 384
361void 385void
362ev_set_allocator (void *(*cb)(void *ptr, long size)) 386ev_set_allocator (void *(*cb)(void *ptr, long size))
363{ 387{
364 alloc = cb; 388 alloc = cb;
365} 389}
366 390
367inline_speed void * 391inline_speed void *
368ev_realloc (void *ptr, long size) 392ev_realloc (void *ptr, long size)
369{ 393{
370 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 394 ptr = alloc (ptr, size);
371 395
372 if (!ptr && size) 396 if (!ptr && size)
373 { 397 {
374 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 398 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
375 abort (); 399 abort ();
… …
496 } 520 }
497} 521}
498 522
499/*****************************************************************************/ 523/*****************************************************************************/
500 524
525#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
526
501int inline_size 527int inline_size
502array_nextsize (int elem, int cur, int cnt) 528array_nextsize (int elem, int cur, int cnt)
503{ 529{
504 int ncur = cur + 1; 530 int ncur = cur + 1;
505 531
506 do 532 do
507 ncur <<= 1; 533 ncur <<= 1;
508 while (cnt > ncur); 534 while (cnt > ncur);
509 535
510 /* 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 */
511 if (elem * ncur > 4096) 537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
512 { 538 {
513 ncur *= elem; 539 ncur *= elem;
514 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
515 ncur = ncur - sizeof (void *) * 4; 541 ncur = ncur - sizeof (void *) * 4;
516 ncur /= elem; 542 ncur /= elem;
517 } 543 }
518 544
519 return ncur; 545 return ncur;
… …
733 } 759 }
734} 760}
735 761
736/*****************************************************************************/ 762/*****************************************************************************/
737 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 */
738void inline_speed 778void inline_speed
739upheap (WT *heap, int k) 779upheap (WT *heap, int k)
740{ 780{
741 WT w = heap [k]; 781 WT w = heap [k];
742 782
743 while (k) 783 for (;;)
744 { 784 {
745 int p = (k - 1) >> 1; 785 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
746 786
747 if (heap [p]->at <= w->at) 787 if (p == k || heap [p]->at <= w->at)
748 break; 788 break;
749 789
750 heap [k] = heap [p]; 790 heap [k] = heap [p];
751 ((W)heap [k])->active = k + 1; 791 ev_active (heap [k]) = k;
752 k = p; 792 k = p;
753 } 793 }
754 794
755 heap [k] = w; 795 heap [k] = w;
756 ((W)heap [k])->active = k + 1; 796 ev_active (heap [k]) = k;
757} 797}
758 798
799/* away from the root */
759void inline_speed 800void inline_speed
760downheap (WT *heap, int N, int k) 801downheap (WT *heap, int N, int k)
761{ 802{
762 WT w = heap [k]; 803 WT w = heap [k];
804 WT *E = heap + N + HEAP0;
763 805
764 for (;;) 806 for (;;)
765 { 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 {
766 int c = (k << 1) + 1; 880 int c = k << 1;
767 881
768 if (c >= N) 882 if (c > N)
769 break; 883 break;
770 884
771 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 885 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
772 ? 1 : 0; 886 ? 1 : 0;
773 887
774 if (w->at <= heap [c]->at) 888 if (w->at <= heap [c]->at)
775 break; 889 break;
776 890
777 heap [k] = heap [c]; 891 heap [k] = heap [c];
778 ((W)heap [k])->active = k + 1; 892 ((W)heap [k])->active = k;
779 893
780 k = c; 894 k = c;
781 } 895 }
782 896
783 heap [k] = w; 897 heap [k] = w;
784 ((W)heap [k])->active = k + 1; 898 ev_active (heap [k]) = k;
785} 899}
900#endif
786 901
787void inline_size 902void inline_size
788adjustheap (WT *heap, int N, int k) 903adjustheap (WT *heap, int N, int k)
789{ 904{
790 upheap (heap, k); 905 upheap (heap, k);
… …
885pipecb (EV_P_ ev_io *iow, int revents) 1000pipecb (EV_P_ ev_io *iow, int revents)
886{ 1001{
887#if EV_USE_EVENTFD 1002#if EV_USE_EVENTFD
888 if (evfd >= 0) 1003 if (evfd >= 0)
889 { 1004 {
890 uint64_t counter = 1; 1005 uint64_t counter;
891 read (evfd, &counter, sizeof (uint64_t)); 1006 read (evfd, &counter, sizeof (uint64_t));
892 } 1007 }
893 else 1008 else
894#endif 1009#endif
895 { 1010 {
… …
1164 if (!(flags & EVFLAG_NOENV) 1279 if (!(flags & EVFLAG_NOENV)
1165 && !enable_secure () 1280 && !enable_secure ()
1166 && getenv ("LIBEV_FLAGS")) 1281 && getenv ("LIBEV_FLAGS"))
1167 flags = atoi (getenv ("LIBEV_FLAGS")); 1282 flags = atoi (getenv ("LIBEV_FLAGS"));
1168 1283
1169 if (!(flags & 0x0000ffffUL)) 1284 if (!(flags & 0x0000ffffU))
1170 flags |= ev_recommended_backends (); 1285 flags |= ev_recommended_backends ();
1171 1286
1172#if EV_USE_PORT 1287#if EV_USE_PORT
1173 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1288 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1174#endif 1289#endif
… …
1262#endif 1377#endif
1263 1378
1264 backend = 0; 1379 backend = 0;
1265} 1380}
1266 1381
1382#if EV_USE_INOTIFY
1267void inline_size infy_fork (EV_P); 1383void inline_size infy_fork (EV_P);
1384#endif
1268 1385
1269void inline_size 1386void inline_size
1270loop_fork (EV_P) 1387loop_fork (EV_P)
1271{ 1388{
1272#if EV_USE_PORT 1389#if EV_USE_PORT
… …
1339void 1456void
1340ev_loop_fork (EV_P) 1457ev_loop_fork (EV_P)
1341{ 1458{
1342 postfork = 1; /* must be in line with ev_default_fork */ 1459 postfork = 1; /* must be in line with ev_default_fork */
1343} 1460}
1344
1345#endif 1461#endif
1346 1462
1347#if EV_MULTIPLICITY 1463#if EV_MULTIPLICITY
1348struct ev_loop * 1464struct ev_loop *
1349ev_default_loop_init (unsigned int flags) 1465ev_default_loop_init (unsigned int flags)
… …
1430 EV_CB_INVOKE (p->w, p->events); 1546 EV_CB_INVOKE (p->w, p->events);
1431 } 1547 }
1432 } 1548 }
1433} 1549}
1434 1550
1435void inline_size
1436timers_reify (EV_P)
1437{
1438 while (timercnt && ((WT)timers [0])->at <= mn_now)
1439 {
1440 ev_timer *w = (ev_timer *)timers [0];
1441
1442 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1443
1444 /* first reschedule or stop timer */
1445 if (w->repeat)
1446 {
1447 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1448
1449 ((WT)w)->at += w->repeat;
1450 if (((WT)w)->at < mn_now)
1451 ((WT)w)->at = mn_now;
1452
1453 downheap (timers, timercnt, 0);
1454 }
1455 else
1456 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1457
1458 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1459 }
1460}
1461
1462#if EV_PERIODIC_ENABLE
1463void inline_size
1464periodics_reify (EV_P)
1465{
1466 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1467 {
1468 ev_periodic *w = (ev_periodic *)periodics [0];
1469
1470 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1471
1472 /* first reschedule or stop timer */
1473 if (w->reschedule_cb)
1474 {
1475 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1476 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1477 downheap (periodics, periodiccnt, 0);
1478 }
1479 else if (w->interval)
1480 {
1481 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1482 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1483 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1484 downheap (periodics, periodiccnt, 0);
1485 }
1486 else
1487 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1488
1489 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1490 }
1491}
1492
1493static void noinline
1494periodics_reschedule (EV_P)
1495{
1496 int i;
1497
1498 /* adjust periodics after time jump */
1499 for (i = 0; i < periodiccnt; ++i)
1500 {
1501 ev_periodic *w = (ev_periodic *)periodics [i];
1502
1503 if (w->reschedule_cb)
1504 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1505 else if (w->interval)
1506 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1507 }
1508
1509 /* now rebuild the heap */
1510 for (i = periodiccnt >> 1; i--; )
1511 downheap (periodics, periodiccnt, i);
1512}
1513#endif
1514
1515#if EV_IDLE_ENABLE 1551#if EV_IDLE_ENABLE
1516void inline_size 1552void inline_size
1517idle_reify (EV_P) 1553idle_reify (EV_P)
1518{ 1554{
1519 if (expect_false (idleall)) 1555 if (expect_false (idleall))
… …
1530 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1566 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1531 break; 1567 break;
1532 } 1568 }
1533 } 1569 }
1534 } 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);
1535} 1651}
1536#endif 1652#endif
1537 1653
1538void inline_speed 1654void inline_speed
1539time_update (EV_P_ ev_tstamp max_block) 1655time_update (EV_P_ ev_tstamp max_block)
… …
1568 */ 1684 */
1569 for (i = 4; --i; ) 1685 for (i = 4; --i; )
1570 { 1686 {
1571 rtmn_diff = ev_rt_now - mn_now; 1687 rtmn_diff = ev_rt_now - mn_now;
1572 1688
1573 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1689 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1574 return; /* all is well */ 1690 return; /* all is well */
1575 1691
1576 ev_rt_now = ev_time (); 1692 ev_rt_now = ev_time ();
1577 mn_now = get_clock (); 1693 mn_now = get_clock ();
1578 now_floor = mn_now; 1694 now_floor = mn_now;
… …
1593 { 1709 {
1594#if EV_PERIODIC_ENABLE 1710#if EV_PERIODIC_ENABLE
1595 periodics_reschedule (EV_A); 1711 periodics_reschedule (EV_A);
1596#endif 1712#endif
1597 /* 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 */
1598 for (i = 0; i < timercnt; ++i) 1714 for (i = 1; i <= timercnt; ++i)
1599 ((WT)timers [i])->at += ev_rt_now - mn_now; 1715 ev_at (timers [i]) += ev_rt_now - mn_now;
1600 } 1716 }
1601 1717
1602 mn_now = ev_rt_now; 1718 mn_now = ev_rt_now;
1603 } 1719 }
1604} 1720}
… …
1674 1790
1675 waittime = MAX_BLOCKTIME; 1791 waittime = MAX_BLOCKTIME;
1676 1792
1677 if (timercnt) 1793 if (timercnt)
1678 { 1794 {
1679 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1795 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1680 if (waittime > to) waittime = to; 1796 if (waittime > to) waittime = to;
1681 } 1797 }
1682 1798
1683#if EV_PERIODIC_ENABLE 1799#if EV_PERIODIC_ENABLE
1684 if (periodiccnt) 1800 if (periodiccnt)
1685 { 1801 {
1686 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;
1687 if (waittime > to) waittime = to; 1803 if (waittime > to) waittime = to;
1688 } 1804 }
1689#endif 1805#endif
1690 1806
1691 if (expect_false (waittime < timeout_blocktime)) 1807 if (expect_false (waittime < timeout_blocktime))
… …
1857ev_timer_start (EV_P_ ev_timer *w) 1973ev_timer_start (EV_P_ ev_timer *w)
1858{ 1974{
1859 if (expect_false (ev_is_active (w))) 1975 if (expect_false (ev_is_active (w)))
1860 return; 1976 return;
1861 1977
1862 ((WT)w)->at += mn_now; 1978 ev_at (w) += mn_now;
1863 1979
1864 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.));
1865 1981
1866 ev_start (EV_A_ (W)w, ++timercnt); 1982 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1867 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1983 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1868 timers [timercnt - 1] = (WT)w; 1984 timers [ev_active (w)] = (WT)w;
1869 upheap (timers, timercnt - 1); 1985 upheap (timers, ev_active (w));
1870 1986
1871 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1987 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1872} 1988}
1873 1989
1874void noinline 1990void noinline
1875ev_timer_stop (EV_P_ ev_timer *w) 1991ev_timer_stop (EV_P_ ev_timer *w)
1876{ 1992{
1877 clear_pending (EV_A_ (W)w); 1993 clear_pending (EV_A_ (W)w);
1878 if (expect_false (!ev_is_active (w))) 1994 if (expect_false (!ev_is_active (w)))
1879 return; 1995 return;
1880 1996
1881 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1882
1883 { 1997 {
1884 int active = ((W)w)->active; 1998 int active = ev_active (w);
1885 1999
2000 assert (("internal timer heap corruption", timers [active] == (WT)w));
2001
1886 if (expect_true (--active < --timercnt)) 2002 if (expect_true (active < timercnt + HEAP0 - 1))
1887 { 2003 {
1888 timers [active] = timers [timercnt]; 2004 timers [active] = timers [timercnt + HEAP0 - 1];
1889 adjustheap (timers, timercnt, active); 2005 adjustheap (timers, timercnt, active);
1890 } 2006 }
2007
2008 --timercnt;
1891 } 2009 }
1892 2010
1893 ((WT)w)->at -= mn_now; 2011 ev_at (w) -= mn_now;
1894 2012
1895 ev_stop (EV_A_ (W)w); 2013 ev_stop (EV_A_ (W)w);
1896} 2014}
1897 2015
1898void noinline 2016void noinline
… …
1900{ 2018{
1901 if (ev_is_active (w)) 2019 if (ev_is_active (w))
1902 { 2020 {
1903 if (w->repeat) 2021 if (w->repeat)
1904 { 2022 {
1905 ((WT)w)->at = mn_now + w->repeat; 2023 ev_at (w) = mn_now + w->repeat;
1906 adjustheap (timers, timercnt, ((W)w)->active - 1); 2024 adjustheap (timers, timercnt, ev_active (w));
1907 } 2025 }
1908 else 2026 else
1909 ev_timer_stop (EV_A_ w); 2027 ev_timer_stop (EV_A_ w);
1910 } 2028 }
1911 else if (w->repeat) 2029 else if (w->repeat)
1912 { 2030 {
1913 w->at = w->repeat; 2031 ev_at (w) = w->repeat;
1914 ev_timer_start (EV_A_ w); 2032 ev_timer_start (EV_A_ w);
1915 } 2033 }
1916} 2034}
1917 2035
1918#if EV_PERIODIC_ENABLE 2036#if EV_PERIODIC_ENABLE
… …
1921{ 2039{
1922 if (expect_false (ev_is_active (w))) 2040 if (expect_false (ev_is_active (w)))
1923 return; 2041 return;
1924 2042
1925 if (w->reschedule_cb) 2043 if (w->reschedule_cb)
1926 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2044 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1927 else if (w->interval) 2045 else if (w->interval)
1928 { 2046 {
1929 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.));
1930 /* 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 */
1931 ((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;
1932 } 2050 }
1933 else 2051 else
1934 ((WT)w)->at = w->offset; 2052 ev_at (w) = w->offset;
1935 2053
1936 ev_start (EV_A_ (W)w, ++periodiccnt); 2054 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1937 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2055 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1938 periodics [periodiccnt - 1] = (WT)w; 2056 periodics [ev_active (w)] = (WT)w;
1939 upheap (periodics, periodiccnt - 1); 2057 upheap (periodics, ev_active (w));
1940 2058
1941 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2059 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1942} 2060}
1943 2061
1944void noinline 2062void noinline
1945ev_periodic_stop (EV_P_ ev_periodic *w) 2063ev_periodic_stop (EV_P_ ev_periodic *w)
1946{ 2064{
1947 clear_pending (EV_A_ (W)w); 2065 clear_pending (EV_A_ (W)w);
1948 if (expect_false (!ev_is_active (w))) 2066 if (expect_false (!ev_is_active (w)))
1949 return; 2067 return;
1950 2068
1951 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1952
1953 { 2069 {
1954 int active = ((W)w)->active; 2070 int active = ev_active (w);
1955 2071
2072 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
2073
1956 if (expect_true (--active < --periodiccnt)) 2074 if (expect_true (active < periodiccnt + HEAP0 - 1))
1957 { 2075 {
1958 periodics [active] = periodics [periodiccnt]; 2076 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1959 adjustheap (periodics, periodiccnt, active); 2077 adjustheap (periodics, periodiccnt, active);
1960 } 2078 }
2079
2080 --periodiccnt;
1961 } 2081 }
1962 2082
1963 ev_stop (EV_A_ (W)w); 2083 ev_stop (EV_A_ (W)w);
1964} 2084}
1965 2085
… …
2081 if (w->wd < 0) 2201 if (w->wd < 0)
2082 { 2202 {
2083 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 */
2084 2204
2085 /* 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 */
2086 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2208 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2087 { 2209 {
2088 char path [4096]; 2210 char path [4096];
2089 strcpy (path, w->path); 2211 strcpy (path, w->path);
2090 2212
… …
2335 clear_pending (EV_A_ (W)w); 2457 clear_pending (EV_A_ (W)w);
2336 if (expect_false (!ev_is_active (w))) 2458 if (expect_false (!ev_is_active (w)))
2337 return; 2459 return;
2338 2460
2339 { 2461 {
2340 int active = ((W)w)->active; 2462 int active = ev_active (w);
2341 2463
2342 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2464 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2343 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2465 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2344 2466
2345 ev_stop (EV_A_ (W)w); 2467 ev_stop (EV_A_ (W)w);
2346 --idleall; 2468 --idleall;
2347 } 2469 }
2348} 2470}
… …
2365 clear_pending (EV_A_ (W)w); 2487 clear_pending (EV_A_ (W)w);
2366 if (expect_false (!ev_is_active (w))) 2488 if (expect_false (!ev_is_active (w)))
2367 return; 2489 return;
2368 2490
2369 { 2491 {
2370 int active = ((W)w)->active; 2492 int active = ev_active (w);
2493
2371 prepares [active - 1] = prepares [--preparecnt]; 2494 prepares [active - 1] = prepares [--preparecnt];
2372 ((W)prepares [active - 1])->active = active; 2495 ev_active (prepares [active - 1]) = active;
2373 } 2496 }
2374 2497
2375 ev_stop (EV_A_ (W)w); 2498 ev_stop (EV_A_ (W)w);
2376} 2499}
2377 2500
… …
2392 clear_pending (EV_A_ (W)w); 2515 clear_pending (EV_A_ (W)w);
2393 if (expect_false (!ev_is_active (w))) 2516 if (expect_false (!ev_is_active (w)))
2394 return; 2517 return;
2395 2518
2396 { 2519 {
2397 int active = ((W)w)->active; 2520 int active = ev_active (w);
2521
2398 checks [active - 1] = checks [--checkcnt]; 2522 checks [active - 1] = checks [--checkcnt];
2399 ((W)checks [active - 1])->active = active; 2523 ev_active (checks [active - 1]) = active;
2400 } 2524 }
2401 2525
2402 ev_stop (EV_A_ (W)w); 2526 ev_stop (EV_A_ (W)w);
2403} 2527}
2404 2528
… …
2500 clear_pending (EV_A_ (W)w); 2624 clear_pending (EV_A_ (W)w);
2501 if (expect_false (!ev_is_active (w))) 2625 if (expect_false (!ev_is_active (w)))
2502 return; 2626 return;
2503 2627
2504 { 2628 {
2505 int active = ((W)w)->active; 2629 int active = ev_active (w);
2630
2506 forks [active - 1] = forks [--forkcnt]; 2631 forks [active - 1] = forks [--forkcnt];
2507 ((W)forks [active - 1])->active = active; 2632 ev_active (forks [active - 1]) = active;
2508 } 2633 }
2509 2634
2510 ev_stop (EV_A_ (W)w); 2635 ev_stop (EV_A_ (W)w);
2511} 2636}
2512#endif 2637#endif
… …
2531 clear_pending (EV_A_ (W)w); 2656 clear_pending (EV_A_ (W)w);
2532 if (expect_false (!ev_is_active (w))) 2657 if (expect_false (!ev_is_active (w)))
2533 return; 2658 return;
2534 2659
2535 { 2660 {
2536 int active = ((W)w)->active; 2661 int active = ev_active (w);
2662
2537 asyncs [active - 1] = asyncs [--asynccnt]; 2663 asyncs [active - 1] = asyncs [--asynccnt];
2538 ((W)asyncs [active - 1])->active = active; 2664 ev_active (asyncs [active - 1]) = active;
2539 } 2665 }
2540 2666
2541 ev_stop (EV_A_ (W)w); 2667 ev_stop (EV_A_ (W)w);
2542} 2668}
2543 2669

Diff Legend

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