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

Comparing libev/ev.c (file contents):
Revision 1.223 by root, Sun Apr 6 14:34:50 2008 UTC vs.
Revision 1.250 by root, Thu May 22 02:44:57 2008 UTC

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

Diff Legend

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