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.234 by root, Tue May 6 23:42:16 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/* towards the root */
738void inline_speed 765void inline_speed
739upheap (WT *heap, int k) 766upheap (WT *heap, int k)
740{ 767{
741 WT w = heap [k]; 768 WT w = heap [k];
742 769
743 while (k) 770 for (;;)
744 { 771 {
745 int p = (k - 1) >> 1; 772 int p = k >> 1;
746 773
774 /* maybe we could use a dummy element at heap [0]? */
747 if (heap [p]->at <= w->at) 775 if (!p || heap [p]->at <= w->at)
748 break; 776 break;
749 777
750 heap [k] = heap [p]; 778 heap [k] = heap [p];
751 ((W)heap [k])->active = k + 1; 779 ev_active (heap [k]) = k;
752 k = p; 780 k = p;
753 } 781 }
754 782
755 heap [k] = w; 783 heap [k] = w;
756 ((W)heap [k])->active = k + 1; 784 ev_active (heap [k]) = k;
757} 785}
758 786
787/* away from the root */
759void inline_speed 788void inline_speed
760downheap (WT *heap, int N, int k) 789downheap (WT *heap, int N, int k)
761{ 790{
762 WT w = heap [k]; 791 WT w = heap [k];
763 792
764 for (;;) 793 for (;;)
765 { 794 {
766 int c = (k << 1) + 1; 795 int c = k << 1;
767 796
768 if (c >= N) 797 if (c > N)
769 break; 798 break;
770 799
771 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 800 c += c < N && heap [c]->at > heap [c + 1]->at
772 ? 1 : 0; 801 ? 1 : 0;
773 802
774 if (w->at <= heap [c]->at) 803 if (w->at <= heap [c]->at)
775 break; 804 break;
776 805
777 heap [k] = heap [c]; 806 heap [k] = heap [c];
778 ((W)heap [k])->active = k + 1; 807 ev_active (heap [k]) = k;
779 808
780 k = c; 809 k = c;
781 } 810 }
782 811
783 heap [k] = w; 812 heap [k] = w;
784 ((W)heap [k])->active = k + 1; 813 ev_active (heap [k]) = k;
785} 814}
786 815
787void inline_size 816void inline_size
788adjustheap (WT *heap, int N, int k) 817adjustheap (WT *heap, int N, int k)
789{ 818{
… …
885pipecb (EV_P_ ev_io *iow, int revents) 914pipecb (EV_P_ ev_io *iow, int revents)
886{ 915{
887#if EV_USE_EVENTFD 916#if EV_USE_EVENTFD
888 if (evfd >= 0) 917 if (evfd >= 0)
889 { 918 {
890 uint64_t counter = 1; 919 uint64_t counter;
891 read (evfd, &counter, sizeof (uint64_t)); 920 read (evfd, &counter, sizeof (uint64_t));
892 } 921 }
893 else 922 else
894#endif 923#endif
895 { 924 {
… …
1164 if (!(flags & EVFLAG_NOENV) 1193 if (!(flags & EVFLAG_NOENV)
1165 && !enable_secure () 1194 && !enable_secure ()
1166 && getenv ("LIBEV_FLAGS")) 1195 && getenv ("LIBEV_FLAGS"))
1167 flags = atoi (getenv ("LIBEV_FLAGS")); 1196 flags = atoi (getenv ("LIBEV_FLAGS"));
1168 1197
1169 if (!(flags & 0x0000ffffUL)) 1198 if (!(flags & 0x0000ffffU))
1170 flags |= ev_recommended_backends (); 1199 flags |= ev_recommended_backends ();
1171 1200
1172#if EV_USE_PORT 1201#if EV_USE_PORT
1173 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1202 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1174#endif 1203#endif
… …
1262#endif 1291#endif
1263 1292
1264 backend = 0; 1293 backend = 0;
1265} 1294}
1266 1295
1296#if EV_USE_INOTIFY
1267void inline_size infy_fork (EV_P); 1297void inline_size infy_fork (EV_P);
1298#endif
1268 1299
1269void inline_size 1300void inline_size
1270loop_fork (EV_P) 1301loop_fork (EV_P)
1271{ 1302{
1272#if EV_USE_PORT 1303#if EV_USE_PORT
… …
1339void 1370void
1340ev_loop_fork (EV_P) 1371ev_loop_fork (EV_P)
1341{ 1372{
1342 postfork = 1; /* must be in line with ev_default_fork */ 1373 postfork = 1; /* must be in line with ev_default_fork */
1343} 1374}
1344
1345#endif 1375#endif
1346 1376
1347#if EV_MULTIPLICITY 1377#if EV_MULTIPLICITY
1348struct ev_loop * 1378struct ev_loop *
1349ev_default_loop_init (unsigned int flags) 1379ev_default_loop_init (unsigned int flags)
… …
1430 EV_CB_INVOKE (p->w, p->events); 1460 EV_CB_INVOKE (p->w, p->events);
1431 } 1461 }
1432 } 1462 }
1433} 1463}
1434 1464
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 1465#if EV_IDLE_ENABLE
1516void inline_size 1466void inline_size
1517idle_reify (EV_P) 1467idle_reify (EV_P)
1518{ 1468{
1519 if (expect_false (idleall)) 1469 if (expect_false (idleall))
… …
1530 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1480 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1531 break; 1481 break;
1532 } 1482 }
1533 } 1483 }
1534 } 1484 }
1485}
1486#endif
1487
1488void inline_size
1489timers_reify (EV_P)
1490{
1491 while (timercnt && ev_at (timers [1]) <= mn_now)
1492 {
1493 ev_timer *w = (ev_timer *)timers [1];
1494
1495 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1496
1497 /* first reschedule or stop timer */
1498 if (w->repeat)
1499 {
1500 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1501
1502 ev_at (w) += w->repeat;
1503 if (ev_at (w) < mn_now)
1504 ev_at (w) = mn_now;
1505
1506 downheap (timers, timercnt, 1);
1507 }
1508 else
1509 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1510
1511 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1512 }
1513}
1514
1515#if EV_PERIODIC_ENABLE
1516void inline_size
1517periodics_reify (EV_P)
1518{
1519 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1520 {
1521 ev_periodic *w = (ev_periodic *)periodics [1];
1522
1523 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1524
1525 /* first reschedule or stop timer */
1526 if (w->reschedule_cb)
1527 {
1528 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1529 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1530 downheap (periodics, periodiccnt, 1);
1531 }
1532 else if (w->interval)
1533 {
1534 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1535 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1536 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1537 downheap (periodics, periodiccnt, 1);
1538 }
1539 else
1540 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1541
1542 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1543 }
1544}
1545
1546static void noinline
1547periodics_reschedule (EV_P)
1548{
1549 int i;
1550
1551 /* adjust periodics after time jump */
1552 for (i = 1; i <= periodiccnt; ++i)
1553 {
1554 ev_periodic *w = (ev_periodic *)periodics [i];
1555
1556 if (w->reschedule_cb)
1557 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1558 else if (w->interval)
1559 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1560 }
1561
1562 /* now rebuild the heap */
1563 for (i = periodiccnt >> 1; i--; )
1564 downheap (periodics, periodiccnt, i);
1535} 1565}
1536#endif 1566#endif
1537 1567
1538void inline_speed 1568void inline_speed
1539time_update (EV_P_ ev_tstamp max_block) 1569time_update (EV_P_ ev_tstamp max_block)
… …
1568 */ 1598 */
1569 for (i = 4; --i; ) 1599 for (i = 4; --i; )
1570 { 1600 {
1571 rtmn_diff = ev_rt_now - mn_now; 1601 rtmn_diff = ev_rt_now - mn_now;
1572 1602
1573 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1603 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1574 return; /* all is well */ 1604 return; /* all is well */
1575 1605
1576 ev_rt_now = ev_time (); 1606 ev_rt_now = ev_time ();
1577 mn_now = get_clock (); 1607 mn_now = get_clock ();
1578 now_floor = mn_now; 1608 now_floor = mn_now;
… …
1593 { 1623 {
1594#if EV_PERIODIC_ENABLE 1624#if EV_PERIODIC_ENABLE
1595 periodics_reschedule (EV_A); 1625 periodics_reschedule (EV_A);
1596#endif 1626#endif
1597 /* adjust timers. this is easy, as the offset is the same for all of them */ 1627 /* adjust timers. this is easy, as the offset is the same for all of them */
1598 for (i = 0; i < timercnt; ++i) 1628 for (i = 1; i <= timercnt; ++i)
1599 ((WT)timers [i])->at += ev_rt_now - mn_now; 1629 ev_at (timers [i]) += ev_rt_now - mn_now;
1600 } 1630 }
1601 1631
1602 mn_now = ev_rt_now; 1632 mn_now = ev_rt_now;
1603 } 1633 }
1604} 1634}
… …
1674 1704
1675 waittime = MAX_BLOCKTIME; 1705 waittime = MAX_BLOCKTIME;
1676 1706
1677 if (timercnt) 1707 if (timercnt)
1678 { 1708 {
1679 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1709 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1680 if (waittime > to) waittime = to; 1710 if (waittime > to) waittime = to;
1681 } 1711 }
1682 1712
1683#if EV_PERIODIC_ENABLE 1713#if EV_PERIODIC_ENABLE
1684 if (periodiccnt) 1714 if (periodiccnt)
1685 { 1715 {
1686 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1716 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge;
1687 if (waittime > to) waittime = to; 1717 if (waittime > to) waittime = to;
1688 } 1718 }
1689#endif 1719#endif
1690 1720
1691 if (expect_false (waittime < timeout_blocktime)) 1721 if (expect_false (waittime < timeout_blocktime))
… …
1857ev_timer_start (EV_P_ ev_timer *w) 1887ev_timer_start (EV_P_ ev_timer *w)
1858{ 1888{
1859 if (expect_false (ev_is_active (w))) 1889 if (expect_false (ev_is_active (w)))
1860 return; 1890 return;
1861 1891
1862 ((WT)w)->at += mn_now; 1892 ev_at (w) += mn_now;
1863 1893
1864 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1894 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1865 1895
1866 ev_start (EV_A_ (W)w, ++timercnt); 1896 ev_start (EV_A_ (W)w, ++timercnt);
1867 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1897 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1868 timers [timercnt - 1] = (WT)w; 1898 timers [timercnt] = (WT)w;
1869 upheap (timers, timercnt - 1); 1899 upheap (timers, timercnt);
1870 1900
1871 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1901 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1872} 1902}
1873 1903
1874void noinline 1904void noinline
1875ev_timer_stop (EV_P_ ev_timer *w) 1905ev_timer_stop (EV_P_ ev_timer *w)
1876{ 1906{
1877 clear_pending (EV_A_ (W)w); 1907 clear_pending (EV_A_ (W)w);
1878 if (expect_false (!ev_is_active (w))) 1908 if (expect_false (!ev_is_active (w)))
1879 return; 1909 return;
1880 1910
1881 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1882
1883 { 1911 {
1884 int active = ((W)w)->active; 1912 int active = ev_active (w);
1885 1913
1914 assert (("internal timer heap corruption", timers [active] == (WT)w));
1915
1886 if (expect_true (--active < --timercnt)) 1916 if (expect_true (active < timercnt))
1887 { 1917 {
1888 timers [active] = timers [timercnt]; 1918 timers [active] = timers [timercnt];
1889 adjustheap (timers, timercnt, active); 1919 adjustheap (timers, timercnt, active);
1890 } 1920 }
1921
1922 --timercnt;
1891 } 1923 }
1892 1924
1893 ((WT)w)->at -= mn_now; 1925 ev_at (w) -= mn_now;
1894 1926
1895 ev_stop (EV_A_ (W)w); 1927 ev_stop (EV_A_ (W)w);
1896} 1928}
1897 1929
1898void noinline 1930void noinline
… …
1900{ 1932{
1901 if (ev_is_active (w)) 1933 if (ev_is_active (w))
1902 { 1934 {
1903 if (w->repeat) 1935 if (w->repeat)
1904 { 1936 {
1905 ((WT)w)->at = mn_now + w->repeat; 1937 ev_at (w) = mn_now + w->repeat;
1906 adjustheap (timers, timercnt, ((W)w)->active - 1); 1938 adjustheap (timers, timercnt, ev_active (w));
1907 } 1939 }
1908 else 1940 else
1909 ev_timer_stop (EV_A_ w); 1941 ev_timer_stop (EV_A_ w);
1910 } 1942 }
1911 else if (w->repeat) 1943 else if (w->repeat)
1912 { 1944 {
1913 w->at = w->repeat; 1945 ev_at (w) = w->repeat;
1914 ev_timer_start (EV_A_ w); 1946 ev_timer_start (EV_A_ w);
1915 } 1947 }
1916} 1948}
1917 1949
1918#if EV_PERIODIC_ENABLE 1950#if EV_PERIODIC_ENABLE
… …
1921{ 1953{
1922 if (expect_false (ev_is_active (w))) 1954 if (expect_false (ev_is_active (w)))
1923 return; 1955 return;
1924 1956
1925 if (w->reschedule_cb) 1957 if (w->reschedule_cb)
1926 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1958 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1927 else if (w->interval) 1959 else if (w->interval)
1928 { 1960 {
1929 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1961 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 */ 1962 /* 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; 1963 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1932 } 1964 }
1933 else 1965 else
1934 ((WT)w)->at = w->offset; 1966 ev_at (w) = w->offset;
1935 1967
1936 ev_start (EV_A_ (W)w, ++periodiccnt); 1968 ev_start (EV_A_ (W)w, ++periodiccnt);
1937 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 1969 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1938 periodics [periodiccnt - 1] = (WT)w; 1970 periodics [periodiccnt] = (WT)w;
1939 upheap (periodics, periodiccnt - 1); 1971 upheap (periodics, periodiccnt);
1940 1972
1941 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1973 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1942} 1974}
1943 1975
1944void noinline 1976void noinline
1945ev_periodic_stop (EV_P_ ev_periodic *w) 1977ev_periodic_stop (EV_P_ ev_periodic *w)
1946{ 1978{
1947 clear_pending (EV_A_ (W)w); 1979 clear_pending (EV_A_ (W)w);
1948 if (expect_false (!ev_is_active (w))) 1980 if (expect_false (!ev_is_active (w)))
1949 return; 1981 return;
1950 1982
1951 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1952
1953 { 1983 {
1954 int active = ((W)w)->active; 1984 int active = ev_active (w);
1955 1985
1986 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1987
1956 if (expect_true (--active < --periodiccnt)) 1988 if (expect_true (active < periodiccnt))
1957 { 1989 {
1958 periodics [active] = periodics [periodiccnt]; 1990 periodics [active] = periodics [periodiccnt];
1959 adjustheap (periodics, periodiccnt, active); 1991 adjustheap (periodics, periodiccnt, active);
1960 } 1992 }
1993
1994 --periodiccnt;
1961 } 1995 }
1962 1996
1963 ev_stop (EV_A_ (W)w); 1997 ev_stop (EV_A_ (W)w);
1964} 1998}
1965 1999
… …
2081 if (w->wd < 0) 2115 if (w->wd < 0)
2082 { 2116 {
2083 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2117 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2084 2118
2085 /* monitor some parent directory for speedup hints */ 2119 /* monitor some parent directory for speedup hints */
2120 /* note that exceeding the hardcoded limit is not a correctness issue, */
2121 /* but an efficiency issue only */
2086 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2122 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2087 { 2123 {
2088 char path [4096]; 2124 char path [4096];
2089 strcpy (path, w->path); 2125 strcpy (path, w->path);
2090 2126
… …
2335 clear_pending (EV_A_ (W)w); 2371 clear_pending (EV_A_ (W)w);
2336 if (expect_false (!ev_is_active (w))) 2372 if (expect_false (!ev_is_active (w)))
2337 return; 2373 return;
2338 2374
2339 { 2375 {
2340 int active = ((W)w)->active; 2376 int active = ev_active (w);
2341 2377
2342 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2378 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2343 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2379 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2344 2380
2345 ev_stop (EV_A_ (W)w); 2381 ev_stop (EV_A_ (W)w);
2346 --idleall; 2382 --idleall;
2347 } 2383 }
2348} 2384}
… …
2365 clear_pending (EV_A_ (W)w); 2401 clear_pending (EV_A_ (W)w);
2366 if (expect_false (!ev_is_active (w))) 2402 if (expect_false (!ev_is_active (w)))
2367 return; 2403 return;
2368 2404
2369 { 2405 {
2370 int active = ((W)w)->active; 2406 int active = ev_active (w);
2407
2371 prepares [active - 1] = prepares [--preparecnt]; 2408 prepares [active - 1] = prepares [--preparecnt];
2372 ((W)prepares [active - 1])->active = active; 2409 ev_active (prepares [active - 1]) = active;
2373 } 2410 }
2374 2411
2375 ev_stop (EV_A_ (W)w); 2412 ev_stop (EV_A_ (W)w);
2376} 2413}
2377 2414
… …
2392 clear_pending (EV_A_ (W)w); 2429 clear_pending (EV_A_ (W)w);
2393 if (expect_false (!ev_is_active (w))) 2430 if (expect_false (!ev_is_active (w)))
2394 return; 2431 return;
2395 2432
2396 { 2433 {
2397 int active = ((W)w)->active; 2434 int active = ev_active (w);
2435
2398 checks [active - 1] = checks [--checkcnt]; 2436 checks [active - 1] = checks [--checkcnt];
2399 ((W)checks [active - 1])->active = active; 2437 ev_active (checks [active - 1]) = active;
2400 } 2438 }
2401 2439
2402 ev_stop (EV_A_ (W)w); 2440 ev_stop (EV_A_ (W)w);
2403} 2441}
2404 2442
… …
2500 clear_pending (EV_A_ (W)w); 2538 clear_pending (EV_A_ (W)w);
2501 if (expect_false (!ev_is_active (w))) 2539 if (expect_false (!ev_is_active (w)))
2502 return; 2540 return;
2503 2541
2504 { 2542 {
2505 int active = ((W)w)->active; 2543 int active = ev_active (w);
2544
2506 forks [active - 1] = forks [--forkcnt]; 2545 forks [active - 1] = forks [--forkcnt];
2507 ((W)forks [active - 1])->active = active; 2546 ev_active (forks [active - 1]) = active;
2508 } 2547 }
2509 2548
2510 ev_stop (EV_A_ (W)w); 2549 ev_stop (EV_A_ (W)w);
2511} 2550}
2512#endif 2551#endif
… …
2531 clear_pending (EV_A_ (W)w); 2570 clear_pending (EV_A_ (W)w);
2532 if (expect_false (!ev_is_active (w))) 2571 if (expect_false (!ev_is_active (w)))
2533 return; 2572 return;
2534 2573
2535 { 2574 {
2536 int active = ((W)w)->active; 2575 int active = ev_active (w);
2576
2537 asyncs [active - 1] = asyncs [--asynccnt]; 2577 asyncs [active - 1] = asyncs [--asynccnt];
2538 ((W)asyncs [active - 1])->active = active; 2578 ev_active (asyncs [active - 1]) = active;
2539 } 2579 }
2540 2580
2541 ev_stop (EV_A_ (W)w); 2581 ev_stop (EV_A_ (W)w);
2542} 2582}
2543 2583

Diff Legend

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