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

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

Diff Legend

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