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

Comparing libev/ev.c (file contents):
Revision 1.247 by root, Wed May 21 21:22:10 2008 UTC vs.
Revision 1.269 by root, Wed Oct 29 06:32:48 2008 UTC

… …
126# define EV_USE_EVENTFD 1 126# define EV_USE_EVENTFD 1
127# else 127# else
128# define EV_USE_EVENTFD 0 128# define EV_USE_EVENTFD 0
129# endif 129# endif
130# endif 130# endif
131 131
132#endif 132#endif
133 133
134#include <math.h> 134#include <math.h>
135#include <stdlib.h> 135#include <stdlib.h>
136#include <fcntl.h> 136#include <fcntl.h>
… …
154#ifndef _WIN32 154#ifndef _WIN32
155# include <sys/time.h> 155# include <sys/time.h>
156# include <sys/wait.h> 156# include <sys/wait.h>
157# include <unistd.h> 157# include <unistd.h>
158#else 158#else
159# include <io.h>
159# define WIN32_LEAN_AND_MEAN 160# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 161# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 162# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 163# define EV_SELECT_IS_WINSOCKET 1
163# endif 164# endif
164#endif 165#endif
165 166
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 167/* this block tries to deduce configuration from header-defined symbols and defaults */
167 168
168#ifndef EV_USE_MONOTONIC 169#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1
172# else
169# define EV_USE_MONOTONIC 0 173# define EV_USE_MONOTONIC 0
174# endif
170#endif 175#endif
171 176
172#ifndef EV_USE_REALTIME 177#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 178# define EV_USE_REALTIME 0
174#endif 179#endif
175 180
176#ifndef EV_USE_NANOSLEEP 181#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1
184# else
177# define EV_USE_NANOSLEEP 0 185# define EV_USE_NANOSLEEP 0
186# endif
178#endif 187#endif
179 188
180#ifndef EV_USE_SELECT 189#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 190# define EV_USE_SELECT 1
182#endif 191#endif
… …
235# else 244# else
236# define EV_USE_EVENTFD 0 245# define EV_USE_EVENTFD 0
237# endif 246# endif
238#endif 247#endif
239 248
249#if 0 /* debugging */
250# define EV_VERIFY 3
251# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1
253#endif
254
255#ifndef EV_VERIFY
256# define EV_VERIFY !EV_MINIMAL
257#endif
258
240#ifndef EV_USE_4HEAP 259#ifndef EV_USE_4HEAP
241# define EV_USE_4HEAP !EV_MINIMAL 260# define EV_USE_4HEAP !EV_MINIMAL
242#endif 261#endif
243 262
244#ifndef EV_HEAP_CACHE_AT 263#ifndef EV_HEAP_CACHE_AT
… …
267# include <sys/select.h> 286# include <sys/select.h>
268# endif 287# endif
269#endif 288#endif
270 289
271#if EV_USE_INOTIFY 290#if EV_USE_INOTIFY
291# include <sys/utsname.h>
272# include <sys/inotify.h> 292# include <sys/inotify.h>
293/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
294# ifndef IN_DONT_FOLLOW
295# undef EV_USE_INOTIFY
296# define EV_USE_INOTIFY 0
297# endif
273#endif 298#endif
274 299
275#if EV_SELECT_IS_WINSOCKET 300#if EV_SELECT_IS_WINSOCKET
276# include <winsock.h> 301# include <winsock.h>
277#endif 302#endif
… …
287} 312}
288# endif 313# endif
289#endif 314#endif
290 315
291/**/ 316/**/
317
318#if EV_VERIFY >= 3
319# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
320#else
321# define EV_FREQUENT_CHECK do { } while (0)
322#endif
292 323
293/* 324/*
294 * This is used to avoid floating point rounding problems. 325 * This is used to avoid floating point rounding problems.
295 * It is added to ev_rt_now when scheduling periodics 326 * It is added to ev_rt_now when scheduling periodics
296 * to ensure progress, time-wise, even when rounding 327 * to ensure progress, time-wise, even when rounding
… …
357{ 388{
358 syserr_cb = cb; 389 syserr_cb = cb;
359} 390}
360 391
361static void noinline 392static void noinline
362syserr (const char *msg) 393ev_syserr (const char *msg)
363{ 394{
364 if (!msg) 395 if (!msg)
365 msg = "(libev) system error"; 396 msg = "(libev) system error";
366 397
367 if (syserr_cb) 398 if (syserr_cb)
… …
418typedef struct 449typedef struct
419{ 450{
420 WL head; 451 WL head;
421 unsigned char events; 452 unsigned char events;
422 unsigned char reify; 453 unsigned char reify;
454 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
455 unsigned char unused;
456#if EV_USE_EPOLL
457 unsigned int egen; /* generation counter to counter epoll bugs */
458#endif
423#if EV_SELECT_IS_WINSOCKET 459#if EV_SELECT_IS_WINSOCKET
424 SOCKET handle; 460 SOCKET handle;
425#endif 461#endif
426} ANFD; 462} ANFD;
427 463
… …
444 typedef struct { 480 typedef struct {
445 ev_tstamp at; 481 ev_tstamp at;
446 WT w; 482 WT w;
447 } ANHE; 483 } ANHE;
448 484
449 #define ANHE_w(he) (he).w /* access watcher, read-write */ 485 #define ANHE_w(he) (he).w /* access watcher, read-write */
450 #define ANHE_at(he) (he).at /* access cached at, read-only */ 486 #define ANHE_at(he) (he).at /* access cached at, read-only */
451 #define ANHE_at_set(he) (he).at = (he).w->at /* update at from watcher */ 487 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
452#else 488#else
453 typedef WT ANHE; 489 typedef WT ANHE;
454 490
455 #define ANHE_w(he) (he) 491 #define ANHE_w(he) (he)
456 #define ANHE_at(he) (he)->at 492 #define ANHE_at(he) (he)->at
457 #define ANHE_at_set(he) 493 #define ANHE_at_cache(he)
458#endif 494#endif
459 495
460#if EV_MULTIPLICITY 496#if EV_MULTIPLICITY
461 497
462 struct ev_loop 498 struct ev_loop
… …
540 struct timeval tv; 576 struct timeval tv;
541 577
542 tv.tv_sec = (time_t)delay; 578 tv.tv_sec = (time_t)delay;
543 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 579 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
544 580
581 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
582 /* somehting nto guaranteed by newer posix versions, but guaranteed */
583 /* by older ones */
545 select (0, 0, 0, 0, &tv); 584 select (0, 0, 0, 0, &tv);
546#endif 585#endif
547 } 586 }
548} 587}
549 588
… …
576array_realloc (int elem, void *base, int *cur, int cnt) 615array_realloc (int elem, void *base, int *cur, int cnt)
577{ 616{
578 *cur = array_nextsize (elem, *cur, cnt); 617 *cur = array_nextsize (elem, *cur, cnt);
579 return ev_realloc (base, elem * *cur); 618 return ev_realloc (base, elem * *cur);
580} 619}
620
621#define array_init_zero(base,count) \
622 memset ((void *)(base), 0, sizeof (*(base)) * (count))
581 623
582#define array_needsize(type,base,cur,cnt,init) \ 624#define array_needsize(type,base,cur,cnt,init) \
583 if (expect_false ((cnt) > (cur))) \ 625 if (expect_false ((cnt) > (cur))) \
584 { \ 626 { \
585 int ocur_ = (cur); \ 627 int ocur_ = (cur); \
… …
629 ev_feed_event (EV_A_ events [i], type); 671 ev_feed_event (EV_A_ events [i], type);
630} 672}
631 673
632/*****************************************************************************/ 674/*****************************************************************************/
633 675
634void inline_size
635anfds_init (ANFD *base, int count)
636{
637 while (count--)
638 {
639 base->head = 0;
640 base->events = EV_NONE;
641 base->reify = 0;
642
643 ++base;
644 }
645}
646
647void inline_speed 676void inline_speed
648fd_event (EV_P_ int fd, int revents) 677fd_event (EV_P_ int fd, int revents)
649{ 678{
650 ANFD *anfd = anfds + fd; 679 ANFD *anfd = anfds + fd;
651 ev_io *w; 680 ev_io *w;
… …
683 events |= (unsigned char)w->events; 712 events |= (unsigned char)w->events;
684 713
685#if EV_SELECT_IS_WINSOCKET 714#if EV_SELECT_IS_WINSOCKET
686 if (events) 715 if (events)
687 { 716 {
688 unsigned long argp; 717 unsigned long arg;
689 #ifdef EV_FD_TO_WIN32_HANDLE 718 #ifdef EV_FD_TO_WIN32_HANDLE
690 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 719 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
691 #else 720 #else
692 anfd->handle = _get_osfhandle (fd); 721 anfd->handle = _get_osfhandle (fd);
693 #endif 722 #endif
694 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 723 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
695 } 724 }
696#endif 725#endif
697 726
698 { 727 {
699 unsigned char o_events = anfd->events; 728 unsigned char o_events = anfd->events;
… …
752{ 781{
753 int fd; 782 int fd;
754 783
755 for (fd = 0; fd < anfdmax; ++fd) 784 for (fd = 0; fd < anfdmax; ++fd)
756 if (anfds [fd].events) 785 if (anfds [fd].events)
757 if (!fd_valid (fd) == -1 && errno == EBADF) 786 if (!fd_valid (fd) && errno == EBADF)
758 fd_kill (EV_A_ fd); 787 fd_kill (EV_A_ fd);
759} 788}
760 789
761/* called on ENOMEM in select/poll to kill some fds and retry */ 790/* called on ENOMEM in select/poll to kill some fds and retry */
762static void noinline 791static void noinline
… …
780 809
781 for (fd = 0; fd < anfdmax; ++fd) 810 for (fd = 0; fd < anfdmax; ++fd)
782 if (anfds [fd].events) 811 if (anfds [fd].events)
783 { 812 {
784 anfds [fd].events = 0; 813 anfds [fd].events = 0;
814 anfds [fd].emask = 0;
785 fd_change (EV_A_ fd, EV_IOFDSET | 1); 815 fd_change (EV_A_ fd, EV_IOFDSET | 1);
786 } 816 }
787} 817}
788 818
789/*****************************************************************************/ 819/*****************************************************************************/
… …
803#if EV_USE_4HEAP 833#if EV_USE_4HEAP
804 834
805#define DHEAP 4 835#define DHEAP 4
806#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 836#define HEAP0 (DHEAP - 1) /* index of first element in heap */
807#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 837#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
808 838#define UPHEAP_DONE(p,k) ((p) == (k))
809/* towards the root */
810void inline_speed
811upheap (ANHE *heap, int k)
812{
813 ANHE he = heap [k];
814
815 for (;;)
816 {
817 int p = HPARENT (k);
818
819 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
820 break;
821
822 heap [k] = heap [p];
823 ev_active (ANHE_w (heap [k])) = k;
824 k = p;
825 }
826
827 heap [k] = he;
828 ev_active (ANHE_w (he)) = k;
829}
830 839
831/* away from the root */ 840/* away from the root */
832void inline_speed 841void inline_speed
833downheap (ANHE *heap, int N, int k) 842downheap (ANHE *heap, int N, int k)
834{ 843{
… …
837 846
838 for (;;) 847 for (;;)
839 { 848 {
840 ev_tstamp minat; 849 ev_tstamp minat;
841 ANHE *minpos; 850 ANHE *minpos;
842 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0; 851 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
843 852
844 // find minimum child 853 /* find minimum child */
845 if (expect_true (pos + DHEAP - 1 < E)) 854 if (expect_true (pos + DHEAP - 1 < E))
846 { 855 {
847 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 856 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
848 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos)); 857 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
849 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos)); 858 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
… …
870 879
871 heap [k] = he; 880 heap [k] = he;
872 ev_active (ANHE_w (he)) = k; 881 ev_active (ANHE_w (he)) = k;
873} 882}
874 883
875#else // 4HEAP 884#else /* 4HEAP */
876 885
877#define HEAP0 1 886#define HEAP0 1
878#define HPARENT(k) ((k) >> 1) 887#define HPARENT(k) ((k) >> 1)
879 888#define UPHEAP_DONE(p,k) (!(p))
880/* towards the root */
881void inline_speed
882upheap (ANHE *heap, int k)
883{
884 ANHE he = heap [k];
885
886 for (;;)
887 {
888 int p = HPARENT (k);
889
890 /* maybe we could use a dummy element at heap [0]? */
891 if (!p || ANHE_at (heap [p]) <= ANHE_at (he))
892 break;
893
894 heap [k] = heap [p];
895 ev_active (ANHE_w (heap [k])) = k;
896 k = p;
897 }
898
899 heap [k] = he;
900 ev_active (ANHE_w (heap [k])) = k;
901}
902 889
903/* away from the root */ 890/* away from the root */
904void inline_speed 891void inline_speed
905downheap (ANHE *heap, int N, int k) 892downheap (ANHE *heap, int N, int k)
906{ 893{
… …
908 895
909 for (;;) 896 for (;;)
910 { 897 {
911 int c = k << 1; 898 int c = k << 1;
912 899
913 if (c > N) 900 if (c > N + HEAP0 - 1)
914 break; 901 break;
915 902
916 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 903 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
917 ? 1 : 0; 904 ? 1 : 0;
918 905
919 if (ANHE_at (he) <= ANHE_at (heap [c])) 906 if (ANHE_at (he) <= ANHE_at (heap [c]))
920 break; 907 break;
921 908
… …
928 heap [k] = he; 915 heap [k] = he;
929 ev_active (ANHE_w (he)) = k; 916 ev_active (ANHE_w (he)) = k;
930} 917}
931#endif 918#endif
932 919
920/* towards the root */
921void inline_speed
922upheap (ANHE *heap, int k)
923{
924 ANHE he = heap [k];
925
926 for (;;)
927 {
928 int p = HPARENT (k);
929
930 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
931 break;
932
933 heap [k] = heap [p];
934 ev_active (ANHE_w (heap [k])) = k;
935 k = p;
936 }
937
938 heap [k] = he;
939 ev_active (ANHE_w (he)) = k;
940}
941
933void inline_size 942void inline_size
934adjustheap (ANHE *heap, int N, int k) 943adjustheap (ANHE *heap, int N, int k)
935{ 944{
936 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 945 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
937 upheap (heap, k); 946 upheap (heap, k);
938 else 947 else
939 downheap (heap, N, k); 948 downheap (heap, N, k);
940} 949}
941 950
951/* rebuild the heap: this function is used only once and executed rarely */
952void inline_size
953reheap (ANHE *heap, int N)
954{
955 int i;
956
957 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
958 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
959 for (i = 0; i < N; ++i)
960 upheap (heap, i + HEAP0);
961}
962
942/*****************************************************************************/ 963/*****************************************************************************/
943 964
944typedef struct 965typedef struct
945{ 966{
946 WL head; 967 WL head;
… …
950static ANSIG *signals; 971static ANSIG *signals;
951static int signalmax; 972static int signalmax;
952 973
953static EV_ATOMIC_T gotsig; 974static EV_ATOMIC_T gotsig;
954 975
955void inline_size
956signals_init (ANSIG *base, int count)
957{
958 while (count--)
959 {
960 base->head = 0;
961 base->gotsig = 0;
962
963 ++base;
964 }
965}
966
967/*****************************************************************************/ 976/*****************************************************************************/
968 977
969void inline_speed 978void inline_speed
970fd_intern (int fd) 979fd_intern (int fd)
971{ 980{
972#ifdef _WIN32 981#ifdef _WIN32
973 int arg = 1; 982 unsigned long arg = 1;
974 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 983 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
975#else 984#else
976 fcntl (fd, F_SETFD, FD_CLOEXEC); 985 fcntl (fd, F_SETFD, FD_CLOEXEC);
977 fcntl (fd, F_SETFL, O_NONBLOCK); 986 fcntl (fd, F_SETFL, O_NONBLOCK);
978#endif 987#endif
… …
992 } 1001 }
993 else 1002 else
994#endif 1003#endif
995 { 1004 {
996 while (pipe (evpipe)) 1005 while (pipe (evpipe))
997 syserr ("(libev) error creating signal/async pipe"); 1006 ev_syserr ("(libev) error creating signal/async pipe");
998 1007
999 fd_intern (evpipe [0]); 1008 fd_intern (evpipe [0]);
1000 fd_intern (evpipe [1]); 1009 fd_intern (evpipe [1]);
1001 ev_io_set (&pipeev, evpipe [0], EV_READ); 1010 ev_io_set (&pipeev, evpipe [0], EV_READ);
1002 } 1011 }
… …
1462 1471
1463 postfork = 0; 1472 postfork = 0;
1464} 1473}
1465 1474
1466#if EV_MULTIPLICITY 1475#if EV_MULTIPLICITY
1476
1467struct ev_loop * 1477struct ev_loop *
1468ev_loop_new (unsigned int flags) 1478ev_loop_new (unsigned int flags)
1469{ 1479{
1470 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1480 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1471 1481
… …
1489void 1499void
1490ev_loop_fork (EV_P) 1500ev_loop_fork (EV_P)
1491{ 1501{
1492 postfork = 1; /* must be in line with ev_default_fork */ 1502 postfork = 1; /* must be in line with ev_default_fork */
1493} 1503}
1504
1505#if EV_VERIFY
1506static void noinline
1507verify_watcher (EV_P_ W w)
1508{
1509 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1510
1511 if (w->pending)
1512 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1513}
1514
1515static void noinline
1516verify_heap (EV_P_ ANHE *heap, int N)
1517{
1518 int i;
1519
1520 for (i = HEAP0; i < N + HEAP0; ++i)
1521 {
1522 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1523 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1524 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1525
1526 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1527 }
1528}
1529
1530static void noinline
1531array_verify (EV_P_ W *ws, int cnt)
1532{
1533 while (cnt--)
1534 {
1535 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1536 verify_watcher (EV_A_ ws [cnt]);
1537 }
1538}
1539#endif
1540
1541void
1542ev_loop_verify (EV_P)
1543{
1544#if EV_VERIFY
1545 int i;
1546 WL w;
1547
1548 assert (activecnt >= -1);
1549
1550 assert (fdchangemax >= fdchangecnt);
1551 for (i = 0; i < fdchangecnt; ++i)
1552 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1553
1554 assert (anfdmax >= 0);
1555 for (i = 0; i < anfdmax; ++i)
1556 for (w = anfds [i].head; w; w = w->next)
1557 {
1558 verify_watcher (EV_A_ (W)w);
1559 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1560 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1561 }
1562
1563 assert (timermax >= timercnt);
1564 verify_heap (EV_A_ timers, timercnt);
1565
1566#if EV_PERIODIC_ENABLE
1567 assert (periodicmax >= periodiccnt);
1568 verify_heap (EV_A_ periodics, periodiccnt);
1569#endif
1570
1571 for (i = NUMPRI; i--; )
1572 {
1573 assert (pendingmax [i] >= pendingcnt [i]);
1574#if EV_IDLE_ENABLE
1575 assert (idleall >= 0);
1576 assert (idlemax [i] >= idlecnt [i]);
1577 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1578#endif
1579 }
1580
1581#if EV_FORK_ENABLE
1582 assert (forkmax >= forkcnt);
1583 array_verify (EV_A_ (W *)forks, forkcnt);
1584#endif
1585
1586#if EV_ASYNC_ENABLE
1587 assert (asyncmax >= asynccnt);
1588 array_verify (EV_A_ (W *)asyncs, asynccnt);
1589#endif
1590
1591 assert (preparemax >= preparecnt);
1592 array_verify (EV_A_ (W *)prepares, preparecnt);
1593
1594 assert (checkmax >= checkcnt);
1595 array_verify (EV_A_ (W *)checks, checkcnt);
1596
1597# if 0
1598 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1599 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1494#endif 1600# endif
1601#endif
1602}
1603
1604#endif /* multiplicity */
1495 1605
1496#if EV_MULTIPLICITY 1606#if EV_MULTIPLICITY
1497struct ev_loop * 1607struct ev_loop *
1498ev_default_loop_init (unsigned int flags) 1608ev_default_loop_init (unsigned int flags)
1499#else 1609#else
… …
1532{ 1642{
1533#if EV_MULTIPLICITY 1643#if EV_MULTIPLICITY
1534 struct ev_loop *loop = ev_default_loop_ptr; 1644 struct ev_loop *loop = ev_default_loop_ptr;
1535#endif 1645#endif
1536 1646
1647 ev_default_loop_ptr = 0;
1648
1537#ifndef _WIN32 1649#ifndef _WIN32
1538 ev_ref (EV_A); /* child watcher */ 1650 ev_ref (EV_A); /* child watcher */
1539 ev_signal_stop (EV_A_ &childev); 1651 ev_signal_stop (EV_A_ &childev);
1540#endif 1652#endif
1541 1653
… …
1547{ 1659{
1548#if EV_MULTIPLICITY 1660#if EV_MULTIPLICITY
1549 struct ev_loop *loop = ev_default_loop_ptr; 1661 struct ev_loop *loop = ev_default_loop_ptr;
1550#endif 1662#endif
1551 1663
1552 if (backend) 1664 ev_loop_fork (EV_A);
1553 postfork = 1; /* must be in line with ev_loop_fork */
1554} 1665}
1555 1666
1556/*****************************************************************************/ 1667/*****************************************************************************/
1557 1668
1558void 1669void
… …
1575 { 1686 {
1576 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1687 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1577 1688
1578 p->w->pending = 0; 1689 p->w->pending = 0;
1579 EV_CB_INVOKE (p->w, p->events); 1690 EV_CB_INVOKE (p->w, p->events);
1691 EV_FREQUENT_CHECK;
1580 } 1692 }
1581 } 1693 }
1582} 1694}
1583 1695
1584#if EV_IDLE_ENABLE 1696#if EV_IDLE_ENABLE
… …
1605#endif 1717#endif
1606 1718
1607void inline_size 1719void inline_size
1608timers_reify (EV_P) 1720timers_reify (EV_P)
1609{ 1721{
1722 EV_FREQUENT_CHECK;
1723
1610 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1724 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1611 { 1725 {
1612 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1726 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1613 1727
1614 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1728 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
… …
1620 if (ev_at (w) < mn_now) 1734 if (ev_at (w) < mn_now)
1621 ev_at (w) = mn_now; 1735 ev_at (w) = mn_now;
1622 1736
1623 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1737 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1624 1738
1625 ANHE_at_set (timers [HEAP0]); 1739 ANHE_at_cache (timers [HEAP0]);
1626 downheap (timers, timercnt, HEAP0); 1740 downheap (timers, timercnt, HEAP0);
1627 } 1741 }
1628 else 1742 else
1629 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1743 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1630 1744
1745 EV_FREQUENT_CHECK;
1631 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1746 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1632 } 1747 }
1633} 1748}
1634 1749
1635#if EV_PERIODIC_ENABLE 1750#if EV_PERIODIC_ENABLE
1636void inline_size 1751void inline_size
1637periodics_reify (EV_P) 1752periodics_reify (EV_P)
1638{ 1753{
1754 EV_FREQUENT_CHECK;
1755
1639 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1756 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1640 { 1757 {
1641 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1758 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1642 1759
1643 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1760 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
… …
1647 { 1764 {
1648 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1765 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1649 1766
1650 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1767 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1651 1768
1652 ANHE_at_set (periodics [HEAP0]); 1769 ANHE_at_cache (periodics [HEAP0]);
1653 downheap (periodics, periodiccnt, HEAP0); 1770 downheap (periodics, periodiccnt, HEAP0);
1654 } 1771 }
1655 else if (w->interval) 1772 else if (w->interval)
1656 { 1773 {
1657 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1774 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
… …
1666 /* has effectively asked to get triggered more often than possible */ 1783 /* has effectively asked to get triggered more often than possible */
1667 if (ev_at (w) < ev_rt_now) 1784 if (ev_at (w) < ev_rt_now)
1668 ev_at (w) = ev_rt_now; 1785 ev_at (w) = ev_rt_now;
1669 } 1786 }
1670 1787
1671 ANHE_at_set (periodics [HEAP0]); 1788 ANHE_at_cache (periodics [HEAP0]);
1672 downheap (periodics, periodiccnt, HEAP0); 1789 downheap (periodics, periodiccnt, HEAP0);
1673 } 1790 }
1674 else 1791 else
1675 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1792 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1676 1793
1794 EV_FREQUENT_CHECK;
1677 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1795 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1678 } 1796 }
1679} 1797}
1680 1798
1681static void noinline 1799static void noinline
… …
1691 if (w->reschedule_cb) 1809 if (w->reschedule_cb)
1692 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1810 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1693 else if (w->interval) 1811 else if (w->interval)
1694 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1812 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1695 1813
1696 ANHE_at_set (periodics [i]); 1814 ANHE_at_cache (periodics [i]);
1697 } 1815 }
1698 1816
1699 /* we don't use floyds algorithm, uphead is simpler and is more cache-efficient */ 1817 reheap (periodics, periodiccnt);
1700 /* also, this is easy and corretc for both 2-heaps and 4-heaps */
1701 for (i = 0; i < periodiccnt; ++i)
1702 upheap (periodics, i + HEAP0);
1703} 1818}
1704#endif 1819#endif
1705 1820
1706void inline_speed 1821void inline_speed
1707time_update (EV_P_ ev_tstamp max_block) 1822time_update (EV_P_ ev_tstamp max_block)
… …
1765 /* adjust timers. this is easy, as the offset is the same for all of them */ 1880 /* adjust timers. this is easy, as the offset is the same for all of them */
1766 for (i = 0; i < timercnt; ++i) 1881 for (i = 0; i < timercnt; ++i)
1767 { 1882 {
1768 ANHE *he = timers + i + HEAP0; 1883 ANHE *he = timers + i + HEAP0;
1769 ANHE_w (*he)->at += ev_rt_now - mn_now; 1884 ANHE_w (*he)->at += ev_rt_now - mn_now;
1770 ANHE_at_set (*he); 1885 ANHE_at_cache (*he);
1771 } 1886 }
1772 } 1887 }
1773 1888
1774 mn_now = ev_rt_now; 1889 mn_now = ev_rt_now;
1775 } 1890 }
… …
1785ev_unref (EV_P) 1900ev_unref (EV_P)
1786{ 1901{
1787 --activecnt; 1902 --activecnt;
1788} 1903}
1789 1904
1905void
1906ev_now_update (EV_P)
1907{
1908 time_update (EV_A_ 1e100);
1909}
1910
1790static int loop_done; 1911static int loop_done;
1791 1912
1792void 1913void
1793ev_loop (EV_P_ int flags) 1914ev_loop (EV_P_ int flags)
1794{ 1915{
… …
1796 1917
1797 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1918 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1798 1919
1799 do 1920 do
1800 { 1921 {
1922#if EV_VERIFY >= 2
1923 ev_loop_verify (EV_A);
1924#endif
1925
1801#ifndef _WIN32 1926#ifndef _WIN32
1802 if (expect_false (curpid)) /* penalise the forking check even more */ 1927 if (expect_false (curpid)) /* penalise the forking check even more */
1803 if (expect_false (getpid () != curpid)) 1928 if (expect_false (getpid () != curpid))
1804 { 1929 {
1805 curpid = getpid (); 1930 curpid = getpid ();
… …
1999 2124
2000 if (expect_false (ev_is_active (w))) 2125 if (expect_false (ev_is_active (w)))
2001 return; 2126 return;
2002 2127
2003 assert (("ev_io_start called with negative fd", fd >= 0)); 2128 assert (("ev_io_start called with negative fd", fd >= 0));
2129 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2130
2131 EV_FREQUENT_CHECK;
2004 2132
2005 ev_start (EV_A_ (W)w, 1); 2133 ev_start (EV_A_ (W)w, 1);
2006 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2134 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2007 wlist_add (&anfds[fd].head, (WL)w); 2135 wlist_add (&anfds[fd].head, (WL)w);
2008 2136
2009 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2137 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2010 w->events &= ~EV_IOFDSET; 2138 w->events &= ~EV_IOFDSET;
2139
2140 EV_FREQUENT_CHECK;
2011} 2141}
2012 2142
2013void noinline 2143void noinline
2014ev_io_stop (EV_P_ ev_io *w) 2144ev_io_stop (EV_P_ ev_io *w)
2015{ 2145{
… …
2017 if (expect_false (!ev_is_active (w))) 2147 if (expect_false (!ev_is_active (w)))
2018 return; 2148 return;
2019 2149
2020 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2150 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2021 2151
2152 EV_FREQUENT_CHECK;
2153
2022 wlist_del (&anfds[w->fd].head, (WL)w); 2154 wlist_del (&anfds[w->fd].head, (WL)w);
2023 ev_stop (EV_A_ (W)w); 2155 ev_stop (EV_A_ (W)w);
2024 2156
2025 fd_change (EV_A_ w->fd, 1); 2157 fd_change (EV_A_ w->fd, 1);
2158
2159 EV_FREQUENT_CHECK;
2026} 2160}
2027 2161
2028void noinline 2162void noinline
2029ev_timer_start (EV_P_ ev_timer *w) 2163ev_timer_start (EV_P_ ev_timer *w)
2030{ 2164{
… …
2033 2167
2034 ev_at (w) += mn_now; 2168 ev_at (w) += mn_now;
2035 2169
2036 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2170 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2037 2171
2172 EV_FREQUENT_CHECK;
2173
2174 ++timercnt;
2038 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2175 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2039 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2); 2176 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
2040 ANHE_w (timers [ev_active (w)]) = (WT)w; 2177 ANHE_w (timers [ev_active (w)]) = (WT)w;
2041 ANHE_at_set (timers [ev_active (w)]); 2178 ANHE_at_cache (timers [ev_active (w)]);
2042 upheap (timers, ev_active (w)); 2179 upheap (timers, ev_active (w));
2180
2181 EV_FREQUENT_CHECK;
2043 2182
2044 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2183 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2045} 2184}
2046 2185
2047void noinline 2186void noinline
… …
2049{ 2188{
2050 clear_pending (EV_A_ (W)w); 2189 clear_pending (EV_A_ (W)w);
2051 if (expect_false (!ev_is_active (w))) 2190 if (expect_false (!ev_is_active (w)))
2052 return; 2191 return;
2053 2192
2193 EV_FREQUENT_CHECK;
2194
2054 { 2195 {
2055 int active = ev_active (w); 2196 int active = ev_active (w);
2056 2197
2057 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2198 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2058 2199
2200 --timercnt;
2201
2059 if (expect_true (active < timercnt + HEAP0 - 1)) 2202 if (expect_true (active < timercnt + HEAP0))
2060 { 2203 {
2061 timers [active] = timers [timercnt + HEAP0 - 1]; 2204 timers [active] = timers [timercnt + HEAP0];
2062 adjustheap (timers, timercnt, active); 2205 adjustheap (timers, timercnt, active);
2063 } 2206 }
2064
2065 --timercnt;
2066 } 2207 }
2208
2209 EV_FREQUENT_CHECK;
2067 2210
2068 ev_at (w) -= mn_now; 2211 ev_at (w) -= mn_now;
2069 2212
2070 ev_stop (EV_A_ (W)w); 2213 ev_stop (EV_A_ (W)w);
2071} 2214}
2072 2215
2073void noinline 2216void noinline
2074ev_timer_again (EV_P_ ev_timer *w) 2217ev_timer_again (EV_P_ ev_timer *w)
2075{ 2218{
2219 EV_FREQUENT_CHECK;
2220
2076 if (ev_is_active (w)) 2221 if (ev_is_active (w))
2077 { 2222 {
2078 if (w->repeat) 2223 if (w->repeat)
2079 { 2224 {
2080 ev_at (w) = mn_now + w->repeat; 2225 ev_at (w) = mn_now + w->repeat;
2081 ANHE_at_set (timers [ev_active (w)]); 2226 ANHE_at_cache (timers [ev_active (w)]);
2082 adjustheap (timers, timercnt, ev_active (w)); 2227 adjustheap (timers, timercnt, ev_active (w));
2083 } 2228 }
2084 else 2229 else
2085 ev_timer_stop (EV_A_ w); 2230 ev_timer_stop (EV_A_ w);
2086 } 2231 }
2087 else if (w->repeat) 2232 else if (w->repeat)
2088 { 2233 {
2089 ev_at (w) = w->repeat; 2234 ev_at (w) = w->repeat;
2090 ev_timer_start (EV_A_ w); 2235 ev_timer_start (EV_A_ w);
2091 } 2236 }
2237
2238 EV_FREQUENT_CHECK;
2092} 2239}
2093 2240
2094#if EV_PERIODIC_ENABLE 2241#if EV_PERIODIC_ENABLE
2095void noinline 2242void noinline
2096ev_periodic_start (EV_P_ ev_periodic *w) 2243ev_periodic_start (EV_P_ ev_periodic *w)
… …
2107 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2254 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2108 } 2255 }
2109 else 2256 else
2110 ev_at (w) = w->offset; 2257 ev_at (w) = w->offset;
2111 2258
2259 EV_FREQUENT_CHECK;
2260
2261 ++periodiccnt;
2112 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2262 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2113 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2); 2263 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2114 ANHE_w (periodics [ev_active (w)]) = (WT)w; 2264 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2115 ANHE_at_set (periodics [ev_active (w)]); 2265 ANHE_at_cache (periodics [ev_active (w)]);
2116 upheap (periodics, ev_active (w)); 2266 upheap (periodics, ev_active (w));
2267
2268 EV_FREQUENT_CHECK;
2117 2269
2118 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2270 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2119} 2271}
2120 2272
2121void noinline 2273void noinline
… …
2123{ 2275{
2124 clear_pending (EV_A_ (W)w); 2276 clear_pending (EV_A_ (W)w);
2125 if (expect_false (!ev_is_active (w))) 2277 if (expect_false (!ev_is_active (w)))
2126 return; 2278 return;
2127 2279
2280 EV_FREQUENT_CHECK;
2281
2128 { 2282 {
2129 int active = ev_active (w); 2283 int active = ev_active (w);
2130 2284
2131 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2285 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2132 2286
2287 --periodiccnt;
2288
2133 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2289 if (expect_true (active < periodiccnt + HEAP0))
2134 { 2290 {
2135 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2291 periodics [active] = periodics [periodiccnt + HEAP0];
2136 adjustheap (periodics, periodiccnt, active); 2292 adjustheap (periodics, periodiccnt, active);
2137 } 2293 }
2138
2139 --periodiccnt;
2140 } 2294 }
2295
2296 EV_FREQUENT_CHECK;
2141 2297
2142 ev_stop (EV_A_ (W)w); 2298 ev_stop (EV_A_ (W)w);
2143} 2299}
2144 2300
2145void noinline 2301void noinline
… …
2165 return; 2321 return;
2166 2322
2167 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2323 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2168 2324
2169 evpipe_init (EV_A); 2325 evpipe_init (EV_A);
2326
2327 EV_FREQUENT_CHECK;
2170 2328
2171 { 2329 {
2172#ifndef _WIN32 2330#ifndef _WIN32
2173 sigset_t full, prev; 2331 sigset_t full, prev;
2174 sigfillset (&full); 2332 sigfillset (&full);
2175 sigprocmask (SIG_SETMASK, &full, &prev); 2333 sigprocmask (SIG_SETMASK, &full, &prev);
2176#endif 2334#endif
2177 2335
2178 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2336 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2179 2337
2180#ifndef _WIN32 2338#ifndef _WIN32
2181 sigprocmask (SIG_SETMASK, &prev, 0); 2339 sigprocmask (SIG_SETMASK, &prev, 0);
2182#endif 2340#endif
2183 } 2341 }
… …
2195 sigfillset (&sa.sa_mask); 2353 sigfillset (&sa.sa_mask);
2196 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2354 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2197 sigaction (w->signum, &sa, 0); 2355 sigaction (w->signum, &sa, 0);
2198#endif 2356#endif
2199 } 2357 }
2358
2359 EV_FREQUENT_CHECK;
2200} 2360}
2201 2361
2202void noinline 2362void noinline
2203ev_signal_stop (EV_P_ ev_signal *w) 2363ev_signal_stop (EV_P_ ev_signal *w)
2204{ 2364{
2205 clear_pending (EV_A_ (W)w); 2365 clear_pending (EV_A_ (W)w);
2206 if (expect_false (!ev_is_active (w))) 2366 if (expect_false (!ev_is_active (w)))
2207 return; 2367 return;
2208 2368
2369 EV_FREQUENT_CHECK;
2370
2209 wlist_del (&signals [w->signum - 1].head, (WL)w); 2371 wlist_del (&signals [w->signum - 1].head, (WL)w);
2210 ev_stop (EV_A_ (W)w); 2372 ev_stop (EV_A_ (W)w);
2211 2373
2212 if (!signals [w->signum - 1].head) 2374 if (!signals [w->signum - 1].head)
2213 signal (w->signum, SIG_DFL); 2375 signal (w->signum, SIG_DFL);
2376
2377 EV_FREQUENT_CHECK;
2214} 2378}
2215 2379
2216void 2380void
2217ev_child_start (EV_P_ ev_child *w) 2381ev_child_start (EV_P_ ev_child *w)
2218{ 2382{
… …
2220 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2384 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2221#endif 2385#endif
2222 if (expect_false (ev_is_active (w))) 2386 if (expect_false (ev_is_active (w)))
2223 return; 2387 return;
2224 2388
2389 EV_FREQUENT_CHECK;
2390
2225 ev_start (EV_A_ (W)w, 1); 2391 ev_start (EV_A_ (W)w, 1);
2226 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2392 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2393
2394 EV_FREQUENT_CHECK;
2227} 2395}
2228 2396
2229void 2397void
2230ev_child_stop (EV_P_ ev_child *w) 2398ev_child_stop (EV_P_ ev_child *w)
2231{ 2399{
2232 clear_pending (EV_A_ (W)w); 2400 clear_pending (EV_A_ (W)w);
2233 if (expect_false (!ev_is_active (w))) 2401 if (expect_false (!ev_is_active (w)))
2234 return; 2402 return;
2235 2403
2404 EV_FREQUENT_CHECK;
2405
2236 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2406 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2237 ev_stop (EV_A_ (W)w); 2407 ev_stop (EV_A_ (W)w);
2408
2409 EV_FREQUENT_CHECK;
2238} 2410}
2239 2411
2240#if EV_STAT_ENABLE 2412#if EV_STAT_ENABLE
2241 2413
2242# ifdef _WIN32 2414# ifdef _WIN32
… …
2311 2483
2312static void noinline 2484static void noinline
2313infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2485infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2314{ 2486{
2315 if (slot < 0) 2487 if (slot < 0)
2316 /* overflow, need to check for all hahs slots */ 2488 /* overflow, need to check for all hash slots */
2317 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2489 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2318 infy_wd (EV_A_ slot, wd, ev); 2490 infy_wd (EV_A_ slot, wd, ev);
2319 else 2491 else
2320 { 2492 {
2321 WL w_; 2493 WL w_;
… …
2355infy_init (EV_P) 2527infy_init (EV_P)
2356{ 2528{
2357 if (fs_fd != -2) 2529 if (fs_fd != -2)
2358 return; 2530 return;
2359 2531
2532 /* kernels < 2.6.25 are borked
2533 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2534 */
2535 {
2536 struct utsname buf;
2537 int major, minor, micro;
2538
2539 fs_fd = -1;
2540
2541 if (uname (&buf))
2542 return;
2543
2544 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2545 return;
2546
2547 if (major < 2
2548 || (major == 2 && minor < 6)
2549 || (major == 2 && minor == 6 && micro < 25))
2550 return;
2551 }
2552
2360 fs_fd = inotify_init (); 2553 fs_fd = inotify_init ();
2361 2554
2362 if (fs_fd >= 0) 2555 if (fs_fd >= 0)
2363 { 2556 {
2364 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 2557 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
… …
2393 if (fs_fd >= 0) 2586 if (fs_fd >= 0)
2394 infy_add (EV_A_ w); /* re-add, no matter what */ 2587 infy_add (EV_A_ w); /* re-add, no matter what */
2395 else 2588 else
2396 ev_timer_start (EV_A_ &w->timer); 2589 ev_timer_start (EV_A_ &w->timer);
2397 } 2590 }
2398
2399 } 2591 }
2400} 2592}
2401 2593
2594#endif
2595
2596#ifdef _WIN32
2597# define EV_LSTAT(p,b) _stati64 (p, b)
2598#else
2599# define EV_LSTAT(p,b) lstat (p, b)
2402#endif 2600#endif
2403 2601
2404void 2602void
2405ev_stat_stat (EV_P_ ev_stat *w) 2603ev_stat_stat (EV_P_ ev_stat *w)
2406{ 2604{
… …
2433 || w->prev.st_atime != w->attr.st_atime 2631 || w->prev.st_atime != w->attr.st_atime
2434 || w->prev.st_mtime != w->attr.st_mtime 2632 || w->prev.st_mtime != w->attr.st_mtime
2435 || w->prev.st_ctime != w->attr.st_ctime 2633 || w->prev.st_ctime != w->attr.st_ctime
2436 ) { 2634 ) {
2437 #if EV_USE_INOTIFY 2635 #if EV_USE_INOTIFY
2636 if (fs_fd >= 0)
2637 {
2438 infy_del (EV_A_ w); 2638 infy_del (EV_A_ w);
2439 infy_add (EV_A_ w); 2639 infy_add (EV_A_ w);
2440 ev_stat_stat (EV_A_ w); /* avoid race... */ 2640 ev_stat_stat (EV_A_ w); /* avoid race... */
2641 }
2441 #endif 2642 #endif
2442 2643
2443 ev_feed_event (EV_A_ w, EV_STAT); 2644 ev_feed_event (EV_A_ w, EV_STAT);
2444 } 2645 }
2445} 2646}
… …
2470 else 2671 else
2471#endif 2672#endif
2472 ev_timer_start (EV_A_ &w->timer); 2673 ev_timer_start (EV_A_ &w->timer);
2473 2674
2474 ev_start (EV_A_ (W)w, 1); 2675 ev_start (EV_A_ (W)w, 1);
2676
2677 EV_FREQUENT_CHECK;
2475} 2678}
2476 2679
2477void 2680void
2478ev_stat_stop (EV_P_ ev_stat *w) 2681ev_stat_stop (EV_P_ ev_stat *w)
2479{ 2682{
2480 clear_pending (EV_A_ (W)w); 2683 clear_pending (EV_A_ (W)w);
2481 if (expect_false (!ev_is_active (w))) 2684 if (expect_false (!ev_is_active (w)))
2482 return; 2685 return;
2483 2686
2687 EV_FREQUENT_CHECK;
2688
2484#if EV_USE_INOTIFY 2689#if EV_USE_INOTIFY
2485 infy_del (EV_A_ w); 2690 infy_del (EV_A_ w);
2486#endif 2691#endif
2487 ev_timer_stop (EV_A_ &w->timer); 2692 ev_timer_stop (EV_A_ &w->timer);
2488 2693
2489 ev_stop (EV_A_ (W)w); 2694 ev_stop (EV_A_ (W)w);
2695
2696 EV_FREQUENT_CHECK;
2490} 2697}
2491#endif 2698#endif
2492 2699
2493#if EV_IDLE_ENABLE 2700#if EV_IDLE_ENABLE
2494void 2701void
… …
2496{ 2703{
2497 if (expect_false (ev_is_active (w))) 2704 if (expect_false (ev_is_active (w)))
2498 return; 2705 return;
2499 2706
2500 pri_adjust (EV_A_ (W)w); 2707 pri_adjust (EV_A_ (W)w);
2708
2709 EV_FREQUENT_CHECK;
2501 2710
2502 { 2711 {
2503 int active = ++idlecnt [ABSPRI (w)]; 2712 int active = ++idlecnt [ABSPRI (w)];
2504 2713
2505 ++idleall; 2714 ++idleall;
2506 ev_start (EV_A_ (W)w, active); 2715 ev_start (EV_A_ (W)w, active);
2507 2716
2508 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 2717 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2509 idles [ABSPRI (w)][active - 1] = w; 2718 idles [ABSPRI (w)][active - 1] = w;
2510 } 2719 }
2720
2721 EV_FREQUENT_CHECK;
2511} 2722}
2512 2723
2513void 2724void
2514ev_idle_stop (EV_P_ ev_idle *w) 2725ev_idle_stop (EV_P_ ev_idle *w)
2515{ 2726{
2516 clear_pending (EV_A_ (W)w); 2727 clear_pending (EV_A_ (W)w);
2517 if (expect_false (!ev_is_active (w))) 2728 if (expect_false (!ev_is_active (w)))
2518 return; 2729 return;
2519 2730
2731 EV_FREQUENT_CHECK;
2732
2520 { 2733 {
2521 int active = ev_active (w); 2734 int active = ev_active (w);
2522 2735
2523 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2736 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2524 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2737 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2525 2738
2526 ev_stop (EV_A_ (W)w); 2739 ev_stop (EV_A_ (W)w);
2527 --idleall; 2740 --idleall;
2528 } 2741 }
2742
2743 EV_FREQUENT_CHECK;
2529} 2744}
2530#endif 2745#endif
2531 2746
2532void 2747void
2533ev_prepare_start (EV_P_ ev_prepare *w) 2748ev_prepare_start (EV_P_ ev_prepare *w)
2534{ 2749{
2535 if (expect_false (ev_is_active (w))) 2750 if (expect_false (ev_is_active (w)))
2536 return; 2751 return;
2752
2753 EV_FREQUENT_CHECK;
2537 2754
2538 ev_start (EV_A_ (W)w, ++preparecnt); 2755 ev_start (EV_A_ (W)w, ++preparecnt);
2539 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2756 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2540 prepares [preparecnt - 1] = w; 2757 prepares [preparecnt - 1] = w;
2758
2759 EV_FREQUENT_CHECK;
2541} 2760}
2542 2761
2543void 2762void
2544ev_prepare_stop (EV_P_ ev_prepare *w) 2763ev_prepare_stop (EV_P_ ev_prepare *w)
2545{ 2764{
2546 clear_pending (EV_A_ (W)w); 2765 clear_pending (EV_A_ (W)w);
2547 if (expect_false (!ev_is_active (w))) 2766 if (expect_false (!ev_is_active (w)))
2548 return; 2767 return;
2549 2768
2769 EV_FREQUENT_CHECK;
2770
2550 { 2771 {
2551 int active = ev_active (w); 2772 int active = ev_active (w);
2552 2773
2553 prepares [active - 1] = prepares [--preparecnt]; 2774 prepares [active - 1] = prepares [--preparecnt];
2554 ev_active (prepares [active - 1]) = active; 2775 ev_active (prepares [active - 1]) = active;
2555 } 2776 }
2556 2777
2557 ev_stop (EV_A_ (W)w); 2778 ev_stop (EV_A_ (W)w);
2779
2780 EV_FREQUENT_CHECK;
2558} 2781}
2559 2782
2560void 2783void
2561ev_check_start (EV_P_ ev_check *w) 2784ev_check_start (EV_P_ ev_check *w)
2562{ 2785{
2563 if (expect_false (ev_is_active (w))) 2786 if (expect_false (ev_is_active (w)))
2564 return; 2787 return;
2788
2789 EV_FREQUENT_CHECK;
2565 2790
2566 ev_start (EV_A_ (W)w, ++checkcnt); 2791 ev_start (EV_A_ (W)w, ++checkcnt);
2567 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2792 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2568 checks [checkcnt - 1] = w; 2793 checks [checkcnt - 1] = w;
2794
2795 EV_FREQUENT_CHECK;
2569} 2796}
2570 2797
2571void 2798void
2572ev_check_stop (EV_P_ ev_check *w) 2799ev_check_stop (EV_P_ ev_check *w)
2573{ 2800{
2574 clear_pending (EV_A_ (W)w); 2801 clear_pending (EV_A_ (W)w);
2575 if (expect_false (!ev_is_active (w))) 2802 if (expect_false (!ev_is_active (w)))
2576 return; 2803 return;
2577 2804
2805 EV_FREQUENT_CHECK;
2806
2578 { 2807 {
2579 int active = ev_active (w); 2808 int active = ev_active (w);
2580 2809
2581 checks [active - 1] = checks [--checkcnt]; 2810 checks [active - 1] = checks [--checkcnt];
2582 ev_active (checks [active - 1]) = active; 2811 ev_active (checks [active - 1]) = active;
2583 } 2812 }
2584 2813
2585 ev_stop (EV_A_ (W)w); 2814 ev_stop (EV_A_ (W)w);
2815
2816 EV_FREQUENT_CHECK;
2586} 2817}
2587 2818
2588#if EV_EMBED_ENABLE 2819#if EV_EMBED_ENABLE
2589void noinline 2820void noinline
2590ev_embed_sweep (EV_P_ ev_embed *w) 2821ev_embed_sweep (EV_P_ ev_embed *w)
… …
2617 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2848 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2618 } 2849 }
2619 } 2850 }
2620} 2851}
2621 2852
2853static void
2854embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2855{
2856 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2857
2858 {
2859 struct ev_loop *loop = w->other;
2860
2861 ev_loop_fork (EV_A);
2862 }
2863}
2864
2622#if 0 2865#if 0
2623static void 2866static void
2624embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2867embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2625{ 2868{
2626 ev_idle_stop (EV_A_ idle); 2869 ev_idle_stop (EV_A_ idle);
… …
2637 struct ev_loop *loop = w->other; 2880 struct ev_loop *loop = w->other;
2638 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2881 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2639 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2882 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2640 } 2883 }
2641 2884
2885 EV_FREQUENT_CHECK;
2886
2642 ev_set_priority (&w->io, ev_priority (w)); 2887 ev_set_priority (&w->io, ev_priority (w));
2643 ev_io_start (EV_A_ &w->io); 2888 ev_io_start (EV_A_ &w->io);
2644 2889
2645 ev_prepare_init (&w->prepare, embed_prepare_cb); 2890 ev_prepare_init (&w->prepare, embed_prepare_cb);
2646 ev_set_priority (&w->prepare, EV_MINPRI); 2891 ev_set_priority (&w->prepare, EV_MINPRI);
2647 ev_prepare_start (EV_A_ &w->prepare); 2892 ev_prepare_start (EV_A_ &w->prepare);
2648 2893
2894 ev_fork_init (&w->fork, embed_fork_cb);
2895 ev_fork_start (EV_A_ &w->fork);
2896
2649 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2897 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2650 2898
2651 ev_start (EV_A_ (W)w, 1); 2899 ev_start (EV_A_ (W)w, 1);
2900
2901 EV_FREQUENT_CHECK;
2652} 2902}
2653 2903
2654void 2904void
2655ev_embed_stop (EV_P_ ev_embed *w) 2905ev_embed_stop (EV_P_ ev_embed *w)
2656{ 2906{
2657 clear_pending (EV_A_ (W)w); 2907 clear_pending (EV_A_ (W)w);
2658 if (expect_false (!ev_is_active (w))) 2908 if (expect_false (!ev_is_active (w)))
2659 return; 2909 return;
2660 2910
2911 EV_FREQUENT_CHECK;
2912
2661 ev_io_stop (EV_A_ &w->io); 2913 ev_io_stop (EV_A_ &w->io);
2662 ev_prepare_stop (EV_A_ &w->prepare); 2914 ev_prepare_stop (EV_A_ &w->prepare);
2915 ev_fork_stop (EV_A_ &w->fork);
2663 2916
2664 ev_stop (EV_A_ (W)w); 2917 EV_FREQUENT_CHECK;
2665} 2918}
2666#endif 2919#endif
2667 2920
2668#if EV_FORK_ENABLE 2921#if EV_FORK_ENABLE
2669void 2922void
2670ev_fork_start (EV_P_ ev_fork *w) 2923ev_fork_start (EV_P_ ev_fork *w)
2671{ 2924{
2672 if (expect_false (ev_is_active (w))) 2925 if (expect_false (ev_is_active (w)))
2673 return; 2926 return;
2927
2928 EV_FREQUENT_CHECK;
2674 2929
2675 ev_start (EV_A_ (W)w, ++forkcnt); 2930 ev_start (EV_A_ (W)w, ++forkcnt);
2676 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2931 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2677 forks [forkcnt - 1] = w; 2932 forks [forkcnt - 1] = w;
2933
2934 EV_FREQUENT_CHECK;
2678} 2935}
2679 2936
2680void 2937void
2681ev_fork_stop (EV_P_ ev_fork *w) 2938ev_fork_stop (EV_P_ ev_fork *w)
2682{ 2939{
2683 clear_pending (EV_A_ (W)w); 2940 clear_pending (EV_A_ (W)w);
2684 if (expect_false (!ev_is_active (w))) 2941 if (expect_false (!ev_is_active (w)))
2685 return; 2942 return;
2686 2943
2944 EV_FREQUENT_CHECK;
2945
2687 { 2946 {
2688 int active = ev_active (w); 2947 int active = ev_active (w);
2689 2948
2690 forks [active - 1] = forks [--forkcnt]; 2949 forks [active - 1] = forks [--forkcnt];
2691 ev_active (forks [active - 1]) = active; 2950 ev_active (forks [active - 1]) = active;
2692 } 2951 }
2693 2952
2694 ev_stop (EV_A_ (W)w); 2953 ev_stop (EV_A_ (W)w);
2954
2955 EV_FREQUENT_CHECK;
2695} 2956}
2696#endif 2957#endif
2697 2958
2698#if EV_ASYNC_ENABLE 2959#if EV_ASYNC_ENABLE
2699void 2960void
… …
2701{ 2962{
2702 if (expect_false (ev_is_active (w))) 2963 if (expect_false (ev_is_active (w)))
2703 return; 2964 return;
2704 2965
2705 evpipe_init (EV_A); 2966 evpipe_init (EV_A);
2967
2968 EV_FREQUENT_CHECK;
2706 2969
2707 ev_start (EV_A_ (W)w, ++asynccnt); 2970 ev_start (EV_A_ (W)w, ++asynccnt);
2708 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2971 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2709 asyncs [asynccnt - 1] = w; 2972 asyncs [asynccnt - 1] = w;
2973
2974 EV_FREQUENT_CHECK;
2710} 2975}
2711 2976
2712void 2977void
2713ev_async_stop (EV_P_ ev_async *w) 2978ev_async_stop (EV_P_ ev_async *w)
2714{ 2979{
2715 clear_pending (EV_A_ (W)w); 2980 clear_pending (EV_A_ (W)w);
2716 if (expect_false (!ev_is_active (w))) 2981 if (expect_false (!ev_is_active (w)))
2717 return; 2982 return;
2718 2983
2984 EV_FREQUENT_CHECK;
2985
2719 { 2986 {
2720 int active = ev_active (w); 2987 int active = ev_active (w);
2721 2988
2722 asyncs [active - 1] = asyncs [--asynccnt]; 2989 asyncs [active - 1] = asyncs [--asynccnt];
2723 ev_active (asyncs [active - 1]) = active; 2990 ev_active (asyncs [active - 1]) = active;
2724 } 2991 }
2725 2992
2726 ev_stop (EV_A_ (W)w); 2993 ev_stop (EV_A_ (W)w);
2994
2995 EV_FREQUENT_CHECK;
2727} 2996}
2728 2997
2729void 2998void
2730ev_async_send (EV_P_ ev_async *w) 2999ev_async_send (EV_P_ ev_async *w)
2731{ 3000{
… …
2748once_cb (EV_P_ struct ev_once *once, int revents) 3017once_cb (EV_P_ struct ev_once *once, int revents)
2749{ 3018{
2750 void (*cb)(int revents, void *arg) = once->cb; 3019 void (*cb)(int revents, void *arg) = once->cb;
2751 void *arg = once->arg; 3020 void *arg = once->arg;
2752 3021
2753 ev_io_stop (EV_A_ &once->io); 3022 ev_io_stop (EV_A_ &once->io);
2754 ev_timer_stop (EV_A_ &once->to); 3023 ev_timer_stop (EV_A_ &once->to);
2755 ev_free (once); 3024 ev_free (once);
2756 3025
2757 cb (revents, arg); 3026 cb (revents, arg);
2758} 3027}
2759 3028
2760static void 3029static void
2761once_cb_io (EV_P_ ev_io *w, int revents) 3030once_cb_io (EV_P_ ev_io *w, int revents)
2762{ 3031{
2763 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3032 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3033
3034 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2764} 3035}
2765 3036
2766static void 3037static void
2767once_cb_to (EV_P_ ev_timer *w, int revents) 3038once_cb_to (EV_P_ ev_timer *w, int revents)
2768{ 3039{
2769 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3040 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3041
3042 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2770} 3043}
2771 3044
2772void 3045void
2773ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3046ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2774{ 3047{

Diff Legend

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