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

Comparing libev/ev.c (file contents):
Revision 1.214 by root, Tue Feb 19 19:21:20 2008 UTC vs.
Revision 1.240 by root, Thu May 8 21:21:41 2008 UTC

… …
39 39
40#ifdef __cplusplus 40#ifdef __cplusplus
41extern "C" { 41extern "C" {
42#endif 42#endif
43 43
44/* this big block deduces configuration from config.h */
44#ifndef EV_STANDALONE 45#ifndef EV_STANDALONE
45# ifdef EV_CONFIG_H 46# ifdef EV_CONFIG_H
46# include EV_CONFIG_H 47# include EV_CONFIG_H
47# else 48# else
48# include "config.h" 49# include "config.h"
… …
118# else 119# else
119# define EV_USE_INOTIFY 0 120# define EV_USE_INOTIFY 0
120# endif 121# endif
121# endif 122# endif
122 123
124# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1
127# else
128# define EV_USE_EVENTFD 0
129# endif
130# endif
131
123#endif 132#endif
124 133
125#include <math.h> 134#include <math.h>
126#include <stdlib.h> 135#include <stdlib.h>
127#include <fcntl.h> 136#include <fcntl.h>
… …
152# ifndef EV_SELECT_IS_WINSOCKET 161# ifndef EV_SELECT_IS_WINSOCKET
153# define EV_SELECT_IS_WINSOCKET 1 162# define EV_SELECT_IS_WINSOCKET 1
154# endif 163# endif
155#endif 164#endif
156 165
157/**/ 166/* this block tries to deduce configuration from header-defined symbols and defaults */
158 167
159#ifndef EV_USE_MONOTONIC 168#ifndef EV_USE_MONOTONIC
160# define EV_USE_MONOTONIC 0 169# define EV_USE_MONOTONIC 0
161#endif 170#endif
162 171
… …
179# define EV_USE_POLL 1 188# define EV_USE_POLL 1
180# endif 189# endif
181#endif 190#endif
182 191
183#ifndef EV_USE_EPOLL 192#ifndef EV_USE_EPOLL
193# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
194# define EV_USE_EPOLL 1
195# else
184# define EV_USE_EPOLL 0 196# define EV_USE_EPOLL 0
197# endif
185#endif 198#endif
186 199
187#ifndef EV_USE_KQUEUE 200#ifndef EV_USE_KQUEUE
188# define EV_USE_KQUEUE 0 201# define EV_USE_KQUEUE 0
189#endif 202#endif
… …
191#ifndef EV_USE_PORT 204#ifndef EV_USE_PORT
192# define EV_USE_PORT 0 205# define EV_USE_PORT 0
193#endif 206#endif
194 207
195#ifndef EV_USE_INOTIFY 208#ifndef EV_USE_INOTIFY
209# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
210# define EV_USE_INOTIFY 1
211# else
196# define EV_USE_INOTIFY 0 212# define EV_USE_INOTIFY 0
213# endif
197#endif 214#endif
198 215
199#ifndef EV_PID_HASHSIZE 216#ifndef EV_PID_HASHSIZE
200# if EV_MINIMAL 217# if EV_MINIMAL
201# define EV_PID_HASHSIZE 1 218# define EV_PID_HASHSIZE 1
… …
210# else 227# else
211# define EV_INOTIFY_HASHSIZE 16 228# define EV_INOTIFY_HASHSIZE 16
212# endif 229# endif
213#endif 230#endif
214 231
215/**/ 232#ifndef EV_USE_EVENTFD
233# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
234# define EV_USE_EVENTFD 1
235# else
236# define EV_USE_EVENTFD 0
237# endif
238#endif
239
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */
216 241
217#ifndef CLOCK_MONOTONIC 242#ifndef CLOCK_MONOTONIC
218# undef EV_USE_MONOTONIC 243# undef EV_USE_MONOTONIC
219# define EV_USE_MONOTONIC 0 244# define EV_USE_MONOTONIC 0
220#endif 245#endif
… …
239# include <sys/inotify.h> 264# include <sys/inotify.h>
240#endif 265#endif
241 266
242#if EV_SELECT_IS_WINSOCKET 267#if EV_SELECT_IS_WINSOCKET
243# include <winsock.h> 268# include <winsock.h>
269#endif
270
271#if EV_USE_EVENTFD
272/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
273# include <stdint.h>
274# ifdef __cplusplus
275extern "C" {
276# endif
277int eventfd (unsigned int initval, int flags);
278# ifdef __cplusplus
279}
280# endif
244#endif 281#endif
245 282
246/**/ 283/**/
247 284
248/* 285/*
… …
263# define expect(expr,value) __builtin_expect ((expr),(value)) 300# define expect(expr,value) __builtin_expect ((expr),(value))
264# define noinline __attribute__ ((noinline)) 301# define noinline __attribute__ ((noinline))
265#else 302#else
266# define expect(expr,value) (expr) 303# define expect(expr,value) (expr)
267# define noinline 304# define noinline
268# if __STDC_VERSION__ < 199901L 305# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
269# define inline 306# define inline
270# endif 307# endif
271#endif 308#endif
272 309
273#define expect_false(expr) expect ((expr) != 0, 0) 310#define expect_false(expr) expect ((expr) != 0, 0)
… …
288 325
289typedef ev_watcher *W; 326typedef ev_watcher *W;
290typedef ev_watcher_list *WL; 327typedef ev_watcher_list *WL;
291typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
292 329
330#define ev_active(w) ((W)(w))->active
331#define ev_at(w) ((WT)(w))->at
332
293#if EV_USE_MONOTONIC 333#if EV_USE_MONOTONIC
294/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 334/* sig_atomic_t is used to avoid per-thread variables or locking but still */
295/* giving it a reasonably high chance of working on typical architetcures */ 335/* giving it a reasonably high chance of working on typical architetcures */
296static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 336static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
297#endif 337#endif
… …
323 perror (msg); 363 perror (msg);
324 abort (); 364 abort ();
325 } 365 }
326} 366}
327 367
368static void *
369ev_realloc_emul (void *ptr, long size)
370{
371 /* some systems, notably openbsd and darwin, fail to properly
372 * implement realloc (x, 0) (as required by both ansi c-98 and
373 * the single unix specification, so work around them here.
374 */
375
376 if (size)
377 return realloc (ptr, size);
378
379 free (ptr);
380 return 0;
381}
382
328static void *(*alloc)(void *ptr, long size); 383static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
329 384
330void 385void
331ev_set_allocator (void *(*cb)(void *ptr, long size)) 386ev_set_allocator (void *(*cb)(void *ptr, long size))
332{ 387{
333 alloc = cb; 388 alloc = cb;
334} 389}
335 390
336inline_speed void * 391inline_speed void *
337ev_realloc (void *ptr, long size) 392ev_realloc (void *ptr, long size)
338{ 393{
339 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 394 ptr = alloc (ptr, size);
340 395
341 if (!ptr && size) 396 if (!ptr && size)
342 { 397 {
343 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 398 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
344 abort (); 399 abort ();
… …
451 ts.tv_sec = (time_t)delay; 506 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 507 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453 508
454 nanosleep (&ts, 0); 509 nanosleep (&ts, 0);
455#elif defined(_WIN32) 510#elif defined(_WIN32)
456 Sleep (delay * 1e3); 511 Sleep ((unsigned long)(delay * 1e3));
457#else 512#else
458 struct timeval tv; 513 struct timeval tv;
459 514
460 tv.tv_sec = (time_t)delay; 515 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 516 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
464#endif 519#endif
465 } 520 }
466} 521}
467 522
468/*****************************************************************************/ 523/*****************************************************************************/
524
525#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
469 526
470int inline_size 527int inline_size
471array_nextsize (int elem, int cur, int cnt) 528array_nextsize (int elem, int cur, int cnt)
472{ 529{
473 int ncur = cur + 1; 530 int ncur = cur + 1;
474 531
475 do 532 do
476 ncur <<= 1; 533 ncur <<= 1;
477 while (cnt > ncur); 534 while (cnt > ncur);
478 535
479 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 536 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
480 if (elem * ncur > 4096) 537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
481 { 538 {
482 ncur *= elem; 539 ncur *= elem;
483 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
484 ncur = ncur - sizeof (void *) * 4; 541 ncur = ncur - sizeof (void *) * 4;
485 ncur /= elem; 542 ncur /= elem;
486 } 543 }
487 544
488 return ncur; 545 return ncur;
… …
702 } 759 }
703} 760}
704 761
705/*****************************************************************************/ 762/*****************************************************************************/
706 763
764/*
765 * at the moment we allow libev the luxury of two heaps,
766 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
767 * which is more cache-efficient.
768 * the difference is about 5% with 50000+ watchers.
769 */
770#define USE_4HEAP !EV_MINIMAL
771#if USE_4HEAP
772
773#define DHEAP 4
774#define HEAP0 (DHEAP - 1) /* index of first element in heap */
775
776/* towards the root */
707void inline_speed 777void inline_speed
708upheap (WT *heap, int k) 778upheap (WT *heap, int k)
709{ 779{
710 WT w = heap [k]; 780 WT w = heap [k];
781 ev_tstamp w_at = w->at;
711 782
712 while (k) 783 for (;;)
713 { 784 {
714 int p = (k - 1) >> 1; 785 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
715 786
716 if (heap [p]->at <= w->at) 787 if (p == k || heap [p]->at <= w_at)
717 break; 788 break;
718 789
719 heap [k] = heap [p]; 790 heap [k] = heap [p];
720 ((W)heap [k])->active = k + 1; 791 ev_active (heap [k]) = k;
721 k = p; 792 k = p;
722 } 793 }
723 794
724 heap [k] = w; 795 heap [k] = w;
725 ((W)heap [k])->active = k + 1; 796 ev_active (heap [k]) = k;
726} 797}
727 798
799/* away from the root */
728void inline_speed 800void inline_speed
729downheap (WT *heap, int N, int k) 801downheap (WT *heap, int N, int k)
730{ 802{
731 WT w = heap [k]; 803 WT w = heap [k];
804 WT *E = heap + N + HEAP0;
732 805
733 for (;;) 806 for (;;)
734 { 807 {
808 ev_tstamp minat;
809 WT *minpos;
810 WT *pos = heap + DHEAP * (k - HEAP0) + HEAP0;
811
812 // find minimum child
813 if (expect_true (pos + DHEAP - 1 < E))
814 {
815 /* fast path */ (minpos = pos + 0), (minat = (*minpos)->at);
816 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
817 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
818 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
819 }
820 else if (pos < E)
821 {
822 /* slow path */ (minpos = pos + 0), (minat = (*minpos)->at);
823 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
824 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
825 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
826 }
827 else
828 break;
829
830 if (w->at <= minat)
831 break;
832
833 ev_active (*minpos) = k;
834 heap [k] = *minpos;
835
836 k = minpos - heap;
837 }
838
839 heap [k] = w;
840 ev_active (heap [k]) = k;
841}
842
843#else // 4HEAP
844
845#define HEAP0 1
846
847/* towards the root */
848void inline_speed
849upheap (WT *heap, int k)
850{
851 WT w = heap [k];
852
853 for (;;)
854 {
855 int p = k >> 1;
856
857 /* maybe we could use a dummy element at heap [0]? */
858 if (!p || heap [p]->at <= w->at)
859 break;
860
861 heap [k] = heap [p];
862 ev_active (heap [k]) = k;
863 k = p;
864 }
865
866 heap [k] = w;
867 ev_active (heap [k]) = k;
868}
869
870/* away from the root */
871void inline_speed
872downheap (WT *heap, int N, int k)
873{
874 WT w = heap [k];
875
876 for (;;)
877 {
735 int c = (k << 1) + 1; 878 int c = k << 1;
736 879
737 if (c >= N) 880 if (c > N)
738 break; 881 break;
739 882
740 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 883 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
741 ? 1 : 0; 884 ? 1 : 0;
742 885
743 if (w->at <= heap [c]->at) 886 if (w->at <= heap [c]->at)
744 break; 887 break;
745 888
746 heap [k] = heap [c]; 889 heap [k] = heap [c];
747 ((W)heap [k])->active = k + 1; 890 ((W)heap [k])->active = k;
748 891
749 k = c; 892 k = c;
750 } 893 }
751 894
752 heap [k] = w; 895 heap [k] = w;
753 ((W)heap [k])->active = k + 1; 896 ev_active (heap [k]) = k;
754} 897}
898#endif
755 899
756void inline_size 900void inline_size
757adjustheap (WT *heap, int N, int k) 901adjustheap (WT *heap, int N, int k)
758{ 902{
759 upheap (heap, k); 903 upheap (heap, k);
… …
802static void noinline 946static void noinline
803evpipe_init (EV_P) 947evpipe_init (EV_P)
804{ 948{
805 if (!ev_is_active (&pipeev)) 949 if (!ev_is_active (&pipeev))
806 { 950 {
951#if EV_USE_EVENTFD
952 if ((evfd = eventfd (0, 0)) >= 0)
953 {
954 evpipe [0] = -1;
955 fd_intern (evfd);
956 ev_io_set (&pipeev, evfd, EV_READ);
957 }
958 else
959#endif
960 {
807 while (pipe (evpipe)) 961 while (pipe (evpipe))
808 syserr ("(libev) error creating signal/async pipe"); 962 syserr ("(libev) error creating signal/async pipe");
809 963
810 fd_intern (evpipe [0]); 964 fd_intern (evpipe [0]);
811 fd_intern (evpipe [1]); 965 fd_intern (evpipe [1]);
812
813 ev_io_set (&pipeev, evpipe [0], EV_READ); 966 ev_io_set (&pipeev, evpipe [0], EV_READ);
967 }
968
814 ev_io_start (EV_A_ &pipeev); 969 ev_io_start (EV_A_ &pipeev);
815 ev_unref (EV_A); /* watcher should not keep loop alive */ 970 ev_unref (EV_A); /* watcher should not keep loop alive */
816 } 971 }
817} 972}
818 973
819void inline_size 974void inline_size
820evpipe_write (EV_P_ EV_ATOMIC_T *flag) 975evpipe_write (EV_P_ EV_ATOMIC_T *flag)
821{ 976{
822 if (!*flag) 977 if (!*flag)
823 { 978 {
824 int old_errno = errno; /* save errno becaue write might clobber it */ 979 int old_errno = errno; /* save errno because write might clobber it */
825 980
826 *flag = 1; 981 *flag = 1;
982
983#if EV_USE_EVENTFD
984 if (evfd >= 0)
985 {
986 uint64_t counter = 1;
987 write (evfd, &counter, sizeof (uint64_t));
988 }
989 else
990#endif
827 write (evpipe [1], &old_errno, 1); 991 write (evpipe [1], &old_errno, 1);
828 992
829 errno = old_errno; 993 errno = old_errno;
830 } 994 }
831} 995}
832 996
833static void 997static void
834pipecb (EV_P_ ev_io *iow, int revents) 998pipecb (EV_P_ ev_io *iow, int revents)
835{ 999{
1000#if EV_USE_EVENTFD
1001 if (evfd >= 0)
836 { 1002 {
837 int dummy; 1003 uint64_t counter;
1004 read (evfd, &counter, sizeof (uint64_t));
1005 }
1006 else
1007#endif
1008 {
1009 char dummy;
838 read (evpipe [0], &dummy, 1); 1010 read (evpipe [0], &dummy, 1);
839 } 1011 }
840 1012
841 if (gotsig && ev_is_default_loop (EV_A)) 1013 if (gotsig && ev_is_default_loop (EV_A))
842 { 1014 {
843 int signum; 1015 int signum;
844 gotsig = 0; 1016 gotsig = 0;
… …
865} 1037}
866 1038
867/*****************************************************************************/ 1039/*****************************************************************************/
868 1040
869static void 1041static void
870sighandler (int signum) 1042ev_sighandler (int signum)
871{ 1043{
872#if EV_MULTIPLICITY 1044#if EV_MULTIPLICITY
873 struct ev_loop *loop = &default_loop_struct; 1045 struct ev_loop *loop = &default_loop_struct;
874#endif 1046#endif
875 1047
876#if _WIN32 1048#if _WIN32
877 signal (signum, sighandler); 1049 signal (signum, ev_sighandler);
878#endif 1050#endif
879 1051
880 signals [signum - 1].gotsig = 1; 1052 signals [signum - 1].gotsig = 1;
881 evpipe_write (EV_A_ &gotsig); 1053 evpipe_write (EV_A_ &gotsig);
882} 1054}
… …
912#ifndef WIFCONTINUED 1084#ifndef WIFCONTINUED
913# define WIFCONTINUED(status) 0 1085# define WIFCONTINUED(status) 0
914#endif 1086#endif
915 1087
916void inline_speed 1088void inline_speed
917child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1089child_reap (EV_P_ int chain, int pid, int status)
918{ 1090{
919 ev_child *w; 1091 ev_child *w;
920 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1092 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
921 1093
922 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1094 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
923 { 1095 {
924 if ((w->pid == pid || !w->pid) 1096 if ((w->pid == pid || !w->pid)
925 && (!traced || (w->flags & 1))) 1097 && (!traced || (w->flags & 1)))
926 { 1098 {
927 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1099 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
928 w->rpid = pid; 1100 w->rpid = pid;
929 w->rstatus = status; 1101 w->rstatus = status;
930 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1102 ev_feed_event (EV_A_ (W)w, EV_CHILD);
931 } 1103 }
932 } 1104 }
… …
946 if (!WCONTINUED 1118 if (!WCONTINUED
947 || errno != EINVAL 1119 || errno != EINVAL
948 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1120 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
949 return; 1121 return;
950 1122
951 /* make sure we are called again until all childs have been reaped */ 1123 /* make sure we are called again until all children have been reaped */
952 /* we need to do it this way so that the callback gets called before we continue */ 1124 /* we need to do it this way so that the callback gets called before we continue */
953 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1125 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
954 1126
955 child_reap (EV_A_ sw, pid, pid, status); 1127 child_reap (EV_A_ pid, pid, status);
956 if (EV_PID_HASHSIZE > 1) 1128 if (EV_PID_HASHSIZE > 1)
957 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1129 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
958} 1130}
959 1131
960#endif 1132#endif
961 1133
962/*****************************************************************************/ 1134/*****************************************************************************/
… …
1105 if (!(flags & EVFLAG_NOENV) 1277 if (!(flags & EVFLAG_NOENV)
1106 && !enable_secure () 1278 && !enable_secure ()
1107 && getenv ("LIBEV_FLAGS")) 1279 && getenv ("LIBEV_FLAGS"))
1108 flags = atoi (getenv ("LIBEV_FLAGS")); 1280 flags = atoi (getenv ("LIBEV_FLAGS"));
1109 1281
1110 if (!(flags & 0x0000ffffUL)) 1282 if (!(flags & 0x0000ffffU))
1111 flags |= ev_recommended_backends (); 1283 flags |= ev_recommended_backends ();
1112 1284
1113#if EV_USE_PORT 1285#if EV_USE_PORT
1114 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1286 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1115#endif 1287#endif
… …
1139 if (ev_is_active (&pipeev)) 1311 if (ev_is_active (&pipeev))
1140 { 1312 {
1141 ev_ref (EV_A); /* signal watcher */ 1313 ev_ref (EV_A); /* signal watcher */
1142 ev_io_stop (EV_A_ &pipeev); 1314 ev_io_stop (EV_A_ &pipeev);
1143 1315
1144 close (evpipe [0]); evpipe [0] = 0; 1316#if EV_USE_EVENTFD
1145 close (evpipe [1]); evpipe [1] = 0; 1317 if (evfd >= 0)
1318 close (evfd);
1319#endif
1320
1321 if (evpipe [0] >= 0)
1322 {
1323 close (evpipe [0]);
1324 close (evpipe [1]);
1325 }
1146 } 1326 }
1147 1327
1148#if EV_USE_INOTIFY 1328#if EV_USE_INOTIFY
1149 if (fs_fd >= 0) 1329 if (fs_fd >= 0)
1150 close (fs_fd); 1330 close (fs_fd);
… …
1195#endif 1375#endif
1196 1376
1197 backend = 0; 1377 backend = 0;
1198} 1378}
1199 1379
1380#if EV_USE_INOTIFY
1200void inline_size infy_fork (EV_P); 1381void inline_size infy_fork (EV_P);
1382#endif
1201 1383
1202void inline_size 1384void inline_size
1203loop_fork (EV_P) 1385loop_fork (EV_P)
1204{ 1386{
1205#if EV_USE_PORT 1387#if EV_USE_PORT
… …
1224 gotasync = 1; 1406 gotasync = 1;
1225#endif 1407#endif
1226 1408
1227 ev_ref (EV_A); 1409 ev_ref (EV_A);
1228 ev_io_stop (EV_A_ &pipeev); 1410 ev_io_stop (EV_A_ &pipeev);
1411
1412#if EV_USE_EVENTFD
1413 if (evfd >= 0)
1414 close (evfd);
1415#endif
1416
1417 if (evpipe [0] >= 0)
1418 {
1229 close (evpipe [0]); 1419 close (evpipe [0]);
1230 close (evpipe [1]); 1420 close (evpipe [1]);
1421 }
1231 1422
1232 evpipe_init (EV_A); 1423 evpipe_init (EV_A);
1233 /* now iterate over everything, in case we missed something */ 1424 /* now iterate over everything, in case we missed something */
1234 pipecb (EV_A_ &pipeev, EV_READ); 1425 pipecb (EV_A_ &pipeev, EV_READ);
1235 } 1426 }
… …
1263void 1454void
1264ev_loop_fork (EV_P) 1455ev_loop_fork (EV_P)
1265{ 1456{
1266 postfork = 1; /* must be in line with ev_default_fork */ 1457 postfork = 1; /* must be in line with ev_default_fork */
1267} 1458}
1268
1269#endif 1459#endif
1270 1460
1271#if EV_MULTIPLICITY 1461#if EV_MULTIPLICITY
1272struct ev_loop * 1462struct ev_loop *
1273ev_default_loop_init (unsigned int flags) 1463ev_default_loop_init (unsigned int flags)
… …
1354 EV_CB_INVOKE (p->w, p->events); 1544 EV_CB_INVOKE (p->w, p->events);
1355 } 1545 }
1356 } 1546 }
1357} 1547}
1358 1548
1359void inline_size
1360timers_reify (EV_P)
1361{
1362 while (timercnt && ((WT)timers [0])->at <= mn_now)
1363 {
1364 ev_timer *w = (ev_timer *)timers [0];
1365
1366 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1367
1368 /* first reschedule or stop timer */
1369 if (w->repeat)
1370 {
1371 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1372
1373 ((WT)w)->at += w->repeat;
1374 if (((WT)w)->at < mn_now)
1375 ((WT)w)->at = mn_now;
1376
1377 downheap (timers, timercnt, 0);
1378 }
1379 else
1380 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1381
1382 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1383 }
1384}
1385
1386#if EV_PERIODIC_ENABLE
1387void inline_size
1388periodics_reify (EV_P)
1389{
1390 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1391 {
1392 ev_periodic *w = (ev_periodic *)periodics [0];
1393
1394 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1395
1396 /* first reschedule or stop timer */
1397 if (w->reschedule_cb)
1398 {
1399 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1400 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1401 downheap (periodics, periodiccnt, 0);
1402 }
1403 else if (w->interval)
1404 {
1405 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1406 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1407 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1408 downheap (periodics, periodiccnt, 0);
1409 }
1410 else
1411 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1412
1413 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1414 }
1415}
1416
1417static void noinline
1418periodics_reschedule (EV_P)
1419{
1420 int i;
1421
1422 /* adjust periodics after time jump */
1423 for (i = 0; i < periodiccnt; ++i)
1424 {
1425 ev_periodic *w = (ev_periodic *)periodics [i];
1426
1427 if (w->reschedule_cb)
1428 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1429 else if (w->interval)
1430 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1431 }
1432
1433 /* now rebuild the heap */
1434 for (i = periodiccnt >> 1; i--; )
1435 downheap (periodics, periodiccnt, i);
1436}
1437#endif
1438
1439#if EV_IDLE_ENABLE 1549#if EV_IDLE_ENABLE
1440void inline_size 1550void inline_size
1441idle_reify (EV_P) 1551idle_reify (EV_P)
1442{ 1552{
1443 if (expect_false (idleall)) 1553 if (expect_false (idleall))
… …
1454 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1564 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1455 break; 1565 break;
1456 } 1566 }
1457 } 1567 }
1458 } 1568 }
1569}
1570#endif
1571
1572void inline_size
1573timers_reify (EV_P)
1574{
1575 while (timercnt && ev_at (timers [HEAP0]) <= mn_now)
1576 {
1577 ev_timer *w = (ev_timer *)timers [HEAP0];
1578
1579 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1580
1581 /* first reschedule or stop timer */
1582 if (w->repeat)
1583 {
1584 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1585
1586 ev_at (w) += w->repeat;
1587 if (ev_at (w) < mn_now)
1588 ev_at (w) = mn_now;
1589
1590 downheap (timers, timercnt, HEAP0);
1591 }
1592 else
1593 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1594
1595 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1596 }
1597}
1598
1599#if EV_PERIODIC_ENABLE
1600void inline_size
1601periodics_reify (EV_P)
1602{
1603 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now)
1604 {
1605 ev_periodic *w = (ev_periodic *)periodics [HEAP0];
1606
1607 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1608
1609 /* first reschedule or stop timer */
1610 if (w->reschedule_cb)
1611 {
1612 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1613 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1614 downheap (periodics, periodiccnt, 1);
1615 }
1616 else if (w->interval)
1617 {
1618 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1619 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1620 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1621 downheap (periodics, periodiccnt, HEAP0);
1622 }
1623 else
1624 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1625
1626 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1627 }
1628}
1629
1630static void noinline
1631periodics_reschedule (EV_P)
1632{
1633 int i;
1634
1635 /* adjust periodics after time jump */
1636 for (i = 1; i <= periodiccnt; ++i)
1637 {
1638 ev_periodic *w = (ev_periodic *)periodics [i];
1639
1640 if (w->reschedule_cb)
1641 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1642 else if (w->interval)
1643 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1644 }
1645
1646 /* now rebuild the heap */
1647 for (i = periodiccnt >> 1; --i; )
1648 downheap (periodics, periodiccnt, i + HEAP0);
1459} 1649}
1460#endif 1650#endif
1461 1651
1462void inline_speed 1652void inline_speed
1463time_update (EV_P_ ev_tstamp max_block) 1653time_update (EV_P_ ev_tstamp max_block)
… …
1492 */ 1682 */
1493 for (i = 4; --i; ) 1683 for (i = 4; --i; )
1494 { 1684 {
1495 rtmn_diff = ev_rt_now - mn_now; 1685 rtmn_diff = ev_rt_now - mn_now;
1496 1686
1497 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1687 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1498 return; /* all is well */ 1688 return; /* all is well */
1499 1689
1500 ev_rt_now = ev_time (); 1690 ev_rt_now = ev_time ();
1501 mn_now = get_clock (); 1691 mn_now = get_clock ();
1502 now_floor = mn_now; 1692 now_floor = mn_now;
… …
1517 { 1707 {
1518#if EV_PERIODIC_ENABLE 1708#if EV_PERIODIC_ENABLE
1519 periodics_reschedule (EV_A); 1709 periodics_reschedule (EV_A);
1520#endif 1710#endif
1521 /* adjust timers. this is easy, as the offset is the same for all of them */ 1711 /* adjust timers. this is easy, as the offset is the same for all of them */
1522 for (i = 0; i < timercnt; ++i) 1712 for (i = 1; i <= timercnt; ++i)
1523 ((WT)timers [i])->at += ev_rt_now - mn_now; 1713 ev_at (timers [i]) += ev_rt_now - mn_now;
1524 } 1714 }
1525 1715
1526 mn_now = ev_rt_now; 1716 mn_now = ev_rt_now;
1527 } 1717 }
1528} 1718}
… …
1542static int loop_done; 1732static int loop_done;
1543 1733
1544void 1734void
1545ev_loop (EV_P_ int flags) 1735ev_loop (EV_P_ int flags)
1546{ 1736{
1547 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1737 loop_done = EVUNLOOP_CANCEL;
1548 ? EVUNLOOP_ONE
1549 : EVUNLOOP_CANCEL;
1550 1738
1551 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1739 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1552 1740
1553 do 1741 do
1554 { 1742 {
… …
1600 1788
1601 waittime = MAX_BLOCKTIME; 1789 waittime = MAX_BLOCKTIME;
1602 1790
1603 if (timercnt) 1791 if (timercnt)
1604 { 1792 {
1605 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1793 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1606 if (waittime > to) waittime = to; 1794 if (waittime > to) waittime = to;
1607 } 1795 }
1608 1796
1609#if EV_PERIODIC_ENABLE 1797#if EV_PERIODIC_ENABLE
1610 if (periodiccnt) 1798 if (periodiccnt)
1611 { 1799 {
1612 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1800 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1613 if (waittime > to) waittime = to; 1801 if (waittime > to) waittime = to;
1614 } 1802 }
1615#endif 1803#endif
1616 1804
1617 if (expect_false (waittime < timeout_blocktime)) 1805 if (expect_false (waittime < timeout_blocktime))
… …
1650 /* queue check watchers, to be executed first */ 1838 /* queue check watchers, to be executed first */
1651 if (expect_false (checkcnt)) 1839 if (expect_false (checkcnt))
1652 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1840 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1653 1841
1654 call_pending (EV_A); 1842 call_pending (EV_A);
1655
1656 } 1843 }
1657 while (expect_true (activecnt && !loop_done)); 1844 while (expect_true (
1845 activecnt
1846 && !loop_done
1847 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1848 ));
1658 1849
1659 if (loop_done == EVUNLOOP_ONE) 1850 if (loop_done == EVUNLOOP_ONE)
1660 loop_done = EVUNLOOP_CANCEL; 1851 loop_done = EVUNLOOP_CANCEL;
1661} 1852}
1662 1853
… …
1780ev_timer_start (EV_P_ ev_timer *w) 1971ev_timer_start (EV_P_ ev_timer *w)
1781{ 1972{
1782 if (expect_false (ev_is_active (w))) 1973 if (expect_false (ev_is_active (w)))
1783 return; 1974 return;
1784 1975
1785 ((WT)w)->at += mn_now; 1976 ev_at (w) += mn_now;
1786 1977
1787 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1978 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1788 1979
1789 ev_start (EV_A_ (W)w, ++timercnt); 1980 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1790 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1981 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1791 timers [timercnt - 1] = (WT)w; 1982 timers [ev_active (w)] = (WT)w;
1792 upheap (timers, timercnt - 1); 1983 upheap (timers, ev_active (w));
1793 1984
1794 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1985 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1795} 1986}
1796 1987
1797void noinline 1988void noinline
1798ev_timer_stop (EV_P_ ev_timer *w) 1989ev_timer_stop (EV_P_ ev_timer *w)
1799{ 1990{
1800 clear_pending (EV_A_ (W)w); 1991 clear_pending (EV_A_ (W)w);
1801 if (expect_false (!ev_is_active (w))) 1992 if (expect_false (!ev_is_active (w)))
1802 return; 1993 return;
1803 1994
1804 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1805
1806 { 1995 {
1807 int active = ((W)w)->active; 1996 int active = ev_active (w);
1808 1997
1998 assert (("internal timer heap corruption", timers [active] == (WT)w));
1999
1809 if (expect_true (--active < --timercnt)) 2000 if (expect_true (active < timercnt + HEAP0 - 1))
1810 { 2001 {
1811 timers [active] = timers [timercnt]; 2002 timers [active] = timers [timercnt + HEAP0 - 1];
1812 adjustheap (timers, timercnt, active); 2003 adjustheap (timers, timercnt, active);
1813 } 2004 }
2005
2006 --timercnt;
1814 } 2007 }
1815 2008
1816 ((WT)w)->at -= mn_now; 2009 ev_at (w) -= mn_now;
1817 2010
1818 ev_stop (EV_A_ (W)w); 2011 ev_stop (EV_A_ (W)w);
1819} 2012}
1820 2013
1821void noinline 2014void noinline
… …
1823{ 2016{
1824 if (ev_is_active (w)) 2017 if (ev_is_active (w))
1825 { 2018 {
1826 if (w->repeat) 2019 if (w->repeat)
1827 { 2020 {
1828 ((WT)w)->at = mn_now + w->repeat; 2021 ev_at (w) = mn_now + w->repeat;
1829 adjustheap (timers, timercnt, ((W)w)->active - 1); 2022 adjustheap (timers, timercnt, ev_active (w));
1830 } 2023 }
1831 else 2024 else
1832 ev_timer_stop (EV_A_ w); 2025 ev_timer_stop (EV_A_ w);
1833 } 2026 }
1834 else if (w->repeat) 2027 else if (w->repeat)
1835 { 2028 {
1836 w->at = w->repeat; 2029 ev_at (w) = w->repeat;
1837 ev_timer_start (EV_A_ w); 2030 ev_timer_start (EV_A_ w);
1838 } 2031 }
1839} 2032}
1840 2033
1841#if EV_PERIODIC_ENABLE 2034#if EV_PERIODIC_ENABLE
… …
1844{ 2037{
1845 if (expect_false (ev_is_active (w))) 2038 if (expect_false (ev_is_active (w)))
1846 return; 2039 return;
1847 2040
1848 if (w->reschedule_cb) 2041 if (w->reschedule_cb)
1849 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2042 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1850 else if (w->interval) 2043 else if (w->interval)
1851 { 2044 {
1852 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2045 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1853 /* this formula differs from the one in periodic_reify because we do not always round up */ 2046 /* this formula differs from the one in periodic_reify because we do not always round up */
1854 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2047 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1855 } 2048 }
1856 else 2049 else
1857 ((WT)w)->at = w->offset; 2050 ev_at (w) = w->offset;
1858 2051
1859 ev_start (EV_A_ (W)w, ++periodiccnt); 2052 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1860 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2053 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1861 periodics [periodiccnt - 1] = (WT)w; 2054 periodics [ev_active (w)] = (WT)w;
1862 upheap (periodics, periodiccnt - 1); 2055 upheap (periodics, ev_active (w));
1863 2056
1864 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2057 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1865} 2058}
1866 2059
1867void noinline 2060void noinline
1868ev_periodic_stop (EV_P_ ev_periodic *w) 2061ev_periodic_stop (EV_P_ ev_periodic *w)
1869{ 2062{
1870 clear_pending (EV_A_ (W)w); 2063 clear_pending (EV_A_ (W)w);
1871 if (expect_false (!ev_is_active (w))) 2064 if (expect_false (!ev_is_active (w)))
1872 return; 2065 return;
1873 2066
1874 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1875
1876 { 2067 {
1877 int active = ((W)w)->active; 2068 int active = ev_active (w);
1878 2069
2070 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
2071
1879 if (expect_true (--active < --periodiccnt)) 2072 if (expect_true (active < periodiccnt + HEAP0 - 1))
1880 { 2073 {
1881 periodics [active] = periodics [periodiccnt]; 2074 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1882 adjustheap (periodics, periodiccnt, active); 2075 adjustheap (periodics, periodiccnt, active);
1883 } 2076 }
2077
2078 --periodiccnt;
1884 } 2079 }
1885 2080
1886 ev_stop (EV_A_ (W)w); 2081 ev_stop (EV_A_ (W)w);
1887} 2082}
1888 2083
… …
1930 wlist_add (&signals [w->signum - 1].head, (WL)w); 2125 wlist_add (&signals [w->signum - 1].head, (WL)w);
1931 2126
1932 if (!((WL)w)->next) 2127 if (!((WL)w)->next)
1933 { 2128 {
1934#if _WIN32 2129#if _WIN32
1935 signal (w->signum, sighandler); 2130 signal (w->signum, ev_sighandler);
1936#else 2131#else
1937 struct sigaction sa; 2132 struct sigaction sa;
1938 sa.sa_handler = sighandler; 2133 sa.sa_handler = ev_sighandler;
1939 sigfillset (&sa.sa_mask); 2134 sigfillset (&sa.sa_mask);
1940 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2135 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1941 sigaction (w->signum, &sa, 0); 2136 sigaction (w->signum, &sa, 0);
1942#endif 2137#endif
1943 } 2138 }
… …
2004 if (w->wd < 0) 2199 if (w->wd < 0)
2005 { 2200 {
2006 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2201 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2007 2202
2008 /* monitor some parent directory for speedup hints */ 2203 /* monitor some parent directory for speedup hints */
2204 /* note that exceeding the hardcoded limit is not a correctness issue, */
2205 /* but an efficiency issue only */
2009 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2206 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2010 { 2207 {
2011 char path [4096]; 2208 char path [4096];
2012 strcpy (path, w->path); 2209 strcpy (path, w->path);
2013 2210
… …
2258 clear_pending (EV_A_ (W)w); 2455 clear_pending (EV_A_ (W)w);
2259 if (expect_false (!ev_is_active (w))) 2456 if (expect_false (!ev_is_active (w)))
2260 return; 2457 return;
2261 2458
2262 { 2459 {
2263 int active = ((W)w)->active; 2460 int active = ev_active (w);
2264 2461
2265 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2462 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2266 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2463 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2267 2464
2268 ev_stop (EV_A_ (W)w); 2465 ev_stop (EV_A_ (W)w);
2269 --idleall; 2466 --idleall;
2270 } 2467 }
2271} 2468}
… …
2288 clear_pending (EV_A_ (W)w); 2485 clear_pending (EV_A_ (W)w);
2289 if (expect_false (!ev_is_active (w))) 2486 if (expect_false (!ev_is_active (w)))
2290 return; 2487 return;
2291 2488
2292 { 2489 {
2293 int active = ((W)w)->active; 2490 int active = ev_active (w);
2491
2294 prepares [active - 1] = prepares [--preparecnt]; 2492 prepares [active - 1] = prepares [--preparecnt];
2295 ((W)prepares [active - 1])->active = active; 2493 ev_active (prepares [active - 1]) = active;
2296 } 2494 }
2297 2495
2298 ev_stop (EV_A_ (W)w); 2496 ev_stop (EV_A_ (W)w);
2299} 2497}
2300 2498
… …
2315 clear_pending (EV_A_ (W)w); 2513 clear_pending (EV_A_ (W)w);
2316 if (expect_false (!ev_is_active (w))) 2514 if (expect_false (!ev_is_active (w)))
2317 return; 2515 return;
2318 2516
2319 { 2517 {
2320 int active = ((W)w)->active; 2518 int active = ev_active (w);
2519
2321 checks [active - 1] = checks [--checkcnt]; 2520 checks [active - 1] = checks [--checkcnt];
2322 ((W)checks [active - 1])->active = active; 2521 ev_active (checks [active - 1]) = active;
2323 } 2522 }
2324 2523
2325 ev_stop (EV_A_ (W)w); 2524 ev_stop (EV_A_ (W)w);
2326} 2525}
2327 2526
… …
2423 clear_pending (EV_A_ (W)w); 2622 clear_pending (EV_A_ (W)w);
2424 if (expect_false (!ev_is_active (w))) 2623 if (expect_false (!ev_is_active (w)))
2425 return; 2624 return;
2426 2625
2427 { 2626 {
2428 int active = ((W)w)->active; 2627 int active = ev_active (w);
2628
2429 forks [active - 1] = forks [--forkcnt]; 2629 forks [active - 1] = forks [--forkcnt];
2430 ((W)forks [active - 1])->active = active; 2630 ev_active (forks [active - 1]) = active;
2431 } 2631 }
2432 2632
2433 ev_stop (EV_A_ (W)w); 2633 ev_stop (EV_A_ (W)w);
2434} 2634}
2435#endif 2635#endif
… …
2454 clear_pending (EV_A_ (W)w); 2654 clear_pending (EV_A_ (W)w);
2455 if (expect_false (!ev_is_active (w))) 2655 if (expect_false (!ev_is_active (w)))
2456 return; 2656 return;
2457 2657
2458 { 2658 {
2459 int active = ((W)w)->active; 2659 int active = ev_active (w);
2660
2460 asyncs [active - 1] = asyncs [--asynccnt]; 2661 asyncs [active - 1] = asyncs [--asynccnt];
2461 ((W)asyncs [active - 1])->active = active; 2662 ev_active (asyncs [active - 1]) = active;
2462 } 2663 }
2463 2664
2464 ev_stop (EV_A_ (W)w); 2665 ev_stop (EV_A_ (W)w);
2465} 2666}
2466 2667

Diff Legend

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