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

Comparing libev/ev.c (file contents):
Revision 1.206 by root, Fri Jan 25 15:45:08 2008 UTC vs.
Revision 1.240 by root, Thu May 8 21:21:41 2008 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
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 sig_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
298 338
299#ifdef _WIN32 339#ifdef _WIN32
300# include "ev_win32.c" 340# include "ev_win32.c"
301#endif 341#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);
… …
763/*****************************************************************************/ 907/*****************************************************************************/
764 908
765typedef struct 909typedef struct
766{ 910{
767 WL head; 911 WL head;
768 sig_atomic_t volatile gotsig; 912 EV_ATOMIC_T gotsig;
769} ANSIG; 913} ANSIG;
770 914
771static ANSIG *signals; 915static ANSIG *signals;
772static int signalmax; 916static int signalmax;
773 917
774static int sigpipe [2]; 918static EV_ATOMIC_T gotsig;
775static sig_atomic_t volatile gotsig;
776static ev_io sigev;
777 919
778void inline_size 920void inline_size
779signals_init (ANSIG *base, int count) 921signals_init (ANSIG *base, int count)
780{ 922{
781 while (count--) 923 while (count--)
… …
785 927
786 ++base; 928 ++base;
787 } 929 }
788} 930}
789 931
790static void 932/*****************************************************************************/
791sighandler (int signum)
792{
793#if _WIN32
794 signal (signum, sighandler);
795#endif
796
797 signals [signum - 1].gotsig = 1;
798
799 if (!gotsig)
800 {
801 int old_errno = errno;
802 gotsig = 1;
803 write (sigpipe [1], &signum, 1);
804 errno = old_errno;
805 }
806}
807
808void noinline
809ev_feed_signal_event (EV_P_ int signum)
810{
811 WL w;
812
813#if EV_MULTIPLICITY
814 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
815#endif
816
817 --signum;
818
819 if (signum < 0 || signum >= signalmax)
820 return;
821
822 signals [signum].gotsig = 0;
823
824 for (w = signals [signum].head; w; w = w->next)
825 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
826}
827
828static void
829sigcb (EV_P_ ev_io *iow, int revents)
830{
831 int signum;
832
833 read (sigpipe [0], &revents, 1);
834 gotsig = 0;
835
836 for (signum = signalmax; signum--; )
837 if (signals [signum].gotsig)
838 ev_feed_signal_event (EV_A_ signum + 1);
839}
840 933
841void inline_speed 934void inline_speed
842fd_intern (int fd) 935fd_intern (int fd)
843{ 936{
844#ifdef _WIN32 937#ifdef _WIN32
… …
849 fcntl (fd, F_SETFL, O_NONBLOCK); 942 fcntl (fd, F_SETFL, O_NONBLOCK);
850#endif 943#endif
851} 944}
852 945
853static void noinline 946static void noinline
854siginit (EV_P) 947evpipe_init (EV_P)
855{ 948{
949 if (!ev_is_active (&pipeev))
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 {
961 while (pipe (evpipe))
962 syserr ("(libev) error creating signal/async pipe");
963
856 fd_intern (sigpipe [0]); 964 fd_intern (evpipe [0]);
857 fd_intern (sigpipe [1]); 965 fd_intern (evpipe [1]);
966 ev_io_set (&pipeev, evpipe [0], EV_READ);
967 }
858 968
859 ev_io_set (&sigev, sigpipe [0], EV_READ);
860 ev_io_start (EV_A_ &sigev); 969 ev_io_start (EV_A_ &pipeev);
861 ev_unref (EV_A); /* child watcher should not keep loop alive */ 970 ev_unref (EV_A); /* watcher should not keep loop alive */
971 }
972}
973
974void inline_size
975evpipe_write (EV_P_ EV_ATOMIC_T *flag)
976{
977 if (!*flag)
978 {
979 int old_errno = errno; /* save errno because write might clobber it */
980
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
991 write (evpipe [1], &old_errno, 1);
992
993 errno = old_errno;
994 }
995}
996
997static void
998pipecb (EV_P_ ev_io *iow, int revents)
999{
1000#if EV_USE_EVENTFD
1001 if (evfd >= 0)
1002 {
1003 uint64_t counter;
1004 read (evfd, &counter, sizeof (uint64_t));
1005 }
1006 else
1007#endif
1008 {
1009 char dummy;
1010 read (evpipe [0], &dummy, 1);
1011 }
1012
1013 if (gotsig && ev_is_default_loop (EV_A))
1014 {
1015 int signum;
1016 gotsig = 0;
1017
1018 for (signum = signalmax; signum--; )
1019 if (signals [signum].gotsig)
1020 ev_feed_signal_event (EV_A_ signum + 1);
1021 }
1022
1023#if EV_ASYNC_ENABLE
1024 if (gotasync)
1025 {
1026 int i;
1027 gotasync = 0;
1028
1029 for (i = asynccnt; i--; )
1030 if (asyncs [i]->sent)
1031 {
1032 asyncs [i]->sent = 0;
1033 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1034 }
1035 }
1036#endif
1037}
1038
1039/*****************************************************************************/
1040
1041static void
1042ev_sighandler (int signum)
1043{
1044#if EV_MULTIPLICITY
1045 struct ev_loop *loop = &default_loop_struct;
1046#endif
1047
1048#if _WIN32
1049 signal (signum, ev_sighandler);
1050#endif
1051
1052 signals [signum - 1].gotsig = 1;
1053 evpipe_write (EV_A_ &gotsig);
1054}
1055
1056void noinline
1057ev_feed_signal_event (EV_P_ int signum)
1058{
1059 WL w;
1060
1061#if EV_MULTIPLICITY
1062 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1063#endif
1064
1065 --signum;
1066
1067 if (signum < 0 || signum >= signalmax)
1068 return;
1069
1070 signals [signum].gotsig = 0;
1071
1072 for (w = signals [signum].head; w; w = w->next)
1073 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
862} 1074}
863 1075
864/*****************************************************************************/ 1076/*****************************************************************************/
865 1077
866static WL childs [EV_PID_HASHSIZE]; 1078static WL childs [EV_PID_HASHSIZE];
… …
872#ifndef WIFCONTINUED 1084#ifndef WIFCONTINUED
873# define WIFCONTINUED(status) 0 1085# define WIFCONTINUED(status) 0
874#endif 1086#endif
875 1087
876void inline_speed 1088void inline_speed
877child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1089child_reap (EV_P_ int chain, int pid, int status)
878{ 1090{
879 ev_child *w; 1091 ev_child *w;
880 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1092 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
881 1093
882 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)
883 { 1095 {
884 if ((w->pid == pid || !w->pid) 1096 if ((w->pid == pid || !w->pid)
885 && (!traced || (w->flags & 1))) 1097 && (!traced || (w->flags & 1)))
886 { 1098 {
887 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 */
888 w->rpid = pid; 1100 w->rpid = pid;
889 w->rstatus = status; 1101 w->rstatus = status;
890 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1102 ev_feed_event (EV_A_ (W)w, EV_CHILD);
891 } 1103 }
892 } 1104 }
… …
906 if (!WCONTINUED 1118 if (!WCONTINUED
907 || errno != EINVAL 1119 || errno != EINVAL
908 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1120 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
909 return; 1121 return;
910 1122
911 /* 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 */
912 /* 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 */
913 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1125 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
914 1126
915 child_reap (EV_A_ sw, pid, pid, status); 1127 child_reap (EV_A_ pid, pid, status);
916 if (EV_PID_HASHSIZE > 1) 1128 if (EV_PID_HASHSIZE > 1)
917 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 */
918} 1130}
919 1131
920#endif 1132#endif
921 1133
922/*****************************************************************************/ 1134/*****************************************************************************/
… …
1040 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1252 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1041 have_monotonic = 1; 1253 have_monotonic = 1;
1042 } 1254 }
1043#endif 1255#endif
1044 1256
1045 ev_rt_now = ev_time (); 1257 ev_rt_now = ev_time ();
1046 mn_now = get_clock (); 1258 mn_now = get_clock ();
1047 now_floor = mn_now; 1259 now_floor = mn_now;
1048 rtmn_diff = ev_rt_now - mn_now; 1260 rtmn_diff = ev_rt_now - mn_now;
1049 1261
1050 io_blocktime = 0.; 1262 io_blocktime = 0.;
1051 timeout_blocktime = 0.; 1263 timeout_blocktime = 0.;
1264 backend = 0;
1265 backend_fd = -1;
1266 gotasync = 0;
1267#if EV_USE_INOTIFY
1268 fs_fd = -2;
1269#endif
1052 1270
1053 /* pid check not overridable via env */ 1271 /* pid check not overridable via env */
1054#ifndef _WIN32 1272#ifndef _WIN32
1055 if (flags & EVFLAG_FORKCHECK) 1273 if (flags & EVFLAG_FORKCHECK)
1056 curpid = getpid (); 1274 curpid = getpid ();
… …
1059 if (!(flags & EVFLAG_NOENV) 1277 if (!(flags & EVFLAG_NOENV)
1060 && !enable_secure () 1278 && !enable_secure ()
1061 && getenv ("LIBEV_FLAGS")) 1279 && getenv ("LIBEV_FLAGS"))
1062 flags = atoi (getenv ("LIBEV_FLAGS")); 1280 flags = atoi (getenv ("LIBEV_FLAGS"));
1063 1281
1064 if (!(flags & 0x0000ffffUL)) 1282 if (!(flags & 0x0000ffffU))
1065 flags |= ev_recommended_backends (); 1283 flags |= ev_recommended_backends ();
1066
1067 backend = 0;
1068 backend_fd = -1;
1069#if EV_USE_INOTIFY
1070 fs_fd = -2;
1071#endif
1072 1284
1073#if EV_USE_PORT 1285#if EV_USE_PORT
1074 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1286 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1075#endif 1287#endif
1076#if EV_USE_KQUEUE 1288#if EV_USE_KQUEUE
… …
1084#endif 1296#endif
1085#if EV_USE_SELECT 1297#if EV_USE_SELECT
1086 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1298 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1087#endif 1299#endif
1088 1300
1089 ev_init (&sigev, sigcb); 1301 ev_init (&pipeev, pipecb);
1090 ev_set_priority (&sigev, EV_MAXPRI); 1302 ev_set_priority (&pipeev, EV_MAXPRI);
1091 } 1303 }
1092} 1304}
1093 1305
1094static void noinline 1306static void noinline
1095loop_destroy (EV_P) 1307loop_destroy (EV_P)
1096{ 1308{
1097 int i; 1309 int i;
1310
1311 if (ev_is_active (&pipeev))
1312 {
1313 ev_ref (EV_A); /* signal watcher */
1314 ev_io_stop (EV_A_ &pipeev);
1315
1316#if EV_USE_EVENTFD
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 }
1326 }
1098 1327
1099#if EV_USE_INOTIFY 1328#if EV_USE_INOTIFY
1100 if (fs_fd >= 0) 1329 if (fs_fd >= 0)
1101 close (fs_fd); 1330 close (fs_fd);
1102#endif 1331#endif
… …
1139#if EV_FORK_ENABLE 1368#if EV_FORK_ENABLE
1140 array_free (fork, EMPTY); 1369 array_free (fork, EMPTY);
1141#endif 1370#endif
1142 array_free (prepare, EMPTY); 1371 array_free (prepare, EMPTY);
1143 array_free (check, EMPTY); 1372 array_free (check, EMPTY);
1373#if EV_ASYNC_ENABLE
1374 array_free (async, EMPTY);
1375#endif
1144 1376
1145 backend = 0; 1377 backend = 0;
1146} 1378}
1147 1379
1380#if EV_USE_INOTIFY
1148void inline_size infy_fork (EV_P); 1381void inline_size infy_fork (EV_P);
1382#endif
1149 1383
1150void inline_size 1384void inline_size
1151loop_fork (EV_P) 1385loop_fork (EV_P)
1152{ 1386{
1153#if EV_USE_PORT 1387#if EV_USE_PORT
… …
1161#endif 1395#endif
1162#if EV_USE_INOTIFY 1396#if EV_USE_INOTIFY
1163 infy_fork (EV_A); 1397 infy_fork (EV_A);
1164#endif 1398#endif
1165 1399
1166 if (ev_is_active (&sigev)) 1400 if (ev_is_active (&pipeev))
1167 { 1401 {
1168 /* default loop */ 1402 /* this "locks" the handlers against writing to the pipe */
1403 /* while we modify the fd vars */
1404 gotsig = 1;
1405#if EV_ASYNC_ENABLE
1406 gotasync = 1;
1407#endif
1169 1408
1170 ev_ref (EV_A); 1409 ev_ref (EV_A);
1171 ev_io_stop (EV_A_ &sigev); 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 {
1172 close (sigpipe [0]); 1419 close (evpipe [0]);
1173 close (sigpipe [1]); 1420 close (evpipe [1]);
1421 }
1174 1422
1175 while (pipe (sigpipe))
1176 syserr ("(libev) error creating pipe");
1177
1178 siginit (EV_A); 1423 evpipe_init (EV_A);
1424 /* now iterate over everything, in case we missed something */
1179 sigcb (EV_A_ &sigev, EV_READ); 1425 pipecb (EV_A_ &pipeev, EV_READ);
1180 } 1426 }
1181 1427
1182 postfork = 0; 1428 postfork = 0;
1183} 1429}
1184 1430
… …
1208void 1454void
1209ev_loop_fork (EV_P) 1455ev_loop_fork (EV_P)
1210{ 1456{
1211 postfork = 1; /* must be in line with ev_default_fork */ 1457 postfork = 1; /* must be in line with ev_default_fork */
1212} 1458}
1213
1214#endif 1459#endif
1215 1460
1216#if EV_MULTIPLICITY 1461#if EV_MULTIPLICITY
1217struct ev_loop * 1462struct ev_loop *
1218ev_default_loop_init (unsigned int flags) 1463ev_default_loop_init (unsigned int flags)
1219#else 1464#else
1220int 1465int
1221ev_default_loop (unsigned int flags) 1466ev_default_loop (unsigned int flags)
1222#endif 1467#endif
1223{ 1468{
1224 if (sigpipe [0] == sigpipe [1])
1225 if (pipe (sigpipe))
1226 return 0;
1227
1228 if (!ev_default_loop_ptr) 1469 if (!ev_default_loop_ptr)
1229 { 1470 {
1230#if EV_MULTIPLICITY 1471#if EV_MULTIPLICITY
1231 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1472 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1232#else 1473#else
… …
1235 1476
1236 loop_init (EV_A_ flags); 1477 loop_init (EV_A_ flags);
1237 1478
1238 if (ev_backend (EV_A)) 1479 if (ev_backend (EV_A))
1239 { 1480 {
1240 siginit (EV_A);
1241
1242#ifndef _WIN32 1481#ifndef _WIN32
1243 ev_signal_init (&childev, childcb, SIGCHLD); 1482 ev_signal_init (&childev, childcb, SIGCHLD);
1244 ev_set_priority (&childev, EV_MAXPRI); 1483 ev_set_priority (&childev, EV_MAXPRI);
1245 ev_signal_start (EV_A_ &childev); 1484 ev_signal_start (EV_A_ &childev);
1246 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1485 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1263#ifndef _WIN32 1502#ifndef _WIN32
1264 ev_ref (EV_A); /* child watcher */ 1503 ev_ref (EV_A); /* child watcher */
1265 ev_signal_stop (EV_A_ &childev); 1504 ev_signal_stop (EV_A_ &childev);
1266#endif 1505#endif
1267 1506
1268 ev_ref (EV_A); /* signal watcher */
1269 ev_io_stop (EV_A_ &sigev);
1270
1271 close (sigpipe [0]); sigpipe [0] = 0;
1272 close (sigpipe [1]); sigpipe [1] = 0;
1273
1274 loop_destroy (EV_A); 1507 loop_destroy (EV_A);
1275} 1508}
1276 1509
1277void 1510void
1278ev_default_fork (void) 1511ev_default_fork (void)
… …
1310 p->w->pending = 0; 1543 p->w->pending = 0;
1311 EV_CB_INVOKE (p->w, p->events); 1544 EV_CB_INVOKE (p->w, p->events);
1312 } 1545 }
1313 } 1546 }
1314} 1547}
1315
1316void inline_size
1317timers_reify (EV_P)
1318{
1319 while (timercnt && ((WT)timers [0])->at <= mn_now)
1320 {
1321 ev_timer *w = (ev_timer *)timers [0];
1322
1323 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1324
1325 /* first reschedule or stop timer */
1326 if (w->repeat)
1327 {
1328 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1329
1330 ((WT)w)->at += w->repeat;
1331 if (((WT)w)->at < mn_now)
1332 ((WT)w)->at = mn_now;
1333
1334 downheap (timers, timercnt, 0);
1335 }
1336 else
1337 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1338
1339 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1340 }
1341}
1342
1343#if EV_PERIODIC_ENABLE
1344void inline_size
1345periodics_reify (EV_P)
1346{
1347 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1348 {
1349 ev_periodic *w = (ev_periodic *)periodics [0];
1350
1351 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1352
1353 /* first reschedule or stop timer */
1354 if (w->reschedule_cb)
1355 {
1356 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1357 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1358 downheap (periodics, periodiccnt, 0);
1359 }
1360 else if (w->interval)
1361 {
1362 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1363 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1364 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1365 downheap (periodics, periodiccnt, 0);
1366 }
1367 else
1368 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1369
1370 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1371 }
1372}
1373
1374static void noinline
1375periodics_reschedule (EV_P)
1376{
1377 int i;
1378
1379 /* adjust periodics after time jump */
1380 for (i = 0; i < periodiccnt; ++i)
1381 {
1382 ev_periodic *w = (ev_periodic *)periodics [i];
1383
1384 if (w->reschedule_cb)
1385 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1386 else if (w->interval)
1387 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1388 }
1389
1390 /* now rebuild the heap */
1391 for (i = periodiccnt >> 1; i--; )
1392 downheap (periodics, periodiccnt, i);
1393}
1394#endif
1395 1548
1396#if EV_IDLE_ENABLE 1549#if EV_IDLE_ENABLE
1397void inline_size 1550void inline_size
1398idle_reify (EV_P) 1551idle_reify (EV_P)
1399{ 1552{
… …
1411 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1564 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1412 break; 1565 break;
1413 } 1566 }
1414 } 1567 }
1415 } 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);
1416} 1649}
1417#endif 1650#endif
1418 1651
1419void inline_speed 1652void inline_speed
1420time_update (EV_P_ ev_tstamp max_block) 1653time_update (EV_P_ ev_tstamp max_block)
… …
1449 */ 1682 */
1450 for (i = 4; --i; ) 1683 for (i = 4; --i; )
1451 { 1684 {
1452 rtmn_diff = ev_rt_now - mn_now; 1685 rtmn_diff = ev_rt_now - mn_now;
1453 1686
1454 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1687 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1455 return; /* all is well */ 1688 return; /* all is well */
1456 1689
1457 ev_rt_now = ev_time (); 1690 ev_rt_now = ev_time ();
1458 mn_now = get_clock (); 1691 mn_now = get_clock ();
1459 now_floor = mn_now; 1692 now_floor = mn_now;
… …
1474 { 1707 {
1475#if EV_PERIODIC_ENABLE 1708#if EV_PERIODIC_ENABLE
1476 periodics_reschedule (EV_A); 1709 periodics_reschedule (EV_A);
1477#endif 1710#endif
1478 /* 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 */
1479 for (i = 0; i < timercnt; ++i) 1712 for (i = 1; i <= timercnt; ++i)
1480 ((WT)timers [i])->at += ev_rt_now - mn_now; 1713 ev_at (timers [i]) += ev_rt_now - mn_now;
1481 } 1714 }
1482 1715
1483 mn_now = ev_rt_now; 1716 mn_now = ev_rt_now;
1484 } 1717 }
1485} 1718}
… …
1499static int loop_done; 1732static int loop_done;
1500 1733
1501void 1734void
1502ev_loop (EV_P_ int flags) 1735ev_loop (EV_P_ int flags)
1503{ 1736{
1504 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1737 loop_done = EVUNLOOP_CANCEL;
1505 ? EVUNLOOP_ONE
1506 : EVUNLOOP_CANCEL;
1507 1738
1508 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 */
1509 1740
1510 do 1741 do
1511 { 1742 {
… …
1557 1788
1558 waittime = MAX_BLOCKTIME; 1789 waittime = MAX_BLOCKTIME;
1559 1790
1560 if (timercnt) 1791 if (timercnt)
1561 { 1792 {
1562 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1793 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1563 if (waittime > to) waittime = to; 1794 if (waittime > to) waittime = to;
1564 } 1795 }
1565 1796
1566#if EV_PERIODIC_ENABLE 1797#if EV_PERIODIC_ENABLE
1567 if (periodiccnt) 1798 if (periodiccnt)
1568 { 1799 {
1569 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;
1570 if (waittime > to) waittime = to; 1801 if (waittime > to) waittime = to;
1571 } 1802 }
1572#endif 1803#endif
1573 1804
1574 if (expect_false (waittime < timeout_blocktime)) 1805 if (expect_false (waittime < timeout_blocktime))
… …
1607 /* queue check watchers, to be executed first */ 1838 /* queue check watchers, to be executed first */
1608 if (expect_false (checkcnt)) 1839 if (expect_false (checkcnt))
1609 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1840 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1610 1841
1611 call_pending (EV_A); 1842 call_pending (EV_A);
1612
1613 } 1843 }
1614 while (expect_true (activecnt && !loop_done)); 1844 while (expect_true (
1845 activecnt
1846 && !loop_done
1847 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1848 ));
1615 1849
1616 if (loop_done == EVUNLOOP_ONE) 1850 if (loop_done == EVUNLOOP_ONE)
1617 loop_done = EVUNLOOP_CANCEL; 1851 loop_done = EVUNLOOP_CANCEL;
1618} 1852}
1619 1853
… …
1737ev_timer_start (EV_P_ ev_timer *w) 1971ev_timer_start (EV_P_ ev_timer *w)
1738{ 1972{
1739 if (expect_false (ev_is_active (w))) 1973 if (expect_false (ev_is_active (w)))
1740 return; 1974 return;
1741 1975
1742 ((WT)w)->at += mn_now; 1976 ev_at (w) += mn_now;
1743 1977
1744 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.));
1745 1979
1746 ev_start (EV_A_ (W)w, ++timercnt); 1980 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1747 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1981 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1748 timers [timercnt - 1] = (WT)w; 1982 timers [ev_active (w)] = (WT)w;
1749 upheap (timers, timercnt - 1); 1983 upheap (timers, ev_active (w));
1750 1984
1751 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1985 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1752} 1986}
1753 1987
1754void noinline 1988void noinline
1755ev_timer_stop (EV_P_ ev_timer *w) 1989ev_timer_stop (EV_P_ ev_timer *w)
1756{ 1990{
1757 clear_pending (EV_A_ (W)w); 1991 clear_pending (EV_A_ (W)w);
1758 if (expect_false (!ev_is_active (w))) 1992 if (expect_false (!ev_is_active (w)))
1759 return; 1993 return;
1760 1994
1761 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1762
1763 { 1995 {
1764 int active = ((W)w)->active; 1996 int active = ev_active (w);
1765 1997
1998 assert (("internal timer heap corruption", timers [active] == (WT)w));
1999
1766 if (expect_true (--active < --timercnt)) 2000 if (expect_true (active < timercnt + HEAP0 - 1))
1767 { 2001 {
1768 timers [active] = timers [timercnt]; 2002 timers [active] = timers [timercnt + HEAP0 - 1];
1769 adjustheap (timers, timercnt, active); 2003 adjustheap (timers, timercnt, active);
1770 } 2004 }
2005
2006 --timercnt;
1771 } 2007 }
1772 2008
1773 ((WT)w)->at -= mn_now; 2009 ev_at (w) -= mn_now;
1774 2010
1775 ev_stop (EV_A_ (W)w); 2011 ev_stop (EV_A_ (W)w);
1776} 2012}
1777 2013
1778void noinline 2014void noinline
… …
1780{ 2016{
1781 if (ev_is_active (w)) 2017 if (ev_is_active (w))
1782 { 2018 {
1783 if (w->repeat) 2019 if (w->repeat)
1784 { 2020 {
1785 ((WT)w)->at = mn_now + w->repeat; 2021 ev_at (w) = mn_now + w->repeat;
1786 adjustheap (timers, timercnt, ((W)w)->active - 1); 2022 adjustheap (timers, timercnt, ev_active (w));
1787 } 2023 }
1788 else 2024 else
1789 ev_timer_stop (EV_A_ w); 2025 ev_timer_stop (EV_A_ w);
1790 } 2026 }
1791 else if (w->repeat) 2027 else if (w->repeat)
1792 { 2028 {
1793 w->at = w->repeat; 2029 ev_at (w) = w->repeat;
1794 ev_timer_start (EV_A_ w); 2030 ev_timer_start (EV_A_ w);
1795 } 2031 }
1796} 2032}
1797 2033
1798#if EV_PERIODIC_ENABLE 2034#if EV_PERIODIC_ENABLE
… …
1801{ 2037{
1802 if (expect_false (ev_is_active (w))) 2038 if (expect_false (ev_is_active (w)))
1803 return; 2039 return;
1804 2040
1805 if (w->reschedule_cb) 2041 if (w->reschedule_cb)
1806 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2042 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1807 else if (w->interval) 2043 else if (w->interval)
1808 { 2044 {
1809 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.));
1810 /* 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 */
1811 ((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;
1812 } 2048 }
1813 else 2049 else
1814 ((WT)w)->at = w->offset; 2050 ev_at (w) = w->offset;
1815 2051
1816 ev_start (EV_A_ (W)w, ++periodiccnt); 2052 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1817 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2053 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1818 periodics [periodiccnt - 1] = (WT)w; 2054 periodics [ev_active (w)] = (WT)w;
1819 upheap (periodics, periodiccnt - 1); 2055 upheap (periodics, ev_active (w));
1820 2056
1821 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2057 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1822} 2058}
1823 2059
1824void noinline 2060void noinline
1825ev_periodic_stop (EV_P_ ev_periodic *w) 2061ev_periodic_stop (EV_P_ ev_periodic *w)
1826{ 2062{
1827 clear_pending (EV_A_ (W)w); 2063 clear_pending (EV_A_ (W)w);
1828 if (expect_false (!ev_is_active (w))) 2064 if (expect_false (!ev_is_active (w)))
1829 return; 2065 return;
1830 2066
1831 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1832
1833 { 2067 {
1834 int active = ((W)w)->active; 2068 int active = ev_active (w);
1835 2069
2070 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
2071
1836 if (expect_true (--active < --periodiccnt)) 2072 if (expect_true (active < periodiccnt + HEAP0 - 1))
1837 { 2073 {
1838 periodics [active] = periodics [periodiccnt]; 2074 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1839 adjustheap (periodics, periodiccnt, active); 2075 adjustheap (periodics, periodiccnt, active);
1840 } 2076 }
2077
2078 --periodiccnt;
1841 } 2079 }
1842 2080
1843 ev_stop (EV_A_ (W)w); 2081 ev_stop (EV_A_ (W)w);
1844} 2082}
1845 2083
… …
1864#endif 2102#endif
1865 if (expect_false (ev_is_active (w))) 2103 if (expect_false (ev_is_active (w)))
1866 return; 2104 return;
1867 2105
1868 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2106 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2107
2108 evpipe_init (EV_A);
1869 2109
1870 { 2110 {
1871#ifndef _WIN32 2111#ifndef _WIN32
1872 sigset_t full, prev; 2112 sigset_t full, prev;
1873 sigfillset (&full); 2113 sigfillset (&full);
… …
1885 wlist_add (&signals [w->signum - 1].head, (WL)w); 2125 wlist_add (&signals [w->signum - 1].head, (WL)w);
1886 2126
1887 if (!((WL)w)->next) 2127 if (!((WL)w)->next)
1888 { 2128 {
1889#if _WIN32 2129#if _WIN32
1890 signal (w->signum, sighandler); 2130 signal (w->signum, ev_sighandler);
1891#else 2131#else
1892 struct sigaction sa; 2132 struct sigaction sa;
1893 sa.sa_handler = sighandler; 2133 sa.sa_handler = ev_sighandler;
1894 sigfillset (&sa.sa_mask); 2134 sigfillset (&sa.sa_mask);
1895 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 */
1896 sigaction (w->signum, &sa, 0); 2136 sigaction (w->signum, &sa, 0);
1897#endif 2137#endif
1898 } 2138 }
… …
1959 if (w->wd < 0) 2199 if (w->wd < 0)
1960 { 2200 {
1961 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 */
1962 2202
1963 /* 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 */
1964 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2206 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1965 { 2207 {
1966 char path [4096]; 2208 char path [4096];
1967 strcpy (path, w->path); 2209 strcpy (path, w->path);
1968 2210
… …
2213 clear_pending (EV_A_ (W)w); 2455 clear_pending (EV_A_ (W)w);
2214 if (expect_false (!ev_is_active (w))) 2456 if (expect_false (!ev_is_active (w)))
2215 return; 2457 return;
2216 2458
2217 { 2459 {
2218 int active = ((W)w)->active; 2460 int active = ev_active (w);
2219 2461
2220 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2462 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2221 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2463 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2222 2464
2223 ev_stop (EV_A_ (W)w); 2465 ev_stop (EV_A_ (W)w);
2224 --idleall; 2466 --idleall;
2225 } 2467 }
2226} 2468}
… …
2243 clear_pending (EV_A_ (W)w); 2485 clear_pending (EV_A_ (W)w);
2244 if (expect_false (!ev_is_active (w))) 2486 if (expect_false (!ev_is_active (w)))
2245 return; 2487 return;
2246 2488
2247 { 2489 {
2248 int active = ((W)w)->active; 2490 int active = ev_active (w);
2491
2249 prepares [active - 1] = prepares [--preparecnt]; 2492 prepares [active - 1] = prepares [--preparecnt];
2250 ((W)prepares [active - 1])->active = active; 2493 ev_active (prepares [active - 1]) = active;
2251 } 2494 }
2252 2495
2253 ev_stop (EV_A_ (W)w); 2496 ev_stop (EV_A_ (W)w);
2254} 2497}
2255 2498
… …
2270 clear_pending (EV_A_ (W)w); 2513 clear_pending (EV_A_ (W)w);
2271 if (expect_false (!ev_is_active (w))) 2514 if (expect_false (!ev_is_active (w)))
2272 return; 2515 return;
2273 2516
2274 { 2517 {
2275 int active = ((W)w)->active; 2518 int active = ev_active (w);
2519
2276 checks [active - 1] = checks [--checkcnt]; 2520 checks [active - 1] = checks [--checkcnt];
2277 ((W)checks [active - 1])->active = active; 2521 ev_active (checks [active - 1]) = active;
2278 } 2522 }
2279 2523
2280 ev_stop (EV_A_ (W)w); 2524 ev_stop (EV_A_ (W)w);
2281} 2525}
2282 2526
… …
2378 clear_pending (EV_A_ (W)w); 2622 clear_pending (EV_A_ (W)w);
2379 if (expect_false (!ev_is_active (w))) 2623 if (expect_false (!ev_is_active (w)))
2380 return; 2624 return;
2381 2625
2382 { 2626 {
2383 int active = ((W)w)->active; 2627 int active = ev_active (w);
2628
2384 forks [active - 1] = forks [--forkcnt]; 2629 forks [active - 1] = forks [--forkcnt];
2385 ((W)forks [active - 1])->active = active; 2630 ev_active (forks [active - 1]) = active;
2386 } 2631 }
2387 2632
2388 ev_stop (EV_A_ (W)w); 2633 ev_stop (EV_A_ (W)w);
2634}
2635#endif
2636
2637#if EV_ASYNC_ENABLE
2638void
2639ev_async_start (EV_P_ ev_async *w)
2640{
2641 if (expect_false (ev_is_active (w)))
2642 return;
2643
2644 evpipe_init (EV_A);
2645
2646 ev_start (EV_A_ (W)w, ++asynccnt);
2647 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2648 asyncs [asynccnt - 1] = w;
2649}
2650
2651void
2652ev_async_stop (EV_P_ ev_async *w)
2653{
2654 clear_pending (EV_A_ (W)w);
2655 if (expect_false (!ev_is_active (w)))
2656 return;
2657
2658 {
2659 int active = ev_active (w);
2660
2661 asyncs [active - 1] = asyncs [--asynccnt];
2662 ev_active (asyncs [active - 1]) = active;
2663 }
2664
2665 ev_stop (EV_A_ (W)w);
2666}
2667
2668void
2669ev_async_send (EV_P_ ev_async *w)
2670{
2671 w->sent = 1;
2672 evpipe_write (EV_A_ &gotasync);
2389} 2673}
2390#endif 2674#endif
2391 2675
2392/*****************************************************************************/ 2676/*****************************************************************************/
2393 2677

Diff Legend

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