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

Diff Legend

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