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

Comparing libev/ev.c (file contents):
Revision 1.207 by root, Thu Jan 31 13:10:56 2008 UTC vs.
Revision 1.241 by root, Fri May 9 13:57:00 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 ();
… …
367 W w; 422 W w;
368 int events; 423 int events;
369} ANPENDING; 424} ANPENDING;
370 425
371#if EV_USE_INOTIFY 426#if EV_USE_INOTIFY
427/* hash table entry per inotify-id */
372typedef struct 428typedef struct
373{ 429{
374 WL head; 430 WL head;
375} ANFS; 431} ANFS;
432#endif
433
434/* Heap Entry */
435#if EV_HEAP_CACHE_AT
436 typedef struct {
437 WT w;
438 ev_tstamp at;
439 } ANHE;
440
441 #define ANHE_w(he) (he) /* access watcher, read-write */
442 #define ANHE_at(he) (he)->at /* acces cahced at, read-only */
443 #define ANHE_at_set(he) (he)->at = (he)->w->at /* update at from watcher */
444#else
445 typedef WT ANHE;
446
447 #define ANHE_w(he) (he)
448 #define ANHE_at(he) (he)->at
449 #define ANHE_at_set(he)
376#endif 450#endif
377 451
378#if EV_MULTIPLICITY 452#if EV_MULTIPLICITY
379 453
380 struct ev_loop 454 struct ev_loop
… …
451 ts.tv_sec = (time_t)delay; 525 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 526 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453 527
454 nanosleep (&ts, 0); 528 nanosleep (&ts, 0);
455#elif defined(_WIN32) 529#elif defined(_WIN32)
456 Sleep (delay * 1e3); 530 Sleep ((unsigned long)(delay * 1e3));
457#else 531#else
458 struct timeval tv; 532 struct timeval tv;
459 533
460 tv.tv_sec = (time_t)delay; 534 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 535 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
464#endif 538#endif
465 } 539 }
466} 540}
467 541
468/*****************************************************************************/ 542/*****************************************************************************/
543
544#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
469 545
470int inline_size 546int inline_size
471array_nextsize (int elem, int cur, int cnt) 547array_nextsize (int elem, int cur, int cnt)
472{ 548{
473 int ncur = cur + 1; 549 int ncur = cur + 1;
474 550
475 do 551 do
476 ncur <<= 1; 552 ncur <<= 1;
477 while (cnt > ncur); 553 while (cnt > ncur);
478 554
479 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 555 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
480 if (elem * ncur > 4096) 556 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
481 { 557 {
482 ncur *= elem; 558 ncur *= elem;
483 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 559 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
484 ncur = ncur - sizeof (void *) * 4; 560 ncur = ncur - sizeof (void *) * 4;
485 ncur /= elem; 561 ncur /= elem;
486 } 562 }
487 563
488 return ncur; 564 return ncur;
… …
702 } 778 }
703} 779}
704 780
705/*****************************************************************************/ 781/*****************************************************************************/
706 782
783/*
784 * the heap functions want a real array index. array index 0 uis guaranteed to not
785 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
786 * the branching factor of the d-tree.
787 */
788
789/*
790 * at the moment we allow libev the luxury of two heaps,
791 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
792 * which is more cache-efficient.
793 * the difference is about 5% with 50000+ watchers.
794 */
795#define EV_USE_4HEAP !EV_MINIMAL
796#if EV_USE_4HEAP
797
798#define DHEAP 4
799#define HEAP0 (DHEAP - 1) /* index of first element in heap */
800
801/* towards the root */
707void inline_speed 802void inline_speed
708upheap (WT *heap, int k) 803upheap (ANHE *heap, int k)
709{ 804{
710 WT w = heap [k]; 805 ANHE he = heap [k];
711 806
712 while (k) 807 for (;;)
713 { 808 {
714 int p = (k - 1) >> 1; 809 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
715 810
716 if (heap [p]->at <= w->at) 811 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
717 break; 812 break;
718 813
719 heap [k] = heap [p]; 814 heap [k] = heap [p];
720 ((W)heap [k])->active = k + 1; 815 ev_active (ANHE_w (heap [k])) = k;
721 k = p; 816 k = p;
722 } 817 }
723 818
819 ev_active (ANHE_w (he)) = k;
820 heap [k] = he;
821}
822
823/* away from the root */
824void inline_speed
825downheap (ANHE *heap, int N, int k)
826{
827 ANHE he = heap [k];
828 ANHE *E = heap + N + HEAP0;
829
830 for (;;)
831 {
832 ev_tstamp minat;
833 ANHE *minpos;
834 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0;
835
836 // find minimum child
837 if (expect_true (pos + DHEAP - 1 < E))
838 {
839 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
840 if (ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
841 if (ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
842 if (ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
843 }
844 else if (pos < E)
845 {
846 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
847 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
848 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
849 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
850 }
851 else
852 break;
853
854 if (ANHE_at (he) <= minat)
855 break;
856
857 ev_active (ANHE_w (*minpos)) = k;
858 heap [k] = *minpos;
859
860 k = minpos - heap;
861 }
862
863 ev_active (ANHE_w (he)) = k;
864 heap [k] = he;
865}
866
867#else // 4HEAP
868
869#define HEAP0 1
870
871/* towards the root */
872void inline_speed
873upheap (ANHE *heap, int k)
874{
875 ANHE he = heap [k];
876
877 for (;;)
878 {
879 int p = k >> 1;
880
881 /* maybe we could use a dummy element at heap [0]? */
882 if (!p || ANHE_at (heap [p]) <= ANHE_at (he))
883 break;
884
885 heap [k] = heap [p];
886 ev_active (ANHE_w (heap [k])) = k;
887 k = p;
888 }
889
724 heap [k] = w; 890 heap [k] = w;
725 ((W)heap [k])->active = k + 1; 891 ev_active (ANHE_w (heap [k])) = k;
726} 892}
727 893
894/* away from the root */
728void inline_speed 895void inline_speed
729downheap (WT *heap, int N, int k) 896downheap (ANHE *heap, int N, int k)
730{ 897{
731 WT w = heap [k]; 898 ANHE he = heap [k];
732 899
733 for (;;) 900 for (;;)
734 { 901 {
735 int c = (k << 1) + 1; 902 int c = k << 1;
736 903
737 if (c >= N) 904 if (c > N)
738 break; 905 break;
739 906
740 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 907 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
741 ? 1 : 0; 908 ? 1 : 0;
742 909
743 if (w->at <= heap [c]->at) 910 if (w->at <= ANHE_at (heap [c]))
744 break; 911 break;
745 912
746 heap [k] = heap [c]; 913 heap [k] = heap [c];
747 ((W)heap [k])->active = k + 1; 914 ev_active (ANHE_w (heap [k])) = k;
748 915
749 k = c; 916 k = c;
750 } 917 }
751 918
752 heap [k] = w; 919 heap [k] = he;
753 ((W)heap [k])->active = k + 1; 920 ev_active (ANHE_w (he)) = k;
754} 921}
922#endif
755 923
756void inline_size 924void inline_size
757adjustheap (WT *heap, int N, int k) 925adjustheap (ANHE *heap, int N, int k)
758{ 926{
759 upheap (heap, k); 927 upheap (heap, k);
760 downheap (heap, N, k); 928 downheap (heap, N, k);
761} 929}
762 930
… …
802static void noinline 970static void noinline
803evpipe_init (EV_P) 971evpipe_init (EV_P)
804{ 972{
805 if (!ev_is_active (&pipeev)) 973 if (!ev_is_active (&pipeev))
806 { 974 {
975#if EV_USE_EVENTFD
976 if ((evfd = eventfd (0, 0)) >= 0)
977 {
978 evpipe [0] = -1;
979 fd_intern (evfd);
980 ev_io_set (&pipeev, evfd, EV_READ);
981 }
982 else
983#endif
984 {
807 while (pipe (evpipe)) 985 while (pipe (evpipe))
808 syserr ("(libev) error creating signal/async pipe"); 986 syserr ("(libev) error creating signal/async pipe");
809 987
810 fd_intern (evpipe [0]); 988 fd_intern (evpipe [0]);
811 fd_intern (evpipe [1]); 989 fd_intern (evpipe [1]);
812
813 ev_io_set (&pipeev, evpipe [0], EV_READ); 990 ev_io_set (&pipeev, evpipe [0], EV_READ);
991 }
992
814 ev_io_start (EV_A_ &pipeev); 993 ev_io_start (EV_A_ &pipeev);
815 ev_unref (EV_A); /* child watcher should not keep loop alive */ 994 ev_unref (EV_A); /* watcher should not keep loop alive */
816 } 995 }
817} 996}
818 997
819void inline_size 998void inline_size
820evpipe_write (EV_P_ int sig, int async) 999evpipe_write (EV_P_ EV_ATOMIC_T *flag)
821{ 1000{
822 if (!(gotasync || gotsig)) 1001 if (!*flag)
823 { 1002 {
824 int old_errno = errno; 1003 int old_errno = errno; /* save errno because write might clobber it */
825 1004
826 if (sig) gotsig = 1; 1005 *flag = 1;
827 if (async) gotasync = 1;
828 1006
1007#if EV_USE_EVENTFD
1008 if (evfd >= 0)
1009 {
1010 uint64_t counter = 1;
1011 write (evfd, &counter, sizeof (uint64_t));
1012 }
1013 else
1014#endif
829 write (evpipe [1], &old_errno, 1); 1015 write (evpipe [1], &old_errno, 1);
1016
830 errno = old_errno; 1017 errno = old_errno;
831 } 1018 }
832} 1019}
833 1020
834static void 1021static void
835pipecb (EV_P_ ev_io *iow, int revents) 1022pipecb (EV_P_ ev_io *iow, int revents)
836{ 1023{
1024#if EV_USE_EVENTFD
1025 if (evfd >= 0)
837 { 1026 {
838 int dummy; 1027 uint64_t counter;
1028 read (evfd, &counter, sizeof (uint64_t));
1029 }
1030 else
1031#endif
1032 {
1033 char dummy;
839 read (evpipe [0], &dummy, 1); 1034 read (evpipe [0], &dummy, 1);
840 } 1035 }
841 1036
842 if (gotsig) 1037 if (gotsig && ev_is_default_loop (EV_A))
843 { 1038 {
844 int signum; 1039 int signum;
845 gotsig = 0; 1040 gotsig = 0;
846 1041
847 for (signum = signalmax; signum--; ) 1042 for (signum = signalmax; signum--; )
848 if (signals [signum].gotsig) 1043 if (signals [signum].gotsig)
849 ev_feed_signal_event (EV_A_ signum + 1); 1044 ev_feed_signal_event (EV_A_ signum + 1);
850 } 1045 }
851 1046
1047#if EV_ASYNC_ENABLE
852 if (gotasync) 1048 if (gotasync)
853 { 1049 {
854 int i; 1050 int i;
855 gotasync = 0; 1051 gotasync = 0;
856 1052
… …
859 { 1055 {
860 asyncs [i]->sent = 0; 1056 asyncs [i]->sent = 0;
861 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC); 1057 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
862 } 1058 }
863 } 1059 }
1060#endif
864} 1061}
865 1062
866/*****************************************************************************/ 1063/*****************************************************************************/
867 1064
868static void 1065static void
869sighandler (int signum) 1066ev_sighandler (int signum)
870{ 1067{
871#if EV_MULTIPLICITY 1068#if EV_MULTIPLICITY
872 struct ev_loop *loop = &default_loop_struct; 1069 struct ev_loop *loop = &default_loop_struct;
873#endif 1070#endif
874 1071
875#if _WIN32 1072#if _WIN32
876 signal (signum, sighandler); 1073 signal (signum, ev_sighandler);
877#endif 1074#endif
878 1075
879 signals [signum - 1].gotsig = 1; 1076 signals [signum - 1].gotsig = 1;
880 evpipe_write (EV_A_ 1, 0); 1077 evpipe_write (EV_A_ &gotsig);
881} 1078}
882 1079
883void noinline 1080void noinline
884ev_feed_signal_event (EV_P_ int signum) 1081ev_feed_signal_event (EV_P_ int signum)
885{ 1082{
… …
911#ifndef WIFCONTINUED 1108#ifndef WIFCONTINUED
912# define WIFCONTINUED(status) 0 1109# define WIFCONTINUED(status) 0
913#endif 1110#endif
914 1111
915void inline_speed 1112void inline_speed
916child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1113child_reap (EV_P_ int chain, int pid, int status)
917{ 1114{
918 ev_child *w; 1115 ev_child *w;
919 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1116 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
920 1117
921 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1118 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
922 { 1119 {
923 if ((w->pid == pid || !w->pid) 1120 if ((w->pid == pid || !w->pid)
924 && (!traced || (w->flags & 1))) 1121 && (!traced || (w->flags & 1)))
925 { 1122 {
926 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1123 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
927 w->rpid = pid; 1124 w->rpid = pid;
928 w->rstatus = status; 1125 w->rstatus = status;
929 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1126 ev_feed_event (EV_A_ (W)w, EV_CHILD);
930 } 1127 }
931 } 1128 }
… …
945 if (!WCONTINUED 1142 if (!WCONTINUED
946 || errno != EINVAL 1143 || errno != EINVAL
947 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1144 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
948 return; 1145 return;
949 1146
950 /* make sure we are called again until all childs have been reaped */ 1147 /* make sure we are called again until all children have been reaped */
951 /* we need to do it this way so that the callback gets called before we continue */ 1148 /* we need to do it this way so that the callback gets called before we continue */
952 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1149 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
953 1150
954 child_reap (EV_A_ sw, pid, pid, status); 1151 child_reap (EV_A_ pid, pid, status);
955 if (EV_PID_HASHSIZE > 1) 1152 if (EV_PID_HASHSIZE > 1)
956 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1153 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
957} 1154}
958 1155
959#endif 1156#endif
960 1157
961/*****************************************************************************/ 1158/*****************************************************************************/
… …
1079 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1276 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1080 have_monotonic = 1; 1277 have_monotonic = 1;
1081 } 1278 }
1082#endif 1279#endif
1083 1280
1084 ev_rt_now = ev_time (); 1281 ev_rt_now = ev_time ();
1085 mn_now = get_clock (); 1282 mn_now = get_clock ();
1086 now_floor = mn_now; 1283 now_floor = mn_now;
1087 rtmn_diff = ev_rt_now - mn_now; 1284 rtmn_diff = ev_rt_now - mn_now;
1088 1285
1089 io_blocktime = 0.; 1286 io_blocktime = 0.;
1090 timeout_blocktime = 0.; 1287 timeout_blocktime = 0.;
1288 backend = 0;
1289 backend_fd = -1;
1290 gotasync = 0;
1291#if EV_USE_INOTIFY
1292 fs_fd = -2;
1293#endif
1091 1294
1092 /* pid check not overridable via env */ 1295 /* pid check not overridable via env */
1093#ifndef _WIN32 1296#ifndef _WIN32
1094 if (flags & EVFLAG_FORKCHECK) 1297 if (flags & EVFLAG_FORKCHECK)
1095 curpid = getpid (); 1298 curpid = getpid ();
… …
1098 if (!(flags & EVFLAG_NOENV) 1301 if (!(flags & EVFLAG_NOENV)
1099 && !enable_secure () 1302 && !enable_secure ()
1100 && getenv ("LIBEV_FLAGS")) 1303 && getenv ("LIBEV_FLAGS"))
1101 flags = atoi (getenv ("LIBEV_FLAGS")); 1304 flags = atoi (getenv ("LIBEV_FLAGS"));
1102 1305
1103 if (!(flags & 0x0000ffffUL)) 1306 if (!(flags & 0x0000ffffU))
1104 flags |= ev_recommended_backends (); 1307 flags |= ev_recommended_backends ();
1105
1106 backend = 0;
1107 backend_fd = -1;
1108#if EV_USE_INOTIFY
1109 fs_fd = -2;
1110#endif
1111 1308
1112#if EV_USE_PORT 1309#if EV_USE_PORT
1113 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1310 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1114#endif 1311#endif
1115#if EV_USE_KQUEUE 1312#if EV_USE_KQUEUE
… …
1138 if (ev_is_active (&pipeev)) 1335 if (ev_is_active (&pipeev))
1139 { 1336 {
1140 ev_ref (EV_A); /* signal watcher */ 1337 ev_ref (EV_A); /* signal watcher */
1141 ev_io_stop (EV_A_ &pipeev); 1338 ev_io_stop (EV_A_ &pipeev);
1142 1339
1143 close (evpipe [0]); evpipe [0] = 0; 1340#if EV_USE_EVENTFD
1144 close (evpipe [1]); evpipe [1] = 0; 1341 if (evfd >= 0)
1342 close (evfd);
1343#endif
1344
1345 if (evpipe [0] >= 0)
1346 {
1347 close (evpipe [0]);
1348 close (evpipe [1]);
1349 }
1145 } 1350 }
1146 1351
1147#if EV_USE_INOTIFY 1352#if EV_USE_INOTIFY
1148 if (fs_fd >= 0) 1353 if (fs_fd >= 0)
1149 close (fs_fd); 1354 close (fs_fd);
… …
1187#if EV_FORK_ENABLE 1392#if EV_FORK_ENABLE
1188 array_free (fork, EMPTY); 1393 array_free (fork, EMPTY);
1189#endif 1394#endif
1190 array_free (prepare, EMPTY); 1395 array_free (prepare, EMPTY);
1191 array_free (check, EMPTY); 1396 array_free (check, EMPTY);
1397#if EV_ASYNC_ENABLE
1398 array_free (async, EMPTY);
1399#endif
1192 1400
1193 backend = 0; 1401 backend = 0;
1194} 1402}
1195 1403
1404#if EV_USE_INOTIFY
1196void inline_size infy_fork (EV_P); 1405void inline_size infy_fork (EV_P);
1406#endif
1197 1407
1198void inline_size 1408void inline_size
1199loop_fork (EV_P) 1409loop_fork (EV_P)
1200{ 1410{
1201#if EV_USE_PORT 1411#if EV_USE_PORT
… …
1212#endif 1422#endif
1213 1423
1214 if (ev_is_active (&pipeev)) 1424 if (ev_is_active (&pipeev))
1215 { 1425 {
1216 /* this "locks" the handlers against writing to the pipe */ 1426 /* this "locks" the handlers against writing to the pipe */
1427 /* while we modify the fd vars */
1428 gotsig = 1;
1429#if EV_ASYNC_ENABLE
1217 gotsig = gotasync = 1; 1430 gotasync = 1;
1431#endif
1218 1432
1219 ev_ref (EV_A); 1433 ev_ref (EV_A);
1220 ev_io_stop (EV_A_ &pipeev); 1434 ev_io_stop (EV_A_ &pipeev);
1435
1436#if EV_USE_EVENTFD
1437 if (evfd >= 0)
1438 close (evfd);
1439#endif
1440
1441 if (evpipe [0] >= 0)
1442 {
1221 close (evpipe [0]); 1443 close (evpipe [0]);
1222 close (evpipe [1]); 1444 close (evpipe [1]);
1445 }
1223 1446
1224 evpipe_init (EV_A); 1447 evpipe_init (EV_A);
1225 /* now iterate over everything */ 1448 /* now iterate over everything, in case we missed something */
1226 evcb (EV_A_ &pipeev, EV_READ); 1449 pipecb (EV_A_ &pipeev, EV_READ);
1227 } 1450 }
1228 1451
1229 postfork = 0; 1452 postfork = 0;
1230} 1453}
1231 1454
… …
1255void 1478void
1256ev_loop_fork (EV_P) 1479ev_loop_fork (EV_P)
1257{ 1480{
1258 postfork = 1; /* must be in line with ev_default_fork */ 1481 postfork = 1; /* must be in line with ev_default_fork */
1259} 1482}
1260
1261#endif 1483#endif
1262 1484
1263#if EV_MULTIPLICITY 1485#if EV_MULTIPLICITY
1264struct ev_loop * 1486struct ev_loop *
1265ev_default_loop_init (unsigned int flags) 1487ev_default_loop_init (unsigned int flags)
… …
1346 EV_CB_INVOKE (p->w, p->events); 1568 EV_CB_INVOKE (p->w, p->events);
1347 } 1569 }
1348 } 1570 }
1349} 1571}
1350 1572
1351void inline_size
1352timers_reify (EV_P)
1353{
1354 while (timercnt && ((WT)timers [0])->at <= mn_now)
1355 {
1356 ev_timer *w = (ev_timer *)timers [0];
1357
1358 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1359
1360 /* first reschedule or stop timer */
1361 if (w->repeat)
1362 {
1363 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1364
1365 ((WT)w)->at += w->repeat;
1366 if (((WT)w)->at < mn_now)
1367 ((WT)w)->at = mn_now;
1368
1369 downheap (timers, timercnt, 0);
1370 }
1371 else
1372 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1373
1374 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1375 }
1376}
1377
1378#if EV_PERIODIC_ENABLE
1379void inline_size
1380periodics_reify (EV_P)
1381{
1382 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1383 {
1384 ev_periodic *w = (ev_periodic *)periodics [0];
1385
1386 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1387
1388 /* first reschedule or stop timer */
1389 if (w->reschedule_cb)
1390 {
1391 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1392 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1393 downheap (periodics, periodiccnt, 0);
1394 }
1395 else if (w->interval)
1396 {
1397 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1398 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1399 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1400 downheap (periodics, periodiccnt, 0);
1401 }
1402 else
1403 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1404
1405 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1406 }
1407}
1408
1409static void noinline
1410periodics_reschedule (EV_P)
1411{
1412 int i;
1413
1414 /* adjust periodics after time jump */
1415 for (i = 0; i < periodiccnt; ++i)
1416 {
1417 ev_periodic *w = (ev_periodic *)periodics [i];
1418
1419 if (w->reschedule_cb)
1420 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1421 else if (w->interval)
1422 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1423 }
1424
1425 /* now rebuild the heap */
1426 for (i = periodiccnt >> 1; i--; )
1427 downheap (periodics, periodiccnt, i);
1428}
1429#endif
1430
1431#if EV_IDLE_ENABLE 1573#if EV_IDLE_ENABLE
1432void inline_size 1574void inline_size
1433idle_reify (EV_P) 1575idle_reify (EV_P)
1434{ 1576{
1435 if (expect_false (idleall)) 1577 if (expect_false (idleall))
… …
1446 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1588 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1447 break; 1589 break;
1448 } 1590 }
1449 } 1591 }
1450 } 1592 }
1593}
1594#endif
1595
1596void inline_size
1597timers_reify (EV_P)
1598{
1599 while (timercnt && ANHE_at (timers [HEAP0]) <= mn_now)
1600 {
1601 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1602
1603 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1604
1605 /* first reschedule or stop timer */
1606 if (w->repeat)
1607 {
1608 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1609
1610 ev_at (w) += w->repeat;
1611 if (ev_at (w) < mn_now)
1612 ev_at (w) = mn_now;
1613
1614 downheap (timers, timercnt, HEAP0);
1615 }
1616 else
1617 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1618
1619 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1620 }
1621}
1622
1623#if EV_PERIODIC_ENABLE
1624void inline_size
1625periodics_reify (EV_P)
1626{
1627 while (periodiccnt && ANHE_at (periodics [HEAP0]) <= ev_rt_now)
1628 {
1629 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1630
1631 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1632
1633 /* first reschedule or stop timer */
1634 if (w->reschedule_cb)
1635 {
1636 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1637 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1638 downheap (periodics, periodiccnt, 1);
1639 }
1640 else if (w->interval)
1641 {
1642 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1643 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1644 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1645 downheap (periodics, periodiccnt, HEAP0);
1646 }
1647 else
1648 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1649
1650 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1651 }
1652}
1653
1654static void noinline
1655periodics_reschedule (EV_P)
1656{
1657 int i;
1658
1659 /* adjust periodics after time jump */
1660 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1661 {
1662 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1663
1664 if (w->reschedule_cb)
1665 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1666 else if (w->interval)
1667 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1668 }
1669
1670 /* now rebuild the heap, this for the 2-heap, inefficient for the 4-heap, but correct */
1671 for (i = periodiccnt >> 1; --i; )
1672 downheap (periodics, periodiccnt, i + HEAP0);
1451} 1673}
1452#endif 1674#endif
1453 1675
1454void inline_speed 1676void inline_speed
1455time_update (EV_P_ ev_tstamp max_block) 1677time_update (EV_P_ ev_tstamp max_block)
… …
1484 */ 1706 */
1485 for (i = 4; --i; ) 1707 for (i = 4; --i; )
1486 { 1708 {
1487 rtmn_diff = ev_rt_now - mn_now; 1709 rtmn_diff = ev_rt_now - mn_now;
1488 1710
1489 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1711 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1490 return; /* all is well */ 1712 return; /* all is well */
1491 1713
1492 ev_rt_now = ev_time (); 1714 ev_rt_now = ev_time ();
1493 mn_now = get_clock (); 1715 mn_now = get_clock ();
1494 now_floor = mn_now; 1716 now_floor = mn_now;
… …
1510#if EV_PERIODIC_ENABLE 1732#if EV_PERIODIC_ENABLE
1511 periodics_reschedule (EV_A); 1733 periodics_reschedule (EV_A);
1512#endif 1734#endif
1513 /* adjust timers. this is easy, as the offset is the same for all of them */ 1735 /* adjust timers. this is easy, as the offset is the same for all of them */
1514 for (i = 0; i < timercnt; ++i) 1736 for (i = 0; i < timercnt; ++i)
1737 {
1738 ANHE *he = timers + i + HEAP0;
1515 ((WT)timers [i])->at += ev_rt_now - mn_now; 1739 ANHE_w (*he)->at += ev_rt_now - mn_now;
1740 ANHE_at_set (*he);
1741 }
1516 } 1742 }
1517 1743
1518 mn_now = ev_rt_now; 1744 mn_now = ev_rt_now;
1519 } 1745 }
1520} 1746}
… …
1534static int loop_done; 1760static int loop_done;
1535 1761
1536void 1762void
1537ev_loop (EV_P_ int flags) 1763ev_loop (EV_P_ int flags)
1538{ 1764{
1539 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1765 loop_done = EVUNLOOP_CANCEL;
1540 ? EVUNLOOP_ONE
1541 : EVUNLOOP_CANCEL;
1542 1766
1543 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1767 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1544 1768
1545 do 1769 do
1546 { 1770 {
… …
1592 1816
1593 waittime = MAX_BLOCKTIME; 1817 waittime = MAX_BLOCKTIME;
1594 1818
1595 if (timercnt) 1819 if (timercnt)
1596 { 1820 {
1597 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1821 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1598 if (waittime > to) waittime = to; 1822 if (waittime > to) waittime = to;
1599 } 1823 }
1600 1824
1601#if EV_PERIODIC_ENABLE 1825#if EV_PERIODIC_ENABLE
1602 if (periodiccnt) 1826 if (periodiccnt)
1603 { 1827 {
1604 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1828 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1605 if (waittime > to) waittime = to; 1829 if (waittime > to) waittime = to;
1606 } 1830 }
1607#endif 1831#endif
1608 1832
1609 if (expect_false (waittime < timeout_blocktime)) 1833 if (expect_false (waittime < timeout_blocktime))
… …
1642 /* queue check watchers, to be executed first */ 1866 /* queue check watchers, to be executed first */
1643 if (expect_false (checkcnt)) 1867 if (expect_false (checkcnt))
1644 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1868 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1645 1869
1646 call_pending (EV_A); 1870 call_pending (EV_A);
1647
1648 } 1871 }
1649 while (expect_true (activecnt && !loop_done)); 1872 while (expect_true (
1873 activecnt
1874 && !loop_done
1875 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1876 ));
1650 1877
1651 if (loop_done == EVUNLOOP_ONE) 1878 if (loop_done == EVUNLOOP_ONE)
1652 loop_done = EVUNLOOP_CANCEL; 1879 loop_done = EVUNLOOP_CANCEL;
1653} 1880}
1654 1881
… …
1772ev_timer_start (EV_P_ ev_timer *w) 1999ev_timer_start (EV_P_ ev_timer *w)
1773{ 2000{
1774 if (expect_false (ev_is_active (w))) 2001 if (expect_false (ev_is_active (w)))
1775 return; 2002 return;
1776 2003
1777 ((WT)w)->at += mn_now; 2004 ev_at (w) += mn_now;
1778 2005
1779 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2006 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1780 2007
1781 ev_start (EV_A_ (W)w, ++timercnt); 2008 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1782 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 2009 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1783 timers [timercnt - 1] = (WT)w; 2010 ANHE_w (timers [ev_active (w)]) = (WT)w;
1784 upheap (timers, timercnt - 1); 2011 ANHE_at_set (timers [ev_active (w)]);
2012 upheap (timers, ev_active (w));
1785 2013
1786 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 2014 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1787} 2015}
1788 2016
1789void noinline 2017void noinline
1790ev_timer_stop (EV_P_ ev_timer *w) 2018ev_timer_stop (EV_P_ ev_timer *w)
1791{ 2019{
1792 clear_pending (EV_A_ (W)w); 2020 clear_pending (EV_A_ (W)w);
1793 if (expect_false (!ev_is_active (w))) 2021 if (expect_false (!ev_is_active (w)))
1794 return; 2022 return;
1795 2023
1796 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1797
1798 { 2024 {
1799 int active = ((W)w)->active; 2025 int active = ev_active (w);
1800 2026
2027 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2028
1801 if (expect_true (--active < --timercnt)) 2029 if (expect_true (active < timercnt + HEAP0 - 1))
1802 { 2030 {
1803 timers [active] = timers [timercnt]; 2031 timers [active] = timers [timercnt + HEAP0 - 1];
1804 adjustheap (timers, timercnt, active); 2032 adjustheap (timers, timercnt, active);
1805 } 2033 }
2034
2035 --timercnt;
1806 } 2036 }
1807 2037
1808 ((WT)w)->at -= mn_now; 2038 ev_at (w) -= mn_now;
1809 2039
1810 ev_stop (EV_A_ (W)w); 2040 ev_stop (EV_A_ (W)w);
1811} 2041}
1812 2042
1813void noinline 2043void noinline
… …
1815{ 2045{
1816 if (ev_is_active (w)) 2046 if (ev_is_active (w))
1817 { 2047 {
1818 if (w->repeat) 2048 if (w->repeat)
1819 { 2049 {
1820 ((WT)w)->at = mn_now + w->repeat; 2050 ev_at (w) = mn_now + w->repeat;
2051 ANHE_at_set (timers [ev_active (w)]);
1821 adjustheap (timers, timercnt, ((W)w)->active - 1); 2052 adjustheap (timers, timercnt, ev_active (w));
1822 } 2053 }
1823 else 2054 else
1824 ev_timer_stop (EV_A_ w); 2055 ev_timer_stop (EV_A_ w);
1825 } 2056 }
1826 else if (w->repeat) 2057 else if (w->repeat)
1827 { 2058 {
1828 w->at = w->repeat; 2059 ev_at (w) = w->repeat;
1829 ev_timer_start (EV_A_ w); 2060 ev_timer_start (EV_A_ w);
1830 } 2061 }
1831} 2062}
1832 2063
1833#if EV_PERIODIC_ENABLE 2064#if EV_PERIODIC_ENABLE
… …
1836{ 2067{
1837 if (expect_false (ev_is_active (w))) 2068 if (expect_false (ev_is_active (w)))
1838 return; 2069 return;
1839 2070
1840 if (w->reschedule_cb) 2071 if (w->reschedule_cb)
1841 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2072 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1842 else if (w->interval) 2073 else if (w->interval)
1843 { 2074 {
1844 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2075 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1845 /* this formula differs from the one in periodic_reify because we do not always round up */ 2076 /* this formula differs from the one in periodic_reify because we do not always round up */
1846 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2077 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1847 } 2078 }
1848 else 2079 else
1849 ((WT)w)->at = w->offset; 2080 ev_at (w) = w->offset;
1850 2081
1851 ev_start (EV_A_ (W)w, ++periodiccnt); 2082 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1852 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2083 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1853 periodics [periodiccnt - 1] = (WT)w; 2084 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1854 upheap (periodics, periodiccnt - 1); 2085 upheap (periodics, ev_active (w));
1855 2086
1856 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2087 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
1857} 2088}
1858 2089
1859void noinline 2090void noinline
1860ev_periodic_stop (EV_P_ ev_periodic *w) 2091ev_periodic_stop (EV_P_ ev_periodic *w)
1861{ 2092{
1862 clear_pending (EV_A_ (W)w); 2093 clear_pending (EV_A_ (W)w);
1863 if (expect_false (!ev_is_active (w))) 2094 if (expect_false (!ev_is_active (w)))
1864 return; 2095 return;
1865 2096
1866 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1867
1868 { 2097 {
1869 int active = ((W)w)->active; 2098 int active = ev_active (w);
1870 2099
2100 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2101
1871 if (expect_true (--active < --periodiccnt)) 2102 if (expect_true (active < periodiccnt + HEAP0 - 1))
1872 { 2103 {
1873 periodics [active] = periodics [periodiccnt]; 2104 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1874 adjustheap (periodics, periodiccnt, active); 2105 adjustheap (periodics, periodiccnt, active);
1875 } 2106 }
2107
2108 --periodiccnt;
1876 } 2109 }
1877 2110
1878 ev_stop (EV_A_ (W)w); 2111 ev_stop (EV_A_ (W)w);
1879} 2112}
1880 2113
… …
1922 wlist_add (&signals [w->signum - 1].head, (WL)w); 2155 wlist_add (&signals [w->signum - 1].head, (WL)w);
1923 2156
1924 if (!((WL)w)->next) 2157 if (!((WL)w)->next)
1925 { 2158 {
1926#if _WIN32 2159#if _WIN32
1927 signal (w->signum, sighandler); 2160 signal (w->signum, ev_sighandler);
1928#else 2161#else
1929 struct sigaction sa; 2162 struct sigaction sa;
1930 sa.sa_handler = sighandler; 2163 sa.sa_handler = ev_sighandler;
1931 sigfillset (&sa.sa_mask); 2164 sigfillset (&sa.sa_mask);
1932 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2165 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1933 sigaction (w->signum, &sa, 0); 2166 sigaction (w->signum, &sa, 0);
1934#endif 2167#endif
1935 } 2168 }
… …
1996 if (w->wd < 0) 2229 if (w->wd < 0)
1997 { 2230 {
1998 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2231 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1999 2232
2000 /* monitor some parent directory for speedup hints */ 2233 /* monitor some parent directory for speedup hints */
2234 /* note that exceeding the hardcoded limit is not a correctness issue, */
2235 /* but an efficiency issue only */
2001 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2236 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2002 { 2237 {
2003 char path [4096]; 2238 char path [4096];
2004 strcpy (path, w->path); 2239 strcpy (path, w->path);
2005 2240
… …
2250 clear_pending (EV_A_ (W)w); 2485 clear_pending (EV_A_ (W)w);
2251 if (expect_false (!ev_is_active (w))) 2486 if (expect_false (!ev_is_active (w)))
2252 return; 2487 return;
2253 2488
2254 { 2489 {
2255 int active = ((W)w)->active; 2490 int active = ev_active (w);
2256 2491
2257 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2492 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2258 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2493 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2259 2494
2260 ev_stop (EV_A_ (W)w); 2495 ev_stop (EV_A_ (W)w);
2261 --idleall; 2496 --idleall;
2262 } 2497 }
2263} 2498}
… …
2280 clear_pending (EV_A_ (W)w); 2515 clear_pending (EV_A_ (W)w);
2281 if (expect_false (!ev_is_active (w))) 2516 if (expect_false (!ev_is_active (w)))
2282 return; 2517 return;
2283 2518
2284 { 2519 {
2285 int active = ((W)w)->active; 2520 int active = ev_active (w);
2521
2286 prepares [active - 1] = prepares [--preparecnt]; 2522 prepares [active - 1] = prepares [--preparecnt];
2287 ((W)prepares [active - 1])->active = active; 2523 ev_active (prepares [active - 1]) = active;
2288 } 2524 }
2289 2525
2290 ev_stop (EV_A_ (W)w); 2526 ev_stop (EV_A_ (W)w);
2291} 2527}
2292 2528
… …
2307 clear_pending (EV_A_ (W)w); 2543 clear_pending (EV_A_ (W)w);
2308 if (expect_false (!ev_is_active (w))) 2544 if (expect_false (!ev_is_active (w)))
2309 return; 2545 return;
2310 2546
2311 { 2547 {
2312 int active = ((W)w)->active; 2548 int active = ev_active (w);
2549
2313 checks [active - 1] = checks [--checkcnt]; 2550 checks [active - 1] = checks [--checkcnt];
2314 ((W)checks [active - 1])->active = active; 2551 ev_active (checks [active - 1]) = active;
2315 } 2552 }
2316 2553
2317 ev_stop (EV_A_ (W)w); 2554 ev_stop (EV_A_ (W)w);
2318} 2555}
2319 2556
… …
2415 clear_pending (EV_A_ (W)w); 2652 clear_pending (EV_A_ (W)w);
2416 if (expect_false (!ev_is_active (w))) 2653 if (expect_false (!ev_is_active (w)))
2417 return; 2654 return;
2418 2655
2419 { 2656 {
2420 int active = ((W)w)->active; 2657 int active = ev_active (w);
2658
2421 forks [active - 1] = forks [--forkcnt]; 2659 forks [active - 1] = forks [--forkcnt];
2422 ((W)forks [active - 1])->active = active; 2660 ev_active (forks [active - 1]) = active;
2423 } 2661 }
2424 2662
2425 ev_stop (EV_A_ (W)w); 2663 ev_stop (EV_A_ (W)w);
2426} 2664}
2427#endif 2665#endif
… …
2446 clear_pending (EV_A_ (W)w); 2684 clear_pending (EV_A_ (W)w);
2447 if (expect_false (!ev_is_active (w))) 2685 if (expect_false (!ev_is_active (w)))
2448 return; 2686 return;
2449 2687
2450 { 2688 {
2451 int active = ((W)w)->active; 2689 int active = ev_active (w);
2690
2452 asyncs [active - 1] = asyncs [--asynccnt]; 2691 asyncs [active - 1] = asyncs [--asynccnt];
2453 ((W)asyncs [active - 1])->active = active; 2692 ev_active (asyncs [active - 1]) = active;
2454 } 2693 }
2455 2694
2456 ev_stop (EV_A_ (W)w); 2695 ev_stop (EV_A_ (W)w);
2457} 2696}
2458 2697
2459void 2698void
2460ev_async_send (EV_P_ ev_async *w) 2699ev_async_send (EV_P_ ev_async *w)
2461{ 2700{
2462 w->sent = 1; 2701 w->sent = 1;
2463 evpipe_write (EV_A_ 0, 1); 2702 evpipe_write (EV_A_ &gotasync);
2464} 2703}
2465#endif 2704#endif
2466 2705
2467/*****************************************************************************/ 2706/*****************************************************************************/
2468 2707

Diff Legend

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