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

Comparing libev/ev.c (file contents):
Revision 1.229 by root, Fri May 2 08:08:45 2008 UTC vs.
Revision 1.259 by root, Mon Sep 8 13:14:23 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>
… …
154#ifndef _WIN32 154#ifndef _WIN32
155# include <sys/time.h> 155# include <sys/time.h>
156# include <sys/wait.h> 156# include <sys/wait.h>
157# include <unistd.h> 157# include <unistd.h>
158#else 158#else
159# include <io.h>
159# define WIN32_LEAN_AND_MEAN 160# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 161# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 162# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 163# define EV_SELECT_IS_WINSOCKET 1
163# endif 164# endif
164#endif 165#endif
165 166
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 167/* this block tries to deduce configuration from header-defined symbols and defaults */
167 168
168#ifndef EV_USE_MONOTONIC 169#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1
172# else
169# define EV_USE_MONOTONIC 0 173# define EV_USE_MONOTONIC 0
174# endif
170#endif 175#endif
171 176
172#ifndef EV_USE_REALTIME 177#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 178# define EV_USE_REALTIME 0
174#endif 179#endif
175 180
176#ifndef EV_USE_NANOSLEEP 181#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1
184# else
177# define EV_USE_NANOSLEEP 0 185# define EV_USE_NANOSLEEP 0
186# endif
178#endif 187#endif
179 188
180#ifndef EV_USE_SELECT 189#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 190# define EV_USE_SELECT 1
182#endif 191#endif
… …
233# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 242# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
234# define EV_USE_EVENTFD 1 243# define EV_USE_EVENTFD 1
235# else 244# else
236# define EV_USE_EVENTFD 0 245# define EV_USE_EVENTFD 0
237# endif 246# endif
247#endif
248
249#if 0 /* debugging */
250# define EV_VERIFY 3
251# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1
253#endif
254
255#ifndef EV_VERIFY
256# define EV_VERIFY !EV_MINIMAL
257#endif
258
259#ifndef EV_USE_4HEAP
260# define EV_USE_4HEAP !EV_MINIMAL
261#endif
262
263#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL
238#endif 265#endif
239 266
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 267/* this block fixes any misconfiguration where we know we run into trouble otherwise */
241 268
242#ifndef CLOCK_MONOTONIC 269#ifndef CLOCK_MONOTONIC
… …
279} 306}
280# endif 307# endif
281#endif 308#endif
282 309
283/**/ 310/**/
311
312#if EV_VERIFY >= 3
313# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
314#else
315# define EV_FREQUENT_CHECK do { } while (0)
316#endif
284 317
285/* 318/*
286 * This is used to avoid floating point rounding problems. 319 * This is used to avoid floating point rounding problems.
287 * It is added to ev_rt_now when scheduling periodics 320 * It is added to ev_rt_now when scheduling periodics
288 * to ensure progress, time-wise, even when rounding 321 * to ensure progress, time-wise, even when rounding
… …
422 W w; 455 W w;
423 int events; 456 int events;
424} ANPENDING; 457} ANPENDING;
425 458
426#if EV_USE_INOTIFY 459#if EV_USE_INOTIFY
460/* hash table entry per inotify-id */
427typedef struct 461typedef struct
428{ 462{
429 WL head; 463 WL head;
430} ANFS; 464} ANFS;
465#endif
466
467/* Heap Entry */
468#if EV_HEAP_CACHE_AT
469 typedef struct {
470 ev_tstamp at;
471 WT w;
472 } ANHE;
473
474 #define ANHE_w(he) (he).w /* access watcher, read-write */
475 #define ANHE_at(he) (he).at /* access cached at, read-only */
476 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
477#else
478 typedef WT ANHE;
479
480 #define ANHE_w(he) (he)
481 #define ANHE_at(he) (he)->at
482 #define ANHE_at_cache(he)
431#endif 483#endif
432 484
433#if EV_MULTIPLICITY 485#if EV_MULTIPLICITY
434 486
435 struct ev_loop 487 struct ev_loop
… …
513 struct timeval tv; 565 struct timeval tv;
514 566
515 tv.tv_sec = (time_t)delay; 567 tv.tv_sec = (time_t)delay;
516 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 568 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
517 569
570 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
571 /* somehting nto guaranteed by newer posix versions, but guaranteed */
572 /* by older ones */
518 select (0, 0, 0, 0, &tv); 573 select (0, 0, 0, 0, &tv);
519#endif 574#endif
520 } 575 }
521} 576}
522 577
523/*****************************************************************************/ 578/*****************************************************************************/
579
580#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
524 581
525int inline_size 582int inline_size
526array_nextsize (int elem, int cur, int cnt) 583array_nextsize (int elem, int cur, int cnt)
527{ 584{
528 int ncur = cur + 1; 585 int ncur = cur + 1;
529 586
530 do 587 do
531 ncur <<= 1; 588 ncur <<= 1;
532 while (cnt > ncur); 589 while (cnt > ncur);
533 590
534 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 591 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
535 if (elem * ncur > 4096) 592 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
536 { 593 {
537 ncur *= elem; 594 ncur *= elem;
538 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 595 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
539 ncur = ncur - sizeof (void *) * 4; 596 ncur = ncur - sizeof (void *) * 4;
540 ncur /= elem; 597 ncur /= elem;
541 } 598 }
542 599
543 return ncur; 600 return ncur;
… …
654 events |= (unsigned char)w->events; 711 events |= (unsigned char)w->events;
655 712
656#if EV_SELECT_IS_WINSOCKET 713#if EV_SELECT_IS_WINSOCKET
657 if (events) 714 if (events)
658 { 715 {
659 unsigned long argp; 716 unsigned long arg;
660 #ifdef EV_FD_TO_WIN32_HANDLE 717 #ifdef EV_FD_TO_WIN32_HANDLE
661 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 718 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
662 #else 719 #else
663 anfd->handle = _get_osfhandle (fd); 720 anfd->handle = _get_osfhandle (fd);
664 #endif 721 #endif
665 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 722 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
666 } 723 }
667#endif 724#endif
668 725
669 { 726 {
670 unsigned char o_events = anfd->events; 727 unsigned char o_events = anfd->events;
… …
723{ 780{
724 int fd; 781 int fd;
725 782
726 for (fd = 0; fd < anfdmax; ++fd) 783 for (fd = 0; fd < anfdmax; ++fd)
727 if (anfds [fd].events) 784 if (anfds [fd].events)
728 if (!fd_valid (fd) == -1 && errno == EBADF) 785 if (!fd_valid (fd) && errno == EBADF)
729 fd_kill (EV_A_ fd); 786 fd_kill (EV_A_ fd);
730} 787}
731 788
732/* called on ENOMEM in select/poll to kill some fds and retry */ 789/* called on ENOMEM in select/poll to kill some fds and retry */
733static void noinline 790static void noinline
… …
757 } 814 }
758} 815}
759 816
760/*****************************************************************************/ 817/*****************************************************************************/
761 818
819/*
820 * the heap functions want a real array index. array index 0 uis guaranteed to not
821 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
822 * the branching factor of the d-tree.
823 */
824
825/*
826 * at the moment we allow libev the luxury of two heaps,
827 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
828 * which is more cache-efficient.
829 * the difference is about 5% with 50000+ watchers.
830 */
831#if EV_USE_4HEAP
832
833#define DHEAP 4
834#define HEAP0 (DHEAP - 1) /* index of first element in heap */
835#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
836#define UPHEAP_DONE(p,k) ((p) == (k))
837
838/* away from the root */
839void inline_speed
840downheap (ANHE *heap, int N, int k)
841{
842 ANHE he = heap [k];
843 ANHE *E = heap + N + HEAP0;
844
845 for (;;)
846 {
847 ev_tstamp minat;
848 ANHE *minpos;
849 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
850
851 /* find minimum child */
852 if (expect_true (pos + DHEAP - 1 < E))
853 {
854 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
855 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
856 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
857 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
858 }
859 else if (pos < E)
860 {
861 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
862 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
863 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
864 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
865 }
866 else
867 break;
868
869 if (ANHE_at (he) <= minat)
870 break;
871
872 heap [k] = *minpos;
873 ev_active (ANHE_w (*minpos)) = k;
874
875 k = minpos - heap;
876 }
877
878 heap [k] = he;
879 ev_active (ANHE_w (he)) = k;
880}
881
882#else /* 4HEAP */
883
884#define HEAP0 1
885#define HPARENT(k) ((k) >> 1)
886#define UPHEAP_DONE(p,k) (!(p))
887
888/* away from the root */
889void inline_speed
890downheap (ANHE *heap, int N, int k)
891{
892 ANHE he = heap [k];
893
894 for (;;)
895 {
896 int c = k << 1;
897
898 if (c > N + HEAP0 - 1)
899 break;
900
901 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
902 ? 1 : 0;
903
904 if (ANHE_at (he) <= ANHE_at (heap [c]))
905 break;
906
907 heap [k] = heap [c];
908 ev_active (ANHE_w (heap [k])) = k;
909
910 k = c;
911 }
912
913 heap [k] = he;
914 ev_active (ANHE_w (he)) = k;
915}
916#endif
917
762/* towards the root */ 918/* towards the root */
763void inline_speed 919void inline_speed
764upheap (WT *heap, int k) 920upheap (ANHE *heap, int k)
765{ 921{
766 WT w = heap [k]; 922 ANHE he = heap [k];
767 923
768 for (;;) 924 for (;;)
769 { 925 {
770 int p = k >> 1; 926 int p = HPARENT (k);
771 927
772 /* maybe we could use a dummy element at heap [0]? */ 928 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
773 if (!p || heap [p]->at <= w->at)
774 break; 929 break;
775 930
776 heap [k] = heap [p]; 931 heap [k] = heap [p];
777 ((W)heap [k])->active = k; 932 ev_active (ANHE_w (heap [k])) = k;
778 k = p; 933 k = p;
779 } 934 }
780 935
781 heap [k] = w; 936 heap [k] = he;
782 ((W)heap [k])->active = k; 937 ev_active (ANHE_w (he)) = k;
783}
784
785/* away from the root */
786void inline_speed
787downheap (WT *heap, int N, int k)
788{
789 WT w = heap [k];
790
791 for (;;)
792 {
793 int c = k << 1;
794
795 if (c > N)
796 break;
797
798 c += c < N && heap [c]->at > heap [c + 1]->at
799 ? 1 : 0;
800
801 if (w->at <= heap [c]->at)
802 break;
803
804 heap [k] = heap [c];
805 ((W)heap [k])->active = k;
806
807 k = c;
808 }
809
810 heap [k] = w;
811 ((W)heap [k])->active = k;
812} 938}
813 939
814void inline_size 940void inline_size
815adjustheap (WT *heap, int N, int k) 941adjustheap (ANHE *heap, int N, int k)
816{ 942{
943 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
817 upheap (heap, k); 944 upheap (heap, k);
945 else
818 downheap (heap, N, k); 946 downheap (heap, N, k);
947}
948
949/* rebuild the heap: this function is used only once and executed rarely */
950void inline_size
951reheap (ANHE *heap, int N)
952{
953 int i;
954
955 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
956 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
957 for (i = 0; i < N; ++i)
958 upheap (heap, i + HEAP0);
819} 959}
820 960
821/*****************************************************************************/ 961/*****************************************************************************/
822 962
823typedef struct 963typedef struct
… …
847 987
848void inline_speed 988void inline_speed
849fd_intern (int fd) 989fd_intern (int fd)
850{ 990{
851#ifdef _WIN32 991#ifdef _WIN32
852 int arg = 1; 992 unsigned long arg = 1;
853 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 993 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
854#else 994#else
855 fcntl (fd, F_SETFD, FD_CLOEXEC); 995 fcntl (fd, F_SETFD, FD_CLOEXEC);
856 fcntl (fd, F_SETFL, O_NONBLOCK); 996 fcntl (fd, F_SETFL, O_NONBLOCK);
857#endif 997#endif
… …
912pipecb (EV_P_ ev_io *iow, int revents) 1052pipecb (EV_P_ ev_io *iow, int revents)
913{ 1053{
914#if EV_USE_EVENTFD 1054#if EV_USE_EVENTFD
915 if (evfd >= 0) 1055 if (evfd >= 0)
916 { 1056 {
917 uint64_t counter = 1; 1057 uint64_t counter;
918 read (evfd, &counter, sizeof (uint64_t)); 1058 read (evfd, &counter, sizeof (uint64_t));
919 } 1059 }
920 else 1060 else
921#endif 1061#endif
922 { 1062 {
… …
1341 1481
1342 postfork = 0; 1482 postfork = 0;
1343} 1483}
1344 1484
1345#if EV_MULTIPLICITY 1485#if EV_MULTIPLICITY
1486
1346struct ev_loop * 1487struct ev_loop *
1347ev_loop_new (unsigned int flags) 1488ev_loop_new (unsigned int flags)
1348{ 1489{
1349 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1490 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1350 1491
… …
1369ev_loop_fork (EV_P) 1510ev_loop_fork (EV_P)
1370{ 1511{
1371 postfork = 1; /* must be in line with ev_default_fork */ 1512 postfork = 1; /* must be in line with ev_default_fork */
1372} 1513}
1373 1514
1515#if EV_VERIFY
1516static void noinline
1517verify_watcher (EV_P_ W w)
1518{
1519 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1520
1521 if (w->pending)
1522 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1523}
1524
1525static void noinline
1526verify_heap (EV_P_ ANHE *heap, int N)
1527{
1528 int i;
1529
1530 for (i = HEAP0; i < N + HEAP0; ++i)
1531 {
1532 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1533 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1534 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1535
1536 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1537 }
1538}
1539
1540static void noinline
1541array_verify (EV_P_ W *ws, int cnt)
1542{
1543 while (cnt--)
1544 {
1545 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1546 verify_watcher (EV_A_ ws [cnt]);
1547 }
1548}
1549#endif
1550
1551void
1552ev_loop_verify (EV_P)
1553{
1554#if EV_VERIFY
1555 int i;
1556 WL w;
1557
1558 assert (activecnt >= -1);
1559
1560 assert (fdchangemax >= fdchangecnt);
1561 for (i = 0; i < fdchangecnt; ++i)
1562 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1563
1564 assert (anfdmax >= 0);
1565 for (i = 0; i < anfdmax; ++i)
1566 for (w = anfds [i].head; w; w = w->next)
1567 {
1568 verify_watcher (EV_A_ (W)w);
1569 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1570 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1571 }
1572
1573 assert (timermax >= timercnt);
1574 verify_heap (EV_A_ timers, timercnt);
1575
1576#if EV_PERIODIC_ENABLE
1577 assert (periodicmax >= periodiccnt);
1578 verify_heap (EV_A_ periodics, periodiccnt);
1579#endif
1580
1581 for (i = NUMPRI; i--; )
1582 {
1583 assert (pendingmax [i] >= pendingcnt [i]);
1584#if EV_IDLE_ENABLE
1585 assert (idleall >= 0);
1586 assert (idlemax [i] >= idlecnt [i]);
1587 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1588#endif
1589 }
1590
1591#if EV_FORK_ENABLE
1592 assert (forkmax >= forkcnt);
1593 array_verify (EV_A_ (W *)forks, forkcnt);
1594#endif
1595
1596#if EV_ASYNC_ENABLE
1597 assert (asyncmax >= asynccnt);
1598 array_verify (EV_A_ (W *)asyncs, asynccnt);
1599#endif
1600
1601 assert (preparemax >= preparecnt);
1602 array_verify (EV_A_ (W *)prepares, preparecnt);
1603
1604 assert (checkmax >= checkcnt);
1605 array_verify (EV_A_ (W *)checks, checkcnt);
1606
1607# if 0
1608 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1609 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1374#endif 1610# endif
1611#endif
1612}
1613
1614#endif /* multiplicity */
1375 1615
1376#if EV_MULTIPLICITY 1616#if EV_MULTIPLICITY
1377struct ev_loop * 1617struct ev_loop *
1378ev_default_loop_init (unsigned int flags) 1618ev_default_loop_init (unsigned int flags)
1379#else 1619#else
… …
1455 { 1695 {
1456 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1696 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1457 1697
1458 p->w->pending = 0; 1698 p->w->pending = 0;
1459 EV_CB_INVOKE (p->w, p->events); 1699 EV_CB_INVOKE (p->w, p->events);
1700 EV_FREQUENT_CHECK;
1460 } 1701 }
1461 } 1702 }
1462} 1703}
1463
1464void inline_size
1465timers_reify (EV_P)
1466{
1467 while (timercnt && ev_at (timers [1]) <= mn_now)
1468 {
1469 ev_timer *w = (ev_timer *)timers [1];
1470
1471 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1472
1473 /* first reschedule or stop timer */
1474 if (w->repeat)
1475 {
1476 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1477
1478 ev_at (w) += w->repeat;
1479 if (ev_at (w) < mn_now)
1480 ev_at (w) = mn_now;
1481
1482 downheap (timers, timercnt, 1);
1483 }
1484 else
1485 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1486
1487 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1488 }
1489}
1490
1491#if EV_PERIODIC_ENABLE
1492void inline_size
1493periodics_reify (EV_P)
1494{
1495 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1496 {
1497 ev_periodic *w = (ev_periodic *)periodics [1];
1498
1499 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1500
1501 /* first reschedule or stop timer */
1502 if (w->reschedule_cb)
1503 {
1504 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1505 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1506 downheap (periodics, periodiccnt, 1);
1507 }
1508 else if (w->interval)
1509 {
1510 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1511 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1512 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1513 downheap (periodics, periodiccnt, 1);
1514 }
1515 else
1516 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1517
1518 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1519 }
1520}
1521
1522static void noinline
1523periodics_reschedule (EV_P)
1524{
1525 int i;
1526
1527 /* adjust periodics after time jump */
1528 for (i = 0; i < periodiccnt; ++i)
1529 {
1530 ev_periodic *w = (ev_periodic *)periodics [i];
1531
1532 if (w->reschedule_cb)
1533 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1534 else if (w->interval)
1535 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1536 }
1537
1538 /* now rebuild the heap */
1539 for (i = periodiccnt >> 1; i--; )
1540 downheap (periodics, periodiccnt, i);
1541}
1542#endif
1543 1704
1544#if EV_IDLE_ENABLE 1705#if EV_IDLE_ENABLE
1545void inline_size 1706void inline_size
1546idle_reify (EV_P) 1707idle_reify (EV_P)
1547{ 1708{
… …
1559 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1720 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1560 break; 1721 break;
1561 } 1722 }
1562 } 1723 }
1563 } 1724 }
1725}
1726#endif
1727
1728void inline_size
1729timers_reify (EV_P)
1730{
1731 EV_FREQUENT_CHECK;
1732
1733 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1734 {
1735 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1736
1737 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1738
1739 /* first reschedule or stop timer */
1740 if (w->repeat)
1741 {
1742 ev_at (w) += w->repeat;
1743 if (ev_at (w) < mn_now)
1744 ev_at (w) = mn_now;
1745
1746 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1747
1748 ANHE_at_cache (timers [HEAP0]);
1749 downheap (timers, timercnt, HEAP0);
1750 }
1751 else
1752 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1753
1754 EV_FREQUENT_CHECK;
1755 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1756 }
1757}
1758
1759#if EV_PERIODIC_ENABLE
1760void inline_size
1761periodics_reify (EV_P)
1762{
1763 EV_FREQUENT_CHECK;
1764
1765 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1766 {
1767 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1768
1769 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1770
1771 /* first reschedule or stop timer */
1772 if (w->reschedule_cb)
1773 {
1774 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1775
1776 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1777
1778 ANHE_at_cache (periodics [HEAP0]);
1779 downheap (periodics, periodiccnt, HEAP0);
1780 }
1781 else if (w->interval)
1782 {
1783 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1784 /* if next trigger time is not sufficiently in the future, put it there */
1785 /* this might happen because of floating point inexactness */
1786 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1787 {
1788 ev_at (w) += w->interval;
1789
1790 /* if interval is unreasonably low we might still have a time in the past */
1791 /* so correct this. this will make the periodic very inexact, but the user */
1792 /* has effectively asked to get triggered more often than possible */
1793 if (ev_at (w) < ev_rt_now)
1794 ev_at (w) = ev_rt_now;
1795 }
1796
1797 ANHE_at_cache (periodics [HEAP0]);
1798 downheap (periodics, periodiccnt, HEAP0);
1799 }
1800 else
1801 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1802
1803 EV_FREQUENT_CHECK;
1804 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1805 }
1806}
1807
1808static void noinline
1809periodics_reschedule (EV_P)
1810{
1811 int i;
1812
1813 /* adjust periodics after time jump */
1814 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1815 {
1816 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1817
1818 if (w->reschedule_cb)
1819 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1820 else if (w->interval)
1821 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1822
1823 ANHE_at_cache (periodics [i]);
1824 }
1825
1826 reheap (periodics, periodiccnt);
1564} 1827}
1565#endif 1828#endif
1566 1829
1567void inline_speed 1830void inline_speed
1568time_update (EV_P_ ev_tstamp max_block) 1831time_update (EV_P_ ev_tstamp max_block)
… …
1597 */ 1860 */
1598 for (i = 4; --i; ) 1861 for (i = 4; --i; )
1599 { 1862 {
1600 rtmn_diff = ev_rt_now - mn_now; 1863 rtmn_diff = ev_rt_now - mn_now;
1601 1864
1602 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1865 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1603 return; /* all is well */ 1866 return; /* all is well */
1604 1867
1605 ev_rt_now = ev_time (); 1868 ev_rt_now = ev_time ();
1606 mn_now = get_clock (); 1869 mn_now = get_clock ();
1607 now_floor = mn_now; 1870 now_floor = mn_now;
… …
1622 { 1885 {
1623#if EV_PERIODIC_ENABLE 1886#if EV_PERIODIC_ENABLE
1624 periodics_reschedule (EV_A); 1887 periodics_reschedule (EV_A);
1625#endif 1888#endif
1626 /* adjust timers. this is easy, as the offset is the same for all of them */ 1889 /* adjust timers. this is easy, as the offset is the same for all of them */
1627 for (i = 1; i <= timercnt; ++i) 1890 for (i = 0; i < timercnt; ++i)
1628 ev_at (timers [i]) += ev_rt_now - mn_now; 1891 {
1892 ANHE *he = timers + i + HEAP0;
1893 ANHE_w (*he)->at += ev_rt_now - mn_now;
1894 ANHE_at_cache (*he);
1895 }
1629 } 1896 }
1630 1897
1631 mn_now = ev_rt_now; 1898 mn_now = ev_rt_now;
1632 } 1899 }
1633} 1900}
… …
1653 1920
1654 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1921 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1655 1922
1656 do 1923 do
1657 { 1924 {
1925#if EV_VERIFY >= 2
1926 ev_loop_verify (EV_A);
1927#endif
1928
1658#ifndef _WIN32 1929#ifndef _WIN32
1659 if (expect_false (curpid)) /* penalise the forking check even more */ 1930 if (expect_false (curpid)) /* penalise the forking check even more */
1660 if (expect_false (getpid () != curpid)) 1931 if (expect_false (getpid () != curpid))
1661 { 1932 {
1662 curpid = getpid (); 1933 curpid = getpid ();
… …
1703 1974
1704 waittime = MAX_BLOCKTIME; 1975 waittime = MAX_BLOCKTIME;
1705 1976
1706 if (timercnt) 1977 if (timercnt)
1707 { 1978 {
1708 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge; 1979 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1709 if (waittime > to) waittime = to; 1980 if (waittime > to) waittime = to;
1710 } 1981 }
1711 1982
1712#if EV_PERIODIC_ENABLE 1983#if EV_PERIODIC_ENABLE
1713 if (periodiccnt) 1984 if (periodiccnt)
1714 { 1985 {
1715 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge; 1986 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1716 if (waittime > to) waittime = to; 1987 if (waittime > to) waittime = to;
1717 } 1988 }
1718#endif 1989#endif
1719 1990
1720 if (expect_false (waittime < timeout_blocktime)) 1991 if (expect_false (waittime < timeout_blocktime))
… …
1857 if (expect_false (ev_is_active (w))) 2128 if (expect_false (ev_is_active (w)))
1858 return; 2129 return;
1859 2130
1860 assert (("ev_io_start called with negative fd", fd >= 0)); 2131 assert (("ev_io_start called with negative fd", fd >= 0));
1861 2132
2133 EV_FREQUENT_CHECK;
2134
1862 ev_start (EV_A_ (W)w, 1); 2135 ev_start (EV_A_ (W)w, 1);
1863 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2136 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1864 wlist_add (&anfds[fd].head, (WL)w); 2137 wlist_add (&anfds[fd].head, (WL)w);
1865 2138
1866 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2139 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1867 w->events &= ~EV_IOFDSET; 2140 w->events &= ~EV_IOFDSET;
2141
2142 EV_FREQUENT_CHECK;
1868} 2143}
1869 2144
1870void noinline 2145void noinline
1871ev_io_stop (EV_P_ ev_io *w) 2146ev_io_stop (EV_P_ ev_io *w)
1872{ 2147{
1873 clear_pending (EV_A_ (W)w); 2148 clear_pending (EV_A_ (W)w);
1874 if (expect_false (!ev_is_active (w))) 2149 if (expect_false (!ev_is_active (w)))
1875 return; 2150 return;
1876 2151
1877 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2152 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2153
2154 EV_FREQUENT_CHECK;
1878 2155
1879 wlist_del (&anfds[w->fd].head, (WL)w); 2156 wlist_del (&anfds[w->fd].head, (WL)w);
1880 ev_stop (EV_A_ (W)w); 2157 ev_stop (EV_A_ (W)w);
1881 2158
1882 fd_change (EV_A_ w->fd, 1); 2159 fd_change (EV_A_ w->fd, 1);
2160
2161 EV_FREQUENT_CHECK;
1883} 2162}
1884 2163
1885void noinline 2164void noinline
1886ev_timer_start (EV_P_ ev_timer *w) 2165ev_timer_start (EV_P_ ev_timer *w)
1887{ 2166{
… …
1890 2169
1891 ev_at (w) += mn_now; 2170 ev_at (w) += mn_now;
1892 2171
1893 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2172 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1894 2173
2174 EV_FREQUENT_CHECK;
2175
2176 ++timercnt;
1895 ev_start (EV_A_ (W)w, ++timercnt); 2177 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
1896 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2); 2178 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1897 timers [timercnt] = (WT)w; 2179 ANHE_w (timers [ev_active (w)]) = (WT)w;
2180 ANHE_at_cache (timers [ev_active (w)]);
1898 upheap (timers, timercnt); 2181 upheap (timers, ev_active (w));
1899 2182
2183 EV_FREQUENT_CHECK;
2184
1900 /*assert (("internal timer heap corruption", timers [((W)w)->active] == w));*/ 2185 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1901} 2186}
1902 2187
1903void noinline 2188void noinline
1904ev_timer_stop (EV_P_ ev_timer *w) 2189ev_timer_stop (EV_P_ ev_timer *w)
1905{ 2190{
1906 clear_pending (EV_A_ (W)w); 2191 clear_pending (EV_A_ (W)w);
1907 if (expect_false (!ev_is_active (w))) 2192 if (expect_false (!ev_is_active (w)))
1908 return; 2193 return;
1909 2194
1910 assert (("internal timer heap corruption", timers [((W)w)->active] == (WT)w)); 2195 EV_FREQUENT_CHECK;
1911 2196
1912 { 2197 {
1913 int active = ((W)w)->active; 2198 int active = ev_active (w);
1914 2199
2200 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2201
2202 --timercnt;
2203
1915 if (expect_true (active < timercnt)) 2204 if (expect_true (active < timercnt + HEAP0))
1916 { 2205 {
1917 timers [active] = timers [timercnt]; 2206 timers [active] = timers [timercnt + HEAP0];
1918 adjustheap (timers, timercnt, active); 2207 adjustheap (timers, timercnt, active);
1919 } 2208 }
1920
1921 --timercnt;
1922 } 2209 }
2210
2211 EV_FREQUENT_CHECK;
1923 2212
1924 ev_at (w) -= mn_now; 2213 ev_at (w) -= mn_now;
1925 2214
1926 ev_stop (EV_A_ (W)w); 2215 ev_stop (EV_A_ (W)w);
1927} 2216}
1928 2217
1929void noinline 2218void noinline
1930ev_timer_again (EV_P_ ev_timer *w) 2219ev_timer_again (EV_P_ ev_timer *w)
1931{ 2220{
2221 EV_FREQUENT_CHECK;
2222
1932 if (ev_is_active (w)) 2223 if (ev_is_active (w))
1933 { 2224 {
1934 if (w->repeat) 2225 if (w->repeat)
1935 { 2226 {
1936 ev_at (w) = mn_now + w->repeat; 2227 ev_at (w) = mn_now + w->repeat;
2228 ANHE_at_cache (timers [ev_active (w)]);
1937 adjustheap (timers, timercnt, ((W)w)->active); 2229 adjustheap (timers, timercnt, ev_active (w));
1938 } 2230 }
1939 else 2231 else
1940 ev_timer_stop (EV_A_ w); 2232 ev_timer_stop (EV_A_ w);
1941 } 2233 }
1942 else if (w->repeat) 2234 else if (w->repeat)
1943 { 2235 {
1944 ev_at (w) = w->repeat; 2236 ev_at (w) = w->repeat;
1945 ev_timer_start (EV_A_ w); 2237 ev_timer_start (EV_A_ w);
1946 } 2238 }
2239
2240 EV_FREQUENT_CHECK;
1947} 2241}
1948 2242
1949#if EV_PERIODIC_ENABLE 2243#if EV_PERIODIC_ENABLE
1950void noinline 2244void noinline
1951ev_periodic_start (EV_P_ ev_periodic *w) 2245ev_periodic_start (EV_P_ ev_periodic *w)
… …
1962 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2256 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1963 } 2257 }
1964 else 2258 else
1965 ev_at (w) = w->offset; 2259 ev_at (w) = w->offset;
1966 2260
2261 EV_FREQUENT_CHECK;
2262
2263 ++periodiccnt;
1967 ev_start (EV_A_ (W)w, ++periodiccnt); 2264 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
1968 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2); 2265 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1969 periodics [periodiccnt] = (WT)w; 2266 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1970 upheap (periodics, periodiccnt); 2267 ANHE_at_cache (periodics [ev_active (w)]);
2268 upheap (periodics, ev_active (w));
1971 2269
2270 EV_FREQUENT_CHECK;
2271
1972 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2272 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
1973} 2273}
1974 2274
1975void noinline 2275void noinline
1976ev_periodic_stop (EV_P_ ev_periodic *w) 2276ev_periodic_stop (EV_P_ ev_periodic *w)
1977{ 2277{
1978 clear_pending (EV_A_ (W)w); 2278 clear_pending (EV_A_ (W)w);
1979 if (expect_false (!ev_is_active (w))) 2279 if (expect_false (!ev_is_active (w)))
1980 return; 2280 return;
1981 2281
1982 assert (("internal periodic heap corruption", periodics [((W)w)->active] == (WT)w)); 2282 EV_FREQUENT_CHECK;
1983 2283
1984 { 2284 {
1985 int active = ((W)w)->active; 2285 int active = ev_active (w);
1986 2286
2287 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2288
2289 --periodiccnt;
2290
1987 if (expect_true (active < periodiccnt)) 2291 if (expect_true (active < periodiccnt + HEAP0))
1988 { 2292 {
1989 periodics [active] = periodics [periodiccnt]; 2293 periodics [active] = periodics [periodiccnt + HEAP0];
1990 adjustheap (periodics, periodiccnt, active); 2294 adjustheap (periodics, periodiccnt, active);
1991 } 2295 }
1992
1993 --periodiccnt;
1994 } 2296 }
2297
2298 EV_FREQUENT_CHECK;
1995 2299
1996 ev_stop (EV_A_ (W)w); 2300 ev_stop (EV_A_ (W)w);
1997} 2301}
1998 2302
1999void noinline 2303void noinline
… …
2019 return; 2323 return;
2020 2324
2021 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2325 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2022 2326
2023 evpipe_init (EV_A); 2327 evpipe_init (EV_A);
2328
2329 EV_FREQUENT_CHECK;
2024 2330
2025 { 2331 {
2026#ifndef _WIN32 2332#ifndef _WIN32
2027 sigset_t full, prev; 2333 sigset_t full, prev;
2028 sigfillset (&full); 2334 sigfillset (&full);
… …
2049 sigfillset (&sa.sa_mask); 2355 sigfillset (&sa.sa_mask);
2050 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2356 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2051 sigaction (w->signum, &sa, 0); 2357 sigaction (w->signum, &sa, 0);
2052#endif 2358#endif
2053 } 2359 }
2360
2361 EV_FREQUENT_CHECK;
2054} 2362}
2055 2363
2056void noinline 2364void noinline
2057ev_signal_stop (EV_P_ ev_signal *w) 2365ev_signal_stop (EV_P_ ev_signal *w)
2058{ 2366{
2059 clear_pending (EV_A_ (W)w); 2367 clear_pending (EV_A_ (W)w);
2060 if (expect_false (!ev_is_active (w))) 2368 if (expect_false (!ev_is_active (w)))
2061 return; 2369 return;
2062 2370
2371 EV_FREQUENT_CHECK;
2372
2063 wlist_del (&signals [w->signum - 1].head, (WL)w); 2373 wlist_del (&signals [w->signum - 1].head, (WL)w);
2064 ev_stop (EV_A_ (W)w); 2374 ev_stop (EV_A_ (W)w);
2065 2375
2066 if (!signals [w->signum - 1].head) 2376 if (!signals [w->signum - 1].head)
2067 signal (w->signum, SIG_DFL); 2377 signal (w->signum, SIG_DFL);
2378
2379 EV_FREQUENT_CHECK;
2068} 2380}
2069 2381
2070void 2382void
2071ev_child_start (EV_P_ ev_child *w) 2383ev_child_start (EV_P_ ev_child *w)
2072{ 2384{
… …
2074 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2386 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2075#endif 2387#endif
2076 if (expect_false (ev_is_active (w))) 2388 if (expect_false (ev_is_active (w)))
2077 return; 2389 return;
2078 2390
2391 EV_FREQUENT_CHECK;
2392
2079 ev_start (EV_A_ (W)w, 1); 2393 ev_start (EV_A_ (W)w, 1);
2080 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2394 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2395
2396 EV_FREQUENT_CHECK;
2081} 2397}
2082 2398
2083void 2399void
2084ev_child_stop (EV_P_ ev_child *w) 2400ev_child_stop (EV_P_ ev_child *w)
2085{ 2401{
2086 clear_pending (EV_A_ (W)w); 2402 clear_pending (EV_A_ (W)w);
2087 if (expect_false (!ev_is_active (w))) 2403 if (expect_false (!ev_is_active (w)))
2088 return; 2404 return;
2089 2405
2406 EV_FREQUENT_CHECK;
2407
2090 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2408 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2091 ev_stop (EV_A_ (W)w); 2409 ev_stop (EV_A_ (W)w);
2410
2411 EV_FREQUENT_CHECK;
2092} 2412}
2093 2413
2094#if EV_STAT_ENABLE 2414#if EV_STAT_ENABLE
2095 2415
2096# ifdef _WIN32 2416# ifdef _WIN32
… …
2114 if (w->wd < 0) 2434 if (w->wd < 0)
2115 { 2435 {
2116 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2436 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2117 2437
2118 /* monitor some parent directory for speedup hints */ 2438 /* monitor some parent directory for speedup hints */
2439 /* note that exceeding the hardcoded limit is not a correctness issue, */
2440 /* but an efficiency issue only */
2119 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2441 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2120 { 2442 {
2121 char path [4096]; 2443 char path [4096];
2122 strcpy (path, w->path); 2444 strcpy (path, w->path);
2123 2445
… …
2249 } 2571 }
2250 2572
2251 } 2573 }
2252} 2574}
2253 2575
2576#endif
2577
2578#ifdef _WIN32
2579# define EV_LSTAT(p,b) _stati64 (p, b)
2580#else
2581# define EV_LSTAT(p,b) lstat (p, b)
2254#endif 2582#endif
2255 2583
2256void 2584void
2257ev_stat_stat (EV_P_ ev_stat *w) 2585ev_stat_stat (EV_P_ ev_stat *w)
2258{ 2586{
… …
2322 else 2650 else
2323#endif 2651#endif
2324 ev_timer_start (EV_A_ &w->timer); 2652 ev_timer_start (EV_A_ &w->timer);
2325 2653
2326 ev_start (EV_A_ (W)w, 1); 2654 ev_start (EV_A_ (W)w, 1);
2655
2656 EV_FREQUENT_CHECK;
2327} 2657}
2328 2658
2329void 2659void
2330ev_stat_stop (EV_P_ ev_stat *w) 2660ev_stat_stop (EV_P_ ev_stat *w)
2331{ 2661{
2332 clear_pending (EV_A_ (W)w); 2662 clear_pending (EV_A_ (W)w);
2333 if (expect_false (!ev_is_active (w))) 2663 if (expect_false (!ev_is_active (w)))
2334 return; 2664 return;
2335 2665
2666 EV_FREQUENT_CHECK;
2667
2336#if EV_USE_INOTIFY 2668#if EV_USE_INOTIFY
2337 infy_del (EV_A_ w); 2669 infy_del (EV_A_ w);
2338#endif 2670#endif
2339 ev_timer_stop (EV_A_ &w->timer); 2671 ev_timer_stop (EV_A_ &w->timer);
2340 2672
2341 ev_stop (EV_A_ (W)w); 2673 ev_stop (EV_A_ (W)w);
2674
2675 EV_FREQUENT_CHECK;
2342} 2676}
2343#endif 2677#endif
2344 2678
2345#if EV_IDLE_ENABLE 2679#if EV_IDLE_ENABLE
2346void 2680void
… …
2348{ 2682{
2349 if (expect_false (ev_is_active (w))) 2683 if (expect_false (ev_is_active (w)))
2350 return; 2684 return;
2351 2685
2352 pri_adjust (EV_A_ (W)w); 2686 pri_adjust (EV_A_ (W)w);
2687
2688 EV_FREQUENT_CHECK;
2353 2689
2354 { 2690 {
2355 int active = ++idlecnt [ABSPRI (w)]; 2691 int active = ++idlecnt [ABSPRI (w)];
2356 2692
2357 ++idleall; 2693 ++idleall;
2358 ev_start (EV_A_ (W)w, active); 2694 ev_start (EV_A_ (W)w, active);
2359 2695
2360 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 2696 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2361 idles [ABSPRI (w)][active - 1] = w; 2697 idles [ABSPRI (w)][active - 1] = w;
2362 } 2698 }
2699
2700 EV_FREQUENT_CHECK;
2363} 2701}
2364 2702
2365void 2703void
2366ev_idle_stop (EV_P_ ev_idle *w) 2704ev_idle_stop (EV_P_ ev_idle *w)
2367{ 2705{
2368 clear_pending (EV_A_ (W)w); 2706 clear_pending (EV_A_ (W)w);
2369 if (expect_false (!ev_is_active (w))) 2707 if (expect_false (!ev_is_active (w)))
2370 return; 2708 return;
2371 2709
2710 EV_FREQUENT_CHECK;
2711
2372 { 2712 {
2373 int active = ((W)w)->active; 2713 int active = ev_active (w);
2374 2714
2375 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2715 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2376 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2716 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2377 2717
2378 ev_stop (EV_A_ (W)w); 2718 ev_stop (EV_A_ (W)w);
2379 --idleall; 2719 --idleall;
2380 } 2720 }
2721
2722 EV_FREQUENT_CHECK;
2381} 2723}
2382#endif 2724#endif
2383 2725
2384void 2726void
2385ev_prepare_start (EV_P_ ev_prepare *w) 2727ev_prepare_start (EV_P_ ev_prepare *w)
2386{ 2728{
2387 if (expect_false (ev_is_active (w))) 2729 if (expect_false (ev_is_active (w)))
2388 return; 2730 return;
2731
2732 EV_FREQUENT_CHECK;
2389 2733
2390 ev_start (EV_A_ (W)w, ++preparecnt); 2734 ev_start (EV_A_ (W)w, ++preparecnt);
2391 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2735 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2392 prepares [preparecnt - 1] = w; 2736 prepares [preparecnt - 1] = w;
2737
2738 EV_FREQUENT_CHECK;
2393} 2739}
2394 2740
2395void 2741void
2396ev_prepare_stop (EV_P_ ev_prepare *w) 2742ev_prepare_stop (EV_P_ ev_prepare *w)
2397{ 2743{
2398 clear_pending (EV_A_ (W)w); 2744 clear_pending (EV_A_ (W)w);
2399 if (expect_false (!ev_is_active (w))) 2745 if (expect_false (!ev_is_active (w)))
2400 return; 2746 return;
2401 2747
2748 EV_FREQUENT_CHECK;
2749
2402 { 2750 {
2403 int active = ((W)w)->active; 2751 int active = ev_active (w);
2752
2404 prepares [active - 1] = prepares [--preparecnt]; 2753 prepares [active - 1] = prepares [--preparecnt];
2405 ((W)prepares [active - 1])->active = active; 2754 ev_active (prepares [active - 1]) = active;
2406 } 2755 }
2407 2756
2408 ev_stop (EV_A_ (W)w); 2757 ev_stop (EV_A_ (W)w);
2758
2759 EV_FREQUENT_CHECK;
2409} 2760}
2410 2761
2411void 2762void
2412ev_check_start (EV_P_ ev_check *w) 2763ev_check_start (EV_P_ ev_check *w)
2413{ 2764{
2414 if (expect_false (ev_is_active (w))) 2765 if (expect_false (ev_is_active (w)))
2415 return; 2766 return;
2767
2768 EV_FREQUENT_CHECK;
2416 2769
2417 ev_start (EV_A_ (W)w, ++checkcnt); 2770 ev_start (EV_A_ (W)w, ++checkcnt);
2418 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2771 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2419 checks [checkcnt - 1] = w; 2772 checks [checkcnt - 1] = w;
2773
2774 EV_FREQUENT_CHECK;
2420} 2775}
2421 2776
2422void 2777void
2423ev_check_stop (EV_P_ ev_check *w) 2778ev_check_stop (EV_P_ ev_check *w)
2424{ 2779{
2425 clear_pending (EV_A_ (W)w); 2780 clear_pending (EV_A_ (W)w);
2426 if (expect_false (!ev_is_active (w))) 2781 if (expect_false (!ev_is_active (w)))
2427 return; 2782 return;
2428 2783
2784 EV_FREQUENT_CHECK;
2785
2429 { 2786 {
2430 int active = ((W)w)->active; 2787 int active = ev_active (w);
2788
2431 checks [active - 1] = checks [--checkcnt]; 2789 checks [active - 1] = checks [--checkcnt];
2432 ((W)checks [active - 1])->active = active; 2790 ev_active (checks [active - 1]) = active;
2433 } 2791 }
2434 2792
2435 ev_stop (EV_A_ (W)w); 2793 ev_stop (EV_A_ (W)w);
2794
2795 EV_FREQUENT_CHECK;
2436} 2796}
2437 2797
2438#if EV_EMBED_ENABLE 2798#if EV_EMBED_ENABLE
2439void noinline 2799void noinline
2440ev_embed_sweep (EV_P_ ev_embed *w) 2800ev_embed_sweep (EV_P_ ev_embed *w)
… …
2487 struct ev_loop *loop = w->other; 2847 struct ev_loop *loop = w->other;
2488 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2848 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2489 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2849 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2490 } 2850 }
2491 2851
2852 EV_FREQUENT_CHECK;
2853
2492 ev_set_priority (&w->io, ev_priority (w)); 2854 ev_set_priority (&w->io, ev_priority (w));
2493 ev_io_start (EV_A_ &w->io); 2855 ev_io_start (EV_A_ &w->io);
2494 2856
2495 ev_prepare_init (&w->prepare, embed_prepare_cb); 2857 ev_prepare_init (&w->prepare, embed_prepare_cb);
2496 ev_set_priority (&w->prepare, EV_MINPRI); 2858 ev_set_priority (&w->prepare, EV_MINPRI);
2497 ev_prepare_start (EV_A_ &w->prepare); 2859 ev_prepare_start (EV_A_ &w->prepare);
2498 2860
2499 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2861 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2500 2862
2501 ev_start (EV_A_ (W)w, 1); 2863 ev_start (EV_A_ (W)w, 1);
2864
2865 EV_FREQUENT_CHECK;
2502} 2866}
2503 2867
2504void 2868void
2505ev_embed_stop (EV_P_ ev_embed *w) 2869ev_embed_stop (EV_P_ ev_embed *w)
2506{ 2870{
2507 clear_pending (EV_A_ (W)w); 2871 clear_pending (EV_A_ (W)w);
2508 if (expect_false (!ev_is_active (w))) 2872 if (expect_false (!ev_is_active (w)))
2509 return; 2873 return;
2510 2874
2875 EV_FREQUENT_CHECK;
2876
2511 ev_io_stop (EV_A_ &w->io); 2877 ev_io_stop (EV_A_ &w->io);
2512 ev_prepare_stop (EV_A_ &w->prepare); 2878 ev_prepare_stop (EV_A_ &w->prepare);
2513 2879
2514 ev_stop (EV_A_ (W)w); 2880 ev_stop (EV_A_ (W)w);
2881
2882 EV_FREQUENT_CHECK;
2515} 2883}
2516#endif 2884#endif
2517 2885
2518#if EV_FORK_ENABLE 2886#if EV_FORK_ENABLE
2519void 2887void
2520ev_fork_start (EV_P_ ev_fork *w) 2888ev_fork_start (EV_P_ ev_fork *w)
2521{ 2889{
2522 if (expect_false (ev_is_active (w))) 2890 if (expect_false (ev_is_active (w)))
2523 return; 2891 return;
2892
2893 EV_FREQUENT_CHECK;
2524 2894
2525 ev_start (EV_A_ (W)w, ++forkcnt); 2895 ev_start (EV_A_ (W)w, ++forkcnt);
2526 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2896 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2527 forks [forkcnt - 1] = w; 2897 forks [forkcnt - 1] = w;
2898
2899 EV_FREQUENT_CHECK;
2528} 2900}
2529 2901
2530void 2902void
2531ev_fork_stop (EV_P_ ev_fork *w) 2903ev_fork_stop (EV_P_ ev_fork *w)
2532{ 2904{
2533 clear_pending (EV_A_ (W)w); 2905 clear_pending (EV_A_ (W)w);
2534 if (expect_false (!ev_is_active (w))) 2906 if (expect_false (!ev_is_active (w)))
2535 return; 2907 return;
2536 2908
2909 EV_FREQUENT_CHECK;
2910
2537 { 2911 {
2538 int active = ((W)w)->active; 2912 int active = ev_active (w);
2913
2539 forks [active - 1] = forks [--forkcnt]; 2914 forks [active - 1] = forks [--forkcnt];
2540 ((W)forks [active - 1])->active = active; 2915 ev_active (forks [active - 1]) = active;
2541 } 2916 }
2542 2917
2543 ev_stop (EV_A_ (W)w); 2918 ev_stop (EV_A_ (W)w);
2919
2920 EV_FREQUENT_CHECK;
2544} 2921}
2545#endif 2922#endif
2546 2923
2547#if EV_ASYNC_ENABLE 2924#if EV_ASYNC_ENABLE
2548void 2925void
… …
2550{ 2927{
2551 if (expect_false (ev_is_active (w))) 2928 if (expect_false (ev_is_active (w)))
2552 return; 2929 return;
2553 2930
2554 evpipe_init (EV_A); 2931 evpipe_init (EV_A);
2932
2933 EV_FREQUENT_CHECK;
2555 2934
2556 ev_start (EV_A_ (W)w, ++asynccnt); 2935 ev_start (EV_A_ (W)w, ++asynccnt);
2557 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2936 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2558 asyncs [asynccnt - 1] = w; 2937 asyncs [asynccnt - 1] = w;
2938
2939 EV_FREQUENT_CHECK;
2559} 2940}
2560 2941
2561void 2942void
2562ev_async_stop (EV_P_ ev_async *w) 2943ev_async_stop (EV_P_ ev_async *w)
2563{ 2944{
2564 clear_pending (EV_A_ (W)w); 2945 clear_pending (EV_A_ (W)w);
2565 if (expect_false (!ev_is_active (w))) 2946 if (expect_false (!ev_is_active (w)))
2566 return; 2947 return;
2567 2948
2949 EV_FREQUENT_CHECK;
2950
2568 { 2951 {
2569 int active = ((W)w)->active; 2952 int active = ev_active (w);
2953
2570 asyncs [active - 1] = asyncs [--asynccnt]; 2954 asyncs [active - 1] = asyncs [--asynccnt];
2571 ((W)asyncs [active - 1])->active = active; 2955 ev_active (asyncs [active - 1]) = active;
2572 } 2956 }
2573 2957
2574 ev_stop (EV_A_ (W)w); 2958 ev_stop (EV_A_ (W)w);
2959
2960 EV_FREQUENT_CHECK;
2575} 2961}
2576 2962
2577void 2963void
2578ev_async_send (EV_P_ ev_async *w) 2964ev_async_send (EV_P_ ev_async *w)
2579{ 2965{
… …
2596once_cb (EV_P_ struct ev_once *once, int revents) 2982once_cb (EV_P_ struct ev_once *once, int revents)
2597{ 2983{
2598 void (*cb)(int revents, void *arg) = once->cb; 2984 void (*cb)(int revents, void *arg) = once->cb;
2599 void *arg = once->arg; 2985 void *arg = once->arg;
2600 2986
2601 ev_io_stop (EV_A_ &once->io); 2987 ev_io_stop (EV_A_ &once->io);
2602 ev_timer_stop (EV_A_ &once->to); 2988 ev_timer_stop (EV_A_ &once->to);
2603 ev_free (once); 2989 ev_free (once);
2604 2990
2605 cb (revents, arg); 2991 cb (revents, arg);
2606} 2992}

Diff Legend

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