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

Comparing libev/ev.c (file contents):
Revision 1.221 by root, Sun Apr 6 12:44:49 2008 UTC vs.
Revision 1.254 by root, Wed Jun 4 20:26:55 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
… …
235# else 243# else
236# define EV_USE_EVENTFD 0 244# define EV_USE_EVENTFD 0
237# endif 245# endif
238#endif 246#endif
239 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
264#endif
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
243# undef EV_USE_MONOTONIC 269# undef EV_USE_MONOTONIC
244# define EV_USE_MONOTONIC 0 270# define EV_USE_MONOTONIC 0
… …
269#endif 295#endif
270 296
271#if EV_USE_EVENTFD 297#if EV_USE_EVENTFD
272/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 298/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
273# include <stdint.h> 299# include <stdint.h>
300# ifdef __cplusplus
301extern "C" {
302# endif
274int eventfd (unsigned int initval, int flags); 303int eventfd (unsigned int initval, int flags);
304# ifdef __cplusplus
305}
306# endif
275#endif 307#endif
276 308
277/**/ 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
278 316
279/* 317/*
280 * This is used to avoid floating point rounding problems. 318 * This is used to avoid floating point rounding problems.
281 * It is added to ev_rt_now when scheduling periodics 319 * It is added to ev_rt_now when scheduling periodics
282 * to ensure progress, time-wise, even when rounding 320 * to ensure progress, time-wise, even when rounding
… …
294# define expect(expr,value) __builtin_expect ((expr),(value)) 332# define expect(expr,value) __builtin_expect ((expr),(value))
295# define noinline __attribute__ ((noinline)) 333# define noinline __attribute__ ((noinline))
296#else 334#else
297# define expect(expr,value) (expr) 335# define expect(expr,value) (expr)
298# define noinline 336# define noinline
299# if __STDC_VERSION__ < 199901L 337# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
300# define inline 338# define inline
301# endif 339# endif
302#endif 340#endif
303 341
304#define expect_false(expr) expect ((expr) != 0, 0) 342#define expect_false(expr) expect ((expr) != 0, 0)
… …
319 357
320typedef ev_watcher *W; 358typedef ev_watcher *W;
321typedef ev_watcher_list *WL; 359typedef ev_watcher_list *WL;
322typedef ev_watcher_time *WT; 360typedef ev_watcher_time *WT;
323 361
362#define ev_active(w) ((W)(w))->active
363#define ev_at(w) ((WT)(w))->at
364
324#if EV_USE_MONOTONIC 365#if EV_USE_MONOTONIC
325/* 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 */
326/* giving it a reasonably high chance of working on typical architetcures */ 367/* giving it a reasonably high chance of working on typical architetcures */
327static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 368static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
328#endif 369#endif
… …
354 perror (msg); 395 perror (msg);
355 abort (); 396 abort ();
356 } 397 }
357} 398}
358 399
400static void *
401ev_realloc_emul (void *ptr, long size)
402{
403 /* some systems, notably openbsd and darwin, fail to properly
404 * implement realloc (x, 0) (as required by both ansi c-98 and
405 * the single unix specification, so work around them here.
406 */
407
408 if (size)
409 return realloc (ptr, size);
410
411 free (ptr);
412 return 0;
413}
414
359static void *(*alloc)(void *ptr, long size); 415static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
360 416
361void 417void
362ev_set_allocator (void *(*cb)(void *ptr, long size)) 418ev_set_allocator (void *(*cb)(void *ptr, long size))
363{ 419{
364 alloc = cb; 420 alloc = cb;
365} 421}
366 422
367inline_speed void * 423inline_speed void *
368ev_realloc (void *ptr, long size) 424ev_realloc (void *ptr, long size)
369{ 425{
370 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 426 ptr = alloc (ptr, size);
371 427
372 if (!ptr && size) 428 if (!ptr && size)
373 { 429 {
374 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 430 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
375 abort (); 431 abort ();
… …
398 W w; 454 W w;
399 int events; 455 int events;
400} ANPENDING; 456} ANPENDING;
401 457
402#if EV_USE_INOTIFY 458#if EV_USE_INOTIFY
459/* hash table entry per inotify-id */
403typedef struct 460typedef struct
404{ 461{
405 WL head; 462 WL head;
406} 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)
407#endif 482#endif
408 483
409#if EV_MULTIPLICITY 484#if EV_MULTIPLICITY
410 485
411 struct ev_loop 486 struct ev_loop
… …
496 } 571 }
497} 572}
498 573
499/*****************************************************************************/ 574/*****************************************************************************/
500 575
576#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
577
501int inline_size 578int inline_size
502array_nextsize (int elem, int cur, int cnt) 579array_nextsize (int elem, int cur, int cnt)
503{ 580{
504 int ncur = cur + 1; 581 int ncur = cur + 1;
505 582
506 do 583 do
507 ncur <<= 1; 584 ncur <<= 1;
508 while (cnt > ncur); 585 while (cnt > ncur);
509 586
510 /* 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 */
511 if (elem * ncur > 4096) 588 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
512 { 589 {
513 ncur *= elem; 590 ncur *= elem;
514 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 591 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
515 ncur = ncur - sizeof (void *) * 4; 592 ncur = ncur - sizeof (void *) * 4;
516 ncur /= elem; 593 ncur /= elem;
517 } 594 }
518 595
519 return ncur; 596 return ncur;
… …
630 events |= (unsigned char)w->events; 707 events |= (unsigned char)w->events;
631 708
632#if EV_SELECT_IS_WINSOCKET 709#if EV_SELECT_IS_WINSOCKET
633 if (events) 710 if (events)
634 { 711 {
635 unsigned long argp; 712 unsigned long arg;
636 #ifdef EV_FD_TO_WIN32_HANDLE 713 #ifdef EV_FD_TO_WIN32_HANDLE
637 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 714 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
638 #else 715 #else
639 anfd->handle = _get_osfhandle (fd); 716 anfd->handle = _get_osfhandle (fd);
640 #endif 717 #endif
641 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));
642 } 719 }
643#endif 720#endif
644 721
645 { 722 {
646 unsigned char o_events = anfd->events; 723 unsigned char o_events = anfd->events;
… …
699{ 776{
700 int fd; 777 int fd;
701 778
702 for (fd = 0; fd < anfdmax; ++fd) 779 for (fd = 0; fd < anfdmax; ++fd)
703 if (anfds [fd].events) 780 if (anfds [fd].events)
704 if (!fd_valid (fd) == -1 && errno == EBADF) 781 if (!fd_valid (fd) && errno == EBADF)
705 fd_kill (EV_A_ fd); 782 fd_kill (EV_A_ fd);
706} 783}
707 784
708/* 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 */
709static void noinline 786static void noinline
… …
733 } 810 }
734} 811}
735 812
736/*****************************************************************************/ 813/*****************************************************************************/
737 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 */
738void inline_speed 835void inline_speed
739upheap (WT *heap, int k) 836downheap (ANHE *heap, int N, int k)
740{ 837{
741 WT w = heap [k]; 838 ANHE he = heap [k];
839 ANHE *E = heap + N + HEAP0;
742 840
743 while (k) 841 for (;;)
744 { 842 {
745 int p = (k - 1) >> 1; 843 ev_tstamp minat;
844 ANHE *minpos;
845 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
746 846
747 if (heap [p]->at <= w->at) 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
748 break; 863 break;
749 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
914/* towards the root */
915void inline_speed
916upheap (ANHE *heap, int k)
917{
918 ANHE he = heap [k];
919
920 for (;;)
921 {
922 int p = HPARENT (k);
923
924 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
925 break;
926
750 heap [k] = heap [p]; 927 heap [k] = heap [p];
751 ((W)heap [k])->active = k + 1; 928 ev_active (ANHE_w (heap [k])) = k;
752 k = p; 929 k = p;
753 } 930 }
754 931
755 heap [k] = w; 932 heap [k] = he;
756 ((W)heap [k])->active = k + 1; 933 ev_active (ANHE_w (he)) = k;
757}
758
759void inline_speed
760downheap (WT *heap, int N, int k)
761{
762 WT w = heap [k];
763
764 for (;;)
765 {
766 int c = (k << 1) + 1;
767
768 if (c >= N)
769 break;
770
771 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
772 ? 1 : 0;
773
774 if (w->at <= heap [c]->at)
775 break;
776
777 heap [k] = heap [c];
778 ((W)heap [k])->active = k + 1;
779
780 k = c;
781 }
782
783 heap [k] = w;
784 ((W)heap [k])->active = k + 1;
785} 934}
786 935
787void inline_size 936void inline_size
788adjustheap (WT *heap, int N, int k) 937adjustheap (ANHE *heap, int N, int k)
789{ 938{
939 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
790 upheap (heap, k); 940 upheap (heap, k);
941 else
791 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);
792} 955}
793 956
794/*****************************************************************************/ 957/*****************************************************************************/
795 958
796typedef struct 959typedef struct
… …
820 983
821void inline_speed 984void inline_speed
822fd_intern (int fd) 985fd_intern (int fd)
823{ 986{
824#ifdef _WIN32 987#ifdef _WIN32
825 int arg = 1; 988 unsigned long arg = 1;
826 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 989 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
827#else 990#else
828 fcntl (fd, F_SETFD, FD_CLOEXEC); 991 fcntl (fd, F_SETFD, FD_CLOEXEC);
829 fcntl (fd, F_SETFL, O_NONBLOCK); 992 fcntl (fd, F_SETFL, O_NONBLOCK);
830#endif 993#endif
… …
885pipecb (EV_P_ ev_io *iow, int revents) 1048pipecb (EV_P_ ev_io *iow, int revents)
886{ 1049{
887#if EV_USE_EVENTFD 1050#if EV_USE_EVENTFD
888 if (evfd >= 0) 1051 if (evfd >= 0)
889 { 1052 {
890 uint64_t counter = 1; 1053 uint64_t counter;
891 read (evfd, &counter, sizeof (uint64_t)); 1054 read (evfd, &counter, sizeof (uint64_t));
892 } 1055 }
893 else 1056 else
894#endif 1057#endif
895 { 1058 {
… …
1164 if (!(flags & EVFLAG_NOENV) 1327 if (!(flags & EVFLAG_NOENV)
1165 && !enable_secure () 1328 && !enable_secure ()
1166 && getenv ("LIBEV_FLAGS")) 1329 && getenv ("LIBEV_FLAGS"))
1167 flags = atoi (getenv ("LIBEV_FLAGS")); 1330 flags = atoi (getenv ("LIBEV_FLAGS"));
1168 1331
1169 if (!(flags & 0x0000ffffUL)) 1332 if (!(flags & 0x0000ffffU))
1170 flags |= ev_recommended_backends (); 1333 flags |= ev_recommended_backends ();
1171 1334
1172#if EV_USE_PORT 1335#if EV_USE_PORT
1173 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1336 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1174#endif 1337#endif
… …
1262#endif 1425#endif
1263 1426
1264 backend = 0; 1427 backend = 0;
1265} 1428}
1266 1429
1430#if EV_USE_INOTIFY
1267void inline_size infy_fork (EV_P); 1431void inline_size infy_fork (EV_P);
1432#endif
1268 1433
1269void inline_size 1434void inline_size
1270loop_fork (EV_P) 1435loop_fork (EV_P)
1271{ 1436{
1272#if EV_USE_PORT 1437#if EV_USE_PORT
… …
1312 1477
1313 postfork = 0; 1478 postfork = 0;
1314} 1479}
1315 1480
1316#if EV_MULTIPLICITY 1481#if EV_MULTIPLICITY
1482
1317struct ev_loop * 1483struct ev_loop *
1318ev_loop_new (unsigned int flags) 1484ev_loop_new (unsigned int flags)
1319{ 1485{
1320 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));
1321 1487
… …
1340ev_loop_fork (EV_P) 1506ev_loop_fork (EV_P)
1341{ 1507{
1342 postfork = 1; /* must be in line with ev_default_fork */ 1508 postfork = 1; /* must be in line with ev_default_fork */
1343} 1509}
1344 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)
1345#endif 1606# endif
1607#endif
1608}
1609
1610#endif /* multiplicity */
1346 1611
1347#if EV_MULTIPLICITY 1612#if EV_MULTIPLICITY
1348struct ev_loop * 1613struct ev_loop *
1349ev_default_loop_init (unsigned int flags) 1614ev_default_loop_init (unsigned int flags)
1350#else 1615#else
… …
1426 { 1691 {
1427 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1692 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1428 1693
1429 p->w->pending = 0; 1694 p->w->pending = 0;
1430 EV_CB_INVOKE (p->w, p->events); 1695 EV_CB_INVOKE (p->w, p->events);
1696 EV_FREQUENT_CHECK;
1431 } 1697 }
1432 } 1698 }
1433} 1699}
1434
1435void inline_size
1436timers_reify (EV_P)
1437{
1438 while (timercnt && ((WT)timers [0])->at <= mn_now)
1439 {
1440 ev_timer *w = (ev_timer *)timers [0];
1441
1442 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1443
1444 /* first reschedule or stop timer */
1445 if (w->repeat)
1446 {
1447 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1448
1449 ((WT)w)->at += w->repeat;
1450 if (((WT)w)->at < mn_now)
1451 ((WT)w)->at = mn_now;
1452
1453 downheap (timers, timercnt, 0);
1454 }
1455 else
1456 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1457
1458 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1459 }
1460}
1461
1462#if EV_PERIODIC_ENABLE
1463void inline_size
1464periodics_reify (EV_P)
1465{
1466 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1467 {
1468 ev_periodic *w = (ev_periodic *)periodics [0];
1469
1470 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1471
1472 /* first reschedule or stop timer */
1473 if (w->reschedule_cb)
1474 {
1475 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1476 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1477 downheap (periodics, periodiccnt, 0);
1478 }
1479 else if (w->interval)
1480 {
1481 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1482 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1483 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1484 downheap (periodics, periodiccnt, 0);
1485 }
1486 else
1487 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1488
1489 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1490 }
1491}
1492
1493static void noinline
1494periodics_reschedule (EV_P)
1495{
1496 int i;
1497
1498 /* adjust periodics after time jump */
1499 for (i = 0; i < periodiccnt; ++i)
1500 {
1501 ev_periodic *w = (ev_periodic *)periodics [i];
1502
1503 if (w->reschedule_cb)
1504 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1505 else if (w->interval)
1506 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1507 }
1508
1509 /* now rebuild the heap */
1510 for (i = periodiccnt >> 1; i--; )
1511 downheap (periodics, periodiccnt, i);
1512}
1513#endif
1514 1700
1515#if EV_IDLE_ENABLE 1701#if EV_IDLE_ENABLE
1516void inline_size 1702void inline_size
1517idle_reify (EV_P) 1703idle_reify (EV_P)
1518{ 1704{
… …
1530 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1716 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1531 break; 1717 break;
1532 } 1718 }
1533 } 1719 }
1534 } 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);
1535} 1823}
1536#endif 1824#endif
1537 1825
1538void inline_speed 1826void inline_speed
1539time_update (EV_P_ ev_tstamp max_block) 1827time_update (EV_P_ ev_tstamp max_block)
… …
1568 */ 1856 */
1569 for (i = 4; --i; ) 1857 for (i = 4; --i; )
1570 { 1858 {
1571 rtmn_diff = ev_rt_now - mn_now; 1859 rtmn_diff = ev_rt_now - mn_now;
1572 1860
1573 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1861 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1574 return; /* all is well */ 1862 return; /* all is well */
1575 1863
1576 ev_rt_now = ev_time (); 1864 ev_rt_now = ev_time ();
1577 mn_now = get_clock (); 1865 mn_now = get_clock ();
1578 now_floor = mn_now; 1866 now_floor = mn_now;
… …
1594#if EV_PERIODIC_ENABLE 1882#if EV_PERIODIC_ENABLE
1595 periodics_reschedule (EV_A); 1883 periodics_reschedule (EV_A);
1596#endif 1884#endif
1597 /* 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 */
1598 for (i = 0; i < timercnt; ++i) 1886 for (i = 0; i < timercnt; ++i)
1887 {
1888 ANHE *he = timers + i + HEAP0;
1599 ((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 }
1600 } 1892 }
1601 1893
1602 mn_now = ev_rt_now; 1894 mn_now = ev_rt_now;
1603 } 1895 }
1604} 1896}
… …
1624 1916
1625 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 */
1626 1918
1627 do 1919 do
1628 { 1920 {
1921#if EV_VERIFY >= 2
1922 ev_loop_verify (EV_A);
1923#endif
1924
1629#ifndef _WIN32 1925#ifndef _WIN32
1630 if (expect_false (curpid)) /* penalise the forking check even more */ 1926 if (expect_false (curpid)) /* penalise the forking check even more */
1631 if (expect_false (getpid () != curpid)) 1927 if (expect_false (getpid () != curpid))
1632 { 1928 {
1633 curpid = getpid (); 1929 curpid = getpid ();
… …
1674 1970
1675 waittime = MAX_BLOCKTIME; 1971 waittime = MAX_BLOCKTIME;
1676 1972
1677 if (timercnt) 1973 if (timercnt)
1678 { 1974 {
1679 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1975 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1680 if (waittime > to) waittime = to; 1976 if (waittime > to) waittime = to;
1681 } 1977 }
1682 1978
1683#if EV_PERIODIC_ENABLE 1979#if EV_PERIODIC_ENABLE
1684 if (periodiccnt) 1980 if (periodiccnt)
1685 { 1981 {
1686 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;
1687 if (waittime > to) waittime = to; 1983 if (waittime > to) waittime = to;
1688 } 1984 }
1689#endif 1985#endif
1690 1986
1691 if (expect_false (waittime < timeout_blocktime)) 1987 if (expect_false (waittime < timeout_blocktime))
… …
1828 if (expect_false (ev_is_active (w))) 2124 if (expect_false (ev_is_active (w)))
1829 return; 2125 return;
1830 2126
1831 assert (("ev_io_start called with negative fd", fd >= 0)); 2127 assert (("ev_io_start called with negative fd", fd >= 0));
1832 2128
2129 EV_FREQUENT_CHECK;
2130
1833 ev_start (EV_A_ (W)w, 1); 2131 ev_start (EV_A_ (W)w, 1);
1834 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2132 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1835 wlist_add (&anfds[fd].head, (WL)w); 2133 wlist_add (&anfds[fd].head, (WL)w);
1836 2134
1837 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2135 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1838 w->events &= ~EV_IOFDSET; 2136 w->events &= ~EV_IOFDSET;
2137
2138 EV_FREQUENT_CHECK;
1839} 2139}
1840 2140
1841void noinline 2141void noinline
1842ev_io_stop (EV_P_ ev_io *w) 2142ev_io_stop (EV_P_ ev_io *w)
1843{ 2143{
1844 clear_pending (EV_A_ (W)w); 2144 clear_pending (EV_A_ (W)w);
1845 if (expect_false (!ev_is_active (w))) 2145 if (expect_false (!ev_is_active (w)))
1846 return; 2146 return;
1847 2147
1848 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;
1849 2151
1850 wlist_del (&anfds[w->fd].head, (WL)w); 2152 wlist_del (&anfds[w->fd].head, (WL)w);
1851 ev_stop (EV_A_ (W)w); 2153 ev_stop (EV_A_ (W)w);
1852 2154
1853 fd_change (EV_A_ w->fd, 1); 2155 fd_change (EV_A_ w->fd, 1);
2156
2157 EV_FREQUENT_CHECK;
1854} 2158}
1855 2159
1856void noinline 2160void noinline
1857ev_timer_start (EV_P_ ev_timer *w) 2161ev_timer_start (EV_P_ ev_timer *w)
1858{ 2162{
1859 if (expect_false (ev_is_active (w))) 2163 if (expect_false (ev_is_active (w)))
1860 return; 2164 return;
1861 2165
1862 ((WT)w)->at += mn_now; 2166 ev_at (w) += mn_now;
1863 2167
1864 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.));
1865 2169
2170 EV_FREQUENT_CHECK;
2171
2172 ++timercnt;
1866 ev_start (EV_A_ (W)w, ++timercnt); 2173 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
1867 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 2174 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1868 timers [timercnt - 1] = (WT)w; 2175 ANHE_w (timers [ev_active (w)]) = (WT)w;
1869 upheap (timers, timercnt - 1); 2176 ANHE_at_cache (timers [ev_active (w)]);
2177 upheap (timers, ev_active (w));
1870 2178
2179 EV_FREQUENT_CHECK;
2180
1871 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 2181 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1872} 2182}
1873 2183
1874void noinline 2184void noinline
1875ev_timer_stop (EV_P_ ev_timer *w) 2185ev_timer_stop (EV_P_ ev_timer *w)
1876{ 2186{
1877 clear_pending (EV_A_ (W)w); 2187 clear_pending (EV_A_ (W)w);
1878 if (expect_false (!ev_is_active (w))) 2188 if (expect_false (!ev_is_active (w)))
1879 return; 2189 return;
1880 2190
1881 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w)); 2191 EV_FREQUENT_CHECK;
1882 2192
1883 { 2193 {
1884 int active = ((W)w)->active; 2194 int active = ev_active (w);
1885 2195
2196 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2197
2198 --timercnt;
2199
1886 if (expect_true (--active < --timercnt)) 2200 if (expect_true (active < timercnt + HEAP0))
1887 { 2201 {
1888 timers [active] = timers [timercnt]; 2202 timers [active] = timers [timercnt + HEAP0];
1889 adjustheap (timers, timercnt, active); 2203 adjustheap (timers, timercnt, active);
1890 } 2204 }
1891 } 2205 }
1892 2206
1893 ((WT)w)->at -= mn_now; 2207 EV_FREQUENT_CHECK;
2208
2209 ev_at (w) -= mn_now;
1894 2210
1895 ev_stop (EV_A_ (W)w); 2211 ev_stop (EV_A_ (W)w);
1896} 2212}
1897 2213
1898void noinline 2214void noinline
1899ev_timer_again (EV_P_ ev_timer *w) 2215ev_timer_again (EV_P_ ev_timer *w)
1900{ 2216{
2217 EV_FREQUENT_CHECK;
2218
1901 if (ev_is_active (w)) 2219 if (ev_is_active (w))
1902 { 2220 {
1903 if (w->repeat) 2221 if (w->repeat)
1904 { 2222 {
1905 ((WT)w)->at = mn_now + w->repeat; 2223 ev_at (w) = mn_now + w->repeat;
2224 ANHE_at_cache (timers [ev_active (w)]);
1906 adjustheap (timers, timercnt, ((W)w)->active - 1); 2225 adjustheap (timers, timercnt, ev_active (w));
1907 } 2226 }
1908 else 2227 else
1909 ev_timer_stop (EV_A_ w); 2228 ev_timer_stop (EV_A_ w);
1910 } 2229 }
1911 else if (w->repeat) 2230 else if (w->repeat)
1912 { 2231 {
1913 w->at = w->repeat; 2232 ev_at (w) = w->repeat;
1914 ev_timer_start (EV_A_ w); 2233 ev_timer_start (EV_A_ w);
1915 } 2234 }
2235
2236 EV_FREQUENT_CHECK;
1916} 2237}
1917 2238
1918#if EV_PERIODIC_ENABLE 2239#if EV_PERIODIC_ENABLE
1919void noinline 2240void noinline
1920ev_periodic_start (EV_P_ ev_periodic *w) 2241ev_periodic_start (EV_P_ ev_periodic *w)
1921{ 2242{
1922 if (expect_false (ev_is_active (w))) 2243 if (expect_false (ev_is_active (w)))
1923 return; 2244 return;
1924 2245
1925 if (w->reschedule_cb) 2246 if (w->reschedule_cb)
1926 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2247 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1927 else if (w->interval) 2248 else if (w->interval)
1928 { 2249 {
1929 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.));
1930 /* 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 */
1931 ((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;
1932 } 2253 }
1933 else 2254 else
1934 ((WT)w)->at = w->offset; 2255 ev_at (w) = w->offset;
1935 2256
2257 EV_FREQUENT_CHECK;
2258
2259 ++periodiccnt;
1936 ev_start (EV_A_ (W)w, ++periodiccnt); 2260 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
1937 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2261 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1938 periodics [periodiccnt - 1] = (WT)w; 2262 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1939 upheap (periodics, periodiccnt - 1); 2263 ANHE_at_cache (periodics [ev_active (w)]);
2264 upheap (periodics, ev_active (w));
1940 2265
2266 EV_FREQUENT_CHECK;
2267
1941 /*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));*/
1942} 2269}
1943 2270
1944void noinline 2271void noinline
1945ev_periodic_stop (EV_P_ ev_periodic *w) 2272ev_periodic_stop (EV_P_ ev_periodic *w)
1946{ 2273{
1947 clear_pending (EV_A_ (W)w); 2274 clear_pending (EV_A_ (W)w);
1948 if (expect_false (!ev_is_active (w))) 2275 if (expect_false (!ev_is_active (w)))
1949 return; 2276 return;
1950 2277
1951 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w)); 2278 EV_FREQUENT_CHECK;
1952 2279
1953 { 2280 {
1954 int active = ((W)w)->active; 2281 int active = ev_active (w);
1955 2282
2283 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2284
2285 --periodiccnt;
2286
1956 if (expect_true (--active < --periodiccnt)) 2287 if (expect_true (active < periodiccnt + HEAP0))
1957 { 2288 {
1958 periodics [active] = periodics [periodiccnt]; 2289 periodics [active] = periodics [periodiccnt + HEAP0];
1959 adjustheap (periodics, periodiccnt, active); 2290 adjustheap (periodics, periodiccnt, active);
1960 } 2291 }
1961 } 2292 }
1962 2293
2294 EV_FREQUENT_CHECK;
2295
1963 ev_stop (EV_A_ (W)w); 2296 ev_stop (EV_A_ (W)w);
1964} 2297}
1965 2298
1966void noinline 2299void noinline
1967ev_periodic_again (EV_P_ ev_periodic *w) 2300ev_periodic_again (EV_P_ ev_periodic *w)
… …
1986 return; 2319 return;
1987 2320
1988 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));
1989 2322
1990 evpipe_init (EV_A); 2323 evpipe_init (EV_A);
2324
2325 EV_FREQUENT_CHECK;
1991 2326
1992 { 2327 {
1993#ifndef _WIN32 2328#ifndef _WIN32
1994 sigset_t full, prev; 2329 sigset_t full, prev;
1995 sigfillset (&full); 2330 sigfillset (&full);
… …
2016 sigfillset (&sa.sa_mask); 2351 sigfillset (&sa.sa_mask);
2017 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 */
2018 sigaction (w->signum, &sa, 0); 2353 sigaction (w->signum, &sa, 0);
2019#endif 2354#endif
2020 } 2355 }
2356
2357 EV_FREQUENT_CHECK;
2021} 2358}
2022 2359
2023void noinline 2360void noinline
2024ev_signal_stop (EV_P_ ev_signal *w) 2361ev_signal_stop (EV_P_ ev_signal *w)
2025{ 2362{
2026 clear_pending (EV_A_ (W)w); 2363 clear_pending (EV_A_ (W)w);
2027 if (expect_false (!ev_is_active (w))) 2364 if (expect_false (!ev_is_active (w)))
2028 return; 2365 return;
2029 2366
2367 EV_FREQUENT_CHECK;
2368
2030 wlist_del (&signals [w->signum - 1].head, (WL)w); 2369 wlist_del (&signals [w->signum - 1].head, (WL)w);
2031 ev_stop (EV_A_ (W)w); 2370 ev_stop (EV_A_ (W)w);
2032 2371
2033 if (!signals [w->signum - 1].head) 2372 if (!signals [w->signum - 1].head)
2034 signal (w->signum, SIG_DFL); 2373 signal (w->signum, SIG_DFL);
2374
2375 EV_FREQUENT_CHECK;
2035} 2376}
2036 2377
2037void 2378void
2038ev_child_start (EV_P_ ev_child *w) 2379ev_child_start (EV_P_ ev_child *w)
2039{ 2380{
… …
2041 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));
2042#endif 2383#endif
2043 if (expect_false (ev_is_active (w))) 2384 if (expect_false (ev_is_active (w)))
2044 return; 2385 return;
2045 2386
2387 EV_FREQUENT_CHECK;
2388
2046 ev_start (EV_A_ (W)w, 1); 2389 ev_start (EV_A_ (W)w, 1);
2047 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;
2048} 2393}
2049 2394
2050void 2395void
2051ev_child_stop (EV_P_ ev_child *w) 2396ev_child_stop (EV_P_ ev_child *w)
2052{ 2397{
2053 clear_pending (EV_A_ (W)w); 2398 clear_pending (EV_A_ (W)w);
2054 if (expect_false (!ev_is_active (w))) 2399 if (expect_false (!ev_is_active (w)))
2055 return; 2400 return;
2056 2401
2402 EV_FREQUENT_CHECK;
2403
2057 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2404 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2058 ev_stop (EV_A_ (W)w); 2405 ev_stop (EV_A_ (W)w);
2406
2407 EV_FREQUENT_CHECK;
2059} 2408}
2060 2409
2061#if EV_STAT_ENABLE 2410#if EV_STAT_ENABLE
2062 2411
2063# ifdef _WIN32 2412# ifdef _WIN32
… …
2081 if (w->wd < 0) 2430 if (w->wd < 0)
2082 { 2431 {
2083 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 */
2084 2433
2085 /* 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 */
2086 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2437 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2087 { 2438 {
2088 char path [4096]; 2439 char path [4096];
2089 strcpy (path, w->path); 2440 strcpy (path, w->path);
2090 2441
… …
2289 else 2640 else
2290#endif 2641#endif
2291 ev_timer_start (EV_A_ &w->timer); 2642 ev_timer_start (EV_A_ &w->timer);
2292 2643
2293 ev_start (EV_A_ (W)w, 1); 2644 ev_start (EV_A_ (W)w, 1);
2645
2646 EV_FREQUENT_CHECK;
2294} 2647}
2295 2648
2296void 2649void
2297ev_stat_stop (EV_P_ ev_stat *w) 2650ev_stat_stop (EV_P_ ev_stat *w)
2298{ 2651{
2299 clear_pending (EV_A_ (W)w); 2652 clear_pending (EV_A_ (W)w);
2300 if (expect_false (!ev_is_active (w))) 2653 if (expect_false (!ev_is_active (w)))
2301 return; 2654 return;
2302 2655
2656 EV_FREQUENT_CHECK;
2657
2303#if EV_USE_INOTIFY 2658#if EV_USE_INOTIFY
2304 infy_del (EV_A_ w); 2659 infy_del (EV_A_ w);
2305#endif 2660#endif
2306 ev_timer_stop (EV_A_ &w->timer); 2661 ev_timer_stop (EV_A_ &w->timer);
2307 2662
2308 ev_stop (EV_A_ (W)w); 2663 ev_stop (EV_A_ (W)w);
2664
2665 EV_FREQUENT_CHECK;
2309} 2666}
2310#endif 2667#endif
2311 2668
2312#if EV_IDLE_ENABLE 2669#if EV_IDLE_ENABLE
2313void 2670void
… …
2315{ 2672{
2316 if (expect_false (ev_is_active (w))) 2673 if (expect_false (ev_is_active (w)))
2317 return; 2674 return;
2318 2675
2319 pri_adjust (EV_A_ (W)w); 2676 pri_adjust (EV_A_ (W)w);
2677
2678 EV_FREQUENT_CHECK;
2320 2679
2321 { 2680 {
2322 int active = ++idlecnt [ABSPRI (w)]; 2681 int active = ++idlecnt [ABSPRI (w)];
2323 2682
2324 ++idleall; 2683 ++idleall;
2325 ev_start (EV_A_ (W)w, active); 2684 ev_start (EV_A_ (W)w, active);
2326 2685
2327 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 2686 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2328 idles [ABSPRI (w)][active - 1] = w; 2687 idles [ABSPRI (w)][active - 1] = w;
2329 } 2688 }
2689
2690 EV_FREQUENT_CHECK;
2330} 2691}
2331 2692
2332void 2693void
2333ev_idle_stop (EV_P_ ev_idle *w) 2694ev_idle_stop (EV_P_ ev_idle *w)
2334{ 2695{
2335 clear_pending (EV_A_ (W)w); 2696 clear_pending (EV_A_ (W)w);
2336 if (expect_false (!ev_is_active (w))) 2697 if (expect_false (!ev_is_active (w)))
2337 return; 2698 return;
2338 2699
2700 EV_FREQUENT_CHECK;
2701
2339 { 2702 {
2340 int active = ((W)w)->active; 2703 int active = ev_active (w);
2341 2704
2342 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2705 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2343 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2706 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2344 2707
2345 ev_stop (EV_A_ (W)w); 2708 ev_stop (EV_A_ (W)w);
2346 --idleall; 2709 --idleall;
2347 } 2710 }
2711
2712 EV_FREQUENT_CHECK;
2348} 2713}
2349#endif 2714#endif
2350 2715
2351void 2716void
2352ev_prepare_start (EV_P_ ev_prepare *w) 2717ev_prepare_start (EV_P_ ev_prepare *w)
2353{ 2718{
2354 if (expect_false (ev_is_active (w))) 2719 if (expect_false (ev_is_active (w)))
2355 return; 2720 return;
2721
2722 EV_FREQUENT_CHECK;
2356 2723
2357 ev_start (EV_A_ (W)w, ++preparecnt); 2724 ev_start (EV_A_ (W)w, ++preparecnt);
2358 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2725 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2359 prepares [preparecnt - 1] = w; 2726 prepares [preparecnt - 1] = w;
2727
2728 EV_FREQUENT_CHECK;
2360} 2729}
2361 2730
2362void 2731void
2363ev_prepare_stop (EV_P_ ev_prepare *w) 2732ev_prepare_stop (EV_P_ ev_prepare *w)
2364{ 2733{
2365 clear_pending (EV_A_ (W)w); 2734 clear_pending (EV_A_ (W)w);
2366 if (expect_false (!ev_is_active (w))) 2735 if (expect_false (!ev_is_active (w)))
2367 return; 2736 return;
2368 2737
2738 EV_FREQUENT_CHECK;
2739
2369 { 2740 {
2370 int active = ((W)w)->active; 2741 int active = ev_active (w);
2742
2371 prepares [active - 1] = prepares [--preparecnt]; 2743 prepares [active - 1] = prepares [--preparecnt];
2372 ((W)prepares [active - 1])->active = active; 2744 ev_active (prepares [active - 1]) = active;
2373 } 2745 }
2374 2746
2375 ev_stop (EV_A_ (W)w); 2747 ev_stop (EV_A_ (W)w);
2748
2749 EV_FREQUENT_CHECK;
2376} 2750}
2377 2751
2378void 2752void
2379ev_check_start (EV_P_ ev_check *w) 2753ev_check_start (EV_P_ ev_check *w)
2380{ 2754{
2381 if (expect_false (ev_is_active (w))) 2755 if (expect_false (ev_is_active (w)))
2382 return; 2756 return;
2757
2758 EV_FREQUENT_CHECK;
2383 2759
2384 ev_start (EV_A_ (W)w, ++checkcnt); 2760 ev_start (EV_A_ (W)w, ++checkcnt);
2385 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2761 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2386 checks [checkcnt - 1] = w; 2762 checks [checkcnt - 1] = w;
2763
2764 EV_FREQUENT_CHECK;
2387} 2765}
2388 2766
2389void 2767void
2390ev_check_stop (EV_P_ ev_check *w) 2768ev_check_stop (EV_P_ ev_check *w)
2391{ 2769{
2392 clear_pending (EV_A_ (W)w); 2770 clear_pending (EV_A_ (W)w);
2393 if (expect_false (!ev_is_active (w))) 2771 if (expect_false (!ev_is_active (w)))
2394 return; 2772 return;
2395 2773
2774 EV_FREQUENT_CHECK;
2775
2396 { 2776 {
2397 int active = ((W)w)->active; 2777 int active = ev_active (w);
2778
2398 checks [active - 1] = checks [--checkcnt]; 2779 checks [active - 1] = checks [--checkcnt];
2399 ((W)checks [active - 1])->active = active; 2780 ev_active (checks [active - 1]) = active;
2400 } 2781 }
2401 2782
2402 ev_stop (EV_A_ (W)w); 2783 ev_stop (EV_A_ (W)w);
2784
2785 EV_FREQUENT_CHECK;
2403} 2786}
2404 2787
2405#if EV_EMBED_ENABLE 2788#if EV_EMBED_ENABLE
2406void noinline 2789void noinline
2407ev_embed_sweep (EV_P_ ev_embed *w) 2790ev_embed_sweep (EV_P_ ev_embed *w)
… …
2454 struct ev_loop *loop = w->other; 2837 struct ev_loop *loop = w->other;
2455 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2838 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2456 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2839 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2457 } 2840 }
2458 2841
2842 EV_FREQUENT_CHECK;
2843
2459 ev_set_priority (&w->io, ev_priority (w)); 2844 ev_set_priority (&w->io, ev_priority (w));
2460 ev_io_start (EV_A_ &w->io); 2845 ev_io_start (EV_A_ &w->io);
2461 2846
2462 ev_prepare_init (&w->prepare, embed_prepare_cb); 2847 ev_prepare_init (&w->prepare, embed_prepare_cb);
2463 ev_set_priority (&w->prepare, EV_MINPRI); 2848 ev_set_priority (&w->prepare, EV_MINPRI);
2464 ev_prepare_start (EV_A_ &w->prepare); 2849 ev_prepare_start (EV_A_ &w->prepare);
2465 2850
2466 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2851 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2467 2852
2468 ev_start (EV_A_ (W)w, 1); 2853 ev_start (EV_A_ (W)w, 1);
2854
2855 EV_FREQUENT_CHECK;
2469} 2856}
2470 2857
2471void 2858void
2472ev_embed_stop (EV_P_ ev_embed *w) 2859ev_embed_stop (EV_P_ ev_embed *w)
2473{ 2860{
2474 clear_pending (EV_A_ (W)w); 2861 clear_pending (EV_A_ (W)w);
2475 if (expect_false (!ev_is_active (w))) 2862 if (expect_false (!ev_is_active (w)))
2476 return; 2863 return;
2477 2864
2865 EV_FREQUENT_CHECK;
2866
2478 ev_io_stop (EV_A_ &w->io); 2867 ev_io_stop (EV_A_ &w->io);
2479 ev_prepare_stop (EV_A_ &w->prepare); 2868 ev_prepare_stop (EV_A_ &w->prepare);
2480 2869
2481 ev_stop (EV_A_ (W)w); 2870 ev_stop (EV_A_ (W)w);
2871
2872 EV_FREQUENT_CHECK;
2482} 2873}
2483#endif 2874#endif
2484 2875
2485#if EV_FORK_ENABLE 2876#if EV_FORK_ENABLE
2486void 2877void
2487ev_fork_start (EV_P_ ev_fork *w) 2878ev_fork_start (EV_P_ ev_fork *w)
2488{ 2879{
2489 if (expect_false (ev_is_active (w))) 2880 if (expect_false (ev_is_active (w)))
2490 return; 2881 return;
2882
2883 EV_FREQUENT_CHECK;
2491 2884
2492 ev_start (EV_A_ (W)w, ++forkcnt); 2885 ev_start (EV_A_ (W)w, ++forkcnt);
2493 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2886 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2494 forks [forkcnt - 1] = w; 2887 forks [forkcnt - 1] = w;
2888
2889 EV_FREQUENT_CHECK;
2495} 2890}
2496 2891
2497void 2892void
2498ev_fork_stop (EV_P_ ev_fork *w) 2893ev_fork_stop (EV_P_ ev_fork *w)
2499{ 2894{
2500 clear_pending (EV_A_ (W)w); 2895 clear_pending (EV_A_ (W)w);
2501 if (expect_false (!ev_is_active (w))) 2896 if (expect_false (!ev_is_active (w)))
2502 return; 2897 return;
2503 2898
2899 EV_FREQUENT_CHECK;
2900
2504 { 2901 {
2505 int active = ((W)w)->active; 2902 int active = ev_active (w);
2903
2506 forks [active - 1] = forks [--forkcnt]; 2904 forks [active - 1] = forks [--forkcnt];
2507 ((W)forks [active - 1])->active = active; 2905 ev_active (forks [active - 1]) = active;
2508 } 2906 }
2509 2907
2510 ev_stop (EV_A_ (W)w); 2908 ev_stop (EV_A_ (W)w);
2909
2910 EV_FREQUENT_CHECK;
2511} 2911}
2512#endif 2912#endif
2513 2913
2514#if EV_ASYNC_ENABLE 2914#if EV_ASYNC_ENABLE
2515void 2915void
… …
2517{ 2917{
2518 if (expect_false (ev_is_active (w))) 2918 if (expect_false (ev_is_active (w)))
2519 return; 2919 return;
2520 2920
2521 evpipe_init (EV_A); 2921 evpipe_init (EV_A);
2922
2923 EV_FREQUENT_CHECK;
2522 2924
2523 ev_start (EV_A_ (W)w, ++asynccnt); 2925 ev_start (EV_A_ (W)w, ++asynccnt);
2524 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2926 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2525 asyncs [asynccnt - 1] = w; 2927 asyncs [asynccnt - 1] = w;
2928
2929 EV_FREQUENT_CHECK;
2526} 2930}
2527 2931
2528void 2932void
2529ev_async_stop (EV_P_ ev_async *w) 2933ev_async_stop (EV_P_ ev_async *w)
2530{ 2934{
2531 clear_pending (EV_A_ (W)w); 2935 clear_pending (EV_A_ (W)w);
2532 if (expect_false (!ev_is_active (w))) 2936 if (expect_false (!ev_is_active (w)))
2533 return; 2937 return;
2534 2938
2939 EV_FREQUENT_CHECK;
2940
2535 { 2941 {
2536 int active = ((W)w)->active; 2942 int active = ev_active (w);
2943
2537 asyncs [active - 1] = asyncs [--asynccnt]; 2944 asyncs [active - 1] = asyncs [--asynccnt];
2538 ((W)asyncs [active - 1])->active = active; 2945 ev_active (asyncs [active - 1]) = active;
2539 } 2946 }
2540 2947
2541 ev_stop (EV_A_ (W)w); 2948 ev_stop (EV_A_ (W)w);
2949
2950 EV_FREQUENT_CHECK;
2542} 2951}
2543 2952
2544void 2953void
2545ev_async_send (EV_P_ ev_async *w) 2954ev_async_send (EV_P_ ev_async *w)
2546{ 2955{

Diff Legend

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