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

Comparing libev/ev.c (file contents):
Revision 1.193 by root, Sat Dec 22 05:47:58 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
333/* sig_atomic_t is used to avoid per-thread variables or locking but still */
334/* giving it a reasonably high chance of working on typical architetcures */
285static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 335static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
336#endif
286 337
287#ifdef _WIN32 338#ifdef _WIN32
288# include "ev_win32.c" 339# include "ev_win32.c"
289#endif 340#endif
290 341
… …
311 perror (msg); 362 perror (msg);
312 abort (); 363 abort ();
313 } 364 }
314} 365}
315 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
316static void *(*alloc)(void *ptr, long size); 382static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
317 383
318void 384void
319ev_set_allocator (void *(*cb)(void *ptr, long size)) 385ev_set_allocator (void *(*cb)(void *ptr, long size))
320{ 386{
321 alloc = cb; 387 alloc = cb;
322} 388}
323 389
324inline_speed void * 390inline_speed void *
325ev_realloc (void *ptr, long size) 391ev_realloc (void *ptr, long size)
326{ 392{
327 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 393 ptr = alloc (ptr, size);
328 394
329 if (!ptr && size) 395 if (!ptr && size)
330 { 396 {
331 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 397 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
332 abort (); 398 abort ();
… …
439 ts.tv_sec = (time_t)delay; 505 ts.tv_sec = (time_t)delay;
440 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 506 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
441 507
442 nanosleep (&ts, 0); 508 nanosleep (&ts, 0);
443#elif defined(_WIN32) 509#elif defined(_WIN32)
444 Sleep (delay * 1e3); 510 Sleep ((unsigned long)(delay * 1e3));
445#else 511#else
446 struct timeval tv; 512 struct timeval tv;
447 513
448 tv.tv_sec = (time_t)delay; 514 tv.tv_sec = (time_t)delay;
449 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 515 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
588 654
589#if EV_SELECT_IS_WINSOCKET 655#if EV_SELECT_IS_WINSOCKET
590 if (events) 656 if (events)
591 { 657 {
592 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
593 anfd->handle = _get_osfhandle (fd); 662 anfd->handle = _get_osfhandle (fd);
663 #endif
594 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));
595 } 665 }
596#endif 666#endif
597 667
598 { 668 {
… …
686 } 756 }
687} 757}
688 758
689/*****************************************************************************/ 759/*****************************************************************************/
690 760
761/* towards the root */
691void inline_speed 762void inline_speed
692upheap (WT *heap, int k) 763upheap (WT *heap, int k)
693{ 764{
694 WT w = heap [k]; 765 WT w = heap [k];
695 766
696 while (k) 767 for (;;)
697 { 768 {
698 int p = (k - 1) >> 1; 769 int p = k >> 1;
699 770
771 /* maybe we could use a dummy element at heap [0]? */
700 if (heap [p]->at <= w->at) 772 if (!p || heap [p]->at <= w->at)
701 break; 773 break;
702 774
703 heap [k] = heap [p]; 775 heap [k] = heap [p];
704 ((W)heap [k])->active = k + 1; 776 ((W)heap [k])->active = k;
705 k = p; 777 k = p;
706 } 778 }
707 779
708 heap [k] = w; 780 heap [k] = w;
709 ((W)heap [k])->active = k + 1; 781 ((W)heap [k])->active = k;
710} 782}
711 783
784/* away from the root */
712void inline_speed 785void inline_speed
713downheap (WT *heap, int N, int k) 786downheap (WT *heap, int N, int k)
714{ 787{
715 WT w = heap [k]; 788 WT w = heap [k];
716 789
717 for (;;) 790 for (;;)
718 { 791 {
719 int c = (k << 1) + 1; 792 int c = k << 1;
720 793
721 if (c >= N) 794 if (c > N)
722 break; 795 break;
723 796
724 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 797 c += c < N && heap [c]->at > heap [c + 1]->at
725 ? 1 : 0; 798 ? 1 : 0;
726 799
727 if (w->at <= heap [c]->at) 800 if (w->at <= heap [c]->at)
728 break; 801 break;
729 802
730 heap [k] = heap [c]; 803 heap [k] = heap [c];
731 ((W)heap [k])->active = k + 1; 804 ((W)heap [k])->active = k;
732 805
733 k = c; 806 k = c;
734 } 807 }
735 808
736 heap [k] = w; 809 heap [k] = w;
737 ((W)heap [k])->active = k + 1; 810 ((W)heap [k])->active = k;
738} 811}
739 812
740void inline_size 813void inline_size
741adjustheap (WT *heap, int N, int k) 814adjustheap (WT *heap, int N, int k)
742{ 815{
… …
747/*****************************************************************************/ 820/*****************************************************************************/
748 821
749typedef struct 822typedef struct
750{ 823{
751 WL head; 824 WL head;
752 sig_atomic_t volatile gotsig; 825 EV_ATOMIC_T gotsig;
753} ANSIG; 826} ANSIG;
754 827
755static ANSIG *signals; 828static ANSIG *signals;
756static int signalmax; 829static int signalmax;
757 830
758static int sigpipe [2]; 831static EV_ATOMIC_T gotsig;
759static sig_atomic_t volatile gotsig;
760static ev_io sigev;
761 832
762void inline_size 833void inline_size
763signals_init (ANSIG *base, int count) 834signals_init (ANSIG *base, int count)
764{ 835{
765 while (count--) 836 while (count--)
… …
769 840
770 ++base; 841 ++base;
771 } 842 }
772} 843}
773 844
774static void 845/*****************************************************************************/
775sighandler (int signum)
776{
777#if _WIN32
778 signal (signum, sighandler);
779#endif
780
781 signals [signum - 1].gotsig = 1;
782
783 if (!gotsig)
784 {
785 int old_errno = errno;
786 gotsig = 1;
787 write (sigpipe [1], &signum, 1);
788 errno = old_errno;
789 }
790}
791
792void noinline
793ev_feed_signal_event (EV_P_ int signum)
794{
795 WL w;
796
797#if EV_MULTIPLICITY
798 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
799#endif
800
801 --signum;
802
803 if (signum < 0 || signum >= signalmax)
804 return;
805
806 signals [signum].gotsig = 0;
807
808 for (w = signals [signum].head; w; w = w->next)
809 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
810}
811
812static void
813sigcb (EV_P_ ev_io *iow, int revents)
814{
815 int signum;
816
817 read (sigpipe [0], &revents, 1);
818 gotsig = 0;
819
820 for (signum = signalmax; signum--; )
821 if (signals [signum].gotsig)
822 ev_feed_signal_event (EV_A_ signum + 1);
823}
824 846
825void inline_speed 847void inline_speed
826fd_intern (int fd) 848fd_intern (int fd)
827{ 849{
828#ifdef _WIN32 850#ifdef _WIN32
… …
833 fcntl (fd, F_SETFL, O_NONBLOCK); 855 fcntl (fd, F_SETFL, O_NONBLOCK);
834#endif 856#endif
835} 857}
836 858
837static void noinline 859static void noinline
838siginit (EV_P) 860evpipe_init (EV_P)
839{ 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
840 fd_intern (sigpipe [0]); 877 fd_intern (evpipe [0]);
841 fd_intern (sigpipe [1]); 878 fd_intern (evpipe [1]);
879 ev_io_set (&pipeev, evpipe [0], EV_READ);
880 }
842 881
843 ev_io_set (&sigev, sigpipe [0], EV_READ);
844 ev_io_start (EV_A_ &sigev); 882 ev_io_start (EV_A_ &pipeev);
845 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
846} 950}
847 951
848/*****************************************************************************/ 952/*****************************************************************************/
849 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
850static WL childs [EV_PID_HASHSIZE]; 991static WL childs [EV_PID_HASHSIZE];
851 992
852#ifndef _WIN32 993#ifndef _WIN32
853 994
854static ev_signal childev; 995static ev_signal childev;
855 996
997#ifndef WIFCONTINUED
998# define WIFCONTINUED(status) 0
999#endif
1000
856void inline_speed 1001void inline_speed
857child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1002child_reap (EV_P_ int chain, int pid, int status)
858{ 1003{
859 ev_child *w; 1004 ev_child *w;
1005 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
860 1006
861 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 {
862 if (w->pid == pid || !w->pid) 1009 if ((w->pid == pid || !w->pid)
1010 && (!traced || (w->flags & 1)))
863 { 1011 {
864 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 */
865 w->rpid = pid; 1013 w->rpid = pid;
866 w->rstatus = status; 1014 w->rstatus = status;
867 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1015 ev_feed_event (EV_A_ (W)w, EV_CHILD);
868 } 1016 }
1017 }
869} 1018}
870 1019
871#ifndef WCONTINUED 1020#ifndef WCONTINUED
872# define WCONTINUED 0 1021# define WCONTINUED 0
873#endif 1022#endif
… …
882 if (!WCONTINUED 1031 if (!WCONTINUED
883 || errno != EINVAL 1032 || errno != EINVAL
884 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1033 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
885 return; 1034 return;
886 1035
887 /* 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 */
888 /* 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 */
889 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1038 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
890 1039
891 child_reap (EV_A_ sw, pid, pid, status); 1040 child_reap (EV_A_ pid, pid, status);
892 if (EV_PID_HASHSIZE > 1) 1041 if (EV_PID_HASHSIZE > 1)
893 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 */
894} 1043}
895 1044
896#endif 1045#endif
897 1046
898/*****************************************************************************/ 1047/*****************************************************************************/
… …
970} 1119}
971 1120
972unsigned int 1121unsigned int
973ev_embeddable_backends (void) 1122ev_embeddable_backends (void)
974{ 1123{
1124 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1125
975 /* 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 */
976 return EVBACKEND_KQUEUE 1127 /* please fix it and tell me how to detect the fix */
977 | EVBACKEND_PORT; 1128 flags &= ~EVBACKEND_EPOLL;
1129
1130 return flags;
978} 1131}
979 1132
980unsigned int 1133unsigned int
981ev_backend (EV_P) 1134ev_backend (EV_P)
982{ 1135{
… …
1012 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1165 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1013 have_monotonic = 1; 1166 have_monotonic = 1;
1014 } 1167 }
1015#endif 1168#endif
1016 1169
1017 ev_rt_now = ev_time (); 1170 ev_rt_now = ev_time ();
1018 mn_now = get_clock (); 1171 mn_now = get_clock ();
1019 now_floor = mn_now; 1172 now_floor = mn_now;
1020 rtmn_diff = ev_rt_now - mn_now; 1173 rtmn_diff = ev_rt_now - mn_now;
1021 1174
1022 io_blocktime = 0.; 1175 io_blocktime = 0.;
1023 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
1024 1183
1025 /* pid check not overridable via env */ 1184 /* pid check not overridable via env */
1026#ifndef _WIN32 1185#ifndef _WIN32
1027 if (flags & EVFLAG_FORKCHECK) 1186 if (flags & EVFLAG_FORKCHECK)
1028 curpid = getpid (); 1187 curpid = getpid ();
… …
1031 if (!(flags & EVFLAG_NOENV) 1190 if (!(flags & EVFLAG_NOENV)
1032 && !enable_secure () 1191 && !enable_secure ()
1033 && getenv ("LIBEV_FLAGS")) 1192 && getenv ("LIBEV_FLAGS"))
1034 flags = atoi (getenv ("LIBEV_FLAGS")); 1193 flags = atoi (getenv ("LIBEV_FLAGS"));
1035 1194
1036 if (!(flags & 0x0000ffffUL)) 1195 if (!(flags & 0x0000ffffU))
1037 flags |= ev_recommended_backends (); 1196 flags |= ev_recommended_backends ();
1038
1039 backend = 0;
1040 backend_fd = -1;
1041#if EV_USE_INOTIFY
1042 fs_fd = -2;
1043#endif
1044 1197
1045#if EV_USE_PORT 1198#if EV_USE_PORT
1046 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1199 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1047#endif 1200#endif
1048#if EV_USE_KQUEUE 1201#if EV_USE_KQUEUE
… …
1056#endif 1209#endif
1057#if EV_USE_SELECT 1210#if EV_USE_SELECT
1058 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1211 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1059#endif 1212#endif
1060 1213
1061 ev_init (&sigev, sigcb); 1214 ev_init (&pipeev, pipecb);
1062 ev_set_priority (&sigev, EV_MAXPRI); 1215 ev_set_priority (&pipeev, EV_MAXPRI);
1063 } 1216 }
1064} 1217}
1065 1218
1066static void noinline 1219static void noinline
1067loop_destroy (EV_P) 1220loop_destroy (EV_P)
1068{ 1221{
1069 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 }
1070 1240
1071#if EV_USE_INOTIFY 1241#if EV_USE_INOTIFY
1072 if (fs_fd >= 0) 1242 if (fs_fd >= 0)
1073 close (fs_fd); 1243 close (fs_fd);
1074#endif 1244#endif
… …
1111#if EV_FORK_ENABLE 1281#if EV_FORK_ENABLE
1112 array_free (fork, EMPTY); 1282 array_free (fork, EMPTY);
1113#endif 1283#endif
1114 array_free (prepare, EMPTY); 1284 array_free (prepare, EMPTY);
1115 array_free (check, EMPTY); 1285 array_free (check, EMPTY);
1286#if EV_ASYNC_ENABLE
1287 array_free (async, EMPTY);
1288#endif
1116 1289
1117 backend = 0; 1290 backend = 0;
1118} 1291}
1119 1292
1293#if EV_USE_INOTIFY
1120void inline_size infy_fork (EV_P); 1294void inline_size infy_fork (EV_P);
1295#endif
1121 1296
1122void inline_size 1297void inline_size
1123loop_fork (EV_P) 1298loop_fork (EV_P)
1124{ 1299{
1125#if EV_USE_PORT 1300#if EV_USE_PORT
… …
1133#endif 1308#endif
1134#if EV_USE_INOTIFY 1309#if EV_USE_INOTIFY
1135 infy_fork (EV_A); 1310 infy_fork (EV_A);
1136#endif 1311#endif
1137 1312
1138 if (ev_is_active (&sigev)) 1313 if (ev_is_active (&pipeev))
1139 { 1314 {
1140 /* 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
1141 1321
1142 ev_ref (EV_A); 1322 ev_ref (EV_A);
1143 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 {
1144 close (sigpipe [0]); 1332 close (evpipe [0]);
1145 close (sigpipe [1]); 1333 close (evpipe [1]);
1334 }
1146 1335
1147 while (pipe (sigpipe))
1148 syserr ("(libev) error creating pipe");
1149
1150 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);
1151 } 1339 }
1152 1340
1153 postfork = 0; 1341 postfork = 0;
1154} 1342}
1155 1343
… …
1177} 1365}
1178 1366
1179void 1367void
1180ev_loop_fork (EV_P) 1368ev_loop_fork (EV_P)
1181{ 1369{
1182 postfork = 1; 1370 postfork = 1; /* must be in line with ev_default_fork */
1183} 1371}
1184 1372
1185#endif 1373#endif
1186 1374
1187#if EV_MULTIPLICITY 1375#if EV_MULTIPLICITY
… …
1190#else 1378#else
1191int 1379int
1192ev_default_loop (unsigned int flags) 1380ev_default_loop (unsigned int flags)
1193#endif 1381#endif
1194{ 1382{
1195 if (sigpipe [0] == sigpipe [1])
1196 if (pipe (sigpipe))
1197 return 0;
1198
1199 if (!ev_default_loop_ptr) 1383 if (!ev_default_loop_ptr)
1200 { 1384 {
1201#if EV_MULTIPLICITY 1385#if EV_MULTIPLICITY
1202 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1386 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1203#else 1387#else
… …
1206 1390
1207 loop_init (EV_A_ flags); 1391 loop_init (EV_A_ flags);
1208 1392
1209 if (ev_backend (EV_A)) 1393 if (ev_backend (EV_A))
1210 { 1394 {
1211 siginit (EV_A);
1212
1213#ifndef _WIN32 1395#ifndef _WIN32
1214 ev_signal_init (&childev, childcb, SIGCHLD); 1396 ev_signal_init (&childev, childcb, SIGCHLD);
1215 ev_set_priority (&childev, EV_MAXPRI); 1397 ev_set_priority (&childev, EV_MAXPRI);
1216 ev_signal_start (EV_A_ &childev); 1398 ev_signal_start (EV_A_ &childev);
1217 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1399 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1234#ifndef _WIN32 1416#ifndef _WIN32
1235 ev_ref (EV_A); /* child watcher */ 1417 ev_ref (EV_A); /* child watcher */
1236 ev_signal_stop (EV_A_ &childev); 1418 ev_signal_stop (EV_A_ &childev);
1237#endif 1419#endif
1238 1420
1239 ev_ref (EV_A); /* signal watcher */
1240 ev_io_stop (EV_A_ &sigev);
1241
1242 close (sigpipe [0]); sigpipe [0] = 0;
1243 close (sigpipe [1]); sigpipe [1] = 0;
1244
1245 loop_destroy (EV_A); 1421 loop_destroy (EV_A);
1246} 1422}
1247 1423
1248void 1424void
1249ev_default_fork (void) 1425ev_default_fork (void)
… …
1251#if EV_MULTIPLICITY 1427#if EV_MULTIPLICITY
1252 struct ev_loop *loop = ev_default_loop_ptr; 1428 struct ev_loop *loop = ev_default_loop_ptr;
1253#endif 1429#endif
1254 1430
1255 if (backend) 1431 if (backend)
1256 postfork = 1; 1432 postfork = 1; /* must be in line with ev_loop_fork */
1257} 1433}
1258 1434
1259/*****************************************************************************/ 1435/*****************************************************************************/
1260 1436
1261void 1437void
… …
1285} 1461}
1286 1462
1287void inline_size 1463void inline_size
1288timers_reify (EV_P) 1464timers_reify (EV_P)
1289{ 1465{
1290 while (timercnt && ((WT)timers [0])->at <= mn_now) 1466 while (timercnt && ev_at (timers [1]) <= mn_now)
1291 { 1467 {
1292 ev_timer *w = (ev_timer *)timers [0]; 1468 ev_timer *w = (ev_timer *)timers [1];
1293 1469
1294 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1470 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1295 1471
1296 /* first reschedule or stop timer */ 1472 /* first reschedule or stop timer */
1297 if (w->repeat) 1473 if (w->repeat)
1298 { 1474 {
1299 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.));
1300 1476
1301 ((WT)w)->at += w->repeat; 1477 ev_at (w) += w->repeat;
1302 if (((WT)w)->at < mn_now) 1478 if (ev_at (w) < mn_now)
1303 ((WT)w)->at = mn_now; 1479 ev_at (w) = mn_now;
1304 1480
1305 downheap (timers, timercnt, 0); 1481 downheap (timers, timercnt, 1);
1306 } 1482 }
1307 else 1483 else
1308 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1484 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1309 1485
1310 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1486 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1313 1489
1314#if EV_PERIODIC_ENABLE 1490#if EV_PERIODIC_ENABLE
1315void inline_size 1491void inline_size
1316periodics_reify (EV_P) 1492periodics_reify (EV_P)
1317{ 1493{
1318 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1494 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1319 { 1495 {
1320 ev_periodic *w = (ev_periodic *)periodics [0]; 1496 ev_periodic *w = (ev_periodic *)periodics [1];
1321 1497
1322 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1498 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1323 1499
1324 /* first reschedule or stop timer */ 1500 /* first reschedule or stop timer */
1325 if (w->reschedule_cb) 1501 if (w->reschedule_cb)
1326 { 1502 {
1327 ((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);
1328 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));
1329 downheap (periodics, periodiccnt, 0); 1505 downheap (periodics, periodiccnt, 1);
1330 } 1506 }
1331 else if (w->interval) 1507 else if (w->interval)
1332 { 1508 {
1333 ((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;
1334 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;
1335 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));
1336 downheap (periodics, periodiccnt, 0); 1512 downheap (periodics, periodiccnt, 1);
1337 } 1513 }
1338 else 1514 else
1339 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1515 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1340 1516
1341 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1517 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1351 for (i = 0; i < periodiccnt; ++i) 1527 for (i = 0; i < periodiccnt; ++i)
1352 { 1528 {
1353 ev_periodic *w = (ev_periodic *)periodics [i]; 1529 ev_periodic *w = (ev_periodic *)periodics [i];
1354 1530
1355 if (w->reschedule_cb) 1531 if (w->reschedule_cb)
1356 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1532 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1357 else if (w->interval) 1533 else if (w->interval)
1358 ((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;
1359 } 1535 }
1360 1536
1361 /* now rebuild the heap */ 1537 /* now rebuild the heap */
1362 for (i = periodiccnt >> 1; i--; ) 1538 for (i = periodiccnt >> 1; i--; )
1363 downheap (periodics, periodiccnt, i); 1539 downheap (periodics, periodiccnt, i);
… …
1445 { 1621 {
1446#if EV_PERIODIC_ENABLE 1622#if EV_PERIODIC_ENABLE
1447 periodics_reschedule (EV_A); 1623 periodics_reschedule (EV_A);
1448#endif 1624#endif
1449 /* 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 */
1450 for (i = 0; i < timercnt; ++i) 1626 for (i = 1; i <= timercnt; ++i)
1451 ((WT)timers [i])->at += ev_rt_now - mn_now; 1627 ev_at (timers [i]) += ev_rt_now - mn_now;
1452 } 1628 }
1453 1629
1454 mn_now = ev_rt_now; 1630 mn_now = ev_rt_now;
1455 } 1631 }
1456} 1632}
… …
1470static int loop_done; 1646static int loop_done;
1471 1647
1472void 1648void
1473ev_loop (EV_P_ int flags) 1649ev_loop (EV_P_ int flags)
1474{ 1650{
1475 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1651 loop_done = EVUNLOOP_CANCEL;
1476 ? EVUNLOOP_ONE
1477 : EVUNLOOP_CANCEL;
1478 1652
1479 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 */
1480 1654
1481 do 1655 do
1482 { 1656 {
… …
1528 1702
1529 waittime = MAX_BLOCKTIME; 1703 waittime = MAX_BLOCKTIME;
1530 1704
1531 if (timercnt) 1705 if (timercnt)
1532 { 1706 {
1533 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1707 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1534 if (waittime > to) waittime = to; 1708 if (waittime > to) waittime = to;
1535 } 1709 }
1536 1710
1537#if EV_PERIODIC_ENABLE 1711#if EV_PERIODIC_ENABLE
1538 if (periodiccnt) 1712 if (periodiccnt)
1539 { 1713 {
1540 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;
1541 if (waittime > to) waittime = to; 1715 if (waittime > to) waittime = to;
1542 } 1716 }
1543#endif 1717#endif
1544 1718
1545 if (expect_false (waittime < timeout_blocktime)) 1719 if (expect_false (waittime < timeout_blocktime))
… …
1578 /* queue check watchers, to be executed first */ 1752 /* queue check watchers, to be executed first */
1579 if (expect_false (checkcnt)) 1753 if (expect_false (checkcnt))
1580 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1754 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1581 1755
1582 call_pending (EV_A); 1756 call_pending (EV_A);
1583
1584 } 1757 }
1585 while (expect_true (activecnt && !loop_done)); 1758 while (expect_true (
1759 activecnt
1760 && !loop_done
1761 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1762 ));
1586 1763
1587 if (loop_done == EVUNLOOP_ONE) 1764 if (loop_done == EVUNLOOP_ONE)
1588 loop_done = EVUNLOOP_CANCEL; 1765 loop_done = EVUNLOOP_CANCEL;
1589} 1766}
1590 1767
… …
1708ev_timer_start (EV_P_ ev_timer *w) 1885ev_timer_start (EV_P_ ev_timer *w)
1709{ 1886{
1710 if (expect_false (ev_is_active (w))) 1887 if (expect_false (ev_is_active (w)))
1711 return; 1888 return;
1712 1889
1713 ((WT)w)->at += mn_now; 1890 ev_at (w) += mn_now;
1714 1891
1715 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.));
1716 1893
1717 ev_start (EV_A_ (W)w, ++timercnt); 1894 ev_start (EV_A_ (W)w, ++timercnt);
1718 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1895 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1719 timers [timercnt - 1] = (WT)w; 1896 timers [timercnt] = (WT)w;
1720 upheap (timers, timercnt - 1); 1897 upheap (timers, timercnt);
1721 1898
1722 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1899 /*assert (("internal timer heap corruption", timers [((W)w)->active] == w));*/
1723} 1900}
1724 1901
1725void noinline 1902void noinline
1726ev_timer_stop (EV_P_ ev_timer *w) 1903ev_timer_stop (EV_P_ ev_timer *w)
1727{ 1904{
1728 clear_pending (EV_A_ (W)w); 1905 clear_pending (EV_A_ (W)w);
1729 if (expect_false (!ev_is_active (w))) 1906 if (expect_false (!ev_is_active (w)))
1730 return; 1907 return;
1731 1908
1732 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w)); 1909 assert (("internal timer heap corruption", timers [((W)w)->active] == (WT)w));
1733 1910
1734 { 1911 {
1735 int active = ((W)w)->active; 1912 int active = ((W)w)->active;
1736 1913
1737 if (expect_true (--active < --timercnt)) 1914 if (expect_true (active < timercnt))
1738 { 1915 {
1739 timers [active] = timers [timercnt]; 1916 timers [active] = timers [timercnt];
1740 adjustheap (timers, timercnt, active); 1917 adjustheap (timers, timercnt, active);
1741 } 1918 }
1919
1920 --timercnt;
1742 } 1921 }
1743 1922
1744 ((WT)w)->at -= mn_now; 1923 ev_at (w) -= mn_now;
1745 1924
1746 ev_stop (EV_A_ (W)w); 1925 ev_stop (EV_A_ (W)w);
1747} 1926}
1748 1927
1749void noinline 1928void noinline
… …
1751{ 1930{
1752 if (ev_is_active (w)) 1931 if (ev_is_active (w))
1753 { 1932 {
1754 if (w->repeat) 1933 if (w->repeat)
1755 { 1934 {
1756 ((WT)w)->at = mn_now + w->repeat; 1935 ev_at (w) = mn_now + w->repeat;
1757 adjustheap (timers, timercnt, ((W)w)->active - 1); 1936 adjustheap (timers, timercnt, ((W)w)->active);
1758 } 1937 }
1759 else 1938 else
1760 ev_timer_stop (EV_A_ w); 1939 ev_timer_stop (EV_A_ w);
1761 } 1940 }
1762 else if (w->repeat) 1941 else if (w->repeat)
… …
1772{ 1951{
1773 if (expect_false (ev_is_active (w))) 1952 if (expect_false (ev_is_active (w)))
1774 return; 1953 return;
1775 1954
1776 if (w->reschedule_cb) 1955 if (w->reschedule_cb)
1777 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1956 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1778 else if (w->interval) 1957 else if (w->interval)
1779 { 1958 {
1780 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.));
1781 /* 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 */
1782 ((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;
1783 } 1962 }
1784 else 1963 else
1785 ((WT)w)->at = w->offset; 1964 ev_at (w) = w->offset;
1786 1965
1787 ev_start (EV_A_ (W)w, ++periodiccnt); 1966 ev_start (EV_A_ (W)w, ++periodiccnt);
1788 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 1967 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1789 periodics [periodiccnt - 1] = (WT)w; 1968 periodics [periodiccnt] = (WT)w;
1790 upheap (periodics, periodiccnt - 1); 1969 upheap (periodics, periodiccnt);
1791 1970
1792 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1971 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1793} 1972}
1794 1973
1795void noinline 1974void noinline
… …
1797{ 1976{
1798 clear_pending (EV_A_ (W)w); 1977 clear_pending (EV_A_ (W)w);
1799 if (expect_false (!ev_is_active (w))) 1978 if (expect_false (!ev_is_active (w)))
1800 return; 1979 return;
1801 1980
1802 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w)); 1981 assert (("internal periodic heap corruption", periodics [((W)w)->active] == (WT)w));
1803 1982
1804 { 1983 {
1805 int active = ((W)w)->active; 1984 int active = ((W)w)->active;
1806 1985
1807 if (expect_true (--active < --periodiccnt)) 1986 if (expect_true (active < periodiccnt))
1808 { 1987 {
1809 periodics [active] = periodics [periodiccnt]; 1988 periodics [active] = periodics [periodiccnt];
1810 adjustheap (periodics, periodiccnt, active); 1989 adjustheap (periodics, periodiccnt, active);
1811 } 1990 }
1991
1992 --periodiccnt;
1812 } 1993 }
1813 1994
1814 ev_stop (EV_A_ (W)w); 1995 ev_stop (EV_A_ (W)w);
1815} 1996}
1816 1997
… …
1835#endif 2016#endif
1836 if (expect_false (ev_is_active (w))) 2017 if (expect_false (ev_is_active (w)))
1837 return; 2018 return;
1838 2019
1839 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);
1840 2023
1841 { 2024 {
1842#ifndef _WIN32 2025#ifndef _WIN32
1843 sigset_t full, prev; 2026 sigset_t full, prev;
1844 sigfillset (&full); 2027 sigfillset (&full);
… …
1856 wlist_add (&signals [w->signum - 1].head, (WL)w); 2039 wlist_add (&signals [w->signum - 1].head, (WL)w);
1857 2040
1858 if (!((WL)w)->next) 2041 if (!((WL)w)->next)
1859 { 2042 {
1860#if _WIN32 2043#if _WIN32
1861 signal (w->signum, sighandler); 2044 signal (w->signum, ev_sighandler);
1862#else 2045#else
1863 struct sigaction sa; 2046 struct sigaction sa;
1864 sa.sa_handler = sighandler; 2047 sa.sa_handler = ev_sighandler;
1865 sigfillset (&sa.sa_mask); 2048 sigfillset (&sa.sa_mask);
1866 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 */
1867 sigaction (w->signum, &sa, 0); 2050 sigaction (w->signum, &sa, 0);
1868#endif 2051#endif
1869 } 2052 }
… …
2264 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2447 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2265 2448
2266 if (ev_cb (w)) 2449 if (ev_cb (w))
2267 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2450 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2268 else 2451 else
2269 ev_embed_sweep (loop, w); 2452 ev_loop (w->other, EVLOOP_NONBLOCK);
2270} 2453}
2271 2454
2272static void 2455static void
2273embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 2456embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2274{ 2457{
2275 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 2458 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2276 2459
2277 fd_reify (w->other); 2460 {
2461 struct ev_loop *loop = w->other;
2462
2463 while (fdchangecnt)
2464 {
2465 fd_reify (EV_A);
2466 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2467 }
2468 }
2278} 2469}
2470
2471#if 0
2472static void
2473embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2474{
2475 ev_idle_stop (EV_A_ idle);
2476}
2477#endif
2279 2478
2280void 2479void
2281ev_embed_start (EV_P_ ev_embed *w) 2480ev_embed_start (EV_P_ ev_embed *w)
2282{ 2481{
2283 if (expect_false (ev_is_active (w))) 2482 if (expect_false (ev_is_active (w)))
… …
2294 2493
2295 ev_prepare_init (&w->prepare, embed_prepare_cb); 2494 ev_prepare_init (&w->prepare, embed_prepare_cb);
2296 ev_set_priority (&w->prepare, EV_MINPRI); 2495 ev_set_priority (&w->prepare, EV_MINPRI);
2297 ev_prepare_start (EV_A_ &w->prepare); 2496 ev_prepare_start (EV_A_ &w->prepare);
2298 2497
2498 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2499
2299 ev_start (EV_A_ (W)w, 1); 2500 ev_start (EV_A_ (W)w, 1);
2300} 2501}
2301 2502
2302void 2503void
2303ev_embed_stop (EV_P_ ev_embed *w) 2504ev_embed_stop (EV_P_ ev_embed *w)
… …
2340 2541
2341 ev_stop (EV_A_ (W)w); 2542 ev_stop (EV_A_ (W)w);
2342} 2543}
2343#endif 2544#endif
2344 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
2345/*****************************************************************************/ 2584/*****************************************************************************/
2346 2585
2347struct ev_once 2586struct ev_once
2348{ 2587{
2349 ev_io io; 2588 ev_io io;

Diff Legend

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