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

Comparing libev/ev.c (file contents):
Revision 1.195 by root, Sat Dec 22 11:44:51 2007 UTC vs.
Revision 1.228 by root, Fri May 2 08:07:37 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 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * modification, are permitted provided that the following conditions are 8 * tion, are permitted provided that the following conditions are met:
9 * met: 9 *
10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE.
10 * 27 *
11 * * Redistributions of source code must retain the above copyright 28 * Alternatively, the contents of this file may be used under the terms of
12 * notice, this list of conditions and the following disclaimer. 29 * the GNU General Public License ("GPL") version 2 or any later version,
13 * 30 * in which case the provisions of the GPL are applicable instead of
14 * * Redistributions in binary form must reproduce the above 31 * the above. If you wish to allow the use of your version of this file
15 * copyright notice, this list of conditions and the following 32 * only under the terms of the GPL and not to allow others to use your
16 * disclaimer in the documentation and/or other materials provided 33 * version of this file under the BSD license, indicate your decision
17 * with the distribution. 34 * by deleting the provisions above and replace them with the notice
18 * 35 * and other provisions required by the GPL. If you do not delete the
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 36 * provisions above, a recipient may use your version of this file under
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 37 * either the BSD or the GPL.
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 38 */
31 39
32#ifdef __cplusplus 40#ifdef __cplusplus
33extern "C" { 41extern "C" {
34#endif 42#endif
35 43
44/* this big block deduces configuration from config.h */
36#ifndef EV_STANDALONE 45#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H 46# ifdef EV_CONFIG_H
38# include EV_CONFIG_H 47# include EV_CONFIG_H
39# else 48# else
40# include "config.h" 49# include "config.h"
… …
110# else 119# else
111# define EV_USE_INOTIFY 0 120# define EV_USE_INOTIFY 0
112# endif 121# endif
113# endif 122# endif
114 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
115#endif 132#endif
116 133
117#include <math.h> 134#include <math.h>
118#include <stdlib.h> 135#include <stdlib.h>
119#include <fcntl.h> 136#include <fcntl.h>
… …
144# ifndef EV_SELECT_IS_WINSOCKET 161# ifndef EV_SELECT_IS_WINSOCKET
145# define EV_SELECT_IS_WINSOCKET 1 162# define EV_SELECT_IS_WINSOCKET 1
146# endif 163# endif
147#endif 164#endif
148 165
149/**/ 166/* this block tries to deduce configuration from header-defined symbols and defaults */
150 167
151#ifndef EV_USE_MONOTONIC 168#ifndef EV_USE_MONOTONIC
152# define EV_USE_MONOTONIC 0 169# define EV_USE_MONOTONIC 0
153#endif 170#endif
154 171
… …
171# define EV_USE_POLL 1 188# define EV_USE_POLL 1
172# endif 189# endif
173#endif 190#endif
174 191
175#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
176# define EV_USE_EPOLL 0 196# define EV_USE_EPOLL 0
197# endif
177#endif 198#endif
178 199
179#ifndef EV_USE_KQUEUE 200#ifndef EV_USE_KQUEUE
180# define EV_USE_KQUEUE 0 201# define EV_USE_KQUEUE 0
181#endif 202#endif
… …
183#ifndef EV_USE_PORT 204#ifndef EV_USE_PORT
184# define EV_USE_PORT 0 205# define EV_USE_PORT 0
185#endif 206#endif
186 207
187#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
188# define EV_USE_INOTIFY 0 212# define EV_USE_INOTIFY 0
213# endif
189#endif 214#endif
190 215
191#ifndef EV_PID_HASHSIZE 216#ifndef EV_PID_HASHSIZE
192# if EV_MINIMAL 217# if EV_MINIMAL
193# define EV_PID_HASHSIZE 1 218# define EV_PID_HASHSIZE 1
… …
202# else 227# else
203# define EV_INOTIFY_HASHSIZE 16 228# define EV_INOTIFY_HASHSIZE 16
204# endif 229# endif
205#endif 230#endif
206 231
207/**/ 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 */
208 241
209#ifndef CLOCK_MONOTONIC 242#ifndef CLOCK_MONOTONIC
210# undef EV_USE_MONOTONIC 243# undef EV_USE_MONOTONIC
211# define EV_USE_MONOTONIC 0 244# define EV_USE_MONOTONIC 0
212#endif 245#endif
… …
231# include <sys/inotify.h> 264# include <sys/inotify.h>
232#endif 265#endif
233 266
234#if EV_SELECT_IS_WINSOCKET 267#if EV_SELECT_IS_WINSOCKET
235# 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
236#endif 281#endif
237 282
238/**/ 283/**/
239 284
240/* 285/*
… …
255# define expect(expr,value) __builtin_expect ((expr),(value)) 300# define expect(expr,value) __builtin_expect ((expr),(value))
256# define noinline __attribute__ ((noinline)) 301# define noinline __attribute__ ((noinline))
257#else 302#else
258# define expect(expr,value) (expr) 303# define expect(expr,value) (expr)
259# define noinline 304# define noinline
260# if __STDC_VERSION__ < 199901L 305# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
261# define inline 306# define inline
262# endif 307# endif
263#endif 308#endif
264 309
265#define expect_false(expr) expect ((expr) != 0, 0) 310#define expect_false(expr) expect ((expr) != 0, 0)
… …
280 325
281typedef ev_watcher *W; 326typedef ev_watcher *W;
282typedef ev_watcher_list *WL; 327typedef ev_watcher_list *WL;
283typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
284 329
330#define ev_at(w) ((WT)(w))->at
331
332#if EV_USE_MONOTONIC
285/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 333/* sig_atomic_t is used to avoid per-thread variables or locking but still */
286/* giving it a reasonably high chance of working on typical architetcures */ 334/* giving it a reasonably high chance of working on typical architetcures */
287static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 335static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
336#endif
288 337
289#ifdef _WIN32 338#ifdef _WIN32
290# include "ev_win32.c" 339# include "ev_win32.c"
291#endif 340#endif
292 341
… …
313 perror (msg); 362 perror (msg);
314 abort (); 363 abort ();
315 } 364 }
316} 365}
317 366
367static void *
368ev_realloc_emul (void *ptr, long size)
369{
370 /* some systems, notably openbsd and darwin, fail to properly
371 * implement realloc (x, 0) (as required by both ansi c-98 and
372 * the single unix specification, so work around them here.
373 */
374
375 if (size)
376 return realloc (ptr, size);
377
378 free (ptr);
379 return 0;
380}
381
318static void *(*alloc)(void *ptr, long size); 382static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
319 383
320void 384void
321ev_set_allocator (void *(*cb)(void *ptr, long size)) 385ev_set_allocator (void *(*cb)(void *ptr, long size))
322{ 386{
323 alloc = cb; 387 alloc = cb;
324} 388}
325 389
326inline_speed void * 390inline_speed void *
327ev_realloc (void *ptr, long size) 391ev_realloc (void *ptr, long size)
328{ 392{
329 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 393 ptr = alloc (ptr, size);
330 394
331 if (!ptr && size) 395 if (!ptr && size)
332 { 396 {
333 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 397 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
334 abort (); 398 abort ();
… …
441 ts.tv_sec = (time_t)delay; 505 ts.tv_sec = (time_t)delay;
442 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 506 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
443 507
444 nanosleep (&ts, 0); 508 nanosleep (&ts, 0);
445#elif defined(_WIN32) 509#elif defined(_WIN32)
446 Sleep (delay * 1e3); 510 Sleep ((unsigned long)(delay * 1e3));
447#else 511#else
448 struct timeval tv; 512 struct timeval tv;
449 513
450 tv.tv_sec = (time_t)delay; 514 tv.tv_sec = (time_t)delay;
451 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 515 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
590 654
591#if EV_SELECT_IS_WINSOCKET 655#if EV_SELECT_IS_WINSOCKET
592 if (events) 656 if (events)
593 { 657 {
594 unsigned long argp; 658 unsigned long argp;
659 #ifdef EV_FD_TO_WIN32_HANDLE
660 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
661 #else
595 anfd->handle = _get_osfhandle (fd); 662 anfd->handle = _get_osfhandle (fd);
663 #endif
596 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 664 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
597 } 665 }
598#endif 666#endif
599 667
600 { 668 {
… …
688 } 756 }
689} 757}
690 758
691/*****************************************************************************/ 759/*****************************************************************************/
692 760
761/* towards the root */
693void inline_speed 762void inline_speed
694upheap (WT *heap, int k) 763upheap (WT *heap, int k)
695{ 764{
696 WT w = heap [k]; 765 WT w = heap [k];
697 766
698 while (k) 767 for (;;)
699 { 768 {
700 int p = (k - 1) >> 1; 769 int p = k >> 1;
701 770
771 /* maybe we could use a dummy element at heap [0]? */
702 if (heap [p]->at <= w->at) 772 if (!p || heap [p]->at <= w->at)
703 break; 773 break;
704 774
705 heap [k] = heap [p]; 775 heap [k] = heap [p];
706 ((W)heap [k])->active = k + 1; 776 ((W)heap [k])->active = k;
707 k = p; 777 k = p;
708 } 778 }
709 779
710 heap [k] = w; 780 heap [k] = w;
711 ((W)heap [k])->active = k + 1; 781 ((W)heap [k])->active = k;
712} 782}
713 783
784/* away from the root */
714void inline_speed 785void inline_speed
715downheap (WT *heap, int N, int k) 786downheap (WT *heap, int N, int k)
716{ 787{
717 WT w = heap [k]; 788 WT w = heap [k];
718 789
719 for (;;) 790 for (;;)
720 { 791 {
721 int c = (k << 1) + 1; 792 int c = k << 1;
722 793
723 if (c >= N) 794 if (c > N)
724 break; 795 break;
725 796
726 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 797 c += c < N && heap [c]->at > heap [c + 1]->at
727 ? 1 : 0; 798 ? 1 : 0;
728 799
729 if (w->at <= heap [c]->at) 800 if (w->at <= heap [c]->at)
730 break; 801 break;
731 802
732 heap [k] = heap [c]; 803 heap [k] = heap [c];
733 ((W)heap [k])->active = k + 1; 804 ((W)heap [k])->active = k;
734 805
735 k = c; 806 k = c;
736 } 807 }
737 808
738 heap [k] = w; 809 heap [k] = w;
739 ((W)heap [k])->active = k + 1; 810 ((W)heap [k])->active = k;
740} 811}
741 812
742void inline_size 813void inline_size
743adjustheap (WT *heap, int N, int k) 814adjustheap (WT *heap, int N, int k)
744{ 815{
… …
749/*****************************************************************************/ 820/*****************************************************************************/
750 821
751typedef struct 822typedef struct
752{ 823{
753 WL head; 824 WL head;
754 sig_atomic_t volatile gotsig; 825 EV_ATOMIC_T gotsig;
755} ANSIG; 826} ANSIG;
756 827
757static ANSIG *signals; 828static ANSIG *signals;
758static int signalmax; 829static int signalmax;
759 830
760static int sigpipe [2]; 831static EV_ATOMIC_T gotsig;
761static sig_atomic_t volatile gotsig;
762static ev_io sigev;
763 832
764void inline_size 833void inline_size
765signals_init (ANSIG *base, int count) 834signals_init (ANSIG *base, int count)
766{ 835{
767 while (count--) 836 while (count--)
… …
771 840
772 ++base; 841 ++base;
773 } 842 }
774} 843}
775 844
776static void 845/*****************************************************************************/
777sighandler (int signum)
778{
779#if _WIN32
780 signal (signum, sighandler);
781#endif
782
783 signals [signum - 1].gotsig = 1;
784
785 if (!gotsig)
786 {
787 int old_errno = errno;
788 gotsig = 1;
789 write (sigpipe [1], &signum, 1);
790 errno = old_errno;
791 }
792}
793
794void noinline
795ev_feed_signal_event (EV_P_ int signum)
796{
797 WL w;
798
799#if EV_MULTIPLICITY
800 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
801#endif
802
803 --signum;
804
805 if (signum < 0 || signum >= signalmax)
806 return;
807
808 signals [signum].gotsig = 0;
809
810 for (w = signals [signum].head; w; w = w->next)
811 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
812}
813
814static void
815sigcb (EV_P_ ev_io *iow, int revents)
816{
817 int signum;
818
819 read (sigpipe [0], &revents, 1);
820 gotsig = 0;
821
822 for (signum = signalmax; signum--; )
823 if (signals [signum].gotsig)
824 ev_feed_signal_event (EV_A_ signum + 1);
825}
826 846
827void inline_speed 847void inline_speed
828fd_intern (int fd) 848fd_intern (int fd)
829{ 849{
830#ifdef _WIN32 850#ifdef _WIN32
… …
835 fcntl (fd, F_SETFL, O_NONBLOCK); 855 fcntl (fd, F_SETFL, O_NONBLOCK);
836#endif 856#endif
837} 857}
838 858
839static void noinline 859static void noinline
840siginit (EV_P) 860evpipe_init (EV_P)
841{ 861{
862 if (!ev_is_active (&pipeev))
863 {
864#if EV_USE_EVENTFD
865 if ((evfd = eventfd (0, 0)) >= 0)
866 {
867 evpipe [0] = -1;
868 fd_intern (evfd);
869 ev_io_set (&pipeev, evfd, EV_READ);
870 }
871 else
872#endif
873 {
874 while (pipe (evpipe))
875 syserr ("(libev) error creating signal/async pipe");
876
842 fd_intern (sigpipe [0]); 877 fd_intern (evpipe [0]);
843 fd_intern (sigpipe [1]); 878 fd_intern (evpipe [1]);
879 ev_io_set (&pipeev, evpipe [0], EV_READ);
880 }
844 881
845 ev_io_set (&sigev, sigpipe [0], EV_READ);
846 ev_io_start (EV_A_ &sigev); 882 ev_io_start (EV_A_ &pipeev);
847 ev_unref (EV_A); /* child watcher should not keep loop alive */ 883 ev_unref (EV_A); /* watcher should not keep loop alive */
884 }
885}
886
887void inline_size
888evpipe_write (EV_P_ EV_ATOMIC_T *flag)
889{
890 if (!*flag)
891 {
892 int old_errno = errno; /* save errno because write might clobber it */
893
894 *flag = 1;
895
896#if EV_USE_EVENTFD
897 if (evfd >= 0)
898 {
899 uint64_t counter = 1;
900 write (evfd, &counter, sizeof (uint64_t));
901 }
902 else
903#endif
904 write (evpipe [1], &old_errno, 1);
905
906 errno = old_errno;
907 }
908}
909
910static void
911pipecb (EV_P_ ev_io *iow, int revents)
912{
913#if EV_USE_EVENTFD
914 if (evfd >= 0)
915 {
916 uint64_t counter = 1;
917 read (evfd, &counter, sizeof (uint64_t));
918 }
919 else
920#endif
921 {
922 char dummy;
923 read (evpipe [0], &dummy, 1);
924 }
925
926 if (gotsig && ev_is_default_loop (EV_A))
927 {
928 int signum;
929 gotsig = 0;
930
931 for (signum = signalmax; signum--; )
932 if (signals [signum].gotsig)
933 ev_feed_signal_event (EV_A_ signum + 1);
934 }
935
936#if EV_ASYNC_ENABLE
937 if (gotasync)
938 {
939 int i;
940 gotasync = 0;
941
942 for (i = asynccnt; i--; )
943 if (asyncs [i]->sent)
944 {
945 asyncs [i]->sent = 0;
946 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
947 }
948 }
949#endif
848} 950}
849 951
850/*****************************************************************************/ 952/*****************************************************************************/
851 953
954static void
955ev_sighandler (int signum)
956{
957#if EV_MULTIPLICITY
958 struct ev_loop *loop = &default_loop_struct;
959#endif
960
961#if _WIN32
962 signal (signum, ev_sighandler);
963#endif
964
965 signals [signum - 1].gotsig = 1;
966 evpipe_write (EV_A_ &gotsig);
967}
968
969void noinline
970ev_feed_signal_event (EV_P_ int signum)
971{
972 WL w;
973
974#if EV_MULTIPLICITY
975 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
976#endif
977
978 --signum;
979
980 if (signum < 0 || signum >= signalmax)
981 return;
982
983 signals [signum].gotsig = 0;
984
985 for (w = signals [signum].head; w; w = w->next)
986 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
987}
988
989/*****************************************************************************/
990
852static WL childs [EV_PID_HASHSIZE]; 991static WL childs [EV_PID_HASHSIZE];
853 992
854#ifndef _WIN32 993#ifndef _WIN32
855 994
856static ev_signal childev; 995static ev_signal childev;
857 996
997#ifndef WIFCONTINUED
998# define WIFCONTINUED(status) 0
999#endif
1000
858void inline_speed 1001void inline_speed
859child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1002child_reap (EV_P_ int chain, int pid, int status)
860{ 1003{
861 ev_child *w; 1004 ev_child *w;
1005 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
862 1006
863 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1007 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1008 {
864 if (w->pid == pid || !w->pid) 1009 if ((w->pid == pid || !w->pid)
1010 && (!traced || (w->flags & 1)))
865 { 1011 {
866 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1012 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
867 w->rpid = pid; 1013 w->rpid = pid;
868 w->rstatus = status; 1014 w->rstatus = status;
869 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1015 ev_feed_event (EV_A_ (W)w, EV_CHILD);
870 } 1016 }
1017 }
871} 1018}
872 1019
873#ifndef WCONTINUED 1020#ifndef WCONTINUED
874# define WCONTINUED 0 1021# define WCONTINUED 0
875#endif 1022#endif
… …
884 if (!WCONTINUED 1031 if (!WCONTINUED
885 || errno != EINVAL 1032 || errno != EINVAL
886 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1033 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
887 return; 1034 return;
888 1035
889 /* make sure we are called again until all childs have been reaped */ 1036 /* make sure we are called again until all children have been reaped */
890 /* we need to do it this way so that the callback gets called before we continue */ 1037 /* we need to do it this way so that the callback gets called before we continue */
891 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1038 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
892 1039
893 child_reap (EV_A_ sw, pid, pid, status); 1040 child_reap (EV_A_ pid, pid, status);
894 if (EV_PID_HASHSIZE > 1) 1041 if (EV_PID_HASHSIZE > 1)
895 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1042 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
896} 1043}
897 1044
898#endif 1045#endif
899 1046
900/*****************************************************************************/ 1047/*****************************************************************************/
… …
972} 1119}
973 1120
974unsigned int 1121unsigned int
975ev_embeddable_backends (void) 1122ev_embeddable_backends (void)
976{ 1123{
1124 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1125
977 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1126 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
978 return EVBACKEND_KQUEUE 1127 /* please fix it and tell me how to detect the fix */
979 | EVBACKEND_PORT; 1128 flags &= ~EVBACKEND_EPOLL;
1129
1130 return flags;
980} 1131}
981 1132
982unsigned int 1133unsigned int
983ev_backend (EV_P) 1134ev_backend (EV_P)
984{ 1135{
… …
1014 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1165 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1015 have_monotonic = 1; 1166 have_monotonic = 1;
1016 } 1167 }
1017#endif 1168#endif
1018 1169
1019 ev_rt_now = ev_time (); 1170 ev_rt_now = ev_time ();
1020 mn_now = get_clock (); 1171 mn_now = get_clock ();
1021 now_floor = mn_now; 1172 now_floor = mn_now;
1022 rtmn_diff = ev_rt_now - mn_now; 1173 rtmn_diff = ev_rt_now - mn_now;
1023 1174
1024 io_blocktime = 0.; 1175 io_blocktime = 0.;
1025 timeout_blocktime = 0.; 1176 timeout_blocktime = 0.;
1177 backend = 0;
1178 backend_fd = -1;
1179 gotasync = 0;
1180#if EV_USE_INOTIFY
1181 fs_fd = -2;
1182#endif
1026 1183
1027 /* pid check not overridable via env */ 1184 /* pid check not overridable via env */
1028#ifndef _WIN32 1185#ifndef _WIN32
1029 if (flags & EVFLAG_FORKCHECK) 1186 if (flags & EVFLAG_FORKCHECK)
1030 curpid = getpid (); 1187 curpid = getpid ();
… …
1033 if (!(flags & EVFLAG_NOENV) 1190 if (!(flags & EVFLAG_NOENV)
1034 && !enable_secure () 1191 && !enable_secure ()
1035 && getenv ("LIBEV_FLAGS")) 1192 && getenv ("LIBEV_FLAGS"))
1036 flags = atoi (getenv ("LIBEV_FLAGS")); 1193 flags = atoi (getenv ("LIBEV_FLAGS"));
1037 1194
1038 if (!(flags & 0x0000ffffUL)) 1195 if (!(flags & 0x0000ffffU))
1039 flags |= ev_recommended_backends (); 1196 flags |= ev_recommended_backends ();
1040
1041 backend = 0;
1042 backend_fd = -1;
1043#if EV_USE_INOTIFY
1044 fs_fd = -2;
1045#endif
1046 1197
1047#if EV_USE_PORT 1198#if EV_USE_PORT
1048 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1199 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1049#endif 1200#endif
1050#if EV_USE_KQUEUE 1201#if EV_USE_KQUEUE
… …
1058#endif 1209#endif
1059#if EV_USE_SELECT 1210#if EV_USE_SELECT
1060 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1211 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1061#endif 1212#endif
1062 1213
1063 ev_init (&sigev, sigcb); 1214 ev_init (&pipeev, pipecb);
1064 ev_set_priority (&sigev, EV_MAXPRI); 1215 ev_set_priority (&pipeev, EV_MAXPRI);
1065 } 1216 }
1066} 1217}
1067 1218
1068static void noinline 1219static void noinline
1069loop_destroy (EV_P) 1220loop_destroy (EV_P)
1070{ 1221{
1071 int i; 1222 int i;
1223
1224 if (ev_is_active (&pipeev))
1225 {
1226 ev_ref (EV_A); /* signal watcher */
1227 ev_io_stop (EV_A_ &pipeev);
1228
1229#if EV_USE_EVENTFD
1230 if (evfd >= 0)
1231 close (evfd);
1232#endif
1233
1234 if (evpipe [0] >= 0)
1235 {
1236 close (evpipe [0]);
1237 close (evpipe [1]);
1238 }
1239 }
1072 1240
1073#if EV_USE_INOTIFY 1241#if EV_USE_INOTIFY
1074 if (fs_fd >= 0) 1242 if (fs_fd >= 0)
1075 close (fs_fd); 1243 close (fs_fd);
1076#endif 1244#endif
… …
1113#if EV_FORK_ENABLE 1281#if EV_FORK_ENABLE
1114 array_free (fork, EMPTY); 1282 array_free (fork, EMPTY);
1115#endif 1283#endif
1116 array_free (prepare, EMPTY); 1284 array_free (prepare, EMPTY);
1117 array_free (check, EMPTY); 1285 array_free (check, EMPTY);
1286#if EV_ASYNC_ENABLE
1287 array_free (async, EMPTY);
1288#endif
1118 1289
1119 backend = 0; 1290 backend = 0;
1120} 1291}
1121 1292
1293#if EV_USE_INOTIFY
1122void inline_size infy_fork (EV_P); 1294void inline_size infy_fork (EV_P);
1295#endif
1123 1296
1124void inline_size 1297void inline_size
1125loop_fork (EV_P) 1298loop_fork (EV_P)
1126{ 1299{
1127#if EV_USE_PORT 1300#if EV_USE_PORT
… …
1135#endif 1308#endif
1136#if EV_USE_INOTIFY 1309#if EV_USE_INOTIFY
1137 infy_fork (EV_A); 1310 infy_fork (EV_A);
1138#endif 1311#endif
1139 1312
1140 if (ev_is_active (&sigev)) 1313 if (ev_is_active (&pipeev))
1141 { 1314 {
1142 /* default loop */ 1315 /* this "locks" the handlers against writing to the pipe */
1316 /* while we modify the fd vars */
1317 gotsig = 1;
1318#if EV_ASYNC_ENABLE
1319 gotasync = 1;
1320#endif
1143 1321
1144 ev_ref (EV_A); 1322 ev_ref (EV_A);
1145 ev_io_stop (EV_A_ &sigev); 1323 ev_io_stop (EV_A_ &pipeev);
1324
1325#if EV_USE_EVENTFD
1326 if (evfd >= 0)
1327 close (evfd);
1328#endif
1329
1330 if (evpipe [0] >= 0)
1331 {
1146 close (sigpipe [0]); 1332 close (evpipe [0]);
1147 close (sigpipe [1]); 1333 close (evpipe [1]);
1334 }
1148 1335
1149 while (pipe (sigpipe))
1150 syserr ("(libev) error creating pipe");
1151
1152 siginit (EV_A); 1336 evpipe_init (EV_A);
1337 /* now iterate over everything, in case we missed something */
1338 pipecb (EV_A_ &pipeev, EV_READ);
1153 } 1339 }
1154 1340
1155 postfork = 0; 1341 postfork = 0;
1156} 1342}
1157 1343
… …
1179} 1365}
1180 1366
1181void 1367void
1182ev_loop_fork (EV_P) 1368ev_loop_fork (EV_P)
1183{ 1369{
1184 postfork = 1; 1370 postfork = 1; /* must be in line with ev_default_fork */
1185} 1371}
1186 1372
1187#endif 1373#endif
1188 1374
1189#if EV_MULTIPLICITY 1375#if EV_MULTIPLICITY
… …
1192#else 1378#else
1193int 1379int
1194ev_default_loop (unsigned int flags) 1380ev_default_loop (unsigned int flags)
1195#endif 1381#endif
1196{ 1382{
1197 if (sigpipe [0] == sigpipe [1])
1198 if (pipe (sigpipe))
1199 return 0;
1200
1201 if (!ev_default_loop_ptr) 1383 if (!ev_default_loop_ptr)
1202 { 1384 {
1203#if EV_MULTIPLICITY 1385#if EV_MULTIPLICITY
1204 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1386 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1205#else 1387#else
… …
1208 1390
1209 loop_init (EV_A_ flags); 1391 loop_init (EV_A_ flags);
1210 1392
1211 if (ev_backend (EV_A)) 1393 if (ev_backend (EV_A))
1212 { 1394 {
1213 siginit (EV_A);
1214
1215#ifndef _WIN32 1395#ifndef _WIN32
1216 ev_signal_init (&childev, childcb, SIGCHLD); 1396 ev_signal_init (&childev, childcb, SIGCHLD);
1217 ev_set_priority (&childev, EV_MAXPRI); 1397 ev_set_priority (&childev, EV_MAXPRI);
1218 ev_signal_start (EV_A_ &childev); 1398 ev_signal_start (EV_A_ &childev);
1219 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1399 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1236#ifndef _WIN32 1416#ifndef _WIN32
1237 ev_ref (EV_A); /* child watcher */ 1417 ev_ref (EV_A); /* child watcher */
1238 ev_signal_stop (EV_A_ &childev); 1418 ev_signal_stop (EV_A_ &childev);
1239#endif 1419#endif
1240 1420
1241 ev_ref (EV_A); /* signal watcher */
1242 ev_io_stop (EV_A_ &sigev);
1243
1244 close (sigpipe [0]); sigpipe [0] = 0;
1245 close (sigpipe [1]); sigpipe [1] = 0;
1246
1247 loop_destroy (EV_A); 1421 loop_destroy (EV_A);
1248} 1422}
1249 1423
1250void 1424void
1251ev_default_fork (void) 1425ev_default_fork (void)
… …
1253#if EV_MULTIPLICITY 1427#if EV_MULTIPLICITY
1254 struct ev_loop *loop = ev_default_loop_ptr; 1428 struct ev_loop *loop = ev_default_loop_ptr;
1255#endif 1429#endif
1256 1430
1257 if (backend) 1431 if (backend)
1258 postfork = 1; 1432 postfork = 1; /* must be in line with ev_loop_fork */
1259} 1433}
1260 1434
1261/*****************************************************************************/ 1435/*****************************************************************************/
1262 1436
1263void 1437void
… …
1287} 1461}
1288 1462
1289void inline_size 1463void inline_size
1290timers_reify (EV_P) 1464timers_reify (EV_P)
1291{ 1465{
1292 while (timercnt && ((WT)timers [0])->at <= mn_now) 1466 while (timercnt && ev_at (timers [1]) <= mn_now)
1293 { 1467 {
1294 ev_timer *w = (ev_timer *)timers [0]; 1468 ev_timer *w = (ev_timer *)timers [1];
1295 1469
1296 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1470 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1297 1471
1298 /* first reschedule or stop timer */ 1472 /* first reschedule or stop timer */
1299 if (w->repeat) 1473 if (w->repeat)
1300 { 1474 {
1301 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1475 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1302 1476
1303 ((WT)w)->at += w->repeat; 1477 ev_at (w) += w->repeat;
1304 if (((WT)w)->at < mn_now) 1478 if (ev_at (w) < mn_now)
1305 ((WT)w)->at = mn_now; 1479 ev_at (w) = mn_now;
1306 1480
1307 downheap (timers, timercnt, 0); 1481 downheap (timers, timercnt, 1);
1308 } 1482 }
1309 else 1483 else
1310 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1484 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1311 1485
1312 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1486 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1315 1489
1316#if EV_PERIODIC_ENABLE 1490#if EV_PERIODIC_ENABLE
1317void inline_size 1491void inline_size
1318periodics_reify (EV_P) 1492periodics_reify (EV_P)
1319{ 1493{
1320 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1494 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1321 { 1495 {
1322 ev_periodic *w = (ev_periodic *)periodics [0]; 1496 ev_periodic *w = (ev_periodic *)periodics [1];
1323 1497
1324 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1498 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1325 1499
1326 /* first reschedule or stop timer */ 1500 /* first reschedule or stop timer */
1327 if (w->reschedule_cb) 1501 if (w->reschedule_cb)
1328 { 1502 {
1329 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1503 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1330 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1504 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1331 downheap (periodics, periodiccnt, 0); 1505 downheap (periodics, periodiccnt, 1);
1332 } 1506 }
1333 else if (w->interval) 1507 else if (w->interval)
1334 { 1508 {
1335 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1509 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1336 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval; 1510 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1337 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1511 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1338 downheap (periodics, periodiccnt, 0); 1512 downheap (periodics, periodiccnt, 1);
1339 } 1513 }
1340 else 1514 else
1341 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1515 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1342 1516
1343 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1517 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1353 for (i = 0; i < periodiccnt; ++i) 1527 for (i = 0; i < periodiccnt; ++i)
1354 { 1528 {
1355 ev_periodic *w = (ev_periodic *)periodics [i]; 1529 ev_periodic *w = (ev_periodic *)periodics [i];
1356 1530
1357 if (w->reschedule_cb) 1531 if (w->reschedule_cb)
1358 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1532 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1359 else if (w->interval) 1533 else if (w->interval)
1360 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1534 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1361 } 1535 }
1362 1536
1363 /* now rebuild the heap */ 1537 /* now rebuild the heap */
1364 for (i = periodiccnt >> 1; i--; ) 1538 for (i = periodiccnt >> 1; i--; )
1365 downheap (periodics, periodiccnt, i); 1539 downheap (periodics, periodiccnt, i);
… …
1447 { 1621 {
1448#if EV_PERIODIC_ENABLE 1622#if EV_PERIODIC_ENABLE
1449 periodics_reschedule (EV_A); 1623 periodics_reschedule (EV_A);
1450#endif 1624#endif
1451 /* adjust timers. this is easy, as the offset is the same for all of them */ 1625 /* adjust timers. this is easy, as the offset is the same for all of them */
1452 for (i = 0; i < timercnt; ++i) 1626 for (i = 1; i <= timercnt; ++i)
1453 ((WT)timers [i])->at += ev_rt_now - mn_now; 1627 ev_at (timers [i]) += ev_rt_now - mn_now;
1454 } 1628 }
1455 1629
1456 mn_now = ev_rt_now; 1630 mn_now = ev_rt_now;
1457 } 1631 }
1458} 1632}
… …
1472static int loop_done; 1646static int loop_done;
1473 1647
1474void 1648void
1475ev_loop (EV_P_ int flags) 1649ev_loop (EV_P_ int flags)
1476{ 1650{
1477 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1651 loop_done = EVUNLOOP_CANCEL;
1478 ? EVUNLOOP_ONE
1479 : EVUNLOOP_CANCEL;
1480 1652
1481 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1653 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1482 1654
1483 do 1655 do
1484 { 1656 {
… …
1530 1702
1531 waittime = MAX_BLOCKTIME; 1703 waittime = MAX_BLOCKTIME;
1532 1704
1533 if (timercnt) 1705 if (timercnt)
1534 { 1706 {
1535 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1707 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1536 if (waittime > to) waittime = to; 1708 if (waittime > to) waittime = to;
1537 } 1709 }
1538 1710
1539#if EV_PERIODIC_ENABLE 1711#if EV_PERIODIC_ENABLE
1540 if (periodiccnt) 1712 if (periodiccnt)
1541 { 1713 {
1542 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1714 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge;
1543 if (waittime > to) waittime = to; 1715 if (waittime > to) waittime = to;
1544 } 1716 }
1545#endif 1717#endif
1546 1718
1547 if (expect_false (waittime < timeout_blocktime)) 1719 if (expect_false (waittime < timeout_blocktime))
… …
1580 /* queue check watchers, to be executed first */ 1752 /* queue check watchers, to be executed first */
1581 if (expect_false (checkcnt)) 1753 if (expect_false (checkcnt))
1582 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1754 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1583 1755
1584 call_pending (EV_A); 1756 call_pending (EV_A);
1585
1586 } 1757 }
1587 while (expect_true (activecnt && !loop_done)); 1758 while (expect_true (
1759 activecnt
1760 && !loop_done
1761 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1762 ));
1588 1763
1589 if (loop_done == EVUNLOOP_ONE) 1764 if (loop_done == EVUNLOOP_ONE)
1590 loop_done = EVUNLOOP_CANCEL; 1765 loop_done = EVUNLOOP_CANCEL;
1591} 1766}
1592 1767
… …
1710ev_timer_start (EV_P_ ev_timer *w) 1885ev_timer_start (EV_P_ ev_timer *w)
1711{ 1886{
1712 if (expect_false (ev_is_active (w))) 1887 if (expect_false (ev_is_active (w)))
1713 return; 1888 return;
1714 1889
1715 ((WT)w)->at += mn_now; 1890 ev_at (w) += mn_now;
1716 1891
1717 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1892 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1718 1893
1719 ev_start (EV_A_ (W)w, ++timercnt); 1894 ev_start (EV_A_ (W)w, ++timercnt);
1720 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1895 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1721 timers [timercnt - 1] = (WT)w; 1896 timers [timercnt] = (WT)w;
1722 upheap (timers, timercnt - 1); 1897 upheap (timers, timercnt);
1723 1898
1724 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1899 /*assert (("internal timer heap corruption", timers [((W)w)->active] == w));*/
1725} 1900}
1726 1901
1727void noinline 1902void noinline
1728ev_timer_stop (EV_P_ ev_timer *w) 1903ev_timer_stop (EV_P_ ev_timer *w)
1729{ 1904{
1730 clear_pending (EV_A_ (W)w); 1905 clear_pending (EV_A_ (W)w);
1731 if (expect_false (!ev_is_active (w))) 1906 if (expect_false (!ev_is_active (w)))
1732 return; 1907 return;
1733 1908
1734 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w)); 1909 assert (("internal timer heap corruption", timers [((W)w)->active] == (WT)w));
1735 1910
1736 { 1911 {
1737 int active = ((W)w)->active; 1912 int active = ((W)w)->active;
1738 1913
1739 if (expect_true (--active < --timercnt)) 1914 if (expect_true (active < timercnt))
1740 { 1915 {
1741 timers [active] = timers [timercnt]; 1916 timers [active] = timers [timercnt];
1742 adjustheap (timers, timercnt, active); 1917 adjustheap (timers, timercnt, active);
1743 } 1918 }
1919
1920 --timercnt;
1744 } 1921 }
1745 1922
1746 ((WT)w)->at -= mn_now; 1923 ev_at (w) -= mn_now;
1747 1924
1748 ev_stop (EV_A_ (W)w); 1925 ev_stop (EV_A_ (W)w);
1749} 1926}
1750 1927
1751void noinline 1928void noinline
… …
1753{ 1930{
1754 if (ev_is_active (w)) 1931 if (ev_is_active (w))
1755 { 1932 {
1756 if (w->repeat) 1933 if (w->repeat)
1757 { 1934 {
1758 ((WT)w)->at = mn_now + w->repeat; 1935 ev_at (w) = mn_now + w->repeat;
1759 adjustheap (timers, timercnt, ((W)w)->active - 1); 1936 adjustheap (timers, timercnt, ((W)w)->active);
1760 } 1937 }
1761 else 1938 else
1762 ev_timer_stop (EV_A_ w); 1939 ev_timer_stop (EV_A_ w);
1763 } 1940 }
1764 else if (w->repeat) 1941 else if (w->repeat)
… …
1774{ 1951{
1775 if (expect_false (ev_is_active (w))) 1952 if (expect_false (ev_is_active (w)))
1776 return; 1953 return;
1777 1954
1778 if (w->reschedule_cb) 1955 if (w->reschedule_cb)
1779 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1956 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1780 else if (w->interval) 1957 else if (w->interval)
1781 { 1958 {
1782 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1959 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1783 /* this formula differs from the one in periodic_reify because we do not always round up */ 1960 /* this formula differs from the one in periodic_reify because we do not always round up */
1784 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1961 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1785 } 1962 }
1786 else 1963 else
1787 ((WT)w)->at = w->offset; 1964 ev_at (w) = w->offset;
1788 1965
1789 ev_start (EV_A_ (W)w, ++periodiccnt); 1966 ev_start (EV_A_ (W)w, ++periodiccnt);
1790 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 1967 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1791 periodics [periodiccnt - 1] = (WT)w; 1968 periodics [periodiccnt] = (WT)w;
1792 upheap (periodics, periodiccnt - 1); 1969 upheap (periodics, periodiccnt);
1793 1970
1794 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1971 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1795} 1972}
1796 1973
1797void noinline 1974void noinline
… …
1799{ 1976{
1800 clear_pending (EV_A_ (W)w); 1977 clear_pending (EV_A_ (W)w);
1801 if (expect_false (!ev_is_active (w))) 1978 if (expect_false (!ev_is_active (w)))
1802 return; 1979 return;
1803 1980
1804 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w)); 1981 assert (("internal periodic heap corruption", periodics [((W)w)->active] == (WT)w));
1805 1982
1806 { 1983 {
1807 int active = ((W)w)->active; 1984 int active = ((W)w)->active;
1808 1985
1809 if (expect_true (--active < --periodiccnt)) 1986 if (expect_true (active < periodiccnt))
1810 { 1987 {
1811 periodics [active] = periodics [periodiccnt]; 1988 periodics [active] = periodics [periodiccnt];
1812 adjustheap (periodics, periodiccnt, active); 1989 adjustheap (periodics, periodiccnt, active);
1813 } 1990 }
1991
1992 --periodiccnt;
1814 } 1993 }
1815 1994
1816 ev_stop (EV_A_ (W)w); 1995 ev_stop (EV_A_ (W)w);
1817} 1996}
1818 1997
… …
1837#endif 2016#endif
1838 if (expect_false (ev_is_active (w))) 2017 if (expect_false (ev_is_active (w)))
1839 return; 2018 return;
1840 2019
1841 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2020 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2021
2022 evpipe_init (EV_A);
1842 2023
1843 { 2024 {
1844#ifndef _WIN32 2025#ifndef _WIN32
1845 sigset_t full, prev; 2026 sigset_t full, prev;
1846 sigfillset (&full); 2027 sigfillset (&full);
… …
1858 wlist_add (&signals [w->signum - 1].head, (WL)w); 2039 wlist_add (&signals [w->signum - 1].head, (WL)w);
1859 2040
1860 if (!((WL)w)->next) 2041 if (!((WL)w)->next)
1861 { 2042 {
1862#if _WIN32 2043#if _WIN32
1863 signal (w->signum, sighandler); 2044 signal (w->signum, ev_sighandler);
1864#else 2045#else
1865 struct sigaction sa; 2046 struct sigaction sa;
1866 sa.sa_handler = sighandler; 2047 sa.sa_handler = ev_sighandler;
1867 sigfillset (&sa.sa_mask); 2048 sigfillset (&sa.sa_mask);
1868 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2049 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1869 sigaction (w->signum, &sa, 0); 2050 sigaction (w->signum, &sa, 0);
1870#endif 2051#endif
1871 } 2052 }
… …
2360 2541
2361 ev_stop (EV_A_ (W)w); 2542 ev_stop (EV_A_ (W)w);
2362} 2543}
2363#endif 2544#endif
2364 2545
2546#if EV_ASYNC_ENABLE
2547void
2548ev_async_start (EV_P_ ev_async *w)
2549{
2550 if (expect_false (ev_is_active (w)))
2551 return;
2552
2553 evpipe_init (EV_A);
2554
2555 ev_start (EV_A_ (W)w, ++asynccnt);
2556 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2557 asyncs [asynccnt - 1] = w;
2558}
2559
2560void
2561ev_async_stop (EV_P_ ev_async *w)
2562{
2563 clear_pending (EV_A_ (W)w);
2564 if (expect_false (!ev_is_active (w)))
2565 return;
2566
2567 {
2568 int active = ((W)w)->active;
2569 asyncs [active - 1] = asyncs [--asynccnt];
2570 ((W)asyncs [active - 1])->active = active;
2571 }
2572
2573 ev_stop (EV_A_ (W)w);
2574}
2575
2576void
2577ev_async_send (EV_P_ ev_async *w)
2578{
2579 w->sent = 1;
2580 evpipe_write (EV_A_ &gotasync);
2581}
2582#endif
2583
2365/*****************************************************************************/ 2584/*****************************************************************************/
2366 2585
2367struct ev_once 2586struct ev_once
2368{ 2587{
2369 ev_io io; 2588 ev_io io;

Diff Legend

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