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

Comparing libev/ev.c (file contents):
Revision 1.222 by root, Sun Apr 6 12:45:58 2008 UTC vs.
Revision 1.248 by root, Wed May 21 23:25:21 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
… …
279} 287}
280# endif 288# endif
281#endif 289#endif
282 290
283/**/ 291/**/
292
293/* undefined or zero: no verification done or available */
294/* 1 or higher: ev_loop_verify function available */
295/* 2 or higher: ev_loop_verify is called frequently */
296#define EV_VERIFY 1
297
298#if EV_VERIFY > 1
299# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
300#else
301# define EV_FREQUENT_CHECK do { } while (0)
302#endif
284 303
285/* 304/*
286 * This is used to avoid floating point rounding problems. 305 * This is used to avoid floating point rounding problems.
287 * It is added to ev_rt_now when scheduling periodics 306 * It is added to ev_rt_now when scheduling periodics
288 * to ensure progress, time-wise, even when rounding 307 * to ensure progress, time-wise, even when rounding
… …
300# define expect(expr,value) __builtin_expect ((expr),(value)) 319# define expect(expr,value) __builtin_expect ((expr),(value))
301# define noinline __attribute__ ((noinline)) 320# define noinline __attribute__ ((noinline))
302#else 321#else
303# define expect(expr,value) (expr) 322# define expect(expr,value) (expr)
304# define noinline 323# define noinline
305# if __STDC_VERSION__ < 199901L 324# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
306# define inline 325# define inline
307# endif 326# endif
308#endif 327#endif
309 328
310#define expect_false(expr) expect ((expr) != 0, 0) 329#define expect_false(expr) expect ((expr) != 0, 0)
… …
325 344
326typedef ev_watcher *W; 345typedef ev_watcher *W;
327typedef ev_watcher_list *WL; 346typedef ev_watcher_list *WL;
328typedef ev_watcher_time *WT; 347typedef ev_watcher_time *WT;
329 348
349#define ev_active(w) ((W)(w))->active
350#define ev_at(w) ((WT)(w))->at
351
330#if EV_USE_MONOTONIC 352#if EV_USE_MONOTONIC
331/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 353/* sig_atomic_t is used to avoid per-thread variables or locking but still */
332/* giving it a reasonably high chance of working on typical architetcures */ 354/* giving it a reasonably high chance of working on typical architetcures */
333static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 355static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
334#endif 356#endif
… …
360 perror (msg); 382 perror (msg);
361 abort (); 383 abort ();
362 } 384 }
363} 385}
364 386
387static void *
388ev_realloc_emul (void *ptr, long size)
389{
390 /* some systems, notably openbsd and darwin, fail to properly
391 * implement realloc (x, 0) (as required by both ansi c-98 and
392 * the single unix specification, so work around them here.
393 */
394
395 if (size)
396 return realloc (ptr, size);
397
398 free (ptr);
399 return 0;
400}
401
365static void *(*alloc)(void *ptr, long size); 402static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
366 403
367void 404void
368ev_set_allocator (void *(*cb)(void *ptr, long size)) 405ev_set_allocator (void *(*cb)(void *ptr, long size))
369{ 406{
370 alloc = cb; 407 alloc = cb;
371} 408}
372 409
373inline_speed void * 410inline_speed void *
374ev_realloc (void *ptr, long size) 411ev_realloc (void *ptr, long size)
375{ 412{
376 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 413 ptr = alloc (ptr, size);
377 414
378 if (!ptr && size) 415 if (!ptr && size)
379 { 416 {
380 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 417 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
381 abort (); 418 abort ();
… …
404 W w; 441 W w;
405 int events; 442 int events;
406} ANPENDING; 443} ANPENDING;
407 444
408#if EV_USE_INOTIFY 445#if EV_USE_INOTIFY
446/* hash table entry per inotify-id */
409typedef struct 447typedef struct
410{ 448{
411 WL head; 449 WL head;
412} ANFS; 450} ANFS;
451#endif
452
453/* Heap Entry */
454#if EV_HEAP_CACHE_AT
455 typedef struct {
456 ev_tstamp at;
457 WT w;
458 } ANHE;
459
460 #define ANHE_w(he) (he).w /* access watcher, read-write */
461 #define ANHE_at(he) (he).at /* access cached at, read-only */
462 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
463#else
464 typedef WT ANHE;
465
466 #define ANHE_w(he) (he)
467 #define ANHE_at(he) (he)->at
468 #define ANHE_at_cache(he)
413#endif 469#endif
414 470
415#if EV_MULTIPLICITY 471#if EV_MULTIPLICITY
416 472
417 struct ev_loop 473 struct ev_loop
… …
502 } 558 }
503} 559}
504 560
505/*****************************************************************************/ 561/*****************************************************************************/
506 562
563#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
564
507int inline_size 565int inline_size
508array_nextsize (int elem, int cur, int cnt) 566array_nextsize (int elem, int cur, int cnt)
509{ 567{
510 int ncur = cur + 1; 568 int ncur = cur + 1;
511 569
512 do 570 do
513 ncur <<= 1; 571 ncur <<= 1;
514 while (cnt > ncur); 572 while (cnt > ncur);
515 573
516 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 574 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
517 if (elem * ncur > 4096) 575 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
518 { 576 {
519 ncur *= elem; 577 ncur *= elem;
520 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 578 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
521 ncur = ncur - sizeof (void *) * 4; 579 ncur = ncur - sizeof (void *) * 4;
522 ncur /= elem; 580 ncur /= elem;
523 } 581 }
524 582
525 return ncur; 583 return ncur;
… …
739 } 797 }
740} 798}
741 799
742/*****************************************************************************/ 800/*****************************************************************************/
743 801
802/*
803 * the heap functions want a real array index. array index 0 uis guaranteed to not
804 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
805 * the branching factor of the d-tree.
806 */
807
808/*
809 * at the moment we allow libev the luxury of two heaps,
810 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
811 * which is more cache-efficient.
812 * the difference is about 5% with 50000+ watchers.
813 */
814#if EV_USE_4HEAP
815
816#define DHEAP 4
817#define HEAP0 (DHEAP - 1) /* index of first element in heap */
818#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
819#define UPHEAP_DONE(p,k) ((p) == (k))
820
821/* away from the root */
744void inline_speed 822void inline_speed
745upheap (WT *heap, int k) 823downheap (ANHE *heap, int N, int k)
746{ 824{
747 WT w = heap [k]; 825 ANHE he = heap [k];
826 ANHE *E = heap + N + HEAP0;
748 827
749 while (k) 828 for (;;)
750 { 829 {
751 int p = (k - 1) >> 1; 830 ev_tstamp minat;
831 ANHE *minpos;
832 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
752 833
753 if (heap [p]->at <= w->at) 834 /* find minimum child */
835 if (expect_true (pos + DHEAP - 1 < E))
836 {
837 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
838 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
839 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
840 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
841 }
842 else if (pos < E)
843 {
844 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
845 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
846 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
847 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
848 }
849 else
754 break; 850 break;
755 851
852 if (ANHE_at (he) <= minat)
853 break;
854
855 heap [k] = *minpos;
856 ev_active (ANHE_w (*minpos)) = k;
857
858 k = minpos - heap;
859 }
860
861 heap [k] = he;
862 ev_active (ANHE_w (he)) = k;
863}
864
865#else /* 4HEAP */
866
867#define HEAP0 1
868#define HPARENT(k) ((k) >> 1)
869#define UPHEAP_DONE(p,k) (!(p))
870
871/* away from the root */
872void inline_speed
873downheap (ANHE *heap, int N, int k)
874{
875 ANHE he = heap [k];
876
877 for (;;)
878 {
879 int c = k << 1;
880
881 if (c > N + HEAP0 - 1)
882 break;
883
884 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
885 ? 1 : 0;
886
887 if (ANHE_at (he) <= ANHE_at (heap [c]))
888 break;
889
890 heap [k] = heap [c];
891 ev_active (ANHE_w (heap [k])) = k;
892
893 k = c;
894 }
895
896 heap [k] = he;
897 ev_active (ANHE_w (he)) = k;
898}
899#endif
900
901/* towards the root */
902void inline_speed
903upheap (ANHE *heap, int k)
904{
905 ANHE he = heap [k];
906
907 for (;;)
908 {
909 int p = HPARENT (k);
910
911 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
912 break;
913
756 heap [k] = heap [p]; 914 heap [k] = heap [p];
757 ((W)heap [k])->active = k + 1; 915 ev_active (ANHE_w (heap [k])) = k;
758 k = p; 916 k = p;
759 } 917 }
760 918
761 heap [k] = w; 919 heap [k] = he;
762 ((W)heap [k])->active = k + 1; 920 ev_active (ANHE_w (he)) = k;
763}
764
765void inline_speed
766downheap (WT *heap, int N, int k)
767{
768 WT w = heap [k];
769
770 for (;;)
771 {
772 int c = (k << 1) + 1;
773
774 if (c >= N)
775 break;
776
777 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
778 ? 1 : 0;
779
780 if (w->at <= heap [c]->at)
781 break;
782
783 heap [k] = heap [c];
784 ((W)heap [k])->active = k + 1;
785
786 k = c;
787 }
788
789 heap [k] = w;
790 ((W)heap [k])->active = k + 1;
791} 921}
792 922
793void inline_size 923void inline_size
794adjustheap (WT *heap, int N, int k) 924adjustheap (ANHE *heap, int N, int k)
795{ 925{
926 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
796 upheap (heap, k); 927 upheap (heap, k);
928 else
797 downheap (heap, N, k); 929 downheap (heap, N, k);
798} 930}
931
932/* rebuild the heap: this function is used only once and executed rarely */
933void inline_size
934reheap (ANHE *heap, int N)
935{
936 int i;
937 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
938 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
939 for (i = 0; i < N; ++i)
940 upheap (heap, i + HEAP0);
941}
942
943#if EV_VERIFY
944static void
945checkheap (ANHE *heap, int N)
946{
947 int i;
948
949 for (i = HEAP0; i < N + HEAP0; ++i)
950 {
951 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
952 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
953 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
954 }
955}
956#endif
799 957
800/*****************************************************************************/ 958/*****************************************************************************/
801 959
802typedef struct 960typedef struct
803{ 961{
… …
891pipecb (EV_P_ ev_io *iow, int revents) 1049pipecb (EV_P_ ev_io *iow, int revents)
892{ 1050{
893#if EV_USE_EVENTFD 1051#if EV_USE_EVENTFD
894 if (evfd >= 0) 1052 if (evfd >= 0)
895 { 1053 {
896 uint64_t counter = 1; 1054 uint64_t counter;
897 read (evfd, &counter, sizeof (uint64_t)); 1055 read (evfd, &counter, sizeof (uint64_t));
898 } 1056 }
899 else 1057 else
900#endif 1058#endif
901 { 1059 {
… …
1170 if (!(flags & EVFLAG_NOENV) 1328 if (!(flags & EVFLAG_NOENV)
1171 && !enable_secure () 1329 && !enable_secure ()
1172 && getenv ("LIBEV_FLAGS")) 1330 && getenv ("LIBEV_FLAGS"))
1173 flags = atoi (getenv ("LIBEV_FLAGS")); 1331 flags = atoi (getenv ("LIBEV_FLAGS"));
1174 1332
1175 if (!(flags & 0x0000ffffUL)) 1333 if (!(flags & 0x0000ffffU))
1176 flags |= ev_recommended_backends (); 1334 flags |= ev_recommended_backends ();
1177 1335
1178#if EV_USE_PORT 1336#if EV_USE_PORT
1179 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1337 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1180#endif 1338#endif
… …
1268#endif 1426#endif
1269 1427
1270 backend = 0; 1428 backend = 0;
1271} 1429}
1272 1430
1431#if EV_USE_INOTIFY
1273void inline_size infy_fork (EV_P); 1432void inline_size infy_fork (EV_P);
1433#endif
1274 1434
1275void inline_size 1435void inline_size
1276loop_fork (EV_P) 1436loop_fork (EV_P)
1277{ 1437{
1278#if EV_USE_PORT 1438#if EV_USE_PORT
… …
1345void 1505void
1346ev_loop_fork (EV_P) 1506ev_loop_fork (EV_P)
1347{ 1507{
1348 postfork = 1; /* must be in line with ev_default_fork */ 1508 postfork = 1; /* must be in line with ev_default_fork */
1349} 1509}
1510
1511#if EV_VERIFY
1512static void
1513array_check (W **ws, int cnt)
1514{
1515 while (cnt--)
1516 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1517}
1518
1519static void
1520ev_loop_verify (EV_P)
1521{
1522 int i;
1523
1524 checkheap (timers, timercnt);
1525#if EV_PERIODIC_ENABLE
1526 checkheap (periodics, periodiccnt);
1527#endif
1528
1529#if EV_IDLE_ENABLE
1530 for (i = NUMPRI; i--; )
1531 array_check ((W **)idles [i], idlecnt [i]);
1532#endif
1533#if EV_FORK_ENABLE
1534 array_check ((W **)forks, forkcnt);
1535#endif
1536 array_check ((W **)prepares, preparecnt);
1537 array_check ((W **)checks, checkcnt);
1538#if EV_ASYNC_ENABLE
1539 array_check ((W **)asyncs, asynccnt);
1540#endif
1541}
1542#endif
1350 1543
1351#endif 1544#endif
1352 1545
1353#if EV_MULTIPLICITY 1546#if EV_MULTIPLICITY
1354struct ev_loop * 1547struct ev_loop *
… …
1421void inline_speed 1614void inline_speed
1422call_pending (EV_P) 1615call_pending (EV_P)
1423{ 1616{
1424 int pri; 1617 int pri;
1425 1618
1619 EV_FREQUENT_CHECK;
1620
1426 for (pri = NUMPRI; pri--; ) 1621 for (pri = NUMPRI; pri--; )
1427 while (pendingcnt [pri]) 1622 while (pendingcnt [pri])
1428 { 1623 {
1429 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1624 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1430 1625
… …
1434 1629
1435 p->w->pending = 0; 1630 p->w->pending = 0;
1436 EV_CB_INVOKE (p->w, p->events); 1631 EV_CB_INVOKE (p->w, p->events);
1437 } 1632 }
1438 } 1633 }
1439}
1440 1634
1441void inline_size 1635 EV_FREQUENT_CHECK;
1442timers_reify (EV_P)
1443{
1444 while (timercnt && ((WT)timers [0])->at <= mn_now)
1445 {
1446 ev_timer *w = (ev_timer *)timers [0];
1447
1448 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1449
1450 /* first reschedule or stop timer */
1451 if (w->repeat)
1452 {
1453 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1454
1455 ((WT)w)->at += w->repeat;
1456 if (((WT)w)->at < mn_now)
1457 ((WT)w)->at = mn_now;
1458
1459 downheap (timers, timercnt, 0);
1460 }
1461 else
1462 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1463
1464 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1465 }
1466} 1636}
1467
1468#if EV_PERIODIC_ENABLE
1469void inline_size
1470periodics_reify (EV_P)
1471{
1472 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1473 {
1474 ev_periodic *w = (ev_periodic *)periodics [0];
1475
1476 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1477
1478 /* first reschedule or stop timer */
1479 if (w->reschedule_cb)
1480 {
1481 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1482 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1483 downheap (periodics, periodiccnt, 0);
1484 }
1485 else if (w->interval)
1486 {
1487 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1488 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1489 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1490 downheap (periodics, periodiccnt, 0);
1491 }
1492 else
1493 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1494
1495 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1496 }
1497}
1498
1499static void noinline
1500periodics_reschedule (EV_P)
1501{
1502 int i;
1503
1504 /* adjust periodics after time jump */
1505 for (i = 0; i < periodiccnt; ++i)
1506 {
1507 ev_periodic *w = (ev_periodic *)periodics [i];
1508
1509 if (w->reschedule_cb)
1510 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1511 else if (w->interval)
1512 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1513 }
1514
1515 /* now rebuild the heap */
1516 for (i = periodiccnt >> 1; i--; )
1517 downheap (periodics, periodiccnt, i);
1518}
1519#endif
1520 1637
1521#if EV_IDLE_ENABLE 1638#if EV_IDLE_ENABLE
1522void inline_size 1639void inline_size
1523idle_reify (EV_P) 1640idle_reify (EV_P)
1524{ 1641{
… …
1536 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1653 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1537 break; 1654 break;
1538 } 1655 }
1539 } 1656 }
1540 } 1657 }
1658}
1659#endif
1660
1661void inline_size
1662timers_reify (EV_P)
1663{
1664 EV_FREQUENT_CHECK;
1665
1666 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1667 {
1668 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1669
1670 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1671
1672 /* first reschedule or stop timer */
1673 if (w->repeat)
1674 {
1675 ev_at (w) += w->repeat;
1676 if (ev_at (w) < mn_now)
1677 ev_at (w) = mn_now;
1678
1679 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1680
1681 ANHE_at_cache (timers [HEAP0]);
1682 downheap (timers, timercnt, HEAP0);
1683 }
1684 else
1685 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1686
1687 EV_FREQUENT_CHECK;
1688 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1689 }
1690}
1691
1692#if EV_PERIODIC_ENABLE
1693void inline_size
1694periodics_reify (EV_P)
1695{
1696 EV_FREQUENT_CHECK;
1697 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1698 {
1699 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1700
1701 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1702
1703 /* first reschedule or stop timer */
1704 if (w->reschedule_cb)
1705 {
1706 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1707
1708 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1709
1710 ANHE_at_cache (periodics [HEAP0]);
1711 downheap (periodics, periodiccnt, HEAP0);
1712 EV_FREQUENT_CHECK;
1713 }
1714 else if (w->interval)
1715 {
1716 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1717 /* if next trigger time is not sufficiently in the future, put it there */
1718 /* this might happen because of floating point inexactness */
1719 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1720 {
1721 ev_at (w) += w->interval;
1722
1723 /* if interval is unreasonably low we might still have a time in the past */
1724 /* so correct this. this will make the periodic very inexact, but the user */
1725 /* has effectively asked to get triggered more often than possible */
1726 if (ev_at (w) < ev_rt_now)
1727 ev_at (w) = ev_rt_now;
1728 }
1729
1730 ANHE_at_cache (periodics [HEAP0]);
1731 downheap (periodics, periodiccnt, HEAP0);
1732 }
1733 else
1734 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1735
1736 EV_FREQUENT_CHECK;
1737 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1738 }
1739}
1740
1741static void noinline
1742periodics_reschedule (EV_P)
1743{
1744 int i;
1745
1746 /* adjust periodics after time jump */
1747 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1748 {
1749 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1750
1751 if (w->reschedule_cb)
1752 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1753 else if (w->interval)
1754 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1755
1756 ANHE_at_cache (periodics [i]);
1757 }
1758
1759 reheap (periodics, periodiccnt);
1541} 1760}
1542#endif 1761#endif
1543 1762
1544void inline_speed 1763void inline_speed
1545time_update (EV_P_ ev_tstamp max_block) 1764time_update (EV_P_ ev_tstamp max_block)
… …
1574 */ 1793 */
1575 for (i = 4; --i; ) 1794 for (i = 4; --i; )
1576 { 1795 {
1577 rtmn_diff = ev_rt_now - mn_now; 1796 rtmn_diff = ev_rt_now - mn_now;
1578 1797
1579 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1798 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1580 return; /* all is well */ 1799 return; /* all is well */
1581 1800
1582 ev_rt_now = ev_time (); 1801 ev_rt_now = ev_time ();
1583 mn_now = get_clock (); 1802 mn_now = get_clock ();
1584 now_floor = mn_now; 1803 now_floor = mn_now;
… …
1600#if EV_PERIODIC_ENABLE 1819#if EV_PERIODIC_ENABLE
1601 periodics_reschedule (EV_A); 1820 periodics_reschedule (EV_A);
1602#endif 1821#endif
1603 /* adjust timers. this is easy, as the offset is the same for all of them */ 1822 /* adjust timers. this is easy, as the offset is the same for all of them */
1604 for (i = 0; i < timercnt; ++i) 1823 for (i = 0; i < timercnt; ++i)
1824 {
1825 ANHE *he = timers + i + HEAP0;
1605 ((WT)timers [i])->at += ev_rt_now - mn_now; 1826 ANHE_w (*he)->at += ev_rt_now - mn_now;
1827 ANHE_at_cache (*he);
1828 }
1606 } 1829 }
1607 1830
1608 mn_now = ev_rt_now; 1831 mn_now = ev_rt_now;
1609 } 1832 }
1610} 1833}
… …
1680 1903
1681 waittime = MAX_BLOCKTIME; 1904 waittime = MAX_BLOCKTIME;
1682 1905
1683 if (timercnt) 1906 if (timercnt)
1684 { 1907 {
1685 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1908 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1686 if (waittime > to) waittime = to; 1909 if (waittime > to) waittime = to;
1687 } 1910 }
1688 1911
1689#if EV_PERIODIC_ENABLE 1912#if EV_PERIODIC_ENABLE
1690 if (periodiccnt) 1913 if (periodiccnt)
1691 { 1914 {
1692 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1915 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1693 if (waittime > to) waittime = to; 1916 if (waittime > to) waittime = to;
1694 } 1917 }
1695#endif 1918#endif
1696 1919
1697 if (expect_false (waittime < timeout_blocktime)) 1920 if (expect_false (waittime < timeout_blocktime))
… …
1834 if (expect_false (ev_is_active (w))) 2057 if (expect_false (ev_is_active (w)))
1835 return; 2058 return;
1836 2059
1837 assert (("ev_io_start called with negative fd", fd >= 0)); 2060 assert (("ev_io_start called with negative fd", fd >= 0));
1838 2061
2062 EV_FREQUENT_CHECK;
2063
1839 ev_start (EV_A_ (W)w, 1); 2064 ev_start (EV_A_ (W)w, 1);
1840 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2065 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1841 wlist_add (&anfds[fd].head, (WL)w); 2066 wlist_add (&anfds[fd].head, (WL)w);
1842 2067
1843 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2068 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1844 w->events &= ~EV_IOFDSET; 2069 w->events &= ~EV_IOFDSET;
2070
2071 EV_FREQUENT_CHECK;
1845} 2072}
1846 2073
1847void noinline 2074void noinline
1848ev_io_stop (EV_P_ ev_io *w) 2075ev_io_stop (EV_P_ ev_io *w)
1849{ 2076{
1850 clear_pending (EV_A_ (W)w); 2077 clear_pending (EV_A_ (W)w);
1851 if (expect_false (!ev_is_active (w))) 2078 if (expect_false (!ev_is_active (w)))
1852 return; 2079 return;
1853 2080
1854 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2081 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2082
2083 EV_FREQUENT_CHECK;
1855 2084
1856 wlist_del (&anfds[w->fd].head, (WL)w); 2085 wlist_del (&anfds[w->fd].head, (WL)w);
1857 ev_stop (EV_A_ (W)w); 2086 ev_stop (EV_A_ (W)w);
1858 2087
1859 fd_change (EV_A_ w->fd, 1); 2088 fd_change (EV_A_ w->fd, 1);
2089
2090 EV_FREQUENT_CHECK;
1860} 2091}
1861 2092
1862void noinline 2093void noinline
1863ev_timer_start (EV_P_ ev_timer *w) 2094ev_timer_start (EV_P_ ev_timer *w)
1864{ 2095{
1865 if (expect_false (ev_is_active (w))) 2096 if (expect_false (ev_is_active (w)))
1866 return; 2097 return;
1867 2098
1868 ((WT)w)->at += mn_now; 2099 ev_at (w) += mn_now;
1869 2100
1870 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2101 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1871 2102
2103 EV_FREQUENT_CHECK;
2104
2105 ++timercnt;
1872 ev_start (EV_A_ (W)w, ++timercnt); 2106 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
1873 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 2107 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1874 timers [timercnt - 1] = (WT)w; 2108 ANHE_w (timers [ev_active (w)]) = (WT)w;
1875 upheap (timers, timercnt - 1); 2109 ANHE_at_cache (timers [ev_active (w)]);
2110 upheap (timers, ev_active (w));
1876 2111
2112 EV_FREQUENT_CHECK;
2113
1877 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 2114 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1878} 2115}
1879 2116
1880void noinline 2117void noinline
1881ev_timer_stop (EV_P_ ev_timer *w) 2118ev_timer_stop (EV_P_ ev_timer *w)
1882{ 2119{
1883 clear_pending (EV_A_ (W)w); 2120 clear_pending (EV_A_ (W)w);
1884 if (expect_false (!ev_is_active (w))) 2121 if (expect_false (!ev_is_active (w)))
1885 return; 2122 return;
1886 2123
1887 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w)); 2124 EV_FREQUENT_CHECK;
1888 2125
1889 { 2126 {
1890 int active = ((W)w)->active; 2127 int active = ev_active (w);
1891 2128
2129 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2130
2131 --timercnt;
2132
1892 if (expect_true (--active < --timercnt)) 2133 if (expect_true (active < timercnt + HEAP0))
1893 { 2134 {
1894 timers [active] = timers [timercnt]; 2135 timers [active] = timers [timercnt + HEAP0];
1895 adjustheap (timers, timercnt, active); 2136 adjustheap (timers, timercnt, active);
1896 } 2137 }
1897 } 2138 }
1898 2139
1899 ((WT)w)->at -= mn_now; 2140 EV_FREQUENT_CHECK;
2141
2142 ev_at (w) -= mn_now;
1900 2143
1901 ev_stop (EV_A_ (W)w); 2144 ev_stop (EV_A_ (W)w);
1902} 2145}
1903 2146
1904void noinline 2147void noinline
1905ev_timer_again (EV_P_ ev_timer *w) 2148ev_timer_again (EV_P_ ev_timer *w)
1906{ 2149{
2150 EV_FREQUENT_CHECK;
2151
1907 if (ev_is_active (w)) 2152 if (ev_is_active (w))
1908 { 2153 {
1909 if (w->repeat) 2154 if (w->repeat)
1910 { 2155 {
1911 ((WT)w)->at = mn_now + w->repeat; 2156 ev_at (w) = mn_now + w->repeat;
2157 ANHE_at_cache (timers [ev_active (w)]);
1912 adjustheap (timers, timercnt, ((W)w)->active - 1); 2158 adjustheap (timers, timercnt, ev_active (w));
1913 } 2159 }
1914 else 2160 else
1915 ev_timer_stop (EV_A_ w); 2161 ev_timer_stop (EV_A_ w);
1916 } 2162 }
1917 else if (w->repeat) 2163 else if (w->repeat)
1918 { 2164 {
1919 w->at = w->repeat; 2165 ev_at (w) = w->repeat;
1920 ev_timer_start (EV_A_ w); 2166 ev_timer_start (EV_A_ w);
1921 } 2167 }
2168
2169 EV_FREQUENT_CHECK;
1922} 2170}
1923 2171
1924#if EV_PERIODIC_ENABLE 2172#if EV_PERIODIC_ENABLE
1925void noinline 2173void noinline
1926ev_periodic_start (EV_P_ ev_periodic *w) 2174ev_periodic_start (EV_P_ ev_periodic *w)
1927{ 2175{
1928 if (expect_false (ev_is_active (w))) 2176 if (expect_false (ev_is_active (w)))
1929 return; 2177 return;
1930 2178
1931 if (w->reschedule_cb) 2179 if (w->reschedule_cb)
1932 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2180 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1933 else if (w->interval) 2181 else if (w->interval)
1934 { 2182 {
1935 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2183 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1936 /* this formula differs from the one in periodic_reify because we do not always round up */ 2184 /* this formula differs from the one in periodic_reify because we do not always round up */
1937 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2185 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1938 } 2186 }
1939 else 2187 else
1940 ((WT)w)->at = w->offset; 2188 ev_at (w) = w->offset;
1941 2189
2190 EV_FREQUENT_CHECK;
2191
2192 ++periodiccnt;
1942 ev_start (EV_A_ (W)w, ++periodiccnt); 2193 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
1943 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2194 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1944 periodics [periodiccnt - 1] = (WT)w; 2195 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1945 upheap (periodics, periodiccnt - 1); 2196 ANHE_at_cache (periodics [ev_active (w)]);
2197 upheap (periodics, ev_active (w));
1946 2198
2199 EV_FREQUENT_CHECK;
2200
1947 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2201 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
1948} 2202}
1949 2203
1950void noinline 2204void noinline
1951ev_periodic_stop (EV_P_ ev_periodic *w) 2205ev_periodic_stop (EV_P_ ev_periodic *w)
1952{ 2206{
1953 clear_pending (EV_A_ (W)w); 2207 clear_pending (EV_A_ (W)w);
1954 if (expect_false (!ev_is_active (w))) 2208 if (expect_false (!ev_is_active (w)))
1955 return; 2209 return;
1956 2210
1957 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w)); 2211 EV_FREQUENT_CHECK;
1958 2212
1959 { 2213 {
1960 int active = ((W)w)->active; 2214 int active = ev_active (w);
1961 2215
2216 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2217
2218 --periodiccnt;
2219
1962 if (expect_true (--active < --periodiccnt)) 2220 if (expect_true (active < periodiccnt + HEAP0))
1963 { 2221 {
1964 periodics [active] = periodics [periodiccnt]; 2222 periodics [active] = periodics [periodiccnt + HEAP0];
1965 adjustheap (periodics, periodiccnt, active); 2223 adjustheap (periodics, periodiccnt, active);
1966 } 2224 }
1967 } 2225 }
1968 2226
2227 EV_FREQUENT_CHECK;
2228
1969 ev_stop (EV_A_ (W)w); 2229 ev_stop (EV_A_ (W)w);
1970} 2230}
1971 2231
1972void noinline 2232void noinline
1973ev_periodic_again (EV_P_ ev_periodic *w) 2233ev_periodic_again (EV_P_ ev_periodic *w)
… …
1992 return; 2252 return;
1993 2253
1994 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2254 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1995 2255
1996 evpipe_init (EV_A); 2256 evpipe_init (EV_A);
2257
2258 EV_FREQUENT_CHECK;
1997 2259
1998 { 2260 {
1999#ifndef _WIN32 2261#ifndef _WIN32
2000 sigset_t full, prev; 2262 sigset_t full, prev;
2001 sigfillset (&full); 2263 sigfillset (&full);
… …
2022 sigfillset (&sa.sa_mask); 2284 sigfillset (&sa.sa_mask);
2023 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2285 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2024 sigaction (w->signum, &sa, 0); 2286 sigaction (w->signum, &sa, 0);
2025#endif 2287#endif
2026 } 2288 }
2289
2290 EV_FREQUENT_CHECK;
2027} 2291}
2028 2292
2029void noinline 2293void noinline
2030ev_signal_stop (EV_P_ ev_signal *w) 2294ev_signal_stop (EV_P_ ev_signal *w)
2031{ 2295{
2032 clear_pending (EV_A_ (W)w); 2296 clear_pending (EV_A_ (W)w);
2033 if (expect_false (!ev_is_active (w))) 2297 if (expect_false (!ev_is_active (w)))
2034 return; 2298 return;
2035 2299
2300 EV_FREQUENT_CHECK;
2301
2036 wlist_del (&signals [w->signum - 1].head, (WL)w); 2302 wlist_del (&signals [w->signum - 1].head, (WL)w);
2037 ev_stop (EV_A_ (W)w); 2303 ev_stop (EV_A_ (W)w);
2038 2304
2039 if (!signals [w->signum - 1].head) 2305 if (!signals [w->signum - 1].head)
2040 signal (w->signum, SIG_DFL); 2306 signal (w->signum, SIG_DFL);
2307
2308 EV_FREQUENT_CHECK;
2041} 2309}
2042 2310
2043void 2311void
2044ev_child_start (EV_P_ ev_child *w) 2312ev_child_start (EV_P_ ev_child *w)
2045{ 2313{
… …
2047 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2315 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2048#endif 2316#endif
2049 if (expect_false (ev_is_active (w))) 2317 if (expect_false (ev_is_active (w)))
2050 return; 2318 return;
2051 2319
2320 EV_FREQUENT_CHECK;
2321
2052 ev_start (EV_A_ (W)w, 1); 2322 ev_start (EV_A_ (W)w, 1);
2053 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2323 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2324
2325 EV_FREQUENT_CHECK;
2054} 2326}
2055 2327
2056void 2328void
2057ev_child_stop (EV_P_ ev_child *w) 2329ev_child_stop (EV_P_ ev_child *w)
2058{ 2330{
2059 clear_pending (EV_A_ (W)w); 2331 clear_pending (EV_A_ (W)w);
2060 if (expect_false (!ev_is_active (w))) 2332 if (expect_false (!ev_is_active (w)))
2061 return; 2333 return;
2062 2334
2335 EV_FREQUENT_CHECK;
2336
2063 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2337 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2064 ev_stop (EV_A_ (W)w); 2338 ev_stop (EV_A_ (W)w);
2339
2340 EV_FREQUENT_CHECK;
2065} 2341}
2066 2342
2067#if EV_STAT_ENABLE 2343#if EV_STAT_ENABLE
2068 2344
2069# ifdef _WIN32 2345# ifdef _WIN32
… …
2087 if (w->wd < 0) 2363 if (w->wd < 0)
2088 { 2364 {
2089 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2365 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2090 2366
2091 /* monitor some parent directory for speedup hints */ 2367 /* monitor some parent directory for speedup hints */
2368 /* note that exceeding the hardcoded limit is not a correctness issue, */
2369 /* but an efficiency issue only */
2092 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2370 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2093 { 2371 {
2094 char path [4096]; 2372 char path [4096];
2095 strcpy (path, w->path); 2373 strcpy (path, w->path);
2096 2374
… …
2295 else 2573 else
2296#endif 2574#endif
2297 ev_timer_start (EV_A_ &w->timer); 2575 ev_timer_start (EV_A_ &w->timer);
2298 2576
2299 ev_start (EV_A_ (W)w, 1); 2577 ev_start (EV_A_ (W)w, 1);
2578
2579 EV_FREQUENT_CHECK;
2300} 2580}
2301 2581
2302void 2582void
2303ev_stat_stop (EV_P_ ev_stat *w) 2583ev_stat_stop (EV_P_ ev_stat *w)
2304{ 2584{
2305 clear_pending (EV_A_ (W)w); 2585 clear_pending (EV_A_ (W)w);
2306 if (expect_false (!ev_is_active (w))) 2586 if (expect_false (!ev_is_active (w)))
2307 return; 2587 return;
2308 2588
2589 EV_FREQUENT_CHECK;
2590
2309#if EV_USE_INOTIFY 2591#if EV_USE_INOTIFY
2310 infy_del (EV_A_ w); 2592 infy_del (EV_A_ w);
2311#endif 2593#endif
2312 ev_timer_stop (EV_A_ &w->timer); 2594 ev_timer_stop (EV_A_ &w->timer);
2313 2595
2314 ev_stop (EV_A_ (W)w); 2596 ev_stop (EV_A_ (W)w);
2597
2598 EV_FREQUENT_CHECK;
2315} 2599}
2316#endif 2600#endif
2317 2601
2318#if EV_IDLE_ENABLE 2602#if EV_IDLE_ENABLE
2319void 2603void
… …
2321{ 2605{
2322 if (expect_false (ev_is_active (w))) 2606 if (expect_false (ev_is_active (w)))
2323 return; 2607 return;
2324 2608
2325 pri_adjust (EV_A_ (W)w); 2609 pri_adjust (EV_A_ (W)w);
2610
2611 EV_FREQUENT_CHECK;
2326 2612
2327 { 2613 {
2328 int active = ++idlecnt [ABSPRI (w)]; 2614 int active = ++idlecnt [ABSPRI (w)];
2329 2615
2330 ++idleall; 2616 ++idleall;
2331 ev_start (EV_A_ (W)w, active); 2617 ev_start (EV_A_ (W)w, active);
2332 2618
2333 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 2619 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2334 idles [ABSPRI (w)][active - 1] = w; 2620 idles [ABSPRI (w)][active - 1] = w;
2335 } 2621 }
2622
2623 EV_FREQUENT_CHECK;
2336} 2624}
2337 2625
2338void 2626void
2339ev_idle_stop (EV_P_ ev_idle *w) 2627ev_idle_stop (EV_P_ ev_idle *w)
2340{ 2628{
2341 clear_pending (EV_A_ (W)w); 2629 clear_pending (EV_A_ (W)w);
2342 if (expect_false (!ev_is_active (w))) 2630 if (expect_false (!ev_is_active (w)))
2343 return; 2631 return;
2344 2632
2633 EV_FREQUENT_CHECK;
2634
2345 { 2635 {
2346 int active = ((W)w)->active; 2636 int active = ev_active (w);
2347 2637
2348 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2638 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2349 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2639 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2350 2640
2351 ev_stop (EV_A_ (W)w); 2641 ev_stop (EV_A_ (W)w);
2352 --idleall; 2642 --idleall;
2353 } 2643 }
2644
2645 EV_FREQUENT_CHECK;
2354} 2646}
2355#endif 2647#endif
2356 2648
2357void 2649void
2358ev_prepare_start (EV_P_ ev_prepare *w) 2650ev_prepare_start (EV_P_ ev_prepare *w)
2359{ 2651{
2360 if (expect_false (ev_is_active (w))) 2652 if (expect_false (ev_is_active (w)))
2361 return; 2653 return;
2654
2655 EV_FREQUENT_CHECK;
2362 2656
2363 ev_start (EV_A_ (W)w, ++preparecnt); 2657 ev_start (EV_A_ (W)w, ++preparecnt);
2364 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2658 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2365 prepares [preparecnt - 1] = w; 2659 prepares [preparecnt - 1] = w;
2660
2661 EV_FREQUENT_CHECK;
2366} 2662}
2367 2663
2368void 2664void
2369ev_prepare_stop (EV_P_ ev_prepare *w) 2665ev_prepare_stop (EV_P_ ev_prepare *w)
2370{ 2666{
2371 clear_pending (EV_A_ (W)w); 2667 clear_pending (EV_A_ (W)w);
2372 if (expect_false (!ev_is_active (w))) 2668 if (expect_false (!ev_is_active (w)))
2373 return; 2669 return;
2374 2670
2671 EV_FREQUENT_CHECK;
2672
2375 { 2673 {
2376 int active = ((W)w)->active; 2674 int active = ev_active (w);
2675
2377 prepares [active - 1] = prepares [--preparecnt]; 2676 prepares [active - 1] = prepares [--preparecnt];
2378 ((W)prepares [active - 1])->active = active; 2677 ev_active (prepares [active - 1]) = active;
2379 } 2678 }
2380 2679
2381 ev_stop (EV_A_ (W)w); 2680 ev_stop (EV_A_ (W)w);
2681
2682 EV_FREQUENT_CHECK;
2382} 2683}
2383 2684
2384void 2685void
2385ev_check_start (EV_P_ ev_check *w) 2686ev_check_start (EV_P_ ev_check *w)
2386{ 2687{
2387 if (expect_false (ev_is_active (w))) 2688 if (expect_false (ev_is_active (w)))
2388 return; 2689 return;
2690
2691 EV_FREQUENT_CHECK;
2389 2692
2390 ev_start (EV_A_ (W)w, ++checkcnt); 2693 ev_start (EV_A_ (W)w, ++checkcnt);
2391 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2694 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2392 checks [checkcnt - 1] = w; 2695 checks [checkcnt - 1] = w;
2696
2697 EV_FREQUENT_CHECK;
2393} 2698}
2394 2699
2395void 2700void
2396ev_check_stop (EV_P_ ev_check *w) 2701ev_check_stop (EV_P_ ev_check *w)
2397{ 2702{
2398 clear_pending (EV_A_ (W)w); 2703 clear_pending (EV_A_ (W)w);
2399 if (expect_false (!ev_is_active (w))) 2704 if (expect_false (!ev_is_active (w)))
2400 return; 2705 return;
2401 2706
2707 EV_FREQUENT_CHECK;
2708
2402 { 2709 {
2403 int active = ((W)w)->active; 2710 int active = ev_active (w);
2711
2404 checks [active - 1] = checks [--checkcnt]; 2712 checks [active - 1] = checks [--checkcnt];
2405 ((W)checks [active - 1])->active = active; 2713 ev_active (checks [active - 1]) = active;
2406 } 2714 }
2407 2715
2408 ev_stop (EV_A_ (W)w); 2716 ev_stop (EV_A_ (W)w);
2717
2718 EV_FREQUENT_CHECK;
2409} 2719}
2410 2720
2411#if EV_EMBED_ENABLE 2721#if EV_EMBED_ENABLE
2412void noinline 2722void noinline
2413ev_embed_sweep (EV_P_ ev_embed *w) 2723ev_embed_sweep (EV_P_ ev_embed *w)
… …
2460 struct ev_loop *loop = w->other; 2770 struct ev_loop *loop = w->other;
2461 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2771 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2462 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2772 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2463 } 2773 }
2464 2774
2775 EV_FREQUENT_CHECK;
2776
2465 ev_set_priority (&w->io, ev_priority (w)); 2777 ev_set_priority (&w->io, ev_priority (w));
2466 ev_io_start (EV_A_ &w->io); 2778 ev_io_start (EV_A_ &w->io);
2467 2779
2468 ev_prepare_init (&w->prepare, embed_prepare_cb); 2780 ev_prepare_init (&w->prepare, embed_prepare_cb);
2469 ev_set_priority (&w->prepare, EV_MINPRI); 2781 ev_set_priority (&w->prepare, EV_MINPRI);
2470 ev_prepare_start (EV_A_ &w->prepare); 2782 ev_prepare_start (EV_A_ &w->prepare);
2471 2783
2472 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2784 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2473 2785
2474 ev_start (EV_A_ (W)w, 1); 2786 ev_start (EV_A_ (W)w, 1);
2787
2788 EV_FREQUENT_CHECK;
2475} 2789}
2476 2790
2477void 2791void
2478ev_embed_stop (EV_P_ ev_embed *w) 2792ev_embed_stop (EV_P_ ev_embed *w)
2479{ 2793{
2480 clear_pending (EV_A_ (W)w); 2794 clear_pending (EV_A_ (W)w);
2481 if (expect_false (!ev_is_active (w))) 2795 if (expect_false (!ev_is_active (w)))
2482 return; 2796 return;
2483 2797
2798 EV_FREQUENT_CHECK;
2799
2484 ev_io_stop (EV_A_ &w->io); 2800 ev_io_stop (EV_A_ &w->io);
2485 ev_prepare_stop (EV_A_ &w->prepare); 2801 ev_prepare_stop (EV_A_ &w->prepare);
2486 2802
2487 ev_stop (EV_A_ (W)w); 2803 ev_stop (EV_A_ (W)w);
2804
2805 EV_FREQUENT_CHECK;
2488} 2806}
2489#endif 2807#endif
2490 2808
2491#if EV_FORK_ENABLE 2809#if EV_FORK_ENABLE
2492void 2810void
2493ev_fork_start (EV_P_ ev_fork *w) 2811ev_fork_start (EV_P_ ev_fork *w)
2494{ 2812{
2495 if (expect_false (ev_is_active (w))) 2813 if (expect_false (ev_is_active (w)))
2496 return; 2814 return;
2815
2816 EV_FREQUENT_CHECK;
2497 2817
2498 ev_start (EV_A_ (W)w, ++forkcnt); 2818 ev_start (EV_A_ (W)w, ++forkcnt);
2499 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2819 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2500 forks [forkcnt - 1] = w; 2820 forks [forkcnt - 1] = w;
2821
2822 EV_FREQUENT_CHECK;
2501} 2823}
2502 2824
2503void 2825void
2504ev_fork_stop (EV_P_ ev_fork *w) 2826ev_fork_stop (EV_P_ ev_fork *w)
2505{ 2827{
2506 clear_pending (EV_A_ (W)w); 2828 clear_pending (EV_A_ (W)w);
2507 if (expect_false (!ev_is_active (w))) 2829 if (expect_false (!ev_is_active (w)))
2508 return; 2830 return;
2509 2831
2832 EV_FREQUENT_CHECK;
2833
2510 { 2834 {
2511 int active = ((W)w)->active; 2835 int active = ev_active (w);
2836
2512 forks [active - 1] = forks [--forkcnt]; 2837 forks [active - 1] = forks [--forkcnt];
2513 ((W)forks [active - 1])->active = active; 2838 ev_active (forks [active - 1]) = active;
2514 } 2839 }
2515 2840
2516 ev_stop (EV_A_ (W)w); 2841 ev_stop (EV_A_ (W)w);
2842
2843 EV_FREQUENT_CHECK;
2517} 2844}
2518#endif 2845#endif
2519 2846
2520#if EV_ASYNC_ENABLE 2847#if EV_ASYNC_ENABLE
2521void 2848void
… …
2523{ 2850{
2524 if (expect_false (ev_is_active (w))) 2851 if (expect_false (ev_is_active (w)))
2525 return; 2852 return;
2526 2853
2527 evpipe_init (EV_A); 2854 evpipe_init (EV_A);
2855
2856 EV_FREQUENT_CHECK;
2528 2857
2529 ev_start (EV_A_ (W)w, ++asynccnt); 2858 ev_start (EV_A_ (W)w, ++asynccnt);
2530 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2859 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2531 asyncs [asynccnt - 1] = w; 2860 asyncs [asynccnt - 1] = w;
2861
2862 EV_FREQUENT_CHECK;
2532} 2863}
2533 2864
2534void 2865void
2535ev_async_stop (EV_P_ ev_async *w) 2866ev_async_stop (EV_P_ ev_async *w)
2536{ 2867{
2537 clear_pending (EV_A_ (W)w); 2868 clear_pending (EV_A_ (W)w);
2538 if (expect_false (!ev_is_active (w))) 2869 if (expect_false (!ev_is_active (w)))
2539 return; 2870 return;
2540 2871
2872 EV_FREQUENT_CHECK;
2873
2541 { 2874 {
2542 int active = ((W)w)->active; 2875 int active = ev_active (w);
2876
2543 asyncs [active - 1] = asyncs [--asynccnt]; 2877 asyncs [active - 1] = asyncs [--asynccnt];
2544 ((W)asyncs [active - 1])->active = active; 2878 ev_active (asyncs [active - 1]) = active;
2545 } 2879 }
2546 2880
2547 ev_stop (EV_A_ (W)w); 2881 ev_stop (EV_A_ (W)w);
2882
2883 EV_FREQUENT_CHECK;
2548} 2884}
2549 2885
2550void 2886void
2551ev_async_send (EV_P_ ev_async *w) 2887ev_async_send (EV_P_ ev_async *w)
2552{ 2888{

Diff Legend

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