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.243 by root, Fri May 9 15:52:13 2008 UTC

… …
235# else 235# else
236# define EV_USE_EVENTFD 0 236# define EV_USE_EVENTFD 0
237# endif 237# endif
238#endif 238#endif
239 239
240#ifndef EV_USE_4HEAP
241# define EV_USE_4HEAP !EV_MINIMAL
242#endif
243
244#ifndef EV_HEAP_CACHE_AT
245# define EV_HEAP_CACHE_AT !EV_MINIMAL
246#endif
247
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 248/* this block fixes any misconfiguration where we know we run into trouble otherwise */
241 249
242#ifndef CLOCK_MONOTONIC 250#ifndef CLOCK_MONOTONIC
243# undef EV_USE_MONOTONIC 251# undef EV_USE_MONOTONIC
244# define EV_USE_MONOTONIC 0 252# define EV_USE_MONOTONIC 0
… …
268# include <winsock.h> 276# include <winsock.h>
269#endif 277#endif
270 278
271#if EV_USE_EVENTFD 279#if EV_USE_EVENTFD
272/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 280/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
281# include <stdint.h>
282# ifdef __cplusplus
283extern "C" {
284# endif
273int eventfd (unsigned int initval, int flags); 285int eventfd (unsigned int initval, int flags);
286# ifdef __cplusplus
287}
288# endif
274#endif 289#endif
275 290
276/**/ 291/**/
277 292
278/* 293/*
… …
293# define expect(expr,value) __builtin_expect ((expr),(value)) 308# define expect(expr,value) __builtin_expect ((expr),(value))
294# define noinline __attribute__ ((noinline)) 309# define noinline __attribute__ ((noinline))
295#else 310#else
296# define expect(expr,value) (expr) 311# define expect(expr,value) (expr)
297# define noinline 312# define noinline
298# if __STDC_VERSION__ < 199901L 313# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
299# define inline 314# define inline
300# endif 315# endif
301#endif 316#endif
302 317
303#define expect_false(expr) expect ((expr) != 0, 0) 318#define expect_false(expr) expect ((expr) != 0, 0)
… …
318 333
319typedef ev_watcher *W; 334typedef ev_watcher *W;
320typedef ev_watcher_list *WL; 335typedef ev_watcher_list *WL;
321typedef ev_watcher_time *WT; 336typedef ev_watcher_time *WT;
322 337
338#define ev_active(w) ((W)(w))->active
339#define ev_at(w) ((WT)(w))->at
340
323#if EV_USE_MONOTONIC 341#if EV_USE_MONOTONIC
324/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 342/* 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 */ 343/* giving it a reasonably high chance of working on typical architetcures */
326static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 344static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
327#endif 345#endif
… …
353 perror (msg); 371 perror (msg);
354 abort (); 372 abort ();
355 } 373 }
356} 374}
357 375
376static void *
377ev_realloc_emul (void *ptr, long size)
378{
379 /* some systems, notably openbsd and darwin, fail to properly
380 * implement realloc (x, 0) (as required by both ansi c-98 and
381 * the single unix specification, so work around them here.
382 */
383
384 if (size)
385 return realloc (ptr, size);
386
387 free (ptr);
388 return 0;
389}
390
358static void *(*alloc)(void *ptr, long size); 391static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
359 392
360void 393void
361ev_set_allocator (void *(*cb)(void *ptr, long size)) 394ev_set_allocator (void *(*cb)(void *ptr, long size))
362{ 395{
363 alloc = cb; 396 alloc = cb;
364} 397}
365 398
366inline_speed void * 399inline_speed void *
367ev_realloc (void *ptr, long size) 400ev_realloc (void *ptr, long size)
368{ 401{
369 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 402 ptr = alloc (ptr, size);
370 403
371 if (!ptr && size) 404 if (!ptr && size)
372 { 405 {
373 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 406 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
374 abort (); 407 abort ();
… …
397 W w; 430 W w;
398 int events; 431 int events;
399} ANPENDING; 432} ANPENDING;
400 433
401#if EV_USE_INOTIFY 434#if EV_USE_INOTIFY
435/* hash table entry per inotify-id */
402typedef struct 436typedef struct
403{ 437{
404 WL head; 438 WL head;
405} ANFS; 439} ANFS;
440#endif
441
442/* Heap Entry */
443#if EV_HEAP_CACHE_AT
444 typedef struct {
445 ev_tstamp at;
446 WT w;
447 } ANHE;
448
449 #define ANHE_w(he) (he).w /* access watcher, read-write */
450 #define ANHE_at(he) (he).at /* access cached at, read-only */
451 #define ANHE_at_set(he) (he).at = (he).w->at /* update at from watcher */
452#else
453 typedef WT ANHE;
454
455 #define ANHE_w(he) (he)
456 #define ANHE_at(he) (he)->at
457 #define ANHE_at_set(he)
406#endif 458#endif
407 459
408#if EV_MULTIPLICITY 460#if EV_MULTIPLICITY
409 461
410 struct ev_loop 462 struct ev_loop
… …
495 } 547 }
496} 548}
497 549
498/*****************************************************************************/ 550/*****************************************************************************/
499 551
552#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
553
500int inline_size 554int inline_size
501array_nextsize (int elem, int cur, int cnt) 555array_nextsize (int elem, int cur, int cnt)
502{ 556{
503 int ncur = cur + 1; 557 int ncur = cur + 1;
504 558
505 do 559 do
506 ncur <<= 1; 560 ncur <<= 1;
507 while (cnt > ncur); 561 while (cnt > ncur);
508 562
509 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 563 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
510 if (elem * ncur > 4096) 564 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
511 { 565 {
512 ncur *= elem; 566 ncur *= elem;
513 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 567 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
514 ncur = ncur - sizeof (void *) * 4; 568 ncur = ncur - sizeof (void *) * 4;
515 ncur /= elem; 569 ncur /= elem;
516 } 570 }
517 571
518 return ncur; 572 return ncur;
… …
732 } 786 }
733} 787}
734 788
735/*****************************************************************************/ 789/*****************************************************************************/
736 790
791/*
792 * the heap functions want a real array index. array index 0 uis guaranteed to not
793 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
794 * the branching factor of the d-tree.
795 */
796
797/*
798 * at the moment we allow libev the luxury of two heaps,
799 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
800 * which is more cache-efficient.
801 * the difference is about 5% with 50000+ watchers.
802 */
803#if EV_USE_4HEAP
804
805#define DHEAP 4
806#define HEAP0 (DHEAP - 1) /* index of first element in heap */
807
808/* towards the root */
737void inline_speed 809void inline_speed
738upheap (WT *heap, int k) 810upheap (ANHE *heap, int k)
739{ 811{
740 WT w = heap [k]; 812 ANHE he = heap [k];
741 813
742 while (k) 814 for (;;)
743 { 815 {
744 int p = (k - 1) >> 1; 816 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
745 817
746 if (heap [p]->at <= w->at) 818 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
747 break; 819 break;
748 820
749 heap [k] = heap [p]; 821 heap [k] = heap [p];
750 ((W)heap [k])->active = k + 1; 822 ev_active (ANHE_w (heap [k])) = k;
751 k = p; 823 k = p;
752 } 824 }
753 825
826 ev_active (ANHE_w (he)) = k;
754 heap [k] = w; 827 heap [k] = he;
755 ((W)heap [k])->active = k + 1;
756} 828}
757 829
830/* away from the root */
758void inline_speed 831void inline_speed
759downheap (WT *heap, int N, int k) 832downheap (ANHE *heap, int N, int k)
760{ 833{
761 WT w = heap [k]; 834 ANHE he = heap [k];
835 ANHE *E = heap + N + HEAP0;
762 836
763 for (;;) 837 for (;;)
764 { 838 {
765 int c = (k << 1) + 1; 839 ev_tstamp minat;
840 ANHE *minpos;
841 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0;
766 842
767 if (c >= N) 843 // find minimum child
844 if (expect_true (pos + DHEAP - 1 < E))
845 {
846 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
847 if (ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
848 if (ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
849 if (ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
850 }
851 else if (pos < E)
852 {
853 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
854 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
855 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
856 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
857 }
858 else
768 break; 859 break;
769 860
861 if (ANHE_at (he) <= minat)
862 break;
863
864 ev_active (ANHE_w (*minpos)) = k;
865 heap [k] = *minpos;
866
867 k = minpos - heap;
868 }
869
870 ev_active (ANHE_w (he)) = k;
871 heap [k] = he;
872}
873
874#else // 4HEAP
875
876#define HEAP0 1
877
878/* towards the root */
879void inline_speed
880upheap (ANHE *heap, int k)
881{
882 ANHE he = heap [k];
883
884 for (;;)
885 {
886 int p = k >> 1;
887
888 /* maybe we could use a dummy element at heap [0]? */
889 if (!p || ANHE_at (heap [p]) <= ANHE_at (he))
890 break;
891
892 heap [k] = heap [p];
893 ev_active (ANHE_w (heap [k])) = k;
894 k = p;
895 }
896
897 heap [k] = he;
898 ev_active (ANHE_w (heap [k])) = k;
899}
900
901/* away from the root */
902void inline_speed
903downheap (ANHE *heap, int N, int k)
904{
905 ANHE he = heap [k];
906
907 for (;;)
908 {
909 int c = k << 1;
910
911 if (c > N)
912 break;
913
770 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 914 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
771 ? 1 : 0; 915 ? 1 : 0;
772 916
773 if (w->at <= heap [c]->at) 917 if (ANHE_at (he) <= ANHE_at (heap [c]))
774 break; 918 break;
775 919
776 heap [k] = heap [c]; 920 heap [k] = heap [c];
777 ((W)heap [k])->active = k + 1; 921 ev_active (ANHE_w (heap [k])) = k;
778 922
779 k = c; 923 k = c;
780 } 924 }
781 925
782 heap [k] = w; 926 heap [k] = he;
783 ((W)heap [k])->active = k + 1; 927 ev_active (ANHE_w (he)) = k;
784} 928}
929#endif
785 930
786void inline_size 931void inline_size
787adjustheap (WT *heap, int N, int k) 932adjustheap (ANHE *heap, int N, int k)
788{ 933{
789 upheap (heap, k); 934 upheap (heap, k);
790 downheap (heap, N, k); 935 downheap (heap, N, k);
791} 936}
792 937
… …
884pipecb (EV_P_ ev_io *iow, int revents) 1029pipecb (EV_P_ ev_io *iow, int revents)
885{ 1030{
886#if EV_USE_EVENTFD 1031#if EV_USE_EVENTFD
887 if (evfd >= 0) 1032 if (evfd >= 0)
888 { 1033 {
889 uint64_t counter = 1; 1034 uint64_t counter;
890 read (evfd, &counter, sizeof (uint64_t)); 1035 read (evfd, &counter, sizeof (uint64_t));
891 } 1036 }
892 else 1037 else
893#endif 1038#endif
894 { 1039 {
… …
1163 if (!(flags & EVFLAG_NOENV) 1308 if (!(flags & EVFLAG_NOENV)
1164 && !enable_secure () 1309 && !enable_secure ()
1165 && getenv ("LIBEV_FLAGS")) 1310 && getenv ("LIBEV_FLAGS"))
1166 flags = atoi (getenv ("LIBEV_FLAGS")); 1311 flags = atoi (getenv ("LIBEV_FLAGS"));
1167 1312
1168 if (!(flags & 0x0000ffffUL)) 1313 if (!(flags & 0x0000ffffU))
1169 flags |= ev_recommended_backends (); 1314 flags |= ev_recommended_backends ();
1170 1315
1171#if EV_USE_PORT 1316#if EV_USE_PORT
1172 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1317 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1173#endif 1318#endif
… …
1261#endif 1406#endif
1262 1407
1263 backend = 0; 1408 backend = 0;
1264} 1409}
1265 1410
1411#if EV_USE_INOTIFY
1266void inline_size infy_fork (EV_P); 1412void inline_size infy_fork (EV_P);
1413#endif
1267 1414
1268void inline_size 1415void inline_size
1269loop_fork (EV_P) 1416loop_fork (EV_P)
1270{ 1417{
1271#if EV_USE_PORT 1418#if EV_USE_PORT
… …
1338void 1485void
1339ev_loop_fork (EV_P) 1486ev_loop_fork (EV_P)
1340{ 1487{
1341 postfork = 1; /* must be in line with ev_default_fork */ 1488 postfork = 1; /* must be in line with ev_default_fork */
1342} 1489}
1343
1344#endif 1490#endif
1345 1491
1346#if EV_MULTIPLICITY 1492#if EV_MULTIPLICITY
1347struct ev_loop * 1493struct ev_loop *
1348ev_default_loop_init (unsigned int flags) 1494ev_default_loop_init (unsigned int flags)
… …
1429 EV_CB_INVOKE (p->w, p->events); 1575 EV_CB_INVOKE (p->w, p->events);
1430 } 1576 }
1431 } 1577 }
1432} 1578}
1433 1579
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 1580#if EV_IDLE_ENABLE
1515void inline_size 1581void inline_size
1516idle_reify (EV_P) 1582idle_reify (EV_P)
1517{ 1583{
1518 if (expect_false (idleall)) 1584 if (expect_false (idleall))
… …
1529 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1595 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1530 break; 1596 break;
1531 } 1597 }
1532 } 1598 }
1533 } 1599 }
1600}
1601#endif
1602
1603void inline_size
1604timers_reify (EV_P)
1605{
1606 while (timercnt && ANHE_at (timers [HEAP0]) <= mn_now)
1607 {
1608 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1609
1610 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1611
1612 /* first reschedule or stop timer */
1613 if (w->repeat)
1614 {
1615 ev_at (w) += w->repeat;
1616 if (ev_at (w) < mn_now)
1617 ev_at (w) = mn_now;
1618
1619 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1620
1621 ANHE_at_set (timers [HEAP0]);
1622 downheap (timers, timercnt, HEAP0);
1623 }
1624 else
1625 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1626
1627 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1628 }
1629}
1630
1631#if EV_PERIODIC_ENABLE
1632void inline_size
1633periodics_reify (EV_P)
1634{
1635 while (periodiccnt && ANHE_at (periodics [HEAP0]) <= ev_rt_now)
1636 {
1637 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1638
1639 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1640
1641 /* first reschedule or stop timer */
1642 if (w->reschedule_cb)
1643 {
1644 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1645
1646 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1647
1648 ANHE_at_set (periodics [HEAP0]);
1649 downheap (periodics, periodiccnt, HEAP0);
1650 }
1651 else if (w->interval)
1652 {
1653 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1654 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1655
1656 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1657
1658 ANHE_at_set (periodics [HEAP0]);
1659 downheap (periodics, periodiccnt, HEAP0);
1660 }
1661 else
1662 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1663
1664 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1665 }
1666}
1667
1668static void noinline
1669periodics_reschedule (EV_P)
1670{
1671 int i;
1672
1673 /* adjust periodics after time jump */
1674 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1675 {
1676 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1677
1678 if (w->reschedule_cb)
1679 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1680 else if (w->interval)
1681 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1682
1683 ANHE_at_set (periodics [i]);
1684 }
1685
1686 /* we don't use floyds algorithm, uphead is simpler and is more cache-efficient */
1687 /* also, this is easy and corretc for both 2-heaps and 4-heaps */
1688 for (i = 0; i < periodiccnt; ++i)
1689 upheap (periodics, i + HEAP0);
1534} 1690}
1535#endif 1691#endif
1536 1692
1537void inline_speed 1693void inline_speed
1538time_update (EV_P_ ev_tstamp max_block) 1694time_update (EV_P_ ev_tstamp max_block)
… …
1567 */ 1723 */
1568 for (i = 4; --i; ) 1724 for (i = 4; --i; )
1569 { 1725 {
1570 rtmn_diff = ev_rt_now - mn_now; 1726 rtmn_diff = ev_rt_now - mn_now;
1571 1727
1572 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1728 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1573 return; /* all is well */ 1729 return; /* all is well */
1574 1730
1575 ev_rt_now = ev_time (); 1731 ev_rt_now = ev_time ();
1576 mn_now = get_clock (); 1732 mn_now = get_clock ();
1577 now_floor = mn_now; 1733 now_floor = mn_now;
… …
1593#if EV_PERIODIC_ENABLE 1749#if EV_PERIODIC_ENABLE
1594 periodics_reschedule (EV_A); 1750 periodics_reschedule (EV_A);
1595#endif 1751#endif
1596 /* adjust timers. this is easy, as the offset is the same for all of them */ 1752 /* adjust timers. this is easy, as the offset is the same for all of them */
1597 for (i = 0; i < timercnt; ++i) 1753 for (i = 0; i < timercnt; ++i)
1754 {
1755 ANHE *he = timers + i + HEAP0;
1598 ((WT)timers [i])->at += ev_rt_now - mn_now; 1756 ANHE_w (*he)->at += ev_rt_now - mn_now;
1757 ANHE_at_set (*he);
1758 }
1599 } 1759 }
1600 1760
1601 mn_now = ev_rt_now; 1761 mn_now = ev_rt_now;
1602 } 1762 }
1603} 1763}
… …
1673 1833
1674 waittime = MAX_BLOCKTIME; 1834 waittime = MAX_BLOCKTIME;
1675 1835
1676 if (timercnt) 1836 if (timercnt)
1677 { 1837 {
1678 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1838 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1679 if (waittime > to) waittime = to; 1839 if (waittime > to) waittime = to;
1680 } 1840 }
1681 1841
1682#if EV_PERIODIC_ENABLE 1842#if EV_PERIODIC_ENABLE
1683 if (periodiccnt) 1843 if (periodiccnt)
1684 { 1844 {
1685 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1845 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1686 if (waittime > to) waittime = to; 1846 if (waittime > to) waittime = to;
1687 } 1847 }
1688#endif 1848#endif
1689 1849
1690 if (expect_false (waittime < timeout_blocktime)) 1850 if (expect_false (waittime < timeout_blocktime))
… …
1842{ 2002{
1843 clear_pending (EV_A_ (W)w); 2003 clear_pending (EV_A_ (W)w);
1844 if (expect_false (!ev_is_active (w))) 2004 if (expect_false (!ev_is_active (w)))
1845 return; 2005 return;
1846 2006
1847 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2007 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1848 2008
1849 wlist_del (&anfds[w->fd].head, (WL)w); 2009 wlist_del (&anfds[w->fd].head, (WL)w);
1850 ev_stop (EV_A_ (W)w); 2010 ev_stop (EV_A_ (W)w);
1851 2011
1852 fd_change (EV_A_ w->fd, 1); 2012 fd_change (EV_A_ w->fd, 1);
… …
1856ev_timer_start (EV_P_ ev_timer *w) 2016ev_timer_start (EV_P_ ev_timer *w)
1857{ 2017{
1858 if (expect_false (ev_is_active (w))) 2018 if (expect_false (ev_is_active (w)))
1859 return; 2019 return;
1860 2020
1861 ((WT)w)->at += mn_now; 2021 ev_at (w) += mn_now;
1862 2022
1863 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2023 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1864 2024
1865 ev_start (EV_A_ (W)w, ++timercnt); 2025 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1866 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 2026 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1867 timers [timercnt - 1] = (WT)w; 2027 ANHE_w (timers [ev_active (w)]) = (WT)w;
1868 upheap (timers, timercnt - 1); 2028 ANHE_at_set (timers [ev_active (w)]);
2029 upheap (timers, ev_active (w));
1869 2030
1870 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 2031 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1871} 2032}
1872 2033
1873void noinline 2034void noinline
1874ev_timer_stop (EV_P_ ev_timer *w) 2035ev_timer_stop (EV_P_ ev_timer *w)
1875{ 2036{
1876 clear_pending (EV_A_ (W)w); 2037 clear_pending (EV_A_ (W)w);
1877 if (expect_false (!ev_is_active (w))) 2038 if (expect_false (!ev_is_active (w)))
1878 return; 2039 return;
1879 2040
1880 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1881
1882 { 2041 {
1883 int active = ((W)w)->active; 2042 int active = ev_active (w);
1884 2043
2044 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2045
1885 if (expect_true (--active < --timercnt)) 2046 if (expect_true (active < timercnt + HEAP0 - 1))
1886 { 2047 {
1887 timers [active] = timers [timercnt]; 2048 timers [active] = timers [timercnt + HEAP0 - 1];
1888 adjustheap (timers, timercnt, active); 2049 adjustheap (timers, timercnt, active);
1889 } 2050 }
2051
2052 --timercnt;
1890 } 2053 }
1891 2054
1892 ((WT)w)->at -= mn_now; 2055 ev_at (w) -= mn_now;
1893 2056
1894 ev_stop (EV_A_ (W)w); 2057 ev_stop (EV_A_ (W)w);
1895} 2058}
1896 2059
1897void noinline 2060void noinline
… …
1899{ 2062{
1900 if (ev_is_active (w)) 2063 if (ev_is_active (w))
1901 { 2064 {
1902 if (w->repeat) 2065 if (w->repeat)
1903 { 2066 {
1904 ((WT)w)->at = mn_now + w->repeat; 2067 ev_at (w) = mn_now + w->repeat;
2068 ANHE_at_set (timers [ev_active (w)]);
1905 adjustheap (timers, timercnt, ((W)w)->active - 1); 2069 adjustheap (timers, timercnt, ev_active (w));
1906 } 2070 }
1907 else 2071 else
1908 ev_timer_stop (EV_A_ w); 2072 ev_timer_stop (EV_A_ w);
1909 } 2073 }
1910 else if (w->repeat) 2074 else if (w->repeat)
1911 { 2075 {
1912 w->at = w->repeat; 2076 ev_at (w) = w->repeat;
1913 ev_timer_start (EV_A_ w); 2077 ev_timer_start (EV_A_ w);
1914 } 2078 }
1915} 2079}
1916 2080
1917#if EV_PERIODIC_ENABLE 2081#if EV_PERIODIC_ENABLE
… …
1920{ 2084{
1921 if (expect_false (ev_is_active (w))) 2085 if (expect_false (ev_is_active (w)))
1922 return; 2086 return;
1923 2087
1924 if (w->reschedule_cb) 2088 if (w->reschedule_cb)
1925 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2089 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1926 else if (w->interval) 2090 else if (w->interval)
1927 { 2091 {
1928 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2092 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 */ 2093 /* 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; 2094 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1931 } 2095 }
1932 else 2096 else
1933 ((WT)w)->at = w->offset; 2097 ev_at (w) = w->offset;
1934 2098
1935 ev_start (EV_A_ (W)w, ++periodiccnt); 2099 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1936 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2100 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1937 periodics [periodiccnt - 1] = (WT)w; 2101 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1938 upheap (periodics, periodiccnt - 1); 2102 ANHE_at_set (periodics [ev_active (w)]);
2103 upheap (periodics, ev_active (w));
1939 2104
1940 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2105 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
1941} 2106}
1942 2107
1943void noinline 2108void noinline
1944ev_periodic_stop (EV_P_ ev_periodic *w) 2109ev_periodic_stop (EV_P_ ev_periodic *w)
1945{ 2110{
1946 clear_pending (EV_A_ (W)w); 2111 clear_pending (EV_A_ (W)w);
1947 if (expect_false (!ev_is_active (w))) 2112 if (expect_false (!ev_is_active (w)))
1948 return; 2113 return;
1949 2114
1950 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1951
1952 { 2115 {
1953 int active = ((W)w)->active; 2116 int active = ev_active (w);
1954 2117
2118 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2119
1955 if (expect_true (--active < --periodiccnt)) 2120 if (expect_true (active < periodiccnt + HEAP0 - 1))
1956 { 2121 {
1957 periodics [active] = periodics [periodiccnt]; 2122 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1958 adjustheap (periodics, periodiccnt, active); 2123 adjustheap (periodics, periodiccnt, active);
1959 } 2124 }
2125
2126 --periodiccnt;
1960 } 2127 }
1961 2128
1962 ev_stop (EV_A_ (W)w); 2129 ev_stop (EV_A_ (W)w);
1963} 2130}
1964 2131
… …
2080 if (w->wd < 0) 2247 if (w->wd < 0)
2081 { 2248 {
2082 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2249 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2083 2250
2084 /* monitor some parent directory for speedup hints */ 2251 /* monitor some parent directory for speedup hints */
2252 /* note that exceeding the hardcoded limit is not a correctness issue, */
2253 /* but an efficiency issue only */
2085 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2254 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2086 { 2255 {
2087 char path [4096]; 2256 char path [4096];
2088 strcpy (path, w->path); 2257 strcpy (path, w->path);
2089 2258
… …
2334 clear_pending (EV_A_ (W)w); 2503 clear_pending (EV_A_ (W)w);
2335 if (expect_false (!ev_is_active (w))) 2504 if (expect_false (!ev_is_active (w)))
2336 return; 2505 return;
2337 2506
2338 { 2507 {
2339 int active = ((W)w)->active; 2508 int active = ev_active (w);
2340 2509
2341 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2510 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2342 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2511 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2343 2512
2344 ev_stop (EV_A_ (W)w); 2513 ev_stop (EV_A_ (W)w);
2345 --idleall; 2514 --idleall;
2346 } 2515 }
2347} 2516}
… …
2364 clear_pending (EV_A_ (W)w); 2533 clear_pending (EV_A_ (W)w);
2365 if (expect_false (!ev_is_active (w))) 2534 if (expect_false (!ev_is_active (w)))
2366 return; 2535 return;
2367 2536
2368 { 2537 {
2369 int active = ((W)w)->active; 2538 int active = ev_active (w);
2539
2370 prepares [active - 1] = prepares [--preparecnt]; 2540 prepares [active - 1] = prepares [--preparecnt];
2371 ((W)prepares [active - 1])->active = active; 2541 ev_active (prepares [active - 1]) = active;
2372 } 2542 }
2373 2543
2374 ev_stop (EV_A_ (W)w); 2544 ev_stop (EV_A_ (W)w);
2375} 2545}
2376 2546
… …
2391 clear_pending (EV_A_ (W)w); 2561 clear_pending (EV_A_ (W)w);
2392 if (expect_false (!ev_is_active (w))) 2562 if (expect_false (!ev_is_active (w)))
2393 return; 2563 return;
2394 2564
2395 { 2565 {
2396 int active = ((W)w)->active; 2566 int active = ev_active (w);
2567
2397 checks [active - 1] = checks [--checkcnt]; 2568 checks [active - 1] = checks [--checkcnt];
2398 ((W)checks [active - 1])->active = active; 2569 ev_active (checks [active - 1]) = active;
2399 } 2570 }
2400 2571
2401 ev_stop (EV_A_ (W)w); 2572 ev_stop (EV_A_ (W)w);
2402} 2573}
2403 2574
… …
2499 clear_pending (EV_A_ (W)w); 2670 clear_pending (EV_A_ (W)w);
2500 if (expect_false (!ev_is_active (w))) 2671 if (expect_false (!ev_is_active (w)))
2501 return; 2672 return;
2502 2673
2503 { 2674 {
2504 int active = ((W)w)->active; 2675 int active = ev_active (w);
2676
2505 forks [active - 1] = forks [--forkcnt]; 2677 forks [active - 1] = forks [--forkcnt];
2506 ((W)forks [active - 1])->active = active; 2678 ev_active (forks [active - 1]) = active;
2507 } 2679 }
2508 2680
2509 ev_stop (EV_A_ (W)w); 2681 ev_stop (EV_A_ (W)w);
2510} 2682}
2511#endif 2683#endif
… …
2530 clear_pending (EV_A_ (W)w); 2702 clear_pending (EV_A_ (W)w);
2531 if (expect_false (!ev_is_active (w))) 2703 if (expect_false (!ev_is_active (w)))
2532 return; 2704 return;
2533 2705
2534 { 2706 {
2535 int active = ((W)w)->active; 2707 int active = ev_active (w);
2708
2536 asyncs [active - 1] = asyncs [--asynccnt]; 2709 asyncs [active - 1] = asyncs [--asynccnt];
2537 ((W)asyncs [active - 1])->active = active; 2710 ev_active (asyncs [active - 1]) = active;
2538 } 2711 }
2539 2712
2540 ev_stop (EV_A_ (W)w); 2713 ev_stop (EV_A_ (W)w);
2541} 2714}
2542 2715

Diff Legend

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